From 65d7787ff9b1e780ec63cf27f5c9ea3b2eaf5fcd Mon Sep 17 00:00:00 2001 From: am2222 Date: Fri, 29 May 2020 15:11:36 -0400 Subject: [PATCH 0001/1694] MAPNIK port added --- ports/mapnik/CONTROL | 58 ++++++++++ ports/mapnik/portfile.cmake | 210 ++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+) create mode 100644 ports/mapnik/CONTROL create mode 100644 ports/mapnik/portfile.cmake diff --git a/ports/mapnik/CONTROL b/ports/mapnik/CONTROL new file mode 100644 index 00000000000000..f3ae0909cf4fc7 --- /dev/null +++ b/ports/mapnik/CONTROL @@ -0,0 +1,58 @@ +Source: mapnik +Version: 3.0.22 +Homepage: https://github.com/am2222/mapnik-windows/ +Description: Mapnik is an open source toolkit for developing mapping applications. Compiling on windows. (unofficial port) +Build-Depends: icu, boost-locale[icu], boost-regex[icu], boost, freetype, tiff, libwebp, libxml2, harfbuzz, libpng, zlib + +Feature: WITH_CAIRO +Description: Cairo renderer +Build-Depends: cairo + +Feature: WITH_PROJ4 +Description: PROJ4 Functionalities +Build-Depends: proj4 + +Feature: WITH_INPUT_CSV +Description: CSV input plugin + +Feature: WITH_INPUT_GDAL +Description: GDAL input plugin +Build-Depends: gdal + +Feature: WITH_INPUT_GEOBUF +Description: GEOBUF input plugin +Build-Depends: protozero + +Feature: WITH_INPUT_GEOJSON +Description: GEOJSON input plugin + +Feature: WITH_INPUT_OGR +Description: OGR input plugin +Build-Depends: gdal + +Feature: WITH_INPUT_PGRASTER +Description: PGRASTER input plugin +Build-Depends: libodb-pgsql + +Feature: WITH_INPUT_POSTGIS +Description: POSTGIS input plugin +Build-Depends: libodb-pgsql + +Feature: WITH_INPUT_RASTER +Description: RASTER input plugin + +Feature: WITH_INPUT_SHAPE +Description: SHAPE input plugin + +Feature: WITH_INPUT_SQLITE +Description: SQLITE input plugin +Build-Depends: sqlite3 + +Feature: WITH_INPUT_TOPOJSON +Description: TOPOJSON input plugin + +Feature: WITH_DEMO +Description: Make Demo Application + +Feature: WITH_UTILS +Description: Make utilities Application including mapnik-rendrer and shapeindex diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake new file mode 100644 index 00000000000000..0039032b9ae8c6 --- /dev/null +++ b/ports/mapnik/portfile.cmake @@ -0,0 +1,210 @@ +set(MAPNIK_VERSION 3.0.22) +include(vcpkg_common_functions) +find_program(GIT git) + +set(GIT_URL "https://github.com/am2222/mapnik-windows.git") +set(GIT_REV "fdba45cd95b66576e47de2e56d30196bfc9de99d") + +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT}) + +if(NOT EXISTS "${SOURCE_PATH}/.git") + message(STATUS "Cloning and fetching submodules") + vcpkg_execute_required_process( + COMMAND ${GIT} clone --recurse-submodules ${GIT_URL} ${SOURCE_PATH} + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME clone + ) + + message(STATUS "Checkout revision ${GIT_REV}") + vcpkg_execute_required_process( + COMMAND ${GIT} checkout ${GIT_REV} + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME checkout + ) +endif() +message(STATUS "Adding worktree done") + + +vcpkg_find_acquire_program(PYTHON2) +get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) +set(ENV{PATH} "$ENV{PATH};${PYTHON2_DIR}") + +set(BOOST_ROOT ${CURRENT_INSTALLED_DIR}) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(MAPNIK_STATIC_LIB OFF) +elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(MAPNIK_STATIC_LIB ON) +endif() + + + +if ("WITH_CAIRO" IN_LIST FEATURES) + set(CMAKE_WITH_CAIRO ON) +else() + set(CMAKE_WITH_CAIRO OFF) +endif() + +if ("WITH_DEMO" IN_LIST FEATURES) + set(CMAKE_DEMO ON) +else() + set(CMAKE_DEMO OFF) +endif() + +if ("WITH_GRID" IN_LIST FEATURES) + set(CMAKE_GRID ON) +else() + set(CMAKE_GRID OFF) +endif() + + +if ("WITH_INPUT_CSV" IN_LIST FEATURES) + set(CMAKE_INPUT_CSV ON) +else() + set(CMAKE_INPUT_CSV OFF) +endif() + +if ("WITH_INPUT_GDAL" IN_LIST FEATURES) + set(CMAKE_INPUT_GDAL ON) +else() + set(CMAKE_INPUT_GDAL OFF) +endif() + + +if ("WITH_INPUT_GEOBUF" IN_LIST FEATURES) + set(CMAKE_GEOBUF ON) +else() + set(CMAKE_GEOBUF OFF) +endif() + + +if ("WITH_INPUT_GEOJSON" IN_LIST FEATURES) + set(CMAKE_GEOJSON ON) +else() + set(CMAKE_GEOJSON OFF) +endif() + +if ("WITH_INPUT_OGR" IN_LIST FEATURES) + set(CMAKE_OGR ON) +else() + set(CMAKE_OGR OFF) +endif() + + +if ("WITH_INPUT_PGRASTER" IN_LIST FEATURES) + set(CMAKE_PGRASTER ON) +else() + set(CMAKE_PGRASTER OFF) +endif() + + +if ("WITH_INPUT_POSTGIS" IN_LIST FEATURES) + set(CMAKE_POSTGIS ON) +else() + set(CMAKE_POSTGIS OFF) +endif() + + +if ("WITH_INPUT_RASTER" IN_LIST FEATURES) + set(CMAKE_RASTER ON) +else() + set(CMAKE_RASTER OFF) +endif() + + + +if ("WITH_INPUT_SHAPE" IN_LIST FEATURES) + set(CMAKE_SHAPE ON) +else() + set(CMAKE_SHAPE OFF) +endif() + + + +if ("WITH_INPUT_SQLITE" IN_LIST FEATURES) + set(CMAKE_SQLITE ON) +else() + set(CMAKE_SQLITE OFF) +endif() + +if ("WITH_INPUT_TOPOJSON" IN_LIST FEATURES) + set(CMAKE_TOPOJSON ON) +else() + set(CMAKE_TOPOJSON OFF) +endif() + +if ("WITH_PROJ4" IN_LIST FEATURES) + set(CMAKE_PROJ4 ON) +else() + set(CMAKE_PROJ4 OFF) +endif() + + +if ("WITH_UTILS" IN_LIST FEATURES) + set(CMAKE_UTILS ON) +else() + set(CMAKE_UTILS OFF) +endif() + +if ("WITH_VIEWER" IN_LIST FEATURES) + set(CMAKE_VIEWER ON) +else() + set(CMAKE_VIEWER OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mapnik + # PREFER_NINJA # Disable this option if project cannot be built with Ninja +# NO_CHARSET_FLAG # automatic templates + OPTIONS + -DWITH_CAIRO={$CMAKE_WITH_CAIRO} + -DWITH_DEMO={$CMAKE_DEMO} + #-DWITH_GRID={$CMAKE_} + -DWITH_INPUT_CSV={$CMAKE_CSV} + -DWITH_INPUT_GDAL={$CMAKE_GDAL} + -DWITH_INPUT_GEOBUF={$CMAKE_GEOBUF} + -DWITH_INPUT_GEOJSON={$CMAKE_GEOJSON=} + -DWITH_INPUT_OGR={$CMAKE_OGR} + -DWITH_INPUT_PGRASTER={$CMAKE_PGRASTER} + -DWITH_INPUT_POSTGIS={$CMAKE_POSTGIS} + -DWITH_INPUT_RASTER={$CMAKE_RASTER} + -DWITH_INPUT_SHAPE={$CMAKE_SHAPE} + -DWITH_INPUT_SQLITE={$CMAKE_SQLITE} + -DWITH_INPUT_TOPOJSON={$CMAKE_TOPOJSON} + -DWITH_PROJ4={$CMAKE_PROJ4} + -DWITH_UTILS={$CMAKE_UTILS} + #-DWITH_VIEWER={$CMAKE_VIEWER} + -DMAPNIK_STATIC_LIB=${MAPNIK_STATIC_LIB} + -DBOOST_PREFIX=${CURRENT_INSTALLED_DIR}/include + -DFREE_TYPE_INCLUDE=${CURRENT_INSTALLED_DIR}/include/freetype2 +) + +vcpkg_install_cmake() + + + +file(COPY ${SOURCE_PATH}/include/mapnik DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +vcpkg_copy_pdbs() +file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe") +if(EXES) + file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) + file(REMOVE ${EXES}) + + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/mapnik) + file(COPY ${SOURCE_PATH}/demo/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik/demo) + file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) + file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) +endif() + +file(GLOB DEBUG_EXES "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") +if(DEBUG_EXES) + file(REMOVE ${EXES}) +endif() + + + + +#file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mapnik RENAME copyright) +file(INSTALL ${SOURCE_PATH}/fonts/unifont_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/mapnik RENAME fonts_copyright) \ No newline at end of file From 0388c5ff0773dfc3f26b49c6e907b6735197f951 Mon Sep 17 00:00:00 2001 From: am2222 Date: Fri, 29 May 2020 15:15:01 -0400 Subject: [PATCH 0002/1694] MAPNIK port added --- scripts/ci.baseline.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a52034597b70e6..f770eb6a6a87e8 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -2033,3 +2033,6 @@ ctp:x64-uwp=skip ctp:x64-windows=skip ctp:x64-windows-static=skip ctp:x86-windows=skip + +mapnik:arm-uwp=fail +mapnik:x64-uwp=fail \ No newline at end of file From d7a333dc635cf5271390891c5c2c3490dc74d372 Mon Sep 17 00:00:00 2001 From: am2222 Date: Fri, 5 Jun 2020 02:02:41 -0400 Subject: [PATCH 0003/1694] addressed issues with the port --- ports/mapnik/CONTROL | 30 +++--- ports/mapnik/portfile.cmake | 182 +++++++----------------------------- scripts/ci.baseline.txt | 10 +- 3 files changed, 54 insertions(+), 168 deletions(-) diff --git a/ports/mapnik/CONTROL b/ports/mapnik/CONTROL index f3ae0909cf4fc7..34bd744d543046 100644 --- a/ports/mapnik/CONTROL +++ b/ports/mapnik/CONTROL @@ -4,55 +4,55 @@ Homepage: https://github.com/am2222/mapnik-windows/ Description: Mapnik is an open source toolkit for developing mapping applications. Compiling on windows. (unofficial port) Build-Depends: icu, boost-locale[icu], boost-regex[icu], boost, freetype, tiff, libwebp, libxml2, harfbuzz, libpng, zlib -Feature: WITH_CAIRO +Feature: CAIRO Description: Cairo renderer Build-Depends: cairo -Feature: WITH_PROJ4 +Feature: PROJ4 Description: PROJ4 Functionalities Build-Depends: proj4 -Feature: WITH_INPUT_CSV +Feature: INPUT_CSV Description: CSV input plugin -Feature: WITH_INPUT_GDAL +Feature: INPUT_GDAL Description: GDAL input plugin Build-Depends: gdal -Feature: WITH_INPUT_GEOBUF +Feature: INPUT_GEOBUF Description: GEOBUF input plugin Build-Depends: protozero -Feature: WITH_INPUT_GEOJSON +Feature: INPUT_GEOJSON Description: GEOJSON input plugin -Feature: WITH_INPUT_OGR +Feature: INPUT_OGR Description: OGR input plugin Build-Depends: gdal -Feature: WITH_INPUT_PGRASTER +Feature: INPUT_PGRASTER Description: PGRASTER input plugin Build-Depends: libodb-pgsql -Feature: WITH_INPUT_POSTGIS +Feature: INPUT_POSTGIS Description: POSTGIS input plugin Build-Depends: libodb-pgsql -Feature: WITH_INPUT_RASTER +Feature: INPUT_RASTER Description: RASTER input plugin -Feature: WITH_INPUT_SHAPE +Feature: INPUT_SHAPE Description: SHAPE input plugin -Feature: WITH_INPUT_SQLITE +Feature: INPUT_SQLITE Description: SQLITE input plugin Build-Depends: sqlite3 -Feature: WITH_INPUT_TOPOJSON +Feature: INPUT_TOPOJSON Description: TOPOJSON input plugin -Feature: WITH_DEMO +Feature: DEMO Description: Make Demo Application -Feature: WITH_UTILS +Feature: UTILS Description: Make utilities Application including mapnik-rendrer and shapeindex diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 0039032b9ae8c6..bbe49f4412004b 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,7 +1,4 @@ -set(MAPNIK_VERSION 3.0.22) -include(vcpkg_common_functions) find_program(GIT git) - set(GIT_URL "https://github.com/am2222/mapnik-windows.git") set(GIT_REV "fdba45cd95b66576e47de2e56d30196bfc9de99d") @@ -27,7 +24,7 @@ message(STATUS "Adding worktree done") vcpkg_find_acquire_program(PYTHON2) get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) -set(ENV{PATH} "$ENV{PATH};${PYTHON2_DIR}") +vcpkg_add_to_path(${PYTHON2_DIR}) set(BOOST_ROOT ${CURRENT_INSTALLED_DIR}) @@ -38,142 +35,33 @@ elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + # Keyword FEATURES is optional if INVERTED_FEATURES are not used + CAIRO WITH_CAIRO + DEMO WITH_DEMO + INPUT_CSV WITH_INPUT_CSV + INPUT_GDAL WITH_INPUT_GDAL + INPUT_GEOBUF WITH_INPUT_GEOBUF + INPUT_GEOJSON WITH_INPUT_GEOJSON + INPUT_OGR WITH_INPUT_OGR + INPUT_PGRASTER WITH_INPUT_PGRASTER + INPUT_POSTGIS WITH_INPUT_POSTGIS + INPUT_RASTER WITH_INPUT_RASTER + INPUT_SHAPE WITH_INPUT_SHAPE + INPUT_SQLITE WITH_INPUT_SQLITE + INPUT_TOPOJSON WITH_INPUT_TOPOJSON + PROJ4 WITH_PROJ4 + UTILS WITH_UTILS -if ("WITH_CAIRO" IN_LIST FEATURES) - set(CMAKE_WITH_CAIRO ON) -else() - set(CMAKE_WITH_CAIRO OFF) -endif() - -if ("WITH_DEMO" IN_LIST FEATURES) - set(CMAKE_DEMO ON) -else() - set(CMAKE_DEMO OFF) -endif() - -if ("WITH_GRID" IN_LIST FEATURES) - set(CMAKE_GRID ON) -else() - set(CMAKE_GRID OFF) -endif() - - -if ("WITH_INPUT_CSV" IN_LIST FEATURES) - set(CMAKE_INPUT_CSV ON) -else() - set(CMAKE_INPUT_CSV OFF) -endif() - -if ("WITH_INPUT_GDAL" IN_LIST FEATURES) - set(CMAKE_INPUT_GDAL ON) -else() - set(CMAKE_INPUT_GDAL OFF) -endif() - - -if ("WITH_INPUT_GEOBUF" IN_LIST FEATURES) - set(CMAKE_GEOBUF ON) -else() - set(CMAKE_GEOBUF OFF) -endif() - - -if ("WITH_INPUT_GEOJSON" IN_LIST FEATURES) - set(CMAKE_GEOJSON ON) -else() - set(CMAKE_GEOJSON OFF) -endif() - -if ("WITH_INPUT_OGR" IN_LIST FEATURES) - set(CMAKE_OGR ON) -else() - set(CMAKE_OGR OFF) -endif() - - -if ("WITH_INPUT_PGRASTER" IN_LIST FEATURES) - set(CMAKE_PGRASTER ON) -else() - set(CMAKE_PGRASTER OFF) -endif() - - -if ("WITH_INPUT_POSTGIS" IN_LIST FEATURES) - set(CMAKE_POSTGIS ON) -else() - set(CMAKE_POSTGIS OFF) -endif() - - -if ("WITH_INPUT_RASTER" IN_LIST FEATURES) - set(CMAKE_RASTER ON) -else() - set(CMAKE_RASTER OFF) -endif() - - - -if ("WITH_INPUT_SHAPE" IN_LIST FEATURES) - set(CMAKE_SHAPE ON) -else() - set(CMAKE_SHAPE OFF) -endif() - - - -if ("WITH_INPUT_SQLITE" IN_LIST FEATURES) - set(CMAKE_SQLITE ON) -else() - set(CMAKE_SQLITE OFF) -endif() - -if ("WITH_INPUT_TOPOJSON" IN_LIST FEATURES) - set(CMAKE_TOPOJSON ON) -else() - set(CMAKE_TOPOJSON OFF) -endif() - -if ("WITH_PROJ4" IN_LIST FEATURES) - set(CMAKE_PROJ4 ON) -else() - set(CMAKE_PROJ4 OFF) -endif() - - -if ("WITH_UTILS" IN_LIST FEATURES) - set(CMAKE_UTILS ON) -else() - set(CMAKE_UTILS OFF) -endif() +) -if ("WITH_VIEWER" IN_LIST FEATURES) - set(CMAKE_VIEWER ON) -else() - set(CMAKE_VIEWER OFF) -endif() vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mapnik + SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT} # PREFER_NINJA # Disable this option if project cannot be built with Ninja # NO_CHARSET_FLAG # automatic templates - OPTIONS - -DWITH_CAIRO={$CMAKE_WITH_CAIRO} - -DWITH_DEMO={$CMAKE_DEMO} - #-DWITH_GRID={$CMAKE_} - -DWITH_INPUT_CSV={$CMAKE_CSV} - -DWITH_INPUT_GDAL={$CMAKE_GDAL} - -DWITH_INPUT_GEOBUF={$CMAKE_GEOBUF} - -DWITH_INPUT_GEOJSON={$CMAKE_GEOJSON=} - -DWITH_INPUT_OGR={$CMAKE_OGR} - -DWITH_INPUT_PGRASTER={$CMAKE_PGRASTER} - -DWITH_INPUT_POSTGIS={$CMAKE_POSTGIS} - -DWITH_INPUT_RASTER={$CMAKE_RASTER} - -DWITH_INPUT_SHAPE={$CMAKE_SHAPE} - -DWITH_INPUT_SQLITE={$CMAKE_SQLITE} - -DWITH_INPUT_TOPOJSON={$CMAKE_TOPOJSON} - -DWITH_PROJ4={$CMAKE_PROJ4} - -DWITH_UTILS={$CMAKE_UTILS} - #-DWITH_VIEWER={$CMAKE_VIEWER} + OPTIONS + ${FEATURE_OPTIONS} -DMAPNIK_STATIC_LIB=${MAPNIK_STATIC_LIB} -DBOOST_PREFIX=${CURRENT_INSTALLED_DIR}/include -DFREE_TYPE_INCLUDE=${CURRENT_INSTALLED_DIR}/include/freetype2 @@ -183,28 +71,24 @@ vcpkg_install_cmake() -file(COPY ${SOURCE_PATH}/include/mapnik DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/include/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/include) vcpkg_copy_pdbs() -file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe") -if(EXES) - file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) - file(REMOVE ${EXES}) - - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/mapnik) + +if ("UTILS" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES mapnik-demo mapnik-render shapeindex + AUTO_CLEAN + ) file(COPY ${SOURCE_PATH}/demo/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik/demo) file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) -endif() -file(GLOB DEBUG_EXES "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") -if(DEBUG_EXES) - file(REMOVE ${EXES}) -endif() + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mapnik-demo ${CURRENT_PACKAGES_DIR}/debug/bin/mapnik-render ${CURRENT_PACKAGES_DIR}/debug/bin/shapeindex) +endif() -#file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mapnik RENAME copyright) -file(INSTALL ${SOURCE_PATH}/fonts/unifont_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/mapnik RENAME fonts_copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/fonts/unifont_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME fonts_copyright) \ No newline at end of file diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f770eb6a6a87e8..f9231a8a9c6519 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1024,6 +1024,11 @@ luasocket:x64-linux=fail luasocket:x64-osx=fail lzfse:arm-uwp=fail magnum:arm64-windows=skip +mapnik:arm-uwp=fail +mapnik:x64-uwp=fail +ctp:x64-windows=skip +ctp:x64-windows-static=skip +ctp:x86-windows=skip marl:arm-uwp=fail marl:x64-uwp=fail mathgl:x64-osx=fail @@ -2032,7 +2037,4 @@ ctp:x64-osx=skip ctp:x64-uwp=skip ctp:x64-windows=skip ctp:x64-windows-static=skip -ctp:x86-windows=skip - -mapnik:arm-uwp=fail -mapnik:x64-uwp=fail \ No newline at end of file +ctp:x86-windows=skip \ No newline at end of file From 02d921a7021475de145fa85b9358edefa6a4cdb3 Mon Sep 17 00:00:00 2001 From: am2222 Date: Fri, 5 Jun 2020 02:04:39 -0400 Subject: [PATCH 0004/1694] addressed issues with the port --- scripts/ci.baseline.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f9231a8a9c6519..77c9222cd9d8a8 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1026,9 +1026,6 @@ lzfse:arm-uwp=fail magnum:arm64-windows=skip mapnik:arm-uwp=fail mapnik:x64-uwp=fail -ctp:x64-windows=skip -ctp:x64-windows-static=skip -ctp:x86-windows=skip marl:arm-uwp=fail marl:x64-uwp=fail mathgl:x64-osx=fail From 051e1e915d3a1037ffc9ad6ae22b6aa7123ac48a Mon Sep 17 00:00:00 2001 From: am2222 Date: Tue, 9 Jun 2020 18:40:18 -0400 Subject: [PATCH 0005/1694] added mapnik cmake patch --- ports/mapnik/0001-CMakeFiles.patch | 1197 ++++++++++++++++++ ports/mapnik/0001-CMakeFiles.patch.txt | 1197 ++++++++++++++++++ ports/mapnik/0002-sqlitepixelwidth.patch | 120 ++ ports/mapnik/0002-sqlitepixelwidth.patch.txt | 120 ++ ports/mapnik/CONTROL | 10 +- ports/mapnik/portfile.cmake | 52 +- 6 files changed, 2670 insertions(+), 26 deletions(-) create mode 100644 ports/mapnik/0001-CMakeFiles.patch create mode 100644 ports/mapnik/0001-CMakeFiles.patch.txt create mode 100644 ports/mapnik/0002-sqlitepixelwidth.patch create mode 100644 ports/mapnik/0002-sqlitepixelwidth.patch.txt diff --git a/ports/mapnik/0001-CMakeFiles.patch b/ports/mapnik/0001-CMakeFiles.patch new file mode 100644 index 00000000000000..4a68e6917070f7 --- /dev/null +++ b/ports/mapnik/0001-CMakeFiles.patch @@ -0,0 +1,1197 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 0000000..f07a5ce +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,306 @@ ++cmake_minimum_required(VERSION 3.13.4) ++project(mapnik) ++set(CMAKE_CXX_STANDARD 14) ++include(CMakeDependentOption) ++ ++ ++option(MAPNIK_STATIC_LIB "Build a static library" OFF) ++ ++option(WITH_DEMO "Build demo" OFF) ++option(WITH_VIEWER "Build viewer" OFF) ++ ++ ++option(WITH_INPUTS "Build input plugins" ON) ++ ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_CSV "Build the csv input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_GDAL "Build the gdal input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_GEOBUF "Build the geobuf input plugin" OFF "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_GEOJSON "Build the geojson input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_OGR "Build the ogr input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_PGRASTER "Build the pgraster input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_POSTGIS "Build the postgis input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_RASTER "Build the raster input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_SHAPE "Build the shape input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_SQLITE "Build the sqlite input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_TOPOJSON "Build the topojson input plugin" ON "WITH_INPUTS" ON) ++ ++MESSAGE(WITH_INPUT_POSTGIS ${WITH_INPUT_POSTGIS}}) ++ ++option(WITH_UTILS "Build the utilities" ON ) ++ ++option(WITH_GRID "Use the grid renderer" OFF) ++option(WITH_CAIRO "Use cairo" ON) ++option(WITH_PROJ4 "Use proj4" ON) ++ ++if(MSVC) ++ # Force to always compile with W4 ++ if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") ++ string(REGEX REPLACE "/W[0-4]" "/W1" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") ++ else() ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W1") ++ endif() ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd\"4068\" /wd\"4661\" /wd\"4503\" ") ++ add_compile_options(/MP) ++ add_compile_options(-bigobj) #added by @am2222 ++ add_compile_definitions(ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1) #added by @am2222 for proj4 compile ++ add_definitions(-DMAPNIK_THREADSAFE) ++ ++endif() ++ ++find_package(Boost REQUIRED ++ COMPONENTS filesystem system regex program_options) ++ ++find_package(FreeType REQUIRED) ++ ++find_library(HARFBUZZ_LIB harfbuzz.lib) ++find_package(ICU REQUIRED COMPONENTS uc) ++ ++find_package(PNG REQUIRED) ++find_package(jpeg REQUIRED) ++find_package(tiff REQUIRED) ++find_package(WebP REQUIRED) ++find_package(LibXml2 REQUIRED) ++find_package(ZLIB REQUIRED) ++ ++set (MAPNIK_DEFS ++ -DHAVE_PNG ++ -DHAVE_JPEG ++ -DHAVE_TIFF ++ -DHAVE_WEBP) ++ ++set(thirdparty_include_paths ${thirdparty_include_paths} ++ ${JPEG_INCLUDE_DIR} ${WEBP_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}) ++ ++set(thirdparty_libraries ${thirdparty_libraries} ++ ${JPEG_LIBRARIES} ${WEBP_LIBRARIES} ${LIBXML2_LIBRARIES} ${HARFBUZZ_LIB}) ++ ++# AGG ++ ++include(files.cmake) ++ ++if (WITH_CAIRO) ++ find_library(CAIRO_LIB_DEBUG cairod) ++ find_library(CAIRO_LIB_RELEASE cairo) ++ find_library(CAIRO_GOBJECT_LIB_DEBUG cairo-gobjectd) ++ find_library(CAIRO_GOBJECT_LIB_RELEASE cairo-gobject) ++ find_path(CAIRO_INCLUDE_DIR cairo/cairo.h) ++ ++ set(thirdparty_include_paths ${thirdparty_include_paths} ${CAIRO_INCLUDE_DIR}) ++ set(thirdparty_libraries ${thirdparty_libraries} $<$:${CAIRO_LIB_DEBUG}> $<$:${CAIRO_LIB_RELEASE}>) ++ ++ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} ++ src/cairo/process_markers_symbolizer.cpp ++ src/cairo/process_group_symbolizer.cpp ++ ++ src/cairo/cairo_context.cpp ++ src/cairo/cairo_render_vector.cpp ++ src/cairo/cairo_renderer.cpp ++ src/cairo/process_building_symbolizer.cpp ++ src/cairo/process_debug_symbolizer.cpp ++ src/cairo/process_line_pattern_symbolizer.cpp ++ src/cairo/process_line_symbolizer.cpp ++ src/cairo/process_point_symbolizer.cpp ++ src/cairo/process_polygon_pattern_symbolizer.cpp ++ src/cairo/process_polygon_symbolizer.cpp ++ src/cairo/process_raster_symbolizer.cpp ++ src/cairo/process_text_symbolizer.cpp) ++ ++ set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_CAIRO) ++endif() ++message(STATUS "Cairo renderer " ${WITH_CAIRO}) ++ ++if (WITH_PROJ4) ++ find_package(PROJ4 REQUIRED) ++ set(thirdparty_include_paths ${thirdparty_include_paths} ${PROJ4_INCLUDE_DIRS}) ++ set(thirdparty_libraries ${thirdparty_libraries} ${PROJ4_LIBRARIES}) ++ ++ set(MAPNIK_DEFS ${MAPNIK_DEFS} -DMAPNIK_USE_PROJ4) ++endif() ++ ++if (WITH_GRID) ++ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} ++ src/grid/grid.cpp ++ src/grid/grid_renderer.cpp ++ src/grid/process_building_symbolizer.cpp ++ src/grid/process_line_pattern_symbolizer.cpp ++ src/grid/process_line_symbolizer.cpp ++ src/grid/process_point_symbolizer.cpp ++ src/grid/process_polygon_pattern_symbolizer.cpp ++ src/grid/process_polygon_symbolizer.cpp ++ src/grid/process_raster_symbolizer.cpp ++ src/grid/process_shield_symbolizer.cpp ++ src/grid/process_text_symbolizer.cpp) ++ set(MAPNIK_DEFS ${MAPNIK_DEFS} -DGRID_RENDERER) ++ENDIF() ++message(STATUS "Grid renderer: " ${WITH_GRID}) ++ ++set(MAPNIK_SOURCES ${MAPNIK_SOURCES} ++ src/svg/output/svg_output_grammars.cpp ++ src/svg/output/svg_renderer.cpp ++ src/svg/output/svg_generator.cpp ++ src/svg/output/svg_output_attributes.cpp ++ src/svg/output/process_symbolizers.cpp ++ src/svg/output/process_line_symbolizer.cpp ++ src/svg/output/process_polygon_symbolizer.cpp) ++set(MAPNIK_DEFS ${MAPNIK_DEFS} -DSVG_RENDERER) ++ ++ ++set(MAPNIK_SOURCES ${MAPNIK_SOURCES} ++ src/jpeg_reader.cpp ++ src/libxml2_loader.cpp ++ src/png_reader.cpp ++ src/tiff_reader.cpp ++ src/webp_reader.cpp ++ ) ++ ++#set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/rapidxml_loader.cpp) ++ ++set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2 -DBOOST_REGEX_HAS_ICU) ++ ++set(mapnik_include_paths ++ include ++ deps ++ deps/agg/include ++ deps/mapbox/geometry/include ++ deps/mapbox/polylabel/include ++ deps/mapbox/variant/include) ++ ++ ++ ++include_directories(${mapnik_include_paths} ${thirdparty_include_paths}) ++ ++if (MAPNIK_STATIC_LIB) ++ message(STATUS "Building static library") ++ add_library(mapnik STATIC ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) ++ target_compile_definitions(mapnik PUBLIC -DMAPNIK_STATICLIB) ++ set(MAPNIK_LIB_DEFINITION -DMAPNIK_STATICLIB) ++else () ++ message(STATUS "Building shared library") ++ add_library(mapnik SHARED ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) ++ target_compile_definitions(mapnik PRIVATE -DMAPNIK_EXPORTS) ++ set(MAPNIK_LIB_DEFINITION ) ++endif () ++ ++target_compile_definitions(mapnik PUBLIC ${MAPNIK_DEFS}) ++ ++target_include_directories(mapnik INTERFACE ${mapnik_include_paths} ${thirdparty_include_paths} ) ++target_link_libraries(mapnik PUBLIC ++ ${thirdparty_libraries} ++ Boost::boost Boost::filesystem Boost::system Boost::regex Boost::program_options Boost::system ++ Freetype::Freetype ++ ICU::uc ++ PNG::PNG ++ TIFF::TIFF ++ ZLIB::ZLIB) ++ ++install(TARGETS mapnik ++ LIBRARY DESTINATION lib) ++ ++install(DIRECTORY include/ DESTINATION include/ CONFIGURATIONS Release) ++ ++add_subdirectory(src/json) ++add_subdirectory(src/wkt) ++ ++# ideally we should also generate mapnik-config ++ ++if (WITH_INPUT_CSV) ++ add_subdirectory(plugins/input/csv) ++endif() ++ ++if (WITH_INPUT_GDAL) ++ find_package(GDAL REQUIRED) ++ add_subdirectory(plugins/input/gdal) ++endif() ++ ++if (WITH_INPUT_GEOBUF) ++ # TODO insert protozero here ++ add_subdirectory(plugins/input/geobuf) ++endif() ++ ++if (WITH_INPUT_GEOJSON) ++ add_subdirectory(plugins/input/geojson) ++endif() ++ ++if (WITH_INPUT_OGR) ++ add_subdirectory(plugins/input/ogr) ++endif() ++ ++if (WITH_INPUT_PGRASTER) ++ find_package(PostgreSQL REQUIRED) ++ add_subdirectory(plugins/input/pgraster) ++endif() ++ ++if (WITH_INPUT_POSTGIS) ++ find_package(PostgreSQL REQUIRED) ++ add_subdirectory(plugins/input/postgis) ++endif() ++ ++if (WITH_INPUT_RASTER) ++ add_subdirectory(plugins/input/raster) ++endif() ++ ++if (WITH_INPUT_SHAPE) ++ add_subdirectory(plugins/input/shape) ++endif() ++ ++if (WITH_INPUT_SQLITE) ++ find_package(sqlite3 REQUIRED) ++ add_subdirectory(plugins/input/sqlite) ++endif() ++ ++if (WITH_INPUT_TOPOJSON) ++ add_subdirectory(plugins/input/topojson) ++endif() ++ ++if (WITH_INPUTS) ++ message(STATUS "Input plugins:") ++ if(WITH_INPUT_CSV ) ++ message(STATUS " - csv ") ++ endif() ++ if(WITH_INPUT_GDAL ) ++ message(STATUS " - gdal ") ++ endif() ++ if(WITH_INPUT_GEOBUF ) ++ message(STATUS " - geobuf ") ++ endif() ++ if(WITH_INPUT_GEOJSON ) ++ message(STATUS " - geojson ") ++ endif() ++ if(WITH_INPUT_OGR ) ++ message(STATUS " - ogr ") ++ endif() ++ if(WITH_INPUT_PGRASTER ) ++ message(STATUS " - pgraster") ++ endif() ++ if(WITH_INPUT_POSTGIS ) ++ message(STATUS " - postgis ") ++ endif() ++ if(WITH_INPUT_RASTER ) ++ message(STATUS " - raster ") ++ endif() ++ if(WITH_INPUT_SHAPE ) ++ message(STATUS " - shape ") ++ endif() ++ if(WITH_INPUT_SQLITE ) ++ message(STATUS " - sqlite ") ++ endif() ++ if(WITH_INPUT_TOPOJSON ) ++ message(STATUS " - topojson") ++ endif() ++else() ++ message(STATUS "Input plugins OFF") ++endif() ++ ++if(WITH_DEMO) ++ add_subdirectory(demo/c++) ++endif() ++ ++if(WITH_VIEWER) ++ find_package(Qt5 COMPONENTS Widgets REQUIRED) ++ add_subdirectory(demo/viewer) ++endif() ++ ++if(WITH_UTILS) ++ add_subdirectory(utils/mapnik-render) ++ add_subdirectory(utils/shapeindex) ++endif() +diff --git a/demo/c++/CMakeLists.txt b/demo/c++/CMakeLists.txt +new file mode 100644 +index 0000000..a0a48b8 +--- /dev/null ++++ b/demo/c++/CMakeLists.txt +@@ -0,0 +1,4 @@ ++add_executable(mapnik-demo rundemo.cpp) ++add_dependencies(mapnik-demo mapnik) ++target_link_libraries(mapnik-demo PRIVATE mapnik) ++install(TARGETS mapnik-demo DESTINATION bin) +diff --git a/demo/viewer/CMakeLists.txt b/demo/viewer/CMakeLists.txt +new file mode 100644 +index 0000000..86034a0 +--- /dev/null ++++ b/demo/viewer/CMakeLists.txt +@@ -0,0 +1,27 @@ ++add_executable(mapnik-viewer ++ about_dialog.cpp ++ info_dialog.cpp ++ layerdelegate.cpp ++ layerlistmodel.cpp ++ layerwidget.cpp ++ layer_info_dialog.cpp ++ main.cpp ++ mainwindow.cpp ++ mapwidget.cpp ++ styles_model.cpp ++ ++ forms/about.ui ++ forms/info.ui ++ forms/layer_info.ui ++ ++ mapnik_viewer.qrc) ++ ++set_target_properties(mapnik-viewer PROPERTIES ++ AUTOUIC_SEARCH_PATHS forms ++ AUTORCC ON ++ AUTOUIC ON ++ AUTOMOC ON) ++ ++add_dependencies(mapnik-viewer mapnik) ++target_link_libraries(mapnik-viewer PRIVATE mapnik Qt5::Widgets) ++install(TARGETS mapnik-viewer DESTINATION bin) +diff --git a/files.cmake b/files.cmake +new file mode 100644 +index 0000000..b9d767f +--- /dev/null ++++ b/files.cmake +@@ -0,0 +1,557 @@ ++set (MAPNIK_SOURCES ++ src/cairo_io.cpp ++ src/color.cpp ++ src/color_factory.cpp ++ src/config_error.cpp ++ src/conversions.cpp ++ src/css_color_grammar.cpp ++ src/dasharray_parser.cpp ++ src/datasource_cache.cpp ++ src/datasource_cache_static.cpp ++ src/debug.cpp ++ src/box2d.cpp ++ src/expression.cpp ++ src/expression_grammar.cpp ++ src/expression_node.cpp ++ src/expression_string.cpp ++ src/feature_kv_iterator.cpp ++ src/feature_style_processor.cpp ++ src/feature_type_style.cpp ++ src/font_engine_freetype.cpp ++ src/font_set.cpp ++ src/fs.cpp ++ src/function_call.cpp ++ src/geometry/interior.cpp ++ src/geometry_envelope.cpp ++ src/geometry_reprojection.cpp ++ src/gradient.cpp ++ src/group/group_layout_manager.cpp ++ src/group/group_rule.cpp ++ src/group/group_symbolizer_helper.cpp ++ src/image.cpp ++ src/image_any.cpp ++ src/image_compositing.cpp ++ src/image_copy.cpp ++ src/image_filter_grammar.cpp ++ src/image_filter_types.cpp ++ src/image_options.cpp ++ src/image_reader.cpp ++ src/image_scaling.cpp ++ src/image_util.cpp ++ src/image_util_jpeg.cpp ++ src/image_util_png.cpp ++ src/image_util_tiff.cpp ++ src/image_util_webp.cpp ++ src/image_view.cpp ++ src/image_view_any.cpp ++ src/layer.cpp ++ src/load_map.cpp ++ src/map.cpp ++ src/math.cpp ++ src/mapped_memory_cache.cpp ++ src/marker_cache.cpp ++ src/marker_helpers.cpp ++ src/memory_datasource.cpp ++ src/palette.cpp ++ src/params.cpp ++ src/parse_path.cpp ++ src/parse_transform.cpp ++ src/plugin.cpp ++ src/proj_transform.cpp ++ src/projection.cpp ++ src/raster_colorizer.cpp ++ src/renderer_common.cpp ++ src/renderer_common/pattern_alignment.cpp ++ src/renderer_common/render_group_symbolizer.cpp ++ src/renderer_common/render_markers_symbolizer.cpp ++ src/renderer_common/render_pattern.cpp ++ src/renderer_common/render_thunk_extractor.cpp ++ src/request.cpp ++ src/rule.cpp ++ src/save_map.cpp ++ src/scale_denominator.cpp ++ src/simplify.cpp ++ src/svg/svg_parser.cpp ++ src/svg/svg_path_parser.cpp ++ src/svg/svg_points_parser.cpp ++ src/svg/svg_transform_parser.cpp ++ src/symbolizer.cpp ++ src/symbolizer_enumerations.cpp ++ src/symbolizer_keys.cpp ++ src/text/face.cpp ++ src/text/font_feature_settings.cpp ++ src/text/font_library.cpp ++ src/text/formatting/base.cpp ++ src/text/formatting/format.cpp ++ src/text/formatting/layout.cpp ++ src/text/formatting/list.cpp ++ src/text/formatting/registry.cpp ++ src/text/formatting/text.cpp ++ src/text/glyph_positions.cpp ++ src/text/itemizer.cpp ++ src/text/placement_finder.cpp ++ src/text/placements/base.cpp ++ src/text/placements/dummy.cpp ++ src/text/placements/list.cpp ++ src/text/placements/registry.cpp ++ src/text/placements/simple.cpp ++ src/text/properties_util.cpp ++ src/text/renderer.cpp ++ src/text/scrptrun.cpp ++ src/text/symbolizer_helpers.cpp ++ src/text/text_layout.cpp ++ src/text/text_line.cpp ++ src/text/text_properties.cpp ++ src/transform_expression.cpp ++ src/transform_expression_grammar.cpp ++ src/twkb.cpp ++ src/unicode.cpp ++ src/util/utf_conv_win.cpp ++ src/value.cpp ++ src/vertex_adapters.cpp ++ src/vertex_cache.cpp ++ src/warp.cpp ++ src/well_known_srs.cpp ++ src/wkb.cpp ++ src/xml_tree.cpp ++ ) ++ ++ ++set(MAPNIK_AGG_SOURCES ++ src/agg/agg_renderer.cpp ++ src/agg/process_building_symbolizer.cpp ++ src/agg/process_debug_symbolizer.cpp ++ src/agg/process_dot_symbolizer.cpp ++ src/agg/process_group_symbolizer.cpp ++ src/agg/process_line_pattern_symbolizer.cpp ++ src/agg/process_line_symbolizer.cpp ++ src/agg/process_markers_symbolizer.cpp ++ src/agg/process_point_symbolizer.cpp ++ src/agg/process_polygon_pattern_symbolizer.cpp ++ src/agg/process_polygon_symbolizer.cpp ++ src/agg/process_raster_symbolizer.cpp ++ src/agg/process_shield_symbolizer.cpp ++ src/agg/process_text_symbolizer.cpp) ++ ++ ++set(AGG_SOURCES ++ deps/agg/src/agg_arc.cpp ++ deps/agg/src/agg_arrowhead.cpp ++ deps/agg/src/agg_bezier_arc.cpp ++ deps/agg/src/agg_bspline.cpp ++ deps/agg/src/agg_curves.cpp ++ deps/agg/src/agg_embedded_raster_fonts.cpp ++ deps/agg/src/agg_gsv_text.cpp ++ deps/agg/src/agg_image_filters.cpp ++ deps/agg/src/agg_line_aa_basics.cpp ++ deps/agg/src/agg_line_profile_aa.cpp ++ deps/agg/src/agg_pixfmt_rgba.cpp ++ deps/agg/src/agg_rounded_rect.cpp ++ deps/agg/src/agg_sqrt_tables.cpp ++ deps/agg/src/agg_trans_affine.cpp ++ deps/agg/src/agg_trans_double_path.cpp ++ deps/agg/src/agg_trans_single_path.cpp ++ deps/agg/src/agg_trans_warp_magnifier.cpp ++ deps/agg/src/agg_vcgen_bspline.cpp ++ deps/agg/src/agg_vcgen_contour.cpp ++ deps/agg/src/agg_vcgen_dash.cpp ++ deps/agg/src/agg_vcgen_markers_term.cpp ++ deps/agg/src/agg_vcgen_stroke.cpp ++ deps/agg/src/agg_vcgen_smooth_poly1.cpp ++ deps/agg/src/agg_vpgen_clip_polygon.cpp ++ deps/agg/src/agg_vpgen_clip_polyline.cpp ++ deps/agg/src/agg_vpgen_segmentator.cpp ) ++ ++set(MAPNIK_INC ++ mapnik/adaptive_smooth.hpp ++ mapnik/agg_helpers.hpp ++ mapnik/agg_pattern_source.hpp ++ mapnik/agg_rasterizer.hpp ++ mapnik/agg_renderer.hpp ++ mapnik/agg_render_marker.hpp ++ mapnik/attribute.hpp ++ mapnik/attribute_collector.hpp ++ mapnik/attribute_descriptor.hpp ++ mapnik/boolean.hpp ++ mapnik/boost_spirit_instantiate.hpp ++ mapnik/cairo_io.hpp ++ mapnik/color.hpp ++ mapnik/color_factory.hpp ++ mapnik/config.hpp ++ mapnik/config_error.hpp ++ mapnik/coord.hpp ++ mapnik/css_color_grammar.hpp ++ mapnik/css_color_grammar_impl.hpp ++ mapnik/cxx11_support.hpp ++ mapnik/datasource.hpp ++ mapnik/datasource_cache.hpp ++ mapnik/datasource_geometry_type.hpp ++ mapnik/debug.hpp ++ mapnik/enumeration.hpp ++ mapnik/evaluate_global_attributes.hpp ++ mapnik/expression.hpp ++ mapnik/expression_evaluator.hpp ++ mapnik/expression_grammar.hpp ++ mapnik/expression_grammar_config.hpp ++ mapnik/expression_grammar_def.hpp ++ mapnik/expression_node.hpp ++ mapnik/expression_node_types.hpp ++ mapnik/expression_string.hpp ++ mapnik/extend_converter.hpp ++ mapnik/factory.hpp ++ mapnik/feature.hpp ++ mapnik/featureset.hpp ++ mapnik/feature_factory.hpp ++ mapnik/feature_kv_iterator.hpp ++ mapnik/feature_layer_desc.hpp ++ mapnik/feature_style_processor.hpp ++ mapnik/feature_style_processor_context.hpp ++ mapnik/feature_style_processor_impl.hpp ++ mapnik/feature_type_style.hpp ++ mapnik/filter_featureset.hpp ++ mapnik/font_engine_freetype.hpp ++ mapnik/font_set.hpp ++ mapnik/function_call.hpp ++ mapnik/geometry.hpp ++ mapnik/geom_util.hpp ++ mapnik/global.hpp ++ mapnik/gradient.hpp ++ mapnik/grid_vertex_converter.hpp ++ mapnik/hextree.hpp ++ mapnik/hit_test_filter.hpp ++ mapnik/image.hpp ++ mapnik/image_any.hpp ++ mapnik/image_compositing.hpp ++ mapnik/image_copy.hpp ++ mapnik/image_filter.hpp ++ mapnik/image_filter_grammar.hpp ++ mapnik/image_filter_grammar_def.hpp ++ mapnik/image_filter_types.hpp ++ mapnik/image_impl.hpp ++ mapnik/image_null.hpp ++ mapnik/image_options.hpp ++ mapnik/image_reader.hpp ++ mapnik/image_scaling.hpp ++ mapnik/image_scaling_traits.hpp ++ mapnik/image_util.hpp ++ mapnik/image_util_jpeg.hpp ++ mapnik/image_util_png.hpp ++ mapnik/image_util_tiff.hpp ++ mapnik/image_util_webp.hpp ++ mapnik/image_view.hpp ++ mapnik/image_view_any.hpp ++ mapnik/image_view_impl.hpp ++ mapnik/image_view_null.hpp ++ mapnik/init_priority.hpp ++ mapnik/jpeg_io.hpp ++ mapnik/label_collision_detector.hpp ++ mapnik/layer.hpp ++ mapnik/load_map.hpp ++ mapnik/make_unique.hpp ++ mapnik/map.hpp ++ mapnik/mapped_memory_cache.hpp ++ mapnik/marker.hpp ++ mapnik/markers_placement.hpp ++ mapnik/marker_cache.hpp ++ mapnik/marker_helpers.hpp ++ mapnik/memory_datasource.hpp ++ mapnik/memory_featureset.hpp ++ mapnik/octree.hpp ++ mapnik/offset_converter.hpp ++ mapnik/palette.hpp ++ mapnik/params.hpp ++ mapnik/params_impl.hpp ++ mapnik/parse_path.hpp ++ mapnik/path.hpp ++ mapnik/path_expression.hpp ++ mapnik/path_expression_grammar.hpp ++ mapnik/path_expression_grammar_def.hpp ++ mapnik/pixel_position.hpp ++ mapnik/pixel_types.hpp ++ mapnik/plugin.hpp ++ mapnik/png_io.hpp ++ mapnik/pool.hpp ++ mapnik/projection.hpp ++ mapnik/proj_strategy.hpp ++ mapnik/proj_transform.hpp ++ mapnik/ptree_helpers.hpp ++ mapnik/quad_tree.hpp ++ mapnik/query.hpp ++ mapnik/raster.hpp ++ mapnik/raster_colorizer.hpp ++ mapnik/renderer_common.hpp ++ mapnik/request.hpp ++ mapnik/rule.hpp ++ mapnik/rule_cache.hpp ++ mapnik/safe_cast.hpp ++ mapnik/save_map.hpp ++ mapnik/scale_denominator.hpp ++ mapnik/simplify.hpp ++ mapnik/simplify_converter.hpp ++ mapnik/span_image_filter.hpp ++ mapnik/sql_utils.hpp ++ mapnik/sse.hpp ++ mapnik/stringify_macro.hpp ++ mapnik/symbolizer.hpp ++ mapnik/symbolizer_base.hpp ++ mapnik/symbolizer_default_values.hpp ++ mapnik/symbolizer_dispatch.hpp ++ mapnik/symbolizer_enumerations.hpp ++ mapnik/symbolizer_hash.hpp ++ mapnik/symbolizer_keys.hpp ++ mapnik/symbolizer_utils.hpp ++ mapnik/tiff_io.hpp ++ mapnik/timer.hpp ++ mapnik/tolerance_iterator.hpp ++ mapnik/transform_path_adapter.hpp ++ mapnik/unicode.hpp ++ mapnik/value.hpp ++ mapnik/version.hpp ++ mapnik/vertex.hpp ++ mapnik/vertex_adapters.hpp ++ mapnik/vertex_cache.hpp ++ mapnik/vertex_converters.hpp ++ mapnik/vertex_processor.hpp ++ mapnik/vertex_vector.hpp ++ mapnik/view_strategy.hpp ++ mapnik/view_transform.hpp ++ mapnik/warning_ignore.hpp ++ mapnik/warning_ignore_agg.hpp ++ mapnik/warp.hpp ++ mapnik/webp_io.hpp ++ mapnik/well_known_srs.hpp ++ mapnik/wkb.hpp ++ mapnik/xml_attribute_cast.hpp ++ mapnik/xml_loader.hpp ++ mapnik/xml_node.hpp ++ mapnik/xml_tree.hpp ++ mapnik/geometry/boost_adapters.hpp ++ mapnik/geometry/boost_spirit_karma_adapter.hpp ++ mapnik/geometry/box2d.hpp ++ mapnik/geometry/box2d_impl.hpp ++ mapnik/geometry/centroid.hpp ++ mapnik/geometry/closest_point.hpp ++ mapnik/geometry/correct.hpp ++ mapnik/geometry/envelope.hpp ++ mapnik/geometry/envelope_impl.hpp ++ mapnik/geometry/fusion_adapted.hpp ++ mapnik/geometry/geometry_type.hpp ++ mapnik/geometry/geometry_types.hpp ++ mapnik/geometry/interior.hpp ++ mapnik/geometry/is_empty.hpp ++ mapnik/geometry/is_simple.hpp ++ mapnik/geometry/is_valid.hpp ++ mapnik/geometry/line_string.hpp ++ mapnik/geometry/multi_line_string.hpp ++ mapnik/geometry/multi_point.hpp ++ mapnik/geometry/multi_polygon.hpp ++ mapnik/geometry/point.hpp ++ mapnik/geometry/polygon.hpp ++ mapnik/geometry/polygon_vertex_processor.hpp ++ mapnik/geometry/polylabel.hpp ++ mapnik/geometry/remove_empty.hpp ++ mapnik/geometry/reprojection.hpp ++ mapnik/geometry/reprojection_impl.hpp ++ mapnik/geometry/strategy.hpp ++ mapnik/geometry/to_path.hpp ++ mapnik/geometry/transform.hpp ++ mapnik/csv/csv_grammar_x3.hpp ++ mapnik/csv/csv_grammar_x3_def.hpp ++ mapnik/csv/csv_types.hpp ++ mapnik/svg/geometry_svg_generator.hpp ++ mapnik/svg/geometry_svg_generator_impl.hpp ++ mapnik/svg/svg_converter.hpp ++ mapnik/svg/svg_grammar_config_x3.hpp ++ mapnik/svg/svg_parser.hpp ++ mapnik/svg/svg_parser_exception.hpp ++ mapnik/svg/svg_path_adapter.hpp ++ mapnik/svg/svg_path_attributes.hpp ++ mapnik/svg/svg_path_commands.hpp ++ mapnik/svg/svg_path_grammar_x3.hpp ++ mapnik/svg/svg_path_grammar_x3_def.hpp ++ mapnik/svg/svg_path_parser.hpp ++ mapnik/svg/svg_renderer_agg.hpp ++ mapnik/svg/svg_storage.hpp ++ mapnik/svg/svg_transform_grammar_x3.hpp ++ mapnik/svg/svg_transform_grammar_x3_def.hpp ++ mapnik/wkt/wkt_factory.hpp ++ mapnik/wkt/wkt_generator_grammar.hpp ++ mapnik/wkt/wkt_generator_grammar_impl.hpp ++ mapnik/wkt/wkt_grammar_x3.hpp ++ mapnik/wkt/wkt_grammar_x3_def.hpp ++ mapnik/cairo/cairo_context.hpp ++ mapnik/cairo/cairo_image_util.hpp ++ mapnik/cairo/cairo_renderer.hpp ++ mapnik/cairo/cairo_render_vector.hpp ++ mapnik/cairo/render_polygon_pattern.hpp ++ mapnik/grid/grid.hpp ++ mapnik/grid/grid_pixel.hpp ++ mapnik/grid/grid_pixfmt.hpp ++ mapnik/grid/grid_rasterizer.hpp ++ mapnik/grid/grid_renderer.hpp ++ mapnik/grid/grid_renderer_base.hpp ++ mapnik/grid/grid_rendering_buffer.hpp ++ mapnik/grid/grid_render_marker.hpp ++ mapnik/grid/grid_view.hpp ++ mapnik/json/attribute_value_visitor.hpp ++ mapnik/json/create_feature.hpp ++ mapnik/json/create_geometry.hpp ++ mapnik/json/extract_bounding_boxes.hpp ++ mapnik/json/extract_bounding_boxes_config.hpp ++ mapnik/json/feature_generator_grammar.hpp ++ mapnik/json/feature_generator_grammar_impl.hpp ++ mapnik/json/feature_grammar_x3.hpp ++ mapnik/json/feature_grammar_x3_def.hpp ++ mapnik/json/feature_parser.hpp ++ mapnik/json/generic_json_grammar_x3.hpp ++ mapnik/json/generic_json_grammar_x3_def.hpp ++ mapnik/json/geojson_grammar_x3.hpp ++ mapnik/json/geojson_grammar_x3_def.hpp ++ mapnik/json/geometry_generator_grammar.hpp ++ mapnik/json/geometry_generator_grammar_impl.hpp ++ mapnik/json/geometry_parser.hpp ++ mapnik/json/json_grammar_config.hpp ++ mapnik/json/json_value.hpp ++ mapnik/json/parse_feature.hpp ++ mapnik/json/positions_grammar_x3.hpp ++ mapnik/json/positions_grammar_x3_def.hpp ++ mapnik/json/positions_x3.hpp ++ mapnik/json/properties_generator_grammar.hpp ++ mapnik/json/properties_generator_grammar_impl.hpp ++ mapnik/json/stringifier.hpp ++ mapnik/json/topojson_grammar_x3.hpp ++ mapnik/json/topojson_grammar_x3_def.hpp ++ mapnik/json/topojson_utils.hpp ++ mapnik/json/topology.hpp ++ mapnik/json/unicode_string_grammar_x3.hpp ++ mapnik/json/unicode_string_grammar_x3_def.hpp ++ mapnik/json/value_converters.hpp ++ mapnik/util/char_array_buffer.hpp ++ mapnik/util/const_rendering_buffer.hpp ++ mapnik/util/container_adapter.hpp ++ mapnik/util/conversions.hpp ++ mapnik/util/dasharray_parser.hpp ++ mapnik/util/featureset_buffer.hpp ++ mapnik/util/feature_to_geojson.hpp ++ mapnik/util/file_io.hpp ++ mapnik/util/fs.hpp ++ mapnik/util/geometry_to_ds_type.hpp ++ mapnik/util/geometry_to_geojson.hpp ++ mapnik/util/geometry_to_svg.hpp ++ mapnik/util/geometry_to_wkb.hpp ++ mapnik/util/geometry_to_wkt.hpp ++ mapnik/util/hsl.hpp ++ mapnik/util/is_clockwise.hpp ++ mapnik/util/math.hpp ++ mapnik/util/name_to_int.hpp ++ mapnik/util/noncopyable.hpp ++ mapnik/util/path_iterator.hpp ++ mapnik/util/rounding_cast.hpp ++ mapnik/util/singleton.hpp ++ mapnik/util/spatial_index.hpp ++ mapnik/util/spirit_transform_attribute.hpp ++ mapnik/util/timer.hpp ++ mapnik/util/trim.hpp ++ mapnik/util/utf_conv_win.hpp ++ mapnik/util/variant.hpp ++ mapnik/util/variant_io.hpp ++ mapnik/group/group_layout.hpp ++ mapnik/group/group_layout_manager.hpp ++ mapnik/group/group_rule.hpp ++ mapnik/group/group_symbolizer_helper.hpp ++ mapnik/group/group_symbolizer_properties.hpp ++ mapnik/text/color_font_renderer.hpp ++ mapnik/text/evaluated_format_properties_ptr.hpp ++ mapnik/text/face.hpp ++ mapnik/text/font_feature_settings.hpp ++ mapnik/text/font_library.hpp ++ mapnik/text/glyph_info.hpp ++ mapnik/text/glyph_positions.hpp ++ mapnik/text/harfbuzz_shaper.hpp ++ mapnik/text/icu_shaper.hpp ++ mapnik/text/itemizer.hpp ++ mapnik/text/placement_finder.hpp ++ mapnik/text/placement_finder_impl.hpp ++ mapnik/text/properties_util.hpp ++ mapnik/text/renderer.hpp ++ mapnik/text/rotation.hpp ++ mapnik/text/scrptrun.hpp ++ mapnik/text/symbolizer_helpers.hpp ++ mapnik/text/text_layout.hpp ++ mapnik/text/text_line.hpp ++ mapnik/text/text_properties.hpp ++ mapnik/text/placements/base.hpp ++ mapnik/text/placements/dummy.hpp ++ mapnik/text/placements/list.hpp ++ mapnik/text/placements/registry.hpp ++ mapnik/text/placements/simple.hpp ++ mapnik/text/formatting/base.hpp ++ mapnik/text/formatting/format.hpp ++ mapnik/text/formatting/layout.hpp ++ mapnik/text/formatting/list.hpp ++ mapnik/text/formatting/registry.hpp ++ mapnik/text/formatting/text.hpp ++ mapnik/transform/parse_transform.hpp ++ mapnik/transform/transform_expression.hpp ++ mapnik/transform/transform_expression_grammar_x3.hpp ++ mapnik/transform/transform_expression_grammar_x3_def.hpp ++ mapnik/transform/transform_processor.hpp ++ mapnik/markers_placements/basic.hpp ++ mapnik/markers_placements/interior.hpp ++ mapnik/markers_placements/line.hpp ++ mapnik/markers_placements/point.hpp ++ mapnik/markers_placements/polylabel.hpp ++ mapnik/markers_placements/vertex_first.hpp ++ mapnik/markers_placements/vertex_last.hpp ++ mapnik/geometry/boost_adapters.hpp ++ mapnik/geometry/boost_spirit_karma_adapter.hpp ++ mapnik/geometry/box2d.hpp ++ mapnik/geometry/box2d_impl.hpp ++ mapnik/geometry/centroid.hpp ++ mapnik/geometry/closest_point.hpp ++ mapnik/geometry/correct.hpp ++ mapnik/geometry/envelope.hpp ++ mapnik/geometry/envelope_impl.hpp ++ mapnik/geometry/fusion_adapted.hpp ++ mapnik/geometry/geometry_type.hpp ++ mapnik/geometry/geometry_types.hpp ++ mapnik/geometry/interior.hpp ++ mapnik/geometry/is_empty.hpp ++ mapnik/geometry/is_simple.hpp ++ mapnik/geometry/is_valid.hpp ++ mapnik/geometry/line_string.hpp ++ mapnik/geometry/multi_line_string.hpp ++ mapnik/geometry/multi_point.hpp ++ mapnik/geometry/multi_polygon.hpp ++ mapnik/geometry/point.hpp ++ mapnik/geometry/polygon.hpp ++ mapnik/geometry/polygon_vertex_processor.hpp ++ mapnik/geometry/polylabel.hpp ++ mapnik/geometry/remove_empty.hpp ++ mapnik/geometry/reprojection.hpp ++ mapnik/geometry/reprojection_impl.hpp ++ mapnik/geometry/strategy.hpp ++ mapnik/geometry/to_path.hpp ++ mapnik/geometry/transform.hpp ++ mapnik/value/error.hpp ++ mapnik/value/hash.hpp ++ mapnik/value/types.hpp) ++ ++set(MAPNIK_INC ${MAPNIK_INC} ++ mapnik/svg/output/svg_generator.hpp ++ mapnik/svg/output/svg_output_attributes.hpp ++ mapnik/svg/output/svg_output_grammars.hpp ++ mapnik/svg/output/svg_output_grammars_impl.hpp ++ mapnik/svg/output/svg_path_iterator.hpp ++ mapnik/svg/output/svg_renderer.hpp) ++ ++set(MAPNIK_INC ${MAPNIK_INC} ++ mapnik/grid/grid.hpp ++ mapnik/grid/grid_pixel.hpp ++ mapnik/grid/grid_pixfmt.hpp ++ mapnik/grid/grid_rasterizer.hpp ++ mapnik/grid/grid_renderer.hpp ++ mapnik/grid/grid_renderer_base.hpp ++ mapnik/grid/grid_rendering_buffer.hpp ++ mapnik/grid/grid_render_marker.hpp ++ mapnik/grid/grid_view.hpp) +\ No newline at end of file +diff --git a/include/mapnik/config.hpp b/include/mapnik/config.hpp +index a9168e5..9bdcad4 100644 +--- a/include/mapnik/config.hpp ++++ b/include/mapnik/config.hpp +@@ -30,8 +30,10 @@ + # define MAPNIK_IMP __declspec (dllimport) + # ifdef MAPNIK_EXPORTS + # define MAPNIK_DECL __declspec (dllexport) +-# else ++# elif !defined(MAPNIK_STATICLIB) + # define MAPNIK_DECL __declspec (dllimport) ++# else ++# define MAPNIK_DECL + # endif + # pragma warning( disable: 4251 ) + # pragma warning( disable: 4275 ) +diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp +index aae2bf3..6484dd3 100644 +--- a/include/mapnik/geometry.hpp ++++ b/include/mapnik/geometry.hpp +@@ -146,7 +146,7 @@ struct geometry : geometry_base + { + using coord_type = T; + +-#if __cpp_inheriting_constructors >= 200802 ++#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) + + using geometry_base::geometry_base; + +diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp +index 65c04c4..6c04609 100644 +--- a/include/mapnik/json/generic_json.hpp ++++ b/include/mapnik/json/generic_json.hpp +@@ -57,7 +57,7 @@ using json_value_base = mapnik::util::variant >; + struct json_value : json_value_base + { +-#if __cpp_inheriting_constructors >= 200802 ++#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) + + using json_value_base::json_value_base; + +diff --git a/plugins/input/csv/CMakeLists.txt b/plugins/input/csv/CMakeLists.txt +new file mode 100644 +index 0000000..34a2e75 +--- /dev/null ++++ b/plugins/input/csv/CMakeLists.txt +@@ -0,0 +1,12 @@ ++add_library(mapnik-input-csv SHARED ++ csv_datasource.cpp ++ csv_featureset.cpp ++ csv_index_featureset.cpp ++ csv_inline_featureset.cpp ++ csv_utils.cpp) ++ ++target_link_libraries(mapnik-input-csv PUBLIC mapnik mapnik-wkt mapnik-json) ++set_target_properties(mapnik-input-csv PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-csv PROPERTIES OUTPUT_NAME "csv") ++set_target_properties(mapnik-input-csv PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-csv DESTINATION bin/plugins/input) +\ No newline at end of file +diff --git a/plugins/input/gdal/CMakeLists.txt b/plugins/input/gdal/CMakeLists.txt +new file mode 100644 +index 0000000..274ee44 +--- /dev/null ++++ b/plugins/input/gdal/CMakeLists.txt +@@ -0,0 +1,9 @@ ++add_library(mapnik-input-gdal SHARED ++ gdal_datasource.cpp ++ gdal_featureset.cpp) ++ ++target_link_libraries(mapnik-input-gdal PUBLIC mapnik ${GDAL_LIBRARIES}) ++set_target_properties(mapnik-input-gdal PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-gdal PROPERTIES OUTPUT_NAME "gdal") ++set_target_properties(mapnik-input-gdal PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-gdal DESTINATION bin/plugins/input) +diff --git a/plugins/input/geobuf/CMakeLists.txt b/plugins/input/geobuf/CMakeLists.txt +new file mode 100644 +index 0000000..1b798e5 +--- /dev/null ++++ b/plugins/input/geobuf/CMakeLists.txt +@@ -0,0 +1,9 @@ ++add_library(mapnik-input-geobuf SHARED ++ geobuf_datasource.cpp ++ geobuf_featureset.cpp) ++ ++target_link_libraries(mapnik-input-geobuf PUBLIC mapnik) ++set_target_properties(mapnik-input-geobuf PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-geobuf PROPERTIES OUTPUT_NAME "geobuf") ++set_target_properties(mapnik-input-geobuf PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-geobuf DESTINATION bin/plugins/input) +diff --git a/plugins/input/geojson/CMakeLists.txt b/plugins/input/geojson/CMakeLists.txt +new file mode 100644 +index 0000000..fb53a3c +--- /dev/null ++++ b/plugins/input/geojson/CMakeLists.txt +@@ -0,0 +1,11 @@ ++add_library(mapnik-input-geojson SHARED ++ geojson_datasource.cpp ++ geojson_featureset.cpp ++ geojson_index_featureset.cpp ++ geojson_memory_index_featureset.cpp) ++ ++target_link_libraries(mapnik-input-geojson PUBLIC mapnik mapnik-json) ++set_target_properties(mapnik-input-geojson PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-geojson PROPERTIES OUTPUT_NAME "geojson") ++set_target_properties(mapnik-input-geojson PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-geojson DESTINATION bin/plugins/input) +diff --git a/plugins/input/ogr/CMakeLists.txt b/plugins/input/ogr/CMakeLists.txt +new file mode 100644 +index 0000000..6d7fd9a +--- /dev/null ++++ b/plugins/input/ogr/CMakeLists.txt +@@ -0,0 +1,11 @@ ++add_library(mapnik-input-ogr SHARED ++ ogr_converter.cpp ++ ogr_datasource.cpp ++ ogr_featureset.cpp ++ ogr_index_featureset.cpp) ++ ++target_link_libraries(mapnik-input-ogr PUBLIC mapnik ${OGR_LIBRARIES} ${GDAL_LIBRARIES}) ++set_target_properties(mapnik-input-ogr PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-ogr PROPERTIES OUTPUT_NAME "ogr") ++set_target_properties(mapnik-input-ogr PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-ogr DESTINATION bin/plugins/input) +diff --git a/plugins/input/pgraster/CMakeLists.txt b/plugins/input/pgraster/CMakeLists.txt +new file mode 100644 +index 0000000..ada5d08 +--- /dev/null ++++ b/plugins/input/pgraster/CMakeLists.txt +@@ -0,0 +1,10 @@ ++add_library(mapnik-input-pgraster SHARED ++ pgraster_datasource.cpp ++ pgraster_featureset.cpp ++ pgraster_wkb_reader.cpp) ++ ++target_link_libraries(mapnik-input-pgraster PUBLIC mapnik ${PostgreSQL_LIBRARIES}) ++set_target_properties(mapnik-input-pgraster PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-pgraster PROPERTIES OUTPUT_NAME "pgraster") ++set_target_properties(mapnik-input-pgraster PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-pgraster DESTINATION bin/plugins/input) +diff --git a/plugins/input/postgis/CMakeLists.txt b/plugins/input/postgis/CMakeLists.txt +new file mode 100644 +index 0000000..385faa3 +--- /dev/null ++++ b/plugins/input/postgis/CMakeLists.txt +@@ -0,0 +1,9 @@ ++add_library(mapnik-input-postgis SHARED ++ postgis_datasource.cpp ++ postgis_featureset.cpp ) ++ ++target_link_libraries(mapnik-input-postgis PUBLIC mapnik ${PostgreSQL_LIBRARIES}) ++set_target_properties(mapnik-input-postgis PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-postgis PROPERTIES OUTPUT_NAME "postgis") ++set_target_properties(mapnik-input-postgis PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-postgis DESTINATION bin/plugins/input) +diff --git a/plugins/input/raster/CMakeLists.txt b/plugins/input/raster/CMakeLists.txt +new file mode 100644 +index 0000000..b08be98 +--- /dev/null ++++ b/plugins/input/raster/CMakeLists.txt +@@ -0,0 +1,10 @@ ++add_library(mapnik-input-raster SHARED ++ raster_datasource.cpp ++ raster_featureset.cpp ++ raster_info.cpp) ++ ++target_link_libraries(mapnik-input-raster PUBLIC mapnik) ++set_target_properties(mapnik-input-raster PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-raster PROPERTIES OUTPUT_NAME "raster") ++set_target_properties(mapnik-input-raster PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-raster DESTINATION bin/plugins/input) +diff --git a/plugins/input/shape/CMakeLists.txt b/plugins/input/shape/CMakeLists.txt +new file mode 100644 +index 0000000..cac54dd +--- /dev/null ++++ b/plugins/input/shape/CMakeLists.txt +@@ -0,0 +1,9 @@ ++SET(INPUT_SHAPE_SOURCES ++ dbfile.cpp dbf_test.cpp shape_datasource.cpp shape_featureset.cpp shape_index_featureset.cpp shape_io.cpp shape_utils.cpp) ++ ++add_library(mapnik-input-shape SHARED ${INPUT_SHAPE_SOURCES}) ++target_link_libraries(mapnik-input-shape PUBLIC mapnik) ++set_target_properties(mapnik-input-shape PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-shape PROPERTIES OUTPUT_NAME "shape") ++set_target_properties(mapnik-input-shape PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-shape DESTINATION bin/plugins/input) +diff --git a/plugins/input/sqlite/CMakeLists.txt b/plugins/input/sqlite/CMakeLists.txt +new file mode 100644 +index 0000000..b84528e +--- /dev/null ++++ b/plugins/input/sqlite/CMakeLists.txt +@@ -0,0 +1,9 @@ ++add_library(mapnik-input-sqlite SHARED ++ sqlite_datasource.cpp ++ sqlite_featureset.cpp) ++ ++target_link_libraries(mapnik-input-sqlite PUBLIC mapnik SQLite::SQLite3) ++set_target_properties(mapnik-input-sqlite PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-sqlite PROPERTIES OUTPUT_NAME "sqlite") ++set_target_properties(mapnik-input-sqlite PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-sqlite DESTINATION bin/plugins/input) +diff --git a/plugins/input/topojson/CMakeLists.txt b/plugins/input/topojson/CMakeLists.txt +new file mode 100644 +index 0000000..aeb559b +--- /dev/null ++++ b/plugins/input/topojson/CMakeLists.txt +@@ -0,0 +1,9 @@ ++add_library(mapnik-input-topojson SHARED ++ topojson_datasource.cpp ++ topojson_featureset.cpp) ++ ++target_link_libraries(mapnik-input-topojson PUBLIC mapnik mapnik-json) ++set_target_properties(mapnik-input-topojson PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-topojson PROPERTIES OUTPUT_NAME "topojson") ++set_target_properties(mapnik-input-topojson PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-topojson DESTINATION bin/plugins/input) +diff --git a/src/agg/CMakeLists.txt b/src/agg/CMakeLists.txt +new file mode 100644 +index 0000000..e69de29 +diff --git a/src/geometry/CMakeLists.txt b/src/geometry/CMakeLists.txt +new file mode 100644 +index 0000000..e69de29 +diff --git a/src/json/CMakeLists.txt b/src/json/CMakeLists.txt +new file mode 100644 +index 0000000..76a23b9 +--- /dev/null ++++ b/src/json/CMakeLists.txt +@@ -0,0 +1,17 @@ ++add_library(mapnik-json STATIC ++ generic_json.cpp ++ mapnik_geometry_to_geojson.cpp ++ mapnik_json_feature_collection_grammar.cpp ++ mapnik_json_feature_grammar.cpp ++ mapnik_json_generator_grammar.cpp ++ mapnik_json_geometry_grammar.cpp ++ mapnik_json_geometry_parser.cpp ++ mapnik_json_positions_grammar.cpp ++ mapnik_topojson_grammar.cpp ++) ++ ++ ++target_link_libraries(mapnik-json INTERFACE ${ICUU_LIB}) ++ ++install(TARGETS mapnik-json LIBRARY DESTINATION lib) ++target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) +diff --git a/src/wkt/CMakeLists.txt b/src/wkt/CMakeLists.txt +new file mode 100644 +index 0000000..dbaf010 +--- /dev/null ++++ b/src/wkt/CMakeLists.txt +@@ -0,0 +1,7 @@ ++add_library(mapnik-wkt STATIC ++ mapnik_wkt_grammar.cpp ++ mapnik_wkt_generator_grammar.cpp ++) ++ ++install(TARGETS mapnik-wkt LIBRARY DESTINATION lib) ++target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) +diff --git a/utils/mapnik-render/CMakeLists.txt b/utils/mapnik-render/CMakeLists.txt +new file mode 100644 +index 0000000..7cfff00 +--- /dev/null ++++ b/utils/mapnik-render/CMakeLists.txt +@@ -0,0 +1,3 @@ ++add_executable(mapnik-render mapnik-render.cpp) ++target_link_libraries(mapnik-render PRIVATE mapnik) ++install(TARGETS mapnik-render DESTINATION tools) +diff --git a/utils/shapeindex/CMakeLists.txt b/utils/shapeindex/CMakeLists.txt +new file mode 100644 +index 0000000..484200a +--- /dev/null ++++ b/utils/shapeindex/CMakeLists.txt +@@ -0,0 +1,4 @@ ++add_executable(shapeindex shapeindex.cpp) ++target_link_libraries(shapeindex PRIVATE mapnik) ++target_include_directories(shapeindex PRIVATE ../../plugins/input/shape) ++install(TARGETS shapeindex DESTINATION tools) diff --git a/ports/mapnik/0001-CMakeFiles.patch.txt b/ports/mapnik/0001-CMakeFiles.patch.txt new file mode 100644 index 00000000000000..4a68e6917070f7 --- /dev/null +++ b/ports/mapnik/0001-CMakeFiles.patch.txt @@ -0,0 +1,1197 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 0000000..f07a5ce +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,306 @@ ++cmake_minimum_required(VERSION 3.13.4) ++project(mapnik) ++set(CMAKE_CXX_STANDARD 14) ++include(CMakeDependentOption) ++ ++ ++option(MAPNIK_STATIC_LIB "Build a static library" OFF) ++ ++option(WITH_DEMO "Build demo" OFF) ++option(WITH_VIEWER "Build viewer" OFF) ++ ++ ++option(WITH_INPUTS "Build input plugins" ON) ++ ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_CSV "Build the csv input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_GDAL "Build the gdal input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_GEOBUF "Build the geobuf input plugin" OFF "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_GEOJSON "Build the geojson input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_OGR "Build the ogr input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_PGRASTER "Build the pgraster input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_POSTGIS "Build the postgis input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_RASTER "Build the raster input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_SHAPE "Build the shape input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_SQLITE "Build the sqlite input plugin" ON "WITH_INPUTS" ON) ++CMAKE_DEPENDENT_OPTION(WITH_INPUT_TOPOJSON "Build the topojson input plugin" ON "WITH_INPUTS" ON) ++ ++MESSAGE(WITH_INPUT_POSTGIS ${WITH_INPUT_POSTGIS}}) ++ ++option(WITH_UTILS "Build the utilities" ON ) ++ ++option(WITH_GRID "Use the grid renderer" OFF) ++option(WITH_CAIRO "Use cairo" ON) ++option(WITH_PROJ4 "Use proj4" ON) ++ ++if(MSVC) ++ # Force to always compile with W4 ++ if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") ++ string(REGEX REPLACE "/W[0-4]" "/W1" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") ++ else() ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W1") ++ endif() ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd\"4068\" /wd\"4661\" /wd\"4503\" ") ++ add_compile_options(/MP) ++ add_compile_options(-bigobj) #added by @am2222 ++ add_compile_definitions(ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1) #added by @am2222 for proj4 compile ++ add_definitions(-DMAPNIK_THREADSAFE) ++ ++endif() ++ ++find_package(Boost REQUIRED ++ COMPONENTS filesystem system regex program_options) ++ ++find_package(FreeType REQUIRED) ++ ++find_library(HARFBUZZ_LIB harfbuzz.lib) ++find_package(ICU REQUIRED COMPONENTS uc) ++ ++find_package(PNG REQUIRED) ++find_package(jpeg REQUIRED) ++find_package(tiff REQUIRED) ++find_package(WebP REQUIRED) ++find_package(LibXml2 REQUIRED) ++find_package(ZLIB REQUIRED) ++ ++set (MAPNIK_DEFS ++ -DHAVE_PNG ++ -DHAVE_JPEG ++ -DHAVE_TIFF ++ -DHAVE_WEBP) ++ ++set(thirdparty_include_paths ${thirdparty_include_paths} ++ ${JPEG_INCLUDE_DIR} ${WEBP_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}) ++ ++set(thirdparty_libraries ${thirdparty_libraries} ++ ${JPEG_LIBRARIES} ${WEBP_LIBRARIES} ${LIBXML2_LIBRARIES} ${HARFBUZZ_LIB}) ++ ++# AGG ++ ++include(files.cmake) ++ ++if (WITH_CAIRO) ++ find_library(CAIRO_LIB_DEBUG cairod) ++ find_library(CAIRO_LIB_RELEASE cairo) ++ find_library(CAIRO_GOBJECT_LIB_DEBUG cairo-gobjectd) ++ find_library(CAIRO_GOBJECT_LIB_RELEASE cairo-gobject) ++ find_path(CAIRO_INCLUDE_DIR cairo/cairo.h) ++ ++ set(thirdparty_include_paths ${thirdparty_include_paths} ${CAIRO_INCLUDE_DIR}) ++ set(thirdparty_libraries ${thirdparty_libraries} $<$:${CAIRO_LIB_DEBUG}> $<$:${CAIRO_LIB_RELEASE}>) ++ ++ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} ++ src/cairo/process_markers_symbolizer.cpp ++ src/cairo/process_group_symbolizer.cpp ++ ++ src/cairo/cairo_context.cpp ++ src/cairo/cairo_render_vector.cpp ++ src/cairo/cairo_renderer.cpp ++ src/cairo/process_building_symbolizer.cpp ++ src/cairo/process_debug_symbolizer.cpp ++ src/cairo/process_line_pattern_symbolizer.cpp ++ src/cairo/process_line_symbolizer.cpp ++ src/cairo/process_point_symbolizer.cpp ++ src/cairo/process_polygon_pattern_symbolizer.cpp ++ src/cairo/process_polygon_symbolizer.cpp ++ src/cairo/process_raster_symbolizer.cpp ++ src/cairo/process_text_symbolizer.cpp) ++ ++ set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_CAIRO) ++endif() ++message(STATUS "Cairo renderer " ${WITH_CAIRO}) ++ ++if (WITH_PROJ4) ++ find_package(PROJ4 REQUIRED) ++ set(thirdparty_include_paths ${thirdparty_include_paths} ${PROJ4_INCLUDE_DIRS}) ++ set(thirdparty_libraries ${thirdparty_libraries} ${PROJ4_LIBRARIES}) ++ ++ set(MAPNIK_DEFS ${MAPNIK_DEFS} -DMAPNIK_USE_PROJ4) ++endif() ++ ++if (WITH_GRID) ++ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} ++ src/grid/grid.cpp ++ src/grid/grid_renderer.cpp ++ src/grid/process_building_symbolizer.cpp ++ src/grid/process_line_pattern_symbolizer.cpp ++ src/grid/process_line_symbolizer.cpp ++ src/grid/process_point_symbolizer.cpp ++ src/grid/process_polygon_pattern_symbolizer.cpp ++ src/grid/process_polygon_symbolizer.cpp ++ src/grid/process_raster_symbolizer.cpp ++ src/grid/process_shield_symbolizer.cpp ++ src/grid/process_text_symbolizer.cpp) ++ set(MAPNIK_DEFS ${MAPNIK_DEFS} -DGRID_RENDERER) ++ENDIF() ++message(STATUS "Grid renderer: " ${WITH_GRID}) ++ ++set(MAPNIK_SOURCES ${MAPNIK_SOURCES} ++ src/svg/output/svg_output_grammars.cpp ++ src/svg/output/svg_renderer.cpp ++ src/svg/output/svg_generator.cpp ++ src/svg/output/svg_output_attributes.cpp ++ src/svg/output/process_symbolizers.cpp ++ src/svg/output/process_line_symbolizer.cpp ++ src/svg/output/process_polygon_symbolizer.cpp) ++set(MAPNIK_DEFS ${MAPNIK_DEFS} -DSVG_RENDERER) ++ ++ ++set(MAPNIK_SOURCES ${MAPNIK_SOURCES} ++ src/jpeg_reader.cpp ++ src/libxml2_loader.cpp ++ src/png_reader.cpp ++ src/tiff_reader.cpp ++ src/webp_reader.cpp ++ ) ++ ++#set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/rapidxml_loader.cpp) ++ ++set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2 -DBOOST_REGEX_HAS_ICU) ++ ++set(mapnik_include_paths ++ include ++ deps ++ deps/agg/include ++ deps/mapbox/geometry/include ++ deps/mapbox/polylabel/include ++ deps/mapbox/variant/include) ++ ++ ++ ++include_directories(${mapnik_include_paths} ${thirdparty_include_paths}) ++ ++if (MAPNIK_STATIC_LIB) ++ message(STATUS "Building static library") ++ add_library(mapnik STATIC ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) ++ target_compile_definitions(mapnik PUBLIC -DMAPNIK_STATICLIB) ++ set(MAPNIK_LIB_DEFINITION -DMAPNIK_STATICLIB) ++else () ++ message(STATUS "Building shared library") ++ add_library(mapnik SHARED ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) ++ target_compile_definitions(mapnik PRIVATE -DMAPNIK_EXPORTS) ++ set(MAPNIK_LIB_DEFINITION ) ++endif () ++ ++target_compile_definitions(mapnik PUBLIC ${MAPNIK_DEFS}) ++ ++target_include_directories(mapnik INTERFACE ${mapnik_include_paths} ${thirdparty_include_paths} ) ++target_link_libraries(mapnik PUBLIC ++ ${thirdparty_libraries} ++ Boost::boost Boost::filesystem Boost::system Boost::regex Boost::program_options Boost::system ++ Freetype::Freetype ++ ICU::uc ++ PNG::PNG ++ TIFF::TIFF ++ ZLIB::ZLIB) ++ ++install(TARGETS mapnik ++ LIBRARY DESTINATION lib) ++ ++install(DIRECTORY include/ DESTINATION include/ CONFIGURATIONS Release) ++ ++add_subdirectory(src/json) ++add_subdirectory(src/wkt) ++ ++# ideally we should also generate mapnik-config ++ ++if (WITH_INPUT_CSV) ++ add_subdirectory(plugins/input/csv) ++endif() ++ ++if (WITH_INPUT_GDAL) ++ find_package(GDAL REQUIRED) ++ add_subdirectory(plugins/input/gdal) ++endif() ++ ++if (WITH_INPUT_GEOBUF) ++ # TODO insert protozero here ++ add_subdirectory(plugins/input/geobuf) ++endif() ++ ++if (WITH_INPUT_GEOJSON) ++ add_subdirectory(plugins/input/geojson) ++endif() ++ ++if (WITH_INPUT_OGR) ++ add_subdirectory(plugins/input/ogr) ++endif() ++ ++if (WITH_INPUT_PGRASTER) ++ find_package(PostgreSQL REQUIRED) ++ add_subdirectory(plugins/input/pgraster) ++endif() ++ ++if (WITH_INPUT_POSTGIS) ++ find_package(PostgreSQL REQUIRED) ++ add_subdirectory(plugins/input/postgis) ++endif() ++ ++if (WITH_INPUT_RASTER) ++ add_subdirectory(plugins/input/raster) ++endif() ++ ++if (WITH_INPUT_SHAPE) ++ add_subdirectory(plugins/input/shape) ++endif() ++ ++if (WITH_INPUT_SQLITE) ++ find_package(sqlite3 REQUIRED) ++ add_subdirectory(plugins/input/sqlite) ++endif() ++ ++if (WITH_INPUT_TOPOJSON) ++ add_subdirectory(plugins/input/topojson) ++endif() ++ ++if (WITH_INPUTS) ++ message(STATUS "Input plugins:") ++ if(WITH_INPUT_CSV ) ++ message(STATUS " - csv ") ++ endif() ++ if(WITH_INPUT_GDAL ) ++ message(STATUS " - gdal ") ++ endif() ++ if(WITH_INPUT_GEOBUF ) ++ message(STATUS " - geobuf ") ++ endif() ++ if(WITH_INPUT_GEOJSON ) ++ message(STATUS " - geojson ") ++ endif() ++ if(WITH_INPUT_OGR ) ++ message(STATUS " - ogr ") ++ endif() ++ if(WITH_INPUT_PGRASTER ) ++ message(STATUS " - pgraster") ++ endif() ++ if(WITH_INPUT_POSTGIS ) ++ message(STATUS " - postgis ") ++ endif() ++ if(WITH_INPUT_RASTER ) ++ message(STATUS " - raster ") ++ endif() ++ if(WITH_INPUT_SHAPE ) ++ message(STATUS " - shape ") ++ endif() ++ if(WITH_INPUT_SQLITE ) ++ message(STATUS " - sqlite ") ++ endif() ++ if(WITH_INPUT_TOPOJSON ) ++ message(STATUS " - topojson") ++ endif() ++else() ++ message(STATUS "Input plugins OFF") ++endif() ++ ++if(WITH_DEMO) ++ add_subdirectory(demo/c++) ++endif() ++ ++if(WITH_VIEWER) ++ find_package(Qt5 COMPONENTS Widgets REQUIRED) ++ add_subdirectory(demo/viewer) ++endif() ++ ++if(WITH_UTILS) ++ add_subdirectory(utils/mapnik-render) ++ add_subdirectory(utils/shapeindex) ++endif() +diff --git a/demo/c++/CMakeLists.txt b/demo/c++/CMakeLists.txt +new file mode 100644 +index 0000000..a0a48b8 +--- /dev/null ++++ b/demo/c++/CMakeLists.txt +@@ -0,0 +1,4 @@ ++add_executable(mapnik-demo rundemo.cpp) ++add_dependencies(mapnik-demo mapnik) ++target_link_libraries(mapnik-demo PRIVATE mapnik) ++install(TARGETS mapnik-demo DESTINATION bin) +diff --git a/demo/viewer/CMakeLists.txt b/demo/viewer/CMakeLists.txt +new file mode 100644 +index 0000000..86034a0 +--- /dev/null ++++ b/demo/viewer/CMakeLists.txt +@@ -0,0 +1,27 @@ ++add_executable(mapnik-viewer ++ about_dialog.cpp ++ info_dialog.cpp ++ layerdelegate.cpp ++ layerlistmodel.cpp ++ layerwidget.cpp ++ layer_info_dialog.cpp ++ main.cpp ++ mainwindow.cpp ++ mapwidget.cpp ++ styles_model.cpp ++ ++ forms/about.ui ++ forms/info.ui ++ forms/layer_info.ui ++ ++ mapnik_viewer.qrc) ++ ++set_target_properties(mapnik-viewer PROPERTIES ++ AUTOUIC_SEARCH_PATHS forms ++ AUTORCC ON ++ AUTOUIC ON ++ AUTOMOC ON) ++ ++add_dependencies(mapnik-viewer mapnik) ++target_link_libraries(mapnik-viewer PRIVATE mapnik Qt5::Widgets) ++install(TARGETS mapnik-viewer DESTINATION bin) +diff --git a/files.cmake b/files.cmake +new file mode 100644 +index 0000000..b9d767f +--- /dev/null ++++ b/files.cmake +@@ -0,0 +1,557 @@ ++set (MAPNIK_SOURCES ++ src/cairo_io.cpp ++ src/color.cpp ++ src/color_factory.cpp ++ src/config_error.cpp ++ src/conversions.cpp ++ src/css_color_grammar.cpp ++ src/dasharray_parser.cpp ++ src/datasource_cache.cpp ++ src/datasource_cache_static.cpp ++ src/debug.cpp ++ src/box2d.cpp ++ src/expression.cpp ++ src/expression_grammar.cpp ++ src/expression_node.cpp ++ src/expression_string.cpp ++ src/feature_kv_iterator.cpp ++ src/feature_style_processor.cpp ++ src/feature_type_style.cpp ++ src/font_engine_freetype.cpp ++ src/font_set.cpp ++ src/fs.cpp ++ src/function_call.cpp ++ src/geometry/interior.cpp ++ src/geometry_envelope.cpp ++ src/geometry_reprojection.cpp ++ src/gradient.cpp ++ src/group/group_layout_manager.cpp ++ src/group/group_rule.cpp ++ src/group/group_symbolizer_helper.cpp ++ src/image.cpp ++ src/image_any.cpp ++ src/image_compositing.cpp ++ src/image_copy.cpp ++ src/image_filter_grammar.cpp ++ src/image_filter_types.cpp ++ src/image_options.cpp ++ src/image_reader.cpp ++ src/image_scaling.cpp ++ src/image_util.cpp ++ src/image_util_jpeg.cpp ++ src/image_util_png.cpp ++ src/image_util_tiff.cpp ++ src/image_util_webp.cpp ++ src/image_view.cpp ++ src/image_view_any.cpp ++ src/layer.cpp ++ src/load_map.cpp ++ src/map.cpp ++ src/math.cpp ++ src/mapped_memory_cache.cpp ++ src/marker_cache.cpp ++ src/marker_helpers.cpp ++ src/memory_datasource.cpp ++ src/palette.cpp ++ src/params.cpp ++ src/parse_path.cpp ++ src/parse_transform.cpp ++ src/plugin.cpp ++ src/proj_transform.cpp ++ src/projection.cpp ++ src/raster_colorizer.cpp ++ src/renderer_common.cpp ++ src/renderer_common/pattern_alignment.cpp ++ src/renderer_common/render_group_symbolizer.cpp ++ src/renderer_common/render_markers_symbolizer.cpp ++ src/renderer_common/render_pattern.cpp ++ src/renderer_common/render_thunk_extractor.cpp ++ src/request.cpp ++ src/rule.cpp ++ src/save_map.cpp ++ src/scale_denominator.cpp ++ src/simplify.cpp ++ src/svg/svg_parser.cpp ++ src/svg/svg_path_parser.cpp ++ src/svg/svg_points_parser.cpp ++ src/svg/svg_transform_parser.cpp ++ src/symbolizer.cpp ++ src/symbolizer_enumerations.cpp ++ src/symbolizer_keys.cpp ++ src/text/face.cpp ++ src/text/font_feature_settings.cpp ++ src/text/font_library.cpp ++ src/text/formatting/base.cpp ++ src/text/formatting/format.cpp ++ src/text/formatting/layout.cpp ++ src/text/formatting/list.cpp ++ src/text/formatting/registry.cpp ++ src/text/formatting/text.cpp ++ src/text/glyph_positions.cpp ++ src/text/itemizer.cpp ++ src/text/placement_finder.cpp ++ src/text/placements/base.cpp ++ src/text/placements/dummy.cpp ++ src/text/placements/list.cpp ++ src/text/placements/registry.cpp ++ src/text/placements/simple.cpp ++ src/text/properties_util.cpp ++ src/text/renderer.cpp ++ src/text/scrptrun.cpp ++ src/text/symbolizer_helpers.cpp ++ src/text/text_layout.cpp ++ src/text/text_line.cpp ++ src/text/text_properties.cpp ++ src/transform_expression.cpp ++ src/transform_expression_grammar.cpp ++ src/twkb.cpp ++ src/unicode.cpp ++ src/util/utf_conv_win.cpp ++ src/value.cpp ++ src/vertex_adapters.cpp ++ src/vertex_cache.cpp ++ src/warp.cpp ++ src/well_known_srs.cpp ++ src/wkb.cpp ++ src/xml_tree.cpp ++ ) ++ ++ ++set(MAPNIK_AGG_SOURCES ++ src/agg/agg_renderer.cpp ++ src/agg/process_building_symbolizer.cpp ++ src/agg/process_debug_symbolizer.cpp ++ src/agg/process_dot_symbolizer.cpp ++ src/agg/process_group_symbolizer.cpp ++ src/agg/process_line_pattern_symbolizer.cpp ++ src/agg/process_line_symbolizer.cpp ++ src/agg/process_markers_symbolizer.cpp ++ src/agg/process_point_symbolizer.cpp ++ src/agg/process_polygon_pattern_symbolizer.cpp ++ src/agg/process_polygon_symbolizer.cpp ++ src/agg/process_raster_symbolizer.cpp ++ src/agg/process_shield_symbolizer.cpp ++ src/agg/process_text_symbolizer.cpp) ++ ++ ++set(AGG_SOURCES ++ deps/agg/src/agg_arc.cpp ++ deps/agg/src/agg_arrowhead.cpp ++ deps/agg/src/agg_bezier_arc.cpp ++ deps/agg/src/agg_bspline.cpp ++ deps/agg/src/agg_curves.cpp ++ deps/agg/src/agg_embedded_raster_fonts.cpp ++ deps/agg/src/agg_gsv_text.cpp ++ deps/agg/src/agg_image_filters.cpp ++ deps/agg/src/agg_line_aa_basics.cpp ++ deps/agg/src/agg_line_profile_aa.cpp ++ deps/agg/src/agg_pixfmt_rgba.cpp ++ deps/agg/src/agg_rounded_rect.cpp ++ deps/agg/src/agg_sqrt_tables.cpp ++ deps/agg/src/agg_trans_affine.cpp ++ deps/agg/src/agg_trans_double_path.cpp ++ deps/agg/src/agg_trans_single_path.cpp ++ deps/agg/src/agg_trans_warp_magnifier.cpp ++ deps/agg/src/agg_vcgen_bspline.cpp ++ deps/agg/src/agg_vcgen_contour.cpp ++ deps/agg/src/agg_vcgen_dash.cpp ++ deps/agg/src/agg_vcgen_markers_term.cpp ++ deps/agg/src/agg_vcgen_stroke.cpp ++ deps/agg/src/agg_vcgen_smooth_poly1.cpp ++ deps/agg/src/agg_vpgen_clip_polygon.cpp ++ deps/agg/src/agg_vpgen_clip_polyline.cpp ++ deps/agg/src/agg_vpgen_segmentator.cpp ) ++ ++set(MAPNIK_INC ++ mapnik/adaptive_smooth.hpp ++ mapnik/agg_helpers.hpp ++ mapnik/agg_pattern_source.hpp ++ mapnik/agg_rasterizer.hpp ++ mapnik/agg_renderer.hpp ++ mapnik/agg_render_marker.hpp ++ mapnik/attribute.hpp ++ mapnik/attribute_collector.hpp ++ mapnik/attribute_descriptor.hpp ++ mapnik/boolean.hpp ++ mapnik/boost_spirit_instantiate.hpp ++ mapnik/cairo_io.hpp ++ mapnik/color.hpp ++ mapnik/color_factory.hpp ++ mapnik/config.hpp ++ mapnik/config_error.hpp ++ mapnik/coord.hpp ++ mapnik/css_color_grammar.hpp ++ mapnik/css_color_grammar_impl.hpp ++ mapnik/cxx11_support.hpp ++ mapnik/datasource.hpp ++ mapnik/datasource_cache.hpp ++ mapnik/datasource_geometry_type.hpp ++ mapnik/debug.hpp ++ mapnik/enumeration.hpp ++ mapnik/evaluate_global_attributes.hpp ++ mapnik/expression.hpp ++ mapnik/expression_evaluator.hpp ++ mapnik/expression_grammar.hpp ++ mapnik/expression_grammar_config.hpp ++ mapnik/expression_grammar_def.hpp ++ mapnik/expression_node.hpp ++ mapnik/expression_node_types.hpp ++ mapnik/expression_string.hpp ++ mapnik/extend_converter.hpp ++ mapnik/factory.hpp ++ mapnik/feature.hpp ++ mapnik/featureset.hpp ++ mapnik/feature_factory.hpp ++ mapnik/feature_kv_iterator.hpp ++ mapnik/feature_layer_desc.hpp ++ mapnik/feature_style_processor.hpp ++ mapnik/feature_style_processor_context.hpp ++ mapnik/feature_style_processor_impl.hpp ++ mapnik/feature_type_style.hpp ++ mapnik/filter_featureset.hpp ++ mapnik/font_engine_freetype.hpp ++ mapnik/font_set.hpp ++ mapnik/function_call.hpp ++ mapnik/geometry.hpp ++ mapnik/geom_util.hpp ++ mapnik/global.hpp ++ mapnik/gradient.hpp ++ mapnik/grid_vertex_converter.hpp ++ mapnik/hextree.hpp ++ mapnik/hit_test_filter.hpp ++ mapnik/image.hpp ++ mapnik/image_any.hpp ++ mapnik/image_compositing.hpp ++ mapnik/image_copy.hpp ++ mapnik/image_filter.hpp ++ mapnik/image_filter_grammar.hpp ++ mapnik/image_filter_grammar_def.hpp ++ mapnik/image_filter_types.hpp ++ mapnik/image_impl.hpp ++ mapnik/image_null.hpp ++ mapnik/image_options.hpp ++ mapnik/image_reader.hpp ++ mapnik/image_scaling.hpp ++ mapnik/image_scaling_traits.hpp ++ mapnik/image_util.hpp ++ mapnik/image_util_jpeg.hpp ++ mapnik/image_util_png.hpp ++ mapnik/image_util_tiff.hpp ++ mapnik/image_util_webp.hpp ++ mapnik/image_view.hpp ++ mapnik/image_view_any.hpp ++ mapnik/image_view_impl.hpp ++ mapnik/image_view_null.hpp ++ mapnik/init_priority.hpp ++ mapnik/jpeg_io.hpp ++ mapnik/label_collision_detector.hpp ++ mapnik/layer.hpp ++ mapnik/load_map.hpp ++ mapnik/make_unique.hpp ++ mapnik/map.hpp ++ mapnik/mapped_memory_cache.hpp ++ mapnik/marker.hpp ++ mapnik/markers_placement.hpp ++ mapnik/marker_cache.hpp ++ mapnik/marker_helpers.hpp ++ mapnik/memory_datasource.hpp ++ mapnik/memory_featureset.hpp ++ mapnik/octree.hpp ++ mapnik/offset_converter.hpp ++ mapnik/palette.hpp ++ mapnik/params.hpp ++ mapnik/params_impl.hpp ++ mapnik/parse_path.hpp ++ mapnik/path.hpp ++ mapnik/path_expression.hpp ++ mapnik/path_expression_grammar.hpp ++ mapnik/path_expression_grammar_def.hpp ++ mapnik/pixel_position.hpp ++ mapnik/pixel_types.hpp ++ mapnik/plugin.hpp ++ mapnik/png_io.hpp ++ mapnik/pool.hpp ++ mapnik/projection.hpp ++ mapnik/proj_strategy.hpp ++ mapnik/proj_transform.hpp ++ mapnik/ptree_helpers.hpp ++ mapnik/quad_tree.hpp ++ mapnik/query.hpp ++ mapnik/raster.hpp ++ mapnik/raster_colorizer.hpp ++ mapnik/renderer_common.hpp ++ mapnik/request.hpp ++ mapnik/rule.hpp ++ mapnik/rule_cache.hpp ++ mapnik/safe_cast.hpp ++ mapnik/save_map.hpp ++ mapnik/scale_denominator.hpp ++ mapnik/simplify.hpp ++ mapnik/simplify_converter.hpp ++ mapnik/span_image_filter.hpp ++ mapnik/sql_utils.hpp ++ mapnik/sse.hpp ++ mapnik/stringify_macro.hpp ++ mapnik/symbolizer.hpp ++ mapnik/symbolizer_base.hpp ++ mapnik/symbolizer_default_values.hpp ++ mapnik/symbolizer_dispatch.hpp ++ mapnik/symbolizer_enumerations.hpp ++ mapnik/symbolizer_hash.hpp ++ mapnik/symbolizer_keys.hpp ++ mapnik/symbolizer_utils.hpp ++ mapnik/tiff_io.hpp ++ mapnik/timer.hpp ++ mapnik/tolerance_iterator.hpp ++ mapnik/transform_path_adapter.hpp ++ mapnik/unicode.hpp ++ mapnik/value.hpp ++ mapnik/version.hpp ++ mapnik/vertex.hpp ++ mapnik/vertex_adapters.hpp ++ mapnik/vertex_cache.hpp ++ mapnik/vertex_converters.hpp ++ mapnik/vertex_processor.hpp ++ mapnik/vertex_vector.hpp ++ mapnik/view_strategy.hpp ++ mapnik/view_transform.hpp ++ mapnik/warning_ignore.hpp ++ mapnik/warning_ignore_agg.hpp ++ mapnik/warp.hpp ++ mapnik/webp_io.hpp ++ mapnik/well_known_srs.hpp ++ mapnik/wkb.hpp ++ mapnik/xml_attribute_cast.hpp ++ mapnik/xml_loader.hpp ++ mapnik/xml_node.hpp ++ mapnik/xml_tree.hpp ++ mapnik/geometry/boost_adapters.hpp ++ mapnik/geometry/boost_spirit_karma_adapter.hpp ++ mapnik/geometry/box2d.hpp ++ mapnik/geometry/box2d_impl.hpp ++ mapnik/geometry/centroid.hpp ++ mapnik/geometry/closest_point.hpp ++ mapnik/geometry/correct.hpp ++ mapnik/geometry/envelope.hpp ++ mapnik/geometry/envelope_impl.hpp ++ mapnik/geometry/fusion_adapted.hpp ++ mapnik/geometry/geometry_type.hpp ++ mapnik/geometry/geometry_types.hpp ++ mapnik/geometry/interior.hpp ++ mapnik/geometry/is_empty.hpp ++ mapnik/geometry/is_simple.hpp ++ mapnik/geometry/is_valid.hpp ++ mapnik/geometry/line_string.hpp ++ mapnik/geometry/multi_line_string.hpp ++ mapnik/geometry/multi_point.hpp ++ mapnik/geometry/multi_polygon.hpp ++ mapnik/geometry/point.hpp ++ mapnik/geometry/polygon.hpp ++ mapnik/geometry/polygon_vertex_processor.hpp ++ mapnik/geometry/polylabel.hpp ++ mapnik/geometry/remove_empty.hpp ++ mapnik/geometry/reprojection.hpp ++ mapnik/geometry/reprojection_impl.hpp ++ mapnik/geometry/strategy.hpp ++ mapnik/geometry/to_path.hpp ++ mapnik/geometry/transform.hpp ++ mapnik/csv/csv_grammar_x3.hpp ++ mapnik/csv/csv_grammar_x3_def.hpp ++ mapnik/csv/csv_types.hpp ++ mapnik/svg/geometry_svg_generator.hpp ++ mapnik/svg/geometry_svg_generator_impl.hpp ++ mapnik/svg/svg_converter.hpp ++ mapnik/svg/svg_grammar_config_x3.hpp ++ mapnik/svg/svg_parser.hpp ++ mapnik/svg/svg_parser_exception.hpp ++ mapnik/svg/svg_path_adapter.hpp ++ mapnik/svg/svg_path_attributes.hpp ++ mapnik/svg/svg_path_commands.hpp ++ mapnik/svg/svg_path_grammar_x3.hpp ++ mapnik/svg/svg_path_grammar_x3_def.hpp ++ mapnik/svg/svg_path_parser.hpp ++ mapnik/svg/svg_renderer_agg.hpp ++ mapnik/svg/svg_storage.hpp ++ mapnik/svg/svg_transform_grammar_x3.hpp ++ mapnik/svg/svg_transform_grammar_x3_def.hpp ++ mapnik/wkt/wkt_factory.hpp ++ mapnik/wkt/wkt_generator_grammar.hpp ++ mapnik/wkt/wkt_generator_grammar_impl.hpp ++ mapnik/wkt/wkt_grammar_x3.hpp ++ mapnik/wkt/wkt_grammar_x3_def.hpp ++ mapnik/cairo/cairo_context.hpp ++ mapnik/cairo/cairo_image_util.hpp ++ mapnik/cairo/cairo_renderer.hpp ++ mapnik/cairo/cairo_render_vector.hpp ++ mapnik/cairo/render_polygon_pattern.hpp ++ mapnik/grid/grid.hpp ++ mapnik/grid/grid_pixel.hpp ++ mapnik/grid/grid_pixfmt.hpp ++ mapnik/grid/grid_rasterizer.hpp ++ mapnik/grid/grid_renderer.hpp ++ mapnik/grid/grid_renderer_base.hpp ++ mapnik/grid/grid_rendering_buffer.hpp ++ mapnik/grid/grid_render_marker.hpp ++ mapnik/grid/grid_view.hpp ++ mapnik/json/attribute_value_visitor.hpp ++ mapnik/json/create_feature.hpp ++ mapnik/json/create_geometry.hpp ++ mapnik/json/extract_bounding_boxes.hpp ++ mapnik/json/extract_bounding_boxes_config.hpp ++ mapnik/json/feature_generator_grammar.hpp ++ mapnik/json/feature_generator_grammar_impl.hpp ++ mapnik/json/feature_grammar_x3.hpp ++ mapnik/json/feature_grammar_x3_def.hpp ++ mapnik/json/feature_parser.hpp ++ mapnik/json/generic_json_grammar_x3.hpp ++ mapnik/json/generic_json_grammar_x3_def.hpp ++ mapnik/json/geojson_grammar_x3.hpp ++ mapnik/json/geojson_grammar_x3_def.hpp ++ mapnik/json/geometry_generator_grammar.hpp ++ mapnik/json/geometry_generator_grammar_impl.hpp ++ mapnik/json/geometry_parser.hpp ++ mapnik/json/json_grammar_config.hpp ++ mapnik/json/json_value.hpp ++ mapnik/json/parse_feature.hpp ++ mapnik/json/positions_grammar_x3.hpp ++ mapnik/json/positions_grammar_x3_def.hpp ++ mapnik/json/positions_x3.hpp ++ mapnik/json/properties_generator_grammar.hpp ++ mapnik/json/properties_generator_grammar_impl.hpp ++ mapnik/json/stringifier.hpp ++ mapnik/json/topojson_grammar_x3.hpp ++ mapnik/json/topojson_grammar_x3_def.hpp ++ mapnik/json/topojson_utils.hpp ++ mapnik/json/topology.hpp ++ mapnik/json/unicode_string_grammar_x3.hpp ++ mapnik/json/unicode_string_grammar_x3_def.hpp ++ mapnik/json/value_converters.hpp ++ mapnik/util/char_array_buffer.hpp ++ mapnik/util/const_rendering_buffer.hpp ++ mapnik/util/container_adapter.hpp ++ mapnik/util/conversions.hpp ++ mapnik/util/dasharray_parser.hpp ++ mapnik/util/featureset_buffer.hpp ++ mapnik/util/feature_to_geojson.hpp ++ mapnik/util/file_io.hpp ++ mapnik/util/fs.hpp ++ mapnik/util/geometry_to_ds_type.hpp ++ mapnik/util/geometry_to_geojson.hpp ++ mapnik/util/geometry_to_svg.hpp ++ mapnik/util/geometry_to_wkb.hpp ++ mapnik/util/geometry_to_wkt.hpp ++ mapnik/util/hsl.hpp ++ mapnik/util/is_clockwise.hpp ++ mapnik/util/math.hpp ++ mapnik/util/name_to_int.hpp ++ mapnik/util/noncopyable.hpp ++ mapnik/util/path_iterator.hpp ++ mapnik/util/rounding_cast.hpp ++ mapnik/util/singleton.hpp ++ mapnik/util/spatial_index.hpp ++ mapnik/util/spirit_transform_attribute.hpp ++ mapnik/util/timer.hpp ++ mapnik/util/trim.hpp ++ mapnik/util/utf_conv_win.hpp ++ mapnik/util/variant.hpp ++ mapnik/util/variant_io.hpp ++ mapnik/group/group_layout.hpp ++ mapnik/group/group_layout_manager.hpp ++ mapnik/group/group_rule.hpp ++ mapnik/group/group_symbolizer_helper.hpp ++ mapnik/group/group_symbolizer_properties.hpp ++ mapnik/text/color_font_renderer.hpp ++ mapnik/text/evaluated_format_properties_ptr.hpp ++ mapnik/text/face.hpp ++ mapnik/text/font_feature_settings.hpp ++ mapnik/text/font_library.hpp ++ mapnik/text/glyph_info.hpp ++ mapnik/text/glyph_positions.hpp ++ mapnik/text/harfbuzz_shaper.hpp ++ mapnik/text/icu_shaper.hpp ++ mapnik/text/itemizer.hpp ++ mapnik/text/placement_finder.hpp ++ mapnik/text/placement_finder_impl.hpp ++ mapnik/text/properties_util.hpp ++ mapnik/text/renderer.hpp ++ mapnik/text/rotation.hpp ++ mapnik/text/scrptrun.hpp ++ mapnik/text/symbolizer_helpers.hpp ++ mapnik/text/text_layout.hpp ++ mapnik/text/text_line.hpp ++ mapnik/text/text_properties.hpp ++ mapnik/text/placements/base.hpp ++ mapnik/text/placements/dummy.hpp ++ mapnik/text/placements/list.hpp ++ mapnik/text/placements/registry.hpp ++ mapnik/text/placements/simple.hpp ++ mapnik/text/formatting/base.hpp ++ mapnik/text/formatting/format.hpp ++ mapnik/text/formatting/layout.hpp ++ mapnik/text/formatting/list.hpp ++ mapnik/text/formatting/registry.hpp ++ mapnik/text/formatting/text.hpp ++ mapnik/transform/parse_transform.hpp ++ mapnik/transform/transform_expression.hpp ++ mapnik/transform/transform_expression_grammar_x3.hpp ++ mapnik/transform/transform_expression_grammar_x3_def.hpp ++ mapnik/transform/transform_processor.hpp ++ mapnik/markers_placements/basic.hpp ++ mapnik/markers_placements/interior.hpp ++ mapnik/markers_placements/line.hpp ++ mapnik/markers_placements/point.hpp ++ mapnik/markers_placements/polylabel.hpp ++ mapnik/markers_placements/vertex_first.hpp ++ mapnik/markers_placements/vertex_last.hpp ++ mapnik/geometry/boost_adapters.hpp ++ mapnik/geometry/boost_spirit_karma_adapter.hpp ++ mapnik/geometry/box2d.hpp ++ mapnik/geometry/box2d_impl.hpp ++ mapnik/geometry/centroid.hpp ++ mapnik/geometry/closest_point.hpp ++ mapnik/geometry/correct.hpp ++ mapnik/geometry/envelope.hpp ++ mapnik/geometry/envelope_impl.hpp ++ mapnik/geometry/fusion_adapted.hpp ++ mapnik/geometry/geometry_type.hpp ++ mapnik/geometry/geometry_types.hpp ++ mapnik/geometry/interior.hpp ++ mapnik/geometry/is_empty.hpp ++ mapnik/geometry/is_simple.hpp ++ mapnik/geometry/is_valid.hpp ++ mapnik/geometry/line_string.hpp ++ mapnik/geometry/multi_line_string.hpp ++ mapnik/geometry/multi_point.hpp ++ mapnik/geometry/multi_polygon.hpp ++ mapnik/geometry/point.hpp ++ mapnik/geometry/polygon.hpp ++ mapnik/geometry/polygon_vertex_processor.hpp ++ mapnik/geometry/polylabel.hpp ++ mapnik/geometry/remove_empty.hpp ++ mapnik/geometry/reprojection.hpp ++ mapnik/geometry/reprojection_impl.hpp ++ mapnik/geometry/strategy.hpp ++ mapnik/geometry/to_path.hpp ++ mapnik/geometry/transform.hpp ++ mapnik/value/error.hpp ++ mapnik/value/hash.hpp ++ mapnik/value/types.hpp) ++ ++set(MAPNIK_INC ${MAPNIK_INC} ++ mapnik/svg/output/svg_generator.hpp ++ mapnik/svg/output/svg_output_attributes.hpp ++ mapnik/svg/output/svg_output_grammars.hpp ++ mapnik/svg/output/svg_output_grammars_impl.hpp ++ mapnik/svg/output/svg_path_iterator.hpp ++ mapnik/svg/output/svg_renderer.hpp) ++ ++set(MAPNIK_INC ${MAPNIK_INC} ++ mapnik/grid/grid.hpp ++ mapnik/grid/grid_pixel.hpp ++ mapnik/grid/grid_pixfmt.hpp ++ mapnik/grid/grid_rasterizer.hpp ++ mapnik/grid/grid_renderer.hpp ++ mapnik/grid/grid_renderer_base.hpp ++ mapnik/grid/grid_rendering_buffer.hpp ++ mapnik/grid/grid_render_marker.hpp ++ mapnik/grid/grid_view.hpp) +\ No newline at end of file +diff --git a/include/mapnik/config.hpp b/include/mapnik/config.hpp +index a9168e5..9bdcad4 100644 +--- a/include/mapnik/config.hpp ++++ b/include/mapnik/config.hpp +@@ -30,8 +30,10 @@ + # define MAPNIK_IMP __declspec (dllimport) + # ifdef MAPNIK_EXPORTS + # define MAPNIK_DECL __declspec (dllexport) +-# else ++# elif !defined(MAPNIK_STATICLIB) + # define MAPNIK_DECL __declspec (dllimport) ++# else ++# define MAPNIK_DECL + # endif + # pragma warning( disable: 4251 ) + # pragma warning( disable: 4275 ) +diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp +index aae2bf3..6484dd3 100644 +--- a/include/mapnik/geometry.hpp ++++ b/include/mapnik/geometry.hpp +@@ -146,7 +146,7 @@ struct geometry : geometry_base + { + using coord_type = T; + +-#if __cpp_inheriting_constructors >= 200802 ++#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) + + using geometry_base::geometry_base; + +diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp +index 65c04c4..6c04609 100644 +--- a/include/mapnik/json/generic_json.hpp ++++ b/include/mapnik/json/generic_json.hpp +@@ -57,7 +57,7 @@ using json_value_base = mapnik::util::variant >; + struct json_value : json_value_base + { +-#if __cpp_inheriting_constructors >= 200802 ++#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) + + using json_value_base::json_value_base; + +diff --git a/plugins/input/csv/CMakeLists.txt b/plugins/input/csv/CMakeLists.txt +new file mode 100644 +index 0000000..34a2e75 +--- /dev/null ++++ b/plugins/input/csv/CMakeLists.txt +@@ -0,0 +1,12 @@ ++add_library(mapnik-input-csv SHARED ++ csv_datasource.cpp ++ csv_featureset.cpp ++ csv_index_featureset.cpp ++ csv_inline_featureset.cpp ++ csv_utils.cpp) ++ ++target_link_libraries(mapnik-input-csv PUBLIC mapnik mapnik-wkt mapnik-json) ++set_target_properties(mapnik-input-csv PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-csv PROPERTIES OUTPUT_NAME "csv") ++set_target_properties(mapnik-input-csv PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-csv DESTINATION bin/plugins/input) +\ No newline at end of file +diff --git a/plugins/input/gdal/CMakeLists.txt b/plugins/input/gdal/CMakeLists.txt +new file mode 100644 +index 0000000..274ee44 +--- /dev/null ++++ b/plugins/input/gdal/CMakeLists.txt +@@ -0,0 +1,9 @@ ++add_library(mapnik-input-gdal SHARED ++ gdal_datasource.cpp ++ gdal_featureset.cpp) ++ ++target_link_libraries(mapnik-input-gdal PUBLIC mapnik ${GDAL_LIBRARIES}) ++set_target_properties(mapnik-input-gdal PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-gdal PROPERTIES OUTPUT_NAME "gdal") ++set_target_properties(mapnik-input-gdal PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-gdal DESTINATION bin/plugins/input) +diff --git a/plugins/input/geobuf/CMakeLists.txt b/plugins/input/geobuf/CMakeLists.txt +new file mode 100644 +index 0000000..1b798e5 +--- /dev/null ++++ b/plugins/input/geobuf/CMakeLists.txt +@@ -0,0 +1,9 @@ ++add_library(mapnik-input-geobuf SHARED ++ geobuf_datasource.cpp ++ geobuf_featureset.cpp) ++ ++target_link_libraries(mapnik-input-geobuf PUBLIC mapnik) ++set_target_properties(mapnik-input-geobuf PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-geobuf PROPERTIES OUTPUT_NAME "geobuf") ++set_target_properties(mapnik-input-geobuf PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-geobuf DESTINATION bin/plugins/input) +diff --git a/plugins/input/geojson/CMakeLists.txt b/plugins/input/geojson/CMakeLists.txt +new file mode 100644 +index 0000000..fb53a3c +--- /dev/null ++++ b/plugins/input/geojson/CMakeLists.txt +@@ -0,0 +1,11 @@ ++add_library(mapnik-input-geojson SHARED ++ geojson_datasource.cpp ++ geojson_featureset.cpp ++ geojson_index_featureset.cpp ++ geojson_memory_index_featureset.cpp) ++ ++target_link_libraries(mapnik-input-geojson PUBLIC mapnik mapnik-json) ++set_target_properties(mapnik-input-geojson PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-geojson PROPERTIES OUTPUT_NAME "geojson") ++set_target_properties(mapnik-input-geojson PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-geojson DESTINATION bin/plugins/input) +diff --git a/plugins/input/ogr/CMakeLists.txt b/plugins/input/ogr/CMakeLists.txt +new file mode 100644 +index 0000000..6d7fd9a +--- /dev/null ++++ b/plugins/input/ogr/CMakeLists.txt +@@ -0,0 +1,11 @@ ++add_library(mapnik-input-ogr SHARED ++ ogr_converter.cpp ++ ogr_datasource.cpp ++ ogr_featureset.cpp ++ ogr_index_featureset.cpp) ++ ++target_link_libraries(mapnik-input-ogr PUBLIC mapnik ${OGR_LIBRARIES} ${GDAL_LIBRARIES}) ++set_target_properties(mapnik-input-ogr PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-ogr PROPERTIES OUTPUT_NAME "ogr") ++set_target_properties(mapnik-input-ogr PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-ogr DESTINATION bin/plugins/input) +diff --git a/plugins/input/pgraster/CMakeLists.txt b/plugins/input/pgraster/CMakeLists.txt +new file mode 100644 +index 0000000..ada5d08 +--- /dev/null ++++ b/plugins/input/pgraster/CMakeLists.txt +@@ -0,0 +1,10 @@ ++add_library(mapnik-input-pgraster SHARED ++ pgraster_datasource.cpp ++ pgraster_featureset.cpp ++ pgraster_wkb_reader.cpp) ++ ++target_link_libraries(mapnik-input-pgraster PUBLIC mapnik ${PostgreSQL_LIBRARIES}) ++set_target_properties(mapnik-input-pgraster PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-pgraster PROPERTIES OUTPUT_NAME "pgraster") ++set_target_properties(mapnik-input-pgraster PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-pgraster DESTINATION bin/plugins/input) +diff --git a/plugins/input/postgis/CMakeLists.txt b/plugins/input/postgis/CMakeLists.txt +new file mode 100644 +index 0000000..385faa3 +--- /dev/null ++++ b/plugins/input/postgis/CMakeLists.txt +@@ -0,0 +1,9 @@ ++add_library(mapnik-input-postgis SHARED ++ postgis_datasource.cpp ++ postgis_featureset.cpp ) ++ ++target_link_libraries(mapnik-input-postgis PUBLIC mapnik ${PostgreSQL_LIBRARIES}) ++set_target_properties(mapnik-input-postgis PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-postgis PROPERTIES OUTPUT_NAME "postgis") ++set_target_properties(mapnik-input-postgis PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-postgis DESTINATION bin/plugins/input) +diff --git a/plugins/input/raster/CMakeLists.txt b/plugins/input/raster/CMakeLists.txt +new file mode 100644 +index 0000000..b08be98 +--- /dev/null ++++ b/plugins/input/raster/CMakeLists.txt +@@ -0,0 +1,10 @@ ++add_library(mapnik-input-raster SHARED ++ raster_datasource.cpp ++ raster_featureset.cpp ++ raster_info.cpp) ++ ++target_link_libraries(mapnik-input-raster PUBLIC mapnik) ++set_target_properties(mapnik-input-raster PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-raster PROPERTIES OUTPUT_NAME "raster") ++set_target_properties(mapnik-input-raster PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-raster DESTINATION bin/plugins/input) +diff --git a/plugins/input/shape/CMakeLists.txt b/plugins/input/shape/CMakeLists.txt +new file mode 100644 +index 0000000..cac54dd +--- /dev/null ++++ b/plugins/input/shape/CMakeLists.txt +@@ -0,0 +1,9 @@ ++SET(INPUT_SHAPE_SOURCES ++ dbfile.cpp dbf_test.cpp shape_datasource.cpp shape_featureset.cpp shape_index_featureset.cpp shape_io.cpp shape_utils.cpp) ++ ++add_library(mapnik-input-shape SHARED ${INPUT_SHAPE_SOURCES}) ++target_link_libraries(mapnik-input-shape PUBLIC mapnik) ++set_target_properties(mapnik-input-shape PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-shape PROPERTIES OUTPUT_NAME "shape") ++set_target_properties(mapnik-input-shape PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-shape DESTINATION bin/plugins/input) +diff --git a/plugins/input/sqlite/CMakeLists.txt b/plugins/input/sqlite/CMakeLists.txt +new file mode 100644 +index 0000000..b84528e +--- /dev/null ++++ b/plugins/input/sqlite/CMakeLists.txt +@@ -0,0 +1,9 @@ ++add_library(mapnik-input-sqlite SHARED ++ sqlite_datasource.cpp ++ sqlite_featureset.cpp) ++ ++target_link_libraries(mapnik-input-sqlite PUBLIC mapnik SQLite::SQLite3) ++set_target_properties(mapnik-input-sqlite PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-sqlite PROPERTIES OUTPUT_NAME "sqlite") ++set_target_properties(mapnik-input-sqlite PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-sqlite DESTINATION bin/plugins/input) +diff --git a/plugins/input/topojson/CMakeLists.txt b/plugins/input/topojson/CMakeLists.txt +new file mode 100644 +index 0000000..aeb559b +--- /dev/null ++++ b/plugins/input/topojson/CMakeLists.txt +@@ -0,0 +1,9 @@ ++add_library(mapnik-input-topojson SHARED ++ topojson_datasource.cpp ++ topojson_featureset.cpp) ++ ++target_link_libraries(mapnik-input-topojson PUBLIC mapnik mapnik-json) ++set_target_properties(mapnik-input-topojson PROPERTIES PREFIX "") ++set_target_properties(mapnik-input-topojson PROPERTIES OUTPUT_NAME "topojson") ++set_target_properties(mapnik-input-topojson PROPERTIES SUFFIX ".input") ++install(TARGETS mapnik-input-topojson DESTINATION bin/plugins/input) +diff --git a/src/agg/CMakeLists.txt b/src/agg/CMakeLists.txt +new file mode 100644 +index 0000000..e69de29 +diff --git a/src/geometry/CMakeLists.txt b/src/geometry/CMakeLists.txt +new file mode 100644 +index 0000000..e69de29 +diff --git a/src/json/CMakeLists.txt b/src/json/CMakeLists.txt +new file mode 100644 +index 0000000..76a23b9 +--- /dev/null ++++ b/src/json/CMakeLists.txt +@@ -0,0 +1,17 @@ ++add_library(mapnik-json STATIC ++ generic_json.cpp ++ mapnik_geometry_to_geojson.cpp ++ mapnik_json_feature_collection_grammar.cpp ++ mapnik_json_feature_grammar.cpp ++ mapnik_json_generator_grammar.cpp ++ mapnik_json_geometry_grammar.cpp ++ mapnik_json_geometry_parser.cpp ++ mapnik_json_positions_grammar.cpp ++ mapnik_topojson_grammar.cpp ++) ++ ++ ++target_link_libraries(mapnik-json INTERFACE ${ICUU_LIB}) ++ ++install(TARGETS mapnik-json LIBRARY DESTINATION lib) ++target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) +diff --git a/src/wkt/CMakeLists.txt b/src/wkt/CMakeLists.txt +new file mode 100644 +index 0000000..dbaf010 +--- /dev/null ++++ b/src/wkt/CMakeLists.txt +@@ -0,0 +1,7 @@ ++add_library(mapnik-wkt STATIC ++ mapnik_wkt_grammar.cpp ++ mapnik_wkt_generator_grammar.cpp ++) ++ ++install(TARGETS mapnik-wkt LIBRARY DESTINATION lib) ++target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) +diff --git a/utils/mapnik-render/CMakeLists.txt b/utils/mapnik-render/CMakeLists.txt +new file mode 100644 +index 0000000..7cfff00 +--- /dev/null ++++ b/utils/mapnik-render/CMakeLists.txt +@@ -0,0 +1,3 @@ ++add_executable(mapnik-render mapnik-render.cpp) ++target_link_libraries(mapnik-render PRIVATE mapnik) ++install(TARGETS mapnik-render DESTINATION tools) +diff --git a/utils/shapeindex/CMakeLists.txt b/utils/shapeindex/CMakeLists.txt +new file mode 100644 +index 0000000..484200a +--- /dev/null ++++ b/utils/shapeindex/CMakeLists.txt +@@ -0,0 +1,4 @@ ++add_executable(shapeindex shapeindex.cpp) ++target_link_libraries(shapeindex PRIVATE mapnik) ++target_include_directories(shapeindex PRIVATE ../../plugins/input/shape) ++install(TARGETS shapeindex DESTINATION tools) diff --git a/ports/mapnik/0002-sqlitepixelwidth.patch b/ports/mapnik/0002-sqlitepixelwidth.patch new file mode 100644 index 00000000000000..df0e27ac13ee03 --- /dev/null +++ b/ports/mapnik/0002-sqlitepixelwidth.patch @@ -0,0 +1,120 @@ +diff --git a/plugins/input/sqlite/sqlite_datasource.cpp b/plugins/input/sqlite/sqlite_datasource.cpp +index 28add64..286edce 100644 +--- a/plugins/input/sqlite/sqlite_datasource.cpp ++++ b/plugins/input/sqlite/sqlite_datasource.cpp +@@ -67,6 +67,8 @@ sqlite_datasource::sqlite_datasource(parameters const& params) + row_offset_(*params.get("row_offset", 0)), + row_limit_(*params.get("row_limit", 0)), + intersects_token_("!intersects!"), ++ pixel_width_token_("!pixel_width!"), ++ pixel_height_token_("!pixel_height!"), + desc_(sqlite_datasource::name(), *params.get("encoding", "utf-8")), + format_(mapnik::wkbAuto) + { +@@ -211,7 +213,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params) + if (using_subquery_) + { + std::ostringstream s; +- std::string query = populate_tokens(table_); ++ std::string query = populate_tokens(table_,0,0); + s << "SELECT " << fields_ << " FROM (" << query << ") LIMIT 1"; + found_types_via_subquery = sqlite_utils::detect_types_from_subquery( + s.str(), +@@ -333,7 +335,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params) + mapnik::progress_timer __stats2__(std::clog, "sqlite_datasource::init(detect_extent)"); + #endif + // TODO - clean this up - reducing arguments +- std::string query = populate_tokens(table_); ++ std::string query = populate_tokens(table_,0,0); + if (!sqlite_utils::detect_extent(dataset_, + has_spatial_index_, + extent_, +@@ -356,7 +358,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params) + + } + +-std::string sqlite_datasource::populate_tokens(std::string const& sql) const ++std::string sqlite_datasource::populate_tokens(std::string const& sql, double pixel_width, double pixel_height) const + { + std::string populated_sql = sql; + if (boost::algorithm::ifind_first(populated_sql, intersects_token_)) +@@ -364,6 +366,19 @@ std::string sqlite_datasource::populate_tokens(std::string const& sql) const + // replace with dummy comparison that is true + boost::algorithm::ireplace_first(populated_sql, intersects_token_, "1=1"); + } ++ if (boost::algorithm::icontains(sql, pixel_width_token_)) ++ { ++ std::ostringstream ss; ++ ss << pixel_width; ++ boost::algorithm::replace_all(populated_sql, pixel_width_token_, ss.str()); ++ } ++ if (boost::algorithm::icontains(sql, pixel_height_token_)) ++ { ++ std::ostringstream ss; ++ ss << pixel_height; ++ boost::algorithm::replace_all(populated_sql, pixel_height_token_, ss.str()); ++ } ++ + return populated_sql; + } + +@@ -487,6 +502,8 @@ featureset_ptr sqlite_datasource::features(query const& q) const + mapnik::box2d const& e = q.get_bbox(); + + std::ostringstream s; ++ const double px_gw = 1.0 / std::get<0>(q.resolution()); ++ const double px_gh = 1.0 / std::get<1>(q.resolution()); + mapnik::context_ptr ctx = std::make_shared(); + + s << "SELECT " << geometry_field_; +@@ -521,10 +538,8 @@ featureset_ptr sqlite_datasource::features(query const& q) const + geometry_table_, + intersects_token_); + } +- else +- { +- query = populate_tokens(table_); +- } ++ ++ query = populate_tokens(table_,px_gw,px_gh); + + s << query ; + +@@ -601,10 +616,7 @@ featureset_ptr sqlite_datasource::features_at_point(coord2d const& pt, double to + geometry_table_, + intersects_token_); + } +- else +- { +- query = populate_tokens(table_); +- } ++ query = populate_tokens(table_,0,0); + + s << query ; + +diff --git a/plugins/input/sqlite/sqlite_datasource.hpp b/plugins/input/sqlite/sqlite_datasource.hpp +index eab71e9..be35f37 100644 +--- a/plugins/input/sqlite/sqlite_datasource.hpp ++++ b/plugins/input/sqlite/sqlite_datasource.hpp +@@ -62,10 +62,10 @@ private: + // Fill init_statements with any statements + // needed to attach auxillary databases + void parse_attachdb(std::string const& attachdb) const; +- std::string populate_tokens(std::string const& sql) const; ++ std::string populate_tokens(std::string const& sql, double pixel_width, double pixel_height) const; + + mapnik::box2d extent_; +- bool extent_initialized_; ++ bool extent_initialized_; + mapnik::datasource::datasource_t type_; + std::string dataset_name_; + std::shared_ptr dataset_; +@@ -80,6 +80,8 @@ private: + mapnik::value_integer row_limit_; + // TODO - also add to postgis.input + const std::string intersects_token_; ++ const std::string pixel_width_token_; ++ const std::string pixel_height_token_; + mapnik::layer_descriptor desc_; + mapnik::wkbFormat format_; + bool use_spatial_index_; diff --git a/ports/mapnik/0002-sqlitepixelwidth.patch.txt b/ports/mapnik/0002-sqlitepixelwidth.patch.txt new file mode 100644 index 00000000000000..df0e27ac13ee03 --- /dev/null +++ b/ports/mapnik/0002-sqlitepixelwidth.patch.txt @@ -0,0 +1,120 @@ +diff --git a/plugins/input/sqlite/sqlite_datasource.cpp b/plugins/input/sqlite/sqlite_datasource.cpp +index 28add64..286edce 100644 +--- a/plugins/input/sqlite/sqlite_datasource.cpp ++++ b/plugins/input/sqlite/sqlite_datasource.cpp +@@ -67,6 +67,8 @@ sqlite_datasource::sqlite_datasource(parameters const& params) + row_offset_(*params.get("row_offset", 0)), + row_limit_(*params.get("row_limit", 0)), + intersects_token_("!intersects!"), ++ pixel_width_token_("!pixel_width!"), ++ pixel_height_token_("!pixel_height!"), + desc_(sqlite_datasource::name(), *params.get("encoding", "utf-8")), + format_(mapnik::wkbAuto) + { +@@ -211,7 +213,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params) + if (using_subquery_) + { + std::ostringstream s; +- std::string query = populate_tokens(table_); ++ std::string query = populate_tokens(table_,0,0); + s << "SELECT " << fields_ << " FROM (" << query << ") LIMIT 1"; + found_types_via_subquery = sqlite_utils::detect_types_from_subquery( + s.str(), +@@ -333,7 +335,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params) + mapnik::progress_timer __stats2__(std::clog, "sqlite_datasource::init(detect_extent)"); + #endif + // TODO - clean this up - reducing arguments +- std::string query = populate_tokens(table_); ++ std::string query = populate_tokens(table_,0,0); + if (!sqlite_utils::detect_extent(dataset_, + has_spatial_index_, + extent_, +@@ -356,7 +358,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params) + + } + +-std::string sqlite_datasource::populate_tokens(std::string const& sql) const ++std::string sqlite_datasource::populate_tokens(std::string const& sql, double pixel_width, double pixel_height) const + { + std::string populated_sql = sql; + if (boost::algorithm::ifind_first(populated_sql, intersects_token_)) +@@ -364,6 +366,19 @@ std::string sqlite_datasource::populate_tokens(std::string const& sql) const + // replace with dummy comparison that is true + boost::algorithm::ireplace_first(populated_sql, intersects_token_, "1=1"); + } ++ if (boost::algorithm::icontains(sql, pixel_width_token_)) ++ { ++ std::ostringstream ss; ++ ss << pixel_width; ++ boost::algorithm::replace_all(populated_sql, pixel_width_token_, ss.str()); ++ } ++ if (boost::algorithm::icontains(sql, pixel_height_token_)) ++ { ++ std::ostringstream ss; ++ ss << pixel_height; ++ boost::algorithm::replace_all(populated_sql, pixel_height_token_, ss.str()); ++ } ++ + return populated_sql; + } + +@@ -487,6 +502,8 @@ featureset_ptr sqlite_datasource::features(query const& q) const + mapnik::box2d const& e = q.get_bbox(); + + std::ostringstream s; ++ const double px_gw = 1.0 / std::get<0>(q.resolution()); ++ const double px_gh = 1.0 / std::get<1>(q.resolution()); + mapnik::context_ptr ctx = std::make_shared(); + + s << "SELECT " << geometry_field_; +@@ -521,10 +538,8 @@ featureset_ptr sqlite_datasource::features(query const& q) const + geometry_table_, + intersects_token_); + } +- else +- { +- query = populate_tokens(table_); +- } ++ ++ query = populate_tokens(table_,px_gw,px_gh); + + s << query ; + +@@ -601,10 +616,7 @@ featureset_ptr sqlite_datasource::features_at_point(coord2d const& pt, double to + geometry_table_, + intersects_token_); + } +- else +- { +- query = populate_tokens(table_); +- } ++ query = populate_tokens(table_,0,0); + + s << query ; + +diff --git a/plugins/input/sqlite/sqlite_datasource.hpp b/plugins/input/sqlite/sqlite_datasource.hpp +index eab71e9..be35f37 100644 +--- a/plugins/input/sqlite/sqlite_datasource.hpp ++++ b/plugins/input/sqlite/sqlite_datasource.hpp +@@ -62,10 +62,10 @@ private: + // Fill init_statements with any statements + // needed to attach auxillary databases + void parse_attachdb(std::string const& attachdb) const; +- std::string populate_tokens(std::string const& sql) const; ++ std::string populate_tokens(std::string const& sql, double pixel_width, double pixel_height) const; + + mapnik::box2d extent_; +- bool extent_initialized_; ++ bool extent_initialized_; + mapnik::datasource::datasource_t type_; + std::string dataset_name_; + std::shared_ptr dataset_; +@@ -80,6 +80,8 @@ private: + mapnik::value_integer row_limit_; + // TODO - also add to postgis.input + const std::string intersects_token_; ++ const std::string pixel_width_token_; ++ const std::string pixel_height_token_; + mapnik::layer_descriptor desc_; + mapnik::wkbFormat format_; + bool use_spatial_index_; diff --git a/ports/mapnik/CONTROL b/ports/mapnik/CONTROL index 34bd744d543046..abfacb42e1f4a6 100644 --- a/ports/mapnik/CONTROL +++ b/ports/mapnik/CONTROL @@ -2,15 +2,15 @@ Source: mapnik Version: 3.0.22 Homepage: https://github.com/am2222/mapnik-windows/ Description: Mapnik is an open source toolkit for developing mapping applications. Compiling on windows. (unofficial port) -Build-Depends: icu, boost-locale[icu], boost-regex[icu], boost, freetype, tiff, libwebp, libxml2, harfbuzz, libpng, zlib +Build-Depends: libjpeg-turbo, tiff, libpng, libwebp, freetype[bzip2,png], icu, libxml2, harfbuzz[icu], boost-locale[icu], boost-regex[icu], boost-gil, boost-geometry, boost-property-tree, boost-filesystem, boost-system, boost-spirit, boost-program-options, boost-assign, boost-bimap, mapbox-variant, zlib Feature: CAIRO Description: Cairo renderer -Build-Depends: cairo +Build-Depends: cairo,cairomm Feature: PROJ4 Description: PROJ4 Functionalities -Build-Depends: proj4 +Build-Depends: proj4[database] Feature: INPUT_CSV Description: CSV input plugin @@ -32,11 +32,11 @@ Build-Depends: gdal Feature: INPUT_PGRASTER Description: PGRASTER input plugin -Build-Depends: libodb-pgsql +Build-Depends: libpq, libodb-pgsql Feature: INPUT_POSTGIS Description: POSTGIS input plugin -Build-Depends: libodb-pgsql +Build-Depends: libpq, libodb-pgsql Feature: INPUT_RASTER Description: RASTER input plugin diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index bbe49f4412004b..1c30981ebd0f4e 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,24 +1,34 @@ -find_program(GIT git) -set(GIT_URL "https://github.com/am2222/mapnik-windows.git") -set(GIT_REV "fdba45cd95b66576e47de2e56d30196bfc9de99d") - -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT}) - -if(NOT EXISTS "${SOURCE_PATH}/.git") - message(STATUS "Cloning and fetching submodules") - vcpkg_execute_required_process( - COMMAND ${GIT} clone --recurse-submodules ${GIT_URL} ${SOURCE_PATH} - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME clone - ) - - message(STATUS "Checkout revision ${GIT_REV}") - vcpkg_execute_required_process( - COMMAND ${GIT} checkout ${GIT_REV} - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME checkout - ) -endif() +# find_program(GIT git) +# set(GIT_URL "https://github.com/am2222/mapnik-windows.git") +# set(GIT_REV "fdba45cd95b66576e47de2e56d30196bfc9de99d") + +# set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT}) + +# if(NOT EXISTS "${SOURCE_PATH}/.git") +# message(STATUS "Cloning and fetching submodules") +# vcpkg_execute_required_process( +# COMMAND ${GIT} clone --recurse-submodules ${GIT_URL} ${SOURCE_PATH} +# WORKING_DIRECTORY ${SOURCE_PATH} +# LOGNAME clone +# ) + +# message(STATUS "Checkout revision ${GIT_REV}") +# vcpkg_execute_required_process( +# COMMAND ${GIT} checkout ${GIT_REV} +# WORKING_DIRECTORY ${SOURCE_PATH} +# LOGNAME checkout +# ) +# endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapnik/mapnik + REF v3.0.23 + SHA512 004429defd3047601b63c28bedd57d701ff88cdfb910a9958f4a10a1ac032d4d13316372122aef06eda60f2e4f67600b8842577db455f8c970009a0e86c5c1cf + HEAD_REF master + PATCHES 0001-CMakeFiles.patch 0002-sqlitepixelwidth.patch +) + message(STATUS "Adding worktree done") From 7cb32e24657679c1683d5b019a1e9d2c91c40aba Mon Sep 17 00:00:00 2001 From: am2222 Date: Tue, 9 Jun 2020 18:40:49 -0400 Subject: [PATCH 0006/1694] added mapnik cmake patch --- ports/mapnik/0001-CMakeFiles.patch.txt | 1197 ------------------ ports/mapnik/0002-sqlitepixelwidth.patch.txt | 120 -- 2 files changed, 1317 deletions(-) delete mode 100644 ports/mapnik/0001-CMakeFiles.patch.txt delete mode 100644 ports/mapnik/0002-sqlitepixelwidth.patch.txt diff --git a/ports/mapnik/0001-CMakeFiles.patch.txt b/ports/mapnik/0001-CMakeFiles.patch.txt deleted file mode 100644 index 4a68e6917070f7..00000000000000 --- a/ports/mapnik/0001-CMakeFiles.patch.txt +++ /dev/null @@ -1,1197 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 0000000..f07a5ce ---- /dev/null -+++ b/CMakeLists.txt -@@ -0,0 +1,306 @@ -+cmake_minimum_required(VERSION 3.13.4) -+project(mapnik) -+set(CMAKE_CXX_STANDARD 14) -+include(CMakeDependentOption) -+ -+ -+option(MAPNIK_STATIC_LIB "Build a static library" OFF) -+ -+option(WITH_DEMO "Build demo" OFF) -+option(WITH_VIEWER "Build viewer" OFF) -+ -+ -+option(WITH_INPUTS "Build input plugins" ON) -+ -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_CSV "Build the csv input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_GDAL "Build the gdal input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_GEOBUF "Build the geobuf input plugin" OFF "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_GEOJSON "Build the geojson input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_OGR "Build the ogr input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_PGRASTER "Build the pgraster input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_POSTGIS "Build the postgis input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_RASTER "Build the raster input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_SHAPE "Build the shape input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_SQLITE "Build the sqlite input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_TOPOJSON "Build the topojson input plugin" ON "WITH_INPUTS" ON) -+ -+MESSAGE(WITH_INPUT_POSTGIS ${WITH_INPUT_POSTGIS}}) -+ -+option(WITH_UTILS "Build the utilities" ON ) -+ -+option(WITH_GRID "Use the grid renderer" OFF) -+option(WITH_CAIRO "Use cairo" ON) -+option(WITH_PROJ4 "Use proj4" ON) -+ -+if(MSVC) -+ # Force to always compile with W4 -+ if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") -+ string(REGEX REPLACE "/W[0-4]" "/W1" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -+ else() -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W1") -+ endif() -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd\"4068\" /wd\"4661\" /wd\"4503\" ") -+ add_compile_options(/MP) -+ add_compile_options(-bigobj) #added by @am2222 -+ add_compile_definitions(ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1) #added by @am2222 for proj4 compile -+ add_definitions(-DMAPNIK_THREADSAFE) -+ -+endif() -+ -+find_package(Boost REQUIRED -+ COMPONENTS filesystem system regex program_options) -+ -+find_package(FreeType REQUIRED) -+ -+find_library(HARFBUZZ_LIB harfbuzz.lib) -+find_package(ICU REQUIRED COMPONENTS uc) -+ -+find_package(PNG REQUIRED) -+find_package(jpeg REQUIRED) -+find_package(tiff REQUIRED) -+find_package(WebP REQUIRED) -+find_package(LibXml2 REQUIRED) -+find_package(ZLIB REQUIRED) -+ -+set (MAPNIK_DEFS -+ -DHAVE_PNG -+ -DHAVE_JPEG -+ -DHAVE_TIFF -+ -DHAVE_WEBP) -+ -+set(thirdparty_include_paths ${thirdparty_include_paths} -+ ${JPEG_INCLUDE_DIR} ${WEBP_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}) -+ -+set(thirdparty_libraries ${thirdparty_libraries} -+ ${JPEG_LIBRARIES} ${WEBP_LIBRARIES} ${LIBXML2_LIBRARIES} ${HARFBUZZ_LIB}) -+ -+# AGG -+ -+include(files.cmake) -+ -+if (WITH_CAIRO) -+ find_library(CAIRO_LIB_DEBUG cairod) -+ find_library(CAIRO_LIB_RELEASE cairo) -+ find_library(CAIRO_GOBJECT_LIB_DEBUG cairo-gobjectd) -+ find_library(CAIRO_GOBJECT_LIB_RELEASE cairo-gobject) -+ find_path(CAIRO_INCLUDE_DIR cairo/cairo.h) -+ -+ set(thirdparty_include_paths ${thirdparty_include_paths} ${CAIRO_INCLUDE_DIR}) -+ set(thirdparty_libraries ${thirdparty_libraries} $<$:${CAIRO_LIB_DEBUG}> $<$:${CAIRO_LIB_RELEASE}>) -+ -+ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} -+ src/cairo/process_markers_symbolizer.cpp -+ src/cairo/process_group_symbolizer.cpp -+ -+ src/cairo/cairo_context.cpp -+ src/cairo/cairo_render_vector.cpp -+ src/cairo/cairo_renderer.cpp -+ src/cairo/process_building_symbolizer.cpp -+ src/cairo/process_debug_symbolizer.cpp -+ src/cairo/process_line_pattern_symbolizer.cpp -+ src/cairo/process_line_symbolizer.cpp -+ src/cairo/process_point_symbolizer.cpp -+ src/cairo/process_polygon_pattern_symbolizer.cpp -+ src/cairo/process_polygon_symbolizer.cpp -+ src/cairo/process_raster_symbolizer.cpp -+ src/cairo/process_text_symbolizer.cpp) -+ -+ set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_CAIRO) -+endif() -+message(STATUS "Cairo renderer " ${WITH_CAIRO}) -+ -+if (WITH_PROJ4) -+ find_package(PROJ4 REQUIRED) -+ set(thirdparty_include_paths ${thirdparty_include_paths} ${PROJ4_INCLUDE_DIRS}) -+ set(thirdparty_libraries ${thirdparty_libraries} ${PROJ4_LIBRARIES}) -+ -+ set(MAPNIK_DEFS ${MAPNIK_DEFS} -DMAPNIK_USE_PROJ4) -+endif() -+ -+if (WITH_GRID) -+ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} -+ src/grid/grid.cpp -+ src/grid/grid_renderer.cpp -+ src/grid/process_building_symbolizer.cpp -+ src/grid/process_line_pattern_symbolizer.cpp -+ src/grid/process_line_symbolizer.cpp -+ src/grid/process_point_symbolizer.cpp -+ src/grid/process_polygon_pattern_symbolizer.cpp -+ src/grid/process_polygon_symbolizer.cpp -+ src/grid/process_raster_symbolizer.cpp -+ src/grid/process_shield_symbolizer.cpp -+ src/grid/process_text_symbolizer.cpp) -+ set(MAPNIK_DEFS ${MAPNIK_DEFS} -DGRID_RENDERER) -+ENDIF() -+message(STATUS "Grid renderer: " ${WITH_GRID}) -+ -+set(MAPNIK_SOURCES ${MAPNIK_SOURCES} -+ src/svg/output/svg_output_grammars.cpp -+ src/svg/output/svg_renderer.cpp -+ src/svg/output/svg_generator.cpp -+ src/svg/output/svg_output_attributes.cpp -+ src/svg/output/process_symbolizers.cpp -+ src/svg/output/process_line_symbolizer.cpp -+ src/svg/output/process_polygon_symbolizer.cpp) -+set(MAPNIK_DEFS ${MAPNIK_DEFS} -DSVG_RENDERER) -+ -+ -+set(MAPNIK_SOURCES ${MAPNIK_SOURCES} -+ src/jpeg_reader.cpp -+ src/libxml2_loader.cpp -+ src/png_reader.cpp -+ src/tiff_reader.cpp -+ src/webp_reader.cpp -+ ) -+ -+#set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/rapidxml_loader.cpp) -+ -+set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2 -DBOOST_REGEX_HAS_ICU) -+ -+set(mapnik_include_paths -+ include -+ deps -+ deps/agg/include -+ deps/mapbox/geometry/include -+ deps/mapbox/polylabel/include -+ deps/mapbox/variant/include) -+ -+ -+ -+include_directories(${mapnik_include_paths} ${thirdparty_include_paths}) -+ -+if (MAPNIK_STATIC_LIB) -+ message(STATUS "Building static library") -+ add_library(mapnik STATIC ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) -+ target_compile_definitions(mapnik PUBLIC -DMAPNIK_STATICLIB) -+ set(MAPNIK_LIB_DEFINITION -DMAPNIK_STATICLIB) -+else () -+ message(STATUS "Building shared library") -+ add_library(mapnik SHARED ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) -+ target_compile_definitions(mapnik PRIVATE -DMAPNIK_EXPORTS) -+ set(MAPNIK_LIB_DEFINITION ) -+endif () -+ -+target_compile_definitions(mapnik PUBLIC ${MAPNIK_DEFS}) -+ -+target_include_directories(mapnik INTERFACE ${mapnik_include_paths} ${thirdparty_include_paths} ) -+target_link_libraries(mapnik PUBLIC -+ ${thirdparty_libraries} -+ Boost::boost Boost::filesystem Boost::system Boost::regex Boost::program_options Boost::system -+ Freetype::Freetype -+ ICU::uc -+ PNG::PNG -+ TIFF::TIFF -+ ZLIB::ZLIB) -+ -+install(TARGETS mapnik -+ LIBRARY DESTINATION lib) -+ -+install(DIRECTORY include/ DESTINATION include/ CONFIGURATIONS Release) -+ -+add_subdirectory(src/json) -+add_subdirectory(src/wkt) -+ -+# ideally we should also generate mapnik-config -+ -+if (WITH_INPUT_CSV) -+ add_subdirectory(plugins/input/csv) -+endif() -+ -+if (WITH_INPUT_GDAL) -+ find_package(GDAL REQUIRED) -+ add_subdirectory(plugins/input/gdal) -+endif() -+ -+if (WITH_INPUT_GEOBUF) -+ # TODO insert protozero here -+ add_subdirectory(plugins/input/geobuf) -+endif() -+ -+if (WITH_INPUT_GEOJSON) -+ add_subdirectory(plugins/input/geojson) -+endif() -+ -+if (WITH_INPUT_OGR) -+ add_subdirectory(plugins/input/ogr) -+endif() -+ -+if (WITH_INPUT_PGRASTER) -+ find_package(PostgreSQL REQUIRED) -+ add_subdirectory(plugins/input/pgraster) -+endif() -+ -+if (WITH_INPUT_POSTGIS) -+ find_package(PostgreSQL REQUIRED) -+ add_subdirectory(plugins/input/postgis) -+endif() -+ -+if (WITH_INPUT_RASTER) -+ add_subdirectory(plugins/input/raster) -+endif() -+ -+if (WITH_INPUT_SHAPE) -+ add_subdirectory(plugins/input/shape) -+endif() -+ -+if (WITH_INPUT_SQLITE) -+ find_package(sqlite3 REQUIRED) -+ add_subdirectory(plugins/input/sqlite) -+endif() -+ -+if (WITH_INPUT_TOPOJSON) -+ add_subdirectory(plugins/input/topojson) -+endif() -+ -+if (WITH_INPUTS) -+ message(STATUS "Input plugins:") -+ if(WITH_INPUT_CSV ) -+ message(STATUS " - csv ") -+ endif() -+ if(WITH_INPUT_GDAL ) -+ message(STATUS " - gdal ") -+ endif() -+ if(WITH_INPUT_GEOBUF ) -+ message(STATUS " - geobuf ") -+ endif() -+ if(WITH_INPUT_GEOJSON ) -+ message(STATUS " - geojson ") -+ endif() -+ if(WITH_INPUT_OGR ) -+ message(STATUS " - ogr ") -+ endif() -+ if(WITH_INPUT_PGRASTER ) -+ message(STATUS " - pgraster") -+ endif() -+ if(WITH_INPUT_POSTGIS ) -+ message(STATUS " - postgis ") -+ endif() -+ if(WITH_INPUT_RASTER ) -+ message(STATUS " - raster ") -+ endif() -+ if(WITH_INPUT_SHAPE ) -+ message(STATUS " - shape ") -+ endif() -+ if(WITH_INPUT_SQLITE ) -+ message(STATUS " - sqlite ") -+ endif() -+ if(WITH_INPUT_TOPOJSON ) -+ message(STATUS " - topojson") -+ endif() -+else() -+ message(STATUS "Input plugins OFF") -+endif() -+ -+if(WITH_DEMO) -+ add_subdirectory(demo/c++) -+endif() -+ -+if(WITH_VIEWER) -+ find_package(Qt5 COMPONENTS Widgets REQUIRED) -+ add_subdirectory(demo/viewer) -+endif() -+ -+if(WITH_UTILS) -+ add_subdirectory(utils/mapnik-render) -+ add_subdirectory(utils/shapeindex) -+endif() -diff --git a/demo/c++/CMakeLists.txt b/demo/c++/CMakeLists.txt -new file mode 100644 -index 0000000..a0a48b8 ---- /dev/null -+++ b/demo/c++/CMakeLists.txt -@@ -0,0 +1,4 @@ -+add_executable(mapnik-demo rundemo.cpp) -+add_dependencies(mapnik-demo mapnik) -+target_link_libraries(mapnik-demo PRIVATE mapnik) -+install(TARGETS mapnik-demo DESTINATION bin) -diff --git a/demo/viewer/CMakeLists.txt b/demo/viewer/CMakeLists.txt -new file mode 100644 -index 0000000..86034a0 ---- /dev/null -+++ b/demo/viewer/CMakeLists.txt -@@ -0,0 +1,27 @@ -+add_executable(mapnik-viewer -+ about_dialog.cpp -+ info_dialog.cpp -+ layerdelegate.cpp -+ layerlistmodel.cpp -+ layerwidget.cpp -+ layer_info_dialog.cpp -+ main.cpp -+ mainwindow.cpp -+ mapwidget.cpp -+ styles_model.cpp -+ -+ forms/about.ui -+ forms/info.ui -+ forms/layer_info.ui -+ -+ mapnik_viewer.qrc) -+ -+set_target_properties(mapnik-viewer PROPERTIES -+ AUTOUIC_SEARCH_PATHS forms -+ AUTORCC ON -+ AUTOUIC ON -+ AUTOMOC ON) -+ -+add_dependencies(mapnik-viewer mapnik) -+target_link_libraries(mapnik-viewer PRIVATE mapnik Qt5::Widgets) -+install(TARGETS mapnik-viewer DESTINATION bin) -diff --git a/files.cmake b/files.cmake -new file mode 100644 -index 0000000..b9d767f ---- /dev/null -+++ b/files.cmake -@@ -0,0 +1,557 @@ -+set (MAPNIK_SOURCES -+ src/cairo_io.cpp -+ src/color.cpp -+ src/color_factory.cpp -+ src/config_error.cpp -+ src/conversions.cpp -+ src/css_color_grammar.cpp -+ src/dasharray_parser.cpp -+ src/datasource_cache.cpp -+ src/datasource_cache_static.cpp -+ src/debug.cpp -+ src/box2d.cpp -+ src/expression.cpp -+ src/expression_grammar.cpp -+ src/expression_node.cpp -+ src/expression_string.cpp -+ src/feature_kv_iterator.cpp -+ src/feature_style_processor.cpp -+ src/feature_type_style.cpp -+ src/font_engine_freetype.cpp -+ src/font_set.cpp -+ src/fs.cpp -+ src/function_call.cpp -+ src/geometry/interior.cpp -+ src/geometry_envelope.cpp -+ src/geometry_reprojection.cpp -+ src/gradient.cpp -+ src/group/group_layout_manager.cpp -+ src/group/group_rule.cpp -+ src/group/group_symbolizer_helper.cpp -+ src/image.cpp -+ src/image_any.cpp -+ src/image_compositing.cpp -+ src/image_copy.cpp -+ src/image_filter_grammar.cpp -+ src/image_filter_types.cpp -+ src/image_options.cpp -+ src/image_reader.cpp -+ src/image_scaling.cpp -+ src/image_util.cpp -+ src/image_util_jpeg.cpp -+ src/image_util_png.cpp -+ src/image_util_tiff.cpp -+ src/image_util_webp.cpp -+ src/image_view.cpp -+ src/image_view_any.cpp -+ src/layer.cpp -+ src/load_map.cpp -+ src/map.cpp -+ src/math.cpp -+ src/mapped_memory_cache.cpp -+ src/marker_cache.cpp -+ src/marker_helpers.cpp -+ src/memory_datasource.cpp -+ src/palette.cpp -+ src/params.cpp -+ src/parse_path.cpp -+ src/parse_transform.cpp -+ src/plugin.cpp -+ src/proj_transform.cpp -+ src/projection.cpp -+ src/raster_colorizer.cpp -+ src/renderer_common.cpp -+ src/renderer_common/pattern_alignment.cpp -+ src/renderer_common/render_group_symbolizer.cpp -+ src/renderer_common/render_markers_symbolizer.cpp -+ src/renderer_common/render_pattern.cpp -+ src/renderer_common/render_thunk_extractor.cpp -+ src/request.cpp -+ src/rule.cpp -+ src/save_map.cpp -+ src/scale_denominator.cpp -+ src/simplify.cpp -+ src/svg/svg_parser.cpp -+ src/svg/svg_path_parser.cpp -+ src/svg/svg_points_parser.cpp -+ src/svg/svg_transform_parser.cpp -+ src/symbolizer.cpp -+ src/symbolizer_enumerations.cpp -+ src/symbolizer_keys.cpp -+ src/text/face.cpp -+ src/text/font_feature_settings.cpp -+ src/text/font_library.cpp -+ src/text/formatting/base.cpp -+ src/text/formatting/format.cpp -+ src/text/formatting/layout.cpp -+ src/text/formatting/list.cpp -+ src/text/formatting/registry.cpp -+ src/text/formatting/text.cpp -+ src/text/glyph_positions.cpp -+ src/text/itemizer.cpp -+ src/text/placement_finder.cpp -+ src/text/placements/base.cpp -+ src/text/placements/dummy.cpp -+ src/text/placements/list.cpp -+ src/text/placements/registry.cpp -+ src/text/placements/simple.cpp -+ src/text/properties_util.cpp -+ src/text/renderer.cpp -+ src/text/scrptrun.cpp -+ src/text/symbolizer_helpers.cpp -+ src/text/text_layout.cpp -+ src/text/text_line.cpp -+ src/text/text_properties.cpp -+ src/transform_expression.cpp -+ src/transform_expression_grammar.cpp -+ src/twkb.cpp -+ src/unicode.cpp -+ src/util/utf_conv_win.cpp -+ src/value.cpp -+ src/vertex_adapters.cpp -+ src/vertex_cache.cpp -+ src/warp.cpp -+ src/well_known_srs.cpp -+ src/wkb.cpp -+ src/xml_tree.cpp -+ ) -+ -+ -+set(MAPNIK_AGG_SOURCES -+ src/agg/agg_renderer.cpp -+ src/agg/process_building_symbolizer.cpp -+ src/agg/process_debug_symbolizer.cpp -+ src/agg/process_dot_symbolizer.cpp -+ src/agg/process_group_symbolizer.cpp -+ src/agg/process_line_pattern_symbolizer.cpp -+ src/agg/process_line_symbolizer.cpp -+ src/agg/process_markers_symbolizer.cpp -+ src/agg/process_point_symbolizer.cpp -+ src/agg/process_polygon_pattern_symbolizer.cpp -+ src/agg/process_polygon_symbolizer.cpp -+ src/agg/process_raster_symbolizer.cpp -+ src/agg/process_shield_symbolizer.cpp -+ src/agg/process_text_symbolizer.cpp) -+ -+ -+set(AGG_SOURCES -+ deps/agg/src/agg_arc.cpp -+ deps/agg/src/agg_arrowhead.cpp -+ deps/agg/src/agg_bezier_arc.cpp -+ deps/agg/src/agg_bspline.cpp -+ deps/agg/src/agg_curves.cpp -+ deps/agg/src/agg_embedded_raster_fonts.cpp -+ deps/agg/src/agg_gsv_text.cpp -+ deps/agg/src/agg_image_filters.cpp -+ deps/agg/src/agg_line_aa_basics.cpp -+ deps/agg/src/agg_line_profile_aa.cpp -+ deps/agg/src/agg_pixfmt_rgba.cpp -+ deps/agg/src/agg_rounded_rect.cpp -+ deps/agg/src/agg_sqrt_tables.cpp -+ deps/agg/src/agg_trans_affine.cpp -+ deps/agg/src/agg_trans_double_path.cpp -+ deps/agg/src/agg_trans_single_path.cpp -+ deps/agg/src/agg_trans_warp_magnifier.cpp -+ deps/agg/src/agg_vcgen_bspline.cpp -+ deps/agg/src/agg_vcgen_contour.cpp -+ deps/agg/src/agg_vcgen_dash.cpp -+ deps/agg/src/agg_vcgen_markers_term.cpp -+ deps/agg/src/agg_vcgen_stroke.cpp -+ deps/agg/src/agg_vcgen_smooth_poly1.cpp -+ deps/agg/src/agg_vpgen_clip_polygon.cpp -+ deps/agg/src/agg_vpgen_clip_polyline.cpp -+ deps/agg/src/agg_vpgen_segmentator.cpp ) -+ -+set(MAPNIK_INC -+ mapnik/adaptive_smooth.hpp -+ mapnik/agg_helpers.hpp -+ mapnik/agg_pattern_source.hpp -+ mapnik/agg_rasterizer.hpp -+ mapnik/agg_renderer.hpp -+ mapnik/agg_render_marker.hpp -+ mapnik/attribute.hpp -+ mapnik/attribute_collector.hpp -+ mapnik/attribute_descriptor.hpp -+ mapnik/boolean.hpp -+ mapnik/boost_spirit_instantiate.hpp -+ mapnik/cairo_io.hpp -+ mapnik/color.hpp -+ mapnik/color_factory.hpp -+ mapnik/config.hpp -+ mapnik/config_error.hpp -+ mapnik/coord.hpp -+ mapnik/css_color_grammar.hpp -+ mapnik/css_color_grammar_impl.hpp -+ mapnik/cxx11_support.hpp -+ mapnik/datasource.hpp -+ mapnik/datasource_cache.hpp -+ mapnik/datasource_geometry_type.hpp -+ mapnik/debug.hpp -+ mapnik/enumeration.hpp -+ mapnik/evaluate_global_attributes.hpp -+ mapnik/expression.hpp -+ mapnik/expression_evaluator.hpp -+ mapnik/expression_grammar.hpp -+ mapnik/expression_grammar_config.hpp -+ mapnik/expression_grammar_def.hpp -+ mapnik/expression_node.hpp -+ mapnik/expression_node_types.hpp -+ mapnik/expression_string.hpp -+ mapnik/extend_converter.hpp -+ mapnik/factory.hpp -+ mapnik/feature.hpp -+ mapnik/featureset.hpp -+ mapnik/feature_factory.hpp -+ mapnik/feature_kv_iterator.hpp -+ mapnik/feature_layer_desc.hpp -+ mapnik/feature_style_processor.hpp -+ mapnik/feature_style_processor_context.hpp -+ mapnik/feature_style_processor_impl.hpp -+ mapnik/feature_type_style.hpp -+ mapnik/filter_featureset.hpp -+ mapnik/font_engine_freetype.hpp -+ mapnik/font_set.hpp -+ mapnik/function_call.hpp -+ mapnik/geometry.hpp -+ mapnik/geom_util.hpp -+ mapnik/global.hpp -+ mapnik/gradient.hpp -+ mapnik/grid_vertex_converter.hpp -+ mapnik/hextree.hpp -+ mapnik/hit_test_filter.hpp -+ mapnik/image.hpp -+ mapnik/image_any.hpp -+ mapnik/image_compositing.hpp -+ mapnik/image_copy.hpp -+ mapnik/image_filter.hpp -+ mapnik/image_filter_grammar.hpp -+ mapnik/image_filter_grammar_def.hpp -+ mapnik/image_filter_types.hpp -+ mapnik/image_impl.hpp -+ mapnik/image_null.hpp -+ mapnik/image_options.hpp -+ mapnik/image_reader.hpp -+ mapnik/image_scaling.hpp -+ mapnik/image_scaling_traits.hpp -+ mapnik/image_util.hpp -+ mapnik/image_util_jpeg.hpp -+ mapnik/image_util_png.hpp -+ mapnik/image_util_tiff.hpp -+ mapnik/image_util_webp.hpp -+ mapnik/image_view.hpp -+ mapnik/image_view_any.hpp -+ mapnik/image_view_impl.hpp -+ mapnik/image_view_null.hpp -+ mapnik/init_priority.hpp -+ mapnik/jpeg_io.hpp -+ mapnik/label_collision_detector.hpp -+ mapnik/layer.hpp -+ mapnik/load_map.hpp -+ mapnik/make_unique.hpp -+ mapnik/map.hpp -+ mapnik/mapped_memory_cache.hpp -+ mapnik/marker.hpp -+ mapnik/markers_placement.hpp -+ mapnik/marker_cache.hpp -+ mapnik/marker_helpers.hpp -+ mapnik/memory_datasource.hpp -+ mapnik/memory_featureset.hpp -+ mapnik/octree.hpp -+ mapnik/offset_converter.hpp -+ mapnik/palette.hpp -+ mapnik/params.hpp -+ mapnik/params_impl.hpp -+ mapnik/parse_path.hpp -+ mapnik/path.hpp -+ mapnik/path_expression.hpp -+ mapnik/path_expression_grammar.hpp -+ mapnik/path_expression_grammar_def.hpp -+ mapnik/pixel_position.hpp -+ mapnik/pixel_types.hpp -+ mapnik/plugin.hpp -+ mapnik/png_io.hpp -+ mapnik/pool.hpp -+ mapnik/projection.hpp -+ mapnik/proj_strategy.hpp -+ mapnik/proj_transform.hpp -+ mapnik/ptree_helpers.hpp -+ mapnik/quad_tree.hpp -+ mapnik/query.hpp -+ mapnik/raster.hpp -+ mapnik/raster_colorizer.hpp -+ mapnik/renderer_common.hpp -+ mapnik/request.hpp -+ mapnik/rule.hpp -+ mapnik/rule_cache.hpp -+ mapnik/safe_cast.hpp -+ mapnik/save_map.hpp -+ mapnik/scale_denominator.hpp -+ mapnik/simplify.hpp -+ mapnik/simplify_converter.hpp -+ mapnik/span_image_filter.hpp -+ mapnik/sql_utils.hpp -+ mapnik/sse.hpp -+ mapnik/stringify_macro.hpp -+ mapnik/symbolizer.hpp -+ mapnik/symbolizer_base.hpp -+ mapnik/symbolizer_default_values.hpp -+ mapnik/symbolizer_dispatch.hpp -+ mapnik/symbolizer_enumerations.hpp -+ mapnik/symbolizer_hash.hpp -+ mapnik/symbolizer_keys.hpp -+ mapnik/symbolizer_utils.hpp -+ mapnik/tiff_io.hpp -+ mapnik/timer.hpp -+ mapnik/tolerance_iterator.hpp -+ mapnik/transform_path_adapter.hpp -+ mapnik/unicode.hpp -+ mapnik/value.hpp -+ mapnik/version.hpp -+ mapnik/vertex.hpp -+ mapnik/vertex_adapters.hpp -+ mapnik/vertex_cache.hpp -+ mapnik/vertex_converters.hpp -+ mapnik/vertex_processor.hpp -+ mapnik/vertex_vector.hpp -+ mapnik/view_strategy.hpp -+ mapnik/view_transform.hpp -+ mapnik/warning_ignore.hpp -+ mapnik/warning_ignore_agg.hpp -+ mapnik/warp.hpp -+ mapnik/webp_io.hpp -+ mapnik/well_known_srs.hpp -+ mapnik/wkb.hpp -+ mapnik/xml_attribute_cast.hpp -+ mapnik/xml_loader.hpp -+ mapnik/xml_node.hpp -+ mapnik/xml_tree.hpp -+ mapnik/geometry/boost_adapters.hpp -+ mapnik/geometry/boost_spirit_karma_adapter.hpp -+ mapnik/geometry/box2d.hpp -+ mapnik/geometry/box2d_impl.hpp -+ mapnik/geometry/centroid.hpp -+ mapnik/geometry/closest_point.hpp -+ mapnik/geometry/correct.hpp -+ mapnik/geometry/envelope.hpp -+ mapnik/geometry/envelope_impl.hpp -+ mapnik/geometry/fusion_adapted.hpp -+ mapnik/geometry/geometry_type.hpp -+ mapnik/geometry/geometry_types.hpp -+ mapnik/geometry/interior.hpp -+ mapnik/geometry/is_empty.hpp -+ mapnik/geometry/is_simple.hpp -+ mapnik/geometry/is_valid.hpp -+ mapnik/geometry/line_string.hpp -+ mapnik/geometry/multi_line_string.hpp -+ mapnik/geometry/multi_point.hpp -+ mapnik/geometry/multi_polygon.hpp -+ mapnik/geometry/point.hpp -+ mapnik/geometry/polygon.hpp -+ mapnik/geometry/polygon_vertex_processor.hpp -+ mapnik/geometry/polylabel.hpp -+ mapnik/geometry/remove_empty.hpp -+ mapnik/geometry/reprojection.hpp -+ mapnik/geometry/reprojection_impl.hpp -+ mapnik/geometry/strategy.hpp -+ mapnik/geometry/to_path.hpp -+ mapnik/geometry/transform.hpp -+ mapnik/csv/csv_grammar_x3.hpp -+ mapnik/csv/csv_grammar_x3_def.hpp -+ mapnik/csv/csv_types.hpp -+ mapnik/svg/geometry_svg_generator.hpp -+ mapnik/svg/geometry_svg_generator_impl.hpp -+ mapnik/svg/svg_converter.hpp -+ mapnik/svg/svg_grammar_config_x3.hpp -+ mapnik/svg/svg_parser.hpp -+ mapnik/svg/svg_parser_exception.hpp -+ mapnik/svg/svg_path_adapter.hpp -+ mapnik/svg/svg_path_attributes.hpp -+ mapnik/svg/svg_path_commands.hpp -+ mapnik/svg/svg_path_grammar_x3.hpp -+ mapnik/svg/svg_path_grammar_x3_def.hpp -+ mapnik/svg/svg_path_parser.hpp -+ mapnik/svg/svg_renderer_agg.hpp -+ mapnik/svg/svg_storage.hpp -+ mapnik/svg/svg_transform_grammar_x3.hpp -+ mapnik/svg/svg_transform_grammar_x3_def.hpp -+ mapnik/wkt/wkt_factory.hpp -+ mapnik/wkt/wkt_generator_grammar.hpp -+ mapnik/wkt/wkt_generator_grammar_impl.hpp -+ mapnik/wkt/wkt_grammar_x3.hpp -+ mapnik/wkt/wkt_grammar_x3_def.hpp -+ mapnik/cairo/cairo_context.hpp -+ mapnik/cairo/cairo_image_util.hpp -+ mapnik/cairo/cairo_renderer.hpp -+ mapnik/cairo/cairo_render_vector.hpp -+ mapnik/cairo/render_polygon_pattern.hpp -+ mapnik/grid/grid.hpp -+ mapnik/grid/grid_pixel.hpp -+ mapnik/grid/grid_pixfmt.hpp -+ mapnik/grid/grid_rasterizer.hpp -+ mapnik/grid/grid_renderer.hpp -+ mapnik/grid/grid_renderer_base.hpp -+ mapnik/grid/grid_rendering_buffer.hpp -+ mapnik/grid/grid_render_marker.hpp -+ mapnik/grid/grid_view.hpp -+ mapnik/json/attribute_value_visitor.hpp -+ mapnik/json/create_feature.hpp -+ mapnik/json/create_geometry.hpp -+ mapnik/json/extract_bounding_boxes.hpp -+ mapnik/json/extract_bounding_boxes_config.hpp -+ mapnik/json/feature_generator_grammar.hpp -+ mapnik/json/feature_generator_grammar_impl.hpp -+ mapnik/json/feature_grammar_x3.hpp -+ mapnik/json/feature_grammar_x3_def.hpp -+ mapnik/json/feature_parser.hpp -+ mapnik/json/generic_json_grammar_x3.hpp -+ mapnik/json/generic_json_grammar_x3_def.hpp -+ mapnik/json/geojson_grammar_x3.hpp -+ mapnik/json/geojson_grammar_x3_def.hpp -+ mapnik/json/geometry_generator_grammar.hpp -+ mapnik/json/geometry_generator_grammar_impl.hpp -+ mapnik/json/geometry_parser.hpp -+ mapnik/json/json_grammar_config.hpp -+ mapnik/json/json_value.hpp -+ mapnik/json/parse_feature.hpp -+ mapnik/json/positions_grammar_x3.hpp -+ mapnik/json/positions_grammar_x3_def.hpp -+ mapnik/json/positions_x3.hpp -+ mapnik/json/properties_generator_grammar.hpp -+ mapnik/json/properties_generator_grammar_impl.hpp -+ mapnik/json/stringifier.hpp -+ mapnik/json/topojson_grammar_x3.hpp -+ mapnik/json/topojson_grammar_x3_def.hpp -+ mapnik/json/topojson_utils.hpp -+ mapnik/json/topology.hpp -+ mapnik/json/unicode_string_grammar_x3.hpp -+ mapnik/json/unicode_string_grammar_x3_def.hpp -+ mapnik/json/value_converters.hpp -+ mapnik/util/char_array_buffer.hpp -+ mapnik/util/const_rendering_buffer.hpp -+ mapnik/util/container_adapter.hpp -+ mapnik/util/conversions.hpp -+ mapnik/util/dasharray_parser.hpp -+ mapnik/util/featureset_buffer.hpp -+ mapnik/util/feature_to_geojson.hpp -+ mapnik/util/file_io.hpp -+ mapnik/util/fs.hpp -+ mapnik/util/geometry_to_ds_type.hpp -+ mapnik/util/geometry_to_geojson.hpp -+ mapnik/util/geometry_to_svg.hpp -+ mapnik/util/geometry_to_wkb.hpp -+ mapnik/util/geometry_to_wkt.hpp -+ mapnik/util/hsl.hpp -+ mapnik/util/is_clockwise.hpp -+ mapnik/util/math.hpp -+ mapnik/util/name_to_int.hpp -+ mapnik/util/noncopyable.hpp -+ mapnik/util/path_iterator.hpp -+ mapnik/util/rounding_cast.hpp -+ mapnik/util/singleton.hpp -+ mapnik/util/spatial_index.hpp -+ mapnik/util/spirit_transform_attribute.hpp -+ mapnik/util/timer.hpp -+ mapnik/util/trim.hpp -+ mapnik/util/utf_conv_win.hpp -+ mapnik/util/variant.hpp -+ mapnik/util/variant_io.hpp -+ mapnik/group/group_layout.hpp -+ mapnik/group/group_layout_manager.hpp -+ mapnik/group/group_rule.hpp -+ mapnik/group/group_symbolizer_helper.hpp -+ mapnik/group/group_symbolizer_properties.hpp -+ mapnik/text/color_font_renderer.hpp -+ mapnik/text/evaluated_format_properties_ptr.hpp -+ mapnik/text/face.hpp -+ mapnik/text/font_feature_settings.hpp -+ mapnik/text/font_library.hpp -+ mapnik/text/glyph_info.hpp -+ mapnik/text/glyph_positions.hpp -+ mapnik/text/harfbuzz_shaper.hpp -+ mapnik/text/icu_shaper.hpp -+ mapnik/text/itemizer.hpp -+ mapnik/text/placement_finder.hpp -+ mapnik/text/placement_finder_impl.hpp -+ mapnik/text/properties_util.hpp -+ mapnik/text/renderer.hpp -+ mapnik/text/rotation.hpp -+ mapnik/text/scrptrun.hpp -+ mapnik/text/symbolizer_helpers.hpp -+ mapnik/text/text_layout.hpp -+ mapnik/text/text_line.hpp -+ mapnik/text/text_properties.hpp -+ mapnik/text/placements/base.hpp -+ mapnik/text/placements/dummy.hpp -+ mapnik/text/placements/list.hpp -+ mapnik/text/placements/registry.hpp -+ mapnik/text/placements/simple.hpp -+ mapnik/text/formatting/base.hpp -+ mapnik/text/formatting/format.hpp -+ mapnik/text/formatting/layout.hpp -+ mapnik/text/formatting/list.hpp -+ mapnik/text/formatting/registry.hpp -+ mapnik/text/formatting/text.hpp -+ mapnik/transform/parse_transform.hpp -+ mapnik/transform/transform_expression.hpp -+ mapnik/transform/transform_expression_grammar_x3.hpp -+ mapnik/transform/transform_expression_grammar_x3_def.hpp -+ mapnik/transform/transform_processor.hpp -+ mapnik/markers_placements/basic.hpp -+ mapnik/markers_placements/interior.hpp -+ mapnik/markers_placements/line.hpp -+ mapnik/markers_placements/point.hpp -+ mapnik/markers_placements/polylabel.hpp -+ mapnik/markers_placements/vertex_first.hpp -+ mapnik/markers_placements/vertex_last.hpp -+ mapnik/geometry/boost_adapters.hpp -+ mapnik/geometry/boost_spirit_karma_adapter.hpp -+ mapnik/geometry/box2d.hpp -+ mapnik/geometry/box2d_impl.hpp -+ mapnik/geometry/centroid.hpp -+ mapnik/geometry/closest_point.hpp -+ mapnik/geometry/correct.hpp -+ mapnik/geometry/envelope.hpp -+ mapnik/geometry/envelope_impl.hpp -+ mapnik/geometry/fusion_adapted.hpp -+ mapnik/geometry/geometry_type.hpp -+ mapnik/geometry/geometry_types.hpp -+ mapnik/geometry/interior.hpp -+ mapnik/geometry/is_empty.hpp -+ mapnik/geometry/is_simple.hpp -+ mapnik/geometry/is_valid.hpp -+ mapnik/geometry/line_string.hpp -+ mapnik/geometry/multi_line_string.hpp -+ mapnik/geometry/multi_point.hpp -+ mapnik/geometry/multi_polygon.hpp -+ mapnik/geometry/point.hpp -+ mapnik/geometry/polygon.hpp -+ mapnik/geometry/polygon_vertex_processor.hpp -+ mapnik/geometry/polylabel.hpp -+ mapnik/geometry/remove_empty.hpp -+ mapnik/geometry/reprojection.hpp -+ mapnik/geometry/reprojection_impl.hpp -+ mapnik/geometry/strategy.hpp -+ mapnik/geometry/to_path.hpp -+ mapnik/geometry/transform.hpp -+ mapnik/value/error.hpp -+ mapnik/value/hash.hpp -+ mapnik/value/types.hpp) -+ -+set(MAPNIK_INC ${MAPNIK_INC} -+ mapnik/svg/output/svg_generator.hpp -+ mapnik/svg/output/svg_output_attributes.hpp -+ mapnik/svg/output/svg_output_grammars.hpp -+ mapnik/svg/output/svg_output_grammars_impl.hpp -+ mapnik/svg/output/svg_path_iterator.hpp -+ mapnik/svg/output/svg_renderer.hpp) -+ -+set(MAPNIK_INC ${MAPNIK_INC} -+ mapnik/grid/grid.hpp -+ mapnik/grid/grid_pixel.hpp -+ mapnik/grid/grid_pixfmt.hpp -+ mapnik/grid/grid_rasterizer.hpp -+ mapnik/grid/grid_renderer.hpp -+ mapnik/grid/grid_renderer_base.hpp -+ mapnik/grid/grid_rendering_buffer.hpp -+ mapnik/grid/grid_render_marker.hpp -+ mapnik/grid/grid_view.hpp) -\ No newline at end of file -diff --git a/include/mapnik/config.hpp b/include/mapnik/config.hpp -index a9168e5..9bdcad4 100644 ---- a/include/mapnik/config.hpp -+++ b/include/mapnik/config.hpp -@@ -30,8 +30,10 @@ - # define MAPNIK_IMP __declspec (dllimport) - # ifdef MAPNIK_EXPORTS - # define MAPNIK_DECL __declspec (dllexport) --# else -+# elif !defined(MAPNIK_STATICLIB) - # define MAPNIK_DECL __declspec (dllimport) -+# else -+# define MAPNIK_DECL - # endif - # pragma warning( disable: 4251 ) - # pragma warning( disable: 4275 ) -diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp -index aae2bf3..6484dd3 100644 ---- a/include/mapnik/geometry.hpp -+++ b/include/mapnik/geometry.hpp -@@ -146,7 +146,7 @@ struct geometry : geometry_base - { - using coord_type = T; - --#if __cpp_inheriting_constructors >= 200802 -+#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) - - using geometry_base::geometry_base; - -diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp -index 65c04c4..6c04609 100644 ---- a/include/mapnik/json/generic_json.hpp -+++ b/include/mapnik/json/generic_json.hpp -@@ -57,7 +57,7 @@ using json_value_base = mapnik::util::variant >; - struct json_value : json_value_base - { --#if __cpp_inheriting_constructors >= 200802 -+#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) - - using json_value_base::json_value_base; - -diff --git a/plugins/input/csv/CMakeLists.txt b/plugins/input/csv/CMakeLists.txt -new file mode 100644 -index 0000000..34a2e75 ---- /dev/null -+++ b/plugins/input/csv/CMakeLists.txt -@@ -0,0 +1,12 @@ -+add_library(mapnik-input-csv SHARED -+ csv_datasource.cpp -+ csv_featureset.cpp -+ csv_index_featureset.cpp -+ csv_inline_featureset.cpp -+ csv_utils.cpp) -+ -+target_link_libraries(mapnik-input-csv PUBLIC mapnik mapnik-wkt mapnik-json) -+set_target_properties(mapnik-input-csv PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-csv PROPERTIES OUTPUT_NAME "csv") -+set_target_properties(mapnik-input-csv PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-csv DESTINATION bin/plugins/input) -\ No newline at end of file -diff --git a/plugins/input/gdal/CMakeLists.txt b/plugins/input/gdal/CMakeLists.txt -new file mode 100644 -index 0000000..274ee44 ---- /dev/null -+++ b/plugins/input/gdal/CMakeLists.txt -@@ -0,0 +1,9 @@ -+add_library(mapnik-input-gdal SHARED -+ gdal_datasource.cpp -+ gdal_featureset.cpp) -+ -+target_link_libraries(mapnik-input-gdal PUBLIC mapnik ${GDAL_LIBRARIES}) -+set_target_properties(mapnik-input-gdal PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-gdal PROPERTIES OUTPUT_NAME "gdal") -+set_target_properties(mapnik-input-gdal PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-gdal DESTINATION bin/plugins/input) -diff --git a/plugins/input/geobuf/CMakeLists.txt b/plugins/input/geobuf/CMakeLists.txt -new file mode 100644 -index 0000000..1b798e5 ---- /dev/null -+++ b/plugins/input/geobuf/CMakeLists.txt -@@ -0,0 +1,9 @@ -+add_library(mapnik-input-geobuf SHARED -+ geobuf_datasource.cpp -+ geobuf_featureset.cpp) -+ -+target_link_libraries(mapnik-input-geobuf PUBLIC mapnik) -+set_target_properties(mapnik-input-geobuf PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-geobuf PROPERTIES OUTPUT_NAME "geobuf") -+set_target_properties(mapnik-input-geobuf PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-geobuf DESTINATION bin/plugins/input) -diff --git a/plugins/input/geojson/CMakeLists.txt b/plugins/input/geojson/CMakeLists.txt -new file mode 100644 -index 0000000..fb53a3c ---- /dev/null -+++ b/plugins/input/geojson/CMakeLists.txt -@@ -0,0 +1,11 @@ -+add_library(mapnik-input-geojson SHARED -+ geojson_datasource.cpp -+ geojson_featureset.cpp -+ geojson_index_featureset.cpp -+ geojson_memory_index_featureset.cpp) -+ -+target_link_libraries(mapnik-input-geojson PUBLIC mapnik mapnik-json) -+set_target_properties(mapnik-input-geojson PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-geojson PROPERTIES OUTPUT_NAME "geojson") -+set_target_properties(mapnik-input-geojson PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-geojson DESTINATION bin/plugins/input) -diff --git a/plugins/input/ogr/CMakeLists.txt b/plugins/input/ogr/CMakeLists.txt -new file mode 100644 -index 0000000..6d7fd9a ---- /dev/null -+++ b/plugins/input/ogr/CMakeLists.txt -@@ -0,0 +1,11 @@ -+add_library(mapnik-input-ogr SHARED -+ ogr_converter.cpp -+ ogr_datasource.cpp -+ ogr_featureset.cpp -+ ogr_index_featureset.cpp) -+ -+target_link_libraries(mapnik-input-ogr PUBLIC mapnik ${OGR_LIBRARIES} ${GDAL_LIBRARIES}) -+set_target_properties(mapnik-input-ogr PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-ogr PROPERTIES OUTPUT_NAME "ogr") -+set_target_properties(mapnik-input-ogr PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-ogr DESTINATION bin/plugins/input) -diff --git a/plugins/input/pgraster/CMakeLists.txt b/plugins/input/pgraster/CMakeLists.txt -new file mode 100644 -index 0000000..ada5d08 ---- /dev/null -+++ b/plugins/input/pgraster/CMakeLists.txt -@@ -0,0 +1,10 @@ -+add_library(mapnik-input-pgraster SHARED -+ pgraster_datasource.cpp -+ pgraster_featureset.cpp -+ pgraster_wkb_reader.cpp) -+ -+target_link_libraries(mapnik-input-pgraster PUBLIC mapnik ${PostgreSQL_LIBRARIES}) -+set_target_properties(mapnik-input-pgraster PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-pgraster PROPERTIES OUTPUT_NAME "pgraster") -+set_target_properties(mapnik-input-pgraster PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-pgraster DESTINATION bin/plugins/input) -diff --git a/plugins/input/postgis/CMakeLists.txt b/plugins/input/postgis/CMakeLists.txt -new file mode 100644 -index 0000000..385faa3 ---- /dev/null -+++ b/plugins/input/postgis/CMakeLists.txt -@@ -0,0 +1,9 @@ -+add_library(mapnik-input-postgis SHARED -+ postgis_datasource.cpp -+ postgis_featureset.cpp ) -+ -+target_link_libraries(mapnik-input-postgis PUBLIC mapnik ${PostgreSQL_LIBRARIES}) -+set_target_properties(mapnik-input-postgis PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-postgis PROPERTIES OUTPUT_NAME "postgis") -+set_target_properties(mapnik-input-postgis PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-postgis DESTINATION bin/plugins/input) -diff --git a/plugins/input/raster/CMakeLists.txt b/plugins/input/raster/CMakeLists.txt -new file mode 100644 -index 0000000..b08be98 ---- /dev/null -+++ b/plugins/input/raster/CMakeLists.txt -@@ -0,0 +1,10 @@ -+add_library(mapnik-input-raster SHARED -+ raster_datasource.cpp -+ raster_featureset.cpp -+ raster_info.cpp) -+ -+target_link_libraries(mapnik-input-raster PUBLIC mapnik) -+set_target_properties(mapnik-input-raster PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-raster PROPERTIES OUTPUT_NAME "raster") -+set_target_properties(mapnik-input-raster PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-raster DESTINATION bin/plugins/input) -diff --git a/plugins/input/shape/CMakeLists.txt b/plugins/input/shape/CMakeLists.txt -new file mode 100644 -index 0000000..cac54dd ---- /dev/null -+++ b/plugins/input/shape/CMakeLists.txt -@@ -0,0 +1,9 @@ -+SET(INPUT_SHAPE_SOURCES -+ dbfile.cpp dbf_test.cpp shape_datasource.cpp shape_featureset.cpp shape_index_featureset.cpp shape_io.cpp shape_utils.cpp) -+ -+add_library(mapnik-input-shape SHARED ${INPUT_SHAPE_SOURCES}) -+target_link_libraries(mapnik-input-shape PUBLIC mapnik) -+set_target_properties(mapnik-input-shape PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-shape PROPERTIES OUTPUT_NAME "shape") -+set_target_properties(mapnik-input-shape PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-shape DESTINATION bin/plugins/input) -diff --git a/plugins/input/sqlite/CMakeLists.txt b/plugins/input/sqlite/CMakeLists.txt -new file mode 100644 -index 0000000..b84528e ---- /dev/null -+++ b/plugins/input/sqlite/CMakeLists.txt -@@ -0,0 +1,9 @@ -+add_library(mapnik-input-sqlite SHARED -+ sqlite_datasource.cpp -+ sqlite_featureset.cpp) -+ -+target_link_libraries(mapnik-input-sqlite PUBLIC mapnik SQLite::SQLite3) -+set_target_properties(mapnik-input-sqlite PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-sqlite PROPERTIES OUTPUT_NAME "sqlite") -+set_target_properties(mapnik-input-sqlite PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-sqlite DESTINATION bin/plugins/input) -diff --git a/plugins/input/topojson/CMakeLists.txt b/plugins/input/topojson/CMakeLists.txt -new file mode 100644 -index 0000000..aeb559b ---- /dev/null -+++ b/plugins/input/topojson/CMakeLists.txt -@@ -0,0 +1,9 @@ -+add_library(mapnik-input-topojson SHARED -+ topojson_datasource.cpp -+ topojson_featureset.cpp) -+ -+target_link_libraries(mapnik-input-topojson PUBLIC mapnik mapnik-json) -+set_target_properties(mapnik-input-topojson PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-topojson PROPERTIES OUTPUT_NAME "topojson") -+set_target_properties(mapnik-input-topojson PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-topojson DESTINATION bin/plugins/input) -diff --git a/src/agg/CMakeLists.txt b/src/agg/CMakeLists.txt -new file mode 100644 -index 0000000..e69de29 -diff --git a/src/geometry/CMakeLists.txt b/src/geometry/CMakeLists.txt -new file mode 100644 -index 0000000..e69de29 -diff --git a/src/json/CMakeLists.txt b/src/json/CMakeLists.txt -new file mode 100644 -index 0000000..76a23b9 ---- /dev/null -+++ b/src/json/CMakeLists.txt -@@ -0,0 +1,17 @@ -+add_library(mapnik-json STATIC -+ generic_json.cpp -+ mapnik_geometry_to_geojson.cpp -+ mapnik_json_feature_collection_grammar.cpp -+ mapnik_json_feature_grammar.cpp -+ mapnik_json_generator_grammar.cpp -+ mapnik_json_geometry_grammar.cpp -+ mapnik_json_geometry_parser.cpp -+ mapnik_json_positions_grammar.cpp -+ mapnik_topojson_grammar.cpp -+) -+ -+ -+target_link_libraries(mapnik-json INTERFACE ${ICUU_LIB}) -+ -+install(TARGETS mapnik-json LIBRARY DESTINATION lib) -+target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) -diff --git a/src/wkt/CMakeLists.txt b/src/wkt/CMakeLists.txt -new file mode 100644 -index 0000000..dbaf010 ---- /dev/null -+++ b/src/wkt/CMakeLists.txt -@@ -0,0 +1,7 @@ -+add_library(mapnik-wkt STATIC -+ mapnik_wkt_grammar.cpp -+ mapnik_wkt_generator_grammar.cpp -+) -+ -+install(TARGETS mapnik-wkt LIBRARY DESTINATION lib) -+target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) -diff --git a/utils/mapnik-render/CMakeLists.txt b/utils/mapnik-render/CMakeLists.txt -new file mode 100644 -index 0000000..7cfff00 ---- /dev/null -+++ b/utils/mapnik-render/CMakeLists.txt -@@ -0,0 +1,3 @@ -+add_executable(mapnik-render mapnik-render.cpp) -+target_link_libraries(mapnik-render PRIVATE mapnik) -+install(TARGETS mapnik-render DESTINATION tools) -diff --git a/utils/shapeindex/CMakeLists.txt b/utils/shapeindex/CMakeLists.txt -new file mode 100644 -index 0000000..484200a ---- /dev/null -+++ b/utils/shapeindex/CMakeLists.txt -@@ -0,0 +1,4 @@ -+add_executable(shapeindex shapeindex.cpp) -+target_link_libraries(shapeindex PRIVATE mapnik) -+target_include_directories(shapeindex PRIVATE ../../plugins/input/shape) -+install(TARGETS shapeindex DESTINATION tools) diff --git a/ports/mapnik/0002-sqlitepixelwidth.patch.txt b/ports/mapnik/0002-sqlitepixelwidth.patch.txt deleted file mode 100644 index df0e27ac13ee03..00000000000000 --- a/ports/mapnik/0002-sqlitepixelwidth.patch.txt +++ /dev/null @@ -1,120 +0,0 @@ -diff --git a/plugins/input/sqlite/sqlite_datasource.cpp b/plugins/input/sqlite/sqlite_datasource.cpp -index 28add64..286edce 100644 ---- a/plugins/input/sqlite/sqlite_datasource.cpp -+++ b/plugins/input/sqlite/sqlite_datasource.cpp -@@ -67,6 +67,8 @@ sqlite_datasource::sqlite_datasource(parameters const& params) - row_offset_(*params.get("row_offset", 0)), - row_limit_(*params.get("row_limit", 0)), - intersects_token_("!intersects!"), -+ pixel_width_token_("!pixel_width!"), -+ pixel_height_token_("!pixel_height!"), - desc_(sqlite_datasource::name(), *params.get("encoding", "utf-8")), - format_(mapnik::wkbAuto) - { -@@ -211,7 +213,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params) - if (using_subquery_) - { - std::ostringstream s; -- std::string query = populate_tokens(table_); -+ std::string query = populate_tokens(table_,0,0); - s << "SELECT " << fields_ << " FROM (" << query << ") LIMIT 1"; - found_types_via_subquery = sqlite_utils::detect_types_from_subquery( - s.str(), -@@ -333,7 +335,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params) - mapnik::progress_timer __stats2__(std::clog, "sqlite_datasource::init(detect_extent)"); - #endif - // TODO - clean this up - reducing arguments -- std::string query = populate_tokens(table_); -+ std::string query = populate_tokens(table_,0,0); - if (!sqlite_utils::detect_extent(dataset_, - has_spatial_index_, - extent_, -@@ -356,7 +358,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params) - - } - --std::string sqlite_datasource::populate_tokens(std::string const& sql) const -+std::string sqlite_datasource::populate_tokens(std::string const& sql, double pixel_width, double pixel_height) const - { - std::string populated_sql = sql; - if (boost::algorithm::ifind_first(populated_sql, intersects_token_)) -@@ -364,6 +366,19 @@ std::string sqlite_datasource::populate_tokens(std::string const& sql) const - // replace with dummy comparison that is true - boost::algorithm::ireplace_first(populated_sql, intersects_token_, "1=1"); - } -+ if (boost::algorithm::icontains(sql, pixel_width_token_)) -+ { -+ std::ostringstream ss; -+ ss << pixel_width; -+ boost::algorithm::replace_all(populated_sql, pixel_width_token_, ss.str()); -+ } -+ if (boost::algorithm::icontains(sql, pixel_height_token_)) -+ { -+ std::ostringstream ss; -+ ss << pixel_height; -+ boost::algorithm::replace_all(populated_sql, pixel_height_token_, ss.str()); -+ } -+ - return populated_sql; - } - -@@ -487,6 +502,8 @@ featureset_ptr sqlite_datasource::features(query const& q) const - mapnik::box2d const& e = q.get_bbox(); - - std::ostringstream s; -+ const double px_gw = 1.0 / std::get<0>(q.resolution()); -+ const double px_gh = 1.0 / std::get<1>(q.resolution()); - mapnik::context_ptr ctx = std::make_shared(); - - s << "SELECT " << geometry_field_; -@@ -521,10 +538,8 @@ featureset_ptr sqlite_datasource::features(query const& q) const - geometry_table_, - intersects_token_); - } -- else -- { -- query = populate_tokens(table_); -- } -+ -+ query = populate_tokens(table_,px_gw,px_gh); - - s << query ; - -@@ -601,10 +616,7 @@ featureset_ptr sqlite_datasource::features_at_point(coord2d const& pt, double to - geometry_table_, - intersects_token_); - } -- else -- { -- query = populate_tokens(table_); -- } -+ query = populate_tokens(table_,0,0); - - s << query ; - -diff --git a/plugins/input/sqlite/sqlite_datasource.hpp b/plugins/input/sqlite/sqlite_datasource.hpp -index eab71e9..be35f37 100644 ---- a/plugins/input/sqlite/sqlite_datasource.hpp -+++ b/plugins/input/sqlite/sqlite_datasource.hpp -@@ -62,10 +62,10 @@ private: - // Fill init_statements with any statements - // needed to attach auxillary databases - void parse_attachdb(std::string const& attachdb) const; -- std::string populate_tokens(std::string const& sql) const; -+ std::string populate_tokens(std::string const& sql, double pixel_width, double pixel_height) const; - - mapnik::box2d extent_; -- bool extent_initialized_; -+ bool extent_initialized_; - mapnik::datasource::datasource_t type_; - std::string dataset_name_; - std::shared_ptr dataset_; -@@ -80,6 +80,8 @@ private: - mapnik::value_integer row_limit_; - // TODO - also add to postgis.input - const std::string intersects_token_; -+ const std::string pixel_width_token_; -+ const std::string pixel_height_token_; - mapnik::layer_descriptor desc_; - mapnik::wkbFormat format_; - bool use_spatial_index_; From 4cf815701d63a567ed09642198b9c7db8c48ceb6 Mon Sep 17 00:00:00 2001 From: am2222 Date: Tue, 9 Jun 2020 18:44:50 -0400 Subject: [PATCH 0007/1694] added mapnik cmake patch --- ports/mapnik/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/CONTROL b/ports/mapnik/CONTROL index abfacb42e1f4a6..25196f6992a8b3 100644 --- a/ports/mapnik/CONTROL +++ b/ports/mapnik/CONTROL @@ -1,7 +1,7 @@ Source: mapnik Version: 3.0.22 -Homepage: https://github.com/am2222/mapnik-windows/ -Description: Mapnik is an open source toolkit for developing mapping applications. Compiling on windows. (unofficial port) +Homepage: https://github.com/mapnik/mapnik +Description: Mapnik is an open source toolkit for developing mapping applications. Build-Depends: libjpeg-turbo, tiff, libpng, libwebp, freetype[bzip2,png], icu, libxml2, harfbuzz[icu], boost-locale[icu], boost-regex[icu], boost-gil, boost-geometry, boost-property-tree, boost-filesystem, boost-system, boost-spirit, boost-program-options, boost-assign, boost-bimap, mapbox-variant, zlib Feature: CAIRO From 6acefc5a3c9204237098bfa673f82235ab3bb6f9 Mon Sep 17 00:00:00 2001 From: am2222 Date: Wed, 10 Jun 2020 10:43:49 -0400 Subject: [PATCH 0008/1694] minor fixes --- ports/mapnik/CONTROL | 30 ++++++++-------- ports/mapnik/portfile.cmake | 70 +++++++++++-------------------------- 2 files changed, 35 insertions(+), 65 deletions(-) diff --git a/ports/mapnik/CONTROL b/ports/mapnik/CONTROL index 25196f6992a8b3..f3a2dffdc4f92c 100644 --- a/ports/mapnik/CONTROL +++ b/ports/mapnik/CONTROL @@ -4,55 +4,55 @@ Homepage: https://github.com/mapnik/mapnik Description: Mapnik is an open source toolkit for developing mapping applications. Build-Depends: libjpeg-turbo, tiff, libpng, libwebp, freetype[bzip2,png], icu, libxml2, harfbuzz[icu], boost-locale[icu], boost-regex[icu], boost-gil, boost-geometry, boost-property-tree, boost-filesystem, boost-system, boost-spirit, boost-program-options, boost-assign, boost-bimap, mapbox-variant, zlib -Feature: CAIRO +Feature: cairo Description: Cairo renderer Build-Depends: cairo,cairomm -Feature: PROJ4 +Feature: proj4 Description: PROJ4 Functionalities Build-Depends: proj4[database] -Feature: INPUT_CSV +Feature: input_csv Description: CSV input plugin -Feature: INPUT_GDAL +Feature: input_gdal Description: GDAL input plugin Build-Depends: gdal -Feature: INPUT_GEOBUF +Feature: input_geobuf Description: GEOBUF input plugin Build-Depends: protozero -Feature: INPUT_GEOJSON +Feature: input_geojson Description: GEOJSON input plugin -Feature: INPUT_OGR +Feature: input_ogr Description: OGR input plugin Build-Depends: gdal -Feature: INPUT_PGRASTER +Feature: input_pgraster Description: PGRASTER input plugin Build-Depends: libpq, libodb-pgsql -Feature: INPUT_POSTGIS +Feature: input_postgis Description: POSTGIS input plugin Build-Depends: libpq, libodb-pgsql -Feature: INPUT_RASTER +Feature: input_raster Description: RASTER input plugin -Feature: INPUT_SHAPE +Feature: input_shape Description: SHAPE input plugin -Feature: INPUT_SQLITE +Feature: input_sqlite Description: SQLITE input plugin Build-Depends: sqlite3 -Feature: INPUT_TOPOJSON +Feature: input_topojson Description: TOPOJSON input plugin -Feature: DEMO +Feature: demo Description: Make Demo Application -Feature: UTILS +Feature: utils Description: Make utilities Application including mapnik-rendrer and shapeindex diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 1c30981ebd0f4e..c8b75087898e8b 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,37 +1,14 @@ -# find_program(GIT git) -# set(GIT_URL "https://github.com/am2222/mapnik-windows.git") -# set(GIT_REV "fdba45cd95b66576e47de2e56d30196bfc9de99d") - -# set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT}) - -# if(NOT EXISTS "${SOURCE_PATH}/.git") -# message(STATUS "Cloning and fetching submodules") -# vcpkg_execute_required_process( -# COMMAND ${GIT} clone --recurse-submodules ${GIT_URL} ${SOURCE_PATH} -# WORKING_DIRECTORY ${SOURCE_PATH} -# LOGNAME clone -# ) - -# message(STATUS "Checkout revision ${GIT_REV}") -# vcpkg_execute_required_process( -# COMMAND ${GIT} checkout ${GIT_REV} -# WORKING_DIRECTORY ${SOURCE_PATH} -# LOGNAME checkout -# ) -# endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik REF v3.0.23 SHA512 004429defd3047601b63c28bedd57d701ff88cdfb910a9958f4a10a1ac032d4d13316372122aef06eda60f2e4f67600b8842577db455f8c970009a0e86c5c1cf HEAD_REF master - PATCHES 0001-CMakeFiles.patch 0002-sqlitepixelwidth.patch + PATCHES + 0001-CMakeFiles.patch + 0002-sqlitepixelwidth.patch ) -message(STATUS "Adding worktree done") - - vcpkg_find_acquire_program(PYTHON2) get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) vcpkg_add_to_path(${PYTHON2_DIR}) @@ -46,30 +23,27 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - # Keyword FEATURES is optional if INVERTED_FEATURES are not used - CAIRO WITH_CAIRO - DEMO WITH_DEMO - INPUT_CSV WITH_INPUT_CSV - INPUT_GDAL WITH_INPUT_GDAL - INPUT_GEOBUF WITH_INPUT_GEOBUF - INPUT_GEOJSON WITH_INPUT_GEOJSON - INPUT_OGR WITH_INPUT_OGR - INPUT_PGRASTER WITH_INPUT_PGRASTER - INPUT_POSTGIS WITH_INPUT_POSTGIS - INPUT_RASTER WITH_INPUT_RASTER - INPUT_SHAPE WITH_INPUT_SHAPE - INPUT_SQLITE WITH_INPUT_SQLITE - INPUT_TOPOJSON WITH_INPUT_TOPOJSON - PROJ4 WITH_PROJ4 - UTILS WITH_UTILS - + cairo WITH_CAIRO + demo WITH_DEMO + input_csv WITH_INPUT_CSV + input_gdal WITH_INPUT_GDAL + input_geobuf WITH_INPUT_GEOBUF + input_geojson WITH_INPUT_GEOJSON + input_ogr WITH_INPUT_OGR + input_pgraster WITH_INPUT_PGRASTER + input_postgis WITH_INPUT_POSTGIS + input_raster WITH_INPUT_RASTER + input_shape WITH_INPUT_SHAPE + input_sqlite WITH_INPUT_SQLITE + input_topojson WITH_INPUT_TOPOJSON + proj4 WITH_PROJ4 + utils WITH_UTILS ) vcpkg_configure_cmake( SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT} - # PREFER_NINJA # Disable this option if project cannot be built with Ninja -# NO_CHARSET_FLAG # automatic templates + PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS ${FEATURE_OPTIONS} -DMAPNIK_STATIC_LIB=${MAPNIK_STATIC_LIB} @@ -79,8 +53,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() - - file(COPY ${SOURCE_PATH}/include/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/include) vcpkg_copy_pdbs() @@ -90,15 +62,13 @@ if ("UTILS" IN_LIST FEATURES) TOOL_NAMES mapnik-demo mapnik-render shapeindex AUTO_CLEAN ) + file(COPY ${SOURCE_PATH}/demo/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik/demo) file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mapnik-demo ${CURRENT_PACKAGES_DIR}/debug/bin/mapnik-render ${CURRENT_PACKAGES_DIR}/debug/bin/shapeindex) - - endif() - file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/fonts/unifont_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME fonts_copyright) \ No newline at end of file From b343e119c31c71404e837d2d448690aeb4522f81 Mon Sep 17 00:00:00 2001 From: am2222 Date: Wed, 10 Jun 2020 11:21:41 -0400 Subject: [PATCH 0009/1694] minor fixes --- ports/mapnik/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index c8b75087898e8b..f89a6ed326141c 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -21,7 +21,6 @@ elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(MAPNIK_STATIC_LIB ON) endif() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS cairo WITH_CAIRO demo WITH_DEMO @@ -57,7 +56,7 @@ file(COPY ${SOURCE_PATH}/include/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/inc vcpkg_copy_pdbs() -if ("UTILS" IN_LIST FEATURES) +if ("utils" IN_LIST FEATURES) vcpkg_copy_tools( TOOL_NAMES mapnik-demo mapnik-render shapeindex AUTO_CLEAN From e07fc0ba15acfd881c3b0c042dc0e7bfbaedfdfd Mon Sep 17 00:00:00 2001 From: Majid Hojati Date: Fri, 14 Aug 2020 12:21:39 -0400 Subject: [PATCH 0010/1694] Update ports/mapnik/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/mapnik/portfile.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index f89a6ed326141c..fd1a961955670e 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_from_github( SHA512 004429defd3047601b63c28bedd57d701ff88cdfb910a9958f4a10a1ac032d4d13316372122aef06eda60f2e4f67600b8842577db455f8c970009a0e86c5c1cf HEAD_REF master PATCHES - 0001-CMakeFiles.patch - 0002-sqlitepixelwidth.patch + 0001-CMakeFiles.patch + 0002-sqlitepixelwidth.patch ) vcpkg_find_acquire_program(PYTHON2) @@ -70,4 +70,4 @@ if ("utils" IN_LIST FEATURES) endif() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/fonts/unifont_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME fonts_copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/fonts/unifont_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME fonts_copyright) From 244c1005dd6be03d4dccc6dafb4f15a84bac4bc2 Mon Sep 17 00:00:00 2001 From: Majid Hojati Date: Fri, 14 Aug 2020 12:22:12 -0400 Subject: [PATCH 0011/1694] Update ports/mapnik/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/mapnik/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index fd1a961955670e..d799b066696747 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -39,7 +39,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS utils WITH_UTILS ) - vcpkg_configure_cmake( SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT} PREFER_NINJA # Disable this option if project cannot be built with Ninja From 15df35421c7df4a13b62d7a48a07bc71010c1c22 Mon Sep 17 00:00:00 2001 From: Majid Hojati Date: Fri, 14 Aug 2020 12:22:23 -0400 Subject: [PATCH 0012/1694] Update ports/mapnik/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/mapnik/portfile.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index d799b066696747..4104d68a227909 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -42,11 +42,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_configure_cmake( SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT} PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS - ${FEATURE_OPTIONS} - -DMAPNIK_STATIC_LIB=${MAPNIK_STATIC_LIB} - -DBOOST_PREFIX=${CURRENT_INSTALLED_DIR}/include - -DFREE_TYPE_INCLUDE=${CURRENT_INSTALLED_DIR}/include/freetype2 + OPTIONS + ${FEATURE_OPTIONS} + -DMAPNIK_STATIC_LIB=${MAPNIK_STATIC_LIB} + -DBOOST_PREFIX=${CURRENT_INSTALLED_DIR}/include + -DFREE_TYPE_INCLUDE=${CURRENT_INSTALLED_DIR}/include/freetype2 ) vcpkg_install_cmake() From de01718ba688681233fe54fae3e1d38a69e03c8d Mon Sep 17 00:00:00 2001 From: Majid Hojati Date: Sat, 15 Aug 2020 22:41:49 -0400 Subject: [PATCH 0013/1694] Update portfile.cmake --- ports/mapnik/portfile.cmake | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 4104d68a227909..aca04430594f4d 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,13 +1,27 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO mapnik/mapnik - REF v3.0.23 - SHA512 004429defd3047601b63c28bedd57d701ff88cdfb910a9958f4a10a1ac032d4d13316372122aef06eda60f2e4f67600b8842577db455f8c970009a0e86c5c1cf - HEAD_REF master - PATCHES - 0001-CMakeFiles.patch - 0002-sqlitepixelwidth.patch -) +find_program(GIT git) + +set(GIT_URL "https://github.com/am2222/mapnik-windows.git") +set(GIT_REV "5ec01cfa138fd3402e5cbf7d19f6fdb26ee63946") + +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT}) + + +if(NOT EXISTS "${SOURCE_PATH}/.git") + message(STATUS "Cloning and fetching submodules") + vcpkg_execute_required_process( + COMMAND ${GIT} clone --recurse-submodules ${GIT_URL} ${SOURCE_PATH} + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME clone + ) + + message(STATUS "Checkout revision ${GIT_REV}") + vcpkg_execute_required_process( + COMMAND ${GIT} checkout ${GIT_REV} + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME checkout + ) +endif() + vcpkg_find_acquire_program(PYTHON2) get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) From 3754afd895060812e74f8554210a2d2905adbbd2 Mon Sep 17 00:00:00 2001 From: Majid Hojati Date: Sat, 15 Aug 2020 22:53:09 -0400 Subject: [PATCH 0014/1694] Update portfile.cmake --- ports/mapnik/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index aca04430594f4d..7eee08417f6c2c 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -27,8 +27,6 @@ vcpkg_find_acquire_program(PYTHON2) get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) vcpkg_add_to_path(${PYTHON2_DIR}) -set(BOOST_ROOT ${CURRENT_INSTALLED_DIR}) - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(MAPNIK_STATIC_LIB OFF) elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) From 85b668a23003cbb6f4a48017dc8921af09157b78 Mon Sep 17 00:00:00 2001 From: Majid Hojati Date: Wed, 2 Sep 2020 23:49:37 -0400 Subject: [PATCH 0015/1694] Update portfile.cmake --- ports/mapnik/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 7eee08417f6c2c..b43359898faf4d 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,7 +1,7 @@ find_program(GIT git) set(GIT_URL "https://github.com/am2222/mapnik-windows.git") -set(GIT_REV "5ec01cfa138fd3402e5cbf7d19f6fdb26ee63946") +set(GIT_REV "cfa268fa6ab438568b9b5320f6fce4317f0e3d8e") set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT}) From 4330b18ddaf46c5f015e6987f66d847ad0e5a340 Mon Sep 17 00:00:00 2001 From: Majid Hojati Date: Sun, 13 Sep 2020 18:23:17 -0400 Subject: [PATCH 0016/1694] Update ci.baseline.txt --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d28f5b10598d8f..b64d6e3dcba58e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1888,6 +1888,7 @@ ctp:x64-windows=skip ctp:x64-windows-static=skip ctp:x86-windows=skip protozero:x64-uwp=fail +protozero:arm-uwp=fail # clapack is replaced by lapack-reference on the platforms lapack-reference supports clapack:x64-linux=skip From a2890555b183deb4689855a7a449b38428a0ee82 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 Nov 2020 10:54:48 -0800 Subject: [PATCH 0017/1694] [vcpkg baseline] Clean up baseline, use Keyword Supports Part 1 (#14245) * [vcpkg baseline] Clean up baseline, use Keyword Supports * Update ports/arrow/CONTROL --- ports/aliyun-oss-c-sdk/CONTROL | 2 +- ports/ampl-mp/CONTROL | 2 +- ports/angelscript/CONTROL | 1 + ports/argtable2/CONTROL | 1 + ports/arrow/CONTROL | 2 +- ports/asiosdk/CONTROL | 1 + ports/asyncplusplus/CONTROL | 1 + scripts/ci.baseline.txt | 25 +------------------------ 8 files changed, 8 insertions(+), 27 deletions(-) diff --git a/ports/aliyun-oss-c-sdk/CONTROL b/ports/aliyun-oss-c-sdk/CONTROL index 84608aa924d7f9..576ab1cb81453f 100644 --- a/ports/aliyun-oss-c-sdk/CONTROL +++ b/ports/aliyun-oss-c-sdk/CONTROL @@ -2,4 +2,4 @@ Source: aliyun-oss-c-sdk Version: 3.10.0 Description: Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability. Build-Depends: curl, apr-util -Supports: !uwp +Supports: !(uwp|linux|osx) diff --git a/ports/ampl-mp/CONTROL b/ports/ampl-mp/CONTROL index db932a69c4ae11..6947d21fe49827 100644 --- a/ports/ampl-mp/CONTROL +++ b/ports/ampl-mp/CONTROL @@ -3,4 +3,4 @@ Version: 2020-11-11 Homepage: https://github.com/ampl/mp Description: An open-source library for mathematical programming Build-Depends: ampl-asl -Supports: !uwp \ No newline at end of file +Supports: !uwp diff --git a/ports/angelscript/CONTROL b/ports/angelscript/CONTROL index 4ec91f2bb9452f..fee238c1edb5af 100644 --- a/ports/angelscript/CONTROL +++ b/ports/angelscript/CONTROL @@ -1,6 +1,7 @@ Source: angelscript Version: 2.34.0 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. +Supports: !arm Feature: addons Description: Installs all addons for use in compiling scripts addons diff --git a/ports/argtable2/CONTROL b/ports/argtable2/CONTROL index 734b97342f6a65..6364d396af0366 100644 --- a/ports/argtable2/CONTROL +++ b/ports/argtable2/CONTROL @@ -3,3 +3,4 @@ Version: 2.13 Port-Version: 8 Homepage: http://argtable.sourceforge.net Description: Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss. +Supports: !uwp \ No newline at end of file diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL index b228586a36b6c6..40ce8f95bf5e78 100644 --- a/ports/arrow/CONTROL +++ b/ports/arrow/CONTROL @@ -4,7 +4,7 @@ Port-Version: 2 Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, bzip2, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser, openssl, utf8proc Homepage: https://github.com/apache/arrow Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations. -Supports: x64 +Supports: x64&!arm Default-Features: csv, json, parquet, filesystem Feature: csv diff --git a/ports/asiosdk/CONTROL b/ports/asiosdk/CONTROL index b97ebb689d4337..a3d9384b5f7d2c 100644 --- a/ports/asiosdk/CONTROL +++ b/ports/asiosdk/CONTROL @@ -2,3 +2,4 @@ Source: asiosdk Version: 2.3.3-1 Homepage: https://www.steinberg.net/en/company/developers.html Description: ASIO is a low latency audio API from Steinberg. +Supports: windows&!(arm|uwp) \ No newline at end of file diff --git a/ports/asyncplusplus/CONTROL b/ports/asyncplusplus/CONTROL index 6f2a09a72d3ab8..8947946277f9f2 100644 --- a/ports/asyncplusplus/CONTROL +++ b/ports/asyncplusplus/CONTROL @@ -1,3 +1,4 @@ Source: asyncplusplus Version: 1.1 Description: Async++ is a lightweight concurrency framework for C++11 +Supports: !uwp diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index aa9709fc428c04..00c68febaee87f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -28,32 +28,9 @@ # Add new items alphabetically - -activemq-cpp:x64-linux=fail -activemq-cpp:x64-osx=fail -alac:arm-uwp=fail -alac:x64-uwp=fail -aliyun-oss-c-sdk:x64-linux=fail -aliyun-oss-c-sdk:x64-osx=fail -amqpcpp:arm-uwp=fail -amqpcpp:x64-uwp=fail -angelscript:arm64-windows=fail -angelscript:arm-uwp=fail -apr:arm-uwp=fail -apr:x64-uwp=fail # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h apr:arm64-windows=fail -argtable2:arm-uwp=fail -argtable2:x64-uwp=fail -arrow:arm64-windows=fail -arrow:x86-windows=fail -asiosdk:x64-linux=fail -asiosdk:x64-osx=fail -asiosdk:x64-uwp=fail -asiosdk:arm64-windows=fail -asiosdk:arm-uwp=fail -asyncplusplus:arm-uwp=fail -asyncplusplus:x64-uwp=fail + atk:x64-osx=fail atk:arm64-windows=fail atlmfc:x64-linux=fail From bb9bfc8cb4c67298b5e7ded2201cf3c15c52046a Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Fri, 13 Nov 2020 12:30:31 -0800 Subject: [PATCH 0018/1694] [vcpkg] Implement constraints and overrides in manifests (#14183) * [vcpkg] Implement constraints in manifests * [vcpkg] Add SourceControlFile::check_against_feature_flags to prevent accidentally ignoring versioning fields * [vcpkg] Switch check_against_feature_flags to accept fs::path * [vcpkg] Implement overrides parsing in manifests * [vcpkg] Address CR comments Co-authored-by: Robert Schumacher --- toolsrc/include/vcpkg/packagespec.h | 28 +++ toolsrc/include/vcpkg/sourceparagraph.h | 17 +- toolsrc/include/vcpkg/versions.h | 10 + toolsrc/src/vcpkg-test/manifests.cpp | 202 ++++++++++++++++ toolsrc/src/vcpkg/install.cpp | 8 +- toolsrc/src/vcpkg/packagespec.cpp | 18 ++ toolsrc/src/vcpkg/portfileprovider.cpp | 14 +- toolsrc/src/vcpkg/sourceparagraph.cpp | 299 ++++++++++++++++++++---- 8 files changed, 531 insertions(+), 65 deletions(-) diff --git a/toolsrc/include/vcpkg/packagespec.h b/toolsrc/include/vcpkg/packagespec.h index a362d80680eb38..d45fb018232051 100644 --- a/toolsrc/include/vcpkg/packagespec.h +++ b/toolsrc/include/vcpkg/packagespec.h @@ -6,6 +6,7 @@ #include #include +#include namespace vcpkg::Parse { @@ -133,11 +134,25 @@ namespace vcpkg static ExpectedS from_string(const std::string& input); }; + struct DependencyConstraint + { + Versions::Constraint::Type type = Versions::Constraint::Type::None; + std::string value; + int port_version = 0; + + friend bool operator==(const DependencyConstraint& lhs, const DependencyConstraint& rhs); + friend bool operator!=(const DependencyConstraint& lhs, const DependencyConstraint& rhs) + { + return !(lhs == rhs); + } + }; + struct Dependency { std::string name; std::vector features; PlatformExpression::Expr platform; + DependencyConstraint constraint; Json::Object extra_info; @@ -145,6 +160,19 @@ namespace vcpkg friend bool operator!=(const Dependency& lhs, const Dependency& rhs) { return !(lhs == rhs); } }; + struct DependencyOverride + { + std::string name; + Versions::Scheme version_scheme = Versions::Scheme::String; + std::string version; + int port_version = 0; + + Json::Object extra_info; + + friend bool operator==(const DependencyOverride& lhs, const DependencyOverride& rhs); + friend bool operator!=(const DependencyOverride& lhs, const DependencyOverride& rhs) { return !(lhs == rhs); } + }; + struct ParsedQualifiedSpecifier { std::string name; diff --git a/toolsrc/include/vcpkg/sourceparagraph.h b/toolsrc/include/vcpkg/sourceparagraph.h index d88c0b0fd8bbc5..2152e02370801c 100644 --- a/toolsrc/include/vcpkg/sourceparagraph.h +++ b/toolsrc/include/vcpkg/sourceparagraph.h @@ -2,6 +2,8 @@ #include +#include + #include #include #include @@ -63,6 +65,7 @@ namespace vcpkg std::string homepage; std::string documentation; std::vector dependencies; + std::vector overrides; std::vector default_features; std::string license; // SPDX license expression @@ -80,16 +83,7 @@ namespace vcpkg /// struct SourceControlFile { - SourceControlFile clone() const - { - SourceControlFile ret; - ret.core_paragraph = std::make_unique(*core_paragraph); - for (const auto& feat_ptr : feature_paragraphs) - { - ret.feature_paragraphs.push_back(std::make_unique(*feat_ptr)); - } - return ret; - } + SourceControlFile clone() const; static Parse::ParseExpected parse_manifest_object(const std::string& origin, const Json::Object& object); @@ -107,6 +101,9 @@ namespace vcpkg Optional find_feature(const std::string& featurename) const; Optional&> find_dependencies_for_feature(const std::string& featurename) const; + Optional check_against_feature_flags(const fs::path& origin, + const FeatureFlagSettings& flags) const; + friend bool operator==(const SourceControlFile& lhs, const SourceControlFile& rhs); friend bool operator!=(const SourceControlFile& lhs, const SourceControlFile& rhs) { return !(lhs == rhs); } }; diff --git a/toolsrc/include/vcpkg/versions.h b/toolsrc/include/vcpkg/versions.h index 331bf7f8b5b252..55586ddcc5fa55 100644 --- a/toolsrc/include/vcpkg/versions.h +++ b/toolsrc/include/vcpkg/versions.h @@ -9,4 +9,14 @@ namespace vcpkg::Versions Date, String }; + + struct Constraint + { + enum class Type + { + None, + Minimum, + Exact + }; + }; } diff --git a/toolsrc/src/vcpkg-test/manifests.cpp b/toolsrc/src/vcpkg-test/manifests.cpp index ee6b15e8da9722..32aa11f8a7a73d 100644 --- a/toolsrc/src/vcpkg-test/manifests.cpp +++ b/toolsrc/src/vcpkg-test/manifests.cpp @@ -44,6 +44,9 @@ static Parse::ParseExpected test_parse_manifest(StringView sv return res; } +static const FeatureFlagSettings feature_flags_with_versioning{false, false, false, true}; +static const FeatureFlagSettings feature_flags_without_versioning{false, false, false, false}; + TEST_CASE ("manifest construct minimum", "[manifests]") { auto m_pgh = test_parse_manifest(R"json({ @@ -59,6 +62,8 @@ TEST_CASE ("manifest construct minimum", "[manifests]") REQUIRE(pgh.core_paragraph->maintainers.empty()); REQUIRE(pgh.core_paragraph->description.empty()); REQUIRE(pgh.core_paragraph->dependencies.empty()); + + REQUIRE(!pgh.check_against_feature_flags({}, feature_flags_without_versioning)); } TEST_CASE ("manifest versioning", "[manifests]") @@ -112,6 +117,201 @@ TEST_CASE ("manifest versioning", "[manifests]") true); } +TEST_CASE ("manifest constraints", "[manifests]") +{ + std::string raw = R"json({ + "name": "zlib", + "version-string": "abcd", + "dependencies": [ + "a", + { + "name": "b", + "port-version": 12, + "version=": "5" + }, + { + "$extra": null, + "name": "c" + }, + { + "name": "d", + "version>=": "2018-09-01" + } + ] +} +)json"; + auto m_pgh = test_parse_manifest(raw); + + REQUIRE(m_pgh.has_value()); + auto& pgh = **m_pgh.get(); + REQUIRE(pgh.check_against_feature_flags({}, feature_flags_without_versioning)); + REQUIRE(!pgh.check_against_feature_flags({}, feature_flags_with_versioning)); + REQUIRE(Json::stringify(serialize_manifest(pgh), Json::JsonStyle::with_spaces(4)) == raw); + REQUIRE(pgh.core_paragraph->dependencies.size() == 4); + REQUIRE(pgh.core_paragraph->dependencies[0].name == "a"); + REQUIRE(pgh.core_paragraph->dependencies[0].constraint == + DependencyConstraint{Versions::Constraint::Type::None, "", 0}); + REQUIRE(pgh.core_paragraph->dependencies[1].name == "b"); + REQUIRE(pgh.core_paragraph->dependencies[1].constraint == + DependencyConstraint{Versions::Constraint::Type::Exact, "5", 12}); + REQUIRE(pgh.core_paragraph->dependencies[2].name == "c"); + REQUIRE(pgh.core_paragraph->dependencies[2].constraint == + DependencyConstraint{Versions::Constraint::Type::None, "", 0}); + REQUIRE(pgh.core_paragraph->dependencies[3].name == "d"); + REQUIRE(pgh.core_paragraph->dependencies[3].constraint == + DependencyConstraint{Versions::Constraint::Type::Minimum, "2018-09-01", 0}); + + test_parse_manifest(R"json({ + "name": "zlib", + "version-string": "abcd", + "dependencies": [ + { + "name": "d", + "version=": "2018-09-01", + "version>=": "2018-09-01" + } + ] + })json", + true); + + test_parse_manifest(R"json({ + "name": "zlib", + "version-string": "abcd", + "dependencies": [ + { + "name": "d", + "port-version": 5 + } + ] + })json", + true); +} + +TEST_CASE ("manifest overrides", "[manifests]") +{ + std::tuple data[] = { + {R"json({ + "name": "zlib", + "version-date": "2020-01-01", + "overrides": [ + { + "name": "abc", + "version-string": "abcd" + } + ] +} +)json", + Versions::Scheme::String, + "abcd"}, + {R"json({ + "name": "zlib", + "version": "1.2.3.4.5", + "overrides": [ + { + "name": "abc", + "version-date": "2020-01-01" + } + ] +} +)json", + Versions::Scheme::Date, + "2020-01-01"}, + {R"json({ + "name": "zlib", + "version-date": "2020-01-01", + "overrides": [ + { + "name": "abc", + "version": "1.2.3.4.5" + } + ] +} +)json", + Versions::Scheme::Relaxed, + "1.2.3.4.5"}, + {R"json({ + "name": "zlib", + "version-date": "2020-01-01", + "overrides": [ + { + "name": "abc", + "version-semver": "1.2.3-rc3" + } + ] +} +)json", + Versions::Scheme::Semver, + "1.2.3-rc3"}, + }; + for (auto v : data) + { + auto m_pgh = test_parse_manifest(std::get<0>(v)); + + REQUIRE(m_pgh.has_value()); + auto& pgh = **m_pgh.get(); + REQUIRE(Json::stringify(serialize_manifest(pgh), Json::JsonStyle::with_spaces(4)) == std::get<0>(v)); + REQUIRE(pgh.core_paragraph->overrides.size() == 1); + REQUIRE(pgh.core_paragraph->overrides[0].version_scheme == std::get<1>(v)); + REQUIRE(pgh.core_paragraph->overrides[0].version == std::get<2>(v)); + REQUIRE(pgh.check_against_feature_flags({}, feature_flags_without_versioning)); + REQUIRE(!pgh.check_against_feature_flags({}, feature_flags_with_versioning)); + } + + test_parse_manifest(R"json({ + "name": "zlib", + "version-string": "abcd", + "overrides": [ + { + "name": "abc", + "version-semver": "1.2.3-rc3", + "version-string": "1.2.3-rc3" + } + ]})json", + true); + + test_parse_manifest(R"json({ + "name": "zlib", + "version-string": "abcd", + "overrides": [ + { + "name": "abc", + "port-version": 5 + } + ]})json", + true); + + std::string raw = R"json({ + "name": "zlib", + "version-string": "abcd", + "overrides": [ + { + "name": "abc", + "port-version": 5, + "version-string": "hello" + }, + { + "name": "abcd", + "port-version": 7, + "version-string": "hello" + } + ] +} +)json"; + auto m_pgh = test_parse_manifest(raw); + + REQUIRE(m_pgh.has_value()); + auto& pgh = **m_pgh.get(); + REQUIRE(Json::stringify(serialize_manifest(pgh), Json::JsonStyle::with_spaces(4)) == raw); + REQUIRE(pgh.core_paragraph->overrides.size() == 2); + REQUIRE(pgh.core_paragraph->overrides[0].name == "abc"); + REQUIRE(pgh.core_paragraph->overrides[0].port_version == 5); + REQUIRE(pgh.core_paragraph->overrides[1].name == "abcd"); + REQUIRE(pgh.core_paragraph->overrides[1].port_version == 7); + + REQUIRE(pgh.check_against_feature_flags({}, feature_flags_without_versioning)); + REQUIRE(!pgh.check_against_feature_flags({}, feature_flags_with_versioning)); +} + TEST_CASE ("manifest construct maximum", "[manifests]") { auto m_pgh = test_parse_manifest(R"json({ @@ -181,6 +381,8 @@ TEST_CASE ("manifest construct maximum", "[manifests]") REQUIRE(pgh.feature_paragraphs[1]->description.size() == 2); REQUIRE(pgh.feature_paragraphs[1]->description[0] == "son of the fire lord"); REQUIRE(pgh.feature_paragraphs[1]->description[1] == "firebending 師父"); + + REQUIRE(!pgh.check_against_feature_flags({}, feature_flags_without_versioning)); } TEST_CASE ("SourceParagraph manifest two dependencies", "[manifests]") diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index 0bae37e5a4233e..2abe20774fef69 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -797,7 +797,7 @@ namespace vcpkg::Install Metrics::g_metrics.lock()->track_property("x-write-nuget-packages-config", "defined"); pkgsconfig = fs::u8path(it_pkgsconfig->second); } - auto manifest_path = paths.get_manifest_path().value_or_exit(VCPKG_LINE_INFO); + const auto& manifest_path = paths.get_manifest_path().value_or_exit(VCPKG_LINE_INFO); auto maybe_manifest_scf = SourceControlFile::parse_manifest_file(manifest_path, *manifest); if (!maybe_manifest_scf) { @@ -806,8 +806,14 @@ namespace vcpkg::Install "more information.\n"); Checks::exit_fail(VCPKG_LINE_INFO); } + auto& manifest_scf = *maybe_manifest_scf.value_or_exit(VCPKG_LINE_INFO); + if (auto maybe_error = manifest_scf.check_against_feature_flags(manifest_path, paths.get_feature_flags())) + { + Checks::exit_with_message(VCPKG_LINE_INFO, maybe_error.value_or_exit(VCPKG_LINE_INFO)); + } + std::vector features; auto manifest_feature_it = options.multisettings.find(OPTION_MANIFEST_FEATURE); if (manifest_feature_it != options.multisettings.end()) diff --git a/toolsrc/src/vcpkg/packagespec.cpp b/toolsrc/src/vcpkg/packagespec.cpp index 0feb8412a418a1..a40d30340a1bc5 100644 --- a/toolsrc/src/vcpkg/packagespec.cpp +++ b/toolsrc/src/vcpkg/packagespec.cpp @@ -259,6 +259,14 @@ namespace vcpkg return ret; } + bool operator==(const DependencyConstraint& lhs, const DependencyConstraint& rhs) + { + if (lhs.type != rhs.type) return false; + if (lhs.value != rhs.value) return false; + return lhs.port_version == rhs.port_version; + } + bool operator!=(const DependencyConstraint& lhs, const DependencyConstraint& rhs); + bool operator==(const Dependency& lhs, const Dependency& rhs) { if (lhs.name != rhs.name) return false; @@ -269,4 +277,14 @@ namespace vcpkg return true; } bool operator!=(const Dependency& lhs, const Dependency& rhs); + + bool operator==(const DependencyOverride& lhs, const DependencyOverride& rhs) + { + if (lhs.version_scheme != rhs.version_scheme) return false; + if (lhs.port_version != rhs.port_version) return false; + if (lhs.name != rhs.name) return false; + if (lhs.version != rhs.version) return false; + return lhs.extra_info == rhs.extra_info; + } + bool operator!=(const DependencyOverride& lhs, const DependencyOverride& rhs); } diff --git a/toolsrc/src/vcpkg/portfileprovider.cpp b/toolsrc/src/vcpkg/portfileprovider.cpp index 3919731873ff86..9c09a23e4fb00b 100644 --- a/toolsrc/src/vcpkg/portfileprovider.cpp +++ b/toolsrc/src/vcpkg/portfileprovider.cpp @@ -182,6 +182,10 @@ namespace vcpkg::PortFileProvider } if (auto p = maybe_port.get()) { + auto maybe_error = + p->source_control_file->check_against_feature_flags(p->source_location, paths.get_feature_flags()); + if (maybe_error) return std::move(*maybe_error.get()); + cache_it = cache.emplace(spec, std::move(*p)).first; } } @@ -192,16 +196,6 @@ namespace vcpkg::PortFileProvider } else { - if (!paths.get_feature_flags().versions) - { - if (cache_it->second.source_control_file->core_paragraph->version_scheme != Versions::Scheme::String) - { - return Strings::concat( - "Port definition rejected because the `", - VcpkgCmdArguments::VERSIONS_FEATURE, - "` feature flag is disabled.\nThis can be fixed by using the \"version-string\" field."); - } - } return cache_it->second; } } diff --git a/toolsrc/src/vcpkg/sourceparagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp index 74858a7386b9ef..f05ebb619e130c 100644 --- a/toolsrc/src/vcpkg/sourceparagraph.cpp +++ b/toolsrc/src/vcpkg/sourceparagraph.cpp @@ -10,6 +10,7 @@ #include #include #include +#include namespace vcpkg { @@ -428,6 +429,9 @@ namespace vcpkg constexpr static StringLiteral FEATURES = "features"; constexpr static StringLiteral DEFAULT_FEATURES = "default-features"; constexpr static StringLiteral PLATFORM = "platform"; + constexpr static StringLiteral PORT_VERSION = "port-version"; + constexpr static StringLiteral VERSION_EQ = "version="; + constexpr static StringLiteral VERSION_GE = "version>="; virtual Span valid_fields() const override { @@ -436,6 +440,9 @@ namespace vcpkg FEATURES, DEFAULT_FEATURES, PLATFORM, + PORT_VERSION, + VERSION_EQ, + VERSION_GE, }; return t; @@ -480,6 +487,34 @@ namespace vcpkg r.optional_object_field(obj, PLATFORM, dep.platform, PlatformExprDeserializer::instance); + static Json::StringDeserializer version_deserializer{"a version"}; + + auto has_eq_constraint = + r.optional_object_field(obj, VERSION_EQ, dep.constraint.value, version_deserializer); + auto has_ge_constraint = + r.optional_object_field(obj, VERSION_GE, dep.constraint.value, version_deserializer); + auto has_port_ver = r.optional_object_field( + obj, PORT_VERSION, dep.constraint.port_version, Json::NaturalNumberDeserializer::instance); + + if (has_eq_constraint) + { + dep.constraint.type = Versions::Constraint::Type::Exact; + if (has_ge_constraint) + { + r.add_generic_error(type_name(), "cannot have both exact and minimum constraints simultaneously"); + } + } + else if (has_ge_constraint) + { + dep.constraint.type = Versions::Constraint::Type::Minimum; + } + else if (has_port_ver) // does not have a primary constraint + { + r.add_generic_error( + type_name(), + "\"port-version\" cannot be used without a primary constraint (\"version=\" or \"version>=\")"); + } + return dep; } @@ -504,6 +539,106 @@ namespace vcpkg constexpr StringLiteral DependencyDeserializer::FEATURES; constexpr StringLiteral DependencyDeserializer::DEFAULT_FEATURES; constexpr StringLiteral DependencyDeserializer::PLATFORM; + constexpr StringLiteral DependencyDeserializer::VERSION_EQ; + constexpr StringLiteral DependencyDeserializer::VERSION_GE; + constexpr StringLiteral DependencyDeserializer::PORT_VERSION; + + struct DependencyOverrideDeserializer : Json::IDeserializer + { + virtual StringView type_name() const override { return "an override"; } + + constexpr static StringLiteral NAME = "name"; + constexpr static StringLiteral PORT_VERSION = "port-version"; + constexpr static StringLiteral VERSION_RELAXED = "version"; + constexpr static StringLiteral VERSION_SEMVER = "version-semver"; + constexpr static StringLiteral VERSION_DATE = "version-date"; + constexpr static StringLiteral VERSION_STRING = "version-string"; + + virtual Span valid_fields() const override + { + static const StringView t[] = { + NAME, + PORT_VERSION, + VERSION_RELAXED, + VERSION_SEMVER, + VERSION_DATE, + VERSION_STRING, + }; + + return t; + } + + static void visit_impl(StringView type_name, + Json::Reader& r, + const Json::Object& obj, + std::string& name, + std::string& version, + Versions::Scheme& version_scheme, + int& port_version) + { + static Json::StringDeserializer version_exact_deserializer{"an exact version string"}; + static Json::StringDeserializer version_relaxed_deserializer{"a relaxed version string"}; + static Json::StringDeserializer version_semver_deserializer{"a semantic version string"}; + static Json::StringDeserializer version_date_deserializer{"a date version string"}; + + r.required_object_field(type_name, obj, NAME, name, Json::IdentifierDeserializer::instance); + bool has_exact = r.optional_object_field(obj, VERSION_STRING, version, version_exact_deserializer); + bool has_relax = r.optional_object_field(obj, VERSION_RELAXED, version, version_relaxed_deserializer); + bool has_semver = r.optional_object_field(obj, VERSION_SEMVER, version, version_semver_deserializer); + bool has_date = r.optional_object_field(obj, VERSION_DATE, version, version_date_deserializer); + int num_versions = (int)has_exact + (int)has_relax + (int)has_semver + (int)has_date; + if (num_versions == 0) + { + r.add_generic_error(type_name, "expected a versioning field (example: ", VERSION_STRING, ")"); + } + else if (num_versions > 1) + { + r.add_generic_error(type_name, "expected only one versioning field"); + } + else + { + if (has_exact) + version_scheme = Versions::Scheme::String; + else if (has_relax) + version_scheme = Versions::Scheme::Relaxed; + else if (has_semver) + version_scheme = Versions::Scheme::Semver; + else if (has_date) + version_scheme = Versions::Scheme::Date; + else + Checks::unreachable(VCPKG_LINE_INFO); + } + + r.optional_object_field(obj, PORT_VERSION, port_version, Json::NaturalNumberDeserializer::instance); + } + + virtual Optional visit_object(Json::Reader& r, const Json::Object& obj) override + { + DependencyOverride dep; + + for (const auto& el : obj) + { + if (Strings::starts_with(el.first, "$")) + { + dep.extra_info.insert_or_replace(el.first.to_string(), el.second); + } + } + + visit_impl(type_name(), r, obj, dep.name, dep.version, dep.version_scheme, dep.port_version); + + return dep; + } + + static DependencyOverrideDeserializer instance; + }; + DependencyOverrideDeserializer DependencyOverrideDeserializer::instance; + + constexpr StringLiteral DependencyOverrideDeserializer::NAME; + constexpr StringLiteral DependencyOverrideDeserializer::VERSION_STRING; + constexpr StringLiteral DependencyOverrideDeserializer::VERSION_RELAXED; + constexpr StringLiteral DependencyOverrideDeserializer::VERSION_SEMVER; + constexpr StringLiteral DependencyOverrideDeserializer::VERSION_DATE; + constexpr StringLiteral DependencyOverrideDeserializer::PORT_VERSION; // reasoning for these two distinct types -- FeatureDeserializer and ArrayFeatureDeserializer: // `"features"` may be defined in one of two ways: @@ -793,6 +928,7 @@ namespace vcpkg constexpr static StringLiteral FEATURES = "features"; constexpr static StringLiteral DEFAULT_FEATURES = "default-features"; constexpr static StringLiteral SUPPORTS = "supports"; + constexpr static StringLiteral OVERRIDES = "overrides"; virtual Span valid_fields() const override { @@ -813,6 +949,7 @@ namespace vcpkg FEATURES, DEFAULT_FEATURES, SUPPORTS, + OVERRIDES, }; return t; @@ -835,48 +972,21 @@ namespace vcpkg } } - static Json::StringDeserializer version_exact_deserializer{"an exact version string"}; - static Json::StringDeserializer version_relaxed_deserializer{"a relaxed version string"}; - static Json::StringDeserializer version_semver_deserializer{"a semantic version string"}; - static Json::StringDeserializer version_date_deserializer{"a date version string"}; static Json::StringDeserializer url_deserializer{"a url"}; constexpr static StringView type_name = "vcpkg.json"; - r.required_object_field(type_name, obj, NAME, spgh->name, Json::IdentifierDeserializer::instance); - bool has_exact = r.optional_object_field(obj, VERSION_STRING, spgh->version, version_exact_deserializer); - bool has_relax = r.optional_object_field(obj, VERSION_RELAXED, spgh->version, version_relaxed_deserializer); - bool has_semver = r.optional_object_field(obj, VERSION_SEMVER, spgh->version, version_semver_deserializer); - bool has_date = r.optional_object_field(obj, VERSION_DATE, spgh->version, version_date_deserializer); - int num_versions = (int)has_exact + (int)has_relax + (int)has_semver + (int)has_date; - if (num_versions == 0) - { - r.add_generic_error(type_name, "expected a versioning field (example: ", VERSION_RELAXED, ")"); - } - else if (num_versions > 1) - { - r.add_generic_error(type_name, "expected only one versioning field"); - } - else - { - if (has_exact) - spgh->version_scheme = Versions::Scheme::String; - else if (has_relax) - spgh->version_scheme = Versions::Scheme::Relaxed; - else if (has_semver) - spgh->version_scheme = Versions::Scheme::Semver; - else if (has_date) - spgh->version_scheme = Versions::Scheme::Date; - else - Checks::unreachable(VCPKG_LINE_INFO); - } + DependencyOverrideDeserializer::visit_impl( + type_name, r, obj, spgh->name, spgh->version, spgh->version_scheme, spgh->port_version); - r.optional_object_field(obj, PORT_VERSION, spgh->port_version, Json::NaturalNumberDeserializer::instance); r.optional_object_field(obj, MAINTAINERS, spgh->maintainers, Json::ParagraphDeserializer::instance); r.optional_object_field(obj, DESCRIPTION, spgh->description, Json::ParagraphDeserializer::instance); r.optional_object_field(obj, HOMEPAGE, spgh->homepage, url_deserializer); r.optional_object_field(obj, DOCUMENTATION, spgh->documentation, url_deserializer); r.optional_object_field(obj, LICENSE, spgh->license, LicenseExpressionDeserializer::instance); r.optional_object_field(obj, DEPENDENCIES, spgh->dependencies, DependencyArrayDeserializer::instance); + static Json::ArrayDeserializer overrides_deserializer{ + "an array of overrides"}; + r.optional_object_field(obj, OVERRIDES, spgh->overrides, overrides_deserializer); if (obj.contains(DEV_DEPENDENCIES)) { @@ -919,6 +1029,18 @@ namespace vcpkg constexpr StringLiteral ManifestDeserializer::FEATURES; constexpr StringLiteral ManifestDeserializer::DEFAULT_FEATURES; constexpr StringLiteral ManifestDeserializer::SUPPORTS; + constexpr StringLiteral ManifestDeserializer::OVERRIDES; + + SourceControlFile SourceControlFile::clone() const + { + SourceControlFile ret; + ret.core_paragraph = std::make_unique(*core_paragraph); + for (const auto& feat_ptr : feature_paragraphs) + { + ret.feature_paragraphs.push_back(std::make_unique(*feat_ptr)); + } + return ret; + } Parse::ParseExpected SourceControlFile::parse_manifest_object(const std::string& origin, const Json::Object& manifest) @@ -944,6 +1066,52 @@ namespace vcpkg } } + Optional SourceControlFile::check_against_feature_flags(const fs::path& origin, + const FeatureFlagSettings& flags) const + { + if (!flags.versions) + { + if (core_paragraph->version_scheme != Versions::Scheme::String) + { + return Strings::concat(fs::u8string(origin), + " was rejected because it uses a non-string version scheme and the `", + VcpkgCmdArguments::VERSIONS_FEATURE, + "` feature flag is disabled.\nThis can be fixed by using \"version-string\"."); + } + + auto check_deps = [&](View deps) -> Optional { + for (auto&& dep : deps) + { + if (dep.constraint.type != Versions::Constraint::Type::None) + { + return Strings::concat(fs::u8string(origin), + " was rejected because it uses constraints and the `", + VcpkgCmdArguments::VERSIONS_FEATURE, + "` feature flag is disabled.\nThis can be fixed by removing uses of " + "\"version>=\" and \"version=\"."); + } + } + return nullopt; + }; + + if (auto r = check_deps(core_paragraph->dependencies)) return r; + + for (auto&& fpgh : feature_paragraphs) + { + if (auto r = check_deps(fpgh->dependencies)) return r; + } + + if (core_paragraph->overrides.size() != 0) + { + return Strings::concat(fs::u8string(origin), + " was rejected because it uses overrides and the `", + VcpkgCmdArguments::VERSIONS_FEATURE, + "` feature flag is disabled.\nThis can be fixed by removing \"overrides\"."); + } + } + return nullopt; + } + Parse::ParseExpected SourceControlFile::parse_manifest_file(const fs::path& path_to_manifest, const Json::Object& manifest) { @@ -1119,7 +1287,8 @@ namespace vcpkg } }; auto serialize_dependency = [&](Json::Array& arr, const Dependency& dep) { - if (dep.features.empty() && dep.platform.is_empty() && dep.extra_info.is_empty()) + if (dep.features.empty() && dep.platform.is_empty() && dep.extra_info.is_empty() && + dep.constraint.type == Versions::Constraint::Type::None) { arr.push_back(Json::Value::string(dep.name)); } @@ -1143,9 +1312,51 @@ namespace vcpkg serialize_optional_array(dep_obj, DependencyDeserializer::FEATURES, features_copy); serialize_optional_string(dep_obj, DependencyDeserializer::PLATFORM, to_string(dep.platform)); + if (dep.constraint.port_version != 0) + { + dep_obj.insert(DependencyDeserializer::PORT_VERSION, + Json::Value::integer(dep.constraint.port_version)); + } + + if (dep.constraint.type == Versions::Constraint::Type::Exact) + { + dep_obj.insert(DependencyDeserializer::VERSION_EQ, Json::Value::string(dep.constraint.value)); + } + else if (dep.constraint.type == Versions::Constraint::Type::Minimum) + { + dep_obj.insert(DependencyDeserializer::VERSION_GE, Json::Value::string(dep.constraint.value)); + } } }; + auto version_field = [](Versions::Scheme version_scheme) { + switch (version_scheme) + { + case Versions::Scheme::String: return ManifestDeserializer::VERSION_STRING; + case Versions::Scheme::Semver: return ManifestDeserializer::VERSION_SEMVER; + case Versions::Scheme::Relaxed: return ManifestDeserializer::VERSION_RELAXED; + case Versions::Scheme::Date: return ManifestDeserializer::VERSION_DATE; + default: Checks::unreachable(VCPKG_LINE_INFO); + } + }; + + auto serialize_override = [&](Json::Array& arr, const DependencyOverride& dep) { + auto& dep_obj = arr.push_back(Json::Object()); + for (const auto& el : dep.extra_info) + { + dep_obj.insert(el.first.to_string(), el.second); + } + + dep_obj.insert(DependencyOverrideDeserializer::NAME, Json::Value::string(dep.name)); + + if (dep.port_version != 0) + { + dep_obj.insert(DependencyDeserializer::PORT_VERSION, Json::Value::integer(dep.port_version)); + } + + dep_obj.insert(version_field(dep.version_scheme), Json::Value::string(dep.version)); + }; + Json::Object obj; for (const auto& el : scf.core_paragraph->extra_info) @@ -1154,17 +1365,7 @@ namespace vcpkg } obj.insert(ManifestDeserializer::NAME, Json::Value::string(scf.core_paragraph->name)); - auto version_field = [&] { - switch (scf.core_paragraph->version_scheme) - { - case Versions::Scheme::String: return ManifestDeserializer::VERSION_STRING; - case Versions::Scheme::Semver: return ManifestDeserializer::VERSION_SEMVER; - case Versions::Scheme::Relaxed: return ManifestDeserializer::VERSION_RELAXED; - case Versions::Scheme::Date: return ManifestDeserializer::VERSION_DATE; - default: Checks::unreachable(VCPKG_LINE_INFO); - } - }(); - obj.insert(version_field, Json::Value::string(scf.core_paragraph->version)); + obj.insert(version_field(scf.core_paragraph->version_scheme), Json::Value::string(scf.core_paragraph->version)); if (scf.core_paragraph->port_version != 0 || debug) { @@ -1216,6 +1417,16 @@ namespace vcpkg } } + if (!scf.core_paragraph->overrides.empty() || debug) + { + auto& overrides = obj.insert(ManifestDeserializer::OVERRIDES, Json::Array()); + + for (const auto& over : scf.core_paragraph->overrides) + { + serialize_override(overrides, over); + } + } + if (debug) { obj.insert("TYPE", Json::Value::string(Type::to_string(scf.core_paragraph->type))); From ce86a7ad5c1bb63cca336065119025300a5b9678 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 Nov 2020 13:35:03 -0800 Subject: [PATCH 0019/1694] [poco] Fix dependency, add features (#14305) * [poco] Fix dependency, add features * [poco] Update libmysql related code * [poco] Drop uwp support, fix cmake path --- ports/poco/CONTROL | 14 +- ports/poco/fix_dependency.patch | 264 ++++++++++++++++++++--------- ports/poco/include_pcre.patch | 22 --- ports/poco/portfile.cmake | 90 +++------- ports/poco/static_pcre.patch | 52 +++--- ports/poco/use-vcpkg-libharu.patch | 18 -- 6 files changed, 245 insertions(+), 215 deletions(-) delete mode 100644 ports/poco/include_pcre.patch delete mode 100644 ports/poco/use-vcpkg-libharu.patch diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL index a2e4d7a9386ede..6c4f1279ad11b5 100644 --- a/ports/poco/CONTROL +++ b/ports/poco/CONTROL @@ -1,8 +1,10 @@ Source: poco Version: 1.10.1 -Build-Depends: expat, libpq, pcre, sqlite3, zlib, libpng +Port-Version: 1 +Build-Depends: expat, pcre, zlib 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 +Supports: !uwp Feature: mysql Build-Depends: libmysql @@ -16,6 +18,14 @@ Feature: postgresql Build-Depends: libpqxx Description: PostgreSQL support for POCO +Feature: sqlite3 +Build-Depends: sqlite3 +Description: Sqlite3 support for POCO + +Feature: netssl +Build-Depends: openssl +Description: NetSSL support for POCO + Feature: pdf Build-Depends: libharu -Description: Haru support for POCO +Description: Haru support for POCO \ No newline at end of file diff --git a/ports/poco/fix_dependency.patch b/ports/poco/fix_dependency.patch index 1521656e1d7127..4512ffce43ec9a 100644 --- a/ports/poco/fix_dependency.patch +++ b/ports/poco/fix_dependency.patch @@ -1,82 +1,182 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b664afd..0d4670e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -457,15 +457,6 @@ install( - Devel - ) - --if(POCO_UNBUNDLED) -- install(FILES cmake/FindPCRE.cmake -- DESTINATION "${PocoConfigPackageLocation}") -- install(FILES cmake/V39/FindEXPAT.cmake -- DESTINATION "${PocoConfigPackageLocation}/V39") -- install(FILES cmake/V313/FindSQLite3.cmake -- DESTINATION "${PocoConfigPackageLocation}/V313") --endif() -- - message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") - message(STATUS "${PROJECT_NAME} package version: ${PROJECT_VERSION}") - if(BUILD_SHARED_LIBS) -diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt -index b52e2c5..0dcfae2 100644 ---- a/Data/SQLite/CMakeLists.txt -+++ b/Data/SQLite/CMakeLists.txt -@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h") - POCO_HEADERS_AUTO(SQLITE_SRCS ${HDRS_G}) - - if(POCO_UNBUNDLED) -- find_package(SQLite3 REQUIRED) -+ find_package(unofficial-sqlite3 CONFIG REQUIRED) - else() - # sqlite3 - POCO_SOURCES(SQLITE_SRCS sqlite3 -@@ -43,7 +43,7 @@ target_include_directories(DataSQLite - ) - - if(POCO_UNBUNDLED) -- target_link_libraries(DataSQLite PUBLIC SQLite::SQLite3) -+ target_link_libraries(DataSQLite PUBLIC unofficial::sqlite3::sqlite3) - target_compile_definitions(DataSQLite PUBLIC - POCO_UNBUNDLED - SQLITE_THREADSAFE=1 -diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt -index 4fbf06f..793285a 100644 ---- a/XML/CMakeLists.txt -+++ b/XML/CMakeLists.txt -@@ -20,7 +20,7 @@ endif() - # If POCO_UNBUNDLED is enabled we try to find the required packages - # The configuration will fail if the packages are not found - if(POCO_UNBUNDLED) -- find_package(EXPAT REQUIRED) -+ find_package(expat CONFIG REQUIRED) - else() - POCO_SOURCES(SRCS expat - src/xmlparse.cpp -@@ -50,7 +50,7 @@ target_include_directories(XML - ) - - if(POCO_UNBUNDLED) -- target_link_libraries(XML PUBLIC EXPAT::EXPAT) -+ target_link_libraries(XML PUBLIC expat::expat) - target_compile_definitions(XML PUBLIC POCO_UNBUNDLED) - else() - if(WIN32) -diff --git a/cmake/PocoConfig.cmake.in b/cmake/PocoConfig.cmake.in -index 173eacd..589fdb6 100644 ---- a/cmake/PocoConfig.cmake.in -+++ b/cmake/PocoConfig.cmake.in -@@ -8,6 +8,13 @@ if (NOT Poco_FIND_COMPONENTS) - return() - endif() - -+include(CMakeFindDependencyMacro) -+find_dependency(ZLIB REQUIRED) -+find_dependency(unofficial-pcre REQUIRED) -+if(Poco_FIND_REQUIRED_XML) -+ find_dependency(EXPAT REQUIRED) -+endif() -+ - set(_Poco_FIND_PARTS_REQUIRED) - if (Poco_FIND_REQUIRED) - set(_Poco_FIND_PARTS_REQUIRED REQUIRED) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b664afd..0f72521 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,8 +82,6 @@ option(FORCE_OPENSSL "Force usage of OpenSSL even under windows" OFF) + + if(ENABLE_CRYPTO OR ENABLE_NETSSL OR ENABLE_JWT) + find_package(OpenSSL REQUIRED) +-else() +- find_package(OpenSSL) + endif() + + if(OPENSSL_FOUND) +@@ -113,24 +111,18 @@ else() + option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" OFF) + endif() + +-if(ENABLE_DATA_MYSQL) +- find_package(MySQL REQUIRED) +-else() +- find_package(MySQL) +-endif() ++option(ENABLE_DATA "Enable Data" OFF) ++option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF) + +-if(MYSQL_FOUND) +- option(ENABLE_DATA "Enable Data" ON) +- option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" ON) +-else() +- option(ENABLE_DATA "Enable Data" OFF) +- option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF) ++if(ENABLE_DATA_MYSQL) ++ find_package(libmysql) ++ if (NOT libmysql_FOUND) ++ find_package(unofficial-libmariadb CONFIG REQUIRED) ++ endif() + endif() + + if(ENABLE_DATA_POSTGRESQL) + find_package(PostgreSQL REQUIRED) +-else() +- find_package(PostgreSQL) + endif() + + if(PostgreSQL_FOUND) +@@ -200,6 +192,9 @@ include(DefinePlatformSpecifc) + # Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file + set(Poco_COMPONENTS "") + ++# Do not declare the link library in the code! ++add_definitions(-DPOCO_NO_AUTOMATIC_LIBS) ++ + if(ENABLE_TESTS) + add_subdirectory(CppUnit) + set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) +@@ -327,8 +322,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS) + list(APPEND Poco_COMPONENTS "Redis") + endif() + +-if(EXISTS ${PROJECT_SOURCE_DIR}/PDF AND ENABLE_PDF) +- add_subdirectory(PDF) ++if(ENABLE_PDF) ++ include(SelectLibraryConfigurations) ++ find_library(PocoPDF_LIBRARY_RELEASE NAMES libhpdf) ++ find_library(PocoPDF_LIBRARY_DEBUG NAMES libhpdfd) ++ select_library_configurations(PocoPDF) + list(APPEND Poco_COMPONENTS "PDF") + endif() + +@@ -457,15 +455,6 @@ install( + Devel + ) + +-if(POCO_UNBUNDLED) +- install(FILES cmake/FindPCRE.cmake +- DESTINATION "${PocoConfigPackageLocation}") +- install(FILES cmake/V39/FindEXPAT.cmake +- DESTINATION "${PocoConfigPackageLocation}/V39") +- install(FILES cmake/V313/FindSQLite3.cmake +- DESTINATION "${PocoConfigPackageLocation}/V313") +-endif() +- + message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") + message(STATUS "${PROJECT_NAME} package version: ${PROJECT_VERSION}") + if(BUILD_SHARED_LIBS) +diff --git a/Data/MySQL/CMakeLists.txt b/Data/MySQL/CMakeLists.txt +index f71b145..c3eaf9e 100644 +--- a/Data/MySQL/CMakeLists.txt ++++ b/Data/MySQL/CMakeLists.txt +@@ -21,7 +21,7 @@ set_target_properties(DataMySQL + DEFINE_SYMBOL MySQL_EXPORTS + ) + +-target_link_libraries(DataMySQL PUBLIC Poco::Data MySQL::client) ++target_link_libraries(DataMySQL PUBLIC Poco::Data ${MYSQL_LIBRARIES}) + target_include_directories(DataMySQL + PUBLIC + $ +diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt +index b52e2c5..0dcfae2 100644 +--- a/Data/SQLite/CMakeLists.txt ++++ b/Data/SQLite/CMakeLists.txt +@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h") + POCO_HEADERS_AUTO(SQLITE_SRCS ${HDRS_G}) + + if(POCO_UNBUNDLED) +- find_package(SQLite3 REQUIRED) ++ find_package(unofficial-sqlite3 CONFIG REQUIRED) + else() + # sqlite3 + POCO_SOURCES(SQLITE_SRCS sqlite3 +@@ -43,7 +43,7 @@ target_include_directories(DataSQLite + ) + + if(POCO_UNBUNDLED) +- target_link_libraries(DataSQLite PUBLIC SQLite::SQLite3) ++ target_link_libraries(DataSQLite PUBLIC unofficial::sqlite3::sqlite3) + target_compile_definitions(DataSQLite PUBLIC + POCO_UNBUNDLED + SQLITE_THREADSAFE=1 +diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt +index 6f5100f..c9fa2e5 100644 +--- a/Foundation/CMakeLists.txt ++++ b/Foundation/CMakeLists.txt +@@ -35,7 +35,7 @@ POCO_MESSAGES(SRCS Logging src/pocomsg.mc) + # If POCO_UNBUNDLED is enabled we try to find the required packages + # The configuration will fail if the packages are not found + if(POCO_UNBUNDLED) +- find_package(PCRE REQUIRED) ++ find_package(unofficial-pcre CONFIG REQUIRED) + find_package(ZLIB REQUIRED) + + #HACK: Unicode.cpp requires functions from these files. The can't be taken from the library +@@ -101,7 +101,7 @@ set_target_properties(Foundation + ) + + if(POCO_UNBUNDLED) +- target_link_libraries(Foundation PUBLIC Pcre::Pcre ZLIB::ZLIB) ++ target_link_libraries(Foundation PUBLIC unofficial::pcre::pcre ZLIB::ZLIB) + target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) + add_definitions( + -D_pcre_utf8_table1=_poco_pcre_utf8_table1 +diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt +index 4fbf06f..793285a 100644 +--- a/XML/CMakeLists.txt ++++ b/XML/CMakeLists.txt +@@ -20,7 +20,7 @@ endif() + # If POCO_UNBUNDLED is enabled we try to find the required packages + # The configuration will fail if the packages are not found + if(POCO_UNBUNDLED) +- find_package(EXPAT REQUIRED) ++ find_package(expat CONFIG REQUIRED) + else() + POCO_SOURCES(SRCS expat + src/xmlparse.cpp +@@ -50,7 +50,7 @@ target_include_directories(XML + ) + + if(POCO_UNBUNDLED) +- target_link_libraries(XML PUBLIC EXPAT::EXPAT) ++ target_link_libraries(XML PUBLIC expat::expat) + target_compile_definitions(XML PUBLIC POCO_UNBUNDLED) + else() + if(WIN32) +diff --git a/cmake/PocoConfig.cmake.in b/cmake/PocoConfig.cmake.in +index 173eacd..9a375cd 100644 +--- a/cmake/PocoConfig.cmake.in ++++ b/cmake/PocoConfig.cmake.in +@@ -8,6 +8,13 @@ if (NOT Poco_FIND_COMPONENTS) + return() + endif() + ++include(CMakeFindDependencyMacro) ++find_dependency(ZLIB REQUIRED) ++find_dependency(unofficial-pcre REQUIRED) ++if(Poco_FIND_REQUIRED_XML) ++ find_dependency(EXPAT REQUIRED) ++endif() ++ + set(_Poco_FIND_PARTS_REQUIRED) + if (Poco_FIND_REQUIRED) + set(_Poco_FIND_PARTS_REQUIRED REQUIRED) diff --git a/ports/poco/include_pcre.patch b/ports/poco/include_pcre.patch deleted file mode 100644 index c714c4a7e890a4..00000000000000 --- a/ports/poco/include_pcre.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt -index 6b276be..f093991 100644 ---- a/Foundation/CMakeLists.txt -+++ b/Foundation/CMakeLists.txt -@@ -35,7 +35,7 @@ POCO_MESSAGES(SRCS Logging src/pocomsg.mc) - # If POCO_UNBUNDLED is enabled we try to find the required packages - # The configuration will fail if the packages are not found - if(POCO_UNBUNDLED) -- find_package(PCRE REQUIRED) -+ find_package(unofficial-pcre CONFIG REQUIRED) - find_package(ZLIB REQUIRED) - - #HACK: Unicode.cpp requires functions from these files. The can't be taken from the library -@@ -101,7 +101,7 @@ set_target_properties(Foundation - ) - - if(POCO_UNBUNDLED) -- target_link_libraries(Foundation PUBLIC Pcre::Pcre ZLIB::ZLIB) -+ target_link_libraries(Foundation PUBLIC unofficial::pcre::pcre ZLIB::ZLIB) - target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) - endif(POCO_UNBUNDLED) - diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index 5a25b98e2bc23e..27187cf086f873 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_TARGET "UWP") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pocoproject/poco @@ -5,12 +7,8 @@ vcpkg_from_github( SHA512 4c53a24a2ab9c57f4bf94e233da65cbb144c101b7d8d422d7e687d6c90ce0b53cb7bcfae63205ff30cade0fd07319e44a32035c1b15637ea2958986efc4ad5df HEAD_REF master PATCHES - # Add include path to public interface for static build - include_pcre.patch # Fix embedded copy of pcre in static linking mode static_pcre.patch - # Use vcpkg installed libharu for feature pdf - use-vcpkg-libharu.patch # Add the support of arm64-windows arm64_pcre.patch fix_dependency.patch @@ -20,36 +18,32 @@ file(REMOVE "${SOURCE_PATH}/Foundation/src/pcre.h") file(REMOVE "${SOURCE_PATH}/cmake/V39/FindEXPAT.cmake") file(REMOVE "${SOURCE_PATH}/cmake/V313/FindSQLite3.cmake") file(REMOVE "${SOURCE_PATH}/cmake/FindPCRE.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindMySQL.cmake") # define Poco linkage type string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" POCO_STATIC) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" POCO_MT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - pdf ENABLE_PDF + pdf ENABLE_PDF + netssl ENABLE_NETSSL + netssl ENABLE_NETSSL_WIN + netssl ENABLE_CRYPTO + sqlite3 ENABLE_DATA_SQLITE + postgresql ENABLE_DATA_POSTGRESQL ) -# MySQL / MariaDDB feature -if("mysql" IN_LIST FEATURES OR "mariadb" IN_LIST FEATURES) - if("mysql" IN_LIST FEATURES) - # enabling MySQL support - set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql") - set(MYSQL_LIBRARY "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib") - set(MYSQL_LIBRARY_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib") - endif() - if("mariadb" IN_LIST FEATURES) - # enabling MariaDB support - set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql") - set(MYSQL_LIBRARY "${CURRENT_INSTALLED_DIR}/lib/libmariadb.lib") - set(MYSQL_LIBRARY_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/libmariadb.lib") - endif() +if ("mysql" IN_LIST FEATURES OR "mariadb" IN_LIST FEATURES) + set(POCO_USE_MYSQL ON) +else() + set(POCO_USE_MYSQL OFF) endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - #PREFER_NINJA + PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} - # Set to OFF|ON (default is OFF) to control linking dependencies as external + # force to use dependencies as external -DPOCO_UNBUNDLED=ON # Define linking feature -DPOCO_STATIC=${POCO_STATIC} @@ -74,16 +68,18 @@ vcpkg_configure_cmake( -DENABLE_POCODOC=ON -DENABLE_PAGECOMPILER=ON -DENABLE_PAGECOMPILER_FILE2PAGE=ON - # - -DMYSQL_INCLUDE_DIR=${MYSQL_INCLUDE_DIR} - OPTIONS_RELEASE - -DMYSQL_LIB=${MYSQL_LIBRARY} - OPTIONS_DEBUG - -DMYSQL_LIB=${MYSQL_LIBRARY_DEBUG} + -DPOCO_DISABLE_INTERNAL_OPENSSL=ON + -DENABLE_APACHECONNECTOR=OFF + -DENABLE_DATA_MYSQL=${POCO_USE_MYSQL} ) vcpkg_install_cmake() +vcpkg_copy_pdbs() + +# Move apps to the tools folder +vcpkg_copy_tools(TOOL_NAMES cpspc f2cpsp PocoDoc tec AUTO_CLEAN) + # Copy additional include files not part of any libraries if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL") file(COPY ${SOURCE_PATH}/Data/include DESTINATION ${CURRENT_PACKAGES_DIR}) @@ -102,48 +98,12 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL/SQLite") file(COPY ${SOURCE_PATH}/Data/SQLite/include DESTINATION ${CURRENT_PACKAGES_DIR}) endif() -# Move apps to the tools folder -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) -if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/cpspc.exe") - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/cpspc.exe ${CURRENT_PACKAGES_DIR}/tools/cpspc.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/f2cpsp.exe ${CURRENT_PACKAGES_DIR}/tools/f2cpsp.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/PocoDoc.exe ${CURRENT_PACKAGES_DIR}/tools/PocoDoc.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/tec.exe ${CURRENT_PACKAGES_DIR}/tools/tec.exe) -else() - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/cpspc ${CURRENT_PACKAGES_DIR}/tools/cpspc) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/f2cpsp ${CURRENT_PACKAGES_DIR}/tools/f2cpsp) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/PocoDoc ${CURRENT_PACKAGES_DIR}/tools/PocoDoc) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/tec ${CURRENT_PACKAGES_DIR}/tools/tec) -endif() - -if (VCPKG_LIBRARY_LINKAGE STREQUAL static OR VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) - file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/bin) -else() - file(REMOVE - ${CURRENT_PACKAGES_DIR}/bin/cpspc.pdb - ${CURRENT_PACKAGES_DIR}/bin/f2cpsp.pdb - ${CURRENT_PACKAGES_DIR}/bin/PocoDoc.pdb - ${CURRENT_PACKAGES_DIR}/bin/tec.pdb - ${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.exe - ${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.pdb - ${CURRENT_PACKAGES_DIR}/debug/bin/f2cpsp.exe - ${CURRENT_PACKAGES_DIR}/debug/bin/f2cpsp.pdb - ${CURRENT_PACKAGES_DIR}/debug/bin/PocoDoc.exe - ${CURRENT_PACKAGES_DIR}/debug/bin/PocoDoc.pdb - ${CURRENT_PACKAGES_DIR}/debug/bin/tec.exe - ${CURRENT_PACKAGES_DIR}/debug/bin/tec.pdb) -endif() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/Poco") +else() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Poco) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) 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/poco/static_pcre.patch b/ports/poco/static_pcre.patch index 2618bce1e3f423..adfc5a7e8c00f9 100644 --- a/ports/poco/static_pcre.patch +++ b/ports/poco/static_pcre.patch @@ -1,26 +1,26 @@ -diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt -index f093991..c9fa2e5 100644 ---- a/Foundation/CMakeLists.txt -+++ b/Foundation/CMakeLists.txt -@@ -103,6 +103,21 @@ set_target_properties(Foundation - if(POCO_UNBUNDLED) - target_link_libraries(Foundation PUBLIC unofficial::pcre::pcre ZLIB::ZLIB) - target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) -+ add_definitions( -+ -D_pcre_utf8_table1=_poco_pcre_utf8_table1 -+ -D_pcre_utf8_table1_size=_poco_pcre_utf8_table1_size -+ -D_pcre_utf8_table2=_poco_pcre_utf8_table2 -+ -D_pcre_utf8_table3=_poco_pcre_utf8_table3 -+ -D_pcre_utf8_table4=_poco_pcre_utf8_table4 -+ -D_pcre_utt_names=_poco_pcre_utt_names -+ -D_pcre_utt=_poco_pcre_utt -+ -D_pcre_utt_size=_poco_pcre_utt_size -+ -D_pcre_OP_lengths=_poco_pcre_OP_lengths -+ -D_pcre_hspace_list=_poco_pcre_hspace_list -+ -D_pcre_vspace_list=_poco_pcre_vspace_list -+ -D_pcre_ucp_gentype=_poco_pcre_ucp_gentype -+ -D_pcre_ucp_gbtable=_poco_pcre_ucp_gbtable -+ ) - endif(POCO_UNBUNDLED) - - target_include_directories(Foundation +diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt +index 6b276be..6f5100f 100644 +--- a/Foundation/CMakeLists.txt ++++ b/Foundation/CMakeLists.txt +@@ -103,6 +103,21 @@ set_target_properties(Foundation + if(POCO_UNBUNDLED) + target_link_libraries(Foundation PUBLIC Pcre::Pcre ZLIB::ZLIB) + target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) ++ add_definitions( ++ -D_pcre_utf8_table1=_poco_pcre_utf8_table1 ++ -D_pcre_utf8_table1_size=_poco_pcre_utf8_table1_size ++ -D_pcre_utf8_table2=_poco_pcre_utf8_table2 ++ -D_pcre_utf8_table3=_poco_pcre_utf8_table3 ++ -D_pcre_utf8_table4=_poco_pcre_utf8_table4 ++ -D_pcre_utt_names=_poco_pcre_utt_names ++ -D_pcre_utt=_poco_pcre_utt ++ -D_pcre_utt_size=_poco_pcre_utt_size ++ -D_pcre_OP_lengths=_poco_pcre_OP_lengths ++ -D_pcre_hspace_list=_poco_pcre_hspace_list ++ -D_pcre_vspace_list=_poco_pcre_vspace_list ++ -D_pcre_ucp_gentype=_poco_pcre_ucp_gentype ++ -D_pcre_ucp_gbtable=_poco_pcre_ucp_gbtable ++ ) + endif(POCO_UNBUNDLED) + + target_include_directories(Foundation diff --git a/ports/poco/use-vcpkg-libharu.patch b/ports/poco/use-vcpkg-libharu.patch deleted file mode 100644 index c0b3dee7742dc8..00000000000000 --- a/ports/poco/use-vcpkg-libharu.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b664afd..2174556 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -327,8 +327,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS) - list(APPEND Poco_COMPONENTS "Redis") - endif() - --if(EXISTS ${PROJECT_SOURCE_DIR}/PDF AND ENABLE_PDF) -- add_subdirectory(PDF) -+if(ENABLE_PDF) -+ include(SelectLibraryConfigurations) -+ find_library(PocoPDF_LIBRARY_RELEASE NAMES libhpdf) -+ find_library(PocoPDF_LIBRARY_DEBUG NAMES libhpdfd) -+ select_library_configurations(PocoPDF) - list(APPEND Poco_COMPONENTS "PDF") - endif() - From 450ea3e1b1dae55c10daa433749575d368d05765 Mon Sep 17 00:00:00 2001 From: "Joakim L. Gilje" Date: Fri, 13 Nov 2020 22:36:41 +0100 Subject: [PATCH 0020/1694] preprocess _ignore_flags with vcpkg_escape_regex_control_characters (#14018) Co-authored-by: JackBoosY --- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 3b7a104ec1a031..baccef10023ad8 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -169,6 +169,7 @@ function(vcpkg_fixup_pkgconfig_check_files pkg_cfg_cmd _file _config _system_lib debug_message("BEFORE IGNORE FLAGS REMOVAL: ${_pkg_libs_output}") foreach(_ignore IN LISTS _ignore_flags) # Remove ignore with whitespace debug_message("REMOVING FLAG:'${_ignore}'") + vcpkg_escape_regex_control_characters(_ignore "${_ignore}") string(REGEX REPLACE "(^[\t ]*|;[\t ]*|[\t ]+)${_ignore}([\t ]+|[\t ]*;|[\t ]*$)" "\\2" _pkg_libs_output "${_pkg_libs_output}") debug_message("AFTER REMOVAL: ${_pkg_libs_output}") endforeach() From 40e01e8bc2fe15aa09c3837eae2c93b2584f2da3 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Sat, 14 Nov 2020 05:38:59 +0800 Subject: [PATCH 0021/1694] [boost] Install usage file (#14517) * [boost] Install usage file * Switch to target style Co-authored-by: nicole mazzuca --- ports/boost-modular-build-helper/CONTROL | 1 + ports/boost-modular-build-helper/boost-modular-build.cmake | 3 +++ ports/boost-modular-build-helper/portfile.cmake | 1 + ports/boost-modular-build-helper/usage | 4 ++++ ports/boost-vcpkg-helpers/CONTROL | 2 +- ports/boost-vcpkg-helpers/boost-modular-headers.cmake | 2 +- ports/boost-vcpkg-helpers/portfile.cmake | 7 ++++--- ports/boost-vcpkg-helpers/usage | 4 ++++ 8 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 ports/boost-modular-build-helper/usage create mode 100644 ports/boost-vcpkg-helpers/usage diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index 6921a7e61ca867..42efdcaf8df702 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,3 +1,4 @@ Source: boost-modular-build-helper Version: 1.74.0 +Port-Version: 1 Build-Depends: boost-uninstall \ No newline at end of file diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 83a76c0730c785..06cebed399326c 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -148,6 +148,8 @@ function(boost_modular_build) if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/lib) message(FATAL_ERROR "No libraries were produced. This indicates a failure while building the boost library.") endif() + + file(INSTALL ${CURRENT_INSTALLED_DIR}/share/boost-build/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) return() endif() @@ -446,4 +448,5 @@ function(boost_modular_build) endif() vcpkg_copy_pdbs() + file(INSTALL ${CURRENT_INSTALLED_DIR}/share/boost-build/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) endfunction() diff --git a/ports/boost-modular-build-helper/portfile.cmake b/ports/boost-modular-build-helper/portfile.cmake index 5f63ce5d8291ea..8224bb9575579a 100644 --- a/ports/boost-modular-build-helper/portfile.cmake +++ b/ports/boost-modular-build-helper/portfile.cmake @@ -7,6 +7,7 @@ file( ${CMAKE_CURRENT_LIST_DIR}/nothing.bat ${CMAKE_CURRENT_LIST_DIR}/user-config.jam ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-build ) \ No newline at end of file diff --git a/ports/boost-modular-build-helper/usage b/ports/boost-modular-build-helper/usage new file mode 100644 index 00000000000000..89a0376daddec3 --- /dev/null +++ b/ports/boost-modular-build-helper/usage @@ -0,0 +1,4 @@ +The package boost is compatible with built-in CMake targets: + + find_package(Boost REQUIRED [COMPONENTS ...]) + target_link_libraries(main PRIVATE Boost::boost Boost:: Boost:: ...) diff --git a/ports/boost-vcpkg-helpers/CONTROL b/ports/boost-vcpkg-helpers/CONTROL index 1b1642e17406b5..e2c97b035302f5 100644 --- a/ports/boost-vcpkg-helpers/CONTROL +++ b/ports/boost-vcpkg-helpers/CONTROL @@ -1,5 +1,5 @@ Source: boost-vcpkg-helpers Version: 7 -Port-Version: 1 +Port-Version: 2 Description: a set of vcpkg-internal scripts used to modularize boost Build-Depends: boost-uninstall \ No newline at end of file diff --git a/ports/boost-vcpkg-helpers/boost-modular-headers.cmake b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake index 86c45be7b9ac7a..2be7c64464e3ba 100644 --- a/ports/boost-vcpkg-helpers/boost-modular-headers.cmake +++ b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake @@ -19,6 +19,6 @@ function(boost_modular_headers) FILENAME "boost_LICENSE_1_0.txt" SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 ) - + file(INSTALL ${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) endfunction() diff --git a/ports/boost-vcpkg-helpers/portfile.cmake b/ports/boost-vcpkg-helpers/portfile.cmake index 32f501f24671f6..0233bda5aa7b1a 100644 --- a/ports/boost-vcpkg-helpers/portfile.cmake +++ b/ports/boost-vcpkg-helpers/portfile.cmake @@ -1,7 +1,8 @@ -file( - COPY ${CMAKE_CURRENT_LIST_DIR}/boost-modular-headers.cmake - DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-vcpkg-helpers +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/boost-modular-headers.cmake + ${CMAKE_CURRENT_LIST_DIR}/usage + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} ) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/boost-vcpkg-helpers/usage b/ports/boost-vcpkg-helpers/usage new file mode 100644 index 00000000000000..89a0376daddec3 --- /dev/null +++ b/ports/boost-vcpkg-helpers/usage @@ -0,0 +1,4 @@ +The package boost is compatible with built-in CMake targets: + + find_package(Boost REQUIRED [COMPONENTS ...]) + target_link_libraries(main PRIVATE Boost::boost Boost:: Boost:: ...) From 4312a554baf962aff1b4ea13df0b13ff2b9ec506 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Sat, 14 Nov 2020 05:41:47 +0800 Subject: [PATCH 0022/1694] [opencl] Remove feature wdk (#14536) --- ports/opencl/CONTROL | 5 +---- ports/opencl/portfile.cmake | 17 ++--------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/ports/opencl/CONTROL b/ports/opencl/CONTROL index e554fe5ee3c017..edbe7c80c6da5a 100644 --- a/ports/opencl/CONTROL +++ b/ports/opencl/CONTROL @@ -1,8 +1,5 @@ Source: opencl Version: 2.2 -Port-Version: 4 +Port-Version: 5 Homepage: https://github.com/KhronosGroup/OpenCL-Headers Description: C/C++ headers and ICD loader (Installable Client Driver) for OpenCL - -Feature: wdk -Description: Windows Driver Kit support diff --git a/ports/opencl/portfile.cmake b/ports/opencl/portfile.cmake index dc1ea069cdc392..b0f09f4f92b2a7 100644 --- a/ports/opencl/portfile.cmake +++ b/ports/opencl/portfile.cmake @@ -1,12 +1,3 @@ -if("wdk" IN_LIST FEATURES) - if(NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Windows Driver Kit support is only available builds targeting Windows") - endif() - set(WITH_WDK ON) -else() - set(WITH_WDK OFF) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/OpenCL-Headers @@ -15,11 +6,7 @@ vcpkg_from_github( HEAD_REF master ) -file(INSTALL - "${SOURCE_PATH}/CL" - DESTINATION - ${CURRENT_PACKAGES_DIR}/include -) +file(INSTALL "${SOURCE_PATH}/CL" DESTINATION ${CURRENT_PACKAGES_DIR}/include) # OpenCL C++ headers vcpkg_from_github( @@ -67,7 +54,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DOPENCL_ICD_LOADER_HEADERS_DIR=${CURRENT_PACKAGES_DIR}/include - -DOPENCL_ICD_LOADER_REQUIRE_WDK=${WITH_WDK} + -DOPENCL_ICD_LOADER_REQUIRE_WDK=OFF -DUSE_DYNAMIC_VCXX_RUNTIME=${USE_DYNAMIC_VCXX_RUNTIME} ) From e73180be99026dc45302d7a6e19a164fe5db6270 Mon Sep 17 00:00:00 2001 From: Vitaliy Didik Date: Sat, 14 Nov 2020 00:45:13 +0300 Subject: [PATCH 0023/1694] [libidn2] Update to version 2.3.0 (#14540) --- ports/libidn2/CONTROL | 4 ++-- ports/libidn2/portfile.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/libidn2/CONTROL b/ports/libidn2/CONTROL index 00ec059a632100..f5fa6b075a333c 100644 --- a/ports/libidn2/CONTROL +++ b/ports/libidn2/CONTROL @@ -1,6 +1,6 @@ Source: libidn2 -Version: 2.2.0 -Port-Version: 2 +Version: 2.3.0 +Port-Version: 0 Build-Depends: libiconv Homepage: https://www.gnu.org/software/libidn/ Description: GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names. diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 5d637c5b19353d..7c3054b1ca00f5 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -1,10 +1,10 @@ -set(IDN2_VERSION 2.2.0) +set(IDN2_VERSION 2.3.0) set(IDN2_FILENAME libidn2-${IDN2_VERSION}.tar.gz) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}" FILENAME "${IDN2_FILENAME}" - SHA512 ccf56056a378d49a28ff67a2a23cd3d32ce51f86a78f84839b98dad709a1d0d03ac8d7c1496f0e4d3536bca00e3d09d34d76a37317b2ce87e3aa66bdf4e877b8 + SHA512 a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187 ) vcpkg_extract_source_archive_ex( From f125ad9adc3c2ff62bbc606eb4bafb158f78d053 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Fri, 13 Nov 2020 22:45:32 +0100 Subject: [PATCH 0024/1694] [sentry-native] Update to version 0.4.4 (#14541) Signed-off-by: Vitalii Koshura --- ports/sentry-native/CONTROL | 3 +-- ports/sentry-native/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ports/sentry-native/CONTROL b/ports/sentry-native/CONTROL index 40fbe7d6ba7083..ed8004c6fc6e64 100644 --- a/ports/sentry-native/CONTROL +++ b/ports/sentry-native/CONTROL @@ -1,6 +1,5 @@ Source: sentry-native -Version: 0.4.3 -Port-Version: 1 +Version: 0.4.4 Homepage: https://sentry.io/ Description: Sentry SDK for C, C++ and native applications. Build-Depends: curl (!windows) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 54533d73c7ce48..d4b6d313d69e83 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.3/sentry-native.zip" - FILENAME "sentry-native-0.4.3.zip" - SHA512 73f927aa27b3ff567cdbcf9f59af3f5b0e824a6e0ac4bcd70652dbe6f1c5b81d70afea90fc9f889f9f6b27e742edc975d32ccb4daa8435a3570d6a1d16fe32c3 + URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.4/sentry-native.zip" + FILENAME "sentry-native-0.4.4.zip" + SHA512 2f714343d07328e287113323937fa9045ebb03e1cd95ee18f9dd63ca7b54eba89c7184122e3ad3640e6b4de27f9a619bca6089d6a49a018225fbd93dab446b2d ) vcpkg_extract_source_archive_ex( From 2ecffc1c5e1af65d74de664849dfe699667458ed Mon Sep 17 00:00:00 2001 From: Eli Arzhannikov Date: Fri, 13 Nov 2020 22:56:26 +0100 Subject: [PATCH 0025/1694] [tbb] fix shared tbb library configuration build under *nix (#14555) * fix shared tbb library configuration build under *nix * bump Port Version * installing missed TBBConfigVersion.cmake --- ports/tbb/CONTROL | 4 ++-- ports/tbb/portfile.cmake | 26 ++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index 565b4a56455765..5eb978f3ac5712 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,6 +1,6 @@ Source: tbb Version: 2020_U3 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/01org/tbb Description: Intel's Threading Building Blocks. -Supports: !(uwp|arm|arm64) | linux \ No newline at end of file +Supports: !(uwp|arm|arm64) | linux diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 2e54a53a00a2e1..5950bd7102905d 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -24,7 +24,17 @@ if (NOT VCPKG_TARGET_IS_WINDOWS) vcpkg_install_cmake() # Settings for TBBConfigInternal.cmake.in - set(TBB_LIB_EXT a) + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(TBB_LIB_EXT a) + else() + if (VCPKG_TARGET_IS_LINUX) + set(TBB_LIB_EXT "so.2") + elseif(VCPKG_TARGET_IS_OSX) + set(TBB_LIB_EXT "dylib") + else() + set(TBB_LIB_EXT "so") + endif() + endif() set(TBB_LIB_PREFIX lib) else() if (VCPKG_CRT_LINKAGE STREQUAL static) @@ -34,7 +44,7 @@ else() set(RELEASE_CONFIGURATION Release) set(DEBUG_CONFIGURATION Debug) endif() - + macro(CONFIGURE_PROJ_FILE arg) set(CONFIGURE_FILE_NAME ${arg}) set(CONFIGURE_BAK_FILE_NAME ${arg}.bak) @@ -56,7 +66,7 @@ else() file(WRITE ${CONFIGURE_FILE_NAME} "${SLN_CONFIGURE}") endif() endmacro() - + CONFIGURE_PROJ_FILE(${SOURCE_PATH}/build/vs2013/tbb.vcxproj) CONFIGURE_PROJ_FILE(${SOURCE_PATH}/build/vs2013/tbbmalloc.vcxproj) CONFIGURE_PROJ_FILE(${SOURCE_PATH}/build/vs2013/tbbmalloc_proxy.vcxproj) @@ -97,6 +107,13 @@ configure_file( ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake @ONLY ) + +configure_file( + ${SOURCE_PATH}/cmake/templates/TBBConfigVersion.cmake.in + ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfigVersion.cmake + @ONLY +) + file(READ ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake _contents) string(REPLACE "get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)" @@ -116,9 +133,10 @@ string(REPLACE _contents "${_contents}" ) + string(REPLACE "SHARED IMPORTED)" "UNKNOWN IMPORTED)" _contents "${_contents}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake "${_contents}") file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb) # 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) From ee8fa86fe68a11edc6be197bbc33b292a51813a5 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 Nov 2020 13:59:23 -0800 Subject: [PATCH 0026/1694] [libarchive] Re-fix dependencies, combine patches (#14535) --- ports/libarchive/CONTROL | 1 + ports/libarchive/fix-dependencies.patch | 156 ++++++++++++++++++++++-- ports/libarchive/fix-lz4.patch | 16 --- ports/libarchive/fix-zstd.patch | 16 --- ports/libarchive/portfile.cmake | 2 - 5 files changed, 144 insertions(+), 47 deletions(-) delete mode 100644 ports/libarchive/fix-lz4.patch delete mode 100644 ports/libarchive/fix-zstd.patch diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index 155b09146e3ab5..db28e8dd36771b 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,5 +1,6 @@ Source: libarchive Version: 3.4.3 +Port-Version: 1 Homepage: https://github.com/libarchive/libarchive Description: Library for reading and writing streaming archives Build-Depends: zlib diff --git a/ports/libarchive/fix-dependencies.patch b/ports/libarchive/fix-dependencies.patch index 1e511b823cad4b..a04f10fbf02dab 100644 --- a/ports/libarchive/fix-dependencies.patch +++ b/ports/libarchive/fix-dependencies.patch @@ -1,13 +1,143 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b2634da..8608efc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -914,7 +914,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}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 39b5333..8164d8f 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,27 +462,15 @@ MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES) + # Find LZMA + # + IF(ENABLE_LZMA) +- FIND_PACKAGE(LibLZMA) ++ FIND_PACKAGE(LibLZMA CONFIG REQUIRED) + ELSE() + SET(LIBLZMA_FOUND FALSE) # Override cached value + ENDIF() + +-IF(LIBLZMA_FOUND) ++IF(LibLZMA_FOUND) + SET(HAVE_LIBLZMA 1) + SET(HAVE_LZMA_H 1) +- CMAKE_PUSH_CHECK_STATE() +- INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) +- LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES}) +- # Test if a macro is needed for the library. +- TRY_MACRO_FOR_LIBRARY( +- "${LIBLZMA_INCLUDE_DIRS}" "${LIBLZMA_LIBRARIES}" +- COMPILES +- "#include \nint main() {return (int)lzma_version_number(); }" +- "WITHOUT_LZMA_API_STATIC;LZMA_API_STATIC") +- IF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC) +- ADD_DEFINITIONS(-DLZMA_API_STATIC) +- ENDIF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC) +- CMAKE_POP_CHECK_STATE() ++ LIST(APPEND ADDITIONAL_LIBS LibLZMA::LibLZMA) + ELSE(LIBLZMA_FOUND) + # LZMA not found and will not be used. + ENDIF(LIBLZMA_FOUND) +@@ -555,22 +543,14 @@ IF(ENABLE_LZ4) + 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) +- FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR) ++ FIND_PACKAGE(lz4 CONFIG REQUIRED) + ELSE(ENABLE_LZ4) + SET(LZ4_FOUND FALSE) # Override cached value + ENDIF(ENABLE_LZ4) +-IF(LZ4_FOUND) ++IF(lz4_FOUND) + SET(HAVE_LIBLZ4 1) + SET(HAVE_LZ4_H 1) +- CMAKE_PUSH_CHECK_STATE() # Save the state of the variables +- SET(CMAKE_REQUIRED_INCLUDES ${LZ4_INCLUDE_DIR}) +- CHECK_INCLUDE_FILES("lz4hc.h" HAVE_LZ4HC_H) +- CMAKE_POP_CHECK_STATE() # Restore the state of the variables +- INCLUDE_DIRECTORIES(${LZ4_INCLUDE_DIR}) +- LIST(APPEND ADDITIONAL_LIBS ${LZ4_LIBRARY}) ++ LIST(APPEND ADDITIONAL_LIBS lz4::lz4) + # + # TODO: test for static library. + # +@@ -586,25 +566,14 @@ IF(ENABLE_ZSTD) + 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) +- FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR) ++ FIND_PACKAGE(zstd CONFIG REQUIRED) + ELSE(ENABLE_ZSTD) + SET(ZSTD_FOUND FALSE) # Override cached value + ENDIF(ENABLE_ZSTD) +-IF(ZSTD_FOUND) ++IF(zstd_FOUND) + 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) +- # +- # TODO: test for static library. +- # +- CMAKE_POP_CHECK_STATE() ++ LIST(APPEND ADDITIONAL_LIBS libzstd) ++ SET(CMAKE_REQUIRED_LIBRARIES libzstd) + 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) + 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) + IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES}) +- 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() +@@ -1432,8 +1400,7 @@ CHECK_C_SOURCE_COMPILES( + MAJOR_IN_SYSMACROS) + + CMAKE_PUSH_CHECK_STATE() +-SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR}) +-SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES}) ++SET(CMAKE_REQUIRED_LIBRARIES LibLZMA::LibLZMA) + IF(ENABLE_LZMA) + CHECK_C_SOURCE_COMPILES( + "#include \n#if LZMA_VERSION < 50020000\n#error unsupported\n#endif\nint main(void){lzma_stream_encoder_mt(0, 0); return 0;}" diff --git a/ports/libarchive/fix-lz4.patch b/ports/libarchive/fix-lz4.patch deleted file mode 100644 index 84b6b2d39da2a2..00000000000000 --- a/ports/libarchive/fix-lz4.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b2634da..3b6da5d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -574,7 +574,10 @@ IF(ENABLE_LZ4) - ENDIF (LZ4_INCLUDE_DIR) - - FIND_PATH(LZ4_INCLUDE_DIR lz4.h) -- FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4) -+ FIND_LIBRARY(LZ4_LIBRARY_DEBUG NAMES lz4d liblz4d) -+ FIND_LIBRARY(LZ4_LIBRARY_RELEASE NAMES lz4 liblz4) -+ INCLUDE(SelectLibraryConfigurations) -+ SELECT_LIBRARY_CONFIGURATIONS(LZ4) - INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR) - ELSE(ENABLE_LZ4) diff --git a/ports/libarchive/fix-zstd.patch b/ports/libarchive/fix-zstd.patch deleted file mode 100644 index 8f28979811445c..00000000000000 --- a/ports/libarchive/fix-zstd.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b2634da..e43b041 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -605,7 +605,10 @@ IF(ENABLE_ZSTD) - ENDIF (ZSTD_INCLUDE_DIR) - - FIND_PATH(ZSTD_INCLUDE_DIR zstd.h) -- FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd) -+ FIND_LIBRARY(ZSTD_LIBRARY_DEBUG NAMES zstdd libzstdd) -+ FIND_LIBRARY(ZSTD_LIBRARY_RELEASE NAMES zstd libzstd) -+ INCLUDE(SelectLibraryConfigurations) -+ SELECT_LIBRARY_CONFIGURATIONS(ZSTD) - INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR) - ELSE(ENABLE_ZSTD) diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index bf9fb71e372543..d275081cc95728 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -9,8 +9,6 @@ vcpkg_from_github( PATCHES fix-buildsystem.patch fix-dependencies.patch - fix-lz4.patch - fix-zstd.patch fix-cpu-set.patch disable-warnings.patch ) From 0825f7bb8c458daceed8fa237e8e5ff3f1647b72 Mon Sep 17 00:00:00 2001 From: Matioupi Date: Mon, 16 Nov 2020 18:49:38 +0100 Subject: [PATCH 0027/1694] [baseline][libarchive] : regression fix (#14579) * Fix regression cf. https://github.com/microsoft/vcpkg/issues/14567 introduced with commit https://github.com/microsoft/vcpkg/commit/5dc53211caedebf4387d590155ed53ee44161f10 * Changes as suggested in https://github.com/microsoft/vcpkg/pull/14579#discussion_r523812601 and following * Change as suggested in https://github.com/microsoft/vcpkg/pull/14579#discussion_r523809876 * [cmake] Fix dependency zstd * [cmake] Revert d14f917bd2c099575d2b5e57bfe8005ffa3d3506 * [libarchive] Fix cmake wrapper, add usage * Manual merge of https://github.com/microsoft/vcpkg/pull/14579/commits/fa887c48f10da9db4a3a3f9e7a0b186866711ea9 Co-authored-by: JackBoosY --- ports/libarchive/CONTROL | 2 +- ports/libarchive/fix-dependencies.patch | 15 +++++++++++---- ports/libarchive/portfile.cmake | 1 + ports/libarchive/usage | 5 +++++ ports/libarchive/vcpkg-cmake-wrapper.cmake | 14 ++++++-------- 5 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 ports/libarchive/usage diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index db28e8dd36771b..e15f1da44e99cd 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,6 +1,6 @@ Source: libarchive Version: 3.4.3 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/libarchive/libarchive Description: Library for reading and writing streaming archives Build-Depends: zlib diff --git a/ports/libarchive/fix-dependencies.patch b/ports/libarchive/fix-dependencies.patch index a04f10fbf02dab..0d3213c6766f52 100644 --- a/ports/libarchive/fix-dependencies.patch +++ b/ports/libarchive/fix-dependencies.patch @@ -42,7 +42,7 @@ index 39b5333..8164d8f 100644 ELSE(LIBLZMA_FOUND) # LZMA not found and will not be used. ENDIF(LIBLZMA_FOUND) -@@ -555,22 +543,14 @@ IF(ENABLE_LZ4) +@@ -555,22 +543,15 @@ IF(ENABLE_LZ4) SET(LZ4_FIND_QUIETLY TRUE) ENDIF (LZ4_INCLUDE_DIR) @@ -56,6 +56,7 @@ index 39b5333..8164d8f 100644 ENDIF(ENABLE_LZ4) -IF(LZ4_FOUND) +IF(lz4_FOUND) ++ SET(HAVE_LZ4HC_H 1) SET(HAVE_LIBLZ4 1) SET(HAVE_LZ4_H 1) - CMAKE_PUSH_CHECK_STATE() # Save the state of the variables @@ -68,7 +69,7 @@ index 39b5333..8164d8f 100644 # # TODO: test for static library. # -@@ -586,25 +566,14 @@ IF(ENABLE_ZSTD) +@@ -586,25 +566,20 @@ IF(ENABLE_ZSTD) SET(ZSTD_FIND_QUIETLY TRUE) ENDIF (ZSTD_INCLUDE_DIR) @@ -93,8 +94,14 @@ index 39b5333..8164d8f 100644 - # TODO: test for static library. - # - CMAKE_POP_CHECK_STATE() -+ LIST(APPEND ADDITIONAL_LIBS libzstd) -+ SET(CMAKE_REQUIRED_LIBRARIES libzstd) ++ SET(HAVE_LIBZSTD 1) ++ IF(TARGET 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) ++ ENDIF(TARGET zstd::libzstd_shared) ENDIF(ZSTD_FOUND) MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR) MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY) diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index d275081cc95728..df7b6ce779d59f 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -83,4 +83,5 @@ foreach(HEADER ${CURRENT_PACKAGES_DIR}/include/archive.h ${CURRENT_PACKAGES_DIR} file(WRITE ${HEADER} "${CONTENTS}") endforeach() +file(INSTALL ${CURRENT_PORT_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/libarchive/usage b/ports/libarchive/usage new file mode 100644 index 00000000000000..57f9f2ba23248a --- /dev/null +++ b/ports/libarchive/usage @@ -0,0 +1,5 @@ +The package libarchive is compatible with built-in CMake targets: + + find_package(libarchive REQUIRED) + target_include_directories(main PRIVATE ${LibArchive_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${LibArchive_LIBRARIES}) diff --git a/ports/libarchive/vcpkg-cmake-wrapper.cmake b/ports/libarchive/vcpkg-cmake-wrapper.cmake index 5e78381372ac37..006dde98dd5d87 100644 --- a/ports/libarchive/vcpkg-cmake-wrapper.cmake +++ b/ports/libarchive/vcpkg-cmake-wrapper.cmake @@ -32,14 +32,12 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") endif() endif() if(@ENABLE_ZSTD@) - find_library(ZSTD_LIBRARY_DEBUG NAMES zstdd zstd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) - find_library(ZSTD_LIBRARY_RELEASE NAMES zstd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) - if(ZSTD_LIBRARY_RELEASE) - list(APPEND LibArchive_LIBRARIES optimized ${ZSTD_LIBRARY_RELEASE}) - endif() - if(ZSTD_LIBRARY_DEBUG) - list(APPEND LibArchive_LIBRARIES debug ${ZSTD_LIBRARY_DEBUG}) - endif() + find_package(zstd CONFIG REQUIRED) + if(TARGET zstd::libzstd_shared) + list(APPEND LibArchive_LIBRARIES zstd::libzstd_shared) + else(TARGET zstd::libzstd_shared) + list(APPEND LibArchive_LIBRARIES zstd::libzstd_static) + endif(TARGET zstd::libzstd_shared) endif() if(@ENABLE_OPENSSL@) find_package(OpenSSL REQUIRED) From b7c00aab1adfedc5da8134401786aa20ee3e1bee Mon Sep 17 00:00:00 2001 From: Kevin Lalumiere Date: Mon, 16 Nov 2020 13:26:18 -0500 Subject: [PATCH 0028/1694] [aws-sdk-cpp] Make aws-sdk-cpp rpath relocatable (#14546) * Make aws-sdk-cpp rpath relocatable (fix #14544) This is important since vcpkg offers binary caching which could be shared between different machines (as long as both machines use the same "toolchains" [more technically, as long as the vcpkg hash is the same]) * Allow cross-compilation * Update port version Co-authored-by: Kevin Lalumiere --- ports/aws-sdk-cpp/CONTROL | 2 +- ports/aws-sdk-cpp/patch-relocatable-rpath.patch | 12 ++++++++++++ ports/aws-sdk-cpp/portfile.cmake | 7 +++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ports/aws-sdk-cpp/patch-relocatable-rpath.patch diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index 32a2323e85e097..ca92ed9585c35e 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,6 +1,6 @@ Source: aws-sdk-cpp Version: 1.8.83 -Port-Version: 0 +Port-Version: 1 Homepage: https://github.com/aws/aws-sdk-cpp Description: AWS SDK for C++ Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream diff --git a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch b/ports/aws-sdk-cpp/patch-relocatable-rpath.patch new file mode 100644 index 00000000000000..9c5a5a2c5d0b08 --- /dev/null +++ b/ports/aws-sdk-cpp/patch-relocatable-rpath.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a653e38628..76d6067646 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -142,7 +142,6 @@ else() + endif() + + # Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables. +-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) + + # build third-party targets + if (BUILD_DEPS) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 02e81684e565c9..21aac718aba7a2 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF e98e5732ec7319051f162f7314ae361c85d0a8c9 # 1.8.83 SHA512 da540db60551be833ea0315dd93241f9740ab953ed5657c1c7a8c401ae52a4e75b116758420b0a8a4ebb79358dff8377f5e052b180b36f0af27a36003f28bd56 HEAD_REF master + PATCHES patch-relocatable-rpath.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) @@ -16,6 +17,11 @@ include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) string(REPLACE ";" "\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}") +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(rpath "@loader_path") +else() + set(rpath "\$ORIGIN") +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE @@ -27,6 +33,7 @@ vcpkg_configure_cmake( -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE -DBUILD_ONLY=${BUILD_ONLY} -DBUILD_DEPS=OFF + -DCMAKE_INSTALL_RPATH=${rpath} ) vcpkg_install_cmake() From c4e23e94d5fb21fc59d5c6e5abd289d84b9cf83e Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 17 Nov 2020 02:28:39 +0800 Subject: [PATCH 0029/1694] [assimp] Fix cmake config name and add cmake version (#14554) * [assimp] Fix cmake cofig name and add cmake version * [ogre] Update 'Assimp' to 'assimp --- ports/assimp/CONTROL | 2 +- ports/assimp/build_fixes.patch | 1253 +++++++++++++++---------------- ports/assimp/irrlicht.patch | 143 ++-- ports/assimp/portfile.cmake | 4 +- ports/ogre/fix-dependency.patch | 2 +- ports/ogre/vcpkg.json | 2 +- 6 files changed, 692 insertions(+), 714 deletions(-) diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL index 55680721b5c7b4..f5c89deeea9d53 100644 --- a/ports/assimp/CONTROL +++ b/ports/assimp/CONTROL @@ -1,6 +1,6 @@ Source: assimp Version: 5.0.1 -Port-Version: 3 +Port-Version: 4 Homepage: https://github.com/assimp/assimp Description: The Open Asset import library Build-Depends: zlib, rapidjson, minizip, stb, kubazip, irrlicht, polyclipping, utfcpp, poly2tri diff --git a/ports/assimp/build_fixes.patch b/ports/assimp/build_fixes.patch index 000a169030b242..7590aec96fec6f 100644 --- a/ports/assimp/build_fixes.patch +++ b/ports/assimp/build_fixes.patch @@ -1,627 +1,626 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dcafb64..453fdff 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -130,6 +130,17 @@ OPTION ( IGNORE_GIT_HASH - OFF - ) - -+find_package(Stb REQUIRED) -+include_directories(${Stb_INCLUDE_DIR}) -+find_package(irrXML CONFIG REQUIRED) -+find_package(utf8cpp CONFIG REQUIRED) -+link_libraries(utf8cpp) -+find_package(RapidJSON CONFIG REQUIRED) -+include_directories(${RAPIDJSON_INCLUDE_DIRS}) -+find_path(UNZIP_INCLUDE_DIRS "minizip/unzip.h") -+include_directories(${UNZIP_INCLUDE_DIRS}/minizip) -+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/contrib) -+ - IF (IOS AND NOT HUNTER_ENABLED) - IF (NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE "Release") -@@ -230,10 +241,8 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M - SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev) - SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names") - --IF( UNIX ) - # Use GNUInstallDirs for Unix predefined directories - INCLUDE(GNUInstallDirs) --ENDIF( UNIX ) - - # Grouped compiler settings - IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW) -@@ -253,7 +262,6 @@ ELSEIF(MSVC) - IF(MSVC12) - ADD_COMPILE_OPTIONS(/wd4351) - ENDIF() -- SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob2 /DEBUG:FULL /Zi") - ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) - IF(NOT HUNTER_ENABLED) - SET(CMAKE_CXX_FLAGS "-fPIC -std=c++11 ${CMAKE_CXX_FLAGS}") -@@ -352,35 +360,17 @@ IF (NOT TARGET uninstall) - ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") - ENDIF() - --IF(HUNTER_ENABLED) -- set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") -+ set(CONFIG_INSTALL_DIR "share/assimp") - set(INCLUDE_INSTALL_DIR "include") - -- set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") -- -- # Configuration -- set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") -- set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") -- set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") -- set(NAMESPACE "${PROJECT_NAME}::") -+ set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Config") -+ set(NAMESPACE "assimp::") - - # Include module with fuction 'write_basic_package_version_file' - include(CMakePackageConfigHelpers) - -- # Note: PROJECT_VERSION is used as a VERSION -- write_basic_package_version_file("${VERSION_CONFIG}" COMPATIBILITY SameMajorVersion) -- -- # Use variables: -- # * TARGETS_EXPORT_NAME -- # * PROJECT_NAME -- configure_package_config_file( -- "cmake/assimp-hunter-config.cmake.in" -- "${PROJECT_CONFIG}" -- INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}" -- ) -- - install( -- FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}" -+ FILES ${VERSION_CONFIG} - DESTINATION "${CONFIG_INSTALL_DIR}" - ) - -@@ -389,30 +379,6 @@ IF(HUNTER_ENABLED) - NAMESPACE "${NAMESPACE}" - DESTINATION "${CONFIG_INSTALL_DIR}" - ) --ELSE(HUNTER_ENABLED) -- # cmake configuration files -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE) -- IF (is_multi_config) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-debug.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" @ONLY IMMEDIATE) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-release.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake" @ONLY IMMEDIATE) -- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake") -- ELSEIF (CMAKE_BUILD_TYPE STREQUAL Debug) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-debug.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" @ONLY IMMEDIATE) -- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake") -- ELSE() -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-release.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake" @ONLY IMMEDIATE) -- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake") -- ENDIF() -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config-version.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" @ONLY IMMEDIATE) -- #we should generated these scripts after CMake VERSION 3.0.2 using export(EXPORT ...) and write_basic_package_version_file(...) -- INSTALL(FILES -- "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" -- "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" -- "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" -- ${PACKAGE_TARGETS_FILE} -- DESTINATION "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}" COMPONENT ${LIBASSIMP-DEV_COMPONENT}) --ENDIF(HUNTER_ENABLED) - - FIND_PACKAGE( DirectX ) - -@@ -422,63 +388,19 @@ ENDIF( BUILD_DOCS ) - - # Look for system installed irrXML - IF ( SYSTEM_IRRXML ) -- FIND_PACKAGE( IrrXML REQUIRED ) -+ FIND_PACKAGE( irrXML REQUIRED ) - ENDIF( SYSTEM_IRRXML ) - - # Search for external dependencies, and build them from source if not found - # Search for zlib --IF(HUNTER_ENABLED) -- hunter_add_package(ZLIB) -- find_package(ZLIB CONFIG REQUIRED) -+ find_package(ZLIB REQUIRED) - - add_definitions(-DASSIMP_BUILD_NO_OWN_ZLIB) - set(ZLIB_FOUND TRUE) -- set(ZLIB_LIBRARIES ZLIB::zlib) -- set(ASSIMP_BUILD_MINIZIP TRUE) --ELSE(HUNTER_ENABLED) -- IF ( NOT ASSIMP_BUILD_ZLIB ) -- FIND_PACKAGE(ZLIB) -- ENDIF( NOT ASSIMP_BUILD_ZLIB ) -- -- IF( NOT ZLIB_FOUND ) -- MESSAGE(STATUS "compiling zlib from sources") -- INCLUDE(CheckIncludeFile) -- INCLUDE(CheckTypeSize) -- INCLUDE(CheckFunctionExists) -- -- # Explicitly turn off ASM686 and AMD64 cmake options. -- # The AMD64 option causes a build failure on MSVC and the ASM builds seem to have problems: -- # https://github.com/madler/zlib/issues/41#issuecomment-125848075 -- # Also prevents these options from "polluting" the cmake options if assimp is being -- # included as a submodule. -- set( ASM686 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE ) -- set( AMD64 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE ) -- -- # compile from sources -- ADD_SUBDIRECTORY(contrib/zlib) -- SET(ZLIB_FOUND 1) -- SET(ZLIB_LIBRARIES zlibstatic) -- SET(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/contrib/zlib ${CMAKE_CURRENT_BINARY_DIR}/contrib/zlib) -- # need to ensure we don't link with system zlib or minizip as well. -- SET(ASSIMP_BUILD_MINIZIP 1) -- ELSE(NOT ZLIB_FOUND) -- ADD_DEFINITIONS(-DASSIMP_BUILD_NO_OWN_ZLIB) -- SET(ZLIB_LIBRARIES_LINKED -lz) -- ENDIF(NOT ZLIB_FOUND) -+ set(ZLIB_LIBRARIES ZLIB::ZLIB) - INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) --ENDIF(HUNTER_ENABLED) - --IF( NOT IOS ) -- IF( NOT ASSIMP_BUILD_MINIZIP ) -- use_pkgconfig(UNZIP minizip) -- ENDIF( NOT ASSIMP_BUILD_MINIZIP ) --ELSE ( NOT IOS ) -- IF( NOT BUILD_SHARED_LIBS ) -- IF( NOT ASSIMP_BUILD_MINIZIP ) -- use_pkgconfig(UNZIP minizip) -- ENDIF( NOT ASSIMP_BUILD_MINIZIP ) -- ENDIF ( NOT BUILD_SHARED_LIBS ) --ENDIF ( NOT IOS ) -+ find_package(minizip CONFIG REQUIRED) - - IF ( ASSIMP_NO_EXPORT ) - ADD_DEFINITIONS( -DASSIMP_BUILD_NO_EXPORT) -@@ -633,7 +555,7 @@ IF(CMAKE_CPACK_COMMAND AND UNIX AND ASSIMP_OPT_BUILD_PACKAGES) - INCLUDE(DebSourcePPA) - ENDIF() - --if(WIN32) -+if(0) - if (CMAKE_SIZEOF_VOID_P EQUAL 8) - SET(BIN_DIR "${PROJECT_SOURCE_DIR}/bin64/") - SET(LIB_DIR "${PROJECT_SOURCE_DIR}/lib64/") -@@ -677,4 +599,4 @@ if(WIN32) - ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM) - ENDIF() - ENDIF(MSVC12 OR MSVC14 OR MSVC15 ) --ENDIF (WIN32) -+ENDIF (0) -diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in -index ab1a8d2..4b0729b 100644 ---- a/assimpTargets.cmake.in -+++ b/assimpTargets.cmake.in -@@ -5,6 +5,8 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) - endif() - cmake_policy(PUSH) - cmake_policy(VERSION 2.6) -+# Required for the evaluation of "if(@BUILD_SHARED_LIBS@)" below to function -+cmake_policy(SET CMP0012 NEW) - #---------------------------------------------------------------- - # Generated CMake target import file. - #---------------------------------------------------------------- -diff --git a/code/3MF/D3MFExporter.cpp b/code/3MF/D3MFExporter.cpp -index 1f388ad..1ccd2aa 100644 ---- a/code/3MF/D3MFExporter.cpp -+++ b/code/3MF/D3MFExporter.cpp -@@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include -+# include - #endif - - namespace Assimp { -@@ -255,7 +255,7 @@ void D3MFExporter::writeBaseMaterials() { - hexDiffuseColor.clear(); - tmp.clear(); - hexDiffuseColor = "#"; -- -+ - tmp = DecimalToHexa( color.r ); - hexDiffuseColor += tmp; - tmp = DecimalToHexa( color.g ); -diff --git a/code/Blender/BlenderTessellator.h b/code/Blender/BlenderTessellator.h -index 518e56c..ec4a653 100644 ---- a/code/Blender/BlenderTessellator.h -+++ b/code/Blender/BlenderTessellator.h -@@ -147,7 +147,7 @@ namespace Assimp - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include "../contrib/poly2tri/poly2tri/poly2tri.h" -+# include - #endif - - namespace Assimp -diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt -index 55538d9..4f9b479 100644 ---- a/code/CMakeLists.txt -+++ b/code/CMakeLists.txt -@@ -862,89 +862,24 @@ SET( Extra_SRCS - SOURCE_GROUP( Extra FILES ${Extra_SRCS}) - - # irrXML --IF(HUNTER_ENABLED) -- hunter_add_package(irrXML) - find_package(irrXML CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- # irrXML already included in contrib directory by parent CMakeLists.txt. --ENDIF(HUNTER_ENABLED) -- --# utf8 --IF(HUNTER_ENABLED) -- hunter_add_package(utf8) -- find_package(utf8 CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- # utf8 is header-only, so Assimp doesn't need to do anything. --ENDIF(HUNTER_ENABLED) - - # polyclipping --IF(HUNTER_ENABLED) -- hunter_add_package(polyclipping) - find_package(polyclipping CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) - SET( Clipper_SRCS - ../contrib/clipper/clipper.hpp - ../contrib/clipper/clipper.cpp - ) - SOURCE_GROUP( Contrib\\Clipper FILES ${Clipper_SRCS}) --ENDIF(HUNTER_ENABLED) - - # poly2tri --IF(HUNTER_ENABLED) -- hunter_add_package(poly2tri) - find_package(poly2tri CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- SET( Poly2Tri_SRCS -- ../contrib/poly2tri/poly2tri/common/shapes.cc -- ../contrib/poly2tri/poly2tri/common/shapes.h -- ../contrib/poly2tri/poly2tri/common/utils.h -- ../contrib/poly2tri/poly2tri/sweep/advancing_front.h -- ../contrib/poly2tri/poly2tri/sweep/advancing_front.cc -- ../contrib/poly2tri/poly2tri/sweep/cdt.cc -- ../contrib/poly2tri/poly2tri/sweep/cdt.h -- ../contrib/poly2tri/poly2tri/sweep/sweep.cc -- ../contrib/poly2tri/poly2tri/sweep/sweep.h -- ../contrib/poly2tri/poly2tri/sweep/sweep_context.cc -- ../contrib/poly2tri/poly2tri/sweep/sweep_context.h -- ) -- SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS}) --ENDIF(HUNTER_ENABLED) - - # minizip/unzip --IF(HUNTER_ENABLED) -- hunter_add_package(minizip) - find_package(minizip CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- SET( unzip_SRCS -- ../contrib/unzip/crypt.h -- ../contrib/unzip/ioapi.c -- ../contrib/unzip/ioapi.h -- ../contrib/unzip/unzip.c -- ../contrib/unzip/unzip.h -- ) -- SOURCE_GROUP(Contrib\\unzip FILES ${unzip_SRCS}) --ENDIF(HUNTER_ENABLED) - - # zip (https://github.com/kuba--/zip) --IF(HUNTER_ENABLED) -- hunter_add_package(zip) -- find_package(zip CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- SET( ziplib_SRCS -- ../contrib/zip/src/miniz.h -- ../contrib/zip/src/zip.c -- ../contrib/zip/src/zip.h -- ) -- -- # TODO if cmake required version has been updated to >3.12.0, collapse this to the second case only -- if(${CMAKE_VERSION} VERSION_LESS "3.12.0") -- add_definitions(-DMINIZ_USE_UNALIGNED_LOADS_AND_STORES=0) -- else() -- add_compile_definitions(MINIZ_USE_UNALIGNED_LOADS_AND_STORES=0) -- endif() -- -- SOURCE_GROUP( ziplib FILES ${ziplib_SRCS} ) --ENDIF(HUNTER_ENABLED) -+ find_package(kubazip CONFIG REQUIRED) - - # openddlparser - IF(HUNTER_ENABLED) -@@ -1021,13 +956,7 @@ ELSE () - ENDIF () - - # RapidJSON --IF(HUNTER_ENABLED) -- hunter_add_package(RapidJSON) - find_package(RapidJSON CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- INCLUDE_DIRECTORIES( "../contrib/rapidjson/include" ) -- INCLUDE_DIRECTORIES( "../contrib" ) --ENDIF(HUNTER_ENABLED) - - # VC2010 fixes - if(MSVC10) -@@ -1044,15 +973,6 @@ if ( MSVC ) - ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) - endif ( MSVC ) - --IF(NOT HUNTER_ENABLED) -- if (UNZIP_FOUND) -- SET (unzip_compile_SRCS "") -- else (UNZIP_FOUND) -- SET (unzip_compile_SRCS ${unzip_SRCS}) -- INCLUDE_DIRECTORIES( "../contrib/unzip/" ) -- endif (UNZIP_FOUND) --ENDIF(NOT HUNTER_ENABLED) -- - MESSAGE(STATUS "Enabled importer formats:${ASSIMP_IMPORTERS_ENABLED}") - MESSAGE(STATUS "Disabled importer formats:${ASSIMP_IMPORTERS_DISABLED}") - -@@ -1111,22 +1031,14 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC - $ - ) - --IF(HUNTER_ENABLED) - TARGET_LINK_LIBRARIES(assimp -- PUBLIC - polyclipping::polyclipping - irrXML::irrXML -- openddlparser::openddl_parser -- poly2tri::poly2tri - minizip::minizip -- ZLIB::zlib -- RapidJSON::rapidjson -- utf8::utf8 -- zip::zip -+ ZLIB::ZLIB -+ kubazip::kubazip -+ poly2tri::poly2tri - ) --ELSE(HUNTER_ENABLED) -- TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} ) --ENDIF(HUNTER_ENABLED) - - if(ASSIMP_ANDROID_JNIIOSYSTEM) - set(ASSIMP_ANDROID_JNIIOSYSTEM_PATH port/AndroidJNI) -@@ -1208,21 +1121,12 @@ ENDIF(APPLE) - - # Build against external unzip, or add ../contrib/unzip so - # assimp can #include "unzip.h" --IF(NOT HUNTER_ENABLED) -- if (UNZIP_FOUND) -- INCLUDE_DIRECTORIES(${UNZIP_INCLUDE_DIRS}) -- TARGET_LINK_LIBRARIES(assimp ${UNZIP_LIBRARIES}) -- else (UNZIP_FOUND) -- INCLUDE_DIRECTORIES("../") -- endif (UNZIP_FOUND) --ENDIF(NOT HUNTER_ENABLED) - - # Add RT-extension library for glTF importer with Open3DGC-compression. - IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) - TARGET_LINK_LIBRARIES(assimp ${RT_LIBRARY}) - ENDIF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) - --IF(HUNTER_ENABLED) - INSTALL( TARGETS assimp - EXPORT "${TARGETS_EXPORT_NAME}" - LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -@@ -1231,14 +1135,6 @@ IF(HUNTER_ENABLED) - FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} - COMPONENT ${LIBASSIMP_COMPONENT} - INCLUDES DESTINATION "include") --ELSE(HUNTER_ENABLED) --INSTALL( TARGETS assimp -- LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} -- FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- COMPONENT ${LIBASSIMP_COMPONENT}) --ENDIF(HUNTER_ENABLED) - INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp COMPONENT assimp-dev) - INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp/Compiler COMPONENT assimp-dev) - -diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp -index b77bbfe..51cba43 100644 ---- a/code/Common/BaseImporter.cpp -+++ b/code/Common/BaseImporter.cpp -@@ -344,7 +344,7 @@ std::string BaseImporter::GetExtension( const std::string& file ) { - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include "../contrib/utf8cpp/source/utf8.h" -+# include - #endif - - // ------------------------------------------------------------------------------------------------ -@@ -364,8 +364,8 @@ void BaseImporter::ConvertToUTF8(std::vector& data) - data.resize(data.size()-3); - return; - } -- -- -+ -+ - // UTF 32 BE with BOM - if(*((uint32_t*)&data.front()) == 0xFFFE0000) { - -@@ -507,7 +507,7 @@ struct Assimp::BatchData { - , next_id(0xffff) - , validate( validate ) { - ai_assert( nullptr != pIO ); -- -+ - pImporter = new Importer(); - pImporter->SetIOHandler( pIO ); - } -diff --git a/code/Importer/IFC/IFCGeometry.cpp b/code/Importer/IFC/IFCGeometry.cpp -index d1c7aee..8e11373 100644 ---- a/code/Importer/IFC/IFCGeometry.cpp -+++ b/code/Importer/IFC/IFCGeometry.cpp -@@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #ifdef ASSIMP_USE_HUNTER - # include --# include -+# include "../contrib/clipper/clipper.hpp" - #else --# include "../contrib/poly2tri/poly2tri/poly2tri.h" -+# include - # include "../contrib/clipper/clipper.hpp" - #endif - -diff --git a/code/Importer/IFC/IFCOpenings.cpp b/code/Importer/IFC/IFCOpenings.cpp -index d6c40b3..387c625 100644 ---- a/code/Importer/IFC/IFCOpenings.cpp -+++ b/code/Importer/IFC/IFCOpenings.cpp -@@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #ifdef ASSIMP_USE_HUNTER - # include --# include -+# include "../contrib/clipper/clipper.hpp" - #else --# include "../contrib/poly2tri/poly2tri/poly2tri.h" -+# include - # include "../contrib/clipper/clipper.hpp" - #endif - -@@ -911,14 +911,14 @@ size_t CloseWindows(ContourVector& contours, - // compare base poly normal and contour normal to detect if we need to reverse the face winding - if(curmesh.mVertcnt.size() > 0) { - IfcVector3 basePolyNormal = TempMesh::ComputePolygonNormal(curmesh.mVerts.data(), curmesh.mVertcnt.front()); -- -+ - std::vector worldSpaceContourVtx(it->contour.size()); -- -+ - for(size_t a = 0; a < it->contour.size(); ++a) - worldSpaceContourVtx[a] = minv * IfcVector3(it->contour[a].x, it->contour[a].y, 0.0); -- -+ - IfcVector3 contourNormal = TempMesh::ComputePolygonNormal(worldSpaceContourVtx.data(), worldSpaceContourVtx.size()); -- -+ - reverseCountourFaces = (contourNormal * basePolyNormal) > 0.0; - } - -diff --git a/code/Importer/STEPParser/STEPFileEncoding.cpp b/code/Importer/STEPParser/STEPFileEncoding.cpp -index 101dcdf..3f12403 100644 ---- a/code/Importer/STEPParser/STEPFileEncoding.cpp -+++ b/code/Importer/STEPParser/STEPFileEncoding.cpp -@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include -+# include - #endif - - #include -diff --git a/code/MMD/MMDPmxParser.cpp b/code/MMD/MMDPmxParser.cpp -index 80f0986..47725e2 100644 ---- a/code/MMD/MMDPmxParser.cpp -+++ b/code/MMD/MMDPmxParser.cpp -@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include "../contrib/utf8cpp/source/utf8.h" -+# include - #endif - #include - -@@ -102,7 +102,7 @@ namespace pmx - const unsigned int targetSize = size * 3; // enough to encode - char *targetStart = new char[targetSize]; - std::memset(targetStart, 0, targetSize * sizeof(char)); -- -+ - utf8::utf16to8( sourceStart, sourceStart + size/2, targetStart ); - - std::string result(targetStart); -diff --git a/code/SIB/SIBImporter.cpp b/code/SIB/SIBImporter.cpp -index 20cdc80..46e9a32 100644 ---- a/code/SIB/SIBImporter.cpp -+++ b/code/SIB/SIBImporter.cpp -@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - # include - #else - //# include "../contrib/ConvertUTF/ConvertUTF.h" --# include "../contrib/utf8cpp/source/utf8.h" -+# include - #endif - #include - #include -@@ -90,10 +90,10 @@ struct SIBChunk { - uint32_t Size; - } PACK_STRUCT; - --enum { -- POS, -- NRM, -- UV, -+enum { -+ POS, -+ NRM, -+ UV, - N - }; - -diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp -index 9bb2c69..525a084 100644 ---- a/code/X3D/FIReader.cpp -+++ b/code/X3D/FIReader.cpp -@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include "../contrib/utf8cpp/source/utf8.h" -+# include - #endif - #include - #include -diff --git a/contrib/clipper/clipper.hpp b/contrib/clipper/clipper.hpp -index 7cdac6c..2728425 100644 ---- a/contrib/clipper/clipper.hpp -+++ b/contrib/clipper/clipper.hpp -@@ -302,5 +302,3 @@ class clipperException : public std::exception - } //ClipperLib namespace - - #endif //clipper_hpp -- -- -diff --git a/contrib/zip/src/miniz.h b/contrib/zip/src/miniz.h -index 2c27a94..8390dfd 100644 ---- a/contrib/zip/src/miniz.h -+++ b/contrib/zip/src/miniz.h -@@ -5944,7 +5944,7 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, - const char *pSrc_filename, const void *pComment, - mz_uint16 comment_size, mz_uint level_and_flags, - mz_uint32 ext_attributes) { -- mz_uint uncomp_crc32 = MZ_CRC32_INIT, level, num_alignment_padding_bytes; -+ mz_uint uncomp_crc32 = MZ_CRC32_INIT, level=0, num_alignment_padding_bytes; - mz_uint16 method = 0, dos_time = 0, dos_date = 0; - time_t file_modified_time; - mz_uint64 local_dir_header_ofs, cur_archive_file_ofs, uncomp_size = 0, -diff --git a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp -index 8d25aaa..e4bc306 100644 ---- a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp -+++ b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp -@@ -19,7 +19,7 @@ - #include - - #define STB_IMAGE_IMPLEMENTATION --#include "contrib/stb_image/stb_image.h" -+#include - - #include - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dcafb64..761040d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,7 @@ IF(HUNTER_ENABLED) + add_definitions(-DASSIMP_USE_HUNTER) + ENDIF(HUNTER_ENABLED) + +-PROJECT( Assimp VERSION 5.0.0 ) ++PROJECT( Assimp VERSION 5.0.1 ) + + # All supported options ############################################### + +@@ -130,6 +130,16 @@ OPTION ( IGNORE_GIT_HASH + OFF + ) + ++find_package(Stb REQUIRED) ++include_directories(${Stb_INCLUDE_DIR}) ++find_package(utf8cpp CONFIG REQUIRED) ++link_libraries(utf8cpp) ++find_package(RapidJSON CONFIG REQUIRED) ++include_directories(${RAPIDJSON_INCLUDE_DIRS}) ++find_path(UNZIP_INCLUDE_DIRS "minizip/unzip.h") ++include_directories(${UNZIP_INCLUDE_DIRS}/minizip) ++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/contrib) ++ + IF (IOS AND NOT HUNTER_ENABLED) + IF (NOT CMAKE_BUILD_TYPE) + SET(CMAKE_BUILD_TYPE "Release") +@@ -230,10 +240,8 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M + SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev) + SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names") + +-IF( UNIX ) + # Use GNUInstallDirs for Unix predefined directories + INCLUDE(GNUInstallDirs) +-ENDIF( UNIX ) + + # Grouped compiler settings + IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW) +@@ -253,7 +261,6 @@ ELSEIF(MSVC) + IF(MSVC12) + ADD_COMPILE_OPTIONS(/wd4351) + ENDIF() +- SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob2 /DEBUG:FULL /Zi") + ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) + IF(NOT HUNTER_ENABLED) + SET(CMAKE_CXX_FLAGS "-fPIC -std=c++11 ${CMAKE_CXX_FLAGS}") +@@ -352,35 +359,21 @@ IF (NOT TARGET uninstall) + ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") + ENDIF() + +-IF(HUNTER_ENABLED) +- set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") ++ set(CONFIG_INSTALL_DIR "share/assimp") + set(INCLUDE_INSTALL_DIR "include") + +- set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") ++ string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE) ++ set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") + +- # Configuration +- set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") +- set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") +- set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") +- set(NAMESPACE "${PROJECT_NAME}::") ++ set(TARGETS_EXPORT_NAME "${PROJECT_NAME_LOWERCASE}Config") ++ set(VERSION_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWERCASE}ConfigVersion.cmake") ++ set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") + +- # Include module with fuction 'write_basic_package_version_file' + include(CMakePackageConfigHelpers) +- +- # Note: PROJECT_VERSION is used as a VERSION +- write_basic_package_version_file("${VERSION_CONFIG}" COMPATIBILITY SameMajorVersion) +- +- # Use variables: +- # * TARGETS_EXPORT_NAME +- # * PROJECT_NAME +- configure_package_config_file( +- "cmake/assimp-hunter-config.cmake.in" +- "${PROJECT_CONFIG}" +- INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}" +- ) ++ write_basic_package_version_file("${VERSION_CONFIG}" VERSION ${${PROJECT_NAME}_VERSION} COMPATIBILITY SameMajorVersion) + + install( +- FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}" ++ FILES ${VERSION_CONFIG} + DESTINATION "${CONFIG_INSTALL_DIR}" + ) + +@@ -389,30 +382,6 @@ IF(HUNTER_ENABLED) + NAMESPACE "${NAMESPACE}" + DESTINATION "${CONFIG_INSTALL_DIR}" + ) +-ELSE(HUNTER_ENABLED) +- # cmake configuration files +- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE) +- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE) +- IF (is_multi_config) +- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-debug.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" @ONLY IMMEDIATE) +- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-release.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake" @ONLY IMMEDIATE) +- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake") +- ELSEIF (CMAKE_BUILD_TYPE STREQUAL Debug) +- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-debug.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" @ONLY IMMEDIATE) +- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake") +- ELSE() +- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-release.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake" @ONLY IMMEDIATE) +- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake") +- ENDIF() +- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config-version.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" @ONLY IMMEDIATE) +- #we should generated these scripts after CMake VERSION 3.0.2 using export(EXPORT ...) and write_basic_package_version_file(...) +- INSTALL(FILES +- "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" +- "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" +- "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" +- ${PACKAGE_TARGETS_FILE} +- DESTINATION "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}" COMPONENT ${LIBASSIMP-DEV_COMPONENT}) +-ENDIF(HUNTER_ENABLED) + + FIND_PACKAGE( DirectX ) + +@@ -422,63 +391,19 @@ ENDIF( BUILD_DOCS ) + + # Look for system installed irrXML + IF ( SYSTEM_IRRXML ) +- FIND_PACKAGE( IrrXML REQUIRED ) ++ FIND_PACKAGE( irrlicht CONFIG REQUIRED ) + ENDIF( SYSTEM_IRRXML ) + + # Search for external dependencies, and build them from source if not found + # Search for zlib +-IF(HUNTER_ENABLED) +- hunter_add_package(ZLIB) +- find_package(ZLIB CONFIG REQUIRED) ++ find_package(ZLIB REQUIRED) + + add_definitions(-DASSIMP_BUILD_NO_OWN_ZLIB) + set(ZLIB_FOUND TRUE) +- set(ZLIB_LIBRARIES ZLIB::zlib) +- set(ASSIMP_BUILD_MINIZIP TRUE) +-ELSE(HUNTER_ENABLED) +- IF ( NOT ASSIMP_BUILD_ZLIB ) +- FIND_PACKAGE(ZLIB) +- ENDIF( NOT ASSIMP_BUILD_ZLIB ) +- +- IF( NOT ZLIB_FOUND ) +- MESSAGE(STATUS "compiling zlib from sources") +- INCLUDE(CheckIncludeFile) +- INCLUDE(CheckTypeSize) +- INCLUDE(CheckFunctionExists) +- +- # Explicitly turn off ASM686 and AMD64 cmake options. +- # The AMD64 option causes a build failure on MSVC and the ASM builds seem to have problems: +- # https://github.com/madler/zlib/issues/41#issuecomment-125848075 +- # Also prevents these options from "polluting" the cmake options if assimp is being +- # included as a submodule. +- set( ASM686 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE ) +- set( AMD64 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE ) +- +- # compile from sources +- ADD_SUBDIRECTORY(contrib/zlib) +- SET(ZLIB_FOUND 1) +- SET(ZLIB_LIBRARIES zlibstatic) +- SET(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/contrib/zlib ${CMAKE_CURRENT_BINARY_DIR}/contrib/zlib) +- # need to ensure we don't link with system zlib or minizip as well. +- SET(ASSIMP_BUILD_MINIZIP 1) +- ELSE(NOT ZLIB_FOUND) +- ADD_DEFINITIONS(-DASSIMP_BUILD_NO_OWN_ZLIB) +- SET(ZLIB_LIBRARIES_LINKED -lz) +- ENDIF(NOT ZLIB_FOUND) ++ set(ZLIB_LIBRARIES ZLIB::ZLIB) + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) +-ENDIF(HUNTER_ENABLED) + +-IF( NOT IOS ) +- IF( NOT ASSIMP_BUILD_MINIZIP ) +- use_pkgconfig(UNZIP minizip) +- ENDIF( NOT ASSIMP_BUILD_MINIZIP ) +-ELSE ( NOT IOS ) +- IF( NOT BUILD_SHARED_LIBS ) +- IF( NOT ASSIMP_BUILD_MINIZIP ) +- use_pkgconfig(UNZIP minizip) +- ENDIF( NOT ASSIMP_BUILD_MINIZIP ) +- ENDIF ( NOT BUILD_SHARED_LIBS ) +-ENDIF ( NOT IOS ) ++ find_package(minizip CONFIG REQUIRED) + + IF ( ASSIMP_NO_EXPORT ) + ADD_DEFINITIONS( -DASSIMP_BUILD_NO_EXPORT) +@@ -633,7 +558,7 @@ IF(CMAKE_CPACK_COMMAND AND UNIX AND ASSIMP_OPT_BUILD_PACKAGES) + INCLUDE(DebSourcePPA) + ENDIF() + +-if(WIN32) ++if(0) + if (CMAKE_SIZEOF_VOID_P EQUAL 8) + SET(BIN_DIR "${PROJECT_SOURCE_DIR}/bin64/") + SET(LIB_DIR "${PROJECT_SOURCE_DIR}/lib64/") +@@ -677,4 +602,4 @@ if(WIN32) + ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM) + ENDIF() + ENDIF(MSVC12 OR MSVC14 OR MSVC15 ) +-ENDIF (WIN32) ++ENDIF (0) +diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in +index ab1a8d2..4b0729b 100644 +--- a/assimpTargets.cmake.in ++++ b/assimpTargets.cmake.in +@@ -5,6 +5,8 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) + endif() + cmake_policy(PUSH) + cmake_policy(VERSION 2.6) ++# Required for the evaluation of "if(@BUILD_SHARED_LIBS@)" below to function ++cmake_policy(SET CMP0012 NEW) + #---------------------------------------------------------------- + # Generated CMake target import file. + #---------------------------------------------------------------- +diff --git a/code/3MF/D3MFExporter.cpp b/code/3MF/D3MFExporter.cpp +index 1f388ad..1ccd2aa 100644 +--- a/code/3MF/D3MFExporter.cpp ++++ b/code/3MF/D3MFExporter.cpp +@@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include ++# include + #endif + + namespace Assimp { +@@ -255,7 +255,7 @@ void D3MFExporter::writeBaseMaterials() { + hexDiffuseColor.clear(); + tmp.clear(); + hexDiffuseColor = "#"; +- ++ + tmp = DecimalToHexa( color.r ); + hexDiffuseColor += tmp; + tmp = DecimalToHexa( color.g ); +diff --git a/code/Blender/BlenderTessellator.h b/code/Blender/BlenderTessellator.h +index 518e56c..ec4a653 100644 +--- a/code/Blender/BlenderTessellator.h ++++ b/code/Blender/BlenderTessellator.h +@@ -147,7 +147,7 @@ namespace Assimp + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include "../contrib/poly2tri/poly2tri/poly2tri.h" ++# include + #endif + + namespace Assimp +diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt +index 55538d9..f5553e5 100644 +--- a/code/CMakeLists.txt ++++ b/code/CMakeLists.txt +@@ -862,89 +862,24 @@ SET( Extra_SRCS + SOURCE_GROUP( Extra FILES ${Extra_SRCS}) + + # irrXML +-IF(HUNTER_ENABLED) +- hunter_add_package(irrXML) + find_package(irrXML CONFIG REQUIRED) +-ELSE(HUNTER_ENABLED) +- # irrXML already included in contrib directory by parent CMakeLists.txt. +-ENDIF(HUNTER_ENABLED) +- +-# utf8 +-IF(HUNTER_ENABLED) +- hunter_add_package(utf8) +- find_package(utf8 CONFIG REQUIRED) +-ELSE(HUNTER_ENABLED) +- # utf8 is header-only, so Assimp doesn't need to do anything. +-ENDIF(HUNTER_ENABLED) + + # polyclipping +-IF(HUNTER_ENABLED) +- hunter_add_package(polyclipping) + find_package(polyclipping CONFIG REQUIRED) +-ELSE(HUNTER_ENABLED) + SET( Clipper_SRCS + ../contrib/clipper/clipper.hpp + ../contrib/clipper/clipper.cpp + ) + SOURCE_GROUP( Contrib\\Clipper FILES ${Clipper_SRCS}) +-ENDIF(HUNTER_ENABLED) + + # poly2tri +-IF(HUNTER_ENABLED) +- hunter_add_package(poly2tri) + find_package(poly2tri CONFIG REQUIRED) +-ELSE(HUNTER_ENABLED) +- SET( Poly2Tri_SRCS +- ../contrib/poly2tri/poly2tri/common/shapes.cc +- ../contrib/poly2tri/poly2tri/common/shapes.h +- ../contrib/poly2tri/poly2tri/common/utils.h +- ../contrib/poly2tri/poly2tri/sweep/advancing_front.h +- ../contrib/poly2tri/poly2tri/sweep/advancing_front.cc +- ../contrib/poly2tri/poly2tri/sweep/cdt.cc +- ../contrib/poly2tri/poly2tri/sweep/cdt.h +- ../contrib/poly2tri/poly2tri/sweep/sweep.cc +- ../contrib/poly2tri/poly2tri/sweep/sweep.h +- ../contrib/poly2tri/poly2tri/sweep/sweep_context.cc +- ../contrib/poly2tri/poly2tri/sweep/sweep_context.h +- ) +- SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS}) +-ENDIF(HUNTER_ENABLED) + + # minizip/unzip +-IF(HUNTER_ENABLED) +- hunter_add_package(minizip) + find_package(minizip CONFIG REQUIRED) +-ELSE(HUNTER_ENABLED) +- SET( unzip_SRCS +- ../contrib/unzip/crypt.h +- ../contrib/unzip/ioapi.c +- ../contrib/unzip/ioapi.h +- ../contrib/unzip/unzip.c +- ../contrib/unzip/unzip.h +- ) +- SOURCE_GROUP(Contrib\\unzip FILES ${unzip_SRCS}) +-ENDIF(HUNTER_ENABLED) + + # zip (https://github.com/kuba--/zip) +-IF(HUNTER_ENABLED) +- hunter_add_package(zip) +- find_package(zip CONFIG REQUIRED) +-ELSE(HUNTER_ENABLED) +- SET( ziplib_SRCS +- ../contrib/zip/src/miniz.h +- ../contrib/zip/src/zip.c +- ../contrib/zip/src/zip.h +- ) +- +- # TODO if cmake required version has been updated to >3.12.0, collapse this to the second case only +- if(${CMAKE_VERSION} VERSION_LESS "3.12.0") +- add_definitions(-DMINIZ_USE_UNALIGNED_LOADS_AND_STORES=0) +- else() +- add_compile_definitions(MINIZ_USE_UNALIGNED_LOADS_AND_STORES=0) +- endif() +- +- SOURCE_GROUP( ziplib FILES ${ziplib_SRCS} ) +-ENDIF(HUNTER_ENABLED) ++ find_package(kubazip CONFIG REQUIRED) + + # openddlparser + IF(HUNTER_ENABLED) +@@ -1021,13 +956,7 @@ ELSE () + ENDIF () + + # RapidJSON +-IF(HUNTER_ENABLED) +- hunter_add_package(RapidJSON) + find_package(RapidJSON CONFIG REQUIRED) +-ELSE(HUNTER_ENABLED) +- INCLUDE_DIRECTORIES( "../contrib/rapidjson/include" ) +- INCLUDE_DIRECTORIES( "../contrib" ) +-ENDIF(HUNTER_ENABLED) + + # VC2010 fixes + if(MSVC10) +@@ -1044,15 +973,6 @@ if ( MSVC ) + ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) + endif ( MSVC ) + +-IF(NOT HUNTER_ENABLED) +- if (UNZIP_FOUND) +- SET (unzip_compile_SRCS "") +- else (UNZIP_FOUND) +- SET (unzip_compile_SRCS ${unzip_SRCS}) +- INCLUDE_DIRECTORIES( "../contrib/unzip/" ) +- endif (UNZIP_FOUND) +-ENDIF(NOT HUNTER_ENABLED) +- + MESSAGE(STATUS "Enabled importer formats:${ASSIMP_IMPORTERS_ENABLED}") + MESSAGE(STATUS "Disabled importer formats:${ASSIMP_IMPORTERS_DISABLED}") + +@@ -1111,22 +1031,14 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC + $ + ) + +-IF(HUNTER_ENABLED) + TARGET_LINK_LIBRARIES(assimp +- PUBLIC + polyclipping::polyclipping + irrXML::irrXML +- openddlparser::openddl_parser +- poly2tri::poly2tri + minizip::minizip +- ZLIB::zlib +- RapidJSON::rapidjson +- utf8::utf8 +- zip::zip ++ ZLIB::ZLIB ++ kubazip::kubazip ++ poly2tri::poly2tri + ) +-ELSE(HUNTER_ENABLED) +- TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} ) +-ENDIF(HUNTER_ENABLED) + + if(ASSIMP_ANDROID_JNIIOSYSTEM) + set(ASSIMP_ANDROID_JNIIOSYSTEM_PATH port/AndroidJNI) +@@ -1208,21 +1120,12 @@ ENDIF(APPLE) + + # Build against external unzip, or add ../contrib/unzip so + # assimp can #include "unzip.h" +-IF(NOT HUNTER_ENABLED) +- if (UNZIP_FOUND) +- INCLUDE_DIRECTORIES(${UNZIP_INCLUDE_DIRS}) +- TARGET_LINK_LIBRARIES(assimp ${UNZIP_LIBRARIES}) +- else (UNZIP_FOUND) +- INCLUDE_DIRECTORIES("../") +- endif (UNZIP_FOUND) +-ENDIF(NOT HUNTER_ENABLED) + + # Add RT-extension library for glTF importer with Open3DGC-compression. + IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) + TARGET_LINK_LIBRARIES(assimp ${RT_LIBRARY}) + ENDIF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) + +-IF(HUNTER_ENABLED) + INSTALL( TARGETS assimp + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +@@ -1231,14 +1134,6 @@ IF(HUNTER_ENABLED) + FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} + COMPONENT ${LIBASSIMP_COMPONENT} + INCLUDES DESTINATION "include") +-ELSE(HUNTER_ENABLED) +-INSTALL( TARGETS assimp +- LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +- ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +- RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} +- FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +- COMPONENT ${LIBASSIMP_COMPONENT}) +-ENDIF(HUNTER_ENABLED) + INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp COMPONENT assimp-dev) + INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp/Compiler COMPONENT assimp-dev) + +diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp +index b77bbfe..51cba43 100644 +--- a/code/Common/BaseImporter.cpp ++++ b/code/Common/BaseImporter.cpp +@@ -344,7 +344,7 @@ std::string BaseImporter::GetExtension( const std::string& file ) { + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include "../contrib/utf8cpp/source/utf8.h" ++# include + #endif + + // ------------------------------------------------------------------------------------------------ +@@ -364,8 +364,8 @@ void BaseImporter::ConvertToUTF8(std::vector& data) + data.resize(data.size()-3); + return; + } +- +- ++ ++ + // UTF 32 BE with BOM + if(*((uint32_t*)&data.front()) == 0xFFFE0000) { + +@@ -507,7 +507,7 @@ struct Assimp::BatchData { + , next_id(0xffff) + , validate( validate ) { + ai_assert( nullptr != pIO ); +- ++ + pImporter = new Importer(); + pImporter->SetIOHandler( pIO ); + } +diff --git a/code/Importer/IFC/IFCGeometry.cpp b/code/Importer/IFC/IFCGeometry.cpp +index d1c7aee..8e11373 100644 +--- a/code/Importer/IFC/IFCGeometry.cpp ++++ b/code/Importer/IFC/IFCGeometry.cpp +@@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #ifdef ASSIMP_USE_HUNTER + # include +-# include ++# include "../contrib/clipper/clipper.hpp" + #else +-# include "../contrib/poly2tri/poly2tri/poly2tri.h" ++# include + # include "../contrib/clipper/clipper.hpp" + #endif + +diff --git a/code/Importer/IFC/IFCOpenings.cpp b/code/Importer/IFC/IFCOpenings.cpp +index d6c40b3..387c625 100644 +--- a/code/Importer/IFC/IFCOpenings.cpp ++++ b/code/Importer/IFC/IFCOpenings.cpp +@@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #ifdef ASSIMP_USE_HUNTER + # include +-# include ++# include "../contrib/clipper/clipper.hpp" + #else +-# include "../contrib/poly2tri/poly2tri/poly2tri.h" ++# include + # include "../contrib/clipper/clipper.hpp" + #endif + +@@ -911,14 +911,14 @@ size_t CloseWindows(ContourVector& contours, + // compare base poly normal and contour normal to detect if we need to reverse the face winding + if(curmesh.mVertcnt.size() > 0) { + IfcVector3 basePolyNormal = TempMesh::ComputePolygonNormal(curmesh.mVerts.data(), curmesh.mVertcnt.front()); +- ++ + std::vector worldSpaceContourVtx(it->contour.size()); +- ++ + for(size_t a = 0; a < it->contour.size(); ++a) + worldSpaceContourVtx[a] = minv * IfcVector3(it->contour[a].x, it->contour[a].y, 0.0); +- ++ + IfcVector3 contourNormal = TempMesh::ComputePolygonNormal(worldSpaceContourVtx.data(), worldSpaceContourVtx.size()); +- ++ + reverseCountourFaces = (contourNormal * basePolyNormal) > 0.0; + } + +diff --git a/code/Importer/STEPParser/STEPFileEncoding.cpp b/code/Importer/STEPParser/STEPFileEncoding.cpp +index 101dcdf..3f12403 100644 +--- a/code/Importer/STEPParser/STEPFileEncoding.cpp ++++ b/code/Importer/STEPParser/STEPFileEncoding.cpp +@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include ++# include + #endif + + #include +diff --git a/code/MMD/MMDPmxParser.cpp b/code/MMD/MMDPmxParser.cpp +index 80f0986..47725e2 100644 +--- a/code/MMD/MMDPmxParser.cpp ++++ b/code/MMD/MMDPmxParser.cpp +@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include "../contrib/utf8cpp/source/utf8.h" ++# include + #endif + #include + +@@ -102,7 +102,7 @@ namespace pmx + const unsigned int targetSize = size * 3; // enough to encode + char *targetStart = new char[targetSize]; + std::memset(targetStart, 0, targetSize * sizeof(char)); +- ++ + utf8::utf16to8( sourceStart, sourceStart + size/2, targetStart ); + + std::string result(targetStart); +diff --git a/code/SIB/SIBImporter.cpp b/code/SIB/SIBImporter.cpp +index 20cdc80..46e9a32 100644 +--- a/code/SIB/SIBImporter.cpp ++++ b/code/SIB/SIBImporter.cpp +@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # include + #else + //# include "../contrib/ConvertUTF/ConvertUTF.h" +-# include "../contrib/utf8cpp/source/utf8.h" ++# include + #endif + #include + #include +@@ -90,10 +90,10 @@ struct SIBChunk { + uint32_t Size; + } PACK_STRUCT; + +-enum { +- POS, +- NRM, +- UV, ++enum { ++ POS, ++ NRM, ++ UV, + N + }; + +diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp +index 9bb2c69..525a084 100644 +--- a/code/X3D/FIReader.cpp ++++ b/code/X3D/FIReader.cpp +@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include "../contrib/utf8cpp/source/utf8.h" ++# include + #endif + #include + #include +diff --git a/contrib/clipper/clipper.hpp b/contrib/clipper/clipper.hpp +index 7cdac6c..2728425 100644 +--- a/contrib/clipper/clipper.hpp ++++ b/contrib/clipper/clipper.hpp +@@ -302,5 +302,3 @@ class clipperException : public std::exception + } //ClipperLib namespace + + #endif //clipper_hpp +- +- +diff --git a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp +index 8d25aaa..e4bc306 100644 +--- a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp ++++ b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp +@@ -19,7 +19,7 @@ + #include + + #define STB_IMAGE_IMPLEMENTATION +-#include "contrib/stb_image/stb_image.h" ++#include + + #include + diff --git a/ports/assimp/irrlicht.patch b/ports/assimp/irrlicht.patch index 4ae91e06f20fb6..3457056c4f07cc 100644 --- a/ports/assimp/irrlicht.patch +++ b/ports/assimp/irrlicht.patch @@ -1,82 +1,61 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 453fdff..3a02956 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -132,7 +132,6 @@ OPTION ( IGNORE_GIT_HASH - - find_package(Stb REQUIRED) - include_directories(${Stb_INCLUDE_DIR}) --find_package(irrXML CONFIG REQUIRED) - find_package(utf8cpp CONFIG REQUIRED) - link_libraries(utf8cpp) - find_package(RapidJSON CONFIG REQUIRED) -@@ -388,7 +387,7 @@ ENDIF( BUILD_DOCS ) - - # Look for system installed irrXML - IF ( SYSTEM_IRRXML ) -- FIND_PACKAGE( irrXML REQUIRED ) -+ FIND_PACKAGE( irrlicht CONFIG REQUIRED ) - ENDIF( SYSTEM_IRRXML ) - - # Search for external dependencies, and build them from source if not found -diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt -index f5553e5..5cffa0c 100644 ---- a/code/CMakeLists.txt -+++ b/code/CMakeLists.txt -@@ -862,7 +862,7 @@ SET( Extra_SRCS - SOURCE_GROUP( Extra FILES ${Extra_SRCS}) - - # irrXML -- find_package(irrXML CONFIG REQUIRED) -+ find_package(irrlicht CONFIG REQUIRED) - - # polyclipping - find_package(polyclipping CONFIG REQUIRED) -@@ -1033,7 +1033,7 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC - - TARGET_LINK_LIBRARIES(assimp - polyclipping::polyclipping -- irrXML::irrXML -+ Irrlicht - minizip::minizip - ZLIB::ZLIB - kubazip::kubazip -diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp -index 525a084..0cbca48 100644 ---- a/code/X3D/FIReader.cpp -+++ b/code/X3D/FIReader.cpp -@@ -654,8 +654,8 @@ public: - return currentNodeType; - } - -- virtual int getAttributeCount() const /*override*/ { -- return static_cast(attributes.size()); -+ virtual unsigned int getAttributeCount() const /*override*/ { -+ return static_cast(attributes.size()); - } - - virtual const char* getAttributeName(int idx) const /*override*/ { -@@ -1733,7 +1733,7 @@ public: - return reader->getNodeType(); - } - -- virtual int getAttributeCount() const /*override*/ { -+ virtual unsigned int getAttributeCount() const /*override*/ { - return reader->getAttributeCount(); - } - -diff --git a/include/assimp/irrXMLWrapper.h b/include/assimp/irrXMLWrapper.h -index 77cfd5e..ba584a0 100644 ---- a/include/assimp/irrXMLWrapper.h -+++ b/include/assimp/irrXMLWrapper.h -@@ -133,8 +133,8 @@ public: - - // ---------------------------------------------------------------------------------- - //! Returns size of file in bytes -- virtual int getSize() { -- return (int)data.size(); -+ virtual long getSize() const override { -+ return (long)data.size(); - } - - private: +diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt +index f5553e5..5cffa0c 100644 +--- a/code/CMakeLists.txt ++++ b/code/CMakeLists.txt +@@ -862,7 +862,7 @@ SET( Extra_SRCS + SOURCE_GROUP( Extra FILES ${Extra_SRCS}) + + # irrXML +- find_package(irrXML CONFIG REQUIRED) ++ find_package(irrlicht CONFIG REQUIRED) + + # polyclipping + find_package(polyclipping CONFIG REQUIRED) +@@ -1033,7 +1033,7 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC + + TARGET_LINK_LIBRARIES(assimp + polyclipping::polyclipping +- irrXML::irrXML ++ Irrlicht + minizip::minizip + ZLIB::ZLIB + kubazip::kubazip +diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp +index 525a084..0cbca48 100644 +--- a/code/X3D/FIReader.cpp ++++ b/code/X3D/FIReader.cpp +@@ -654,8 +654,8 @@ public: + return currentNodeType; + } + +- virtual int getAttributeCount() const /*override*/ { +- return static_cast(attributes.size()); ++ virtual unsigned int getAttributeCount() const /*override*/ { ++ return static_cast(attributes.size()); + } + + virtual const char* getAttributeName(int idx) const /*override*/ { +@@ -1733,7 +1733,7 @@ public: + return reader->getNodeType(); + } + +- virtual int getAttributeCount() const /*override*/ { ++ virtual unsigned int getAttributeCount() const /*override*/ { + return reader->getAttributeCount(); + } + +diff --git a/include/assimp/irrXMLWrapper.h b/include/assimp/irrXMLWrapper.h +index 77cfd5e..ba584a0 100644 +--- a/include/assimp/irrXMLWrapper.h ++++ b/include/assimp/irrXMLWrapper.h +@@ -133,8 +133,8 @@ public: + + // ---------------------------------------------------------------------------------- + //! Returns size of file in bytes +- virtual int getSize() { +- return (int)data.size(); ++ virtual long getSize() const override { ++ return (long)data.size(); + } + + private: diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index 8c3b9dba219c00..3527124ce163d5 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -72,8 +72,8 @@ vcpkg_fixup_cmake_targets() vcpkg_fixup_pkgconfig() # Probably requires more fixing for static builds. See qt5-3d and the config changes below vcpkg_copy_pdbs() -file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/AssimpConfig.cmake ASSIMP_CONFIG) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/assimp/AssimpConfig.cmake " +file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimpConfig.cmake ASSIMP_CONFIG) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/assimp/assimpConfig.cmake " include(CMakeFindDependencyMacro) find_dependency(ZLIB) find_dependency(irrlicht CONFIG) diff --git a/ports/ogre/fix-dependency.patch b/ports/ogre/fix-dependency.patch index 3bc67dfe068c1d..fd7076dd83ed5c 100644 --- a/ports/ogre/fix-dependency.patch +++ b/ports/ogre/fix-dependency.patch @@ -21,7 +21,7 @@ index 2ae0b66..e6c55cd 100644 # Assimp -find_package(ASSIMP QUIET) -+find_package(Assimp CONFIG REQUIRED) ++find_package(assimp CONFIG REQUIRED) macro_log_feature(ASSIMP_FOUND "Assimp" "Needed for the AssimpLoader Plugin" "https://www.assimp.org/" FALSE "" "") if(ASSIMP_FOUND) diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index 453cb363ebee5f..88d46d93798456 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre", "version-string": "1.12.9", - "port-version": 2, + "port-version": 3, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "dependencies": [ From 0f1d53b7ef791c4f71241b7179db86e205e081f6 Mon Sep 17 00:00:00 2001 From: Antoine Hoarau <703240+ahoarau@users.noreply.github.com> Date: Mon, 16 Nov 2020 19:29:18 +0100 Subject: [PATCH 0030/1694] [ignition-transport8] fix version in CONTROL file (#14562) --- ports/ignition-transport8/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ignition-transport8/CONTROL b/ports/ignition-transport8/CONTROL index 19c9cc552f249a..e28231c99864c1 100644 --- a/ports/ignition-transport8/CONTROL +++ b/ports/ignition-transport8/CONTROL @@ -1,4 +1,4 @@ Source: ignition-transport8 -Version: 8.0.0 +Version: 8.1.0 Build-Depends: cppzmq, ignition-cmake2, ignition-msgs5, libuuid (!windows&!uwp), protobuf, sqlite3, zeromq Description: Transport middleware for robotics From 4559277173a4c35c109efedfb09a873a0bc20a69 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 17 Nov 2020 18:18:59 +0100 Subject: [PATCH 0031/1694] [intl/gettext/fontconfig] update to native build system (#11776) * [fontconfig] update fontconfig * [libiconv] update to make * [gettext] update to make * [vcpkg_configure_make] Changes considering pure configure ports without the requirement to run autoconfig * [fontconfig] make it work on windows * Remove install of unofficial cmake config * add function get_cmake_vars * fine tuning. * apply to make based ports. * add log suffix on not windows platforms * fix c&p error * add previous LINK env * setup env on windows and extract cpp flags correctly. * update glib and libxml2 * fix windows regressions * Apply suggestions from code review * add windres wrapper to invoke RC. * remove wrong fi * fix libintl. * try fixing uwp * other things to update * exiv2 fix * libtool does not like -RTC1 * pass the /RTC flag directly to the compiler * trust cmake instead of adding extra flags * fix expat * fix iconv wrapper install * change fontconfig intl linkage. * add appcontainer back in which is required for UWP. Why is this not in the cmake flags? * fix pkg-config in vcpkg_configure_make * fix json-c pkg-config installation * remove remnoved config * comment out debug messages + bit of tuning * finally fontconfig * comment debug messages * expat apply extra patches. * Switch back to -E instead of -EP in cpp * commit changes from fontconfig PR * [expat] fix expat details * Apply suggestions from code review Co-authored-by: nicole mazzuca * cleanup docs * update osx pipeline so that fontconfig actually builds * fix expat the lazy way by using a higher commit than release * fix a barage of regressions due to the use of unofficial targets * [expat] use a higher commit hash with a better stabilized cmake build * forgot freexl regression * more unofficial fixes * fix downstream expat usage * fix wxwidgets * fix gcdm regression * [vtk] fix the regression due to expat * add uwp cl flags back in. Somehow those are not set by cmake * add a few other configure options for full gettext build * fix cmake regression * fix a few regressions * fix static gettext build * fix gettext static * fix libxml2 wrapper for cmake * some more regressions fixes * add conversion from somelib.lib to -lsomelib * add a few option to libiconv. * get logs from CI * add missing ar-lib wrapper * add missing ar-lib wrapper * add fatal error to gettext * remove uuid from the list of LIBS since it seems to not exist in CI? * small but important regex correction * fix regex and add debug message for libs * remove error and only build libintl. * add uuid dependency to fontconfig in qt5-base * osx install gettext for autopoint * fix io2d regression by saying the port is broken ..... (which it is; upstream needs to learn proper cmake) * restore the old libxml2 wrapper with minor modifications * fix xmlsec regression * install wrapper correctly * try actual fixing io2d * improve iconv wrapper * add latest changes from update_fontconfig PR * Apply suggestions from code review first set which don't need special attention Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Apply suggestions from code review one more simple change Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * [x264] set env AS * fix bugs due to refactor * use subpath everywhere * apply changes from CR * fix fontconfig build. * only change libs in static builds * remove unnecessary lines 41 & 44 * remove flag transformation * reintroduce the flag / to - transformation for MSVC * trying to figure out autopoint issue. using wrong (windows) find.exe instead of msys * add correct working_dir to subpath * escape stupid env paths. * fix typo * add findutils remove debug messages * add error if libtool chokes * add file to msys * pass lt_cv_deplibs_check_method=pass_all on windows (couldn't get file.exe to work so that libtool correctly ids the passed libs) * add bzip2 to msys * reenable libtool check. Lets see if CI agrees * unbreak linux try to figure out where uuid should be on windows. * add -L flag and help libtool ? * try to get ci to find uuid. * try to use cygpath * update controls * cleanup merge mistakes * correct merge issues * determine cmake vars if not done before. * move adding of -l earlier * more merge cleanup * fix uwp builds by not transforming libs * fix patches in io2d * fix xz download error * apply code review changes manually * fix the typos left behind in CR Co-authored-by: nicole mazzuca Co-authored-by: Billy Robert O'Neal III Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> --- ports/cairo/CMakeLists.txt | 6 +- ports/cairo/CONTROL | 2 +- ports/exiv2/CONTROL | 2 +- ports/exiv2/vcpkg-cmake-wrapper.cmake | 9 +- ports/fontconfig/CMakeLists.txt | 96 -- ports/fontconfig/CONTROL | 6 +- ports/fontconfig/build.patch | 295 +++++ ports/fontconfig/build2.patch | 35 + ports/fontconfig/fcobjtypehash.patch | 18 - ports/fontconfig/include/alias/fcalias.h | 0 ports/fontconfig/include/alias/fcaliastail.h | 1 - ports/fontconfig/include/alias/fcftalias.h | 0 .../fontconfig/include/alias/fcftaliastail.h | 1 - ports/fontconfig/include/unix/config.h | 376 ------ ports/fontconfig/include/win32/config.h | 374 ------ ports/fontconfig/include/win32/unistd.h | 21 - ports/fontconfig/portfile.cmake | 109 +- ports/fontconfig/remove_tests.patch | 13 + ports/freexl/CONTROL | 2 +- ports/freexl/portfile.cmake | 8 +- ports/gdal/CONTROL | 2 +- ports/gdal/portfile.cmake | 4 +- ports/gdk-pixbuf/CMakeLists.txt | 6 +- ports/gdk-pixbuf/CONTROL | 1 + .../gettext/0001-Fix-macro-definitions.patch | 17 - ports/gettext/0002-Fix-uwp-build.patch | 33 +- .../gettext/0003-Fix-win-unicode-paths.patch | 2 +- ports/gettext/CMakeLists.txt | 150 --- ports/gettext/CONTROL | 2 +- ports/gettext/config.unix.h.in | 1009 ----------------- ports/gettext/config.win32.h | 675 ----------- ports/gettext/libgnuintl.win32.h | 423 ------- ports/gettext/portfile.cmake | 71 +- ports/gettext/unofficial-gettext-config.cmake | 1 - ports/gettext/uwp_remove_localcharset.patch | 79 ++ ports/gettext/vcpkg-cmake-wrapper.cmake | 10 + ports/glib/CMakeLists.txt | 30 +- ports/glib/CONTROL | 3 +- .../cmake/unofficial-glib-config.in.cmake | 2 +- ports/glibmm/CMakeLists.txt | 9 +- ports/glibmm/CONTROL | 3 +- ports/gmime/CMakeLists.txt | 4 +- ports/gmime/CONTROL | 1 + ports/harfbuzz/glib-cmake.patch | 4 +- ports/io2d/CONTROL | 1 + ports/io2d/Fix-FindCairo.patch | 15 - ports/io2d/cmake.dep.patch | 62 + ports/io2d/fix-expat.patch | 13 - ports/io2d/fix-linux-build.patch | 22 - ports/io2d/portfile.cmake | 4 +- ports/libcroco/CMakeLists.txt | 10 +- ports/libcroco/CONTROL | 3 +- ports/libiconv/CMakeLists.txt | 107 -- ports/libiconv/CONTROL | 2 +- ports/libiconv/portfile.cmake | 35 +- ports/libiconv/unofficial-iconv-config.cmake | 8 - ports/libiconv/vcpkg-cmake-wrapper.cmake | 9 +- ports/libidn2/CMakeLists.txt | 4 +- ports/libidn2/CONTROL | 2 +- ports/libspatialite/CONTROL | 2 +- ports/libspatialite/portfile.cmake | 8 +- ports/libtorrent/CONTROL | 2 +- ports/libtorrent/fix_find_iconv.patch | 35 - ports/libtorrent/portfile.cmake | 4 +- ports/libxml2/CMakeLists.txt | 4 +- ports/libxml2/vcpkg-cmake-wrapper.cmake | 13 +- ports/libxmlpp/CMakeLists.txt | 4 +- ports/libxmlpp/CONTROL | 3 +- ports/libxslt/0001-Fix-makefile.patch | 2 +- ports/libxslt/0002-Fix-lzma.patch | 2 +- ports/libxslt/CONTROL | 4 +- ports/osg/CONTROL | 2 +- ports/osg/fix-example-application.patch | 8 +- ports/qt5-base/CONTROL | 1 + ports/qt5-base/portfile.cmake | 4 +- ports/spatialite-tools/CONTROL | 2 +- ports/spatialite-tools/portfile.cmake | 8 +- ports/tesseract/CONTROL | 2 +- ports/tesseract/fix-text2image.patch | 12 +- ports/xmlsec/CMakeLists.txt | 9 +- ports/xmlsec/CONTROL | 1 + scripts/cmake/vcpkg_acquire_msys.cmake | 41 +- scripts/cmake/vcpkg_build_make.cmake | 11 + scripts/cmake/vcpkg_configure_make.cmake | 33 +- 84 files changed, 856 insertions(+), 3573 deletions(-) delete mode 100644 ports/fontconfig/CMakeLists.txt create mode 100644 ports/fontconfig/build.patch create mode 100644 ports/fontconfig/build2.patch delete mode 100644 ports/fontconfig/fcobjtypehash.patch delete mode 100644 ports/fontconfig/include/alias/fcalias.h delete mode 100644 ports/fontconfig/include/alias/fcaliastail.h delete mode 100644 ports/fontconfig/include/alias/fcftalias.h delete mode 100644 ports/fontconfig/include/alias/fcftaliastail.h delete mode 100644 ports/fontconfig/include/unix/config.h delete mode 100644 ports/fontconfig/include/win32/config.h delete mode 100644 ports/fontconfig/include/win32/unistd.h create mode 100644 ports/fontconfig/remove_tests.patch delete mode 100644 ports/gettext/0001-Fix-macro-definitions.patch delete mode 100644 ports/gettext/CMakeLists.txt delete mode 100644 ports/gettext/config.unix.h.in delete mode 100644 ports/gettext/config.win32.h delete mode 100644 ports/gettext/libgnuintl.win32.h delete mode 100644 ports/gettext/unofficial-gettext-config.cmake create mode 100644 ports/gettext/uwp_remove_localcharset.patch create mode 100644 ports/gettext/vcpkg-cmake-wrapper.cmake delete mode 100644 ports/io2d/Fix-FindCairo.patch create mode 100644 ports/io2d/cmake.dep.patch delete mode 100644 ports/io2d/fix-expat.patch delete mode 100644 ports/io2d/fix-linux-build.patch delete mode 100644 ports/libiconv/CMakeLists.txt delete mode 100644 ports/libiconv/unofficial-iconv-config.cmake delete mode 100644 ports/libtorrent/fix_find_iconv.patch diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt index e333f304d23ce6..a68491fbd8b9c0 100644 --- a/ports/cairo/CMakeLists.txt +++ b/ports/cairo/CMakeLists.txt @@ -182,7 +182,7 @@ find_package(Threads REQUIRED) find_package(ZLIB REQUIRED) find_package(PNG REQUIRED) find_package(Freetype REQUIRED) -find_package(unofficial-fontconfig CONFIG REQUIRED) +find_package(Fontconfig REQUIRED) find_package(unofficial-pixman CONFIG REQUIRED) # Cairo needs to be told which features of FreeType are availible @@ -211,7 +211,7 @@ if (WITH_X11) target_compile_definitions(cairo PUBLIC -DCAIRO_HAS_XLIB_SURFACE=1) endif() target_include_directories(cairo PUBLIC ${FREETYPE_INCLUDE_DIRS}) -target_link_libraries(cairo PRIVATE ZLIB::ZLIB PNG::PNG Freetype::Freetype unofficial::pixman::pixman-1 unofficial::fontconfig::fontconfig) +target_link_libraries(cairo PRIVATE ZLIB::ZLIB PNG::PNG Freetype::Freetype unofficial::pixman::pixman-1 Fontconfig::Fontconfig) if(WIN32) target_link_libraries(cairo PRIVATE gdi32 msimg32 user32) @@ -297,7 +297,7 @@ include(CMakeFindDependencyMacro) find_dependency(ZLIB) find_dependency(PNG) find_dependency(Freetype) -find_dependency(unofficial-fontconfig CONFIG) +find_dependency(Fontconfig) find_dependency(unofficial-pixman CONFIG) if(WITH_GOBJECT) find_dependency(unofficial-glib CONFIG) diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL index 6c26c77a250d5f..06877af9b7f25b 100644 --- a/ports/cairo/CONTROL +++ b/ports/cairo/CONTROL @@ -1,6 +1,6 @@ Source: cairo Version: 1.16.0 -Port-Version: 7 +Port-Version: 8 Homepage: https://cairographics.org 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. Build-Depends: zlib, libpng, pixman, freetype, fontconfig diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL index 14be794c7699ae..c9f5ecca4b36e8 100644 --- a/ports/exiv2/CONTROL +++ b/ports/exiv2/CONTROL @@ -1,6 +1,6 @@ Source: exiv2 Version: 0.27.3 -Port-Version: 2 +Port-Version: 3 Build-Depends: zlib, libiconv, gettext Description: Image metadata library and tools Homepage: https://www.exiv2.org diff --git a/ports/exiv2/vcpkg-cmake-wrapper.cmake b/ports/exiv2/vcpkg-cmake-wrapper.cmake index 76e941f2016d62..ab71ccdb702a5f 100644 --- a/ports/exiv2/vcpkg-cmake-wrapper.cmake +++ b/ports/exiv2/vcpkg-cmake-wrapper.cmake @@ -1,11 +1,12 @@ _find_package(${ARGS}) if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") - find_package(unofficial-iconv CONFIG REQUIRED) - find_package(unofficial-gettext CONFIG REQUIRED) + find_package(Iconv REQUIRED) + find_package(Intl REQUIRED) if(TARGET exiv2lib) set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES - unofficial::iconv::libiconv - unofficial::gettext::libintl) + Iconv::Iconv + ) + target_link_libraries(exiv2lib INTERFACE ${Intl_LIBRARIES}) endif() endif() diff --git a/ports/fontconfig/CMakeLists.txt b/ports/fontconfig/CMakeLists.txt deleted file mode 100644 index 61197ed92dbd04..00000000000000 --- a/ports/fontconfig/CMakeLists.txt +++ /dev/null @@ -1,96 +0,0 @@ -cmake_minimum_required(VERSION 3.11) -project(fontconfig C) - -add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DHAVE_CONFIG_H) - -# find dependencies -find_package(unofficial-iconv CONFIG REQUIRED) -find_package(Freetype REQUIRED) -find_package(expat CONFIG REQUIRED) - -add_library(fontconfig - src/fcatomic.c - src/fcblanks.c - src/fccache.c - src/fccfg.c - src/fccharset.c - src/fccompat.c - src/fcdbg.c - src/fcdefault.c - src/fcdir.c - src/fcformat.c - src/fcfreetype.c - src/fcfs.c - src/fcinit.c - src/fclang.c - src/fclist.c - src/fcmatch.c - src/fcmatrix.c - src/fcname.c - src/fcobjs.c - src/fcpat.c - src/fcrange.c - src/fcserialize.c - src/fcstat.c - src/fcstr.c - src/fcweight.c - src/fcxml.c - src/ftglue.c) - -if(WIN32) - set_target_properties(fontconfig PROPERTIES DEFINE_SYMBOL "FcPublic=__declspec(dllexport)") -else() - set_target_properties(fontconfig PROPERTIES DEFINE_SYMBOL "FcPublic=__attribute__((visibility(\"default\")))") -endif() - -target_include_directories(fontconfig PRIVATE . - ${FC_INCLUDE_DIR}/alias - ${EXPAT_INCLUDE_DIR}) -if(WIN32) - target_include_directories(fontconfig PRIVATE ${FC_INCLUDE_DIR}/win32) -else() - target_include_directories(fontconfig PRIVATE ${FC_INCLUDE_DIR}/unix) -endif() - -target_link_libraries(fontconfig PRIVATE unofficial::iconv::libiconv Freetype::Freetype expat::expat) - -install(TARGETS fontconfig - EXPORT fontconfig-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) - -if(NOT FC_SKIP_HEADERS) - install(FILES - fontconfig/fontconfig.h - fontconfig/fcfreetype.h - fontconfig/fcprivate.h - DESTINATION include/fontconfig) -endif() - -if(NOT FC_SKIP_TOOLS) - set(FC_DEFAULT_FONTS WINDOWSFONTDIR) - set(FC_FONTPATH) - set(FC_CACHEDIR WINDOWSTEMPDIR_FONTCONFIG_CACHE) - set(CONFIGDIR ./fonts/conf.d) - configure_file(fonts.conf.in ${CMAKE_SOURCE_DIR}/fonts.conf @ONLY) - install(FILES fonts.conf DESTINATION tools/fontconfig) - install(DIRECTORY conf.d DESTINATION tools/fontconfig FILES_MATCHING PATTERN "*.conf") -endif() - -install( - EXPORT fontconfig-targets - NAMESPACE unofficial::fontconfig:: - FILE unofficial-fontconfig-targets.cmake - DESTINATION share/unofficial-fontconfig -) - -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-fontconfig-config.cmake " -include(CMakeFindDependencyMacro) -find_dependency(unofficial-iconv CONFIG) -find_dependency(Freetype) -find_dependency(expat CONFIG) - -include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-fontconfig-targets.cmake) -") -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-fontconfig-config.cmake DESTINATION share/unofficial-fontconfig) diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL index e541f560a71d26..636b7499a3f145 100644 --- a/ports/fontconfig/CONTROL +++ b/ports/fontconfig/CONTROL @@ -1,7 +1,5 @@ Source: fontconfig -Version: 2.12.4 -Port-Version: 13 +Version: 2.13.1 Homepage: https://www.freedesktop.org/software/fontconfig/front.html Description: Library for configuring and customizing font access. -Build-Depends: freetype, expat, libiconv, dirent -Supports: !uwp \ No newline at end of file +Build-Depends: freetype, expat, libiconv, dirent, pthread, json-c, dirent, libuuid (!windows&!osx), gettext \ No newline at end of file diff --git a/ports/fontconfig/build.patch b/ports/fontconfig/build.patch new file mode 100644 index 00000000000000..5b8c1b3a9bfb04 --- /dev/null +++ b/ports/fontconfig/build.patch @@ -0,0 +1,295 @@ +diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am +index ff03fb2eb..769fc6005 100644 +--- a/conf.d/Makefile.am ++++ b/conf.d/Makefile.am +@@ -95,9 +95,9 @@ install-data-hook: + @(echo cd $(DESTDIR)$(configdir); \ + cd $(DESTDIR)$(configdir); \ + for i in $(CONF_LINKS); do \ +- echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \ ++ echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \ + $(RM) $$i; \ +- ln -s $(templatedir)/$$i .; \ ++ $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \ + done) + uninstall-local: + @(echo cd $(DESTDIR)$(configdir); \ +diff --git a/src/Makefile.am b/src/Makefile.am +index 35e820d60..42bd7c5a2 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -33,7 +33,7 @@ fontconfig_def_dependency = fontconfig.def + + install-libtool-import-lib: libfontconfig.la + $(MKDIR_P) $(DESTDIR)$(libdir) +- $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a ++# $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a + $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def + + uninstall-libtool-import-lib: +@@ -58,7 +58,8 @@ fontconfig.lib : libfontconfig.la + lib -name:libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll -def:fontconfig.def -out:$@ + + install-ms-import-lib: +- $(INSTALL) fontconfig.lib $(DESTDIR)$(libdir) ++ $(MKDIR_P) $(DESTDIR)$(libdir) ++ $(INSTALL) .libs/fontconfig.lib $(DESTDIR)$(libdir) + + uninstall-ms-import-lib: + $(RM) $(DESTDIR)$(libdir)/fontconfig.lib +diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c +index 87e302083..8b5012110 100644 +--- a/fc-cache/fc-cache.c ++++ b/fc-cache/fc-cache.c +@@ -34,11 +34,20 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include ++#if HAVE_SYS_STAT_H + #include ++#endif + #include ++#if HAVE_FCNTL_H + #include ++#endif + #include + #include + #include +diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c +index 69611bcc3..e7b0efbaa 100644 +--- a/fc-cat/fc-cat.c ++++ b/fc-cat/fc-cat.c +@@ -36,9 +36,16 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include ++#if HAVE_SYS_STAT_H + #include ++#endif + #include + #include + +diff --git a/fc-conflist/fc-conflist.c b/fc-conflist/fc-conflist.c +index 5c40a0f09..affaca09e 100644 +--- a/fc-conflist/fc-conflist.c ++++ b/fc-conflist/fc-conflist.c +@@ -35,7 +35,12 @@ + + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include + #include + #include +diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c +index 2039acd36..0e56b1c32 100644 +--- a/fc-list/fc-list.c ++++ b/fc-list/fc-list.c +@@ -24,7 +24,12 @@ + + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include + #include + #include +diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c +index dee61479d..da8d820aa 100644 +--- a/fc-match/fc-match.c ++++ b/fc-match/fc-match.c +@@ -33,7 +33,12 @@ + + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include + #include + #include +diff --git a/fc-pattern/fc-pattern.c b/fc-pattern/fc-pattern.c +index 7989b816f..15b43e098 100644 +--- a/fc-pattern/fc-pattern.c ++++ b/fc-pattern/fc-pattern.c +@@ -33,7 +33,12 @@ + + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include + #include + #include +diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c +index fbffb8415..58c251fe3 100644 +--- a/fc-query/fc-query.c ++++ b/fc-query/fc-query.c +@@ -36,7 +36,12 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include + #include + #include +diff --git a/fc-scan/fc-scan.c b/fc-scan/fc-scan.c +index 9302ac559..3a0ccf188 100644 +--- a/fc-scan/fc-scan.c ++++ b/fc-scan/fc-scan.c +@@ -36,7 +36,12 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include + #include + #include +diff --git a/fc-validate/fc-validate.c b/fc-validate/fc-validate.c +index 2ceee2024..8f702f190 100644 +--- a/fc-validate/fc-validate.c ++++ b/fc-validate/fc-validate.c +@@ -36,7 +36,12 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include + #include + #include +diff --git a/src/fcatomic.c b/src/fcatomic.c +index d12d32408..da7234934 100644 +--- a/src/fcatomic.c ++++ b/src/fcatomic.c +@@ -50,7 +50,9 @@ + #include "fcint.h" + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + #include + #include + +diff --git a/src/fccache.c b/src/fccache.c +index 2b604014e..50fb742c6 100644 +--- a/src/fccache.c ++++ b/src/fccache.c +@@ -30,7 +30,9 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #if defined(HAVE_MMAP) || defined(__CYGWIN__) + # include +diff --git a/src/fcint.h b/src/fcint.h +index de78cd8c9..4fb269ffa 100644 +--- a/src/fcint.h ++++ b/src/fcint.h +@@ -40,7 +40,18 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#include ++#include ++#define ssize_t SSIZE_T ++#define F_OK 0 ++#define W_OK 2 ++typedef int mode_t; ++#endif + #include + #include + #include +diff --git a/test/test-migration.c b/test/test-migration.c +index b7d96dcce..7eac59dcc 100644 +--- a/test/test-migration.c ++++ b/test/test-migration.c +@@ -28,13 +28,16 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include + #include + #ifndef HAVE_STRUCT_DIRENT_D_TYPE +-#include + #include +-#include + #endif + #include + +diff --git a/test/test-pthread.c b/test/test-pthread.c +index fbf397d4c..38d7dea35 100644 +--- a/test/test-pthread.c ++++ b/test/test-pthread.c +@@ -24,7 +24,12 @@ + */ + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include + #include + diff --git a/ports/fontconfig/build2.patch b/ports/fontconfig/build2.patch new file mode 100644 index 00000000000000..13bacf15d41883 --- /dev/null +++ b/ports/fontconfig/build2.patch @@ -0,0 +1,35 @@ +diff --git a/Tools.mk b/Tools.mk +index f0fa0ec50..24e5afd16 100644 +--- a/Tools.mk ++++ b/Tools.mk +@@ -43,7 +43,7 @@ AM_CPPFLAGS = \ + $(WARN_CFLAGS) + + $(TOOL): $(TSRC) $(ALIAS_FILES) +- $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS) ++ $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS) $(LIBINTL) + + $(TARG): $(TMPL) $(TSRC) $(DEPS) + $(AM_V_GEN) $(MAKE) $(TOOL) && \ +diff --git a/fc-case/fc-case.c b/fc-case/fc-case.c +index 236bff5f0..6fb21c855 100644 +--- a/fc-case/fc-case.c ++++ b/fc-case/fc-case.c +@@ -345,7 +345,7 @@ main (int argc, char **argv) + break; + fputs (line, stdout); + } +- ++ fflush (stdout); + /* + * Dump these tables + */ +@@ -354,7 +354,7 @@ main (int argc, char **argv) + /* + * And flush out the rest of the input file + */ +- ++ fflush (stdout); + while (fgets (line, sizeof (line), stdin)) + fputs (line, stdout); + diff --git a/ports/fontconfig/fcobjtypehash.patch b/ports/fontconfig/fcobjtypehash.patch deleted file mode 100644 index e0db68942c06c9..00000000000000 --- a/ports/fontconfig/fcobjtypehash.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/fcobjs.c b/src/fcobjs.c -index 33bba8d..e6b0808 100644 ---- a/src/fcobjs.c -+++ b/src/fcobjs.c -@@ -24,11 +24,13 @@ - - #include "fcint.h" - -+#if 0 - static unsigned int - FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len); - - static const struct FcObjectTypeInfo * - FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len); -+#endif - - #include "fcobjshash.h" - diff --git a/ports/fontconfig/include/alias/fcalias.h b/ports/fontconfig/include/alias/fcalias.h deleted file mode 100644 index e69de29bb2d1d6..00000000000000 diff --git a/ports/fontconfig/include/alias/fcaliastail.h b/ports/fontconfig/include/alias/fcaliastail.h deleted file mode 100644 index a9eae81f2aaf25..00000000000000 --- a/ports/fontconfig/include/alias/fcaliastail.h +++ /dev/null @@ -1 +0,0 @@ -/* intentionally empty */ diff --git a/ports/fontconfig/include/alias/fcftalias.h b/ports/fontconfig/include/alias/fcftalias.h deleted file mode 100644 index e69de29bb2d1d6..00000000000000 diff --git a/ports/fontconfig/include/alias/fcftaliastail.h b/ports/fontconfig/include/alias/fcftaliastail.h deleted file mode 100644 index a9eae81f2aaf25..00000000000000 --- a/ports/fontconfig/include/alias/fcftaliastail.h +++ /dev/null @@ -1 +0,0 @@ -/* intentionally empty */ diff --git a/ports/fontconfig/include/unix/config.h b/ports/fontconfig/include/unix/config.h deleted file mode 100644 index 5b5da37926d3cb..00000000000000 --- a/ports/fontconfig/include/unix/config.h +++ /dev/null @@ -1,376 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if building universal (internal helper macro) */ -/* #undef AC_APPLE_UNIVERSAL_BUILD */ - -#define FC_CACHEDIR "./" - -/* The normal alignment of `double', in bytes. */ -#define ALIGNOF_DOUBLE 8 - -/* The normal alignment of `void *', in bytes. */ -#if defined(_WIN64) -#define ALIGNOF_VOID_P 8 -#else -#define ALIGNOF_VOID_P 4 -#endif - -/* Use libxml2 instead of Expat */ -/* #undef ENABLE_LIBXML2 */ - -/* Additional font directories */ -#define FC_ADD_FONTS "yes" - -/* Architecture prefix to use for cache file names */ -/* #undef FC_ARCHITECTURE */ - -/* System font directory */ -#define FC_DEFAULT_FONTS "" - -/* The type of len parameter of the gperf hash/lookup function */ -#define FC_GPERF_SIZE_T size_t - -/* Define to nothing if C supports flexible array members, and to 1 if it does - not. That way, with a declaration like `struct s { int n; double - d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99 - compilers. When computing the size of such an object, don't use 'sizeof - (struct s)' as it overestimates the size. Use 'offsetof (struct s, d)' - instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with - MSVC and with C++ compilers. */ -#define FLEXIBLE_ARRAY_MEMBER /**/ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#define HAVE_DIRENT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -/* #undef HAVE_DOPRNT */ - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define to 1 if you have the `fstatfs' function. */ -/* #undef HAVE_FSTATFS */ - -/* Define to 1 if you have the `fstatvfs' function. */ -/* #undef HAVE_FSTATVFS */ - -/* FT_Bitmap_Size structure includes y_ppem field */ -#define HAVE_FT_BITMAP_SIZE_Y_PPEM 1 - -/* Define to 1 if you have the `FT_Get_BDF_Property' function. */ -#define HAVE_FT_GET_BDF_PROPERTY 1 - -/* Define to 1 if you have the `FT_Get_Next_Char' function. */ -#define HAVE_FT_GET_NEXT_CHAR 1 - -/* Define to 1 if you have the `FT_Get_PS_Font_Info' function. */ -#define HAVE_FT_GET_PS_FONT_INFO 1 - -/* Define to 1 if you have the `FT_Get_X11_Font_Format' function. */ -#define HAVE_FT_GET_X11_FONT_FORMAT 1 - -/* Define to 1 if you have the `FT_Has_PS_Glyph_Names' function. */ -#define HAVE_FT_HAS_PS_GLYPH_NAMES 1 - -/* Define to 1 if you have the `FT_Select_Size' function. */ -#define HAVE_FT_SELECT_SIZE 1 - -/* Define to 1 if you have the `getexecname' function. */ -/* #undef HAVE_GETEXECNAME */ - -/* Define to 1 if you have the `getopt' function. */ -#define HAVE_GETOPT 1 - -/* Define to 1 if you have the `getopt_long' function. */ -#define HAVE_GETOPT_LONG 1 - -/* Define to 1 if you have the `getpagesize' function. */ -#define HAVE_GETPAGESIZE 1 - -/* Define to 1 if you have the `getprogname' function. */ -/* #undef HAVE_GETPROGNAME */ - -/* Have Intel __sync_* atomic primitives */ -#define HAVE_INTEL_ATOMIC_PRIMITIVES 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the `link' function. */ -/* #undef HAVE_LINK */ - -/* Define to 1 if you have the `lrand48' function. */ -/* #undef HAVE_LRAND48 */ - -/* Define to 1 if you have the `lstat' function. */ -/* #undef HAVE_LSTAT */ - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mkdtemp' function. */ -/* #undef HAVE_MKDTEMP */ - -/* Define to 1 if you have the `mkostemp' function. */ -/* #undef HAVE_MKOSTEMP */ - -/* Define to 1 if you have the `mkstemp' function. */ -#define HAVE_MKSTEMP 1 - -/* Define to 1 if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_NDIR_H */ - -/* Define to 1 if you have the 'posix_fadvise' function. */ -/* #undef HAVE_POSIX_FADVISE */ - -/* Have POSIX threads */ -#define HAVE_PTHREAD 1 - -/* Have PTHREAD_PRIO_INHERIT. */ -/* #undef HAVE_PTHREAD_PRIO_INHERIT */ - -/* Define to 1 if you have the `rand' function. */ -#define HAVE_RAND 1 - -/* Define to 1 if you have the `random' function. */ -/* #undef HAVE_RANDOM */ - -/* Define to 1 if you have the `random_r' function. */ -/* #undef HAVE_RANDOM_R */ - -/* Define to 1 if you have the `rand_r' function. */ -/* #undef HAVE_RAND_R */ - -/* Define to 1 if you have the `readlink' function. */ -/* #undef HAVE_READLINK */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SCHED_H */ - -/* Have sched_yield */ -/* #undef HAVE_SCHED_YIELD */ - -/* Have Solaris __machine_*_barrier and atomic_* operations */ -/* #undef HAVE_SOLARIS_ATOMIC_OPS */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if `d_type' is a member of `struct dirent'. */ -/* #undef HAVE_STRUCT_DIRENT_D_TYPE */ - -/* Define to 1 if `f_flags' is a member of `struct statfs'. */ -/* #undef HAVE_STRUCT_STATFS_F_FLAGS */ - -/* Define to 1 if `f_fstypename' is a member of `struct statfs'. */ -/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */ - -/* Define to 1 if `f_basetype' is a member of `struct statvfs'. */ -/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */ - -/* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */ -/* #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME */ - -/* Define to 1 if `st_mtim' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_MTIM */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MOUNT_H */ - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_PARAM_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_STATFS_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_STATVFS_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_VFS_H */ - -/* Define to 1 if `usLowerOpticalPointSize' is a member of `TT_OS2'. */ -#define HAVE_TT_OS2_USLOWEROPTICALPOINTSIZE 1 - -/* Define to 1 if `usUpperOpticalPointSize' is a member of `TT_OS2'. */ -#define HAVE_TT_OS2_USUPPEROPTICALPOINTSIZE 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `vprintf' function. */ -#define HAVE_VPRINTF 1 - -/* Can use #warning in C files */ -#define HAVE_WARNING_CPP_DIRECTIVE 1 - -/* Use xmlparse.h instead of expat.h */ -/* #undef HAVE_XMLPARSE_H */ - -/* Define to 1 if you have the `XML_SetDoctypeDeclHandler' function. */ -#define HAVE_XML_SETDOCTYPEDECLHANDLER 1 - -/* Define to 1 if you have the `_mktemp_s' function. */ -/* #undef HAVE__MKTEMP_S */ - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "fontconfig" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "fontconfig" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "fontconfig 2.12.3" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "fontconfig" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "2.12.3" - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -/* #undef PTHREAD_CREATE_JOINABLE */ - -/* The size of `char', as computed by sizeof. */ -/* #undef SIZEOF_CHAR */ - -/* The size of `int', as computed by sizeof. */ -/* #undef SIZEOF_INT */ - -/* The size of `long', as computed by sizeof. */ -/* #undef SIZEOF_LONG */ - -/* The size of `short', as computed by sizeof. */ -/* #undef SIZEOF_SHORT */ - -/* The size of `void*', as computed by sizeof. */ -/* #undef SIZEOF_VOIDP */ - -/* The size of `void *', as computed by sizeof. */ -#if defined(_WIN64) -#define SIZEOF_VOIDP 8 -#define SIZEOF_VOID_P 8 -#else -#define SIZEOF_VOIDP 4 -#define SIZEOF_VOID_P 4 -#endif - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Use iconv. */ -#define USE_ICONV 1 - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# define _ALL_SOURCE 1 -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# define _POSIX_PTHREAD_SEMANTICS 1 -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# define _TANDEM_SOURCE 1 -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif - - -/* Version number of package */ -#define VERSION "2.12.3" - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -/* # undef WORDS_BIGENDIAN */ -# endif -#endif - -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - -/* Number of bits in a file offset, on hosts where this is settable. */ -#define _FILE_OFFSET_BITS 64 - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to 1 if on MINIX. */ -/* #undef _MINIX */ - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -/* #undef _POSIX_SOURCE */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - -/* Define to `int' if does not define. */ -/* #undef pid_t */ - -#define FONTCONFIG_PATH "/etc/fonts" - -#include "config-fixups.h" diff --git a/ports/fontconfig/include/win32/config.h b/ports/fontconfig/include/win32/config.h deleted file mode 100644 index 0fbdead6e46672..00000000000000 --- a/ports/fontconfig/include/win32/config.h +++ /dev/null @@ -1,374 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if building universal (internal helper macro) */ -/* #undef AC_APPLE_UNIVERSAL_BUILD */ - -#define FC_CACHEDIR "./" - -/* The normal alignment of `double', in bytes. */ -#define ALIGNOF_DOUBLE 8 - -/* The normal alignment of `void *', in bytes. */ -#if defined(_WIN64) -#define ALIGNOF_VOID_P 8 -#else -#define ALIGNOF_VOID_P 4 -#endif - -/* Use libxml2 instead of Expat */ -/* #undef ENABLE_LIBXML2 */ - -/* Additional font directories */ -#define FC_ADD_FONTS "yes" - -/* Architecture prefix to use for cache file names */ -/* #undef FC_ARCHITECTURE */ - -/* System font directory */ -#define FC_DEFAULT_FONTS "WINDOWSFONTDIR" - -/* The type of len parameter of the gperf hash/lookup function */ -#define FC_GPERF_SIZE_T size_t - -/* Define to nothing if C supports flexible array members, and to 1 if it does - not. That way, with a declaration like `struct s { int n; double - d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99 - compilers. When computing the size of such an object, don't use 'sizeof - (struct s)' as it overestimates the size. Use 'offsetof (struct s, d)' - instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with - MSVC and with C++ compilers. */ -#define FLEXIBLE_ARRAY_MEMBER /**/ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#define HAVE_DIRENT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -/* #undef HAVE_DOPRNT */ - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define to 1 if you have the `fstatfs' function. */ -/* #undef HAVE_FSTATFS */ - -/* Define to 1 if you have the `fstatvfs' function. */ -/* #undef HAVE_FSTATVFS */ - -/* FT_Bitmap_Size structure includes y_ppem field */ -#define HAVE_FT_BITMAP_SIZE_Y_PPEM 1 - -/* Define to 1 if you have the `FT_Get_BDF_Property' function. */ -#define HAVE_FT_GET_BDF_PROPERTY 1 - -/* Define to 1 if you have the `FT_Get_Next_Char' function. */ -#define HAVE_FT_GET_NEXT_CHAR 1 - -/* Define to 1 if you have the `FT_Get_PS_Font_Info' function. */ -#define HAVE_FT_GET_PS_FONT_INFO 1 - -/* Define to 1 if you have the `FT_Get_X11_Font_Format' function. */ -#define HAVE_FT_GET_X11_FONT_FORMAT 1 - -/* Define to 1 if you have the `FT_Has_PS_Glyph_Names' function. */ -#define HAVE_FT_HAS_PS_GLYPH_NAMES 1 - -/* Define to 1 if you have the `FT_Select_Size' function. */ -#define HAVE_FT_SELECT_SIZE 1 - -/* Define to 1 if you have the `getexecname' function. */ -/* #undef HAVE_GETEXECNAME */ - -/* Define to 1 if you have the `getopt' function. */ -#define HAVE_GETOPT 1 - -/* Define to 1 if you have the `getopt_long' function. */ -#define HAVE_GETOPT_LONG 1 - -/* Define to 1 if you have the `getpagesize' function. */ -#define HAVE_GETPAGESIZE 1 - -/* Define to 1 if you have the `getprogname' function. */ -/* #undef HAVE_GETPROGNAME */ - -/* Have Intel __sync_* atomic primitives */ -#define HAVE_INTEL_ATOMIC_PRIMITIVES 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the `link' function. */ -/* #undef HAVE_LINK */ - -/* Define to 1 if you have the `lrand48' function. */ -/* #undef HAVE_LRAND48 */ - -/* Define to 1 if you have the `lstat' function. */ -/* #undef HAVE_LSTAT */ - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mkdtemp' function. */ -/* #undef HAVE_MKDTEMP */ - -/* Define to 1 if you have the `mkostemp' function. */ -/* #undef HAVE_MKOSTEMP */ - -/* Define to 1 if you have the `mkstemp' function. */ -/* #undef HAVE_MKSTEMP */ - -/* Define to 1 if you have a working `mmap' system call. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_NDIR_H */ - -/* Define to 1 if you have the 'posix_fadvise' function. */ -/* #undef HAVE_POSIX_FADVISE */ - -/* Have POSIX threads */ -/* #undef HAVE_PTHREAD */ - -/* Have PTHREAD_PRIO_INHERIT. */ -/* #undef HAVE_PTHREAD_PRIO_INHERIT */ - -/* Define to 1 if you have the `rand' function. */ -#define HAVE_RAND 1 - -/* Define to 1 if you have the `random' function. */ -/* #undef HAVE_RANDOM */ - -/* Define to 1 if you have the `random_r' function. */ -/* #undef HAVE_RANDOM_R */ - -/* Define to 1 if you have the `rand_r' function. */ -/* #undef HAVE_RAND_R */ - -/* Define to 1 if you have the `readlink' function. */ -/* #undef HAVE_READLINK */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SCHED_H */ - -/* Have sched_yield */ -/* #undef HAVE_SCHED_YIELD */ - -/* Have Solaris __machine_*_barrier and atomic_* operations */ -/* #undef HAVE_SOLARIS_ATOMIC_OPS */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if `d_type' is a member of `struct dirent'. */ -/* #undef HAVE_STRUCT_DIRENT_D_TYPE */ - -/* Define to 1 if `f_flags' is a member of `struct statfs'. */ -/* #undef HAVE_STRUCT_STATFS_F_FLAGS */ - -/* Define to 1 if `f_fstypename' is a member of `struct statfs'. */ -/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */ - -/* Define to 1 if `f_basetype' is a member of `struct statvfs'. */ -/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */ - -/* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */ -/* #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME */ - -/* Define to 1 if `st_mtim' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_MTIM */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MOUNT_H */ - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_PARAM_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_STATFS_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_STATVFS_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_VFS_H */ - -/* Define to 1 if `usLowerOpticalPointSize' is a member of `TT_OS2'. */ -#define HAVE_TT_OS2_USLOWEROPTICALPOINTSIZE 1 - -/* Define to 1 if `usUpperOpticalPointSize' is a member of `TT_OS2'. */ -#define HAVE_TT_OS2_USUPPEROPTICALPOINTSIZE 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `vprintf' function. */ -#define HAVE_VPRINTF 1 - -/* Can use #warning in C files */ -#define HAVE_WARNING_CPP_DIRECTIVE 1 - -/* Use xmlparse.h instead of expat.h */ -/* #undef HAVE_XMLPARSE_H */ - -/* Define to 1 if you have the `XML_SetDoctypeDeclHandler' function. */ -#define HAVE_XML_SETDOCTYPEDECLHANDLER 1 - -/* Define to 1 if you have the `_mktemp_s' function. */ -#define HAVE__MKTEMP_S 1 - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "fontconfig" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "fontconfig" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "fontconfig 2.12.3" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "fontconfig" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "2.12.3" - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -/* #undef PTHREAD_CREATE_JOINABLE */ - -/* The size of `char', as computed by sizeof. */ -/* #undef SIZEOF_CHAR */ - -/* The size of `int', as computed by sizeof. */ -/* #undef SIZEOF_INT */ - -/* The size of `long', as computed by sizeof. */ -/* #undef SIZEOF_LONG */ - -/* The size of `short', as computed by sizeof. */ -/* #undef SIZEOF_SHORT */ - -/* The size of `void*', as computed by sizeof. */ -/* #undef SIZEOF_VOIDP */ - -/* The size of `void *', as computed by sizeof. */ -#if defined(_WIN64) -#define SIZEOF_VOIDP 8 -#define SIZEOF_VOID_P 8 -#else -#define SIZEOF_VOIDP 4 -#define SIZEOF_VOID_P 4 -#endif - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Use iconv. */ -#define USE_ICONV 1 - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# define _ALL_SOURCE 1 -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# define _POSIX_PTHREAD_SEMANTICS 1 -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# define _TANDEM_SOURCE 1 -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif - - -/* Version number of package */ -#define VERSION "2.12.3" - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -/* # undef WORDS_BIGENDIAN */ -# endif -#endif - -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - -/* Number of bits in a file offset, on hosts where this is settable. */ -#define _FILE_OFFSET_BITS 64 - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to 1 if on MINIX. */ -/* #undef _MINIX */ - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -/* #undef _POSIX_SOURCE */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - -/* Define to `int' if does not define. */ -/* #undef pid_t */ - -#include "config-fixups.h" diff --git a/ports/fontconfig/include/win32/unistd.h b/ports/fontconfig/include/win32/unistd.h deleted file mode 100644 index 7d04abe2925b08..00000000000000 --- a/ports/fontconfig/include/win32/unistd.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Minimal unistd.h, just to get fontconfig to compile */ -#ifndef UNISTD_H -#define UNISTD_H - -#include - -#ifndef R_OK -#define R_OK 4 -#endif - -#ifndef W_OK -#define W_OK 2 -#endif - -#ifndef F_OK -#define F_OK 0 -#endif - -typedef int mode_t; - -#endif \ No newline at end of file diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 5d9492f706c997..b4641e3525eada 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -1,52 +1,95 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") +set(FONTCONFIG_VERSION 2.13.1) -set(FONTCONFIG_VERSION 2.12.4) -vcpkg_download_distfile(ARCHIVE - URLS "https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz" - FILENAME "fontconfig-${FONTCONFIG_VERSION}.tar.gz" - SHA512 2be3ee0e8e0e3b62571135a3cae06e456c289dd1ad40ef2a7c780406418ee5efce863a833eca5a8ef55bc737a0ea04ef562bba6fd27e174ae43e42131b52810d -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${FONTCONFIG_VERSION} - PATCHES fcobjtypehash.patch + REPO fontconfig/fontconfig + REF 844d8709a1f3ecab45015b24b72dd775c13b2421 #v2.13.1 + SHA512 fed0cf46f5dca9cb1e03475d7a8d7efdab06c7180fe0c922fb30cadfa91e1efe1f6a6e36d2fdb742a479cb09c05b0aefb5da5658bf2e01a32b7ac88ee8ff0b58 + HEAD_REF master # branch name + PATCHES remove_tests.patch + build.patch + build2.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +vcpkg_find_acquire_program(GPERF) +get_filename_component(GPERF_PATH ${GPERF} DIRECTORY) +vcpkg_add_to_path(${GPERF_PATH}) -vcpkg_configure_cmake( +vcpkg_configure_make( + AUTOCONFIG + COPY_SOURCE SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS - -DFC_INCLUDE_DIR=${CMAKE_CURRENT_LIST_DIR}/include + --disable-docs + ${OPTIONS} + ac_cv_type_pid_t=yes + --enable-iconv + "--with-libiconv=${CURRENT_INSTALLED_DIR}" + "--with-libiconv-includes=${CURRENT_INSTALLED_DIR}/include" OPTIONS_DEBUG - -DFC_SKIP_TOOLS=ON - -DFC_SKIP_HEADERS=ON + "--with-libiconv-lib=${CURRENT_INSTALLED_DIR}/debug/lib" + ${OPT_DBG} + OPTIONS_RELEASE + "--with-libiconv-lib=${CURRENT_INSTALLED_DIR}/lib" + ${OPT_REL} + ADD_BIN_TO_PATH + ADDITIONAL_MSYS_PACKAGES xz findutils gettext gettext-devel # for autopoint ) -vcpkg_install_cmake() +vcpkg_install_make(ADD_BIN_TO_PATH) +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES uuid) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-fontconfig TARGET_PATH share/unofficial-fontconfig) +# Fix paths in debug pc file. +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontconfig.pc") +if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE "/etc" "/../etc" _contents "${_contents}") + string(REPLACE "/var" "/../var" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() -vcpkg_copy_pdbs() +# Make path to cache in fonts.conf relative +set(_file "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf") +if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE "${CURRENT_INSTALLED_DIR}/var/cache/fontconfig" "./../../var/cache/fontconfig" _contents "${_contents}") + string(REPLACE "/var" "/../var" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/var" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/etc") if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(VCPKG_TARGET_IS_WINDOWS) + set(DEFINE_FC_PUBLIC "#define FcPublic __declspec(dllimport)") + else() + set(DEFINE_FC_PUBLIC "#define FcPublic __attribute__((visibility(\"default\")))") + endif() foreach(HEADER fcfreetype.h fontconfig.h) - if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER} - "#define FcPublic" - "#define FcPublic __declspec(dllimport)" - ) - else() - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER} - "#define FcPublic" - "#define FcPublic __attribute__((visibility(\"default\")))" - ) - endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER}" + "#define FcPublic" + "${DEFINE_FC_PUBLIC}" + ) endforeach() 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) + + +## Build the fontconfig cache +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(ENV{FONTCONFIG_PATH} "${CURRENT_PACKAGES_DIR}/etc/fonts") + set(ENV{FONTCONFIG_FILE} "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf") + vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" + LOGNAME fc-cache-${TARGET_TRIPLET}) +endif() +if(VCPKG_TARGET_IS_WINDOWS) + # Unnecessary make rule creating the fontconfig cache dir on windows. + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}LOCAL_APPDATA_FONTCONFIG_CACHE") +endif() \ No newline at end of file diff --git a/ports/fontconfig/remove_tests.patch b/ports/fontconfig/remove_tests.patch new file mode 100644 index 00000000000000..0f9e1b8fcd8f0c --- /dev/null +++ b/ports/fontconfig/remove_tests.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index cc3024e68..e58f8688c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -24,7 +24,7 @@ + SUBDIRS=fontconfig fc-case fc-lang src \ + fc-cache fc-cat fc-conflist fc-list fc-match \ + fc-pattern fc-query fc-scan fc-validate conf.d \ +- its po po-conf test ++ its po po-conf + if ENABLE_DOCS + SUBDIRS += doc + endif diff --git a/ports/freexl/CONTROL b/ports/freexl/CONTROL index 1a887b1932ad42..3855a9cad33f51 100644 --- a/ports/freexl/CONTROL +++ b/ports/freexl/CONTROL @@ -1,6 +1,6 @@ Source: freexl Version: 1.0.4 -Port-Version: 10 +Port-Version: 11 Homepage: https://www.gaia-gis.it/gaia-sins/freexl-sources Description: FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet Build-Depends: libiconv diff --git a/ports/freexl/portfile.cmake b/ports/freexl/portfile.cmake index 6a79451dd77d95..6b4998b679e99c 100644 --- a/ports/freexl/portfile.cmake +++ b/ports/freexl/portfile.cmake @@ -16,12 +16,12 @@ if (VCPKG_TARGET_IS_WINDOWS) ) set(LIBS_ALL_DBG - "\"${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib\" \ - \"${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib\"" + "\"${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib\" \ + \"${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib\"" ) set(LIBS_ALL_REL - "\"${CURRENT_INSTALLED_DIR}/lib/libiconv.lib\" \ - \"${CURRENT_INSTALLED_DIR}/lib/libcharset.lib\"" + "\"${CURRENT_INSTALLED_DIR}/lib/iconv.lib\" \ + \"${CURRENT_INSTALLED_DIR}/lib/charset.lib\"" ) vcpkg_install_nmake( diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 38a1e266ab6c23..89bf2d2af9ffc1 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,6 +1,6 @@ Source: gdal Version: 2.4.1 -Port-Version: 13 +Port-Version: 14 Homepage: https://gdal.org/ Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data. Build-Depends: proj4, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index e5775e78194d3b..8c3650629eb945 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -149,8 +149,8 @@ if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.lib" OPENSSL_LIBRARY_DBG) # Setup libiconv libraries path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libiconv.lib ${CURRENT_INSTALLED_DIR}/lib/libcharset.lib" ICONV_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib" ICONV_LIBRARY_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/lib/charset.lib" ICONV_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib" ICONV_LIBRARY_DBG) if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES) # Setup MySQL libraries + include path diff --git a/ports/gdk-pixbuf/CMakeLists.txt b/ports/gdk-pixbuf/CMakeLists.txt index cdc5c3fb80b5e2..0ff2a85e2c54ae 100644 --- a/ports/gdk-pixbuf/CMakeLists.txt +++ b/ports/gdk-pixbuf/CMakeLists.txt @@ -12,7 +12,7 @@ find_package(PNG REQUIRED) find_package(unofficial-glib CONFIG REQUIRED) find_path(GLIB_INCLUDE_DIR glib.h) -find_package(unofficial-gettext CONFIG REQUIRED) +find_package(Intl REQUIRED) find_path(LIBINTL_INCLUDE_DIR libintl.h) if(WIN32) @@ -66,10 +66,10 @@ target_include_directories(gdk-pixbuf PRIVATE ${GLIB_INCLUDE_DIR} ${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} - ${LIBINTL_INCLUDE_DIR}) + ${Intl_INCLUDE_DIR}) set(LIBS - unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject unofficial::gettext::libintl + unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject ${Intl_LIBRARIES} ${ZLIB_LIBRARIES} ${PNG_LIBRARIES} ) diff --git a/ports/gdk-pixbuf/CONTROL b/ports/gdk-pixbuf/CONTROL index 229973bc88a66d..c283d8e6e83942 100644 --- a/ports/gdk-pixbuf/CONTROL +++ b/ports/gdk-pixbuf/CONTROL @@ -1,5 +1,6 @@ Source: gdk-pixbuf Version: 2.36.9-5 +Port-Version: 6 Homepage: https://developer.gnome.org/gdk-pixbuf/ Description: Image loading library. Build-Depends: gettext, zlib, libpng, glib diff --git a/ports/gettext/0001-Fix-macro-definitions.patch b/ports/gettext/0001-Fix-macro-definitions.patch deleted file mode 100644 index eeed3a0ce22498..00000000000000 --- a/ports/gettext/0001-Fix-macro-definitions.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/gettext-runtime/intl/xsize.h b/gettext-runtime/intl/xsize.h -index c256665..7400ea1 100644 ---- a/gettext-runtime/intl/xsize.h -+++ b/gettext-runtime/intl/xsize.h -@@ -27,6 +27,12 @@ - # include - #endif - -+#if defined _WIN32 -+# define _GL_INLINE_HEADER_BEGIN -+# define _GL_INLINE_HEADER_END -+# define _GL_INLINE static inline -+#endif -+ - #ifndef _GL_INLINE_HEADER_BEGIN - #error "Please include config.h first." - #endif diff --git a/ports/gettext/0002-Fix-uwp-build.patch b/ports/gettext/0002-Fix-uwp-build.patch index 1541315447881a..ba98e2665d5d4f 100644 --- a/ports/gettext/0002-Fix-uwp-build.patch +++ b/ports/gettext/0002-Fix-uwp-build.patch @@ -5,7 +5,7 @@ index aeb1c4e9..2ac531be 100644 @@ -33,7 +33,13 @@ extern void _nl_locale_name_canonicalize (char *name); #endif - #if defined _WIN32 || defined __WIN32__ + #if defined _WIN32 -# define WIN32_NATIVE +# if !defined(WINAPI_FAMILY) +# define WIN32_NATIVE @@ -22,10 +22,10 @@ index 670b8e6c..035a96bd 100644 --- "a/gettext-runtime/intl/localcharset.c" +++ "b/gettext-runtime/intl/localcharset.c" @@ -36,6 +36,16 @@ - # define WINDOWS_NATIVE + # include #endif -+#if defined _WIN32 || defined __WIN32__ ++#if defined _WIN32 +# if !defined(WINAPI_FAMILY) +# define HAVE_ACP +# else @@ -38,32 +38,32 @@ index 670b8e6c..035a96bd 100644 #if defined __EMX__ /* Assume EMX program runs on OS/2, even if compiled under DOS. */ # ifndef OS2 -@@ -361,7 +371,7 @@ STATIC +@@ -830,7 +830,7 @@ STATIC const char * locale_charset (void) { - const char *codeset; + const char *codeset = NULL; - const char *aliases; - #if !(defined WINDOWS_NATIVE || defined OS2) -@@ -457,7 +467,7 @@ locale_charset (void) + /* This function must be multithread-safe. To achieve this without using + thread-local storage, we use a simple strcpy or memcpy to fill this static +@@ -912,7 +912,7 @@ locale_charset (void) + /* The canonical name cannot be determined. */ + codeset = ""; - # endif - --#elif defined WINDOWS_NATIVE -+#elif defined WINDOWS_NATIVE && defined HAVE_ACP - - static char buf[2 + 10 + 1]; +-# elif defined WINDOWS_NATIVE ++# elif defined WINDOWS_NATIVE && defined HAVE_ACP + char buf[2 + 10 + 1]; + static char resultbuf[2 + 10 + 1]; diff --git "a/gettext-runtime/intl/localename.c" "b/gettext-runtime/intl/localename.c" index 108dd6f1..ace3aa88 100644 --- "a/gettext-runtime/intl/localename.c" +++ "b/gettext-runtime/intl/localename.c" -@@ -54,7 +54,13 @@ +@@ -75,10 +75,16 @@ #endif - #if defined _WIN32 || defined __WIN32__ + #if defined _WIN32 && !defined __CYGWIN__ -# define WINDOWS_NATIVE +# if !defined(WINAPI_FAMILY) +# define WINDOWS_NATIVE @@ -72,6 +72,9 @@ index 108dd6f1..ace3aa88 100644 +# define WINDOWS_NATIVE +# endif +# endif + # if !defined IN_LIBINTL + # include "glthread/lock.h" + # endif #endif #if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */ diff --git a/ports/gettext/0003-Fix-win-unicode-paths.patch b/ports/gettext/0003-Fix-win-unicode-paths.patch index 540ac3d92cb6df..d8e52719f43e37 100644 --- a/ports/gettext/0003-Fix-win-unicode-paths.patch +++ b/ports/gettext/0003-Fix-win-unicode-paths.patch @@ -2,7 +2,7 @@ diff --git "a/gettext-runtime/intl/loadmsgcat.c" "b/gettext-runtime/intl/loadmsg index 63351523..c078de3f 100644 --- a/gettext-runtime/intl/loadmsgcat.c +++ b/gettext-runtime/intl/loadmsgcat.c -@@ -477,6 +477,55 @@ char *alloca (); +@@ -388,6 +388,55 @@ char *alloca (); # define munmap(addr, len) __munmap (addr, len) #endif diff --git a/ports/gettext/CMakeLists.txt b/ports/gettext/CMakeLists.txt deleted file mode 100644 index 57d5a14e52e5f3..00000000000000 --- a/ports/gettext/CMakeLists.txt +++ /dev/null @@ -1,150 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(libintl C) - -find_package(unofficial-iconv REQUIRED) - -set(CMAKE_STATIC_LIBRARY_PREFIX) -set(CMAKE_SHARED_LIBRARY_PREFIX) - -if(WIN32) - set(HAVE_POSIX_PRINTF 0) - set(HAVE_SNPRINTF 0) - set(HAVE_ASPRINTF 0) - set(HAVE_WPRINTF 0) - set(HAVE_NEWLOCALE 0) - - configure_file(intl/libgnuintl.win32.h config/libgnuintl.h COPYONLY) - configure_file(config.win32.h config/config.h COPYONLY) -else() - set(HAVE_POSIX_PRINTF 1) - set(HAVE_SNPRINTF 1) - set(HAVE_ASPRINTF 1) - set(HAVE_WPRINTF 1) - set(HAVE_NEWLOCALE 1) - add_definitions(-DHAVE_NEWLOCALE=1) - add_definitions(-DHAVE_NEWLOCALE=1) - - set(CMAKE_THREAD_PREFER_PTHREAD TRUE) - set(THREADS_PREFER_PTHREAD_FLAG TRUE) - find_package(Threads REQUIRED) - if(NOT CMAKE_USE_PTHREADS_INIT) - message(FATAL_ERROR "Error: Only pthreads is currently supported.") - endif() - - include(CheckFunctionExists) - include(CheckIncludeFiles) - - if(APPLE) - set(HAVE_CFLOCALECOPYCURRENT 1) - set(HAVE_CFPREFERENCESCOPYAPPVALUE 1) - endif() - check_function_exists(dcgettext HAVE_DCGETTEXT) - check_include_files(features.h HAVE_FEATURES_H) - check_function_exists(gettext HAVE_GETTEXT) - check_include_files(mach-o/dyld.h HAVE_MACH_O_DYLD_H) - check_function_exists(mempcpy HAVE_MEMPCPY) - check_include_files(xlocale.h HAVE_XLOCALE_H) - - configure_file(intl/libgnuintl.in.h config/libgnuintl.h @ONLY) - configure_file(config.unix.h.in config/config.h @ONLY) -endif() - -if(NOT DISABLE_INSTALL_HEADERS) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/config/libgnuintl.h" DESTINATION include RENAME libintl.h) -endif() - -file(READ "${CMAKE_CURRENT_BINARY_DIR}/config/config.h" _contents) -if(NOT WIN32) - string(REPLACE "/* #undef HAVE_STPCPY */" "#define HAVE_STPCPY 1" _contents "${_contents}") -endif() -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config/config.h" "${_contents}") - -FILE(GLOB SOURCES - "intl/bindtextdom.c" - "intl/dcgettext.c" - "intl/dcigettext.c" - "intl/dcngettext.c" - "intl/dgettext.c" - "intl/dngettext.c" - "intl/explodename.c" - "intl/finddomain.c" - "intl/gettext.c" - "intl/hash-string.c" - "intl/intl-compat.c" - "intl/l10nflist.c" - "intl/langprefs.c" - "intl/loadmsgcat.c" - "intl/localealias.c" - "intl/localename.c" - "intl/lock.c" - "intl/log.c" - "intl/ngettext.c" - "intl/osdep.c" - "intl/plural-exp.c" - "intl/plural.c" - "intl/printf.c" - "intl/relocatable.c" - "intl/textdomain.c" - "intl/version.c" -) -if(NOT WIN32) - list(APPEND SOURCES "intl/setlocale.c") -endif() - -set(LOCALDIR "c:/gettext") - -add_definitions(-DLOCALEDIR=\"${LOCALDIR}\") -add_definitions(-DLOCALE_ALIAS_PATH=\"${LOCALDIR}\") -add_definitions(-DLIBDIR=\"${LOCALDIR}\") -add_definitions(-DINSTALLDIR=\"${LOCALDIR}\") -if(BUILD_SHARED_LIBS) - add_definitions(-DBUILDING_DLL) -endif() -add_definitions("-DBUILDING_LIBINTL -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY") - -add_definitions("-DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -DHAVE_ICONV -DHAVE_ICONV_H -DICONV_CONST=const -D_CRT_SECURE_NO_WARNINGS") - -add_library(libintl ${SOURCES}) -target_link_libraries(libintl PRIVATE unofficial::iconv::libcharset unofficial::iconv::libiconv) - -target_include_directories(libintl PUBLIC - $ - $ -) - -if(APPLE) - find_library(COREFOUNDATION_LIBRARY CoreFoundation REQUIRED) - target_link_libraries(libintl PRIVATE ${COREFOUNDATION_LIBRARY}) -endif() -if(NOT WIN32) - target_link_libraries(libintl PRIVATE Threads::Threads) -endif() -if (WIN32) - target_link_libraries(libintl PRIVATE kernel32.lib Advapi32.lib) -endif() - -install(TARGETS libintl - EXPORT unofficial-gettext-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -install( - EXPORT unofficial-gettext-targets - FILE unofficial-gettext-targets.cmake - NAMESPACE unofficial::gettext:: - DESTINATION share/unofficial-gettext -) - -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-gettext-config.cmake" " -include(CMakeFindDependencyMacro) -find_dependency(unofficial-iconv) -find_dependency(Threads) -include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-gettext-targets.cmake) -") - -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-gettext-config.cmake - DESTINATION share/unofficial-gettext -) diff --git a/ports/gettext/CONTROL b/ports/gettext/CONTROL index 0918e1943c3abc..d5fd705c3d73b9 100644 --- a/ports/gettext/CONTROL +++ b/ports/gettext/CONTROL @@ -1,5 +1,5 @@ Source: gettext -Version: 0.19-15 +Version: 0.21 Homepage: https://www.gnu.org/software/gettext/ Description: The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. Provides libintl. Build-Depends: libiconv diff --git a/ports/gettext/config.unix.h.in b/ports/gettext/config.unix.h.in deleted file mode 100644 index 9f00a6fcda47bb..00000000000000 --- a/ports/gettext/config.unix.h.in +++ /dev/null @@ -1,1009 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to the number of bits in type 'ptrdiff_t'. */ -#define BITSIZEOF_PTRDIFF_T sizeof(ptrdiff_t) - -/* Define to the number of bits in type 'sig_atomic_t'. */ -#define BITSIZEOF_SIG_ATOMIC_T 32 - -/* Define to the number of bits in type 'size_t'. */ -#define BITSIZEOF_SIZE_T sizeof(size_t) - -/* Define to the number of bits in type 'wchar_t'. */ -#define BITSIZEOF_WCHAR_T 32 - -/* Define to the number of bits in type 'wint_t'. */ -#define BITSIZEOF_WINT_T 32 - -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define if mono is the preferred C# implementation. */ -/* #undef CSHARP_CHOICE_MONO */ - -/* Define if pnet is the preferred C# implementation. */ -/* #undef CSHARP_CHOICE_PNET */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* Define to 1 if // is a file system root distinct from /. */ -/* #undef DOUBLE_SLASH_IS_DISTINCT_ROOT */ - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#define ENABLE_NLS 1 - -/* Define to 1 if the package shall run at any location in the file system. */ -#define ENABLE_RELOCATABLE 1 - -/* Define to 1 if realpath() can malloc memory, always gives an absolute path, - and handles trailing slash correctly. */ -/* #undef FUNC_REALPATH_WORKS */ - -/* Define if gettimeofday clobbers the localtime buffer. */ -/* #undef GETTIMEOFDAY_CLOBBERS_LOCALTIME */ - -/* Define this to 'void' or 'struct timezone' to match the system's - declaration of the second argument to gettimeofday. */ -#define GETTIMEOFDAY_TIMEZONE void - -/* Define to a C preprocessor expression that evaluates to 1 or 0, depending - whether the gnulib module canonicalize-lgpl shall be considered present. */ -#define GNULIB_CANONICALIZE_LGPL 1 - -/* Define to a C preprocessor expression that evaluates to 1 or 0, depending - whether the gnulib module fscanf shall be considered present. */ -#define GNULIB_FSCANF 1 - -/* Define to a C preprocessor expression that evaluates to 1 or 0, depending - whether the gnulib module fwriteerror shall be considered present. */ -#define GNULIB_FWRITEERROR 1 - -/* Define to a C preprocessor expression that evaluates to 1 or 0, depending - whether the gnulib module lock shall be considered present. */ -#define GNULIB_LOCK 1 - -/* Define to a C preprocessor expression that evaluates to 1 or 0, depending - whether the gnulib module scanf shall be considered present. */ -#define GNULIB_SCANF 1 - -/* Define to a C preprocessor expression that evaluates to 1 or 0, depending - whether the gnulib module sigpipe shall be considered present. */ -#define GNULIB_SIGPIPE 1 - -/* Define to a C preprocessor expression that evaluates to 1 or 0, depending - whether the gnulib module strerror shall be considered present. */ -#define GNULIB_STRERROR 1 - -/* Define to a C preprocessor expression that evaluates to 1 or 0, depending - whether the gnulib module unistr/u8-mbtoucr shall be considered present. */ -#define GNULIB_UNISTR_U8_MBTOUCR 1 - -/* Define to a C preprocessor expression that evaluates to 1 or 0, depending - whether the gnulib module unistr/u8-uctomb shall be considered present. */ -#define GNULIB_UNISTR_U8_UCTOMB 1 - -/* Define to 1 if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -#define HAVE_ALLOCA_H 1 - -/* Define to 1 if you have the `argz_count' function. */ -/* #undef HAVE_ARGZ_COUNT */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ARGZ_H */ - -/* Define to 1 if you have the `argz_next' function. */ -/* #undef HAVE_ARGZ_NEXT */ - -/* Define to 1 if you have the `argz_stringify' function. */ -/* #undef HAVE_ARGZ_STRINGIFY */ - -/* Define to 1 if you have the `asprintf' function. */ -#define HAVE_ASPRINTF 1 - -/* Define to 1 if you have the `atexit' function. */ -#define HAVE_ATEXIT 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_BP_SYM_H */ - -/* Define to 1 if the compiler understands __builtin_expect. */ -#define HAVE_BUILTIN_EXPECT 1 - -/* Define to 1 if you have the `canonicalize_file_name' function. */ -/* #undef HAVE_CANONICALIZE_FILE_NAME */ - -/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -#cmakedefine HAVE_CFLOCALECOPYCURRENT 1 - -/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -#cmakedefine HAVE_CFPREFERENCESCOPYAPPVALUE 1 - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -#cmakedefine HAVE_DCGETTEXT 1 - -/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_CLEARERR_UNLOCKED 1 - -/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you - don't. */ -#define HAVE_DECL_FEOF_UNLOCKED 1 - -/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FERROR_UNLOCKED 1 - -/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FFLUSH_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FGETS_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FPUTC_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FPUTS_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FREAD_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FWRITE_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_GETCHAR_UNLOCKED 1 - -/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you - don't. */ -#define HAVE_DECL_GETC_UNLOCKED 1 - -/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. - */ -#define HAVE_DECL_GETENV 1 - -/* Define to 1 if you have the declaration of `iswblank', and to 0 if you - don't. */ -#define HAVE_DECL_ISWBLANK 1 - -/* Define to 1 if you have the declaration of `mbrtowc', and to 0 if you - don't. */ -/* #undef HAVE_DECL_MBRTOWC */ - -/* Define to 1 if you have the declaration of `mbsinit', and to 0 if you - don't. */ -/* #undef HAVE_DECL_MBSINIT */ - -/* Define to 1 if you have the declaration of `program_invocation_name', and - to 0 if you don't. */ -#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0 - -/* Define to 1 if you have the declaration of `program_invocation_short_name', - and to 0 if you don't. */ -#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 0 - -/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_PUTCHAR_UNLOCKED 1 - -/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you - don't. */ -#define HAVE_DECL_PUTC_UNLOCKED 1 - -/* Define to 1 if you have the declaration of `setenv', and to 0 if you don't. - */ -#define HAVE_DECL_SETENV 1 - -/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you - don't. */ -#define HAVE_DECL_STRERROR_R 1 - -/* Define to 1 if you have the declaration of `strnlen', and to 0 if you - don't. */ -#define HAVE_DECL_STRNLEN 1 - -/* Define to 1 if you have the declaration of `towlower', and to 0 if you - don't. */ -/* #undef HAVE_DECL_TOWLOWER */ - -/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you - don't. */ -#define HAVE_DECL_WCWIDTH 1 - -/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you - don't. */ -#define HAVE_DECL__SNPRINTF 0 - -/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you - don't. */ -#define HAVE_DECL__SNWPRINTF 0 - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Define if you have the declaration of environ. */ -/* #undef HAVE_ENVIRON_DECL */ - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_FEATURES_H 1 - -/* Define to 1 if you have the `fwprintf' function. */ -#define HAVE_FWPRINTF 1 - -/* Define to 1 if you have the `getcwd' function. */ -#define HAVE_GETCWD 1 - -/* Define to 1 if you have the `getegid' function. */ -#define HAVE_GETEGID 1 - -/* Define to 1 if you have the `geteuid' function. */ -#define HAVE_GETEUID 1 - -/* Define to 1 if you have the `getgid' function. */ -#define HAVE_GETGID 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_GETOPT_H 1 - -/* Define to 1 if you have the `getopt_long_only' function. */ -#define HAVE_GETOPT_LONG_ONLY 1 - -/* Define to 1 if you have the `getpagesize' function. */ -#define HAVE_GETPAGESIZE 1 - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#cmakedefine HAVE_GETTEXT 1 - -/* Define to 1 if you have the `gettimeofday' function. */ -#define HAVE_GETTIMEOFDAY 1 - -/* Define to 1 if you have the `getuid' function. */ -#define HAVE_GETUID 1 - -/* Define if you have the iconv() function and it works. */ -#define HAVE_ICONV 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_ICONV_H 1 - -/* Define to 1 if the compiler supports one of the keywords 'inline', - '__inline__', '__inline' and effectively inlines functions marked as such. - */ -#define HAVE_INLINE 1 - -/* Define if you have the 'intmax_t' type in or . */ -#define HAVE_INTMAX_T 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define if exists, doesn't clash with , and - declares uintmax_t. */ -#define HAVE_INTTYPES_H_WITH_UINTMAX 1 - -/* Define to 1 if you have the `iswblank' function. */ -#define HAVE_ISWBLANK 1 - -/* Define to 1 if you have the `iswcntrl' function. */ -#define HAVE_ISWCNTRL 1 - -/* Define if you have and nl_langinfo(CODESET). */ -#define HAVE_LANGINFO_CODESET 1 - -/* Define if your file defines LC_MESSAGES. */ -#define HAVE_LC_MESSAGES 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if the system has the type 'long long int'. */ -#define HAVE_LONG_LONG_INT 1 - -/* Define to 1 if you have the `lstat' function. */ -#define HAVE_LSTAT 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_MACH_O_DYLD_H 1 - -/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including - config.h and . */ -#define HAVE_MAP_ANONYMOUS 1 - -/* Define to 1 if you have the `mbrtowc' function. */ -#define HAVE_MBRTOWC 1 - -/* Define to 1 if you have the `mbsinit' function. */ -#define HAVE_MBSINIT 1 - -/* Define to 1 if you have the `mbslen' function. */ -/* #undef HAVE_MBSLEN */ - -/* Define to 1 if declares mbstate_t. */ -#define HAVE_MBSTATE_T 1 - -/* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mempcpy' function. */ -#cmakedefine HAVE_MEMPCPY 1 - -/* Define to 1 if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 - -/* Define to 1 if you have the `mprotect' function. */ -#define HAVE_MPROTECT 1 - -/* Define to 1 on MSVC platforms that have the "invalid parameter handler" - concept. */ -/* #undef HAVE_MSVC_INVALID_PARAMETER_HANDLER */ - -/* Define to 1 if you have the `munmap' function. */ -#define HAVE_MUNMAP 1 - -/* Define to 1 if you have the `newlocale' function. */ -#cmakedefine HAVE_NEWLOCALE 1 - -/* Define if your printf() function supports format strings with positions. */ -#define HAVE_POSIX_PRINTF 1 - -/* Define if the defines PTHREAD_MUTEX_RECURSIVE. */ -#define HAVE_PTHREAD_MUTEX_RECURSIVE 1 - -/* Define if the POSIX multithreading library has read/write locks. */ -#define HAVE_PTHREAD_RWLOCK 1 - -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define to 1 if you have the `raise' function. */ -#define HAVE_RAISE 1 - -/* Define to 1 if you have the `readlink' function. */ -#define HAVE_READLINK 1 - -/* Define to 1 if you have the `readlinkat' function. */ -#define HAVE_READLINKAT 1 - -/* Define to 1 if you have the `realpath' function. */ -#define HAVE_REALPATH 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SEARCH_H 1 - -/* Define to 1 if you have the `setenv' function. */ -#define HAVE_SETENV 1 - -/* Define to 1 if you have the `setlocale' function. */ -#define HAVE_SETLOCALE 1 - -/* Define to 1 if 'sig_atomic_t' is a signed integer type. */ -/* #undef HAVE_SIGNED_SIG_ATOMIC_T */ - -/* Define to 1 if 'wchar_t' is a signed integer type. */ -/* #undef HAVE_SIGNED_WCHAR_T */ - -/* Define to 1 if 'wint_t' is a signed integer type. */ -/* #undef HAVE_SIGNED_WINT_T */ - -/* Define to 1 if the system has the type `sigset_t'. */ -#define HAVE_SIGSET_T 1 - -/* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDDEF_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define if exists, doesn't clash with , and declares - uintmax_t. */ -#define HAVE_STDINT_H_WITH_UINTMAX 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `stpcpy' function. */ -#define HAVE_STPCPY 1 - -/* Define to 1 if you have the `strcasecmp' function. */ -#define HAVE_STRCASECMP 1 - -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - -/* Define to 1 if you have the `strerror_r' function. */ -#define HAVE_STRERROR_R 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strnlen' function. */ -#define HAVE_STRNLEN 1 - -/* Define to 1 if you have the `strtoul' function. */ -#define HAVE_STRTOUL 1 - -/* Define to 1 if you have the `symlink' function. */ -#define HAVE_SYMLINK 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_BITYPES_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_INTTYPES_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_MMAN_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_SOCKET_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TIMEB_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the `towlower' function. */ -#define HAVE_TOWLOWER 1 - -/* Define to 1 if you have the `tsearch' function. */ -#define HAVE_TSEARCH 1 - -/* Define if you have the 'uintmax_t' type in or . */ -#define HAVE_UINTMAX_T 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if the system has the type 'unsigned long long int'. */ -#define HAVE_UNSIGNED_LONG_LONG_INT 1 - -/* Define to 1 if you have the `uselocale' function. */ -#define HAVE_USELOCALE 1 - -/* Define to 1 or 0, depending whether the compiler supports simple visibility - declarations. */ -#define HAVE_VISIBILITY 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_WCHAR_H 1 - -/* Define if you have the 'wchar_t' type. */ -#define HAVE_WCHAR_T 1 - -/* Define to 1 if you have the `wcrtomb' function. */ -#define HAVE_WCRTOMB 1 - -/* Define to 1 if you have the `wcslen' function. */ -#define HAVE_WCSLEN 1 - -/* Define to 1 if you have the `wcsnlen' function. */ -#define HAVE_WCSNLEN 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_WCTYPE_H 1 - -/* Define to 1 if you have the `wcwidth' function. */ -#define HAVE_WCWIDTH 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_WINSOCK2_H */ - -/* Define if you have the 'wint_t' type. */ -#define HAVE_WINT_T 1 - -/* Define to 1 if O_NOATIME works. */ -#define HAVE_WORKING_O_NOATIME 0 - -/* Define to 1 if O_NOFOLLOW works. */ -#define HAVE_WORKING_O_NOFOLLOW 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_XLOCALE_H 1 - -/* Define to 1 if the system has the type `_Bool'. */ -#define HAVE__BOOL 1 - -/* Define to 1 if you have the `_ftime' function. */ -/* #undef HAVE__FTIME */ - -/* Define to 1 if you have the `_NSGetExecutablePath' function. */ -/* #undef HAVE__NSGETEXECUTABLEPATH */ - -/* Define to 1 if you have the `_set_invalid_parameter_handler' function. */ -/* #undef HAVE__SET_INVALID_PARAMETER_HANDLER */ - -/* Define to 1 if you have the `__fsetlocking' function. */ -/* #undef HAVE___FSETLOCKING */ - -/* Define as const if the declaration of iconv() needs const. */ -#define ICONV_CONST - -/* Define to a symbolic name denoting the flavor of iconv_open() - implementation. */ -/* #undef ICONV_FLAVOR */ - -/* Define to the value of ${prefix}, as a string. */ -/* #define INSTALLPREFIX "/usr/local" */ - -/* Define if integer division by zero raises signal SIGFPE. */ -#define INTDIV0_RAISES_SIGFPE 0 - -/* Define to 1 if 'lstat' dereferences a symlink specified with a trailing - slash. */ -/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */ - -/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */ -#define MALLOC_0_IS_NONNULL 1 - -/* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */ -/* #undef MAP_ANONYMOUS */ - -/* Define if the mbrtowc function has the NULL pwc argument bug. */ -/* #undef MBRTOWC_NULL_ARG1_BUG */ - -/* Define if the mbrtowc function has the NULL string argument bug. */ -/* #undef MBRTOWC_NULL_ARG2_BUG */ - -/* Define if the mbrtowc function does not return 0 for a NUL character. */ -/* #undef MBRTOWC_NUL_RETVAL_BUG */ - -/* Define if the mbrtowc function returns a wrong return value. */ -/* #undef MBRTOWC_RETVAL_BUG */ - -/* Name of package */ -#define PACKAGE "gettext-runtime" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "gettext-runtime" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "gettext-runtime 0.19" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "gettext-runtime" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "0.19" - -/* Define if exists and defines unusable PRI* macros. */ -/* #undef PRI_MACROS_BROKEN */ - -/* Define if the pthread_in_use() detection is hard. */ -/* #undef PTHREAD_IN_USE_DETECTION_HARD */ - -/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'ptrdiff_t'. */ -#define PTRDIFF_T_SUFFIX - -/* Define to 1 if readlink fails to recognize a trailing slash. */ -/* #undef READLINK_TRAILING_SLASH_BUG */ - -/* Define to 1 if stat needs help when passed a directory name with a trailing - slash */ -/* #undef REPLACE_FUNC_STAT_DIR */ - -/* Define to 1 if stat needs help when passed a file name with a trailing - slash */ -/* #undef REPLACE_FUNC_STAT_FILE */ - -/* Define to 1 if strerror(0) does not return a message implying success. */ -/* #undef REPLACE_STRERROR_0 */ - -/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'sig_atomic_t'. */ -#define SIG_ATOMIC_T_SUFFIX - -/* Define as the maximum value of type 'size_t', if the system doesn't define - it. */ -#ifndef SIZE_MAX -/* # undef SIZE_MAX */ -#endif - -/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'size_t'. */ -#define SIZE_T_SUFFIX ul - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -/* #undef STACK_DIRECTION */ - -/* Define to 1 if the `S_IS*' macros in do not work properly. */ -/* #undef STAT_MACROS_BROKEN */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if strerror_r returns char *. */ -/* #undef STRERROR_R_CHAR_P */ - -/* Define to the prefix of C symbols at the assembler and linker level, either - an underscore or empty. */ -#define USER_LABEL_PREFIX - -/* Define if the POSIX multithreading library can be used. */ -#define USE_POSIX_THREADS 1 - -/* Define if references to the POSIX multithreading library should be made - weak. */ -/* #undef USE_POSIX_THREADS_WEAK */ - -/* Define if the GNU Pth multithreading library can be used. */ -/* #undef USE_PTH_THREADS */ - -/* Define if references to the GNU Pth multithreading library should be made - weak. */ -/* #undef USE_PTH_THREADS_WEAK */ - -/* Define if the old Solaris multithreading library can be used. */ -/* #undef USE_SOLARIS_THREADS */ - -/* Define if references to the old Solaris multithreading library should be - made weak. */ -/* #undef USE_SOLARIS_THREADS_WEAK */ - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# define _ALL_SOURCE 1 -#endif -/* Enable general extensions on OS X. */ -#ifndef _DARWIN_C_SOURCE -# define _DARWIN_C_SOURCE 1 -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# define _POSIX_PTHREAD_SEMANTICS 1 -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# define _TANDEM_SOURCE 1 -#endif -/* Enable X/Open extensions if necessary. HP-UX 11.11 defines - mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of - whether compiling with -Ae or -D_HPUX_SOURCE=1. */ -#ifndef _XOPEN_SOURCE -/* # undef _XOPEN_SOURCE */ -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif - - -/* Define to 1 if you want getc etc. to use unlocked I/O if available. - Unlocked I/O can improve performance in unithreaded apps, but it is not - safe for multithreaded apps. */ -#define USE_UNLOCKED_IO 1 - -/* Define if the native Windows multithreading API can be used. */ -/* #undef USE_WINDOWS_THREADS */ - -/* Version number of package */ -#define VERSION "0.19" - -/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'wchar_t'. */ -#define WCHAR_T_SUFFIX - -/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'wint_t'. */ -#define WINT_T_SUFFIX - -/* Define when --enable-shared is used on mingw or Cygwin. */ -/* #undef WOE32DLL */ - -/* Enable large inode numbers on Mac OS X 10.5. */ -#define _DARWIN_USE_64_BIT_INODE 1 - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define to 1 if Gnulib overrides 'struct stat' on Windows so that struct - stat.st_size becomes 64-bit. */ -/* #undef _GL_WINDOWS_64_BIT_ST_SIZE */ - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to 1 on Solaris. */ -/* #undef _LCONV_C99 */ - -/* Define to 1 if on MINIX. */ -/* #undef _MINIX */ - -/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */ -/* #undef _NETBSD_SOURCE */ - -/* The _Noreturn keyword of C11. */ -#if ! (defined _Noreturn \ - || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) -# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ - || 0x5110 <= __SUNPRO_C) -# define _Noreturn __attribute__ ((__noreturn__)) -# elif defined _MSC_VER && 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) -# else -# define _Noreturn -# endif -#endif - - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define to 1 if you need to in order for 'stat' and other things to work. */ -/* #undef _POSIX_SOURCE */ - -/* Define to rpl_ if the getopt replacement functions and variables should be - used. */ -#define __GETOPT_PREFIX rpl_ - -/* Please see the Gnulib manual for how to use these macros. - - Suppress extern inline with HP-UX cc, as it appears to be broken; see - . - - Suppress extern inline with Sun C in standards-conformance mode, as it - mishandles inline functions that call each other. E.g., for 'inline void f - (void) { } inline void g (void) { f (); }', c99 incorrectly complains - 'reference to static identifier "f" in extern inline function'. - This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. - - Suppress the use of extern inline on problematic Apple configurations. - OS X 10.8 and earlier mishandle it; see, e.g., - . - OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and - for clang but remains for g++; see . - Perhaps Apple will fix this some day. */ -#if (defined __APPLE__ \ - && (defined __header_inline \ - ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ - && ! defined __clang__) \ - : ((! defined _DONT_USE_CTYPE_INLINE_ \ - && (defined __GNUC__ || defined __cplusplus)) \ - || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ - && defined __GNUC__ && ! defined __cplusplus)))) -# define _GL_EXTERN_INLINE_APPLE_BUG -#endif -#if ((__GNUC__ \ - ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ - : (199901L <= __STDC_VERSION__ \ - && !defined __HP_cc \ - && !(defined __SUNPRO_C && __STDC__))) \ - && !defined _GL_EXTERN_INLINE_APPLE_BUG) -# define _GL_INLINE inline -# define _GL_EXTERN_INLINE extern inline -# define _GL_EXTERN_INLINE_IN_USE -#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ - && !defined _GL_EXTERN_INLINE_APPLE_BUG) -# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ - /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ -# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) -# else -# define _GL_INLINE extern inline -# endif -# define _GL_EXTERN_INLINE extern -# define _GL_EXTERN_INLINE_IN_USE -#else -# define _GL_INLINE static _GL_UNUSED -# define _GL_EXTERN_INLINE static _GL_UNUSED -#endif - -#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) -# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ -# define _GL_INLINE_HEADER_CONST_PRAGMA -# else -# define _GL_INLINE_HEADER_CONST_PRAGMA \ - _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") -# endif - /* Suppress GCC's bogus "no previous prototype for 'FOO'" - and "no previous declaration for 'FOO'" diagnostics, - when FOO is an inline function in the header; see - . */ -# define _GL_INLINE_HEADER_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ - _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \ - _GL_INLINE_HEADER_CONST_PRAGMA -# define _GL_INLINE_HEADER_END \ - _Pragma ("GCC diagnostic pop") -#else -# define _GL_INLINE_HEADER_BEGIN -# define _GL_INLINE_HEADER_END -#endif - -/* Define to `int' if doesn't define. */ -/* #undef gid_t */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - -/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports - the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of - earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. - __APPLE__ && __MACH__ test for Mac OS X. - __APPLE_CC__ tests for the Apple compiler and its version. - __STDC_VERSION__ tests for the C99 mode. */ -#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ -# define __GNUC_STDC_INLINE__ 1 -#endif - -/* Define to a type if does not define. */ -/* #undef mbstate_t */ - -/* Define to `int' if does not define. */ -/* #undef mode_t */ - -/* Define to the type of st_nlink in struct stat, or a supertype. */ -/* #undef nlink_t */ - -/* Define to `int' if does not define. */ -/* #undef pid_t */ - -/* Define as the type of the result of subtracting two pointers, if the system - doesn't define it. */ -/* #undef ptrdiff_t */ - -/* Define to the equivalent of the C99 'restrict' keyword, or to - nothing if this is not supported. Do not define if restrict is - supported directly. */ -#define restrict __restrict -/* Work around a bug in Sun C++: it does not support _Restrict or - __restrict__, even though the corresponding Sun C compiler ends up with - "#define restrict _Restrict" or "#define restrict __restrict__" in the - previous line. Perhaps some future version of Sun C++ will work with - restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ -#if defined __SUNPRO_CC && !defined __RESTRICT -# define _Restrict -# define __restrict__ -#endif - -/* Define to `unsigned int' if does not define. */ -/* #undef size_t */ - -/* Define as a signed type of the same size as size_t. */ -/* #undef ssize_t */ - -/* Define to `int' if doesn't define. */ -/* #undef uid_t */ - -/* Define to unsigned long or unsigned long long if and - don't define. */ -/* #undef uintmax_t */ - -/* Define as a marker that can be attached to declarations that might not - be used. This helps to reduce warnings, such as from - GCC -Wunused-parameter. */ -#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define _GL_UNUSED __attribute__ ((__unused__)) -#else -# define _GL_UNUSED -#endif -/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name - is a misnomer outside of parameter lists. */ -#define _UNUSED_PARAMETER_ _GL_UNUSED - -/* The __pure__ attribute was added in gcc 2.96. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) -# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -#else -# define _GL_ATTRIBUTE_PURE /* empty */ -#endif - -/* The __const__ attribute was added in gcc 2.95. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) -#else -# define _GL_ATTRIBUTE_CONST /* empty */ -#endif - - - -#define __libc_lock_t gl_lock_t -#define __libc_lock_define gl_lock_define -#define __libc_lock_define_initialized gl_lock_define_initialized -#define __libc_lock_init gl_lock_init -#define __libc_lock_lock gl_lock_lock -#define __libc_lock_unlock gl_lock_unlock -#define __libc_lock_recursive_t gl_recursive_lock_t -#define __libc_lock_define_recursive gl_recursive_lock_define -#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized -#define __libc_lock_init_recursive gl_recursive_lock_init -#define __libc_lock_lock_recursive gl_recursive_lock_lock -#define __libc_lock_unlock_recursive gl_recursive_lock_unlock -#define glthread_in_use libintl_thread_in_use -#define glthread_lock_init_func libintl_lock_init_func -#define glthread_lock_lock_func libintl_lock_lock_func -#define glthread_lock_unlock_func libintl_lock_unlock_func -#define glthread_lock_destroy_func libintl_lock_destroy_func -#define glthread_rwlock_init_multithreaded libintl_rwlock_init_multithreaded -#define glthread_rwlock_init_func libintl_rwlock_init_func -#define glthread_rwlock_rdlock_multithreaded libintl_rwlock_rdlock_multithreaded -#define glthread_rwlock_rdlock_func libintl_rwlock_rdlock_func -#define glthread_rwlock_wrlock_multithreaded libintl_rwlock_wrlock_multithreaded -#define glthread_rwlock_wrlock_func libintl_rwlock_wrlock_func -#define glthread_rwlock_unlock_multithreaded libintl_rwlock_unlock_multithreaded -#define glthread_rwlock_unlock_func libintl_rwlock_unlock_func -#define glthread_rwlock_destroy_multithreaded libintl_rwlock_destroy_multithreaded -#define glthread_rwlock_destroy_func libintl_rwlock_destroy_func -#define glthread_recursive_lock_init_multithreaded libintl_recursive_lock_init_multithreaded -#define glthread_recursive_lock_init_func libintl_recursive_lock_init_func -#define glthread_recursive_lock_lock_multithreaded libintl_recursive_lock_lock_multithreaded -#define glthread_recursive_lock_lock_func libintl_recursive_lock_lock_func -#define glthread_recursive_lock_unlock_multithreaded libintl_recursive_lock_unlock_multithreaded -#define glthread_recursive_lock_unlock_func libintl_recursive_lock_unlock_func -#define glthread_recursive_lock_destroy_multithreaded libintl_recursive_lock_destroy_multithreaded -#define glthread_recursive_lock_destroy_func libintl_recursive_lock_destroy_func -#define glthread_once_func libintl_once_func -#define glthread_once_singlethreaded libintl_once_singlethreaded -#define glthread_once_multithreaded libintl_once_multithreaded - - - -/* On Windows, variables that may be in a DLL must be marked specially. */ -#if (defined _MSC_VER && defined _DLL) && !defined IN_RELOCWRAPPER -# define DLL_VARIABLE __declspec (dllimport) -#else -# define DLL_VARIABLE -#endif - -/* Extra OS/2 (emx+gcc) defines. */ -#ifdef __EMX__ -# include "intl/os2compat.h" -#endif - diff --git a/ports/gettext/config.win32.h b/ports/gettext/config.win32.h deleted file mode 100644 index e8507894dec221..00000000000000 --- a/ports/gettext/config.win32.h +++ /dev/null @@ -1,675 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -#ifndef WIN32 -# define _GL_INLINE_HEADER_BEGIN -# define _GL_INLINE_HEADER_END -# define _GL_INLINE static inline -#endif - -/* Disable function deprecated warnings */ -#define _CRT_NONSTDC_NO_WARNINGS - -/* Define to the number of bits in type 'ptrdiff_t'. */ -#define BITSIZEOF_PTRDIFF_T sizeof(ptrdiff_t) - -/* Define to the number of bits in type 'sig_atomic_t'. */ -#define BITSIZEOF_SIG_ATOMIC_T 32 - -/* Define to the number of bits in type 'size_t'. */ -#define BITSIZEOF_SIZE_T sizeof(size_t) - -/* Define to the number of bits in type 'wchar_t'. */ -#define BITSIZEOF_WCHAR_T 16 - -/* Define to the number of bits in type 'wint_t'. */ -#define BITSIZEOF_WINT_T 16 - -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define if mono is the preferred C# implementation. */ -/* #undef CSHARP_CHOICE_MONO */ - -/* Define if pnet is the preferred C# implementation. */ -/* #undef CSHARP_CHOICE_PNET */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#define ENABLE_NLS 1 - -/* Define to 1 if the package shall run at any location in the filesystem. */ -#define ENABLE_RELOCATABLE 1 - -/* Define to 1 when using the gnulib module fwriteerror. */ -#define GNULIB_FWRITEERROR 1 - -/* Define to 1 if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -/* #undef HAVE_ALLOCA_H */ - -/* Define to 1 if you have the `argz_count' function. */ -/* #undef HAVE_ARGZ_COUNT */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ARGZ_H */ - -/* Define to 1 if you have the `argz_next' function. */ -/* #undef HAVE_ARGZ_NEXT */ - -/* Define to 1 if you have the `argz_stringify' function. */ -/* #undef HAVE_ARGZ_STRINGIFY */ - -/* Define to 1 if you have the `asprintf' function. */ -/* #undef HAVE_ASPRINTF */ - -/* Define to 1 if you have the `atexit' function. */ -#define HAVE_ATEXIT 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_BP_SYM_H */ - -/* Define to 1 if the compiler understands __builtin_expect. */ -/* #undef HAVE_BUILTIN_EXPECT */ - -/* Define to 1 if you have the `canonicalize_file_name' function. */ -/* #undef HAVE_CANONICALIZE_FILE_NAME */ - -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -/* #undef HAVE_CFLOCALECOPYCURRENT */ - -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -/* #undef HAVE_DCGETTEXT */ - -/* Define to 1 if you have the declaration of `canonicalize_file_name', and to - 0 if you don't. */ -#define HAVE_DECL_CANONICALIZE_FILE_NAME 0 - -/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_CLEARERR_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you - don't. */ -#define HAVE_DECL_FEOF_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FERROR_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FFLUSH_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FGETS_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FPUTC_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FPUTS_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FREAD_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FWRITE_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_GETCHAR_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you - don't. */ -#define HAVE_DECL_GETC_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. - */ -#define HAVE_DECL_GETENV 1 - -/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_PUTCHAR_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you - don't. */ -#define HAVE_DECL_PUTC_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `strdup', and to 0 if you don't. - */ -#define HAVE_DECL_STRDUP 1 - -/* Define to 1 if you have the declaration of `strerror', and to 0 if you - don't. */ -/* #undef HAVE_DECL_STRERROR */ - -/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you - don't. */ -#define HAVE_DECL_STRERROR_R 0 - -/* Define to 1 if you have the declaration of `strnlen', and to 0 if you - don't. */ -#define HAVE_DECL_STRNLEN 0 - -/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you - don't. */ -#define HAVE_DECL_WCWIDTH 0 - -/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you - don't. */ -#define HAVE_DECL__SNPRINTF 1 - -/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you - don't. */ -#define HAVE_DECL__SNWPRINTF 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define if you have the declaration of environ. */ -#define HAVE_ENVIRON_DECL 1 - -/* Define to 1 if you have the `fwprintf' function. */ -#define HAVE_FWPRINTF 1 - -/* Define to 1 if you have the `getcwd' function. */ -#define HAVE_GETCWD 1 - -/* Define to 1 if you have the `getegid' function. */ -/* #undef HAVE_GETEGID */ - -/* Define to 1 if you have the `geteuid' function. */ -/* #undef HAVE_GETEUID */ - -/* Define to 1 if you have the `getgid' function. */ -/* #undef HAVE_GETGID */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_GETOPT_H */ - -/* Define to 1 if you have the `getopt_long_only' function. */ -/* #undef HAVE_GETOPT_LONG_ONLY */ - -/* Define to 1 if you have the `getpagesize' function. */ -/* #undef HAVE_GETPAGESIZE */ - -/* Define if the GNU gettext() function is already present or preinstalled. */ -/* #undef HAVE_GETTEXT */ - -/* Define to 1 if you have the `getuid' function. */ -/* #undef HAVE_GETUID */ - -/* Define if you have the iconv() function and it works. */ -/* #undef HAVE_ICONV */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ICONV_H */ - -/* Define if your compiler supports the #include_next directive. */ -/* #undef HAVE_INCLUDE_NEXT */ - -/* Define if you have the 'intmax_t' type in or . */ -#define HAVE_INTMAX_T 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_INTTYPES_H */ - -/* Define if exists, doesn't clash with , and - declares uintmax_t. */ -/* #undef HAVE_INTTYPES_H_WITH_UINTMAX */ - -/* Define to 1 if you have the `iswcntrl' function. */ -#define HAVE_ISWCNTRL 1 - -/* Define if you have and nl_langinfo(CODESET). */ -/* #undef HAVE_LANGINFO_CODESET */ - -/* Define if your file defines LC_MESSAGES. */ -/* #undef HAVE_LC_MESSAGES */ - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if the system has the type `long long int'. */ -/* #undef HAVE_LONG_LONG_INT */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_MACH_O_DYLD_H */ - -/* Define if the 'malloc' function is POSIX compliant. */ -/* #undef HAVE_MALLOC_POSIX */ - -/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ -/* #undef HAVE_MBRTOWC */ - -/* Define to 1 if declares mbstate_t. */ -#define HAVE_MBSTATE_T 1 - -/* Define to 1 if you have the `memchr' function. */ -#define HAVE_MEMCHR 1 - -/* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mempcpy' function. */ -#ifdef __GNUC__ -#define HAVE_MEMPCPY 1 -#endif - -/* Define to 1 if you have a working `mmap' system call. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the `munmap' function. */ -/* #undef HAVE_MUNMAP */ - -/* Define if you have and it defines the NL_LOCALE_NAME macro if - _GNU_SOURCE is defined. */ -/* #undef HAVE_NL_LOCALE_NAME */ - -/* Define if your printf() function supports format strings with positions. */ -/* #undef HAVE_POSIX_PRINTF */ - -/* Define if the defines PTHREAD_MUTEX_RECURSIVE. */ -/* #undef HAVE_PTHREAD_MUTEX_RECURSIVE */ - -/* Define if the POSIX multithreading library has read/write locks. */ -/* #undef HAVE_PTHREAD_RWLOCK */ - -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define to 1 if you have the `readlink' function. */ -/* #undef HAVE_READLINK */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SEARCH_H 1 - -/* Define to 1 if you have the `setenv' function. */ -/* #undef HAVE_SETENV */ - -/* Define to 1 if you have the `setlocale' function. */ -#define HAVE_SETLOCALE 1 - -/* Define to 1 if 'sig_atomic_t' is a signed integer type. */ -#define HAVE_SIGNED_SIG_ATOMIC_T 1 - -/* Define to 1 if 'wchar_t' is a signed integer type. */ -/* #undef HAVE_SIGNED_WCHAR_T */ - -/* Define to 1 if 'wint_t' is a signed integer type. */ -/* #undef HAVE_SIGNED_WINT_T */ - -/* Define to 1 if you have the `snprintf' function. */ -/* #undef HAVE_SNPRINTF */ - -/* Define to 1 if stdbool.h conforms to C99. */ -/* #undef HAVE_STDBOOL_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDDEF_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define if exists, doesn't clash with , and declares - uintmax_t. */ -#define HAVE_STDINT_H_WITH_UINTMAX 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `stpcpy' function. */ -/* #undef HAVE_STPCPY */ - -/* Define to 1 if you have the `strcasecmp' function. */ -/* #undef HAVE_STRCASECMP */ - -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - -/* Define to 1 if you have the `strerror_r' function. */ -/* #undef HAVE_STRERROR_R */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STRINGS_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strtol' function. */ -#define HAVE_STRTOL 1 - -/* Define to 1 if you have the `strtoul' function. */ -#define HAVE_STRTOUL 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_BITYPES_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_INTTYPES_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_PARAM_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the `tsearch' function. */ -/* #undef HAVE_TSEARCH */ - -/* Define if you have the 'uintmax_t' type in or . */ -#define HAVE_UINTMAX_T 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_UNISTD_H */ - -/* Define to 1 if the system has the type `unsigned long long int'. */ -/* #undef HAVE_UNSIGNED_LONG_LONG_INT */ - -/* Define to 1 or 0, depending whether the compiler supports simple visibility - declarations. */ -#define HAVE_VISIBILITY 0 - -/* Define to 1 if you have the header file. */ -#define HAVE_WCHAR_H 1 - -/* Define if you have the 'wchar_t' type. */ -#define HAVE_WCHAR_T 1 - -/* Define to 1 if you have the `wcslen' function. */ -#define HAVE_WCSLEN 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_WCTYPE_H 1 - -/* Define to 1 if you have the `wcwidth' function. */ -/* #undef HAVE_WCWIDTH */ - -/* Define if you have the 'wint_t' type. */ -#define HAVE_WINT_T 1 - -/* Define to 1 if the system has the type `_Bool'. */ -/* #undef HAVE__BOOL */ - -/* Define to 1 if you have the `_NSGetExecutablePath' function. */ -/* #undef HAVE__NSGETEXECUTABLEPATH */ - -/* Define to 1 if you have the `__fsetlocking' function. */ -/* #undef HAVE___FSETLOCKING */ - -/* Define as const if the declaration of iconv() needs const. */ -/* #undef ICONV_CONST */ - -/* Define to a symbolic name denoting the flavor of iconv_open() - implementation. */ -/* #undef ICONV_FLAVOR */ - -/* Define to the value of ${prefix}, as a string. */ -/* #define INSTALLPREFIX "/usr/local" */ - -/* Define if integer division by zero raises signal SIGFPE. */ -#define INTDIV0_RAISES_SIGFPE 0 - -/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */ -#define MALLOC_0_IS_NONNULL 1 - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#define NO_MINUS_C_MINUS_O 1 - -/* Name of package */ -#define PACKAGE "gettext-runtime" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* Define if exists and defines unusable PRI* macros. */ -/* #undef PRI_MACROS_BROKEN */ - -/* Define if the pthread_in_use() detection is hard. */ -/* #undef PTHREAD_IN_USE_DETECTION_HARD */ - -/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'ptrdiff_t'. */ -#define PTRDIFF_T_SUFFIX - -/* Define this to 1 if strerror is broken. */ -/* #undef REPLACE_STRERROR */ - -/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'sig_atomic_t'. */ -#define SIG_ATOMIC_T_SUFFIX - -/* Define as the maximum value of type 'size_t', if the system doesn't define - it. */ -#if defined(_WIN32) -#define SIZE_MAX (((1UL << 31) - 1) * 2 + 1) -#endif - -/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'size_t'. */ -#define SIZE_T_SUFFIX u - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -/* #undef STACK_DIRECTION */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if strerror_r returns char *. */ -/* #undef STRERROR_R_CHAR_P */ - -/* Define if the POSIX multithreading library can be used. */ -/* #undef USE_POSIX_THREADS */ - -/* Define if references to the POSIX multithreading library should be made - weak. */ -/* #undef USE_POSIX_THREADS_WEAK */ - -/* Define if the GNU Pth multithreading library can be used. */ -/* #undef USE_PTH_THREADS */ - -/* Define if references to the GNU Pth multithreading library should be made - weak. */ -/* #undef USE_PTH_THREADS_WEAK */ - -/* Define if the old Solaris multithreading library can be used. */ -/* #undef USE_SOLARIS_THREADS */ - -/* Define if references to the old Solaris multithreading library should be - made weak. */ -/* #undef USE_SOLARIS_THREADS_WEAK */ - -/* Define to 1 if you want getc etc. to use unlocked I/O if available. - Unlocked I/O can improve performance in unithreaded apps, but it is not - safe for multithreaded apps. */ -#define USE_UNLOCKED_IO 0 - -/* Define if the Win32 multithreading API can be used. */ -#define USE_WIN32_THREADS 1 - -/* Version number of package */ -#define VERSION "0.17" - -/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'wchar_t'. */ -#define WCHAR_T_SUFFIX - -/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'wint_t'. */ -#define WINT_T_SUFFIX - -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -/* Define to 1 if on MINIX. */ -/* #undef _MINIX */ - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -/* #undef _POSIX_SOURCE */ - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# define _ALL_SOURCE 1 -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# define _POSIX_PTHREAD_SEMANTICS 1 -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# define _TANDEM_SOURCE 1 -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif - - -/* Define to rpl_ if the getopt replacement functions and variables should be - used. */ -#define __GETOPT_PREFIX rpl_ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#define inline __inline -#endif - -/* Define to a type if does not define. */ -/* #undef mbstate_t */ - -/* Define as the type of the result of subtracting two pointers, if the system - doesn't define it. */ -/* #undef ptrdiff_t */ - -/* Define to a replacement function name for realpath(). */ -#define realpath rpl_realpath - -/* Define to the equivalent of the C99 'restrict' keyword, or to - nothing if this is not supported. Do not define if restrict is - supported directly. */ -#define restrict -/* Work around a bug in Sun C++: it does not support _Restrict, even - though the corresponding Sun C compiler does, which causes - "#define restrict _Restrict" in the previous line. Perhaps some future - version of Sun C++ will work with _Restrict; if so, it'll probably - define __RESTRICT, just as Sun C does. */ -#if defined __SUNPRO_CC && !defined __RESTRICT -# define _Restrict -#endif - -/* Define to `unsigned int' if does not define. */ -/* #undef size_t */ - -/* Define as a signed type of the same size as size_t. */ -#ifdef _WIN64 -#define ssize_t __int64 -#elif _WIN32 -#define ssize_t __int32 -#endif - -/* Define to rpl_strnlen if the replacement function should be used. */ -#define strnlen rpl_strnlen - -/* Define to unsigned long or unsigned long long if and - don't define. */ -/* #undef uintmax_t */ - -#define __libc_lock_t gl_lock_t -#define __libc_lock_define gl_lock_define -#define __libc_lock_define_initialized gl_lock_define_initialized -#define __libc_lock_init gl_lock_init -#define __libc_lock_lock gl_lock_lock -#define __libc_lock_unlock gl_lock_unlock -#define __libc_lock_recursive_t gl_recursive_lock_t -#define __libc_lock_define_recursive gl_recursive_lock_define -#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized -#define __libc_lock_init_recursive gl_recursive_lock_init -#define __libc_lock_lock_recursive gl_recursive_lock_lock -#define __libc_lock_unlock_recursive gl_recursive_lock_unlock -#if 0 -#define glthread_in_use libintl_thread_in_use -#define glthread_lock_init libintl_lock_init -#define glthread_lock_lock libintl_lock_lock -#define glthread_lock_unlock libintl_lock_unlock -#define glthread_lock_destroy libintl_lock_destroy -#define glthread_rwlock_init libintl_rwlock_init -#define glthread_rwlock_rdlock libintl_rwlock_rdlock -#define glthread_rwlock_wrlock libintl_rwlock_wrlock -#define glthread_rwlock_unlock libintl_rwlock_unlock -#define glthread_rwlock_destroy libintl_rwlock_destroy -#define glthread_recursive_lock_init libintl_recursive_lock_init -#define glthread_recursive_lock_lock libintl_recursive_lock_lock -#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock -#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy -#define glthread_once libintl_once -#define glthread_once_call libintl_once_call -#define glthread_once_singlethreaded libintl_once_singlethreaded -#endif - - -/* On Windows, variables that may be in a DLL must be marked specially. */ -#if (defined _MSC_VER && defined _DLL) && !defined IN_RELOCWRAPPER -# define DLL_VARIABLE __declspec (dllimport) -#else -# define DLL_VARIABLE -#endif - -/* Extra OS/2 (emx+gcc) defines. */ -#ifdef __EMX__ -# include "intl/os2compat.h" -#endif - diff --git a/ports/gettext/libgnuintl.win32.h b/ports/gettext/libgnuintl.win32.h deleted file mode 100644 index 440da4d5941261..00000000000000 --- a/ports/gettext/libgnuintl.win32.h +++ /dev/null @@ -1,423 +0,0 @@ -/* Message catalogs for internationalization. -Copyright (C) 1995-1997, 2000-2007 Free Software Foundation, Inc. - -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU Library General Public License as published -by the Free Software Foundation; either version 2, or (at your option) -any later version. - -This program 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -USA. */ - -#ifndef _LIBINTL_H -#define _LIBINTL_H 1 - -#if defined(_WIN32) && defined(libintl_EXPORTS) -#define LIBINTL_DLL_EXPORTED __declspec(dllexport) -#else -#define LIBINTL_DLL_EXPORTED -#endif - -#include - -/* The LC_MESSAGES locale category is the category used by the functions -gettext() and dgettext(). It is specified in POSIX, but not in ANSI C. -On systems that don't define it, use an arbitrary value instead. -On Solaris, defines __LOCALE_H (or _LOCALE_H in Solaris 2.5) -then includes (i.e. this file!) and then only defines -LC_MESSAGES. To avoid a redefinition warning, don't define LC_MESSAGES -in this case. */ -#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun)) -# define LC_MESSAGES 1729 -#endif - -/* We define an additional symbol to signal that we use the GNU -implementation of gettext. */ -#define __USE_GNU_GETTEXT 1 - -/* Provide information about the supported file formats. Returns the -maximum minor revision number supported for a given major revision. */ -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \ - ((major) == 0 || (major) == 1 ? 1 : -1) - -/* Resolve a platform specific conflict on DJGPP. GNU gettext takes -precedence over _conio_gettext. */ -#ifdef __DJGPP__ -# undef gettext -#endif - -#ifdef __cplusplus -extern "C" { -#endif - - - /* Version number: (major<<16) + (minor<<8) + subminor */ -#define LIBINTL_VERSION 0x001100 - extern LIBINTL_DLL_EXPORTED int libintl_version; - - - /* We redirect the functions to those prefixed with "libintl_". This is - necessary, because some systems define gettext/textdomain/... in the C - library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer). - If we used the unprefixed names, there would be cases where the - definition in the C library would override the one in the libintl.so - shared library. Recall that on ELF systems, the symbols are looked - up in the following order: - 1. in the executable, - 2. in the shared libraries specified on the link command line, in order, - 3. in the dependencies of the shared libraries specified on the link - command line, - 4. in the dlopen()ed shared libraries, in the order in which they were - dlopen()ed. - The definition in the C library would override the one in libintl.so if - either - * -lc is given on the link command line and -lintl isn't, or - * -lc is given on the link command line before -lintl, or - * libintl.so is a dependency of a dlopen()ed shared library but not - linked to the executable at link time. - Since Solaris gettext() behaves differently than GNU gettext(), this - would be unacceptable. - - The redirection happens by default through macros in C, so that &gettext - is independent of the compilation unit, but through inline functions in - C++, in order not to interfere with the name mangling of class fields or - class methods called 'gettext'. */ - - /* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS. - If he doesn't, we choose the method. A third possible method is - _INTL_REDIRECT_ASM, supported only by GCC. */ -#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS) -# if __GNUC__ >= 2 && !(__APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus) -# define _INTL_REDIRECT_ASM -# else -# ifdef __cplusplus -# define _INTL_REDIRECT_INLINE -# else -# define _INTL_REDIRECT_MACROS -# endif -# endif -#endif - /* Auxiliary macros. */ -#ifdef _INTL_REDIRECT_ASM -# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname)) -# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring -# define _INTL_STRINGIFY(prefix) #prefix -#else -# define _INTL_ASM(cname) -#endif - - /* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return - its n-th argument literally. This enables GCC to warn for example about - printf (gettext ("foo %y")). */ -#if __GNUC__ >= 3 && !(__APPLE_CC__ > 1 && defined __cplusplus) -# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n))) -#else -# define _INTL_MAY_RETURN_STRING_ARG(n) -#endif - - /* Look up MSGID in the current default message catalog for the current - LC_MESSAGES locale. If not found, returns MSGID itself (the default - text). */ -#ifdef _INTL_REDIRECT_INLINE - extern LIBINTL_DLL_EXPORTED char *libintl_gettext(const char *__msgid) - _INTL_MAY_RETURN_STRING_ARG(1); - static inline char *gettext(const char *__msgid) - { - return libintl_gettext(__msgid); - } -#else -#ifdef _INTL_REDIRECT_MACROS -# define gettext libintl_gettext -#endif - extern LIBINTL_DLL_EXPORTED char *gettext(const char *__msgid) - _INTL_ASM(libintl_gettext) - _INTL_MAY_RETURN_STRING_ARG(1); -#endif - - /* Look up MSGID in the DOMAINNAME message catalog for the current - LC_MESSAGES locale. */ -#ifdef _INTL_REDIRECT_INLINE - extern LIBINTL_DLL_EXPORTED char *libintl_dgettext(const char *__domainname, const char *__msgid) - _INTL_MAY_RETURN_STRING_ARG(2); - static inline char *dgettext(const char *__domainname, const char *__msgid) - { - return libintl_dgettext(__domainname, __msgid); - } -#else -#ifdef _INTL_REDIRECT_MACROS -# define dgettext libintl_dgettext -#endif - extern LIBINTL_DLL_EXPORTED char *dgettext(const char *__domainname, const char *__msgid) - _INTL_ASM(libintl_dgettext) - _INTL_MAY_RETURN_STRING_ARG(2); -#endif - - /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY - locale. */ -#ifdef _INTL_REDIRECT_INLINE - extern LIBINTL_DLL_EXPORTED char *libintl_dcgettext(const char *__domainname, const char *__msgid, - int __category) - _INTL_MAY_RETURN_STRING_ARG(2); - static inline char *dcgettext(const char *__domainname, const char *__msgid, - int __category) - { - return libintl_dcgettext(__domainname, __msgid, __category); - } -#else -#ifdef _INTL_REDIRECT_MACROS -# define dcgettext libintl_dcgettext -#endif - extern LIBINTL_DLL_EXPORTED char *dcgettext(const char *__domainname, const char *__msgid, - int __category) - _INTL_ASM(libintl_dcgettext) - _INTL_MAY_RETURN_STRING_ARG(2); -#endif - - - /* Similar to `gettext' but select the plural form corresponding to the - number N. */ -#ifdef _INTL_REDIRECT_INLINE - extern LIBINTL_DLL_EXPORTED char *libintl_ngettext(const char *__msgid1, const char *__msgid2, - unsigned long int __n) - _INTL_MAY_RETURN_STRING_ARG(1) _INTL_MAY_RETURN_STRING_ARG(2); - static inline char *ngettext(const char *__msgid1, const char *__msgid2, - unsigned long int __n) - { - return libintl_ngettext(__msgid1, __msgid2, __n); - } -#else -#ifdef _INTL_REDIRECT_MACROS -# define ngettext libintl_ngettext -#endif - extern LIBINTL_DLL_EXPORTED char *ngettext(const char *__msgid1, const char *__msgid2, - unsigned long int __n) - _INTL_ASM(libintl_ngettext) - _INTL_MAY_RETURN_STRING_ARG(1) _INTL_MAY_RETURN_STRING_ARG(2); -#endif - - /* Similar to `dgettext' but select the plural form corresponding to the - number N. */ -#ifdef _INTL_REDIRECT_INLINE - extern LIBINTL_DLL_EXPORTED char *libintl_dngettext(const char *__domainname, const char *__msgid1, - const char *__msgid2, unsigned long int __n) - _INTL_MAY_RETURN_STRING_ARG(2) _INTL_MAY_RETURN_STRING_ARG(3); - static inline char *dngettext(const char *__domainname, const char *__msgid1, - const char *__msgid2, unsigned long int __n) - { - return libintl_dngettext(__domainname, __msgid1, __msgid2, __n); - } -#else -#ifdef _INTL_REDIRECT_MACROS -# define dngettext libintl_dngettext -#endif - extern LIBINTL_DLL_EXPORTED char *dngettext(const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n) - _INTL_ASM(libintl_dngettext) - _INTL_MAY_RETURN_STRING_ARG(2) _INTL_MAY_RETURN_STRING_ARG(3); -#endif - - /* Similar to `dcgettext' but select the plural form corresponding to the - number N. */ -#ifdef _INTL_REDIRECT_INLINE - extern LIBINTL_DLL_EXPORTED char *libintl_dcngettext(const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n, int __category) - _INTL_MAY_RETURN_STRING_ARG(2) _INTL_MAY_RETURN_STRING_ARG(3); - static inline char *dcngettext(const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n, int __category) - { - return libintl_dcngettext(__domainname, __msgid1, __msgid2, __n, __category); - } -#else -#ifdef _INTL_REDIRECT_MACROS -# define dcngettext libintl_dcngettext -#endif - extern LIBINTL_DLL_EXPORTED char *dcngettext(const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n, int __category) - _INTL_ASM(libintl_dcngettext) - _INTL_MAY_RETURN_STRING_ARG(2) _INTL_MAY_RETURN_STRING_ARG(3); -#endif - - - - /* Set the current default message catalog to DOMAINNAME. - If DOMAINNAME is null, return the current default. - If DOMAINNAME is "", reset to the default of "messages". */ -#ifdef _INTL_REDIRECT_INLINE - extern LIBINTL_DLL_EXPORTED char *libintl_textdomain(const char *__domainname); - static inline char *textdomain(const char *__domainname) - { - return libintl_textdomain(__domainname); - } -#else -#ifdef _INTL_REDIRECT_MACROS -# define textdomain libintl_textdomain -#endif - extern LIBINTL_DLL_EXPORTED char *textdomain(const char *__domainname) - _INTL_ASM(libintl_textdomain); -#endif - - /* Specify that the DOMAINNAME message catalog will be found - in DIRNAME rather than in the system locale data base. */ -#ifdef _INTL_REDIRECT_INLINE - extern LIBINTL_DLL_EXPORTED char *libintl_bindtextdomain(const char *__domainname, - const char *__dirname); - static inline char *bindtextdomain(const char *__domainname, - const char *__dirname) - { - return libintl_bindtextdomain(__domainname, __dirname); - } -#else -#ifdef _INTL_REDIRECT_MACROS -# define bindtextdomain libintl_bindtextdomain -#endif - extern LIBINTL_DLL_EXPORTED char *bindtextdomain(const char *__domainname, const char *__dirname) - _INTL_ASM(libintl_bindtextdomain); -#endif - - /* Specify the character encoding in which the messages from the - DOMAINNAME message catalog will be returned. */ -#ifdef _INTL_REDIRECT_INLINE - extern LIBINTL_DLL_EXPORTED char *libintl_bind_textdomain_codeset(const char *__domainname, - const char *__codeset); - static inline char *bind_textdomain_codeset(const char *__domainname, - const char *__codeset) - { - return libintl_bind_textdomain_codeset(__domainname, __codeset); - } -#else -#ifdef _INTL_REDIRECT_MACROS -# define bind_textdomain_codeset libintl_bind_textdomain_codeset -#endif - extern LIBINTL_DLL_EXPORTED char *bind_textdomain_codeset(const char *__domainname, - const char *__codeset) - _INTL_ASM(libintl_bind_textdomain_codeset); -#endif - - - - /* Support for format strings with positions in *printf(), following the - POSIX/XSI specification. - Note: These replacements for the *printf() functions are visible only - in source files that #include or #include "gettext.h". - Packages that use *printf() in source files that don't refer to _() - or gettext() but for which the format string could be the return value - of _() or gettext() need to add this #include. Oh well. */ - -#if !0 - -#include -#include - - /* Get va_list. */ -#if __STDC__ || defined __cplusplus || defined _MSC_VER -# include -#else -# include -#endif - -#undef fprintf -#define fprintf libintl_fprintf - extern LIBINTL_DLL_EXPORTED int fprintf(FILE *, const char *, ...); -#undef vfprintf -#define vfprintf libintl_vfprintf - extern LIBINTL_DLL_EXPORTED int vfprintf(FILE *, const char *, va_list); - -#undef printf -#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__ - /* Don't break __attribute__((format(printf,M,N))). - This redefinition is only possible because the libc in NetBSD, Cygwin, - mingw does not have a function __printf__. */ -# define libintl_printf __printf__ -#endif -#define printf libintl_printf - extern LIBINTL_DLL_EXPORTED int printf(const char *, ...); -#undef vprintf -#define vprintf libintl_vprintf - extern LIBINTL_DLL_EXPORTED int vprintf(const char *, va_list); - -#undef sprintf -#define sprintf libintl_sprintf - extern LIBINTL_DLL_EXPORTED int sprintf(char *, const char *, ...); -#undef vsprintf -#define vsprintf libintl_vsprintf - extern LIBINTL_DLL_EXPORTED int vsprintf(char *, const char *, va_list); - -#if 0 - -#undef snprintf -#define snprintf libintl_snprintf - extern LIBINTL_DLL_EXPORTED int snprintf(char *, size_t, const char *, ...); -#undef vsnprintf -#define vsnprintf libintl_vsnprintf - extern LIBINTL_DLL_EXPORTED int vsnprintf(char *, size_t, const char *, va_list); - -#endif - -#if 0 - -#undef asprintf -#define asprintf libintl_asprintf - extern LIBINTL_DLL_EXPORTED int asprintf(char **, const char *, ...); -#undef vasprintf -#define vasprintf libintl_vasprintf - extern LIBINTL_DLL_EXPORTED int vasprintf(char **, const char *, va_list); - -#endif - -#if 0 - -#undef fwprintf -#define fwprintf libintl_fwprintf - extern LIBINTL_DLL_EXPORTED int fwprintf(FILE *, const wchar_t *, ...); -#undef vfwprintf -#define vfwprintf libintl_vfwprintf - extern LIBINTL_DLL_EXPORTED int vfwprintf(FILE *, const wchar_t *, va_list); - -#undef wprintf -#define wprintf libintl_wprintf - extern LIBINTL_DLL_EXPORTED int wprintf(const wchar_t *, ...); -#undef vwprintf -#define vwprintf libintl_vwprintf - extern LIBINTL_DLL_EXPORTED int vwprintf(const wchar_t *, va_list); - -#undef swprintf -#define swprintf libintl_swprintf - extern LIBINTL_DLL_EXPORTED int swprintf(wchar_t *, size_t, const wchar_t *, ...); -#undef vswprintf -#define vswprintf libintl_vswprintf - extern LIBINTL_DLL_EXPORTED int vswprintf(wchar_t *, size_t, const wchar_t *, va_list); - -#endif - -#endif - - - /* Support for relocatable packages. */ - - /* Sets the original and the current installation prefix of the package. - Relocation simply replaces a pathname starting with the original prefix - by the corresponding pathname with the current prefix instead. Both - prefixes should be directory names without trailing slash (i.e. use "" - instead of "/"). */ -#define libintl_set_relocation_prefix libintl_set_relocation_prefix - extern LIBINTL_DLL_EXPORTED void - libintl_set_relocation_prefix(const char *orig_prefix, - const char *curr_prefix); - - -#ifdef __cplusplus -} -#endif - -#endif /* libintl.h */ \ No newline at end of file diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index 988c2f439cadab..449029e7c9531e 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -3,7 +3,6 @@ if(VCPKG_TARGET_IS_LINUX) if (NOT EXISTS "/usr/include/libintl.h") message(FATAL_ERROR "Please use command \"sudo apt-get install gettext\" to install gettext on linux.") endif() - file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-gettext-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-gettext) return() else() set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) @@ -11,45 +10,73 @@ endif() #Based on https://github.com/winlibs/gettext -set(GETTEXT_VERSION 0.19) +set(GETTEXT_VERSION 0.21) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz" FILENAME "gettext-${GETTEXT_VERSION}.tar.gz" - SHA512 a5db035c582ff49d45ee6eab9466b2bef918e413a882019c204a9d8903cb3770ddfecd32c971ea7c7b037c7b69476cf7c56dcabc8b498b94ab99f132516c9922 + SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1 ) +if(VCPKG_TARGET_IS_UWP) + set(PATCHES uwp_remove_localcharset.patch) +endif() vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${GETTEXT_VERSION} PATCHES - 0001-Fix-macro-definitions.patch 0002-Fix-uwp-build.patch 0003-Fix-win-unicode-paths.patch + ${PATCHES} ) +vcpkg_find_acquire_program(BISON) +get_filename_component(BISON_PATH ${BISON} DIRECTORY) +vcpkg_add_to_path(${BISON_PATH}) -file(COPY - ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_LIST_DIR}/config.win32.h - ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in - DESTINATION ${SOURCE_PATH}/gettext-runtime -) -file(REMOVE ${SOURCE_PATH}/gettext-runtime/intl/libgnuintl.h ${SOURCE_PATH}/gettext-runtime/config.h) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/libgnuintl.win32.h DESTINATION ${SOURCE_PATH}/gettext-runtime/intl) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/gettext-runtime - PREFER_NINJA - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -) - -vcpkg_install_cmake() +if(VCPKG_TARGET_IS_WINDOWS) + # This is required. For some reason these do not get correctly identified for release builds. + list(APPEND OPTIONS ac_cv_func_wcslen=yes + ac_cv_func_memmove=yes + #The following are required for a full gettext built. + # Left here for future reference. + gl_cv_func_printf_directive_n=no #segfaults otherwise with popup window + ac_cv_func_memset=yes #not detected in release builds + ) +endif() +vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH}/gettext-runtime # Port should probably be renamed to gettext-runtime instead of only gettext. Removing the subdir here builds all of gettext + DETERMINE_BUILD_TRIPLET + USE_WRAPPERS + ADD_BIN_TO_PATH # So configure can check for working iconv + OPTIONS --enable-relocatable #symbol duplication with glib-init.c? + --enable-c++ + --disable-java + ${OPTIONS} + ) + +if(VCPKG_TARGET_IS_UWP) + vcpkg_install_make(SUBPATH "/intl") # Could make a port intl or libintl or have features in Gettext +else() + vcpkg_install_make(SUBPATH "/intl") +endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-gettext TARGET_PATH share/unofficial-gettext) # Handle copyright file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gettext) file(RENAME ${CURRENT_PACKAGES_DIR}/share/gettext/COPYING ${CURRENT_PACKAGES_DIR}/share/gettext/copyright) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +set(GNU_DLL_PATHS lib/ debug/lib/) +set(GNU_DLL_NAME GNU.Gettext.dll) #C# dll? +foreach(DLL_PATH IN LISTS GNU_DLL_PATHS) + if(EXISTS "${CURRENT_PACKAGES_DIR}/${DLL_PATH}${GNU_DLL_NAME}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/${DLL_PATH}${GNU_DLL_NAME}") + endif() +endforeach() + vcpkg_copy_pdbs() + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/intl) diff --git a/ports/gettext/unofficial-gettext-config.cmake b/ports/gettext/unofficial-gettext-config.cmake deleted file mode 100644 index 3b872142af7b8d..00000000000000 --- a/ports/gettext/unofficial-gettext-config.cmake +++ /dev/null @@ -1 +0,0 @@ -add_library(unofficial::gettext::libintl INTERFACE IMPORTED) diff --git a/ports/gettext/uwp_remove_localcharset.patch b/ports/gettext/uwp_remove_localcharset.patch new file mode 100644 index 00000000000000..285f81cf19eafa --- /dev/null +++ b/ports/gettext/uwp_remove_localcharset.patch @@ -0,0 +1,79 @@ +diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in +index 7999d3456..b3ef40340 100644 +--- a/gettext-runtime/intl/Makefile.in ++++ b/gettext-runtime/intl/Makefile.in +@@ -252,7 +252,7 @@ am__libgnuintl_la_SOURCES_DIST = bindtextdom.c dcgettext.c dgettext.c \ + gettext.c finddomain.c hash-string.c loadmsgcat.c \ + localealias.c textdomain.c l10nflist.c explodename.c \ + dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \ +- plural-exp.c localcharset.c threadlib.c lock.c relocatable.c \ ++ plural-exp.c threadlib.c lock.c relocatable.c \ + langprefs.c localename.c localename-table.c log.c printf.c \ + setlocale.c setlocale-lock.c setlocale_null.c version.c \ + xsize.c osdep.c intl-compat.c windows-mutex.c windows-rwlock.c \ +@@ -264,7 +264,7 @@ am__objects_2 = bindtextdom.lo dcgettext.lo dgettext.lo gettext.lo \ + finddomain.lo hash-string.lo loadmsgcat.lo localealias.lo \ + textdomain.lo l10nflist.lo explodename.lo dcigettext.lo \ + dcngettext.lo dngettext.lo ngettext.lo plural.lo plural-exp.lo \ +- localcharset.lo threadlib.lo lock.lo relocatable.lo \ ++ threadlib.lo lock.lo relocatable.lo \ + langprefs.lo localename.lo localename-table.lo log.lo \ + printf.lo setlocale.lo setlocale-lock.lo setlocale_null.lo \ + version.lo xsize.lo osdep.lo intl-compat.lo $(am__objects_1) +@@ -282,7 +282,7 @@ am__libintl_la_SOURCES_DIST = bindtextdom.c dcgettext.c dgettext.c \ + gettext.c finddomain.c hash-string.c loadmsgcat.c \ + localealias.c textdomain.c l10nflist.c explodename.c \ + dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \ +- plural-exp.c localcharset.c threadlib.c lock.c relocatable.c \ ++ plural-exp.c threadlib.c lock.c relocatable.c \ + langprefs.c localename.c localename-table.c log.c printf.c \ + setlocale.c setlocale-lock.c setlocale_null.c version.c \ + xsize.c osdep.c intl-compat.c windows-mutex.c windows-rwlock.c \ +@@ -1387,7 +1387,7 @@ AUTOMAKE_OPTIONS = 1.10 gnu no-dependencies + + # Miscellaneous files. + EXTRA_DIST = gmo.h gettextP.h hash-string.h loadinfo.h plural-exp.h \ +- eval-plural.h localcharset.h lock.h windows-mutex.h \ ++ eval-plural.h lock.h windows-mutex.h \ + windows-rwlock.h windows-recmutex.h windows-once.h \ + windows-initguard.h relocatable.h arg-nonnull.h attribute.h \ + filename.h flexmember.h localename-table.in.h setlocale_null.h \ +@@ -1543,7 +1543,7 @@ LIBINTLSOURCES = bindtextdom.c dcgettext.c dgettext.c gettext.c \ + finddomain.c hash-string.c loadmsgcat.c localealias.c \ + textdomain.c l10nflist.c explodename.c dcigettext.c \ + dcngettext.c dngettext.c ngettext.c plural.y plural-exp.c \ +- localcharset.c threadlib.c lock.c relocatable.c langprefs.c \ ++ threadlib.c lock.c relocatable.c langprefs.c \ + localename.c localename-table.c log.c printf.c setlocale.c \ + setlocale-lock.c setlocale_null.c version.c xsize.c osdep.c \ + intl-compat.c $(am__append_2) +@@ -2016,8 +2016,6 @@ plural.lo: $(srcdir)/plural.c + $(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/plural.c + plural-exp.lo: $(srcdir)/plural-exp.c + $(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/plural-exp.c +-localcharset.lo: $(srcdir)/localcharset.c +- $(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/localcharset.c + threadlib.lo: $(srcdir)/threadlib.c + $(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/threadlib.c + lock.lo: $(srcdir)/lock.c +@@ -2074,7 +2072,6 @@ dngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo + ngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h $(srcdir)/lock.h $(srcdir)/windows-mutex.h $(srcdir)/windows-rwlock.h $(srcdir)/windows-recmutex.h $(srcdir)/windows-once.h $(srcdir)/windows-initguard.h + plural.lo: ../config.h $(srcdir)/plural-exp.h $(PLURAL_DEPS) + plural-exp.lo: ../config.h $(srcdir)/plural-exp.h +-localcharset.lo: ../config.h $(srcdir)/localcharset.h + threadlib.lo: ../config.h + lock.lo: ../config.h $(srcdir)/lock.h $(srcdir)/windows-mutex.h $(srcdir)/windows-rwlock.h $(srcdir)/windows-recmutex.h $(srcdir)/windows-once.h $(srcdir)/windows-initguard.h + relocatable.lo: ../config.h $(srcdir)/relocatable.h +diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c +index 1a1627888..3e6582f17 100644 +--- a/gettext-runtime/intl/localcharset.c ++++ b/gettext-runtime/intl/localcharset.c +@@ -1021,7 +1021,7 @@ locale_charset (void) + + # else + +-# error "Add code for other platforms here." ++//# error "Add code for other platforms here." + + # endif + diff --git a/ports/gettext/vcpkg-cmake-wrapper.cmake b/ports/gettext/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..c231bfee692a73 --- /dev/null +++ b/ports/gettext/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,10 @@ +_find_package(${ARGS}) + +if(Intl_FOUND AND Intl_LIBRARIES) + include(SelectLibraryConfigurations) + find_library(Intl_LIBRARY_DEBUG NAMES intl libintl intl-8 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) + find_library(Intl_LIBRARY_RELEASE NAMES intl libintl intl-8 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) + unset(Intl_LIBRARIES) + unset(Intl_LIBRARIES CACHE) + select_library_configurations(Intl) +endif() \ No newline at end of file diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index 2315420738622c..cc24a2f63ae00b 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -31,7 +31,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug) endif() find_library(PCRE_LIBRARY NAMES pcre${PCRE_SUFFIX} pcre) # libiconv -find_package(unofficial-iconv REQUIRED) +find_package(Iconv REQUIRED) # libffi find_path(FFI_INCLUDE_DIR ffi.h) find_library(FFI_LIBRARY NAMES ffi libffi) @@ -45,11 +45,7 @@ endif() if(WIN32 OR APPLE) # libintl(gettext) - find_path(LIBINTL_INCLUDE_DIR libintl.h) - find_library(LIBINTL_LIBRARY NAMES intl libintl) -else() - set(LIBINTL_INCLUDE_DIR) - set(LIBINTL_LIBRARY) + find_package(Intl REQUIRED) endif() if(WIN32) @@ -139,7 +135,7 @@ if(NOT WIN32) endif() add_library(glib ${GLIB_SOURCES}) target_compile_definitions(glib PRIVATE GLIB_COMPILATION G_LOG_DOMAIN="GLib" LIBDIR="") -target_link_libraries(glib PRIVATE ${PCRE_LIBRARY} unofficial::iconv::libiconv unofficial::iconv::libcharset ${LIBINTL_LIBRARY}) +target_link_libraries(glib PRIVATE ${PCRE_LIBRARY} Iconv::Iconv ${Intl_LIBRARIES}) if(WIN32) target_compile_definitions(glib PRIVATE USE_SYSTEM_PCRE) target_link_libraries(glib PRIVATE ws2_32 winmm advapi32 ole32 shell32) @@ -149,7 +145,7 @@ else() target_link_libraries(glib PRIVATE Threads::Threads ${CMAKE_DL_LIBS}) endif() target_include_directories(glib PRIVATE ${PCRE_INCLUDE_DIR} ${ICONV_INCLUDE_DIR}) -target_include_directories(glib PUBLIC $ $) +target_include_directories(glib PUBLIC $ $) list(APPEND GLIB_TARGETS glib) if(NOT GLIB_SKIP_HEADERS) install(FILES glib/glib.h glib/glib-object.h ${CMAKE_BINARY_DIR}/config/glib/glibconfig.h DESTINATION include) @@ -165,8 +161,8 @@ endif() # gthread add_library(gthread gthread/gthread-impl.c) target_compile_definitions(gthread PRIVATE G_LOG_DOMAIN="GThread") -target_link_libraries(gthread PRIVATE glib ${LIBINTL_LIBRARY}) -target_include_directories(gthread PRIVATE ${LIBINTL_INCLUDE_DIR}) +target_link_libraries(gthread PRIVATE glib ${Intl_LIBRARIES}) +target_include_directories(gthread PRIVATE ${Intl_INCLUDE_DIRS}) list(APPEND GLIB_TARGETS gthread) # gobject @@ -185,9 +181,9 @@ endif() # gmodule add_library(gmodule gmodule/gmodule.c) target_compile_definitions(gmodule PRIVATE G_LOG_DOMAIN="GModule") -target_link_libraries(gmodule PRIVATE glib ${LIBINTL_LIBRARY}) +target_link_libraries(gmodule PRIVATE glib ${Intl_LIBRARIES}) target_include_directories(gmodule PUBLIC $) -target_include_directories(gmodule PRIVATE ${LIBINTL_INCLUDE_DIR} PUBLIC $) +target_include_directories(gmodule PRIVATE ${Intl_INCLUDE_DIRS} PUBLIC $) list(APPEND GLIB_TARGETS gmodule) if(NOT GLIB_SKIP_HEADERS) install(FILES gmodule/gmodule.h DESTINATION include) @@ -254,7 +250,7 @@ if(NOT GLIB_SKIP_HEADERS) endif() add_library(gio ${GIO_SOURCES}) target_compile_definitions(gio PRIVATE GIO_COMPILATION G_LOG_DOMAIN="GLib-GIO") -target_link_libraries(gio PRIVATE glib gmodule gobject ZLIB::ZLIB ${LIBRESOLV_LIBRARY} ${LIBINTL_LIBRARY}) +target_link_libraries(gio PRIVATE glib gmodule gobject ZLIB::ZLIB ${LIBRESOLV_LIBRARY} ${Intl_LIBRARIES}) target_include_directories(gio PUBLIC $ $) if(WIN32) target_link_libraries(gio PRIVATE ws2_32 shlwapi dnsapi iphlpapi advapi32 shell32) @@ -280,9 +276,9 @@ endforeach() macro(add_glib_tool TOOL_NAME) add_executable(${TOOL_NAME} ${ARGN}) if(WIN32) - target_link_libraries(${TOOL_NAME} glib ${LIBINTL_LIBRARY} shell32) + target_link_libraries(${TOOL_NAME} glib ${Intl_LIBRARIES} shell32) else() - target_link_libraries(${TOOL_NAME} glib ${LIBINTL_LIBRARY}) + target_link_libraries(${TOOL_NAME} glib ${Intl_LIBRARIES}) endif() target_compile_definitions(${TOOL_NAME} PRIVATE GLIB_COMPILATION) list(APPEND GLIB_TOOLS ${TOOL_NAME}) @@ -290,7 +286,7 @@ endmacro() macro(add_gio_tool TOOL_NAME) add_executable(${TOOL_NAME} ${ARGN}) - target_link_libraries(${TOOL_NAME} PRIVATE glib gio gobject gmodule ${LIBINTL_LIBRARY}) + target_link_libraries(${TOOL_NAME} PRIVATE glib gio gobject gmodule ${Intl_LIBRARIES}) target_include_directories(${TOOL_NAME} PRIVATE gmodule gio) target_compile_definitions(${TOOL_NAME} PRIVATE GIO_COMPILATION) list(APPEND GLIB_TOOLS ${TOOL_NAME}) @@ -359,7 +355,7 @@ message(STATUS " " ${PCRE_LIBRARY}) message(STATUS " " ${ICONV_LIBRARY}) message(STATUS " " ${CHARSET_LIBRARY}) message(STATUS " " ${FFI_LIBRARY}) -message(STATUS " " ${LIBINTL_LIBRARY}) +message(STATUS " " ${Intl_LIBRARIES}) set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix ${CMAKE_INSTALL_PREFIX}) diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index 14c896e59454cf..8d74d5613b3244 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -1,5 +1,6 @@ Source: glib -Version: 2.52.3-14-7 +Version: 2.52.3 +Port-Version: 23 Homepage: https://developer.gnome.org/glib/ Description: Portable, general-purpose utility library. Build-Depends: zlib, pcre, libffi, gettext, libiconv diff --git a/ports/glib/cmake/unofficial-glib-config.in.cmake b/ports/glib/cmake/unofficial-glib-config.in.cmake index ea87ea0b230bca..6edc8348be7e34 100644 --- a/ports/glib/cmake/unofficial-glib-config.in.cmake +++ b/ports/glib/cmake/unofficial-glib-config.in.cmake @@ -1,5 +1,5 @@ include(CMakeFindDependencyMacro) -find_dependency(unofficial-iconv) +find_dependency(Iconv) if(NOT WIN32) find_dependency(Threads) endif() diff --git a/ports/glibmm/CMakeLists.txt b/ports/glibmm/CMakeLists.txt index 10839260a14628..15f7bff129075c 100644 --- a/ports/glibmm/CMakeLists.txt +++ b/ports/glibmm/CMakeLists.txt @@ -26,12 +26,9 @@ link_libraries( ${FFI_LIBRARY} ) -if(APPLE) - find_library(LIBINTL_LIBRARY NAMES intl) -endif() - -find_package(unofficial-iconv REQUIRED) -link_libraries(${LIBINTL_LIBRARY} unofficial::iconv::libiconv) +find_package(Intl REQUIRED) +find_package(Iconv REQUIRED) +link_libraries(${Intl_LIBRARIES} Iconv::Iconv) if(APPLE) find_library(COREFOUNDATION_LIBRARY CoreFoundation) diff --git a/ports/glibmm/CONTROL b/ports/glibmm/CONTROL index aefaf7b834a21b..59836db6f55517 100644 --- a/ports/glibmm/CONTROL +++ b/ports/glibmm/CONTROL @@ -1,5 +1,6 @@ Source: glibmm -Version: 2.52.1-11 +Version: 2.52.1 +Port-Version: 12 Description: This is glibmm, a C++ API for parts of glib that are useful for C++. Homepage: https://www.gtkmm.org. Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp diff --git a/ports/gmime/CMakeLists.txt b/ports/gmime/CMakeLists.txt index 51ea75cd3cd5fc..cefc0f22672444 100644 --- a/ports/gmime/CMakeLists.txt +++ b/ports/gmime/CMakeLists.txt @@ -7,7 +7,7 @@ set(GMIME_LIB_SUFFIX 3.0) find_package(zlib REQUIRED) find_package(unofficial-glib CONFIG REQUIRED) -find_package(unofficial-iconv REQUIRED) +find_package(Iconv REQUIRED) find_library(IDN_LIBRARY NAMES libidn2) @@ -45,7 +45,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES ) target_include_directories(${PROJECT_NAME} PRIVATE . ./util) -target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::iconv::libiconv ZLIB::ZLIB ${IDN_LIBRARY}) +target_link_libraries(${PROJECT_NAME} PRIVATE Iconv::Iconv ZLIB::ZLIB ${IDN_LIBRARY}) target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::glib::gobject unofficial::glib::gio unofficial::glib::glib) target_link_libraries(${PROJECT_NAME} PRIVATE Ws2_32.lib) diff --git a/ports/gmime/CONTROL b/ports/gmime/CONTROL index 70200731ce3af3..301f303e3f8bb7 100644 --- a/ports/gmime/CONTROL +++ b/ports/gmime/CONTROL @@ -1,5 +1,6 @@ Source: gmime Version: 3.2.6 +Port-Version: 1 Build-Depends: zlib, glib, libiconv, libidn2 Homepage: https://developer.gnome.org/gmime/ Description: GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME). diff --git a/ports/harfbuzz/glib-cmake.patch b/ports/harfbuzz/glib-cmake.patch index 519627ac710318..f982171206dad1 100644 --- a/ports/harfbuzz/glib-cmake.patch +++ b/ports/harfbuzz/glib-cmake.patch @@ -16,7 +16,7 @@ index 9b21bef2c..ae741ef63 100644 - - include_directories(${GLIBCONFIG_INCLUDE_DIR} ${GLIB_INCLUDE_DIR}) + find_package(Threads REQUIRED) -+ find_package(unofficial-iconv REQUIRED) ++ find_package(Iconv REQUIRED) + find_package(unofficial-glib CONFIG REQUIRED) list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-glib.h) @@ -24,7 +24,7 @@ index 9b21bef2c..ae741ef63 100644 - list(APPEND THIRD_PARTY_LIBS ${GLIB_LIBRARIES}) - - mark_as_advanced(GLIB_LIBRARIES GLIBCONFIG_INCLUDE_DIR GLIB_INCLUDE_DIR) -+ list(APPEND THIRD_PARTY_LIBS unofficial::glib::glib) ++ list(APPEND THIRD_PARTY_LIBS unofficial::glib::glib Iconv::Iconv) endif () if (HB_HAVE_ICU) diff --git a/ports/io2d/CONTROL b/ports/io2d/CONTROL index 5848cb75410116..59ff0c23cf183d 100644 --- a/ports/io2d/CONTROL +++ b/ports/io2d/CONTROL @@ -1,4 +1,5 @@ Source: io2d Version: 2020-09-14 +Port-Version: 1 Description: a lightweight, cross platform drawing library Build-Depends: cairo (!osx), cairo[x11] (linux), graphicsmagick (!osx) diff --git a/ports/io2d/Fix-FindCairo.patch b/ports/io2d/Fix-FindCairo.patch deleted file mode 100644 index e3caa2f7f64250..00000000000000 --- a/ports/io2d/Fix-FindCairo.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt -index d0e9176..2ac638c 100644 ---- a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt -+++ b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt -@@ -24,7 +24,9 @@ target_include_directories(io2d_cairo PUBLIC - - target_compile_features(io2d_cairo PUBLIC cxx_std_17) - --target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo unofficial::graphicsmagick::graphicsmagick) -+find_package(unofficial-cairo CONFIG REQUIRED) -+ -+target_link_libraries(io2d_cairo PUBLIC io2d_core unofficial::cairo::cairo unofficial::graphicsmagick::graphicsmagick) - - install( - TARGETS io2d_cairo EXPORT io2d_targets diff --git a/ports/io2d/cmake.dep.patch b/ports/io2d/cmake.dep.patch new file mode 100644 index 00000000000000..baad3634137cb8 --- /dev/null +++ b/ports/io2d/cmake.dep.patch @@ -0,0 +1,62 @@ +diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt +index 5ebeb6afa..702864667 100644 +--- a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt ++++ b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt +@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.8) + + project(io2d CXX) + +-find_package(Cairo REQUIRED) +-find_package(GraphicsMagick REQUIRED) ++find_package(unofficial-Cairo REQUIRED) ++find_package(unofficial-GraphicsMagick REQUIRED) + + add_library(io2d_cairo + cairo_renderer-graphicsmagickinit.cpp +@@ -24,7 +24,7 @@ target_include_directories(io2d_cairo PUBLIC + + target_compile_features(io2d_cairo PUBLIC cxx_std_17) + +-target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo GraphicsMagick::GraphicsMagick) ++target_link_libraries(io2d_cairo PUBLIC io2d_core unofficial::cairo::cairo unofficial::graphicsmagick::graphicsmagick) + + install( + TARGETS io2d_cairo EXPORT io2d_targets +diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt +index abb150113..75d8c654d 100644 +--- a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt ++++ b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt +@@ -27,15 +27,24 @@ if(MSVC) + target_compile_definitions(io2d_cairo_win32 PUBLIC -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS) + + find_library(PIXMAN_LIB pixman-1) +- find_library(FREETYPE_LIB freetype) +- find_library(FONTCONFIG_LIB fontconfig) +- find_library(BZ_LIB bz2) +- find_library(JPEG_LIB jpeg) +- find_library(TIFF_LIB tiff) +- find_library(EXPAT_LIB expat) +- find_library(LZMA_LIB lzma) +- find_library(ICONV_LIB libiconv) +- find_library(CHARSET_LIB libcharset) ++ find_package(FreeType REQUIRED) ++ set(FREETYPE_LIB ${FREETYPE_LIBRARIES}) # I dont use targets here since this means I have to correct the config.cmake too ++ find_package(Fontconfig REQUIRED) ++ set(FONTCONFIG_LIB ${Fontconfig_LIBRARIES}) ++ find_package(BZip2 REQUIRED) ++ set(BZ_LIB ${BZIP2_LIBRARIES}) ++ find_package(JPEG REQUIRED) ++ set(JPEG_LIB ${JPEG_LIBRARIES}) ++ find_package(TIFF REQUIRED) ++ set(TIFF_LIB ${TIFF_LIBRARIES}) ++ find_package(EXPAT REQUIRED) ++ set(EXPAT_LIB ${EXPAT_LIBRARIES}) ++ find_package(LibLZMA REQUIRED) ++ set(LZMA_LIB ${LIBLZMA_LIBRARIES}) ++ find_package(Iconv REQUIRED) ++ if(NOT Iconv_IS_BUILT_IN) ++ set(ICONV_LIB ${Iconv_LIBRARIES}) ++ endif() + + target_link_libraries(io2d_cairo_win32 PUBLIC ${PIXMAN_LIB} ${FREETYPE_LIB} ${FONTCONFIG_LIB} ${BZ_LIB} ${JPEG_LIB} ${TIFF_LIB} ${EXPAT_LIB} ${LZMA_LIB} ${ICONV_LIB} ${CHARSET_LIB}) + endif() diff --git a/ports/io2d/fix-expat.patch b/ports/io2d/fix-expat.patch deleted file mode 100644 index 25d38bb10507f8..00000000000000 --- a/ports/io2d/fix-expat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt -index abb1501..412f3d4 100644 ---- a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt -+++ b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt -@@ -32,7 +32,7 @@ if(MSVC) - find_library(BZ_LIB bz2) - find_library(JPEG_LIB jpeg) - find_library(TIFF_LIB tiff) -- find_library(EXPAT_LIB expat) -+ find_library(EXPAT_LIB libexpat) - find_library(LZMA_LIB lzma) - find_library(ICONV_LIB libiconv) - find_library(CHARSET_LIB libcharset) diff --git a/ports/io2d/fix-linux-build.patch b/ports/io2d/fix-linux-build.patch deleted file mode 100644 index be038fab41be04..00000000000000 --- a/ports/io2d/fix-linux-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt -index 5ebeb6a..d0e9176 100644 ---- a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt -+++ b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt -@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.8) - project(io2d CXX) - - find_package(Cairo REQUIRED) --find_package(GraphicsMagick REQUIRED) -+find_package(unofficial-graphicsmagick REQUIRED) - - add_library(io2d_cairo - cairo_renderer-graphicsmagickinit.cpp -@@ -24,7 +24,7 @@ target_include_directories(io2d_cairo PUBLIC - - target_compile_features(io2d_cairo PUBLIC cxx_std_17) - --target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo GraphicsMagick::GraphicsMagick) -+target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo unofficial::graphicsmagick::graphicsmagick) - - install( - TARGETS io2d_cairo EXPORT io2d_targets diff --git a/ports/io2d/portfile.cmake b/ports/io2d/portfile.cmake index ad36dd70ea7d4d..d47fc97c854164 100644 --- a/ports/io2d/portfile.cmake +++ b/ports/io2d/portfile.cmake @@ -7,9 +7,7 @@ vcpkg_from_github( SHA512 f8e5a708f6cbda913a0492a843e1502b8d3cc615a6abda50e850be944e1484ec9087b787c54cc25d513172a7d5ab789be41a761c97df94266df4d1bcf14db17c HEAD_REF master PATCHES - fix-linux-build.patch - Fix-FindCairo.patch - fix-expat.patch + cmake.dep.patch ) if (VCPKG_TARGET_IS_OSX) diff --git a/ports/libcroco/CMakeLists.txt b/ports/libcroco/CMakeLists.txt index ff11792ff669ef..f8e8a71058eb68 100644 --- a/ports/libcroco/CMakeLists.txt +++ b/ports/libcroco/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.11) project(libcroco C) -find_package(unofficial-iconv REQUIRED) -find_package(unofficial-gettext CONFIG REQUIRED) +find_package(Iconv REQUIRED) +find_package(Intl REQUIRED) find_package(unofficial-glib CONFIG REQUIRED) find_package(LibXml2 REQUIRED) if(NOT WIN32) @@ -76,7 +76,7 @@ target_link_libraries(croco-0.6 PRIVATE unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject - ${LIBXML2_LIBRARIES} + ${LIBXML2_LIBRARIES} ${Intl_LIBRARIES} Iconv::Iconv ) install(TARGETS croco-0.6 @@ -127,8 +127,8 @@ install( file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libcroco-config.cmake " include(CMakeFindDependencyMacro) -find_dependency(unofficial-gettext) -find_dependency(unofficial-iconv CONFIG) +find_dependency(Intl) +find_dependency(Iconv) find_dependency(unofficial-glib CONFIG) find_dependency(LibXml2) if(NOT WIN32) diff --git a/ports/libcroco/CONTROL b/ports/libcroco/CONTROL index 8badbeccc1944b..bb1ea8fd29376b 100644 --- a/ports/libcroco/CONTROL +++ b/ports/libcroco/CONTROL @@ -1,4 +1,5 @@ Source: libcroco -Version: 0.6.13-1 +Version: 0.6.13 +Port-Version: 2 Description: A standalone css2 parsing and manipulation library Build-Depends: glib, libxml2 diff --git a/ports/libiconv/CMakeLists.txt b/ports/libiconv/CMakeLists.txt deleted file mode 100644 index 43d55c0c39fa0a..00000000000000 --- a/ports/libiconv/CMakeLists.txt +++ /dev/null @@ -1,107 +0,0 @@ -cmake_minimum_required(VERSION 3.0.0) -project(libiconv C) - -if(BUILD_SHARED_LIBS) - set(LIBICONV_DYNAMIC "1 /*LIBICONV_DYNAMIC*/") -else() - set(LIBICONV_DYNAMIC "0 /*LIBICONV_DYNAMIC*/") -endif() - -set(CMAKE_STATIC_LIBRARY_PREFIX) -set(CMAKE_SHARED_LIBRARY_PREFIX) - -if(WIN32) - set(HAVE_WCHAR_T "1 /*HAVE_WCHAR_T*/") - set(USE_MBSTATE_T "0 /*USE_MBSTATE_T*/") - set(BROKEN_WCHAR_H "0 /*BROKEN_WCHAR_H*/") - set(HAVE_VISIBILITY "0 /*HAVE_VISIBILITY*/") - set(ICONV_CONST "") - - configure_file(config.h.in config.h) - file(READ "${CMAKE_CURRENT_BINARY_DIR}/config.h" _contents) - string(REPLACE "#undef HAVE_WORKING_O_NOFOLLOW" "#define HAVE_WORKING_O_NOFOLLOW 0" _contents "${_contents}") - string(REPLACE "#undef HAVE_MBRTOWC" "#define HAVE_MBRTOWC 1" _contents "${_contents}") - string(REPLACE "#undef HAVE_MBSINIT" "#define HAVE_MBSINIT 1" _contents "${_contents}") - string(REPLACE "#undef HAVE_WCRTOMB" "#define HAVE_WCRTOMB 1" _contents "${_contents}") - string(REPLACE "#undef ICONV_CONST" "#define ICONV_CONST ${ICONV_CONST}" _contents "${_contents}") - string(REPLACE "#undef EILSEQ" "" _contents "${_contents}") - string(REPLACE "#undef WORDS_LITTLEENDIAN" "#define WORDS_LITTLEENDIAN 1" _contents "${_contents}") - string(REPLACE "#undef ENABLE_RELOCATABLE" "#define ENABLE_RELOCATABLE 1" _contents "${_contents}") - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.h" "${_contents}") - - configure_file(libcharset/include/localcharset.h.build.in localcharset.h) - configure_file(libcharset/include/libcharset.h.in libcharset.h) - configure_file(include/iconv.h.build.in iconv.h) - - if(MSVC) - add_compile_options(/wd4018) - endif() - - add_definitions( - -D_CRT_SECURE_NO_WARNINGS - -DLIBDIR=${LIBDIR} - -DINSTALLDIR=${INSTALLDIR} - -DNO_XMALLOC=1 - -DENABLE_RELOCATABLE=1 - -DIN_LIBRARY=1 - ) - if(BUILD_SHARED_LIBS) - add_definitions( - -DBUILDING_LIBCHARSET=1 - -DBUILDING_LIBICONV=1 - -DBUILDING_DLL=1) - endif() -else() - if(BUILD_SHARED_LIBS) - set(STATIC_SHARED --enable-shared --disable-static) - else() - set(STATIC_SHARED --disable-shared --enable-static) - endif() - - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/autoconf) - - execute_process( - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/configure --enable-relocatable ${STATIC_SHARED} --without-libiconv-prefix --without-libintl-prefix - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/autoconf - ) - - configure_file(${CMAKE_CURRENT_BINARY_DIR}/autoconf/lib/config.h config.h @ONLY) - configure_file(${CMAKE_CURRENT_BINARY_DIR}/autoconf/include/iconv.h iconv.h @ONLY) - configure_file(${CMAKE_CURRENT_BINARY_DIR}/autoconf/libcharset/include/localcharset.h localcharset.h @ONLY) -endif() - -include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) - -add_library(libcharset libcharset/lib/localcharset.c libcharset/lib/relocatable-stub.c) -target_include_directories(libcharset PUBLIC $) - -add_library(libiconv lib/iconv.c lib/relocatable.c) -if(WIN32) - target_compile_definitions(libiconv PRIVATE - -Dset_relocation_prefix=libiconv_set_relocation_prefix - -Drelocate=libiconv_relocate -Drelocate2=libiconv_relocate2 - ) -endif() -target_link_libraries(libiconv PRIVATE libcharset) -target_include_directories(libiconv PUBLIC $) - -install(TARGETS libcharset libiconv EXPORT unofficial-iconv-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -if(NOT DISABLE_INSTALL_HEADERS) - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/iconv.h - ${CMAKE_CURRENT_BINARY_DIR}/localcharset.h - DESTINATION include - ) -endif() - -install( - EXPORT unofficial-iconv-targets - FILE unofficial-iconv-config.cmake - NAMESPACE unofficial::iconv:: - DESTINATION share/unofficial-iconv -) diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index e95414202ecfbb..329b3ebc17819d 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,5 +1,5 @@ Source: libiconv Version: 1.16 -Port-Version: 5 +Port-Version: 6 Homepage: https://www.gnu.org/software/libiconv/ Description: GNU Unicode text conversion diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 934e2f7b0e1fac..62fb8e42d89b45 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -1,7 +1,7 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/unofficial-iconv) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-iconv-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-iconv) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/Iconv) + file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv) return() endif() @@ -21,24 +21,25 @@ vcpkg_extract_source_archive_ex( 0003-Add-export.patch ) -#Since libiconv uses automake, make and configure, we use a custom CMake file -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DINSTALLDIR=\"\" -DLIBDIR=\"\" - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -) - -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-iconv TARGET_PATH share/unofficial-iconv) +vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH} + DETERMINE_BUILD_TRIPLET + USE_WRAPPERS + OPTIONS + --enable-relocatable + --enable-extra-encodings + --without-libiconv-prefix + --without-libintl-prefix + ${OPTIONS} + ) +vcpkg_install_make() vcpkg_copy_pdbs() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/Iconv) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv) file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) \ No newline at end of file diff --git a/ports/libiconv/unofficial-iconv-config.cmake b/ports/libiconv/unofficial-iconv-config.cmake deleted file mode 100644 index 94d65d2ff910e8..00000000000000 --- a/ports/libiconv/unofficial-iconv-config.cmake +++ /dev/null @@ -1,8 +0,0 @@ -if (NOT TARGET unofficial::iconv::libiconv) - add_library(unofficial::iconv::libcharset INTERFACE IMPORTED) - add_library(unofficial::iconv::libiconv INTERFACE IMPORTED) - if(APPLE) - set_property(TARGET unofficial::iconv::libcharset PROPERTY INTERFACE_LINK_LIBRARIES "charset;unofficial::iconv::libiconv") - set_property(TARGET unofficial::iconv::libiconv PROPERTY INTERFACE_LINK_LIBRARIES "iconv") - endif() -endif() diff --git a/ports/libiconv/vcpkg-cmake-wrapper.cmake b/ports/libiconv/vcpkg-cmake-wrapper.cmake index 472dd8082db8af..db39413da1f899 100644 --- a/ports/libiconv/vcpkg-cmake-wrapper.cmake +++ b/ports/libiconv/vcpkg-cmake-wrapper.cmake @@ -1,10 +1,15 @@ include(SelectLibraryConfigurations) _find_package(${ARGS}) -if(Iconv_FOUND) +if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN) find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib) select_library_configurations(CHARSET) - list(APPEND Iconv_LIBRARIES ${CHARSET_LIBRARIES}) + if(CHARSET_LIBRARIES) + list(APPEND Iconv_LIBRARIES ${CHARSET_LIBRARIES}) + if(TARGET Iconv::Iconv) + target_link_libraries(Iconv::Iconv INTERFACE ${CHARSET_LIBRARIES}) + endif() + endif() endif() diff --git a/ports/libidn2/CMakeLists.txt b/ports/libidn2/CMakeLists.txt index d7a5d771ee5835..cd87848f38816b 100644 --- a/ports/libidn2/CMakeLists.txt +++ b/ports/libidn2/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.8) project(libidn2 C) -find_package(unofficial-iconv REQUIRED) +find_package(Iconv REQUIRED) if(MSVC) add_definitions(-D_CRT_SECURE_NO_DEPRECATE) @@ -91,7 +91,7 @@ set(GL_SRC gl/rawmemchr.c add_library(libidn2 ${LIB_SRC} ${UNISTR_SRC} ${GL_SRC}) target_include_directories(libidn2 PRIVATE . ./unistring ./gl) -target_link_libraries(libidn2 PRIVATE unofficial::iconv::libiconv unofficial::iconv::libcharset) +target_link_libraries(libidn2 PRIVATE Iconv::Iconv) install(TARGETS libidn2 RUNTIME DESTINATION bin diff --git a/ports/libidn2/CONTROL b/ports/libidn2/CONTROL index f5fa6b075a333c..fb29df0323f37c 100644 --- a/ports/libidn2/CONTROL +++ b/ports/libidn2/CONTROL @@ -1,6 +1,6 @@ Source: libidn2 Version: 2.3.0 -Port-Version: 0 +Port-Version: 1 Build-Depends: libiconv Homepage: https://www.gnu.org/software/libidn/ Description: GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names. diff --git a/ports/libspatialite/CONTROL b/ports/libspatialite/CONTROL index 364bd887c6ec0c..38b4041f1e6eb4 100644 --- a/ports/libspatialite/CONTROL +++ b/ports/libspatialite/CONTROL @@ -1,6 +1,6 @@ Source: libspatialite Version: 4.3.0a -Port-Version: 5 +Port-Version: 6 Homepage: https://www.gaia-gis.it/gaia-sins/libspatialite-sources Description: SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities. Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index b5c818ae03e265..9f1f3d6bd11e2a 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -37,8 +37,8 @@ if (VCPKG_TARGET_IS_WINDOWS) endif() set(LIBS_ALL_DBG - "${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib \ - ${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib \ + "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib \ + ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib \ ${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \ ${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib \ ${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \ @@ -47,8 +47,8 @@ if (VCPKG_TARGET_IS_WINDOWS) ${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib" ) set(LIBS_ALL_REL - "${CURRENT_INSTALLED_DIR}/lib/libiconv.lib \ - ${CURRENT_INSTALLED_DIR}/lib/libcharset.lib \ + "${CURRENT_INSTALLED_DIR}/lib/iconv.lib \ + ${CURRENT_INSTALLED_DIR}/lib/charset.lib \ ${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \ ${CURRENT_INSTALLED_DIR}/lib/freexl.lib \ ${CURRENT_INSTALLED_DIR}/lib/zlib.lib \ diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL index 47ef4184589ba2..707cf8a4389129 100644 --- a/ports/libtorrent/CONTROL +++ b/ports/libtorrent/CONTROL @@ -1,6 +1,6 @@ Source: libtorrent Version: 1.2.10 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/arvidn/libtorrent Description: An efficient feature complete C++ BitTorrent implementation Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config, boost-iterator, boost-scope-exit, boost-multiprecision, boost-pool, boost-variant diff --git a/ports/libtorrent/fix_find_iconv.patch b/ports/libtorrent/fix_find_iconv.patch deleted file mode 100644 index 2c22c15e0a26f7..00000000000000 --- a/ports/libtorrent/fix_find_iconv.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9efd451fb..d85b31fd4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -643,24 +643,19 @@ target_optional_compile_definitions(torrent-rasterbar PUBLIC FEATURE NAME mutabl - target_optional_compile_definitions(torrent-rasterbar PUBLIC FEATURE NAME streaming DEFAULT ON - DESCRIPTION "Enables support for piece deadline" DISABLED TORRENT_DISABLE_STREAMING) - --find_public_dependency(Iconv) --if(MSVC) -- set(iconv_package_type OPTIONAL) --else() -- set(iconv_package_type RECOMMENDED) --endif() -+find_public_dependency(unofficial-iconv REQUIRED) - --set_package_properties(Iconv -+set_package_properties(unofficial-iconv - PROPERTIES - URL "https://www.gnu.org/software/libiconv/" -- DESCRIPTION "GNU encoding conversion library" -- TYPE ${iconv_package_type} -+ DESCRIPTION "GNU encoding conversion library (unofficial vcpkg CMake port)" -+ TYPE REQUIRED - PURPOSE "Convert strings between various encodings" - ) - --if(Iconv_FOUND) -+if(unofficial-iconv_FOUND) - target_compile_definitions(torrent-rasterbar PUBLIC TORRENT_USE_ICONV) -- target_link_libraries(torrent-rasterbar PRIVATE Iconv::Iconv) -+ target_link_libraries(torrent-rasterbar PRIVATE unofficial::iconv::libiconv unofficial::iconv::libcharset) - endif() - - find_public_dependency(OpenSSL) diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index 54d40d63dece28..e548b9b44187d5 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -6,9 +6,7 @@ if(VCPKG_TARGET_IS_WINDOWS) message(FATAL_ERROR "The python feature is currently broken on Windows") endif() - if("iconv" IN_LIST FEATURES) - set(ICONV_PATCH "fix_find_iconv.patch") - else() + if(NOT "iconv" IN_LIST FEATURES) # prevent picking up libiconv if it happens to already be installed set(ICONV_PATCH "no_use_iconv.patch") endif() diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt index a7118bec923db0..323f64c34eb60d 100644 --- a/ports/libxml2/CMakeLists.txt +++ b/ports/libxml2/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_STATIC_LIBRARY_PREFIX) find_package(ZLIB REQUIRED) find_package(LibLZMA REQUIRED) -find_package(unofficial-iconv REQUIRED) +find_package(Iconv REQUIRED) file(GLOB SOURCES *.c) list(FILTER SOURCES EXCLUDE REGEX "/(run|test|trio)[^/]*$") @@ -109,7 +109,7 @@ if(INSTALL_HEADERS) endif() target_include_directories(libxml2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/include include ${LIBLZMA_INCLUDE_DIRS}) target_link_libraries(libxml2 PRIVATE - unofficial::iconv::libcharset unofficial::iconv::libiconv + Iconv::Iconv ZLIB::ZLIB ${LIBLZMA_LIBRARIES} ) diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake index 94ef458031f311..405b94670762ea 100644 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -14,10 +14,17 @@ if(LibXml2_FOUND) list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES}) if(CMAKE_SYSTEM_NAME STREQUAL "Linux") list(APPEND LIBXML2_LIBRARIES m) - else() - list(APPEND LIBXML2_LIBRARIES ${ICONV_LIBRARIES} ${CHARSET_LIBRARIES}) + endif() + if(ICONV_LIBRARIES) + list(APPEND LIBXML2_LIBRARIES ${ICONV_LIBRARIES}) + if(TARGET LibXml2::LibXml2) + target_link_libraries(LibXml2::LibXml2 INTERFACE ${ICONV_LIBRARIES} ) + endif() + endif() + if(CHARSET_LIBRARIES) + list(APPEND LIBXML2_LIBRARIES ${CHARSET_LIBRARIES}) if(TARGET LibXml2::LibXml2) - target_link_libraries(LibXml2::LibXml2 INTERFACE ${ICONV_LIBRARIES} ${CHARSET_LIBRARIES}) + target_link_libraries(LibXml2::LibXml2 INTERFACE ${CHARSET_LIBRARIES}) endif() endif() if(CMAKE_SYSTEM_NAME STREQUAL "Windows") diff --git a/ports/libxmlpp/CMakeLists.txt b/ports/libxmlpp/CMakeLists.txt index bbaae7cda22486..0ff2f23fe77b99 100644 --- a/ports/libxmlpp/CMakeLists.txt +++ b/ports/libxmlpp/CMakeLists.txt @@ -21,8 +21,8 @@ if(APPLE) find_library(LIBINTL_LIBRARY NAMES intl) endif() -find_package(unofficial-iconv REQUIRED) -link_libraries(${LIBINTL_LIBRARY} unofficial::iconv::libiconv) +find_package(Iconv REQUIRED) +link_libraries(${LIBINTL_LIBRARY} Iconv::Iconv) if(APPLE) find_library(COREFOUNDATION_LIBRARY CoreFoundation) diff --git a/ports/libxmlpp/CONTROL b/ports/libxmlpp/CONTROL index 247704f9f20642..b737bde3c9ecfa 100644 --- a/ports/libxmlpp/CONTROL +++ b/ports/libxmlpp/CONTROL @@ -1,4 +1,5 @@ Source: libxmlpp -Version: 2.40.1-5 +Version: 2.40.1 +Port-Version: 6 Description: a C++ wrapper for the libxml XML parser library. Build-Depends: libxml2, glibmm diff --git a/ports/libxslt/0001-Fix-makefile.patch b/ports/libxslt/0001-Fix-makefile.patch index 8648a3fe589c69..4d835e103f707f 100644 --- a/ports/libxslt/0001-Fix-makefile.patch +++ b/ports/libxslt/0001-Fix-makefile.patch @@ -12,7 +12,7 @@ index 23a02d2..b13dd26 100644 LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) -LIBS = wsock32.lib +# The libraries are needed for static builds (the makefile builds all tools and dlls) -+LIBS = wsock32.lib libiconv.lib libcharset.lib ++LIBS = wsock32.lib iconv.lib charset.lib +!if "$(DEBUG)" == "1" +LIBS = $(LIBS) zlibd.lib +!else diff --git a/ports/libxslt/0002-Fix-lzma.patch b/ports/libxslt/0002-Fix-lzma.patch index 8c0e287ae64576..fb52844cac93c2 100644 --- a/ports/libxslt/0002-Fix-lzma.patch +++ b/ports/libxslt/0002-Fix-lzma.patch @@ -4,7 +4,7 @@ index 0d1953d..0e538ef 100644 +++ b/win32/Makefile.msvc @@ -62,9 +62,9 @@ LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) # The libraries are needed for static builds (the makefile builds all tools and dlls) - LIBS = wsock32.lib libiconv.lib libcharset.lib + LIBS = wsock32.lib iconv.lib charset.lib !if "$(DEBUG)" == "1" -LIBS = $(LIBS) zlibd.lib +LIBS = $(LIBS) zlibd.lib lzmad.lib diff --git a/ports/libxslt/CONTROL b/ports/libxslt/CONTROL index 1e00a1e65a3e2c..27f8c16f448566 100644 --- a/ports/libxslt/CONTROL +++ b/ports/libxslt/CONTROL @@ -1,6 +1,6 @@ Source: libxslt -Version: 1.1.33-7 -Port-Version: 2 +Version: 1.1.33 +Port-Version: 8 Homepage: https://github.com/GNOME/libxslt Description: Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT Build-Depends: libxml2, liblzma diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index a63ea9b47aa0d6..241d89f52b09b4 100644 --- a/ports/osg/CONTROL +++ b/ports/osg/CONTROL @@ -1,6 +1,6 @@ Source: osg Version: 3.6.5 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/openscenegraph/OpenSceneGraph Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit. Build-Depends: zlib, fontconfig, boost-asio (!windows), boost-core (!windows), boost-logic (!windows), boost-lexical-cast (!windows), boost-smart-ptr (!windows), boost-tuple (!windows), boost-bind (!windows), freeglut (windows), expat (windows), openimageio (osx) diff --git a/ports/osg/fix-example-application.patch b/ports/osg/fix-example-application.patch index 4745f8b413c9b2..3b4da587dd7656 100644 --- a/ports/osg/fix-example-application.patch +++ b/ports/osg/fix-example-application.patch @@ -8,9 +8,9 @@ index df859d0..123313a 100644 SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32) + + find_package(EXPAT REQUIRED) -+ find_package(unofficial-iconv CONFIG REQUIRED) ++ find_package(Iconv CONFIG REQUIRED) + -+ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT unofficial::iconv::libiconv unofficial::iconv::libcharset) ++ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) ELSE() CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" LIB_NSL_HAS_GETHOSTBYNAME) IF(LIB_NSL_HAS_GETHOSTBYNAME) @@ -24,9 +24,9 @@ index 071ab26..bf8d85f 100644 +IF (WIN32) + find_package(EXPAT REQUIRED) -+ find_package(unofficial-iconv CONFIG REQUIRED) ++ find_package(Iconv CONFIG REQUIRED) + -+ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT unofficial::iconv::libiconv unofficial::iconv::libcharset) ++ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) +ENDIF() + SET(TARGET_SRC osgstaticviewer.cpp ) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 969290a7b30d4c..10a7d54290ab3d 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,5 +1,6 @@ Source: qt5-base Version: 5.15.1 +Port-Version: 1 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, zstd, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 31c059bba8fe7d..0e7929a0811013 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -244,14 +244,14 @@ elseif(VCPKG_TARGET_IS_LINUX) "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE} ${FREETYPE_RELEASE_ALL} ${GLIB_RELEASE} -lpthread" "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" - "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE}" + "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE} -luuid" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_TYPES_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG} ${FREETYPE_DEBUG_ALL} ${GLIB_DEBUG} -lpthread" "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" - "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG}" + "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG} -luuid" ) elseif(VCPKG_TARGET_IS_OSX) list(APPEND CORE_OPTIONS -fontconfig) diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL index 7ef2a3284a6a0d..fbbad4d411d3ee 100644 --- a/ports/spatialite-tools/CONTROL +++ b/ports/spatialite-tools/CONTROL @@ -1,6 +1,6 @@ Source: spatialite-tools Version: 4.3.0 -Port-Version: 4 +Port-Version: 5 Homepage: https://www.gaia-gis.it/fossil/spatialite-tools/index Description: Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries) Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat diff --git a/ports/spatialite-tools/portfile.cmake b/ports/spatialite-tools/portfile.cmake index eacba0c367fad0..540e29b1844ca2 100644 --- a/ports/spatialite-tools/portfile.cmake +++ b/ports/spatialite-tools/portfile.cmake @@ -26,8 +26,8 @@ if(VCPKG_CRT_LINKAGE STREQUAL dynamic) set(LIBXML2_LIBS_DBG "${LDIR}/debug/lib/libxml2.lib") set(SPATIALITE_LIBS_REL "${LDIR}/lib/spatialite.lib") set(SPATIALITE_LIBS_DBG "${LDIR}/debug/lib/spatialite.lib") - set(ICONV_LIBS_REL "${LDIR}/lib/libiconv.lib") - set(ICONV_LIBS_DBG "${LDIR}/debug/lib/libiconv.lib") + set(ICONV_LIBS_REL "${LDIR}/lib/iconv.lib") + set(ICONV_LIBS_DBG "${LDIR}/debug/lib/iconv.lib") set(EXPAT_LIBS_REL "${LDIR}/lib/libexpat.lib") set(EXPAT_LIBS_DBG "${LDIR}/debug/lib/libexpatd.lib") else() @@ -39,8 +39,8 @@ else() set(LIBXML2_LIBS_DBG "${LDIR}/debug/lib/libxml2.lib ${LDIR}/debug/lib/lzmad.lib ws2_32.lib") set(SPATIALITE_LIBS_REL "${LDIR}/lib/spatialite.lib ${LDIR}/lib/freexl.lib") set(SPATIALITE_LIBS_DBG "${LDIR}/debug/lib/spatialite.lib ${LDIR}/debug/lib/freexl.lib") - set(ICONV_LIBS_REL "${LDIR}/lib/libiconv.lib ${LDIR}/lib/libcharset.lib") - set(ICONV_LIBS_DBG "${LDIR}/debug/lib/libiconv.lib ${LDIR}/debug/lib/libcharset.lib ") + set(ICONV_LIBS_REL "${LDIR}/lib/iconv.lib ${LDIR}/lib/charset.lib") + set(ICONV_LIBS_DBG "${LDIR}/debug/lib/iconv.lib ${LDIR}/debug/lib/charset.lib ") set(EXPAT_LIBS_REL "${LDIR}/lib/libexpatMD.lib") set(EXPAT_LIBS_DBG "${LDIR}/debug/lib/libexpatdMD.lib") endif() diff --git a/ports/tesseract/CONTROL b/ports/tesseract/CONTROL index 7f646fdaf66a66..0524821bf212f3 100644 --- a/ports/tesseract/CONTROL +++ b/ports/tesseract/CONTROL @@ -1,6 +1,6 @@ Source: tesseract Version: 4.1.1 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/tesseract-ocr/tesseract Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google. Build-Depends: leptonica diff --git a/ports/tesseract/fix-text2image.patch b/ports/tesseract/fix-text2image.patch index 8a9c6caf49b343..e9623f4ac9645d 100644 --- a/ports/tesseract/fix-text2image.patch +++ b/ports/tesseract/fix-text2image.patch @@ -35,8 +35,8 @@ index 8fd96a9..186341e 100644 -pkg_check_modules(FontConfig REQUIRED fontconfig) +find_package(unofficial-cairo CONFIG REQUIRED) +find_package(unofficial-glib CONFIG REQUIRED) -+find_package(unofficial-gettext CONFIG REQUIRED) -+find_package(unofficial-fontconfig CONFIG REQUIRED) ++find_package(Intl CONFIG REQUIRED) ++find_package(Fontconfig REQUIRED) +find_package(Freetype REQUIRED) +if(UNIX OR BUILD_SHARED_LIBS) + find_package(harfbuzz CONFIG REQUIRED) @@ -76,8 +76,8 @@ index 8fd96a9..186341e 100644 + Freetype::Freetype + unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject + unofficial::cairo::cairo unofficial::cairo::cairo-gobject -+ unofficial::gettext::libintl -+ unofficial::fontconfig::fontconfig ++ ${Intl_LIBRARIES} ++ Fontconfig::Fontconfig +) +else() + target_link_libraries (text2image @@ -89,8 +89,8 @@ index 8fd96a9..186341e 100644 + Freetype::Freetype + unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject + unofficial::cairo::cairo unofficial::cairo::cairo-gobject -+ unofficial::gettext::libintl -+ unofficial::fontconfig::fontconfig ++ ${Intl_LIBRARIES} ++ Fontconfig::Fontconfig + ) endif() if (CPPAN_BUILD) diff --git a/ports/xmlsec/CMakeLists.txt b/ports/xmlsec/CMakeLists.txt index 4805839feadb18..54f04475194236 100644 --- a/ports/xmlsec/CMakeLists.txt +++ b/ports/xmlsec/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_STATIC_LIBRARY_PREFIX) find_package(LibXml2 REQUIRED) find_package(OpenSSL REQUIRED) -find_package(unofficial-iconv REQUIRED) +find_package(Iconv REQUIRED) FILE(GLOB SOURCESXMLSEC src/*.c @@ -139,9 +139,12 @@ if(INSTALL_HEADERS_TOOLS) endif() target_link_libraries(xmlsec PRIVATE - ${LIBXML2_LIBRARIES} OpenSSL::SSL libxmlsec libxmlsec-openssl unofficial::iconv::libiconv + ${LIBXML2_LIBRARIES} OpenSSL::SSL libxmlsec libxmlsec-openssl ) - + if(NOT Iconv_IS_BUILT_IN) + target_link_libraries(xmlsec PRIVATE Iconv::Iconv) + endif() + target_compile_definitions(xmlsec PRIVATE -DXMLSEC_CRYPTO_OPENSSL ) diff --git a/ports/xmlsec/CONTROL b/ports/xmlsec/CONTROL index 1f3750e5328e26..e4437a14d26467 100644 --- a/ports/xmlsec/CONTROL +++ b/ports/xmlsec/CONTROL @@ -1,5 +1,6 @@ Source: xmlsec Version: 1.2.30 +Port-Version: 1 Homepage: https://www.aleksey.com/xmlsec/ Description: XML Security Library is a C library based on LibXML2. The library supports major XML security standards. Build-Depends: libxml2, openssl diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index b502eab6a356bb..49271eeb62066a 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -183,7 +183,27 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) msys_package( URL "https://repo.msys2.org/msys/x86_64/libtool-2.4.6-9-x86_64.pkg.tar.xz" SHA512 b309799e5a9d248ef66eaf11a0bd21bf4e8b9bd5c677c627ec83fa760ce9f0b54ddf1b62cbb436e641fbbde71e3b61cb71ff541d866f8ca7717a3a0dbeb00ebf - DEPS grep sed coreutils + DEPS grep sed coreutils file + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/file-5.39-1-x86_64.pkg.tar.zst" + SHA512 be51dd0f6143a2f34f2a3e7d412866eb12511f25daaf3a5478240537733a67d7797a3a55a8893e5638589c06bca5af20aed5ded7db0bf19fbf52b30fae08cadd + DEPS gcc-libs zlib libbz2 + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/zlib-1.2.11-1-x86_64.pkg.tar.xz" + SHA512 b607da40d3388b440f2a09e154f21966cd55ad77e02d47805f78a9dee5de40226225bf0b8335fdfd4b83f25ead3098e9cb974d4f202f28827f8468e30e3b790d + DEPS gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/bzip2-1.0.8-2-x86_64.pkg.tar.xz" + SHA512 336f5b59eb9cf4e93b537a212509d84f72cd9b8a97bf8ac0596eff298f3c0979bdea6c605244d5913670b9d20b017e5ee327f1e606f546a88e177a03c589a636 + DEPS gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-2-x86_64.pkg.tar.xz" + SHA512 d128bd1792d0f5750e6a63a24db86a791e7ee457db8c0bef68d217099be4a6eef27c85caf6ad09b0bcd5b3cdac6fc0a2b9842cc58d381a4035505906cc4803ec + DEPS gcc-libs ) msys_package( URL "https://repo.msys2.org/msys/x86_64/coreutils-8.32-1-x86_64.pkg.tar.xz" @@ -229,6 +249,15 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) URL "https://repo.msys2.org/msys/x86_64/gmp-6.2.0-1-x86_64.pkg.tar.xz" SHA512 1389a443e775bb255d905665dd577bef7ed71d51a8c24d118097f8119c08c4dfe67505e88ddd1e9a3764dd1d50ed8b84fa34abefa797d257e90586f0cbf54de8 ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/xz-5.2.5-1-x86_64.pkg.tar.xz" # this seems to require immediate updating on version bumps. + SHA512 99d092c3398277e47586cead103b41e023e9432911fb7bdeafb967b826f6a57d32e58afc94c8230dad5b5ec2aef4f10d61362a6d9e410a6645cf23f076736bba + DEPS liblzma libiconv gettext + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/liblzma-5.2.5-1-x86_64.pkg.tar.xz" + SHA512 8d5c04354fdc7309e73abce679a4369c0be3dc342de51cef9d2a932b7df6a961c8cb1f7e373b1b8b2be40343a95fbd57ac29ebef63d4a2074be1d865e28ca6ad + ) msys_package( URL "https://repo.msys2.org/msys/x86_64/libreadline-8.0.004-1-x86_64.pkg.tar.xz" SHA512 42760bddedccc8d93507c1e3a7a81595dc6392b5e4319d24a85275eb04c30eb79078e4247eb2cdd00ff3884d932639130c89bf1b559310a17fa4858062491f97 @@ -269,6 +298,11 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) SHA512 7306dec7859edc27d70a24ab4b396728481484a426c5aa2f7e9fed2635b3b25548b05b7d37a161a86a8edaa5922948bee8c99b1e8a078606e69ca48a433fe321 DEPS libintl msys2-runtime ) +msys_package( + URL "https://repo.msys2.org/msys/x86_64/gettext-devel-0.19.8.1-1-x86_64.pkg.tar.xz" + SHA512 648f74c23e4f92145cdd0d45ff5285c2df34e855a9e75e5463dd6646967f8cf34a18ce357c6f498a4680e6d7b84e2d1697ba9deee84da8ea6bb14bbdb594ee22 + DEPS gettext + ) msys_package( URL "https://repo.msys2.org/msys/x86_64/gettext-0.19.8.1-1-x86_64.pkg.tar.xz" SHA512 c8c42d084c297746548963f7ec7a7df46241886f3e637e779811ee4a8fee6058f892082bb2658f6777cbffba2de4bcdfd68e846ba63c6a6552c9efb0c8c1de50 @@ -284,6 +318,11 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) SHA512 a2e8027b9bbee20f8cf60851130ca2af436641b1fb66054f8deba118da7ebecb1cd188224dcf08e4c5b7cde85b412efab058afef2358e843c9de8eb128ca448c DEPS gcc-libs ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/findutils-4.7.0-1-x86_64.pkg.tar.xz" + SHA512 fd09a24562b196ff252f4b5de86ed977280306a8c628792930812f146fcf7355f9d87434bbabe25e6cc17d8bd028f6bc68fc02e5bea83137a49cf5cc6f509e10 + DEPS libintl libiconv + ) msys_package( URL "https://repo.msys2.org/msys/x86_64/libintl-0.19.8.1-1-x86_64.pkg.tar.xz" SHA512 4e54c252b828c862f376d8f5a2410ee623a43d70cbb07d0b8ac20c25096f59fb3ae8dcd011d1792bec76f0b0b9411d0e184ee23707995761dc50eb76f9fc6b92 diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index fb9daa3589453d..a6adebc435d506 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -42,7 +42,12 @@ ## * [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) ## * [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) function(vcpkg_build_make) + if(NOT _VCPKG_CMAKE_VARS_FILE) + # vcpkg_build_make called without using vcpkg_configure_make before + vcpkg_internal_get_cmake_vars(OUTPUT_FILE _VCPKG_CMAKE_VARS_FILE) + endif() include("${_VCPKG_CMAKE_VARS_FILE}") + # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 _bc "ADD_BIN_TO_PATH;ENABLE_INSTALL;DISABLE_PARALLEL" "LOGFILE_ROOT;BUILD_TARGET;SUBPATH" "") @@ -117,6 +122,7 @@ function(vcpkg_build_make) message(STATUS "Building ${TARGET_TRIPLET}${SHORT_BUILDTYPE}") _vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${CMAKE_BUILDTYPE}) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(LINKER_FLAGS_${CMAKE_BUILDTYPE} "${VCPKG_DETECTED_STATIC_LINKERFLAGS_${CMAKE_BUILDTYPE}}") else() # dynamic @@ -173,6 +179,11 @@ function(vcpkg_build_make) ) endif() + file(READ "${CURRENT_BUILDTREES_DIR}/${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}${SHORT_BUILDTYPE}-out.log" LOGDATA) + if(LOGDATA MATCHES "Warning: linker path does not have real file for library") + message(FATAL_ERROR "libtool could not find a file being linked against!") + endif() + if (_bc_ENABLE_INSTALL) message(STATUS "Installing ${TARGET_TRIPLET}${SHORT_BUILDTYPE}") if(MAKE_BASH) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index d3cba3bf2d43d6..0d80e148cb9670 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -206,7 +206,7 @@ function(vcpkg_configure_make) cmake_parse_arguments(PARSE_ARGV 0 _csc "AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;USE_WRAPPERS;DETERMINE_BUILD_TRIPLET" "SOURCE_PATH;PROJECT_SUBPATH;PRERUN_SHELL;BUILD_TRIPLET" - "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;CONFIGURE_ENVIRONMENT_VARIABLES;CONFIG_DEPENDENT_ENVIRONMENT" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;CONFIGURE_ENVIRONMENT_VARIABLES;CONFIG_DEPENDENT_ENVIRONMENT;ADDITIONAL_MSYS_PACKAGES" ) vcpkg_internal_get_cmake_vars(OUTPUT_FILE _VCPKG_CMAKE_VARS_FILE) set(_VCPKG_CMAKE_VARS_FILE "${_VCPKG_CMAKE_VARS_FILE}" PARENT_SCOPE) @@ -265,7 +265,7 @@ function(vcpkg_configure_make) # Pre-processing windows configure requirements if (CMAKE_HOST_WIN32) list(APPEND MSYS_REQUIRE_PACKAGES binutils libtool autoconf automake-wrapper automake1.16 m4) - vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${MSYS_REQUIRE_PACKAGES}) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${MSYS_REQUIRE_PACKAGES} ${_csc_ADDITIONAL_MSYS_PACKAGES}) if (_csc_AUTOCONFIG AND NOT _csc_BUILD_TRIPLET OR _csc_DETERMINE_BUILD_TRIPLET) _vcpkg_determine_autotools_host_cpu(BUILD_ARCH) # VCPKG_HOST => machine you are building on => --build= _vcpkg_determine_autotools_target_cpu(TARGET_ARCH) @@ -388,6 +388,7 @@ function(vcpkg_configure_make) # Variables not correctly detected by configure. In release builds. list(APPEND _csc_OPTIONS gl_cv_double_slash_root=yes ac_cv_func_memmove=yes) + #list(APPEND _csc_OPTIONS lt_cv_deplibs_check_method=pass_all) # Just ignore libtool checks if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") list(APPEND _csc_OPTIONS gl_cv_host_cpu_c_abi=no) endif() @@ -478,20 +479,34 @@ function(vcpkg_configure_make) convert_to_list(VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES C_LIBS_LIST) convert_to_list(VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES CXX_LIBS_LIST) set(ALL_LIBS_LIST ${C_LIBS_LIST} ${CXX_LIBS_LIST}) - list(REMOVE_DUPLICATES ALL_LIBS_LIST) list(TRANSFORM ALL_LIBS_LIST STRIP) - list(TRANSFORM ALL_LIBS_LIST REPLACE "(.lib|.a|.so)$" "") - if(VCPKG_TARGET_IS_WINDOWS) - list(REMOVE_ITEM ALL_LIBS_LIST "uuid") + + #Do lib list transformation from name.lib to -lname if necessary + set(_VCPKG_TRANSFORM_LIBS TRUE) + if(VCPKG_TARGET_IS_UWP) + set(_VCPKG_TRANSFORM_LIBS FALSE) + # Avoid libtool choke: "Warning: linker path does not have real file for library -lWindowsApp." + # The problem with the choke is that libtool always falls back to built a static library even if a dynamic was requested. + # Note: Env LIBPATH;LIB are on the search path for libtool by default on windows. + # It even does unix/dos-short/unix transformation with the path to get rid of spaces. + endif() + set(_lprefix) + if(_VCPKG_TRANSFORM_LIBS) + set(_lprefix "-l") + list(TRANSFORM ALL_LIBS_LIST REPLACE "(.dll.lib|.lib|.a|.so)$" "") + if(VCPKG_TARGET_IS_WINDOWS) + list(REMOVE_ITEM ALL_LIBS_LIST "uuid") + endif() endif() - list(JOIN ALL_LIBS_LIST " -l" ALL_LIBS_STRING) + list(JOIN ALL_LIBS_LIST " ${_lprefix}" ALL_LIBS_STRING) if(ALL_LIBS_STRING) + set(ALL_LIBS_STRING "${_lprefix}${ALL_LIBS_STRING}") if(DEFINED ENV{LIBS}) - set(ENV{LIBS} "$ENV{LIBS} -l${ALL_LIBS_STRING}") + set(ENV{LIBS} "$ENV{LIBS} ${ALL_LIBS_STRING}") else() - set(ENV{LIBS} "-l${ALL_LIBS_STRING}") + set(ENV{LIBS} "${ALL_LIBS_STRING}") endif() endif() debug_message(STATUS "ENV{LIBS}:$ENV{LIBS}") From e32dd81813d68d99589a3983d9536f78887f71bd Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 17 Nov 2020 18:26:16 +0100 Subject: [PATCH 0032/1694] fix single configuration make builds. (#14580) --- scripts/cmake/vcpkg_internal_get_cmake_vars.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake b/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake index 7cf9f15d1329b6..7f5ed1283d019a 100644 --- a/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake +++ b/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake @@ -53,6 +53,13 @@ function(vcpkg_internal_get_cmake_vars) LOGNAME get-cmake-vars-${TARGET_TRIPLET} ) - file(WRITE "${${_gcv_OUTPUT_FILE}}" "include(\"${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-dbg.cmake.log\")\ninclude(\"${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-rel.cmake.log\")") + set(_include_string) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + string(APPEND _include_string "include(\"${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-rel.cmake.log\")\n") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + string(APPEND _include_string "include(\"${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-dbg.cmake.log\")\n") + endif() + file(WRITE "${${_gcv_OUTPUT_FILE}}" "${_include_string}") endfunction() From f89edf60272e0b7f94dcf0aae973ce5a282736e7 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 18 Nov 2020 01:30:37 +0800 Subject: [PATCH 0033/1694] [vcpkg baseline][monkeys-audio] Update to 5.59 (#14586) * [vcpkg baseline][monkeys-audio] Update to the new version * Update ports/monkeys-audio/portfile.cmake * Fix typo error in patch name * Refix typo --- ports/monkeys-audio/CONTROL | 2 +- ports/monkeys-audio/portfile.cmake | 8 +++--- .../remove-certificate-step.patch | 26 +++++++++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 ports/monkeys-audio/remove-certificate-step.patch diff --git a/ports/monkeys-audio/CONTROL b/ports/monkeys-audio/CONTROL index 388299f8c7e25f..4ccdbc52a51cb7 100644 --- a/ports/monkeys-audio/CONTROL +++ b/ports/monkeys-audio/CONTROL @@ -1,5 +1,5 @@ Source: monkeys-audio -Version: 5.48 +Version: 5.59 Homepage: https://monkeysaudio.com Description: Monkey's Audio is an excellent audio compression tool which has multiple advantages over traditional methods. Audio files compressed with it end with .ape extension. diff --git a/ports/monkeys-audio/portfile.cmake b/ports/monkeys-audio/portfile.cmake index f0edaaf32e0c77..4fed4a0520431d 100644 --- a/ports/monkeys-audio/portfile.cmake +++ b/ports/monkeys-audio/portfile.cmake @@ -2,19 +2,21 @@ vcpkg_fail_port_install(ON_TARGET "UWP" "OSX" "Linux") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) -set(MA_VERSION 548) +set(MA_VERSION 559c) vcpkg_download_distfile(ARCHIVE URLS "https://monkeysaudio.com/files/MAC_SDK_${MA_VERSION}.zip" FILENAME "MAC_SDK_${MA_VERSION}.zip" - SHA512 036c75f4cc8dc54837b2f9f822d260ebdbed918dff9ac744746e2786d13a33364d0cd7f380f015e89eaf5ebedd7180df979dfd15cb8f0160e339fafebc93f4ba + SHA512 83ed3e2a4de62cb95e508a12146cecfe6bb584ce3cb30c20ae2f8e2f76839f4a83a4a0f68399a68dfd56829bcd5678824bcdf46730ae6662e14a5248522c0554 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} NO_REMOVE_ONE_LEVEL - PATCHES fix-project-config.patch + PATCHES + fix-project-config.patch + remove-certificate-step.patch ) file(REMOVE_RECURSE diff --git a/ports/monkeys-audio/remove-certificate-step.patch b/ports/monkeys-audio/remove-certificate-step.patch new file mode 100644 index 00000000000000..d06f5161b51844 --- /dev/null +++ b/ports/monkeys-audio/remove-certificate-step.patch @@ -0,0 +1,26 @@ +diff --git a/Source/Projects/VS2019/Console/Console.vcxproj b/Source/Projects/VS2019/Console/Console.vcxproj +index 164608f..feeb163 100644 +--- a/Source/Projects/VS2019/Console/Console.vcxproj ++++ b/Source/Projects/VS2019/Console/Console.vcxproj +@@ -180,10 +180,6 @@ + + MachineX86 + +- +- C:\MAC\Current\Source\Certificate\signtool.exe sign /t http://timestamp.digicert.com /f C:\MAC\Current\Source\Certificate\MAC2.crt /v "$(TargetPath)" +-C:\MAC\Current\Source\Certificate\signtool.exe sign /f C:\MAC\Current\Source\Certificate\MAC2.crt /tr http://timestamp.comodoca.com /td sha256 /fd sha256 /a /as "$(TargetPath)" +- + + + +@@ -273,10 +269,6 @@ C:\MAC\Current\Source\Certificate\signtool.exe sign /f C:\MAC\Current\Source\Cer + + MachineX64 + +- +- C:\MAC\Current\Source\Certificate\signtool.exe sign /t http://timestamp.digicert.com /f C:\MAC\Current\Source\Certificate\MAC2.crt /v "$(TargetPath)" +-C:\MAC\Current\Source\Certificate\signtool.exe sign /f C:\MAC\Current\Source\Certificate\MAC2.crt /tr http://timestamp.comodoca.com /td sha256 /fd sha256 /a /as "$(TargetPath)" +- + + + From a27bda2b1cf853587234c2b6bab4ba4b303843d0 Mon Sep 17 00:00:00 2001 From: Andrei Lebedev Date: Tue, 17 Nov 2020 23:37:14 +0100 Subject: [PATCH 0034/1694] [libprotobuf-mutator] Add new port (#13691) Signed-off-by: Andrei Lebedev --- ports/libprotobuf-mutator/portfile.cmake | 29 ++++++++++++++++++++++++ ports/libprotobuf-mutator/vcpkg.json | 8 +++++++ 2 files changed, 37 insertions(+) create mode 100644 ports/libprotobuf-mutator/portfile.cmake create mode 100644 ports/libprotobuf-mutator/vcpkg.json diff --git a/ports/libprotobuf-mutator/portfile.cmake b/ports/libprotobuf-mutator/portfile.cmake new file mode 100644 index 00000000000000..9ce795f25553ea --- /dev/null +++ b/ports/libprotobuf-mutator/portfile.cmake @@ -0,0 +1,29 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/libprotobuf-mutator + REF v1.0 + SHA512 75e423289f938d4332d98033062cd9608b71141b7ca1df4e8f28c927c51a16e7ff2f5bf08867308d2a291fc2422e4456f8928ab2c11d545eeb982ea732baf2e9 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DLIB_PROTO_MUTATOR_TESTING=OFF + -DLIB_PROTO_MUTATOR_MSVC_STATIC_RUNTIME=${STATIC_RUNTIME} + -DPKG_CONFIG_PATH=lib/pkgconfig +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${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/libprotobuf-mutator/vcpkg.json b/ports/libprotobuf-mutator/vcpkg.json new file mode 100644 index 00000000000000..e41bf2652cdbd9 --- /dev/null +++ b/ports/libprotobuf-mutator/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libprotobuf-mutator", + "version-string": "1.0", + "description": "Library for structured fuzzing with protobuffers.", + "dependencies": [ + "protobuf" + ] +} From 91410a1956caf62fd39ae6349518df2a2d5e6314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 17 Nov 2020 23:45:32 +0100 Subject: [PATCH 0035/1694] [directxtk][directxtk12][directxtex][directxmesh] Update to latest version (#14539) * [directxtk][directxtk12][directxtex][directxmesh] Update to latest version https://github.com/microsoft/DirectXTK/releases/tag/nov2020 https://github.com/microsoft/DirectXTK12/releases/tag/nov2020 https://github.com/microsoft/DirectXTex/releases/tag/nov2020 https://github.com/microsoft/DirectXMesh/releases/tag/nov2020 * [directxlibs] Fix wrong port version --- ports/directxmesh/CONTROL | 3 +-- ports/directxmesh/portfile.cmake | 4 ++-- ports/directxtex/CONTROL | 3 +-- ports/directxtex/enable_openexr_support.patch | 4 ++-- ports/directxtex/portfile.cmake | 4 ++-- ports/directxtk/CONTROL | 3 +-- ports/directxtk/portfile.cmake | 4 ++-- ports/directxtk12/CONTROL | 3 +-- ports/directxtk12/portfile.cmake | 4 ++-- 9 files changed, 14 insertions(+), 18 deletions(-) diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL index b72a514eb5f776..42c70287d6b97f 100644 --- a/ports/directxmesh/CONTROL +++ b/ports/directxmesh/CONTROL @@ -1,6 +1,5 @@ Source: directxmesh -Version: aug2020 -Port-Version: 1 +Version: nov2020 Homepage: https://walbourn.github.io/directxmesh Description: DirectXMesh geometry processing library Build-Depends: directxmesh[core,dx12](arm64|uwp) diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 3017d39e6de6c9..b9c3227b03728d 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF aug2020 - SHA512 4a116b6266070a075aca523d9439eeab878b5406ffe5f94f7c008d659842750eab17b11c027c7f1da1ed12a0b8a43ab53dc5aaea8477a0bb029654cd477b5424 + REF nov2020 + SHA512 07bf8acba1f15f1b74d864ac624c7e0bfbdf5927c3e66f94ef78ab447e757daa01351ca8e1c8e8652dbb7008cee13c30247922af2d1712e61bc50bdb55cedf42 HEAD_REF master ) diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL index eb5865def9d0dd..06ec4ac5a53a96 100644 --- a/ports/directxtex/CONTROL +++ b/ports/directxtex/CONTROL @@ -1,6 +1,5 @@ Source: directxtex -Version: sept2020 -Port-Version: 2 +Version: nov2020 Homepage: https://walbourn.github.io/directxtex Description: DirectXTex texture processing library Build-Depends: directxtex[core,dx12](arm64|uwp) diff --git a/ports/directxtex/enable_openexr_support.patch b/ports/directxtex/enable_openexr_support.patch index def2700d1f4189..c5ec406a3752fa 100644 --- a/ports/directxtex/enable_openexr_support.patch +++ b/ports/directxtex/enable_openexr_support.patch @@ -52,8 +52,8 @@ index 53b41a3..84867f3 100644 target_compile_options(texassemble PRIVATE /fp:fast) @@ -140,6 +160,12 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) target_compile_options(texassemble PRIVATE ${WarningsEXE}) - target_compile_options(texconv PRIVATE ${WarningsEXE}) - target_compile_options(texdiag PRIVATE ${WarningsEXE} "-Wno-double-promotion" ) + target_compile_options(texconv PRIVATE ${WarningsEXE} "-Wno-global-constructors") + target_compile_options(texdiag PRIVATE ${WarningsEXE} "-Wno-double-promotion") + + if(ENABLE_OPENEXR_SUPPORT) + target_compile_options(texassemble PRIVATE -DUSE_OPENEXR) diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index a3791d6d02cea3..b8871ea31160cc 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF sept2020 - SHA512 f6b5b07817c05c64a5281b0006b182f2ebd110d79f10332801b51a185486fd7426e18c454e66995e9f88c92d7b8cf0c03ae590aa040d92314bdd3d4989784156 + REF nov2020 + SHA512 a3f4abc2729c6e98b8cd29ff1d410410bced2eaa2dc62563f18344dbb33f30d7ce32c11cafe85f91786e80610d8a2030dab48919f5bf9ccf92ceba2c5ed4db13 HEAD_REF master ) diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL index f9e7a8efb82d13..42068aa10f3561 100644 --- a/ports/directxtk/CONTROL +++ b/ports/directxtk/CONTROL @@ -1,6 +1,5 @@ Source: directxtk -Version: sept2020 -Port-Version: 1 +Version: nov2020 Homepage: https://walbourn.github.io/directxtk Description: A collection of helper classes for writing DirectX 11.x code in C++. Build-Depends: directxtk[core,xaudio2-9](arm64|uwp) diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index 6311aac22694ca..f10da7b842cf61 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF sept2020 - SHA512 fcb98ffee960494f4ba9a3edd802dce7eacf8e0d9a17f712ea971cdf6c13d9ee4e403deecbcd2c8a4555301316334e6f987d6b051b7cb87e2ae76e41f213e91e + REF nov2020 + SHA512 9d10a851f37deb428c16166cdecf38ffba28a4ab836f9753f071bccc570fcb22ce98271c6bbad9fa1380dddd1fa6602156a7aa1607d347139bda1860fc2210ce HEAD_REF master ) diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL index c5c30e5f072e52..4551b56c5f411f 100644 --- a/ports/directxtk12/CONTROL +++ b/ports/directxtk12/CONTROL @@ -1,5 +1,4 @@ Source: directxtk12 -Version: sept2020 -Port-Version: 1 +Version: nov2020 Homepage: https://walbourn.github.io/directx-tool-kit-for-directx-12 Description: A collection of helper classes for writing DirectX 12 code in C++. diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 01efa2aa310334..825cdae2a59458 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF sept2020 - SHA512 25963234068700944d29f93e376d3e9dcb27689ae953f790b53f931d5776d33ae047dc340464894805ce13be469efacc3c73e731691e66cdb2c7624b14dc25ff + REF nov2020 + SHA512 fd49bd8f124ac5c9808f8da09a955599234712b74525fd27739135f9044883b65f4c570048a9fe335f6aa82c8d49de1e6c0e81c904696ade3cd63b1982cf4d68 HEAD_REF master ) From 93333041d4f6f203fda053318fd50ff486fb8a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 17 Nov 2020 23:45:52 +0100 Subject: [PATCH 0036/1694] [robin-hood-hashing] Update to 3.9.1 (#14563) https://github.com/martinus/robin-hood-hashing/releases/tag/3.9.1 --- ports/robin-hood-hashing/CONTROL | 2 +- ports/robin-hood-hashing/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/robin-hood-hashing/CONTROL b/ports/robin-hood-hashing/CONTROL index a4cc8e69df3317..c17463e729a9b6 100644 --- a/ports/robin-hood-hashing/CONTROL +++ b/ports/robin-hood-hashing/CONTROL @@ -1,4 +1,4 @@ Source: robin-hood-hashing -Version: 3.9.0 +Version: 3.9.1 Homepage: https://github.com/martinus/robin-hood-hashing Description: Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20 diff --git a/ports/robin-hood-hashing/portfile.cmake b/ports/robin-hood-hashing/portfile.cmake index bf6e319a6da0c4..a273467c41e70d 100644 --- a/ports/robin-hood-hashing/portfile.cmake +++ b/ports/robin-hood-hashing/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinus/robin-hood-hashing - REF 3.9.0 - SHA512 4331b64eaefe4214f00aa2679f3b18dd5d21d3870620e6809ca5f559e81ffd4df9e5f59a7fadb4dc90d1009fa2ec173b1eb69d42dd1144bac79416538a69b050 + REF 3.9.1 + SHA512 dbd614b772171d3e1d47e01513b3aa56d086a0530bad80931dbee4c3674e08c31cb023ac2cd3e9cadd86db76856ccc4c7a0fa9f7cd653044cd68c82e1a4c9c9c HEAD_REF master ) From b00137a07564fbf838bf1e3e014be0f5e9b61025 Mon Sep 17 00:00:00 2001 From: chausner Date: Tue, 17 Nov 2020 23:46:38 +0100 Subject: [PATCH 0037/1694] [liblsl] Update to 1.13.1 (#14566) --- ports/liblsl/CONTROL | 2 +- ports/liblsl/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/liblsl/CONTROL b/ports/liblsl/CONTROL index 924dd323610291..e374a5888f72a3 100644 --- a/ports/liblsl/CONTROL +++ b/ports/liblsl/CONTROL @@ -1,3 +1,3 @@ Source: liblsl -Version: 1.13.0-b11-1 +Version: 1.13.1 Description: C++ lsl library for multi-modal time-synched data transmission over the local network diff --git a/ports/liblsl/portfile.cmake b/ports/liblsl/portfile.cmake index cbeb710e2ff2c8..38a74bf239bb2d 100644 --- a/ports/liblsl/portfile.cmake +++ b/ports/liblsl/portfile.cmake @@ -3,8 +3,8 @@ set(VCPKG_LIBRARY_LINKAGE dynamic) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sccn/liblsl - REF 1.13.0-b11 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake - SHA512 212f28070b8239dc176d2e35bf4091896babbf7688e4cbe1c2bb0c3788f317ce2a80f92d4b008c6e577b01a09e8faf65228d396ff13e9ade0c1ffdc5e08cb9e5 + REF 1.13.1 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake + SHA512 95cfd69cff86eb7de62624775f3037dd71a5240a6ad82c12d9340bfaf2c38c25ac9e884b01635bf71e27fcd9ce385602d8fa347c61b6ce10cf2bb7f0ad761282 HEAD_REF master ) @@ -15,7 +15,7 @@ vcpkg_configure_cmake( -DLSL_BUILD_STATIC=OFF -DLSL_UNIXFOLDERS=ON -DLSL_NO_FANCY_LIBNAME=ON - -Dlslgitrevision="1.13.0-b11" + -Dlslgitrevision="1.13.1" -Dlslgitbranch="master" ) From dee6a94aa6bacd9df4cffd5344be17f4240f5e95 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 17 Nov 2020 22:21:40 -0800 Subject: [PATCH 0038/1694] [vcpkg] Fix GCC-6 build. (#14616) Fixes #13937. Fixes MicrosoftDocs/vscodespaces#827. --- toolsrc/src/vcpkg/vcpkgcmdarguments.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp index b3f42e6c796302..ec4eef3a8a8370 100644 --- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp +++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp @@ -920,6 +920,7 @@ namespace vcpkg constexpr StringLiteral VcpkgCmdArguments::TRIPLET_ARG; constexpr StringLiteral VcpkgCmdArguments::OVERLAY_PORTS_ENV; constexpr StringLiteral VcpkgCmdArguments::OVERLAY_PORTS_ARG; + constexpr StringLiteral VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV; constexpr StringLiteral VcpkgCmdArguments::OVERLAY_TRIPLETS_ARG; constexpr StringLiteral VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV; From cc8da571136549db1461d321e2681d51a853dbc5 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 11:41:52 +0100 Subject: [PATCH 0039/1694] added mapbox-geometry --- ports/mapbox-geometry/portfile.cmake | 17 +++++++++++++++++ ports/mapbox-geometry/vcpkg.json | 6 ++++++ 2 files changed, 23 insertions(+) create mode 100644 ports/mapbox-geometry/portfile.cmake create mode 100644 ports/mapbox-geometry/vcpkg.json diff --git a/ports/mapbox-geometry/portfile.cmake b/ports/mapbox-geometry/portfile.cmake new file mode 100644 index 00000000000000..3c58fb7ef1151b --- /dev/null +++ b/ports/mapbox-geometry/portfile.cmake @@ -0,0 +1,17 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/geometry.hpp + REF c83a2ab18a225254f128b6f5115aa39d04f2de21 + SHA512 81c93a4efb517866888aee86ccb61896f4465f862d5404b0e45e35632a3bf6fb2d5c46935bbe56ff03079861ea503bd13d9d4003d5aae50cad5d1b2187834661 + HEAD_REF master +) + +# Copy header files +file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") + + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/ports/mapbox-geometry/vcpkg.json b/ports/mapbox-geometry/vcpkg.json new file mode 100644 index 00000000000000..291e8de613a361 --- /dev/null +++ b/ports/mapbox-geometry/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "mapbox-geometry", + "version-string": "2.0.3", + "description": "C++ geometry types", + "homepage": "https://github.com/mapbox/geometry.hpp" +} From 3ebaef5c64279514b863657d168c3ad0dfd6369e Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 11:42:06 +0100 Subject: [PATCH 0040/1694] added mapbox-polylabel --- ports/mapbox-polylabel/portfile.cmake | 17 +++++++++++++++++ ports/mapbox-polylabel/vcpkg.json | 10 ++++++++++ 2 files changed, 27 insertions(+) create mode 100644 ports/mapbox-polylabel/portfile.cmake create mode 100644 ports/mapbox-polylabel/vcpkg.json diff --git a/ports/mapbox-polylabel/portfile.cmake b/ports/mapbox-polylabel/portfile.cmake new file mode 100644 index 00000000000000..2b2b123a185821 --- /dev/null +++ b/ports/mapbox-polylabel/portfile.cmake @@ -0,0 +1,17 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/polylabel + REF 51f09d04c21e7b7faf94e2300ca1fe6e1f12fa7f + SHA512 75ddb479d4aa6768f161cc4d0f94121097c0f97840e9d677adec59b7360f8245bca54770cc894c7d10171c1cfea6e9a1ab73a7b45dff383791baa60bcf2226b9 + HEAD_REF master +) + +# Copy header files +file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") + + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/ports/mapbox-polylabel/vcpkg.json b/ports/mapbox-polylabel/vcpkg.json new file mode 100644 index 00000000000000..953a378982d96b --- /dev/null +++ b/ports/mapbox-polylabel/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "mapbox-polylabel", + "version-string": "1.0.4", + "description": "A fast algorithm for finding the pole of inaccessibility of a polygon (in JavaScript and C++)", + "homepage": "https://github.com/mapbox/polylabel", + "dependencies": [ + "mapbox-geometry", + "mapbox-variant" + ] +} From 693f82301e99de00874b1e2128e9fcb1c2fd9277 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 11:42:20 +0100 Subject: [PATCH 0041/1694] functional build with mapnik master --- ports/mapnik/0001-CMakeFiles.patch | 1197 ----------------- ports/mapnik/0002-sqlitepixelwidth.patch | 120 -- ports/mapnik/CONTROL | 58 - ports/mapnik/cmake/CMakeLists.txt | 307 +++++ ports/mapnik/cmake/demo/c++/CMakeLists.txt | 4 + ports/mapnik/cmake/demo/viewer/CMakeLists.txt | 27 + ports/mapnik/cmake/files.cmake | 568 ++++++++ .../cmake/plugins/input/csv/CMakeLists.txt | 12 + .../cmake/plugins/input/gdal/CMakeLists.txt | 9 + .../cmake/plugins/input/geobuf/CMakeLists.txt | 13 + .../plugins/input/geojson/CMakeLists.txt | 11 + .../cmake/plugins/input/ogr/CMakeLists.txt | 11 + .../plugins/input/pgraster/CMakeLists.txt | 10 + .../plugins/input/postgis/CMakeLists.txt | 11 + .../cmake/plugins/input/raster/CMakeLists.txt | 10 + .../cmake/plugins/input/shape/CMakeLists.txt | 15 + .../cmake/plugins/input/sqlite/CMakeLists.txt | 9 + .../plugins/input/topojson/CMakeLists.txt | 9 + ports/mapnik/cmake/src/agg/CMakeLists.txt | 0 ports/mapnik/cmake/src/json/CMakeLists.txt | 19 + ports/mapnik/cmake/src/wkt/CMakeLists.txt | 8 + .../cmake/utils/mapnik-render/CMakeLists.txt | 4 + .../cmake/utils/shapeindex/CMakeLists.txt | 4 + ports/mapnik/fix-box2d.patch | 12 + ports/mapnik/fix-config.patch | 16 + .../mapnik/fix-constructor-inheritance.patch | 39 + ports/mapnik/portfile.cmake | 95 +- ports/mapnik/vcpkg.json | 139 ++ 28 files changed, 1312 insertions(+), 1425 deletions(-) delete mode 100644 ports/mapnik/0001-CMakeFiles.patch delete mode 100644 ports/mapnik/0002-sqlitepixelwidth.patch delete mode 100644 ports/mapnik/CONTROL create mode 100644 ports/mapnik/cmake/CMakeLists.txt create mode 100644 ports/mapnik/cmake/demo/c++/CMakeLists.txt create mode 100644 ports/mapnik/cmake/demo/viewer/CMakeLists.txt create mode 100644 ports/mapnik/cmake/files.cmake create mode 100644 ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt create mode 100644 ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt create mode 100644 ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt create mode 100644 ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt create mode 100644 ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt create mode 100644 ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt create mode 100644 ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt create mode 100644 ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt create mode 100644 ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt create mode 100644 ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt create mode 100644 ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt create mode 100644 ports/mapnik/cmake/src/agg/CMakeLists.txt create mode 100644 ports/mapnik/cmake/src/json/CMakeLists.txt create mode 100644 ports/mapnik/cmake/src/wkt/CMakeLists.txt create mode 100644 ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt create mode 100644 ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt create mode 100644 ports/mapnik/fix-box2d.patch create mode 100644 ports/mapnik/fix-config.patch create mode 100644 ports/mapnik/fix-constructor-inheritance.patch create mode 100644 ports/mapnik/vcpkg.json diff --git a/ports/mapnik/0001-CMakeFiles.patch b/ports/mapnik/0001-CMakeFiles.patch deleted file mode 100644 index 4a68e6917070f7..00000000000000 --- a/ports/mapnik/0001-CMakeFiles.patch +++ /dev/null @@ -1,1197 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 0000000..f07a5ce ---- /dev/null -+++ b/CMakeLists.txt -@@ -0,0 +1,306 @@ -+cmake_minimum_required(VERSION 3.13.4) -+project(mapnik) -+set(CMAKE_CXX_STANDARD 14) -+include(CMakeDependentOption) -+ -+ -+option(MAPNIK_STATIC_LIB "Build a static library" OFF) -+ -+option(WITH_DEMO "Build demo" OFF) -+option(WITH_VIEWER "Build viewer" OFF) -+ -+ -+option(WITH_INPUTS "Build input plugins" ON) -+ -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_CSV "Build the csv input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_GDAL "Build the gdal input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_GEOBUF "Build the geobuf input plugin" OFF "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_GEOJSON "Build the geojson input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_OGR "Build the ogr input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_PGRASTER "Build the pgraster input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_POSTGIS "Build the postgis input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_RASTER "Build the raster input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_SHAPE "Build the shape input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_SQLITE "Build the sqlite input plugin" ON "WITH_INPUTS" ON) -+CMAKE_DEPENDENT_OPTION(WITH_INPUT_TOPOJSON "Build the topojson input plugin" ON "WITH_INPUTS" ON) -+ -+MESSAGE(WITH_INPUT_POSTGIS ${WITH_INPUT_POSTGIS}}) -+ -+option(WITH_UTILS "Build the utilities" ON ) -+ -+option(WITH_GRID "Use the grid renderer" OFF) -+option(WITH_CAIRO "Use cairo" ON) -+option(WITH_PROJ4 "Use proj4" ON) -+ -+if(MSVC) -+ # Force to always compile with W4 -+ if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") -+ string(REGEX REPLACE "/W[0-4]" "/W1" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -+ else() -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W1") -+ endif() -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd\"4068\" /wd\"4661\" /wd\"4503\" ") -+ add_compile_options(/MP) -+ add_compile_options(-bigobj) #added by @am2222 -+ add_compile_definitions(ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1) #added by @am2222 for proj4 compile -+ add_definitions(-DMAPNIK_THREADSAFE) -+ -+endif() -+ -+find_package(Boost REQUIRED -+ COMPONENTS filesystem system regex program_options) -+ -+find_package(FreeType REQUIRED) -+ -+find_library(HARFBUZZ_LIB harfbuzz.lib) -+find_package(ICU REQUIRED COMPONENTS uc) -+ -+find_package(PNG REQUIRED) -+find_package(jpeg REQUIRED) -+find_package(tiff REQUIRED) -+find_package(WebP REQUIRED) -+find_package(LibXml2 REQUIRED) -+find_package(ZLIB REQUIRED) -+ -+set (MAPNIK_DEFS -+ -DHAVE_PNG -+ -DHAVE_JPEG -+ -DHAVE_TIFF -+ -DHAVE_WEBP) -+ -+set(thirdparty_include_paths ${thirdparty_include_paths} -+ ${JPEG_INCLUDE_DIR} ${WEBP_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}) -+ -+set(thirdparty_libraries ${thirdparty_libraries} -+ ${JPEG_LIBRARIES} ${WEBP_LIBRARIES} ${LIBXML2_LIBRARIES} ${HARFBUZZ_LIB}) -+ -+# AGG -+ -+include(files.cmake) -+ -+if (WITH_CAIRO) -+ find_library(CAIRO_LIB_DEBUG cairod) -+ find_library(CAIRO_LIB_RELEASE cairo) -+ find_library(CAIRO_GOBJECT_LIB_DEBUG cairo-gobjectd) -+ find_library(CAIRO_GOBJECT_LIB_RELEASE cairo-gobject) -+ find_path(CAIRO_INCLUDE_DIR cairo/cairo.h) -+ -+ set(thirdparty_include_paths ${thirdparty_include_paths} ${CAIRO_INCLUDE_DIR}) -+ set(thirdparty_libraries ${thirdparty_libraries} $<$:${CAIRO_LIB_DEBUG}> $<$:${CAIRO_LIB_RELEASE}>) -+ -+ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} -+ src/cairo/process_markers_symbolizer.cpp -+ src/cairo/process_group_symbolizer.cpp -+ -+ src/cairo/cairo_context.cpp -+ src/cairo/cairo_render_vector.cpp -+ src/cairo/cairo_renderer.cpp -+ src/cairo/process_building_symbolizer.cpp -+ src/cairo/process_debug_symbolizer.cpp -+ src/cairo/process_line_pattern_symbolizer.cpp -+ src/cairo/process_line_symbolizer.cpp -+ src/cairo/process_point_symbolizer.cpp -+ src/cairo/process_polygon_pattern_symbolizer.cpp -+ src/cairo/process_polygon_symbolizer.cpp -+ src/cairo/process_raster_symbolizer.cpp -+ src/cairo/process_text_symbolizer.cpp) -+ -+ set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_CAIRO) -+endif() -+message(STATUS "Cairo renderer " ${WITH_CAIRO}) -+ -+if (WITH_PROJ4) -+ find_package(PROJ4 REQUIRED) -+ set(thirdparty_include_paths ${thirdparty_include_paths} ${PROJ4_INCLUDE_DIRS}) -+ set(thirdparty_libraries ${thirdparty_libraries} ${PROJ4_LIBRARIES}) -+ -+ set(MAPNIK_DEFS ${MAPNIK_DEFS} -DMAPNIK_USE_PROJ4) -+endif() -+ -+if (WITH_GRID) -+ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} -+ src/grid/grid.cpp -+ src/grid/grid_renderer.cpp -+ src/grid/process_building_symbolizer.cpp -+ src/grid/process_line_pattern_symbolizer.cpp -+ src/grid/process_line_symbolizer.cpp -+ src/grid/process_point_symbolizer.cpp -+ src/grid/process_polygon_pattern_symbolizer.cpp -+ src/grid/process_polygon_symbolizer.cpp -+ src/grid/process_raster_symbolizer.cpp -+ src/grid/process_shield_symbolizer.cpp -+ src/grid/process_text_symbolizer.cpp) -+ set(MAPNIK_DEFS ${MAPNIK_DEFS} -DGRID_RENDERER) -+ENDIF() -+message(STATUS "Grid renderer: " ${WITH_GRID}) -+ -+set(MAPNIK_SOURCES ${MAPNIK_SOURCES} -+ src/svg/output/svg_output_grammars.cpp -+ src/svg/output/svg_renderer.cpp -+ src/svg/output/svg_generator.cpp -+ src/svg/output/svg_output_attributes.cpp -+ src/svg/output/process_symbolizers.cpp -+ src/svg/output/process_line_symbolizer.cpp -+ src/svg/output/process_polygon_symbolizer.cpp) -+set(MAPNIK_DEFS ${MAPNIK_DEFS} -DSVG_RENDERER) -+ -+ -+set(MAPNIK_SOURCES ${MAPNIK_SOURCES} -+ src/jpeg_reader.cpp -+ src/libxml2_loader.cpp -+ src/png_reader.cpp -+ src/tiff_reader.cpp -+ src/webp_reader.cpp -+ ) -+ -+#set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/rapidxml_loader.cpp) -+ -+set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2 -DBOOST_REGEX_HAS_ICU) -+ -+set(mapnik_include_paths -+ include -+ deps -+ deps/agg/include -+ deps/mapbox/geometry/include -+ deps/mapbox/polylabel/include -+ deps/mapbox/variant/include) -+ -+ -+ -+include_directories(${mapnik_include_paths} ${thirdparty_include_paths}) -+ -+if (MAPNIK_STATIC_LIB) -+ message(STATUS "Building static library") -+ add_library(mapnik STATIC ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) -+ target_compile_definitions(mapnik PUBLIC -DMAPNIK_STATICLIB) -+ set(MAPNIK_LIB_DEFINITION -DMAPNIK_STATICLIB) -+else () -+ message(STATUS "Building shared library") -+ add_library(mapnik SHARED ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) -+ target_compile_definitions(mapnik PRIVATE -DMAPNIK_EXPORTS) -+ set(MAPNIK_LIB_DEFINITION ) -+endif () -+ -+target_compile_definitions(mapnik PUBLIC ${MAPNIK_DEFS}) -+ -+target_include_directories(mapnik INTERFACE ${mapnik_include_paths} ${thirdparty_include_paths} ) -+target_link_libraries(mapnik PUBLIC -+ ${thirdparty_libraries} -+ Boost::boost Boost::filesystem Boost::system Boost::regex Boost::program_options Boost::system -+ Freetype::Freetype -+ ICU::uc -+ PNG::PNG -+ TIFF::TIFF -+ ZLIB::ZLIB) -+ -+install(TARGETS mapnik -+ LIBRARY DESTINATION lib) -+ -+install(DIRECTORY include/ DESTINATION include/ CONFIGURATIONS Release) -+ -+add_subdirectory(src/json) -+add_subdirectory(src/wkt) -+ -+# ideally we should also generate mapnik-config -+ -+if (WITH_INPUT_CSV) -+ add_subdirectory(plugins/input/csv) -+endif() -+ -+if (WITH_INPUT_GDAL) -+ find_package(GDAL REQUIRED) -+ add_subdirectory(plugins/input/gdal) -+endif() -+ -+if (WITH_INPUT_GEOBUF) -+ # TODO insert protozero here -+ add_subdirectory(plugins/input/geobuf) -+endif() -+ -+if (WITH_INPUT_GEOJSON) -+ add_subdirectory(plugins/input/geojson) -+endif() -+ -+if (WITH_INPUT_OGR) -+ add_subdirectory(plugins/input/ogr) -+endif() -+ -+if (WITH_INPUT_PGRASTER) -+ find_package(PostgreSQL REQUIRED) -+ add_subdirectory(plugins/input/pgraster) -+endif() -+ -+if (WITH_INPUT_POSTGIS) -+ find_package(PostgreSQL REQUIRED) -+ add_subdirectory(plugins/input/postgis) -+endif() -+ -+if (WITH_INPUT_RASTER) -+ add_subdirectory(plugins/input/raster) -+endif() -+ -+if (WITH_INPUT_SHAPE) -+ add_subdirectory(plugins/input/shape) -+endif() -+ -+if (WITH_INPUT_SQLITE) -+ find_package(sqlite3 REQUIRED) -+ add_subdirectory(plugins/input/sqlite) -+endif() -+ -+if (WITH_INPUT_TOPOJSON) -+ add_subdirectory(plugins/input/topojson) -+endif() -+ -+if (WITH_INPUTS) -+ message(STATUS "Input plugins:") -+ if(WITH_INPUT_CSV ) -+ message(STATUS " - csv ") -+ endif() -+ if(WITH_INPUT_GDAL ) -+ message(STATUS " - gdal ") -+ endif() -+ if(WITH_INPUT_GEOBUF ) -+ message(STATUS " - geobuf ") -+ endif() -+ if(WITH_INPUT_GEOJSON ) -+ message(STATUS " - geojson ") -+ endif() -+ if(WITH_INPUT_OGR ) -+ message(STATUS " - ogr ") -+ endif() -+ if(WITH_INPUT_PGRASTER ) -+ message(STATUS " - pgraster") -+ endif() -+ if(WITH_INPUT_POSTGIS ) -+ message(STATUS " - postgis ") -+ endif() -+ if(WITH_INPUT_RASTER ) -+ message(STATUS " - raster ") -+ endif() -+ if(WITH_INPUT_SHAPE ) -+ message(STATUS " - shape ") -+ endif() -+ if(WITH_INPUT_SQLITE ) -+ message(STATUS " - sqlite ") -+ endif() -+ if(WITH_INPUT_TOPOJSON ) -+ message(STATUS " - topojson") -+ endif() -+else() -+ message(STATUS "Input plugins OFF") -+endif() -+ -+if(WITH_DEMO) -+ add_subdirectory(demo/c++) -+endif() -+ -+if(WITH_VIEWER) -+ find_package(Qt5 COMPONENTS Widgets REQUIRED) -+ add_subdirectory(demo/viewer) -+endif() -+ -+if(WITH_UTILS) -+ add_subdirectory(utils/mapnik-render) -+ add_subdirectory(utils/shapeindex) -+endif() -diff --git a/demo/c++/CMakeLists.txt b/demo/c++/CMakeLists.txt -new file mode 100644 -index 0000000..a0a48b8 ---- /dev/null -+++ b/demo/c++/CMakeLists.txt -@@ -0,0 +1,4 @@ -+add_executable(mapnik-demo rundemo.cpp) -+add_dependencies(mapnik-demo mapnik) -+target_link_libraries(mapnik-demo PRIVATE mapnik) -+install(TARGETS mapnik-demo DESTINATION bin) -diff --git a/demo/viewer/CMakeLists.txt b/demo/viewer/CMakeLists.txt -new file mode 100644 -index 0000000..86034a0 ---- /dev/null -+++ b/demo/viewer/CMakeLists.txt -@@ -0,0 +1,27 @@ -+add_executable(mapnik-viewer -+ about_dialog.cpp -+ info_dialog.cpp -+ layerdelegate.cpp -+ layerlistmodel.cpp -+ layerwidget.cpp -+ layer_info_dialog.cpp -+ main.cpp -+ mainwindow.cpp -+ mapwidget.cpp -+ styles_model.cpp -+ -+ forms/about.ui -+ forms/info.ui -+ forms/layer_info.ui -+ -+ mapnik_viewer.qrc) -+ -+set_target_properties(mapnik-viewer PROPERTIES -+ AUTOUIC_SEARCH_PATHS forms -+ AUTORCC ON -+ AUTOUIC ON -+ AUTOMOC ON) -+ -+add_dependencies(mapnik-viewer mapnik) -+target_link_libraries(mapnik-viewer PRIVATE mapnik Qt5::Widgets) -+install(TARGETS mapnik-viewer DESTINATION bin) -diff --git a/files.cmake b/files.cmake -new file mode 100644 -index 0000000..b9d767f ---- /dev/null -+++ b/files.cmake -@@ -0,0 +1,557 @@ -+set (MAPNIK_SOURCES -+ src/cairo_io.cpp -+ src/color.cpp -+ src/color_factory.cpp -+ src/config_error.cpp -+ src/conversions.cpp -+ src/css_color_grammar.cpp -+ src/dasharray_parser.cpp -+ src/datasource_cache.cpp -+ src/datasource_cache_static.cpp -+ src/debug.cpp -+ src/box2d.cpp -+ src/expression.cpp -+ src/expression_grammar.cpp -+ src/expression_node.cpp -+ src/expression_string.cpp -+ src/feature_kv_iterator.cpp -+ src/feature_style_processor.cpp -+ src/feature_type_style.cpp -+ src/font_engine_freetype.cpp -+ src/font_set.cpp -+ src/fs.cpp -+ src/function_call.cpp -+ src/geometry/interior.cpp -+ src/geometry_envelope.cpp -+ src/geometry_reprojection.cpp -+ src/gradient.cpp -+ src/group/group_layout_manager.cpp -+ src/group/group_rule.cpp -+ src/group/group_symbolizer_helper.cpp -+ src/image.cpp -+ src/image_any.cpp -+ src/image_compositing.cpp -+ src/image_copy.cpp -+ src/image_filter_grammar.cpp -+ src/image_filter_types.cpp -+ src/image_options.cpp -+ src/image_reader.cpp -+ src/image_scaling.cpp -+ src/image_util.cpp -+ src/image_util_jpeg.cpp -+ src/image_util_png.cpp -+ src/image_util_tiff.cpp -+ src/image_util_webp.cpp -+ src/image_view.cpp -+ src/image_view_any.cpp -+ src/layer.cpp -+ src/load_map.cpp -+ src/map.cpp -+ src/math.cpp -+ src/mapped_memory_cache.cpp -+ src/marker_cache.cpp -+ src/marker_helpers.cpp -+ src/memory_datasource.cpp -+ src/palette.cpp -+ src/params.cpp -+ src/parse_path.cpp -+ src/parse_transform.cpp -+ src/plugin.cpp -+ src/proj_transform.cpp -+ src/projection.cpp -+ src/raster_colorizer.cpp -+ src/renderer_common.cpp -+ src/renderer_common/pattern_alignment.cpp -+ src/renderer_common/render_group_symbolizer.cpp -+ src/renderer_common/render_markers_symbolizer.cpp -+ src/renderer_common/render_pattern.cpp -+ src/renderer_common/render_thunk_extractor.cpp -+ src/request.cpp -+ src/rule.cpp -+ src/save_map.cpp -+ src/scale_denominator.cpp -+ src/simplify.cpp -+ src/svg/svg_parser.cpp -+ src/svg/svg_path_parser.cpp -+ src/svg/svg_points_parser.cpp -+ src/svg/svg_transform_parser.cpp -+ src/symbolizer.cpp -+ src/symbolizer_enumerations.cpp -+ src/symbolizer_keys.cpp -+ src/text/face.cpp -+ src/text/font_feature_settings.cpp -+ src/text/font_library.cpp -+ src/text/formatting/base.cpp -+ src/text/formatting/format.cpp -+ src/text/formatting/layout.cpp -+ src/text/formatting/list.cpp -+ src/text/formatting/registry.cpp -+ src/text/formatting/text.cpp -+ src/text/glyph_positions.cpp -+ src/text/itemizer.cpp -+ src/text/placement_finder.cpp -+ src/text/placements/base.cpp -+ src/text/placements/dummy.cpp -+ src/text/placements/list.cpp -+ src/text/placements/registry.cpp -+ src/text/placements/simple.cpp -+ src/text/properties_util.cpp -+ src/text/renderer.cpp -+ src/text/scrptrun.cpp -+ src/text/symbolizer_helpers.cpp -+ src/text/text_layout.cpp -+ src/text/text_line.cpp -+ src/text/text_properties.cpp -+ src/transform_expression.cpp -+ src/transform_expression_grammar.cpp -+ src/twkb.cpp -+ src/unicode.cpp -+ src/util/utf_conv_win.cpp -+ src/value.cpp -+ src/vertex_adapters.cpp -+ src/vertex_cache.cpp -+ src/warp.cpp -+ src/well_known_srs.cpp -+ src/wkb.cpp -+ src/xml_tree.cpp -+ ) -+ -+ -+set(MAPNIK_AGG_SOURCES -+ src/agg/agg_renderer.cpp -+ src/agg/process_building_symbolizer.cpp -+ src/agg/process_debug_symbolizer.cpp -+ src/agg/process_dot_symbolizer.cpp -+ src/agg/process_group_symbolizer.cpp -+ src/agg/process_line_pattern_symbolizer.cpp -+ src/agg/process_line_symbolizer.cpp -+ src/agg/process_markers_symbolizer.cpp -+ src/agg/process_point_symbolizer.cpp -+ src/agg/process_polygon_pattern_symbolizer.cpp -+ src/agg/process_polygon_symbolizer.cpp -+ src/agg/process_raster_symbolizer.cpp -+ src/agg/process_shield_symbolizer.cpp -+ src/agg/process_text_symbolizer.cpp) -+ -+ -+set(AGG_SOURCES -+ deps/agg/src/agg_arc.cpp -+ deps/agg/src/agg_arrowhead.cpp -+ deps/agg/src/agg_bezier_arc.cpp -+ deps/agg/src/agg_bspline.cpp -+ deps/agg/src/agg_curves.cpp -+ deps/agg/src/agg_embedded_raster_fonts.cpp -+ deps/agg/src/agg_gsv_text.cpp -+ deps/agg/src/agg_image_filters.cpp -+ deps/agg/src/agg_line_aa_basics.cpp -+ deps/agg/src/agg_line_profile_aa.cpp -+ deps/agg/src/agg_pixfmt_rgba.cpp -+ deps/agg/src/agg_rounded_rect.cpp -+ deps/agg/src/agg_sqrt_tables.cpp -+ deps/agg/src/agg_trans_affine.cpp -+ deps/agg/src/agg_trans_double_path.cpp -+ deps/agg/src/agg_trans_single_path.cpp -+ deps/agg/src/agg_trans_warp_magnifier.cpp -+ deps/agg/src/agg_vcgen_bspline.cpp -+ deps/agg/src/agg_vcgen_contour.cpp -+ deps/agg/src/agg_vcgen_dash.cpp -+ deps/agg/src/agg_vcgen_markers_term.cpp -+ deps/agg/src/agg_vcgen_stroke.cpp -+ deps/agg/src/agg_vcgen_smooth_poly1.cpp -+ deps/agg/src/agg_vpgen_clip_polygon.cpp -+ deps/agg/src/agg_vpgen_clip_polyline.cpp -+ deps/agg/src/agg_vpgen_segmentator.cpp ) -+ -+set(MAPNIK_INC -+ mapnik/adaptive_smooth.hpp -+ mapnik/agg_helpers.hpp -+ mapnik/agg_pattern_source.hpp -+ mapnik/agg_rasterizer.hpp -+ mapnik/agg_renderer.hpp -+ mapnik/agg_render_marker.hpp -+ mapnik/attribute.hpp -+ mapnik/attribute_collector.hpp -+ mapnik/attribute_descriptor.hpp -+ mapnik/boolean.hpp -+ mapnik/boost_spirit_instantiate.hpp -+ mapnik/cairo_io.hpp -+ mapnik/color.hpp -+ mapnik/color_factory.hpp -+ mapnik/config.hpp -+ mapnik/config_error.hpp -+ mapnik/coord.hpp -+ mapnik/css_color_grammar.hpp -+ mapnik/css_color_grammar_impl.hpp -+ mapnik/cxx11_support.hpp -+ mapnik/datasource.hpp -+ mapnik/datasource_cache.hpp -+ mapnik/datasource_geometry_type.hpp -+ mapnik/debug.hpp -+ mapnik/enumeration.hpp -+ mapnik/evaluate_global_attributes.hpp -+ mapnik/expression.hpp -+ mapnik/expression_evaluator.hpp -+ mapnik/expression_grammar.hpp -+ mapnik/expression_grammar_config.hpp -+ mapnik/expression_grammar_def.hpp -+ mapnik/expression_node.hpp -+ mapnik/expression_node_types.hpp -+ mapnik/expression_string.hpp -+ mapnik/extend_converter.hpp -+ mapnik/factory.hpp -+ mapnik/feature.hpp -+ mapnik/featureset.hpp -+ mapnik/feature_factory.hpp -+ mapnik/feature_kv_iterator.hpp -+ mapnik/feature_layer_desc.hpp -+ mapnik/feature_style_processor.hpp -+ mapnik/feature_style_processor_context.hpp -+ mapnik/feature_style_processor_impl.hpp -+ mapnik/feature_type_style.hpp -+ mapnik/filter_featureset.hpp -+ mapnik/font_engine_freetype.hpp -+ mapnik/font_set.hpp -+ mapnik/function_call.hpp -+ mapnik/geometry.hpp -+ mapnik/geom_util.hpp -+ mapnik/global.hpp -+ mapnik/gradient.hpp -+ mapnik/grid_vertex_converter.hpp -+ mapnik/hextree.hpp -+ mapnik/hit_test_filter.hpp -+ mapnik/image.hpp -+ mapnik/image_any.hpp -+ mapnik/image_compositing.hpp -+ mapnik/image_copy.hpp -+ mapnik/image_filter.hpp -+ mapnik/image_filter_grammar.hpp -+ mapnik/image_filter_grammar_def.hpp -+ mapnik/image_filter_types.hpp -+ mapnik/image_impl.hpp -+ mapnik/image_null.hpp -+ mapnik/image_options.hpp -+ mapnik/image_reader.hpp -+ mapnik/image_scaling.hpp -+ mapnik/image_scaling_traits.hpp -+ mapnik/image_util.hpp -+ mapnik/image_util_jpeg.hpp -+ mapnik/image_util_png.hpp -+ mapnik/image_util_tiff.hpp -+ mapnik/image_util_webp.hpp -+ mapnik/image_view.hpp -+ mapnik/image_view_any.hpp -+ mapnik/image_view_impl.hpp -+ mapnik/image_view_null.hpp -+ mapnik/init_priority.hpp -+ mapnik/jpeg_io.hpp -+ mapnik/label_collision_detector.hpp -+ mapnik/layer.hpp -+ mapnik/load_map.hpp -+ mapnik/make_unique.hpp -+ mapnik/map.hpp -+ mapnik/mapped_memory_cache.hpp -+ mapnik/marker.hpp -+ mapnik/markers_placement.hpp -+ mapnik/marker_cache.hpp -+ mapnik/marker_helpers.hpp -+ mapnik/memory_datasource.hpp -+ mapnik/memory_featureset.hpp -+ mapnik/octree.hpp -+ mapnik/offset_converter.hpp -+ mapnik/palette.hpp -+ mapnik/params.hpp -+ mapnik/params_impl.hpp -+ mapnik/parse_path.hpp -+ mapnik/path.hpp -+ mapnik/path_expression.hpp -+ mapnik/path_expression_grammar.hpp -+ mapnik/path_expression_grammar_def.hpp -+ mapnik/pixel_position.hpp -+ mapnik/pixel_types.hpp -+ mapnik/plugin.hpp -+ mapnik/png_io.hpp -+ mapnik/pool.hpp -+ mapnik/projection.hpp -+ mapnik/proj_strategy.hpp -+ mapnik/proj_transform.hpp -+ mapnik/ptree_helpers.hpp -+ mapnik/quad_tree.hpp -+ mapnik/query.hpp -+ mapnik/raster.hpp -+ mapnik/raster_colorizer.hpp -+ mapnik/renderer_common.hpp -+ mapnik/request.hpp -+ mapnik/rule.hpp -+ mapnik/rule_cache.hpp -+ mapnik/safe_cast.hpp -+ mapnik/save_map.hpp -+ mapnik/scale_denominator.hpp -+ mapnik/simplify.hpp -+ mapnik/simplify_converter.hpp -+ mapnik/span_image_filter.hpp -+ mapnik/sql_utils.hpp -+ mapnik/sse.hpp -+ mapnik/stringify_macro.hpp -+ mapnik/symbolizer.hpp -+ mapnik/symbolizer_base.hpp -+ mapnik/symbolizer_default_values.hpp -+ mapnik/symbolizer_dispatch.hpp -+ mapnik/symbolizer_enumerations.hpp -+ mapnik/symbolizer_hash.hpp -+ mapnik/symbolizer_keys.hpp -+ mapnik/symbolizer_utils.hpp -+ mapnik/tiff_io.hpp -+ mapnik/timer.hpp -+ mapnik/tolerance_iterator.hpp -+ mapnik/transform_path_adapter.hpp -+ mapnik/unicode.hpp -+ mapnik/value.hpp -+ mapnik/version.hpp -+ mapnik/vertex.hpp -+ mapnik/vertex_adapters.hpp -+ mapnik/vertex_cache.hpp -+ mapnik/vertex_converters.hpp -+ mapnik/vertex_processor.hpp -+ mapnik/vertex_vector.hpp -+ mapnik/view_strategy.hpp -+ mapnik/view_transform.hpp -+ mapnik/warning_ignore.hpp -+ mapnik/warning_ignore_agg.hpp -+ mapnik/warp.hpp -+ mapnik/webp_io.hpp -+ mapnik/well_known_srs.hpp -+ mapnik/wkb.hpp -+ mapnik/xml_attribute_cast.hpp -+ mapnik/xml_loader.hpp -+ mapnik/xml_node.hpp -+ mapnik/xml_tree.hpp -+ mapnik/geometry/boost_adapters.hpp -+ mapnik/geometry/boost_spirit_karma_adapter.hpp -+ mapnik/geometry/box2d.hpp -+ mapnik/geometry/box2d_impl.hpp -+ mapnik/geometry/centroid.hpp -+ mapnik/geometry/closest_point.hpp -+ mapnik/geometry/correct.hpp -+ mapnik/geometry/envelope.hpp -+ mapnik/geometry/envelope_impl.hpp -+ mapnik/geometry/fusion_adapted.hpp -+ mapnik/geometry/geometry_type.hpp -+ mapnik/geometry/geometry_types.hpp -+ mapnik/geometry/interior.hpp -+ mapnik/geometry/is_empty.hpp -+ mapnik/geometry/is_simple.hpp -+ mapnik/geometry/is_valid.hpp -+ mapnik/geometry/line_string.hpp -+ mapnik/geometry/multi_line_string.hpp -+ mapnik/geometry/multi_point.hpp -+ mapnik/geometry/multi_polygon.hpp -+ mapnik/geometry/point.hpp -+ mapnik/geometry/polygon.hpp -+ mapnik/geometry/polygon_vertex_processor.hpp -+ mapnik/geometry/polylabel.hpp -+ mapnik/geometry/remove_empty.hpp -+ mapnik/geometry/reprojection.hpp -+ mapnik/geometry/reprojection_impl.hpp -+ mapnik/geometry/strategy.hpp -+ mapnik/geometry/to_path.hpp -+ mapnik/geometry/transform.hpp -+ mapnik/csv/csv_grammar_x3.hpp -+ mapnik/csv/csv_grammar_x3_def.hpp -+ mapnik/csv/csv_types.hpp -+ mapnik/svg/geometry_svg_generator.hpp -+ mapnik/svg/geometry_svg_generator_impl.hpp -+ mapnik/svg/svg_converter.hpp -+ mapnik/svg/svg_grammar_config_x3.hpp -+ mapnik/svg/svg_parser.hpp -+ mapnik/svg/svg_parser_exception.hpp -+ mapnik/svg/svg_path_adapter.hpp -+ mapnik/svg/svg_path_attributes.hpp -+ mapnik/svg/svg_path_commands.hpp -+ mapnik/svg/svg_path_grammar_x3.hpp -+ mapnik/svg/svg_path_grammar_x3_def.hpp -+ mapnik/svg/svg_path_parser.hpp -+ mapnik/svg/svg_renderer_agg.hpp -+ mapnik/svg/svg_storage.hpp -+ mapnik/svg/svg_transform_grammar_x3.hpp -+ mapnik/svg/svg_transform_grammar_x3_def.hpp -+ mapnik/wkt/wkt_factory.hpp -+ mapnik/wkt/wkt_generator_grammar.hpp -+ mapnik/wkt/wkt_generator_grammar_impl.hpp -+ mapnik/wkt/wkt_grammar_x3.hpp -+ mapnik/wkt/wkt_grammar_x3_def.hpp -+ mapnik/cairo/cairo_context.hpp -+ mapnik/cairo/cairo_image_util.hpp -+ mapnik/cairo/cairo_renderer.hpp -+ mapnik/cairo/cairo_render_vector.hpp -+ mapnik/cairo/render_polygon_pattern.hpp -+ mapnik/grid/grid.hpp -+ mapnik/grid/grid_pixel.hpp -+ mapnik/grid/grid_pixfmt.hpp -+ mapnik/grid/grid_rasterizer.hpp -+ mapnik/grid/grid_renderer.hpp -+ mapnik/grid/grid_renderer_base.hpp -+ mapnik/grid/grid_rendering_buffer.hpp -+ mapnik/grid/grid_render_marker.hpp -+ mapnik/grid/grid_view.hpp -+ mapnik/json/attribute_value_visitor.hpp -+ mapnik/json/create_feature.hpp -+ mapnik/json/create_geometry.hpp -+ mapnik/json/extract_bounding_boxes.hpp -+ mapnik/json/extract_bounding_boxes_config.hpp -+ mapnik/json/feature_generator_grammar.hpp -+ mapnik/json/feature_generator_grammar_impl.hpp -+ mapnik/json/feature_grammar_x3.hpp -+ mapnik/json/feature_grammar_x3_def.hpp -+ mapnik/json/feature_parser.hpp -+ mapnik/json/generic_json_grammar_x3.hpp -+ mapnik/json/generic_json_grammar_x3_def.hpp -+ mapnik/json/geojson_grammar_x3.hpp -+ mapnik/json/geojson_grammar_x3_def.hpp -+ mapnik/json/geometry_generator_grammar.hpp -+ mapnik/json/geometry_generator_grammar_impl.hpp -+ mapnik/json/geometry_parser.hpp -+ mapnik/json/json_grammar_config.hpp -+ mapnik/json/json_value.hpp -+ mapnik/json/parse_feature.hpp -+ mapnik/json/positions_grammar_x3.hpp -+ mapnik/json/positions_grammar_x3_def.hpp -+ mapnik/json/positions_x3.hpp -+ mapnik/json/properties_generator_grammar.hpp -+ mapnik/json/properties_generator_grammar_impl.hpp -+ mapnik/json/stringifier.hpp -+ mapnik/json/topojson_grammar_x3.hpp -+ mapnik/json/topojson_grammar_x3_def.hpp -+ mapnik/json/topojson_utils.hpp -+ mapnik/json/topology.hpp -+ mapnik/json/unicode_string_grammar_x3.hpp -+ mapnik/json/unicode_string_grammar_x3_def.hpp -+ mapnik/json/value_converters.hpp -+ mapnik/util/char_array_buffer.hpp -+ mapnik/util/const_rendering_buffer.hpp -+ mapnik/util/container_adapter.hpp -+ mapnik/util/conversions.hpp -+ mapnik/util/dasharray_parser.hpp -+ mapnik/util/featureset_buffer.hpp -+ mapnik/util/feature_to_geojson.hpp -+ mapnik/util/file_io.hpp -+ mapnik/util/fs.hpp -+ mapnik/util/geometry_to_ds_type.hpp -+ mapnik/util/geometry_to_geojson.hpp -+ mapnik/util/geometry_to_svg.hpp -+ mapnik/util/geometry_to_wkb.hpp -+ mapnik/util/geometry_to_wkt.hpp -+ mapnik/util/hsl.hpp -+ mapnik/util/is_clockwise.hpp -+ mapnik/util/math.hpp -+ mapnik/util/name_to_int.hpp -+ mapnik/util/noncopyable.hpp -+ mapnik/util/path_iterator.hpp -+ mapnik/util/rounding_cast.hpp -+ mapnik/util/singleton.hpp -+ mapnik/util/spatial_index.hpp -+ mapnik/util/spirit_transform_attribute.hpp -+ mapnik/util/timer.hpp -+ mapnik/util/trim.hpp -+ mapnik/util/utf_conv_win.hpp -+ mapnik/util/variant.hpp -+ mapnik/util/variant_io.hpp -+ mapnik/group/group_layout.hpp -+ mapnik/group/group_layout_manager.hpp -+ mapnik/group/group_rule.hpp -+ mapnik/group/group_symbolizer_helper.hpp -+ mapnik/group/group_symbolizer_properties.hpp -+ mapnik/text/color_font_renderer.hpp -+ mapnik/text/evaluated_format_properties_ptr.hpp -+ mapnik/text/face.hpp -+ mapnik/text/font_feature_settings.hpp -+ mapnik/text/font_library.hpp -+ mapnik/text/glyph_info.hpp -+ mapnik/text/glyph_positions.hpp -+ mapnik/text/harfbuzz_shaper.hpp -+ mapnik/text/icu_shaper.hpp -+ mapnik/text/itemizer.hpp -+ mapnik/text/placement_finder.hpp -+ mapnik/text/placement_finder_impl.hpp -+ mapnik/text/properties_util.hpp -+ mapnik/text/renderer.hpp -+ mapnik/text/rotation.hpp -+ mapnik/text/scrptrun.hpp -+ mapnik/text/symbolizer_helpers.hpp -+ mapnik/text/text_layout.hpp -+ mapnik/text/text_line.hpp -+ mapnik/text/text_properties.hpp -+ mapnik/text/placements/base.hpp -+ mapnik/text/placements/dummy.hpp -+ mapnik/text/placements/list.hpp -+ mapnik/text/placements/registry.hpp -+ mapnik/text/placements/simple.hpp -+ mapnik/text/formatting/base.hpp -+ mapnik/text/formatting/format.hpp -+ mapnik/text/formatting/layout.hpp -+ mapnik/text/formatting/list.hpp -+ mapnik/text/formatting/registry.hpp -+ mapnik/text/formatting/text.hpp -+ mapnik/transform/parse_transform.hpp -+ mapnik/transform/transform_expression.hpp -+ mapnik/transform/transform_expression_grammar_x3.hpp -+ mapnik/transform/transform_expression_grammar_x3_def.hpp -+ mapnik/transform/transform_processor.hpp -+ mapnik/markers_placements/basic.hpp -+ mapnik/markers_placements/interior.hpp -+ mapnik/markers_placements/line.hpp -+ mapnik/markers_placements/point.hpp -+ mapnik/markers_placements/polylabel.hpp -+ mapnik/markers_placements/vertex_first.hpp -+ mapnik/markers_placements/vertex_last.hpp -+ mapnik/geometry/boost_adapters.hpp -+ mapnik/geometry/boost_spirit_karma_adapter.hpp -+ mapnik/geometry/box2d.hpp -+ mapnik/geometry/box2d_impl.hpp -+ mapnik/geometry/centroid.hpp -+ mapnik/geometry/closest_point.hpp -+ mapnik/geometry/correct.hpp -+ mapnik/geometry/envelope.hpp -+ mapnik/geometry/envelope_impl.hpp -+ mapnik/geometry/fusion_adapted.hpp -+ mapnik/geometry/geometry_type.hpp -+ mapnik/geometry/geometry_types.hpp -+ mapnik/geometry/interior.hpp -+ mapnik/geometry/is_empty.hpp -+ mapnik/geometry/is_simple.hpp -+ mapnik/geometry/is_valid.hpp -+ mapnik/geometry/line_string.hpp -+ mapnik/geometry/multi_line_string.hpp -+ mapnik/geometry/multi_point.hpp -+ mapnik/geometry/multi_polygon.hpp -+ mapnik/geometry/point.hpp -+ mapnik/geometry/polygon.hpp -+ mapnik/geometry/polygon_vertex_processor.hpp -+ mapnik/geometry/polylabel.hpp -+ mapnik/geometry/remove_empty.hpp -+ mapnik/geometry/reprojection.hpp -+ mapnik/geometry/reprojection_impl.hpp -+ mapnik/geometry/strategy.hpp -+ mapnik/geometry/to_path.hpp -+ mapnik/geometry/transform.hpp -+ mapnik/value/error.hpp -+ mapnik/value/hash.hpp -+ mapnik/value/types.hpp) -+ -+set(MAPNIK_INC ${MAPNIK_INC} -+ mapnik/svg/output/svg_generator.hpp -+ mapnik/svg/output/svg_output_attributes.hpp -+ mapnik/svg/output/svg_output_grammars.hpp -+ mapnik/svg/output/svg_output_grammars_impl.hpp -+ mapnik/svg/output/svg_path_iterator.hpp -+ mapnik/svg/output/svg_renderer.hpp) -+ -+set(MAPNIK_INC ${MAPNIK_INC} -+ mapnik/grid/grid.hpp -+ mapnik/grid/grid_pixel.hpp -+ mapnik/grid/grid_pixfmt.hpp -+ mapnik/grid/grid_rasterizer.hpp -+ mapnik/grid/grid_renderer.hpp -+ mapnik/grid/grid_renderer_base.hpp -+ mapnik/grid/grid_rendering_buffer.hpp -+ mapnik/grid/grid_render_marker.hpp -+ mapnik/grid/grid_view.hpp) -\ No newline at end of file -diff --git a/include/mapnik/config.hpp b/include/mapnik/config.hpp -index a9168e5..9bdcad4 100644 ---- a/include/mapnik/config.hpp -+++ b/include/mapnik/config.hpp -@@ -30,8 +30,10 @@ - # define MAPNIK_IMP __declspec (dllimport) - # ifdef MAPNIK_EXPORTS - # define MAPNIK_DECL __declspec (dllexport) --# else -+# elif !defined(MAPNIK_STATICLIB) - # define MAPNIK_DECL __declspec (dllimport) -+# else -+# define MAPNIK_DECL - # endif - # pragma warning( disable: 4251 ) - # pragma warning( disable: 4275 ) -diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp -index aae2bf3..6484dd3 100644 ---- a/include/mapnik/geometry.hpp -+++ b/include/mapnik/geometry.hpp -@@ -146,7 +146,7 @@ struct geometry : geometry_base - { - using coord_type = T; - --#if __cpp_inheriting_constructors >= 200802 -+#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) - - using geometry_base::geometry_base; - -diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp -index 65c04c4..6c04609 100644 ---- a/include/mapnik/json/generic_json.hpp -+++ b/include/mapnik/json/generic_json.hpp -@@ -57,7 +57,7 @@ using json_value_base = mapnik::util::variant >; - struct json_value : json_value_base - { --#if __cpp_inheriting_constructors >= 200802 -+#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) - - using json_value_base::json_value_base; - -diff --git a/plugins/input/csv/CMakeLists.txt b/plugins/input/csv/CMakeLists.txt -new file mode 100644 -index 0000000..34a2e75 ---- /dev/null -+++ b/plugins/input/csv/CMakeLists.txt -@@ -0,0 +1,12 @@ -+add_library(mapnik-input-csv SHARED -+ csv_datasource.cpp -+ csv_featureset.cpp -+ csv_index_featureset.cpp -+ csv_inline_featureset.cpp -+ csv_utils.cpp) -+ -+target_link_libraries(mapnik-input-csv PUBLIC mapnik mapnik-wkt mapnik-json) -+set_target_properties(mapnik-input-csv PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-csv PROPERTIES OUTPUT_NAME "csv") -+set_target_properties(mapnik-input-csv PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-csv DESTINATION bin/plugins/input) -\ No newline at end of file -diff --git a/plugins/input/gdal/CMakeLists.txt b/plugins/input/gdal/CMakeLists.txt -new file mode 100644 -index 0000000..274ee44 ---- /dev/null -+++ b/plugins/input/gdal/CMakeLists.txt -@@ -0,0 +1,9 @@ -+add_library(mapnik-input-gdal SHARED -+ gdal_datasource.cpp -+ gdal_featureset.cpp) -+ -+target_link_libraries(mapnik-input-gdal PUBLIC mapnik ${GDAL_LIBRARIES}) -+set_target_properties(mapnik-input-gdal PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-gdal PROPERTIES OUTPUT_NAME "gdal") -+set_target_properties(mapnik-input-gdal PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-gdal DESTINATION bin/plugins/input) -diff --git a/plugins/input/geobuf/CMakeLists.txt b/plugins/input/geobuf/CMakeLists.txt -new file mode 100644 -index 0000000..1b798e5 ---- /dev/null -+++ b/plugins/input/geobuf/CMakeLists.txt -@@ -0,0 +1,9 @@ -+add_library(mapnik-input-geobuf SHARED -+ geobuf_datasource.cpp -+ geobuf_featureset.cpp) -+ -+target_link_libraries(mapnik-input-geobuf PUBLIC mapnik) -+set_target_properties(mapnik-input-geobuf PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-geobuf PROPERTIES OUTPUT_NAME "geobuf") -+set_target_properties(mapnik-input-geobuf PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-geobuf DESTINATION bin/plugins/input) -diff --git a/plugins/input/geojson/CMakeLists.txt b/plugins/input/geojson/CMakeLists.txt -new file mode 100644 -index 0000000..fb53a3c ---- /dev/null -+++ b/plugins/input/geojson/CMakeLists.txt -@@ -0,0 +1,11 @@ -+add_library(mapnik-input-geojson SHARED -+ geojson_datasource.cpp -+ geojson_featureset.cpp -+ geojson_index_featureset.cpp -+ geojson_memory_index_featureset.cpp) -+ -+target_link_libraries(mapnik-input-geojson PUBLIC mapnik mapnik-json) -+set_target_properties(mapnik-input-geojson PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-geojson PROPERTIES OUTPUT_NAME "geojson") -+set_target_properties(mapnik-input-geojson PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-geojson DESTINATION bin/plugins/input) -diff --git a/plugins/input/ogr/CMakeLists.txt b/plugins/input/ogr/CMakeLists.txt -new file mode 100644 -index 0000000..6d7fd9a ---- /dev/null -+++ b/plugins/input/ogr/CMakeLists.txt -@@ -0,0 +1,11 @@ -+add_library(mapnik-input-ogr SHARED -+ ogr_converter.cpp -+ ogr_datasource.cpp -+ ogr_featureset.cpp -+ ogr_index_featureset.cpp) -+ -+target_link_libraries(mapnik-input-ogr PUBLIC mapnik ${OGR_LIBRARIES} ${GDAL_LIBRARIES}) -+set_target_properties(mapnik-input-ogr PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-ogr PROPERTIES OUTPUT_NAME "ogr") -+set_target_properties(mapnik-input-ogr PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-ogr DESTINATION bin/plugins/input) -diff --git a/plugins/input/pgraster/CMakeLists.txt b/plugins/input/pgraster/CMakeLists.txt -new file mode 100644 -index 0000000..ada5d08 ---- /dev/null -+++ b/plugins/input/pgraster/CMakeLists.txt -@@ -0,0 +1,10 @@ -+add_library(mapnik-input-pgraster SHARED -+ pgraster_datasource.cpp -+ pgraster_featureset.cpp -+ pgraster_wkb_reader.cpp) -+ -+target_link_libraries(mapnik-input-pgraster PUBLIC mapnik ${PostgreSQL_LIBRARIES}) -+set_target_properties(mapnik-input-pgraster PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-pgraster PROPERTIES OUTPUT_NAME "pgraster") -+set_target_properties(mapnik-input-pgraster PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-pgraster DESTINATION bin/plugins/input) -diff --git a/plugins/input/postgis/CMakeLists.txt b/plugins/input/postgis/CMakeLists.txt -new file mode 100644 -index 0000000..385faa3 ---- /dev/null -+++ b/plugins/input/postgis/CMakeLists.txt -@@ -0,0 +1,9 @@ -+add_library(mapnik-input-postgis SHARED -+ postgis_datasource.cpp -+ postgis_featureset.cpp ) -+ -+target_link_libraries(mapnik-input-postgis PUBLIC mapnik ${PostgreSQL_LIBRARIES}) -+set_target_properties(mapnik-input-postgis PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-postgis PROPERTIES OUTPUT_NAME "postgis") -+set_target_properties(mapnik-input-postgis PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-postgis DESTINATION bin/plugins/input) -diff --git a/plugins/input/raster/CMakeLists.txt b/plugins/input/raster/CMakeLists.txt -new file mode 100644 -index 0000000..b08be98 ---- /dev/null -+++ b/plugins/input/raster/CMakeLists.txt -@@ -0,0 +1,10 @@ -+add_library(mapnik-input-raster SHARED -+ raster_datasource.cpp -+ raster_featureset.cpp -+ raster_info.cpp) -+ -+target_link_libraries(mapnik-input-raster PUBLIC mapnik) -+set_target_properties(mapnik-input-raster PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-raster PROPERTIES OUTPUT_NAME "raster") -+set_target_properties(mapnik-input-raster PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-raster DESTINATION bin/plugins/input) -diff --git a/plugins/input/shape/CMakeLists.txt b/plugins/input/shape/CMakeLists.txt -new file mode 100644 -index 0000000..cac54dd ---- /dev/null -+++ b/plugins/input/shape/CMakeLists.txt -@@ -0,0 +1,9 @@ -+SET(INPUT_SHAPE_SOURCES -+ dbfile.cpp dbf_test.cpp shape_datasource.cpp shape_featureset.cpp shape_index_featureset.cpp shape_io.cpp shape_utils.cpp) -+ -+add_library(mapnik-input-shape SHARED ${INPUT_SHAPE_SOURCES}) -+target_link_libraries(mapnik-input-shape PUBLIC mapnik) -+set_target_properties(mapnik-input-shape PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-shape PROPERTIES OUTPUT_NAME "shape") -+set_target_properties(mapnik-input-shape PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-shape DESTINATION bin/plugins/input) -diff --git a/plugins/input/sqlite/CMakeLists.txt b/plugins/input/sqlite/CMakeLists.txt -new file mode 100644 -index 0000000..b84528e ---- /dev/null -+++ b/plugins/input/sqlite/CMakeLists.txt -@@ -0,0 +1,9 @@ -+add_library(mapnik-input-sqlite SHARED -+ sqlite_datasource.cpp -+ sqlite_featureset.cpp) -+ -+target_link_libraries(mapnik-input-sqlite PUBLIC mapnik SQLite::SQLite3) -+set_target_properties(mapnik-input-sqlite PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-sqlite PROPERTIES OUTPUT_NAME "sqlite") -+set_target_properties(mapnik-input-sqlite PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-sqlite DESTINATION bin/plugins/input) -diff --git a/plugins/input/topojson/CMakeLists.txt b/plugins/input/topojson/CMakeLists.txt -new file mode 100644 -index 0000000..aeb559b ---- /dev/null -+++ b/plugins/input/topojson/CMakeLists.txt -@@ -0,0 +1,9 @@ -+add_library(mapnik-input-topojson SHARED -+ topojson_datasource.cpp -+ topojson_featureset.cpp) -+ -+target_link_libraries(mapnik-input-topojson PUBLIC mapnik mapnik-json) -+set_target_properties(mapnik-input-topojson PROPERTIES PREFIX "") -+set_target_properties(mapnik-input-topojson PROPERTIES OUTPUT_NAME "topojson") -+set_target_properties(mapnik-input-topojson PROPERTIES SUFFIX ".input") -+install(TARGETS mapnik-input-topojson DESTINATION bin/plugins/input) -diff --git a/src/agg/CMakeLists.txt b/src/agg/CMakeLists.txt -new file mode 100644 -index 0000000..e69de29 -diff --git a/src/geometry/CMakeLists.txt b/src/geometry/CMakeLists.txt -new file mode 100644 -index 0000000..e69de29 -diff --git a/src/json/CMakeLists.txt b/src/json/CMakeLists.txt -new file mode 100644 -index 0000000..76a23b9 ---- /dev/null -+++ b/src/json/CMakeLists.txt -@@ -0,0 +1,17 @@ -+add_library(mapnik-json STATIC -+ generic_json.cpp -+ mapnik_geometry_to_geojson.cpp -+ mapnik_json_feature_collection_grammar.cpp -+ mapnik_json_feature_grammar.cpp -+ mapnik_json_generator_grammar.cpp -+ mapnik_json_geometry_grammar.cpp -+ mapnik_json_geometry_parser.cpp -+ mapnik_json_positions_grammar.cpp -+ mapnik_topojson_grammar.cpp -+) -+ -+ -+target_link_libraries(mapnik-json INTERFACE ${ICUU_LIB}) -+ -+install(TARGETS mapnik-json LIBRARY DESTINATION lib) -+target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) -diff --git a/src/wkt/CMakeLists.txt b/src/wkt/CMakeLists.txt -new file mode 100644 -index 0000000..dbaf010 ---- /dev/null -+++ b/src/wkt/CMakeLists.txt -@@ -0,0 +1,7 @@ -+add_library(mapnik-wkt STATIC -+ mapnik_wkt_grammar.cpp -+ mapnik_wkt_generator_grammar.cpp -+) -+ -+install(TARGETS mapnik-wkt LIBRARY DESTINATION lib) -+target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) -diff --git a/utils/mapnik-render/CMakeLists.txt b/utils/mapnik-render/CMakeLists.txt -new file mode 100644 -index 0000000..7cfff00 ---- /dev/null -+++ b/utils/mapnik-render/CMakeLists.txt -@@ -0,0 +1,3 @@ -+add_executable(mapnik-render mapnik-render.cpp) -+target_link_libraries(mapnik-render PRIVATE mapnik) -+install(TARGETS mapnik-render DESTINATION tools) -diff --git a/utils/shapeindex/CMakeLists.txt b/utils/shapeindex/CMakeLists.txt -new file mode 100644 -index 0000000..484200a ---- /dev/null -+++ b/utils/shapeindex/CMakeLists.txt -@@ -0,0 +1,4 @@ -+add_executable(shapeindex shapeindex.cpp) -+target_link_libraries(shapeindex PRIVATE mapnik) -+target_include_directories(shapeindex PRIVATE ../../plugins/input/shape) -+install(TARGETS shapeindex DESTINATION tools) diff --git a/ports/mapnik/0002-sqlitepixelwidth.patch b/ports/mapnik/0002-sqlitepixelwidth.patch deleted file mode 100644 index df0e27ac13ee03..00000000000000 --- a/ports/mapnik/0002-sqlitepixelwidth.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff --git a/plugins/input/sqlite/sqlite_datasource.cpp b/plugins/input/sqlite/sqlite_datasource.cpp -index 28add64..286edce 100644 ---- a/plugins/input/sqlite/sqlite_datasource.cpp -+++ b/plugins/input/sqlite/sqlite_datasource.cpp -@@ -67,6 +67,8 @@ sqlite_datasource::sqlite_datasource(parameters const& params) - row_offset_(*params.get("row_offset", 0)), - row_limit_(*params.get("row_limit", 0)), - intersects_token_("!intersects!"), -+ pixel_width_token_("!pixel_width!"), -+ pixel_height_token_("!pixel_height!"), - desc_(sqlite_datasource::name(), *params.get("encoding", "utf-8")), - format_(mapnik::wkbAuto) - { -@@ -211,7 +213,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params) - if (using_subquery_) - { - std::ostringstream s; -- std::string query = populate_tokens(table_); -+ std::string query = populate_tokens(table_,0,0); - s << "SELECT " << fields_ << " FROM (" << query << ") LIMIT 1"; - found_types_via_subquery = sqlite_utils::detect_types_from_subquery( - s.str(), -@@ -333,7 +335,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params) - mapnik::progress_timer __stats2__(std::clog, "sqlite_datasource::init(detect_extent)"); - #endif - // TODO - clean this up - reducing arguments -- std::string query = populate_tokens(table_); -+ std::string query = populate_tokens(table_,0,0); - if (!sqlite_utils::detect_extent(dataset_, - has_spatial_index_, - extent_, -@@ -356,7 +358,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params) - - } - --std::string sqlite_datasource::populate_tokens(std::string const& sql) const -+std::string sqlite_datasource::populate_tokens(std::string const& sql, double pixel_width, double pixel_height) const - { - std::string populated_sql = sql; - if (boost::algorithm::ifind_first(populated_sql, intersects_token_)) -@@ -364,6 +366,19 @@ std::string sqlite_datasource::populate_tokens(std::string const& sql) const - // replace with dummy comparison that is true - boost::algorithm::ireplace_first(populated_sql, intersects_token_, "1=1"); - } -+ if (boost::algorithm::icontains(sql, pixel_width_token_)) -+ { -+ std::ostringstream ss; -+ ss << pixel_width; -+ boost::algorithm::replace_all(populated_sql, pixel_width_token_, ss.str()); -+ } -+ if (boost::algorithm::icontains(sql, pixel_height_token_)) -+ { -+ std::ostringstream ss; -+ ss << pixel_height; -+ boost::algorithm::replace_all(populated_sql, pixel_height_token_, ss.str()); -+ } -+ - return populated_sql; - } - -@@ -487,6 +502,8 @@ featureset_ptr sqlite_datasource::features(query const& q) const - mapnik::box2d const& e = q.get_bbox(); - - std::ostringstream s; -+ const double px_gw = 1.0 / std::get<0>(q.resolution()); -+ const double px_gh = 1.0 / std::get<1>(q.resolution()); - mapnik::context_ptr ctx = std::make_shared(); - - s << "SELECT " << geometry_field_; -@@ -521,10 +538,8 @@ featureset_ptr sqlite_datasource::features(query const& q) const - geometry_table_, - intersects_token_); - } -- else -- { -- query = populate_tokens(table_); -- } -+ -+ query = populate_tokens(table_,px_gw,px_gh); - - s << query ; - -@@ -601,10 +616,7 @@ featureset_ptr sqlite_datasource::features_at_point(coord2d const& pt, double to - geometry_table_, - intersects_token_); - } -- else -- { -- query = populate_tokens(table_); -- } -+ query = populate_tokens(table_,0,0); - - s << query ; - -diff --git a/plugins/input/sqlite/sqlite_datasource.hpp b/plugins/input/sqlite/sqlite_datasource.hpp -index eab71e9..be35f37 100644 ---- a/plugins/input/sqlite/sqlite_datasource.hpp -+++ b/plugins/input/sqlite/sqlite_datasource.hpp -@@ -62,10 +62,10 @@ private: - // Fill init_statements with any statements - // needed to attach auxillary databases - void parse_attachdb(std::string const& attachdb) const; -- std::string populate_tokens(std::string const& sql) const; -+ std::string populate_tokens(std::string const& sql, double pixel_width, double pixel_height) const; - - mapnik::box2d extent_; -- bool extent_initialized_; -+ bool extent_initialized_; - mapnik::datasource::datasource_t type_; - std::string dataset_name_; - std::shared_ptr dataset_; -@@ -80,6 +80,8 @@ private: - mapnik::value_integer row_limit_; - // TODO - also add to postgis.input - const std::string intersects_token_; -+ const std::string pixel_width_token_; -+ const std::string pixel_height_token_; - mapnik::layer_descriptor desc_; - mapnik::wkbFormat format_; - bool use_spatial_index_; diff --git a/ports/mapnik/CONTROL b/ports/mapnik/CONTROL deleted file mode 100644 index f3a2dffdc4f92c..00000000000000 --- a/ports/mapnik/CONTROL +++ /dev/null @@ -1,58 +0,0 @@ -Source: mapnik -Version: 3.0.22 -Homepage: https://github.com/mapnik/mapnik -Description: Mapnik is an open source toolkit for developing mapping applications. -Build-Depends: libjpeg-turbo, tiff, libpng, libwebp, freetype[bzip2,png], icu, libxml2, harfbuzz[icu], boost-locale[icu], boost-regex[icu], boost-gil, boost-geometry, boost-property-tree, boost-filesystem, boost-system, boost-spirit, boost-program-options, boost-assign, boost-bimap, mapbox-variant, zlib - -Feature: cairo -Description: Cairo renderer -Build-Depends: cairo,cairomm - -Feature: proj4 -Description: PROJ4 Functionalities -Build-Depends: proj4[database] - -Feature: input_csv -Description: CSV input plugin - -Feature: input_gdal -Description: GDAL input plugin -Build-Depends: gdal - -Feature: input_geobuf -Description: GEOBUF input plugin -Build-Depends: protozero - -Feature: input_geojson -Description: GEOJSON input plugin - -Feature: input_ogr -Description: OGR input plugin -Build-Depends: gdal - -Feature: input_pgraster -Description: PGRASTER input plugin -Build-Depends: libpq, libodb-pgsql - -Feature: input_postgis -Description: POSTGIS input plugin -Build-Depends: libpq, libodb-pgsql - -Feature: input_raster -Description: RASTER input plugin - -Feature: input_shape -Description: SHAPE input plugin - -Feature: input_sqlite -Description: SQLITE input plugin -Build-Depends: sqlite3 - -Feature: input_topojson -Description: TOPOJSON input plugin - -Feature: demo -Description: Make Demo Application - -Feature: utils -Description: Make utilities Application including mapnik-rendrer and shapeindex diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt new file mode 100644 index 00000000000000..426f1f6509b994 --- /dev/null +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -0,0 +1,307 @@ +cmake_minimum_required(VERSION 3.13.4) +project(mapnik) +set(CMAKE_CXX_STANDARD 14) +include(CMakeDependentOption) + + +option(MAPNIK_STATIC_LIB "Build a static library" ON) + +option(WITH_DEMO "Build demo" ON) +option(WITH_VIEWER "Build viewer" OFF) + + +option(WITH_INPUTS "Build input plugins" ON) + +CMAKE_DEPENDENT_OPTION(WITH_INPUT_CSV "Build the csv input plugin" ON "WITH_INPUTS" ON) +CMAKE_DEPENDENT_OPTION(WITH_INPUT_GDAL "Build the gdal input plugin" ON "WITH_INPUTS" ON) +CMAKE_DEPENDENT_OPTION(WITH_INPUT_GEOBUF "Build the geobuf input plugin" OFF "WITH_INPUTS" ON) +CMAKE_DEPENDENT_OPTION(WITH_INPUT_GEOJSON "Build the geojson input plugin" ON "WITH_INPUTS" ON) +CMAKE_DEPENDENT_OPTION(WITH_INPUT_OGR "Build the ogr input plugin" ON "WITH_INPUTS" ON) +CMAKE_DEPENDENT_OPTION(WITH_INPUT_PGRASTER "Build the pgraster input plugin" ON "WITH_INPUTS" ON) +CMAKE_DEPENDENT_OPTION(WITH_INPUT_POSTGIS "Build the postgis input plugin" ON "WITH_INPUTS" ON) +CMAKE_DEPENDENT_OPTION(WITH_INPUT_RASTER "Build the raster input plugin" ON "WITH_INPUTS" ON) +CMAKE_DEPENDENT_OPTION(WITH_INPUT_SHAPE "Build the shape input plugin" ON "WITH_INPUTS" ON) +CMAKE_DEPENDENT_OPTION(WITH_INPUT_SQLITE "Build the sqlite input plugin" ON "WITH_INPUTS" ON) +CMAKE_DEPENDENT_OPTION(WITH_INPUT_TOPOJSON "Build the topojson input plugin" ON "WITH_INPUTS" ON) + +option(WITH_UTILS "Build the utilities" ON ) + +option(WITH_GRID "Use the grid renderer" OFF) +option(WITH_CAIRO "Use cairo" ON) +option(WITH_PROJ4 "Use proj4" ON) + +if(MSVC) + # Force to always compile with W4 + if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") + string(REGEX REPLACE "/W[0-4]" "/W1" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W1") + endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd\"4068\" /wd\"4661\" /wd\"4503\" ") + add_compile_options(/MP) + add_compile_options(-bigobj) #added by @am2222 + add_compile_definitions(ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1) #added by @am2222 for proj4 compile + + +endif() + +find_package(Boost REQUIRED + COMPONENTS filesystem system regex program_options) + +find_package(FreeType REQUIRED) + +find_library(HARFBUZZ_LIB harfbuzz.lib) +find_package(ICU REQUIRED COMPONENTS uc) + +find_package(PNG REQUIRED) +find_package(jpeg REQUIRED) +find_package(tiff REQUIRED) +find_package(WebP REQUIRED) +find_package(LibXml2 REQUIRED) +find_package(ZLIB REQUIRED) + +set (MAPNIK_DEFS + -DHAVE_PNG + -DHAVE_JPEG + -DHAVE_TIFF + -DHAVE_WEBP) + +set(thirdparty_include_paths ${thirdparty_include_paths} + ${JPEG_INCLUDE_DIR} ${WEBP_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}) + +set(thirdparty_libraries ${thirdparty_libraries} + ${JPEG_LIBRARIES} ${WEBP_LIBRARIES} ${LIBXML2_LIBRARIES} ${HARFBUZZ_LIB}) + +# AGG + +include(files.cmake) + +if (WITH_CAIRO) + find_library(CAIRO_LIB_DEBUG cairod) + find_library(CAIRO_LIB_RELEASE cairo) + find_library(CAIRO_GOBJECT_LIB_DEBUG cairo-gobjectd) + find_library(CAIRO_GOBJECT_LIB_RELEASE cairo-gobject) + find_path(CAIRO_INCLUDE_DIR cairo/cairo.h) + + set(thirdparty_include_paths ${thirdparty_include_paths} ${CAIRO_INCLUDE_DIR}) + set(thirdparty_libraries ${thirdparty_libraries} $<$:${CAIRO_LIB_DEBUG}> $<$:${CAIRO_LIB_RELEASE}>) + + set(MAPNIK_SOURCES ${MAPNIK_SOURCES} + src/cairo/process_markers_symbolizer.cpp + src/cairo/process_group_symbolizer.cpp + + src/cairo/cairo_context.cpp + src/cairo/cairo_render_vector.cpp + src/cairo/cairo_renderer.cpp + src/cairo/process_building_symbolizer.cpp + src/cairo/process_debug_symbolizer.cpp + src/cairo/process_line_pattern_symbolizer.cpp + src/cairo/process_line_symbolizer.cpp + src/cairo/process_point_symbolizer.cpp + src/cairo/process_polygon_pattern_symbolizer.cpp + src/cairo/process_polygon_symbolizer.cpp + src/cairo/process_raster_symbolizer.cpp + src/cairo/process_text_symbolizer.cpp) + + set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_CAIRO) +endif() +message(STATUS "Cairo renderer " ${WITH_CAIRO}) + +if (WITH_PROJ4) + find_package(PROJ4 REQUIRED) + set(thirdparty_include_paths ${thirdparty_include_paths} ${PROJ4_INCLUDE_DIRS}) + set(thirdparty_libraries ${thirdparty_libraries} ${PROJ4_LIBRARIES}) + + set(MAPNIK_DEFS ${MAPNIK_DEFS} -DMAPNIK_USE_PROJ4) +endif() + +if (WITH_GRID) + set(MAPNIK_SOURCES ${MAPNIK_SOURCES} + src/grid/grid.cpp + src/grid/grid_renderer.cpp + src/grid/process_building_symbolizer.cpp + src/grid/process_line_pattern_symbolizer.cpp + src/grid/process_line_symbolizer.cpp + src/grid/process_point_symbolizer.cpp + src/grid/process_polygon_pattern_symbolizer.cpp + src/grid/process_polygon_symbolizer.cpp + src/grid/process_raster_symbolizer.cpp + src/grid/process_shield_symbolizer.cpp + src/grid/process_text_symbolizer.cpp) + set(MAPNIK_DEFS ${MAPNIK_DEFS} -DGRID_RENDERER) +ENDIF() +message(STATUS "Grid renderer: " ${WITH_GRID}) + +set(MAPNIK_SOURCES ${MAPNIK_SOURCES} + src/svg/output/svg_output_grammars.cpp + src/svg/output/svg_renderer.cpp + src/svg/output/svg_generator.cpp + src/svg/output/svg_output_attributes.cpp + src/svg/output/process_symbolizers.cpp + src/svg/output/process_line_symbolizer.cpp + src/svg/output/process_polygon_symbolizer.cpp) +set(MAPNIK_DEFS ${MAPNIK_DEFS} -DSVG_RENDERER) + + +set(MAPNIK_SOURCES ${MAPNIK_SOURCES} + src/jpeg_reader.cpp + src/libxml2_loader.cpp + src/png_reader.cpp + src/tiff_reader.cpp + src/webp_reader.cpp + ) + +#set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/rapidxml_loader.cpp) + +set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2 -DBOOST_REGEX_HAS_ICU) + +find_path(MAPBOX_POLYLABEL_INCLUDE_DIRS "mapbox/polylabel.hpp") +find_path(MAPBOX_GEOMETRY_INCLUDE_DIRS "mapbox/feature.hpp") +find_path(MAPBOX_VARIANT_INCLUDE_DIRS "mapbox/optional.hpp") + +set(mapnik_include_paths + include + deps + deps/agg/include) + + + +include_directories( + ${mapnik_include_paths} + ${MAPBOX_POLYLABEL_INCLUDE_DIRS} + ${MAPBOX_GEOMETRY_INCLUDE_DIRS} + ${MAPBOX_VARIANT_INCLUDE_DIRS} + ${thirdparty_include_paths}) + +if (MAPNIK_STATIC_LIB) + message(STATUS "Building static library") + add_library(mapnik STATIC ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) + set_target_properties(mapnik PROPERTIES DEFINE_SYMBOL MAPNIK_STATICLIB) + set(MAPNIK_LIB_DEFINITION -DMAPNIK_STATICLIB) +else () + message(STATUS "Building shared library") + add_library(mapnik SHARED ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) + set_target_properties(mapnik PROPERTIES DEFINE_SYMBOL MAPNIK_EXPORTS) + set(MAPNIK_LIB_DEFINITION ) +endif () + +target_compile_definitions(mapnik PUBLIC ${MAPNIK_DEFS}) + +target_include_directories(mapnik INTERFACE ${mapnik_include_paths} ${thirdparty_include_paths} ) +target_link_libraries(mapnik PUBLIC + ${thirdparty_libraries} + Boost::boost Boost::filesystem Boost::system Boost::regex Boost::program_options Boost::system + Freetype::Freetype + ICU::uc + PNG::PNG + TIFF::TIFF + ZLIB::ZLIB) + + +install(TARGETS mapnik) + +add_subdirectory(src/json) +add_subdirectory(src/wkt) + +# ideally we should also generate mapnik-config + +if (WITH_INPUT_CSV) + add_subdirectory(plugins/input/csv) +endif() + +if (WITH_INPUT_GDAL) + find_package(GDAL REQUIRED) + add_subdirectory(plugins/input/gdal) +endif() + +if (WITH_INPUT_GEOBUF) + add_subdirectory(plugins/input/geobuf) +endif() + +if (WITH_INPUT_GEOJSON) + add_subdirectory(plugins/input/geojson) +endif() + +if (WITH_INPUT_OGR) + add_subdirectory(plugins/input/ogr) +endif() + +if (WITH_INPUT_PGRASTER) + find_package(PostgreSQL REQUIRED) + add_subdirectory(plugins/input/pgraster) +endif() + +if (WITH_INPUT_POSTGIS) + find_package(PostgreSQL REQUIRED) + add_subdirectory(plugins/input/postgis) +endif() + +if (WITH_INPUT_RASTER) + add_subdirectory(plugins/input/raster) +endif() + +if (WITH_INPUT_SHAPE) + add_subdirectory(plugins/input/shape) +endif() + +if (WITH_INPUT_SQLITE) + find_package(sqlite3 REQUIRED) + add_subdirectory(plugins/input/sqlite) +endif() + +if (WITH_INPUT_TOPOJSON) + add_subdirectory(plugins/input/topojson) +endif() + +if (WITH_INPUTS) + message(STATUS "Input plugins:") + if(WITH_INPUT_CSV ) + message(STATUS " - csv ") + endif() + if(WITH_INPUT_GDAL ) + message(STATUS " - gdal ") + endif() + if(WITH_INPUT_GEOBUF ) + message(STATUS " - geobuf ") + endif() + if(WITH_INPUT_GEOJSON ) + message(STATUS " - geojson ") + endif() + if(WITH_INPUT_OGR ) + message(STATUS " - ogr ") + endif() + if(WITH_INPUT_PGRASTER ) + message(STATUS " - pgraster") + endif() + if(WITH_INPUT_POSTGIS ) + message(STATUS " - postgis ") + endif() + if(WITH_INPUT_RASTER ) + message(STATUS " - raster ") + endif() + if(WITH_INPUT_SHAPE ) + message(STATUS " - shape ") + endif() + if(WITH_INPUT_SQLITE ) + message(STATUS " - sqlite ") + endif() + if(WITH_INPUT_TOPOJSON ) + message(STATUS " - topojson") + endif() +else() + message(STATUS "Input plugins OFF") +endif() + +if(WITH_DEMO) + add_subdirectory(demo/c++) +endif() + +if(WITH_VIEWER) + find_package(Qt5 COMPONENTS Widgets REQUIRED) + add_subdirectory(demo/viewer) +endif() + +if(WITH_UTILS) + add_subdirectory(utils/mapnik-render) + add_subdirectory(utils/shapeindex) +endif() \ No newline at end of file diff --git a/ports/mapnik/cmake/demo/c++/CMakeLists.txt b/ports/mapnik/cmake/demo/c++/CMakeLists.txt new file mode 100644 index 00000000000000..0c59904107f109 --- /dev/null +++ b/ports/mapnik/cmake/demo/c++/CMakeLists.txt @@ -0,0 +1,4 @@ +add_executable(mapnik-demo rundemo.cpp) +add_dependencies(mapnik-demo mapnik) +target_link_libraries(mapnik-demo PRIVATE mapnik) +install(TARGETS mapnik-demo DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/cmake/demo/viewer/CMakeLists.txt b/ports/mapnik/cmake/demo/viewer/CMakeLists.txt new file mode 100644 index 00000000000000..b157f98a5a04f7 --- /dev/null +++ b/ports/mapnik/cmake/demo/viewer/CMakeLists.txt @@ -0,0 +1,27 @@ +add_executable(mapnik-viewer + about_dialog.cpp + info_dialog.cpp + layerdelegate.cpp + layerlistmodel.cpp + layerwidget.cpp + layer_info_dialog.cpp + main.cpp + mainwindow.cpp + mapwidget.cpp + styles_model.cpp + + forms/about.ui + forms/info.ui + forms/layer_info.ui + + mapnik_viewer.qrc) + +set_target_properties(mapnik-viewer PROPERTIES + AUTOUIC_SEARCH_PATHS forms + AUTORCC ON + AUTOUIC ON + AUTOMOC ON) + +add_dependencies(mapnik-viewer mapnik) +target_link_libraries(mapnik-viewer PRIVATE mapnik Qt5::Widgets) +install(TARGETS mapnik-viewer DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/cmake/files.cmake b/ports/mapnik/cmake/files.cmake new file mode 100644 index 00000000000000..d3d86d8975cf64 --- /dev/null +++ b/ports/mapnik/cmake/files.cmake @@ -0,0 +1,568 @@ +set (MAPNIK_SOURCES + src/cairo_io.cpp + src/color.cpp + src/color_factory.cpp + src/config_error.cpp + src/conversions_numeric.cpp + src/conversions_string.cpp + src/css/css_color_grammar_x3.cpp + src/css/css_grammar_x3.cpp + src/dasharray_parser.cpp + src/datasource_cache.cpp + src/datasource_cache_static.cpp + src/debug.cpp + src/expression.cpp + src/expression_grammar_x3.cpp + src/expression_node.cpp + src/expression_string.cpp + src/feature_kv_iterator.cpp + src/feature_style_processor.cpp + src/feature_type_style.cpp + src/font_engine_freetype.cpp + src/font_set.cpp + src/fs.cpp + src/function_call.cpp + src/generate_image_filters.cpp + src/geometry/box2d.cpp + src/geometry/closest_point.cpp + src/geometry/envelope.cpp + src/geometry/interior.cpp + src/geometry/polylabel.cpp + src/geometry/reprojection.cpp + src/gradient.cpp + src/group/group_layout_manager.cpp + src/group/group_rule.cpp + src/group/group_symbolizer_helper.cpp + src/image.cpp + src/image_any.cpp + src/image_compositing.cpp + src/image_copy.cpp + src/image_filter_grammar_x3.cpp + src/image_options.cpp + src/image_reader.cpp + src/image_scaling.cpp + src/image_util.cpp + src/image_util_jpeg.cpp + src/image_util_png.cpp + src/image_util_tiff.cpp + src/image_util_webp.cpp + src/image_view.cpp + src/image_view_any.cpp + src/layer.cpp + src/load_map.cpp + src/map.cpp + src/mapped_memory_cache.cpp + src/marker_cache.cpp + src/marker_helpers.cpp + src/memory_datasource.cpp + src/palette.cpp + src/params.cpp + src/parse_image_filters.cpp + src/parse_path.cpp + src/parse_transform.cpp + src/path_expression_grammar_x3.cpp + src/plugin.cpp + src/proj_transform.cpp + src/projection.cpp + src/raster_colorizer.cpp + src/renderer_common.cpp + src/renderer_common/pattern_alignment.cpp + src/renderer_common/render_group_symbolizer.cpp + src/renderer_common/render_markers_symbolizer.cpp + src/renderer_common/render_pattern.cpp + src/renderer_common/render_thunk_extractor.cpp + src/request.cpp + src/rule.cpp + src/save_map.cpp + src/scale_denominator.cpp + src/simplify.cpp + src/svg/svg_parser.cpp + src/svg/svg_path_grammar_x3.cpp + src/svg/svg_path_parser.cpp + src/svg/svg_points_parser.cpp + src/svg/svg_transform_parser.cpp + src/symbolizer.cpp + src/symbolizer_enumerations.cpp + src/symbolizer_keys.cpp + src/text/color_font_renderer.cpp + src/text/face.cpp + src/text/font_feature_settings.cpp + src/text/font_library.cpp + src/text/formatting/base.cpp + src/text/formatting/format.cpp + src/text/formatting/layout.cpp + src/text/formatting/list.cpp + src/text/formatting/registry.cpp + src/text/formatting/text.cpp + src/text/glyph_positions.cpp + src/text/itemizer.cpp + src/text/placement_finder.cpp + src/text/placements/base.cpp + src/text/placements/dummy.cpp + src/text/placements/list.cpp + src/text/placements/registry.cpp + src/text/placements/simple.cpp + src/text/properties_util.cpp + src/text/renderer.cpp + src/text/scrptrun.cpp + src/text/symbolizer_helpers.cpp + src/text/text_layout.cpp + src/text/text_line.cpp + src/text/text_properties.cpp + src/transform_expression.cpp + src/transform_expression_grammar_x3.cpp + src/twkb.cpp + src/unicode.cpp + src/util/math.cpp + src/util/utf_conv_win.cpp + src/value.cpp + src/vertex_adapters.cpp + src/vertex_cache.cpp + src/warp.cpp + src/well_known_srs.cpp + src/wkb.cpp + src/xml_tree.cpp + ) + + +set(MAPNIK_AGG_SOURCES + src/agg/agg_renderer.cpp + src/agg/process_building_symbolizer.cpp + src/agg/process_debug_symbolizer.cpp + src/agg/process_dot_symbolizer.cpp + src/agg/process_group_symbolizer.cpp + src/agg/process_line_pattern_symbolizer.cpp + src/agg/process_line_symbolizer.cpp + src/agg/process_markers_symbolizer.cpp + src/agg/process_point_symbolizer.cpp + src/agg/process_polygon_pattern_symbolizer.cpp + src/agg/process_polygon_symbolizer.cpp + src/agg/process_raster_symbolizer.cpp + src/agg/process_shield_symbolizer.cpp + src/agg/process_text_symbolizer.cpp) + + +set(AGG_SOURCES + deps/agg/src/agg_arc.cpp + deps/agg/src/agg_arrowhead.cpp + deps/agg/src/agg_bezier_arc.cpp + deps/agg/src/agg_bspline.cpp + deps/agg/src/agg_curves.cpp + deps/agg/src/agg_embedded_raster_fonts.cpp + deps/agg/src/agg_gsv_text.cpp + deps/agg/src/agg_image_filters.cpp + deps/agg/src/agg_line_aa_basics.cpp + deps/agg/src/agg_line_profile_aa.cpp + deps/agg/src/agg_pixfmt_rgba.cpp + deps/agg/src/agg_rounded_rect.cpp + deps/agg/src/agg_sqrt_tables.cpp + deps/agg/src/agg_trans_affine.cpp + deps/agg/src/agg_trans_double_path.cpp + deps/agg/src/agg_trans_single_path.cpp + deps/agg/src/agg_trans_warp_magnifier.cpp + deps/agg/src/agg_vcgen_bspline.cpp + deps/agg/src/agg_vcgen_contour.cpp + deps/agg/src/agg_vcgen_dash.cpp + deps/agg/src/agg_vcgen_markers_term.cpp + deps/agg/src/agg_vcgen_stroke.cpp + deps/agg/src/agg_vpgen_clip_polygon.cpp + deps/agg/src/agg_vpgen_clip_polyline.cpp + deps/agg/src/agg_vpgen_segmentator.cpp ) + + +set(MAPNIK_INC + mapnik/adaptive_smooth.hpp + mapnik/agg_helpers.hpp + mapnik/agg_pattern_source.hpp + mapnik/agg_rasterizer.hpp + mapnik/agg_renderer.hpp + mapnik/agg_render_marker.hpp + mapnik/attribute.hpp + mapnik/attribute_collector.hpp + mapnik/attribute_descriptor.hpp + mapnik/boolean.hpp + mapnik/boost_spirit_instantiate.hpp + mapnik/cairo_io.hpp + mapnik/color.hpp + mapnik/color_factory.hpp + mapnik/config.hpp + mapnik/config_error.hpp + mapnik/coord.hpp + mapnik/css/css_color_grammar_x3.hpp + mapnik/css/css_color_grammar_x3_def.hpp + mapnik/css/css_grammar_x3.hpp + mapnik/css/css_grammar_x3_def.hpp + mapnik/css/css_unit_value.hpp + mapnik/cxx11_support.hpp + mapnik/datasource.hpp + mapnik/datasource_cache.hpp + mapnik/datasource_geometry_type.hpp + mapnik/debug.hpp + mapnik/enumeration.hpp + mapnik/evaluate_global_attributes.hpp + mapnik/expression.hpp + mapnik/expression_evaluator.hpp + mapnik/expression_grammar_x3.hpp + mapnik/expression_grammar_x3_config.hpp + mapnik/expression_grammar_x3_def.hpp + mapnik/expression_node.hpp + mapnik/expression_node_types.hpp + mapnik/expression_string.hpp + mapnik/extend_converter.hpp + mapnik/factory.hpp + mapnik/feature.hpp + mapnik/featureset.hpp + mapnik/feature_factory.hpp + mapnik/feature_kv_iterator.hpp + mapnik/feature_layer_desc.hpp + mapnik/feature_style_processor.hpp + mapnik/feature_style_processor_context.hpp + mapnik/feature_style_processor_impl.hpp + mapnik/feature_type_style.hpp + mapnik/filter_featureset.hpp + mapnik/font_engine_freetype.hpp + mapnik/font_set.hpp + mapnik/function_call.hpp + mapnik/geometry.hpp + mapnik/geom_util.hpp + mapnik/global.hpp + mapnik/gradient.hpp + mapnik/grid_vertex_converter.hpp + mapnik/hextree.hpp + mapnik/hit_test_filter.hpp + mapnik/image.hpp + mapnik/image_any.hpp + mapnik/image_compositing.hpp + mapnik/image_copy.hpp + mapnik/image_filter.hpp + mapnik/image_filter_grammar_x3.hpp + mapnik/image_filter_grammar_x3_def.hpp + mapnik/image_filter_types.hpp + mapnik/image_impl.hpp + mapnik/image_null.hpp + mapnik/image_options.hpp + mapnik/image_reader.hpp + mapnik/image_scaling.hpp + mapnik/image_scaling_traits.hpp + mapnik/image_util.hpp + mapnik/image_util_jpeg.hpp + mapnik/image_util_png.hpp + mapnik/image_util_tiff.hpp + mapnik/image_util_webp.hpp + mapnik/image_view.hpp + mapnik/image_view_any.hpp + mapnik/image_view_impl.hpp + mapnik/image_view_null.hpp + mapnik/init_priority.hpp + mapnik/jpeg_io.hpp + mapnik/label_collision_detector.hpp + mapnik/layer.hpp + mapnik/load_map.hpp + mapnik/make_unique.hpp + mapnik/map.hpp + mapnik/mapped_memory_cache.hpp + mapnik/marker.hpp + mapnik/markers_placement.hpp + mapnik/marker_cache.hpp + mapnik/marker_helpers.hpp + mapnik/memory_datasource.hpp + mapnik/memory_featureset.hpp + mapnik/octree.hpp + mapnik/offset_converter.hpp + mapnik/palette.hpp + mapnik/params.hpp + mapnik/params_impl.hpp + mapnik/parse_path.hpp + mapnik/path.hpp + mapnik/path_expression.hpp + mapnik/path_expression_grammar_x3.hpp + mapnik/path_expression_grammar_x3_def.hpp + mapnik/pixel_position.hpp + mapnik/pixel_types.hpp + mapnik/plugin.hpp + mapnik/png_io.hpp + mapnik/pool.hpp + mapnik/projection.hpp + mapnik/proj_strategy.hpp + mapnik/proj_transform.hpp + mapnik/ptree_helpers.hpp + mapnik/quad_tree.hpp + mapnik/query.hpp + mapnik/raster.hpp + mapnik/raster_colorizer.hpp + mapnik/renderer_common.hpp + mapnik/request.hpp + mapnik/rule.hpp + mapnik/rule_cache.hpp + mapnik/safe_cast.hpp + mapnik/save_map.hpp + mapnik/scale_denominator.hpp + mapnik/simplify.hpp + mapnik/simplify_converter.hpp + mapnik/span_image_filter.hpp + mapnik/sql_utils.hpp + mapnik/sse.hpp + mapnik/stringify_macro.hpp + mapnik/symbolizer.hpp + mapnik/symbolizer_base.hpp + mapnik/symbolizer_default_values.hpp + mapnik/symbolizer_dispatch.hpp + mapnik/symbolizer_enumerations.hpp + mapnik/symbolizer_hash.hpp + mapnik/symbolizer_keys.hpp + mapnik/symbolizer_utils.hpp + mapnik/tiff_io.hpp + mapnik/timer.hpp + mapnik/tolerance_iterator.hpp + mapnik/transform_path_adapter.hpp + mapnik/unicode.hpp + mapnik/value.hpp + mapnik/version.hpp + mapnik/vertex.hpp + mapnik/vertex_adapters.hpp + mapnik/vertex_cache.hpp + mapnik/vertex_converters.hpp + mapnik/vertex_processor.hpp + mapnik/vertex_vector.hpp + mapnik/view_strategy.hpp + mapnik/view_transform.hpp + mapnik/warning_ignore.hpp + mapnik/warning_ignore_agg.hpp + mapnik/warp.hpp + mapnik/webp_io.hpp + mapnik/well_known_srs.hpp + mapnik/wkb.hpp + mapnik/xml_attribute_cast.hpp + mapnik/xml_loader.hpp + mapnik/xml_node.hpp + mapnik/xml_tree.hpp + mapnik/geometry/boost_adapters.hpp + mapnik/geometry/boost_spirit_karma_adapter.hpp + mapnik/geometry/box2d.hpp + mapnik/geometry/box2d_impl.hpp + mapnik/geometry/centroid.hpp + mapnik/geometry/closest_point.hpp + mapnik/geometry/correct.hpp + mapnik/geometry/envelope.hpp + mapnik/geometry/envelope_impl.hpp + mapnik/geometry/fusion_adapted.hpp + mapnik/geometry/geometry_type.hpp + mapnik/geometry/geometry_types.hpp + mapnik/geometry/interior.hpp + mapnik/geometry/is_empty.hpp + mapnik/geometry/is_simple.hpp + mapnik/geometry/is_valid.hpp + mapnik/geometry/line_string.hpp + mapnik/geometry/multi_line_string.hpp + mapnik/geometry/multi_point.hpp + mapnik/geometry/multi_polygon.hpp + mapnik/geometry/point.hpp + mapnik/geometry/polygon.hpp + mapnik/geometry/polygon_vertex_processor.hpp + mapnik/geometry/polylabel.hpp + mapnik/geometry/remove_empty.hpp + mapnik/geometry/reprojection.hpp + mapnik/geometry/reprojection_impl.hpp + mapnik/geometry/strategy.hpp + mapnik/geometry/to_path.hpp + mapnik/geometry/transform.hpp + mapnik/csv/csv_grammar_x3.hpp + mapnik/csv/csv_grammar_x3_def.hpp + mapnik/csv/csv_types.hpp + mapnik/svg/geometry_svg_generator.hpp + mapnik/svg/geometry_svg_generator_impl.hpp + mapnik/svg/svg_converter.hpp + mapnik/svg/svg_grammar_config_x3.hpp + mapnik/svg/svg_parser.hpp + mapnik/svg/svg_parser_exception.hpp + mapnik/svg/svg_path_adapter.hpp + mapnik/svg/svg_path_attributes.hpp + mapnik/svg/svg_path_commands.hpp + mapnik/svg/svg_path_grammar_x3.hpp + mapnik/svg/svg_path_grammar_x3_def.hpp + mapnik/svg/svg_path_parser.hpp + mapnik/svg/svg_renderer_agg.hpp + mapnik/svg/svg_storage.hpp + mapnik/svg/svg_transform_grammar_x3.hpp + mapnik/svg/svg_transform_grammar_x3_def.hpp + mapnik/wkt/wkt_factory.hpp + mapnik/wkt/wkt_generator_grammar.hpp + mapnik/wkt/wkt_generator_grammar_impl.hpp + mapnik/wkt/wkt_grammar_x3.hpp + mapnik/wkt/wkt_grammar_x3_def.hpp + mapnik/cairo/cairo_context.hpp + mapnik/cairo/cairo_image_util.hpp + mapnik/cairo/cairo_renderer.hpp + mapnik/cairo/cairo_render_vector.hpp + mapnik/cairo/render_polygon_pattern.hpp + mapnik/grid/grid.hpp + mapnik/grid/grid_pixel.hpp + mapnik/grid/grid_pixfmt.hpp + mapnik/grid/grid_rasterizer.hpp + mapnik/grid/grid_renderer.hpp + mapnik/grid/grid_renderer_base.hpp + mapnik/grid/grid_rendering_buffer.hpp + mapnik/grid/grid_render_marker.hpp + mapnik/grid/grid_view.hpp + mapnik/json/attribute_value_visitor.hpp + mapnik/json/create_feature.hpp + mapnik/json/create_geometry.hpp + mapnik/json/extract_bounding_boxes_x3.hpp + mapnik/json/extract_bounding_boxes_x3_config.hpp + mapnik/json/feature_generator_grammar.hpp + mapnik/json/feature_generator_grammar_impl.hpp + mapnik/json/feature_grammar_x3.hpp + mapnik/json/feature_grammar_x3_def.hpp + mapnik/json/feature_parser.hpp + mapnik/json/generic_json_grammar_x3.hpp + mapnik/json/generic_json_grammar_x3_def.hpp + mapnik/json/geojson_grammar_x3.hpp + mapnik/json/geojson_grammar_x3_def.hpp + mapnik/json/geometry_generator_grammar.hpp + mapnik/json/geometry_generator_grammar_impl.hpp + mapnik/json/geometry_parser.hpp + mapnik/json/json_grammar_config.hpp + mapnik/json/json_value.hpp + mapnik/json/parse_feature.hpp + mapnik/json/positions_grammar_x3.hpp + mapnik/json/positions_grammar_x3_def.hpp + mapnik/json/positions_x3.hpp + mapnik/json/properties_generator_grammar.hpp + mapnik/json/properties_generator_grammar_impl.hpp + mapnik/json/stringifier.hpp + mapnik/json/topojson_grammar_x3.hpp + mapnik/json/topojson_grammar_x3_def.hpp + mapnik/json/topojson_utils.hpp + mapnik/json/topology.hpp + mapnik/json/unicode_string_grammar_x3.hpp + mapnik/json/unicode_string_grammar_x3_def.hpp + mapnik/json/value_converters.hpp + mapnik/util/char_array_buffer.hpp + mapnik/util/const_rendering_buffer.hpp + mapnik/util/container_adapter.hpp + mapnik/util/conversions.hpp + mapnik/util/dasharray_parser.hpp + mapnik/util/featureset_buffer.hpp + mapnik/util/feature_to_geojson.hpp + mapnik/util/file_io.hpp + mapnik/util/fs.hpp + mapnik/util/geometry_to_ds_type.hpp + mapnik/util/geometry_to_geojson.hpp + mapnik/util/geometry_to_svg.hpp + mapnik/util/geometry_to_wkb.hpp + mapnik/util/geometry_to_wkt.hpp + mapnik/util/hsl.hpp + mapnik/util/is_clockwise.hpp + mapnik/util/math.hpp + mapnik/util/name_to_int.hpp + mapnik/util/noncopyable.hpp + mapnik/util/path_iterator.hpp + mapnik/util/rounding_cast.hpp + mapnik/util/singleton.hpp + mapnik/util/spatial_index.hpp + mapnik/util/spirit_transform_attribute.hpp + mapnik/util/timer.hpp + mapnik/util/trim.hpp + mapnik/util/utf_conv_win.hpp + mapnik/util/variant.hpp + mapnik/util/variant_io.hpp + mapnik/group/group_layout.hpp + mapnik/group/group_layout_manager.hpp + mapnik/group/group_rule.hpp + mapnik/group/group_symbolizer_helper.hpp + mapnik/group/group_symbolizer_properties.hpp + mapnik/text/color_font_renderer.hpp + mapnik/text/evaluated_format_properties_ptr.hpp + mapnik/text/face.hpp + mapnik/text/font_feature_settings.hpp + mapnik/text/font_library.hpp + mapnik/text/glyph_info.hpp + mapnik/text/glyph_positions.hpp + mapnik/text/harfbuzz_shaper.hpp + mapnik/text/icu_shaper.hpp + mapnik/text/itemizer.hpp + mapnik/text/placement_finder.hpp + mapnik/text/placement_finder_impl.hpp + mapnik/text/properties_util.hpp + mapnik/text/renderer.hpp + mapnik/text/rotation.hpp + mapnik/text/scrptrun.hpp + mapnik/text/symbolizer_helpers.hpp + mapnik/text/text_layout.hpp + mapnik/text/text_line.hpp + mapnik/text/text_properties.hpp + mapnik/text/placements/base.hpp + mapnik/text/placements/dummy.hpp + mapnik/text/placements/list.hpp + mapnik/text/placements/registry.hpp + mapnik/text/placements/simple.hpp + mapnik/text/formatting/base.hpp + mapnik/text/formatting/format.hpp + mapnik/text/formatting/layout.hpp + mapnik/text/formatting/list.hpp + mapnik/text/formatting/registry.hpp + mapnik/text/formatting/text.hpp + mapnik/transform/parse_transform.hpp + mapnik/transform/transform_expression.hpp + mapnik/transform/transform_expression_grammar_x3.hpp + mapnik/transform/transform_expression_grammar_x3_def.hpp + mapnik/transform/transform_processor.hpp + mapnik/markers_placements/basic.hpp + mapnik/markers_placements/interior.hpp + mapnik/markers_placements/line.hpp + mapnik/markers_placements/point.hpp + mapnik/markers_placements/polylabel.hpp + mapnik/markers_placements/vertex_first.hpp + mapnik/markers_placements/vertex_last.hpp + mapnik/geometry/boost_adapters.hpp + mapnik/geometry/boost_spirit_karma_adapter.hpp + mapnik/geometry/box2d.hpp + mapnik/geometry/box2d_impl.hpp + mapnik/geometry/centroid.hpp + mapnik/geometry/closest_point.hpp + mapnik/geometry/correct.hpp + mapnik/geometry/envelope.hpp + mapnik/geometry/envelope_impl.hpp + mapnik/geometry/fusion_adapted.hpp + mapnik/geometry/geometry_type.hpp + mapnik/geometry/geometry_types.hpp + mapnik/geometry/interior.hpp + mapnik/geometry/is_empty.hpp + mapnik/geometry/is_simple.hpp + mapnik/geometry/is_valid.hpp + mapnik/geometry/line_string.hpp + mapnik/geometry/multi_line_string.hpp + mapnik/geometry/multi_point.hpp + mapnik/geometry/multi_polygon.hpp + mapnik/geometry/point.hpp + mapnik/geometry/polygon.hpp + mapnik/geometry/polygon_vertex_processor.hpp + mapnik/geometry/polylabel.hpp + mapnik/geometry/remove_empty.hpp + mapnik/geometry/reprojection.hpp + mapnik/geometry/reprojection_impl.hpp + mapnik/geometry/strategy.hpp + mapnik/geometry/to_path.hpp + mapnik/geometry/transform.hpp + mapnik/value/error.hpp + mapnik/value/hash.hpp + mapnik/value/types.hpp) + +set(MAPNIK_INC ${MAPNIK_INC} + mapnik/svg/output/svg_generator.hpp + mapnik/svg/output/svg_output_attributes.hpp + mapnik/svg/output/svg_output_grammars.hpp + mapnik/svg/output/svg_output_grammars_impl.hpp + mapnik/svg/output/svg_path_iterator.hpp + mapnik/svg/output/svg_renderer.hpp) + +set(MAPNIK_INC ${MAPNIK_INC} + mapnik/grid/grid.hpp + mapnik/grid/grid_pixel.hpp + mapnik/grid/grid_pixfmt.hpp + mapnik/grid/grid_rasterizer.hpp + mapnik/grid/grid_renderer.hpp + mapnik/grid/grid_renderer_base.hpp + mapnik/grid/grid_rendering_buffer.hpp + mapnik/grid/grid_render_marker.hpp + mapnik/grid/grid_view.hpp) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt new file mode 100644 index 00000000000000..2bbe0f41de8268 --- /dev/null +++ b/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt @@ -0,0 +1,12 @@ +add_library(mapnik-input-csv SHARED + csv_datasource.cpp + csv_featureset.cpp + csv_index_featureset.cpp + csv_inline_featureset.cpp + csv_utils.cpp) + +target_link_libraries(mapnik-input-csv PUBLIC mapnik mapnik-wkt mapnik-json) +set_target_properties(mapnik-input-csv PROPERTIES PREFIX "") +set_target_properties(mapnik-input-csv PROPERTIES OUTPUT_NAME "csv") +set_target_properties(mapnik-input-csv PROPERTIES SUFFIX ".input") +install(TARGETS mapnik-input-csv DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt new file mode 100644 index 00000000000000..efddbe31e9bc1c --- /dev/null +++ b/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt @@ -0,0 +1,9 @@ +add_library(mapnik-input-gdal SHARED + gdal_datasource.cpp + gdal_featureset.cpp) + +target_link_libraries(mapnik-input-gdal PUBLIC mapnik ${GDAL_LIBRARIES}) +set_target_properties(mapnik-input-gdal PROPERTIES PREFIX "") +set_target_properties(mapnik-input-gdal PROPERTIES OUTPUT_NAME "gdal") +set_target_properties(mapnik-input-gdal PROPERTIES SUFFIX ".input") +install(TARGETS mapnik-input-gdal DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt new file mode 100644 index 00000000000000..679f6249a736e5 --- /dev/null +++ b/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt @@ -0,0 +1,13 @@ + +add_library(mapnik-input-geobuf SHARED +geobuf_datasource.cpp +geobuf_featureset.cpp) + +find_path(PROTOZERO_INCLUDE_DIRS "protozero/byteswap.hpp") +target_include_directories(mapnik-input-geobuf PRIVATE ${PROTOZERO_INCLUDE_DIRS}) + +target_link_libraries(mapnik-input-geobuf PUBLIC mapnik) +set_target_properties(mapnik-input-geobuf PROPERTIES PREFIX "") +set_target_properties(mapnik-input-geobuf PROPERTIES OUTPUT_NAME "geobuf") +set_target_properties(mapnik-input-geobuf PROPERTIES SUFFIX ".input") +install(TARGETS mapnik-input-geobuf DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt new file mode 100644 index 00000000000000..d821c0de1fa98b --- /dev/null +++ b/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt @@ -0,0 +1,11 @@ +add_library(mapnik-input-geojson SHARED + geojson_datasource.cpp + geojson_featureset.cpp + geojson_index_featureset.cpp + geojson_memory_index_featureset.cpp) + +target_link_libraries(mapnik-input-geojson PUBLIC mapnik mapnik-json) +set_target_properties(mapnik-input-geojson PROPERTIES PREFIX "") +set_target_properties(mapnik-input-geojson PROPERTIES OUTPUT_NAME "geojson") +set_target_properties(mapnik-input-geojson PROPERTIES SUFFIX ".input") +install(TARGETS mapnik-input-geojson DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt new file mode 100644 index 00000000000000..87a6e88913301a --- /dev/null +++ b/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt @@ -0,0 +1,11 @@ +add_library(mapnik-input-ogr SHARED + ogr_converter.cpp + ogr_datasource.cpp + ogr_featureset.cpp + ogr_index_featureset.cpp) + +target_link_libraries(mapnik-input-ogr PUBLIC mapnik ${OGR_LIBRARIES} ${GDAL_LIBRARIES}) +set_target_properties(mapnik-input-ogr PROPERTIES PREFIX "") +set_target_properties(mapnik-input-ogr PROPERTIES OUTPUT_NAME "ogr") +set_target_properties(mapnik-input-ogr PROPERTIES SUFFIX ".input") +install(TARGETS mapnik-input-ogr DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt new file mode 100644 index 00000000000000..5c11168237bcdd --- /dev/null +++ b/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt @@ -0,0 +1,10 @@ +add_library(mapnik-input-pgraster SHARED +pgraster_datasource.cpp +pgraster_featureset.cpp +pgraster_wkb_reader.cpp) + +target_link_libraries(mapnik-input-pgraster PUBLIC mapnik ${PostgreSQL_LIBRARIES}) +set_target_properties(mapnik-input-pgraster PROPERTIES PREFIX "") +set_target_properties(mapnik-input-pgraster PROPERTIES OUTPUT_NAME "pgraster") +set_target_properties(mapnik-input-pgraster PROPERTIES SUFFIX ".input") +install(TARGETS mapnik-input-pgraster DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt new file mode 100644 index 00000000000000..71a254e7896e12 --- /dev/null +++ b/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt @@ -0,0 +1,11 @@ + +add_library(mapnik-input-pgraster SHARED +pgraster_datasource.cpp +pgraster_featureset.cpp +pgraster_wkb_reader.cpp) + +target_link_libraries(mapnik-input-pgraster PUBLIC mapnik ${PostgreSQL_LIBRARIES}) +set_target_properties(mapnik-input-pgraster PROPERTIES PREFIX "") +set_target_properties(mapnik-input-pgraster PROPERTIES OUTPUT_NAME "pgraster") +set_target_properties(mapnik-input-pgraster PROPERTIES SUFFIX ".input") +install(TARGETS mapnik-input-pgraster DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt new file mode 100644 index 00000000000000..8f0dffa9e0f137 --- /dev/null +++ b/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt @@ -0,0 +1,10 @@ +add_library(mapnik-input-raster SHARED + raster_datasource.cpp + raster_featureset.cpp + raster_info.cpp) + +target_link_libraries(mapnik-input-raster PUBLIC mapnik) +set_target_properties(mapnik-input-raster PROPERTIES PREFIX "") +set_target_properties(mapnik-input-raster PROPERTIES OUTPUT_NAME "raster") +set_target_properties(mapnik-input-raster PROPERTIES SUFFIX ".input") +install(TARGETS mapnik-input-raster DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt new file mode 100644 index 00000000000000..314eb221c47b1e --- /dev/null +++ b/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt @@ -0,0 +1,15 @@ +SET(INPUT_SHAPE_SOURCES + dbfile.cpp + dbf_test.cpp + shape_datasource.cpp + shape_featureset.cpp + shape_index_featureset.cpp + shape_io.cpp shape_utils.cpp +) + +add_library(mapnik-input-shape SHARED ${INPUT_SHAPE_SOURCES}) +target_link_libraries(mapnik-input-shape PUBLIC mapnik) +set_target_properties(mapnik-input-shape PROPERTIES PREFIX "") +set_target_properties(mapnik-input-shape PROPERTIES OUTPUT_NAME "shape") +set_target_properties(mapnik-input-shape PROPERTIES SUFFIX ".input") +install(TARGETS mapnik-input-shape DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt new file mode 100644 index 00000000000000..26f3cb718a0ab5 --- /dev/null +++ b/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt @@ -0,0 +1,9 @@ +add_library(mapnik-input-sqlite SHARED + sqlite_datasource.cpp + sqlite_featureset.cpp) + +target_link_libraries(mapnik-input-sqlite PUBLIC mapnik SQLite::SQLite3) +set_target_properties(mapnik-input-sqlite PROPERTIES PREFIX "") +set_target_properties(mapnik-input-sqlite PROPERTIES OUTPUT_NAME "sqlite") +set_target_properties(mapnik-input-sqlite PROPERTIES SUFFIX ".input") +install(TARGETS mapnik-input-sqlite DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt new file mode 100644 index 00000000000000..56fb062a90537b --- /dev/null +++ b/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt @@ -0,0 +1,9 @@ +add_library(mapnik-input-topojson SHARED + topojson_datasource.cpp + topojson_featureset.cpp) + +target_link_libraries(mapnik-input-topojson PUBLIC mapnik mapnik-json) +set_target_properties(mapnik-input-topojson PROPERTIES PREFIX "") +set_target_properties(mapnik-input-topojson PROPERTIES OUTPUT_NAME "topojson") +set_target_properties(mapnik-input-topojson PROPERTIES SUFFIX ".input") +install(TARGETS mapnik-input-topojson DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/src/agg/CMakeLists.txt b/ports/mapnik/cmake/src/agg/CMakeLists.txt new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/ports/mapnik/cmake/src/json/CMakeLists.txt b/ports/mapnik/cmake/src/json/CMakeLists.txt new file mode 100644 index 00000000000000..b0f18c26b89b1f --- /dev/null +++ b/ports/mapnik/cmake/src/json/CMakeLists.txt @@ -0,0 +1,19 @@ +add_library(mapnik-json STATIC + extract_bounding_boxes_x3.cpp + feature_from_geojson.cpp + feature_grammar_x3.cpp + generic_json_grammar_x3.cpp + geojson_grammar_x3.cpp + geometry_from_geojson.cpp + mapnik_feature_to_geojson.cpp + mapnik_geometry_to_geojson.cpp + mapnik_json_generator_grammar.cpp + parse_feature.cpp + positions_grammar_x3.cpp + topojson_grammar_x3.cpp + unicode_string_grammar_x3.cpp) + +target_link_libraries(mapnik-json INTERFACE ${ICUU_LIB}) + +install(TARGETS mapnik-json LIBRARY DESTINATION lib) +target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) \ No newline at end of file diff --git a/ports/mapnik/cmake/src/wkt/CMakeLists.txt b/ports/mapnik/cmake/src/wkt/CMakeLists.txt new file mode 100644 index 00000000000000..527f5512fb8a56 --- /dev/null +++ b/ports/mapnik/cmake/src/wkt/CMakeLists.txt @@ -0,0 +1,8 @@ +add_library(mapnik-wkt STATIC + geometry_to_wkt.cpp + mapnik_wkt_generator_grammar.cpp + wkt_factory.cpp + wkt_grammar_x3.cpp) + +install(TARGETS mapnik-wkt LIBRARY DESTINATION lib) +target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) \ No newline at end of file diff --git a/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt b/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt new file mode 100644 index 00000000000000..0aa78966d69347 --- /dev/null +++ b/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt @@ -0,0 +1,4 @@ + +add_executable(mapnik-render mapnik-render.cpp) +target_link_libraries(mapnik-render PRIVATE mapnik) +install(TARGETS mapnik-render DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt b/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt new file mode 100644 index 00000000000000..f162bb25c48120 --- /dev/null +++ b/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt @@ -0,0 +1,4 @@ +add_executable(shapeindex shapeindex.cpp) +target_link_libraries(shapeindex PRIVATE mapnik) +target_include_directories(shapeindex PRIVATE ../../plugins/input/shape) +install(TARGETS shapeindex DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/fix-box2d.patch b/ports/mapnik/fix-box2d.patch new file mode 100644 index 00000000000000..f441fefbcbddae --- /dev/null +++ b/ports/mapnik/fix-box2d.patch @@ -0,0 +1,12 @@ +diff --git a/include/mapnik/geometry/box2d.hpp b/include/mapnik/geometry/box2d.hpp +index 1894978..7dc8d57 100644 +--- a/include/mapnik/geometry/box2d.hpp ++++ b/include/mapnik/geometry/box2d.hpp +@@ -23,6 +23,7 @@ + #ifndef MAPNIK_BOX2D_HPP + #define MAPNIK_BOX2D_HPP + ++#include + // mapnik + #include + #include diff --git a/ports/mapnik/fix-config.patch b/ports/mapnik/fix-config.patch new file mode 100644 index 00000000000000..1db95db7079a6a --- /dev/null +++ b/ports/mapnik/fix-config.patch @@ -0,0 +1,16 @@ +diff --git a/include/mapnik/config.hpp b/include/mapnik/config.hpp +index ac48546..9069079 100644 +--- a/include/mapnik/config.hpp ++++ b/include/mapnik/config.hpp +@@ -30,8 +30,10 @@ + # define MAPNIK_IMP __declspec (dllimport) + # ifdef MAPNIK_EXPORTS + # define MAPNIK_DECL __declspec (dllexport) +-# else ++# elif !defined(MAPNIK_STATICLIB) + # define MAPNIK_DECL __declspec (dllimport) ++# else ++# define MAPNIK_DECL + # endif + # pragma warning( disable: 4251 ) + # pragma warning( disable: 4275 ) diff --git a/ports/mapnik/fix-constructor-inheritance.patch b/ports/mapnik/fix-constructor-inheritance.patch new file mode 100644 index 00000000000000..41d295f6bf73c1 --- /dev/null +++ b/ports/mapnik/fix-constructor-inheritance.patch @@ -0,0 +1,39 @@ +diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp +index f6e795d..44b9931 100644 +--- a/include/mapnik/geometry.hpp ++++ b/include/mapnik/geometry.hpp +@@ -59,7 +59,7 @@ struct geometry : geometry_base + { + using coordinate_type = T; + +-#if __cpp_inheriting_constructors >= 200802 ++#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) + + using geometry_base::geometry_base; + +diff --git a/include/mapnik/json/geojson_grammar_x3.hpp b/include/mapnik/json/geojson_grammar_x3.hpp +index 9a9ffaa..9c90d36 100644 +--- a/include/mapnik/json/geojson_grammar_x3.hpp ++++ b/include/mapnik/json/geojson_grammar_x3.hpp +@@ -53,7 +53,7 @@ using geojson_value_base = mapnik::util::variant; + struct geojson_value : geojson_value_base + { +-#if __cpp_inheriting_constructors >= 200802 ++#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) + + using geojson_value_base::geojson_value_base; + +diff --git a/include/mapnik/json/json_value.hpp b/include/mapnik/json/json_value.hpp +index c5ed036..150a80f 100644 +--- a/include/mapnik/json/json_value.hpp ++++ b/include/mapnik/json/json_value.hpp +@@ -46,7 +46,7 @@ using json_value_base = mapnik::util::variant; + struct json_value : json_value_base + { +-#if __cpp_inheriting_constructors >= 200802 ++#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) + + using json_value_base::json_value_base; + diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index b43359898faf4d..97ffdc8312b1ae 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,27 +1,16 @@ -find_program(GIT git) - -set(GIT_URL "https://github.com/am2222/mapnik-windows.git") -set(GIT_REV "cfa268fa6ab438568b9b5320f6fce4317f0e3d8e") - -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT}) - - -if(NOT EXISTS "${SOURCE_PATH}/.git") - message(STATUS "Cloning and fetching submodules") - vcpkg_execute_required_process( - COMMAND ${GIT} clone --recurse-submodules ${GIT_URL} ${SOURCE_PATH} - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME clone - ) - - message(STATUS "Checkout revision ${GIT_REV}") - vcpkg_execute_required_process( - COMMAND ${GIT} checkout ${GIT_REV} - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME checkout - ) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapnik/mapnik + REF c6fc956a779123e3735c16ba28aa85922b924cac + SHA512 004429defd3047601b63c28bedd57d701ff88cdfb910a9958f4a10a1ac032d4d13316372122aef06eda60f2e4f67600b8842577db455f8c970009a0e86c5c1cf + HEAD_REF master + PATCHES + fix-config.patch + fix-box2d.patch + fix-constructor-inheritance.patch +) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}) vcpkg_find_acquire_program(PYTHON2) get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) @@ -34,26 +23,27 @@ elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - cairo WITH_CAIRO - demo WITH_DEMO - input_csv WITH_INPUT_CSV - input_gdal WITH_INPUT_GDAL - input_geobuf WITH_INPUT_GEOBUF - input_geojson WITH_INPUT_GEOJSON - input_ogr WITH_INPUT_OGR - input_pgraster WITH_INPUT_PGRASTER - input_postgis WITH_INPUT_POSTGIS - input_raster WITH_INPUT_RASTER - input_shape WITH_INPUT_SHAPE - input_sqlite WITH_INPUT_SQLITE - input_topojson WITH_INPUT_TOPOJSON - proj4 WITH_PROJ4 - utils WITH_UTILS + cairo WITH_CAIRO + demo WITH_DEMO + viewer WITH_VIEWER + "input-csv" WITH_INPUT_CSV + "input-gdal" WITH_INPUT_GDAL + "input-geobuf" WITH_INPUT_GEOBUF + "input-geojson" WITH_INPUT_GEOJSON + "input-ogr" WITH_INPUT_OGR + "input-pgraster" WITH_INPUT_PGRASTER + "input-postgis" WITH_INPUT_POSTGIS + "input-raster" WITH_INPUT_RASTER + "input-shape" WITH_INPUT_SHAPE + "input-sqlite" WITH_INPUT_SQLITE + "input-topojson" WITH_INPUT_TOPOJSON + proj4 WITH_PROJ4 + utils WITH_UTILS ) vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT} - PREFER_NINJA # Disable this option if project cannot be built with Ninja + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DMAPNIK_STATIC_LIB=${MAPNIK_STATIC_LIB} @@ -67,17 +57,22 @@ file(COPY ${SOURCE_PATH}/include/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/inc vcpkg_copy_pdbs() -if ("utils" IN_LIST FEATURES) - vcpkg_copy_tools( - TOOL_NAMES mapnik-demo mapnik-render shapeindex - AUTO_CLEAN - ) - - file(COPY ${SOURCE_PATH}/demo/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik/demo) - file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) +if("demo" IN_LIST FEATURES) + file(COPY ${SOURCE_PATH}/demo/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik/demo) + vcpkg_copy_tools(TOOL_NAMES mapnik-demo AUTO_CLEAN) +endif() - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mapnik-demo ${CURRENT_PACKAGES_DIR}/debug/bin/mapnik-render ${CURRENT_PACKAGES_DIR}/debug/bin/shapeindex) +if("viewer" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES mapnik-viewer AUTO_CLEAN) +endif() + +if ("utils" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES mapnik-render shapeindex + AUTO_CLEAN + ) + file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) + #file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) endif() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json new file mode 100644 index 00000000000000..7b87f26f12ee60 --- /dev/null +++ b/ports/mapnik/vcpkg.json @@ -0,0 +1,139 @@ +{ + "name": "mapnik", + "version-string": "3.0.23", + "description": "Mapnik is an open source toolkit for developing mapping applications.", + "homepage": "https://github.com/mapnik/mapnik", + "dependencies": [ + "mapbox-geometry", + "mapbox-polylabel", + "mapbox-variant", + "boost-assign", + "boost-bimap", + "boost-filesystem", + "boost-geometry", + "boost-gil", + "boost-msm", + { + "name": "boost-locale", + "features": [ + "icu" + ] + }, + "boost-program-options", + "boost-property-tree", + { + "name": "boost-regex", + "features": [ + "icu" + ] + }, + "boost-spirit", + "boost-system", + { + "name": "freetype", + "features": [ + "bzip2", + "png" + ] + }, + { + "name": "harfbuzz", + "features": [ + "icu" + ] + }, + "icu", + "libjpeg-turbo", + "libpng", + "libwebp", + "libxml2", + "mapbox-variant", + "tiff", + "zlib" + ], + "features": { + "cairo": { + "description": "Cairo renderer", + "dependencies": [ + "cairo", + "cairomm" + ] + }, + "demo": { + "description": "Make demo application" + }, + "viewer": { + "description": "Make demo viewer application", + "dependencies": [ + "qt5-base" + ] + }, + "input-csv": { + "description": "CSV input plugin" + }, + "input-gdal": { + "description": "GDAL input plugin", + "dependencies": [ + "gdal" + ] + }, + "input-geobuf": { + "description": "GEOBUF input plugin", + "dependencies": [ + "protozero" + ] + }, + "input-geojson": { + "description": "GEOJSON input plugin" + }, + "input-ogr": { + "description": "OGR input plugin", + "dependencies": [ + "gdal" + ] + }, + "input-pgraster": { + "description": "PGRASTER input plugin", + "dependencies": [ + "libodb-pgsql", + "libpq" + ] + }, + "input-postgis": { + "description": "POSTGIS input plugin", + "dependencies": [ + "libodb-pgsql", + "libpq" + ] + }, + "input-raster": { + "description": "RASTER input plugin" + }, + "input-shape": { + "description": "SHAPE input plugin" + }, + "input-sqlite": { + "description": "SQLITE input plugin", + "dependencies": [ + "sqlite3" + ] + }, + "input-topojson": { + "description": "TOPOJSON input plugin" + }, + "proj4": { + "description": "PROJ4 Functionalities", + "dependencies": [ + { + "name": "proj4", + "features": [ + "database" + ] + } + ] + }, + "utils": { + "description": "Make utilities Application including mapnik-rendrer and shapeindex" + } + } +} From 038504a2e141f0bf938673dc805230a1ccad09c1 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 11:45:13 +0100 Subject: [PATCH 0042/1694] do not change baseline --- scripts/ci.baseline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index adbe5dd164cd58..aa9709fc428c04 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1764,8 +1764,8 @@ ctp:x64-uwp=skip ctp:x64-windows=skip ctp:x64-windows-static=skip ctp:x86-windows=skip -protozero:x64-uwp=fail protozero:arm-uwp=fail +protozero:x64-uwp=fail # clapack is replaced by lapack-reference on the platforms lapack-reference supports clapack:x64-linux=skip From 80c3d04b3f6efd109d96b9ae98551321d73a0548 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 11:56:27 +0100 Subject: [PATCH 0043/1694] fix formatting... --- ports/mapnik/vcpkg.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 7b87f26f12ee60..0662d626ee4a0b 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -4,21 +4,18 @@ "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "dependencies": [ - "mapbox-geometry", - "mapbox-polylabel", - "mapbox-variant", "boost-assign", "boost-bimap", "boost-filesystem", "boost-geometry", "boost-gil", - "boost-msm", { "name": "boost-locale", "features": [ "icu" ] }, + "boost-msm", "boost-program-options", "boost-property-tree", { @@ -47,6 +44,9 @@ "libpng", "libwebp", "libxml2", + "mapbox-geometry", + "mapbox-polylabel", + "mapbox-variant", "mapbox-variant", "tiff", "zlib" @@ -62,12 +62,6 @@ "demo": { "description": "Make demo application" }, - "viewer": { - "description": "Make demo viewer application", - "dependencies": [ - "qt5-base" - ] - }, "input-csv": { "description": "CSV input plugin" }, @@ -134,6 +128,12 @@ }, "utils": { "description": "Make utilities Application including mapnik-rendrer and shapeindex" + }, + "viewer": { + "description": "Make demo viewer application", + "dependencies": [ + "qt5-base" + ] } } } From c43f2e5b49223a62bba71dbc40a5668fb2301289 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 12:45:24 +0100 Subject: [PATCH 0044/1694] fix postfis cmake --- .../plugins/input/postgis/CMakeLists.txt | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt index 71a254e7896e12..1d7c80b425387e 100644 --- a/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt @@ -1,11 +1,9 @@ - -add_library(mapnik-input-pgraster SHARED -pgraster_datasource.cpp -pgraster_featureset.cpp -pgraster_wkb_reader.cpp) - -target_link_libraries(mapnik-input-pgraster PUBLIC mapnik ${PostgreSQL_LIBRARIES}) -set_target_properties(mapnik-input-pgraster PROPERTIES PREFIX "") -set_target_properties(mapnik-input-pgraster PROPERTIES OUTPUT_NAME "pgraster") -set_target_properties(mapnik-input-pgraster PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-pgraster DESTINATION bin/plugins/input) \ No newline at end of file +add_library(mapnik-input-postgis SHARED + postgis_datasource.cpp + postgis_featureset.cpp ) + +target_link_libraries(mapnik-input-postgis PUBLIC mapnik ${PostgreSQL_LIBRARIES}) +set_target_properties(mapnik-input-postgis PROPERTIES PREFIX "") +set_target_properties(mapnik-input-postgis PROPERTIES OUTPUT_NAME "postgis") +set_target_properties(mapnik-input-postgis PROPERTIES SUFFIX ".input") +install(TARGETS mapnik-input-postgis DESTINATION bin/plugins/input) From 390ede462142e3a265b2c6a1fb4cfac044ba548e Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 13:01:26 +0100 Subject: [PATCH 0045/1694] fix csv and use actual master hash --- ports/mapnik/fix-csv.patch | 13 +++++++++++++ ports/mapnik/portfile.cmake | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/mapnik/fix-csv.patch diff --git a/ports/mapnik/fix-csv.patch b/ports/mapnik/fix-csv.patch new file mode 100644 index 00000000000000..ad36dbcc981711 --- /dev/null +++ b/ports/mapnik/fix-csv.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/input/csv/csv_index_featureset.cpp b/plugins/input/csv/csv_index_featureset.cpp +index 3b1c8a4..c1701e5 100644 +--- a/plugins/input/csv/csv_index_featureset.cpp ++++ b/plugins/input/csv/csv_index_featureset.cpp +@@ -122,7 +122,7 @@ mapnik::feature_ptr csv_index_featureset::next() + #else + std::fseek(file_.get(), pos.off, SEEK_SET); + std::vector record; +- record.resize(pos.second); ++ record.resize(pos.size); + if (std::fread(record.data(), pos.size, 1, file_.get()) != 1) + { + return mapnik::feature_ptr(); diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 97ffdc8312b1ae..95f1ecf00e9208 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,12 +2,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik REF c6fc956a779123e3735c16ba28aa85922b924cac - SHA512 004429defd3047601b63c28bedd57d701ff88cdfb910a9958f4a10a1ac032d4d13316372122aef06eda60f2e4f67600b8842577db455f8c970009a0e86c5c1cf + SHA512 a30d8d82e5f0f9f344036858d248ee88872b6f9314e59206e7f127449fb7b9e6af62f624a8e81e1db79723c0dc7324ca8ec970d15646b253a1a28992160c7a3a HEAD_REF master PATCHES fix-config.patch fix-box2d.patch fix-constructor-inheritance.patch + fix-csv.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}) From 758ec34266a0458dc15736fc1d72d9e24ec7084c Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 13:01:26 +0100 Subject: [PATCH 0046/1694] fix csv and use actual master hash --- ports/mapnik/fix-csv.patch | 13 +++++++++++++ ports/mapnik/portfile.cmake | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/mapnik/fix-csv.patch diff --git a/ports/mapnik/fix-csv.patch b/ports/mapnik/fix-csv.patch new file mode 100644 index 00000000000000..ad36dbcc981711 --- /dev/null +++ b/ports/mapnik/fix-csv.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/input/csv/csv_index_featureset.cpp b/plugins/input/csv/csv_index_featureset.cpp +index 3b1c8a4..c1701e5 100644 +--- a/plugins/input/csv/csv_index_featureset.cpp ++++ b/plugins/input/csv/csv_index_featureset.cpp +@@ -122,7 +122,7 @@ mapnik::feature_ptr csv_index_featureset::next() + #else + std::fseek(file_.get(), pos.off, SEEK_SET); + std::vector record; +- record.resize(pos.second); ++ record.resize(pos.size); + if (std::fread(record.data(), pos.size, 1, file_.get()) != 1) + { + return mapnik::feature_ptr(); diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 97ffdc8312b1ae..95f1ecf00e9208 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,12 +2,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik REF c6fc956a779123e3735c16ba28aa85922b924cac - SHA512 004429defd3047601b63c28bedd57d701ff88cdfb910a9958f4a10a1ac032d4d13316372122aef06eda60f2e4f67600b8842577db455f8c970009a0e86c5c1cf + SHA512 a30d8d82e5f0f9f344036858d248ee88872b6f9314e59206e7f127449fb7b9e6af62f624a8e81e1db79723c0dc7324ca8ec970d15646b253a1a28992160c7a3a HEAD_REF master PATCHES fix-config.patch fix-box2d.patch fix-constructor-inheritance.patch + fix-csv.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}) From 546cf97d4efc30f7de71ba89488dcf18c46c8bc9 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 13:14:20 +0100 Subject: [PATCH 0047/1694] fix geojson plugin --- ports/mapnik/fix-geojson-plugin.patch | 13 +++++++++++++ ports/mapnik/portfile.cmake | 1 + 2 files changed, 14 insertions(+) create mode 100644 ports/mapnik/fix-geojson-plugin.patch diff --git a/ports/mapnik/fix-geojson-plugin.patch b/ports/mapnik/fix-geojson-plugin.patch new file mode 100644 index 00000000000000..002222d065461e --- /dev/null +++ b/ports/mapnik/fix-geojson-plugin.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp +index 7f915fa..d3a4933 100644 +--- a/plugins/input/geojson/geojson_index_featureset.cpp ++++ b/plugins/input/geojson/geojson_index_featureset.cpp +@@ -93,7 +93,7 @@ mapnik::feature_ptr geojson_index_featureset::next() + #else + std::fseek(file_.get(), pos.off, SEEK_SET); + std::vector record; +- record.resize(pos.second); ++ record.resize(pos.size); + auto count = std::fread(record.data(), pos.size, 1, file_.get()); + auto const* start = record.data(); + auto const* end = (count == 1) ? start + record.size() : start; diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 95f1ecf00e9208..6332e455269a2f 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( fix-box2d.patch fix-constructor-inheritance.patch fix-csv.patch + fix-geojson-plugin.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}) From b3fb43f045c2b08265934b2b864c4a60b7b1f7f8 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 13:14:20 +0100 Subject: [PATCH 0048/1694] fix geojson plugin --- ports/mapnik/fix-geojson-plugin.patch | 13 +++++++++++++ ports/mapnik/portfile.cmake | 1 + 2 files changed, 14 insertions(+) create mode 100644 ports/mapnik/fix-geojson-plugin.patch diff --git a/ports/mapnik/fix-geojson-plugin.patch b/ports/mapnik/fix-geojson-plugin.patch new file mode 100644 index 00000000000000..002222d065461e --- /dev/null +++ b/ports/mapnik/fix-geojson-plugin.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp +index 7f915fa..d3a4933 100644 +--- a/plugins/input/geojson/geojson_index_featureset.cpp ++++ b/plugins/input/geojson/geojson_index_featureset.cpp +@@ -93,7 +93,7 @@ mapnik::feature_ptr geojson_index_featureset::next() + #else + std::fseek(file_.get(), pos.off, SEEK_SET); + std::vector record; +- record.resize(pos.second); ++ record.resize(pos.size); + auto count = std::fread(record.data(), pos.size, 1, file_.get()); + auto const* start = record.data(); + auto const* end = (count == 1) ? start + record.size() : start; diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 95f1ecf00e9208..6332e455269a2f 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( fix-box2d.patch fix-constructor-inheritance.patch fix-csv.patch + fix-geojson-plugin.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}) From 25475c7719c536108c874ce86d7ae75ea7db3968 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 13:50:03 +0100 Subject: [PATCH 0049/1694] add settings for viewer tool. copy plugins --- ports/mapnik/portfile.cmake | 13 +++++++++---- ports/mapnik/viewer.ini | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 ports/mapnik/viewer.ini diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 6332e455269a2f..e1c9024ef3c019 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -55,16 +55,22 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(COPY ${SOURCE_PATH}/include/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/include/mapnik DESTINATION ${CURRENT_PACKAGES_DIR}/include) +# copy plugins into tool path, if any plugin is installed +if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/plugins) + file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +endif() vcpkg_copy_pdbs() if("demo" IN_LIST FEATURES) - file(COPY ${SOURCE_PATH}/demo/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik/demo) + file(COPY ${SOURCE_PATH}/demo/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/demo) vcpkg_copy_tools(TOOL_NAMES mapnik-demo AUTO_CLEAN) endif() if("viewer" IN_LIST FEATURES) + # copy the ini file to reference the plugins correctly + file(COPY $${CMAKE_CURRENT_LIST_DIR}/viewer.ini DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) vcpkg_copy_tools(TOOL_NAMES mapnik-viewer AUTO_CLEAN) endif() @@ -73,8 +79,7 @@ if ("utils" IN_LIST FEATURES) TOOL_NAMES mapnik-render shapeindex AUTO_CLEAN ) - file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) - #file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) + file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/mapnik/viewer.ini b/ports/mapnik/viewer.ini new file mode 100644 index 00000000000000..39e4c0f8fbdbf7 --- /dev/null +++ b/ports/mapnik/viewer.ini @@ -0,0 +1,2 @@ +[mapnik] +plugins_dir=plugins/input \ No newline at end of file From 4f272a4f43bd02d79e77fcb46ab244352b628803 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 13:50:03 +0100 Subject: [PATCH 0050/1694] add settings for viewer tool. copy plugins --- ports/mapnik/portfile.cmake | 13 +++++++++---- ports/mapnik/viewer.ini | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 ports/mapnik/viewer.ini diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 6332e455269a2f..e1c9024ef3c019 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -55,16 +55,22 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(COPY ${SOURCE_PATH}/include/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/include/mapnik DESTINATION ${CURRENT_PACKAGES_DIR}/include) +# copy plugins into tool path, if any plugin is installed +if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/plugins) + file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +endif() vcpkg_copy_pdbs() if("demo" IN_LIST FEATURES) - file(COPY ${SOURCE_PATH}/demo/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik/demo) + file(COPY ${SOURCE_PATH}/demo/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/demo) vcpkg_copy_tools(TOOL_NAMES mapnik-demo AUTO_CLEAN) endif() if("viewer" IN_LIST FEATURES) + # copy the ini file to reference the plugins correctly + file(COPY $${CMAKE_CURRENT_LIST_DIR}/viewer.ini DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) vcpkg_copy_tools(TOOL_NAMES mapnik-viewer AUTO_CLEAN) endif() @@ -73,8 +79,7 @@ if ("utils" IN_LIST FEATURES) TOOL_NAMES mapnik-render shapeindex AUTO_CLEAN ) - file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) - #file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik) + file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/mapnik/viewer.ini b/ports/mapnik/viewer.ini new file mode 100644 index 00000000000000..39e4c0f8fbdbf7 --- /dev/null +++ b/ports/mapnik/viewer.ini @@ -0,0 +1,2 @@ +[mapnik] +plugins_dir=plugins/input \ No newline at end of file From cf5a972622a47c64f484dfd0e646ee88770f4542 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 14:09:19 +0100 Subject: [PATCH 0051/1694] fix typo in cmake... --- ports/mapnik/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index e1c9024ef3c019..97974797c934db 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -70,7 +70,7 @@ endif() if("viewer" IN_LIST FEATURES) # copy the ini file to reference the plugins correctly - file(COPY $${CMAKE_CURRENT_LIST_DIR}/viewer.ini DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(COPY ${CMAKE_CURRENT_LIST_DIR}/viewer.ini DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) vcpkg_copy_tools(TOOL_NAMES mapnik-viewer AUTO_CLEAN) endif() From 690b69a94afcaacad9bf4757cf13b5649dc911f2 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 14:09:19 +0100 Subject: [PATCH 0052/1694] fix typo in cmake... --- ports/mapnik/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index e1c9024ef3c019..97974797c934db 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -70,7 +70,7 @@ endif() if("viewer" IN_LIST FEATURES) # copy the ini file to reference the plugins correctly - file(COPY $${CMAKE_CURRENT_LIST_DIR}/viewer.ini DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(COPY ${CMAKE_CURRENT_LIST_DIR}/viewer.ini DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) vcpkg_copy_tools(TOOL_NAMES mapnik-viewer AUTO_CLEAN) endif() From 9883746f48fee38720b3b6838af7313d086e60f9 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 15:10:27 +0100 Subject: [PATCH 0053/1694] [mapbox-polylane,mapbox-geometry] use release versions --- ports/mapbox-geometry/portfile.cmake | 4 ++-- ports/mapbox-polylabel/portfile.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/mapbox-geometry/portfile.cmake b/ports/mapbox-geometry/portfile.cmake index 3c58fb7ef1151b..0371625f5d2095 100644 --- a/ports/mapbox-geometry/portfile.cmake +++ b/ports/mapbox-geometry/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapbox/geometry.hpp - REF c83a2ab18a225254f128b6f5115aa39d04f2de21 - SHA512 81c93a4efb517866888aee86ccb61896f4465f862d5404b0e45e35632a3bf6fb2d5c46935bbe56ff03079861ea503bd13d9d4003d5aae50cad5d1b2187834661 + REF v2.0.3 + SHA512 76c10578e1fba44430786fb5e043dbc063aa251f62396701a509f7fa1e2e5c351fa0fe041d16be84bda9816ec5df3342cd9890da6fe99d78d6fb26e0a3b2485b HEAD_REF master ) diff --git a/ports/mapbox-polylabel/portfile.cmake b/ports/mapbox-polylabel/portfile.cmake index 2b2b123a185821..5bcfe424ad1784 100644 --- a/ports/mapbox-polylabel/portfile.cmake +++ b/ports/mapbox-polylabel/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapbox/polylabel - REF 51f09d04c21e7b7faf94e2300ca1fe6e1f12fa7f - SHA512 75ddb479d4aa6768f161cc4d0f94121097c0f97840e9d677adec59b7360f8245bca54770cc894c7d10171c1cfea6e9a1ab73a7b45dff383791baa60bcf2226b9 + REF v1.0.4 + SHA512 c337577545e072dbc43b5fc822e7a4fc9585051e24f6af76a3525faee7ab5c332915c43401629ad2e8f1f142f9e920f65347609607aec9394fd6bbc5d4936564 HEAD_REF master ) From 4fe72032d2680bcb38cf396749e6ad2244eb90c9 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 15:10:27 +0100 Subject: [PATCH 0054/1694] [mapbox-polylane,mapbox-geometry] use release versions --- ports/mapbox-geometry/portfile.cmake | 4 ++-- ports/mapbox-polylabel/portfile.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/mapbox-geometry/portfile.cmake b/ports/mapbox-geometry/portfile.cmake index 3c58fb7ef1151b..0371625f5d2095 100644 --- a/ports/mapbox-geometry/portfile.cmake +++ b/ports/mapbox-geometry/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapbox/geometry.hpp - REF c83a2ab18a225254f128b6f5115aa39d04f2de21 - SHA512 81c93a4efb517866888aee86ccb61896f4465f862d5404b0e45e35632a3bf6fb2d5c46935bbe56ff03079861ea503bd13d9d4003d5aae50cad5d1b2187834661 + REF v2.0.3 + SHA512 76c10578e1fba44430786fb5e043dbc063aa251f62396701a509f7fa1e2e5c351fa0fe041d16be84bda9816ec5df3342cd9890da6fe99d78d6fb26e0a3b2485b HEAD_REF master ) diff --git a/ports/mapbox-polylabel/portfile.cmake b/ports/mapbox-polylabel/portfile.cmake index 2b2b123a185821..5bcfe424ad1784 100644 --- a/ports/mapbox-polylabel/portfile.cmake +++ b/ports/mapbox-polylabel/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapbox/polylabel - REF 51f09d04c21e7b7faf94e2300ca1fe6e1f12fa7f - SHA512 75ddb479d4aa6768f161cc4d0f94121097c0f97840e9d677adec59b7360f8245bca54770cc894c7d10171c1cfea6e9a1ab73a7b45dff383791baa60bcf2226b9 + REF v1.0.4 + SHA512 c337577545e072dbc43b5fc822e7a4fc9585051e24f6af76a3525faee7ab5c332915c43401629ad2e8f1f142f9e920f65347609607aec9394fd6bbc5d4936564 HEAD_REF master ) From f8eabaf5e4f5287653367acc95cc1fee4f82689a Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 15:15:44 +0100 Subject: [PATCH 0055/1694] should fix linux --- ports/mapnik/vcpkg.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 0662d626ee4a0b..75888d97e194d3 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -13,7 +13,12 @@ "name": "boost-locale", "features": [ "icu" - ] + ], + "platform": "windows" + }, + { + "name": "boost-locale", + "platform": "!windows" }, "boost-msm", "boost-program-options", From 75f5ea97a7fddb351af9dce7a73b0d178b3cadf6 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 15:15:44 +0100 Subject: [PATCH 0056/1694] should fix linux --- ports/mapnik/vcpkg.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 0662d626ee4a0b..75888d97e194d3 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -13,7 +13,12 @@ "name": "boost-locale", "features": [ "icu" - ] + ], + "platform": "windows" + }, + { + "name": "boost-locale", + "platform": "!windows" }, "boost-msm", "boost-program-options", From 374442b6252e348bb613652da75fd21fc744d3ce Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 16:55:01 +0100 Subject: [PATCH 0057/1694] now fix linux really... --- ports/mapnik/vcpkg.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 75888d97e194d3..28e175e1784499 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -13,12 +13,7 @@ "name": "boost-locale", "features": [ "icu" - ], - "platform": "windows" - }, - { - "name": "boost-locale", - "platform": "!windows" + ] }, "boost-msm", "boost-program-options", @@ -27,7 +22,12 @@ "name": "boost-regex", "features": [ "icu" - ] + ], + "platform": "windows" + }, + { + "name": "boost-regex", + "platform": "!windows" }, "boost-spirit", "boost-system", From 4aaa5b4ab99d00783c911270d28ab8f835c2ef56 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 16:55:01 +0100 Subject: [PATCH 0058/1694] now fix linux really... --- ports/mapnik/vcpkg.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 75888d97e194d3..28e175e1784499 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -13,12 +13,7 @@ "name": "boost-locale", "features": [ "icu" - ], - "platform": "windows" - }, - { - "name": "boost-locale", - "platform": "!windows" + ] }, "boost-msm", "boost-program-options", @@ -27,7 +22,12 @@ "name": "boost-regex", "features": [ "icu" - ] + ], + "platform": "windows" + }, + { + "name": "boost-regex", + "platform": "!windows" }, "boost-spirit", "boost-system", From e5071982ac783e731328dd563c3ee0d369a60d3e Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 17:03:21 +0100 Subject: [PATCH 0059/1694] fix linux again both boosts icus are not supported --- ports/mapnik/vcpkg.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 28e175e1784499..791146ecf1068c 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -13,7 +13,12 @@ "name": "boost-locale", "features": [ "icu" - ] + ], + "platform": "windows" + }, + { + "name": "boost-locale", + "platform": "!windows" }, "boost-msm", "boost-program-options", From cddf575dcdd4a137776e7f8d49b737a149462c9a Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 17:03:21 +0100 Subject: [PATCH 0060/1694] fix linux again both boosts icus are not supported --- ports/mapnik/vcpkg.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 28e175e1784499..791146ecf1068c 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -13,7 +13,12 @@ "name": "boost-locale", "features": [ "icu" - ] + ], + "platform": "windows" + }, + { + "name": "boost-locale", + "platform": "!windows" }, "boost-msm", "boost-program-options", From 198f0395a5d86f7ce7e8dcba22a4282a0790cc71 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 17:57:19 +0100 Subject: [PATCH 0061/1694] remove fixes due to resolved issue https://github.com/mapnik/mapnik/issues/4187 --- ports/mapnik/fix-csv.patch | 13 ------------- ports/mapnik/fix-geojson-plugin.patch | 13 ------------- ports/mapnik/portfile.cmake | 6 ++---- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 ports/mapnik/fix-csv.patch delete mode 100644 ports/mapnik/fix-geojson-plugin.patch diff --git a/ports/mapnik/fix-csv.patch b/ports/mapnik/fix-csv.patch deleted file mode 100644 index ad36dbcc981711..00000000000000 --- a/ports/mapnik/fix-csv.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plugins/input/csv/csv_index_featureset.cpp b/plugins/input/csv/csv_index_featureset.cpp -index 3b1c8a4..c1701e5 100644 ---- a/plugins/input/csv/csv_index_featureset.cpp -+++ b/plugins/input/csv/csv_index_featureset.cpp -@@ -122,7 +122,7 @@ mapnik::feature_ptr csv_index_featureset::next() - #else - std::fseek(file_.get(), pos.off, SEEK_SET); - std::vector record; -- record.resize(pos.second); -+ record.resize(pos.size); - if (std::fread(record.data(), pos.size, 1, file_.get()) != 1) - { - return mapnik::feature_ptr(); diff --git a/ports/mapnik/fix-geojson-plugin.patch b/ports/mapnik/fix-geojson-plugin.patch deleted file mode 100644 index 002222d065461e..00000000000000 --- a/ports/mapnik/fix-geojson-plugin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp -index 7f915fa..d3a4933 100644 ---- a/plugins/input/geojson/geojson_index_featureset.cpp -+++ b/plugins/input/geojson/geojson_index_featureset.cpp -@@ -93,7 +93,7 @@ mapnik::feature_ptr geojson_index_featureset::next() - #else - std::fseek(file_.get(), pos.off, SEEK_SET); - std::vector record; -- record.resize(pos.second); -+ record.resize(pos.size); - auto count = std::fread(record.data(), pos.size, 1, file_.get()); - auto const* start = record.data(); - auto const* end = (count == 1) ? start + record.size() : start; diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 97974797c934db..d181d7ca7d0ecc 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,15 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik - REF c6fc956a779123e3735c16ba28aa85922b924cac - SHA512 a30d8d82e5f0f9f344036858d248ee88872b6f9314e59206e7f127449fb7b9e6af62f624a8e81e1db79723c0dc7324ca8ec970d15646b253a1a28992160c7a3a + REF 4227fd5d698d069a92917cfea9ce9139435d3f12 + SHA512 913e725a05e315b8630928fec7635ccddac833428800cd3f1b5c25226952f00883dbe9b007eb36bfd0330eac001608596fb53d08aa3df2fce297a3aab3bbf935 HEAD_REF master PATCHES fix-config.patch fix-box2d.patch fix-constructor-inheritance.patch - fix-csv.patch - fix-geojson-plugin.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}) From ccfc176252acecd7fbe8aab6700e5ed62b9af84c Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 17:57:19 +0100 Subject: [PATCH 0062/1694] remove fixes due to resolved issue https://github.com/mapnik/mapnik/issues/4187 --- ports/mapnik/fix-csv.patch | 13 ------------- ports/mapnik/fix-geojson-plugin.patch | 13 ------------- ports/mapnik/portfile.cmake | 6 ++---- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 ports/mapnik/fix-csv.patch delete mode 100644 ports/mapnik/fix-geojson-plugin.patch diff --git a/ports/mapnik/fix-csv.patch b/ports/mapnik/fix-csv.patch deleted file mode 100644 index ad36dbcc981711..00000000000000 --- a/ports/mapnik/fix-csv.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plugins/input/csv/csv_index_featureset.cpp b/plugins/input/csv/csv_index_featureset.cpp -index 3b1c8a4..c1701e5 100644 ---- a/plugins/input/csv/csv_index_featureset.cpp -+++ b/plugins/input/csv/csv_index_featureset.cpp -@@ -122,7 +122,7 @@ mapnik::feature_ptr csv_index_featureset::next() - #else - std::fseek(file_.get(), pos.off, SEEK_SET); - std::vector record; -- record.resize(pos.second); -+ record.resize(pos.size); - if (std::fread(record.data(), pos.size, 1, file_.get()) != 1) - { - return mapnik::feature_ptr(); diff --git a/ports/mapnik/fix-geojson-plugin.patch b/ports/mapnik/fix-geojson-plugin.patch deleted file mode 100644 index 002222d065461e..00000000000000 --- a/ports/mapnik/fix-geojson-plugin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp -index 7f915fa..d3a4933 100644 ---- a/plugins/input/geojson/geojson_index_featureset.cpp -+++ b/plugins/input/geojson/geojson_index_featureset.cpp -@@ -93,7 +93,7 @@ mapnik::feature_ptr geojson_index_featureset::next() - #else - std::fseek(file_.get(), pos.off, SEEK_SET); - std::vector record; -- record.resize(pos.second); -+ record.resize(pos.size); - auto count = std::fread(record.data(), pos.size, 1, file_.get()); - auto const* start = record.data(); - auto const* end = (count == 1) ? start + record.size() : start; diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 97974797c934db..d181d7ca7d0ecc 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,15 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik - REF c6fc956a779123e3735c16ba28aa85922b924cac - SHA512 a30d8d82e5f0f9f344036858d248ee88872b6f9314e59206e7f127449fb7b9e6af62f624a8e81e1db79723c0dc7324ca8ec970d15646b253a1a28992160c7a3a + REF 4227fd5d698d069a92917cfea9ce9139435d3f12 + SHA512 913e725a05e315b8630928fec7635ccddac833428800cd3f1b5c25226952f00883dbe9b007eb36bfd0330eac001608596fb53d08aa3df2fce297a3aab3bbf935 HEAD_REF master PATCHES fix-config.patch fix-box2d.patch fix-constructor-inheritance.patch - fix-csv.patch - fix-geojson-plugin.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}) From f9bb2c979d12a2c2b1151c0876fee93f3adc80cc Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 18:31:07 +0100 Subject: [PATCH 0063/1694] add cmake targets; cleanup cmakelists --- ports/mapnik/cmake/CMakeLists.txt | 145 +++++++++++------- ports/mapnik/cmake/MapnikConfig.cmake.in | 5 + ports/mapnik/cmake/demo/c++/CMakeLists.txt | 3 + ports/mapnik/cmake/demo/viewer/CMakeLists.txt | 3 + .../cmake/plugins/input/csv/CMakeLists.txt | 5 +- .../cmake/plugins/input/gdal/CMakeLists.txt | 3 + .../cmake/plugins/input/geobuf/CMakeLists.txt | 5 +- .../plugins/input/geojson/CMakeLists.txt | 7 +- .../cmake/plugins/input/ogr/CMakeLists.txt | 7 +- .../plugins/input/pgraster/CMakeLists.txt | 5 +- .../plugins/input/postgis/CMakeLists.txt | 11 +- .../cmake/plugins/input/raster/CMakeLists.txt | 5 +- .../cmake/plugins/input/shape/CMakeLists.txt | 6 +- .../cmake/plugins/input/sqlite/CMakeLists.txt | 7 +- .../plugins/input/topojson/CMakeLists.txt | 6 +- ports/mapnik/cmake/src/agg/CMakeLists.txt | 0 ports/mapnik/cmake/src/json/CMakeLists.txt | 18 ++- ports/mapnik/cmake/src/wkt/CMakeLists.txt | 18 ++- .../cmake/utils/mapnik-render/CMakeLists.txt | 3 + .../cmake/utils/shapeindex/CMakeLists.txt | 5 +- ports/mapnik/portfile.cmake | 4 + 21 files changed, 193 insertions(+), 78 deletions(-) create mode 100644 ports/mapnik/cmake/MapnikConfig.cmake.in delete mode 100644 ports/mapnik/cmake/src/agg/CMakeLists.txt diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt index 426f1f6509b994..75ac1fca053054 100644 --- a/ports/mapnik/cmake/CMakeLists.txt +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -1,6 +1,11 @@ cmake_minimum_required(VERSION 3.13.4) project(mapnik) -set(CMAKE_CXX_STANDARD 14) + +set(MAPNIK_MAJOR_VERSION 3) +set(MAPNIK_MINOR_VERSION 0) +set(MAPNIK_PATCH_VERSION 23) +set(MAPNIK_VERSION ${MAPNIK_MAJOR_VERSION}.${MAPNIK_MINOR_VERSION}.${MAPNIK_PATCH_VERSION}) + include(CMakeDependentOption) @@ -48,15 +53,15 @@ endif() find_package(Boost REQUIRED COMPONENTS filesystem system regex program_options) -find_package(FreeType REQUIRED) +find_package(freetype CONFIG REQUIRED) -find_library(HARFBUZZ_LIB harfbuzz.lib) +find_package(harfbuzz CONFIG REQUIRED) find_package(ICU REQUIRED COMPONENTS uc) find_package(PNG REQUIRED) -find_package(jpeg REQUIRED) -find_package(tiff REQUIRED) -find_package(WebP REQUIRED) +find_package(JPEG REQUIRED) +find_package(TIFF REQUIRED) +find_package(WebP CONFIG REQUIRED) find_package(LibXml2 REQUIRED) find_package(ZLIB REQUIRED) @@ -66,26 +71,12 @@ set (MAPNIK_DEFS -DHAVE_TIFF -DHAVE_WEBP) -set(thirdparty_include_paths ${thirdparty_include_paths} - ${JPEG_INCLUDE_DIR} ${WEBP_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}) - -set(thirdparty_libraries ${thirdparty_libraries} - ${JPEG_LIBRARIES} ${WEBP_LIBRARIES} ${LIBXML2_LIBRARIES} ${HARFBUZZ_LIB}) - # AGG - include(files.cmake) if (WITH_CAIRO) - find_library(CAIRO_LIB_DEBUG cairod) - find_library(CAIRO_LIB_RELEASE cairo) - find_library(CAIRO_GOBJECT_LIB_DEBUG cairo-gobjectd) - find_library(CAIRO_GOBJECT_LIB_RELEASE cairo-gobject) - find_path(CAIRO_INCLUDE_DIR cairo/cairo.h) - - set(thirdparty_include_paths ${thirdparty_include_paths} ${CAIRO_INCLUDE_DIR}) - set(thirdparty_libraries ${thirdparty_libraries} $<$:${CAIRO_LIB_DEBUG}> $<$:${CAIRO_LIB_RELEASE}>) - + find_package(unofficial-cairo CONFIG REQUIRED) + set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/cairo/process_markers_symbolizer.cpp src/cairo/process_group_symbolizer.cpp @@ -104,14 +95,14 @@ if (WITH_CAIRO) src/cairo/process_text_symbolizer.cpp) set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_CAIRO) + + set(OPTIONAL_LIBRARIES ${OPTIONAL_LIBRARIES} unofficial::cairo::cairo) endif() message(STATUS "Cairo renderer " ${WITH_CAIRO}) if (WITH_PROJ4) - find_package(PROJ4 REQUIRED) - set(thirdparty_include_paths ${thirdparty_include_paths} ${PROJ4_INCLUDE_DIRS}) - set(thirdparty_libraries ${thirdparty_libraries} ${PROJ4_LIBRARIES}) - + find_package(PROJ4 CONFIG REQUIRED) + set(OPTIONAL_LIBRARIES ${OPTIONAL_LIBRARIES} proj) set(MAPNIK_DEFS ${MAPNIK_DEFS} -DMAPNIK_USE_PROJ4) endif() @@ -129,7 +120,7 @@ if (WITH_GRID) src/grid/process_shield_symbolizer.cpp src/grid/process_text_symbolizer.cpp) set(MAPNIK_DEFS ${MAPNIK_DEFS} -DGRID_RENDERER) -ENDIF() +endif() message(STATUS "Grid renderer: " ${WITH_GRID}) set(MAPNIK_SOURCES ${MAPNIK_SOURCES} @@ -149,60 +140,85 @@ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/png_reader.cpp src/tiff_reader.cpp src/webp_reader.cpp - ) +) #set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/rapidxml_loader.cpp) -set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2 -DBOOST_REGEX_HAS_ICU) +#vcpkg only supports icu on windows +if(WIN32) + set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2 -DBOOST_REGEX_HAS_ICU) +endif() find_path(MAPBOX_POLYLABEL_INCLUDE_DIRS "mapbox/polylabel.hpp") find_path(MAPBOX_GEOMETRY_INCLUDE_DIRS "mapbox/feature.hpp") find_path(MAPBOX_VARIANT_INCLUDE_DIRS "mapbox/optional.hpp") -set(mapnik_include_paths - include - deps - deps/agg/include) - - -include_directories( - ${mapnik_include_paths} - ${MAPBOX_POLYLABEL_INCLUDE_DIRS} - ${MAPBOX_GEOMETRY_INCLUDE_DIRS} - ${MAPBOX_VARIANT_INCLUDE_DIRS} - ${thirdparty_include_paths}) +set(MAPNIK_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/include) +set(mapnik_include_paths + ${PROJECT_SOURCE_DIR}/deps + ${PROJECT_SOURCE_DIR}/deps/agg/include) + +add_library(mapnik ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) if (MAPNIK_STATIC_LIB) message(STATUS "Building static library") - add_library(mapnik STATIC ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) set_target_properties(mapnik PROPERTIES DEFINE_SYMBOL MAPNIK_STATICLIB) set(MAPNIK_LIB_DEFINITION -DMAPNIK_STATICLIB) else () message(STATUS "Building shared library") - add_library(mapnik SHARED ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) set_target_properties(mapnik PROPERTIES DEFINE_SYMBOL MAPNIK_EXPORTS) - set(MAPNIK_LIB_DEFINITION ) + set(MAPNIK_LIB_DEFINITION -DMAPNIK_EXPORTS) endif () -target_compile_definitions(mapnik PUBLIC ${MAPNIK_DEFS}) -target_include_directories(mapnik INTERFACE ${mapnik_include_paths} ${thirdparty_include_paths} ) +target_compile_definitions(mapnik PUBLIC ${MAPNIK_DEFS}) +target_include_directories(mapnik PUBLIC + $ + $ +) +target_include_directories(mapnik PRIVATE + ${mapnik_include_paths} + ${JPEG_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${MAPBOX_POLYLABEL_INCLUDE_DIRS} + ${MAPBOX_GEOMETRY_INCLUDE_DIRS} + ${MAPBOX_VARIANT_INCLUDE_DIRS} +) target_link_libraries(mapnik PUBLIC - ${thirdparty_libraries} Boost::boost Boost::filesystem Boost::system Boost::regex Boost::program_options Boost::system - Freetype::Freetype + WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder + freetype ICU::uc PNG::PNG TIFF::TIFF - ZLIB::ZLIB) - - -install(TARGETS mapnik) + ZLIB::ZLIB + harfbuzz::harfbuzz + JPEG::JPEG + ${LIBXML2_LIBRARIES} + ${OPTIONAL_LIBRARIES} +) + + +install(TARGETS mapnik + EXPORT MapnikTargets + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + INCLUDES DESTINATION include +) add_subdirectory(src/json) add_subdirectory(src/wkt) + +install(EXPORT MapnikTargets + FILE MapnikTargets.cmake + NAMESPACE mapnik:: + DESTINATION lib/cmake/mapnik +) + + # ideally we should also generate mapnik-config if (WITH_INPUT_CSV) @@ -245,7 +261,7 @@ if (WITH_INPUT_SHAPE) endif() if (WITH_INPUT_SQLITE) - find_package(sqlite3 REQUIRED) + find_package(SQLite3 REQUIRED) add_subdirectory(plugins/input/sqlite) endif() @@ -304,4 +320,25 @@ endif() if(WITH_UTILS) add_subdirectory(utils/mapnik-render) add_subdirectory(utils/shapeindex) -endif() \ No newline at end of file +endif() + + + + +include(CMakePackageConfigHelpers) +write_basic_package_version_file( + "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfigVersion.cmake" + VERSION ${MAPNIK_VERSION} + COMPATIBILITY SameMajorVersion +) + +configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/MapnikConfig.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfig.cmake" + INSTALL_DESTINATION lib/cmake/mapnik +) + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfigVersion.cmake" + DESTINATION lib/cmake/mapnik +) \ No newline at end of file diff --git a/ports/mapnik/cmake/MapnikConfig.cmake.in b/ports/mapnik/cmake/MapnikConfig.cmake.in new file mode 100644 index 00000000000000..7df03c72cfadd0 --- /dev/null +++ b/ports/mapnik/cmake/MapnikConfig.cmake.in @@ -0,0 +1,5 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/MapnikTargets.cmake") + +check_required_components(mapnik) \ No newline at end of file diff --git a/ports/mapnik/cmake/demo/c++/CMakeLists.txt b/ports/mapnik/cmake/demo/c++/CMakeLists.txt index 0c59904107f109..635b5693aeb764 100644 --- a/ports/mapnik/cmake/demo/c++/CMakeLists.txt +++ b/ports/mapnik/cmake/demo/c++/CMakeLists.txt @@ -1,4 +1,7 @@ add_executable(mapnik-demo rundemo.cpp) add_dependencies(mapnik-demo mapnik) +target_include_directories(mapnik-demo PRIVATE + ${mapnik_include_paths} +) target_link_libraries(mapnik-demo PRIVATE mapnik) install(TARGETS mapnik-demo DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/cmake/demo/viewer/CMakeLists.txt b/ports/mapnik/cmake/demo/viewer/CMakeLists.txt index b157f98a5a04f7..e57997d03fac31 100644 --- a/ports/mapnik/cmake/demo/viewer/CMakeLists.txt +++ b/ports/mapnik/cmake/demo/viewer/CMakeLists.txt @@ -23,5 +23,8 @@ set_target_properties(mapnik-viewer PROPERTIES AUTOMOC ON) add_dependencies(mapnik-viewer mapnik) +target_include_directories(mapnik-viewer PRIVATE + ${mapnik_include_paths} +) target_link_libraries(mapnik-viewer PRIVATE mapnik Qt5::Widgets) install(TARGETS mapnik-viewer DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt index 2bbe0f41de8268..8b8ef5a33382b5 100644 --- a/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt @@ -5,7 +5,10 @@ add_library(mapnik-input-csv SHARED csv_inline_featureset.cpp csv_utils.cpp) -target_link_libraries(mapnik-input-csv PUBLIC mapnik mapnik-wkt mapnik-json) +target_link_libraries(mapnik-input-csv PUBLIC mapnik mapnik-wkt mapnik-json) +target_include_directories(mapnik-input-csv PRIVATE + ${mapnik_include_paths} +) set_target_properties(mapnik-input-csv PROPERTIES PREFIX "") set_target_properties(mapnik-input-csv PROPERTIES OUTPUT_NAME "csv") set_target_properties(mapnik-input-csv PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt index efddbe31e9bc1c..6c704c3f2b5097 100644 --- a/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt @@ -2,6 +2,9 @@ add_library(mapnik-input-gdal SHARED gdal_datasource.cpp gdal_featureset.cpp) +target_include_directories(mapnik-input-gdal PRIVATE + ${mapnik_include_paths} +) target_link_libraries(mapnik-input-gdal PUBLIC mapnik ${GDAL_LIBRARIES}) set_target_properties(mapnik-input-gdal PROPERTIES PREFIX "") set_target_properties(mapnik-input-gdal PROPERTIES OUTPUT_NAME "gdal") diff --git a/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt index 679f6249a736e5..48721e9e4b9c74 100644 --- a/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt @@ -4,9 +4,8 @@ geobuf_datasource.cpp geobuf_featureset.cpp) find_path(PROTOZERO_INCLUDE_DIRS "protozero/byteswap.hpp") -target_include_directories(mapnik-input-geobuf PRIVATE ${PROTOZERO_INCLUDE_DIRS}) - -target_link_libraries(mapnik-input-geobuf PUBLIC mapnik) +target_include_directories(mapnik-input-geobuf PRIVATE ${PROTOZERO_INCLUDE_DIRS} ${mapnik_include_paths}) +target_link_libraries(mapnik-input-geobuf PRIVATE mapnik) set_target_properties(mapnik-input-geobuf PROPERTIES PREFIX "") set_target_properties(mapnik-input-geobuf PROPERTIES OUTPUT_NAME "geobuf") set_target_properties(mapnik-input-geobuf PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt index d821c0de1fa98b..980a8c40428cae 100644 --- a/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt @@ -3,8 +3,11 @@ add_library(mapnik-input-geojson SHARED geojson_featureset.cpp geojson_index_featureset.cpp geojson_memory_index_featureset.cpp) - -target_link_libraries(mapnik-input-geojson PUBLIC mapnik mapnik-json) + +target_include_directories(mapnik-input-geojson PRIVATE + ${mapnik_include_paths} +) +target_link_libraries(mapnik-input-geojson PRIVATE mapnik mapnik-json) set_target_properties(mapnik-input-geojson PROPERTIES PREFIX "") set_target_properties(mapnik-input-geojson PROPERTIES OUTPUT_NAME "geojson") set_target_properties(mapnik-input-geojson PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt index 87a6e88913301a..758107010fff0d 100644 --- a/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt @@ -3,8 +3,11 @@ add_library(mapnik-input-ogr SHARED ogr_datasource.cpp ogr_featureset.cpp ogr_index_featureset.cpp) - -target_link_libraries(mapnik-input-ogr PUBLIC mapnik ${OGR_LIBRARIES} ${GDAL_LIBRARIES}) + +target_include_directories(mapnik-input-ogr PRIVATE + ${mapnik_include_paths} +) +target_link_libraries(mapnik-input-ogr PRIVATE mapnik ${OGR_LIBRARIES} ${GDAL_LIBRARIES}) set_target_properties(mapnik-input-ogr PROPERTIES PREFIX "") set_target_properties(mapnik-input-ogr PROPERTIES OUTPUT_NAME "ogr") set_target_properties(mapnik-input-ogr PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt index 5c11168237bcdd..8716119cfdba9d 100644 --- a/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt @@ -3,7 +3,10 @@ pgraster_datasource.cpp pgraster_featureset.cpp pgraster_wkb_reader.cpp) -target_link_libraries(mapnik-input-pgraster PUBLIC mapnik ${PostgreSQL_LIBRARIES}) +target_include_directories(mapnik-input-pgraster PRIVATE + ${mapnik_include_paths} +) +target_link_libraries(mapnik-input-pgraster PRIVATE mapnik PostgreSQL::PostgreSQL) set_target_properties(mapnik-input-pgraster PROPERTIES PREFIX "") set_target_properties(mapnik-input-pgraster PROPERTIES OUTPUT_NAME "pgraster") set_target_properties(mapnik-input-pgraster PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt index 1d7c80b425387e..6fb85622a6964a 100644 --- a/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt @@ -1,8 +1,15 @@ +find_package(odb CONFIG REQUIRED) add_library(mapnik-input-postgis SHARED postgis_datasource.cpp postgis_featureset.cpp ) - -target_link_libraries(mapnik-input-postgis PUBLIC mapnik ${PostgreSQL_LIBRARIES}) + +target_include_directories(mapnik-input-postgis PRIVATE + ${mapnik_include_paths} + ${MAPBOX_POLYLABEL_INCLUDE_DIRS} + ${MAPBOX_GEOMETRY_INCLUDE_DIRS} + ${MAPBOX_VARIANT_INCLUDE_DIRS} +) +target_link_libraries(mapnik-input-postgis PRIVATE mapnik PostgreSQL::PostgreSQL) set_target_properties(mapnik-input-postgis PROPERTIES PREFIX "") set_target_properties(mapnik-input-postgis PROPERTIES OUTPUT_NAME "postgis") set_target_properties(mapnik-input-postgis PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt index 8f0dffa9e0f137..0341a369a5dc72 100644 --- a/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt @@ -3,7 +3,10 @@ add_library(mapnik-input-raster SHARED raster_featureset.cpp raster_info.cpp) -target_link_libraries(mapnik-input-raster PUBLIC mapnik) +target_include_directories(mapnik-input-raster PRIVATE + ${mapnik_include_paths} +) +target_link_libraries(mapnik-input-raster PRIVATE mapnik) set_target_properties(mapnik-input-raster PROPERTIES PREFIX "") set_target_properties(mapnik-input-raster PROPERTIES OUTPUT_NAME "raster") set_target_properties(mapnik-input-raster PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt index 314eb221c47b1e..f484c2fed36fe8 100644 --- a/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt @@ -6,9 +6,11 @@ SET(INPUT_SHAPE_SOURCES shape_index_featureset.cpp shape_io.cpp shape_utils.cpp ) - add_library(mapnik-input-shape SHARED ${INPUT_SHAPE_SOURCES}) -target_link_libraries(mapnik-input-shape PUBLIC mapnik) +target_include_directories(mapnik-input-shape PRIVATE + ${mapnik_include_paths} +) +target_link_libraries(mapnik-input-shape PRIVATE mapnik) set_target_properties(mapnik-input-shape PROPERTIES PREFIX "") set_target_properties(mapnik-input-shape PROPERTIES OUTPUT_NAME "shape") set_target_properties(mapnik-input-shape PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt index 26f3cb718a0ab5..eea67a1ef9970c 100644 --- a/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt @@ -1,8 +1,11 @@ +find_package(unofficial-sqlite3 CONFIG REQUIRED) add_library(mapnik-input-sqlite SHARED sqlite_datasource.cpp sqlite_featureset.cpp) - -target_link_libraries(mapnik-input-sqlite PUBLIC mapnik SQLite::SQLite3) +target_include_directories(mapnik-input-sqlite PRIVATE + ${mapnik_include_paths} +) +target_link_libraries(mapnik-input-sqlite PRIVATE mapnik unofficial::sqlite3::sqlite3) set_target_properties(mapnik-input-sqlite PROPERTIES PREFIX "") set_target_properties(mapnik-input-sqlite PROPERTIES OUTPUT_NAME "sqlite") set_target_properties(mapnik-input-sqlite PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt index 56fb062a90537b..61dcdb16022c82 100644 --- a/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt @@ -1,8 +1,10 @@ add_library(mapnik-input-topojson SHARED topojson_datasource.cpp topojson_featureset.cpp) - -target_link_libraries(mapnik-input-topojson PUBLIC mapnik mapnik-json) +target_include_directories(mapnik-input-topojson PRIVATE + ${mapnik_include_paths} +) +target_link_libraries(mapnik-input-topojson PRIVATE mapnik mapnik-json) set_target_properties(mapnik-input-topojson PROPERTIES PREFIX "") set_target_properties(mapnik-input-topojson PROPERTIES OUTPUT_NAME "topojson") set_target_properties(mapnik-input-topojson PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/src/agg/CMakeLists.txt b/ports/mapnik/cmake/src/agg/CMakeLists.txt deleted file mode 100644 index e69de29bb2d1d6..00000000000000 diff --git a/ports/mapnik/cmake/src/json/CMakeLists.txt b/ports/mapnik/cmake/src/json/CMakeLists.txt index b0f18c26b89b1f..d16f4596f89ae8 100644 --- a/ports/mapnik/cmake/src/json/CMakeLists.txt +++ b/ports/mapnik/cmake/src/json/CMakeLists.txt @@ -13,7 +13,19 @@ add_library(mapnik-json STATIC topojson_grammar_x3.cpp unicode_string_grammar_x3.cpp) -target_link_libraries(mapnik-json INTERFACE ${ICUU_LIB}) +target_include_directories(mapnik-json PRIVATE + ${JPEG_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${MAPBOX_POLYLABEL_INCLUDE_DIRS} + ${MAPBOX_GEOMETRY_INCLUDE_DIRS} + ${MAPBOX_VARIANT_INCLUDE_DIRS} +) +target_link_libraries(mapnik-json PRIVATE mapnik ${ICUU_LIB}) +#target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) -install(TARGETS mapnik-json LIBRARY DESTINATION lib) -target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) \ No newline at end of file +install(TARGETS mapnik-json + EXPORT MapnikTargets + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin +) \ No newline at end of file diff --git a/ports/mapnik/cmake/src/wkt/CMakeLists.txt b/ports/mapnik/cmake/src/wkt/CMakeLists.txt index 527f5512fb8a56..a63413ce925c52 100644 --- a/ports/mapnik/cmake/src/wkt/CMakeLists.txt +++ b/ports/mapnik/cmake/src/wkt/CMakeLists.txt @@ -4,5 +4,19 @@ add_library(mapnik-wkt STATIC wkt_factory.cpp wkt_grammar_x3.cpp) -install(TARGETS mapnik-wkt LIBRARY DESTINATION lib) -target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) \ No newline at end of file +target_include_directories(mapnik-wkt PRIVATE + ${MAPNIK_INCLUDE_PATH} + ${JPEG_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${MAPBOX_POLYLABEL_INCLUDE_DIRS} + ${MAPBOX_GEOMETRY_INCLUDE_DIRS} + ${MAPBOX_VARIANT_INCLUDE_DIRS} +) +target_compile_definitions(mapnik-wkt PRIVATE ${MAPNIK_LIB_DEFINITION}) + +install(TARGETS mapnik-wkt + EXPORT MapnikTargets + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin +) \ No newline at end of file diff --git a/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt b/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt index 0aa78966d69347..23ce12ebbc2e6d 100644 --- a/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt +++ b/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt @@ -1,4 +1,7 @@ add_executable(mapnik-render mapnik-render.cpp) +target_include_directories(mapnik-render PRIVATE + ${mapnik_include_paths} +) target_link_libraries(mapnik-render PRIVATE mapnik) install(TARGETS mapnik-render DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt b/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt index f162bb25c48120..5a81e557d1b7d8 100644 --- a/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt +++ b/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt @@ -1,4 +1,7 @@ add_executable(shapeindex shapeindex.cpp) target_link_libraries(shapeindex PRIVATE mapnik) -target_include_directories(shapeindex PRIVATE ../../plugins/input/shape) +target_include_directories(shapeindex PRIVATE + ../../plugins/input/shape + ${mapnik_include_paths} +) install(TARGETS shapeindex DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index d181d7ca7d0ecc..b7fbe52c76429f 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -80,5 +80,9 @@ if ("utils" IN_LIST FEATURES) file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mapnik) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + + file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/fonts/unifont_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME fonts_copyright) From d1ab6bdd6a6a94d96f63ede0a971ecaaf6df8358 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 18:31:07 +0100 Subject: [PATCH 0064/1694] add cmake targets; cleanup cmakelists --- ports/mapnik/cmake/CMakeLists.txt | 145 +++++++++++------- ports/mapnik/cmake/MapnikConfig.cmake.in | 5 + ports/mapnik/cmake/demo/c++/CMakeLists.txt | 3 + ports/mapnik/cmake/demo/viewer/CMakeLists.txt | 3 + .../cmake/plugins/input/csv/CMakeLists.txt | 5 +- .../cmake/plugins/input/gdal/CMakeLists.txt | 3 + .../cmake/plugins/input/geobuf/CMakeLists.txt | 5 +- .../plugins/input/geojson/CMakeLists.txt | 7 +- .../cmake/plugins/input/ogr/CMakeLists.txt | 7 +- .../plugins/input/pgraster/CMakeLists.txt | 5 +- .../plugins/input/postgis/CMakeLists.txt | 11 +- .../cmake/plugins/input/raster/CMakeLists.txt | 5 +- .../cmake/plugins/input/shape/CMakeLists.txt | 6 +- .../cmake/plugins/input/sqlite/CMakeLists.txt | 7 +- .../plugins/input/topojson/CMakeLists.txt | 6 +- ports/mapnik/cmake/src/agg/CMakeLists.txt | 0 ports/mapnik/cmake/src/json/CMakeLists.txt | 18 ++- ports/mapnik/cmake/src/wkt/CMakeLists.txt | 18 ++- .../cmake/utils/mapnik-render/CMakeLists.txt | 3 + .../cmake/utils/shapeindex/CMakeLists.txt | 5 +- ports/mapnik/portfile.cmake | 4 + 21 files changed, 193 insertions(+), 78 deletions(-) create mode 100644 ports/mapnik/cmake/MapnikConfig.cmake.in delete mode 100644 ports/mapnik/cmake/src/agg/CMakeLists.txt diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt index 426f1f6509b994..75ac1fca053054 100644 --- a/ports/mapnik/cmake/CMakeLists.txt +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -1,6 +1,11 @@ cmake_minimum_required(VERSION 3.13.4) project(mapnik) -set(CMAKE_CXX_STANDARD 14) + +set(MAPNIK_MAJOR_VERSION 3) +set(MAPNIK_MINOR_VERSION 0) +set(MAPNIK_PATCH_VERSION 23) +set(MAPNIK_VERSION ${MAPNIK_MAJOR_VERSION}.${MAPNIK_MINOR_VERSION}.${MAPNIK_PATCH_VERSION}) + include(CMakeDependentOption) @@ -48,15 +53,15 @@ endif() find_package(Boost REQUIRED COMPONENTS filesystem system regex program_options) -find_package(FreeType REQUIRED) +find_package(freetype CONFIG REQUIRED) -find_library(HARFBUZZ_LIB harfbuzz.lib) +find_package(harfbuzz CONFIG REQUIRED) find_package(ICU REQUIRED COMPONENTS uc) find_package(PNG REQUIRED) -find_package(jpeg REQUIRED) -find_package(tiff REQUIRED) -find_package(WebP REQUIRED) +find_package(JPEG REQUIRED) +find_package(TIFF REQUIRED) +find_package(WebP CONFIG REQUIRED) find_package(LibXml2 REQUIRED) find_package(ZLIB REQUIRED) @@ -66,26 +71,12 @@ set (MAPNIK_DEFS -DHAVE_TIFF -DHAVE_WEBP) -set(thirdparty_include_paths ${thirdparty_include_paths} - ${JPEG_INCLUDE_DIR} ${WEBP_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}) - -set(thirdparty_libraries ${thirdparty_libraries} - ${JPEG_LIBRARIES} ${WEBP_LIBRARIES} ${LIBXML2_LIBRARIES} ${HARFBUZZ_LIB}) - # AGG - include(files.cmake) if (WITH_CAIRO) - find_library(CAIRO_LIB_DEBUG cairod) - find_library(CAIRO_LIB_RELEASE cairo) - find_library(CAIRO_GOBJECT_LIB_DEBUG cairo-gobjectd) - find_library(CAIRO_GOBJECT_LIB_RELEASE cairo-gobject) - find_path(CAIRO_INCLUDE_DIR cairo/cairo.h) - - set(thirdparty_include_paths ${thirdparty_include_paths} ${CAIRO_INCLUDE_DIR}) - set(thirdparty_libraries ${thirdparty_libraries} $<$:${CAIRO_LIB_DEBUG}> $<$:${CAIRO_LIB_RELEASE}>) - + find_package(unofficial-cairo CONFIG REQUIRED) + set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/cairo/process_markers_symbolizer.cpp src/cairo/process_group_symbolizer.cpp @@ -104,14 +95,14 @@ if (WITH_CAIRO) src/cairo/process_text_symbolizer.cpp) set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_CAIRO) + + set(OPTIONAL_LIBRARIES ${OPTIONAL_LIBRARIES} unofficial::cairo::cairo) endif() message(STATUS "Cairo renderer " ${WITH_CAIRO}) if (WITH_PROJ4) - find_package(PROJ4 REQUIRED) - set(thirdparty_include_paths ${thirdparty_include_paths} ${PROJ4_INCLUDE_DIRS}) - set(thirdparty_libraries ${thirdparty_libraries} ${PROJ4_LIBRARIES}) - + find_package(PROJ4 CONFIG REQUIRED) + set(OPTIONAL_LIBRARIES ${OPTIONAL_LIBRARIES} proj) set(MAPNIK_DEFS ${MAPNIK_DEFS} -DMAPNIK_USE_PROJ4) endif() @@ -129,7 +120,7 @@ if (WITH_GRID) src/grid/process_shield_symbolizer.cpp src/grid/process_text_symbolizer.cpp) set(MAPNIK_DEFS ${MAPNIK_DEFS} -DGRID_RENDERER) -ENDIF() +endif() message(STATUS "Grid renderer: " ${WITH_GRID}) set(MAPNIK_SOURCES ${MAPNIK_SOURCES} @@ -149,60 +140,85 @@ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/png_reader.cpp src/tiff_reader.cpp src/webp_reader.cpp - ) +) #set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/rapidxml_loader.cpp) -set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2 -DBOOST_REGEX_HAS_ICU) +#vcpkg only supports icu on windows +if(WIN32) + set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2 -DBOOST_REGEX_HAS_ICU) +endif() find_path(MAPBOX_POLYLABEL_INCLUDE_DIRS "mapbox/polylabel.hpp") find_path(MAPBOX_GEOMETRY_INCLUDE_DIRS "mapbox/feature.hpp") find_path(MAPBOX_VARIANT_INCLUDE_DIRS "mapbox/optional.hpp") -set(mapnik_include_paths - include - deps - deps/agg/include) - - -include_directories( - ${mapnik_include_paths} - ${MAPBOX_POLYLABEL_INCLUDE_DIRS} - ${MAPBOX_GEOMETRY_INCLUDE_DIRS} - ${MAPBOX_VARIANT_INCLUDE_DIRS} - ${thirdparty_include_paths}) +set(MAPNIK_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/include) +set(mapnik_include_paths + ${PROJECT_SOURCE_DIR}/deps + ${PROJECT_SOURCE_DIR}/deps/agg/include) + +add_library(mapnik ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) if (MAPNIK_STATIC_LIB) message(STATUS "Building static library") - add_library(mapnik STATIC ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) set_target_properties(mapnik PROPERTIES DEFINE_SYMBOL MAPNIK_STATICLIB) set(MAPNIK_LIB_DEFINITION -DMAPNIK_STATICLIB) else () message(STATUS "Building shared library") - add_library(mapnik SHARED ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) set_target_properties(mapnik PROPERTIES DEFINE_SYMBOL MAPNIK_EXPORTS) - set(MAPNIK_LIB_DEFINITION ) + set(MAPNIK_LIB_DEFINITION -DMAPNIK_EXPORTS) endif () -target_compile_definitions(mapnik PUBLIC ${MAPNIK_DEFS}) -target_include_directories(mapnik INTERFACE ${mapnik_include_paths} ${thirdparty_include_paths} ) +target_compile_definitions(mapnik PUBLIC ${MAPNIK_DEFS}) +target_include_directories(mapnik PUBLIC + $ + $ +) +target_include_directories(mapnik PRIVATE + ${mapnik_include_paths} + ${JPEG_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${MAPBOX_POLYLABEL_INCLUDE_DIRS} + ${MAPBOX_GEOMETRY_INCLUDE_DIRS} + ${MAPBOX_VARIANT_INCLUDE_DIRS} +) target_link_libraries(mapnik PUBLIC - ${thirdparty_libraries} Boost::boost Boost::filesystem Boost::system Boost::regex Boost::program_options Boost::system - Freetype::Freetype + WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder + freetype ICU::uc PNG::PNG TIFF::TIFF - ZLIB::ZLIB) - - -install(TARGETS mapnik) + ZLIB::ZLIB + harfbuzz::harfbuzz + JPEG::JPEG + ${LIBXML2_LIBRARIES} + ${OPTIONAL_LIBRARIES} +) + + +install(TARGETS mapnik + EXPORT MapnikTargets + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + INCLUDES DESTINATION include +) add_subdirectory(src/json) add_subdirectory(src/wkt) + +install(EXPORT MapnikTargets + FILE MapnikTargets.cmake + NAMESPACE mapnik:: + DESTINATION lib/cmake/mapnik +) + + # ideally we should also generate mapnik-config if (WITH_INPUT_CSV) @@ -245,7 +261,7 @@ if (WITH_INPUT_SHAPE) endif() if (WITH_INPUT_SQLITE) - find_package(sqlite3 REQUIRED) + find_package(SQLite3 REQUIRED) add_subdirectory(plugins/input/sqlite) endif() @@ -304,4 +320,25 @@ endif() if(WITH_UTILS) add_subdirectory(utils/mapnik-render) add_subdirectory(utils/shapeindex) -endif() \ No newline at end of file +endif() + + + + +include(CMakePackageConfigHelpers) +write_basic_package_version_file( + "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfigVersion.cmake" + VERSION ${MAPNIK_VERSION} + COMPATIBILITY SameMajorVersion +) + +configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/MapnikConfig.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfig.cmake" + INSTALL_DESTINATION lib/cmake/mapnik +) + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfigVersion.cmake" + DESTINATION lib/cmake/mapnik +) \ No newline at end of file diff --git a/ports/mapnik/cmake/MapnikConfig.cmake.in b/ports/mapnik/cmake/MapnikConfig.cmake.in new file mode 100644 index 00000000000000..7df03c72cfadd0 --- /dev/null +++ b/ports/mapnik/cmake/MapnikConfig.cmake.in @@ -0,0 +1,5 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/MapnikTargets.cmake") + +check_required_components(mapnik) \ No newline at end of file diff --git a/ports/mapnik/cmake/demo/c++/CMakeLists.txt b/ports/mapnik/cmake/demo/c++/CMakeLists.txt index 0c59904107f109..635b5693aeb764 100644 --- a/ports/mapnik/cmake/demo/c++/CMakeLists.txt +++ b/ports/mapnik/cmake/demo/c++/CMakeLists.txt @@ -1,4 +1,7 @@ add_executable(mapnik-demo rundemo.cpp) add_dependencies(mapnik-demo mapnik) +target_include_directories(mapnik-demo PRIVATE + ${mapnik_include_paths} +) target_link_libraries(mapnik-demo PRIVATE mapnik) install(TARGETS mapnik-demo DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/cmake/demo/viewer/CMakeLists.txt b/ports/mapnik/cmake/demo/viewer/CMakeLists.txt index b157f98a5a04f7..e57997d03fac31 100644 --- a/ports/mapnik/cmake/demo/viewer/CMakeLists.txt +++ b/ports/mapnik/cmake/demo/viewer/CMakeLists.txt @@ -23,5 +23,8 @@ set_target_properties(mapnik-viewer PROPERTIES AUTOMOC ON) add_dependencies(mapnik-viewer mapnik) +target_include_directories(mapnik-viewer PRIVATE + ${mapnik_include_paths} +) target_link_libraries(mapnik-viewer PRIVATE mapnik Qt5::Widgets) install(TARGETS mapnik-viewer DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt index 2bbe0f41de8268..8b8ef5a33382b5 100644 --- a/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt @@ -5,7 +5,10 @@ add_library(mapnik-input-csv SHARED csv_inline_featureset.cpp csv_utils.cpp) -target_link_libraries(mapnik-input-csv PUBLIC mapnik mapnik-wkt mapnik-json) +target_link_libraries(mapnik-input-csv PUBLIC mapnik mapnik-wkt mapnik-json) +target_include_directories(mapnik-input-csv PRIVATE + ${mapnik_include_paths} +) set_target_properties(mapnik-input-csv PROPERTIES PREFIX "") set_target_properties(mapnik-input-csv PROPERTIES OUTPUT_NAME "csv") set_target_properties(mapnik-input-csv PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt index efddbe31e9bc1c..6c704c3f2b5097 100644 --- a/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt @@ -2,6 +2,9 @@ add_library(mapnik-input-gdal SHARED gdal_datasource.cpp gdal_featureset.cpp) +target_include_directories(mapnik-input-gdal PRIVATE + ${mapnik_include_paths} +) target_link_libraries(mapnik-input-gdal PUBLIC mapnik ${GDAL_LIBRARIES}) set_target_properties(mapnik-input-gdal PROPERTIES PREFIX "") set_target_properties(mapnik-input-gdal PROPERTIES OUTPUT_NAME "gdal") diff --git a/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt index 679f6249a736e5..48721e9e4b9c74 100644 --- a/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt @@ -4,9 +4,8 @@ geobuf_datasource.cpp geobuf_featureset.cpp) find_path(PROTOZERO_INCLUDE_DIRS "protozero/byteswap.hpp") -target_include_directories(mapnik-input-geobuf PRIVATE ${PROTOZERO_INCLUDE_DIRS}) - -target_link_libraries(mapnik-input-geobuf PUBLIC mapnik) +target_include_directories(mapnik-input-geobuf PRIVATE ${PROTOZERO_INCLUDE_DIRS} ${mapnik_include_paths}) +target_link_libraries(mapnik-input-geobuf PRIVATE mapnik) set_target_properties(mapnik-input-geobuf PROPERTIES PREFIX "") set_target_properties(mapnik-input-geobuf PROPERTIES OUTPUT_NAME "geobuf") set_target_properties(mapnik-input-geobuf PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt index d821c0de1fa98b..980a8c40428cae 100644 --- a/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt @@ -3,8 +3,11 @@ add_library(mapnik-input-geojson SHARED geojson_featureset.cpp geojson_index_featureset.cpp geojson_memory_index_featureset.cpp) - -target_link_libraries(mapnik-input-geojson PUBLIC mapnik mapnik-json) + +target_include_directories(mapnik-input-geojson PRIVATE + ${mapnik_include_paths} +) +target_link_libraries(mapnik-input-geojson PRIVATE mapnik mapnik-json) set_target_properties(mapnik-input-geojson PROPERTIES PREFIX "") set_target_properties(mapnik-input-geojson PROPERTIES OUTPUT_NAME "geojson") set_target_properties(mapnik-input-geojson PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt index 87a6e88913301a..758107010fff0d 100644 --- a/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt @@ -3,8 +3,11 @@ add_library(mapnik-input-ogr SHARED ogr_datasource.cpp ogr_featureset.cpp ogr_index_featureset.cpp) - -target_link_libraries(mapnik-input-ogr PUBLIC mapnik ${OGR_LIBRARIES} ${GDAL_LIBRARIES}) + +target_include_directories(mapnik-input-ogr PRIVATE + ${mapnik_include_paths} +) +target_link_libraries(mapnik-input-ogr PRIVATE mapnik ${OGR_LIBRARIES} ${GDAL_LIBRARIES}) set_target_properties(mapnik-input-ogr PROPERTIES PREFIX "") set_target_properties(mapnik-input-ogr PROPERTIES OUTPUT_NAME "ogr") set_target_properties(mapnik-input-ogr PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt index 5c11168237bcdd..8716119cfdba9d 100644 --- a/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt @@ -3,7 +3,10 @@ pgraster_datasource.cpp pgraster_featureset.cpp pgraster_wkb_reader.cpp) -target_link_libraries(mapnik-input-pgraster PUBLIC mapnik ${PostgreSQL_LIBRARIES}) +target_include_directories(mapnik-input-pgraster PRIVATE + ${mapnik_include_paths} +) +target_link_libraries(mapnik-input-pgraster PRIVATE mapnik PostgreSQL::PostgreSQL) set_target_properties(mapnik-input-pgraster PROPERTIES PREFIX "") set_target_properties(mapnik-input-pgraster PROPERTIES OUTPUT_NAME "pgraster") set_target_properties(mapnik-input-pgraster PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt index 1d7c80b425387e..6fb85622a6964a 100644 --- a/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt @@ -1,8 +1,15 @@ +find_package(odb CONFIG REQUIRED) add_library(mapnik-input-postgis SHARED postgis_datasource.cpp postgis_featureset.cpp ) - -target_link_libraries(mapnik-input-postgis PUBLIC mapnik ${PostgreSQL_LIBRARIES}) + +target_include_directories(mapnik-input-postgis PRIVATE + ${mapnik_include_paths} + ${MAPBOX_POLYLABEL_INCLUDE_DIRS} + ${MAPBOX_GEOMETRY_INCLUDE_DIRS} + ${MAPBOX_VARIANT_INCLUDE_DIRS} +) +target_link_libraries(mapnik-input-postgis PRIVATE mapnik PostgreSQL::PostgreSQL) set_target_properties(mapnik-input-postgis PROPERTIES PREFIX "") set_target_properties(mapnik-input-postgis PROPERTIES OUTPUT_NAME "postgis") set_target_properties(mapnik-input-postgis PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt index 8f0dffa9e0f137..0341a369a5dc72 100644 --- a/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt @@ -3,7 +3,10 @@ add_library(mapnik-input-raster SHARED raster_featureset.cpp raster_info.cpp) -target_link_libraries(mapnik-input-raster PUBLIC mapnik) +target_include_directories(mapnik-input-raster PRIVATE + ${mapnik_include_paths} +) +target_link_libraries(mapnik-input-raster PRIVATE mapnik) set_target_properties(mapnik-input-raster PROPERTIES PREFIX "") set_target_properties(mapnik-input-raster PROPERTIES OUTPUT_NAME "raster") set_target_properties(mapnik-input-raster PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt index 314eb221c47b1e..f484c2fed36fe8 100644 --- a/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt @@ -6,9 +6,11 @@ SET(INPUT_SHAPE_SOURCES shape_index_featureset.cpp shape_io.cpp shape_utils.cpp ) - add_library(mapnik-input-shape SHARED ${INPUT_SHAPE_SOURCES}) -target_link_libraries(mapnik-input-shape PUBLIC mapnik) +target_include_directories(mapnik-input-shape PRIVATE + ${mapnik_include_paths} +) +target_link_libraries(mapnik-input-shape PRIVATE mapnik) set_target_properties(mapnik-input-shape PROPERTIES PREFIX "") set_target_properties(mapnik-input-shape PROPERTIES OUTPUT_NAME "shape") set_target_properties(mapnik-input-shape PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt index 26f3cb718a0ab5..eea67a1ef9970c 100644 --- a/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt @@ -1,8 +1,11 @@ +find_package(unofficial-sqlite3 CONFIG REQUIRED) add_library(mapnik-input-sqlite SHARED sqlite_datasource.cpp sqlite_featureset.cpp) - -target_link_libraries(mapnik-input-sqlite PUBLIC mapnik SQLite::SQLite3) +target_include_directories(mapnik-input-sqlite PRIVATE + ${mapnik_include_paths} +) +target_link_libraries(mapnik-input-sqlite PRIVATE mapnik unofficial::sqlite3::sqlite3) set_target_properties(mapnik-input-sqlite PROPERTIES PREFIX "") set_target_properties(mapnik-input-sqlite PROPERTIES OUTPUT_NAME "sqlite") set_target_properties(mapnik-input-sqlite PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt index 56fb062a90537b..61dcdb16022c82 100644 --- a/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt @@ -1,8 +1,10 @@ add_library(mapnik-input-topojson SHARED topojson_datasource.cpp topojson_featureset.cpp) - -target_link_libraries(mapnik-input-topojson PUBLIC mapnik mapnik-json) +target_include_directories(mapnik-input-topojson PRIVATE + ${mapnik_include_paths} +) +target_link_libraries(mapnik-input-topojson PRIVATE mapnik mapnik-json) set_target_properties(mapnik-input-topojson PROPERTIES PREFIX "") set_target_properties(mapnik-input-topojson PROPERTIES OUTPUT_NAME "topojson") set_target_properties(mapnik-input-topojson PROPERTIES SUFFIX ".input") diff --git a/ports/mapnik/cmake/src/agg/CMakeLists.txt b/ports/mapnik/cmake/src/agg/CMakeLists.txt deleted file mode 100644 index e69de29bb2d1d6..00000000000000 diff --git a/ports/mapnik/cmake/src/json/CMakeLists.txt b/ports/mapnik/cmake/src/json/CMakeLists.txt index b0f18c26b89b1f..d16f4596f89ae8 100644 --- a/ports/mapnik/cmake/src/json/CMakeLists.txt +++ b/ports/mapnik/cmake/src/json/CMakeLists.txt @@ -13,7 +13,19 @@ add_library(mapnik-json STATIC topojson_grammar_x3.cpp unicode_string_grammar_x3.cpp) -target_link_libraries(mapnik-json INTERFACE ${ICUU_LIB}) +target_include_directories(mapnik-json PRIVATE + ${JPEG_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${MAPBOX_POLYLABEL_INCLUDE_DIRS} + ${MAPBOX_GEOMETRY_INCLUDE_DIRS} + ${MAPBOX_VARIANT_INCLUDE_DIRS} +) +target_link_libraries(mapnik-json PRIVATE mapnik ${ICUU_LIB}) +#target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) -install(TARGETS mapnik-json LIBRARY DESTINATION lib) -target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) \ No newline at end of file +install(TARGETS mapnik-json + EXPORT MapnikTargets + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin +) \ No newline at end of file diff --git a/ports/mapnik/cmake/src/wkt/CMakeLists.txt b/ports/mapnik/cmake/src/wkt/CMakeLists.txt index 527f5512fb8a56..a63413ce925c52 100644 --- a/ports/mapnik/cmake/src/wkt/CMakeLists.txt +++ b/ports/mapnik/cmake/src/wkt/CMakeLists.txt @@ -4,5 +4,19 @@ add_library(mapnik-wkt STATIC wkt_factory.cpp wkt_grammar_x3.cpp) -install(TARGETS mapnik-wkt LIBRARY DESTINATION lib) -target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) \ No newline at end of file +target_include_directories(mapnik-wkt PRIVATE + ${MAPNIK_INCLUDE_PATH} + ${JPEG_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${MAPBOX_POLYLABEL_INCLUDE_DIRS} + ${MAPBOX_GEOMETRY_INCLUDE_DIRS} + ${MAPBOX_VARIANT_INCLUDE_DIRS} +) +target_compile_definitions(mapnik-wkt PRIVATE ${MAPNIK_LIB_DEFINITION}) + +install(TARGETS mapnik-wkt + EXPORT MapnikTargets + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin +) \ No newline at end of file diff --git a/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt b/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt index 0aa78966d69347..23ce12ebbc2e6d 100644 --- a/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt +++ b/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt @@ -1,4 +1,7 @@ add_executable(mapnik-render mapnik-render.cpp) +target_include_directories(mapnik-render PRIVATE + ${mapnik_include_paths} +) target_link_libraries(mapnik-render PRIVATE mapnik) install(TARGETS mapnik-render DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt b/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt index f162bb25c48120..5a81e557d1b7d8 100644 --- a/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt +++ b/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt @@ -1,4 +1,7 @@ add_executable(shapeindex shapeindex.cpp) target_link_libraries(shapeindex PRIVATE mapnik) -target_include_directories(shapeindex PRIVATE ../../plugins/input/shape) +target_include_directories(shapeindex PRIVATE + ../../plugins/input/shape + ${mapnik_include_paths} +) install(TARGETS shapeindex DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index d181d7ca7d0ecc..b7fbe52c76429f 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -80,5 +80,9 @@ if ("utils" IN_LIST FEATURES) file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mapnik) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + + file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/fonts/unifont_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME fonts_copyright) From bd69a3a2067cd3cda2051de8086126ba8c3d3075 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 18:33:22 +0100 Subject: [PATCH 0065/1694] fix cmake define --- ports/mapnik/cmake/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt index 75ac1fca053054..9c03cb2310c149 100644 --- a/ports/mapnik/cmake/CMakeLists.txt +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -146,8 +146,9 @@ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} #vcpkg only supports icu on windows if(WIN32) - set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2 -DBOOST_REGEX_HAS_ICU) + set(MAPNIK_DEFS ${MAPNIK_DEFS} -DBOOST_REGEX_HAS_ICU) endif() +set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2) find_path(MAPBOX_POLYLABEL_INCLUDE_DIRS "mapbox/polylabel.hpp") find_path(MAPBOX_GEOMETRY_INCLUDE_DIRS "mapbox/feature.hpp") From f5d7d6eeb791f8b684fa66d463e0068e065ad17a Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 18:33:22 +0100 Subject: [PATCH 0066/1694] fix cmake define --- ports/mapnik/cmake/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt index 75ac1fca053054..9c03cb2310c149 100644 --- a/ports/mapnik/cmake/CMakeLists.txt +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -146,8 +146,9 @@ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} #vcpkg only supports icu on windows if(WIN32) - set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2 -DBOOST_REGEX_HAS_ICU) + set(MAPNIK_DEFS ${MAPNIK_DEFS} -DBOOST_REGEX_HAS_ICU) endif() +set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2) find_path(MAPBOX_POLYLABEL_INCLUDE_DIRS "mapbox/polylabel.hpp") find_path(MAPBOX_GEOMETRY_INCLUDE_DIRS "mapbox/feature.hpp") From 444a8282693750faef164a7acb2d4da20f0c2372 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 18:49:26 +0100 Subject: [PATCH 0067/1694] install deps/agg headers --- ports/mapnik/cmake/CMakeLists.txt | 23 +++++++++++------------ ports/mapnik/portfile.cmake | 1 + 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt index 9c03cb2310c149..629b930a48c6ea 100644 --- a/ports/mapnik/cmake/CMakeLists.txt +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -64,13 +64,23 @@ find_package(TIFF REQUIRED) find_package(WebP CONFIG REQUIRED) find_package(LibXml2 REQUIRED) find_package(ZLIB REQUIRED) - +find_path(MAPBOX_POLYLABEL_INCLUDE_DIRS "mapbox/polylabel.hpp") +find_path(MAPBOX_GEOMETRY_INCLUDE_DIRS "mapbox/feature.hpp") +find_path(MAPBOX_VARIANT_INCLUDE_DIRS "mapbox/optional.hpp") set (MAPNIK_DEFS -DHAVE_PNG -DHAVE_JPEG -DHAVE_TIFF -DHAVE_WEBP) + +#vcpkg only supports icu on windows +if(WIN32) + set(MAPNIK_DEFS ${MAPNIK_DEFS} -DBOOST_REGEX_HAS_ICU) +endif() +set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2) + + # AGG include(files.cmake) @@ -144,17 +154,6 @@ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} #set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/rapidxml_loader.cpp) -#vcpkg only supports icu on windows -if(WIN32) - set(MAPNIK_DEFS ${MAPNIK_DEFS} -DBOOST_REGEX_HAS_ICU) -endif() -set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2) - -find_path(MAPBOX_POLYLABEL_INCLUDE_DIRS "mapbox/polylabel.hpp") -find_path(MAPBOX_GEOMETRY_INCLUDE_DIRS "mapbox/feature.hpp") -find_path(MAPBOX_VARIANT_INCLUDE_DIRS "mapbox/optional.hpp") - - set(MAPNIK_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/include) set(mapnik_include_paths diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index b7fbe52c76429f..7ae175c616ff90 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -54,6 +54,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() file(COPY ${SOURCE_PATH}/include/mapnik DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/deps/agg/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) # copy plugins into tool path, if any plugin is installed if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/plugins) From f23c0ddafa1b9fe628200beed1ec3f5176dacf53 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 18 Nov 2020 18:49:26 +0100 Subject: [PATCH 0068/1694] install deps/agg headers --- ports/mapnik/cmake/CMakeLists.txt | 23 +++++++++++------------ ports/mapnik/portfile.cmake | 1 + 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt index 9c03cb2310c149..629b930a48c6ea 100644 --- a/ports/mapnik/cmake/CMakeLists.txt +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -64,13 +64,23 @@ find_package(TIFF REQUIRED) find_package(WebP CONFIG REQUIRED) find_package(LibXml2 REQUIRED) find_package(ZLIB REQUIRED) - +find_path(MAPBOX_POLYLABEL_INCLUDE_DIRS "mapbox/polylabel.hpp") +find_path(MAPBOX_GEOMETRY_INCLUDE_DIRS "mapbox/feature.hpp") +find_path(MAPBOX_VARIANT_INCLUDE_DIRS "mapbox/optional.hpp") set (MAPNIK_DEFS -DHAVE_PNG -DHAVE_JPEG -DHAVE_TIFF -DHAVE_WEBP) + +#vcpkg only supports icu on windows +if(WIN32) + set(MAPNIK_DEFS ${MAPNIK_DEFS} -DBOOST_REGEX_HAS_ICU) +endif() +set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2) + + # AGG include(files.cmake) @@ -144,17 +154,6 @@ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} #set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/rapidxml_loader.cpp) -#vcpkg only supports icu on windows -if(WIN32) - set(MAPNIK_DEFS ${MAPNIK_DEFS} -DBOOST_REGEX_HAS_ICU) -endif() -set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2) - -find_path(MAPBOX_POLYLABEL_INCLUDE_DIRS "mapbox/polylabel.hpp") -find_path(MAPBOX_GEOMETRY_INCLUDE_DIRS "mapbox/feature.hpp") -find_path(MAPBOX_VARIANT_INCLUDE_DIRS "mapbox/optional.hpp") - - set(MAPNIK_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/include) set(mapnik_include_paths diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index b7fbe52c76429f..7ae175c616ff90 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -54,6 +54,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() file(COPY ${SOURCE_PATH}/include/mapnik DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/deps/agg/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) # copy plugins into tool path, if any plugin is installed if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/plugins) From 7935f4647849528ae5899efef5c0ca69cbb729ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 18 Nov 2020 10:49:25 -0800 Subject: [PATCH 0069/1694] [vcpkg baseline] Clean up baseline, use Keyword Supports (#14246) --- ports/atk/CONTROL | 1 + ports/atlmfc/CONTROL | 1 + ports/aubio/CONTROL | 1 + ports/avro-cpp/CONTROL | 1 + ports/aws-c-common/CONTROL | 1 + ports/aws-checksums/CONTROL | 3 +- ports/aws-lambda-cpp/CONTROL | 1 + ports/azure-kinect-sensor-sdk/CONTROL | 1 + ports/bde/CONTROL | 1 + ports/benchmark/CONTROL | 2 +- ports/bitserializer/CONTROL | 1 + scripts/ci.baseline.txt | 46 +-------------------------- 12 files changed, 13 insertions(+), 47 deletions(-) diff --git a/ports/atk/CONTROL b/ports/atk/CONTROL index 0fa67bfc5446a5..bcfc01d1655faa 100644 --- a/ports/atk/CONTROL +++ b/ports/atk/CONTROL @@ -3,3 +3,4 @@ Version: 2.24.0-5 Homepage: https://developer.gnome.org/atk/ Description: GNOME Accessibility Toolkit Build-Depends: glib, gettext +Supports: !(osx|arm) \ No newline at end of file diff --git a/ports/atlmfc/CONTROL b/ports/atlmfc/CONTROL index aff5c97aa6e235..a5af713fcbf156 100644 --- a/ports/atlmfc/CONTROL +++ b/ports/atlmfc/CONTROL @@ -1,3 +1,4 @@ Source: atlmfc Version: 0 Description: a stub package that ensures VS has ATL/MFC installed. +Supports: windows \ No newline at end of file diff --git a/ports/aubio/CONTROL b/ports/aubio/CONTROL index de5eafe694fa83..211dad0793e32c 100644 --- a/ports/aubio/CONTROL +++ b/ports/aubio/CONTROL @@ -4,3 +4,4 @@ Port-Version: 3 Homepage: https://github.com/aubio/aubio 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. Build-Depends: ffmpeg, libsndfile, libogg, libflac, libvorbis, bzip2, liblzma +Supports: windows \ No newline at end of file diff --git a/ports/avro-cpp/CONTROL b/ports/avro-cpp/CONTROL index 0f75d7e24cdd2e..85518d7577fcb7 100644 --- a/ports/avro-cpp/CONTROL +++ b/ports/avro-cpp/CONTROL @@ -3,6 +3,7 @@ Version: 1.9.2 Homepage: https://github.com/apache/avro Description: Apache Avro is a data serialization system Build-Depends: boost-format, boost-thread, boost-filesystem, boost-iostreams, boost-program-options, boost-random, boost-crc, boost-test, libzip, bzip2, liblzma, zlib, zstd +Supports: !(windows&static) Feature: snappy Build-Depends: snappy diff --git a/ports/aws-c-common/CONTROL b/ports/aws-c-common/CONTROL index cc91c44f48b767..2439c0c655e399 100644 --- a/ports/aws-c-common/CONTROL +++ b/ports/aws-c-common/CONTROL @@ -2,3 +2,4 @@ Source: aws-c-common Version: 0.4.56 Homepage: https://github.com/awslabs/aws-c-common Description: AWS common library for C +Supports: !(arm|uwp) \ No newline at end of file diff --git a/ports/aws-checksums/CONTROL b/ports/aws-checksums/CONTROL index 79a420c09b8584..d9b9e53c92f3e1 100644 --- a/ports/aws-checksums/CONTROL +++ b/ports/aws-checksums/CONTROL @@ -1,4 +1,5 @@ Source: aws-checksums Version: 0.1.9 Description: Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations. -Build-Depends: aws-c-common \ No newline at end of file +Build-Depends: aws-c-common +Supports: !(arm&windows) \ No newline at end of file diff --git a/ports/aws-lambda-cpp/CONTROL b/ports/aws-lambda-cpp/CONTROL index ca3f5aa7618295..a5533ba8bf66b3 100644 --- a/ports/aws-lambda-cpp/CONTROL +++ b/ports/aws-lambda-cpp/CONTROL @@ -2,3 +2,4 @@ Source: aws-lambda-cpp Version: 0.2.6 Build-Depends: curl Description: C++ Runtime for AWS Lambda. +Supports: linux \ No newline at end of file diff --git a/ports/azure-kinect-sensor-sdk/CONTROL b/ports/azure-kinect-sensor-sdk/CONTROL index 81b05d3ac9df5d..f6bf9ae0cad430 100644 --- a/ports/azure-kinect-sensor-sdk/CONTROL +++ b/ports/azure-kinect-sensor-sdk/CONTROL @@ -4,6 +4,7 @@ Port-Version: 6 Homepage: https://github.com/microsoft/Azure-Kinect-Sensor-SDK Description: Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device. Build-Depends: azure-c-shared-utility, glfw3, gtest, imgui, libusb, spdlog, cjson, ebml, libjpeg-turbo, matroska, libsoundio, libyuv +Supports: windows Feature: docs Description: Build K4A doxygen documentation. diff --git a/ports/bde/CONTROL b/ports/bde/CONTROL index 10accadc9f8b90..b31c0e2eb5022e 100644 --- a/ports/bde/CONTROL +++ b/ports/bde/CONTROL @@ -2,3 +2,4 @@ Source: bde Version: 3.2.0.0 Port-Version: 2 Description: Basic Development Environment - a set of foundational C++ libraries used at Bloomberg. +Supports: !windows \ No newline at end of file diff --git a/ports/benchmark/CONTROL b/ports/benchmark/CONTROL index 5a6af55955e7f6..9a7618385495b8 100644 --- a/ports/benchmark/CONTROL +++ b/ports/benchmark/CONTROL @@ -2,4 +2,4 @@ Source: benchmark Version: 1.5.2 Homepage: https://github.com/google/benchmark Description: A library to support the benchmarking of functions, similar to unit-tests. -Supports: !uwp \ No newline at end of file +Supports: !(arm|uwp) diff --git a/ports/bitserializer/CONTROL b/ports/bitserializer/CONTROL index 63444a871ba59c..bc33cc5525a5da 100644 --- a/ports/bitserializer/CONTROL +++ b/ports/bitserializer/CONTROL @@ -3,6 +3,7 @@ Version: 0.10 Description: Core part of C++ 17 library for serialization to JSON, XML, YAML Homepage: https://bitbucket.org/Pavel_Kisliak/bitserializer Default-Features: cpprestjson-archive, rapidjson-archive, pugixml-archive +Supports: !(arm|osx) Feature: cpprestjson-archive Build-Depends: cpprestsdk diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 00c68febaee87f..9e2161c49a352c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -30,53 +30,9 @@ # Add new items alphabetically # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h apr:arm64-windows=fail - -atk:x64-osx=fail -atk:arm64-windows=fail -atlmfc:x64-linux=fail -atlmfc:x64-osx=fail -aubio:x64-linux=fail -aubio:x64-osx=fail -avro-c:arm-uwp=fail -avro-c:x64-osx=fail -avro-c:x64-uwp=fail -avro-cpp:x64-windows-static=fail -aws-c-common:arm64-windows=fail -aws-c-common:arm-uwp=fail -aws-c-common:x64-uwp=fail -aws-checksums:arm64-windows=fail -aws-lambda-cpp:arm64-windows=fail -aws-lambda-cpp:arm-uwp=fail -aws-lambda-cpp:x64-uwp=fail -aws-lambda-cpp:x64-windows=fail -aws-lambda-cpp:x64-windows-static=fail -aws-lambda-cpp:x86-windows=fail -aws-lambda-cpp:x64-osx=fail -azure-c-shared-utility:arm-uwp=fail -azure-c-shared-utility:x64-uwp=fail -azure-kinect-sensor-sdk:x64-linux=fail -azure-kinect-sensor-sdk:x64-osx=fail # Requires ATL for ARM64 to be installed in CI azure-storage-cpp:arm64-windows=fail -bde:arm64-windows=fail -bde:arm-uwp=fail -bde:x64-uwp=fail -bde:x64-windows=fail -bde:x64-windows-static=fail -bde:x86-windows=fail -benchmark:arm64-windows=fail -benchmark:arm-uwp=fail -benchmark:x64-uwp=fail -berkeleydb:arm-uwp=fail -berkeleydb:x64-linux=fail -berkeleydb:x64-osx=fail -berkeleydb:x64-uwp=fail -bitserializer-rapidyaml:arm-uwp=skip -bitserializer-rapidyaml:arm64-windows=skip -bitserializer-rapidyaml:x64-osx=skip -bitserializer:arm-uwp=skip -bitserializer:arm64-windows=skip -bitserializer:x64-osx=skip + blend2d:arm64-windows=fail blend2d:arm-uwp=fail blend2d:x64-uwp=fail From 6e5055ff5942a0caad5f476832fdc2e80de03cfc Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Wed, 18 Nov 2020 12:21:23 -0800 Subject: [PATCH 0070/1694] [vcpkg] Add experimental x-azblob binary provider (#13626) * [vcpkg] Add experimental x-azblob binary provider * [vcpkg] Test azblob storage provider in CI * [vcpkg] Address some CR comments from #13639 * [vcpkg] Fixup azure-pipelines * [vcpkg] Fix regression where the downloaded package is purged before decompressing * [vcpkg] Further refactor vcpkg::Downloads * [vcpkg] Enable OSX for x-azblob testing * [vcpkg] Reduce diff against master * [vcpkg] Extract Downloads::details::split_uri_view * [vcpkg] Address PR comments * [vcpkg] Add testing and metrics for x-azblob * [vcpkg] Add docs for x-azblob This includes a note that it is currently experimental * [vcpkg] Address CR comments * [vcpkg] Revert pipeline changes except OSX to minimize disruption Co-authored-by: Robert Schumacher Co-authored-by: Billy Robert O'Neal III --- docs/users/binarycaching.md | 3 +- .../azure-pipelines/osx/azure-pipelines.yml | 5 +- .../azure-pipelines/test-modified-ports.ps1 | 22 +- toolsrc/include/vcpkg/base/downloads.h | 25 + toolsrc/include/vcpkg/base/fwd/lockguarded.h | 10 + toolsrc/include/vcpkg/base/lockguarded.h | 35 ++ toolsrc/include/vcpkg/base/util.h | 31 -- toolsrc/include/vcpkg/binarycaching.h | 30 +- toolsrc/include/vcpkg/dependencies.h | 1 + toolsrc/include/vcpkg/globalstate.h | 3 +- toolsrc/include/vcpkg/metrics.h | 1 + toolsrc/src/vcpkg-test/binaryconfigparser.cpp | 36 ++ toolsrc/src/vcpkg-test/downloads.cpp | 59 ++ toolsrc/src/vcpkg/base/downloads.cpp | 516 +++++++++++++----- toolsrc/src/vcpkg/binarycaching.cpp | 452 +++++++++++---- toolsrc/src/vcpkg/commands.ci.cpp | 4 +- toolsrc/src/vcpkg/dependencies.cpp | 6 + toolsrc/src/vcpkg/globalstate.cpp | 2 + toolsrc/src/vcpkg/install.cpp | 3 +- 19 files changed, 955 insertions(+), 289 deletions(-) create mode 100644 toolsrc/include/vcpkg/base/fwd/lockguarded.h create mode 100644 toolsrc/include/vcpkg/base/lockguarded.h create mode 100644 toolsrc/src/vcpkg-test/downloads.cpp diff --git a/docs/users/binarycaching.md b/docs/users/binarycaching.md index 3798fbde76537f..c3fb98a4ff731e 100644 --- a/docs/users/binarycaching.md +++ b/docs/users/binarycaching.md @@ -108,7 +108,8 @@ By default, zip-based archives will be cached at the first valid location of: | `default[,]` | Adds the default file-based location | `files,[,]` | Adds a custom file-based location | `nuget,[,]` | Adds a NuGet-based source; equivalent to the `-Source` parameter of the NuGet CLI -| `nugetconfig,[,]` | Adds a NuGet-config-file-based source; equivalent to the `-Config` parameter
of the NuGet CLI. This config should specify `defaultPushSource` for uploads. +| `nugetconfig,[,]` | Adds a NuGet-config-file-based source; equivalent to the `-Config` parameter of the NuGet CLI. This config should specify `defaultPushSource` for uploads. +| `x-azblob,,[,]` | **Experimental: will change or be removed without warning**
Adds an Azure Blob Storage source. Uses Shared Access Signature validation. URL should include the container path. | `interactive` | Enables interactive credential management for NuGet (for debugging; requires `--debug` on the command line) The `` optional parameter for certain sources controls whether they will be consulted for diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index 6f2e90fec096d3..c0e1c3a260613a 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -14,6 +14,9 @@ jobs: value: /Users/vagrant/Data - name: VCPKG_DOWNLOADS value: /Users/vagrant/Data/downloads + - group: azblob-test-sas-group + - name: BINARY_SOURCE_STUB + value: "x-azblob,$(azblob-root-url),$(azblob-test-sas)" steps: - bash: df -h @@ -40,7 +43,7 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet x64-osx -BuildReason $(Build.Reason) -ArchivesRoot ${{ variables.WORKING_ROOT }}/archives -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + arguments: '-Triplet x64-osx -BuildReason $(Build.Reason) -BinarySourceStub "$(BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' - bash: | df -h displayName: 'Report on Disk Space After Build' diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index bac16c595af0e8..98ffbf53a9f0b3 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -16,8 +16,11 @@ The location used as scratch space for 'installed', 'packages', and 'buildtrees' The Azure Pipelines artifacts directory. If not supplied, defaults to the current directory. .PARAMETER ArchivesRoot -The location where the binary caching archives are stored. Shared across runs of this script. If -this parameter is not set, binary caching will not be used. +Equivalent to '-BinarySourceStub "files,$ArchivesRoot"' + +.PARAMETER BinarySourceStub +The type and parameters of the binary source. Shared across runs of this script. If +this parameter is not set, binary caching will not be used. Example: "files,W:\" .PARAMETER BuildReason The reason Azure Pipelines is running this script (controls in which mode Binary Caching is used). @@ -25,7 +28,7 @@ If ArchivesRoot is not set, this parameter has no effect. If ArchivesRoot is set binary caching will default to read-write mode. #> -[CmdletBinding()] +[CmdletBinding(DefaultParameterSetName="ArchivesRoot")] Param( [Parameter(Mandatory = $true)] [ValidateNotNullOrEmpty()] @@ -35,7 +38,10 @@ Param( $WorkingRoot, [ValidateNotNullOrEmpty()] $ArtifactStagingDirectory = '.', + [Parameter(ParameterSetName='ArchivesRoot')] $ArchivesRoot = $null, + [Parameter(ParameterSetName='BinarySourceStub')] + $BinarySourceStub = $null, $BuildReason = $null ) @@ -49,7 +55,7 @@ $buildtreesRoot = Join-Path $WorkingRoot 'buildtrees' $installRoot = Join-Path $WorkingRoot 'installed' $packagesRoot = Join-Path $WorkingRoot 'packages' -$usingBinaryCaching = -Not ([string]::IsNullOrWhiteSpace($ArchivesRoot)) +$usingBinaryCaching = -Not ([string]::IsNullOrWhiteSpace($ArchivesRoot)) -Or -Not ([string]::IsNullOrWhiteSpace($BinarySourceStub)) $commonArgs = @() if ($usingBinaryCaching) { $commonArgs += @('--binarycaching') @@ -78,8 +84,12 @@ if ($usingBinaryCaching) { Write-Host "Build reason was $BuildReason, using binary caching in write only mode." $binaryCachingMode = 'write' } - - $commonArgs += @("--x-binarysource=clear;files,$ArchivesRoot,$binaryCachingMode") + if ([string]::IsNullOrWhiteSpace($ArchivesRoot)) { + $commonArgs += @("--binarysource=clear;$BinarySourceStub,$binaryCachingMode") + } + else { + $commonArgs += @("--binarysource=clear;files,$ArchivesRoot,$binaryCachingMode") + } } if ($Triplet -eq 'x64-linux') { diff --git a/toolsrc/include/vcpkg/base/downloads.h b/toolsrc/include/vcpkg/base/downloads.h index 61c79248852130..bf97c0650ea9a6 100644 --- a/toolsrc/include/vcpkg/base/downloads.h +++ b/toolsrc/include/vcpkg/base/downloads.h @@ -1,16 +1,41 @@ #pragma once #include +#include +#include namespace vcpkg::Downloads { + namespace details + { + struct SplitURIView + { + StringView scheme; + Optional authority; + StringView path_query_fragment; + }; + + // e.g. {"https","//example.org", "/index.html"} + Optional split_uri_view(StringView uri); + } + void verify_downloaded_file_hash(const Files::Filesystem& fs, const std::string& url, const fs::path& path, const std::string& sha512); + // Returns url that was successfully downloaded from + std::string download_file(Files::Filesystem& fs, + View urls, + const fs::path& download_path, + const std::string& sha512); + void download_file(Files::Filesystem& fs, const std::string& url, const fs::path& download_path, const std::string& sha512); + + std::vector download_files(Files::Filesystem& fs, View> url_pairs); + int put_file(const Files::Filesystem&, StringView url, const fs::path& file); + std::vector url_heads(View urls); } diff --git a/toolsrc/include/vcpkg/base/fwd/lockguarded.h b/toolsrc/include/vcpkg/base/fwd/lockguarded.h new file mode 100644 index 00000000000000..e7e88b5a1de119 --- /dev/null +++ b/toolsrc/include/vcpkg/base/fwd/lockguarded.h @@ -0,0 +1,10 @@ +#pragma once + +namespace vcpkg::Util +{ + template + struct LockGuardPtr; + + template + struct LockGuarded; +} diff --git a/toolsrc/include/vcpkg/base/lockguarded.h b/toolsrc/include/vcpkg/base/lockguarded.h new file mode 100644 index 00000000000000..e573ec7b0e361e --- /dev/null +++ b/toolsrc/include/vcpkg/base/lockguarded.h @@ -0,0 +1,35 @@ +#pragma once + +#include + +#include + +namespace vcpkg::Util +{ + template + struct LockGuarded + { + friend struct LockGuardPtr; + + LockGuardPtr lock() { return *this; } + + private: + std::mutex m_mutex; + T m_t; + }; + + template + struct LockGuardPtr + { + T& operator*() { return m_ptr; } + T* operator->() { return &m_ptr; } + + T* get() { return &m_ptr; } + + LockGuardPtr(LockGuarded& sync) : m_lock(sync.m_mutex), m_ptr(sync.m_t) { } + + private: + std::lock_guard m_lock; + T& m_ptr; + }; +} diff --git a/toolsrc/include/vcpkg/base/util.h b/toolsrc/include/vcpkg/base/util.h index 0453ac20a64b01..ca5104c234c631 100644 --- a/toolsrc/include/vcpkg/base/util.h +++ b/toolsrc/include/vcpkg/base/util.h @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include @@ -222,36 +221,6 @@ namespace vcpkg::Util ~ResourceBase() = default; }; - template - struct LockGuardPtr; - - template - struct LockGuarded - { - friend struct LockGuardPtr; - - LockGuardPtr lock() { return *this; } - - private: - std::mutex m_mutex; - T m_t; - }; - - template - struct LockGuardPtr - { - T& operator*() { return m_ptr; } - T* operator->() { return &m_ptr; } - - T* get() { return &m_ptr; } - - LockGuardPtr(LockGuarded& sync) : m_lock(sync.m_mutex), m_ptr(sync.m_t) { } - - private: - std::unique_lock m_lock; - T& m_ptr; - }; - namespace Enum { template diff --git a/toolsrc/include/vcpkg/binarycaching.h b/toolsrc/include/vcpkg/binarycaching.h index 9e77bc76389010..5a127cb5c23e64 100644 --- a/toolsrc/include/vcpkg/binarycaching.h +++ b/toolsrc/include/vcpkg/binarycaching.h @@ -8,8 +8,12 @@ #include +#include + namespace vcpkg { + struct MergeBinaryProviders; + enum class RestoreResult { missing, @@ -20,18 +24,32 @@ namespace vcpkg struct IBinaryProvider { virtual ~IBinaryProvider() = default; - /// Gives the BinaryProvider an opportunity to batch any downloading or server communication for executing - /// `plan`. - virtual void prefetch(const VcpkgPaths& paths, const Dependencies::ActionPlan& plan) = 0; + /// Attempts to restore the package referenced by `action` into the packages directory. virtual RestoreResult try_restore(const VcpkgPaths& paths, const Dependencies::InstallPlanAction& action) = 0; + /// Called upon a successful build of `action` virtual void push_success(const VcpkgPaths& paths, const Dependencies::InstallPlanAction& action) = 0; - /// Requests the result of `try_restore()` without actually downloading the package. Used by CI to determine - /// missing packages. - virtual RestoreResult precheck(const VcpkgPaths& paths, const Dependencies::InstallPlanAction& action) = 0; + + /// Gives the BinaryProvider an opportunity to batch any downloading or server communication for + /// executing `plan`. + /// Must only be called once for a given binary provider instance + /// InOut vector of actions to be prefetched + virtual void prefetch(const VcpkgPaths& paths, + std::vector& actions) = 0; + + /// Requests the result of try_restore() without actually downloading the package. Used by CI to + /// determine missing packages. + /// InOut map to track the restored packages. Should be initialized to + /// {&action, RestoreResult::missing} for all install actions + virtual void precheck( + const VcpkgPaths& paths, + std::unordered_map& results_map) = 0; }; + std::unordered_map binary_provider_precheck( + const VcpkgPaths& paths, const Dependencies::ActionPlan& plan, IBinaryProvider& provider); + IBinaryProvider& null_binary_provider(); ExpectedS> create_binary_provider_from_configs(View args); diff --git a/toolsrc/include/vcpkg/dependencies.h b/toolsrc/include/vcpkg/dependencies.h index 5e46a61948486a..1ea81c185ebdb9 100644 --- a/toolsrc/include/vcpkg/dependencies.h +++ b/toolsrc/include/vcpkg/dependencies.h @@ -61,6 +61,7 @@ namespace vcpkg::Dependencies std::string displayname() const; const std::string& public_abi() const; bool has_package_abi() const; + Optional package_abi() const; const Build::PreBuildInfo& pre_build_info(LineInfo linfo) const; PackageSpec spec; diff --git a/toolsrc/include/vcpkg/globalstate.h b/toolsrc/include/vcpkg/globalstate.h index 35ca71dbba2b90..44c34f25c23f73 100644 --- a/toolsrc/include/vcpkg/globalstate.h +++ b/toolsrc/include/vcpkg/globalstate.h @@ -1,7 +1,8 @@ #pragma once +#include + #include -#include #include #include diff --git a/toolsrc/include/vcpkg/metrics.h b/toolsrc/include/vcpkg/metrics.h index 3ab1bc758606b4..b1a5e61043ba52 100644 --- a/toolsrc/include/vcpkg/metrics.h +++ b/toolsrc/include/vcpkg/metrics.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include diff --git a/toolsrc/src/vcpkg-test/binaryconfigparser.cpp b/toolsrc/src/vcpkg-test/binaryconfigparser.cpp index 259f1986e1405b..1c46790bf44aaa 100644 --- a/toolsrc/src/vcpkg-test/binaryconfigparser.cpp +++ b/toolsrc/src/vcpkg-test/binaryconfigparser.cpp @@ -298,3 +298,39 @@ TEST_CASE ("BinaryConfigParser args", "[binaryconfigparser]") REQUIRE(parsed.has_value()); } } + +TEST_CASE ("BinaryConfigParser azblob provider", "[binaryconfigparser]") +{ + { + auto parsed = create_binary_provider_from_configs_pure("x-azblob,https://azure/container,sas", {}); + REQUIRE(parsed.has_value()); + } + { + auto parsed = create_binary_provider_from_configs_pure("x-azblob,https://azure/container,?sas", {}); + REQUIRE(!parsed.has_value()); + } + { + auto parsed = create_binary_provider_from_configs_pure("x-azblob,,sas", {}); + REQUIRE(!parsed.has_value()); + } + { + auto parsed = create_binary_provider_from_configs_pure("x-azblob,https://azure/container", {}); + REQUIRE(!parsed.has_value()); + } + { + auto parsed = create_binary_provider_from_configs_pure("x-azblob,https://azure/container,sas,invalid", {}); + REQUIRE(!parsed.has_value()); + } + { + auto parsed = create_binary_provider_from_configs_pure("x-azblob,https://azure/container,sas,read", {}); + REQUIRE(parsed.has_value()); + } + { + auto parsed = create_binary_provider_from_configs_pure("x-azblob,https://azure/container,sas,write", {}); + REQUIRE(parsed.has_value()); + } + { + auto parsed = create_binary_provider_from_configs_pure("x-azblob,https://azure/container,sas,readwrite", {}); + REQUIRE(parsed.has_value()); + } +} diff --git a/toolsrc/src/vcpkg-test/downloads.cpp b/toolsrc/src/vcpkg-test/downloads.cpp new file mode 100644 index 00000000000000..b182e46d6b7446 --- /dev/null +++ b/toolsrc/src/vcpkg-test/downloads.cpp @@ -0,0 +1,59 @@ +#include + +#include + +using namespace vcpkg; + +TEST_CASE ("Downloads::details::split_uri_view", "[downloads]") +{ + { + auto x = Downloads::details::split_uri_view("https://github.com/Microsoft/vcpkg"); + REQUIRE(x.has_value()); + REQUIRE(x.get()->scheme == "https"); + REQUIRE(x.get()->authority.value_or("") == "//github.com"); + REQUIRE(x.get()->path_query_fragment == "/Microsoft/vcpkg"); + } + { + auto x = Downloads::details::split_uri_view(""); + REQUIRE(!x.has_value()); + } + { + auto x = Downloads::details::split_uri_view("hello"); + REQUIRE(!x.has_value()); + } + { + auto x = Downloads::details::split_uri_view("file:"); + REQUIRE(x.has_value()); + REQUIRE(x.get()->scheme == "file"); + REQUIRE(!x.get()->authority.has_value()); + REQUIRE(x.get()->path_query_fragment == ""); + } + { + auto x = Downloads::details::split_uri_view("file:path"); + REQUIRE(x.has_value()); + REQUIRE(x.get()->scheme == "file"); + REQUIRE(!x.get()->authority.has_value()); + REQUIRE(x.get()->path_query_fragment == "path"); + } + { + auto x = Downloads::details::split_uri_view("file:/path"); + REQUIRE(x.has_value()); + REQUIRE(x.get()->scheme == "file"); + REQUIRE(!x.get()->authority.has_value()); + REQUIRE(x.get()->path_query_fragment == "/path"); + } + { + auto x = Downloads::details::split_uri_view("file://user:pw@host"); + REQUIRE(x.has_value()); + REQUIRE(x.get()->scheme == "file"); + REQUIRE(x.get()->authority.value_or({}) == "//user:pw@host"); + REQUIRE(x.get()->path_query_fragment == ""); + } + { + auto x = Downloads::details::split_uri_view("ftp://host:port/"); + REQUIRE(x.has_value()); + REQUIRE(x.get()->scheme == "ftp"); + REQUIRE(x.get()->authority.value_or({}) == "//host:port"); + REQUIRE(x.get()->path_query_fragment == "/"); + } +} diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp index 40f0494f9c2199..e263f703758423 100644 --- a/toolsrc/src/vcpkg/base/downloads.cpp +++ b/toolsrc/src/vcpkg/base/downloads.cpp @@ -1,6 +1,10 @@ +#include #include #include +#include +#include #include +#include #include #include @@ -11,132 +15,177 @@ namespace vcpkg::Downloads { #if defined(_WIN32) - static void winhttp_download_file(Files::Filesystem& fs, - ZStringView target_file_path, - StringView hostname, - StringView url_path) + struct WinHttpHandleDeleter { - // Make sure the directories are present, otherwise fopen_s fails - const auto dir = fs::path(target_file_path.c_str()).parent_path(); - std::error_code ec; - fs.create_directories(dir, ec); - Checks::check_exit(VCPKG_LINE_INFO, !ec, "Could not create directories %s", fs::u8string(dir)); - - FILE* f = nullptr; - const errno_t err = fopen_s(&f, target_file_path.c_str(), "wb"); - Checks::check_exit(VCPKG_LINE_INFO, - !err, - "Could not download https://%s%s. Failed to open file %s. Error code was %s", - hostname, - url_path, - target_file_path, - std::to_string(err)); - ASSUME(f != nullptr); - - auto hSession = WinHttpOpen(L"vcpkg/1.0", - IsWindows8Point1OrGreater() ? WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY - : WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, - WINHTTP_NO_PROXY_NAME, - WINHTTP_NO_PROXY_BYPASS, - 0); - Checks::check_exit(VCPKG_LINE_INFO, hSession, "WinHttpOpen() failed: %d", GetLastError()); - - // If the environment variable HTTPS_PROXY is set - // use that variable as proxy. This situation might exist when user is in a company network - // with restricted network/proxy settings - auto maybe_https_proxy_env = System::get_environment_variable("HTTPS_PROXY"); - if (auto p_https_proxy = maybe_https_proxy_env.get()) + void operator()(HINTERNET h) const { WinHttpCloseHandle(h); } + }; + + struct WinHttpRequest + { + static ExpectedS make(HINTERNET hConnect, StringView url_path, const wchar_t* method = L"GET") { - std::wstring env_proxy_settings = Strings::to_utf16(*p_https_proxy); - WINHTTP_PROXY_INFO proxy; - proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; - proxy.lpszProxy = env_proxy_settings.data(); - proxy.lpszProxyBypass = nullptr; + WinHttpRequest ret; + // Create an HTTP request handle. + auto h = WinHttpOpenRequest(hConnect, + method, + Strings::to_utf16(url_path).c_str(), + nullptr, + WINHTTP_NO_REFERER, + WINHTTP_DEFAULT_ACCEPT_TYPES, + WINHTTP_FLAG_SECURE); + if (!h) return Strings::concat("WinHttpOpenRequest() failed: ", GetLastError()); + ret.m_hRequest.reset(h); + + // Send a request. + auto bResults = WinHttpSendRequest( + ret.m_hRequest.get(), WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0); + + if (!bResults) return Strings::concat("WinHttpSendRequest() failed: ", GetLastError()); + + // End the request. + bResults = WinHttpReceiveResponse(ret.m_hRequest.get(), NULL); + if (!bResults) return Strings::concat("WinHttpReceiveResponse() failed: ", GetLastError()); + + DWORD dwStatusCode = 0; + DWORD dwSize = sizeof(dwStatusCode); + + bResults = WinHttpQueryHeaders(ret.m_hRequest.get(), + WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, + WINHTTP_HEADER_NAME_BY_INDEX, + &dwStatusCode, + &dwSize, + WINHTTP_NO_HEADER_INDEX); + if (!bResults) return Strings::concat("WinHttpQueryHeaders() failed: ", GetLastError()); + if (dwStatusCode < 200 || dwStatusCode >= 300) return Strings::concat("failed: status code ", dwStatusCode); - WinHttpSetOption(hSession, WINHTTP_OPTION_PROXY, &proxy, sizeof(proxy)); + return std::move(ret); } - // Win7 IE Proxy fallback - else if (IsWindows7OrGreater() && !IsWindows8Point1OrGreater()) + + template + ExpectedS forall_data(F f) { - // First check if any proxy has been found automatically - WINHTTP_PROXY_INFO proxyInfo; - DWORD proxyInfoSize = sizeof(WINHTTP_PROXY_INFO); - auto noProxyFound = !WinHttpQueryOption(hSession, WINHTTP_OPTION_PROXY, &proxyInfo, &proxyInfoSize) || - proxyInfo.dwAccessType == WINHTTP_ACCESS_TYPE_NO_PROXY; + std::vector buf; - // If no proxy was found automatically, use IE's proxy settings, if any - if (noProxyFound) + size_t total_downloaded_size = 0; + DWORD dwSize = 0; + do { - WINHTTP_CURRENT_USER_IE_PROXY_CONFIG ieProxy; - if (WinHttpGetIEProxyConfigForCurrentUser(&ieProxy) && ieProxy.lpszProxy != nullptr) - { - WINHTTP_PROXY_INFO proxy; - proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; - proxy.lpszProxy = ieProxy.lpszProxy; - proxy.lpszProxyBypass = ieProxy.lpszProxyBypass; - WinHttpSetOption(hSession, WINHTTP_OPTION_PROXY, &proxy, sizeof(proxy)); - GlobalFree(ieProxy.lpszProxy); - GlobalFree(ieProxy.lpszProxyBypass); - GlobalFree(ieProxy.lpszAutoConfigUrl); - } - } + DWORD downloaded_size = 0; + auto bResults = WinHttpQueryDataAvailable(m_hRequest.get(), &dwSize); + if (!bResults) return Strings::concat("WinHttpQueryDataAvailable() failed: ", GetLastError()); + + if (buf.size() < dwSize) buf.resize(static_cast(dwSize) * 2); + + bResults = WinHttpReadData(m_hRequest.get(), (LPVOID)buf.data(), dwSize, &downloaded_size); + if (!bResults) return Strings::concat("WinHttpReadData() failed: ", GetLastError()); + f(Span(buf.data(), downloaded_size)); + + total_downloaded_size += downloaded_size; + } while (dwSize > 0); + return 1; } - // Use Windows 10 defaults on Windows 7 - DWORD secure_protocols(WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 | - WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2); - WinHttpSetOption(hSession, WINHTTP_OPTION_SECURE_PROTOCOLS, &secure_protocols, sizeof(secure_protocols)); + std::unique_ptr m_hRequest; + }; - // Specify an HTTP server. - auto hConnect = WinHttpConnect(hSession, Strings::to_utf16(hostname).c_str(), INTERNET_DEFAULT_HTTPS_PORT, 0); - Checks::check_exit(VCPKG_LINE_INFO, hConnect, "WinHttpConnect() failed: %d", GetLastError()); + struct WinHttpSession + { + static ExpectedS make() + { + auto h = WinHttpOpen(L"vcpkg/1.0", + IsWindows8Point1OrGreater() ? WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY + : WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, + WINHTTP_NO_PROXY_NAME, + WINHTTP_NO_PROXY_BYPASS, + 0); + if (!h) return Strings::concat("WinHttpOpen() failed: ", GetLastError()); + WinHttpSession ret; + ret.m_hSession.reset(h); - // Create an HTTP request handle. - auto hRequest = WinHttpOpenRequest(hConnect, - L"GET", - Strings::to_utf16(url_path).c_str(), - nullptr, - WINHTTP_NO_REFERER, - WINHTTP_DEFAULT_ACCEPT_TYPES, - WINHTTP_FLAG_SECURE); - Checks::check_exit(VCPKG_LINE_INFO, hRequest, "WinHttpOpenRequest() failed: %d", GetLastError()); + // If the environment variable HTTPS_PROXY is set + // use that variable as proxy. This situation might exist when user is in a company network + // with restricted network/proxy settings + auto maybe_https_proxy_env = System::get_environment_variable("HTTPS_PROXY"); + if (auto p_https_proxy = maybe_https_proxy_env.get()) + { + std::wstring env_proxy_settings = Strings::to_utf16(*p_https_proxy); + WINHTTP_PROXY_INFO proxy; + proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; + proxy.lpszProxy = env_proxy_settings.data(); + proxy.lpszProxyBypass = nullptr; - // Send a request. - auto bResults = - WinHttpSendRequest(hRequest, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0); + WinHttpSetOption(ret.m_hSession.get(), WINHTTP_OPTION_PROXY, &proxy, sizeof(proxy)); + } + // Win7 IE Proxy fallback + else if (IsWindows7OrGreater() && !IsWindows8Point1OrGreater()) + { + // First check if any proxy has been found automatically + WINHTTP_PROXY_INFO proxyInfo; + DWORD proxyInfoSize = sizeof(WINHTTP_PROXY_INFO); + auto noProxyFound = + !WinHttpQueryOption(ret.m_hSession.get(), WINHTTP_OPTION_PROXY, &proxyInfo, &proxyInfoSize) || + proxyInfo.dwAccessType == WINHTTP_ACCESS_TYPE_NO_PROXY; + + // If no proxy was found automatically, use IE's proxy settings, if any + if (noProxyFound) + { + WINHTTP_CURRENT_USER_IE_PROXY_CONFIG ieProxy; + if (WinHttpGetIEProxyConfigForCurrentUser(&ieProxy) && ieProxy.lpszProxy != nullptr) + { + WINHTTP_PROXY_INFO proxy; + proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; + proxy.lpszProxy = ieProxy.lpszProxy; + proxy.lpszProxyBypass = ieProxy.lpszProxyBypass; + WinHttpSetOption(ret.m_hSession.get(), WINHTTP_OPTION_PROXY, &proxy, sizeof(proxy)); + GlobalFree(ieProxy.lpszProxy); + GlobalFree(ieProxy.lpszProxyBypass); + GlobalFree(ieProxy.lpszAutoConfigUrl); + } + } + } - Checks::check_exit(VCPKG_LINE_INFO, bResults, "WinHttpSendRequest() failed: %d", GetLastError()); + // Use Windows 10 defaults on Windows 7 + DWORD secure_protocols(WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 | + WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2); + WinHttpSetOption( + ret.m_hSession.get(), WINHTTP_OPTION_SECURE_PROTOCOLS, &secure_protocols, sizeof(secure_protocols)); - // End the request. - bResults = WinHttpReceiveResponse(hRequest, NULL); - Checks::check_exit(VCPKG_LINE_INFO, bResults, "WinHttpReceiveResponse() failed: %d", GetLastError()); + return ret; + } - std::vector buf; + std::unique_ptr m_hSession; + }; - size_t total_downloaded_size = 0; - DWORD dwSize = 0; - do + struct WinHttpConnection + { + static ExpectedS make(HINTERNET hSession, StringView hostname, INTERNET_PORT port) { - DWORD downloaded_size = 0; - bResults = WinHttpQueryDataAvailable(hRequest, &dwSize); - Checks::check_exit(VCPKG_LINE_INFO, bResults, "WinHttpQueryDataAvailable() failed: %d", GetLastError()); - - if (buf.size() < dwSize) buf.resize(static_cast(dwSize) * 2); + // Specify an HTTP server. + auto h = WinHttpConnect(hSession, Strings::to_utf16(hostname).c_str(), port, 0); + if (!h) return Strings::concat("WinHttpConnect() failed: ", GetLastError()); + WinHttpConnection ret; + ret.m_hConnect.reset(h); + return ret; + } - bResults = WinHttpReadData(hRequest, (LPVOID)buf.data(), dwSize, &downloaded_size); - Checks::check_exit(VCPKG_LINE_INFO, bResults, "WinHttpReadData() failed: %d", GetLastError()); - fwrite(buf.data(), 1, downloaded_size, f); + std::unique_ptr m_hConnect; + }; +#endif - total_downloaded_size += downloaded_size; - } while (dwSize > 0); + Optional details::split_uri_view(StringView uri) + { + auto sep = std::find(uri.begin(), uri.end(), ':'); + if (sep == uri.end()) return nullopt; - WinHttpCloseHandle(hSession); - WinHttpCloseHandle(hConnect); - WinHttpCloseHandle(hRequest); - fflush(f); - fclose(f); + StringView scheme(uri.begin(), sep); + if (Strings::starts_with({sep + 1, uri.end()}, "//")) + { + auto path_start = std::find(sep + 3, uri.end(), '/'); + return details::SplitURIView{scheme, StringView{sep + 1, path_start}, {path_start, uri.end()}}; + } + // no authority + return details::SplitURIView{scheme, {}, {sep + 1, uri.end()}}; } -#endif void verify_downloaded_file_hash(const Files::Filesystem& fs, const std::string& url, @@ -167,30 +216,251 @@ namespace vcpkg::Downloads actual_hash); } - void download_file(vcpkg::Files::Filesystem& fs, + static void url_heads_inner(View urls, std::vector* out) + { + static constexpr StringLiteral guid_marker = "8a1db05f-a65d-419b-aa72-037fb4d0672e"; + + System::CmdLineBuilder cmd; + cmd.string_arg("curl") + .string_arg("--head") + .string_arg("--location") + .string_arg("-w") + .string_arg(Strings::concat(guid_marker, " %{http_code}\\n")); + for (auto&& url : urls) + { + cmd.string_arg(url); + } + auto res = System::cmd_execute_and_stream_lines(cmd, [out](const std::string& line) { + if (Strings::starts_with(line, guid_marker)) + { + out->push_back(std::strtol(line.data() + guid_marker.size(), nullptr, 10)); + } + }); + Checks::check_exit(VCPKG_LINE_INFO, res == 0, "curl failed to execute with exit code: %d", res); + } + std::vector url_heads(View urls) + { + static constexpr size_t batch_size = 100; + + std::vector ret; + + size_t i = 0; + for (; i + batch_size <= urls.size(); i += batch_size) + { + url_heads_inner({urls.data() + i, batch_size}, &ret); + } + if (i != urls.size()) url_heads_inner({urls.begin() + i, urls.end()}, &ret); + + return ret; + } + + static void download_files_inner(Files::Filesystem&, + View> url_pairs, + std::vector* out) + { + static constexpr StringLiteral guid_marker = "8a1db05f-a65d-419b-aa72-037fb4d0672e"; + + System::CmdLineBuilder cmd; + cmd.string_arg("curl") + .string_arg("--location") + .string_arg("-w") + .string_arg(Strings::concat(guid_marker, " %{http_code}\\n")); + for (auto&& url : url_pairs) + { + cmd.string_arg(url.first).string_arg("-o").path_arg(url.second); + } + auto res = System::cmd_execute_and_stream_lines(cmd, [out](const std::string& line) { + if (Strings::starts_with(line, guid_marker)) + { + out->push_back(std::strtol(line.data() + guid_marker.size(), nullptr, 10)); + } + }); + Checks::check_exit(VCPKG_LINE_INFO, res == 0, "curl failed to execute with exit code: %d", res); + } + std::vector download_files(Files::Filesystem& fs, View> url_pairs) + { + static constexpr size_t batch_size = 50; + + std::vector ret; + + size_t i = 0; + for (; i + batch_size <= url_pairs.size(); i += batch_size) + { + download_files_inner(fs, {url_pairs.data() + i, batch_size}, &ret); + } + if (i != url_pairs.size()) download_files_inner(fs, {url_pairs.begin() + i, url_pairs.end()}, &ret); + + Checks::check_exit(VCPKG_LINE_INFO, ret.size() == url_pairs.size()); + return ret; + } + + int put_file(const Files::Filesystem&, StringView url, const fs::path& file) + { + static constexpr StringLiteral guid_marker = "9a1db05f-a65d-419b-aa72-037fb4d0672e"; + + System::CmdLineBuilder cmd; + cmd.string_arg("curl").string_arg("-X").string_arg("PUT"); + cmd.string_arg("-w").string_arg(Strings::concat("\\n", guid_marker, "%{http_code}")); + cmd.string_arg(url); + cmd.string_arg("-T").path_arg(file); + cmd.string_arg("-H").string_arg("x-ms-blob-type: BlockBlob"); + int code = 0; + auto res = System::cmd_execute_and_stream_lines(cmd, [&code](const std::string& line) { + if (Strings::starts_with(line, guid_marker)) + { + code = std::strtol(line.data() + guid_marker.size(), nullptr, 10); + } + }); + if (res != 0) + { + System::print2(System::Color::warning, "curl failed to execute with exit code: ", res, '\n'); + } + return code; + } + + void download_file(Files::Filesystem& fs, const std::string& url, const fs::path& download_path, const std::string& sha512) { - const std::string download_path_part = fs::u8string(download_path) + ".part"; - auto download_path_part_path = fs::u8path(download_path_part); - std::error_code ec; - fs.remove(download_path, ec); - fs.remove(download_path_part_path, ec); + download_file(fs, {&url, 1}, download_path, sha512); + } + #if defined(_WIN32) - auto url_no_proto = url.substr(8); // drop https:// - auto path_begin = Util::find(url_no_proto, '/'); - std::string hostname(url_no_proto.begin(), path_begin); - std::string path(path_begin, url_no_proto.end()); - - winhttp_download_file(fs, download_path_part, hostname, path); -#else - const auto code = System::cmd_execute( - Strings::format(R"(curl -L '%s' --create-dirs --output '%s')", url, download_path_part)); - Checks::check_exit(VCPKG_LINE_INFO, code == 0, "Could not download %s", url); + namespace + { + struct WriteFlushFile + { + WriteFlushFile(const fs::path& p) + { + auto err = _wfopen_s(&f, p.c_str(), L"wb"); + Checks::check_exit(VCPKG_LINE_INFO, + !err, + "Failed to open file %s. Error code was %s", + fs::u8string(p), + std::to_string(err)); + ASSUME(f != nullptr); + } + ~WriteFlushFile() + { + if (f) + { + fflush(f); + fclose(f); + } + } + FILE* f = nullptr; + }; + + /// + /// Download a file using WinHTTP -- only supports HTTP and HTTPS + /// + static bool download_winhttp(Files::Filesystem& fs, + const fs::path& download_path_part_path, + details::SplitURIView split_uri, + const std::string& url, + std::string& errors) + { + // `download_winhttp` does not support user or port syntax in authorities + auto hostname = split_uri.authority.value_or_exit(VCPKG_LINE_INFO).substr(2); + INTERNET_PORT port; + if (split_uri.scheme == "https") + { + port = INTERNET_DEFAULT_HTTPS_PORT; + } + else if (split_uri.scheme == "http") + { + port = INTERNET_DEFAULT_HTTP_PORT; + } + else + { + Checks::unreachable(VCPKG_LINE_INFO); + } + + // Make sure the directories are present, otherwise fopen_s fails + const auto dir = download_path_part_path.parent_path(); + fs.create_directories(dir, VCPKG_LINE_INFO); + + WriteFlushFile f(download_path_part_path); + + Debug::print("Downloading ", url, "\n"); + static auto s = WinHttpSession::make().value_or_exit(VCPKG_LINE_INFO); + auto conn = WinHttpConnection::make(s.m_hSession.get(), hostname, port); + if (!conn) + { + Strings::append(errors, url, ": ", conn.error(), '\n'); + return false; + } + auto req = WinHttpRequest::make(conn.get()->m_hConnect.get(), split_uri.path_query_fragment); + if (!req) + { + Strings::append(errors, url, ": ", req.error(), '\n'); + return false; + } + auto forall_data = + req.get()->forall_data([&](Span span) { fwrite(span.data(), 1, span.size(), f.f); }); + if (!forall_data) + { + Strings::append(errors, url, ": ", forall_data.error(), '\n'); + return false; + } + return true; + } + } #endif - verify_downloaded_file_hash(fs, url, download_path_part_path, sha512); - fs.rename(download_path_part_path, download_path, VCPKG_LINE_INFO); + std::string download_file(vcpkg::Files::Filesystem& fs, + View urls, + const fs::path& download_path, + const std::string& sha512) + { + Checks::check_exit(VCPKG_LINE_INFO, urls.size() > 0); + + auto download_path_part_path = download_path; + download_path_part_path += fs::u8path(".part"); + fs.remove(download_path, ignore_errors); + fs.remove(download_path_part_path, ignore_errors); + + std::string errors; + for (const std::string& url : urls) + { +#if defined(_WIN32) + auto split_uri = details::split_uri_view(url).value_or_exit(VCPKG_LINE_INFO); + auto authority = split_uri.authority.value_or_exit(VCPKG_LINE_INFO).substr(2); + if (split_uri.scheme == "https" || split_uri.scheme == "http") + { + // This check causes complex URLs (non-default port, embedded basic auth) to be passed down to curl.exe + if (Strings::find_first_of(authority, ":@") == authority.end()) + { + if (download_winhttp(fs, download_path_part_path, split_uri, url, errors)) + { + verify_downloaded_file_hash(fs, url, download_path_part_path, sha512); + fs.rename(download_path_part_path, download_path, VCPKG_LINE_INFO); + return url; + } + continue; + } + } +#endif + System::CmdLineBuilder cmd; + cmd.string_arg("curl") + .string_arg("--fail") + .string_arg("-L") + .string_arg(url) + .string_arg("--create-dirs") + .string_arg("--output") + .path_arg(download_path_part_path); + const auto out = System::cmd_execute_and_capture_output(cmd); + if (out.exit_code != 0) + { + Strings::append(errors, url, ": ", out.output, '\n'); + continue; + } + + verify_downloaded_file_hash(fs, url, download_path_part_path, sha512); + fs.rename(download_path_part_path, download_path, VCPKG_LINE_INFO); + return url; + } + Checks::exit_with_message(VCPKG_LINE_INFO, "Failed to download from mirror set:\n%s", errors); } } diff --git a/toolsrc/src/vcpkg/binarycaching.cpp b/toolsrc/src/vcpkg/binarycaching.cpp index 5512182c5372aa..8624cb3d3115fd 100644 --- a/toolsrc/src/vcpkg/binarycaching.cpp +++ b/toolsrc/src/vcpkg/binarycaching.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -16,31 +17,68 @@ using namespace vcpkg; namespace { - static System::ExitCodeAndOutput decompress_archive(const VcpkgPaths& paths, - const PackageSpec& spec, - const fs::path& archive_path) + struct NullBinaryProvider : IBinaryProvider { - auto& fs = paths.get_filesystem(); + void prefetch(const VcpkgPaths&, std::vector&) { } - auto pkg_path = paths.package_dir(spec); - fs.remove_all(pkg_path, VCPKG_LINE_INFO); - std::error_code ec; - fs.create_directories(pkg_path, ec); - auto files = fs.get_files_non_recursive(pkg_path); - Checks::check_exit(VCPKG_LINE_INFO, files.empty(), "unable to clear path: %s", fs::u8string(pkg_path)); + void push_success(const VcpkgPaths&, const Dependencies::InstallPlanAction&) { } + RestoreResult try_restore(const VcpkgPaths&, const Dependencies::InstallPlanAction&) + { + return RestoreResult::missing; + } + + void precheck(const VcpkgPaths&, std::unordered_map&) { } + }; +} + +std::unordered_map vcpkg::binary_provider_precheck( + const VcpkgPaths& paths, const Dependencies::ActionPlan& plan, IBinaryProvider& provider) +{ + std::unordered_map checked; + for (auto&& action : plan.install_actions) + checked.emplace(&action, RestoreResult::missing); + provider.precheck(paths, checked); + return checked; +} + +namespace +{ + static void clean_prepare_dir(Files::Filesystem& fs, const fs::path& dir) + { + fs.remove_all(dir, VCPKG_LINE_INFO); + bool created_last = fs.create_directories(dir, VCPKG_LINE_INFO); + Checks::check_exit(VCPKG_LINE_INFO, created_last, "unable to clear path: %s", fs::u8string(dir)); + } + + static System::ExitCodeAndOutput decompress_archive(const VcpkgPaths& paths, + const fs::path& dst, + const fs::path& archive_path) + { + System::CmdLineBuilder cmd; #if defined(_WIN32) auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP); - auto cmd = Strings::format(R"("%s" x "%s" -o"%s" -y)", - fs::u8string(seven_zip_exe), - fs::u8string(archive_path), - fs::u8string(pkg_path)); + cmd.path_arg(seven_zip_exe) + .string_arg("x") + .path_arg(archive_path) + .string_arg("-o" + fs::u8string(dst)) + .string_arg("-y"); #else - auto cmd = Strings::format(R"(unzip -qq "%s" "-d%s")", fs::u8string(archive_path), fs::u8string(pkg_path)); + (void)paths; + cmd.string_arg("unzip").string_arg("-qq").path_arg(archive_path).string_arg("-d" + fs::u8string(dst)); #endif return System::cmd_execute_and_capture_output(cmd, System::get_clean_environment()); } + static System::ExitCodeAndOutput clean_decompress_archive(const VcpkgPaths& paths, + const PackageSpec& spec, + const fs::path& archive_path) + { + auto pkg_path = paths.package_dir(spec); + clean_prepare_dir(paths.get_filesystem(), pkg_path); + return decompress_archive(paths, pkg_path, archive_path); + } + // Compress the source directory into the destination file. static void compress_directory(const VcpkgPaths& paths, const fs::path& source, const fs::path& destination) { @@ -66,69 +104,95 @@ namespace struct ArchivesBinaryProvider : IBinaryProvider { - ArchivesBinaryProvider(std::vector&& read_dirs, std::vector&& write_dirs) - : m_read_dirs(std::move(read_dirs)), m_write_dirs(std::move(write_dirs)) + ArchivesBinaryProvider(std::vector&& read_dirs, + std::vector&& write_dirs, + std::vector&& put_url_templates) + : m_read_dirs(std::move(read_dirs)) + , m_write_dirs(std::move(write_dirs)) + , m_put_url_templates(std::move(put_url_templates)) { } - ~ArchivesBinaryProvider() = default; - void prefetch(const VcpkgPaths&, const Dependencies::ActionPlan&) override { } - RestoreResult try_restore(const VcpkgPaths& paths, const Dependencies::InstallPlanAction& action) override + + void prefetch(const VcpkgPaths& paths, std::vector& actions) override { - const auto& abi_tag = action.abi_info.value_or_exit(VCPKG_LINE_INFO).package_abi; - auto& spec = action.spec; auto& fs = paths.get_filesystem(); - std::error_code ec; - for (auto&& archives_root_dir : m_read_dirs) - { - const std::string archive_name = abi_tag + ".zip"; - const fs::path archive_subpath = fs::u8path(abi_tag.substr(0, 2)) / archive_name; - const fs::path archive_path = archives_root_dir / archive_subpath; - if (fs.exists(archive_path)) + Util::erase_remove_if(actions, [this, &fs, &paths](const Dependencies::InstallPlanAction* action) { + auto& spec = action->spec; + const auto& abi_tag = action->abi_info.value_or_exit(VCPKG_LINE_INFO).package_abi; + const auto archive_name = fs::u8path(abi_tag + ".zip"); + for (const auto& archives_root_dir : m_read_dirs) { - System::print2("Using cached binary package: ", fs::u8string(archive_path), "\n"); + auto archive_path = archives_root_dir; + archive_path /= fs::u8path(abi_tag.substr(0, 2)); + archive_path /= archive_name; + if (fs.exists(archive_path)) + { + System::print2("Using cached binary package: ", fs::u8string(archive_path), "\n"); - int archive_result = decompress_archive(paths, spec, archive_path).exit_code; + int archive_result = clean_decompress_archive(paths, spec, archive_path).exit_code; - if (archive_result == 0) - { - return RestoreResult::success; - } - else - { - System::print2("Failed to decompress archive package\n"); - if (action.build_options.purge_decompress_failure == Build::PurgeDecompressFailure::NO) + if (archive_result == 0) { - return RestoreResult::build_failed; + m_restored.insert(spec); + return true; } else { - System::print2("Purging bad archive\n"); - fs.remove(archive_path, ec); + System::print2("Failed to decompress archive package\n"); + if (action->build_options.purge_decompress_failure == Build::PurgeDecompressFailure::YES) + { + System::print2("Purging bad archive\n"); + fs.remove(archive_path, ignore_errors); + } } } - } - System::printf("Could not locate cached archive: %s\n", fs::u8string(archive_path)); - } - - return RestoreResult::missing; + System::printf("Could not locate cached archive: %s\n", fs::u8string(archive_path)); + } + return false; + }); + } + RestoreResult try_restore(const VcpkgPaths&, const Dependencies::InstallPlanAction& action) override + { + if (Util::Sets::contains(m_restored, action.spec)) + return RestoreResult::success; + else + return RestoreResult::missing; } void push_success(const VcpkgPaths& paths, const Dependencies::InstallPlanAction& action) override { - if (m_write_dirs.empty()) return; + if (m_write_dirs.empty() && m_put_url_templates.empty()) return; const auto& abi_tag = action.abi_info.value_or_exit(VCPKG_LINE_INFO).package_abi; auto& spec = action.spec; auto& fs = paths.get_filesystem(); const auto tmp_archive_path = paths.buildtrees / spec.name() / (spec.triplet().to_string() + ".zip"); compress_directory(paths, paths.package_dir(spec), tmp_archive_path); - for (auto&& m_directory : m_write_dirs) + size_t http_remotes_pushed = 0; + for (auto&& put_url_template : m_put_url_templates) + { + auto url = Strings::replace_all(std::string(put_url_template), "", abi_tag); + auto code = Downloads::put_file(fs, url, tmp_archive_path); + if (code >= 200 && code < 300) + { + http_remotes_pushed++; + } + else + { + Debug::print("Failed to upload to ", url, ": ", code, '\n'); + } + } + if (!m_put_url_templates.empty()) { - const fs::path& archives_root_dir = m_directory; - const std::string archive_name = abi_tag + ".zip"; - const fs::path archive_subpath = fs::u8path(abi_tag.substr(0, 2)) / archive_name; - const fs::path archive_path = archives_root_dir / archive_subpath; + System::print2("Uploaded binaries to ", http_remotes_pushed, " HTTP remotes.\n"); + } + const auto archive_name = fs::u8path(abi_tag + ".zip"); + for (const auto& archives_root_dir : m_write_dirs) + { + auto archive_path = archives_root_dir; + archive_path /= fs::u8path(abi_tag.substr(0, 2)); + archive_path /= archive_name; fs.create_directories(archive_path.parent_path(), ignore_errors); std::error_code ec; if (m_write_dirs.size() > 1) @@ -145,29 +209,143 @@ namespace else System::printf("Stored binary cache: %s\n", fs::u8string(archive_path)); } - if (m_write_dirs.size() > 1) fs.remove(tmp_archive_path, ignore_errors); + // In the case of 1 write dir, the file will be moved instead of copied + if (m_write_dirs.size() != 1) + { + fs.remove(tmp_archive_path, ignore_errors); + } } - RestoreResult precheck(const VcpkgPaths& paths, const Dependencies::InstallPlanAction& action) override + void precheck(const VcpkgPaths& paths, + std::unordered_map& results_map) override { - const auto& abi_tag = action.abi_info.value_or_exit(VCPKG_LINE_INFO).package_abi; auto& fs = paths.get_filesystem(); - std::error_code ec; - for (auto&& archives_root_dir : m_read_dirs) + + for (auto&& result_pair : results_map) { - const std::string archive_name = abi_tag + ".zip"; - const fs::path archive_subpath = fs::u8path(abi_tag.substr(0, 2)) / archive_name; - const fs::path archive_path = archives_root_dir / archive_subpath; + if (result_pair.second != RestoreResult::missing) continue; - if (fs.exists(archive_path)) + const auto& abi_tag = result_pair.first->abi_info.value_or_exit(VCPKG_LINE_INFO).package_abi; + std::error_code ec; + for (auto&& archives_root_dir : m_read_dirs) { - return RestoreResult::success; + const std::string archive_name = abi_tag + ".zip"; + const fs::path archive_subpath = fs::u8path(abi_tag.substr(0, 2)) / archive_name; + const fs::path archive_path = archives_root_dir / archive_subpath; + + if (fs.exists(archive_path)) + { + result_pair.second = RestoreResult::success; + break; + } } } - return RestoreResult::missing; } private: - std::vector m_read_dirs, m_write_dirs; + std::vector m_read_dirs; + std::vector m_write_dirs; + std::vector m_put_url_templates; + + std::set m_restored; + }; + struct HttpGetBinaryProvider : NullBinaryProvider + { + HttpGetBinaryProvider(std::vector&& url_templates) : m_url_templates(std::move(url_templates)) { } + void prefetch(const VcpkgPaths& paths, std::vector& actions) override + { + auto& fs = paths.get_filesystem(); + + const size_t current_restored = m_restored.size(); + + for (auto&& url_template : m_url_templates) + { + std::vector> url_paths; + std::vector specs; + + for (auto&& action : actions) + { + auto abi = action->package_abi(); + if (!abi) continue; + + specs.push_back(action->spec); + auto pkgdir = paths.package_dir(action->spec); + clean_prepare_dir(fs, pkgdir); + pkgdir /= fs::u8path(Strings::concat(*abi.get(), ".zip")); + url_paths.emplace_back(Strings::replace_all(std::string(url_template), "", *abi.get()), + pkgdir); + } + + if (url_paths.empty()) break; + + System::print2("Attempting to fetch ", url_paths.size(), " packages from HTTP servers.\n"); + + auto codes = Downloads::download_files(fs, url_paths); + for (size_t i = 0; i < codes.size(); ++i) + { + if (codes[i] == 200) + { + int archive_result = + decompress_archive(paths, paths.package_dir(specs[i]), url_paths[i].second).exit_code; + if (archive_result == 0) + { + // decompression success + fs.remove(url_paths[i].second, VCPKG_LINE_INFO); + m_restored.insert(specs[i]); + } + else + { + Debug::print("Failed to decompress ", fs::u8string(url_paths[i].second), '\n'); + } + } + } + + Util::erase_remove_if(actions, [this](const Dependencies::InstallPlanAction* action) { + return Util::Sets::contains(m_restored, action->spec); + }); + } + System::print2("Restored ", + m_restored.size() - current_restored, + " packages from HTTP servers. Use --debug for more information.\n"); + } + RestoreResult try_restore(const VcpkgPaths&, const Dependencies::InstallPlanAction& action) override + { + if (Util::Sets::contains(m_restored, action.spec)) + return RestoreResult::success; + else + return RestoreResult::missing; + } + void precheck(const VcpkgPaths&, + std::unordered_map& results_map) override + { + std::vector urls; + std::vector url_actions; + for (auto&& url_template : m_url_templates) + { + urls.clear(); + url_actions.clear(); + for (auto&& result_pair : results_map) + { + if (result_pair.second != RestoreResult::missing) continue; + auto abi = result_pair.first->package_abi(); + if (!abi) continue; + urls.push_back(Strings::replace_all(std::string(url_template), "", *abi.get())); + url_actions.push_back(result_pair.first); + } + if (urls.empty()) break; + auto codes = Downloads::url_heads(urls); + Checks::check_exit(VCPKG_LINE_INFO, codes.size() == url_actions.size()); + for (size_t i = 0; i < codes.size(); ++i) + { + if (codes[i] == 200) + { + results_map[url_actions[i]] = RestoreResult::success; + } + } + } + } + + std::vector m_url_templates; + std::set m_restored; }; static std::string trim_leading_zeroes(std::string v) @@ -184,7 +362,7 @@ namespace return v; } - struct NugetBinaryProvider : IBinaryProvider + struct NugetBinaryProvider : NullBinaryProvider { NugetBinaryProvider(std::vector&& read_sources, std::vector&& write_sources, @@ -198,7 +376,8 @@ namespace , m_interactive(interactive) { } - void prefetch(const VcpkgPaths& paths, const Dependencies::ActionPlan& plan) override + + void prefetch(const VcpkgPaths& paths, std::vector& actions) override { if (m_read_sources.empty() && m_read_configs.empty()) return; @@ -206,14 +385,14 @@ namespace std::vector> nuget_refs; - for (auto&& action : plan.install_actions) + for (auto&& action : actions) { - if (!action.has_package_abi()) continue; + if (!action->has_package_abi()) continue; - auto& spec = action.spec; + auto& spec = action->spec; fs.remove_all(paths.package_dir(spec), VCPKG_LINE_INFO); - nuget_refs.emplace_back(spec, NugetReference(action)); + nuget_refs.emplace_back(spec, NugetReference(*action)); } if (nuget_refs.empty()) return; @@ -294,7 +473,7 @@ namespace cmdlines.push_back(cmdline.extract()); } - size_t num_restored = 0; + const size_t current_restored = m_restored.size(); for (const auto& cmdline : cmdlines) { @@ -327,7 +506,6 @@ namespace "Unable to remove nupkg after restoring: %s", fs::u8string(nupkg_path)); m_restored.emplace(nuget_ref.first); - ++num_restored; return true; } else @@ -337,7 +515,13 @@ namespace }); } - System::print2("Restored ", num_restored, " packages. Use --debug for more information.\n"); + Util::erase_remove_if(actions, [this](const Dependencies::InstallPlanAction* action) { + return Util::Sets::contains(m_restored, action->spec); + }); + + System::print2("Restored ", + m_restored.size() - current_restored, + " packages from NuGet. Use --debug for more information.\n"); } RestoreResult try_restore(const VcpkgPaths&, const Dependencies::InstallPlanAction& action) override { @@ -450,10 +634,6 @@ namespace paths.get_filesystem().remove(nupkg_path, ignore_errors); } } - RestoreResult precheck(const VcpkgPaths&, const Dependencies::InstallPlanAction&) override - { - return RestoreResult::missing; - } private: std::vector m_read_sources; @@ -465,19 +645,22 @@ namespace std::set m_restored; bool m_interactive; }; +} - struct MergeBinaryProviders : IBinaryProvider +namespace vcpkg +{ + struct MergeBinaryProviders : NullBinaryProvider { explicit MergeBinaryProviders(std::vector>&& providers) : m_providers(std::move(providers)) { } - void prefetch(const VcpkgPaths& paths, const Dependencies::ActionPlan& plan) override + void prefetch(const VcpkgPaths& paths, std::vector& actions) override { for (auto&& provider : m_providers) { - provider->prefetch(paths, plan); + provider->prefetch(paths, actions); } } RestoreResult try_restore(const VcpkgPaths& paths, const Dependencies::InstallPlanAction& action) override @@ -502,39 +685,18 @@ namespace provider->push_success(paths, action); } } - RestoreResult precheck(const VcpkgPaths& paths, const Dependencies::InstallPlanAction& action) override + void precheck(const VcpkgPaths& paths, + std::unordered_map& results_map) override { for (auto&& provider : m_providers) { - auto result = provider->precheck(paths, action); - switch (result) - { - case RestoreResult::build_failed: - case RestoreResult::success: return result; - case RestoreResult::missing: continue; - default: Checks::unreachable(VCPKG_LINE_INFO); - } + provider->precheck(paths, results_map); } - return RestoreResult::missing; } private: std::vector> m_providers; }; - - struct NullBinaryProvider : IBinaryProvider - { - void prefetch(const VcpkgPaths&, const Dependencies::ActionPlan&) override { } - RestoreResult try_restore(const VcpkgPaths&, const Dependencies::InstallPlanAction&) override - { - return RestoreResult::missing; - } - void push_success(const VcpkgPaths&, const Dependencies::InstallPlanAction&) override { } - RestoreResult precheck(const VcpkgPaths&, const Dependencies::InstallPlanAction&) override - { - return RestoreResult::missing; - } - }; } XmlSerializer& XmlSerializer::emit_declaration() @@ -650,12 +812,6 @@ IBinaryProvider& vcpkg::null_binary_provider() return p; } -ExpectedS> vcpkg::create_binary_provider_from_configs(View args) -{ - std::string env_string = System::get_environment_variable("VCPKG_BINARY_SOURCES").value_or(""); - - return create_binary_provider_from_configs_pure(env_string, args); -} namespace { const ExpectedS& default_cache_path() @@ -692,10 +848,6 @@ namespace return {"default path was not absolute: " + fs::u8string(p), expected_right_tag}; } }); - if (cachepath.has_value()) - Debug::print("Default binary cache path is: ", fs::u8string(*cachepath.get()), '\n'); - else - Debug::print("No binary cache path. Reason: ", cachepath.error(), '\n'); return cachepath; } @@ -707,6 +859,9 @@ namespace std::vector archives_to_read; std::vector archives_to_write; + std::vector url_templates_to_get; + std::vector azblob_templates_to_put; + std::vector sources_to_read; std::vector sources_to_write; @@ -719,6 +874,8 @@ namespace interactive = false; archives_to_read.clear(); archives_to_write.clear(); + url_templates_to_get.clear(); + azblob_templates_to_put.clear(); sources_to_read.clear(); sources_to_write.clear(); configs_to_read.clear(); @@ -901,6 +1058,40 @@ namespace handle_readwrite( state->archives_to_read, state->archives_to_write, fs::path(*maybe_home.get()), segments, 1); } + else if (segments[0].second == "x-azblob") + { + // Scheme: x-azblob,,[,] + if (segments.size() < 3) + { + return add_error( + "expected arguments: binary config 'azblob' requires at least a base-url and a SAS token", + segments[0].first); + } + if (!Strings::starts_with(segments[1].second, "https://")) + { + return add_error( + "invalid argument: binary config 'azblob' requires an https base url as the first argument", + segments[1].first); + } + if (Strings::starts_with(segments[2].second, "?")) + { + return add_error("invalid argument: binary config 'azblob' requires a SAS token without a " + "preceeding '?' as the second argument", + segments[2].first); + } + auto p = segments[1].second; + if (p.back() != '/') p.push_back('/'); + p.append(".zip"); + if (!Strings::starts_with(segments[2].second, "?")) p.push_back('?'); + p.append(segments[2].second); + handle_readwrite( + state->url_templates_to_get, state->azblob_templates_to_put, std::move(p), segments, 3); + if (segments.size() > 4) + { + return add_error("unexpected arguments: binary config 'azblob' requires 2 or 3 arguments", + segments[4].first); + } + } else { return add_error( @@ -912,6 +1103,21 @@ namespace }; } +ExpectedS> vcpkg::create_binary_provider_from_configs(View args) +{ + std::string env_string = System::get_environment_variable("VCPKG_BINARY_SOURCES").value_or(""); + if (Debug::g_debugging) + { + const auto& cachepath = default_cache_path(); + if (cachepath.has_value()) + Debug::print("Default binary cache path is: ", fs::u8string(*cachepath.get()), '\n'); + else + Debug::print("No binary cache path. Reason: ", cachepath.error(), '\n'); + } + + return create_binary_provider_from_configs_pure(env_string, args); +} + ExpectedS> vcpkg::create_binary_provider_from_configs_pure( const std::string& env_string, View args) { @@ -939,9 +1145,16 @@ ExpectedS> vcpkg::create_binary_provider_from_c if (s.m_cleared) Metrics::g_metrics.lock()->track_property("binarycaching-clear", "defined"); std::vector> providers; - if (!s.archives_to_read.empty() || !s.archives_to_write.empty()) - providers.push_back( - std::make_unique(std::move(s.archives_to_read), std::move(s.archives_to_write))); + if (!s.archives_to_read.empty() || !s.archives_to_write.empty() || !s.azblob_templates_to_put.empty()) + { + providers.push_back(std::make_unique( + std::move(s.archives_to_read), std::move(s.archives_to_write), std::move(s.azblob_templates_to_put))); + } + if (!s.url_templates_to_get.empty()) + { + Metrics::g_metrics.lock()->track_property("binarycaching-url-get", "defined"); + providers.push_back(std::make_unique(std::move(s.url_templates_to_get))); + } if (!s.sources_to_read.empty() || !s.sources_to_write.empty() || !s.configs_to_read.empty() || !s.configs_to_write.empty()) { @@ -1088,6 +1301,9 @@ void vcpkg::help_topic_binary_caching(const VcpkgPaths&) tbl.format("nugetconfig,[,]", "Adds a NuGet-config-file-based source; equivalent to the `-Config` parameter of the NuGet CLI. This " "config should specify `defaultPushSource` for uploads."); + tbl.format("x-azblob,,[,]", + "**Experimental: will change or be removed without warning** Adds an Azure Blob Storage source. Uses " + "Shared Access Signature validation. URL should include the container path."); tbl.format("interactive", "Enables interactive credential management for some source types"); tbl.blank(); tbl.text("The `` optional parameter for certain strings controls whether they will be consulted for " diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp index 1d83f471b9a293..ee6222d6edbef8 100644 --- a/toolsrc/src/vcpkg/commands.ci.cpp +++ b/toolsrc/src/vcpkg/commands.ci.cpp @@ -332,6 +332,8 @@ namespace vcpkg::Commands::CI { vcpkg::System::BufferedPrint stdout_print; + auto precheck_results = binary_provider_precheck(paths, action_plan, binaryprovider); + for (auto&& action : action_plan.install_actions) { auto p = &action; @@ -345,7 +347,7 @@ namespace vcpkg::Commands::CI p->build_options = vcpkg::Build::backcompat_prohibiting_package_options; } - auto precheck_result = binaryprovider.precheck(paths, action); + auto precheck_result = precheck_results.at(&action); bool b_will_build = false; std::string state; diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index 69db32e27c5e58..75509343a37b8c 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -433,6 +433,12 @@ namespace vcpkg::Dependencies if (!abi_info) return false; return !abi_info.get()->package_abi.empty(); } + Optional InstallPlanAction::package_abi() const + { + if (!abi_info) return nullopt; + if (abi_info.get()->package_abi.empty()) return nullopt; + return abi_info.get()->package_abi; + } const Build::PreBuildInfo& InstallPlanAction::pre_build_info(LineInfo linfo) const { return *abi_info.value_or_exit(linfo).pre_build_info.get(); diff --git a/toolsrc/src/vcpkg/globalstate.cpp b/toolsrc/src/vcpkg/globalstate.cpp index b07690bbd31741..896e96c81f09ec 100644 --- a/toolsrc/src/vcpkg/globalstate.cpp +++ b/toolsrc/src/vcpkg/globalstate.cpp @@ -1,3 +1,5 @@ +#include + #include namespace vcpkg diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index 2abe20774fef69..f3da9c5d672872 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -481,7 +481,8 @@ namespace vcpkg::Install Build::compute_all_abis(paths, action_plan, var_provider, status_db); - binaryprovider.prefetch(paths, action_plan); + auto to_prefetch = Util::fmap(action_plan.install_actions, [](const auto& x) { return &x; }); + binaryprovider.prefetch(paths, to_prefetch); for (auto&& action : action_plan.install_actions) { From 36a6f9257195ccccbbf74db9039067adb4c7f2a2 Mon Sep 17 00:00:00 2001 From: SvenPStarFinanz Date: Wed, 18 Nov 2020 22:07:04 +0100 Subject: [PATCH 0071/1694] [xmlsec] Update to 1.2.31 (#14587) Co-authored-by: Nicole Mazzuca --- ports/xmlsec/0001-uwp-fix.patch | 24 ++++++++++-------------- ports/xmlsec/CONTROL | 3 +-- ports/xmlsec/portfile.cmake | 4 ++-- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/ports/xmlsec/0001-uwp-fix.patch b/ports/xmlsec/0001-uwp-fix.patch index f48cbf589c0b48..d1e62f91c9a979 100644 --- a/ports/xmlsec/0001-uwp-fix.patch +++ b/ports/xmlsec/0001-uwp-fix.patch @@ -1,20 +1,16 @@ diff --git a/src/dl.c b/src/dl.c -index b13f9d4..4a1b0c1 100644 +index e934fe4e..a511df43 100644 --- a/src/dl.c +++ b/src/dl.c -@@ -148,7 +148,14 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) { +@@ -148,7 +148,7 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) { #endif /* XMLSEC_DL_LIBLTDL */ #ifdef XMLSEC_DL_WIN32 -- lib->handle = LoadLibraryA((char*)lib->filename); -+#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP -+ lib->handle = LoadLibraryA((char*)lib->filename); -+#else -+ LPTSTR wcLib = NULL; -+ wcLib = xmlSecWin32ConvertUtf8ToTstr((char*)lib->filename); -+ if (wcLib) -+ lib->handle = LoadPackagedLibrary(wcLib, 0); -+#endif - if(lib->handle == NULL) { - xmlSecIOError("LoadLibraryA", lib->filename, NULL); - xmlSecCryptoDLLibraryDestroy(lib); +-#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) ++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) + lib->handle = LoadLibraryA((char*)lib->filename); + #else + LPWSTR wcLibFilename = xmlSecWin32ConvertUtf8ToUnicode(lib->filename); +-- +2.25.1.windows.1 + diff --git a/ports/xmlsec/CONTROL b/ports/xmlsec/CONTROL index e4437a14d26467..095b99a17b4e1b 100644 --- a/ports/xmlsec/CONTROL +++ b/ports/xmlsec/CONTROL @@ -1,6 +1,5 @@ Source: xmlsec -Version: 1.2.30 -Port-Version: 1 +Version: 1.2.31 Homepage: https://www.aleksey.com/xmlsec/ Description: XML Security Library is a C library based on LibXML2. The library supports major XML security standards. Build-Depends: libxml2, openssl diff --git a/ports/xmlsec/portfile.cmake b/ports/xmlsec/portfile.cmake index 0c47010e317487..a3f88a687949e9 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 xmlsec-1_2_30 - SHA512 e631e7b132b39bb53f2713fe34880f8b4e81fd759fd206e8872c066236a8a64713842ba5e0ba9ad2f345f9f6d1da304acbeb61411b52cfa79d2934fc9e260ce9 + REF xmlsec-1_2_31 + SHA512 00c67bdfed208c23cbdbcdecd0648c19b66e6036a8dd27145d3c3f2150cba92cbdf5bf976f8561273e752ed3b5c188fa56ab84677e894194c6f1269a07caf04d HEAD_REF master PATCHES 0001-uwp-fix.patch From fc94ccb5ad241f9fb8184ff236a7fdffe80ec5b9 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Thu, 19 Nov 2020 05:07:49 +0800 Subject: [PATCH 0072/1694] [poco] Fix dependency and cmake config issue (#14589) * [poco] Fix dependency and cmake config issue * Merge the patches --- ports/poco/CONTROL | 2 +- ports/poco/fix_dependency.patch | 399 +++++++++++++++++--------------- 2 files changed, 218 insertions(+), 183 deletions(-) diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL index 6c4f1279ad11b5..275cc58f39a34e 100644 --- a/ports/poco/CONTROL +++ b/ports/poco/CONTROL @@ -1,6 +1,6 @@ Source: poco Version: 1.10.1 -Port-Version: 1 +Port-Version: 2 Build-Depends: expat, pcre, zlib 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 diff --git a/ports/poco/fix_dependency.patch b/ports/poco/fix_dependency.patch index 4512ffce43ec9a..48c0c5bec446a1 100644 --- a/ports/poco/fix_dependency.patch +++ b/ports/poco/fix_dependency.patch @@ -1,182 +1,217 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b664afd..0f72521 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -82,8 +82,6 @@ option(FORCE_OPENSSL "Force usage of OpenSSL even under windows" OFF) - - if(ENABLE_CRYPTO OR ENABLE_NETSSL OR ENABLE_JWT) - find_package(OpenSSL REQUIRED) --else() -- find_package(OpenSSL) - endif() - - if(OPENSSL_FOUND) -@@ -113,24 +111,18 @@ else() - option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" OFF) - endif() - --if(ENABLE_DATA_MYSQL) -- find_package(MySQL REQUIRED) --else() -- find_package(MySQL) --endif() -+option(ENABLE_DATA "Enable Data" OFF) -+option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF) - --if(MYSQL_FOUND) -- option(ENABLE_DATA "Enable Data" ON) -- option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" ON) --else() -- option(ENABLE_DATA "Enable Data" OFF) -- option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF) -+if(ENABLE_DATA_MYSQL) -+ find_package(libmysql) -+ if (NOT libmysql_FOUND) -+ find_package(unofficial-libmariadb CONFIG REQUIRED) -+ endif() - endif() - - if(ENABLE_DATA_POSTGRESQL) - find_package(PostgreSQL REQUIRED) --else() -- find_package(PostgreSQL) - endif() - - if(PostgreSQL_FOUND) -@@ -200,6 +192,9 @@ include(DefinePlatformSpecifc) - # Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file - set(Poco_COMPONENTS "") - -+# Do not declare the link library in the code! -+add_definitions(-DPOCO_NO_AUTOMATIC_LIBS) -+ - if(ENABLE_TESTS) - add_subdirectory(CppUnit) - set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) -@@ -327,8 +322,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS) - list(APPEND Poco_COMPONENTS "Redis") - endif() - --if(EXISTS ${PROJECT_SOURCE_DIR}/PDF AND ENABLE_PDF) -- add_subdirectory(PDF) -+if(ENABLE_PDF) -+ include(SelectLibraryConfigurations) -+ find_library(PocoPDF_LIBRARY_RELEASE NAMES libhpdf) -+ find_library(PocoPDF_LIBRARY_DEBUG NAMES libhpdfd) -+ select_library_configurations(PocoPDF) - list(APPEND Poco_COMPONENTS "PDF") - endif() - -@@ -457,15 +455,6 @@ install( - Devel - ) - --if(POCO_UNBUNDLED) -- install(FILES cmake/FindPCRE.cmake -- DESTINATION "${PocoConfigPackageLocation}") -- install(FILES cmake/V39/FindEXPAT.cmake -- DESTINATION "${PocoConfigPackageLocation}/V39") -- install(FILES cmake/V313/FindSQLite3.cmake -- DESTINATION "${PocoConfigPackageLocation}/V313") --endif() -- - message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") - message(STATUS "${PROJECT_NAME} package version: ${PROJECT_VERSION}") - if(BUILD_SHARED_LIBS) -diff --git a/Data/MySQL/CMakeLists.txt b/Data/MySQL/CMakeLists.txt -index f71b145..c3eaf9e 100644 ---- a/Data/MySQL/CMakeLists.txt -+++ b/Data/MySQL/CMakeLists.txt -@@ -21,7 +21,7 @@ set_target_properties(DataMySQL - DEFINE_SYMBOL MySQL_EXPORTS - ) - --target_link_libraries(DataMySQL PUBLIC Poco::Data MySQL::client) -+target_link_libraries(DataMySQL PUBLIC Poco::Data ${MYSQL_LIBRARIES}) - target_include_directories(DataMySQL - PUBLIC - $ -diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt -index b52e2c5..0dcfae2 100644 ---- a/Data/SQLite/CMakeLists.txt -+++ b/Data/SQLite/CMakeLists.txt -@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h") - POCO_HEADERS_AUTO(SQLITE_SRCS ${HDRS_G}) - - if(POCO_UNBUNDLED) -- find_package(SQLite3 REQUIRED) -+ find_package(unofficial-sqlite3 CONFIG REQUIRED) - else() - # sqlite3 - POCO_SOURCES(SQLITE_SRCS sqlite3 -@@ -43,7 +43,7 @@ target_include_directories(DataSQLite - ) - - if(POCO_UNBUNDLED) -- target_link_libraries(DataSQLite PUBLIC SQLite::SQLite3) -+ target_link_libraries(DataSQLite PUBLIC unofficial::sqlite3::sqlite3) - target_compile_definitions(DataSQLite PUBLIC - POCO_UNBUNDLED - SQLITE_THREADSAFE=1 -diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt -index 6f5100f..c9fa2e5 100644 ---- a/Foundation/CMakeLists.txt -+++ b/Foundation/CMakeLists.txt -@@ -35,7 +35,7 @@ POCO_MESSAGES(SRCS Logging src/pocomsg.mc) - # If POCO_UNBUNDLED is enabled we try to find the required packages - # The configuration will fail if the packages are not found - if(POCO_UNBUNDLED) -- find_package(PCRE REQUIRED) -+ find_package(unofficial-pcre CONFIG REQUIRED) - find_package(ZLIB REQUIRED) - - #HACK: Unicode.cpp requires functions from these files. The can't be taken from the library -@@ -101,7 +101,7 @@ set_target_properties(Foundation - ) - - if(POCO_UNBUNDLED) -- target_link_libraries(Foundation PUBLIC Pcre::Pcre ZLIB::ZLIB) -+ target_link_libraries(Foundation PUBLIC unofficial::pcre::pcre ZLIB::ZLIB) - target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) - add_definitions( - -D_pcre_utf8_table1=_poco_pcre_utf8_table1 -diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt -index 4fbf06f..793285a 100644 ---- a/XML/CMakeLists.txt -+++ b/XML/CMakeLists.txt -@@ -20,7 +20,7 @@ endif() - # If POCO_UNBUNDLED is enabled we try to find the required packages - # The configuration will fail if the packages are not found - if(POCO_UNBUNDLED) -- find_package(EXPAT REQUIRED) -+ find_package(expat CONFIG REQUIRED) - else() - POCO_SOURCES(SRCS expat - src/xmlparse.cpp -@@ -50,7 +50,7 @@ target_include_directories(XML - ) - - if(POCO_UNBUNDLED) -- target_link_libraries(XML PUBLIC EXPAT::EXPAT) -+ target_link_libraries(XML PUBLIC expat::expat) - target_compile_definitions(XML PUBLIC POCO_UNBUNDLED) - else() - if(WIN32) -diff --git a/cmake/PocoConfig.cmake.in b/cmake/PocoConfig.cmake.in -index 173eacd..9a375cd 100644 ---- a/cmake/PocoConfig.cmake.in -+++ b/cmake/PocoConfig.cmake.in -@@ -8,6 +8,13 @@ if (NOT Poco_FIND_COMPONENTS) - return() - endif() - -+include(CMakeFindDependencyMacro) -+find_dependency(ZLIB REQUIRED) -+find_dependency(unofficial-pcre REQUIRED) -+if(Poco_FIND_REQUIRED_XML) -+ find_dependency(EXPAT REQUIRED) -+endif() -+ - set(_Poco_FIND_PARTS_REQUIRED) - if (Poco_FIND_REQUIRED) - set(_Poco_FIND_PARTS_REQUIRED REQUIRED) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b664afd..e08b6c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,8 +82,6 @@ option(FORCE_OPENSSL "Force usage of OpenSSL even under windows" OFF) + + if(ENABLE_CRYPTO OR ENABLE_NETSSL OR ENABLE_JWT) + find_package(OpenSSL REQUIRED) +-else() +- find_package(OpenSSL) + endif() + + if(OPENSSL_FOUND) +@@ -113,24 +111,18 @@ else() + option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" OFF) + endif() + +-if(ENABLE_DATA_MYSQL) +- find_package(MySQL REQUIRED) +-else() +- find_package(MySQL) +-endif() ++option(ENABLE_DATA "Enable Data" OFF) ++option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF) + +-if(MYSQL_FOUND) +- option(ENABLE_DATA "Enable Data" ON) +- option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" ON) +-else() +- option(ENABLE_DATA "Enable Data" OFF) +- option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF) ++if(ENABLE_DATA_MYSQL) ++ find_package(libmysql) ++ if (NOT libmysql_FOUND) ++ find_package(unofficial-libmariadb CONFIG REQUIRED) ++ endif() + endif() + + if(ENABLE_DATA_POSTGRESQL) + find_package(PostgreSQL REQUIRED) +-else() +- find_package(PostgreSQL) + endif() + + if(PostgreSQL_FOUND) +@@ -200,6 +192,9 @@ include(DefinePlatformSpecifc) + # Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file + set(Poco_COMPONENTS "") + ++# Do not declare the link library in the code! ++add_definitions(-DPOCO_NO_AUTOMATIC_LIBS) ++ + if(ENABLE_TESTS) + add_subdirectory(CppUnit) + set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) +@@ -327,8 +322,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS) + list(APPEND Poco_COMPONENTS "Redis") + endif() + +-if(EXISTS ${PROJECT_SOURCE_DIR}/PDF AND ENABLE_PDF) +- add_subdirectory(PDF) ++if(ENABLE_PDF) ++ include(SelectLibraryConfigurations) ++ find_library(PocoPDF_LIBRARY_RELEASE NAMES libhpdf) ++ find_library(PocoPDF_LIBRARY_DEBUG NAMES libhpdfd) ++ select_library_configurations(PocoPDF) + list(APPEND Poco_COMPONENTS "PDF") + endif() + +@@ -457,15 +455,6 @@ install( + Devel + ) + +-if(POCO_UNBUNDLED) +- install(FILES cmake/FindPCRE.cmake +- DESTINATION "${PocoConfigPackageLocation}") +- install(FILES cmake/V39/FindEXPAT.cmake +- DESTINATION "${PocoConfigPackageLocation}/V39") +- install(FILES cmake/V313/FindSQLite3.cmake +- DESTINATION "${PocoConfigPackageLocation}/V313") +-endif() +- + message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") + message(STATUS "${PROJECT_NAME} package version: ${PROJECT_VERSION}") + if(BUILD_SHARED_LIBS) +diff --git a/Data/MySQL/CMakeLists.txt b/Data/MySQL/CMakeLists.txt +index f71b145..7034974 100644 +--- a/Data/MySQL/CMakeLists.txt ++++ b/Data/MySQL/CMakeLists.txt +@@ -21,7 +21,7 @@ set_target_properties(DataMySQL + DEFINE_SYMBOL MySQL_EXPORTS + ) + +-target_link_libraries(DataMySQL PUBLIC Poco::Data MySQL::client) ++target_link_libraries(DataMySQL PUBLIC Poco::Data ${MYSQL_LIBRARIES}) + target_include_directories(DataMySQL + PUBLIC + $ +diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt +index b52e2c5..0dcfae2 100644 +--- a/Data/SQLite/CMakeLists.txt ++++ b/Data/SQLite/CMakeLists.txt +@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h") + POCO_HEADERS_AUTO(SQLITE_SRCS ${HDRS_G}) + + if(POCO_UNBUNDLED) +- find_package(SQLite3 REQUIRED) ++ find_package(unofficial-sqlite3 CONFIG REQUIRED) + else() + # sqlite3 + POCO_SOURCES(SQLITE_SRCS sqlite3 +@@ -43,7 +43,7 @@ target_include_directories(DataSQLite + ) + + if(POCO_UNBUNDLED) +- target_link_libraries(DataSQLite PUBLIC SQLite::SQLite3) ++ target_link_libraries(DataSQLite PUBLIC unofficial::sqlite3::sqlite3) + target_compile_definitions(DataSQLite PUBLIC + POCO_UNBUNDLED + SQLITE_THREADSAFE=1 +diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt +index 6f5100f..c9fa2e5 100644 +--- a/Foundation/CMakeLists.txt ++++ b/Foundation/CMakeLists.txt +@@ -35,7 +35,7 @@ POCO_MESSAGES(SRCS Logging src/pocomsg.mc) + # If POCO_UNBUNDLED is enabled we try to find the required packages + # The configuration will fail if the packages are not found + if(POCO_UNBUNDLED) +- find_package(PCRE REQUIRED) ++ find_package(unofficial-pcre CONFIG REQUIRED) + find_package(ZLIB REQUIRED) + + #HACK: Unicode.cpp requires functions from these files. The can't be taken from the library +@@ -101,7 +101,7 @@ set_target_properties(Foundation + ) + + if(POCO_UNBUNDLED) +- target_link_libraries(Foundation PUBLIC Pcre::Pcre ZLIB::ZLIB) ++ target_link_libraries(Foundation PUBLIC unofficial::pcre::pcre ZLIB::ZLIB) + target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) + add_definitions( + -D_pcre_utf8_table1=_poco_pcre_utf8_table1 +diff --git a/Foundation/cmake/PocoFoundationConfig.cmake b/Foundation/cmake/PocoFoundationConfig.cmake +index 46c2d3f..af2e78c 100644 +--- a/Foundation/cmake/PocoFoundationConfig.cmake ++++ b/Foundation/cmake/PocoFoundationConfig.cmake +@@ -2,7 +2,7 @@ if(@POCO_UNBUNDLED@) + include(CMakeFindDependencyMacro) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + find_dependency(ZLIB REQUIRED) +- find_dependency(PCRE REQUIRED) ++ find_dependency(unofficial-pcre REQUIRED) + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/PocoFoundationTargets.cmake") +diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt +index 4fbf06f..793285a 100644 +--- a/XML/CMakeLists.txt ++++ b/XML/CMakeLists.txt +@@ -20,7 +20,7 @@ endif() + # If POCO_UNBUNDLED is enabled we try to find the required packages + # The configuration will fail if the packages are not found + if(POCO_UNBUNDLED) +- find_package(EXPAT REQUIRED) ++ find_package(expat CONFIG REQUIRED) + else() + POCO_SOURCES(SRCS expat + src/xmlparse.cpp +@@ -50,7 +50,7 @@ target_include_directories(XML + ) + + if(POCO_UNBUNDLED) +- target_link_libraries(XML PUBLIC EXPAT::EXPAT) ++ target_link_libraries(XML PUBLIC expat::expat) + target_compile_definitions(XML PUBLIC POCO_UNBUNDLED) + else() + if(WIN32) +diff --git a/XML/cmake/PocoXMLConfig.cmake b/XML/cmake/PocoXMLConfig.cmake +index ef58207..4ed94ec 100644 +--- a/XML/cmake/PocoXMLConfig.cmake ++++ b/XML/cmake/PocoXMLConfig.cmake +@@ -4,7 +4,7 @@ if(@POCO_UNBUNDLED@) + if(CMAKE_VERSION VERSION_LESS "3.10") + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/V39") + endif() +- find_dependency(EXPAT REQUIRED) ++ find_dependency(expat CONFIG REQUIRED) + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/PocoXMLTargets.cmake") +diff --git a/cmake/PocoConfig.cmake.in b/cmake/PocoConfig.cmake.in +index 173eacd..936edf4 100644 +--- a/cmake/PocoConfig.cmake.in ++++ b/cmake/PocoConfig.cmake.in +@@ -8,6 +8,13 @@ if (NOT Poco_FIND_COMPONENTS) + return() + endif() + ++include(CMakeFindDependencyMacro) ++find_dependency(ZLIB REQUIRED) ++find_dependency(unofficial-pcre REQUIRED) ++if(Poco_FIND_REQUIRED_XML) ++ find_dependency(expat CONFIG REQUIRED) ++endif() ++ + set(_Poco_FIND_PARTS_REQUIRED) + if (Poco_FIND_REQUIRED) + set(_Poco_FIND_PARTS_REQUIRED REQUIRED) +@@ -23,7 +30,7 @@ set(_Poco_NOTFOUND_MESSAGE) + + # Let components find each other, but don't overwrite CMAKE_PREFIX_PATH + set(_Poco_CMAKE_PREFIX_PATH_old ${CMAKE_PREFIX_PATH}) +-set(CMAKE_PREFIX_PATH ${_Poco_install_prefix}) ++set(CMAKE_PREFIX_PATH ${_Poco_install_prefix} ${CMAKE_PREFIX_PATH}) + + foreach(module ${Poco_FIND_COMPONENTS}) + find_package(Poco${module} From 03e91004d8c7ab9cee80c8ea2cf2599becca7806 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 19 Nov 2020 05:08:22 +0800 Subject: [PATCH 0073/1694] [SUNDIALS] Update to 5.5.0 (#14618) * [lua] update to 5.4.1 * Handling lua file conflicts * [SUNDIALS] Update to 5.5.0 * Handling lua file conflicts * [SUNDIALS] Update to 5.5.0 --- ports/sundials/CONTROL | 2 +- ports/sundials/portfile.cmake | 15 ++++++++++----- ports/sundials/uwp-c4703-warning.patch | 12 ------------ 3 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 ports/sundials/uwp-c4703-warning.patch diff --git a/ports/sundials/CONTROL b/ports/sundials/CONTROL index ae45b9d88faa0c..fdd491a61b3585 100644 --- a/ports/sundials/CONTROL +++ b/ports/sundials/CONTROL @@ -1,4 +1,4 @@ Source: sundials -Version: 3.1.1-2 +Version: 5.5.0 Homepage: https://computation.llnl.gov/projects/sundials Description: SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers) diff --git a/ports/sundials/portfile.cmake b/ports/sundials/portfile.cmake index d5b52cac31b17f..9a5886f6549cca 100644 --- a/ports/sundials/portfile.cmake +++ b/ports/sundials/portfile.cmake @@ -1,22 +1,26 @@ -set(ARCHIVE_NAME "sundials-3.1.1") +set(ARCHIVE_NAME "sundials-5.5.0") vcpkg_download_distfile(ARCHIVE URLS "https://computation.llnl.gov/projects/sundials/download/${ARCHIVE_NAME}.tar.gz" FILENAME "${ARCHIVE_NAME}.tar.gz" - SHA512 3e8fc7183c5503943f1ba00c73b04c1614a48b6e6cb90559ec5481f9acffaa19acd97bd961611b251ebdc032f1a13f0919b0ab0cdfe9d9b4ddc99d40bef5719f + SHA512 e8cba7341f6b8d647151fe5543e62a13adda363d4c96bdaba7a70925b2c58ec4f4f089a0d6c9c5a57c50fb32fa1285bd09b450697056bc3da24cf882c6c7c427 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES - uwp-c4703-warning.patch ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SUN_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SUN_BUILD_SHARED) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DEXAMPLES_ENABLE=OFF + OPTIONS + -DEXAMPLES_ENABLE=OFF + -DBUILD_STATIC_LIBS=${SUN_BUILD_STATIC} + -DBUILD_SHARED_LIBS=${SUN_BUILD_SHARED} ) vcpkg_install_cmake(DISABLE_PARALLEL) @@ -53,3 +57,4 @@ if(REMOVE_DLLS) endif() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) diff --git a/ports/sundials/uwp-c4703-warning.patch b/ports/sundials/uwp-c4703-warning.patch deleted file mode 100644 index 3718753cfba5ae..00000000000000 --- a/ports/sundials/uwp-c4703-warning.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4030f4d..afef556 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -602,6 +602,7 @@ MARK_AS_ADVANCED(FORCE SUNDIALS_DEVTESTS) - - IF(WIN32) - ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) -+ ADD_COMPILE_OPTIONS(/wd4703) # Needed for uwp - ENDIF(WIN32) - - IF(APPLE) From 6ba5b7195de618a0da78364e8ddbcf82aa4fcc3f Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 19 Nov 2020 05:08:48 +0800 Subject: [PATCH 0074/1694] [cppzmq] Add draft feature (#14624) * [cppzmq] Add draft feature * Update ports/cppzmq/CONTROL --- ports/cppzmq/CONTROL | 4 ++++ ports/cppzmq/portfile.cmake | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ports/cppzmq/CONTROL b/ports/cppzmq/CONTROL index bec4b67c62cd76..f148c1a7736c5e 100644 --- a/ports/cppzmq/CONTROL +++ b/ports/cppzmq/CONTROL @@ -1,5 +1,9 @@ Source: cppzmq Version: 4.7.1 +Port-Version: 1 Build-Depends: zeromq Homepage: https://github.com/zeromq/cppzmq Description: lightweight messaging kernel, C++ bindings + +Feature: draft +Description: Build and install draft diff --git a/ports/cppzmq/portfile.cmake b/ports/cppzmq/portfile.cmake index f8c2ed28d004e1..2789190b73a3e7 100644 --- a/ports/cppzmq/portfile.cmake +++ b/ports/cppzmq/portfile.cmake @@ -6,10 +6,15 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + draft ENABLE_DRAFTS +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DCPPZMQ_BUILD_TESTS=OFF + OPTIONS ${FEATURE_OPTIONS} + -DCPPZMQ_BUILD_TESTS=OFF ) vcpkg_install_cmake() From 82df97dd525e4cbb9fd6e7ba3fe28495afa6ea1f Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 19 Nov 2020 05:09:26 +0800 Subject: [PATCH 0075/1694] [libde265] Updated to v1.0.8 (#14497) * [lua] update to 5.4.1 * [libde265] update to 1.0.8 * Handling lua file conflicts * Updated libde265 to v1.0.8 * Updated libde265 to v1.0.8 * Updated libde265 to v1.0.8 * Updated libde265 to v1.0.8 * [libde265] update to 1.0.8 --- ports/libde265/CONTROL | 2 +- ports/libde265/fix-libde265-headers.patch | 21 +++++++++++++++++++++ ports/libde265/portfile.cmake | 7 +++++-- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 ports/libde265/fix-libde265-headers.patch diff --git a/ports/libde265/CONTROL b/ports/libde265/CONTROL index 09ab2f2318147f..898e0fe128ffc7 100644 --- a/ports/libde265/CONTROL +++ b/ports/libde265/CONTROL @@ -1,5 +1,5 @@ Source: libde265 -Version: 1.0.5 +Version: 1.0.8 Homepage: https://www.libde265.org/ Description: Open h.265 video codec implementation. Supports: !(arm|uwp) diff --git a/ports/libde265/fix-libde265-headers.patch b/ports/libde265/fix-libde265-headers.patch new file mode 100644 index 00000000000000..fac2e35a862c2b --- /dev/null +++ b/ports/libde265/fix-libde265-headers.patch @@ -0,0 +1,21 @@ +diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt +index 749c7fb..45e7419 100644 +--- a/libde265/CMakeLists.txt ++++ b/libde265/CMakeLists.txt +@@ -43,7 +43,7 @@ set (libde265_headers + bitstream.h + cabac.h + configparam.h +- de265-version.h ++ ${CMAKE_CURRENT_BINARY_DIR}/de265-version.h + contextmodel.h + de265.h + deblock.h +@@ -119,7 +119,6 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config + ) + + install(FILES ${libde265_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/de265-version.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) + + install(EXPORT ${PROJECT_NAME}Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake index 70cfe2e3015b32..40ae383c571a07 100644 --- a/ports/libde265/portfile.cmake +++ b/ports/libde265/portfile.cmake @@ -3,9 +3,11 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libde265 - REF v1.0.5 - SHA512 3ff7310fc4621cac0ef1cb9bbc4df61724f8943d57f5263a3663a77f4d90d84716b2a708ee9fec306e909dc8b5e7fe645a641b6a6db795a89a01799be910831e + REF 8aed7472df0af25b811828fa14f2f169dc34d35a # v1.0.8 + SHA512 e2da1436e5b0d8a3841087e879fbbff5a92de4ebb69d097959972ec8c9407305bc2a17020cb46139fbacc84f91ff8cfb4d9547308074ba213e002ee36bb2e006 HEAD_REF master + PATCHES + fix-libde265-headers.patch ) vcpkg_configure_cmake( @@ -15,6 +17,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libde265/) +vcpkg_copy_tools(TOOL_NAMES dec265 enc265 AUTO_CLEAN) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") From 44e8e0b2596ea189a3024616a3197416cf4548c8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 18 Nov 2020 22:36:20 +0100 Subject: [PATCH 0076/1694] [meson|scripts] update scripts (#12945) * Update meson to a recent commit to fix a bug with 0.56 * rename static libraries built by meson by default on windows * apply cmake variables detection to meson. use native/cross files make arm builds work. * update munit * fix fribidi * fix _FLAGS variables * set env SDKROOT and MACOSX_DEPLOYMENT_TARGET in configure_meson * need osx env while building and configuring * - remove unused env backup functions - rename internal functions to be prefixed with _vcpkg_ - fix VCPKG_CHAINLOAD_TOOLCHAIN_FILE for ios/freebsd * replace _vcpkg with vcpkg since _ has special meaning in functions * rename functions to vcpkg_internal_meson_generate * update control tool-meson --- ports/fribidi/CONTROL | 1 + ports/fribidi/fix-win-static-suffix.patch | 25 - ports/fribidi/portfile.cmake | 3 +- ports/munit/CONTROL | 2 + ports/munit/portfile.cmake | 2 - ports/tool-meson/CONTROL | 2 +- scripts/cmake/vcpkg_configure_meson.cmake | 528 +++++++++++++----- .../cmake/vcpkg_find_acquire_program.cmake | 13 +- scripts/cmake/vcpkg_install_meson.cmake | 50 ++ scripts/get_cmake_vars/CMakeLists.txt | 4 + 10 files changed, 464 insertions(+), 166 deletions(-) delete mode 100644 ports/fribidi/fix-win-static-suffix.patch diff --git a/ports/fribidi/CONTROL b/ports/fribidi/CONTROL index 570fd13621e5b2..5ca0a10a44e59f 100644 --- a/ports/fribidi/CONTROL +++ b/ports/fribidi/CONTROL @@ -1,4 +1,5 @@ Source: fribidi Version: 1.0.10 +Port-Version: 1 Description: GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi) Build-Depends: tool-meson diff --git a/ports/fribidi/fix-win-static-suffix.patch b/ports/fribidi/fix-win-static-suffix.patch deleted file mode 100644 index 953b1b91be7d19..00000000000000 --- a/ports/fribidi/fix-win-static-suffix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/lib/meson.build b/lib/meson.build -index aaf2aed..3fe8937 100644 ---- a/lib/meson.build -+++ b/lib/meson.build -@@ -71,6 +71,10 @@ fribidi_sources = [ - 'fribidi-shape.c', - ] - -+libsuffix = [] -+if host_machine.system() == 'windows' and get_option('default_library') == 'static' -+ libsuffix = 'lib' -+endif - libfribidi = library('fribidi', - fribidi_sources, fribidi_unicode_version_h, fribidi_config_h, - generated_tab_include_files, config_h, -@@ -78,7 +82,8 @@ libfribidi = library('fribidi', - c_args: ['-DHAVE_CONFIG_H', '-DFRIBIDI_BUILD'] + fribidi_static_cargs + visibility_args, - version: libversion, - soversion: soversion, -- install: true) -+ install: true, -+ name_suffix: libsuffix) - - libfribidi_dep = declare_dependency(link_with: libfribidi, - include_directories: incs, diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake index 740502bdd8c88d..7e71fe68e2ba2c 100644 --- a/ports/fribidi/portfile.cmake +++ b/ports/fribidi/portfile.cmake @@ -4,7 +4,6 @@ vcpkg_from_github( REF 5464c284034da9c058269377b7f5013bb089f553 # v1.0.10 SHA512 82e42b022f23d6ecebac5071f997c9f46db6aa41c36f87a7f1a28a79b4ccaada10d68b233bbf687c552fc94d91f4b47161e0ef4909fd1de0b483089f1d1377f9 HEAD_REF master - PATCHES fix-win-static-suffix.patch ) vcpkg_configure_meson( @@ -13,10 +12,10 @@ vcpkg_configure_meson( -Ddocs=false -Dbin=false -Dtests=false - --backend=ninja ) vcpkg_install_meson() +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() # Define static macro diff --git a/ports/munit/CONTROL b/ports/munit/CONTROL index 8e1bb2e23cef14..cd1d6f303d6af3 100644 --- a/ports/munit/CONTROL +++ b/ports/munit/CONTROL @@ -1,5 +1,7 @@ Source: munit Version: 2019-04-06 +Port-Version: 1 Description: A small but full-featured unit testing framework for C +Build-Depends: tool-meson Supports: !(arm|arm64|uwp) Homepage: https://github.com/nemequ/munit diff --git a/ports/munit/portfile.cmake b/ports/munit/portfile.cmake index bd45959308e02f..cf6d0df3cb5fe7 100644 --- a/ports/munit/portfile.cmake +++ b/ports/munit/portfile.cmake @@ -14,8 +14,6 @@ vcpkg_from_github( vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - OPTIONS - --backend=ninja ) vcpkg_install_meson() diff --git a/ports/tool-meson/CONTROL b/ports/tool-meson/CONTROL index 9eb6d800b73818..f40ea553fb969b 100644 --- a/ports/tool-meson/CONTROL +++ b/ports/tool-meson/CONTROL @@ -1,4 +1,4 @@ Source: tool-meson -Version: 0.56.0 +Version: 0.56.01 Homepage: https://github.com/mesonbuild/meson Description: Meson build system diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 71d9267db44a1b..982e3a5e1f1b09 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -33,55 +33,347 @@ ## ## * [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) ## * [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) -function(vcpkg_configure_meson) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vcm "" "SOURCE_PATH" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE") +function(vcpkg_internal_meson_generate_native_file) #https://mesonbuild.com/Native-environments.html + set(NATIVE "[binaries]\n") + #set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT) + if(VCPKG_TARGET_IS_WINDOWS) + set(proglist MT) + else() + set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT) + endif() + foreach(prog IN LISTS proglist) + if(VCPKG_DETECTED_CMAKE_${prog}) + string(TOLOWER "${prog}" proglower) + string(APPEND NATIVE "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n") + endif() + endforeach() + set(compiler C CXX RC) + foreach(prog IN LISTS compiler) + if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER) + string(REPLACE "CXX" "CPP" mesonprog "${prog}") + string(TOLOWER "${mesonprog}" proglower) + string(APPEND NATIVE "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") + endif() + endforeach() + if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) + string(APPEND NATIVE "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + string(APPEND NATIVE "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + endif() + string(APPEND NATIVE "cmake = '${CMAKE_COMMAND}'\n") - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + string(APPEND NATIVE "[built-in options]\n") #https://mesonbuild.com/Builtin-options.html + if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") + string(APPEND NATIVE "cpp_eh='none'\n") # To make sure meson is not adding eh flags by itself using msvc + endif() + if(VCPKG_TARGET_IS_WINDOWS) + string(REGEX REPLACE "( |^)(-|/)" ";\\2" WIN_C_STANDARD_LIBRARIES "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}") + string(REGEX REPLACE "\\.lib " ".lib;" WIN_C_STANDARD_LIBRARIES "${WIN_C_STANDARD_LIBRARIES}") + list(TRANSFORM WIN_C_STANDARD_LIBRARIES APPEND "'") + list(TRANSFORM WIN_C_STANDARD_LIBRARIES PREPEND "'") + list(JOIN WIN_C_STANDARD_LIBRARIES ", " WIN_C_STANDARD_LIBRARIES) + string(APPEND NATIVE "c_winlibs = [${WIN_C_STANDARD_LIBRARIES}]\n") + string(REGEX REPLACE "( |^)(-|/)" ";\\2" WIN_CXX_STANDARD_LIBRARIES "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + string(REGEX REPLACE "\\.lib " ".lib;" WIN_CXX_STANDARD_LIBRARIES "${WIN_CXX_STANDARD_LIBRARIES}") + list(TRANSFORM WIN_CXX_STANDARD_LIBRARIES APPEND "'") + list(TRANSFORM WIN_CXX_STANDARD_LIBRARIES PREPEND "'") + list(JOIN WIN_CXX_STANDARD_LIBRARIES ", " WIN_CXX_STANDARD_LIBRARIES) + string(APPEND NATIVE "cpp_winlibs = [${WIN_CXX_STANDARD_LIBRARIES}]\n") + endif() + + set(_file "${CURRENT_BUILDTREES_DIR}/meson-nativ-${TARGET_TRIPLET}.log") + set(VCPKG_MESON_NATIVE_FILE "${_file}" PARENT_SCOPE) + file(WRITE "${_file}" "${NATIVE}") +endfunction() + +function(vcpkg_internal_meson_generate_native_file_config _config) #https://mesonbuild.com/Native-environments.html + if(VCPKG_TARGET_IS_WINDOWS) + set(L_FLAG /LIBPATH:) + else() + set(L_FLAG -L) + endif() + set(PATH_SUFFIX_DEBUG /debug) + set(LIBPATH_${_config} "'${L_FLAG}${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib'") + + set(NATIVE_${_config} "[properties]\n") #https://mesonbuild.com/Builtin-options.html + string(REGEX REPLACE "( |^)(-|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") + list(TRANSFORM MESON_CFLAGS_${_config} APPEND "'") + list(TRANSFORM MESON_CFLAGS_${_config} PREPEND "'") + #list(APPEND MESON_CFLAGS_${_config} "${LIBPATH_${_config}}") + list(APPEND MESON_CFLAGS_${_config} "'-I${CURRENT_INSTALLED_DIR}/include'") + list(JOIN MESON_CFLAGS_${_config} ", " MESON_CFLAGS_${_config}) + string(REPLACE "'', " "" MESON_CFLAGS_${_config} "${MESON_CFLAGS_${_config}}") + string(APPEND NATIVE_${_config} "c_args = [${MESON_CFLAGS_${_config}}]\n") + string(REGEX REPLACE "( |^)(-|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") + list(TRANSFORM MESON_CXXFLAGS_${_config} APPEND "'") + list(TRANSFORM MESON_CXXFLAGS_${_config} PREPEND "'") + #list(APPEND MESON_CXXFLAGS_${_config} "${LIBPATH_${_config}}") + list(APPEND MESON_CXXFLAGS_${_config} "'-I${CURRENT_INSTALLED_DIR}/include'") + list(JOIN MESON_CXXFLAGS_${_config} ", " MESON_CXXFLAGS_${_config}) + string(REPLACE "'', " "" MESON_CXXFLAGS_${_config} "${MESON_CXXFLAGS_${_config}}") + string(APPEND NATIVE_${_config} "cpp_args = [${MESON_CXXFLAGS_${_config}}]\n") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(LINKER_FLAGS_${_config} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${_config}}") + else() + set(LINKER_FLAGS_${_config} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${_config}}") + endif() + string(REGEX REPLACE "( |^)(-|/)" ";\\2" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") + list(TRANSFORM LINKER_FLAGS_${_config} APPEND "'") + list(TRANSFORM LINKER_FLAGS_${_config} PREPEND "'") + list(APPEND LINKER_FLAGS_${_config} "${LIBPATH_${_config}}") + list(JOIN LINKER_FLAGS_${_config} ", " LINKER_FLAGS_${_config}) + string(REPLACE "'', " "" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") + string(APPEND NATIVE_${_config} "c_link_args = [${LINKER_FLAGS_${_config}}]\n") + string(APPEND NATIVE_${_config} "cpp_link_args = [${LINKER_FLAGS_${_config}}]\n") + + #Setup CMake properties + string(APPEND NATIVE_${_config} "cmake_toolchain_file = '${SCRIPTS}/buildsystems/vcpkg.cmake'\n") + string(APPEND NATIVE_${_config} "[cmake]\n") - #Extract compiler flags if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - set(MESON_CMAKE_FLAG_SUFFIX "_INIT") if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - set(MESON_CMAKE_FLAG_SUFFIX "") elseif(VCPKG_TARGET_IS_LINUX) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") elseif(VCPKG_TARGET_IS_ANDROID) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") elseif(VCPKG_TARGET_IS_OSX) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") - elseif(VVCPKG_TARGET_IS_FREEBSD) + elseif(VCPKG_TARGET_IS_IOS) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") + elseif(VCPKG_TARGET_IS_FREEBSD) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") elseif(VCPKG_TARGET_IS_MINGW) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") endif() endif() - include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") - - string(APPEND MESON_COMMON_CFLAGS " ${CMAKE_C_FLAGS${MESON_CMAKE_FLAG_SUFFIX}}") - string(APPEND MESON_COMMON_CXXFLAGS " ${CMAKE_CXX_FLAGS${MESON_CMAKE_FLAG_SUFFIX}}") + string(APPEND NATIVE_${_config} "VCPKG_TARGET_TRIPLET = '${TARGET_TRIPLET}'\n") + string(APPEND NATIVE_${_config} "VCPKG_CHAINLOAD_TOOLCHAIN_FILE = '${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}'\n") - string(APPEND MESON_DEBUG_CFLAGS " ${CMAKE_C_FLAGS_DEBUG${MESON_CMAKE_FLAG_SUFFIX}}") - string(APPEND MESON_DEBUG_CXXFLAGS " ${CMAKE_CXX_FLAGS_DEBUG${MESON_CMAKE_FLAG_SUFFIX}}") + string(APPEND NATIVE_${_config} "[built-in options]\n") + if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(CRT mt) + else() + set(CRT md) + endif() + if(${_config} STREQUAL DEBUG) + set(CRT ${CRT}d) + endif() + string(APPEND NATIVE_${_config} "b_vscrt = '${CRT}'\n") + endif() + string(TOLOWER "${_config}" lowerconfig) + set(_file "${CURRENT_BUILDTREES_DIR}/meson-nativ-${TARGET_TRIPLET}-${lowerconfig}.log") + set(VCPKG_MESON_NATIVE_FILE_${_config} "${_file}" PARENT_SCOPE) + file(WRITE "${_file}" "${NATIVE_${_config}}") +endfunction() - string(APPEND MESON_RELEASE_CFLAGS " ${CMAKE_C_FLAGS_RELEASE${MESON_CMAKE_FLAG_SUFFIX}}") - string(APPEND MESON_RELEASE_CXXFLAGS " ${CMAKE_CXX_FLAGS_RELEASE${MESON_CMAKE_FLAG_SUFFIX}}") +function(vcpkg_internal_meson_generate_cross_file) #https://mesonbuild.com/Cross-compilation.html + if(CMAKE_HOST_WIN32) + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(BUILD_ARCH $ENV{PROCESSOR_ARCHITEW6432}) + else() + set(BUILD_ARCH $ENV{PROCESSOR_ARCHITECTURE}) + endif() + if(BUILD_ARCH MATCHES "(amd|AMD)64") + set(BUILD_CPU_FAM x86_x64) + set(BUILD_CPU x86_x64) + elseif(BUILD_ARCH MATCHES "(x|X)86") + set(BUILD_CPU_FAM x86) + set(BUILD_CPU i686) + elseif(BUILD_ARCH MATCHES "^(ARM|arm)64$") + set(BUILD_CPU_FAM aarch64) + set(BUILD_CPU armv8) + elseif(BUILD_ARCH MATCHES "^(ARM|arm)$") + set(BUILD_CPU_FAM arm) + set(BUILD_CPU armv7hl) + else() + message(FATAL_ERROR "Unsupported host architecture ${BUILD_ARCH}!" ) + endif() + else() # TODO: add correct detection for OSX and Linux. Currently only x64 triplets are available in official vcpkg. + set(BUILD_CPU_FAM x86_x64) + set(BUILD_CPU x86_x64) + endif() - string(APPEND MESON_COMMON_LDFLAGS " ${CMAKE_SHARED_LINKER_FLAGS${MESON_CMAKE_FLAG_SUFFIX}}") - string(APPEND MESON_DEBUG_LDFLAGS " ${CMAKE_SHARED_LINKER_FLAGS_DEBUG${MESON_CMAKE_FLAG_SUFFIX}}") - string(APPEND MESON_RELEASE_LDFLAGS " ${CMAKE_SHARED_LINKER_FLAGS_RELEASE${MESON_CMAKE_FLAG_SUFFIX}}") + if(VCPKG_TARGET_ARCHITECTURE MATCHES "(amd|AMD|x|X)64") + set(HOST_CPU_FAM x86_x64) + set(HOST_CPU x86_x64) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "(x|X)86") + set(HOST_CPU_FAM x86) + set(HOST_CPU i686) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)64$") + set(HOST_CPU_FAM aarch64) + set(HOST_CPU armv8) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)$") + set(HOST_CPU_FAM arm) + set(HOST_CPU armv7hl) + else() + message(FATAL_ERROR "Unsupported target architecture ${VCPKG_TARGET_ARCHITECTURE}!" ) + endif() + set(CROSS "[binaries]\n") + if(VCPKG_TARGET_IS_WINDOWS) + set(proglist MT) + else() + set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT) + endif() + foreach(prog IN LISTS proglist) + if(VCPKG_DETECTED_CMAKE_${prog}) + string(TOLOWER "${prog}" proglower) + string(APPEND CROSS "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n") + endif() + endforeach() + set(compiler C CXX RC) + foreach(prog IN LISTS compiler) + if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER) + string(REPLACE "CXX" "CPP" mesonprog "${prog}") + string(TOLOWER "${mesonprog}" proglower) + string(APPEND CROSS "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") + endif() + endforeach() + if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) + string(APPEND CROSS "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + string(APPEND CROSS "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + endif() + string(APPEND CROSS "[properties]\n") + string(APPEND CROSS "skip_sanity_check = true\n") + string(APPEND CROSS "[host_machine]\n") + string(APPEND CROSS "endian = 'little'\n") + if(NOT VCPKG_CMAKE_SYSTEM_NAME) + set(MESON_SYSTEM_NAME "windows") + else() + string(TOLOWER "${VCPKG_CMAKE_SYSTEM_NAME}" MESON_SYSTEM_NAME) + endif() + string(APPEND CROSS "system = '${MESON_SYSTEM_NAME}'\n") + string(APPEND CROSS "cpu_family = '${HOST_CPU_FAM}'\n") + string(APPEND CROSS "cpu = '${HOST_CPU}'\n") - # select meson cmd-line options + string(APPEND CROSS "[build_machine]\n") + string(APPEND CROSS "endian = 'little'\n") + if(WIN32) + string(APPEND CROSS "system = 'windows'\n") + elseif(DARWIN) + string(APPEND CROSS "system = 'darwin'\n") + else() + string(APPEND CROSS "system = 'linux'\n") + endif() + string(APPEND CROSS "cpu_family = '${BUILD_CPU_FAM}'\n") + string(APPEND CROSS "cpu = '${BUILD_CPU}'\n") + + if(NOT BUILD_CPU_FAM STREQUAL HOST_CPU_FAM) + set(_file "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}.log") + set(VCPKG_MESON_CROSS_FILE "${_file}" PARENT_SCOPE) + file(WRITE "${_file}" "${CROSS}") + endif() +endfunction() + +function(vcpkg_internal_meson_generate_cross_file_config _config) #https://mesonbuild.com/Native-environments.html if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND _vcm_OPTIONS "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/share']") + set(L_FLAG /LIBPATH:) + else() + set(L_FLAG -L) + endif() + set(PATH_SUFFIX_DEBUG /debug) + set(LIBPATH_${_config} "'${L_FLAG}${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib'") + + + set(NATIVE_${_config} "[properties]\n") #https://mesonbuild.com/Builtin-options.html + string(REGEX REPLACE "( |^)(-|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") + list(TRANSFORM MESON_CFLAGS_${_config} APPEND "'") + list(TRANSFORM MESON_CFLAGS_${_config} PREPEND "'") + list(APPEND MESON_CFLAGS_${_config} "'-I\"${CURRENT_INSTALLED_DIR}/include\"'") + list(JOIN MESON_CFLAGS_${_config} ", " MESON_CFLAGS_${_config}) + string(REPLACE "'', " "" MESON_CFLAGS_${_config} "${MESON_CFLAGS_${_config}}") + string(APPEND NATIVE_${_config} "c_args = [${MESON_CFLAGS_${_config}}]\n") + string(REGEX REPLACE "( |^)(-|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") + list(TRANSFORM MESON_CXXFLAGS_${_config} APPEND "'") + list(TRANSFORM MESON_CXXFLAGS_${_config} PREPEND "'") + list(APPEND MESON_CXXFLAGS_${_config} "'-I\"${CURRENT_INSTALLED_DIR}/include\"'") + list(JOIN MESON_CXXFLAGS_${_config} ", " MESON_CXXFLAGS_${_config}) + string(REPLACE "'', " "" MESON_CXXFLAGS_${_config} "${MESON_CXXFLAGS_${_config}}") + string(APPEND NATIVE_${_config} "cpp_args = [${MESON_CXXFLAGS_${_config}}]\n") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(LINKER_FLAGS_${_config} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${_config}}") else() - list(APPEND _vcm_OPTIONS "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}']") + set(LINKER_FLAGS_${_config} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${_config}}") + endif() + string(REGEX REPLACE "( |^)(-|/)" ";\\2" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") + list(TRANSFORM LINKER_FLAGS_${_config} APPEND "'") + list(TRANSFORM LINKER_FLAGS_${_config} PREPEND "'") + list(APPEND LINKER_FLAGS_${_config} "${LIBPATH_${_config}}") + list(JOIN LINKER_FLAGS_${_config} ", " LINKER_FLAGS_${_config}) + string(REPLACE "'', " "" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") + string(APPEND NATIVE_${_config} "c_link_args = [${LINKER_FLAGS_${_config}}]\n") + string(APPEND NATIVE_${_config} "cpp_link_args = [${LINKER_FLAGS_${_config}}]\n") + + string(APPEND NATIVE_${_config} "[built-in options]\n") + if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(CRT mt) + else() + set(CRT md) + endif() + if(${_config} STREQUAL DEBUG) + set(CRT ${CRT}d) + endif() + string(APPEND NATIVE_${_config} "b_vscrt = '${CRT}'\n") endif() + + string(TOLOWER "${_config}" lowerconfig) + set(_file "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}-${lowerconfig}.log") + set(VCPKG_MESON_CROSS_FILE_${_config} "${_file}" PARENT_SCOPE) + file(WRITE "${_file}" "${NATIVE_${_config}}") +endfunction() + + +function(vcpkg_configure_meson) + # parse parameters such that semicolons in options arguments to COMMAND don't get erased + cmake_parse_arguments(PARSE_ARGV 0 _vcm "" "SOURCE_PATH" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE") + + file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) + file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + + vcpkg_internal_get_cmake_vars(OUTPUT_FILE _VCPKG_CMAKE_VARS_FILE) + set(_VCPKG_CMAKE_VARS_FILE "${_VCPKG_CMAKE_VARS_FILE}" PARENT_SCOPE) + debug_message("Including cmake vars from: ${_VCPKG_CMAKE_VARS_FILE}") + include("${_VCPKG_CMAKE_VARS_FILE}") + list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) + + if(NOT VCPKG_MESON_NATIVE_FILE) + vcpkg_internal_meson_generate_native_file() + endif() + if(NOT VCPKG_MESON_NATIVE_FILE_DEBUG) + vcpkg_internal_meson_generate_native_file_config(DEBUG) + endif() + if(NOT VCPKG_MESON_NATIVE_FILE_RELEASE) + vcpkg_internal_meson_generate_native_file_config(RELEASE) + endif() + list(APPEND _vcm_OPTIONS --native "${VCPKG_MESON_NATIVE_FILE}") + list(APPEND _vcm_OPTIONS_DEBUG --native "${VCPKG_MESON_NATIVE_FILE_DEBUG}") + list(APPEND _vcm_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE_RELEASE}") + + if(NOT VCPKG_MESON_CROSS_FILE) + vcpkg_internal_meson_generate_cross_file() + endif() + if(NOT VCPKG_MESON_CROSS_FILE_DEBUG AND VCPKG_MESON_CROSS_FILE) + vcpkg_internal_meson_generate_cross_file_config(DEBUG) + endif() + if(NOT VCPKG_MESON_CROSS_FILE_RELEASE AND VCPKG_MESON_CROSS_FILE) + vcpkg_internal_meson_generate_cross_file_config(RELEASE) + endif() + if(VCPKG_MESON_CROSS_FILE) + list(APPEND _vcm_OPTIONS --cross "${VCPKG_MESON_CROSS_FILE}") + endif() + if(VCPKG_MESON_CROSS_FILE_DEBUG) + list(APPEND _vcm_OPTIONS_DEBUG --cross "${VCPKG_MESON_CROSS_FILE_DEBUG}") + endif() + if(VCPKG_MESON_CROSS_FILE_RELEASE) + list(APPEND _vcm_OPTIONS_RELEASE --cross "${VCPKG_MESON_CROSS_FILE_RELEASE}") + endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND _vcm_OPTIONS --default-library shared) else() @@ -89,11 +381,24 @@ function(vcpkg_configure_meson) endif() list(APPEND _vcm_OPTIONS --libdir lib) # else meson install into an architecture describing folder - list(APPEND _vcm_OPTIONS_DEBUG --prefix ${CURRENT_PACKAGES_DIR}/debug --includedir ../include) - list(APPEND _vcm_OPTIONS_RELEASE --prefix ${CURRENT_PACKAGES_DIR}) - + list(APPEND _vcm_OPTIONS_DEBUG -Ddebug=true --prefix ${CURRENT_PACKAGES_DIR}/debug --includedir ../include) + list(APPEND _vcm_OPTIONS_RELEASE -Ddebug=false --prefix ${CURRENT_PACKAGES_DIR}) + + # select meson cmd-line options + if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND _vcm_OPTIONS_DEBUG "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/share']") + list(APPEND _vcm_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}/share']") + else() + list(APPEND _vcm_OPTIONS_DEBUG "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}']") + list(APPEND _vcm_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug']") + endif() + + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path("${PYTHON3_DIR}") + vcpkg_find_acquire_program(MESON) - + get_filename_component(CMAKE_PATH ${CMAKE_COMMAND} DIRECTORY) vcpkg_add_to_path("${CMAKE_PATH}") # Make CMake invokeable for Meson @@ -105,129 +410,90 @@ function(vcpkg_configure_meson) get_filename_component(PKGCONFIG_PATH ${PKGCONFIG} DIRECTORY) vcpkg_add_to_path("${PKGCONFIG_PATH}") set(PKGCONFIG_SHARE_DIR "${CURRENT_INSTALLED_DIR}/share/pkgconfig/") - # configure debug - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - - #setting up PKGCONFIG - if(NOT PKGCONFIG MATCHES "--define-variable=prefix") - set(PKGCONFIG_PREFIX "${CURRENT_INSTALLED_DIR}/debug") - set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=${PKGCONFIG_PREFIX}") - endif() - set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/") - if(ENV{PKG_CONFIG_PATH}) - set(BACKUP_ENV_PKG_CONFIG_PATH_DEBUG $ENV{PKG_CONFIG_PATH}) - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") - else() - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_SHARE_DIR}") - endif() - set(CFLAGS "-Dc_args=[${MESON_COMMON_CFLAGS} ${MESON_DEBUG_CFLAGS}]") - string(REGEX REPLACE " +(/|-)" "','\\1" CFLAGS ${CFLAGS}) # Seperate compiler arguments with comma and enclose in ' - string(REGEX REPLACE " *\\\]" "']" CFLAGS ${CFLAGS}) # Add trailing ' at end - string(REGEX REPLACE "\\\['," "[" CFLAGS ${CFLAGS}) # Remove prepended ', introduced in #1 - string(REGEX REPLACE "\\\['\\\]" "[]" CFLAGS ${CFLAGS}) # Remove trailing ' introduced in #2 if no elements - - set(CXXFLAGS "-Dcpp_args=[${MESON_COMMON_CXXFLAGS} ${MESON_DEBUG_CXXFLAGS}]") - string(REGEX REPLACE " +(/|-)" "','\\1" CXXFLAGS ${CXXFLAGS}) - string(REGEX REPLACE " *\\\]" "']" CXXFLAGS ${CXXFLAGS}) - string(REGEX REPLACE "\\\['," "[" CXXFLAGS ${CXXFLAGS}) - string(REGEX REPLACE "\\\['\\\]" "[]" CXXFLAGS ${CXXFLAGS}) - - set(LDFLAGS "[${MESON_COMMON_LDFLAGS} ${MESON_DEBUG_LDFLAGS}]") - string(REGEX REPLACE " +(/|-)" "','\\1" LDFLAGS ${LDFLAGS}) - string(REGEX REPLACE " *\\\]" "']" LDFLAGS ${LDFLAGS}) - string(REGEX REPLACE "\\\['," "[" LDFLAGS ${LDFLAGS}) - string(REGEX REPLACE "\\\['\\\]" "[]" LDFLAGS ${LDFLAGS}) - set(CLDFLAGS "-Dc_link_args=${LDFLAGS}") - set(CXXLDFLAGS "-Dcpp_link_args=${LDFLAGS}") - vcpkg_execute_required_process( - COMMAND ${MESON} ${_vcm_OPTIONS} ${_vcm_OPTIONS_DEBUG} ${_vcm_SOURCE_PATH} ${CFLAGS} ${CXXFLAGS} ${CLDFLAGS} ${CXXLDFLAGS} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - LOGNAME config-${TARGET_TRIPLET}-dbg - ) - - #Copy meson log files into buildtree for CI - if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/meson-logs/meson-log.txt") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/meson-logs/meson-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/meson-log.txt" "${CURRENT_BUILDTREES_DIR}/meson-log-dbg.txt") - endif() - if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/meson-logs/install-log.txt") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/meson-logs/install-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/install-log.txt" "${CURRENT_BUILDTREES_DIR}/install-log-dbg.txt") + set(buildtypes) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(BUILDNAME DEBUG) + list(APPEND buildtypes ${BUILDNAME}) + set(PATH_SUFFIX_${BUILDNAME} "debug/") + set(SUFFIX_${BUILDNAME} "dbg") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(BUILDNAME RELEASE) + list(APPEND buildtypes ${BUILDNAME}) + set(PATH_SUFFIX_${BUILDNAME} "") + set(SUFFIX_${BUILDNAME} "rel") + endif() + + if(VCPKG_TARGET_IS_OSX) + if(DEFINED ENV{SDKROOT}) + set(_VCPKG_ENV_SDKROOT_BACKUP $ENV{SDKROOT}) endif() - message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done") - - #Restore PKG_CONFIG_PATH - if(BACKUP_ENV_PKG_CONFIG_PATH_DEBUG) - set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_DEBUG}") - unset(BACKUP_ENV_PKG_CONFIG_PATH_DEBUG) - else() - unset(ENV{PKG_CONFIG_PATH}) + set(ENV{SDKROOT} "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}") + set(VCPKG_DETECTED_CMAKE_OSX_SYSROOT "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}" PARENT_SCOPE) + + if(DEFINED ENV{MACOSX_DEPLOYMENT_TARGET}) + set(_VCPKG_ENV_MACOSX_DEPLOYMENT_TARGET_BACKUP $ENV{MACOSX_DEPLOYMENT_TARGET}) endif() + set(ENV{MACOSX_DEPLOYMENT_TARGET} "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}") + set(VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}" PARENT_SCOPE) endif() - - # configure release - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - message(STATUS "Configuring ${TARGET_TRIPLET}-rel") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) + + if(DEFINED ENV{INCLUDE}) + set(ENV{INCLUDE} "$ENV{INCLUDE}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/include") + else() + set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include") + endif() + # configure build + foreach(buildtype IN LISTS buildtypes) + message(STATUS "Configuring ${TARGET_TRIPLET}-${SUFFIX_${buildtype}}") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SUFFIX_${buildtype}}") #setting up PKGCONFIG - if(NOT PKGCONFIG MATCHES "--define-variable=prefix") - set(PKGCONFIG_PREFIX "${CURRENT_INSTALLED_DIR}") - set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=${PKGCONFIG_PREFIX}") - endif() - set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/") - if(ENV{PKG_CONFIG_PATH}) + set(ENV{PKG_CONFIG} "${PKGCONFIG}") # Set via native file? + set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}/${PATH_SUFFIX_${buildtype}}lib/pkgconfig/") + if(DEFINED ENV{PKG_CONFIG_PATH}) set(BACKUP_ENV_PKG_CONFIG_PATH_RELEASE $ENV{PKG_CONFIG_PATH}) set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") else() set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_SHARE_DIR}") endif() - # Normalize flags for meson (i.e. " /string /with /flags " -> ['/string', '/with', '/flags']) - set(CFLAGS "-Dc_args=[${MESON_COMMON_CFLAGS} ${MESON_RELEASE_CFLAGS}]") - string(REGEX REPLACE " +(/|-)" "','\\1" CFLAGS ${CFLAGS}) # Seperate compiler arguments with comma and enclose in ' - string(REGEX REPLACE " *\\\]" "']" CFLAGS ${CFLAGS}) # Add trailing ' at end - string(REGEX REPLACE "\\\['," "[" CFLAGS ${CFLAGS}) # Remove prepended ', introduced in #1 - string(REGEX REPLACE "\\\['\\\]" "[]" CFLAGS ${CFLAGS}) # Remove trailing ' introduced in #2 if no elements - set(CXXFLAGS "-Dcpp_args=[${MESON_COMMON_CXXFLAGS} ${MESON_RELEASE_CXXFLAGS}]") - string(REGEX REPLACE " +(/|-)" "','\\1" CXXFLAGS ${CXXFLAGS}) - string(REGEX REPLACE " *\\\]" "']" CXXFLAGS ${CXXFLAGS}) - string(REGEX REPLACE "\\\['," "[" CXXFLAGS ${CXXFLAGS}) - string(REGEX REPLACE "\\\['\\\]" "[]" CXXFLAGS ${CXXFLAGS}) - set(LDFLAGS "[${MESON_COMMON_LDFLAGS} ${MESON_RELEASE_LDFLAGS}]") - string(REGEX REPLACE " +(/|-)" "','\\1" LDFLAGS ${LDFLAGS}) - string(REGEX REPLACE " *\\\]" "']" LDFLAGS ${LDFLAGS}) - string(REGEX REPLACE "\\\['," "[" LDFLAGS ${LDFLAGS}) - string(REGEX REPLACE "\\\['\\\]" "[]" LDFLAGS ${LDFLAGS}) - set(CLDFLAGS "-Dc_link_args=${LDFLAGS}") - set(CXXLDFLAGS "-Dcpp_link_args=${LDFLAGS}") - vcpkg_execute_required_process( - COMMAND ${MESON} ${_vcm_OPTIONS} ${_vcm_OPTIONS_RELEASE} ${_vcm_SOURCE_PATH} ${CFLAGS} ${CXXFLAGS} ${CLDFLAGS} ${CXXLDFLAGS} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - LOGNAME config-${TARGET_TRIPLET}-rel + COMMAND ${MESON} ${_vcm_OPTIONS} ${_vcm_OPTIONS_${buildtype}} ${_vcm_SOURCE_PATH} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SUFFIX_${buildtype}} + LOGNAME config-${TARGET_TRIPLET}-${SUFFIX_${buildtype}} ) + #Copy meson log files into buildtree for CI - if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/meson-logs/meson-log.txt") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/meson-logs/meson-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/meson-log.txt" "${CURRENT_BUILDTREES_DIR}/meson-log-rel.txt") + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SUFFIX_${buildtype}}/meson-logs/meson-log.txt") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SUFFIX_${buildtype}}/meson-logs/meson-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") + file(RENAME "${CURRENT_BUILDTREES_DIR}/meson-log.txt" "${CURRENT_BUILDTREES_DIR}/meson-log-${SUFFIX_${buildtype}}.txt") endif() - if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/meson-logs/install-log.txt") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/meson-logs/install-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/install-log.txt" "${CURRENT_BUILDTREES_DIR}/install-log-rel.txt") + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SUFFIX_${buildtype}}/meson-logs/install-log.txt") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SUFFIX_${buildtype}}/meson-logs/install-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") + file(RENAME "${CURRENT_BUILDTREES_DIR}/install-log.txt" "${CURRENT_BUILDTREES_DIR}/install-log-${SUFFIX_${buildtype}}.txt") endif() - message(STATUS "Configuring ${TARGET_TRIPLET}-rel done") - + message(STATUS "Configuring ${TARGET_TRIPLET}-${SUFFIX_${buildtype}} done") + #Restore PKG_CONFIG_PATH - if(BACKUP_ENV_PKG_CONFIG_PATH_RELEASE) - set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_RELEASE}") - unset(BACKUP_ENV_PKG_CONFIG_PATH_RELEASE) + if(BACKUP_ENV_PKG_CONFIG_PATH_${buildtype}) + set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_${buildtype}}") + unset(BACKUP_ENV_PKG_CONFIG_PATH_${buildtype}) else() unset(ENV{PKG_CONFIG_PATH}) endif() - - endif() + endforeach() + if(VCPKG_TARGET_IS_OSX) + if(DEFINED _VCPKG_ENV_SDKROOT_BACKUP) + set(ENV{SDKROOT} "${_VCPKG_ENV_SDKROOT_BACKUP}") + else() + unset(ENV{SDKROOT}) + endif() + if(DEFINED _VCPKG_ENV_MACOSX_DEPLOYMENT_TARGET_BACKUP) + set(ENV{MACOSX_DEPLOYMENT_TARGET} "${_VCPKG_ENV_MACOSX_DEPLOYMENT_TARGET_BACKUP}") + else() + unset(ENV{MACOSX_DEPLOYMENT_TARGET}) + endif() + endif() endfunction() diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 7d12e808401c37..1f914c86859ccb 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -246,16 +246,19 @@ function(vcpkg_find_acquire_program VAR) set(NOEXTRACT ON) set(HASH 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619) elseif(VAR MATCHES "MESON") - set(MESON_VERSION 0.56.0) + set(MESON_VERSION 0.56.01) set(PROGNAME meson) set(REQUIRED_INTERPRETER PYTHON3) set(APT_PACKAGE_NAME "meson") set(BREW_PACKAGE_NAME "meson") set(SCRIPTNAME meson meson.py) - set(PATHS ${DOWNLOADS}/tools/meson/meson-${MESON_VERSION}) - set(URL "https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz") - set(ARCHIVE "meson-${MESON_VERSION}.tar.gz") - set(HASH da426e2ac0f657da5672d66143b8f4f45513c269a9a544e8b4c48b4a702743a50d35cbaa37ef4c4fbd7e18b8784c788314927a54faba6a14bb2d468eeaa87607) + set(PATHS ${DOWNLOADS}/tools/meson/meson-91876b40316962620c1705ae14075ab46f8dd644) + set(URL "https://github.com/mesonbuild/meson/archive/91876b40316962620c1705ae14075ab46f8dd644.tar.gz") + set(ARCHIVE "meson-91876b40316962620c1705ae14075ab46f8dd644.tar.gz") + #set(PATHS ${DOWNLOADS}/tools/meson/meson-${MESON_VERSION}) + #set(URL "https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz") + #set(ARCHIVE "meson-${MESON_VERSION}.tar.gz") + set(HASH 784b740a01de70312f9240d38b683b2065f40572c87d30929386fe417b2cc70bcc86213c86e143f349c78121c9cc6d7392526d6e53512ae22a6ec0db57f26e3e) set(_vfa_SUPPORTED ON) set(VERSION_CMD --version) elseif(VAR MATCHES "FLEX" OR VAR MATCHES "BISON") diff --git a/scripts/cmake/vcpkg_install_meson.cmake b/scripts/cmake/vcpkg_install_meson.cmake index edc6c7302e02f9..9d9972a0b91bc3 100644 --- a/scripts/cmake/vcpkg_install_meson.cmake +++ b/scripts/cmake/vcpkg_install_meson.cmake @@ -15,6 +15,18 @@ function(vcpkg_install_meson) vcpkg_find_acquire_program(NINJA) unset(ENV{DESTDIR}) # installation directory was already specified with '--prefix' option + if(VCPKG_TARGET_IS_OSX) + if(DEFINED ENV{SDKROOT}) + set(_VCPKG_ENV_SDKROOT_BACKUP $ENV{SDKROOT}) + endif() + set(ENV{SDKROOT} "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}") + + if(DEFINED ENV{MACOSX_DEPLOYMENT_TARGET}) + set(_VCPKG_ENV_MACOSX_DEPLOYMENT_TARGET_BACKUP $ENV{MACOSX_DEPLOYMENT_TARGET}) + endif() + set(ENV{MACOSX_DEPLOYMENT_TARGET} "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}") + endif() + message(STATUS "Package ${TARGET_TRIPLET}-rel") vcpkg_execute_required_process( COMMAND ${NINJA} install -v @@ -28,4 +40,42 @@ function(vcpkg_install_meson) WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg LOGNAME package-${TARGET_TRIPLET}-dbg ) + + set(RENAMED_LIBS) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) + # Meson names all static libraries lib.a which basically breaks the world + file(GLOB_RECURSE LIBRARIES "${CURRENT_PACKAGES_DIR}*/**/lib*.a") + foreach(_library IN LISTS LIBRARIES) + get_filename_component(LIBDIR "${_library}" DIRECTORY ) + get_filename_component(LIBNAME "${_library}" NAME) + string(REGEX REPLACE ".a$" ".lib" LIBNAMENEW "${LIBNAME}") + string(REGEX REPLACE "^lib" "" LIBNAMENEW "${LIBNAMENEW}") + file(RENAME "${_library}" "${LIBDIR}/${LIBNAMENEW}") + # For cmake fixes. + string(REGEX REPLACE ".a$" "" LIBRAWNAMEOLD "${LIBNAME}") + string(REGEX REPLACE ".lib$" "" LIBRAWNAMENEW "${LIBNAMENEW}") + list(APPEND RENAMED_LIBS ${LIBRAWNAMENEW}) + set(${LIBRAWNAME}_OLD ${LIBRAWNAMEOLD}) + set(${LIBRAWNAME}_NEW ${LIBRAWNAMENEW}) + endforeach() + file(GLOB_RECURSE CMAKE_FILES "${CURRENT_PACKAGES_DIR}*/*.cmake") + foreach(_cmake IN LISTS CMAKE_FILES) + foreach(_lib IN LISTS RENAMED_LIBS) + vcpkg_replace_string("${_cmake}" "${${_lib}_OLD}" "${${_lib}_NEW}") + endforeach() + endforeach() + endif() + + if(VCPKG_TARGET_IS_OSX) + if(DEFINED _VCPKG_ENV_SDKROOT_BACKUP) + set(ENV{SDKROOT} "${_VCPKG_ENV_SDKROOT_BACKUP}") + else() + unset(ENV{SDKROOT}) + endif() + if(DEFINED _VCPKG_ENV_MACOSX_DEPLOYMENT_TARGET_BACKUP) + set(ENV{MACOSX_DEPLOYMENT_TARGET} "${_VCPKG_ENV_MACOSX_DEPLOYMENT_TARGET_BACKUP}") + else() + unset(ENV{MACOSX_DEPLOYMENT_TARGET}) + endif() + endif() endfunction() diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt index 283f4ef87d6ec6..45a53989b56a6b 100644 --- a/scripts/get_cmake_vars/CMakeLists.txt +++ b/scripts/get_cmake_vars/CMakeLists.txt @@ -9,6 +9,10 @@ list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_CROSSCOMPILING CMAKE_HOST_SYSTEM_NAME CMAKE_SYSTEM_PROCESSOR CMAKE_HOST_SYSTEM_PROCESSOR) +if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_OSX_DEPLOYMENT_TARGET + CMAKE_OSX_SYSROOT) +endif() # Programs to check set(PROGLIST AR RANLIB STRIP NM OBJDUMP DLLTOOL MT LINKER) foreach(prog IN LISTS PROGLIST) From a699b2942dfafa52e02e69742ad66f71579a8a6e Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 18 Nov 2020 22:55:25 +0100 Subject: [PATCH 0077/1694] [BLAS] add metaport (#13448) * [BLAS] add metaport * [openblas] enable also on macOS to allow lapack-reference previous setup * [clapack] bump port version * [blas, lapack] Remove incorrect comments about "outside vcpkg" Co-authored-by: Billy Robert O'Neal III --- ports/armadillo/CONTROL | 2 +- ports/blas/CMakeLists.txt | 4 ++++ ports/blas/CONTROL | 4 ++++ ports/blas/portfile.cmake | 5 +++++ ports/clapack/CONTROL | 4 ++-- ports/dlib/CONTROL | 2 +- ports/ensmallen/CONTROL | 2 +- ports/geogram/CONTROL | 2 +- ports/halide/CONTROL | 1 + ports/hypre/CONTROL | 2 +- ports/lapack-reference/CONTROL | 2 +- ports/lapack/CMakeLists.txt | 1 - ports/lapack/CONTROL | 1 + ports/shogun/CONTROL | 6 +++--- ports/superlu/CONTROL | 4 ++-- 15 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 ports/blas/CMakeLists.txt create mode 100644 ports/blas/CONTROL create mode 100644 ports/blas/portfile.cmake diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL index 16fad7f7088d9d..0939fe8f269fe8 100644 --- a/ports/armadillo/CONTROL +++ b/ports/armadillo/CONTROL @@ -2,4 +2,4 @@ Source: armadillo Version: 10.1.0 Homepage: https://gitlab.com/conradsnicta/armadillo-code Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use -Build-Depends: openblas, lapack +Build-Depends: blas, lapack diff --git a/ports/blas/CMakeLists.txt b/ports/blas/CMakeLists.txt new file mode 100644 index 00000000000000..790f79e8baa70e --- /dev/null +++ b/ports/blas/CMakeLists.txt @@ -0,0 +1,4 @@ +cmake_minimum_required(VERSION 3.17) + +project(Find_BLAS_external) +find_package(BLAS REQUIRED) diff --git a/ports/blas/CONTROL b/ports/blas/CONTROL new file mode 100644 index 00000000000000..6f660d228e5580 --- /dev/null +++ b/ports/blas/CONTROL @@ -0,0 +1,4 @@ +Source: blas +Version: 1 +Description: Metapackage for packages which provide BLAS +Build-Depends: openblas diff --git a/ports/blas/portfile.cmake b/ports/blas/portfile.cmake new file mode 100644 index 00000000000000..f70aa46eabd3fb --- /dev/null +++ b/ports/blas/portfile.cmake @@ -0,0 +1,5 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +# Make sure BLAS can be found +vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR} + OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}") diff --git a/ports/clapack/CONTROL b/ports/clapack/CONTROL index 0dac115073e94a..f24dee073da3b7 100644 --- a/ports/clapack/CONTROL +++ b/ports/clapack/CONTROL @@ -1,6 +1,6 @@ Source: clapack Version: 3.2.1 -Port-Version: 15 +Port-Version: 16 Homepage: https://www.netlib.org/clapack Description: CLAPACK (f2c'ed version of LAPACK) -Build-Depends: openblas (!osx) +Build-Depends: blas diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL index f651f9d62fcc1d..a01d89ec5cfe4a 100644 --- a/ports/dlib/CONTROL +++ b/ports/dlib/CONTROL @@ -1,7 +1,7 @@ Source: dlib Version: 19.21 Port-Version: 4 -Build-Depends: libjpeg-turbo, libpng, openblas, lapack +Build-Depends: libjpeg-turbo, libpng, blas, lapack Homepage: https://github.com/davisking/dlib Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ Default-Features: fftw3, sqlite3 diff --git a/ports/ensmallen/CONTROL b/ports/ensmallen/CONTROL index 9c904f326fcb7d..10d51ce79f0a94 100644 --- a/ports/ensmallen/CONTROL +++ b/ports/ensmallen/CONTROL @@ -2,4 +2,4 @@ Source: ensmallen Version: 2.14.2 Homepage: https://github.com/mlpack/ensmallen Description: A header-only C++ library for mathematical optimization. -Build-Depends: openblas, lapack, armadillo +Build-Depends: blas, lapack, armadillo diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL index 4d589b42243553..0a17639cc2be31 100644 --- a/ports/geogram/CONTROL +++ b/ports/geogram/CONTROL @@ -3,7 +3,7 @@ Version: 1.7.5 Port-Version: 2 Homepage: https://gforge.inria.fr/projects/geogram/ Description: Geogram is a programming library of geometric algorithms. -Build-Depends: openblas, lapack +Build-Depends: blas, lapack Supports: !uwp Feature: graphics diff --git a/ports/halide/CONTROL b/ports/halide/CONTROL index 5de3a27dbd4ac5..b41d28226ef8c4 100644 --- a/ports/halide/CONTROL +++ b/ports/halide/CONTROL @@ -61,3 +61,4 @@ Build-Depends: llvm[core,target-riscv] Feature: target-x86 Description: Include X86 target Build-Depends: llvm[core,target-x86] + diff --git a/ports/hypre/CONTROL b/ports/hypre/CONTROL index 63f36cd7bb171c..b82a4ede88ee9f 100644 --- a/ports/hypre/CONTROL +++ b/ports/hypre/CONTROL @@ -2,4 +2,4 @@ Source: hypre Version: 2.19.0 Homepage: https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods Description: SCALABLE LINEAR SOLVERS AND MULTIGRID METHODS -Build-Depends: mpi, openblas, lapack +Build-Depends: mpi, blas, lapack diff --git a/ports/lapack-reference/CONTROL b/ports/lapack-reference/CONTROL index 3d8bb855dc071d..9ed60cc58fc1f2 100644 --- a/ports/lapack-reference/CONTROL +++ b/ports/lapack-reference/CONTROL @@ -9,7 +9,7 @@ Feature: cblas Description: Builds CBLAS Feature: noblas -Build-Depends: openblas +Build-Depends: blas Description: Use external optimized BLAS Feature: blas-select diff --git a/ports/lapack/CMakeLists.txt b/ports/lapack/CMakeLists.txt index 07b2818b1a4a97..ddd7883b1632eb 100644 --- a/ports/lapack/CMakeLists.txt +++ b/ports/lapack/CMakeLists.txt @@ -2,4 +2,3 @@ cmake_minimum_required(VERSION 3.17) project(Find_LAPACK_external) find_package(LAPACK REQUIRED) -#TODO make sure that the found LAPACK is outside VCPKG \ No newline at end of file diff --git a/ports/lapack/CONTROL b/ports/lapack/CONTROL index aad8e3cf826243..6147ef3a807f8f 100644 --- a/ports/lapack/CONTROL +++ b/ports/lapack/CONTROL @@ -1,4 +1,5 @@ Source: lapack Version: 3 +Port-Version: 1 Description: Metapackage for packages which provide LAPACK Build-Depends: clapack(arm&windows), lapack-reference(!arm|!windows) diff --git a/ports/shogun/CONTROL b/ports/shogun/CONTROL index e274c9d3f29791..485efd9dfdff81 100644 --- a/ports/shogun/CONTROL +++ b/ports/shogun/CONTROL @@ -1,6 +1,6 @@ Source: shogun Version: 6.1.4 -Port-Version: 3 -Build-Depends: bzip2, eigen3, liblzma, libxml2, openblas, nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent +Port-Version: 4 +Build-Depends: bzip2, eigen3, liblzma, libxml2, blas, nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent Homepage: https://github.com/shogun-toolbox/shogun -Description: Unified and efficient Machine Learning \ No newline at end of file +Description: Unified and efficient Machine Learning diff --git a/ports/superlu/CONTROL b/ports/superlu/CONTROL index 11b27ea763bf9c..b498fdafc04d9e 100644 --- a/ports/superlu/CONTROL +++ b/ports/superlu/CONTROL @@ -1,7 +1,7 @@ Source: superlu Version: 2020-01-07 Port-Version: 2 -Build-Depends: openblas +Build-Depends: blas Description: Supernodal sparse direct solver. Homepage: https://github.com/xiaoyeli/superlu -Supports: !(uwp|arm) \ No newline at end of file +Supports: !(uwp|arm) From 76842f59bedae15ba6bc9f5ffe58918f5ed930c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 18 Nov 2020 23:09:34 +0100 Subject: [PATCH 0078/1694] [icu] Add MSVC ARM64 support (#14186) --- ports/icu/CONTROL | 12 +- ports/icu/portfile.cmake | 490 ++++++++++++++++++++------------------- scripts/ci.baseline.txt | 1 - 3 files changed, 257 insertions(+), 246 deletions(-) diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL index 9624e639bb3e03..411e6867bd1e00 100644 --- a/ports/icu/CONTROL +++ b/ports/icu/CONTROL @@ -1,6 +1,6 @@ -Source: icu -Version: 67.1 -Port-Version: 5 -Homepage: http://icu-project.org/apiref/icu4c/ -Description: Mature and widely used Unicode and localization library. -Supports: !(arm|uwp) +Source: icu +Version: 67.1 +Port-Version: 6 +Homepage: http://icu-project.org/apiref/icu4c/ +Description: Mature and widely used Unicode and localization library. +Supports: !(arm|uwp) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 17296c7409030e..ffddfe572808e1 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -1,239 +1,251 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - -set(ICU_VERSION_MAJOR 67) -set(ICU_VERSION_MINOR 1) -set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}") -set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}") -set(VERSION3 "${ICU_VERSION_MAJOR}-${ICU_VERSION_MINOR}") - -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 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8 -) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/disable-escapestr-tool.patch - ${CMAKE_CURRENT_LIST_DIR}/remove-MD-from-configure.patch - ${CMAKE_CURRENT_LIST_DIR}/fix_parallel_build_on_windows.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-extra.patch -) - -vcpkg_find_acquire_program(PYTHON3) -set(ENV{PYTHON} "${PYTHON3}") - -set(CONFIGURE_OPTIONS "--disable-samples --disable-tests --disable-layoutex") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --disable-static --enable-shared") -else() - set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --enable-static --disable-shared") -endif() - -set(CONFIGURE_OPTIONS_RELEASE "--disable-debug --enable-release --prefix=${CURRENT_PACKAGES_DIR}") -set(CONFIGURE_OPTIONS_DEBUG "--enable-debug --disable-release --prefix=${CURRENT_PACKAGES_DIR}/debug") -set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel) -set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg) - -if(NOT VCPKG_TARGET_IS_WINDOWS) - set(BASH bash) - set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -fPIC") - set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -fPIC") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - # Configure release - message(STATUS "Configuring ${RELEASE_TRIPLET}") - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}) - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}) - set(ENV{CFLAGS} "-O2 ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}") - set(ENV{CXXFLAGS} "-O2 ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE}") - vcpkg_execute_required_process( - COMMAND ${BASH} --noprofile --norc -c - "${SOURCE_PATH}/source/runConfigureICU Linux ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELEASE}" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" - LOGNAME "configure-${RELEASE_TRIPLET}") - message(STATUS "Configuring ${RELEASE_TRIPLET} done") - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - # Configure debug - message(STATUS "Configuring ${DEBUG_TRIPLET}") - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}) - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}) - set(ENV{CFLAGS} "-O0 -g ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}") - set(ENV{CXXFLAGS} "-O0 -g ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG}") - vcpkg_execute_required_process( - COMMAND ${BASH} --noprofile --norc -c - "${SOURCE_PATH}/source/runConfigureICU Linux ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEBUG}" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}" - LOGNAME "configure-${DEBUG_TRIPLET}") - message(STATUS "Configuring ${DEBUG_TRIPLET} done") - endif() - -else() - - set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --host=i686-pc-mingw32") - - # Acquire tools - vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.16) - - # Insert msys into the path between the compiler toolset and windows system32. This prevents masking of "link.exe" but DOES mask "find.exe". - string(REPLACE ";$ENV{SystemRoot}\\system32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}") - string(REPLACE ";$ENV{SystemRoot}\\System32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "${NEWPATH}") - set(ENV{PATH} "${NEWPATH}") - set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) - - set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.16) - file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source) - - if(VCPKG_CRT_LINKAGE STREQUAL static) - set(ICU_RUNTIME "-MT") - else() - set(ICU_RUNTIME "-MD") - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - # Configure release - message(STATUS "Configuring ${RELEASE_TRIPLET}") - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}) - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}) - set(ENV{CFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi -FS ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}") - set(ENV{CXXFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi -FS ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE}") - set(ENV{LDFLAGS} "-DEBUG -INCREMENTAL:NO -OPT:REF -OPT:ICF") - vcpkg_execute_required_process( - COMMAND ${BASH} --noprofile --norc -c - "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELEASE}" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" - LOGNAME "configure-${RELEASE_TRIPLET}") - message(STATUS "Configuring ${RELEASE_TRIPLET} done") - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - # Configure debug - message(STATUS "Configuring ${DEBUG_TRIPLET}") - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}) - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}) - set(ENV{CFLAGS} "${ICU_RUNTIME}d -Od -Zi -FS -RTC1 ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}") - set(ENV{CXXFLAGS} "${ICU_RUNTIME}d -Od -Zi -FS -RTC1 ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG}") - set(ENV{LDFLAGS} "-DEBUG") - vcpkg_execute_required_process( - COMMAND ${BASH} --noprofile --norc -c - "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEBUG}" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}" - LOGNAME "configure-${DEBUG_TRIPLET}") - message(STATUS "Configuring ${DEBUG_TRIPLET} done") - endif() -endif() - -unset(ENV{CFLAGS}) -unset(ENV{CXXFLAGS}) -unset(ENV{LDFLAGS}) - -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - # Build release - message(STATUS "Package ${RELEASE_TRIPLET}") - vcpkg_execute_build_process( - COMMAND ${BASH} --noprofile --norc -c "make -j ${VCPKG_CONCURRENCY}" - NO_PARALLEL_COMMAND ${BASH} --noprofile --norc -c "make" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" - LOGNAME "make-build-${RELEASE_TRIPLET}") - - vcpkg_execute_build_process( - COMMAND ${BASH} --noprofile --norc -c "make install" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" - LOGNAME "make-install-${RELEASE_TRIPLET}") - message(STATUS "Package ${RELEASE_TRIPLET} done") -endif() - -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - # Build debug - message(STATUS "Package ${DEBUG_TRIPLET}") - vcpkg_execute_build_process( - COMMAND ${BASH} --noprofile --norc -c "make -j ${VCPKG_CONCURRENCY}" - NO_PARALLEL_COMMAND ${BASH} --noprofile --norc -c "make" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}" - LOGNAME "make-build-${DEBUG_TRIPLET}") - - vcpkg_execute_build_process( - COMMAND ${BASH} --noprofile --norc -c "make install" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}" - LOGNAME "make-install-${DEBUG_TRIPLET}") - message(STATUS "Package ${DEBUG_TRIPLET} done") -endif() - -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/bin - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/share - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/lib/icu - ${CURRENT_PACKAGES_DIR}/debug/lib/icud) - -file(GLOB TEST_LIBS - ${CURRENT_PACKAGES_DIR}/lib/*test* - ${CURRENT_PACKAGES_DIR}/debug/lib/*test*) -file(REMOVE ${TEST_LIBS}) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - # copy icu dlls from lib to bin - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(GLOB RELEASE_DLLS ${CURRENT_PACKAGES_DIR}/lib/icu*${ICU_VERSION_MAJOR}.dll) - file(COPY ${RELEASE_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(GLOB DEBUG_DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/icu*d${ICU_VERSION_MAJOR}.dll) - file(COPY ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - endif() -else() - if(VCPKG_TARGET_IS_WINDOWS) - # rename static libraries to match import libs - # see https://gitlab.kitware.com/cmake/cmake/issues/16617 - foreach(MODULE dt in io tu uc) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/sicu${MODULE}.lib ${CURRENT_PACKAGES_DIR}/lib/icu${MODULE}.lib) - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sicu${MODULE}d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/icu${MODULE}d.lib) - endif() - endforeach() - - file(GLOB_RECURSE pkg_files LIST_DIRECTORIES false ${CURRENT_PACKAGES_DIR}/*.pc) - message(STATUS "${pkg_files}") - foreach(pkg_file IN LISTS pkg_files) - message(STATUS "${pkg_file}") - file(READ ${pkg_file} PKG_FILE) - string(REGEX REPLACE "-ls([^ \\t\\n]+)" "-l\\1" PKG_FILE "${PKG_FILE}" ) - file(WRITE ${pkg_file} "${PKG_FILE}") - endforeach() - endif() - - # force U_STATIC_IMPLEMENTATION macro - foreach(HEADER utypes.h utf_old.h platform.h) - file(READ ${CURRENT_PACKAGES_DIR}/include/unicode/${HEADER} HEADER_CONTENTS) - string(REPLACE "defined(U_STATIC_IMPLEMENTATION)" "1" HEADER_CONTENTS "${HEADER_CONTENTS}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/unicode/${HEADER} "${HEADER_CONTENTS}") - endforeach() -endif() - -# Install executables from ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/bin to /tools/icu -file(GLOB ICU_TOOLS ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/bin/*${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(INSTALL ${ICU_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - -# remove any remaining dlls in /lib -file(GLOB DUMMY_DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) -if(DUMMY_DLLS) - file(REMOVE ${DUMMY_DLLS}) -endif() - -# Generates warnings about missing pdbs for icudt.dll -# This is expected because ICU database contains no executable code -vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread m) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fail_port_install(ON_TARGET "uwp") + +set(ICU_VERSION_MAJOR 67) +set(ICU_VERSION_MINOR 1) +set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}") +set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}") +set(VERSION3 "${ICU_VERSION_MAJOR}-${ICU_VERSION_MINOR}") + +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 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8 +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/disable-escapestr-tool.patch + ${CMAKE_CURRENT_LIST_DIR}/remove-MD-from-configure.patch + ${CMAKE_CURRENT_LIST_DIR}/fix_parallel_build_on_windows.patch + ${CMAKE_CURRENT_LIST_DIR}/fix-extra.patch +) + +vcpkg_find_acquire_program(PYTHON3) +set(ENV{PYTHON} "${PYTHON3}") + +set(CONFIGURE_OPTIONS "--disable-samples --disable-tests --disable-layoutex") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --disable-static --enable-shared") +else() + set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --enable-static --disable-shared") +endif() + +set(CONFIGURE_OPTIONS_RELEASE "--disable-debug --enable-release --prefix=${CURRENT_PACKAGES_DIR}") +set(CONFIGURE_OPTIONS_DEBUG "--enable-debug --disable-release --prefix=${CURRENT_PACKAGES_DIR}/debug") +set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel) +set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(BASH bash) + set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -fPIC") + set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -fPIC") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + # Configure release + message(STATUS "Configuring ${RELEASE_TRIPLET}") + file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}) + file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}) + set(ENV{CFLAGS} "-O2 ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}") + set(ENV{CXXFLAGS} "-O2 ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE}") + vcpkg_execute_required_process( + COMMAND ${BASH} --noprofile --norc -c + "${SOURCE_PATH}/source/runConfigureICU Linux ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELEASE}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" + LOGNAME "configure-${RELEASE_TRIPLET}") + message(STATUS "Configuring ${RELEASE_TRIPLET} done") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + # Configure debug + message(STATUS "Configuring ${DEBUG_TRIPLET}") + file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}) + file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}) + set(ENV{CFLAGS} "-O0 -g ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}") + set(ENV{CXXFLAGS} "-O0 -g ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG}") + vcpkg_execute_required_process( + COMMAND ${BASH} --noprofile --norc -c + "${SOURCE_PATH}/source/runConfigureICU Linux ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEBUG}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}" + LOGNAME "configure-${DEBUG_TRIPLET}") + message(STATUS "Configuring ${DEBUG_TRIPLET} done") + endif() + +else() + + set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --host=i686-pc-mingw32") + + # Acquire tools + vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.16) + + # Insert msys into the path between the compiler toolset and windows system32. This prevents masking of "link.exe" but DOES mask "find.exe". + string(REPLACE ";$ENV{SystemRoot}\\system32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}") + string(REPLACE ";$ENV{SystemRoot}\\System32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "${NEWPATH}") + set(ENV{PATH} "${NEWPATH}") + set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + + set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.16) + file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source) + + if(VCPKG_CRT_LINKAGE STREQUAL static) + set(ICU_RUNTIME "-MT") + else() + set(ICU_RUNTIME "-MD") + endif() + + if(CMAKE_HOST_WIN32 AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") + set(ICU_MSVC_CROSS_COMPILE_TO_ARM ON) + # Need the buildtrees dir, as the required files (e.g. icucross.mk) are not part of the installed package + get_filename_component(ICU_HOST_PATH "${BUILDTREES_DIR}/icu/x86-windows-rel" ABSOLUTE) + if(NOT EXISTS "${ICU_HOST_PATH}") + message(FATAL_ERROR "The x86 icu must be be built locally to build for non-x86/x64 platforms. Please run `vcpkg install icu:x86-windows`.") + endif() + + set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --with-cross-build=${ICU_HOST_PATH}") + set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${ICU_HOST_PATH}/lib") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + # Configure release + message(STATUS "Configuring ${RELEASE_TRIPLET}") + file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}) + file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}) + set(ENV{CFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi -FS ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}") + set(ENV{CXXFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi -FS ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE}") + set(ENV{LDFLAGS} "-DEBUG -INCREMENTAL:NO -OPT:REF -OPT:ICF") + vcpkg_execute_required_process( + COMMAND ${BASH} --noprofile --norc -c + "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELEASE}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" + LOGNAME "configure-${RELEASE_TRIPLET}") + message(STATUS "Configuring ${RELEASE_TRIPLET} done") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + # Configure debug + message(STATUS "Configuring ${DEBUG_TRIPLET}") + file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}) + file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}) + set(ENV{CFLAGS} "${ICU_RUNTIME}d -Od -Zi -FS -RTC1 ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}") + set(ENV{CXXFLAGS} "${ICU_RUNTIME}d -Od -Zi -FS -RTC1 ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG}") + set(ENV{LDFLAGS} "-DEBUG") + vcpkg_execute_required_process( + COMMAND ${BASH} --noprofile --norc -c + "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEBUG}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}" + LOGNAME "configure-${DEBUG_TRIPLET}") + message(STATUS "Configuring ${DEBUG_TRIPLET} done") + endif() +endif() + +unset(ENV{CFLAGS}) +unset(ENV{CXXFLAGS}) +unset(ENV{LDFLAGS}) + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + # Build release + message(STATUS "Package ${RELEASE_TRIPLET}") + vcpkg_execute_build_process( + COMMAND ${BASH} --noprofile --norc -c "make -j ${VCPKG_CONCURRENCY}" + NO_PARALLEL_COMMAND ${BASH} --noprofile --norc -c "make" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" + LOGNAME "make-build-${RELEASE_TRIPLET}") + + vcpkg_execute_build_process( + COMMAND ${BASH} --noprofile --norc -c "make install" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" + LOGNAME "make-install-${RELEASE_TRIPLET}") + message(STATUS "Package ${RELEASE_TRIPLET} done") +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + # Build debug + message(STATUS "Package ${DEBUG_TRIPLET}") + vcpkg_execute_build_process( + COMMAND ${BASH} --noprofile --norc -c "make -j ${VCPKG_CONCURRENCY}" + NO_PARALLEL_COMMAND ${BASH} --noprofile --norc -c "make" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}" + LOGNAME "make-build-${DEBUG_TRIPLET}") + + vcpkg_execute_build_process( + COMMAND ${BASH} --noprofile --norc -c "make install" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}" + LOGNAME "make-install-${DEBUG_TRIPLET}") + message(STATUS "Package ${DEBUG_TRIPLET} done") +endif() + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/bin + ${CURRENT_PACKAGES_DIR}/debug/bin + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/share + ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/lib/icu + ${CURRENT_PACKAGES_DIR}/debug/lib/icud) + +file(GLOB TEST_LIBS + ${CURRENT_PACKAGES_DIR}/lib/*test* + ${CURRENT_PACKAGES_DIR}/debug/lib/*test*) +file(REMOVE ${TEST_LIBS}) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + # copy icu dlls from lib to bin + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB RELEASE_DLLS ${CURRENT_PACKAGES_DIR}/lib/icu*${ICU_VERSION_MAJOR}.dll) + file(COPY ${RELEASE_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB DEBUG_DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/icu*d${ICU_VERSION_MAJOR}.dll) + file(COPY ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + endif() +else() + if(VCPKG_TARGET_IS_WINDOWS) + # rename static libraries to match import libs + # see https://gitlab.kitware.com/cmake/cmake/issues/16617 + foreach(MODULE dt in io tu uc) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/sicu${MODULE}.lib ${CURRENT_PACKAGES_DIR}/lib/icu${MODULE}.lib) + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sicu${MODULE}d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/icu${MODULE}d.lib) + endif() + endforeach() + + file(GLOB_RECURSE pkg_files LIST_DIRECTORIES false ${CURRENT_PACKAGES_DIR}/*.pc) + message(STATUS "${pkg_files}") + foreach(pkg_file IN LISTS pkg_files) + message(STATUS "${pkg_file}") + file(READ ${pkg_file} PKG_FILE) + string(REGEX REPLACE "-ls([^ \\t\\n]+)" "-l\\1" PKG_FILE "${PKG_FILE}" ) + file(WRITE ${pkg_file} "${PKG_FILE}") + endforeach() + endif() + + # force U_STATIC_IMPLEMENTATION macro + foreach(HEADER utypes.h utf_old.h platform.h) + file(READ ${CURRENT_PACKAGES_DIR}/include/unicode/${HEADER} HEADER_CONTENTS) + string(REPLACE "defined(U_STATIC_IMPLEMENTATION)" "1" HEADER_CONTENTS "${HEADER_CONTENTS}") + file(WRITE ${CURRENT_PACKAGES_DIR}/include/unicode/${HEADER} "${HEADER_CONTENTS}") + endforeach() +endif() + +# Install executables from ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/bin to /tools/icu +file(GLOB ICU_TOOLS ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/bin/*${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(INSTALL ${ICU_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +# remove any remaining dlls in /lib +file(GLOB DUMMY_DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) +if(DUMMY_DLLS) + file(REMOVE ${DUMMY_DLLS}) +endif() + +# Generates warnings about missing pdbs for icudt.dll +# This is expected because ICU database contains no executable code +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread m) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9e2161c49a352c..1d577800fe37c9 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -454,7 +454,6 @@ hiredis:x64-uwp=fail hpx:x64-windows-static=fail hpx:x64-linux=fail libhsplasma:x64-windows-static=fail -icu:arm64-windows=fail icu:arm-uwp=fail icu:x64-uwp=fail idevicerestore:x64-linux=fail From 560d686fba9ed419f9cd52d6676ab06d6a0dd306 Mon Sep 17 00:00:00 2001 From: Nemirtingas <9432037+Nemirtingas@users.noreply.github.com> Date: Wed, 18 Nov 2020 23:15:31 +0100 Subject: [PATCH 0079/1694] [libjuice] Update libjuice for libdatachannel port. (#14213) * Update libjuice for libdatachannel port. * Update ports/libjuice/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update libjuice to v0.6.0 * Update ports/libjuice/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Nemirtingas Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/libjuice/CONTROL | 2 +- ports/libjuice/fix-for-vcpkg.patch | 18 +++++++++--------- ports/libjuice/portfile.cmake | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ports/libjuice/CONTROL b/ports/libjuice/CONTROL index 5901d8d74fa9c6..4660f8033409fc 100644 --- a/ports/libjuice/CONTROL +++ b/ports/libjuice/CONTROL @@ -1,5 +1,5 @@ Source: libjuice -Version: 0.5.2 +Version: 0.6.0 Homepage: https://github.com/paullouisageneau/libjuice 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. diff --git a/ports/libjuice/fix-for-vcpkg.patch b/ports/libjuice/fix-for-vcpkg.patch index 6bbfd837f05b78..2d390aa9f0b3ef 100644 --- a/ports/libjuice/fix-for-vcpkg.patch +++ b/ports/libjuice/fix-for-vcpkg.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index be72a2a..8a631e8 100644 +index 8136e2e..fa7ce92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -41,6 +41,9 @@ set(LIBJUICE_SOURCES +@@ -46,6 +46,9 @@ set(LIBJUICE_SOURCES set(LIBJUICE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/juice/juice.h ) @@ -12,7 +12,7 @@ index be72a2a..8a631e8 100644 set(TESTS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/test/main.c -@@ -54,10 +57,10 @@ set(TESTS_SOURCES +@@ -59,10 +62,10 @@ set(TESTS_SOURCES set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) @@ -25,13 +25,13 @@ index be72a2a..8a631e8 100644 target_include_directories(juice PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/juice) target_include_directories(juice PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) target_link_libraries(juice PUBLIC Threads::Threads) -@@ -77,10 +80,14 @@ endif() +@@ -86,10 +89,14 @@ endif() if (USE_NETTLE) find_package(Nettle REQUIRED) -+ find_path(NETTLE_INCLUDE_PATH "nettle/hmac.h" REQUIRED) -+ target_include_directories(juice PRIVATE ${NETTLE_INCLUDE_PATH}) -+ target_include_directories(juice-static PRIVATE ${NETTLE_INCLUDE_PATH}) ++ find_path(NETTLE_INCLUDE_PATH "nettle/hmac.h" REQUIRED) ++ target_include_directories(juice PRIVATE ${NETTLE_INCLUDE_PATH}) ++ target_include_directories(juice-static PRIVATE ${NETTLE_INCLUDE_PATH}) + target_compile_definitions(juice PRIVATE USE_NETTLE=1) - target_link_libraries(juice PRIVATE Nettle::Nettle) @@ -42,7 +42,7 @@ index be72a2a..8a631e8 100644 else() target_compile_definitions(juice PRIVATE USE_NETTLE=0) target_compile_definitions(juice-static PRIVATE USE_NETTLE=0) -@@ -100,8 +107,13 @@ endif() +@@ -109,8 +116,13 @@ endif() add_library(LibJuice::LibJuice ALIAS juice) add_library(LibJuice::LibJuiceStatic ALIAS juice-static) @@ -57,7 +57,7 @@ index be72a2a..8a631e8 100644 if(NOT MSVC) target_compile_options(juice PRIVATE -Wall -Wextra) -@@ -128,3 +140,8 @@ if(NOT NO_TESTS) +@@ -145,3 +157,8 @@ if(NOT NO_TESTS) target_link_libraries(juice-tests juice) endif() diff --git a/ports/libjuice/portfile.cmake b/ports/libjuice/portfile.cmake index 68770243fe566d..c03818b2ba7a7b 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 92fc9e7a9d8cd19a5c5d59cbc0a11cc9f684483b - SHA512 80e9898c51bc98a60ca317030bc5394fda412c2bc822adc656f88bfa60b42501d4945a8692771afb8241ec7994fbe48c3e8360f919a0859cfb47288fd3292dd4 + REF v0.6.0 + SHA512 43ab1f4d7d51c05b5cf2c948c9910b26b5cb7f0f15f10cdfcfdbfc833cfc0caf23da18f12adc1aa7183f77cfb510f5637031d89b3b08014c1fb7266b7f5f31f2 HEAD_REF master PATCHES fix-for-vcpkg.patch From ce477ac7999c0946f2cfdd7a33e70de9e0638dc0 Mon Sep 17 00:00:00 2001 From: Wei Dai Date: Wed, 18 Nov 2020 15:39:36 -0800 Subject: [PATCH 0080/1694] [seal] Update to version 3.6.0. Changed default features. (#14576) * Updated ports/seal to version 3.6.0. Changed default features. Supported linux and *-windows-static. macOS is not tested but should work. * Changed to use vcpkg_check_features and VCPKG_TARGET_IS_WINDOWS. Updated SEAL's commit hash to keep up-to-date with SEAL's new fixes. * Removed one unnecessary cmake argument. * Disabled parallel configure. * Updated SEAL's commit hash. * Enforced static linkage. Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/seal/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: nicole mazzuca --- ports/seal/CONTROL | 14 +++++- ports/seal/no-source-writes.patch | 79 ------------------------------- ports/seal/portfile.cmake | 28 ++++++----- 3 files changed, 28 insertions(+), 93 deletions(-) delete mode 100644 ports/seal/no-source-writes.patch diff --git a/ports/seal/CONTROL b/ports/seal/CONTROL index 3a23af0d40bf64..36f701e8a3d2e5 100644 --- a/ports/seal/CONTROL +++ b/ports/seal/CONTROL @@ -1,7 +1,17 @@ Source: seal -Version: 3.5.9 +Version: 3.6.0 Homepage: https://github.com/microsoft/SEAL Description: Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library. +Default-Features: ms-gsl, zlib, zstd + +Feature: ms-gsl +Build-Depends: ms-gsl +Description: Use ms-gsl for span view Feature: zlib -Description: (Not currently implemented) Use zlib for compressed serialization +Build-Depends: zlib +Description: Use zlib for compressed serialization + +Feature: zstd +Build-Depends: zstd +Description: Use zstd for compressed serialization diff --git a/ports/seal/no-source-writes.patch b/ports/seal/no-source-writes.patch deleted file mode 100644 index e9616861b728d2..00000000000000 --- a/ports/seal/no-source-writes.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 92404c5..9867974 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -108,20 +108,20 @@ endif() - - # Required files and directories - include(GNUInstallDirs) --set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SEAL_SOURCE_DIR}/${OUTLIB_PATH}) --set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SEAL_SOURCE_DIR}/${OUTLIB_PATH}) --set(CMAKE_LIBRARY_RUNTIME_DIRECTORY ${SEAL_SOURCE_DIR}/bin) --set(SEAL_TARGETS_FILENAME ${SEAL_SOURCE_DIR}/cmake/SEALTargets.cmake) -+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${OUTLIB_PATH}) -+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${OUTLIB_PATH}) -+set(CMAKE_LIBRARY_RUNTIME_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) -+set(SEAL_TARGETS_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/cmake/SEALTargets.cmake) - set(SEAL_CONFIG_IN_FILENAME ${SEAL_SOURCE_DIR}/cmake/SEALConfig.cmake.in) --set(SEAL_CONFIG_FILENAME ${SEAL_SOURCE_DIR}/cmake/SEALConfig.cmake) -+set(SEAL_CONFIG_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/cmake/SEALConfig.cmake) - set(SEAL_PKGCONFIG_IN_FILENAME ${SEAL_SOURCE_DIR}/seal.pc.in) --set(SEAL_PKGCONFIG_FILENAME ${SEAL_SOURCE_DIR}/seal-${SEAL_VERSION_MAJOR}.${SEAL_VERSION_MINOR}.pc) --set(SEAL_CONFIG_VERSION_FILENAME ${SEAL_SOURCE_DIR}/cmake/SEALConfigVersion.cmake) -+set(SEAL_PKGCONFIG_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/seal-${SEAL_VERSION_MAJOR}.${SEAL_VERSION_MINOR}.pc) -+set(SEAL_CONFIG_VERSION_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/cmake/SEALConfigVersion.cmake) - set(SEAL_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/SEAL-${SEAL_VERSION_MAJOR}.${SEAL_VERSION_MINOR}) - set(SEAL_PKGCONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - set(SEAL_INCLUDES_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/SEAL-${SEAL_VERSION_MAJOR}.${SEAL_VERSION_MINOR}) - set(SEAL_INCLUDES_BUILD_DIR ${SEAL_SOURCE_DIR}/native/src) --set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SEAL_SOURCE_DIR}/bin) -+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) - set(SEAL_THIRDPARTY_DIR ${SEAL_SOURCE_DIR}/thirdparty) - - # For extra modules we might have -@@ -830,7 +830,7 @@ unset(SEAL_MACOS_SEAL_C_PATH) - # Create SEALNet-multi.nuspec for a multi-platform NuGet package - configure_file( - ${SEAL_SOURCE_DIR}/dotnet/nuget/SEALNet-multi.nuspec.in -- ${SEAL_SOURCE_DIR}/dotnet/nuget/SEALNet-multi.nuspec -+ ${CMAKE_CURRENT_BINARY_DIR}/dotnet/nuget/SEALNet-multi.nuspec - @ONLY) - - set(SEAL_WINDOWS_SEAL_C_PATH "") -@@ -855,11 +855,11 @@ endif() - # Create SEALNet.nuspec for a local NuGet pack from SEALNet.nuspec.in - configure_file( - ${SEAL_SOURCE_DIR}/dotnet/nuget/SEALNet.nuspec.in -- ${SEAL_SOURCE_DIR}/dotnet/nuget/SEALNet.nuspec -+ ${CMAKE_CURRENT_BINARY_DIR}/dotnet/nuget/SEALNet.nuspec - @ONLY) - - # Create SEALNet.targets from SEALNet.targets.in - configure_file( - ${SEAL_SOURCE_DIR}/dotnet/nuget/SEALNet.targets.in -- ${SEAL_SOURCE_DIR}/dotnet/nuget/SEALNet.targets -+ ${CMAKE_CURRENT_BINARY_DIR}/dotnet/nuget/SEALNet.targets - @ONLY) -diff --git a/native/src/seal/util/CMakeLists.txt b/native/src/seal/util/CMakeLists.txt -index 3f2c7ba..a15e634 100644 ---- a/native/src/seal/util/CMakeLists.txt -+++ b/native/src/seal/util/CMakeLists.txt -@@ -28,7 +28,8 @@ target_sources(seal_obj PRIVATE - ) - - # Create the config file --configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h.in ${CMAKE_CURRENT_LIST_DIR}/config.h) -+configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/seal/util/config.h) -+target_include_directories(seal_obj PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - - # Add header files for installation - install( -@@ -38,7 +39,7 @@ install( - ${CMAKE_CURRENT_LIST_DIR}/clang.h - ${CMAKE_CURRENT_LIST_DIR}/clipnormal.h - ${CMAKE_CURRENT_LIST_DIR}/common.h -- ${CMAKE_CURRENT_LIST_DIR}/config.h -+ ${CMAKE_CURRENT_BINARY_DIR}/seal/util/config.h - ${CMAKE_CURRENT_LIST_DIR}/croots.h - ${CMAKE_CURRENT_LIST_DIR}/defines.h - ${CMAKE_CURRENT_LIST_DIR}/galois.h diff --git a/ports/seal/portfile.cmake b/ports/seal/portfile.cmake index d680e10376735b..4b0fc342cd2b44 100644 --- a/ports/seal/portfile.cmake +++ b/ports/seal/portfile.cmake @@ -3,31 +3,32 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/SEAL - REF e3ad13edf7e5b4dc8a59fd2cd6235ad9d7428cab - SHA512 9d52a51bd1d3141e45fd1f92134433a9eb7458e125140501952535c67ea49e0c66ccd4a80f7473c31db1963afcd7e690c716ea32d195cb07ba6fa60847168a91 + REF 3eea4353d4768c79899a67ca4d36bfc3005d5412 + SHA512 ee3d8926f4a26c8f67a9e79fe5da9883195d2e9f9fffa47bb9c3526150d1e0c179968af7222ca280574921feb3c45200da1ca4dc0b012b82aa57dbdef26dcc0a HEAD_REF master - PATCHES no-source-writes.patch ) -if("zlib" IN_LIST FEATURES) - message("SEAL currently does not support non-vendored zlib -- ignoring feature 'zlib'") -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + ms-gsl SEAL_USE_MSGSL + zlib SEAL_USE_ZLIB + zstd SEAL_USE_ZSTD +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS - -DALLOW_COMMAND_LINE_BUILD=ON - -DSEAL_BUILD_EXAMPLES=OFF - -DSEAL_BUILD_TESTS=OFF + -DSEAL_BUILD_DEPS=OFF + -DSEAL_BUILD_EXAMPLES=OFF + -DSEAL_BUILD_TESTS=OFF -DSEAL_BUILD_SEAL_C=OFF - -DSEAL_USE_MSGSL=OFF - -DSEAL_USE_ZLIB=OFF + ${FEATURE_OPTIONS} ) vcpkg_build_cmake(TARGET seal LOGFILE_ROOT build) + vcpkg_install_cmake() -vcpkg_copy_pdbs() file(GLOB CONFIG_PATH RELATIVE "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}/lib/cmake/SEAL-*") if(NOT CONFIG_PATH) @@ -35,9 +36,12 @@ if(NOT CONFIG_PATH) endif() vcpkg_fixup_cmake_targets(CONFIG_PATH "${CONFIG_PATH}") + vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() From 9fd59021357ba4ac816d992def79399e6e087eed Mon Sep 17 00:00:00 2001 From: Maxime GIMENO Date: Thu, 19 Nov 2020 00:44:04 +0100 Subject: [PATCH 0081/1694] CGAL: Update to 5.1.1 (#14605) * Update to 5.1.1 * Update CONTROL * Fix repo name Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/cgal/CONTROL | 2 +- ports/cgal/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index 192784692cf206..07a07942aec238 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,5 +1,5 @@ Source: cgal -Version: 5.1 +Version: 5.1.1 Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-ptr-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision, boost-interval Homepage: https://github.com/CGAL/cgal 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. diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 150a8183b62f16..300b2a3d3f9fd4 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF b271ec54df4547dd63db6b84efc5b5ecd57750a7 # v5.1 - SHA512 c1a9166eaa3b437f0f164fc04b76d2b3805a284f333a3c40b4045160210fc331f6c5d2a9fa73e3959d8e3bedbe88abc38786552e2ce5a121b3e6dda27818e103 + REF v5.1.1 + SHA512 e1a56332269d1386afb6ffea51193800235292094ba160f138532246f6c2232ef104df319b4e8b0540953cb682a6687426b8b108a330604cbfcb6c119b01d97a HEAD_REF master ) From 8b7e8fdea3e3dfa1f109c1f0ee2cc8b33bc8da5f Mon Sep 17 00:00:00 2001 From: Christophe Calmejane Date: Thu, 19 Nov 2020 00:45:05 +0100 Subject: [PATCH 0082/1694] [vcpkg android] Fix for issue #11927 (#14625) Allow selection of Android SDK platform version from triplet file. --- scripts/cmake/vcpkg_configure_cmake.cmake | 2 ++ scripts/toolchains/android.cmake | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index f41747f8a13598..9f71b2208fd84f 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -170,6 +170,8 @@ function(vcpkg_configure_cmake) list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") if(_TARGETTING_UWP AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(VCPKG_CMAKE_SYSTEM_VERSION 21) endif() endif() diff --git a/scripts/toolchains/android.cmake b/scripts/toolchains/android.cmake index 6f6c98507a7ee0..c721c2c4267e5b 100644 --- a/scripts/toolchains/android.cmake +++ b/scripts/toolchains/android.cmake @@ -1,8 +1,7 @@ - set(ANDROID_CPP_FEATURES "rtti exceptions" CACHE STRING "") set(CMAKE_SYSTEM_NAME Android CACHE STRING "") set(ANDROID_TOOLCHAIN clang CACHE STRING "") -set(ANDROID_NATIVE_API_LEVEL 21 CACHE STRING "") +set(ANDROID_NATIVE_API_LEVEL ${CMAKE_SYSTEM_VERSION} CACHE STRING "") set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang CACHE STRING "") if (VCPKG_TARGET_TRIPLET MATCHES "^arm64-android") From 72e0b9f5d1b06d06132ea842799413480c5d063b Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 19 Nov 2020 09:09:56 +0100 Subject: [PATCH 0083/1694] can't build static --- ports/mapnik/cmake/CMakeLists.txt | 4 +--- ports/mapnik/fix-config.patch | 16 ---------------- ports/mapnik/portfile.cmake | 2 +- 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 ports/mapnik/fix-config.patch diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt index 629b930a48c6ea..04b598c0bdf02f 100644 --- a/ports/mapnik/cmake/CMakeLists.txt +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -162,9 +162,7 @@ set(mapnik_include_paths add_library(mapnik ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) if (MAPNIK_STATIC_LIB) - message(STATUS "Building static library") - set_target_properties(mapnik PROPERTIES DEFINE_SYMBOL MAPNIK_STATICLIB) - set(MAPNIK_LIB_DEFINITION -DMAPNIK_STATICLIB) + message(FATAL_ERROR "Dont support static library") else () message(STATUS "Building shared library") set_target_properties(mapnik PROPERTIES DEFINE_SYMBOL MAPNIK_EXPORTS) diff --git a/ports/mapnik/fix-config.patch b/ports/mapnik/fix-config.patch deleted file mode 100644 index 1db95db7079a6a..00000000000000 --- a/ports/mapnik/fix-config.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/include/mapnik/config.hpp b/include/mapnik/config.hpp -index ac48546..9069079 100644 ---- a/include/mapnik/config.hpp -+++ b/include/mapnik/config.hpp -@@ -30,8 +30,10 @@ - # define MAPNIK_IMP __declspec (dllimport) - # ifdef MAPNIK_EXPORTS - # define MAPNIK_DECL __declspec (dllexport) --# else -+# elif !defined(MAPNIK_STATICLIB) - # define MAPNIK_DECL __declspec (dllimport) -+# else -+# define MAPNIK_DECL - # endif - # pragma warning( disable: 4251 ) - # pragma warning( disable: 4275 ) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 7ae175c616ff90..5989a092e8c696 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,3 +1,4 @@ +vcpkg_fail_port_install(ON_LIBRARY_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik @@ -5,7 +6,6 @@ vcpkg_from_github( SHA512 913e725a05e315b8630928fec7635ccddac833428800cd3f1b5c25226952f00883dbe9b007eb36bfd0330eac001608596fb53d08aa3df2fce297a3aab3bbf935 HEAD_REF master PATCHES - fix-config.patch fix-box2d.patch fix-constructor-inheritance.patch ) From 88e8d2258dc7c1435f8203324cd7b3cea5ec6dc2 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 19 Nov 2020 09:09:56 +0100 Subject: [PATCH 0084/1694] can't build static --- ports/mapnik/cmake/CMakeLists.txt | 4 +--- ports/mapnik/fix-config.patch | 16 ---------------- ports/mapnik/portfile.cmake | 2 +- 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 ports/mapnik/fix-config.patch diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt index 629b930a48c6ea..04b598c0bdf02f 100644 --- a/ports/mapnik/cmake/CMakeLists.txt +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -162,9 +162,7 @@ set(mapnik_include_paths add_library(mapnik ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) if (MAPNIK_STATIC_LIB) - message(STATUS "Building static library") - set_target_properties(mapnik PROPERTIES DEFINE_SYMBOL MAPNIK_STATICLIB) - set(MAPNIK_LIB_DEFINITION -DMAPNIK_STATICLIB) + message(FATAL_ERROR "Dont support static library") else () message(STATUS "Building shared library") set_target_properties(mapnik PROPERTIES DEFINE_SYMBOL MAPNIK_EXPORTS) diff --git a/ports/mapnik/fix-config.patch b/ports/mapnik/fix-config.patch deleted file mode 100644 index 1db95db7079a6a..00000000000000 --- a/ports/mapnik/fix-config.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/include/mapnik/config.hpp b/include/mapnik/config.hpp -index ac48546..9069079 100644 ---- a/include/mapnik/config.hpp -+++ b/include/mapnik/config.hpp -@@ -30,8 +30,10 @@ - # define MAPNIK_IMP __declspec (dllimport) - # ifdef MAPNIK_EXPORTS - # define MAPNIK_DECL __declspec (dllexport) --# else -+# elif !defined(MAPNIK_STATICLIB) - # define MAPNIK_DECL __declspec (dllimport) -+# else -+# define MAPNIK_DECL - # endif - # pragma warning( disable: 4251 ) - # pragma warning( disable: 4275 ) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 7ae175c616ff90..5989a092e8c696 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,3 +1,4 @@ +vcpkg_fail_port_install(ON_LIBRARY_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik @@ -5,7 +6,6 @@ vcpkg_from_github( SHA512 913e725a05e315b8630928fec7635ccddac833428800cd3f1b5c25226952f00883dbe9b007eb36bfd0330eac001608596fb53d08aa3df2fce297a3aab3bbf935 HEAD_REF master PATCHES - fix-config.patch fix-box2d.patch fix-constructor-inheritance.patch ) From a74a10768fec5f51539d884973b6d328df3f31f5 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 19 Nov 2020 10:10:49 +0100 Subject: [PATCH 0085/1694] Update CMakeLists.txt --- ports/mapnik/cmake/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt index 04b598c0bdf02f..3ea5448f3aaf39 100644 --- a/ports/mapnik/cmake/CMakeLists.txt +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -162,7 +162,6 @@ set(mapnik_include_paths add_library(mapnik ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) if (MAPNIK_STATIC_LIB) - message(FATAL_ERROR "Dont support static library") else () message(STATUS "Building shared library") set_target_properties(mapnik PROPERTIES DEFINE_SYMBOL MAPNIK_EXPORTS) @@ -339,4 +338,4 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfigVersion.cmake" DESTINATION lib/cmake/mapnik -) \ No newline at end of file +) From 529333d7ad16a9371441ac6a4f8a44307e7f589c Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 19 Nov 2020 10:10:49 +0100 Subject: [PATCH 0086/1694] Update CMakeLists.txt --- ports/mapnik/cmake/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt index 04b598c0bdf02f..3ea5448f3aaf39 100644 --- a/ports/mapnik/cmake/CMakeLists.txt +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -162,7 +162,6 @@ set(mapnik_include_paths add_library(mapnik ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) if (MAPNIK_STATIC_LIB) - message(FATAL_ERROR "Dont support static library") else () message(STATUS "Building shared library") set_target_properties(mapnik PROPERTIES DEFINE_SYMBOL MAPNIK_EXPORTS) @@ -339,4 +338,4 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfigVersion.cmake" DESTINATION lib/cmake/mapnik -) \ No newline at end of file +) From f4091b14364a2554207e8c62efc0797432d81b05 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 19 Nov 2020 10:57:42 +0100 Subject: [PATCH 0087/1694] only fail on windows static --- ports/mapnik/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 5989a092e8c696..5e14c05ace1028 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(ON_LIBRARY_LINKAGE "static") +vcpkg_fail_port_install(ON_TARGET Windows ON_LIBRARY_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik From fe9f26f6182f8a48b019ed72f678bb426107bcf9 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 19 Nov 2020 10:57:42 +0100 Subject: [PATCH 0088/1694] only fail on windows static --- ports/mapnik/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 5989a092e8c696..5e14c05ace1028 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(ON_LIBRARY_LINKAGE "static") +vcpkg_fail_port_install(ON_TARGET Windows ON_LIBRARY_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik From b36de5b94f8881f93b7de5cb486d98722a6eb037 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 19 Nov 2020 11:19:39 +0100 Subject: [PATCH 0089/1694] remove duplicate dependency Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/mapnik/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 791146ecf1068c..5870e40e964be6 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -57,7 +57,6 @@ "mapbox-geometry", "mapbox-polylabel", "mapbox-variant", - "mapbox-variant", "tiff", "zlib" ], From 2ea0d053562b9e070421fae8f1b398bd9985fc90 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 19 Nov 2020 11:19:39 +0100 Subject: [PATCH 0090/1694] remove duplicate dependency Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/mapnik/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 791146ecf1068c..5870e40e964be6 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -57,7 +57,6 @@ "mapbox-geometry", "mapbox-polylabel", "mapbox-variant", - "mapbox-variant", "tiff", "zlib" ], From 732ca1161d3f76970158a4756b064ea3b58e31c7 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 19 Nov 2020 11:25:25 +0100 Subject: [PATCH 0091/1694] remove not needed lines Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/mapbox-geometry/portfile.cmake | 2 -- ports/mapbox-polylabel/portfile.cmake | 2 -- ports/mapnik/cmake/CMakeLists.txt | 16 ---------------- ports/mapnik/cmake/demo/viewer/CMakeLists.txt | 4 +--- .../cmake/plugins/input/geobuf/CMakeLists.txt | 3 +-- .../cmake/utils/mapnik-render/CMakeLists.txt | 3 +-- ports/mapnik/portfile.cmake | 5 ++--- 7 files changed, 5 insertions(+), 30 deletions(-) diff --git a/ports/mapbox-geometry/portfile.cmake b/ports/mapbox-geometry/portfile.cmake index 0371625f5d2095..9ee4065e927e0d 100644 --- a/ports/mapbox-geometry/portfile.cmake +++ b/ports/mapbox-geometry/portfile.cmake @@ -11,7 +11,5 @@ vcpkg_from_github( # Copy header files file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") - # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - diff --git a/ports/mapbox-polylabel/portfile.cmake b/ports/mapbox-polylabel/portfile.cmake index 5bcfe424ad1784..a0c711699241d1 100644 --- a/ports/mapbox-polylabel/portfile.cmake +++ b/ports/mapbox-polylabel/portfile.cmake @@ -11,7 +11,5 @@ vcpkg_from_github( # Copy header files file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") - # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt index 3ea5448f3aaf39..6e9bb5b981d0d9 100644 --- a/ports/mapnik/cmake/CMakeLists.txt +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -8,13 +8,11 @@ set(MAPNIK_VERSION ${MAPNIK_MAJOR_VERSION}.${MAPNIK_MINOR_VERSION}.${MAPNIK_PATC include(CMakeDependentOption) - option(MAPNIK_STATIC_LIB "Build a static library" ON) option(WITH_DEMO "Build demo" ON) option(WITH_VIEWER "Build viewer" OFF) - option(WITH_INPUTS "Build input plugins" ON) CMAKE_DEPENDENT_OPTION(WITH_INPUT_CSV "Build the csv input plugin" ON "WITH_INPUTS" ON) @@ -46,8 +44,6 @@ if(MSVC) add_compile_options(/MP) add_compile_options(-bigobj) #added by @am2222 add_compile_definitions(ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1) #added by @am2222 for proj4 compile - - endif() find_package(Boost REQUIRED @@ -73,14 +69,12 @@ set (MAPNIK_DEFS -DHAVE_TIFF -DHAVE_WEBP) - #vcpkg only supports icu on windows if(WIN32) set(MAPNIK_DEFS ${MAPNIK_DEFS} -DBOOST_REGEX_HAS_ICU) endif() set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2) - # AGG include(files.cmake) @@ -90,7 +84,6 @@ if (WITH_CAIRO) set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/cairo/process_markers_symbolizer.cpp src/cairo/process_group_symbolizer.cpp - src/cairo/cairo_context.cpp src/cairo/cairo_render_vector.cpp src/cairo/cairo_renderer.cpp @@ -143,7 +136,6 @@ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/svg/output/process_polygon_symbolizer.cpp) set(MAPNIK_DEFS ${MAPNIK_DEFS} -DSVG_RENDERER) - set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/jpeg_reader.cpp src/libxml2_loader.cpp @@ -152,7 +144,6 @@ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/webp_reader.cpp ) -#set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/rapidxml_loader.cpp) set(MAPNIK_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/include) @@ -168,7 +159,6 @@ else () set(MAPNIK_LIB_DEFINITION -DMAPNIK_EXPORTS) endif () - target_compile_definitions(mapnik PUBLIC ${MAPNIK_DEFS}) target_include_directories(mapnik PUBLIC $ @@ -196,7 +186,6 @@ target_link_libraries(mapnik PUBLIC ${OPTIONAL_LIBRARIES} ) - install(TARGETS mapnik EXPORT MapnikTargets LIBRARY DESTINATION lib @@ -208,14 +197,12 @@ install(TARGETS mapnik add_subdirectory(src/json) add_subdirectory(src/wkt) - install(EXPORT MapnikTargets FILE MapnikTargets.cmake NAMESPACE mapnik:: DESTINATION lib/cmake/mapnik ) - # ideally we should also generate mapnik-config if (WITH_INPUT_CSV) @@ -319,9 +306,6 @@ if(WITH_UTILS) add_subdirectory(utils/shapeindex) endif() - - - include(CMakePackageConfigHelpers) write_basic_package_version_file( "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfigVersion.cmake" diff --git a/ports/mapnik/cmake/demo/viewer/CMakeLists.txt b/ports/mapnik/cmake/demo/viewer/CMakeLists.txt index e57997d03fac31..34b53786d433c5 100644 --- a/ports/mapnik/cmake/demo/viewer/CMakeLists.txt +++ b/ports/mapnik/cmake/demo/viewer/CMakeLists.txt @@ -9,11 +9,9 @@ add_executable(mapnik-viewer mainwindow.cpp mapwidget.cpp styles_model.cpp - forms/about.ui forms/info.ui forms/layer_info.ui - mapnik_viewer.qrc) set_target_properties(mapnik-viewer PROPERTIES @@ -27,4 +25,4 @@ target_include_directories(mapnik-viewer PRIVATE ${mapnik_include_paths} ) target_link_libraries(mapnik-viewer PRIVATE mapnik Qt5::Widgets) -install(TARGETS mapnik-viewer DESTINATION bin) \ No newline at end of file +install(TARGETS mapnik-viewer DESTINATION bin) diff --git a/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt index 48721e9e4b9c74..45279d717fc0e1 100644 --- a/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt @@ -1,4 +1,3 @@ - add_library(mapnik-input-geobuf SHARED geobuf_datasource.cpp geobuf_featureset.cpp) @@ -9,4 +8,4 @@ target_link_libraries(mapnik-input-geobuf PRIVATE mapnik) set_target_properties(mapnik-input-geobuf PROPERTIES PREFIX "") set_target_properties(mapnik-input-geobuf PROPERTIES OUTPUT_NAME "geobuf") set_target_properties(mapnik-input-geobuf PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-geobuf DESTINATION bin/plugins/input) \ No newline at end of file +install(TARGETS mapnik-input-geobuf DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt b/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt index 23ce12ebbc2e6d..0892f9a6d85762 100644 --- a/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt +++ b/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt @@ -1,7 +1,6 @@ - add_executable(mapnik-render mapnik-render.cpp) target_include_directories(mapnik-render PRIVATE ${mapnik_include_paths} ) target_link_libraries(mapnik-render PRIVATE mapnik) -install(TARGETS mapnik-render DESTINATION bin) \ No newline at end of file +install(TARGETS mapnik-render DESTINATION bin) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 5e14c05ace1028..856f7fd7d3871a 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -6,8 +6,8 @@ vcpkg_from_github( SHA512 913e725a05e315b8630928fec7635ccddac833428800cd3f1b5c25226952f00883dbe9b007eb36bfd0330eac001608596fb53d08aa3df2fce297a3aab3bbf935 HEAD_REF master PATCHES - fix-box2d.patch - fix-constructor-inheritance.patch + fix-box2d.patch + fix-constructor-inheritance.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}) @@ -84,6 +84,5 @@ endif() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mapnik) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/fonts/unifont_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME fonts_copyright) From d3f185fce202f692457f459032d71d1e7fc32583 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 19 Nov 2020 11:25:25 +0100 Subject: [PATCH 0092/1694] remove not needed lines Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/mapbox-geometry/portfile.cmake | 2 -- ports/mapbox-polylabel/portfile.cmake | 2 -- ports/mapnik/cmake/CMakeLists.txt | 16 ---------------- ports/mapnik/cmake/demo/viewer/CMakeLists.txt | 4 +--- .../cmake/plugins/input/geobuf/CMakeLists.txt | 3 +-- .../cmake/utils/mapnik-render/CMakeLists.txt | 3 +-- ports/mapnik/portfile.cmake | 5 ++--- 7 files changed, 5 insertions(+), 30 deletions(-) diff --git a/ports/mapbox-geometry/portfile.cmake b/ports/mapbox-geometry/portfile.cmake index 0371625f5d2095..9ee4065e927e0d 100644 --- a/ports/mapbox-geometry/portfile.cmake +++ b/ports/mapbox-geometry/portfile.cmake @@ -11,7 +11,5 @@ vcpkg_from_github( # Copy header files file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") - # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - diff --git a/ports/mapbox-polylabel/portfile.cmake b/ports/mapbox-polylabel/portfile.cmake index 5bcfe424ad1784..a0c711699241d1 100644 --- a/ports/mapbox-polylabel/portfile.cmake +++ b/ports/mapbox-polylabel/portfile.cmake @@ -11,7 +11,5 @@ vcpkg_from_github( # Copy header files file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") - # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt index 3ea5448f3aaf39..6e9bb5b981d0d9 100644 --- a/ports/mapnik/cmake/CMakeLists.txt +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -8,13 +8,11 @@ set(MAPNIK_VERSION ${MAPNIK_MAJOR_VERSION}.${MAPNIK_MINOR_VERSION}.${MAPNIK_PATC include(CMakeDependentOption) - option(MAPNIK_STATIC_LIB "Build a static library" ON) option(WITH_DEMO "Build demo" ON) option(WITH_VIEWER "Build viewer" OFF) - option(WITH_INPUTS "Build input plugins" ON) CMAKE_DEPENDENT_OPTION(WITH_INPUT_CSV "Build the csv input plugin" ON "WITH_INPUTS" ON) @@ -46,8 +44,6 @@ if(MSVC) add_compile_options(/MP) add_compile_options(-bigobj) #added by @am2222 add_compile_definitions(ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1) #added by @am2222 for proj4 compile - - endif() find_package(Boost REQUIRED @@ -73,14 +69,12 @@ set (MAPNIK_DEFS -DHAVE_TIFF -DHAVE_WEBP) - #vcpkg only supports icu on windows if(WIN32) set(MAPNIK_DEFS ${MAPNIK_DEFS} -DBOOST_REGEX_HAS_ICU) endif() set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2) - # AGG include(files.cmake) @@ -90,7 +84,6 @@ if (WITH_CAIRO) set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/cairo/process_markers_symbolizer.cpp src/cairo/process_group_symbolizer.cpp - src/cairo/cairo_context.cpp src/cairo/cairo_render_vector.cpp src/cairo/cairo_renderer.cpp @@ -143,7 +136,6 @@ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/svg/output/process_polygon_symbolizer.cpp) set(MAPNIK_DEFS ${MAPNIK_DEFS} -DSVG_RENDERER) - set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/jpeg_reader.cpp src/libxml2_loader.cpp @@ -152,7 +144,6 @@ set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/webp_reader.cpp ) -#set(MAPNIK_SOURCES ${MAPNIK_SOURCES} src/rapidxml_loader.cpp) set(MAPNIK_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/include) @@ -168,7 +159,6 @@ else () set(MAPNIK_LIB_DEFINITION -DMAPNIK_EXPORTS) endif () - target_compile_definitions(mapnik PUBLIC ${MAPNIK_DEFS}) target_include_directories(mapnik PUBLIC $ @@ -196,7 +186,6 @@ target_link_libraries(mapnik PUBLIC ${OPTIONAL_LIBRARIES} ) - install(TARGETS mapnik EXPORT MapnikTargets LIBRARY DESTINATION lib @@ -208,14 +197,12 @@ install(TARGETS mapnik add_subdirectory(src/json) add_subdirectory(src/wkt) - install(EXPORT MapnikTargets FILE MapnikTargets.cmake NAMESPACE mapnik:: DESTINATION lib/cmake/mapnik ) - # ideally we should also generate mapnik-config if (WITH_INPUT_CSV) @@ -319,9 +306,6 @@ if(WITH_UTILS) add_subdirectory(utils/shapeindex) endif() - - - include(CMakePackageConfigHelpers) write_basic_package_version_file( "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfigVersion.cmake" diff --git a/ports/mapnik/cmake/demo/viewer/CMakeLists.txt b/ports/mapnik/cmake/demo/viewer/CMakeLists.txt index e57997d03fac31..34b53786d433c5 100644 --- a/ports/mapnik/cmake/demo/viewer/CMakeLists.txt +++ b/ports/mapnik/cmake/demo/viewer/CMakeLists.txt @@ -9,11 +9,9 @@ add_executable(mapnik-viewer mainwindow.cpp mapwidget.cpp styles_model.cpp - forms/about.ui forms/info.ui forms/layer_info.ui - mapnik_viewer.qrc) set_target_properties(mapnik-viewer PROPERTIES @@ -27,4 +25,4 @@ target_include_directories(mapnik-viewer PRIVATE ${mapnik_include_paths} ) target_link_libraries(mapnik-viewer PRIVATE mapnik Qt5::Widgets) -install(TARGETS mapnik-viewer DESTINATION bin) \ No newline at end of file +install(TARGETS mapnik-viewer DESTINATION bin) diff --git a/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt index 48721e9e4b9c74..45279d717fc0e1 100644 --- a/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt +++ b/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt @@ -1,4 +1,3 @@ - add_library(mapnik-input-geobuf SHARED geobuf_datasource.cpp geobuf_featureset.cpp) @@ -9,4 +8,4 @@ target_link_libraries(mapnik-input-geobuf PRIVATE mapnik) set_target_properties(mapnik-input-geobuf PROPERTIES PREFIX "") set_target_properties(mapnik-input-geobuf PROPERTIES OUTPUT_NAME "geobuf") set_target_properties(mapnik-input-geobuf PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-geobuf DESTINATION bin/plugins/input) \ No newline at end of file +install(TARGETS mapnik-input-geobuf DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt b/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt index 23ce12ebbc2e6d..0892f9a6d85762 100644 --- a/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt +++ b/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt @@ -1,7 +1,6 @@ - add_executable(mapnik-render mapnik-render.cpp) target_include_directories(mapnik-render PRIVATE ${mapnik_include_paths} ) target_link_libraries(mapnik-render PRIVATE mapnik) -install(TARGETS mapnik-render DESTINATION bin) \ No newline at end of file +install(TARGETS mapnik-render DESTINATION bin) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 5e14c05ace1028..856f7fd7d3871a 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -6,8 +6,8 @@ vcpkg_from_github( SHA512 913e725a05e315b8630928fec7635ccddac833428800cd3f1b5c25226952f00883dbe9b007eb36bfd0330eac001608596fb53d08aa3df2fce297a3aab3bbf935 HEAD_REF master PATCHES - fix-box2d.patch - fix-constructor-inheritance.patch + fix-box2d.patch + fix-constructor-inheritance.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}) @@ -84,6 +84,5 @@ endif() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mapnik) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/fonts/unifont_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME fonts_copyright) From 813d8be4e73fb3460cfc222ca79d576c81d0fbb8 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 19 Nov 2020 11:26:01 +0100 Subject: [PATCH 0093/1694] Update ports/mapnik/portfile.cmake fix fail port install Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/mapnik/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 856f7fd7d3871a..d3a426d879dd37 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_fail_port_install(ON_TARGET Windows ON_LIBRARY_LINKAGE "static") +vcpkg_fail_port_install(ON_TARGET "Windows") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik From 14c599c55d11d6d712fff86e8d6822434b126eac Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 19 Nov 2020 11:26:01 +0100 Subject: [PATCH 0094/1694] Update ports/mapnik/portfile.cmake fix fail port install Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/mapnik/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 856f7fd7d3871a..d3a426d879dd37 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_fail_port_install(ON_TARGET Windows ON_LIBRARY_LINKAGE "static") +vcpkg_fail_port_install(ON_TARGET "Windows") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik From d4b3127ccd2195d8bc970e833c68523f47bf61e0 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 19 Nov 2020 11:27:55 +0100 Subject: [PATCH 0095/1694] fix linkage --- ports/mapnik/portfile.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index d3a426d879dd37..c6b19ecec1586a 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,6 +1,4 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik From 85135f1bef9e25c6d483052083730e0a82038ea2 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 19 Nov 2020 11:27:55 +0100 Subject: [PATCH 0096/1694] fix linkage --- ports/mapnik/portfile.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index d3a426d879dd37..c6b19ecec1586a 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,6 +1,4 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik From e0243b0081db308a6f95e84d2424ff4d501d333d Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Thu, 19 Nov 2020 12:50:38 -0600 Subject: [PATCH 0097/1694] [arrayfire] New Port (#14240) * [arrayfire] New Port * Format manifest file * Remove nvidia cub, forge, and spdlog submodules and use vcpkg ports - add patch * Remove arrayfire/assets and don't build examples * Remove arrayfire/glad submodule, use port, update patch * Add optional freeimage dependency for graphics lib * Remove rename of arrayfire threads/pass path to build * Update ports/arrayfire/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Fix up cmake targets files, install bin/dlls to the proper location * Use debug bin dir if in debug mode * Fixes for unified, Windows dlls, and more - Make the unified backend its own feature - Make the unified and CPU backend default features - Conditionally create a bin directory if a Windows non-static build for the unified dll - Remove fftw dependency (relies on MKL) - Only support x64 * Add warning for Windows static builds * Ensure CMake assets are in the proper dir for non-Windows builds * Actually, don't change cmake targets in non-Windows systems * Remove port-version * Use MKL for CPU and OpenCL backends * Patch arrayfire/threads - fix duplicate include * Use newer af/threads, replace include path to fix Windows builds * Fix binary dir for output DLLs * Update select_compute_arch to work with CUDA 11 * Don't include CUB if using CUDA >= 11 * Bump port verison to 3.7.3 to handle CUDA 11+ * Update port to use 3.7.3 * Update to include MSVC 2019 fixes, fixup CMake targets on *nix * Apply suggestions from code review * Update ports/arrayfire/portfile.cmake * Change AF CMake dir since targets.cmake are included by other targets * Bump to commit with fixed AF version for bits The v3.7 branch tip was still outputting shared objects with 3.7.2 versions attached to them. It's now fixed Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: nicole mazzuca --- ports/arrayfire/build.patch | 200 +++++++++++++++++++++++++++++++++ ports/arrayfire/portfile.cmake | 69 ++++++++++++ ports/arrayfire/vcpkg.json | 46 ++++++++ 3 files changed, 315 insertions(+) create mode 100644 ports/arrayfire/build.patch create mode 100644 ports/arrayfire/portfile.cmake create mode 100644 ports/arrayfire/vcpkg.json diff --git a/ports/arrayfire/build.patch b/ports/arrayfire/build.patch new file mode 100644 index 00000000000000..c952f5f6213793 --- /dev/null +++ b/ports/arrayfire/build.patch @@ -0,0 +1,200 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e1108c60..670f271b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -104,18 +104,11 @@ mark_as_advanced( + CUDA_HOST_COMPILER + CUDA_USE_STATIC_CUDA_RUNTIME + CUDA_rt_LIBRARY +- SPDLOG_BUILD_EXAMPLES +- SPDLOG_BUILD_TESTING + ADDR2LINE_PROGRAM + Backtrace_LIBRARY + AF_WITH_STATIC_MKL + ) + +-#Configure forge submodule +-#forge is included in ALL target if AF_BUILD_FORGE is ON +-#otherwise, forge is not built at all +-include(AFconfigure_forge_submodule) +- + configure_file( + ${ArrayFire_SOURCE_DIR}/CMakeModules/version.hpp.in + ${ArrayFire_BINARY_DIR}/version.hpp +@@ -159,9 +152,7 @@ if(NOT LAPACK_FOUND) + endif() + endif() + +-set(SPDLOG_BUILD_TESTING OFF CACHE INTERNAL "Disable testing in spdlog") +-add_subdirectory(extern/spdlog EXCLUDE_FROM_ALL) +-add_subdirectory(extern/glad) ++find_package(spdlog CONFIG REQUIRED) + add_subdirectory(src/backend/common) + add_subdirectory(src/api/c) + add_subdirectory(src/api/cpp) +@@ -269,10 +260,6 @@ install(DIRECTORY examples/ #NOTE The slash at the end is important + DESTINATION ${AF_INSTALL_EXAMPLE_DIR} + COMPONENT examples) + +-install(DIRECTORY assets/examples/ #NOTE The slash at the end is important +- DESTINATION ${AF_INSTALL_EXAMPLE_DIR} +- COMPONENT examples) +- + install(DIRECTORY "${ArrayFire_SOURCE_DIR}/LICENSES/" + DESTINATION LICENSES + COMPONENT licenses) +diff --git a/CMakeModules/AFInstallDirs.cmake b/CMakeModules/AFInstallDirs.cmake +index 2c7b96ea..b5006ee0 100644 +--- a/CMakeModules/AFInstallDirs.cmake ++++ b/CMakeModules/AFInstallDirs.cmake +@@ -7,8 +7,12 @@ include(GNUInstallDirs) + # NOTE: These paths are all relative to the project installation prefix. + + # Executables +-if(NOT DEFINED AF_INSTALL_BIN_DIR) +- set(AF_INSTALL_BIN_DIR "lib" CACHE PATH "Installation path for executables") ++if(CMAKE_BUILD_TYPE MATCHES Debug) ++ set(AF_INSTALL_BIN_DIR "${AF_BIN_DIR}/debug/bin") ++ message(STATUS " Setting install to debug path ${AF_INSTALL_BIN_DIR}") ++else() ++ set(AF_INSTALL_BIN_DIR "${AF_BIN_DIR}/bin") ++ message(STATUS " Setting install to release path ${AF_INSTALL_BIN_DIR}") + endif() + + # Libraries +diff --git a/assets b/assets +index cd08d749..c53bfab9 160000 +--- a/assets ++++ b/assets +@@ -1 +1 @@ +-Subproject commit cd08d749611b324012555ad6f23fd76c5465bd6c ++Subproject commit c53bfab909adfeed626f91ed419555711e20bca5 +diff --git a/src/api/unified/CMakeLists.txt b/src/api/unified/CMakeLists.txt +index 967eaa63..ff04392c 100644 +--- a/src/api/unified/CMakeLists.txt ++++ b/src/api/unified/CMakeLists.txt +@@ -96,7 +96,7 @@ target_include_directories(af + target_link_libraries(af + PRIVATE + cpp_api_interface +- spdlog ++ spdlog::spdlog spdlog::spdlog_header_only + Threads::Threads + Boost::boost + ${CMAKE_DL_LIBS} +diff --git a/src/backend/common/CMakeLists.txt b/src/backend/common/CMakeLists.txt +index c9fe0889..4fdfeb66 100644 +--- a/src/backend/common/CMakeLists.txt ++++ b/src/backend/common/CMakeLists.txt +@@ -77,12 +77,15 @@ else() + target_sources(afcommon_interface INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/module_loading_unix.cpp) + endif() + ++find_package(glad CONFIG REQUIRED) ++ + target_link_libraries(afcommon_interface + INTERFACE +- spdlog ++ spdlog::spdlog ++ spdlog::spdlog_header_only + Boost::boost +- af_glad_interface + ${CMAKE_DL_LIBS} ++ glad::glad + ) + + if(AF_BUILD_FORGE) +@@ -95,8 +98,6 @@ target_include_directories(afcommon_interface + ${ArrayFire_BINARY_DIR} + SYSTEM INTERFACE + $<$:${OPENGL_INCLUDE_DIR}> +- ${ArrayFire_SOURCE_DIR}/extern/forge/include +- ${ArrayFire_BINARY_DIR}/extern/forge/include + ) + + if(APPLE AND NOT USE_MKL) +diff --git a/src/backend/cpu/CMakeLists.txt b/src/backend/cpu/CMakeLists.txt +index 170bb0f3..c6e20177 100644 +--- a/src/backend/cpu/CMakeLists.txt ++++ b/src/backend/cpu/CMakeLists.txt +@@ -266,9 +266,10 @@ endif(AF_WITH_CPUID) + + target_sources(afcpu + PRIVATE +- ${CMAKE_CURRENT_SOURCE_DIR}/threads/async_queue.hpp +- ${CMAKE_CURRENT_SOURCE_DIR}/threads/event.hpp ++ ${AF_CPU_THREAD_PATH}/include/threads/async_queue.hpp ++ ${AF_CPU_THREAD_PATH}/include/threads/event.hpp + ) ++target_include_directories(afcpu PRIVATE ${AF_CPU_THREAD_PATH}/include) + + arrayfire_set_default_cxx_flags(afcpu) + +diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt +index 7e3e4089..bbd8d838 100644 +--- a/src/backend/cuda/CMakeLists.txt ++++ b/src/backend/cuda/CMakeLists.txt +@@ -110,7 +110,11 @@ cuda_include_directories( + ${COMMON_INTERFACE_DIRS} + ) + if(CUDA_VERSION_MAJOR VERSION_LESS 11) +- cuda_include_directories(${ArrayFire_SOURCE_DIR}/extern/cub) ++ find_path(CUB_INCLUDE_DIRS "cub/agent/agent_histogram.cuh") ++ if (${CUB_INCLUDE_DIRS} EQUAL "CUB_INCLUDE_DIRS-NOTFOUND") ++ set(CUB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/cub) ++ endif() ++ cuda_include_directories(${CUB_INCLUDE_DIRS}) + endif() + + file(GLOB jit_src "kernel/jit.cuh") +diff --git a/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt b/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt +index 9a796c9e..d9864b00 100644 +--- a/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt ++++ b/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt +@@ -27,6 +27,7 @@ foreach(SBK_BINARY_OP ${SBK_BINARY_OPS}) + add_dependencies(opencl_scan_by_key_${SBK_BINARY_OP} + ${cl_kernel_targets} OpenCL::cl2hpp Boost::boost) + ++ find_package(glad CONFIG REQUIRED) + target_include_directories(opencl_scan_by_key_${SBK_BINARY_OP} + PRIVATE + . +@@ -39,9 +40,7 @@ foreach(SBK_BINARY_OP ${SBK_BINARY_OPS}) + $ + $ + $ +- $ +- ${ArrayFire_SOURCE_DIR}/extern/forge/include +- ${ArrayFire_BINARY_DIR}/extern/forge/include ++ $ + ) + + set_target_properties(opencl_scan_by_key_${SBK_BINARY_OP} +diff --git a/src/backend/opencl/kernel/sort_by_key/CMakeLists.txt b/src/backend/opencl/kernel/sort_by_key/CMakeLists.txt +index d618ff2f..9f517398 100644 +--- a/src/backend/opencl/kernel/sort_by_key/CMakeLists.txt ++++ b/src/backend/opencl/kernel/sort_by_key/CMakeLists.txt +@@ -32,14 +32,13 @@ foreach(SBK_TYPE ${SBK_TYPES}) + ../../../include + ${CMAKE_CURRENT_BINARY_DIR}) + ++ find_package(glad CONFIG REQUIRED) + target_include_directories(opencl_sort_by_key_${SBK_TYPE} + SYSTEM PRIVATE + $ + $ + $ +- $ +- ${ArrayFire_SOURCE_DIR}/extern/forge/include +- ${ArrayFire_BINARY_DIR}/extern/forge/include ++ $ + ) + + set_target_properties(opencl_sort_by_key_${SBK_TYPE} +diff --git a/test/data b/test/data +index 408f4405..6a48c886 160000 +--- a/test/data ++++ b/test/data +@@ -1 +1 @@ +-Subproject commit 408f44059015c57a66e13b4c98df86ebcb427950 ++Subproject commit 6a48c88658bcd68392e99344714cb0dccd4ec285 diff --git a/ports/arrayfire/portfile.cmake b/ports/arrayfire/portfile.cmake new file mode 100644 index 00000000000000..ebc0616b193174 --- /dev/null +++ b/ports/arrayfire/portfile.cmake @@ -0,0 +1,69 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arrayfire/arrayfire + REF 59ac7b980d1ae124aae914fb29cbf086c948954d # v3.7.3 + SHA512 e8c209a5249046cb8d68877463b4f4921cfc363ec2f9b070ba67c9e00cbe7b44d5db209922dabc47e53977ff918e7f0d289f85c7571a826c2050d0ee8deae3e0 + HEAD_REF master + PATCHES build.patch + ) + +# arrayfire cpu thread lib needed as a submodule for the CPU backend +vcpkg_from_github( + OUT_SOURCE_PATH CPU_THREADS_PATH + REPO arrayfire/threads + REF b666773940269179f19ef11c8f1eb77005e85d9a + SHA512 b3e8b54acf3a588b1f821c2774d5da2d8f8441962c6d99808d513f7117278b9066eb050b8b501bddbd3882e68eb5cc5da0b2fca54e15ab1923fe068a3fe834f5 + HEAD_REF master + ) + +################################### Build ################################### + +# Default flags +set(AF_DEFAULT_VCPKG_CMAKE_FLAGS + -DBUILD_TESTING=OFF + -DAF_BUILD_DOCS=OFF + -DAF_BUILD_EXAMPLES=OFF + -DUSE_CPU_MKL=ON + -DUSE_OPENCL_MKL=ON + -DAF_CPU_THREAD_PATH=${CPU_THREADS_PATH} # for building the arrayfire cpu threads lib + -DAF_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT} # for CMake configs/targets + ) + +# bin/dll directory for Windows non-static builds for the unified backend dll +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(AF_BIN_DIR ${CURRENT_PACKAGES_DIR}) + list(APPEND AF_DEFAULT_VCPKG_CMAKE_FLAGS "-DAF_BIN_DIR=${AF_BIN_DIR}") +endif() + +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message(WARNING "NOTE: Windows support with static linkeage is still experimental.") +endif() + +# Determine which backend to build via specified feature +vcpkg_check_features( + OUT_FEATURE_OPTIONS AF_BACKEND_FEATURE_OPTIONS + FEATURES + unified AF_BUILD_UNIFIED + cpu AF_BUILD_CPU + cuda AF_BUILD_CUDA + opencl AF_BUILD_OPENCL +) + +# Build and install +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${AF_DEFAULT_VCPKG_CMAKE_FLAGS} + ${AF_BACKEND_FEATURE_OPTIONS} + ) +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Copyright and license +file(INSTALL ${SOURCE_PATH}/COPYRIGHT.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/arrayfire/vcpkg.json b/ports/arrayfire/vcpkg.json new file mode 100644 index 00000000000000..ee80e879d8d0c2 --- /dev/null +++ b/ports/arrayfire/vcpkg.json @@ -0,0 +1,46 @@ +{ + "name": "arrayfire", + "version-string": "3.7.3", + "description": "ArrayFire is a general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.", + "supports": "x64", + "dependencies": [ + "boost-compute", + "boost-stacktrace", + "forge", + "freeimage", + "glad", + "spdlog" + ], + "default-features": [ + "cpu", + "unified" + ], + "features": { + "cpu": { + "description": "ArrayFire CPU backend", + "dependencies": [ + "intel-mkl" + ] + }, + "cuda": { + "description": "ArrayFire CUDA backend", + "dependencies": [ + "cub", + "cuda", + "cudnn" + ] + }, + "opencl": { + "description": "ArrayFire OpenCL backend", + "dependencies": [ + "opencl" + ] + }, + "unified": { + "description": "ArrayFire unified backend", + "dependencies": [ + "intel-mkl" + ] + } + } +} From 51811a70d7f3ac440244a789f9cb1768ab0a209f Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 20 Nov 2020 02:56:44 +0800 Subject: [PATCH 0098/1694] [vcpkg baseline][qt5-location] Update patch (#14644) --- ports/qt5-location/CONTROL | 2 +- ports/qt5-location/portfile.cmake | 9 +-- .../rename_third_party_libs_conflicts.patch | 68 +++++++++++++++++++ 3 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 ports/qt5-location/rename_third_party_libs_conflicts.patch diff --git a/ports/qt5-location/CONTROL b/ports/qt5-location/CONTROL index 16edf4033da8c7..470d25e3df8df0 100644 --- a/ports/qt5-location/CONTROL +++ b/ports/qt5-location/CONTROL @@ -1,5 +1,5 @@ Source: qt5-location Version: 5.15.1 -Port-Version: 1 +Port-Version: 2 Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application. Build-Depends: qt5-base[core], qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake index e1be09062ee5d8..6855151bd36522 100644 --- a/ports/qt5-location/portfile.cmake +++ b/ports/qt5-location/portfile.cmake @@ -1,10 +1,3 @@ -vcpkg_download_distfile( - PATCH - URLS "https://codereview.qt-project.org/gitweb?p=qt%2Fqtlocation.git;a=commitdiff_plain;h=6b2cf7e9d150b7be709fcd688c5045949cedc3d9;hp=7769ea903f87efc4ad55530a2749f104eddff2e4" - SHA512 99d16fb0e88a2250de3896815abbb22ff5aa4d3920397610cf37be701fe03a7241e0586aae5b85755aeb958926183c96a0482a8837335d20a2171ebb2a66e640 - FILENAME qt5-location-rename-99d16fb0.patch -) - message(STATUS "${PORT} has a spurious failure in which it is unable to create a parent directory! Just retry.") include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(PATCHES "${PATCH}") +qt_submodule_installation(PATCHES rename_third_party_libs_conflicts.patch) diff --git a/ports/qt5-location/rename_third_party_libs_conflicts.patch b/ports/qt5-location/rename_third_party_libs_conflicts.patch new file mode 100644 index 00000000000000..786cea1ba73752 --- /dev/null +++ b/ports/qt5-location/rename_third_party_libs_conflicts.patch @@ -0,0 +1,68 @@ +diff --git a/src/3rdparty/clip2tri/clip2tri.pro b/src/3rdparty/clip2tri/clip2tri.pro +index 802c040..4059a63 100644 +--- a/src/3rdparty/clip2tri/clip2tri.pro ++++ b/src/3rdparty/clip2tri/clip2tri.pro +@@ -1,4 +1,4 @@ +-TARGET = clip2tri ++TARGET = qt_clip2tri + + CONFIG += staticlib exceptions warn_off optimize_full + +@@ -18,5 +18,5 @@ gcc { + HEADERS += clip2tri.h + SOURCES += clip2tri.cpp + +-LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() -lclipper$$qtPlatformTargetSuffix() ++LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_poly2tri$$qtPlatformTargetSuffix() -lqt_clipper$$qtPlatformTargetSuffix() + +diff --git a/src/3rdparty/clipper/clipper.pro b/src/3rdparty/clipper/clipper.pro +index 874d55c..a518d24 100644 +--- a/src/3rdparty/clipper/clipper.pro ++++ b/src/3rdparty/clipper/clipper.pro +@@ -1,4 +1,4 @@ +-TARGET = clipper ++TARGET = qt_clipper + + CONFIG += staticlib exceptions warn_off optimize_full + +diff --git a/src/3rdparty/poly2tri/poly2tri.pro b/src/3rdparty/poly2tri/poly2tri.pro +index 76f2779..6c5f769 100644 +--- a/src/3rdparty/poly2tri/poly2tri.pro ++++ b/src/3rdparty/poly2tri/poly2tri.pro +@@ -1,4 +1,4 @@ +-TARGET = poly2tri ++TARGET = qt_poly2tri + + CONFIG += staticlib warn_off optimize_full + +diff --git a/src/location/declarativemaps/declarativemaps.pri b/src/location/declarativemaps/declarativemaps.pri +index e2a922f..12199ee 100644 +--- a/src/location/declarativemaps/declarativemaps.pri ++++ b/src/location/declarativemaps/declarativemaps.pri +@@ -68,5 +68,5 @@ SOURCES += \ + declarativemaps/qquickgeomapgesturearea.cpp + + load(qt_build_paths) +-LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() -lclip2tri$$qtPlatformTargetSuffix() ++LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_poly2tri$$qtPlatformTargetSuffix() -lqt_clip2tri$$qtPlatformTargetSuffix() + +diff --git a/src/location/location.pro b/src/location/location.pro +index 1b541b9..b0e2c3f 100644 +--- a/src/location/location.pro ++++ b/src/location/location.pro +@@ -45,4 +45,4 @@ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + + load(qt_module) + +-LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lclip2tri$$qtPlatformTargetSuffix() ++LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_clip2tri$$qtPlatformTargetSuffix() +diff --git a/src/positioning/positioning.pro b/src/positioning/positioning.pro +index 6535090..db49921 100644 +--- a/src/positioning/positioning.pro ++++ b/src/positioning/positioning.pro +@@ -95,4 +95,4 @@ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + + load(qt_module) + +-LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lclip2tri$$qtPlatformTargetSuffix() ++LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_clip2tri$$qtPlatformTargetSuffix() From 085875fedbccdae79d38dbfe86b14ffbf8634c51 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 19 Nov 2020 21:33:04 +0100 Subject: [PATCH 0099/1694] [libpq/ffmpeg] Fix iconv/intl linkage not covered by CI (#14626) * fix iconv naming in ffmpeg * libpq fix features --- ports/ffmpeg/0007-fix-lib-naming.patch | 2 +- ports/ffmpeg/CONTROL | 2 +- ports/libpq/CONTROL | 2 +- ports/libpq/patches/windows/Solution_Debug.patch | 4 ++-- ports/libpq/patches/windows/Solution_Release.patch | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/ffmpeg/0007-fix-lib-naming.patch b/ports/ffmpeg/0007-fix-lib-naming.patch index c9fb9db216ec13..7e4aa7102e67d8 100644 --- a/ports/ffmpeg/0007-fix-lib-naming.patch +++ b/ports/ffmpeg/0007-fix-lib-naming.patch @@ -8,7 +8,7 @@ index d6c4388..75b96c3 100644 -lx264) echo libx264.lib ;; + -lx265) echo libx265.lib ;; + -lmp3lame) echo libmp3lame.lib ;; -+ -liconv) echo libiconv.lib ;; ++ -liconv) echo iconv.lib ;; + -lm) ;; -lstdc++) ;; -l*) echo ${flag#-l}.lib ;; diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 4ea0d0400b1bc9..0667d882267826 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,6 +1,6 @@ Source: ffmpeg Version: 4.3.1 -Port-Version: 7 +Port-Version: 8 Homepage: https://ffmpeg.org 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. diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL index f55423ec592613..9087debeedbc17 100644 --- a/ports/libpq/CONTROL +++ b/ports/libpq/CONTROL @@ -1,6 +1,6 @@ Source: libpq Version: 12.2 -Port-Version: 8 +Port-Version: 9 Build-Depends: libpq[core,bonjour] (osx) Supports: !uwp Homepage: https://www.postgresql.org/ diff --git a/ports/libpq/patches/windows/Solution_Debug.patch b/ports/libpq/patches/windows/Solution_Debug.patch index 07e57497b6ae79..e641f468a10924 100644 --- a/ports/libpq/patches/windows/Solution_Debug.patch +++ b/ports/libpq/patches/windows/Solution_Debug.patch @@ -93,7 +93,7 @@ index 51711c2bf..d33fdc3b0 100644 { $proj->AddIncludeDir($self->{options}->{nls} . '\include'); - $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); -+ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\libintl.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); # This must be updated } if ($self->{options}->{gss}) { @@ -110,7 +110,7 @@ index 51711c2bf..d33fdc3b0 100644 { $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); - $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); -+ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\libiconv.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); # This must be updated } if ($self->{options}->{icu}) { diff --git a/ports/libpq/patches/windows/Solution_Release.patch b/ports/libpq/patches/windows/Solution_Release.patch index e4b653c7aeadba..cc41b8d0b7d569 100644 --- a/ports/libpq/patches/windows/Solution_Release.patch +++ b/ports/libpq/patches/windows/Solution_Release.patch @@ -93,7 +93,7 @@ index 51711c2bf..d33fdc3b0 100644 { $proj->AddIncludeDir($self->{options}->{nls} . '\include'); - $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); -+ $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); # This must be updated } if ($self->{options}->{gss}) { @@ -110,7 +110,7 @@ index 51711c2bf..d33fdc3b0 100644 { $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); - $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); -+ $proj->AddLibrary($self->{options}->{iconv} . '\lib\libiconv.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); # This must be updated } if ($self->{options}->{icu}) { From 767df01d595992a8430cd2b9338e4315e5e3f24d Mon Sep 17 00:00:00 2001 From: "Dr. Frank Heimes" <20513035+FrankHeimes@users.noreply.github.com> Date: Thu, 19 Nov 2020 21:33:20 +0100 Subject: [PATCH 0100/1694] [vcpkg] Two bug fixes and some improvements in buildsystems/msbuild (#13755) * Use IncludePath and LibraryPath properties These tool agnostic properties allow to configure ClCompile and ResourceCompile without repeating the code. This change includes my changes from #4454. * Applied changes as described in #13753 * Fixed warning and error in vcpkg end-to-end tests * Fixed incorrect warning "we found a manifest file in \." * Fixed still failing integration test. See discussion in #13753. * Code Review Correction Removed stray double quote reported by @strega-nil * change display name Co-authored-by: Nicole Mazzuca Co-authored-by: Billy Robert O'Neal III --- .../buildsystems/msbuild/vcpkg-general.xml | 154 +++++++++--------- scripts/buildsystems/msbuild/vcpkg.props | 47 +++--- scripts/buildsystems/msbuild/vcpkg.targets | 112 +++++-------- 3 files changed, 134 insertions(+), 179 deletions(-) diff --git a/scripts/buildsystems/msbuild/vcpkg-general.xml b/scripts/buildsystems/msbuild/vcpkg-general.xml index 2638597a6631a0..0fbe3c6abbce47 100644 --- a/scripts/buildsystems/msbuild/vcpkg-general.xml +++ b/scripts/buildsystems/msbuild/vcpkg-general.xml @@ -1,77 +1,77 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/buildsystems/msbuild/vcpkg.props b/scripts/buildsystems/msbuild/vcpkg.props index f9db4fc58a7772..f9f5511f0d24c0 100644 --- a/scripts/buildsystems/msbuild/vcpkg.props +++ b/scripts/buildsystems/msbuild/vcpkg.props @@ -1,41 +1,34 @@ - - true - true - true - false - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .vcpkg-root)) - $(Configuration) - $(VcpkgRoot)\scripts\buildsystems\msbuild\vcpkg-general.xml - + - - uwp - - - windows + + windows + uwp - - x86 - - - $(Platform) + + $(Platform) + x86 - + true + true + $(Configuration) + false + $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), '..\..\..')) + + true + + false + + false true - $([MSbuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), vcpkg.json)) + $([MSbuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), vcpkg.json)) - - - $(VcpkgPlatformTarget)-$(VcpkgOSTarget) - $(VcpkgUserTriplet) - $(VcpkgRoot)\scripts\buildsystems\msbuild\vcpkg-general.xml - diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 5013d764a2469f..488fd070c2534d 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -1,77 +1,35 @@ - - - - true - true - false - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .vcpkg-root)) - $(Configuration) - $(VcpkgRoot)\scripts\buildsystems\msbuild\vcpkg-general.xml - false - true - $([MSbuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), vcpkg.json)) - - - - - uwp - - - windows - - - - - x86 - - - $(Platform) - + - - - $(VcpkgPlatformTarget)-$(VcpkgOSTarget) - $(VcpkgUserTriplet) - $(VcpkgRoot)\installed\$(VcpkgTriplet)\ - + + - - - - Project - - - - - - $(VcpkgManifestRoot)\vcpkg_installed\ - - - $(VcpkgRoot)\installed\ - + + + + + -static + $(VcpkgPlatformTarget)-$(VcpkgOSTarget)$(VcpkgLinkage) - - - $(VcpkgUserTriplet)-static - + + $([System.IO.Path]::Combine($(VcpkgRoot), 'scripts\buildsystems\msbuild\vcpkg-general.xml')) - - $(VcpkgInstalledDir)$(VcpkgTriplet) - - - + $([System.IO.Path]::Combine($(VcpkgRoot), 'installed')) + $([System.IO.Path]::Combine($(VcpkgManifestRoot), 'vcpkg_installed')) + $([System.IO.Path]::Combine($(VcpkgInstalledDir), $(VcpkgTriplet))) + $(VcpkgCurrentInstalledDir)\ Debug Release debug\ - $(VcpkgRoot)\ - $(VcpkgCurrentInstalledDir)\ - $(VcpkgManifestRoot)\ true - - false + + + + Project + + + %(AdditionalDependencies);$(VcpkgCurrentInstalledDir)$(VcpkgConfigSubdir)lib\*.lib @@ -85,28 +43,32 @@ - - - + + + - - + + - + - + - + - <_VcpkgAppLocalPowerShellCommonArguments>-ExecutionPolicy Bypass -noprofile -File "$(MSBuildThisFileDirectory)applocal.ps1" "$(TargetPath)" "$(VcpkgCurrentInstalledDir)$(VcpkgConfigSubdir)bin" "$(TLogLocation)$(ProjectName).write.1u.tlog" "$(IntDir)vcpkg.applocal.log" From 71221ecd65340c54478442dd7c38ac97ddfef3dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n?= Date: Thu, 19 Nov 2020 21:34:13 +0100 Subject: [PATCH 0101/1694] [camport3] add new port (#13759) * [camport3] add new port: https://github.com/percipioxyz/camport3 * Removes no longer needed include Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * using VCPKG_TARGET_IS_WINDOWS and VCPKG_TARGET_IS_LINUX fails if installed on OSX * Update ports/camport3/CONTROL Co-authored-by: Robert Schumacher * unsupported targets and architectures added to control and portfile * Update ports/camport3/CONTROL * fixes supports string in control file * Apply suggestions from code review this port doesn't support UWP Co-authored-by: Ivan Bravo Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher Co-authored-by: nicole mazzuca --- ports/camport3/CONTROL | 5 +++ ports/camport3/portfile.cmake | 83 +++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 ports/camport3/CONTROL create mode 100644 ports/camport3/portfile.cmake diff --git a/ports/camport3/CONTROL b/ports/camport3/CONTROL new file mode 100644 index 00000000000000..5aeb6b2cba5838 --- /dev/null +++ b/ports/camport3/CONTROL @@ -0,0 +1,5 @@ +Source: camport3 +Version: 1.5.3 +Description: percipio.xyz cameras SDK +Homepage: https://github.com/percipioxyz/camport3 +Supports: ((windows & !uwp & !arm & !arm64 & !static) | linux) & !wasm32 diff --git a/ports/camport3/portfile.cmake b/ports/camport3/portfile.cmake new file mode 100644 index 00000000000000..a46d4ded934d6c --- /dev/null +++ b/ports/camport3/portfile.cmake @@ -0,0 +1,83 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_fail_port_install(ON_LIBRARY_LINKAGE "static") + vcpkg_fail_port_install(ON_TARGET "uwp") + vcpkg_fail_port_install(ON_ARCH "arm" "arm64" "wasm32") +elseif(VCPKG_TARGET_IS_LINUX) + vcpkg_fail_port_install(ON_ARCH "wasm32") +else() + vcpkg_fail_port_install(ALWAYS) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO percipioxyz/camport3 + REF v1.5.3 + SHA512 efa41e75b4ed7147f94270765138aa226a92ec51c99157776e916ec178ad2a9fe55aa6e6e746be46e2f2178852f4c4f9323b515f5a1b151ac70c21f8f923d901 + HEAD_REF master +) + +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) + +if(VCPKG_TARGET_IS_WINDOWS) + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib) + file(COPY + ${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 + ) + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + 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 + ) + file(COPY + ${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + ) + endif() + +elseif(VCPKG_TARGET_IS_LINUX) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set (CAMPORT3_ARCH "Aarch64") + elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set (CAMPORT3_ARCH "armv7hf") + elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set (CAMPORT3_ARCH "i686") + else() + set (CAMPORT3_ARCH ${VCPKG_TARGET_ARCHITECTURE}) + endif() + + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib) + file(COPY + ${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(COPY + ${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} + RENAME copyright +) From 3e800b1a0142cb550d4ae8b23862f5509d51199c Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 19 Nov 2020 21:34:30 +0100 Subject: [PATCH 0102/1694] [qt5-base] fix brotli linkage and qml dlls deployment (#14594) --- ports/qt5-base/portfile.cmake | 6 ++---- ports/qt5-base/qtdeploy.ps1 | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 0e7929a0811013..a3e9d05ec294b8 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -139,8 +139,6 @@ find_library(BROTLI_COMMON_RELEASE NAMES brotlicommon brotlicommon-static PATHS find_library(BROTLI_COMMON_DEBUG NAMES brotlicommon brotlicommon-static brotlicommond brotlicommon-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(BROTLI_DEC_RELEASE NAMES brotlidec brotlidec-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(BROTLI_DEC_DEBUG NAMES brotlidec brotlidec-static brotlidecd brotlidec-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(BROTLI_ENC_RELEASE NAMES brotlienc brotlienc-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(BROTLI_ENC_DEBUG NAMES brotlienc brotlienc-static brotliencd brotlienc-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUUC_RELEASE NAMES icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUUC_DEBUG NAMES icuucd libicuucd icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) @@ -178,8 +176,8 @@ find_library(SSL_DEBUG ssl ssleay32 ssld ssleay32d PATHS "${CURRENT_INSTALLED_DI find_library(EAY_RELEASE libeay32 crypto libcrypto PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(EAY_DEBUG libeay32 crypto libcrypto libeay32d cryptod libcryptod PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -set(FREETYPE_RELEASE_ALL "${FREETYPE_RELEASE} ${BZ2_RELEASE} ${LIBPNG_RELEASE} ${ZLIB_RELEASE} ${BROTLI_ENC_RELEASE} ${BROTLI_DEC_RELEASE} ${BROTLI_COMMON_RELEASE}") -set(FREETYPE_DEBUG_ALL "${FREETYPE_DEBUG} ${BZ2_DEBUG} ${LIBPNG_DEBUG} ${ZLIB_DEBUG} ${BROTLI_ENC_DEBUG} ${BROTLI_DEC_DEBUG} ${BROTLI_COMMON_RELEASE}") +set(FREETYPE_RELEASE_ALL "${FREETYPE_RELEASE} ${BZ2_RELEASE} ${LIBPNG_RELEASE} ${ZLIB_RELEASE} ${BROTLI_DEC_RELEASE} ${BROTLI_COMMON_RELEASE}") +set(FREETYPE_DEBUG_ALL "${FREETYPE_DEBUG} ${BZ2_DEBUG} ${LIBPNG_DEBUG} ${ZLIB_DEBUG} ${BROTLI_DEC_DEBUG} ${BROTLI_COMMON_DEBUG}") # If HarfBuzz is built with GLib enabled, it must be statically link set(GLIB_LIB_VERSION 2.0) diff --git a/ports/qt5-base/qtdeploy.ps1 b/ports/qt5-base/qtdeploy.ps1 index 5b8e06ee9857fc..4973cfc3879a29 100644 --- a/ports/qt5-base/qtdeploy.ps1 +++ b/ports/qt5-base/qtdeploy.ps1 @@ -74,7 +74,7 @@ function deployPluginsIfQt([string]$targetBinaryDir, [string]$QtPluginsDir, [str } } } elseif ($targetBinaryName -match "Qt5Quickd?.dll") { - foreach ($a in @("Qt5QuickControls2", "Qt5QuickControls2d", "Qt5QuickShapes", "Qt5QuickShapesd", "Qt5QuickTemplates2", "Qt5QuickTemplates2d")) + foreach ($a in @("Qt5QuickControls2", "Qt5QuickControls2d", "Qt5QuickShapes", "Qt5QuickShapesd", "Qt5QuickTemplates2", "Qt5QuickTemplates2d", "Qt5QmlWorkerScript", "Qt5QmlWorkerScriptd", "Qt5QuickParticles", "Qt5QuickParticlesd", "Qt5QuickWidgets", "Qt5QuickWidgetsd")) { if (Test-Path "$binDir\$a.dll") { From 546c2809cb852789406979f6153dda7b597cf39f Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 19 Nov 2020 19:17:10 -0800 Subject: [PATCH 0103/1694] [vcpkg] fix vs2015 build (#14659) --- toolsrc/include/vcpkg/base/lockguarded.h | 2 +- toolsrc/src/vcpkg/build.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolsrc/include/vcpkg/base/lockguarded.h b/toolsrc/include/vcpkg/base/lockguarded.h index e573ec7b0e361e..e49b0b5d9a8664 100644 --- a/toolsrc/include/vcpkg/base/lockguarded.h +++ b/toolsrc/include/vcpkg/base/lockguarded.h @@ -29,7 +29,7 @@ namespace vcpkg::Util LockGuardPtr(LockGuarded& sync) : m_lock(sync.m_mutex), m_ptr(sync.m_t) { } private: - std::lock_guard m_lock; + std::unique_lock m_lock; T& m_ptr; }; } diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index e75f5b7c12df26..d418f71f55a581 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -214,7 +214,7 @@ namespace vcpkg::Build static std::remove_const_t generate_all_policies() { - std::remove_const_t res; + std::remove_const_t res{}; for (size_t i = 0; i < res.size(); ++i) { res[i] = static_cast(i); From b47e4243c5424fb829f173bf780130f3b3360c7d Mon Sep 17 00:00:00 2001 From: seanlis Date: Fri, 20 Nov 2020 13:38:36 +0800 Subject: [PATCH 0104/1694] [qt5-tools] Patch windeployqt to locate icudtd correctly. (#14083) * Patch windeployqt to locate icudtd correctly. * Add the link of the upstream issue as a comment to the patch in the portfile. --- ports/qt5-tools/CONTROL | 1 + ports/qt5-tools/icudt-debug-suffix.patch | 13 +++++++++++++ ports/qt5-tools/portfile.cmake | 7 +++++-- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 ports/qt5-tools/icudt-debug-suffix.patch diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL index 49319c5fbc44c2..523a608cedb0a8 100644 --- a/ports/qt5-tools/CONTROL +++ b/ports/qt5-tools/CONTROL @@ -1,4 +1,5 @@ Source: qt5-tools Version: 5.15.1 +Port-Version: 1 Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications Build-Depends: qt5-base[core], qt5-declarative, qt5-activeqt (windows) diff --git a/ports/qt5-tools/icudt-debug-suffix.patch b/ports/qt5-tools/icudt-debug-suffix.patch new file mode 100644 index 00000000000000..9d9d8bb395b2ab --- /dev/null +++ b/ports/qt5-tools/icudt-debug-suffix.patch @@ -0,0 +1,13 @@ +diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp +index 4e480bb..e15f076 100644 +--- a/src/windeployqt/main.cpp ++++ b/src/windeployqt/main.cpp +@@ -1324,7 +1324,7 @@ static DeployResult deploy(const Options &options, + const QString icuVersion = icuLibs.front().mid(index, numberExpression.matchedLength()); + if (optVerboseLevel > 1) + std::wcout << "Adding ICU version " << icuVersion << '\n'; +- icuLibs.push_back(QStringLiteral("icudt") + icuVersion + QLatin1String(windowsSharedLibrarySuffix)); ++ icuLibs.push_back(QStringLiteral("icudt") + (result.isDebug && platformHasDebugSuffix(options.platform) ? QStringLiteral("d") : QString()) + icuVersion + QLatin1String(windowsSharedLibrarySuffix)); + } + for (const QString &icuLib : qAsConst(icuLibs)) { + const QString icuPath = findInPath(icuLib); diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake index 2efc85eb960e66..7b0b32ac2cf8cc 100644 --- a/ports/qt5-tools/portfile.cmake +++ b/ports/qt5-tools/portfile.cmake @@ -1,7 +1,10 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(PATCHES assistant.patch) +qt_submodule_installation(PATCHES + assistant.patch + icudt-debug-suffix.patch # https://bugreports.qt.io/browse/QTBUG-87677 +) if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms") -endif() \ No newline at end of file +endif() From ea8eec8dee477a20b4721a542ada7c7857d29118 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 19 Nov 2020 21:39:08 -0800 Subject: [PATCH 0105/1694] [vcpkg] fix cmake paths in tags (alternative 2) (#14661) * [vcpkg] fix cmake paths in tags (alternative 2) * fix compile on VS2019 unnecessary and invalid SFINAE'd constructor --- toolsrc/include/vcpkg/base/span.h | 5 ----- toolsrc/src/vcpkg/cmakevars.cpp | 24 ++++++++++++++++++------ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/toolsrc/include/vcpkg/base/span.h b/toolsrc/include/vcpkg/base/span.h index 91d94ec473182e..7748222cfa3d83 100644 --- a/toolsrc/include/vcpkg/base/span.h +++ b/toolsrc/include/vcpkg/base/span.h @@ -32,11 +32,6 @@ namespace vcpkg { } - template::value>> - constexpr Span(std::remove_const_t (&arr)[N]) noexcept : m_ptr(arr), m_count(N) - { - } - template().data()), class = std::enable_if_t, Span>::value>> diff --git a/toolsrc/src/vcpkg/cmakevars.cpp b/toolsrc/src/vcpkg/cmakevars.cpp index 69326fffc5c1e9..39a4d18b0776a0 100644 --- a/toolsrc/src/vcpkg/cmakevars.cpp +++ b/toolsrc/src/vcpkg/cmakevars.cpp @@ -85,17 +85,29 @@ namespace vcpkg::CMakeVars { emitted_triplets[spec_abi_setting.first->package_spec.triplet()] = emitted_triplet_id++; } + Strings::append(extraction_file, "macro(vcpkg_triplet_file VCPKG_TRIPLET_ID)\n"); + Strings::append(extraction_file, + "set(_vcpkg_triplet_file_BACKUP_CURRENT_LIST_FILE \"${CMAKE_CURRENT_LIST_FILE}\")\n"); + for (auto& p : emitted_triplets) { - Strings::append(extraction_file, - "if(VCPKG_TRIPLET_ID EQUAL ", - p.second, - ")\n", - fs.read_contents(paths.get_triplet_file_path(p.first), VCPKG_LINE_INFO), - "\nendif()\n"); + auto path_to_triplet = paths.get_triplet_file_path(p.first); + Strings::append(extraction_file, "if(VCPKG_TRIPLET_ID EQUAL ", p.second, ")\n"); + Strings::append( + extraction_file, "set(CMAKE_CURRENT_LIST_FILE \"", fs::generic_u8string(path_to_triplet), "\")\n"); + Strings::append( + extraction_file, + "get_filename_component(CMAKE_CURRENT_LIST_DIR \"${CMAKE_CURRENT_LIST_FILE}\" DIRECTORY)\n"); + Strings::append(extraction_file, fs.read_contents(paths.get_triplet_file_path(p.first), VCPKG_LINE_INFO)); + Strings::append(extraction_file, "\nendif()\n"); } + Strings::append(extraction_file, + "set(CMAKE_CURRENT_LIST_FILE \"${_vcpkg_triplet_file_BACKUP_CURRENT_LIST_FILE}\")\n"); + Strings::append(extraction_file, + "get_filename_component(CMAKE_CURRENT_LIST_DIR \"${CMAKE_CURRENT_LIST_FILE}\" DIRECTORY)\n"); Strings::append(extraction_file, "endmacro()\n"); + for (const auto& spec_abi_setting : spec_abi_settings) { const FullPackageSpec& spec = *spec_abi_setting.first; From d86057e6ddde74d5f226b69a4d2ec74c5019f18a Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Fri, 20 Nov 2020 18:25:36 +0100 Subject: [PATCH 0106/1694] complile with c++17; install files directly in cmake --- ports/mapnik/cmake/CMakeLists.txt | 6 +++++- ports/mapnik/portfile.cmake | 8 +------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt index 6e9bb5b981d0d9..922daf44751d15 100644 --- a/ports/mapnik/cmake/CMakeLists.txt +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.13.4) project(mapnik) +set(CXX_STANDARD 17) set(MAPNIK_MAJOR_VERSION 3) set(MAPNIK_MINOR_VERSION 0) set(MAPNIK_PATCH_VERSION 23) @@ -191,8 +192,11 @@ install(TARGETS mapnik LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin - INCLUDES DESTINATION include + INCLUDES DESTINATION include/ + PUBLIC_HEADER DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/include/ ) +install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +install(DIRECTORY deps/agg/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) add_subdirectory(src/json) add_subdirectory(src/wkt) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index c6b19ecec1586a..4d42d336d62e8d 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -12,10 +12,6 @@ vcpkg_from_github( file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}) -vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) -vcpkg_add_to_path(${PYTHON2_DIR}) - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(MAPNIK_STATIC_LIB OFF) elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -49,13 +45,11 @@ vcpkg_configure_cmake( -DMAPNIK_STATIC_LIB=${MAPNIK_STATIC_LIB} -DBOOST_PREFIX=${CURRENT_INSTALLED_DIR}/include -DFREE_TYPE_INCLUDE=${CURRENT_INSTALLED_DIR}/include/freetype2 + -DCMAKE_INSTALL_INCLUDEDIR=${CURRENT_PACKAGES_DIR}/include ) vcpkg_install_cmake() -file(COPY ${SOURCE_PATH}/include/mapnik DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/deps/agg/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) - # copy plugins into tool path, if any plugin is installed if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/plugins) file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) From 9466fb88b0249123fbf9fe399fc8b2b7f9eea935 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Fri, 20 Nov 2020 18:25:36 +0100 Subject: [PATCH 0107/1694] complile with c++17; install files directly in cmake --- ports/mapnik/cmake/CMakeLists.txt | 6 +++++- ports/mapnik/portfile.cmake | 8 +------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt index 6e9bb5b981d0d9..922daf44751d15 100644 --- a/ports/mapnik/cmake/CMakeLists.txt +++ b/ports/mapnik/cmake/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.13.4) project(mapnik) +set(CXX_STANDARD 17) set(MAPNIK_MAJOR_VERSION 3) set(MAPNIK_MINOR_VERSION 0) set(MAPNIK_PATCH_VERSION 23) @@ -191,8 +192,11 @@ install(TARGETS mapnik LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin - INCLUDES DESTINATION include + INCLUDES DESTINATION include/ + PUBLIC_HEADER DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/include/ ) +install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +install(DIRECTORY deps/agg/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) add_subdirectory(src/json) add_subdirectory(src/wkt) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index c6b19ecec1586a..4d42d336d62e8d 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -12,10 +12,6 @@ vcpkg_from_github( file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}) -vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) -vcpkg_add_to_path(${PYTHON2_DIR}) - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(MAPNIK_STATIC_LIB OFF) elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -49,13 +45,11 @@ vcpkg_configure_cmake( -DMAPNIK_STATIC_LIB=${MAPNIK_STATIC_LIB} -DBOOST_PREFIX=${CURRENT_INSTALLED_DIR}/include -DFREE_TYPE_INCLUDE=${CURRENT_INSTALLED_DIR}/include/freetype2 + -DCMAKE_INSTALL_INCLUDEDIR=${CURRENT_PACKAGES_DIR}/include ) vcpkg_install_cmake() -file(COPY ${SOURCE_PATH}/include/mapnik DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/deps/agg/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) - # copy plugins into tool path, if any plugin is installed if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/plugins) file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) From 4eedd0917c63278de9545da9e231735ef8a03719 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 20 Nov 2020 12:44:51 -0500 Subject: [PATCH 0108/1694] [python3] Upgrade to 3.9.0 (#14510) * [python3] Bump to 3.8.6. * [python3] Bump to 3.9.0. * [itk] Correct python artifact names. * [pybind11] Update python artifact names. * [vcpkg_find_acquire_program] Bump PYTHON3 to 3.9.0. --- ports/itk/portfile.cmake | 20 +++++++------- ports/itk/vcpkg.json | 2 +- ports/pybind11/CONTROL | 1 + ports/pybind11/portfile.cmake | 4 +-- ports/python3/0001-static-library.patch | 26 ++++++++++++++----- ports/python3/0002-static-crt.patch | 17 ++++++++++-- ports/python3/CONTROL | 3 +-- ports/python3/portfile.cmake | 6 ++--- .../cmake/vcpkg_find_acquire_program.cmake | 8 +++--- 9 files changed, 57 insertions(+), 30 deletions(-) diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index e5cb1383f5e0a6..c89c65aa59ec5a 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -110,17 +110,17 @@ if("python" IN_LIST FEATURES) ) # Due to ITKs internal shenanigans with the variables ...... if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND ADDITIONAL_OPTIONS "-DPython3_LIBRARY_RELEASE:PATH=${CURRENT_INSTALLED_DIR}/lib/python38.lib" - "-DPython3_LIBRARY_DEBUG:PATH=${CURRENT_INSTALLED_DIR}/debug/lib/python38_d.lib" - "-DPython3_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include/python3.8") - list(APPEND OPTIONS_DEBUG "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/python38_d.lib") - list(APPEND OPTIONS_RELEASE "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/python38.lib") + list(APPEND ADDITIONAL_OPTIONS "-DPython3_LIBRARY_RELEASE:PATH=${CURRENT_INSTALLED_DIR}/lib/python39.lib" + "-DPython3_LIBRARY_DEBUG:PATH=${CURRENT_INSTALLED_DIR}/debug/lib/python39_d.lib" + "-DPython3_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include/python3.9") + list(APPEND OPTIONS_DEBUG "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/python39_d.lib") + list(APPEND OPTIONS_RELEASE "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/python39.lib") elseif(VCPKG_TARGET_IS_LINUX) - list(APPEND ADDITIONAL_OPTIONS "-DPython3_LIBRARY_RELEASE:PATH=${CURRENT_INSTALLED_DIR}/lib/libpython38m.a" - "-DPython3_LIBRARY_DEBUG:PATH=${CURRENT_INSTALLED_DIR}/debug/lib/libpython38md.a" - "-DPython3_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include/python3.8m") - list(APPEND OPTIONS_DEBUG "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/libpython38md.a") - list(APPEND OPTIONS_RELEASE "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/libpython38m.a") + list(APPEND ADDITIONAL_OPTIONS "-DPython3_LIBRARY_RELEASE:PATH=${CURRENT_INSTALLED_DIR}/lib/libpython39m.a" + "-DPython3_LIBRARY_DEBUG:PATH=${CURRENT_INSTALLED_DIR}/debug/lib/libpython39md.a" + "-DPython3_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include/python3.9m") + list(APPEND OPTIONS_DEBUG "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/libpython39md.a") + list(APPEND OPTIONS_RELEASE "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/libpython39m.a") elseif(VCPKG_TARGET_IS_OSX) #Need Python3 information on OSX within VCPKG endif() diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json index 4231c3cdc70e25..24de005c6794f1 100644 --- a/ports/itk/vcpkg.json +++ b/ports/itk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "itk", "version-string": "5.1.0", - "port-version": 3, + "port-version": 4, "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.", "homepage": "https://github.com/InsightSoftwareConsortium/ITK", "dependencies": [ diff --git a/ports/pybind11/CONTROL b/ports/pybind11/CONTROL index f2004f37930c0f..be711e1b1be0d2 100644 --- a/ports/pybind11/CONTROL +++ b/ports/pybind11/CONTROL @@ -1,5 +1,6 @@ Source: pybind11 Version: 2.6.0 +Port-Version: 1 Homepage: https://github.com/pybind/pybind11 Description: pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code. Build-Depends: python3 (windows) diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 0664ccf677c17b..458c2a669a9882 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -20,10 +20,10 @@ vcpkg_configure_cmake( -DPYTHON_MODULE_EXTENSION=.dll OPTIONS_RELEASE -DPYTHON_IS_DEBUG=OFF - -DPYTHON_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/python36.lib + -DPYTHON_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/python39.lib OPTIONS_DEBUG -DPYTHON_IS_DEBUG=ON - -DPYTHON_LIBRARIES=${CURRENT_INSTALLED_DIR}/debug/lib/python36_d.lib + -DPYTHON_LIBRARIES=${CURRENT_INSTALLED_DIR}/debug/lib/python39_d.lib ) vcpkg_install_cmake() diff --git a/ports/python3/0001-static-library.patch b/ports/python3/0001-static-library.patch index d9d6024d0d0792..e0824849a84257 100644 --- a/ports/python3/0001-static-library.patch +++ b/ports/python3/0001-static-library.patch @@ -1,8 +1,19 @@ +From dffd6c572fb60f955bf3d98a87e5739163ab8f3f Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Thu, 28 May 2020 17:25:21 -0400 +Subject: [PATCH 1/2] static library + +builds the pythoncore as a static library instead of a DLL +--- + PC/pyconfig.h | 6 ++++++ + PCbuild/pythoncore.vcxproj | 16 ++++++++++++++-- + 2 files changed, 20 insertions(+), 2 deletions(-) + diff --git a/PC/pyconfig.h b/PC/pyconfig.h -index b6b8d445869bc..35b329f307c12 100644 +index 02216b5068..d359c884e2 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h -@@ -257,6 +257,7 @@ typedef int pid_t; +@@ -252,6 +252,7 @@ typedef int pid_t; /* For Windows the Python core is in a DLL by default. Test Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ @@ -10,7 +21,7 @@ index b6b8d445869bc..35b329f307c12 100644 #if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED) # define Py_ENABLE_SHARED 1 /* standard symbol for shared library */ # define MS_COREDLL /* deprecated old symbol */ -@@ -282,6 +283,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ +@@ -277,6 +278,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ # endif /* _DEBUG */ # endif /* _MSC_VER */ # endif /* Py_BUILD_CORE */ @@ -23,7 +34,7 @@ index b6b8d445869bc..35b329f307c12 100644 #if defined(MS_WIN64) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index 0666b90f66cc9..ca83b82d8a0fe 100644 +index 2625d0293d..dbe236829a 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -73,7 +73,7 @@ @@ -44,7 +55,7 @@ index 0666b90f66cc9..ca83b82d8a0fe 100644 _Py_HAVE_ZLIB;%(PreprocessorDefinitions) - version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies) + version.lib;shlwapi.lib;ws2_32.lib;pathcch.lib;%(AdditionalDependencies) + + MachineX86 @@ -60,4 +71,7 @@ index 0666b90f66cc9..ca83b82d8a0fe 100644 + - + +-- +2.28.0.windows.1 + diff --git a/ports/python3/0002-static-crt.patch b/ports/python3/0002-static-crt.patch index 362610f38c0f20..5044507ec930c7 100644 --- a/ports/python3/0002-static-crt.patch +++ b/ports/python3/0002-static-crt.patch @@ -1,5 +1,15 @@ +From 28fe1e90fc4d34381553b7faf2f4c331bcaef669 Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Thu, 28 May 2020 17:36:31 -0400 +Subject: [PATCH 2/2] static crt + +changes crt linkage of pythoncore to static. +--- + PCbuild/pythoncore.vcxproj | 4 ++++ + 1 file changed, 4 insertions(+) + diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index ca83b82d8a0fe..b925a26a96e5e 100644 +index dbe236829a..1a4ddb5cea 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -104,6 +104,10 @@ @@ -12,4 +22,7 @@ index ca83b82d8a0fe..b925a26a96e5e 100644 + MultiThreaded - version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies) + version.lib;shlwapi.lib;ws2_32.lib;pathcch.lib;%(AdditionalDependencies) +-- +2.28.0.windows.1 + diff --git a/ports/python3/CONTROL b/ports/python3/CONTROL index aecb34d98b36c5..9085950fd19073 100644 --- a/ports/python3/CONTROL +++ b/ports/python3/CONTROL @@ -1,6 +1,5 @@ Source: python3 -Version: 3.8.3 -Port-Version: 2 +Version: 3.9.0 Homepage: https://github.com/python/cpython Description: The Python programming language as an embeddable library Build-Depends: libffi, openssl, zlib (!uwp&!windows) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 087e59a03c58f2..40b1aeacb15ae1 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -4,8 +4,8 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_CRT_LINKAGE STREQUAL static endif() set(PYTHON_VERSION_MAJOR 3) -set(PYTHON_VERSION_MINOR 8) -set(PYTHON_VERSION_PATCH 3) +set(PYTHON_VERSION_MINOR 9) +set(PYTHON_VERSION_PATCH 0) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) if(VCPKG_TARGET_IS_WINDOWS) @@ -21,7 +21,7 @@ vcpkg_from_github( OUT_SOURCE_PATH TEMP_SOURCE_PATH REPO python/cpython REF v${PYTHON_VERSION} - SHA512 eb264a858ef55f2f61b53f663454be6e99ffe9035d8fcdb3366d7a08fd3b295613e5d15e93e2e4b9b18ad297d8c17139bde5e90e396db04fe04c6f441a443fd2 + SHA512 39d304cae181674c4872c63768c0e5aeace2c92eb6d5ea550428d65c8571bc60922b3a3d484b51c46b466aadb7e27500559cafec13a489b48613bbb3fe6a5a5d HEAD_REF master PATCHES ${PATCHES} ) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 1f914c86859ccb..875ba1f14b8471 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -147,20 +147,20 @@ function(vcpkg_find_acquire_program VAR) elseif(VAR MATCHES "PYTHON3") if(CMAKE_HOST_WIN32) set(PROGNAME python) - set(PYTHON_VERSION 3.8.3) + set(PYTHON_VERSION 3.9.0) if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) set(SUBDIR "python-${PYTHON_VERSION}-x86") set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-win32.zip") set(ARCHIVE "python-${PYTHON_VERSION}-embed-win32.zip") - set(HASH 8c9078f55b1b5d694e0e809eee6ccf8a6e15810dd4649e8ae1209bff30e102d49546ce970a5d519349ca7759d93146f459c316dc440737171f018600255dcd0a) + set(HASH 1501ad0b3ed1053466bef303e639c4d5cd9c270beacd07d70fb631db15503ea9e1f9de054cafe8759403e77aa898cd8b8878bf9024add4c081b28a4c5a9947ed) else() set(SUBDIR "python-${PYTHON_VERSION}-x64") set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-amd64.zip") set(ARCHIVE "python-${PYTHON_VERSION}-embed-amd64.zip") - set(HASH a322fc925167edb1897764297cf47e294ad3f52c109a05f8911412807eb83e104f780e9fe783b17fe0d9b18b7838797c15e9b0805dab759829f77a9bc0159424) + set(HASH e969622b74ea79a6adcf41b4d628bd80c9320df2f3d797905872610172838f1ab70d9bb0c70fcf7da396e03c3a73de96fa69a4b212b26f97de0e4f3366accf51) endif() set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) - set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E remove python38._pth) + set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E rm python39._pth) else() set(PROGNAME python3) set(BREW_PACKAGE_NAME "python") From a7734633c9f057919139cd8dd878d711ce9cd1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 20 Nov 2020 10:29:25 -0800 Subject: [PATCH 0109/1694] [gdal] Update to 3.1.3 (#13449) * [vcpkg_*_nmake] Add option INSTALL_COMMAND * [gdal] Update to 3.1.3 and switch to vcpkg_*_nmake on Windows * [vcpkg_build_make] Add option MAKEFILE * fix install on windows, fix linux build * fix options position * [gdal] Fix linux build * [gdal] Fix expat library name * [gdal] Fix geos library name * [gdal] Fix cmake wrapper * [pdal] Fix dependency geos * [pdal] Fix PDALConfig.cmake * [gdal] Fix dependency cfitsio on *inx * disable cfitsio temporary * [gdal] Correct cmake wrapper and usage * [gdal] Fix tools on windows-static * Revert a9ac823007975485aacc7e1f3eb4053e295376e1 * Apply suggestions * [vcpkg_build_nmake] Fix install command * [vcpkg_build_nmake] Fix install command * regenerate docs * [gdal] Update dependency iconv and charset library names * [gdal] add json-c as a dependency on non-windows Co-authored-by: Billy Robert O'Neal III Co-authored-by: Nicole Mazzuca --- docs/maintainers/portfile-functions.md | 9 +- docs/maintainers/vcpkg_acquire_msys.md | 23 +- docs/maintainers/vcpkg_build_make.md | 10 + docs/maintainers/vcpkg_build_nmake.md | 1 + docs/maintainers/vcpkg_check_linkage.md | 4 +- docs/maintainers/vcpkg_common_definitions.md | 1 + docs/maintainers/vcpkg_configure_cmake.md | 3 + docs/maintainers/vcpkg_configure_make.md | 33 ++ docs/maintainers/vcpkg_download_distfile.md | 3 + .../vcpkg_execute_in_download_mode.md | 29 ++ .../vcpkg_execute_required_process.md | 12 + .../maintainers/vcpkg_find_acquire_program.md | 1 + docs/maintainers/vcpkg_find_fortran.md | 14 + docs/maintainers/vcpkg_fixup_pkgconfig.md | 10 +- docs/maintainers/vcpkg_from_github.md | 3 + docs/maintainers/vcpkg_install_nmake.md | 1 + .../vcpkg_internal_get_cmake_vars.md | 29 ++ ports/gdal/0001-Fix-debug-crt-flags.patch | 20 +- ports/gdal/0002-Fix-build.patch | 38 ++ ports/gdal/0002-Fix-static-build.patch | 27 -- ports/gdal/0003-Fix-static-build.patch | 22 + ports/gdal/0003-Fix-std-fabs.patch | 10 - ports/gdal/0004-Fix-std-fabs.patch | 12 + ports/gdal/0005-Fix-cfitsio.patch | 13 + ports/gdal/CONTROL | 5 +- ports/gdal/dependency_win.cmake | 120 ++++++ ports/gdal/portfile.cmake | 404 ++++-------------- ports/gdal/usage | 4 +- ports/gdal/vcpkg-cmake-wrapper.cmake | 8 +- ports/pdal/PDALConfig.patch | 14 - ports/pdal/fix-dependency.patch | 33 +- ports/pdal/portfile.cmake | 1 - scripts/cmake/execute_process.cmake | 4 +- scripts/cmake/vcpkg_build_make.cmake | 22 +- scripts/cmake/vcpkg_build_nmake.cmake | 19 +- scripts/cmake/vcpkg_install_nmake.cmake | 10 +- 36 files changed, 549 insertions(+), 423 deletions(-) create mode 100644 docs/maintainers/vcpkg_execute_in_download_mode.md create mode 100644 docs/maintainers/vcpkg_find_fortran.md create mode 100644 docs/maintainers/vcpkg_internal_get_cmake_vars.md create mode 100644 ports/gdal/0002-Fix-build.patch delete mode 100644 ports/gdal/0002-Fix-static-build.patch create mode 100644 ports/gdal/0003-Fix-static-build.patch delete mode 100644 ports/gdal/0003-Fix-std-fabs.patch create mode 100644 ports/gdal/0004-Fix-std-fabs.patch create mode 100644 ports/gdal/0005-Fix-cfitsio.patch create mode 100644 ports/gdal/dependency_win.cmake delete mode 100644 ports/pdal/PDALConfig.patch diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index 8873111274db76..943afa6e752f3f 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -1,5 +1,5 @@ - - + + # Portfile helper functions - [execute\_process](execute_process.md) - [vcpkg\_acquire\_msys](vcpkg_acquire_msys.md) @@ -21,15 +21,17 @@ - [vcpkg\_configure\_make](vcpkg_configure_make.md) - [vcpkg\_configure\_meson](vcpkg_configure_meson.md) - [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md) -- [vcpkg\_copy\_tools](vcpkg_copy_tools.md) - [vcpkg\_copy\_tool\_dependencies](vcpkg_copy_tool_dependencies.md) +- [vcpkg\_copy\_tools](vcpkg_copy_tools.md) - [vcpkg\_download\_distfile](vcpkg_download_distfile.md) - [vcpkg\_execute\_build\_process](vcpkg_execute_build_process.md) +- [vcpkg\_execute\_in\_download\_mode](vcpkg_execute_in_download_mode.md) - [vcpkg\_execute\_required\_process](vcpkg_execute_required_process.md) - [vcpkg\_extract\_source\_archive](vcpkg_extract_source_archive.md) - [vcpkg\_extract\_source\_archive\_ex](vcpkg_extract_source_archive_ex.md) - [vcpkg\_fail\_port\_install](vcpkg_fail_port_install.md) - [vcpkg\_find\_acquire\_program](vcpkg_find_acquire_program.md) +- [vcpkg\_find\_fortran](vcpkg_find_fortran.md) - [vcpkg\_fixup\_cmake\_targets](vcpkg_fixup_cmake_targets.md) - [vcpkg\_fixup\_pkgconfig](vcpkg_fixup_pkgconfig.md) - [vcpkg\_from\_bitbucket](vcpkg_from_bitbucket.md) @@ -44,4 +46,5 @@ - [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md) - [vcpkg\_install\_nmake](vcpkg_install_nmake.md) - [vcpkg\_install\_qmake](vcpkg_install_qmake.md) +- [vcpkg\_internal\_get\_cmake\_vars](vcpkg_internal_get_cmake_vars.md) - [vcpkg\_prettify\_command](vcpkg_prettify_command.md) diff --git a/docs/maintainers/vcpkg_acquire_msys.md b/docs/maintainers/vcpkg_acquire_msys.md index 4dc8f53917e285..5dd075a70c46ac 100644 --- a/docs/maintainers/vcpkg_acquire_msys.md +++ b/docs/maintainers/vcpkg_acquire_msys.md @@ -4,7 +4,11 @@ Download and prepare an MSYS2 instance. ## Usage ```cmake -vcpkg_acquire_msys( [PACKAGES ...]) +vcpkg_acquire_msys( + PACKAGES ... + [NO_DEFAULT_PACKAGES] + [DIRECT_PACKAGES ...] +) ``` ## Parameters @@ -14,7 +18,22 @@ An out-variable that will be set to the path to MSYS2. ### PACKAGES A list of packages to acquire in msys. -To ensure a package is available: `vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.15)` +To ensure a package is available: `vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.16)` + +### NO_DEFAULT_PACKAGES +Exclude the normal base packages. + +The list of base packages includes: bash, coreutils, sed, grep, gawk, diffutils, make, and pkg-config + +### DIRECT_PACKAGES +A list of URL/SHA512 pairs to acquire in msys. + +This parameter can be used by a port to privately extend the list of msys packages to be acquired. +The URLs can be found on the msys2 website[1] and should be a direct archive link: + + https://repo.msys2.org/mingw/i686/mingw-w64-i686-gettext-0.19.8.1-9-any.pkg.tar.zst + +[1] https://packages.msys2.org/search ## Notes A call to `vcpkg_acquire_msys` will usually be followed by a call to `bash.exe`: diff --git a/docs/maintainers/vcpkg_build_make.md b/docs/maintainers/vcpkg_build_make.md index 3332191d1f7154..de44a84d4a2ef7 100644 --- a/docs/maintainers/vcpkg_build_make.md +++ b/docs/maintainers/vcpkg_build_make.md @@ -7,6 +7,7 @@ Build a linux makefile project. vcpkg_build_make([BUILD_TARGET ] [ADD_BIN_TO_PATH] [ENABLE_INSTALL]) + [MAKEFILE ] [LOGFILE_ROOT ]) ``` @@ -20,10 +21,19 @@ Adds the appropriate Release and Debug `bin\` directories to the path during the ### ENABLE_INSTALL IF the port supports the install target use vcpkg_install_make() instead of vcpkg_build_make() +### MAKEFILE +Specifies the Makefile as a relative path from the root of the sources passed to `vcpkg_configure_make()` + ### BUILD_TARGET The target passed to the make build command (`./make `). If not specified, the 'all' target will be passed. +### DISABLE_PARALLEL +The underlying buildsystem will be instructed to not parallelize + +### SUBPATH +Additional subdir to invoke make in. Useful if only parts of a port should be built. + ## Notes: This command should be preceeded by a call to [`vcpkg_configure_make()`](vcpkg_configure_make.md). You can use the alias [`vcpkg_install_make()`](vcpkg_configure_make.md) function if your CMake script supports the diff --git a/docs/maintainers/vcpkg_build_nmake.md b/docs/maintainers/vcpkg_build_nmake.md index c9f4cc5d9b3480..1daa0717f14093 100644 --- a/docs/maintainers/vcpkg_build_nmake.md +++ b/docs/maintainers/vcpkg_build_nmake.md @@ -7,6 +7,7 @@ Build a msvc makefile project. vcpkg_build_nmake( SOURCE_PATH <${SOURCE_PATH}> [NO_DEBUG] + [TARGET ] [PROJECT_SUBPATH <${SUBPATH}>] [PROJECT_NAME <${MAKEFILE_NAME}>] [PRERUN_SHELL <${SHELL_PATH}>] diff --git a/docs/maintainers/vcpkg_check_linkage.md b/docs/maintainers/vcpkg_check_linkage.md index eb20e97c861919..406325dba08f84 100644 --- a/docs/maintainers/vcpkg_check_linkage.md +++ b/docs/maintainers/vcpkg_check_linkage.md @@ -28,7 +28,7 @@ This command will either alter the settings for `VCPKG_LIBRARY_LINKAGE` or fail, ## Examples -* [abseil](https://github.com/Microsoft/vcpkg/blob/master/ports/abseil/portfile.cmake) +* [libimobiledevice](https://github.com/Microsoft/vcpkg/blob/master/ports/libimobiledevice/portfile.cmake) ## Source -[scripts/cmake/vcpkg_check_linkage.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_linkage.cmake) +[scripts/cmake/vcpkg_check_linkage.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_linkage.cmake) diff --git a/docs/maintainers/vcpkg_common_definitions.md b/docs/maintainers/vcpkg_common_definitions.md index 21b05aa1df69db..9c16deba36d1c9 100644 --- a/docs/maintainers/vcpkg_common_definitions.md +++ b/docs/maintainers/vcpkg_common_definitions.md @@ -5,6 +5,7 @@ File contains helpful variabls for portfiles which are commonly needed or used. ## The following variables are available: ```cmake VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD. only defined if +VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD. only defined if VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "${VCPKG_HOST_PATH_SEPARATOR}"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "") VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host VCPKG_TARGET_EXECUTABLE_SUFFIX executable suffix of the target diff --git a/docs/maintainers/vcpkg_configure_cmake.md b/docs/maintainers/vcpkg_configure_cmake.md index 00324dc1cd2906..92e5dbb7723c8f 100644 --- a/docs/maintainers/vcpkg_configure_cmake.md +++ b/docs/maintainers/vcpkg_configure_cmake.md @@ -51,6 +51,9 @@ Additional options passed to CMake during the Release configuration. These are i ### OPTIONS_DEBUG Additional options passed to CMake during the Debug configuration. These are in addition to `OPTIONS`. +### LOGNAME +Name of the log to write the output of the configure call to. + ## Notes This command supplies many common arguments to CMake. To see the full list, examine the source. diff --git a/docs/maintainers/vcpkg_configure_make.md b/docs/maintainers/vcpkg_configure_make.md index 43f7e45f13be95..6e7f6fa9569999 100644 --- a/docs/maintainers/vcpkg_configure_make.md +++ b/docs/maintainers/vcpkg_configure_make.md @@ -7,6 +7,13 @@ Configure configure for Debug and Release builds of a project. vcpkg_configure_make( SOURCE_PATH <${SOURCE_PATH}> [AUTOCONFIG] + [USE_WRAPPERS] + [DETERMINE_BUILD_TRIPLET] + [BUILD_TRIPLET "--host=x64 --build=i686-unknown-pc"] + [NO_ADDITIONAL_PATHS] + [CONFIG_DEPENDENT_ENVIRONMENT ...] + [CONFIGURE_ENVIRONMENT_VARIABLES ...] + [ADD_BIN_TO_PATH] [NO_DEBUG] [SKIP_CONFIGURE] [PROJECT_SUBPATH <${PROJ_SUBPATH}>] @@ -29,12 +36,30 @@ By convention, this is usually set in the portfile as the variable `SOURCE_PATH` ### SKIP_CONFIGURE Skip configure process +### USE_WRAPPERS +Use autotools ar-lib and compile wrappers (only applies to windows cl and lib) + +### BUILD_TRIPLET +Used to pass custom --build/--target/--host to configure. Can be globally overwritten by VCPKG_MAKE_BUILD_TRIPLET + +### DETERMINE_BUILD_TRIPLET +For ports having a configure script following the autotools rules for selecting the triplet + +### NO_ADDITIONAL_PATHS +Don't pass any additional paths except for --prefix to the configure call + ### AUTOCONFIG Need to use autoconfig to generate configure file. ### PRERUN_SHELL Script that needs to be called before configuration (do not use for batch files which simply call autoconf or configure) +### 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 + ### OPTIONS Additional options passed to configure during the configuration. @@ -44,6 +69,14 @@ Additional options passed to configure during the Release configuration. These a ### OPTIONS_DEBUG Additional options passed to configure during the Debug configuration. These are in addition to `OPTIONS`. +### CONFIG_DEPENDENT_ENVIRONMENT +List of additional configuration dependent environment variables to set. +Pass SOMEVAR to set the environment and have SOMEVAR_(DEBUG|RELEASE) set in the portfile to the appropriate values +General environment variables can be set from within the portfile itself. + +### CONFIGURE_ENVIRONMENT_VARIABLES +List of additional environment variables to pass via the configure call. + ## Notes This command supplies many common arguments to configure. To see the full list, examine the source. diff --git a/docs/maintainers/vcpkg_download_distfile.md b/docs/maintainers/vcpkg_download_distfile.md index 18bdf9dc7f0055..36c9ff2c05af8f 100644 --- a/docs/maintainers/vcpkg_download_distfile.md +++ b/docs/maintainers/vcpkg_download_distfile.md @@ -28,6 +28,9 @@ The expected hash for the file. If this doesn't match the downloaded version, the build will be terminated with a message describing the mismatch. +### QUIET +Suppress output on cache hit + ### SKIP_SHA512 Skip SHA512 hash check for file. diff --git a/docs/maintainers/vcpkg_execute_in_download_mode.md b/docs/maintainers/vcpkg_execute_in_download_mode.md new file mode 100644 index 00000000000000..0a7f8a8f745d4f --- /dev/null +++ b/docs/maintainers/vcpkg_execute_in_download_mode.md @@ -0,0 +1,29 @@ +# vcpkg_execute_in_download_mode + +Execute a process even in download mode. + +## Usage +```cmake +vcpkg_execute_in_download_mode( + COMMAND [...] + OUTPUT_QUIET ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY + TIMEOUT + RESULT_VARIABLE + OUTPUT_VARIABLE + ERROR_VARIABLE + INPUT_FILE + OUTPUT_FILE + ERROR_FILE + ENCODING +) +``` + +The signature of this function is identical with `execute_process()` except that +it only accepts one COMMAND argument, i.e., does not support chaining multiple +commands with pipes. + +See `execute_process()` for a detailed description of the parameters. + +## Source +[scripts/cmake/vcpkg_execute_in_download_mode.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_execute_in_download_mode.cmake) diff --git a/docs/maintainers/vcpkg_execute_required_process.md b/docs/maintainers/vcpkg_execute_required_process.md index 26a116782f79e8..1691f1792d014d 100644 --- a/docs/maintainers/vcpkg_execute_required_process.md +++ b/docs/maintainers/vcpkg_execute_required_process.md @@ -8,6 +8,9 @@ vcpkg_execute_required_process( COMMAND <${PERL}> [...] WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg> LOGNAME + [TIMEOUT ] + [OUTPUT_VARIABLE ] + [ERROR_VARIABLE ] ) ``` ## Parameters @@ -24,6 +27,15 @@ The directory to execute the command in. ### LOGNAME The prefix to use for the log files. +### TIMEOUT +Optional timeout after which to terminate the command. + +### OUTPUT_VARIABLE +Optional variable to receive stdout of the command. + +### ERROR_VARIABLE +Optional variable to receive stderr of the command. + This should be a unique name for different triplets so that the logs don't conflict when building multiple at once. ## Examples diff --git a/docs/maintainers/vcpkg_find_acquire_program.md b/docs/maintainers/vcpkg_find_acquire_program.md index ae83ccb92fe4af..aef499b12e34b6 100644 --- a/docs/maintainers/vcpkg_find_acquire_program.md +++ b/docs/maintainers/vcpkg_find_acquire_program.md @@ -34,6 +34,7 @@ The current list of programs includes: - NINJA - NUGET - SCONS +- SWIG - YASM Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_acquire_msys.md). diff --git a/docs/maintainers/vcpkg_find_fortran.md b/docs/maintainers/vcpkg_find_fortran.md new file mode 100644 index 00000000000000..eb04ebdf360aab --- /dev/null +++ b/docs/maintainers/vcpkg_find_fortran.md @@ -0,0 +1,14 @@ +# vcpkg_find_fortran + +Checks if a Fortran compiler can be found. +Windows(x86/x64) Only: If not it will switch/enable MinGW gfortran + and return required cmake args for building. + +## Usage +```cmake +vcpkg_find_fortran( +) +``` + +## Source +[scripts/cmake/vcpkg_find_fortran.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_find_fortran.cmake) diff --git a/docs/maintainers/vcpkg_fixup_pkgconfig.md b/docs/maintainers/vcpkg_fixup_pkgconfig.md index 25c6aae5dec0a1..be77ae3471e6cf 100644 --- a/docs/maintainers/vcpkg_fixup_pkgconfig.md +++ b/docs/maintainers/vcpkg_fixup_pkgconfig.md @@ -8,6 +8,8 @@ vcpkg_fixup_pkgconfig( [RELEASE_FILES ...] [DEBUG_FILES ...] [SYSTEM_LIBRARIES ...] + [IGNORE_FLAGS ] + [SKIP_CHECK] ) ``` @@ -20,10 +22,6 @@ Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR} without ${CURR Specifies a list of files to apply the fixes for debug paths. Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR}/debug/ -### SYSTEM_PACKAGES -If the *.pc file contains system packages outside vcpkg these need to be listed here. -Since vcpkg checks the existence of all required packages within vcpkg. - ### SYSTEM_LIBRARIES If the *.pc file contains system libraries outside vcpkg these need to be listed here. VCPKG checks every -l flag for the existence of the required library within vcpkg. @@ -31,11 +29,13 @@ VCPKG checks every -l flag for the existence of the required library within vcpk ### IGNORE_FLAGS If the *.pc file contains flags in the lib field which are not libraries. These can be listed here +### SKIP_CHECK +Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself has unhandled cases. + ## Notes Still work in progress. If there are more cases which can be handled here feel free to add them ## Examples - Just call vcpkg_fixup_pkgconfig() after any install step which installs *.pc files. ## Source diff --git a/docs/maintainers/vcpkg_from_github.md b/docs/maintainers/vcpkg_from_github.md index 18ab5b9765a00c..64ff2b1955a2ed 100644 --- a/docs/maintainers/vcpkg_from_github.md +++ b/docs/maintainers/vcpkg_from_github.md @@ -55,6 +55,9 @@ This field should contain the scheme, host, and port of the desired URL without ### AUTHORIZATION_TOKEN A token to be passed via the Authorization HTTP header as "token ${AUTHORIZATION_TOKEN}". +### FILE_DISAMBIGUATOR +A token to uniquely identify the resulting filename if the SHA512 changes even though a git ref does not, to avoid stepping on the same file name. + ## Notes: At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. diff --git a/docs/maintainers/vcpkg_install_nmake.md b/docs/maintainers/vcpkg_install_nmake.md index e83b05ff731c14..b1ff83ef8a130e 100644 --- a/docs/maintainers/vcpkg_install_nmake.md +++ b/docs/maintainers/vcpkg_install_nmake.md @@ -7,6 +7,7 @@ Build and install a msvc makefile project. vcpkg_install_nmake( SOURCE_PATH <${SOURCE_PATH}> [NO_DEBUG] + [TARGET ] PROJECT_SUBPATH <${SUBPATH}> PROJECT_NAME <${MAKEFILE_NAME}> [PRERUN_SHELL <${SHELL_PATH}>] diff --git a/docs/maintainers/vcpkg_internal_get_cmake_vars.md b/docs/maintainers/vcpkg_internal_get_cmake_vars.md new file mode 100644 index 00000000000000..e2adfad744ad6e --- /dev/null +++ b/docs/maintainers/vcpkg_internal_get_cmake_vars.md @@ -0,0 +1,29 @@ +# vcpkg_internal_get_cmake_vars + +**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** +Runs a cmake configure with a dummy project to extract certain cmake variables + +## Usage +```cmake +vcpkg_internal_get_cmake_vars( + [OUTPUT_FILE ] + [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] +) +``` + +## Parameters +### OPTIONS +Additional options to pass to the test configure call + +### OUTPUT_FILE +Variable to return the path to the generated cmake file with the detected `CMAKE_` variables set as `VCKPG_DETECTED_` + +## Notes +If possible avoid usage in portfiles. + +## Examples + +* [vcpkg_configure_make](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_make.cmake) + +## Source +[scripts/cmake/vcpkg_internal_get_cmake_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake) diff --git a/ports/gdal/0001-Fix-debug-crt-flags.patch b/ports/gdal/0001-Fix-debug-crt-flags.patch index 266fc435532aee..1580051f5c7610 100644 --- a/ports/gdal/0001-Fix-debug-crt-flags.patch +++ b/ports/gdal/0001-Fix-debug-crt-flags.patch @@ -1,6 +1,10 @@ ---- a/nmake.opt Fri Dec 14 22:34:20 2018 -+++ b/nmake.opt Wed Mar 27 11:00:00 2019 -@@ -133,7 +133,17 @@ +diff --git a/nmake.opt b/nmake.opt +index 88e197c..308eddd 100644 +--- a/nmake.opt ++++ b/nmake.opt +@@ -147,11 +147,21 @@ CXX_PDB_FLAGS=/Zi /Fd$(GDAL_PDB) + CXX_PDB_FLAGS= + !ENDIF +# Flags to choose CRT variant to link against (e.g. static: /MT, /MTd, dynamic: /MD, /MDd) +# Ensure MRSID_CONFIG in mrsid/nmake.opt is set appropriately as well @@ -14,9 +18,11 @@ + !IFNDEF OPTFLAGS !IF "$(DEBUG)" == "0" --OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP /MD /EHsc /Ox /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG -+OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP $(CXX_CRT_FLAGS) /EHsc /Ox /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG +-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) /MD /EHsc /Ox /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG ++OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) $(CXX_CRT_FLAGS) /EHsc /Ox /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG !ELSE --OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP /MDd /EHsc /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG -+OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP $(CXX_CRT_FLAGS) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG +-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) /MDd /EHsc /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG ++OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) $(CXX_CRT_FLAGS) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG !ENDIF + !ENDIF # OPTFLAGS + diff --git a/ports/gdal/0002-Fix-build.patch b/ports/gdal/0002-Fix-build.patch new file mode 100644 index 00000000000000..13fa32562d74ab --- /dev/null +++ b/ports/gdal/0002-Fix-build.patch @@ -0,0 +1,38 @@ +diff --git a/makefile.vc b/makefile.vc +index 9e0bd44..8559f79 100644 +--- a/makefile.vc ++++ b/makefile.vc +@@ -84,7 +84,7 @@ staticlib: $(LIB_DEPENDS) + call < - #include - #include -+#include - - CPL_CVSID("$Id: ogrlinestring.cpp 61153d33d7f055c3442ff728adbfa8e09582464b 2019-03-10 14:23:51 +0100 Even Rouault $") - diff --git a/ports/gdal/0004-Fix-std-fabs.patch b/ports/gdal/0004-Fix-std-fabs.patch new file mode 100644 index 00000000000000..08fb21ce7bffb5 --- /dev/null +++ b/ports/gdal/0004-Fix-std-fabs.patch @@ -0,0 +1,12 @@ +diff --git a/ogr/ogrlinestring.cpp b/ogr/ogrlinestring.cpp +index 1e16d9f..cf7ced1 100644 +--- a/ogr/ogrlinestring.cpp ++++ b/ogr/ogrlinestring.cpp +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + CPL_CVSID("$Id: ogrlinestring.cpp ad9178b63f501e9840d86a3220c9e5100c6e3fa2 2019-10-21 13:19:06 +0200 Even Rouault $") + diff --git a/ports/gdal/0005-Fix-cfitsio.patch b/ports/gdal/0005-Fix-cfitsio.patch new file mode 100644 index 00000000000000..5e3814a3dcbfe3 --- /dev/null +++ b/ports/gdal/0005-Fix-cfitsio.patch @@ -0,0 +1,13 @@ +diff --git a/frmts/fits/fitsdataset.cpp b/frmts/fits/fitsdataset.cpp +index 4f41a12..723d211 100644 +--- a/frmts/fits/fitsdataset.cpp ++++ b/frmts/fits/fitsdataset.cpp +@@ -34,7 +34,7 @@ + #include "ogr_spatialref.h" + + #include +-#include ++#include + + #include + #include diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 89bf2d2af9ffc1..00177bc067e003 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,9 +1,8 @@ Source: gdal -Version: 2.4.1 -Port-Version: 14 +Version: 3.1.3 Homepage: https://gdal.org/ Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data. -Build-Depends: proj4, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib +Build-Depends: proj4, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib, libgeotiff, cfitsio, json-c (!windows) Supports: !arm Feature: mysql-libmariadb diff --git a/ports/gdal/dependency_win.cmake b/ports/gdal/dependency_win.cmake new file mode 100644 index 00000000000000..0d9dfa53368978 --- /dev/null +++ b/ports/gdal/dependency_win.cmake @@ -0,0 +1,120 @@ +macro(find_dependency_win) + # Setup proj4 libraries + include path + set(PROJ_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include") + set(PROJ_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/proj.lib") + set(PROJ_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib") + + # Setup libpng libraries + include path + set(PNG_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include") + set(PNG_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libpng16.lib" ) + set(PNG_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" ) + + # Setup zlib libraries + include path + set(ZLIB_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) + set(ZLIB_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/zlib.lib" ) + set(ZLIB_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib" ) + + # Setup geos libraries + include path + set(GEOS_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) + set(GEOS_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib" ) + set(GEOS_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib" ) + + # Setup expat libraries + include path + set(EXPAT_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(EXPAT_SUFFIX "MT") + else() + set(EXPAT_SUFFIX "MD") + endif() + set(EXPAT_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libexpat${EXPAT_SUFFIX}.lib" ) + set(EXPAT_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd${EXPAT_SUFFIX}.lib" ) + else() + set(EXPAT_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libexpat.lib" ) + set(EXPAT_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd.lib" ) + endif() + + # Setup curl libraries + include path + set(CURL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) + if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib") + set(CURL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib" ) + elseif(EXISTS "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib") + set(CURL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib" ) + endif() + if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d.lib") + set(CURL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d.lib" ) + elseif(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d_imp.lib") + set(CURL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d_imp.lib" ) + endif() + + # Setup sqlite3 libraries + include path + set(SQLITE_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) + set(SQLITE_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib" ) + set(SQLITE_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib" ) + + # Setup PostgreSQL libraries + include path + set(PGSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) + set(PGSQL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libpq.lib" ) + set(PGSQL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libpq.lib" ) + + set(TMP_REL "${CURRENT_INSTALLED_DIR}/lib/libpgcommon.lib" ) + set(TMP_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libpgcommon.lib" ) + set(PGSQL_LIBRARY_REL "${PGSQL_LIBRARY_REL} ${TMP_REL}") + set(PGSQL_LIBRARY_DBG "${PGSQL_LIBRARY_DBG} ${TMP_DBG}") + + set(TMP_REL "${CURRENT_INSTALLED_DIR}/lib/libpgport.lib" ) + set(TMP_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libpgport.lib" ) + set(PGSQL_LIBRARY_REL "${PGSQL_LIBRARY_REL} ${TMP_REL}") + set(PGSQL_LIBRARY_DBG "${PGSQL_LIBRARY_DBG} ${TMP_DBG}") + + # Setup OpenJPEG libraries + include path + set(OPENJPEG_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) + set(OPENJPEG_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/openjp2.lib" ) + set(OPENJPEG_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/openjp2.lib" ) + + # Setup WebP libraries + include path + set(WEBP_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) + set(WEBP_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/webp.lib" ) + set(WEBP_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/webpd.lib" ) + + # Setup libxml2 libraries + include path + set(XML2_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) + set(XML2_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib" ) + set(XML2_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib" ) + + # Setup liblzma libraries + include path + set(LZMA_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) + set(LZMA_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/lzma.lib" ) + set(LZMA_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib" ) + + # Setup openssl libraries path + set(OPENSSL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libcrypto.lib ${CURRENT_INSTALLED_DIR}/lib/libssl.lib" ) + set(OPENSSL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.lib" ) + + # Setup libiconv libraries path + set(ICONV_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/lib/charset.lib" ) + set(ICONV_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib" ) + + if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES) + # Setup MySQL libraries + include path + if("mysql-libmysql" IN_LIST FEATURES) + set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql" ) + set(MYSQL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib" ) + set(MYSQL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib" ) + endif() + + if("mysql-libmariadb" IN_LIST FEATURES) + set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql" ) + set(MYSQL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libmariadb.lib" ) + set(MYSQL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libmariadb.lib" ) + endif() + endif() + + if ("libspatialite" IN_LIST FEATURES) + # Setup spatialite libraries + include path + set(SPATIALITE_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/spatialite" ) + set(SPATIALITE_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/spatialite.lib" ) + set(SPATIALITE_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib" ) + set(HAVE_SPATIALITE "-DHAVE_SPATIALITE") + endif() +endmacro() \ No newline at end of file diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 8c3650629eb945..8675d8ced675fa 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -1,186 +1,45 @@ -# NOTE: update the version and checksum for new GDAL release -set(GDAL_VERSION_STR "2.4.1") -set(GDAL_VERSION_PKG "241") -set(GDAL_VERSION_LIB "204") -set(GDAL_PACKAGE_SUM "edb9679ee6788334cf18971c803615ac9b1c72bc0c96af8fd4852cb7e8f58e9c4f3d9cb66406bc8654419612e1a7e9d0e62f361712215f4a50120f646bb0a738") +include(${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake) +#include(${CMAKE_CURRENT_LIST_DIR}/dependency_unix.cmake) vcpkg_fail_port_install(ON_ARCH "arm") +# NOTE: update the version and checksum for new GDAL release +set(GDAL_VERSION_STR "3.1.3") +set(GDAL_VERSION_PKG "313") +set(GDAL_VERSION_LIB "204") +set(GDAL_PACKAGE_SUM "a6dad37813eecb5e0c888ec940cf7f83c5096e69e4f33a3e5a5557542e7f656b9726e470e1b5d3d035de53df065510931a436a8c889f1366abd630c1cf5dfb49") + vcpkg_download_distfile(ARCHIVE URLS "http://download.osgeo.org/gdal/${GDAL_VERSION_STR}/gdal${GDAL_VERSION_PKG}.zip" FILENAME "gdal${GDAL_VERSION_PKG}.zip" SHA512 ${GDAL_PACKAGE_SUM} ) -# Extract source into architecture specific directory, because GDALs' nmake based build currently does not -# support out of source builds. -set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-debug/gdal-${GDAL_VERSION_STR}) -set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-release/gdal-${GDAL_VERSION_STR}) - -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - list(APPEND BUILD_TYPES "release") -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - list(APPEND BUILD_TYPES "debug") +set(GDAL_PATCHES 0001-Fix-debug-crt-flags.patch 0002-Fix-build.patch) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND GDAL_PATCHES 0003-Fix-static-build.patch) endif() +list(APPEND GDAL_PATCHES 0004-Fix-std-fabs.patch 0005-Fix-cfitsio.patch) -foreach(BUILD_TYPE IN LISTS BUILD_TYPES) - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}) - vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}) - if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR} - PATCHES - 0001-Fix-debug-crt-flags.patch - 0002-Fix-static-build.patch - ) - else() - vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR} - PATCHES - 0001-Fix-debug-crt-flags.patch - ) - endif() - vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR}/ogr - PATCHES - 0003-Fix-std-fabs.patch - ) -endforeach() - -if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - # Check build system first - find_program(NMAKE nmake REQUIRED) - - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR) - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/gdal" NATIVE_DATA_DIR) - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/gdal/html" NATIVE_HTML_DIR) - - # Setup proj4 libraries + include path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PROJ_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/proj.lib" PROJ_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib" PROJ_LIBRARY_DBG) - - # Setup libpng libraries + include path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PNG_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpng16.lib" PNG_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" PNG_LIBRARY_DBG) - - # Setup zlib libraries + include path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" ZLIB_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/zlib.lib" ZLIB_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib" ZLIB_LIBRARY_DBG) - - # Setup geos libraries + include path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" GEOS_INCLUDE_DIR) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib ${CURRENT_INSTALLED_DIR}/lib/geos.lib" GEOS_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/geosd.lib" GEOS_LIBRARY_DBG) - else() - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib" GEOS_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib" GEOS_LIBRARY_DBG) - endif() - - # Setup expat libraries + include path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" EXPAT_INCLUDE_DIR) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libexpatMD.lib" EXPAT_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatdMD.lib" EXPAT_LIBRARY_DBG) - else() - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libexpat.lib" EXPAT_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd.lib" EXPAT_LIBRARY_DBG) - endif() - - # Setup curl libraries + include path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" CURL_INCLUDE_DIR) - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib" CURL_LIBRARY_REL) - elseif(EXISTS "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib" CURL_LIBRARY_REL) - endif() - if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d.lib" CURL_LIBRARY_DBG) - elseif(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d_imp.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d_imp.lib" CURL_LIBRARY_DBG) - endif() - - # Setup sqlite3 libraries + include path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" SQLITE_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib" SQLITE_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib" SQLITE_LIBRARY_DBG) - - # Setup PostgreSQL libraries + include path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PGSQL_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpq.lib" PGSQL_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpq.lib" PGSQL_LIBRARY_DBG) - - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpgcommon.lib" TMP_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpgcommon.lib" TMP_DBG) - set(PGSQL_LIBRARY_REL "${PGSQL_LIBRARY_REL} ${TMP_REL}") - set(PGSQL_LIBRARY_DBG "${PGSQL_LIBRARY_DBG} ${TMP_DBG}") - - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpgport.lib" TMP_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpgport.lib" TMP_DBG) - set(PGSQL_LIBRARY_REL "${PGSQL_LIBRARY_REL} ${TMP_REL}") - set(PGSQL_LIBRARY_DBG "${PGSQL_LIBRARY_DBG} ${TMP_DBG}") - - # Setup OpenJPEG libraries + include path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" OPENJPEG_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/openjp2.lib" OPENJPEG_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/openjp2.lib" OPENJPEG_LIBRARY_DBG) - - # Setup WebP libraries + include path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" WEBP_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/webp.lib" WEBP_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/webpd.lib" WEBP_LIBRARY_DBG) - - # Setup libxml2 libraries + include path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" XML2_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib" XML2_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib" XML2_LIBRARY_DBG) - - # Setup liblzma libraries + include path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" LZMA_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/lzma.lib" LZMA_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib" LZMA_LIBRARY_DBG) +vcpkg_extract_source_archive_ex( + ARCHIVE ${ARCHIVE} + OUT_SOURCE_PATH SOURCE_PATH + PATCHES ${GDAL_PATCHES} +) - # Setup openssl libraries path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcrypto.lib ${CURRENT_INSTALLED_DIR}/lib/libssl.lib" OPENSSL_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.lib" OPENSSL_LIBRARY_DBG) +if (VCPKG_TARGET_IS_WINDOWS) + set(NATIVE_DATA_DIR "${CURRENT_PACKAGES_DIR}/share/gdal") + set(NATIVE_HTML_DIR "${CURRENT_PACKAGES_DIR}/share/gdal/html") - # Setup libiconv libraries path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/lib/charset.lib" ICONV_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib" ICONV_LIBRARY_DBG) + find_dependency_win() if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES) - # Setup MySQL libraries + include path - if("mysql-libmysql" IN_LIST FEATURES) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/mysql" MYSQL_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib" MYSQL_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib" MYSQL_LIBRARY_DBG) - endif() - - if("mysql-libmariadb" IN_LIST FEATURES) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/mysql" MYSQL_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libmariadb.lib" MYSQL_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libmariadb.lib" MYSQL_LIBRARY_DBG) - endif() - list(APPEND NMAKE_OPTIONS MYSQL_INC_DIR=${MYSQL_INCLUDE_DIR}) list(APPEND NMAKE_OPTIONS_REL MYSQL_LIB=${MYSQL_LIBRARY_REL}) list(APPEND NMAKE_OPTIONS_DBG MYSQL_LIB=${MYSQL_LIBRARY_DBG}) endif() - if ("libspatialite" IN_LIST FEATURES) - # Setup spatialite libraries + include path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/spatialite" SPATIALITE_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/spatialite.lib" SPATIALITE_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib" SPATIALITE_LIBRARY_DBG) - set(HAVE_SPATIALITE "-DHAVE_SPATIALITE") - endif() - list(APPEND NMAKE_OPTIONS - GDAL_HOME=${NATIVE_PACKAGES_DIR} DATADIR=${NATIVE_DATA_DIR} HTMLDIR=${NATIVE_HTML_DIR} GEOS_DIR=${GEOS_INCLUDE_DIR} @@ -227,6 +86,7 @@ if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) list(APPEND NMAKE_OPTIONS_REL ${NMAKE_OPTIONS} + GDAL_HOME=${CURRENT_PACKAGES_DIR} CXX_CRT_FLAGS=${LINKAGE_FLAGS} PROJ_LIBRARY=${PROJ_LIBRARY_REL} PNG_LIB=${PNG_LIBRARY_REL} @@ -243,6 +103,7 @@ if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) list(APPEND NMAKE_OPTIONS_DBG ${NMAKE_OPTIONS} + GDAL_HOME=${CURRENT_PACKAGES_DIR}/debug CXX_CRT_FLAGS="${LINKAGE_FLAGS}d" PROJ_LIBRARY=${PROJ_LIBRARY_DBG} PNG_LIB=${PNG_LIBRARY_DBG} @@ -259,175 +120,94 @@ if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) ) # Begin build process - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - ################ - # Release build - ################ - message(STATUS "Building ${TARGET_TRIPLET}-rel") - vcpkg_execute_required_process( - COMMAND ${NMAKE} -f makefile.vc - ${NMAKE_OPTIONS_REL} - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME nmake-build-${TARGET_TRIPLET}-release - ) - message(STATUS "Building ${TARGET_TRIPLET}-rel done") - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - ################ - # Debug build - ################ - - message(STATUS "Building ${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process( - COMMAND ${NMAKE} /G -f makefile.vc - ${NMAKE_OPTIONS_DBG} - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - LOGNAME nmake-build-${TARGET_TRIPLET}-debug - ) - message(STATUS "Building ${TARGET_TRIPLET}-dbg done") - endif() - - message(STATUS "Packaging ${TARGET_TRIPLET}") + vcpkg_install_nmake( + SOURCE_PATH ${SOURCE_PATH} + TARGET devinstall + OPTIONS_RELEASE + "${NMAKE_OPTIONS_REL}" + OPTIONS_DEBUG + "${NMAKE_OPTIONS_DBG}" + ) if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/gdal/html) endif() - vcpkg_execute_required_process( - COMMAND ${NMAKE} -f makefile.vc - ${NMAKE_OPTIONS_REL} - install - devinstall - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME nmake-install-${TARGET_TRIPLET} - ) - - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(COPY ${SOURCE_PATH_RELEASE}/gdal.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(COPY ${SOURCE_PATH_DEBUG}/gdal.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib) - endif() - + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + list(APPEND GDAL_EXES + gdal_contour + gdal_grid + gdal_rasterize + gdal_translate + gdal_viewshed + gdaladdo + gdalbuildvrt + gdaldem + gdalenhance + gdalinfo + gdallocationinfo + gdalmanage + gdalmdiminfo + gdalmdimtranslate + gdalserver + gdalsrsinfo + gdaltindex + gdaltransform + gdalwarp + gnmanalyse + gnmmanage + nearblack + ogr2ogr + ogrinfo + ogrlineref + ogrtindex + testepsg + ) + vcpkg_copy_tools(TOOL_NAMES ${GDAL_EXES} AUTO_CLEAN) else() - - set(GDAL_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/gdal) - file(MAKE_DIRECTORY ${GDAL_TOOL_PATH}) - - file(GLOB GDAL_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe) - file(COPY ${GDAL_TOOLS} DESTINATION ${GDAL_TOOL_PATH}) - file(REMOVE_RECURSE ${GDAL_TOOLS}) - - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal.lib) - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/lib/gdal.lib) - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(COPY ${SOURCE_PATH_DEBUG}/gdal${GDAL_VERSION_LIB}.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(COPY ${SOURCE_PATH_DEBUG}/gdal_i.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib) - endif() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/share/gdal/html) - # Copy over PDBs vcpkg_copy_pdbs() if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal204.pdb) endif() -elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") # Build in UNIX - # Check build system first - find_program(MAKE make) - if (NOT MAKE) - message(FATAL_ERROR "MAKE not found") - endif() - - set(ENV{CFLAGS} "$ENV{CFLAGS} -Wno-error=implicit-function-declaration") - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - ################ - # Release build - ################ - message(STATUS "Configuring ${TARGET_TRIPLET}-rel") - set(OUT_PATH_RELEASE ${SOURCE_PATH_RELEASE}/../../make-build-${TARGET_TRIPLET}-release) - file(MAKE_DIRECTORY ${OUT_PATH_RELEASE}) - vcpkg_execute_required_process( - COMMAND "${SOURCE_PATH_RELEASE}/configure" --prefix=${OUT_PATH_RELEASE} - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME config-${TARGET_TRIPLET}-rel - ) - - message(STATUS "Building ${TARGET_TRIPLET}-rel") - vcpkg_execute_build_process( - COMMAND make -j ${VCPKG_CONCURRENCY} - NO_PARALLEL_COMMAND make - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME make-build-${TARGET_TRIPLET}-release - ) - - message(STATUS "Installing ${TARGET_TRIPLET}-rel") - vcpkg_execute_required_process( - COMMAND make install - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME make-install-${TARGET_TRIPLET}-release - ) - - file(REMOVE_RECURSE ${OUT_PATH_RELEASE}/lib/gdalplugins) - file(COPY ${OUT_PATH_RELEASE}/lib/pkgconfig DESTINATION ${OUT_PATH_RELEASE}/share/gdal) - file(REMOVE_RECURSE ${OUT_PATH_RELEASE}/lib/pkgconfig) - file(COPY ${OUT_PATH_RELEASE}/lib DESTINATION ${CURRENT_PACKAGES_DIR}) - file(COPY ${OUT_PATH_RELEASE}/include DESTINATION ${CURRENT_PACKAGES_DIR}) - file(COPY ${OUT_PATH_RELEASE}/share DESTINATION ${CURRENT_PACKAGES_DIR}) - message(STATUS "Installing ${TARGET_TRIPLET}-rel done") - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - ################ - # Debug build - ################ - message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") - set(OUT_PATH_DEBUG ${SOURCE_PATH_RELEASE}/../../make-build-${TARGET_TRIPLET}-debug) - file(MAKE_DIRECTORY ${OUT_PATH_DEBUG}) - vcpkg_execute_required_process( - COMMAND "${SOURCE_PATH_DEBUG}/configure" --prefix=${OUT_PATH_DEBUG} - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - LOGNAME config-${TARGET_TRIPLET}-debug - ) - - message(STATUS "Building ${TARGET_TRIPLET}-dbg") - vcpkg_execute_build_process( - COMMAND make -j ${VCPKG_CONCURRENCY} - NO_PARALLEL_COMMAND make - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - LOGNAME make-build-${TARGET_TRIPLET}-debug +else() + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_DYNAMIC yes) + set(BUILD_STATIC no) + else() + set(BUILD_DYNAMIC no) + set(BUILD_STATIC yes) + endif() + + set(CONF_OPTS --enable-shared=${BUILD_DYNAMIC} --enable-static=${BUILD_STATIC}) + list(APPEND CONF_OPTS --with-proj=${CURRENT_INSTALLED_DIR} --with-libjson-c=${CURRENT_INSTALLED_DIR}) + + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + COPY_SOURCE + OPTIONS ${CONF_OPTS} + OPTIONS_DEBUG + --enable-debug + --without-fit # Disable cfitsio temporary ) - - message(STATUS "Installing ${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process( - COMMAND make -j install - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - LOGNAME make-install-${TARGET_TRIPLET}-debug + + vcpkg_install_make(MAKEFILE GNUmakefile) + + file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/lib/gdalplugins + ${CURRENT_PACKAGES_DIR}/debug/lib/gdalplugins + ${CURRENT_PACKAGES_DIR}/debug/share ) - - file(REMOVE_RECURSE ${OUT_PATH_DEBUG}/lib/gdalplugins) - file(REMOVE_RECURSE ${OUT_PATH_DEBUG}/lib/pkgconfig) - file(COPY ${OUT_PATH_DEBUG}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug) - message(STATUS "Installing ${TARGET_TRIPLET}-dbg done") - endif() -else() # Other build system - message(FATAL_ERROR "Unsupport build system.") endif() file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) # Handle copyright -configure_file(${SOURCE_PATH_RELEASE}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/gdal/usage b/ports/gdal/usage index 2ee0072acd1e40..63a67bc07d0748 100644 --- a/ports/gdal/usage +++ b/ports/gdal/usage @@ -1,5 +1,5 @@ The package GDAL provides CMake targets: find_package(GDAL REQUIRED) - target_include_directories(main PRIVATE ${GDAL_INCLUDE_DIR}) - target_link_libraries(main PRIVATE ${GDAL_LIBRARY}) \ No newline at end of file + target_include_directories(main PRIVATE ${GDAL_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${GDAL_LIBRARIES}) diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index 89550ddf834562..30c3b5a6675254 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -3,10 +3,10 @@ include(SelectLibraryConfigurations) find_path(GDAL_INCLUDE_DIR NAMES gdal.h HINTS ${CURRENT_INSTALLED_DIR}) -find_library(GDAL_LIBRARY_DEBUG NAMES gdal gdald NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) -find_library(GDAL_LIBRARY_RELEASE NAMES gdal NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) +find_library(GDAL_LIBRARY_DEBUG NAMES gdal_d gdal_i_d gdal NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) +find_library(GDAL_LIBRARY_RELEASE NAMES gdal_i gdal NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) select_library_configurations(GDAL) -set(GDAL_INCLUDE_DIR ${GDAL_INCLUDE_DIR}) -set(GDAL_LIBRARY ${GDAL_LIBRARY}) +set(GDAL_INCLUDE_DIRS ${GDAL_INCLUDE_DIR}) +set(GDAL_LIBRARIES ${GDAL_LIBRARY}) diff --git a/ports/pdal/PDALConfig.patch b/ports/pdal/PDALConfig.patch deleted file mode 100644 index 25e9bfcbed2332..00000000000000 --- a/ports/pdal/PDALConfig.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in -index a03ef142e..2d06a2937 100644 ---- a/PDALConfig.cmake.in -+++ b/PDALConfig.cmake.in -@@ -15,6 +15,9 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@) - list(APPEND PDAL_LIBRARY_DIRS ${_foo}) - endforeach(_dir) - -+include(CMakeFindDependencyMacro) -+find_dependency(GeoTIFF) -+find_dependency(CURL) - include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake") - - if (WIN32) diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index f7351c950ec3b5..352eb1d43f1b17 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -1,20 +1,19 @@ diff --git a/cmake/geos.cmake b/cmake/geos.cmake -index 90b79d9..4e144a6 100644 +index 90b79d9..5942ee5 100644 --- a/cmake/geos.cmake +++ b/cmake/geos.cmake -@@ -1,7 +1,11 @@ +@@ -1,8 +1,5 @@ # # GEOS (required) # -find_package(GEOS QUIET 3.3) -+include(SelectLibraryConfigurations) -+find_library(GEOS_LIBRARY_RELEASE NAMES geos_c libgeos_c) -+find_library(GEOS_LIBRARY_DEBUG NAMES geos_cd libgeos_cd) -+select_library_configurations(GEOS) -+find_path(GEOS_INCLUDE_DIR geos_c.h) - set_package_properties(GEOS PROPERTIES TYPE REQUIRED - PURPOSE "Provides general purpose geometry support") - +-set_package_properties(GEOS PROPERTIES TYPE REQUIRED +- PURPOSE "Provides general purpose geometry support") +- +-include_directories("${GEOS_INCLUDE_DIR}") ++find_package(geos CONFIG REQUIRED) ++set(GEOS_LIBRARY GEOS::geos GEOS::geos_c GEOS::geos_cxx_flags) +\ No newline at end of file diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake index 8178418..31b54d6 100644 --- a/cmake/modules/FindPostgreSQL.cmake @@ -46,14 +45,18 @@ index 42cca1e..43b0ced 100644 add_subdirectory(vendor/kazhdan) if (NOT PDAL_HAVE_JSONCPP) diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in -index ea695cf..21b66a1 100644 +index a03ef14..9d073e6 100644 --- a/PDALConfig.cmake.in +++ b/PDALConfig.cmake.in -@@ -18,6 +18,7 @@ endforeach(_dir) - include(CMakeFindDependencyMacro) - find_dependency(GeoTIFF) - find_dependency(CURL) +@@ -15,6 +15,11 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@) + list(APPEND PDAL_LIBRARY_DIRS ${_foo}) + endforeach(_dir) + ++include(CMakeFindDependencyMacro) ++find_dependency(GeoTIFF) ++find_dependency(CURL) +find_dependency(Boost COMPONENTS system filesystem) ++find_dependency(geos CONFIG) include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake") if (WIN32) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index b6c503d161d82c..8099bed6f92ec3 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -13,7 +13,6 @@ vcpkg_extract_source_archive_ex( 0001-win32_compiler_options.cmake.patch 0002-no-source-dir-writes.patch 0003-fix-copy-vendor.patch - PDALConfig.patch fix-dependency.patch libpq.patch fix-CPL_DLL.patch diff --git a/scripts/cmake/execute_process.cmake b/scripts/cmake/execute_process.cmake index 97af4eea1377fd..76a3d9a8b9d74d 100644 --- a/scripts/cmake/execute_process.cmake +++ b/scripts/cmake/execute_process.cmake @@ -3,7 +3,7 @@ ## Intercepts all calls to execute_process() inside portfiles and fails when Download Mode ## is enabled. ## -## In order to execute a process in Download Mode call `_execute_process()` instead. +## In order to execute a process in Download Mode call `vcpkg_execute_in_download_mode()` instead. ## if (NOT DEFINED OVERRIDEN_EXECUTE_PROCESS) set(OVERRIDEN_EXECUTE_PROCESS ON) @@ -17,4 +17,4 @@ if (NOT DEFINED OVERRIDEN_EXECUTE_PROCESS) execute_process(${ARGV}) endmacro() endif() -endif() \ No newline at end of file +endif() diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index a6adebc435d506..6deded6471ee3c 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -7,6 +7,7 @@ ## vcpkg_build_make([BUILD_TARGET ] ## [ADD_BIN_TO_PATH] ## [ENABLE_INSTALL]) +## [MAKEFILE ] ## [LOGFILE_ROOT ]) ## ``` ## @@ -20,6 +21,9 @@ ## ### ENABLE_INSTALL ## IF the port supports the install target use vcpkg_install_make() instead of vcpkg_build_make() ## +## ### MAKEFILE +## Specifies the Makefile as a relative path from the root of the sources passed to `vcpkg_configure_make()` +## ## ### BUILD_TARGET ## The target passed to the make build command (`./make `). If not specified, the 'all' target will ## be passed. @@ -49,7 +53,7 @@ function(vcpkg_build_make) include("${_VCPKG_CMAKE_VARS_FILE}") # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _bc "ADD_BIN_TO_PATH;ENABLE_INSTALL;DISABLE_PARALLEL" "LOGFILE_ROOT;BUILD_TARGET;SUBPATH" "") + cmake_parse_arguments(PARSE_ARGV 0 _bc "ADD_BIN_TO_PATH;ENABLE_INSTALL;DISABLE_PARALLEL" "LOGFILE_ROOT;BUILD_TARGET;SUBPATH;MAKEFILE" "") if(NOT _bc_LOGFILE_ROOT) set(_bc_LOGFILE_ROOT "build") @@ -59,6 +63,10 @@ function(vcpkg_build_make) set(_bc_BUILD_TARGET "all") endif() + if (NOT _bc_MAKEFILE) + set(_bc_MAKEFILE Makefile) + endif() + if(WIN32) set(_VCPKG_PREFIX ${CURRENT_PACKAGES_DIR}) set(_VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR}) @@ -76,22 +84,22 @@ function(vcpkg_build_make) vcpkg_acquire_msys(MSYS_ROOT) find_program(MAKE make REQUIRED) set(MAKE_COMMAND "${MAKE}") - set(MAKE_OPTS ${_bc_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY} --trace -f Makefile ${_bc_BUILD_TARGET}) - set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} -j 1 --trace -f Makefile ${_bc_BUILD_TARGET}) + set(MAKE_OPTS ${_bc_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) + set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} -j 1 --trace -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) string(REPLACE " " "\\\ " _VCPKG_PACKAGE_PREFIX ${CURRENT_PACKAGES_DIR}) # Don't know why '/cygdrive' is suddenly a requirement here. (at least for x264) string(REGEX REPLACE "([a-zA-Z]):/" "/cygdrive/\\1/" _VCPKG_PACKAGE_PREFIX "${_VCPKG_PACKAGE_PREFIX}") - set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} --trace -f Makefile install DESTDIR=${_VCPKG_PACKAGE_PREFIX}) + set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} install DESTDIR=${_VCPKG_PACKAGE_PREFIX}) #TODO: optimize for install-data (release) and install-exec (release/debug) else() # Compiler requriements find_program(MAKE make REQUIRED) set(MAKE_COMMAND "${MAKE}") # Set make command and install command - set(MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f Makefile ${_bc_BUILD_TARGET}) - set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j 1 -f Makefile ${_bc_BUILD_TARGET}) - set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} -f Makefile install DESTDIR=${CURRENT_PACKAGES_DIR}) + set(MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) + set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j 1 -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) + set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} install DESTDIR=${CURRENT_PACKAGES_DIR}) endif() # Since includes are buildtype independent those are setup by vcpkg_configure_make diff --git a/scripts/cmake/vcpkg_build_nmake.cmake b/scripts/cmake/vcpkg_build_nmake.cmake index 371dea0ee73dc4..7f81ca29322f76 100644 --- a/scripts/cmake/vcpkg_build_nmake.cmake +++ b/scripts/cmake/vcpkg_build_nmake.cmake @@ -7,6 +7,7 @@ ## vcpkg_build_nmake( ## SOURCE_PATH <${SOURCE_PATH}> ## [NO_DEBUG] +## [TARGET ] ## [PROJECT_SUBPATH <${SUBPATH}>] ## [PROJECT_NAME <${MAKEFILE_NAME}>] ## [PRERUN_SHELL <${SHELL_PATH}>] @@ -75,7 +76,7 @@ function(vcpkg_build_nmake) cmake_parse_arguments(PARSE_ARGV 0 _bn "ADD_BIN_TO_PATH;ENABLE_INSTALL;NO_DEBUG" "SOURCE_PATH;PROJECT_SUBPATH;PROJECT_NAME;LOGFILE_ROOT" - "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG;PRERUN_SHELL;PRERUN_SHELL_DEBUG;PRERUN_SHELL_RELEASE" + "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG;PRERUN_SHELL;PRERUN_SHELL_DEBUG;PRERUN_SHELL_RELEASE;TARGET" ) if (NOT CMAKE_HOST_WIN32) @@ -98,7 +99,6 @@ function(vcpkg_build_nmake) set(MAKE ) set(MAKE_OPTS_BASE ) - set(INSTALL_OPTS_BASE ) find_program(NMAKE nmake REQUIRED) get_filename_component(NMAKE_EXE_PATH ${NMAKE} DIRECTORY) @@ -112,8 +112,15 @@ function(vcpkg_build_nmake) set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") # Set make command and install command set(MAKE ${NMAKE} /NOLOGO /G /U) - set(MAKE_OPTS_BASE -f ${MAKEFILE_NAME} all) - set(INSTALL_OPTS_BASE install) + set(MAKE_OPTS_BASE -f ${MAKEFILE_NAME}) + if (_bn_ENABLE_INSTALL) + set(INSTALL_COMMAND install) + endif() + if (_bn_TARGET) + set(MAKE_OPTS_BASE ${MAKE_OPTS_BASE} ${_bn_TARGET} ${INSTALL_COMMAND}) + else() + set(MAKE_OPTS_BASE ${MAKE_OPTS_BASE} all ${INSTALL_COMMAND}) + endif() # Add subpath to work directory if (_bn_PROJECT_SUBPATH) set(_bn_PROJECT_SUBPATH /${_bn_PROJECT_SUBPATH}) @@ -134,7 +141,7 @@ function(vcpkg_build_nmake) # Add install command and arguments set(MAKE_OPTS ${MAKE_OPTS_BASE}) if (_bn_ENABLE_INSTALL) - set(INSTALL_OPTS ${INSTALL_OPTS_BASE} INSTALLDIR=${CURRENT_PACKAGES_DIR}/debug) + set(INSTALL_OPTS INSTALLDIR=${CURRENT_PACKAGES_DIR}/debug) set(MAKE_OPTS ${MAKE_OPTS} ${INSTALL_OPTS}) endif() set(MAKE_OPTS ${MAKE_OPTS} ${_bn_OPTIONS} ${_bn_OPTIONS_DEBUG}) @@ -154,7 +161,7 @@ function(vcpkg_build_nmake) # Add install command and arguments set(MAKE_OPTS ${MAKE_OPTS_BASE}) if (_bn_ENABLE_INSTALL) - set(INSTALL_OPTS ${INSTALL_OPTS_BASE} INSTALLDIR=${CURRENT_PACKAGES_DIR}) + set(INSTALL_OPTS INSTALLDIR=${CURRENT_PACKAGES_DIR}) set(MAKE_OPTS ${MAKE_OPTS} ${INSTALL_OPTS}) endif() set(MAKE_OPTS ${MAKE_OPTS} ${_bn_OPTIONS} ${_bn_OPTIONS_RELEASE}) diff --git a/scripts/cmake/vcpkg_install_nmake.cmake b/scripts/cmake/vcpkg_install_nmake.cmake index c4d600cc6e09fc..05efce2e238e80 100644 --- a/scripts/cmake/vcpkg_install_nmake.cmake +++ b/scripts/cmake/vcpkg_install_nmake.cmake @@ -7,6 +7,7 @@ ## vcpkg_install_nmake( ## SOURCE_PATH <${SOURCE_PATH}> ## [NO_DEBUG] +## [TARGET ] ## PROJECT_SUBPATH <${SUBPATH}> ## PROJECT_NAME <${MAKEFILE_NAME}> ## [PRERUN_SHELL <${SHELL_PATH}>] @@ -66,7 +67,7 @@ function(vcpkg_install_nmake) cmake_parse_arguments(PARSE_ARGV 0 _in "NO_DEBUG" "SOURCE_PATH;PROJECT_SUBPATH;PROJECT_NAME" - "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG;PRERUN_SHELL;PRERUN_SHELL_DEBUG;PRERUN_SHELL_RELEASE" + "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG;PRERUN_SHELL;PRERUN_SHELL_DEBUG;PRERUN_SHELL_RELEASE;TARGET" ) if (NOT CMAKE_HOST_WIN32) @@ -77,8 +78,15 @@ function(vcpkg_install_nmake) set(NO_DEBUG NO_DEBUG) endif() + if (NOT _in_TARGET) + set(INSTALL_TARGET "all") + else() + set(INSTALL_TARGET "${_in_TARGET}") + endif() + vcpkg_build_nmake(LOGFILE_ROOT ENABLE_INSTALL ${NO_DEBUG} + TARGET "${INSTALL_TARGET}" SOURCE_PATH ${_in_SOURCE_PATH} PROJECT_SUBPATH ${_in_PROJECT_SUBPATH} PROJECT_NAME ${_in_PROJECT_NAME} PRERUN_SHELL ${_in_PRERUN_SHELL} PRERUN_SHELL_DEBUG ${_in_PRERUN_SHELL_DEBUG} PRERUN_SHELL_RELEASE ${_in_PRERUN_SHELL_RELEASE} OPTIONS ${_in_OPTIONS} OPTIONS_RELEASE ${_in_OPTIONS_RELEASE} OPTIONS_DEBUG ${_in_OPTIONS_DEBUG} From eb0c95034cf93d4d25d63558186b9719105afd27 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 20 Nov 2020 20:38:27 +0100 Subject: [PATCH 0110/1694] [leptonica] add missing dependency on big sur (#14655) --- ports/leptonica/CONTROL | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/leptonica/CONTROL b/ports/leptonica/CONTROL index 292ad0b746cbbc..4d8d938fcbd949 100644 --- a/ports/leptonica/CONTROL +++ b/ports/leptonica/CONTROL @@ -1,5 +1,6 @@ Source: leptonica Version: 1.80.0 +Port-Version: 1 Homepage: https://github.com/DanBloomberg/leptonica Description: An open source library containing software that is broadly useful for image processing and image analysis applications -Build-Depends: libjpeg-turbo, zlib, libpng, tiff, giflib, libwebp +Build-Depends: libjpeg-turbo, zlib, libpng, tiff, giflib, libwebp, openjpeg From 0184a48b66e3ffa9d91623fcfe3b6192908f5a09 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 21 Nov 2020 03:48:17 +0800 Subject: [PATCH 0111/1694] [libheif] update to 1.9.1 (#14648) * [libheif] update to 1.9.1 * Add example optinos * Update ports/libheif/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/libheif/CONTROL | 3 +-- .../dont_build_examples_and_gdk_pixbuf.patch | 13 ------------- ports/libheif/install-extra-headers.patch | 12 ------------ ports/libheif/portfile.cmake | 10 ++++------ ports/libheif/remove_finding_pkgconfig.patch | 18 ------------------ 5 files changed, 5 insertions(+), 51 deletions(-) delete mode 100644 ports/libheif/dont_build_examples_and_gdk_pixbuf.patch delete mode 100644 ports/libheif/install-extra-headers.patch delete mode 100644 ports/libheif/remove_finding_pkgconfig.patch diff --git a/ports/libheif/CONTROL b/ports/libheif/CONTROL index c6dc34356082a4..b5f372def26984 100644 --- a/ports/libheif/CONTROL +++ b/ports/libheif/CONTROL @@ -1,6 +1,5 @@ Source: libheif -Version: 1.7.0 -Port-Version: 1 +Version: 1.9.1 Homepage: http://www.libheif.org/ Description: Open h.265 video codec implementation. Build-Depends: x265, libde265 diff --git a/ports/libheif/dont_build_examples_and_gdk_pixbuf.patch b/ports/libheif/dont_build_examples_and_gdk_pixbuf.patch deleted file mode 100644 index 78bab905a380dc..00000000000000 --- a/ports/libheif/dont_build_examples_and_gdk_pixbuf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4463476..3a5cfbc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -80,6 +80,6 @@ configure_file(libheif.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libheif.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libheif.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - --add_subdirectory (examples) -+#add_subdirectory (examples) - add_subdirectory (libheif) --add_subdirectory (gdk-pixbuf) -+#add_subdirectory (gdk-pixbuf) diff --git a/ports/libheif/install-extra-headers.patch b/ports/libheif/install-extra-headers.patch deleted file mode 100644 index eb32ee8a408dab..00000000000000 --- a/ports/libheif/install-extra-headers.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libheif/CMakeLists.txt b/libheif/CMakeLists.txt -index 6d683ec..dc2c4eb 100644 ---- a/libheif/CMakeLists.txt -+++ b/libheif/CMakeLists.txt -@@ -17,6 +17,7 @@ set(libheif_headers - heif_plugin_registry.h - heif_limits.h - heif_plugin.h -+ heif_cxx.h - logging.h - ${CMAKE_CURRENT_BINARY_DIR}/heif_version.h - ) diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 97068d449bae66..4c77d6781f8d26 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -1,18 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif - REF v1.7.0 - SHA512 7da6ab9daf253c2493e0c3960c6f817e0234dfbd0463467cd1e5f11f7d6804735e401b73fb1038b8f81cfc6527fafb6ac7f4668c3de9400a0131c1292bdbe660 + REF 2e218ef40440e258b5da1e513f72c7f3b1611c7c #v1.9.1 + SHA512 78fc62813f088133dfc12799d8e1989580630e80865e33e43450ae4bba0d9ef03fe250dcc734f7905ea1d02dcb7ae77a9b461b25da27fcb2ef98562c69ab0b87 HEAD_REF master - PATCHES - dont_build_examples_and_gdk_pixbuf.patch - remove_finding_pkgconfig.patch - install-extra-headers.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DWITH_EXAMPLES=OFF ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libheif/) diff --git a/ports/libheif/remove_finding_pkgconfig.patch b/ports/libheif/remove_finding_pkgconfig.patch deleted file mode 100644 index ed8913a22b352b..00000000000000 --- a/ports/libheif/remove_finding_pkgconfig.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3a5cfbc..9a3046e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,10 +52,9 @@ if (has_potentially_evaluated_expression) - endif() - - if (UNIX) -- find_package(PkgConfig) -- pkg_check_modules(LIBDE265 libde265) -- pkg_check_modules(X265 x265) -- pkg_check_modules(AOM aom) -+ find_package(libde265) -+ find_package(x265) -+ find_package(aom) - endif() - - # Create libheif pkgconfig file From 1afb237d556c364df38d0b7e78a891254270bb2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 20 Nov 2020 11:53:48 -0800 Subject: [PATCH 0112/1694] [abseil] Re-fix cxx 17 standard, add macro ABSL_USE_CXX17 (#14647) * [abseil] Re-fix cxx 17 standard, add macro ABSL_USE_CXX17 to `absl-config.cmake` * [grpc] Fix build failure when abseil use cxx 17 standard * Update ports/abseil/portfile.cmake --- ports/abseil/fix-cxx-standard.patch | 96 +++++++++++++++++++ ports/abseil/fix-lnk2019-error.patch | 40 -------- ports/abseil/fix-use-cxx17-stdlib-types.patch | 40 -------- ports/abseil/portfile.cmake | 30 +++--- ports/abseil/vcpkg.json | 1 + ports/grpc/00012-fix-use-cxx17.patch | 16 ++++ ports/grpc/CONTROL | 1 + ports/grpc/portfile.cmake | 1 + 8 files changed, 126 insertions(+), 99 deletions(-) create mode 100644 ports/abseil/fix-cxx-standard.patch delete mode 100644 ports/abseil/fix-lnk2019-error.patch delete mode 100644 ports/abseil/fix-use-cxx17-stdlib-types.patch create mode 100644 ports/grpc/00012-fix-use-cxx17.patch diff --git a/ports/abseil/fix-cxx-standard.patch b/ports/abseil/fix-cxx-standard.patch new file mode 100644 index 00000000000000..19e1f54db3f100 --- /dev/null +++ b/ports/abseil/fix-cxx-standard.patch @@ -0,0 +1,96 @@ +diff --git a/CMake/abslConfig.cmake.in b/CMake/abslConfig.cmake.in +index 62d246d..00947cf 100644 +--- a/CMake/abslConfig.cmake.in ++++ b/CMake/abslConfig.cmake.in +@@ -6,3 +6,5 @@ find_dependency(Threads) + @PACKAGE_INIT@ + + include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") ++ ++set(ABSL_USE_CXX17 @ABSL_USE_CXX17@) +\ No newline at end of file +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f0af6f6..927f4ed 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,6 +57,23 @@ else() + option(ABSL_ENABLE_INSTALL "Enable install rule" ON) + endif() + ++# CXX standard ++option(ABSL_USE_CXX17 "Enable CXX 17 standard" OFF) ++ ++if (ABSL_USE_CXX17) ++ set(CMAKE_CXX_STANDARD 17) ++ set(STD_ANY 1) ++ set(STD_OPTIONAL 1) ++ set(STD_STRING_VIEW 1) ++ set(STD_VARIANT 1) ++else() ++ set(CMAKE_CXX_STANDARD 11) ++ set(STD_ANY 0) ++ set(STD_OPTIONAL 0) ++ set(STD_STRING_VIEW 0) ++ set(STD_VARIANT 0) ++endif() ++ + list(APPEND CMAKE_MODULE_PATH + ${CMAKE_CURRENT_LIST_DIR}/CMake + ${CMAKE_CURRENT_LIST_DIR}/absl/copts +diff --git a/absl/base/CMakeLists.txt b/absl/base/CMakeLists.txt +index 9ff5aa2..315bee4 100644 +--- a/absl/base/CMakeLists.txt ++++ b/absl/base/CMakeLists.txt +@@ -87,6 +87,12 @@ absl_cc_library( + absl::errno_saver + ) + ++if (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/options.h.in) ++ file(RENAME ${CMAKE_CURRENT_LIST_DIR}/options.h ${CMAKE_CURRENT_LIST_DIR}/options.h.in) ++endif() ++file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/options.h) ++configure_file(${CMAKE_CURRENT_LIST_DIR}/options.h.in ${CMAKE_CURRENT_LIST_DIR}/options.h @ONLY) ++ + absl_cc_library( + NAME + config +diff --git a/absl/base/options.h b/absl/base/options.h +index 6a0fb07..54a9780 100644 +--- a/absl/base/options.h ++++ b/absl/base/options.h +@@ -100,7 +100,7 @@ + // User code should not inspect this macro. To check in the preprocessor if + // absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY. + +-#define ABSL_OPTION_USE_STD_ANY 2 ++#define ABSL_OPTION_USE_STD_ANY @STD_ANY@ + + + // ABSL_OPTION_USE_STD_OPTIONAL +@@ -127,7 +127,7 @@ + // absl::optional is a typedef of std::optional, use the feature macro + // ABSL_USES_STD_OPTIONAL. + +-#define ABSL_OPTION_USE_STD_OPTIONAL 2 ++#define ABSL_OPTION_USE_STD_OPTIONAL @STD_OPTIONAL@ + + + // ABSL_OPTION_USE_STD_STRING_VIEW +@@ -154,7 +154,7 @@ + // absl::string_view is a typedef of std::string_view, use the feature macro + // ABSL_USES_STD_STRING_VIEW. + +-#define ABSL_OPTION_USE_STD_STRING_VIEW 2 ++#define ABSL_OPTION_USE_STD_STRING_VIEW @STD_STRING_VIEW@ + + // ABSL_OPTION_USE_STD_VARIANT + // +@@ -180,7 +180,7 @@ + // absl::variant is a typedef of std::variant, use the feature macro + // ABSL_USES_STD_VARIANT. + +-#define ABSL_OPTION_USE_STD_VARIANT 2 ++#define ABSL_OPTION_USE_STD_VARIANT @STD_VARIANT@ + + + // ABSL_OPTION_USE_INLINE_NAMESPACE diff --git a/ports/abseil/fix-lnk2019-error.patch b/ports/abseil/fix-lnk2019-error.patch deleted file mode 100644 index 645d1e094a420b..00000000000000 --- a/ports/abseil/fix-lnk2019-error.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/absl/base/options.h b/absl/base/options.h -index 234137c..1fb77e4 100644 ---- a/absl/base/options.h -+++ b/absl/base/options.h -@@ -100,7 +100,7 @@ - // User code should not inspect this macro. To check in the preprocessor if - // absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY. - --#define ABSL_OPTION_USE_STD_ANY 2 -+#define ABSL_OPTION_USE_STD_ANY 0 - - - // ABSL_OPTION_USE_STD_OPTIONAL -@@ -127,7 +127,7 @@ - // absl::optional is a typedef of std::optional, use the feature macro - // ABSL_USES_STD_OPTIONAL. - --#define ABSL_OPTION_USE_STD_OPTIONAL 2 -+#define ABSL_OPTION_USE_STD_OPTIONAL 0 - - - // ABSL_OPTION_USE_STD_STRING_VIEW -@@ -154,7 +154,7 @@ - // absl::string_view is a typedef of std::string_view, use the feature macro - // ABSL_USES_STD_STRING_VIEW. - --#define ABSL_OPTION_USE_STD_STRING_VIEW 2 -+#define ABSL_OPTION_USE_STD_STRING_VIEW 0 - - // ABSL_OPTION_USE_STD_VARIANT - // -@@ -180,7 +180,7 @@ - // absl::variant is a typedef of std::variant, use the feature macro - // ABSL_USES_STD_VARIANT. - --#define ABSL_OPTION_USE_STD_VARIANT 2 -+#define ABSL_OPTION_USE_STD_VARIANT 0 - - - // ABSL_OPTION_USE_INLINE_NAMESPACE diff --git a/ports/abseil/fix-use-cxx17-stdlib-types.patch b/ports/abseil/fix-use-cxx17-stdlib-types.patch deleted file mode 100644 index 86715824d4b632..00000000000000 --- a/ports/abseil/fix-use-cxx17-stdlib-types.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/absl/base/options.h b/absl/base/options.h -index 234137c..1fb77e4 100644 ---- a/absl/base/options.h -+++ b/absl/base/options.h -@@ -100,7 +100,7 @@ - // User code should not inspect this macro. To check in the preprocessor if - // absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY. - --#define ABSL_OPTION_USE_STD_ANY 2 -+#define ABSL_OPTION_USE_STD_ANY 1 - - - // ABSL_OPTION_USE_STD_OPTIONAL -@@ -127,7 +127,7 @@ - // absl::optional is a typedef of std::optional, use the feature macro - // ABSL_USES_STD_OPTIONAL. - --#define ABSL_OPTION_USE_STD_OPTIONAL 2 -+#define ABSL_OPTION_USE_STD_OPTIONAL 1 - - - // ABSL_OPTION_USE_STD_STRING_VIEW -@@ -154,7 +154,7 @@ - // absl::string_view is a typedef of std::string_view, use the feature macro - // ABSL_USES_STD_STRING_VIEW. - --#define ABSL_OPTION_USE_STD_STRING_VIEW 2 -+#define ABSL_OPTION_USE_STD_STRING_VIEW 1 - - // ABSL_OPTION_USE_STD_VARIANT - // -@@ -180,7 +180,7 @@ - // absl::variant is a typedef of std::variant, use the feature macro - // ABSL_USES_STD_VARIANT. - --#define ABSL_OPTION_USE_STD_VARIANT 2 -+#define ABSL_OPTION_USE_STD_VARIANT 1 - - - // ABSL_OPTION_USE_INLINE_NAMESPACE diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 536e88f094eb01..a544c1fe43da9e 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -2,37 +2,29 @@ if (NOT VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() -if("cxx17" IN_LIST FEATURES) - # in C++17 mode, use std::any, std::optional, std::string_view, std::variant - # instead of the library replacement types - list(APPEND ABSEIL_PATCHES fix-use-cxx17-stdlib-types.patch) -else() - # force use of library replacement types, otherwise the automatic - - # detection can cause ABI issues depending on which compiler options - # are enabled for consuming user code - list(APPEND ABSEIL_PATCHES fix-lnk2019-error.patch) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp REF 0f3bb466b868b523cf1dc9b2aaaed65c77b28862 #LTS 20200923, Patch 2 SHA512 17e766a2f7a655a3877eb3accc5745a910b69a5e2426b7ce7f6d31095523dd32d48a709c5f8380488b4cb93ce9faadedc08f0481dbdbd00cf68831541d724b4d HEAD_REF master - PATCHES ${ABSEIL_PATCHES} + # in C++17 mode, use std::any, std::optional, std::string_view, std::variant + # instead of the library replacement types + # in C++11 mode, force use of library replacement types, otherwise the automatic + # detection can cause ABI issues depending on which compiler options + # are enabled for consuming user code + PATCHES fix-cxx-standard.patch ) -set(CMAKE_CXX_STANDARD 11) -if("cxx17" IN_LIST FEATURES) - set(CMAKE_CXX_STANDARD 17) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + cxx17 ABSL_USE_CXX17 +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS - -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} + DISABLE_PARALLEL_CONFIGURE + OPTIONS ${FEATURE_OPTIONS} ) vcpkg_install_cmake() diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index bd0cd8300c0d9f..96f3288e89a072 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,6 +1,7 @@ { "name": "abseil", "version-string": "2020-09-23", + "port-version": 1, "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", diff --git a/ports/grpc/00012-fix-use-cxx17.patch b/ports/grpc/00012-fix-use-cxx17.patch new file mode 100644 index 00000000000000..012db102b332ba --- /dev/null +++ b/ports/grpc/00012-fix-use-cxx17.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1911144..c749d28 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -257,6 +257,11 @@ include(cmake/re2.cmake) + include(cmake/ssl.cmake) + include(cmake/upb.cmake) + include(cmake/zlib.cmake) ++ ++if (ABSL_USE_CXX17) ++ message(STATUS "Found absl uses CXX17, enable CXX17 feature.") ++ set(CMAKE_CXX_STANDARD 17) ++endif() + + if(_gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS) + set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m pthread) diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index f44b4e00e9b181..f5954763e7c451 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,5 +1,6 @@ Source: grpc Version: 1.33.1 +Port-Version: 1 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp), upb, abseil, re2 Homepage: https://github.com/grpc/grpc Description: An RPC library and framework diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index a082a69634941a..8253fe3e67b1ba 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( 00010-add-feature-absl-sync.patch 00011-fix-csharp_plugin.patch snprintf.patch + 00012-fix-use-cxx17.patch ) if((NOT VCPKG_TARGET_IS_LINUX) AND (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) From a69a448e6ec0cdbb55b7cc18f6b595e5ed85e1e4 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 21 Nov 2020 03:54:07 +0800 Subject: [PATCH 0113/1694] [soci] Update to 4.0.1 (#14646) --- ports/soci/CONTROL | 2 +- ports/soci/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/soci/CONTROL b/ports/soci/CONTROL index 96c8f48de7b4c1..f60240ee6ec18a 100644 --- a/ports/soci/CONTROL +++ b/ports/soci/CONTROL @@ -1,5 +1,5 @@ Source: soci -Version: 4.0.0-1 +Version: 4.0.1 Homepage: https://github.com/SOCI/soci Description: SOCI database access library diff --git a/ports/soci/portfile.cmake b/ports/soci/portfile.cmake index 3bfc519f9cd65a..bed98237a12ddc 100644 --- a/ports/soci/portfile.cmake +++ b/ports/soci/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SOCI/soci - REF 3742c894ab8ba5fd51b6a156980e8b34db0f3063 #version 4.0.0 commit on 2019.11.10 - SHA512 27950230d104bdc0ab8e439a69c59d1b157df373adc863a22c8332b8bb896c2a6e3028f8343bb36b42bf9ab2a2312375e20cbdeca7f497f0bb1424a4733f0c9c + REF 334cc55d9fa7b42d7214a8533a246d637bc92899 #version 4.0.1 commit on 2020.10.19 + SHA512 b300b13f68347d78252812e09efffb1735072cf5019940da53366a5cdee997f4b8b03a584a87a95ba764b0a78640ad6eb4966b53f9156280cb452465607afbc7 HEAD_REF master ) From 832ab33c343aba5db5e87868561cfc5cba178669 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 21 Nov 2020 03:54:45 +0800 Subject: [PATCH 0114/1694] [zeromq] Add feature draft (#14642) * [zeromq] Add feature draft * Modify protfile copyrigt --- ports/zeromq/CONTROL | 5 ++++- ports/zeromq/portfile.cmake | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL index a3df52420027e3..e2f7b0b99cf309 100644 --- a/ports/zeromq/CONTROL +++ b/ports/zeromq/CONTROL @@ -1,6 +1,6 @@ Source: zeromq Version: 2019-09-20 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/zeromq/libzmq Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products @@ -10,3 +10,6 @@ Build-Depends: libsodium Feature: websockets-sha1 Description: Enable WebSocket transport through builtin sha1 (libzmq#3676) + +Feature: draft +Description: Build and install draft APIs diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index de448216eb6ac1..7ec044646c5a63 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES sodium WITH_LIBSODIUM + draft ENABLE_DRAFTS INVERTED_FEATURES websockets-sha1 DISABLE_WS ) @@ -67,6 +68,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() # Handle copyright -file(RENAME ${CURRENT_PACKAGES_DIR}/share/zmq/COPYING.LESSER.txt ${CURRENT_PACKAGES_DIR}/share/zeromq/copyright) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/zmq/COPYING.LESSER.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/zmq) From 264b739665b5cbb40f1841e0aa2e1f463c8bae84 Mon Sep 17 00:00:00 2001 From: Matioupi Date: Fri, 20 Nov 2020 21:18:17 +0100 Subject: [PATCH 0115/1694] [curl] Fixes pkgconfig configuration file (#14350) * Fix pkgconfig for windows debug build. Re-allow tool feature on non windows platforms * Fix tool feature * Modified debug/release prvate libs according to https://github.com/microsoft/vcpkg/pull/14350#discussion_r520444862 Added vcpkg_fixup_pkgconfig() according to https://github.com/microsoft/vcpkg/pull/14350#discussion_r520435718 * Delete portfile.cmake.orig * Fix pkgconfig * Revert "Fix pkgconfig" This reverts commit cb4da8bcc5e92248c20065f34d5e5d1d88a0e5d4. * Bump port version to 3 * add missing system libs for windows. made case type coherent for ws2_32 * Fix build on x64-linux triplet * Reverted ws2_32 to Ws2_32 as discudssed in https://github.com/microsoft/vcpkg/pull/14350#discussion_r525893479 * More fixes for Linux build with features * Fix for feature c-ares * Formatting Co-authored-by: Phoebe Ma --- ports/curl/CONTROL | 2 +- ports/curl/portfile.cmake | 63 +++++++++++++++++++- scripts/cmake/vcpkg_common_definitions.cmake | 2 + 3 files changed, 65 insertions(+), 2 deletions(-) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 2fcccdc49481de..26817daefd425d 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,6 +1,6 @@ Source: curl Version: 7.73.0 -Port-Version: 2 +Port-Version: 3 Build-Depends: zlib Homepage: https://github.com/curl/curl Description: A library for transferring data with URLs diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 2c5d4dd628848e..419b22baaf58eb 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -111,5 +111,66 @@ else() ) endif() +# Fix the pkgconfig file for debug +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/libcurl.pc "-lcurl" "-lcurl-d") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/zlib.lib" "-lzlibd") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssl.lib" "-lssl") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.lib" "-lcrypto") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/mbedtls.lib" "-lmbedtls") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/mbedx509.lib" "-lmbedx509") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/mbedcrypto.lib" "-lmbedcrypto") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/nghttp2.lib" "-lnghttp2") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssh2.lib" "-lssh2") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/cares.lib" "-lcares") + elseif(VCPKG_TARGET_IS_LINUX) + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "-lcurl" "-lcurl-d") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssl.a" "-lssl") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.a" "-lcrypto") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libmbedtls.a" "-lmbedtls") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libmbedx509.a" "-lmbedx509") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libmbedcrypto.a" "-lmbedcrypto") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libnghttp2.a" "-lnghttp2") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssh2.a" "-lssh2") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libcares.a" "-lcares") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" "-lz") + endif() + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +endif() + +# Fix the pkgconfig file for release +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/libcurl.pc "-lcurl" "-lcurl") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/zlib.lib" "-lzlib") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libssl.lib" "-lssl") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libcrypto.lib" "-lcrypto") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/mbedtls.lib" "-lmbedtls") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/mbedx509.lib" "-lmbedx509") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/mbedcrypto.lib" "-lmbedcrypto") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/nghttp2.lib" "-lnghttp2") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libssh2.lib" "-lssh2") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/cares.lib" "-lcares") + elseif(VCPKG_TARGET_IS_LINUX) + #vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "-lcurl" "-lcurl") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libssl.a" "-lssl") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libcrypto.a" "-lcrypto") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libmbedtls.a" "-lmbedtls") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libmbedx509.a" "-lmbedx509") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libmbedcrypto.a" "-lmbedcrypto") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libnghttp2.a" "-lnghttp2") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libssh2.a" "-lssh2") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libcares.a" "-lcares") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libz.a" "-lz") + endif() + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +endif() +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_fixup_pkgconfig() +elseif(VCPKG_TARGET_IS_LINUX) + vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread dl c) +endif() + file(INSTALL ${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index 1689dc762186cc..ee5288db20e602 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -193,4 +193,6 @@ if(VCPKG_TARGET_IS_WINDOWS) list(APPEND VCPKG_SYSTEM_LIBRARIES winmm) list(APPEND VCPKG_SYSTEM_LIBRARIES wsock32) list(APPEND VCPKG_SYSTEM_LIBRARIES Ws2_32) + list(APPEND VCPKG_SYSTEM_LIBRARIES wldap32) + list(APPEND VCPKG_SYSTEM_LIBRARIES crypt32) endif() From db6fb0d5146348c3f0a6ff5195e131e218f2b43b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 20 Nov 2020 21:23:19 +0100 Subject: [PATCH 0116/1694] [liblzma] use upstream CMakeLists.txt + Add pkgconfig. (#14615) * [liblzma] use upstream CMakeLists.txt + Add pkgconfig. * fixing regressions * add debug suffix. fix pkgconfig * fix cmake path * remove empty lines * fix wrapper * more fixes * fix findLibLZMA * fix patch for static builds --- ports/liblzma/CMakeLists.txt | 182 ------------------------ ports/liblzma/CONTROL | 2 +- ports/liblzma/fix_config_include.patch | 12 ++ ports/liblzma/portfile.cmake | 53 ++++++- ports/liblzma/usage | 9 ++ ports/liblzma/vcpkg-cmake-wrapper.cmake | 6 +- ports/liblzma/win_output_name.patch | 17 +++ 7 files changed, 90 insertions(+), 191 deletions(-) delete mode 100644 ports/liblzma/CMakeLists.txt create mode 100644 ports/liblzma/fix_config_include.patch create mode 100644 ports/liblzma/usage create mode 100644 ports/liblzma/win_output_name.patch diff --git a/ports/liblzma/CMakeLists.txt b/ports/liblzma/CMakeLists.txt deleted file mode 100644 index c87b0b611f9bdf..00000000000000 --- a/ports/liblzma/CMakeLists.txt +++ /dev/null @@ -1,182 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(LibLZMA) - -set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") -set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") -set(INSTALL_INCLUDE_DIR "include" CACHE PATH "Path where headers will be installed") -set(INSTALL_CMAKE_DIR "share/liblzma" CACHE PATH "Path where cmake configs will be installed") -set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Append a suffix to debug libraries") - -if(NOT WIN32) - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/config.h - " -#define TUKLIB_SYMBOL_PREFIX lzma_ -#define ASSUME_RAM 128 -#define HAVE_CHECK_CRC32 1 -#define HAVE_CHECK_CRC64 1 -#define HAVE_CHECK_SHA256 1 -#define HAVE_DECODERS 1 -#define HAVE_DECODER_ARM 1 -#define HAVE_DECODER_ARMTHUMB 1 -#define HAVE_DECODER_DELTA 1 -#define HAVE_DECODER_IA64 1 -#define HAVE_DECODER_LZMA1 1 -#define HAVE_DECODER_LZMA2 1 -#define HAVE_DECODER_POWERPC 1 -#define HAVE_DECODER_SPARC 1 -#define HAVE_DECODER_X86 1 -#define HAVE_ENCODERS 1 -#define HAVE_ENCODER_ARM 1 -#define HAVE_ENCODER_ARMTHUMB 1 -#define HAVE_ENCODER_DELTA 1 -#define HAVE_ENCODER_IA64 1 -#define HAVE_ENCODER_LZMA1 1 -#define HAVE_ENCODER_LZMA2 1 -#define HAVE_ENCODER_POWERPC 1 -#define HAVE_ENCODER_SPARC 1 -#define HAVE_ENCODER_X86 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_LIMITS_H 1 -#define HAVE_MF_BT2 1 -#define HAVE_MF_BT3 1 -#define HAVE_MF_BT4 1 -#define HAVE_MF_HC3 1 -#define HAVE_MF_HC4 1 -#define HAVE_STDBOOL_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#define HAVE_VISIBILITY 1 -#define MYTHREAD_POSIX 1 -#define PACKAGE_NAME \"XZ Utils\" -#define PACKAGE_URL \"http://tukaani.org/xz/\" -#define SIZEOF_SIZE_T (sizeof(size_t)) -") -endif() - -add_library(LibLZMA - src/common/tuklib_cpucores.c - src/common/tuklib_physmem.c - src/liblzma/check/check.c - src/liblzma/check/crc32_fast.c - src/liblzma/check/crc32_table.c - src/liblzma/check/crc64_fast.c - src/liblzma/check/crc64_table.c - src/liblzma/check/sha256.c - src/liblzma/common/alone_decoder.c - src/liblzma/common/alone_encoder.c - src/liblzma/common/auto_decoder.c - src/liblzma/common/block_buffer_decoder.c - src/liblzma/common/block_buffer_encoder.c - src/liblzma/common/block_decoder.c - src/liblzma/common/block_encoder.c - src/liblzma/common/block_header_decoder.c - src/liblzma/common/block_header_encoder.c - src/liblzma/common/block_util.c - src/liblzma/common/common.c - src/liblzma/common/easy_buffer_encoder.c - src/liblzma/common/easy_decoder_memusage.c - src/liblzma/common/easy_encoder.c - src/liblzma/common/easy_encoder_memusage.c - src/liblzma/common/easy_preset.c - src/liblzma/common/filter_buffer_decoder.c - src/liblzma/common/filter_buffer_encoder.c - src/liblzma/common/filter_common.c - src/liblzma/common/filter_decoder.c - src/liblzma/common/filter_encoder.c - src/liblzma/common/filter_flags_decoder.c - src/liblzma/common/filter_flags_encoder.c - src/liblzma/common/hardware_cputhreads.c - src/liblzma/common/hardware_physmem.c - src/liblzma/common/index.c - src/liblzma/common/index_decoder.c - src/liblzma/common/index_encoder.c - src/liblzma/common/index_hash.c - src/liblzma/common/outqueue.c - src/liblzma/common/stream_buffer_decoder.c - src/liblzma/common/stream_buffer_encoder.c - src/liblzma/common/stream_decoder.c - src/liblzma/common/stream_encoder.c - src/liblzma/common/stream_encoder_mt.c - src/liblzma/common/stream_flags_common.c - src/liblzma/common/stream_flags_decoder.c - src/liblzma/common/stream_flags_encoder.c - src/liblzma/common/vli_decoder.c - src/liblzma/common/vli_encoder.c - src/liblzma/common/vli_size.c - src/liblzma/delta/delta_common.c - src/liblzma/delta/delta_decoder.c - src/liblzma/delta/delta_encoder.c - src/liblzma/lzma/fastpos_table.c - src/liblzma/lzma/lzma2_decoder.c - src/liblzma/lzma/lzma2_encoder.c - src/liblzma/lzma/lzma_decoder.c - src/liblzma/lzma/lzma_encoder.c - src/liblzma/lzma/lzma_encoder_optimum_fast.c - src/liblzma/lzma/lzma_encoder_optimum_normal.c - src/liblzma/lzma/lzma_encoder_presets.c - src/liblzma/lz/lz_decoder.c - src/liblzma/lz/lz_encoder.c - src/liblzma/lz/lz_encoder_mf.c - src/liblzma/rangecoder/price_table.c - src/liblzma/simple/arm.c - src/liblzma/simple/armthumb.c - src/liblzma/simple/ia64.c - src/liblzma/simple/powerpc.c - src/liblzma/simple/simple_coder.c - src/liblzma/simple/simple_decoder.c - src/liblzma/simple/simple_encoder.c - src/liblzma/simple/sparc.c - src/liblzma/simple/x86.c -) - -if(WIN32) - target_include_directories(LibLZMA PRIVATE $) -else() - target_compile_definitions(LibLZMA PRIVATE -DHAVE_VISIBILITY=1) -endif() - -if(BUILD_SHARED_LIBS) - target_compile_definitions(LibLZMA PRIVATE -DDLL_EXPORT) - target_compile_definitions(LibLZMA PUBLIC -DLIBLZMADLL_EXPORTS) -else() - target_compile_definitions(LibLZMA PUBLIC -DLZMA_API_STATIC) -endif() -target_compile_definitions(LibLZMA PRIVATE -DHAVE_CONFIG_H) - -target_include_directories(LibLZMA PUBLIC - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ -) - -set_target_properties(LibLZMA PROPERTIES OUTPUT_NAME "lzma") - -set_target_properties(LibLZMA PROPERTIES PUBLIC_HEADER -"${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/base.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/bcj.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/block.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/check.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/container.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/delta.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/filter.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/hardware.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/index.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/index_hash.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/lzma12.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/stream_flags.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/version.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/vli.h" -) - -install(TARGETS LibLZMA EXPORT LibLZMATargets - RUNTIME DESTINATION "${INSTALL_BIN_DIR}" - ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" - LIBRARY DESTINATION "${INSTALL_LIB_DIR}" - PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/lzma" -) - -install(FILES "${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma.h" - DESTINATION "${INSTALL_INCLUDE_DIR}" -) - -install(EXPORT LibLZMATargets - FILE LibLZMAConfig.cmake - NAMESPACE LibLZMA:: - DESTINATION "${INSTALL_CMAKE_DIR}" -) diff --git a/ports/liblzma/CONTROL b/ports/liblzma/CONTROL index dc9d0fda86c7e5..da00befc3aca47 100644 --- a/ports/liblzma/CONTROL +++ b/ports/liblzma/CONTROL @@ -1,5 +1,5 @@ Source: liblzma Version: 5.2.5 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/xz-mirror/xz Description: Compression library with an API similar to that of zlib. diff --git a/ports/liblzma/fix_config_include.patch b/ports/liblzma/fix_config_include.patch new file mode 100644 index 00000000000000..20b32895a6618f --- /dev/null +++ b/ports/liblzma/fix_config_include.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 34c6aca00..7b3708ab2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -401,6 +401,7 @@ if(WIN32) + if(BUILD_SHARED_LIBS) + # Add the Windows resource file for liblzma.dll. + target_sources(liblzma PRIVATE src/liblzma/liblzma_w32res.rc) ++ target_include_directories(liblzma PRIVATE windows/vs2019) + + # Export the public API symbols with __declspec(dllexport). + target_compile_definitions(liblzma PRIVATE DLL_EXPORT) diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index c29dbafedc367e..e58a0e543cd52d 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -6,20 +6,43 @@ vcpkg_from_github( HEAD_REF master PATCHES enable-uwp-builds.patch + fix_config_include.patch + win_output_name.patch # Fix output name on Windows. Autotool build does not generate lib prefixed libraries on windows. ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + "-DCMAKE_DEBUG_POSTFIX=d" # This was in the old vcpkg CMakeLists.txt and I don't intend to fix it all over vcpkg ) - vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() -file(APPEND ${CURRENT_PACKAGES_DIR}/share/liblzma/LibLZMAConfig.cmake +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") +set(PACKAGE_URL https://tukaani.org/xz/) +set(PACKAGE_VERSION 5.2.5) +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(PTHREAD_CFLAGS -pthread) +endif() +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(prefix "${CURRENT_INSTALLED_DIR}") + configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/liblzma.pc" @ONLY) +endif() +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(prefix "${CURRENT_INSTALLED_DIR}/debug") + configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/liblzma.pc" @ONLY) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/liblzma.pc" "-llzma" "-llzmad") +endif() +vcpkg_fixup_pkgconfig() + + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/liblzma) + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzma-config.cmake" "include(\"\${CMAKE_CURRENT_LIST_DIR}/liblzmaConfig.cmake\")") +file(APPEND "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzmaConfig.cmake" " include(\${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) find_path(LibLZMA_INCLUDE_DIR @@ -27,8 +50,8 @@ find_path(LibLZMA_INCLUDE_DIR PATH_SUFFIXES lzma ) if(NOT LibLZMA_LIBRARY) - find_library(LibLZMA_LIBRARY_RELEASE NAMES lzma LZMA LibLZMA PATHS \${_IMPORT_PREFIX}/lib/) - find_library(LibLZMA_LIBRARY_DEBUG NAMES lzmad LZMAd LibLZMAd PATHS \${_IMPORT_PREFIX}/debug/lib/) + find_library(LibLZMA_LIBRARY_RELEASE NAMES lzma LZMA LibLZMA liblzma PATHS \${_IMPORT_PREFIX}/lib/) + find_library(LibLZMA_LIBRARY_DEBUG NAMES lzmad LZMAd LibLZMAd lzma LZMA LibLZMA liblzma PATHS \${_IMPORT_PREFIX}/debug/lib/) select_library_configurations(LibLZMA) endif() set(LibLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\") @@ -91,5 +114,21 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +set(TOOLS xz xzdec) +foreach(_tool IN LISTS TOOLS) + if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + list(REMOVE_ITEM TOOLS ${_tool}) + endif() +endforeach() +if(TOOLS) + vcpkg_copy_tools(TOOL_NAMES ${TOOLS} AUTO_CLEAN) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file diff --git a/ports/liblzma/usage b/ports/liblzma/usage new file mode 100644 index 00000000000000..8d70b5804e7f7b --- /dev/null +++ b/ports/liblzma/usage @@ -0,0 +1,9 @@ +The package liblzma provides CMake targets: + + find_package(LibLZMA REQUIRED) + target_link_libraries(main PRIVATE LibLZMA::LibLZMA) + + or + + find_package(liblzma CONFIG REQUIRED) + target_link_libraries(main PRIVATE liblzma::liblzma) diff --git a/ports/liblzma/vcpkg-cmake-wrapper.cmake b/ports/liblzma/vcpkg-cmake-wrapper.cmake index b7572d736c0f14..cf22af021a6489 100644 --- a/ports/liblzma/vcpkg-cmake-wrapper.cmake +++ b/ports/liblzma/vcpkg-cmake-wrapper.cmake @@ -1,4 +1,8 @@ list(REMOVE_ITEM ARGS "NO_MODULE") list(REMOVE_ITEM ARGS "CONFIG") -list(REMOVE_ITEM ARGS "MODULE") +list(REMOVE_ITEM ARGS "MODULE") # Always call CONFIG. _find_package(${ARGS} CONFIG) +if(NOT TARGET LibLZMA::LibLZMA AND TARGET liblzma::liblzma) + add_library(LibLZMA::LibLZMA INTERFACE IMPORTED) # Too lazy to fix wrong target usage all over vcpkg. + set_target_properties(LibLZMA::LibLZMA PROPERTIES INTERFACE_LINK_LIBRARIES liblzma::liblzma) +endif() diff --git a/ports/liblzma/win_output_name.patch b/ports/liblzma/win_output_name.patch new file mode 100644 index 00000000000000..b6e3cd8ee86bb7 --- /dev/null +++ b/ports/liblzma/win_output_name.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 120dc7548..728ca3591 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -398,11 +398,12 @@ else() + endif() + + if(WIN32) ++ set_target_properties(liblzma PROPERTIES OUTPUT_NAME lzma) + if(BUILD_SHARED_LIBS) + # Add the Windows resource file for liblzma.dll. + target_sources(liblzma PRIVATE src/liblzma/liblzma_w32res.rc) + target_include_directories(liblzma PRIVATE windows/vs2019) + + # Export the public API symbols with __declspec(dllexport). + target_compile_definitions(liblzma PRIVATE DLL_EXPORT) + else() From 6db446cc25632f2e1f0eb8b2fb23a992280c3303 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Sat, 21 Nov 2020 04:25:16 +0800 Subject: [PATCH 0117/1694] [hunspell] Avoid automatically added lib prefix (#14623) * [hunspell] Avoid automatically added lib prefix * Update port version * Update CMakeLists.txt --- ports/hunspell/CMakeLists.txt | 4 ++++ ports/hunspell/CONTROL | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/hunspell/CMakeLists.txt b/ports/hunspell/CMakeLists.txt index 810c894f7706c3..dd3715a10e29f0 100644 --- a/ports/hunspell/CMakeLists.txt +++ b/ports/hunspell/CMakeLists.txt @@ -60,6 +60,10 @@ set(LIBHUNSPELL_HDRS #hunspell/libhunspell add_library(libhunspell ${LIBHUNSPELL_HDRS} ${LIBHUNSPELL_SRCS}) + +#Avoid automatically added lib prefix 'lib' for hunspell +set_target_properties(libhunspell PROPERTIES PREFIX "") + target_compile_definitions(libhunspell PRIVATE -DBUILDING_LIBHUNSPELL) install(TARGETS libhunspell ARCHIVE DESTINATION lib diff --git a/ports/hunspell/CONTROL b/ports/hunspell/CONTROL index 967cc32c5c5f99..229d5ca93bb97f 100644 --- a/ports/hunspell/CONTROL +++ b/ports/hunspell/CONTROL @@ -1,5 +1,6 @@ Source: hunspell -Version: 1.7.0-1 +Version: 1.7.0 +Port-Version: 2 Homepage: https://github.com/hunspell/hunspell Description: The most popular spellchecking library. From 0a639b6054fce2f0b23c19d5c3e21fd9168214df Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Sat, 21 Nov 2020 05:25:30 +0800 Subject: [PATCH 0118/1694] [openvdb] Fix dependency issue and usage issue (#14651) --- ports/openvdb/0003-fix-cmake.patch | 238 ++++++++++++++++-------- ports/openvdb/CONTROL | 1 + ports/openvdb/portfile.cmake | 8 +- ports/openvdb/usage | 4 + ports/openvdb/vcpkg-cmake-wrapper.cmake | 10 + 5 files changed, 183 insertions(+), 78 deletions(-) create mode 100644 ports/openvdb/usage create mode 100644 ports/openvdb/vcpkg-cmake-wrapper.cmake diff --git a/ports/openvdb/0003-fix-cmake.patch b/ports/openvdb/0003-fix-cmake.patch index 2945968698b2b9..1c70da27d5b4c0 100644 --- a/ports/openvdb/0003-fix-cmake.patch +++ b/ports/openvdb/0003-fix-cmake.patch @@ -1,76 +1,162 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f2e8c2a..4fd3f40 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -360,7 +360,6 @@ if(OPENVDB_INSTALL_CMAKE_MODULES) - cmake/FindLog4cplus.cmake - cmake/FindOpenEXR.cmake - cmake/FindOpenVDB.cmake -- cmake/FindTBB.cmake - cmake/OpenVDBGLFW3Setup.cmake - cmake/OpenVDBHoudiniSetup.cmake - cmake/OpenVDBMayaSetup.cmake -diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake -index b065192..286e8b6 100644 ---- a/cmake/FindOpenVDB.cmake -+++ b/cmake/FindOpenVDB.cmake -@@ -430,7 +430,7 @@ endif() - # Add standard dependencies - - find_package(IlmBase REQUIRED COMPONENTS Half) --find_package(TBB REQUIRED COMPONENTS tbb) -+find_package(TBB CONFIG REQUIRED) - find_package(ZLIB REQUIRED) - - if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS) -diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt -index 45b302c..e208bcf 100644 ---- a/openvdb/CMakeLists.txt -+++ b/openvdb/CMakeLists.txt -@@ -47,7 +47,7 @@ message(STATUS "----------------------------------------------------") - ########################################################################## - - # Collect and configure lib dependencies -- -+if(0) - if(USE_EXR) - find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED) - find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED) -@@ -57,8 +57,14 @@ if(USE_EXR) - "is deprecated and will be removed.") - endif() - endif() -+endif() -+endif() -+ -+if(USE_EXR) -+ find_package(IlmBase REQUIRED) -+ find_package(OpenEXR REQUIRED) - else() -- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half) -+ find_package(IlmBase REQUIRED COMPONENTS Half) - endif() - - if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION) -@@ -68,7 +74,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION) - endif() - endif() - --find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb) -+find_package(TBB CONFIG REQUIRED) - - if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION) - if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION) -diff --git a/openvdb/cmd/CMakeLists.txt b/openvdb/cmd/CMakeLists.txt -index 2b831bb..2fa11d4 100644 ---- a/openvdb/cmd/CMakeLists.txt -+++ b/openvdb/cmd/CMakeLists.txt -@@ -50,7 +50,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc") - find_package(Jemalloc REQUIRED) - list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS Jemalloc::jemalloc) - elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc") -- find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc) -+ find_package(TBB CONFIG REQUIRED) - list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc) - endif() - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f2e8c2a..749e12c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -353,14 +353,10 @@ endif() + + if(OPENVDB_INSTALL_CMAKE_MODULES) + set(OPENVDB_CMAKE_MODULES +- cmake/FindBlosc.cmake + cmake/FindCppUnit.cmake + cmake/FindJemalloc.cmake +- cmake/FindIlmBase.cmake + cmake/FindLog4cplus.cmake +- cmake/FindOpenEXR.cmake + cmake/FindOpenVDB.cmake +- cmake/FindTBB.cmake + cmake/OpenVDBGLFW3Setup.cmake + cmake/OpenVDBHoudiniSetup.cmake + cmake/OpenVDBMayaSetup.cmake +diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake +index b065192..7549843 100644 +--- a/cmake/FindOpenVDB.cmake ++++ b/cmake/FindOpenVDB.cmake +@@ -224,8 +224,9 @@ foreach(COMPONENT ${OpenVDB_FIND_COMPONENTS}) + ${OPENVDB_${COMPONENT}_ROOT} + ${OPENVDB_${COMPONENT}_INCLUDEDIR} + ) +- list(REMOVE_DUPLICATES _VDB_COMPONENT_SEARCH_DIRS) +- ++ if(_VDB_COMPONENT_SEARCH_DIRS) ++ list(REMOVE_DUPLICATES _VDB_COMPONENT_SEARCH_DIRS) ++ endif() + # Look for a standard header files. + if(${COMPONENT} STREQUAL "openvdb") + # Look for a standard OpenVDB header file. +@@ -429,8 +430,8 @@ endif() + + # Add standard dependencies + +-find_package(IlmBase REQUIRED COMPONENTS Half) +-find_package(TBB REQUIRED COMPONENTS tbb) ++find_package(IlmBase CONFIG REQUIRED) ++find_package(TBB CONFIG REQUIRED) + find_package(ZLIB REQUIRED) + + if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS) +@@ -540,7 +541,7 @@ if(NOT OPENVDB_USE_STATIC_LIBS) + endif() + + if(OpenVDB_USES_BLOSC) +- find_package(Blosc REQUIRED) ++ find_package(blosc CONFIG REQUIRED) + endif() + + if(OpenVDB_USES_LOG4CPLUS) +@@ -548,8 +549,8 @@ if(OpenVDB_USES_LOG4CPLUS) + endif() + + if(OpenVDB_USES_EXR) +- find_package(IlmBase REQUIRED) +- find_package(OpenEXR REQUIRED) ++ find_package(IlmBase CONFIG REQUIRED) ++ find_package(OpenEXR CONFIG REQUIRED) + endif() + + if(UNIX) +@@ -610,7 +611,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES) + + if(NOT OPENVDB_USE_STATIC_LIBS) + if(OpenVDB_USES_BLOSC) +- list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES Blosc::blosc) ++ list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES blosc) + endif() + + list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB) +diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt +index 45b302c..d75cfd1 100644 +--- a/openvdb/CMakeLists.txt ++++ b/openvdb/CMakeLists.txt +@@ -47,7 +47,7 @@ message(STATUS "----------------------------------------------------") + ########################################################################## + + # Collect and configure lib dependencies +- ++if(0) + if(USE_EXR) + find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED) + find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED) +@@ -57,8 +57,14 @@ if(USE_EXR) + "is deprecated and will be removed.") + endif() + endif() ++endif() ++endif() ++ ++if(USE_EXR) ++ find_package(IlmBase CONFIG REQUIRED) ++ find_package(OpenEXR CONFIG REQUIRED) + else() +- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half) ++ find_package(IlmBase CONFIG REQUIRED) + endif() + + if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION) +@@ -68,7 +74,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION) + endif() + endif() + +-find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb) ++find_package(TBB CONFIG REQUIRED) + + if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION) + if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION) +@@ -84,14 +90,7 @@ if(USE_LOG4CPLUS) + endif() + + if(USE_BLOSC) +- find_package(Blosc ${MINIMUM_BLOSC_VERSION} REQUIRED) +- if(Blosc_FOUND AND Blosc_VERSION VERSION_GREATER MINIMUM_BLOSC_VERSION) +- message(WARNING "The version of Blosc located is greater than ${MINIMUM_BLOSC_VERSION}. " +- "There have been reported issues with using later versions of Blosc with OpenVDB. " +- "OpenVDB has been tested fully against Blosc ${MINIMUM_BLOSC_VERSION}, it is " +- "recommended that you use this version where possible." +- ) +- endif() ++ find_package(blosc CONFIG REQUIRED) + else() + message(WARNING "Blosc support is disabled. It is strongly recommended to " + "enable blosc for optimal builds of OpenVDB and to support compatible " +@@ -163,7 +162,7 @@ endif() + # See FindOpenVDB.cmake + + if(USE_BLOSC) +- list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc) ++ list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc) + endif() + + list(APPEND OPENVDB_CORE_DEPENDENT_LIBS +diff --git a/openvdb/cmd/CMakeLists.txt b/openvdb/cmd/CMakeLists.txt +index 2b831bb..a13b63b 100644 +--- a/openvdb/cmd/CMakeLists.txt ++++ b/openvdb/cmd/CMakeLists.txt +@@ -50,7 +50,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc") + find_package(Jemalloc REQUIRED) + list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS Jemalloc::jemalloc) + elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc") +- find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc) ++ find_package(TBB CONFIG REQUIRED) + list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc) + endif() + +@@ -120,8 +120,8 @@ endif() + #### vdb_render + + if(OPENVDB_BUILD_VDB_RENDER) +- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) +- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) ++ find_package(IlmBase CONFIG REQUIRED) ++ find_package(OpenEXR CONFIG REQUIRED) + + set(VDB_RENDER_SOURCE_FILES openvdb_render.cc) + add_executable(vdb_render ${VDB_RENDER_SOURCE_FILES}) diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL index 17e6c12de1dc3b..f100be3e8a18c5 100644 --- a/ports/openvdb/CONTROL +++ b/ports/openvdb/CONTROL @@ -1,5 +1,6 @@ Source: openvdb Version: 7.1.0 +Port-Version: 1 Build-Depends: boost-ptr-container, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess, ilmbase Homepage: https://github.com/dreamworksanimation/openvdb Description: Sparse volume data structure and tools diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index 492936c707d731..fa91fc7f884d22 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -9,6 +9,9 @@ vcpkg_from_github( ) file(REMOVE ${SOURCE_PATH}/cmake/FindTBB.cmake) +file(REMOVE ${SOURCE_PATH}/cmake/FindIlmBase.cmake) +file(REMOVE ${SOURCE_PATH}/cmake/FindBlosc.cmake) +file(REMOVE ${SOURCE_PATH}/cmake/FindOpenEXR.cmake) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OPENVDB_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" OPENVDB_SHARED) @@ -51,5 +54,6 @@ if (OPENVDB_BUILD_TOOLS) vcpkg_copy_tools(TOOL_NAMES vdb_print vdb_render vdb_view vdb_lod AUTO_CLEAN) endif() -# Handle copyright -file(INSTALL ${SOURCE_PATH}/openvdb/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${SOURCE_PATH}/openvdb/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/openvdb/usage b/ports/openvdb/usage new file mode 100644 index 00000000000000..85407878067843 --- /dev/null +++ b/ports/openvdb/usage @@ -0,0 +1,4 @@ +The package openvdb provides CMake targets: + + find_package(OpenVDB CONFIG REQUIRED) + target_link_libraries(main PRIVATE OpenVDB::openvdb) diff --git a/ports/openvdb/vcpkg-cmake-wrapper.cmake b/ports/openvdb/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..fd1c5d23de7a6f --- /dev/null +++ b/ports/openvdb/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,10 @@ +set(OPENVDB_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +list(REMOVE_ITEM ARGS "NO_MODULE") +list(REMOVE_ITEM ARGS "CONFIG") +list(REMOVE_ITEM ARGS "MODULE") + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${OPENVDB_PREV_MODULE_PATH}) From eee535458663e8f050d1160809119d04ee231934 Mon Sep 17 00:00:00 2001 From: Sander Cox Date: Fri, 20 Nov 2020 22:28:14 +0100 Subject: [PATCH 0119/1694] [vcpkg] X_VCPKG_APPINSTALL_DEPS_INSTALL optionally install dependencies on install (#14243) * Adding an install command override for dependencies * Apply suggestions from code review Use variables directly instead of prefixing with `${}` as is done in rest of the file. Thanks @shatur95 Co-authored-by: Hennadii Chernyshchyk * Update scripts/buildsystems/vcpkg.cmake Co-authored-by: Hennadii Chernyshchyk Co-authored-by: Hennadii Chernyshchyk --- scripts/buildsystems/vcpkg.cmake | 40 ++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index ecacaf066f10aa..55516b1f72ec94 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -515,6 +515,46 @@ function(x_vcpkg_install_local_dependencies) endif() endfunction() +set(X_VCPKG_APPLOCAL_DEPS_INSTALL ${X_VCPKG_APPLOCAL_DEPS_INSTALL} CACHE BOOL "(experimental) Automatically copy dependencies into the install target directory for executables.") +if(X_VCPKG_APPLOCAL_DEPS_INSTALL) + function(install) + _install(${ARGV}) + + if(ARGV0 STREQUAL "TARGETS") + # Will contain the list of targets + set(PARSED_TARGETS "") + + # Destination - [RUNTIME] DESTINATION argument overrides this + set(DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") + + # Parse arguments given to the install function to find targets and (runtime) destination + set(MODIFIER "") # Modifier for the command in the argument + set(LAST_COMMAND "") # Last command we found to process + foreach(ARG ${ARGN}) + if(ARG MATCHES "ARCHIVE|LIBRARY|RUNTIME|OBJECTS|FRAMEWORK|BUNDLE|PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE") + set(MODIFIER ${ARG}) + continue() + endif() + + if(ARG MATCHES "TARGETS|DESTINATION|PERMISSIONS|CONFIGURATIONS|COMPONENT|NAMELINK_COMPONENT|OPTIONAL|EXCLUDE_FROM_ALL|NAMELINK_ONLY|NAMELINK_SKIP") + set(LAST_COMMAND ${ARG}) + continue() + endif() + + if(LAST_COMMAND STREQUAL "TARGETS") + list(APPEND PARSED_TARGETS "${ARG}") + endif() + + if(LAST_COMMAND STREQUAL "DESTINATION" AND (MODIFIER STREQUAL "" OR MODIFIER STREQUAL "RUNTIME")) + set(DESTINATION "${ARG}") + endif() + endforeach() + + x_vcpkg_install_local_dependencies(TARGETS ${PARSED_TARGETS} DESTINATION ${DESTINATION}) + endif() + endfunction() +endif() + if(NOT DEFINED VCPKG_OVERRIDE_FIND_PACKAGE_NAME) set(VCPKG_OVERRIDE_FIND_PACKAGE_NAME find_package) endif() From fcd76e6707a30fa6d37ed530853f2b4f474f6982 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 13:49:06 +0100 Subject: [PATCH 0120/1694] run a first test with upstream cmake --- ports/mapnik/cmake/CMakeLists.txt | 329 ---------- ports/mapnik/cmake/MapnikConfig.cmake.in | 5 - ports/mapnik/cmake/demo/c++/CMakeLists.txt | 7 - ports/mapnik/cmake/demo/viewer/CMakeLists.txt | 28 - ports/mapnik/cmake/files.cmake | 568 ------------------ .../cmake/plugins/input/csv/CMakeLists.txt | 15 - .../cmake/plugins/input/gdal/CMakeLists.txt | 12 - .../cmake/plugins/input/geobuf/CMakeLists.txt | 11 - .../plugins/input/geojson/CMakeLists.txt | 14 - .../cmake/plugins/input/ogr/CMakeLists.txt | 14 - .../plugins/input/pgraster/CMakeLists.txt | 13 - .../plugins/input/postgis/CMakeLists.txt | 16 - .../cmake/plugins/input/raster/CMakeLists.txt | 13 - .../cmake/plugins/input/shape/CMakeLists.txt | 17 - .../cmake/plugins/input/sqlite/CMakeLists.txt | 12 - .../plugins/input/topojson/CMakeLists.txt | 11 - ports/mapnik/cmake/src/json/CMakeLists.txt | 31 - ports/mapnik/cmake/src/wkt/CMakeLists.txt | 22 - .../cmake/utils/mapnik-render/CMakeLists.txt | 6 - .../cmake/utils/shapeindex/CMakeLists.txt | 7 - ports/mapnik/fix-box2d.patch | 12 - .../mapnik/fix-constructor-inheritance.patch | 39 -- ports/mapnik/portfile.cmake | 99 +-- ports/mapnik/vcpkg.json | 103 +++- ports/mapnik/viewer.ini | 2 - 25 files changed, 142 insertions(+), 1264 deletions(-) delete mode 100644 ports/mapnik/cmake/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/MapnikConfig.cmake.in delete mode 100644 ports/mapnik/cmake/demo/c++/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/demo/viewer/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/files.cmake delete mode 100644 ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/src/json/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/src/wkt/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt delete mode 100644 ports/mapnik/fix-box2d.patch delete mode 100644 ports/mapnik/fix-constructor-inheritance.patch delete mode 100644 ports/mapnik/viewer.ini diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt deleted file mode 100644 index 922daf44751d15..00000000000000 --- a/ports/mapnik/cmake/CMakeLists.txt +++ /dev/null @@ -1,329 +0,0 @@ -cmake_minimum_required(VERSION 3.13.4) -project(mapnik) - -set(CXX_STANDARD 17) -set(MAPNIK_MAJOR_VERSION 3) -set(MAPNIK_MINOR_VERSION 0) -set(MAPNIK_PATCH_VERSION 23) -set(MAPNIK_VERSION ${MAPNIK_MAJOR_VERSION}.${MAPNIK_MINOR_VERSION}.${MAPNIK_PATCH_VERSION}) - -include(CMakeDependentOption) - -option(MAPNIK_STATIC_LIB "Build a static library" ON) - -option(WITH_DEMO "Build demo" ON) -option(WITH_VIEWER "Build viewer" OFF) - -option(WITH_INPUTS "Build input plugins" ON) - -CMAKE_DEPENDENT_OPTION(WITH_INPUT_CSV "Build the csv input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_GDAL "Build the gdal input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_GEOBUF "Build the geobuf input plugin" OFF "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_GEOJSON "Build the geojson input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_OGR "Build the ogr input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_PGRASTER "Build the pgraster input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_POSTGIS "Build the postgis input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_RASTER "Build the raster input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_SHAPE "Build the shape input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_SQLITE "Build the sqlite input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_TOPOJSON "Build the topojson input plugin" ON "WITH_INPUTS" ON) - -option(WITH_UTILS "Build the utilities" ON ) - -option(WITH_GRID "Use the grid renderer" OFF) -option(WITH_CAIRO "Use cairo" ON) -option(WITH_PROJ4 "Use proj4" ON) - -if(MSVC) - # Force to always compile with W4 - if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") - string(REGEX REPLACE "/W[0-4]" "/W1" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W1") - endif() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd\"4068\" /wd\"4661\" /wd\"4503\" ") - add_compile_options(/MP) - add_compile_options(-bigobj) #added by @am2222 - add_compile_definitions(ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1) #added by @am2222 for proj4 compile -endif() - -find_package(Boost REQUIRED - COMPONENTS filesystem system regex program_options) - -find_package(freetype CONFIG REQUIRED) - -find_package(harfbuzz CONFIG REQUIRED) -find_package(ICU REQUIRED COMPONENTS uc) - -find_package(PNG REQUIRED) -find_package(JPEG REQUIRED) -find_package(TIFF REQUIRED) -find_package(WebP CONFIG REQUIRED) -find_package(LibXml2 REQUIRED) -find_package(ZLIB REQUIRED) -find_path(MAPBOX_POLYLABEL_INCLUDE_DIRS "mapbox/polylabel.hpp") -find_path(MAPBOX_GEOMETRY_INCLUDE_DIRS "mapbox/feature.hpp") -find_path(MAPBOX_VARIANT_INCLUDE_DIRS "mapbox/optional.hpp") -set (MAPNIK_DEFS - -DHAVE_PNG - -DHAVE_JPEG - -DHAVE_TIFF - -DHAVE_WEBP) - -#vcpkg only supports icu on windows -if(WIN32) - set(MAPNIK_DEFS ${MAPNIK_DEFS} -DBOOST_REGEX_HAS_ICU) -endif() -set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2) - -# AGG -include(files.cmake) - -if (WITH_CAIRO) - find_package(unofficial-cairo CONFIG REQUIRED) - - set(MAPNIK_SOURCES ${MAPNIK_SOURCES} - src/cairo/process_markers_symbolizer.cpp - src/cairo/process_group_symbolizer.cpp - src/cairo/cairo_context.cpp - src/cairo/cairo_render_vector.cpp - src/cairo/cairo_renderer.cpp - src/cairo/process_building_symbolizer.cpp - src/cairo/process_debug_symbolizer.cpp - src/cairo/process_line_pattern_symbolizer.cpp - src/cairo/process_line_symbolizer.cpp - src/cairo/process_point_symbolizer.cpp - src/cairo/process_polygon_pattern_symbolizer.cpp - src/cairo/process_polygon_symbolizer.cpp - src/cairo/process_raster_symbolizer.cpp - src/cairo/process_text_symbolizer.cpp) - - set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_CAIRO) - - set(OPTIONAL_LIBRARIES ${OPTIONAL_LIBRARIES} unofficial::cairo::cairo) -endif() -message(STATUS "Cairo renderer " ${WITH_CAIRO}) - -if (WITH_PROJ4) - find_package(PROJ4 CONFIG REQUIRED) - set(OPTIONAL_LIBRARIES ${OPTIONAL_LIBRARIES} proj) - set(MAPNIK_DEFS ${MAPNIK_DEFS} -DMAPNIK_USE_PROJ4) -endif() - -if (WITH_GRID) - set(MAPNIK_SOURCES ${MAPNIK_SOURCES} - src/grid/grid.cpp - src/grid/grid_renderer.cpp - src/grid/process_building_symbolizer.cpp - src/grid/process_line_pattern_symbolizer.cpp - src/grid/process_line_symbolizer.cpp - src/grid/process_point_symbolizer.cpp - src/grid/process_polygon_pattern_symbolizer.cpp - src/grid/process_polygon_symbolizer.cpp - src/grid/process_raster_symbolizer.cpp - src/grid/process_shield_symbolizer.cpp - src/grid/process_text_symbolizer.cpp) - set(MAPNIK_DEFS ${MAPNIK_DEFS} -DGRID_RENDERER) -endif() -message(STATUS "Grid renderer: " ${WITH_GRID}) - -set(MAPNIK_SOURCES ${MAPNIK_SOURCES} - src/svg/output/svg_output_grammars.cpp - src/svg/output/svg_renderer.cpp - src/svg/output/svg_generator.cpp - src/svg/output/svg_output_attributes.cpp - src/svg/output/process_symbolizers.cpp - src/svg/output/process_line_symbolizer.cpp - src/svg/output/process_polygon_symbolizer.cpp) -set(MAPNIK_DEFS ${MAPNIK_DEFS} -DSVG_RENDERER) - -set(MAPNIK_SOURCES ${MAPNIK_SOURCES} - src/jpeg_reader.cpp - src/libxml2_loader.cpp - src/png_reader.cpp - src/tiff_reader.cpp - src/webp_reader.cpp -) - - -set(MAPNIK_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/include) - -set(mapnik_include_paths - ${PROJECT_SOURCE_DIR}/deps - ${PROJECT_SOURCE_DIR}/deps/agg/include) - -add_library(mapnik ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) -if (MAPNIK_STATIC_LIB) -else () - message(STATUS "Building shared library") - set_target_properties(mapnik PROPERTIES DEFINE_SYMBOL MAPNIK_EXPORTS) - set(MAPNIK_LIB_DEFINITION -DMAPNIK_EXPORTS) -endif () - -target_compile_definitions(mapnik PUBLIC ${MAPNIK_DEFS}) -target_include_directories(mapnik PUBLIC - $ - $ -) -target_include_directories(mapnik PRIVATE - ${mapnik_include_paths} - ${JPEG_INCLUDE_DIR} - ${LIBXML2_INCLUDE_DIR} - ${MAPBOX_POLYLABEL_INCLUDE_DIRS} - ${MAPBOX_GEOMETRY_INCLUDE_DIRS} - ${MAPBOX_VARIANT_INCLUDE_DIRS} -) -target_link_libraries(mapnik PUBLIC - Boost::boost Boost::filesystem Boost::system Boost::regex Boost::program_options Boost::system - WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder - freetype - ICU::uc - PNG::PNG - TIFF::TIFF - ZLIB::ZLIB - harfbuzz::harfbuzz - JPEG::JPEG - ${LIBXML2_LIBRARIES} - ${OPTIONAL_LIBRARIES} -) - -install(TARGETS mapnik - EXPORT MapnikTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin - INCLUDES DESTINATION include/ - PUBLIC_HEADER DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/include/ -) -install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -install(DIRECTORY deps/agg/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - -add_subdirectory(src/json) -add_subdirectory(src/wkt) - -install(EXPORT MapnikTargets - FILE MapnikTargets.cmake - NAMESPACE mapnik:: - DESTINATION lib/cmake/mapnik -) - -# ideally we should also generate mapnik-config - -if (WITH_INPUT_CSV) - add_subdirectory(plugins/input/csv) -endif() - -if (WITH_INPUT_GDAL) - find_package(GDAL REQUIRED) - add_subdirectory(plugins/input/gdal) -endif() - -if (WITH_INPUT_GEOBUF) - add_subdirectory(plugins/input/geobuf) -endif() - -if (WITH_INPUT_GEOJSON) - add_subdirectory(plugins/input/geojson) -endif() - -if (WITH_INPUT_OGR) - add_subdirectory(plugins/input/ogr) -endif() - -if (WITH_INPUT_PGRASTER) - find_package(PostgreSQL REQUIRED) - add_subdirectory(plugins/input/pgraster) -endif() - -if (WITH_INPUT_POSTGIS) - find_package(PostgreSQL REQUIRED) - add_subdirectory(plugins/input/postgis) -endif() - -if (WITH_INPUT_RASTER) - add_subdirectory(plugins/input/raster) -endif() - -if (WITH_INPUT_SHAPE) - add_subdirectory(plugins/input/shape) -endif() - -if (WITH_INPUT_SQLITE) - find_package(SQLite3 REQUIRED) - add_subdirectory(plugins/input/sqlite) -endif() - -if (WITH_INPUT_TOPOJSON) - add_subdirectory(plugins/input/topojson) -endif() - -if (WITH_INPUTS) - message(STATUS "Input plugins:") - if(WITH_INPUT_CSV ) - message(STATUS " - csv ") - endif() - if(WITH_INPUT_GDAL ) - message(STATUS " - gdal ") - endif() - if(WITH_INPUT_GEOBUF ) - message(STATUS " - geobuf ") - endif() - if(WITH_INPUT_GEOJSON ) - message(STATUS " - geojson ") - endif() - if(WITH_INPUT_OGR ) - message(STATUS " - ogr ") - endif() - if(WITH_INPUT_PGRASTER ) - message(STATUS " - pgraster") - endif() - if(WITH_INPUT_POSTGIS ) - message(STATUS " - postgis ") - endif() - if(WITH_INPUT_RASTER ) - message(STATUS " - raster ") - endif() - if(WITH_INPUT_SHAPE ) - message(STATUS " - shape ") - endif() - if(WITH_INPUT_SQLITE ) - message(STATUS " - sqlite ") - endif() - if(WITH_INPUT_TOPOJSON ) - message(STATUS " - topojson") - endif() -else() - message(STATUS "Input plugins OFF") -endif() - -if(WITH_DEMO) - add_subdirectory(demo/c++) -endif() - -if(WITH_VIEWER) - find_package(Qt5 COMPONENTS Widgets REQUIRED) - add_subdirectory(demo/viewer) -endif() - -if(WITH_UTILS) - add_subdirectory(utils/mapnik-render) - add_subdirectory(utils/shapeindex) -endif() - -include(CMakePackageConfigHelpers) -write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfigVersion.cmake" - VERSION ${MAPNIK_VERSION} - COMPATIBILITY SameMajorVersion -) - -configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/MapnikConfig.cmake.in - "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfig.cmake" - INSTALL_DESTINATION lib/cmake/mapnik -) - -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfigVersion.cmake" - DESTINATION lib/cmake/mapnik -) diff --git a/ports/mapnik/cmake/MapnikConfig.cmake.in b/ports/mapnik/cmake/MapnikConfig.cmake.in deleted file mode 100644 index 7df03c72cfadd0..00000000000000 --- a/ports/mapnik/cmake/MapnikConfig.cmake.in +++ /dev/null @@ -1,5 +0,0 @@ -@PACKAGE_INIT@ - -include("${CMAKE_CURRENT_LIST_DIR}/MapnikTargets.cmake") - -check_required_components(mapnik) \ No newline at end of file diff --git a/ports/mapnik/cmake/demo/c++/CMakeLists.txt b/ports/mapnik/cmake/demo/c++/CMakeLists.txt deleted file mode 100644 index 635b5693aeb764..00000000000000 --- a/ports/mapnik/cmake/demo/c++/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_executable(mapnik-demo rundemo.cpp) -add_dependencies(mapnik-demo mapnik) -target_include_directories(mapnik-demo PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-demo PRIVATE mapnik) -install(TARGETS mapnik-demo DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/cmake/demo/viewer/CMakeLists.txt b/ports/mapnik/cmake/demo/viewer/CMakeLists.txt deleted file mode 100644 index 34b53786d433c5..00000000000000 --- a/ports/mapnik/cmake/demo/viewer/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -add_executable(mapnik-viewer - about_dialog.cpp - info_dialog.cpp - layerdelegate.cpp - layerlistmodel.cpp - layerwidget.cpp - layer_info_dialog.cpp - main.cpp - mainwindow.cpp - mapwidget.cpp - styles_model.cpp - forms/about.ui - forms/info.ui - forms/layer_info.ui - mapnik_viewer.qrc) - -set_target_properties(mapnik-viewer PROPERTIES - AUTOUIC_SEARCH_PATHS forms - AUTORCC ON - AUTOUIC ON - AUTOMOC ON) - -add_dependencies(mapnik-viewer mapnik) -target_include_directories(mapnik-viewer PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-viewer PRIVATE mapnik Qt5::Widgets) -install(TARGETS mapnik-viewer DESTINATION bin) diff --git a/ports/mapnik/cmake/files.cmake b/ports/mapnik/cmake/files.cmake deleted file mode 100644 index d3d86d8975cf64..00000000000000 --- a/ports/mapnik/cmake/files.cmake +++ /dev/null @@ -1,568 +0,0 @@ -set (MAPNIK_SOURCES - src/cairo_io.cpp - src/color.cpp - src/color_factory.cpp - src/config_error.cpp - src/conversions_numeric.cpp - src/conversions_string.cpp - src/css/css_color_grammar_x3.cpp - src/css/css_grammar_x3.cpp - src/dasharray_parser.cpp - src/datasource_cache.cpp - src/datasource_cache_static.cpp - src/debug.cpp - src/expression.cpp - src/expression_grammar_x3.cpp - src/expression_node.cpp - src/expression_string.cpp - src/feature_kv_iterator.cpp - src/feature_style_processor.cpp - src/feature_type_style.cpp - src/font_engine_freetype.cpp - src/font_set.cpp - src/fs.cpp - src/function_call.cpp - src/generate_image_filters.cpp - src/geometry/box2d.cpp - src/geometry/closest_point.cpp - src/geometry/envelope.cpp - src/geometry/interior.cpp - src/geometry/polylabel.cpp - src/geometry/reprojection.cpp - src/gradient.cpp - src/group/group_layout_manager.cpp - src/group/group_rule.cpp - src/group/group_symbolizer_helper.cpp - src/image.cpp - src/image_any.cpp - src/image_compositing.cpp - src/image_copy.cpp - src/image_filter_grammar_x3.cpp - src/image_options.cpp - src/image_reader.cpp - src/image_scaling.cpp - src/image_util.cpp - src/image_util_jpeg.cpp - src/image_util_png.cpp - src/image_util_tiff.cpp - src/image_util_webp.cpp - src/image_view.cpp - src/image_view_any.cpp - src/layer.cpp - src/load_map.cpp - src/map.cpp - src/mapped_memory_cache.cpp - src/marker_cache.cpp - src/marker_helpers.cpp - src/memory_datasource.cpp - src/palette.cpp - src/params.cpp - src/parse_image_filters.cpp - src/parse_path.cpp - src/parse_transform.cpp - src/path_expression_grammar_x3.cpp - src/plugin.cpp - src/proj_transform.cpp - src/projection.cpp - src/raster_colorizer.cpp - src/renderer_common.cpp - src/renderer_common/pattern_alignment.cpp - src/renderer_common/render_group_symbolizer.cpp - src/renderer_common/render_markers_symbolizer.cpp - src/renderer_common/render_pattern.cpp - src/renderer_common/render_thunk_extractor.cpp - src/request.cpp - src/rule.cpp - src/save_map.cpp - src/scale_denominator.cpp - src/simplify.cpp - src/svg/svg_parser.cpp - src/svg/svg_path_grammar_x3.cpp - src/svg/svg_path_parser.cpp - src/svg/svg_points_parser.cpp - src/svg/svg_transform_parser.cpp - src/symbolizer.cpp - src/symbolizer_enumerations.cpp - src/symbolizer_keys.cpp - src/text/color_font_renderer.cpp - src/text/face.cpp - src/text/font_feature_settings.cpp - src/text/font_library.cpp - src/text/formatting/base.cpp - src/text/formatting/format.cpp - src/text/formatting/layout.cpp - src/text/formatting/list.cpp - src/text/formatting/registry.cpp - src/text/formatting/text.cpp - src/text/glyph_positions.cpp - src/text/itemizer.cpp - src/text/placement_finder.cpp - src/text/placements/base.cpp - src/text/placements/dummy.cpp - src/text/placements/list.cpp - src/text/placements/registry.cpp - src/text/placements/simple.cpp - src/text/properties_util.cpp - src/text/renderer.cpp - src/text/scrptrun.cpp - src/text/symbolizer_helpers.cpp - src/text/text_layout.cpp - src/text/text_line.cpp - src/text/text_properties.cpp - src/transform_expression.cpp - src/transform_expression_grammar_x3.cpp - src/twkb.cpp - src/unicode.cpp - src/util/math.cpp - src/util/utf_conv_win.cpp - src/value.cpp - src/vertex_adapters.cpp - src/vertex_cache.cpp - src/warp.cpp - src/well_known_srs.cpp - src/wkb.cpp - src/xml_tree.cpp - ) - - -set(MAPNIK_AGG_SOURCES - src/agg/agg_renderer.cpp - src/agg/process_building_symbolizer.cpp - src/agg/process_debug_symbolizer.cpp - src/agg/process_dot_symbolizer.cpp - src/agg/process_group_symbolizer.cpp - src/agg/process_line_pattern_symbolizer.cpp - src/agg/process_line_symbolizer.cpp - src/agg/process_markers_symbolizer.cpp - src/agg/process_point_symbolizer.cpp - src/agg/process_polygon_pattern_symbolizer.cpp - src/agg/process_polygon_symbolizer.cpp - src/agg/process_raster_symbolizer.cpp - src/agg/process_shield_symbolizer.cpp - src/agg/process_text_symbolizer.cpp) - - -set(AGG_SOURCES - deps/agg/src/agg_arc.cpp - deps/agg/src/agg_arrowhead.cpp - deps/agg/src/agg_bezier_arc.cpp - deps/agg/src/agg_bspline.cpp - deps/agg/src/agg_curves.cpp - deps/agg/src/agg_embedded_raster_fonts.cpp - deps/agg/src/agg_gsv_text.cpp - deps/agg/src/agg_image_filters.cpp - deps/agg/src/agg_line_aa_basics.cpp - deps/agg/src/agg_line_profile_aa.cpp - deps/agg/src/agg_pixfmt_rgba.cpp - deps/agg/src/agg_rounded_rect.cpp - deps/agg/src/agg_sqrt_tables.cpp - deps/agg/src/agg_trans_affine.cpp - deps/agg/src/agg_trans_double_path.cpp - deps/agg/src/agg_trans_single_path.cpp - deps/agg/src/agg_trans_warp_magnifier.cpp - deps/agg/src/agg_vcgen_bspline.cpp - deps/agg/src/agg_vcgen_contour.cpp - deps/agg/src/agg_vcgen_dash.cpp - deps/agg/src/agg_vcgen_markers_term.cpp - deps/agg/src/agg_vcgen_stroke.cpp - deps/agg/src/agg_vpgen_clip_polygon.cpp - deps/agg/src/agg_vpgen_clip_polyline.cpp - deps/agg/src/agg_vpgen_segmentator.cpp ) - - -set(MAPNIK_INC - mapnik/adaptive_smooth.hpp - mapnik/agg_helpers.hpp - mapnik/agg_pattern_source.hpp - mapnik/agg_rasterizer.hpp - mapnik/agg_renderer.hpp - mapnik/agg_render_marker.hpp - mapnik/attribute.hpp - mapnik/attribute_collector.hpp - mapnik/attribute_descriptor.hpp - mapnik/boolean.hpp - mapnik/boost_spirit_instantiate.hpp - mapnik/cairo_io.hpp - mapnik/color.hpp - mapnik/color_factory.hpp - mapnik/config.hpp - mapnik/config_error.hpp - mapnik/coord.hpp - mapnik/css/css_color_grammar_x3.hpp - mapnik/css/css_color_grammar_x3_def.hpp - mapnik/css/css_grammar_x3.hpp - mapnik/css/css_grammar_x3_def.hpp - mapnik/css/css_unit_value.hpp - mapnik/cxx11_support.hpp - mapnik/datasource.hpp - mapnik/datasource_cache.hpp - mapnik/datasource_geometry_type.hpp - mapnik/debug.hpp - mapnik/enumeration.hpp - mapnik/evaluate_global_attributes.hpp - mapnik/expression.hpp - mapnik/expression_evaluator.hpp - mapnik/expression_grammar_x3.hpp - mapnik/expression_grammar_x3_config.hpp - mapnik/expression_grammar_x3_def.hpp - mapnik/expression_node.hpp - mapnik/expression_node_types.hpp - mapnik/expression_string.hpp - mapnik/extend_converter.hpp - mapnik/factory.hpp - mapnik/feature.hpp - mapnik/featureset.hpp - mapnik/feature_factory.hpp - mapnik/feature_kv_iterator.hpp - mapnik/feature_layer_desc.hpp - mapnik/feature_style_processor.hpp - mapnik/feature_style_processor_context.hpp - mapnik/feature_style_processor_impl.hpp - mapnik/feature_type_style.hpp - mapnik/filter_featureset.hpp - mapnik/font_engine_freetype.hpp - mapnik/font_set.hpp - mapnik/function_call.hpp - mapnik/geometry.hpp - mapnik/geom_util.hpp - mapnik/global.hpp - mapnik/gradient.hpp - mapnik/grid_vertex_converter.hpp - mapnik/hextree.hpp - mapnik/hit_test_filter.hpp - mapnik/image.hpp - mapnik/image_any.hpp - mapnik/image_compositing.hpp - mapnik/image_copy.hpp - mapnik/image_filter.hpp - mapnik/image_filter_grammar_x3.hpp - mapnik/image_filter_grammar_x3_def.hpp - mapnik/image_filter_types.hpp - mapnik/image_impl.hpp - mapnik/image_null.hpp - mapnik/image_options.hpp - mapnik/image_reader.hpp - mapnik/image_scaling.hpp - mapnik/image_scaling_traits.hpp - mapnik/image_util.hpp - mapnik/image_util_jpeg.hpp - mapnik/image_util_png.hpp - mapnik/image_util_tiff.hpp - mapnik/image_util_webp.hpp - mapnik/image_view.hpp - mapnik/image_view_any.hpp - mapnik/image_view_impl.hpp - mapnik/image_view_null.hpp - mapnik/init_priority.hpp - mapnik/jpeg_io.hpp - mapnik/label_collision_detector.hpp - mapnik/layer.hpp - mapnik/load_map.hpp - mapnik/make_unique.hpp - mapnik/map.hpp - mapnik/mapped_memory_cache.hpp - mapnik/marker.hpp - mapnik/markers_placement.hpp - mapnik/marker_cache.hpp - mapnik/marker_helpers.hpp - mapnik/memory_datasource.hpp - mapnik/memory_featureset.hpp - mapnik/octree.hpp - mapnik/offset_converter.hpp - mapnik/palette.hpp - mapnik/params.hpp - mapnik/params_impl.hpp - mapnik/parse_path.hpp - mapnik/path.hpp - mapnik/path_expression.hpp - mapnik/path_expression_grammar_x3.hpp - mapnik/path_expression_grammar_x3_def.hpp - mapnik/pixel_position.hpp - mapnik/pixel_types.hpp - mapnik/plugin.hpp - mapnik/png_io.hpp - mapnik/pool.hpp - mapnik/projection.hpp - mapnik/proj_strategy.hpp - mapnik/proj_transform.hpp - mapnik/ptree_helpers.hpp - mapnik/quad_tree.hpp - mapnik/query.hpp - mapnik/raster.hpp - mapnik/raster_colorizer.hpp - mapnik/renderer_common.hpp - mapnik/request.hpp - mapnik/rule.hpp - mapnik/rule_cache.hpp - mapnik/safe_cast.hpp - mapnik/save_map.hpp - mapnik/scale_denominator.hpp - mapnik/simplify.hpp - mapnik/simplify_converter.hpp - mapnik/span_image_filter.hpp - mapnik/sql_utils.hpp - mapnik/sse.hpp - mapnik/stringify_macro.hpp - mapnik/symbolizer.hpp - mapnik/symbolizer_base.hpp - mapnik/symbolizer_default_values.hpp - mapnik/symbolizer_dispatch.hpp - mapnik/symbolizer_enumerations.hpp - mapnik/symbolizer_hash.hpp - mapnik/symbolizer_keys.hpp - mapnik/symbolizer_utils.hpp - mapnik/tiff_io.hpp - mapnik/timer.hpp - mapnik/tolerance_iterator.hpp - mapnik/transform_path_adapter.hpp - mapnik/unicode.hpp - mapnik/value.hpp - mapnik/version.hpp - mapnik/vertex.hpp - mapnik/vertex_adapters.hpp - mapnik/vertex_cache.hpp - mapnik/vertex_converters.hpp - mapnik/vertex_processor.hpp - mapnik/vertex_vector.hpp - mapnik/view_strategy.hpp - mapnik/view_transform.hpp - mapnik/warning_ignore.hpp - mapnik/warning_ignore_agg.hpp - mapnik/warp.hpp - mapnik/webp_io.hpp - mapnik/well_known_srs.hpp - mapnik/wkb.hpp - mapnik/xml_attribute_cast.hpp - mapnik/xml_loader.hpp - mapnik/xml_node.hpp - mapnik/xml_tree.hpp - mapnik/geometry/boost_adapters.hpp - mapnik/geometry/boost_spirit_karma_adapter.hpp - mapnik/geometry/box2d.hpp - mapnik/geometry/box2d_impl.hpp - mapnik/geometry/centroid.hpp - mapnik/geometry/closest_point.hpp - mapnik/geometry/correct.hpp - mapnik/geometry/envelope.hpp - mapnik/geometry/envelope_impl.hpp - mapnik/geometry/fusion_adapted.hpp - mapnik/geometry/geometry_type.hpp - mapnik/geometry/geometry_types.hpp - mapnik/geometry/interior.hpp - mapnik/geometry/is_empty.hpp - mapnik/geometry/is_simple.hpp - mapnik/geometry/is_valid.hpp - mapnik/geometry/line_string.hpp - mapnik/geometry/multi_line_string.hpp - mapnik/geometry/multi_point.hpp - mapnik/geometry/multi_polygon.hpp - mapnik/geometry/point.hpp - mapnik/geometry/polygon.hpp - mapnik/geometry/polygon_vertex_processor.hpp - mapnik/geometry/polylabel.hpp - mapnik/geometry/remove_empty.hpp - mapnik/geometry/reprojection.hpp - mapnik/geometry/reprojection_impl.hpp - mapnik/geometry/strategy.hpp - mapnik/geometry/to_path.hpp - mapnik/geometry/transform.hpp - mapnik/csv/csv_grammar_x3.hpp - mapnik/csv/csv_grammar_x3_def.hpp - mapnik/csv/csv_types.hpp - mapnik/svg/geometry_svg_generator.hpp - mapnik/svg/geometry_svg_generator_impl.hpp - mapnik/svg/svg_converter.hpp - mapnik/svg/svg_grammar_config_x3.hpp - mapnik/svg/svg_parser.hpp - mapnik/svg/svg_parser_exception.hpp - mapnik/svg/svg_path_adapter.hpp - mapnik/svg/svg_path_attributes.hpp - mapnik/svg/svg_path_commands.hpp - mapnik/svg/svg_path_grammar_x3.hpp - mapnik/svg/svg_path_grammar_x3_def.hpp - mapnik/svg/svg_path_parser.hpp - mapnik/svg/svg_renderer_agg.hpp - mapnik/svg/svg_storage.hpp - mapnik/svg/svg_transform_grammar_x3.hpp - mapnik/svg/svg_transform_grammar_x3_def.hpp - mapnik/wkt/wkt_factory.hpp - mapnik/wkt/wkt_generator_grammar.hpp - mapnik/wkt/wkt_generator_grammar_impl.hpp - mapnik/wkt/wkt_grammar_x3.hpp - mapnik/wkt/wkt_grammar_x3_def.hpp - mapnik/cairo/cairo_context.hpp - mapnik/cairo/cairo_image_util.hpp - mapnik/cairo/cairo_renderer.hpp - mapnik/cairo/cairo_render_vector.hpp - mapnik/cairo/render_polygon_pattern.hpp - mapnik/grid/grid.hpp - mapnik/grid/grid_pixel.hpp - mapnik/grid/grid_pixfmt.hpp - mapnik/grid/grid_rasterizer.hpp - mapnik/grid/grid_renderer.hpp - mapnik/grid/grid_renderer_base.hpp - mapnik/grid/grid_rendering_buffer.hpp - mapnik/grid/grid_render_marker.hpp - mapnik/grid/grid_view.hpp - mapnik/json/attribute_value_visitor.hpp - mapnik/json/create_feature.hpp - mapnik/json/create_geometry.hpp - mapnik/json/extract_bounding_boxes_x3.hpp - mapnik/json/extract_bounding_boxes_x3_config.hpp - mapnik/json/feature_generator_grammar.hpp - mapnik/json/feature_generator_grammar_impl.hpp - mapnik/json/feature_grammar_x3.hpp - mapnik/json/feature_grammar_x3_def.hpp - mapnik/json/feature_parser.hpp - mapnik/json/generic_json_grammar_x3.hpp - mapnik/json/generic_json_grammar_x3_def.hpp - mapnik/json/geojson_grammar_x3.hpp - mapnik/json/geojson_grammar_x3_def.hpp - mapnik/json/geometry_generator_grammar.hpp - mapnik/json/geometry_generator_grammar_impl.hpp - mapnik/json/geometry_parser.hpp - mapnik/json/json_grammar_config.hpp - mapnik/json/json_value.hpp - mapnik/json/parse_feature.hpp - mapnik/json/positions_grammar_x3.hpp - mapnik/json/positions_grammar_x3_def.hpp - mapnik/json/positions_x3.hpp - mapnik/json/properties_generator_grammar.hpp - mapnik/json/properties_generator_grammar_impl.hpp - mapnik/json/stringifier.hpp - mapnik/json/topojson_grammar_x3.hpp - mapnik/json/topojson_grammar_x3_def.hpp - mapnik/json/topojson_utils.hpp - mapnik/json/topology.hpp - mapnik/json/unicode_string_grammar_x3.hpp - mapnik/json/unicode_string_grammar_x3_def.hpp - mapnik/json/value_converters.hpp - mapnik/util/char_array_buffer.hpp - mapnik/util/const_rendering_buffer.hpp - mapnik/util/container_adapter.hpp - mapnik/util/conversions.hpp - mapnik/util/dasharray_parser.hpp - mapnik/util/featureset_buffer.hpp - mapnik/util/feature_to_geojson.hpp - mapnik/util/file_io.hpp - mapnik/util/fs.hpp - mapnik/util/geometry_to_ds_type.hpp - mapnik/util/geometry_to_geojson.hpp - mapnik/util/geometry_to_svg.hpp - mapnik/util/geometry_to_wkb.hpp - mapnik/util/geometry_to_wkt.hpp - mapnik/util/hsl.hpp - mapnik/util/is_clockwise.hpp - mapnik/util/math.hpp - mapnik/util/name_to_int.hpp - mapnik/util/noncopyable.hpp - mapnik/util/path_iterator.hpp - mapnik/util/rounding_cast.hpp - mapnik/util/singleton.hpp - mapnik/util/spatial_index.hpp - mapnik/util/spirit_transform_attribute.hpp - mapnik/util/timer.hpp - mapnik/util/trim.hpp - mapnik/util/utf_conv_win.hpp - mapnik/util/variant.hpp - mapnik/util/variant_io.hpp - mapnik/group/group_layout.hpp - mapnik/group/group_layout_manager.hpp - mapnik/group/group_rule.hpp - mapnik/group/group_symbolizer_helper.hpp - mapnik/group/group_symbolizer_properties.hpp - mapnik/text/color_font_renderer.hpp - mapnik/text/evaluated_format_properties_ptr.hpp - mapnik/text/face.hpp - mapnik/text/font_feature_settings.hpp - mapnik/text/font_library.hpp - mapnik/text/glyph_info.hpp - mapnik/text/glyph_positions.hpp - mapnik/text/harfbuzz_shaper.hpp - mapnik/text/icu_shaper.hpp - mapnik/text/itemizer.hpp - mapnik/text/placement_finder.hpp - mapnik/text/placement_finder_impl.hpp - mapnik/text/properties_util.hpp - mapnik/text/renderer.hpp - mapnik/text/rotation.hpp - mapnik/text/scrptrun.hpp - mapnik/text/symbolizer_helpers.hpp - mapnik/text/text_layout.hpp - mapnik/text/text_line.hpp - mapnik/text/text_properties.hpp - mapnik/text/placements/base.hpp - mapnik/text/placements/dummy.hpp - mapnik/text/placements/list.hpp - mapnik/text/placements/registry.hpp - mapnik/text/placements/simple.hpp - mapnik/text/formatting/base.hpp - mapnik/text/formatting/format.hpp - mapnik/text/formatting/layout.hpp - mapnik/text/formatting/list.hpp - mapnik/text/formatting/registry.hpp - mapnik/text/formatting/text.hpp - mapnik/transform/parse_transform.hpp - mapnik/transform/transform_expression.hpp - mapnik/transform/transform_expression_grammar_x3.hpp - mapnik/transform/transform_expression_grammar_x3_def.hpp - mapnik/transform/transform_processor.hpp - mapnik/markers_placements/basic.hpp - mapnik/markers_placements/interior.hpp - mapnik/markers_placements/line.hpp - mapnik/markers_placements/point.hpp - mapnik/markers_placements/polylabel.hpp - mapnik/markers_placements/vertex_first.hpp - mapnik/markers_placements/vertex_last.hpp - mapnik/geometry/boost_adapters.hpp - mapnik/geometry/boost_spirit_karma_adapter.hpp - mapnik/geometry/box2d.hpp - mapnik/geometry/box2d_impl.hpp - mapnik/geometry/centroid.hpp - mapnik/geometry/closest_point.hpp - mapnik/geometry/correct.hpp - mapnik/geometry/envelope.hpp - mapnik/geometry/envelope_impl.hpp - mapnik/geometry/fusion_adapted.hpp - mapnik/geometry/geometry_type.hpp - mapnik/geometry/geometry_types.hpp - mapnik/geometry/interior.hpp - mapnik/geometry/is_empty.hpp - mapnik/geometry/is_simple.hpp - mapnik/geometry/is_valid.hpp - mapnik/geometry/line_string.hpp - mapnik/geometry/multi_line_string.hpp - mapnik/geometry/multi_point.hpp - mapnik/geometry/multi_polygon.hpp - mapnik/geometry/point.hpp - mapnik/geometry/polygon.hpp - mapnik/geometry/polygon_vertex_processor.hpp - mapnik/geometry/polylabel.hpp - mapnik/geometry/remove_empty.hpp - mapnik/geometry/reprojection.hpp - mapnik/geometry/reprojection_impl.hpp - mapnik/geometry/strategy.hpp - mapnik/geometry/to_path.hpp - mapnik/geometry/transform.hpp - mapnik/value/error.hpp - mapnik/value/hash.hpp - mapnik/value/types.hpp) - -set(MAPNIK_INC ${MAPNIK_INC} - mapnik/svg/output/svg_generator.hpp - mapnik/svg/output/svg_output_attributes.hpp - mapnik/svg/output/svg_output_grammars.hpp - mapnik/svg/output/svg_output_grammars_impl.hpp - mapnik/svg/output/svg_path_iterator.hpp - mapnik/svg/output/svg_renderer.hpp) - -set(MAPNIK_INC ${MAPNIK_INC} - mapnik/grid/grid.hpp - mapnik/grid/grid_pixel.hpp - mapnik/grid/grid_pixfmt.hpp - mapnik/grid/grid_rasterizer.hpp - mapnik/grid/grid_renderer.hpp - mapnik/grid/grid_renderer_base.hpp - mapnik/grid/grid_rendering_buffer.hpp - mapnik/grid/grid_render_marker.hpp - mapnik/grid/grid_view.hpp) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt deleted file mode 100644 index 8b8ef5a33382b5..00000000000000 --- a/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -add_library(mapnik-input-csv SHARED - csv_datasource.cpp - csv_featureset.cpp - csv_index_featureset.cpp - csv_inline_featureset.cpp - csv_utils.cpp) - -target_link_libraries(mapnik-input-csv PUBLIC mapnik mapnik-wkt mapnik-json) -target_include_directories(mapnik-input-csv PRIVATE - ${mapnik_include_paths} -) -set_target_properties(mapnik-input-csv PROPERTIES PREFIX "") -set_target_properties(mapnik-input-csv PROPERTIES OUTPUT_NAME "csv") -set_target_properties(mapnik-input-csv PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-csv DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt deleted file mode 100644 index 6c704c3f2b5097..00000000000000 --- a/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -add_library(mapnik-input-gdal SHARED - gdal_datasource.cpp - gdal_featureset.cpp) - -target_include_directories(mapnik-input-gdal PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-gdal PUBLIC mapnik ${GDAL_LIBRARIES}) -set_target_properties(mapnik-input-gdal PROPERTIES PREFIX "") -set_target_properties(mapnik-input-gdal PROPERTIES OUTPUT_NAME "gdal") -set_target_properties(mapnik-input-gdal PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-gdal DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt deleted file mode 100644 index 45279d717fc0e1..00000000000000 --- a/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_library(mapnik-input-geobuf SHARED -geobuf_datasource.cpp -geobuf_featureset.cpp) - -find_path(PROTOZERO_INCLUDE_DIRS "protozero/byteswap.hpp") -target_include_directories(mapnik-input-geobuf PRIVATE ${PROTOZERO_INCLUDE_DIRS} ${mapnik_include_paths}) -target_link_libraries(mapnik-input-geobuf PRIVATE mapnik) -set_target_properties(mapnik-input-geobuf PROPERTIES PREFIX "") -set_target_properties(mapnik-input-geobuf PROPERTIES OUTPUT_NAME "geobuf") -set_target_properties(mapnik-input-geobuf PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-geobuf DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt deleted file mode 100644 index 980a8c40428cae..00000000000000 --- a/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -add_library(mapnik-input-geojson SHARED - geojson_datasource.cpp - geojson_featureset.cpp - geojson_index_featureset.cpp - geojson_memory_index_featureset.cpp) - -target_include_directories(mapnik-input-geojson PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-geojson PRIVATE mapnik mapnik-json) -set_target_properties(mapnik-input-geojson PROPERTIES PREFIX "") -set_target_properties(mapnik-input-geojson PROPERTIES OUTPUT_NAME "geojson") -set_target_properties(mapnik-input-geojson PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-geojson DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt deleted file mode 100644 index 758107010fff0d..00000000000000 --- a/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -add_library(mapnik-input-ogr SHARED - ogr_converter.cpp - ogr_datasource.cpp - ogr_featureset.cpp - ogr_index_featureset.cpp) - -target_include_directories(mapnik-input-ogr PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-ogr PRIVATE mapnik ${OGR_LIBRARIES} ${GDAL_LIBRARIES}) -set_target_properties(mapnik-input-ogr PROPERTIES PREFIX "") -set_target_properties(mapnik-input-ogr PROPERTIES OUTPUT_NAME "ogr") -set_target_properties(mapnik-input-ogr PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-ogr DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt deleted file mode 100644 index 8716119cfdba9d..00000000000000 --- a/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -add_library(mapnik-input-pgraster SHARED -pgraster_datasource.cpp -pgraster_featureset.cpp -pgraster_wkb_reader.cpp) - -target_include_directories(mapnik-input-pgraster PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-pgraster PRIVATE mapnik PostgreSQL::PostgreSQL) -set_target_properties(mapnik-input-pgraster PROPERTIES PREFIX "") -set_target_properties(mapnik-input-pgraster PROPERTIES OUTPUT_NAME "pgraster") -set_target_properties(mapnik-input-pgraster PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-pgraster DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt deleted file mode 100644 index 6fb85622a6964a..00000000000000 --- a/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -find_package(odb CONFIG REQUIRED) -add_library(mapnik-input-postgis SHARED - postgis_datasource.cpp - postgis_featureset.cpp ) - -target_include_directories(mapnik-input-postgis PRIVATE - ${mapnik_include_paths} - ${MAPBOX_POLYLABEL_INCLUDE_DIRS} - ${MAPBOX_GEOMETRY_INCLUDE_DIRS} - ${MAPBOX_VARIANT_INCLUDE_DIRS} -) -target_link_libraries(mapnik-input-postgis PRIVATE mapnik PostgreSQL::PostgreSQL) -set_target_properties(mapnik-input-postgis PROPERTIES PREFIX "") -set_target_properties(mapnik-input-postgis PROPERTIES OUTPUT_NAME "postgis") -set_target_properties(mapnik-input-postgis PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-postgis DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt deleted file mode 100644 index 0341a369a5dc72..00000000000000 --- a/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -add_library(mapnik-input-raster SHARED - raster_datasource.cpp - raster_featureset.cpp - raster_info.cpp) - -target_include_directories(mapnik-input-raster PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-raster PRIVATE mapnik) -set_target_properties(mapnik-input-raster PROPERTIES PREFIX "") -set_target_properties(mapnik-input-raster PROPERTIES OUTPUT_NAME "raster") -set_target_properties(mapnik-input-raster PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-raster DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt deleted file mode 100644 index f484c2fed36fe8..00000000000000 --- a/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -SET(INPUT_SHAPE_SOURCES - dbfile.cpp - dbf_test.cpp - shape_datasource.cpp - shape_featureset.cpp - shape_index_featureset.cpp - shape_io.cpp shape_utils.cpp -) -add_library(mapnik-input-shape SHARED ${INPUT_SHAPE_SOURCES}) -target_include_directories(mapnik-input-shape PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-shape PRIVATE mapnik) -set_target_properties(mapnik-input-shape PROPERTIES PREFIX "") -set_target_properties(mapnik-input-shape PROPERTIES OUTPUT_NAME "shape") -set_target_properties(mapnik-input-shape PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-shape DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt deleted file mode 100644 index eea67a1ef9970c..00000000000000 --- a/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -find_package(unofficial-sqlite3 CONFIG REQUIRED) -add_library(mapnik-input-sqlite SHARED - sqlite_datasource.cpp - sqlite_featureset.cpp) -target_include_directories(mapnik-input-sqlite PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-sqlite PRIVATE mapnik unofficial::sqlite3::sqlite3) -set_target_properties(mapnik-input-sqlite PROPERTIES PREFIX "") -set_target_properties(mapnik-input-sqlite PROPERTIES OUTPUT_NAME "sqlite") -set_target_properties(mapnik-input-sqlite PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-sqlite DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt deleted file mode 100644 index 61dcdb16022c82..00000000000000 --- a/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_library(mapnik-input-topojson SHARED - topojson_datasource.cpp - topojson_featureset.cpp) -target_include_directories(mapnik-input-topojson PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-topojson PRIVATE mapnik mapnik-json) -set_target_properties(mapnik-input-topojson PROPERTIES PREFIX "") -set_target_properties(mapnik-input-topojson PROPERTIES OUTPUT_NAME "topojson") -set_target_properties(mapnik-input-topojson PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-topojson DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/src/json/CMakeLists.txt b/ports/mapnik/cmake/src/json/CMakeLists.txt deleted file mode 100644 index d16f4596f89ae8..00000000000000 --- a/ports/mapnik/cmake/src/json/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -add_library(mapnik-json STATIC - extract_bounding_boxes_x3.cpp - feature_from_geojson.cpp - feature_grammar_x3.cpp - generic_json_grammar_x3.cpp - geojson_grammar_x3.cpp - geometry_from_geojson.cpp - mapnik_feature_to_geojson.cpp - mapnik_geometry_to_geojson.cpp - mapnik_json_generator_grammar.cpp - parse_feature.cpp - positions_grammar_x3.cpp - topojson_grammar_x3.cpp - unicode_string_grammar_x3.cpp) - -target_include_directories(mapnik-json PRIVATE - ${JPEG_INCLUDE_DIR} - ${LIBXML2_INCLUDE_DIR} - ${MAPBOX_POLYLABEL_INCLUDE_DIRS} - ${MAPBOX_GEOMETRY_INCLUDE_DIRS} - ${MAPBOX_VARIANT_INCLUDE_DIRS} -) -target_link_libraries(mapnik-json PRIVATE mapnik ${ICUU_LIB}) -#target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) - -install(TARGETS mapnik-json - EXPORT MapnikTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin -) \ No newline at end of file diff --git a/ports/mapnik/cmake/src/wkt/CMakeLists.txt b/ports/mapnik/cmake/src/wkt/CMakeLists.txt deleted file mode 100644 index a63413ce925c52..00000000000000 --- a/ports/mapnik/cmake/src/wkt/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -add_library(mapnik-wkt STATIC - geometry_to_wkt.cpp - mapnik_wkt_generator_grammar.cpp - wkt_factory.cpp - wkt_grammar_x3.cpp) - -target_include_directories(mapnik-wkt PRIVATE - ${MAPNIK_INCLUDE_PATH} - ${JPEG_INCLUDE_DIR} - ${LIBXML2_INCLUDE_DIR} - ${MAPBOX_POLYLABEL_INCLUDE_DIRS} - ${MAPBOX_GEOMETRY_INCLUDE_DIRS} - ${MAPBOX_VARIANT_INCLUDE_DIRS} -) -target_compile_definitions(mapnik-wkt PRIVATE ${MAPNIK_LIB_DEFINITION}) - -install(TARGETS mapnik-wkt - EXPORT MapnikTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin -) \ No newline at end of file diff --git a/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt b/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt deleted file mode 100644 index 0892f9a6d85762..00000000000000 --- a/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_executable(mapnik-render mapnik-render.cpp) -target_include_directories(mapnik-render PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-render PRIVATE mapnik) -install(TARGETS mapnik-render DESTINATION bin) diff --git a/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt b/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt deleted file mode 100644 index 5a81e557d1b7d8..00000000000000 --- a/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_executable(shapeindex shapeindex.cpp) -target_link_libraries(shapeindex PRIVATE mapnik) -target_include_directories(shapeindex PRIVATE - ../../plugins/input/shape - ${mapnik_include_paths} -) -install(TARGETS shapeindex DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/fix-box2d.patch b/ports/mapnik/fix-box2d.patch deleted file mode 100644 index f441fefbcbddae..00000000000000 --- a/ports/mapnik/fix-box2d.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/mapnik/geometry/box2d.hpp b/include/mapnik/geometry/box2d.hpp -index 1894978..7dc8d57 100644 ---- a/include/mapnik/geometry/box2d.hpp -+++ b/include/mapnik/geometry/box2d.hpp -@@ -23,6 +23,7 @@ - #ifndef MAPNIK_BOX2D_HPP - #define MAPNIK_BOX2D_HPP - -+#include - // mapnik - #include - #include diff --git a/ports/mapnik/fix-constructor-inheritance.patch b/ports/mapnik/fix-constructor-inheritance.patch deleted file mode 100644 index 41d295f6bf73c1..00000000000000 --- a/ports/mapnik/fix-constructor-inheritance.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp -index f6e795d..44b9931 100644 ---- a/include/mapnik/geometry.hpp -+++ b/include/mapnik/geometry.hpp -@@ -59,7 +59,7 @@ struct geometry : geometry_base - { - using coordinate_type = T; - --#if __cpp_inheriting_constructors >= 200802 -+#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) - - using geometry_base::geometry_base; - -diff --git a/include/mapnik/json/geojson_grammar_x3.hpp b/include/mapnik/json/geojson_grammar_x3.hpp -index 9a9ffaa..9c90d36 100644 ---- a/include/mapnik/json/geojson_grammar_x3.hpp -+++ b/include/mapnik/json/geojson_grammar_x3.hpp -@@ -53,7 +53,7 @@ using geojson_value_base = mapnik::util::variant; - struct geojson_value : geojson_value_base - { --#if __cpp_inheriting_constructors >= 200802 -+#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) - - using geojson_value_base::geojson_value_base; - -diff --git a/include/mapnik/json/json_value.hpp b/include/mapnik/json/json_value.hpp -index c5ed036..150a80f 100644 ---- a/include/mapnik/json/json_value.hpp -+++ b/include/mapnik/json/json_value.hpp -@@ -46,7 +46,7 @@ using json_value_base = mapnik::util::variant; - struct json_value : json_value_base - { --#if __cpp_inheriting_constructors >= 200802 -+#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) - - using json_value_base::json_value_base; - diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 4d42d336d62e8d..c7483d95052b79 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,40 +1,40 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO mapnik/mapnik - REF 4227fd5d698d069a92917cfea9ce9139435d3f12 - SHA512 913e725a05e315b8630928fec7635ccddac833428800cd3f1b5c25226952f00883dbe9b007eb36bfd0330eac001608596fb53d08aa3df2fce297a3aab3bbf935 + REPO mathisloge/mapnik + REF cmake-support + SHA512 69aab419d74e9bf70a54f3a900e28a8f2721cad13c167fb2ce44dd8d548a9d54fd2983417b8757e29cacf79efbaf11cfe405e000f8fdeb399aa3bf5ab1c9c213 HEAD_REF master - PATCHES - fix-box2d.patch - fix-constructor-inheritance.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(MAPNIK_STATIC_LIB OFF) -elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(MAPNIK_STATIC_LIB ON) -endif() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - cairo WITH_CAIRO - demo WITH_DEMO - viewer WITH_VIEWER - "input-csv" WITH_INPUT_CSV - "input-gdal" WITH_INPUT_GDAL - "input-geobuf" WITH_INPUT_GEOBUF - "input-geojson" WITH_INPUT_GEOJSON - "input-ogr" WITH_INPUT_OGR - "input-pgraster" WITH_INPUT_PGRASTER - "input-postgis" WITH_INPUT_POSTGIS - "input-raster" WITH_INPUT_RASTER - "input-shape" WITH_INPUT_SHAPE - "input-sqlite" WITH_INPUT_SQLITE - "input-topojson" WITH_INPUT_TOPOJSON - proj4 WITH_PROJ4 - utils WITH_UTILS + jpeg USE_JPEG + png USE_PNG + tiff USE_TIFF + webp USE_WEBP + libxml2 USE_LIBXML2 + cairo USE_CAIRO + proj4 USE_PROJ4 + "input-csv" USE_PLUGIN_INPUT_CSV + "input-gdal" USE_PLUGIN_INPUT_GDAL + "input-geobuf" USE_PLUGIN_INPUT_GEOBUF + "input-geojson" USE_PLUGIN_INPUT_GEOJSON + "input-ogr" USE_PLUGIN_INPUT_OGR + "input-pgraster" USE_PLUGIN_INPUT_PGRASTER + "input-postgis" USE_PLUGIN_INPUT_POSTGIS + "input-raster" USE_PLUGIN_INPUT_RASTER + "input-shape" USE_PLUGIN_INPUT_SHAPE + "input-sqlite" USE_PLUGIN_INPUT_SQLITE + "input-topojson" USE_PLUGIN_INPUT_TOPOJSON + viewer BUILD_DEMO_VIEWER + demo BUILD_DEMO_CPP + "utility-geometry-to-wkb" BUILD_UTILITY_GEOMETRY_TO_WKB + "utility-mapnik-index" BUILD_UTILITY_MAPNIK_INDEX + "utility-mapnik-render" BUILD_UTILITY_MAPNIK_RENDER + "utility-ogrindex" BUILD_UTILITY_OGRINDEX + "utility-pgsql2sqlite" BUILD_UTILITY_PGSQL2SQLITE + "utility-shapeindex" BUILD_UTILITY_SHAPEINDEX + "utility-svg2png" BUILD_UTILITY_SVG2PNG ) vcpkg_configure_cmake( @@ -42,10 +42,12 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} - -DMAPNIK_STATIC_LIB=${MAPNIK_STATIC_LIB} - -DBOOST_PREFIX=${CURRENT_INSTALLED_DIR}/include - -DFREE_TYPE_INCLUDE=${CURRENT_INSTALLED_DIR}/include/freetype2 - -DCMAKE_INSTALL_INCLUDEDIR=${CURRENT_PACKAGES_DIR}/include + -DBUILD_SHARED_LIBS=ON + -DBUILD_TEST=OFF + -DUSE_EXTERNAL_MAPBOX_GEOMETRY=ON + -DUSE_EXTERNAL_MAPBOX_POLYLABEL=ON + -DUSE_EXTERNAL_MAPBOX_PROTOZERO=ON + -DUSE_EXTERNAL_MAPBOX_VARIANT=ON ) vcpkg_install_cmake() @@ -53,6 +55,7 @@ vcpkg_install_cmake() # copy plugins into tool path, if any plugin is installed if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/plugins) file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + #file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() vcpkg_copy_pdbs() @@ -67,12 +70,28 @@ if("viewer" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES mapnik-viewer AUTO_CLEAN) endif() -if ("utils" IN_LIST FEATURES) - vcpkg_copy_tools( - TOOL_NAMES mapnik-render shapeindex - AUTO_CLEAN - ) - file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +if("utility-geometry-to-wkb" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES geometry_to_wkb AUTO_CLEAN) +endif() + +if("utility-mapnik-index" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES mapnik-index AUTO_CLEAN) +endif() +if("utility-mapnik-render" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES mapnik-render AUTO_CLEAN) +endif() +if("utility-ogrindex" IN_LIST FEATURES) + # build is currently not supported + # vcpkg_copy_tools(TOOL_NAMES ogrindex AUTO_CLEAN) +endif() +if("utility-pgsql2sqlite" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES pgsql2sqlite AUTO_CLEAN) +endif() +if("utility-shapeindex" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES shapeindex AUTO_CLEAN) +endif() +if("utility-svg2png" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES svg2png AUTO_CLEAN) endif() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mapnik) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 5870e40e964be6..9451393e108fe0 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -21,7 +21,6 @@ "platform": "!windows" }, "boost-msm", - "boost-program-options", "boost-property-tree", { "name": "boost-regex", @@ -50,17 +49,42 @@ ] }, "icu", - "libjpeg-turbo", - "libpng", - "libwebp", - "libxml2", "mapbox-geometry", "mapbox-polylabel", "mapbox-variant", - "tiff", "zlib" ], "features": { + "jpeg": { + "description": "add jpeg support", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "png": { + "description": "add png support", + "dependencies": [ + "libpng" + ] + }, + "tiff": { + "description": "add tiff support", + "dependencies": [ + "tiff" + ] + }, + "webp": { + "description": "add webp support", + "dependencies": [ + "libwebp" + ] + }, + "libxml2": { + "description": "use libxml2 instead of rapidxml", + "dependencies": [ + "libxml2" + ] + }, "cairo": { "description": "Cairo renderer", "dependencies": [ @@ -68,6 +92,23 @@ "cairomm" ] }, + "proj4": { + "description": "PROJ4 Functionalities", + "dependencies": [ + { + "name": "proj4", + "features": [ + "database" + ] + } + ] + }, + "viewer": { + "description": "Make demo viewer application", + "dependencies": [ + "qt5-base" + ] + }, "demo": { "description": "Make demo application" }, @@ -124,25 +165,47 @@ "input-topojson": { "description": "TOPOJSON input plugin" }, - "proj4": { - "description": "PROJ4 Functionalities", + "utility-geometry-to-wkb": { + "description": "utility application geometry-to-wkb", "dependencies": [ - { - "name": "proj4", - "features": [ - "database" - ] - } + "boost-program-options" ] }, - "utils": { - "description": "Make utilities Application including mapnik-rendrer and shapeindex" + "utility-mapnik-index": { + "description": "utility application mapnik-index", + "dependencies": [ + "boost-program-options" + ] }, - "viewer": { - "description": "Make demo viewer application", + "utility-mapnik-render": { + "description": "utility application mapnik-render", "dependencies": [ - "qt5-base" + "boost-program-options" + ] + }, + "utility-ogrindex": { + "description": "utility application ogrindex" + }, + "utility-pgsql2sqlite": { + "description": "utility application pgsql2sqlite", + "dependencies": [ + "boost-program-options", + "sqlite3", + "libodb-pgsql", + "libpq" + ] + }, + "utility-shapeindex": { + "description": "utility application shapeindex", + "dependencies": [ + "boost-program-options" + ] + }, + "utility-svg2png": { + "description": "utility application svg2png", + "dependencies": [ + "boost-program-options" ] } } -} +} \ No newline at end of file diff --git a/ports/mapnik/viewer.ini b/ports/mapnik/viewer.ini deleted file mode 100644 index 39e4c0f8fbdbf7..00000000000000 --- a/ports/mapnik/viewer.ini +++ /dev/null @@ -1,2 +0,0 @@ -[mapnik] -plugins_dir=plugins/input \ No newline at end of file From c6fd59b4094b46afd99abb4aedfe97a75c3e559d Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 13:49:06 +0100 Subject: [PATCH 0121/1694] run a first test with upstream cmake --- ports/mapnik/cmake/CMakeLists.txt | 329 ---------- ports/mapnik/cmake/MapnikConfig.cmake.in | 5 - ports/mapnik/cmake/demo/c++/CMakeLists.txt | 7 - ports/mapnik/cmake/demo/viewer/CMakeLists.txt | 28 - ports/mapnik/cmake/files.cmake | 568 ------------------ .../cmake/plugins/input/csv/CMakeLists.txt | 15 - .../cmake/plugins/input/gdal/CMakeLists.txt | 12 - .../cmake/plugins/input/geobuf/CMakeLists.txt | 11 - .../plugins/input/geojson/CMakeLists.txt | 14 - .../cmake/plugins/input/ogr/CMakeLists.txt | 14 - .../plugins/input/pgraster/CMakeLists.txt | 13 - .../plugins/input/postgis/CMakeLists.txt | 16 - .../cmake/plugins/input/raster/CMakeLists.txt | 13 - .../cmake/plugins/input/shape/CMakeLists.txt | 17 - .../cmake/plugins/input/sqlite/CMakeLists.txt | 12 - .../plugins/input/topojson/CMakeLists.txt | 11 - ports/mapnik/cmake/src/json/CMakeLists.txt | 31 - ports/mapnik/cmake/src/wkt/CMakeLists.txt | 22 - .../cmake/utils/mapnik-render/CMakeLists.txt | 6 - .../cmake/utils/shapeindex/CMakeLists.txt | 7 - ports/mapnik/fix-box2d.patch | 12 - .../mapnik/fix-constructor-inheritance.patch | 39 -- ports/mapnik/portfile.cmake | 99 +-- ports/mapnik/vcpkg.json | 103 +++- ports/mapnik/viewer.ini | 2 - 25 files changed, 142 insertions(+), 1264 deletions(-) delete mode 100644 ports/mapnik/cmake/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/MapnikConfig.cmake.in delete mode 100644 ports/mapnik/cmake/demo/c++/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/demo/viewer/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/files.cmake delete mode 100644 ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/src/json/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/src/wkt/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt delete mode 100644 ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt delete mode 100644 ports/mapnik/fix-box2d.patch delete mode 100644 ports/mapnik/fix-constructor-inheritance.patch delete mode 100644 ports/mapnik/viewer.ini diff --git a/ports/mapnik/cmake/CMakeLists.txt b/ports/mapnik/cmake/CMakeLists.txt deleted file mode 100644 index 922daf44751d15..00000000000000 --- a/ports/mapnik/cmake/CMakeLists.txt +++ /dev/null @@ -1,329 +0,0 @@ -cmake_minimum_required(VERSION 3.13.4) -project(mapnik) - -set(CXX_STANDARD 17) -set(MAPNIK_MAJOR_VERSION 3) -set(MAPNIK_MINOR_VERSION 0) -set(MAPNIK_PATCH_VERSION 23) -set(MAPNIK_VERSION ${MAPNIK_MAJOR_VERSION}.${MAPNIK_MINOR_VERSION}.${MAPNIK_PATCH_VERSION}) - -include(CMakeDependentOption) - -option(MAPNIK_STATIC_LIB "Build a static library" ON) - -option(WITH_DEMO "Build demo" ON) -option(WITH_VIEWER "Build viewer" OFF) - -option(WITH_INPUTS "Build input plugins" ON) - -CMAKE_DEPENDENT_OPTION(WITH_INPUT_CSV "Build the csv input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_GDAL "Build the gdal input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_GEOBUF "Build the geobuf input plugin" OFF "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_GEOJSON "Build the geojson input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_OGR "Build the ogr input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_PGRASTER "Build the pgraster input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_POSTGIS "Build the postgis input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_RASTER "Build the raster input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_SHAPE "Build the shape input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_SQLITE "Build the sqlite input plugin" ON "WITH_INPUTS" ON) -CMAKE_DEPENDENT_OPTION(WITH_INPUT_TOPOJSON "Build the topojson input plugin" ON "WITH_INPUTS" ON) - -option(WITH_UTILS "Build the utilities" ON ) - -option(WITH_GRID "Use the grid renderer" OFF) -option(WITH_CAIRO "Use cairo" ON) -option(WITH_PROJ4 "Use proj4" ON) - -if(MSVC) - # Force to always compile with W4 - if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") - string(REGEX REPLACE "/W[0-4]" "/W1" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W1") - endif() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd\"4068\" /wd\"4661\" /wd\"4503\" ") - add_compile_options(/MP) - add_compile_options(-bigobj) #added by @am2222 - add_compile_definitions(ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1) #added by @am2222 for proj4 compile -endif() - -find_package(Boost REQUIRED - COMPONENTS filesystem system regex program_options) - -find_package(freetype CONFIG REQUIRED) - -find_package(harfbuzz CONFIG REQUIRED) -find_package(ICU REQUIRED COMPONENTS uc) - -find_package(PNG REQUIRED) -find_package(JPEG REQUIRED) -find_package(TIFF REQUIRED) -find_package(WebP CONFIG REQUIRED) -find_package(LibXml2 REQUIRED) -find_package(ZLIB REQUIRED) -find_path(MAPBOX_POLYLABEL_INCLUDE_DIRS "mapbox/polylabel.hpp") -find_path(MAPBOX_GEOMETRY_INCLUDE_DIRS "mapbox/feature.hpp") -find_path(MAPBOX_VARIANT_INCLUDE_DIRS "mapbox/optional.hpp") -set (MAPNIK_DEFS - -DHAVE_PNG - -DHAVE_JPEG - -DHAVE_TIFF - -DHAVE_WEBP) - -#vcpkg only supports icu on windows -if(WIN32) - set(MAPNIK_DEFS ${MAPNIK_DEFS} -DBOOST_REGEX_HAS_ICU) -endif() -set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_LIBXML2) - -# AGG -include(files.cmake) - -if (WITH_CAIRO) - find_package(unofficial-cairo CONFIG REQUIRED) - - set(MAPNIK_SOURCES ${MAPNIK_SOURCES} - src/cairo/process_markers_symbolizer.cpp - src/cairo/process_group_symbolizer.cpp - src/cairo/cairo_context.cpp - src/cairo/cairo_render_vector.cpp - src/cairo/cairo_renderer.cpp - src/cairo/process_building_symbolizer.cpp - src/cairo/process_debug_symbolizer.cpp - src/cairo/process_line_pattern_symbolizer.cpp - src/cairo/process_line_symbolizer.cpp - src/cairo/process_point_symbolizer.cpp - src/cairo/process_polygon_pattern_symbolizer.cpp - src/cairo/process_polygon_symbolizer.cpp - src/cairo/process_raster_symbolizer.cpp - src/cairo/process_text_symbolizer.cpp) - - set(MAPNIK_DEFS ${MAPNIK_DEFS} -DHAVE_CAIRO) - - set(OPTIONAL_LIBRARIES ${OPTIONAL_LIBRARIES} unofficial::cairo::cairo) -endif() -message(STATUS "Cairo renderer " ${WITH_CAIRO}) - -if (WITH_PROJ4) - find_package(PROJ4 CONFIG REQUIRED) - set(OPTIONAL_LIBRARIES ${OPTIONAL_LIBRARIES} proj) - set(MAPNIK_DEFS ${MAPNIK_DEFS} -DMAPNIK_USE_PROJ4) -endif() - -if (WITH_GRID) - set(MAPNIK_SOURCES ${MAPNIK_SOURCES} - src/grid/grid.cpp - src/grid/grid_renderer.cpp - src/grid/process_building_symbolizer.cpp - src/grid/process_line_pattern_symbolizer.cpp - src/grid/process_line_symbolizer.cpp - src/grid/process_point_symbolizer.cpp - src/grid/process_polygon_pattern_symbolizer.cpp - src/grid/process_polygon_symbolizer.cpp - src/grid/process_raster_symbolizer.cpp - src/grid/process_shield_symbolizer.cpp - src/grid/process_text_symbolizer.cpp) - set(MAPNIK_DEFS ${MAPNIK_DEFS} -DGRID_RENDERER) -endif() -message(STATUS "Grid renderer: " ${WITH_GRID}) - -set(MAPNIK_SOURCES ${MAPNIK_SOURCES} - src/svg/output/svg_output_grammars.cpp - src/svg/output/svg_renderer.cpp - src/svg/output/svg_generator.cpp - src/svg/output/svg_output_attributes.cpp - src/svg/output/process_symbolizers.cpp - src/svg/output/process_line_symbolizer.cpp - src/svg/output/process_polygon_symbolizer.cpp) -set(MAPNIK_DEFS ${MAPNIK_DEFS} -DSVG_RENDERER) - -set(MAPNIK_SOURCES ${MAPNIK_SOURCES} - src/jpeg_reader.cpp - src/libxml2_loader.cpp - src/png_reader.cpp - src/tiff_reader.cpp - src/webp_reader.cpp -) - - -set(MAPNIK_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/include) - -set(mapnik_include_paths - ${PROJECT_SOURCE_DIR}/deps - ${PROJECT_SOURCE_DIR}/deps/agg/include) - -add_library(mapnik ${MAPNIK_SOURCES} ${MAPNIK_AGG_SOURCES} ${AGG_SOURCES}) -if (MAPNIK_STATIC_LIB) -else () - message(STATUS "Building shared library") - set_target_properties(mapnik PROPERTIES DEFINE_SYMBOL MAPNIK_EXPORTS) - set(MAPNIK_LIB_DEFINITION -DMAPNIK_EXPORTS) -endif () - -target_compile_definitions(mapnik PUBLIC ${MAPNIK_DEFS}) -target_include_directories(mapnik PUBLIC - $ - $ -) -target_include_directories(mapnik PRIVATE - ${mapnik_include_paths} - ${JPEG_INCLUDE_DIR} - ${LIBXML2_INCLUDE_DIR} - ${MAPBOX_POLYLABEL_INCLUDE_DIRS} - ${MAPBOX_GEOMETRY_INCLUDE_DIRS} - ${MAPBOX_VARIANT_INCLUDE_DIRS} -) -target_link_libraries(mapnik PUBLIC - Boost::boost Boost::filesystem Boost::system Boost::regex Boost::program_options Boost::system - WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder - freetype - ICU::uc - PNG::PNG - TIFF::TIFF - ZLIB::ZLIB - harfbuzz::harfbuzz - JPEG::JPEG - ${LIBXML2_LIBRARIES} - ${OPTIONAL_LIBRARIES} -) - -install(TARGETS mapnik - EXPORT MapnikTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin - INCLUDES DESTINATION include/ - PUBLIC_HEADER DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/include/ -) -install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -install(DIRECTORY deps/agg/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - -add_subdirectory(src/json) -add_subdirectory(src/wkt) - -install(EXPORT MapnikTargets - FILE MapnikTargets.cmake - NAMESPACE mapnik:: - DESTINATION lib/cmake/mapnik -) - -# ideally we should also generate mapnik-config - -if (WITH_INPUT_CSV) - add_subdirectory(plugins/input/csv) -endif() - -if (WITH_INPUT_GDAL) - find_package(GDAL REQUIRED) - add_subdirectory(plugins/input/gdal) -endif() - -if (WITH_INPUT_GEOBUF) - add_subdirectory(plugins/input/geobuf) -endif() - -if (WITH_INPUT_GEOJSON) - add_subdirectory(plugins/input/geojson) -endif() - -if (WITH_INPUT_OGR) - add_subdirectory(plugins/input/ogr) -endif() - -if (WITH_INPUT_PGRASTER) - find_package(PostgreSQL REQUIRED) - add_subdirectory(plugins/input/pgraster) -endif() - -if (WITH_INPUT_POSTGIS) - find_package(PostgreSQL REQUIRED) - add_subdirectory(plugins/input/postgis) -endif() - -if (WITH_INPUT_RASTER) - add_subdirectory(plugins/input/raster) -endif() - -if (WITH_INPUT_SHAPE) - add_subdirectory(plugins/input/shape) -endif() - -if (WITH_INPUT_SQLITE) - find_package(SQLite3 REQUIRED) - add_subdirectory(plugins/input/sqlite) -endif() - -if (WITH_INPUT_TOPOJSON) - add_subdirectory(plugins/input/topojson) -endif() - -if (WITH_INPUTS) - message(STATUS "Input plugins:") - if(WITH_INPUT_CSV ) - message(STATUS " - csv ") - endif() - if(WITH_INPUT_GDAL ) - message(STATUS " - gdal ") - endif() - if(WITH_INPUT_GEOBUF ) - message(STATUS " - geobuf ") - endif() - if(WITH_INPUT_GEOJSON ) - message(STATUS " - geojson ") - endif() - if(WITH_INPUT_OGR ) - message(STATUS " - ogr ") - endif() - if(WITH_INPUT_PGRASTER ) - message(STATUS " - pgraster") - endif() - if(WITH_INPUT_POSTGIS ) - message(STATUS " - postgis ") - endif() - if(WITH_INPUT_RASTER ) - message(STATUS " - raster ") - endif() - if(WITH_INPUT_SHAPE ) - message(STATUS " - shape ") - endif() - if(WITH_INPUT_SQLITE ) - message(STATUS " - sqlite ") - endif() - if(WITH_INPUT_TOPOJSON ) - message(STATUS " - topojson") - endif() -else() - message(STATUS "Input plugins OFF") -endif() - -if(WITH_DEMO) - add_subdirectory(demo/c++) -endif() - -if(WITH_VIEWER) - find_package(Qt5 COMPONENTS Widgets REQUIRED) - add_subdirectory(demo/viewer) -endif() - -if(WITH_UTILS) - add_subdirectory(utils/mapnik-render) - add_subdirectory(utils/shapeindex) -endif() - -include(CMakePackageConfigHelpers) -write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfigVersion.cmake" - VERSION ${MAPNIK_VERSION} - COMPATIBILITY SameMajorVersion -) - -configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/MapnikConfig.cmake.in - "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfig.cmake" - INSTALL_DESTINATION lib/cmake/mapnik -) - -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfigVersion.cmake" - DESTINATION lib/cmake/mapnik -) diff --git a/ports/mapnik/cmake/MapnikConfig.cmake.in b/ports/mapnik/cmake/MapnikConfig.cmake.in deleted file mode 100644 index 7df03c72cfadd0..00000000000000 --- a/ports/mapnik/cmake/MapnikConfig.cmake.in +++ /dev/null @@ -1,5 +0,0 @@ -@PACKAGE_INIT@ - -include("${CMAKE_CURRENT_LIST_DIR}/MapnikTargets.cmake") - -check_required_components(mapnik) \ No newline at end of file diff --git a/ports/mapnik/cmake/demo/c++/CMakeLists.txt b/ports/mapnik/cmake/demo/c++/CMakeLists.txt deleted file mode 100644 index 635b5693aeb764..00000000000000 --- a/ports/mapnik/cmake/demo/c++/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_executable(mapnik-demo rundemo.cpp) -add_dependencies(mapnik-demo mapnik) -target_include_directories(mapnik-demo PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-demo PRIVATE mapnik) -install(TARGETS mapnik-demo DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/cmake/demo/viewer/CMakeLists.txt b/ports/mapnik/cmake/demo/viewer/CMakeLists.txt deleted file mode 100644 index 34b53786d433c5..00000000000000 --- a/ports/mapnik/cmake/demo/viewer/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -add_executable(mapnik-viewer - about_dialog.cpp - info_dialog.cpp - layerdelegate.cpp - layerlistmodel.cpp - layerwidget.cpp - layer_info_dialog.cpp - main.cpp - mainwindow.cpp - mapwidget.cpp - styles_model.cpp - forms/about.ui - forms/info.ui - forms/layer_info.ui - mapnik_viewer.qrc) - -set_target_properties(mapnik-viewer PROPERTIES - AUTOUIC_SEARCH_PATHS forms - AUTORCC ON - AUTOUIC ON - AUTOMOC ON) - -add_dependencies(mapnik-viewer mapnik) -target_include_directories(mapnik-viewer PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-viewer PRIVATE mapnik Qt5::Widgets) -install(TARGETS mapnik-viewer DESTINATION bin) diff --git a/ports/mapnik/cmake/files.cmake b/ports/mapnik/cmake/files.cmake deleted file mode 100644 index d3d86d8975cf64..00000000000000 --- a/ports/mapnik/cmake/files.cmake +++ /dev/null @@ -1,568 +0,0 @@ -set (MAPNIK_SOURCES - src/cairo_io.cpp - src/color.cpp - src/color_factory.cpp - src/config_error.cpp - src/conversions_numeric.cpp - src/conversions_string.cpp - src/css/css_color_grammar_x3.cpp - src/css/css_grammar_x3.cpp - src/dasharray_parser.cpp - src/datasource_cache.cpp - src/datasource_cache_static.cpp - src/debug.cpp - src/expression.cpp - src/expression_grammar_x3.cpp - src/expression_node.cpp - src/expression_string.cpp - src/feature_kv_iterator.cpp - src/feature_style_processor.cpp - src/feature_type_style.cpp - src/font_engine_freetype.cpp - src/font_set.cpp - src/fs.cpp - src/function_call.cpp - src/generate_image_filters.cpp - src/geometry/box2d.cpp - src/geometry/closest_point.cpp - src/geometry/envelope.cpp - src/geometry/interior.cpp - src/geometry/polylabel.cpp - src/geometry/reprojection.cpp - src/gradient.cpp - src/group/group_layout_manager.cpp - src/group/group_rule.cpp - src/group/group_symbolizer_helper.cpp - src/image.cpp - src/image_any.cpp - src/image_compositing.cpp - src/image_copy.cpp - src/image_filter_grammar_x3.cpp - src/image_options.cpp - src/image_reader.cpp - src/image_scaling.cpp - src/image_util.cpp - src/image_util_jpeg.cpp - src/image_util_png.cpp - src/image_util_tiff.cpp - src/image_util_webp.cpp - src/image_view.cpp - src/image_view_any.cpp - src/layer.cpp - src/load_map.cpp - src/map.cpp - src/mapped_memory_cache.cpp - src/marker_cache.cpp - src/marker_helpers.cpp - src/memory_datasource.cpp - src/palette.cpp - src/params.cpp - src/parse_image_filters.cpp - src/parse_path.cpp - src/parse_transform.cpp - src/path_expression_grammar_x3.cpp - src/plugin.cpp - src/proj_transform.cpp - src/projection.cpp - src/raster_colorizer.cpp - src/renderer_common.cpp - src/renderer_common/pattern_alignment.cpp - src/renderer_common/render_group_symbolizer.cpp - src/renderer_common/render_markers_symbolizer.cpp - src/renderer_common/render_pattern.cpp - src/renderer_common/render_thunk_extractor.cpp - src/request.cpp - src/rule.cpp - src/save_map.cpp - src/scale_denominator.cpp - src/simplify.cpp - src/svg/svg_parser.cpp - src/svg/svg_path_grammar_x3.cpp - src/svg/svg_path_parser.cpp - src/svg/svg_points_parser.cpp - src/svg/svg_transform_parser.cpp - src/symbolizer.cpp - src/symbolizer_enumerations.cpp - src/symbolizer_keys.cpp - src/text/color_font_renderer.cpp - src/text/face.cpp - src/text/font_feature_settings.cpp - src/text/font_library.cpp - src/text/formatting/base.cpp - src/text/formatting/format.cpp - src/text/formatting/layout.cpp - src/text/formatting/list.cpp - src/text/formatting/registry.cpp - src/text/formatting/text.cpp - src/text/glyph_positions.cpp - src/text/itemizer.cpp - src/text/placement_finder.cpp - src/text/placements/base.cpp - src/text/placements/dummy.cpp - src/text/placements/list.cpp - src/text/placements/registry.cpp - src/text/placements/simple.cpp - src/text/properties_util.cpp - src/text/renderer.cpp - src/text/scrptrun.cpp - src/text/symbolizer_helpers.cpp - src/text/text_layout.cpp - src/text/text_line.cpp - src/text/text_properties.cpp - src/transform_expression.cpp - src/transform_expression_grammar_x3.cpp - src/twkb.cpp - src/unicode.cpp - src/util/math.cpp - src/util/utf_conv_win.cpp - src/value.cpp - src/vertex_adapters.cpp - src/vertex_cache.cpp - src/warp.cpp - src/well_known_srs.cpp - src/wkb.cpp - src/xml_tree.cpp - ) - - -set(MAPNIK_AGG_SOURCES - src/agg/agg_renderer.cpp - src/agg/process_building_symbolizer.cpp - src/agg/process_debug_symbolizer.cpp - src/agg/process_dot_symbolizer.cpp - src/agg/process_group_symbolizer.cpp - src/agg/process_line_pattern_symbolizer.cpp - src/agg/process_line_symbolizer.cpp - src/agg/process_markers_symbolizer.cpp - src/agg/process_point_symbolizer.cpp - src/agg/process_polygon_pattern_symbolizer.cpp - src/agg/process_polygon_symbolizer.cpp - src/agg/process_raster_symbolizer.cpp - src/agg/process_shield_symbolizer.cpp - src/agg/process_text_symbolizer.cpp) - - -set(AGG_SOURCES - deps/agg/src/agg_arc.cpp - deps/agg/src/agg_arrowhead.cpp - deps/agg/src/agg_bezier_arc.cpp - deps/agg/src/agg_bspline.cpp - deps/agg/src/agg_curves.cpp - deps/agg/src/agg_embedded_raster_fonts.cpp - deps/agg/src/agg_gsv_text.cpp - deps/agg/src/agg_image_filters.cpp - deps/agg/src/agg_line_aa_basics.cpp - deps/agg/src/agg_line_profile_aa.cpp - deps/agg/src/agg_pixfmt_rgba.cpp - deps/agg/src/agg_rounded_rect.cpp - deps/agg/src/agg_sqrt_tables.cpp - deps/agg/src/agg_trans_affine.cpp - deps/agg/src/agg_trans_double_path.cpp - deps/agg/src/agg_trans_single_path.cpp - deps/agg/src/agg_trans_warp_magnifier.cpp - deps/agg/src/agg_vcgen_bspline.cpp - deps/agg/src/agg_vcgen_contour.cpp - deps/agg/src/agg_vcgen_dash.cpp - deps/agg/src/agg_vcgen_markers_term.cpp - deps/agg/src/agg_vcgen_stroke.cpp - deps/agg/src/agg_vpgen_clip_polygon.cpp - deps/agg/src/agg_vpgen_clip_polyline.cpp - deps/agg/src/agg_vpgen_segmentator.cpp ) - - -set(MAPNIK_INC - mapnik/adaptive_smooth.hpp - mapnik/agg_helpers.hpp - mapnik/agg_pattern_source.hpp - mapnik/agg_rasterizer.hpp - mapnik/agg_renderer.hpp - mapnik/agg_render_marker.hpp - mapnik/attribute.hpp - mapnik/attribute_collector.hpp - mapnik/attribute_descriptor.hpp - mapnik/boolean.hpp - mapnik/boost_spirit_instantiate.hpp - mapnik/cairo_io.hpp - mapnik/color.hpp - mapnik/color_factory.hpp - mapnik/config.hpp - mapnik/config_error.hpp - mapnik/coord.hpp - mapnik/css/css_color_grammar_x3.hpp - mapnik/css/css_color_grammar_x3_def.hpp - mapnik/css/css_grammar_x3.hpp - mapnik/css/css_grammar_x3_def.hpp - mapnik/css/css_unit_value.hpp - mapnik/cxx11_support.hpp - mapnik/datasource.hpp - mapnik/datasource_cache.hpp - mapnik/datasource_geometry_type.hpp - mapnik/debug.hpp - mapnik/enumeration.hpp - mapnik/evaluate_global_attributes.hpp - mapnik/expression.hpp - mapnik/expression_evaluator.hpp - mapnik/expression_grammar_x3.hpp - mapnik/expression_grammar_x3_config.hpp - mapnik/expression_grammar_x3_def.hpp - mapnik/expression_node.hpp - mapnik/expression_node_types.hpp - mapnik/expression_string.hpp - mapnik/extend_converter.hpp - mapnik/factory.hpp - mapnik/feature.hpp - mapnik/featureset.hpp - mapnik/feature_factory.hpp - mapnik/feature_kv_iterator.hpp - mapnik/feature_layer_desc.hpp - mapnik/feature_style_processor.hpp - mapnik/feature_style_processor_context.hpp - mapnik/feature_style_processor_impl.hpp - mapnik/feature_type_style.hpp - mapnik/filter_featureset.hpp - mapnik/font_engine_freetype.hpp - mapnik/font_set.hpp - mapnik/function_call.hpp - mapnik/geometry.hpp - mapnik/geom_util.hpp - mapnik/global.hpp - mapnik/gradient.hpp - mapnik/grid_vertex_converter.hpp - mapnik/hextree.hpp - mapnik/hit_test_filter.hpp - mapnik/image.hpp - mapnik/image_any.hpp - mapnik/image_compositing.hpp - mapnik/image_copy.hpp - mapnik/image_filter.hpp - mapnik/image_filter_grammar_x3.hpp - mapnik/image_filter_grammar_x3_def.hpp - mapnik/image_filter_types.hpp - mapnik/image_impl.hpp - mapnik/image_null.hpp - mapnik/image_options.hpp - mapnik/image_reader.hpp - mapnik/image_scaling.hpp - mapnik/image_scaling_traits.hpp - mapnik/image_util.hpp - mapnik/image_util_jpeg.hpp - mapnik/image_util_png.hpp - mapnik/image_util_tiff.hpp - mapnik/image_util_webp.hpp - mapnik/image_view.hpp - mapnik/image_view_any.hpp - mapnik/image_view_impl.hpp - mapnik/image_view_null.hpp - mapnik/init_priority.hpp - mapnik/jpeg_io.hpp - mapnik/label_collision_detector.hpp - mapnik/layer.hpp - mapnik/load_map.hpp - mapnik/make_unique.hpp - mapnik/map.hpp - mapnik/mapped_memory_cache.hpp - mapnik/marker.hpp - mapnik/markers_placement.hpp - mapnik/marker_cache.hpp - mapnik/marker_helpers.hpp - mapnik/memory_datasource.hpp - mapnik/memory_featureset.hpp - mapnik/octree.hpp - mapnik/offset_converter.hpp - mapnik/palette.hpp - mapnik/params.hpp - mapnik/params_impl.hpp - mapnik/parse_path.hpp - mapnik/path.hpp - mapnik/path_expression.hpp - mapnik/path_expression_grammar_x3.hpp - mapnik/path_expression_grammar_x3_def.hpp - mapnik/pixel_position.hpp - mapnik/pixel_types.hpp - mapnik/plugin.hpp - mapnik/png_io.hpp - mapnik/pool.hpp - mapnik/projection.hpp - mapnik/proj_strategy.hpp - mapnik/proj_transform.hpp - mapnik/ptree_helpers.hpp - mapnik/quad_tree.hpp - mapnik/query.hpp - mapnik/raster.hpp - mapnik/raster_colorizer.hpp - mapnik/renderer_common.hpp - mapnik/request.hpp - mapnik/rule.hpp - mapnik/rule_cache.hpp - mapnik/safe_cast.hpp - mapnik/save_map.hpp - mapnik/scale_denominator.hpp - mapnik/simplify.hpp - mapnik/simplify_converter.hpp - mapnik/span_image_filter.hpp - mapnik/sql_utils.hpp - mapnik/sse.hpp - mapnik/stringify_macro.hpp - mapnik/symbolizer.hpp - mapnik/symbolizer_base.hpp - mapnik/symbolizer_default_values.hpp - mapnik/symbolizer_dispatch.hpp - mapnik/symbolizer_enumerations.hpp - mapnik/symbolizer_hash.hpp - mapnik/symbolizer_keys.hpp - mapnik/symbolizer_utils.hpp - mapnik/tiff_io.hpp - mapnik/timer.hpp - mapnik/tolerance_iterator.hpp - mapnik/transform_path_adapter.hpp - mapnik/unicode.hpp - mapnik/value.hpp - mapnik/version.hpp - mapnik/vertex.hpp - mapnik/vertex_adapters.hpp - mapnik/vertex_cache.hpp - mapnik/vertex_converters.hpp - mapnik/vertex_processor.hpp - mapnik/vertex_vector.hpp - mapnik/view_strategy.hpp - mapnik/view_transform.hpp - mapnik/warning_ignore.hpp - mapnik/warning_ignore_agg.hpp - mapnik/warp.hpp - mapnik/webp_io.hpp - mapnik/well_known_srs.hpp - mapnik/wkb.hpp - mapnik/xml_attribute_cast.hpp - mapnik/xml_loader.hpp - mapnik/xml_node.hpp - mapnik/xml_tree.hpp - mapnik/geometry/boost_adapters.hpp - mapnik/geometry/boost_spirit_karma_adapter.hpp - mapnik/geometry/box2d.hpp - mapnik/geometry/box2d_impl.hpp - mapnik/geometry/centroid.hpp - mapnik/geometry/closest_point.hpp - mapnik/geometry/correct.hpp - mapnik/geometry/envelope.hpp - mapnik/geometry/envelope_impl.hpp - mapnik/geometry/fusion_adapted.hpp - mapnik/geometry/geometry_type.hpp - mapnik/geometry/geometry_types.hpp - mapnik/geometry/interior.hpp - mapnik/geometry/is_empty.hpp - mapnik/geometry/is_simple.hpp - mapnik/geometry/is_valid.hpp - mapnik/geometry/line_string.hpp - mapnik/geometry/multi_line_string.hpp - mapnik/geometry/multi_point.hpp - mapnik/geometry/multi_polygon.hpp - mapnik/geometry/point.hpp - mapnik/geometry/polygon.hpp - mapnik/geometry/polygon_vertex_processor.hpp - mapnik/geometry/polylabel.hpp - mapnik/geometry/remove_empty.hpp - mapnik/geometry/reprojection.hpp - mapnik/geometry/reprojection_impl.hpp - mapnik/geometry/strategy.hpp - mapnik/geometry/to_path.hpp - mapnik/geometry/transform.hpp - mapnik/csv/csv_grammar_x3.hpp - mapnik/csv/csv_grammar_x3_def.hpp - mapnik/csv/csv_types.hpp - mapnik/svg/geometry_svg_generator.hpp - mapnik/svg/geometry_svg_generator_impl.hpp - mapnik/svg/svg_converter.hpp - mapnik/svg/svg_grammar_config_x3.hpp - mapnik/svg/svg_parser.hpp - mapnik/svg/svg_parser_exception.hpp - mapnik/svg/svg_path_adapter.hpp - mapnik/svg/svg_path_attributes.hpp - mapnik/svg/svg_path_commands.hpp - mapnik/svg/svg_path_grammar_x3.hpp - mapnik/svg/svg_path_grammar_x3_def.hpp - mapnik/svg/svg_path_parser.hpp - mapnik/svg/svg_renderer_agg.hpp - mapnik/svg/svg_storage.hpp - mapnik/svg/svg_transform_grammar_x3.hpp - mapnik/svg/svg_transform_grammar_x3_def.hpp - mapnik/wkt/wkt_factory.hpp - mapnik/wkt/wkt_generator_grammar.hpp - mapnik/wkt/wkt_generator_grammar_impl.hpp - mapnik/wkt/wkt_grammar_x3.hpp - mapnik/wkt/wkt_grammar_x3_def.hpp - mapnik/cairo/cairo_context.hpp - mapnik/cairo/cairo_image_util.hpp - mapnik/cairo/cairo_renderer.hpp - mapnik/cairo/cairo_render_vector.hpp - mapnik/cairo/render_polygon_pattern.hpp - mapnik/grid/grid.hpp - mapnik/grid/grid_pixel.hpp - mapnik/grid/grid_pixfmt.hpp - mapnik/grid/grid_rasterizer.hpp - mapnik/grid/grid_renderer.hpp - mapnik/grid/grid_renderer_base.hpp - mapnik/grid/grid_rendering_buffer.hpp - mapnik/grid/grid_render_marker.hpp - mapnik/grid/grid_view.hpp - mapnik/json/attribute_value_visitor.hpp - mapnik/json/create_feature.hpp - mapnik/json/create_geometry.hpp - mapnik/json/extract_bounding_boxes_x3.hpp - mapnik/json/extract_bounding_boxes_x3_config.hpp - mapnik/json/feature_generator_grammar.hpp - mapnik/json/feature_generator_grammar_impl.hpp - mapnik/json/feature_grammar_x3.hpp - mapnik/json/feature_grammar_x3_def.hpp - mapnik/json/feature_parser.hpp - mapnik/json/generic_json_grammar_x3.hpp - mapnik/json/generic_json_grammar_x3_def.hpp - mapnik/json/geojson_grammar_x3.hpp - mapnik/json/geojson_grammar_x3_def.hpp - mapnik/json/geometry_generator_grammar.hpp - mapnik/json/geometry_generator_grammar_impl.hpp - mapnik/json/geometry_parser.hpp - mapnik/json/json_grammar_config.hpp - mapnik/json/json_value.hpp - mapnik/json/parse_feature.hpp - mapnik/json/positions_grammar_x3.hpp - mapnik/json/positions_grammar_x3_def.hpp - mapnik/json/positions_x3.hpp - mapnik/json/properties_generator_grammar.hpp - mapnik/json/properties_generator_grammar_impl.hpp - mapnik/json/stringifier.hpp - mapnik/json/topojson_grammar_x3.hpp - mapnik/json/topojson_grammar_x3_def.hpp - mapnik/json/topojson_utils.hpp - mapnik/json/topology.hpp - mapnik/json/unicode_string_grammar_x3.hpp - mapnik/json/unicode_string_grammar_x3_def.hpp - mapnik/json/value_converters.hpp - mapnik/util/char_array_buffer.hpp - mapnik/util/const_rendering_buffer.hpp - mapnik/util/container_adapter.hpp - mapnik/util/conversions.hpp - mapnik/util/dasharray_parser.hpp - mapnik/util/featureset_buffer.hpp - mapnik/util/feature_to_geojson.hpp - mapnik/util/file_io.hpp - mapnik/util/fs.hpp - mapnik/util/geometry_to_ds_type.hpp - mapnik/util/geometry_to_geojson.hpp - mapnik/util/geometry_to_svg.hpp - mapnik/util/geometry_to_wkb.hpp - mapnik/util/geometry_to_wkt.hpp - mapnik/util/hsl.hpp - mapnik/util/is_clockwise.hpp - mapnik/util/math.hpp - mapnik/util/name_to_int.hpp - mapnik/util/noncopyable.hpp - mapnik/util/path_iterator.hpp - mapnik/util/rounding_cast.hpp - mapnik/util/singleton.hpp - mapnik/util/spatial_index.hpp - mapnik/util/spirit_transform_attribute.hpp - mapnik/util/timer.hpp - mapnik/util/trim.hpp - mapnik/util/utf_conv_win.hpp - mapnik/util/variant.hpp - mapnik/util/variant_io.hpp - mapnik/group/group_layout.hpp - mapnik/group/group_layout_manager.hpp - mapnik/group/group_rule.hpp - mapnik/group/group_symbolizer_helper.hpp - mapnik/group/group_symbolizer_properties.hpp - mapnik/text/color_font_renderer.hpp - mapnik/text/evaluated_format_properties_ptr.hpp - mapnik/text/face.hpp - mapnik/text/font_feature_settings.hpp - mapnik/text/font_library.hpp - mapnik/text/glyph_info.hpp - mapnik/text/glyph_positions.hpp - mapnik/text/harfbuzz_shaper.hpp - mapnik/text/icu_shaper.hpp - mapnik/text/itemizer.hpp - mapnik/text/placement_finder.hpp - mapnik/text/placement_finder_impl.hpp - mapnik/text/properties_util.hpp - mapnik/text/renderer.hpp - mapnik/text/rotation.hpp - mapnik/text/scrptrun.hpp - mapnik/text/symbolizer_helpers.hpp - mapnik/text/text_layout.hpp - mapnik/text/text_line.hpp - mapnik/text/text_properties.hpp - mapnik/text/placements/base.hpp - mapnik/text/placements/dummy.hpp - mapnik/text/placements/list.hpp - mapnik/text/placements/registry.hpp - mapnik/text/placements/simple.hpp - mapnik/text/formatting/base.hpp - mapnik/text/formatting/format.hpp - mapnik/text/formatting/layout.hpp - mapnik/text/formatting/list.hpp - mapnik/text/formatting/registry.hpp - mapnik/text/formatting/text.hpp - mapnik/transform/parse_transform.hpp - mapnik/transform/transform_expression.hpp - mapnik/transform/transform_expression_grammar_x3.hpp - mapnik/transform/transform_expression_grammar_x3_def.hpp - mapnik/transform/transform_processor.hpp - mapnik/markers_placements/basic.hpp - mapnik/markers_placements/interior.hpp - mapnik/markers_placements/line.hpp - mapnik/markers_placements/point.hpp - mapnik/markers_placements/polylabel.hpp - mapnik/markers_placements/vertex_first.hpp - mapnik/markers_placements/vertex_last.hpp - mapnik/geometry/boost_adapters.hpp - mapnik/geometry/boost_spirit_karma_adapter.hpp - mapnik/geometry/box2d.hpp - mapnik/geometry/box2d_impl.hpp - mapnik/geometry/centroid.hpp - mapnik/geometry/closest_point.hpp - mapnik/geometry/correct.hpp - mapnik/geometry/envelope.hpp - mapnik/geometry/envelope_impl.hpp - mapnik/geometry/fusion_adapted.hpp - mapnik/geometry/geometry_type.hpp - mapnik/geometry/geometry_types.hpp - mapnik/geometry/interior.hpp - mapnik/geometry/is_empty.hpp - mapnik/geometry/is_simple.hpp - mapnik/geometry/is_valid.hpp - mapnik/geometry/line_string.hpp - mapnik/geometry/multi_line_string.hpp - mapnik/geometry/multi_point.hpp - mapnik/geometry/multi_polygon.hpp - mapnik/geometry/point.hpp - mapnik/geometry/polygon.hpp - mapnik/geometry/polygon_vertex_processor.hpp - mapnik/geometry/polylabel.hpp - mapnik/geometry/remove_empty.hpp - mapnik/geometry/reprojection.hpp - mapnik/geometry/reprojection_impl.hpp - mapnik/geometry/strategy.hpp - mapnik/geometry/to_path.hpp - mapnik/geometry/transform.hpp - mapnik/value/error.hpp - mapnik/value/hash.hpp - mapnik/value/types.hpp) - -set(MAPNIK_INC ${MAPNIK_INC} - mapnik/svg/output/svg_generator.hpp - mapnik/svg/output/svg_output_attributes.hpp - mapnik/svg/output/svg_output_grammars.hpp - mapnik/svg/output/svg_output_grammars_impl.hpp - mapnik/svg/output/svg_path_iterator.hpp - mapnik/svg/output/svg_renderer.hpp) - -set(MAPNIK_INC ${MAPNIK_INC} - mapnik/grid/grid.hpp - mapnik/grid/grid_pixel.hpp - mapnik/grid/grid_pixfmt.hpp - mapnik/grid/grid_rasterizer.hpp - mapnik/grid/grid_renderer.hpp - mapnik/grid/grid_renderer_base.hpp - mapnik/grid/grid_rendering_buffer.hpp - mapnik/grid/grid_render_marker.hpp - mapnik/grid/grid_view.hpp) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt deleted file mode 100644 index 8b8ef5a33382b5..00000000000000 --- a/ports/mapnik/cmake/plugins/input/csv/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -add_library(mapnik-input-csv SHARED - csv_datasource.cpp - csv_featureset.cpp - csv_index_featureset.cpp - csv_inline_featureset.cpp - csv_utils.cpp) - -target_link_libraries(mapnik-input-csv PUBLIC mapnik mapnik-wkt mapnik-json) -target_include_directories(mapnik-input-csv PRIVATE - ${mapnik_include_paths} -) -set_target_properties(mapnik-input-csv PROPERTIES PREFIX "") -set_target_properties(mapnik-input-csv PROPERTIES OUTPUT_NAME "csv") -set_target_properties(mapnik-input-csv PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-csv DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt deleted file mode 100644 index 6c704c3f2b5097..00000000000000 --- a/ports/mapnik/cmake/plugins/input/gdal/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -add_library(mapnik-input-gdal SHARED - gdal_datasource.cpp - gdal_featureset.cpp) - -target_include_directories(mapnik-input-gdal PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-gdal PUBLIC mapnik ${GDAL_LIBRARIES}) -set_target_properties(mapnik-input-gdal PROPERTIES PREFIX "") -set_target_properties(mapnik-input-gdal PROPERTIES OUTPUT_NAME "gdal") -set_target_properties(mapnik-input-gdal PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-gdal DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt deleted file mode 100644 index 45279d717fc0e1..00000000000000 --- a/ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_library(mapnik-input-geobuf SHARED -geobuf_datasource.cpp -geobuf_featureset.cpp) - -find_path(PROTOZERO_INCLUDE_DIRS "protozero/byteswap.hpp") -target_include_directories(mapnik-input-geobuf PRIVATE ${PROTOZERO_INCLUDE_DIRS} ${mapnik_include_paths}) -target_link_libraries(mapnik-input-geobuf PRIVATE mapnik) -set_target_properties(mapnik-input-geobuf PROPERTIES PREFIX "") -set_target_properties(mapnik-input-geobuf PROPERTIES OUTPUT_NAME "geobuf") -set_target_properties(mapnik-input-geobuf PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-geobuf DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt deleted file mode 100644 index 980a8c40428cae..00000000000000 --- a/ports/mapnik/cmake/plugins/input/geojson/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -add_library(mapnik-input-geojson SHARED - geojson_datasource.cpp - geojson_featureset.cpp - geojson_index_featureset.cpp - geojson_memory_index_featureset.cpp) - -target_include_directories(mapnik-input-geojson PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-geojson PRIVATE mapnik mapnik-json) -set_target_properties(mapnik-input-geojson PROPERTIES PREFIX "") -set_target_properties(mapnik-input-geojson PROPERTIES OUTPUT_NAME "geojson") -set_target_properties(mapnik-input-geojson PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-geojson DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt deleted file mode 100644 index 758107010fff0d..00000000000000 --- a/ports/mapnik/cmake/plugins/input/ogr/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -add_library(mapnik-input-ogr SHARED - ogr_converter.cpp - ogr_datasource.cpp - ogr_featureset.cpp - ogr_index_featureset.cpp) - -target_include_directories(mapnik-input-ogr PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-ogr PRIVATE mapnik ${OGR_LIBRARIES} ${GDAL_LIBRARIES}) -set_target_properties(mapnik-input-ogr PROPERTIES PREFIX "") -set_target_properties(mapnik-input-ogr PROPERTIES OUTPUT_NAME "ogr") -set_target_properties(mapnik-input-ogr PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-ogr DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt deleted file mode 100644 index 8716119cfdba9d..00000000000000 --- a/ports/mapnik/cmake/plugins/input/pgraster/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -add_library(mapnik-input-pgraster SHARED -pgraster_datasource.cpp -pgraster_featureset.cpp -pgraster_wkb_reader.cpp) - -target_include_directories(mapnik-input-pgraster PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-pgraster PRIVATE mapnik PostgreSQL::PostgreSQL) -set_target_properties(mapnik-input-pgraster PROPERTIES PREFIX "") -set_target_properties(mapnik-input-pgraster PROPERTIES OUTPUT_NAME "pgraster") -set_target_properties(mapnik-input-pgraster PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-pgraster DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt deleted file mode 100644 index 6fb85622a6964a..00000000000000 --- a/ports/mapnik/cmake/plugins/input/postgis/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -find_package(odb CONFIG REQUIRED) -add_library(mapnik-input-postgis SHARED - postgis_datasource.cpp - postgis_featureset.cpp ) - -target_include_directories(mapnik-input-postgis PRIVATE - ${mapnik_include_paths} - ${MAPBOX_POLYLABEL_INCLUDE_DIRS} - ${MAPBOX_GEOMETRY_INCLUDE_DIRS} - ${MAPBOX_VARIANT_INCLUDE_DIRS} -) -target_link_libraries(mapnik-input-postgis PRIVATE mapnik PostgreSQL::PostgreSQL) -set_target_properties(mapnik-input-postgis PROPERTIES PREFIX "") -set_target_properties(mapnik-input-postgis PROPERTIES OUTPUT_NAME "postgis") -set_target_properties(mapnik-input-postgis PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-postgis DESTINATION bin/plugins/input) diff --git a/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt deleted file mode 100644 index 0341a369a5dc72..00000000000000 --- a/ports/mapnik/cmake/plugins/input/raster/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -add_library(mapnik-input-raster SHARED - raster_datasource.cpp - raster_featureset.cpp - raster_info.cpp) - -target_include_directories(mapnik-input-raster PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-raster PRIVATE mapnik) -set_target_properties(mapnik-input-raster PROPERTIES PREFIX "") -set_target_properties(mapnik-input-raster PROPERTIES OUTPUT_NAME "raster") -set_target_properties(mapnik-input-raster PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-raster DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt deleted file mode 100644 index f484c2fed36fe8..00000000000000 --- a/ports/mapnik/cmake/plugins/input/shape/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -SET(INPUT_SHAPE_SOURCES - dbfile.cpp - dbf_test.cpp - shape_datasource.cpp - shape_featureset.cpp - shape_index_featureset.cpp - shape_io.cpp shape_utils.cpp -) -add_library(mapnik-input-shape SHARED ${INPUT_SHAPE_SOURCES}) -target_include_directories(mapnik-input-shape PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-shape PRIVATE mapnik) -set_target_properties(mapnik-input-shape PROPERTIES PREFIX "") -set_target_properties(mapnik-input-shape PROPERTIES OUTPUT_NAME "shape") -set_target_properties(mapnik-input-shape PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-shape DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt deleted file mode 100644 index eea67a1ef9970c..00000000000000 --- a/ports/mapnik/cmake/plugins/input/sqlite/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -find_package(unofficial-sqlite3 CONFIG REQUIRED) -add_library(mapnik-input-sqlite SHARED - sqlite_datasource.cpp - sqlite_featureset.cpp) -target_include_directories(mapnik-input-sqlite PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-sqlite PRIVATE mapnik unofficial::sqlite3::sqlite3) -set_target_properties(mapnik-input-sqlite PROPERTIES PREFIX "") -set_target_properties(mapnik-input-sqlite PROPERTIES OUTPUT_NAME "sqlite") -set_target_properties(mapnik-input-sqlite PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-sqlite DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt b/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt deleted file mode 100644 index 61dcdb16022c82..00000000000000 --- a/ports/mapnik/cmake/plugins/input/topojson/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_library(mapnik-input-topojson SHARED - topojson_datasource.cpp - topojson_featureset.cpp) -target_include_directories(mapnik-input-topojson PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-input-topojson PRIVATE mapnik mapnik-json) -set_target_properties(mapnik-input-topojson PROPERTIES PREFIX "") -set_target_properties(mapnik-input-topojson PROPERTIES OUTPUT_NAME "topojson") -set_target_properties(mapnik-input-topojson PROPERTIES SUFFIX ".input") -install(TARGETS mapnik-input-topojson DESTINATION bin/plugins/input) \ No newline at end of file diff --git a/ports/mapnik/cmake/src/json/CMakeLists.txt b/ports/mapnik/cmake/src/json/CMakeLists.txt deleted file mode 100644 index d16f4596f89ae8..00000000000000 --- a/ports/mapnik/cmake/src/json/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -add_library(mapnik-json STATIC - extract_bounding_boxes_x3.cpp - feature_from_geojson.cpp - feature_grammar_x3.cpp - generic_json_grammar_x3.cpp - geojson_grammar_x3.cpp - geometry_from_geojson.cpp - mapnik_feature_to_geojson.cpp - mapnik_geometry_to_geojson.cpp - mapnik_json_generator_grammar.cpp - parse_feature.cpp - positions_grammar_x3.cpp - topojson_grammar_x3.cpp - unicode_string_grammar_x3.cpp) - -target_include_directories(mapnik-json PRIVATE - ${JPEG_INCLUDE_DIR} - ${LIBXML2_INCLUDE_DIR} - ${MAPBOX_POLYLABEL_INCLUDE_DIRS} - ${MAPBOX_GEOMETRY_INCLUDE_DIRS} - ${MAPBOX_VARIANT_INCLUDE_DIRS} -) -target_link_libraries(mapnik-json PRIVATE mapnik ${ICUU_LIB}) -#target_compile_definitions(mapnik-json PRIVATE ${MAPNIK_LIB_DEFINITION}) - -install(TARGETS mapnik-json - EXPORT MapnikTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin -) \ No newline at end of file diff --git a/ports/mapnik/cmake/src/wkt/CMakeLists.txt b/ports/mapnik/cmake/src/wkt/CMakeLists.txt deleted file mode 100644 index a63413ce925c52..00000000000000 --- a/ports/mapnik/cmake/src/wkt/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -add_library(mapnik-wkt STATIC - geometry_to_wkt.cpp - mapnik_wkt_generator_grammar.cpp - wkt_factory.cpp - wkt_grammar_x3.cpp) - -target_include_directories(mapnik-wkt PRIVATE - ${MAPNIK_INCLUDE_PATH} - ${JPEG_INCLUDE_DIR} - ${LIBXML2_INCLUDE_DIR} - ${MAPBOX_POLYLABEL_INCLUDE_DIRS} - ${MAPBOX_GEOMETRY_INCLUDE_DIRS} - ${MAPBOX_VARIANT_INCLUDE_DIRS} -) -target_compile_definitions(mapnik-wkt PRIVATE ${MAPNIK_LIB_DEFINITION}) - -install(TARGETS mapnik-wkt - EXPORT MapnikTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin -) \ No newline at end of file diff --git a/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt b/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt deleted file mode 100644 index 0892f9a6d85762..00000000000000 --- a/ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_executable(mapnik-render mapnik-render.cpp) -target_include_directories(mapnik-render PRIVATE - ${mapnik_include_paths} -) -target_link_libraries(mapnik-render PRIVATE mapnik) -install(TARGETS mapnik-render DESTINATION bin) diff --git a/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt b/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt deleted file mode 100644 index 5a81e557d1b7d8..00000000000000 --- a/ports/mapnik/cmake/utils/shapeindex/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_executable(shapeindex shapeindex.cpp) -target_link_libraries(shapeindex PRIVATE mapnik) -target_include_directories(shapeindex PRIVATE - ../../plugins/input/shape - ${mapnik_include_paths} -) -install(TARGETS shapeindex DESTINATION bin) \ No newline at end of file diff --git a/ports/mapnik/fix-box2d.patch b/ports/mapnik/fix-box2d.patch deleted file mode 100644 index f441fefbcbddae..00000000000000 --- a/ports/mapnik/fix-box2d.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/mapnik/geometry/box2d.hpp b/include/mapnik/geometry/box2d.hpp -index 1894978..7dc8d57 100644 ---- a/include/mapnik/geometry/box2d.hpp -+++ b/include/mapnik/geometry/box2d.hpp -@@ -23,6 +23,7 @@ - #ifndef MAPNIK_BOX2D_HPP - #define MAPNIK_BOX2D_HPP - -+#include - // mapnik - #include - #include diff --git a/ports/mapnik/fix-constructor-inheritance.patch b/ports/mapnik/fix-constructor-inheritance.patch deleted file mode 100644 index 41d295f6bf73c1..00000000000000 --- a/ports/mapnik/fix-constructor-inheritance.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp -index f6e795d..44b9931 100644 ---- a/include/mapnik/geometry.hpp -+++ b/include/mapnik/geometry.hpp -@@ -59,7 +59,7 @@ struct geometry : geometry_base - { - using coordinate_type = T; - --#if __cpp_inheriting_constructors >= 200802 -+#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) - - using geometry_base::geometry_base; - -diff --git a/include/mapnik/json/geojson_grammar_x3.hpp b/include/mapnik/json/geojson_grammar_x3.hpp -index 9a9ffaa..9c90d36 100644 ---- a/include/mapnik/json/geojson_grammar_x3.hpp -+++ b/include/mapnik/json/geojson_grammar_x3.hpp -@@ -53,7 +53,7 @@ using geojson_value_base = mapnik::util::variant; - struct geojson_value : geojson_value_base - { --#if __cpp_inheriting_constructors >= 200802 -+#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) - - using geojson_value_base::geojson_value_base; - -diff --git a/include/mapnik/json/json_value.hpp b/include/mapnik/json/json_value.hpp -index c5ed036..150a80f 100644 ---- a/include/mapnik/json/json_value.hpp -+++ b/include/mapnik/json/json_value.hpp -@@ -46,7 +46,7 @@ using json_value_base = mapnik::util::variant; - struct json_value : json_value_base - { --#if __cpp_inheriting_constructors >= 200802 -+#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) - - using json_value_base::json_value_base; - diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 4d42d336d62e8d..c7483d95052b79 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,40 +1,40 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO mapnik/mapnik - REF 4227fd5d698d069a92917cfea9ce9139435d3f12 - SHA512 913e725a05e315b8630928fec7635ccddac833428800cd3f1b5c25226952f00883dbe9b007eb36bfd0330eac001608596fb53d08aa3df2fce297a3aab3bbf935 + REPO mathisloge/mapnik + REF cmake-support + SHA512 69aab419d74e9bf70a54f3a900e28a8f2721cad13c167fb2ce44dd8d548a9d54fd2983417b8757e29cacf79efbaf11cfe405e000f8fdeb399aa3bf5ab1c9c213 HEAD_REF master - PATCHES - fix-box2d.patch - fix-constructor-inheritance.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(MAPNIK_STATIC_LIB OFF) -elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(MAPNIK_STATIC_LIB ON) -endif() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - cairo WITH_CAIRO - demo WITH_DEMO - viewer WITH_VIEWER - "input-csv" WITH_INPUT_CSV - "input-gdal" WITH_INPUT_GDAL - "input-geobuf" WITH_INPUT_GEOBUF - "input-geojson" WITH_INPUT_GEOJSON - "input-ogr" WITH_INPUT_OGR - "input-pgraster" WITH_INPUT_PGRASTER - "input-postgis" WITH_INPUT_POSTGIS - "input-raster" WITH_INPUT_RASTER - "input-shape" WITH_INPUT_SHAPE - "input-sqlite" WITH_INPUT_SQLITE - "input-topojson" WITH_INPUT_TOPOJSON - proj4 WITH_PROJ4 - utils WITH_UTILS + jpeg USE_JPEG + png USE_PNG + tiff USE_TIFF + webp USE_WEBP + libxml2 USE_LIBXML2 + cairo USE_CAIRO + proj4 USE_PROJ4 + "input-csv" USE_PLUGIN_INPUT_CSV + "input-gdal" USE_PLUGIN_INPUT_GDAL + "input-geobuf" USE_PLUGIN_INPUT_GEOBUF + "input-geojson" USE_PLUGIN_INPUT_GEOJSON + "input-ogr" USE_PLUGIN_INPUT_OGR + "input-pgraster" USE_PLUGIN_INPUT_PGRASTER + "input-postgis" USE_PLUGIN_INPUT_POSTGIS + "input-raster" USE_PLUGIN_INPUT_RASTER + "input-shape" USE_PLUGIN_INPUT_SHAPE + "input-sqlite" USE_PLUGIN_INPUT_SQLITE + "input-topojson" USE_PLUGIN_INPUT_TOPOJSON + viewer BUILD_DEMO_VIEWER + demo BUILD_DEMO_CPP + "utility-geometry-to-wkb" BUILD_UTILITY_GEOMETRY_TO_WKB + "utility-mapnik-index" BUILD_UTILITY_MAPNIK_INDEX + "utility-mapnik-render" BUILD_UTILITY_MAPNIK_RENDER + "utility-ogrindex" BUILD_UTILITY_OGRINDEX + "utility-pgsql2sqlite" BUILD_UTILITY_PGSQL2SQLITE + "utility-shapeindex" BUILD_UTILITY_SHAPEINDEX + "utility-svg2png" BUILD_UTILITY_SVG2PNG ) vcpkg_configure_cmake( @@ -42,10 +42,12 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} - -DMAPNIK_STATIC_LIB=${MAPNIK_STATIC_LIB} - -DBOOST_PREFIX=${CURRENT_INSTALLED_DIR}/include - -DFREE_TYPE_INCLUDE=${CURRENT_INSTALLED_DIR}/include/freetype2 - -DCMAKE_INSTALL_INCLUDEDIR=${CURRENT_PACKAGES_DIR}/include + -DBUILD_SHARED_LIBS=ON + -DBUILD_TEST=OFF + -DUSE_EXTERNAL_MAPBOX_GEOMETRY=ON + -DUSE_EXTERNAL_MAPBOX_POLYLABEL=ON + -DUSE_EXTERNAL_MAPBOX_PROTOZERO=ON + -DUSE_EXTERNAL_MAPBOX_VARIANT=ON ) vcpkg_install_cmake() @@ -53,6 +55,7 @@ vcpkg_install_cmake() # copy plugins into tool path, if any plugin is installed if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/plugins) file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + #file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() vcpkg_copy_pdbs() @@ -67,12 +70,28 @@ if("viewer" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES mapnik-viewer AUTO_CLEAN) endif() -if ("utils" IN_LIST FEATURES) - vcpkg_copy_tools( - TOOL_NAMES mapnik-render shapeindex - AUTO_CLEAN - ) - file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +if("utility-geometry-to-wkb" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES geometry_to_wkb AUTO_CLEAN) +endif() + +if("utility-mapnik-index" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES mapnik-index AUTO_CLEAN) +endif() +if("utility-mapnik-render" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES mapnik-render AUTO_CLEAN) +endif() +if("utility-ogrindex" IN_LIST FEATURES) + # build is currently not supported + # vcpkg_copy_tools(TOOL_NAMES ogrindex AUTO_CLEAN) +endif() +if("utility-pgsql2sqlite" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES pgsql2sqlite AUTO_CLEAN) +endif() +if("utility-shapeindex" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES shapeindex AUTO_CLEAN) +endif() +if("utility-svg2png" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES svg2png AUTO_CLEAN) endif() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mapnik) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 5870e40e964be6..9451393e108fe0 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -21,7 +21,6 @@ "platform": "!windows" }, "boost-msm", - "boost-program-options", "boost-property-tree", { "name": "boost-regex", @@ -50,17 +49,42 @@ ] }, "icu", - "libjpeg-turbo", - "libpng", - "libwebp", - "libxml2", "mapbox-geometry", "mapbox-polylabel", "mapbox-variant", - "tiff", "zlib" ], "features": { + "jpeg": { + "description": "add jpeg support", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "png": { + "description": "add png support", + "dependencies": [ + "libpng" + ] + }, + "tiff": { + "description": "add tiff support", + "dependencies": [ + "tiff" + ] + }, + "webp": { + "description": "add webp support", + "dependencies": [ + "libwebp" + ] + }, + "libxml2": { + "description": "use libxml2 instead of rapidxml", + "dependencies": [ + "libxml2" + ] + }, "cairo": { "description": "Cairo renderer", "dependencies": [ @@ -68,6 +92,23 @@ "cairomm" ] }, + "proj4": { + "description": "PROJ4 Functionalities", + "dependencies": [ + { + "name": "proj4", + "features": [ + "database" + ] + } + ] + }, + "viewer": { + "description": "Make demo viewer application", + "dependencies": [ + "qt5-base" + ] + }, "demo": { "description": "Make demo application" }, @@ -124,25 +165,47 @@ "input-topojson": { "description": "TOPOJSON input plugin" }, - "proj4": { - "description": "PROJ4 Functionalities", + "utility-geometry-to-wkb": { + "description": "utility application geometry-to-wkb", "dependencies": [ - { - "name": "proj4", - "features": [ - "database" - ] - } + "boost-program-options" ] }, - "utils": { - "description": "Make utilities Application including mapnik-rendrer and shapeindex" + "utility-mapnik-index": { + "description": "utility application mapnik-index", + "dependencies": [ + "boost-program-options" + ] }, - "viewer": { - "description": "Make demo viewer application", + "utility-mapnik-render": { + "description": "utility application mapnik-render", "dependencies": [ - "qt5-base" + "boost-program-options" + ] + }, + "utility-ogrindex": { + "description": "utility application ogrindex" + }, + "utility-pgsql2sqlite": { + "description": "utility application pgsql2sqlite", + "dependencies": [ + "boost-program-options", + "sqlite3", + "libodb-pgsql", + "libpq" + ] + }, + "utility-shapeindex": { + "description": "utility application shapeindex", + "dependencies": [ + "boost-program-options" + ] + }, + "utility-svg2png": { + "description": "utility application svg2png", + "dependencies": [ + "boost-program-options" ] } } -} +} \ No newline at end of file diff --git a/ports/mapnik/viewer.ini b/ports/mapnik/viewer.ini deleted file mode 100644 index 39e4c0f8fbdbf7..00000000000000 --- a/ports/mapnik/viewer.ini +++ /dev/null @@ -1,2 +0,0 @@ -[mapnik] -plugins_dir=plugins/input \ No newline at end of file From 613c570ac0be0f3b6a1fb047a549bae76bae649f Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 14:13:16 +0100 Subject: [PATCH 0122/1694] fix build --- ports/mapnik/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index c7483d95052b79..ade10a524fdbc6 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -66,7 +66,7 @@ endif() if("viewer" IN_LIST FEATURES) # copy the ini file to reference the plugins correctly - file(COPY ${CMAKE_CURRENT_LIST_DIR}/viewer.ini DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(COPY ${CURRENT_PACKAGES_DIR}/bin/viewer.ini DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) vcpkg_copy_tools(TOOL_NAMES mapnik-viewer AUTO_CLEAN) endif() From 8d758167f484b346222245bda8f73b8831ff41fb Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 14:13:16 +0100 Subject: [PATCH 0123/1694] fix build --- ports/mapnik/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index c7483d95052b79..ade10a524fdbc6 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -66,7 +66,7 @@ endif() if("viewer" IN_LIST FEATURES) # copy the ini file to reference the plugins correctly - file(COPY ${CMAKE_CURRENT_LIST_DIR}/viewer.ini DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(COPY ${CURRENT_PACKAGES_DIR}/bin/viewer.ini DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) vcpkg_copy_tools(TOOL_NAMES mapnik-viewer AUTO_CLEAN) endif() From 8167ef05aed13f1ca314d5f9405834fd304f5498 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 14:14:41 +0100 Subject: [PATCH 0124/1694] format... --- ports/mapnik/vcpkg.json | 100 ++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 9451393e108fe0..efdcae3db6cecb 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -55,36 +55,6 @@ "zlib" ], "features": { - "jpeg": { - "description": "add jpeg support", - "dependencies": [ - "libjpeg-turbo" - ] - }, - "png": { - "description": "add png support", - "dependencies": [ - "libpng" - ] - }, - "tiff": { - "description": "add tiff support", - "dependencies": [ - "tiff" - ] - }, - "webp": { - "description": "add webp support", - "dependencies": [ - "libwebp" - ] - }, - "libxml2": { - "description": "use libxml2 instead of rapidxml", - "dependencies": [ - "libxml2" - ] - }, "cairo": { "description": "Cairo renderer", "dependencies": [ @@ -92,23 +62,6 @@ "cairomm" ] }, - "proj4": { - "description": "PROJ4 Functionalities", - "dependencies": [ - { - "name": "proj4", - "features": [ - "database" - ] - } - ] - }, - "viewer": { - "description": "Make demo viewer application", - "dependencies": [ - "qt5-base" - ] - }, "demo": { "description": "Make demo application" }, @@ -165,6 +118,41 @@ "input-topojson": { "description": "TOPOJSON input plugin" }, + "jpeg": { + "description": "add jpeg support", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "libxml2": { + "description": "use libxml2 instead of rapidxml", + "dependencies": [ + "libxml2" + ] + }, + "png": { + "description": "add png support", + "dependencies": [ + "libpng" + ] + }, + "proj4": { + "description": "PROJ4 Functionalities", + "dependencies": [ + { + "name": "proj4", + "features": [ + "database" + ] + } + ] + }, + "tiff": { + "description": "add tiff support", + "dependencies": [ + "tiff" + ] + }, "utility-geometry-to-wkb": { "description": "utility application geometry-to-wkb", "dependencies": [ @@ -190,9 +178,9 @@ "description": "utility application pgsql2sqlite", "dependencies": [ "boost-program-options", - "sqlite3", "libodb-pgsql", - "libpq" + "libpq", + "sqlite3" ] }, "utility-shapeindex": { @@ -206,6 +194,18 @@ "dependencies": [ "boost-program-options" ] + }, + "viewer": { + "description": "Make demo viewer application", + "dependencies": [ + "qt5-base" + ] + }, + "webp": { + "description": "add webp support", + "dependencies": [ + "libwebp" + ] } } -} \ No newline at end of file +} From ca92a4927c2f2a4fad9a433f135cf4855ce3e2d0 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 14:14:41 +0100 Subject: [PATCH 0125/1694] format... --- ports/mapnik/vcpkg.json | 100 ++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 9451393e108fe0..efdcae3db6cecb 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -55,36 +55,6 @@ "zlib" ], "features": { - "jpeg": { - "description": "add jpeg support", - "dependencies": [ - "libjpeg-turbo" - ] - }, - "png": { - "description": "add png support", - "dependencies": [ - "libpng" - ] - }, - "tiff": { - "description": "add tiff support", - "dependencies": [ - "tiff" - ] - }, - "webp": { - "description": "add webp support", - "dependencies": [ - "libwebp" - ] - }, - "libxml2": { - "description": "use libxml2 instead of rapidxml", - "dependencies": [ - "libxml2" - ] - }, "cairo": { "description": "Cairo renderer", "dependencies": [ @@ -92,23 +62,6 @@ "cairomm" ] }, - "proj4": { - "description": "PROJ4 Functionalities", - "dependencies": [ - { - "name": "proj4", - "features": [ - "database" - ] - } - ] - }, - "viewer": { - "description": "Make demo viewer application", - "dependencies": [ - "qt5-base" - ] - }, "demo": { "description": "Make demo application" }, @@ -165,6 +118,41 @@ "input-topojson": { "description": "TOPOJSON input plugin" }, + "jpeg": { + "description": "add jpeg support", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "libxml2": { + "description": "use libxml2 instead of rapidxml", + "dependencies": [ + "libxml2" + ] + }, + "png": { + "description": "add png support", + "dependencies": [ + "libpng" + ] + }, + "proj4": { + "description": "PROJ4 Functionalities", + "dependencies": [ + { + "name": "proj4", + "features": [ + "database" + ] + } + ] + }, + "tiff": { + "description": "add tiff support", + "dependencies": [ + "tiff" + ] + }, "utility-geometry-to-wkb": { "description": "utility application geometry-to-wkb", "dependencies": [ @@ -190,9 +178,9 @@ "description": "utility application pgsql2sqlite", "dependencies": [ "boost-program-options", - "sqlite3", "libodb-pgsql", - "libpq" + "libpq", + "sqlite3" ] }, "utility-shapeindex": { @@ -206,6 +194,18 @@ "dependencies": [ "boost-program-options" ] + }, + "viewer": { + "description": "Make demo viewer application", + "dependencies": [ + "qt5-base" + ] + }, + "webp": { + "description": "add webp support", + "dependencies": [ + "libwebp" + ] } } -} \ No newline at end of file +} From 3cb92f4963f75e30f78906f7d4352f88367f9362 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 14:36:43 +0100 Subject: [PATCH 0126/1694] add boost po again --- ports/mapnik/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index efdcae3db6cecb..1df862bae67e91 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -21,6 +21,7 @@ "platform": "!windows" }, "boost-msm", + "boost-program-options", "boost-property-tree", { "name": "boost-regex", From d1bdd48c56a9985cbb547045ca8505f6fc4a567a Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 14:36:43 +0100 Subject: [PATCH 0127/1694] add boost po again --- ports/mapnik/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index efdcae3db6cecb..1df862bae67e91 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -21,6 +21,7 @@ "platform": "!windows" }, "boost-msm", + "boost-program-options", "boost-property-tree", { "name": "boost-regex", From 3fa38c5054ad6498e0e29e7a5b21950db581eba6 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 14:41:38 +0100 Subject: [PATCH 0128/1694] missing protozero --- ports/mapnik/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 1df862bae67e91..e5b2f94206a41f 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -53,6 +53,7 @@ "mapbox-geometry", "mapbox-polylabel", "mapbox-variant", + "protozero", "zlib" ], "features": { From 8045b498dd4a6d1b84fb1ffbed49e8e9bd3effc4 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 14:41:38 +0100 Subject: [PATCH 0129/1694] missing protozero --- ports/mapnik/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 1df862bae67e91..e5b2f94206a41f 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -53,6 +53,7 @@ "mapbox-geometry", "mapbox-polylabel", "mapbox-variant", + "protozero", "zlib" ], "features": { From cc61007579df7af70551486b37123e833c653f48 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 14:56:29 +0100 Subject: [PATCH 0130/1694] use new version --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index ade10a524fdbc6..9e65791a8586de 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF cmake-support - SHA512 69aab419d74e9bf70a54f3a900e28a8f2721cad13c167fb2ce44dd8d548a9d54fd2983417b8757e29cacf79efbaf11cfe405e000f8fdeb399aa3bf5ab1c9c213 + REF 9213f76d491da76f9f04151ce6bc89f38d92bd6f + SHA512 3428eb4e843ccb68e61e95ed4098701948c77c820fbe391db4c82c1da1d36bb5fbb4217e88a9d429b779e8ac01723c1dd8573af1ad7b039ed84ad993daa10fd3 HEAD_REF master ) From a80bdb3fe095a465a1ff1388478b92ea66b3dbb4 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 14:56:29 +0100 Subject: [PATCH 0131/1694] use new version --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index ade10a524fdbc6..9e65791a8586de 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF cmake-support - SHA512 69aab419d74e9bf70a54f3a900e28a8f2721cad13c167fb2ce44dd8d548a9d54fd2983417b8757e29cacf79efbaf11cfe405e000f8fdeb399aa3bf5ab1c9c213 + REF 9213f76d491da76f9f04151ce6bc89f38d92bd6f + SHA512 3428eb4e843ccb68e61e95ed4098701948c77c820fbe391db4c82c1da1d36bb5fbb4217e88a9d429b779e8ac01723c1dd8573af1ad7b039ed84ad993daa10fd3 HEAD_REF master ) From 92988a73e94c56cd85e0fb214f8c2fa6ff453113 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 15:02:59 +0100 Subject: [PATCH 0132/1694] use new version take2 --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 9e65791a8586de..0a022e5828539c 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 9213f76d491da76f9f04151ce6bc89f38d92bd6f - SHA512 3428eb4e843ccb68e61e95ed4098701948c77c820fbe391db4c82c1da1d36bb5fbb4217e88a9d429b779e8ac01723c1dd8573af1ad7b039ed84ad993daa10fd3 + REF 744aa2a76ad165d4652e285a80cc6ad78b9d01fd + SHA512 ca23b5eb334936ff8a3eb6a88bf28ff38578ca240dfe4c0710f82a89a873ddfe30a505f21fd9490bd71cc06c0c9c72f2de95f8a81f8492fce06a015f3584f236 HEAD_REF master ) From cf41627ab96242da8c3173520b39b8b96c78313d Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 15:02:59 +0100 Subject: [PATCH 0133/1694] use new version take2 --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 9e65791a8586de..0a022e5828539c 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 9213f76d491da76f9f04151ce6bc89f38d92bd6f - SHA512 3428eb4e843ccb68e61e95ed4098701948c77c820fbe391db4c82c1da1d36bb5fbb4217e88a9d429b779e8ac01723c1dd8573af1ad7b039ed84ad993daa10fd3 + REF 744aa2a76ad165d4652e285a80cc6ad78b9d01fd + SHA512 ca23b5eb334936ff8a3eb6a88bf28ff38578ca240dfe4c0710f82a89a873ddfe30a505f21fd9490bd71cc06c0c9c72f2de95f8a81f8492fce06a015f3584f236 HEAD_REF master ) From 8292fe19872f63d84aaca210bd966039363e0c78 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 15:11:26 +0100 Subject: [PATCH 0134/1694] enable c++17 --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 0a022e5828539c..bfe415f4e1514e 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 744aa2a76ad165d4652e285a80cc6ad78b9d01fd - SHA512 ca23b5eb334936ff8a3eb6a88bf28ff38578ca240dfe4c0710f82a89a873ddfe30a505f21fd9490bd71cc06c0c9c72f2de95f8a81f8492fce06a015f3584f236 + REF 07546fe0987e7062fdd2daadeb48c412d8f176d9 + SHA512 0e73c6bfe0321afc8fd5e590d0355d63ed4ced9ee1d654fcd0d1fdfaf117f868c34b180ed51fc4587d04b14b15f3ffc0e6be198fb52a8c2f216ebde1598bd827 HEAD_REF master ) From 0c95befdc350c9f5ed1575112f78a95ad508cbe6 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 15:11:26 +0100 Subject: [PATCH 0135/1694] enable c++17 --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 0a022e5828539c..bfe415f4e1514e 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 744aa2a76ad165d4652e285a80cc6ad78b9d01fd - SHA512 ca23b5eb334936ff8a3eb6a88bf28ff38578ca240dfe4c0710f82a89a873ddfe30a505f21fd9490bd71cc06c0c9c72f2de95f8a81f8492fce06a015f3584f236 + REF 07546fe0987e7062fdd2daadeb48c412d8f176d9 + SHA512 0e73c6bfe0321afc8fd5e590d0355d63ed4ced9ee1d654fcd0d1fdfaf117f868c34b180ed51fc4587d04b14b15f3ffc0e6be198fb52a8c2f216ebde1598bd827 HEAD_REF master ) From 6aa2dc43b2fb1211fb4a27b66b28850c0722cbec Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 15:19:51 +0100 Subject: [PATCH 0136/1694] fix for linux --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index bfe415f4e1514e..01d0b7062f5d98 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 07546fe0987e7062fdd2daadeb48c412d8f176d9 - SHA512 0e73c6bfe0321afc8fd5e590d0355d63ed4ced9ee1d654fcd0d1fdfaf117f868c34b180ed51fc4587d04b14b15f3ffc0e6be198fb52a8c2f216ebde1598bd827 + REF 0084628d61ebdb6ece5460c22601e5bf5a03644d + SHA512 a53ce3cfae731d31376ae65515eaf2c00341529f4afbe64d1bec27f62b64580de0384cfe28c77bb9bfaa5ee7fe9aa1fa6ad8f1a2e24bbdeb769825876035cfcf HEAD_REF master ) From 826454a4a27c6294e919d8cdab6f27edd59e2602 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 15:19:51 +0100 Subject: [PATCH 0137/1694] fix for linux --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index bfe415f4e1514e..01d0b7062f5d98 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 07546fe0987e7062fdd2daadeb48c412d8f176d9 - SHA512 0e73c6bfe0321afc8fd5e590d0355d63ed4ced9ee1d654fcd0d1fdfaf117f868c34b180ed51fc4587d04b14b15f3ffc0e6be198fb52a8c2f216ebde1598bd827 + REF 0084628d61ebdb6ece5460c22601e5bf5a03644d + SHA512 a53ce3cfae731d31376ae65515eaf2c00341529f4afbe64d1bec27f62b64580de0384cfe28c77bb9bfaa5ee7fe9aa1fa6ad8f1a2e24bbdeb769825876035cfcf HEAD_REF master ) From 02e709b3e086b61f07800d9762eb1ed2af759dad Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 15:35:40 +0100 Subject: [PATCH 0138/1694] change to c++14 since linux dont support --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 01d0b7062f5d98..296868a993a138 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 0084628d61ebdb6ece5460c22601e5bf5a03644d - SHA512 a53ce3cfae731d31376ae65515eaf2c00341529f4afbe64d1bec27f62b64580de0384cfe28c77bb9bfaa5ee7fe9aa1fa6ad8f1a2e24bbdeb769825876035cfcf + REF 096befe69eed03a9038cb3387c3aed0ded21e7e3 + SHA512 f0749b7e16d57bd6895c13af96a1d51f530dc08932dff2a86ebc62aa349d28fcef9a56ce304324dec76546b699c657860790045c99c6e944c3e0e9f18c50a464 HEAD_REF master ) From 3cab88cb4b23fb1aa17ea04bffa8eb91a9b3eaed Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 15:35:40 +0100 Subject: [PATCH 0139/1694] change to c++14 since linux dont support --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 01d0b7062f5d98..296868a993a138 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 0084628d61ebdb6ece5460c22601e5bf5a03644d - SHA512 a53ce3cfae731d31376ae65515eaf2c00341529f4afbe64d1bec27f62b64580de0384cfe28c77bb9bfaa5ee7fe9aa1fa6ad8f1a2e24bbdeb769825876035cfcf + REF 096befe69eed03a9038cb3387c3aed0ded21e7e3 + SHA512 f0749b7e16d57bd6895c13af96a1d51f530dc08932dff2a86ebc62aa349d28fcef9a56ce304324dec76546b699c657860790045c99c6e944c3e0e9f18c50a464 HEAD_REF master ) From f96fdb0157986b09a41500bbed03b29fd93a66eb Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 17:51:27 +0100 Subject: [PATCH 0140/1694] add feature renderers; fail on windows static --- ports/mapnik/portfile.cmake | 6 ++++-- ports/mapnik/vcpkg.json | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 296868a993a138..d26b3784f28b40 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 096befe69eed03a9038cb3387c3aed0ded21e7e3 - SHA512 f0749b7e16d57bd6895c13af96a1d51f530dc08932dff2a86ebc62aa349d28fcef9a56ce304324dec76546b699c657860790045c99c6e944c3e0e9f18c50a464 + REF 96a8327d06b11bd53297aefd692223a06862b234 + SHA512 7bc149f62a4e65d5b0b10edb207e3fff4710b1097055cdf9e26cdc3dd5daf4055a73c6c8693d0c922879ee22efa3ba1aee548ca29b3966256c0bdb90fb1f4104 HEAD_REF master ) @@ -15,6 +15,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS libxml2 USE_LIBXML2 cairo USE_CAIRO proj4 USE_PROJ4 + "grid-renderer" USE_GRID_RENDERER + "svg-renderer" USE_SVG_RENDERER "input-csv" USE_PLUGIN_INPUT_CSV "input-gdal" USE_PLUGIN_INPUT_GDAL "input-geobuf" USE_PLUGIN_INPUT_GEOBUF diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index e5b2f94206a41f..9e3b7bd740c80a 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -3,6 +3,7 @@ "version-string": "3.0.23", "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", + "supports": "!(static & windows)", "dependencies": [ "boost-assign", "boost-bimap", @@ -67,6 +68,9 @@ "demo": { "description": "Make demo application" }, + "grid-renderer": { + "description": "Grid renderer" + }, "input-csv": { "description": "CSV input plugin" }, @@ -149,6 +153,9 @@ } ] }, + "svg-renderer": { + "description": "SVG renderer" + }, "tiff": { "description": "add tiff support", "dependencies": [ From 718dae608be2d103d8f03f444fc9db0df17323fd Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 17:51:27 +0100 Subject: [PATCH 0141/1694] add feature renderers; fail on windows static --- ports/mapnik/portfile.cmake | 6 ++++-- ports/mapnik/vcpkg.json | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 296868a993a138..d26b3784f28b40 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 096befe69eed03a9038cb3387c3aed0ded21e7e3 - SHA512 f0749b7e16d57bd6895c13af96a1d51f530dc08932dff2a86ebc62aa349d28fcef9a56ce304324dec76546b699c657860790045c99c6e944c3e0e9f18c50a464 + REF 96a8327d06b11bd53297aefd692223a06862b234 + SHA512 7bc149f62a4e65d5b0b10edb207e3fff4710b1097055cdf9e26cdc3dd5daf4055a73c6c8693d0c922879ee22efa3ba1aee548ca29b3966256c0bdb90fb1f4104 HEAD_REF master ) @@ -15,6 +15,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS libxml2 USE_LIBXML2 cairo USE_CAIRO proj4 USE_PROJ4 + "grid-renderer" USE_GRID_RENDERER + "svg-renderer" USE_SVG_RENDERER "input-csv" USE_PLUGIN_INPUT_CSV "input-gdal" USE_PLUGIN_INPUT_GDAL "input-geobuf" USE_PLUGIN_INPUT_GEOBUF diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index e5b2f94206a41f..9e3b7bd740c80a 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -3,6 +3,7 @@ "version-string": "3.0.23", "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", + "supports": "!(static & windows)", "dependencies": [ "boost-assign", "boost-bimap", @@ -67,6 +68,9 @@ "demo": { "description": "Make demo application" }, + "grid-renderer": { + "description": "Grid renderer" + }, "input-csv": { "description": "CSV input plugin" }, @@ -149,6 +153,9 @@ } ] }, + "svg-renderer": { + "description": "SVG renderer" + }, "tiff": { "description": "add tiff support", "dependencies": [ From 83d40659f50cc3d144829dc5ee2bfa36dc8ae53d Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 18:03:05 +0100 Subject: [PATCH 0142/1694] fix svg renderer --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index d26b3784f28b40..8cd103bf9dd8c6 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 96a8327d06b11bd53297aefd692223a06862b234 - SHA512 7bc149f62a4e65d5b0b10edb207e3fff4710b1097055cdf9e26cdc3dd5daf4055a73c6c8693d0c922879ee22efa3ba1aee548ca29b3966256c0bdb90fb1f4104 + REF 695ad02cb245b0c883957d121ca10de6912844ae + SHA512 357ee9ce82ad042b134b0265bc558dae5cb9e4a5d39070fee682b3fb648e27337b55f1ad8e9b902f2b8931c540832ea11880a7e214ced61cba0343f039dc6bed HEAD_REF master ) From f6a259258a43bc0143e6f565cf751fa5495f1606 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 18:03:05 +0100 Subject: [PATCH 0143/1694] fix svg renderer --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index d26b3784f28b40..8cd103bf9dd8c6 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 96a8327d06b11bd53297aefd692223a06862b234 - SHA512 7bc149f62a4e65d5b0b10edb207e3fff4710b1097055cdf9e26cdc3dd5daf4055a73c6c8693d0c922879ee22efa3ba1aee548ca29b3966256c0bdb90fb1f4104 + REF 695ad02cb245b0c883957d121ca10de6912844ae + SHA512 357ee9ce82ad042b134b0265bc558dae5cb9e4a5d39070fee682b3fb648e27337b55f1ad8e9b902f2b8931c540832ea11880a7e214ced61cba0343f039dc6bed HEAD_REF master ) From 64de0fef46663e10002788a2941d2908e0c7323c Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 18:05:31 +0100 Subject: [PATCH 0144/1694] fix typo --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 8cd103bf9dd8c6..d4f4866a6717a4 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 695ad02cb245b0c883957d121ca10de6912844ae - SHA512 357ee9ce82ad042b134b0265bc558dae5cb9e4a5d39070fee682b3fb648e27337b55f1ad8e9b902f2b8931c540832ea11880a7e214ced61cba0343f039dc6bed + REF 99d8c3e503fed79cde86b839ff1e6fb913845d05 + SHA512 b4c2db89d009141a929ff7677975e8eb5e37a7de2329dae9befdf51622fa2b384325c9ecce5ede7155c86f2e12f0a98b63d7d05c2a1fab55631905a5d38c0b65 HEAD_REF master ) From 1c1a1189bf2a5107b25354a8af0d39f197922454 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 18:05:31 +0100 Subject: [PATCH 0145/1694] fix typo --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 8cd103bf9dd8c6..d4f4866a6717a4 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 695ad02cb245b0c883957d121ca10de6912844ae - SHA512 357ee9ce82ad042b134b0265bc558dae5cb9e4a5d39070fee682b3fb648e27337b55f1ad8e9b902f2b8931c540832ea11880a7e214ced61cba0343f039dc6bed + REF 99d8c3e503fed79cde86b839ff1e6fb913845d05 + SHA512 b4c2db89d009141a929ff7677975e8eb5e37a7de2329dae9befdf51622fa2b384325c9ecce5ede7155c86f2e12f0a98b63d7d05c2a1fab55631905a5d38c0b65 HEAD_REF master ) From 1323252a8123b32d0e3d2b038eaaaab1a98bd3f4 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 18:20:52 +0100 Subject: [PATCH 0146/1694] pls test with current version --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index d4f4866a6717a4..e7a3e3a8444076 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 99d8c3e503fed79cde86b839ff1e6fb913845d05 - SHA512 b4c2db89d009141a929ff7677975e8eb5e37a7de2329dae9befdf51622fa2b384325c9ecce5ede7155c86f2e12f0a98b63d7d05c2a1fab55631905a5d38c0b65 + REF 45fd654898a02587ed6279161fa267b73cbe37eb + SHA512 ec404845b6d0fa20d003ef116aeb8b9fadbf4f0f7ea36d09a34e787c2afe8ce0db1ed420617a5925d55eeb49d1742c442aa03b45ff65acef8f935b83bf97a185 HEAD_REF master ) From f7a10a7008cbf01836c772b647a610a71f828fe5 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 21 Nov 2020 18:20:52 +0100 Subject: [PATCH 0147/1694] pls test with current version --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index d4f4866a6717a4..e7a3e3a8444076 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 99d8c3e503fed79cde86b839ff1e6fb913845d05 - SHA512 b4c2db89d009141a929ff7677975e8eb5e37a7de2329dae9befdf51622fa2b384325c9ecce5ede7155c86f2e12f0a98b63d7d05c2a1fab55631905a5d38c0b65 + REF 45fd654898a02587ed6279161fa267b73cbe37eb + SHA512 ec404845b6d0fa20d003ef116aeb8b9fadbf4f0f7ea36d09a34e787c2afe8ce0db1ed420617a5925d55eeb49d1742c442aa03b45ff65acef8f935b83bf97a185 HEAD_REF master ) From 35efc62560b2cec125cc850b0b9e7d0e20cc025d Mon Sep 17 00:00:00 2001 From: "Joakim L. Gilje" Date: Mon, 23 Nov 2020 18:43:23 +0100 Subject: [PATCH 0148/1694] [vcpkg] initial openbsd (community) support (#14549) * initial openbsd support in vcpkg * after clang-format * hardcoded in the preferred compiler for openbsd in bootstrap scipt (thanks @tormfinn) * Fetch a patched pkg-config because openbsd pkg-config lacks {fcfiledir} * fixes from review feedback * corrected hash for pkg-config.openbsd * re-added missing endif() * regenerate docs * Update scripts/cmake/vcpkg_configure_meson.cmake Co-authored-by: Nicole Mazzuca --- docs/maintainers/vcpkg_common_definitions.md | 4 +-- ports/openssl/unix/CMakeLists.txt | 2 ++ scripts/bootstrap.sh | 11 +++++++ scripts/cmake/vcpkg_build_make.cmake | 6 +++- scripts/cmake/vcpkg_common_definitions.cmake | 16 ++++++---- scripts/cmake/vcpkg_configure_cmake.cmake | 2 ++ scripts/cmake/vcpkg_configure_make.cmake | 3 +- scripts/cmake/vcpkg_configure_meson.cmake | 2 ++ .../cmake/vcpkg_find_acquire_program.cmake | 11 +++++++ scripts/toolchains/openbsd.cmake | 32 +++++++++++++++++++ toolsrc/cmake/utilities.cmake | 3 ++ toolsrc/src/vcpkg/base/system.process.cpp | 6 ++++ toolsrc/src/vcpkg/build.cpp | 4 +++ toolsrc/src/vcpkg/tools.cpp | 4 ++- toolsrc/src/vcpkg/triplet.cpp | 2 ++ triplets/community/x64-openbsd.cmake | 8 +++++ 16 files changed, 105 insertions(+), 11 deletions(-) create mode 100644 scripts/toolchains/openbsd.cmake create mode 100644 triplets/community/x64-openbsd.cmake diff --git a/docs/maintainers/vcpkg_common_definitions.md b/docs/maintainers/vcpkg_common_definitions.md index 9c16deba36d1c9..9bbc64b1ef4deb 100644 --- a/docs/maintainers/vcpkg_common_definitions.md +++ b/docs/maintainers/vcpkg_common_definitions.md @@ -4,8 +4,8 @@ File contains helpful variabls for portfiles which are commonly needed or used. ## The following variables are available: ```cmake -VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD. only defined if -VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD. only defined if +VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if +VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD, OPENBSD. only defined if VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "${VCPKG_HOST_PATH_SEPARATOR}"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "") VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host VCPKG_TARGET_EXECUTABLE_SUFFIX executable suffix of the target diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index 7e09222c92e2e0..8b277d3970dcef 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -28,6 +28,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(PLATFORM darwin64-x86_64-cc) elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(PLATFORM BSD-generic64) +elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") + set(PLATFORM BSD-generic64) elseif(MINGW) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") set(PLATFORM mingw64) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 969d1aa95fcac0..e5503f3866d75d 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -245,6 +245,17 @@ if [ "$ARCH" = "armv7l" -o "$ARCH" = "aarch64" -o "$ARCH" = "s390x" ]; then vcpkgUseSystem=true fi +if [ "$UNAME" = "OpenBSD" ]; then + vcpkgUseSystem=true + + if [ -z "$CXX" ]; then + CXX=/usr/bin/clang++ + fi + if [ -z "$CC" ]; then + CC=/usr/bin/clang + fi +fi + if $vcpkgUseSystem; then cmakeExe="cmake" ninjaExe="ninja" diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 6deded6471ee3c..d74db5f45a75fc 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -94,7 +94,11 @@ function(vcpkg_build_make) #TODO: optimize for install-data (release) and install-exec (release/debug) else() # Compiler requriements - find_program(MAKE make REQUIRED) + if(VCPKG_HOST_IS_OPENBSD) + find_program(MAKE gmake REQUIRED) + else() + find_program(MAKE make REQUIRED) + endif() set(MAKE_COMMAND "${MAKE}") # Set make command and install command set(MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index ee5288db20e602..33c66c3ec94cc3 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -4,8 +4,8 @@ ## ## ## The following variables are available: ## ```cmake -## VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD. only defined if -## VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD. only defined if +## VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if +## VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD, OPENBSD. only defined if ## VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "${VCPKG_HOST_PATH_SEPARATOR}"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "") ## VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host ## VCPKG_TARGET_EXECUTABLE_SUFFIX executable suffix of the target @@ -41,6 +41,8 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") set(VCPKG_TARGET_IS_ANDROID 1) elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(VCPKG_TARGET_IS_FREEBSD 1) +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") + set(VCPKG_TARGET_IS_OPENBSD 1) elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") set(VCPKG_TARGET_IS_WINDOWS 1) set(VCPKG_TARGET_IS_MINGW 1) @@ -55,6 +57,8 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(VCPKG_HOST_IS_LINUX 1) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") set(VCPKG_HOST_IS_FREEBSD 1) +elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") + set(VCPKG_HOST_IS_OPENBSD 1) endif() #Helper variable to identify the host path separator. @@ -136,17 +140,17 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_OSX) endif() # Platforms with libm -if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_MINGW) +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OPENBSD OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_MINGW) list(APPEND VCPKG_SYSTEM_LIBRARIES m) endif() # Platforms with pthread -if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_MINGW) +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OPENBSD OR VCPKG_TARGET_IS_MINGW) list(APPEND VCPKG_SYSTEM_LIBRARIES pthread) endif() # Platforms with libstdc++ -if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_MINGW) +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OPENBSD OR VCPKG_TARGET_IS_MINGW) list(APPEND VCPKG_SYSTEM_LIBRARIES [=[stdc\+\+]=]) endif() @@ -161,7 +165,7 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_OSX OR VC endif() # Platforms with GCC libs -if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_MINGW) +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OPENBSD OR VCPKG_TARGET_IS_MINGW) list(APPEND VCPKG_SYSTEM_LIBRARIES gcc) list(APPEND VCPKG_SYSTEM_LIBRARIES gcc_s) endif() diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 9f71b2208fd84f..14df78e53cf96c 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -217,6 +217,8 @@ function(vcpkg_configure_cmake) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") endif() diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 0d80e148cb9670..8e079b64d2f27a 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -663,7 +663,8 @@ function(vcpkg_configure_make) if (CMAKE_HOST_WIN32) set(command ${base_cmd} -c "${CONFIGURE_ENV} ./${RELATIVE_BUILD_PATH}/configure ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}") else() - set(command /bin/bash "./${RELATIVE_BUILD_PATH}/configure" ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}) + find_program(BASH bash REQUIRED) + set(command "${BASH}" "./${RELATIVE_BUILD_PATH}/configure" ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}) endif() if(_csc_ADD_BIN_TO_PATH) set(PATH_BACKUP $ENV{PATH}) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 982e3a5e1f1b09..8bcb654d96ad5a 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -143,6 +143,8 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") elseif(VCPKG_TARGET_IS_FREEBSD) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") + elseif(VCPKG_TARGET_IS_OPENBSD) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") elseif(VCPKG_TARGET_IS_MINGW) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 875ba1f14b8471..970a41d7d98e3e 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -423,6 +423,17 @@ function(vcpkg_find_acquire_program VAR) debug_message(STATUS "PKG_CONFIG found in ENV! Using $ENV{PKG_CONFIG}") set(PKGCONFIG $ENV{PKG_CONFIG} PARENT_SCOPE) return() + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") + # As of 6.8, the OpenBSD specific pkg-config doesn't support {pcfiledir} + set(_vfa_SUPPORTED ON) + set(_vfa_RENAME "pkg-config") + set(PKGCONFIG_VERSION 0.29.2.1) + set(NOEXTRACT ON) + set(ARCHIVE "pkg-config.openbsd") + set(SUBDIR "openbsd") + set(URL "https://raw.githubusercontent.com/jgilje/pkg-config-openbsd/master/pkg-config") + set(HASH b7ec9017b445e00ae1377e36e774cf3f5194ab262595840b449832707d11e443a102675f66d8b7e8b2e2f28cebd6e256835507b1e0c69644cc9febab8285080b) + set(VERSION_CMD --version) elseif(CMAKE_HOST_WIN32) if(NOT EXISTS "${PKGCONFIG}") set(VERSION 0.29.2-1) diff --git a/scripts/toolchains/openbsd.cmake b/scripts/toolchains/openbsd.cmake new file mode 100644 index 00000000000000..9eb8f3a0b0e4fa --- /dev/null +++ b/scripts/toolchains/openbsd.cmake @@ -0,0 +1,32 @@ +if(NOT _VCPKG_OPENBSD_TOOLCHAIN) +set(_VCPKG_OPENBSD_TOOLCHAIN 1) + +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") + set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") +endif() +set(CMAKE_SYSTEM_NAME OpenBSD CACHE STRING "") + +if(NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER "/usr/bin/clang++") +endif() +if(NOT DEFINED CMAKE_C_COMPILER) + set(CMAKE_C_COMPILER "/usr/bin/clang") +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} ") + string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${VCPKG_CXX_FLAGS} ") + string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ") + string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " ${VCPKG_CXX_FLAGS_DEBUG} ") + string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ") + string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ") + + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") +endif(NOT _CMAKE_IN_TRY_COMPILE) +endif(NOT _VCPKG_OPENBSD_TOOLCHAIN) diff --git a/toolsrc/cmake/utilities.cmake b/toolsrc/cmake/utilities.cmake index 429a86f5f07c71..9523b9d9782662 100644 --- a/toolsrc/cmake/utilities.cmake +++ b/toolsrc/cmake/utilities.cmake @@ -137,6 +137,9 @@ int main() {} if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang") # AppleClang never requires (or allows) -lc++fs, even with libc++ version 8.0.0 set(_VCPKG_CXXFS_LIBRARY OFF) + elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") + # As above, not required on this platform (tested at least on 6.8) + set(_VCPKG_CXXFS_LIBRARY OFF) else() check_cxx_source_compiles([[ #include diff --git a/toolsrc/src/vcpkg/base/system.process.cpp b/toolsrc/src/vcpkg/base/system.process.cpp index 16b37dff7fb9c7..b330069e669621 100644 --- a/toolsrc/src/vcpkg/base/system.process.cpp +++ b/toolsrc/src/vcpkg/base/system.process.cpp @@ -156,6 +156,12 @@ namespace vcpkg Checks::check_exit(VCPKG_LINE_INFO, rcode == 0, "Could not determine current executable path."); Checks::check_exit(VCPKG_LINE_INFO, len > 0, "Could not determine current executable path."); return fs::path(exePath, exePath + len - 1); +#elif defined(__OpenBSD__) + const char* progname = getprogname(); + char resolved_path[PATH_MAX]; + auto ret = realpath(progname, resolved_path); + Checks::check_exit(VCPKG_LINE_INFO, ret != nullptr, "Could not determine current executable path."); + return fs::u8path(resolved_path); #else /* LINUX */ std::array buf; auto written = readlink("/proc/self/exe", buf.data(), buf.size()); diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index d418f71f55a581..495b517eabdb54 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -694,6 +694,10 @@ namespace vcpkg::Build { return m_paths.scripts / fs::u8path("toolchains/freebsd.cmake"); } + else if (cmake_system_name == "OpenBSD") + { + return m_paths.scripts / fs::u8path("toolchains/openbsd.cmake"); + } else if (cmake_system_name == "Android") { return m_paths.scripts / fs::u8path("toolchains/android.cmake"); diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index b7092a364fefa0..69ad05d385e8f7 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -53,11 +53,13 @@ namespace vcpkg static constexpr StringLiteral OS_STRING = "linux"; #elif defined(__FreeBSD__) static constexpr StringLiteral OS_STRING = "freebsd"; +#elif defined(__OpenBSD__) + static constexpr StringLiteral OS_STRING = "openbsd"; #else return std::string("operating system is unknown"); #endif -#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) +#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) static const std::string XML_VERSION = "2"; static const fs::path XML_PATH = paths.scripts / "vcpkgTools.xml"; static const std::regex XML_VERSION_REGEX{R"###()###"}; diff --git a/toolsrc/src/vcpkg/triplet.cpp b/toolsrc/src/vcpkg/triplet.cpp index 45dbf1f3344c80..dbb82e3c87ec55 100644 --- a/toolsrc/src/vcpkg/triplet.cpp +++ b/toolsrc/src/vcpkg/triplet.cpp @@ -90,6 +90,8 @@ namespace vcpkg return Triplet::from_canonical_name("x64-osx"); #elif defined(__FreeBSD__) return Triplet::from_canonical_name("x64-freebsd"); +#elif defined(__OpenBSD__) + return Triplet::from_canonical_name("x64-openbsd"); #elif defined(__GLIBC__) #if defined(__aarch64__) return Triplet::from_canonical_name("arm64-linux"); diff --git a/triplets/community/x64-openbsd.cmake b/triplets/community/x64-openbsd.cmake new file mode 100644 index 00000000000000..9aa220a743f1c7 --- /dev/null +++ b/triplets/community/x64-openbsd.cmake @@ -0,0 +1,8 @@ +# Use with +# VCPKG_FORCE_SYSTEM_BINARIES=1 ./vcpkg install brotli + +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME OpenBSD) From 38ebbfbe5447d90e0782d4419a1ce9089d7fa17f Mon Sep 17 00:00:00 2001 From: Nemirtingas <9432037+Nemirtingas@users.noreply.github.com> Date: Mon, 23 Nov 2020 19:50:37 +0100 Subject: [PATCH 0149/1694] [libdatachannel] Add new port (#13704) * libdatachannel port * Fixed various things for pr. * Update to v0.9.2 * Update to 0.9.4 and enable SRTP feature * Add openssl dependency * Fix usrsctp find_library * Flip the sense of the websockets feature and use a manifest instead of CONTROL file. * Need to update libjuice and libdatachannel but there is now a USE_SRTP option. * Update libdatachannel for USE_SRTP Option * Update libdatachannel to v0.10.1 Co-authored-by: Nemirtingas Co-authored-by: JackBoosY Co-authored-by: Billy Robert O'Neal III --- ports/libdatachannel/fix-for-vcpkg.patch | 110 +++++++++++++++++++++++ ports/libdatachannel/portfile.cmake | 34 +++++++ ports/libdatachannel/vcpkg.json | 26 ++++++ 3 files changed, 170 insertions(+) create mode 100644 ports/libdatachannel/fix-for-vcpkg.patch create mode 100644 ports/libdatachannel/portfile.cmake create mode 100644 ports/libdatachannel/vcpkg.json diff --git a/ports/libdatachannel/fix-for-vcpkg.patch b/ports/libdatachannel/fix-for-vcpkg.patch new file mode 100644 index 00000000000000..fc6c26adf5303b --- /dev/null +++ b/ports/libdatachannel/fix-for-vcpkg.patch @@ -0,0 +1,110 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bed634b..fced56e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -112,28 +112,18 @@ set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_package(Threads REQUIRED) + + set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) +-add_subdirectory(deps/plog) +- +-option(sctp_build_programs 0) +-option(sctp_build_shared_lib 0) +-add_subdirectory(deps/usrsctp EXCLUDE_FROM_ALL) +-if (MSYS OR MINGW) +- target_compile_definitions(usrsctp PUBLIC -DSCTP_STDINT_INCLUDE=) +-endif() +-if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") +- target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation) +-endif() +-add_library(Usrsctp::Usrsctp ALIAS usrsctp) ++find_library(USRSCTP_LIBRARY usrsctp REQUIRED) ++find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h") + + if (NO_WEBSOCKET) +- add_library(datachannel SHARED ++ add_library(datachannel + ${LIBDATACHANNEL_SOURCES}) + add_library(datachannel-static STATIC EXCLUDE_FROM_ALL + ${LIBDATACHANNEL_SOURCES}) + target_compile_definitions(datachannel PUBLIC RTC_ENABLE_WEBSOCKET=0) + target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_WEBSOCKET=0) + else() +- add_library(datachannel SHARED ++ add_library(datachannel + ${LIBDATACHANNEL_SOURCES} + ${LIBDATACHANNEL_WEBSOCKET_SOURCES}) + add_library(datachannel-static STATIC EXCLUDE_FROM_ALL +@@ -150,17 +140,17 @@ set_target_properties(datachannel-static PROPERTIES + VERSION ${PROJECT_VERSION} + CXX_STANDARD 17) + +-target_include_directories(datachannel PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) ++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) +-target_link_libraries(datachannel PUBLIC Threads::Threads plog::plog) +-target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp) ++target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) ++target_link_libraries(datachannel PUBLIC Threads::Threads ${USRSCTP_LIBRARY}) + + target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) + target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) + target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) +-target_link_libraries(datachannel-static PUBLIC Threads::Threads plog::plog) +-target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp) ++target_include_directories(datachannel-static PRIVATE ${PLOG_INCLUDE_DIRS}) ++target_link_libraries(datachannel-static PUBLIC Threads::Threads ${USRSCTP_LIBRARY}) + + if(WIN32) + target_link_libraries(datachannel PRIVATE ws2_32) # winsock2 +@@ -224,11 +214,11 @@ if (USE_NICE OR NOT USE_JUICE) + target_link_libraries(datachannel PRIVATE LibNice::LibNice) + target_link_libraries(datachannel-static PRIVATE LibNice::LibNice) + else() +- add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL) ++ find_package(libjuice CONFIG REQUIRED) + target_compile_definitions(datachannel PRIVATE USE_NICE=0) + target_compile_definitions(datachannel-static PRIVATE USE_NICE=0) +- target_link_libraries(datachannel PRIVATE LibJuice::LibJuiceStatic) +- target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuiceStatic) ++ target_link_libraries(datachannel PRIVATE LibJuice::juice) ++ target_link_libraries(datachannel-static PRIVATE LibJuice::juice) + endif() + + if(RSA_KEY_BITS_2048) +@@ -244,7 +234,11 @@ endif() + add_library(LibDataChannel::LibDataChannel ALIAS datachannel) + add_library(LibDataChannel::LibDataChannelStatic ALIAS datachannel-static) + +-install(TARGETS datachannel LIBRARY DESTINATION lib) ++install(TARGETS datachannel EXPORT libdatachannel-config ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) + install(FILES ${LIBDATACHANNEL_HEADERS} DESTINATION include/rtc) + + if(NOT MSVC) +@@ -306,3 +300,8 @@ if(NOT NO_EXAMPLES AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + add_subdirectory(examples/copy-paste-capi) + endif() + ++install( ++ EXPORT libdatachannel-config ++ NAMESPACE LibDatachannel:: ++ DESTINATION share/cmake/libdatachannel ++) +diff --git a/src/tcptransport.hpp b/src/tcptransport.hpp +index 1447835..1c92686 100644 +--- a/src/tcptransport.hpp ++++ b/src/tcptransport.hpp +@@ -29,7 +29,7 @@ + #include + + // Use the socket defines from libjuice +-#include "../deps/libjuice/src/socket.h" ++#include + + namespace rtc { + diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake new file mode 100644 index 00000000000000..9fb73f372698cf --- /dev/null +++ b/ports/libdatachannel/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO paullouisageneau/libdatachannel + REF v0.10.1 + SHA512 195f564776b2a7ab6fe3a838d55be7fa03b72a5f08faaba5ddefac59ae1fff28f3ee0b9ed5dc17a7ef9155a1d30a61f8c593f2a108f60e415ffd213188e081bd + HEAD_REF master + PATCHES + fix-for-vcpkg.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + ws NO_WEBSOCKET + srtp NO_MEDIA +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DUSE_SYSTEM_SRTP=ON + -DNO_EXAMPLES=ON + -DNO_TESTS=ON +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libdatachannel) +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json new file mode 100644 index 00000000000000..79299fa5caf9dc --- /dev/null +++ b/ports/libdatachannel/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "libdatachannel", + "version-string": "v0.10.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", + "dependencies": [ + "libjuice", + "openssl", + "plog", + "usrsctp" + ], + "default-features": [ + "ws" + ], + "features": { + "srtp": { + "description": "Use Cisco's libSRTP for media transport.", + "dependencies": [ + "libsrtp" + ] + }, + "ws": { + "description": "Web Socket support" + } + } +} From 3079f4c13c846ddf621dee25e9e32786eb1b14f9 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 24 Nov 2020 02:51:06 +0800 Subject: [PATCH 0150/1694] [qt-advanced-docking-system] Update hash (#14714) --- ports/qt-advanced-docking-system/CONTROL | 1 + ports/qt-advanced-docking-system/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/qt-advanced-docking-system/CONTROL b/ports/qt-advanced-docking-system/CONTROL index 885f9e25690b44..49a2b28fed1ed2 100644 --- a/ports/qt-advanced-docking-system/CONTROL +++ b/ports/qt-advanced-docking-system/CONTROL @@ -1,5 +1,6 @@ Source: qt-advanced-docking-system Version: 3.6.3 Build-Depends: qt5-base[core], qt5-x11extras (!windows), zlib, bzip2 +Port-Version: 1 Description: Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio Homepage: https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake index 5c46a879fb1fb5..a464049ec76ab2 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO githubuser0xFFFF/Qt-Advanced-Docking-System REF 44dc76bd19853dcb18d37d5be231af526c8f709e #v3.6.3 - SHA512 c28aeb7f229c5ea637913ca122c475f235320085bc4a5df3aa4ef493e0ac42d167f21cd893eaac163382916a6f108b5d0e2bc8dda99bebb27c028f98b7e730ba + SHA512 ff50cd65f82736eae90f823d332d63c5c024ecb9e510f95fb8d776a0763bbd0143094b789516193c4037ca2a82eba33d73a68193bb6777e285c8a1e397b3958c HEAD_REF master PATCHES hardcode_version.patch From faf5f775e9caac82998d71713149982618aeb5f2 Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Mon, 23 Nov 2020 18:25:27 -0500 Subject: [PATCH 0151/1694] [cudnn] Try to find CUDNN locally before downloading (#14686) * [cudnn] Try to find CUDNN locally before downloading * Update port version to 3 --- ports/cudnn/CONTROL | 2 +- ports/cudnn/FindCUDNN.cmake | 4 +- ports/cudnn/portfile.cmake | 126 ++++++++++++++++++++++++------------ 3 files changed, 89 insertions(+), 43 deletions(-) diff --git a/ports/cudnn/CONTROL b/ports/cudnn/CONTROL index 24714f97fd2a87..386b3fea7a48ae 100644 --- a/ports/cudnn/CONTROL +++ b/ports/cudnn/CONTROL @@ -1,6 +1,6 @@ Source: cudnn Version: 7.6 -Port-Version: 2 +Port-Version: 3 Description: NVIDIA's cuDNN deep neural network acceleration library Build-Depends: cuda Supports: (windows|linux)&x64 diff --git a/ports/cudnn/FindCUDNN.cmake b/ports/cudnn/FindCUDNN.cmake index 5dc2e339266a74..594fd5dd6a3370 100644 --- a/ports/cudnn/FindCUDNN.cmake +++ b/ports/cudnn/FindCUDNN.cmake @@ -26,13 +26,13 @@ include(FindPackageHandleStandardArgs) if(NOT CUDNN_INCLUDE_DIR) find_path(CUDNN_INCLUDE_DIR cudnn.h - HINTS ${CUDA_HOME} ${CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} + HINTS ${CUDA_HOME} ${CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} PATH_SUFFIXES cuda/include include) endif() if(NOT CUDNN_LIBRARY) find_library(CUDNN_LIBRARY cudnn - HINTS ${CUDA_HOME} ${CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} + HINTS ${CUDA_HOME} ${CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64) endif() diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index 01fc2cbefe2c22..5902861c5e9eb5 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -11,50 +11,96 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) #note: this port must be kept in sync with CUDA port: every time one is upgraded, the other must be too set(CUDNN_VERSION "7.6.0") set(CUDNN_FULL_VERSION "${CUDNN_VERSION}-cuda10.1_0") - -if(VCPKG_TARGET_IS_WINDOWS) - set(CUDNN_DOWNLOAD_LINK "https://anaconda.org/anaconda/cudnn/${CUDNN_VERSION}/download/win-64/cudnn-${CUDNN_FULL_VERSION}.tar.bz2") - set(SHA512_CUDNN "c0218407e7bc2b3c1497f1709dedee345bc619603ec0efa094e392888c0d513d645a1241501f9b406f688defa811578f36b49f456eb533535ecd526702156eea") - set(CUDNN_OS "windows") -elseif(VCPKG_TARGET_IS_LINUX) - set(CUDNN_DOWNLOAD_LINK "https://anaconda.org/anaconda/cudnn/${CUDNN_VERSION}/download/linux-64/cudnn-${CUDNN_FULL_VERSION}.tar.bz2") - set(SHA512_CUDNN "128ccdc0ec24a1133947d7a8eff6cd8edc224134fa5065a11a1a01a99dbaee7d799db1454e0a59e411cf6db244f8c2420c160488a5dd4830addc3578b2011e3d") - set(CUDNN_OS "linux") -endif() - -vcpkg_download_distfile(ARCHIVE - URLS ${CUDNN_DOWNLOAD_LINK} - FILENAME "cudnn-${CUDNN_FULL_VERSION}-${CUDNN_OS}.tar.bz2" - SHA512 ${SHA512_CUDNN} -) - -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - NO_REMOVE_ONE_LEVEL -) - string(REPLACE "." ";" VERSION_LIST ${CUDNN_VERSION}) list(GET VERSION_LIST 0 CUDNN_VERSION_MAJOR) list(GET VERSION_LIST 1 CUDNN_VERSION_MINOR) list(GET VERSION_LIST 2 CUDNN_VERSION_PATCH) -if(VCPKG_TARGET_IS_WINDOWS) - file(INSTALL "${SOURCE_PATH}/Library/include/cudnn.h" DESTINATION ${CURRENT_PACKAGES_DIR}/include) - file(INSTALL "${SOURCE_PATH}/Library/lib/x64/cudnn.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL "${SOURCE_PATH}/Library/bin/cudnn64_${CUDNN_VERSION_MAJOR}.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL "${SOURCE_PATH}/Library/lib/x64/cudnn.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(INSTALL "${SOURCE_PATH}/Library/bin/cudnn64_${CUDNN_VERSION_MAJOR}.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) -elseif(VCPKG_TARGET_IS_LINUX) - file(INSTALL "${SOURCE_PATH}/include/cudnn.h" DESTINATION ${CURRENT_PACKAGES_DIR}/include) - file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION_MAJOR}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION_MAJOR}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +# Try to find CUDNN if it exists; only download if it doesn't exist +find_path(CUDNN_INCLUDE_DIR cudnn.h + HINTS ${CUDA_HOME} ${CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} + PATH_SUFFIXES cuda/include include) +find_library(CUDNN_LIBRARY cudnn + HINTS ${CUDA_HOME} ${CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} + PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64) +if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h") + file(READ ${CUDNN_INCLUDE_DIR}/cudnn.h CUDNN_HEADER_CONTENTS) + if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_version.h") + file(READ "${CUDNN_INCLUDE_DIR}/cudnn_version.h" CUDNN_VERSION_H_CONTENTS) + string(APPEND CUDNN_HEADER_CONTENTS "${CUDNN_VERSION_H_CONTENTS}") + unset(CUDNN_VERSION_H_CONTENTS) + endif() + string(REGEX MATCH "define CUDNN_MAJOR * +([0-9]+)" + _CUDNN_VERSION_MAJOR "${CUDNN_HEADER_CONTENTS}") + string(REGEX REPLACE "define CUDNN_MAJOR * +([0-9]+)" "\\1" + _CUDNN_VERSION_MAJOR "${_CUDNN_VERSION_MAJOR}") + string(REGEX MATCH "define CUDNN_MINOR * +([0-9]+)" + _CUDNN_VERSION_MINOR "${CUDNN_HEADER_CONTENTS}") + string(REGEX REPLACE "define CUDNN_MINOR * +([0-9]+)" "\\1" + _CUDNN_VERSION_MINOR "${_CUDNN_VERSION_MINOR}") + string(REGEX MATCH "define CUDNN_PATCHLEVEL * +([0-9]+)" + _CUDNN_VERSION_PATCH "${CUDNN_HEADER_CONTENTS}") + string(REGEX REPLACE "define CUDNN_PATCHLEVEL * +([0-9]+)" "\\1" + _CUDNN_VERSION_PATCH "${_CUDNN_VERSION_PATCH}") + if(NOT _CUDNN_VERSION_MAJOR) + set(_CUDNN_VERSION "?") + else() + set(_CUDNN_VERSION "${_CUDNN_VERSION_MAJOR}.${_CUDNN_VERSION_MINOR}.${_CUDNN_VERSION_PATCH}") + endif() +endif() + +if (CUDNN_INCLUDE_DIR AND CUDNN_LIBRARY AND _CUDNN_VERSION VERSION_GREATER_EQUAL CUDNN_VERSION) + set(CUDNN_FOUND TRUE) +else() + set(CUDNN_FOUND FALSE) endif() -file(INSTALL "${SOURCE_PATH}/info/LICENSE.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindCUDNN.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +# Download CUDNN if not found +if (CUDNN_FOUND) + message(STATUS "Found CUDNN located on system: (include ${CUDNN_INCLUDE_DIR} lib: ${CUDNN_LIBRARY})") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + message(STATUS "CUDNN not found on system - downloading...") + if(VCPKG_TARGET_IS_WINDOWS) + set(CUDNN_DOWNLOAD_LINK "https://anaconda.org/anaconda/cudnn/${CUDNN_VERSION}/download/win-64/cudnn-${CUDNN_FULL_VERSION}.tar.bz2") + set(SHA512_CUDNN "c0218407e7bc2b3c1497f1709dedee345bc619603ec0efa094e392888c0d513d645a1241501f9b406f688defa811578f36b49f456eb533535ecd526702156eea") + set(CUDNN_OS "windows") + elseif(VCPKG_TARGET_IS_LINUX) + set(CUDNN_DOWNLOAD_LINK "https://anaconda.org/anaconda/cudnn/${CUDNN_VERSION}/download/linux-64/cudnn-${CUDNN_FULL_VERSION}.tar.bz2") + set(SHA512_CUDNN "128ccdc0ec24a1133947d7a8eff6cd8edc224134fa5065a11a1a01a99dbaee7d799db1454e0a59e411cf6db244f8c2420c160488a5dd4830addc3578b2011e3d") + set(CUDNN_OS "linux") + endif() + + vcpkg_download_distfile(ARCHIVE + URLS ${CUDNN_DOWNLOAD_LINK} + FILENAME "cudnn-${CUDNN_FULL_VERSION}-${CUDNN_OS}.tar.bz2" + SHA512 ${SHA512_CUDNN} + ) + + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL + ) + + if(VCPKG_TARGET_IS_WINDOWS) + file(INSTALL "${SOURCE_PATH}/Library/include/cudnn.h" DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(INSTALL "${SOURCE_PATH}/Library/lib/x64/cudnn.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL "${SOURCE_PATH}/Library/bin/cudnn64_${CUDNN_VERSION_MAJOR}.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL "${SOURCE_PATH}/Library/lib/x64/cudnn.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${SOURCE_PATH}/Library/bin/cudnn64_${CUDNN_VERSION_MAJOR}.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + elseif(VCPKG_TARGET_IS_LINUX) + file(INSTALL "${SOURCE_PATH}/include/cudnn.h" DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION_MAJOR}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION_MAJOR}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + endif() + + file(INSTALL "${SOURCE_PATH}/info/LICENSE.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindCUDNN.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +endif() # NOT CUDNN_FOUND From e4be3a94b77f3901e88dffb6fc2f81877f1426b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 23 Nov 2020 15:26:01 -0800 Subject: [PATCH 0152/1694] Add option VCPKG_QMAKE_USE_NMAKE in vcpkg_build_qmake and install_qt (#8524) * add option PREFER_NMAKE to vcpkg_build_qmake and install_qt. * Add /MP to qt5-base/vcpkg_build_qmake. * use VCPKG_QMAKE_USE_NMAKE instead of as function parameter. * Update ports/qt5-base/cmake/install_qt.cmake * Update scripts/cmake/vcpkg_build_qmake.cmake Co-authored-by: Billy Robert O'Neal III --- ports/qt5-base/CONTROL | 18 +++++++++--------- ports/qt5-base/cmake/install_qt.cmake | 16 +++++++++++++--- scripts/cmake/vcpkg_build_qmake.cmake | 13 +++++++++++-- 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 10a7d54290ab3d..34209500bf4408 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,9 +1,9 @@ -Source: qt5-base -Version: 5.15.1 -Port-Version: 1 -Homepage: https://www.qt.io/ -Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, zstd, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) - -Feature: latest -Description: Build latest qt version (5.15.1) instead of LTS (latest and LTS are currently the same) +Source: qt5-base +Version: 5.15.1 +Port-Version: 2 +Homepage: https://www.qt.io/ +Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. +Build-Depends: zlib, zstd, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) + +Feature: latest +Description: Build latest qt version (5.15.1) instead of LTS (latest and LTS are currently the same) diff --git a/ports/qt5-base/cmake/install_qt.cmake b/ports/qt5-base/cmake/install_qt.cmake index 97f2e71a20e920..640a308de50d49 100644 --- a/ports/qt5-base/cmake/install_qt.cmake +++ b/ports/qt5-base/cmake/install_qt.cmake @@ -2,9 +2,19 @@ include(qt_fix_makefile_install) function(install_qt) if(CMAKE_HOST_WIN32) - vcpkg_find_acquire_program(JOM) - set(INVOKE "${JOM}" /J ${VCPKG_CONCURRENCY}) - set(INVOKE_SINGLE "${JOM}" /J 1) + if (VCPKG_QMAKE_USE_NMAKE) + find_program(NMAKE nmake REQUIRED) + set(INVOKE "${NMAKE}") + set(INVOKE_SINGLE "${NMAKE}") + get_filename_component(NMAKE_EXE_PATH ${NMAKE} DIRECTORY) + set(PATH_GLOBAL "$ENV{PATH}") + set(ENV{PATH} "$ENV{PATH};${NMAKE_EXE_PATH}") + set(ENV{CL} "$ENV{CL} /MP${VCPKG_CONCURRENCY}") + else() + vcpkg_find_acquire_program(JOM) + set(INVOKE "${JOM}" /J ${VCPKG_CONCURRENCY}) + set(INVOKE_SINGLE "${JOM}" /J 1) + endif() else() find_program(MAKE make) set(INVOKE "${MAKE}" -j${VCPKG_CONCURRENCY}) diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake index d4c435a0d1d11d..5568c080ce3cef 100644 --- a/scripts/cmake/vcpkg_build_qmake.cmake +++ b/scripts/cmake/vcpkg_build_qmake.cmake @@ -11,8 +11,17 @@ function(vcpkg_build_qmake) cmake_parse_arguments(PARSE_ARGV 0 _csc "SKIP_MAKEFILES" "BUILD_LOGNAME" "TARGETS;RELEASE_TARGETS;DEBUG_TARGETS") if(CMAKE_HOST_WIN32) - vcpkg_find_acquire_program(JOM) - set(INVOKE "${JOM}") + if (VCPKG_QMAKE_USE_NMAKE) + find_program(NMAKE nmake) + set(INVOKE "${NMAKE}") + get_filename_component(NMAKE_EXE_PATH ${NMAKE} DIRECTORY) + set(PATH_GLOBAL "$ENV{PATH}") + set(ENV{PATH} "$ENV{PATH};${NMAKE_EXE_PATH}") + set(ENV{CL} "$ENV{CL} /MP${VCPKG_CONCURRENCY}") + else() + vcpkg_find_acquire_program(JOM) + set(INVOKE "${JOM}") + endif() else() find_program(MAKE make) set(INVOKE "${MAKE}") From ffd7ecfbf7536da9341196ad082ee7068388d28e Mon Sep 17 00:00:00 2001 From: Matioupi Date: Tue, 24 Nov 2020 00:26:38 +0100 Subject: [PATCH 0153/1694] [curl] Fixes pkgconfig file (#14715) * Fix pkgconfig for windows debug build. Re-allow tool feature on non windows platforms * Fix tool feature * Modified debug/release prvate libs according to https://github.com/microsoft/vcpkg/pull/14350#discussion_r520444862 Added vcpkg_fixup_pkgconfig() according to https://github.com/microsoft/vcpkg/pull/14350#discussion_r520435718 * Delete portfile.cmake.orig * Fix pkgconfig * Revert "Fix pkgconfig" This reverts commit cb4da8bcc5e92248c20065f34d5e5d1d88a0e5d4. * Bump port version to 3 * add missing system libs for windows. made case type coherent for ws2_32 * Fix build on x64-linux triplet * Reverted ws2_32 to Ws2_32 as discudssed in https://github.com/microsoft/vcpkg/pull/14350#discussion_r525893479 * More fixes for Linux build with features * Fix for feature c-ares * Formatting * First fix attemps for https://github.com/microsoft/vcpkg/issues/14681 * More fix for https://github.com/microsoft/vcpkg/issues/14681 (Windows only for now) * Add brotli dependcy when brotli feature is enabled * Fixed indentation Co-authored-by: Phoebe Ma --- ports/curl/CONTROL | 3 ++- ports/curl/portfile.cmake | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 26817daefd425d..ad919d564b21da 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,6 +1,6 @@ Source: curl Version: 7.73.0 -Port-Version: 3 +Port-Version: 4 Build-Depends: zlib Homepage: https://github.com/curl/curl Description: A library for transferring data with URLs @@ -51,4 +51,5 @@ Feature: sspi Description: SSPI support Feature: brotli +Build-Depends: brotli Description: brotli support (brotli) \ No newline at end of file diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 419b22baaf58eb..d0d89fd6e06485 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -123,7 +123,14 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/mbedcrypto.lib" "-lmbedcrypto") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/nghttp2.lib" "-lnghttp2") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssh2.lib" "-lssh2") - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/cares.lib" "-lcares") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/cares.lib" "-lcares") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/brotlicommon.lib" "-lbrotlicommon") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/brotlidec.lib" "-lbrotlidec") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib" "-lpthreadVC3d") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " ${CURRENT_INSTALLED_DIR}/lib/pthreadVC3.lib" "") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " -loptimized" "") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " -ldebug" "") + elseif(VCPKG_TARGET_IS_LINUX) vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "-lcurl" "-lcurl-d") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssl.a" "-lssl") @@ -152,6 +159,12 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/nghttp2.lib" "-lnghttp2") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libssh2.lib" "-lssh2") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/cares.lib" "-lcares") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/brotlicommon.lib" "-lbrotlicommon") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/brotlidec.lib" "-lbrotlidec") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/pthreadVC3.lib" "-lpthreadVC3") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " ${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib" "") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " -loptimized" "") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " -ldebug" "") elseif(VCPKG_TARGET_IS_LINUX) #vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "-lcurl" "-lcurl") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libssl.a" "-lssl") From d642d9acd83dcd741f08b25386f5987316897e17 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 24 Nov 2020 01:17:05 +0100 Subject: [PATCH 0154/1694] update to version 3.5.4 (#14691) --- ports/commsdsl/fix-cmake-cmakedir-path.patch | 13 ------------- ports/commsdsl/portfile.cmake | 9 +++------ ports/commsdsl/vcpkg.json | 3 +-- 3 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 ports/commsdsl/fix-cmake-cmakedir-path.patch diff --git a/ports/commsdsl/fix-cmake-cmakedir-path.patch b/ports/commsdsl/fix-cmake-cmakedir-path.patch deleted file mode 100644 index bc4d5fb8822160..00000000000000 --- a/ports/commsdsl/fix-cmake-cmakedir-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fb0bc2f..e94a693 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -45,7 +45,7 @@ while (TRUE) - message (FATAL_ERROR "The comms library found but the directory is not known") - endif () - -- set (CC_CMAKE_DIR ${LibComms_DIR}/lib/LibComms/cmake) -+ set (CC_CMAKE_DIR ${LibComms_DIR}) - break() - endif () - diff --git a/ports/commsdsl/portfile.cmake b/ports/commsdsl/portfile.cmake index 95ec1b4d0ea88f..c785fd80aa8678 100644 --- a/ports/commsdsl/portfile.cmake +++ b/ports/commsdsl/portfile.cmake @@ -3,20 +3,17 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/commsdsl - REF v3.5.3 - SHA512 f9e908f42e11e30aefe07f1b37d65545be2074758f054fb0d519e1a01f0b7060b309d2667459a5a6918a9ad9f535d0c0a0cc2cd0d4a281e78c2c48a6b8ae4a5d + REF v3.5.4 + SHA512 d2bbb5332606d86200645f628507da966b385c2d8f0010e8cb83e0cdb3f3384272021db24ccb9418c69b4bd61a38edc18149cd0f7adbbbbc30168d0a15abef58 HEAD_REF master - PATCHES - "fix-cmake-cmakedir-path.patch" ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DCOMMSDSL_TEST_BUILD_CC_PLUGIN=OFF + -DCOMMSDSL_NO_COMMS_CHAMPION=ON -DCOMMSDSL_NO_TESTS=ON - -DBUILD_TESTING=OFF -DCOMMSDSL_NO_WARN_AS_ERR=ON # remove on next version or on next version of boost ) vcpkg_install_cmake() diff --git a/ports/commsdsl/vcpkg.json b/ports/commsdsl/vcpkg.json index d373944b00b674..9a3830be68ccd3 100644 --- a/ports/commsdsl/vcpkg.json +++ b/ports/commsdsl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "commsdsl", - "version-string": "3.5.3", + "version-string": "3.5.4", "description": "DSL schemas parser and code generator for CommsChampion Ecosystem", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/commsdsl", @@ -9,7 +9,6 @@ "boost-algorithm", "boost-filesystem", "boost-program-options", - "comms", "libxml2" ] } From c893f4f268d5069b010c11c60e015f1fca61a56d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 24 Nov 2020 01:17:36 +0100 Subject: [PATCH 0155/1694] [vcpkg] Output the filepath on hash error. (#14674) * update hash error message to include the path * Update toolsrc/include/vcpkg/base/hash.h Co-authored-by: nicole mazzuca --- toolsrc/include/vcpkg/base/hash.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolsrc/include/vcpkg/base/hash.h b/toolsrc/include/vcpkg/base/hash.h index d62fd392164ab5..0747e6737f3209 100644 --- a/toolsrc/include/vcpkg/base/hash.h +++ b/toolsrc/include/vcpkg/base/hash.h @@ -43,7 +43,8 @@ namespace vcpkg::Hash const auto result = get_file_hash(fs, path, algo, ec); if (ec) { - Checks::exit_with_message(li, "Failure to read file for hashing: %s", ec.message()); + Checks::exit_with_message( + li, "Failure to read file '%s' for hashing: %s", fs::u8string(path), ec.message()); } return result; From 5448c7e4f648a78b1f9f724fbbceddf8b6354310 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Mon, 23 Nov 2020 18:18:51 -0600 Subject: [PATCH 0156/1694] [vcpkg_find_acquire_program] Use OS-included Python 2.7 on macOS (#14662) --- scripts/cmake/vcpkg_find_acquire_program.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 970a41d7d98e3e..1760c3630cbdac 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -182,9 +182,12 @@ function(vcpkg_find_acquire_program VAR) set(HASH 47c1518d1da939e3ba6722c54747778b93a44c525bcb358b253c23b2510374a49a43739c8d0454cedade858f54efa6319763ba33316fdc721305bc457efe4ffb) endif() set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + # macOS includes Python 2.7 built-in as `python` + set(PROGNAME python) + set(BREW_PACKAGE_NAME "python2") else() set(PROGNAME python2) - set(BREW_PACKAGE_NAME "python2") set(APT_PACKAGE_NAME "python") endif() elseif(VAR MATCHES "RUBY") From 7b16cfe90f95839ec47688077dcedf59b7bb6d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 23 Nov 2020 16:20:30 -0800 Subject: [PATCH 0157/1694] [tesseract] Enable dynamic build, format portfile.cmake (#14650) * [tesseract] Enable dynamic build, format portfile.cmake * [tesseract] Remove wrongly deletions * [tesseract] Fix build training tools on dynamic --- ports/tesseract/CONTROL | 2 +- ports/tesseract/fix-training-tools.patch | 40 +++++++++++++++ ports/tesseract/portfile.cmake | 65 ++++++++---------------- 3 files changed, 61 insertions(+), 46 deletions(-) create mode 100644 ports/tesseract/fix-training-tools.patch diff --git a/ports/tesseract/CONTROL b/ports/tesseract/CONTROL index 0524821bf212f3..eb90d70e1017ae 100644 --- a/ports/tesseract/CONTROL +++ b/ports/tesseract/CONTROL @@ -1,6 +1,6 @@ Source: tesseract Version: 4.1.1 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/tesseract-ocr/tesseract Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google. Build-Depends: leptonica diff --git a/ports/tesseract/fix-training-tools.patch b/ports/tesseract/fix-training-tools.patch new file mode 100644 index 00000000000000..fd5729cb8b1e7e --- /dev/null +++ b/ports/tesseract/fix-training-tools.patch @@ -0,0 +1,40 @@ +diff --git a/src/training/CMakeLists.txt b/src/training/CMakeLists.txt +index af291a5..f2e2ceb 100644 +--- a/src/training/CMakeLists.txt ++++ b/src/training/CMakeLists.txt +@@ -63,7 +63,7 @@ endif() + # LIBRARY tessopt + ######################################## + +-add_library (tessopt tessopt.cpp tessopt.h) ++add_library (tessopt STATIC tessopt.cpp tessopt.h) + project_group (tessopt "Training Tools") + + +@@ -81,7 +81,7 @@ set(common_training_src + mastertrainer.cpp + mastertrainer.h + ) +-add_library (common_training ${common_training_src}) ++add_library (common_training STATIC ${common_training_src}) + target_link_libraries (common_training libtesseract tessopt) + project_group (common_training "Training Tools") + +@@ -196,7 +196,7 @@ set(unicharset_training_src + validate_javanese.cpp validate_myanmar.cpp validator.cpp + + ) +-add_library (unicharset_training ${unicharset_training_src}) ++add_library (unicharset_training STATIC ${unicharset_training_src}) + if(UNIX) + list(APPEND ICU_LIBRARIES ${CMAKE_DL_LIBS}) + endif() +@@ -270,7 +270,7 @@ endif() + + find_package(unofficial-cairo CONFIG REQUIRED) + find_package(unofficial-glib CONFIG REQUIRED) +-find_package(Intl CONFIG REQUIRED) ++find_package(Intl REQUIRED) + find_package(Fontconfig REQUIRED) + find_package(Freetype REQUIRED) + if(UNIX OR BUILD_SHARED_LIBS) diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index 925b19afbc65bb..d141625b62a586 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tesseract-ocr/tesseract @@ -8,78 +6,55 @@ vcpkg_from_github( PATCHES fix-tiff-linkage.patch fix-text2image.patch + fix-training-tools.patch ) # The built-in cmake FindICU is better file(REMOVE ${SOURCE_PATH}/cmake/FindICU.cmake) -# Handle Static Library Output -if(VCPKG_LIBRARY_LINKAGE EQUAL "static") - list(APPEND OPTIONS_LIST -DSTATIC=ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + training-tools BUILD_TRAINING_TOOLS +) -# Handle CONTROL -if("training-tools" IN_LIST FEATURES) - list(APPEND OPTIONS_LIST -DBUILD_TRAINING_TOOLS=ON) -else() - list(APPEND OPTIONS_LIST -DBUILD_TRAINING_TOOLS=OFF) -endif() if("cpu-independed" IN_LIST FEATURES) - list(APPEND OPTIONS_LIST -DTARGET_ARCHITECTURE=none) + set(TARGET_ARCHITECTURE none) else() - list(APPEND OPTIONS_LIST -DTARGET_ARCHITECTURE=auto) + set(TARGET_ARCHITECTURE auto) endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS - -DSTATIC=ON + OPTIONS ${FEATURE_OPTIONS} + -DSTATIC=${BUILD_STATIC} -DUSE_SYSTEM_ICU=True -DCMAKE_DISABLE_FIND_PACKAGE_LibArchive=ON -DCMAKE_DISABLE_FIND_PACKAGE_OpenCL=ON -DLeptonica_DIR=YES - ${OPTIONS_LIST} + -DTARGET_ARCHITECTURE=${TARGET_ARCHITECTURE} ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -# Install tool -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/tesseract) -set(EXTENSION) -if(WIN32) - set(EXTENSION ".exe") -endif() +vcpkg_copy_tools(TOOL_NAMES tesseract AUTO_CLEAN) -# copy training tools -set(TRAINING_TOOLS_DIR ${CURRENT_PACKAGES_DIR}/tools/tesseract/training) -if("training_tools" IN_LIST FEATURES) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/ambiguous_words${EXTENSION} DESTINATION ${TRAINING_TOOLS_DIR}) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/classifier_tester${EXTENSION} DESTINATION ${TRAINING_TOOLS_DIR}) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/combine_tessdata${EXTENSION} DESTINATION ${TRAINING_TOOLS_DIR}) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/cntraining${EXTENSION} DESTINATION ${TRAINING_TOOLS_DIR}) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/dawg2wordlist${EXTENSION} DESTINATION ${TRAINING_TOOLS_DIR}) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/mftraining${EXTENSION} DESTINATION ${TRAINING_TOOLS_DIR}) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/shapeclustering${EXTENSION} DESTINATION ${TRAINING_TOOLS_DIR}) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/wordlist2dawg${EXTENSION} DESTINATION ${TRAINING_TOOLS_DIR}) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/combine_lang_model${EXTENSION} DESTINATION ${TRAINING_TOOLS_DIR}) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/lstmeval${EXTENSION} DESTINATION ${TRAINING_TOOLS_DIR}) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/lstmtraining${EXTENSION} DESTINATION ${TRAINING_TOOLS_DIR}) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/set_unicharset_properties${EXTENSION} DESTINATION ${TRAINING_TOOLS_DIR}) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/unicharset_extractor${EXTENSION} DESTINATION ${TRAINING_TOOLS_DIR}) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/text2image${EXTENSION} DESTINATION ${TRAINING_TOOLS_DIR}) +if("training-tools" IN_LIST FEATURES) + list(APPEND TRAINING_TOOLS + ambiguous_words classifier_tester combine_tessdata + cntraining dawg2wordlist mftraining shapeclustering + wordlist2dawg combine_lang_model lstmeval lstmtraining + set_unicharset_properties unicharset_extractor text2image + ) + vcpkg_copy_tools(TOOL_NAMES ${TRAINING_TOOLS} AUTO_CLEAN) endif() -file(COPY ${CURRENT_PACKAGES_DIR}/bin/tesseract${EXTENSION} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/tesseract) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/tesseract) - vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 97c09a85e306b93b0db143380cf9cf130e9bee58 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 25 Nov 2020 08:37:03 +0100 Subject: [PATCH 0158/1694] use boost-PO only for needed features --- ports/mapnik/portfile.cmake | 4 ++-- ports/mapnik/vcpkg.json | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index e7a3e3a8444076..d6b7564a652b9a 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 45fd654898a02587ed6279161fa267b73cbe37eb - SHA512 ec404845b6d0fa20d003ef116aeb8b9fadbf4f0f7ea36d09a34e787c2afe8ce0db1ed420617a5925d55eeb49d1742c442aa03b45ff65acef8f935b83bf97a185 + REF f027667daa51c93a3aeb40a6fa47219ce039b0c2 + SHA512 c43f8ba767a7c0a5ea0a56fcdeb85dfda845c8284dd7fd2941e17553691a69ab6244cf0cd22dbac2a3823d3573dbd7fdc53c11996a5a5f53afa7e53a50cf51fc HEAD_REF master ) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 9e3b7bd740c80a..8a1d99af78d78f 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -22,7 +22,6 @@ "platform": "!windows" }, "boost-msm", - "boost-program-options", "boost-property-tree", { "name": "boost-regex", From 66d2d4e68c5db90557b65b14d61aa5ecffd1db73 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 25 Nov 2020 08:37:03 +0100 Subject: [PATCH 0159/1694] use boost-PO only for needed features --- ports/mapnik/portfile.cmake | 4 ++-- ports/mapnik/vcpkg.json | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index e7a3e3a8444076..d6b7564a652b9a 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 45fd654898a02587ed6279161fa267b73cbe37eb - SHA512 ec404845b6d0fa20d003ef116aeb8b9fadbf4f0f7ea36d09a34e787c2afe8ce0db1ed420617a5925d55eeb49d1742c442aa03b45ff65acef8f935b83bf97a185 + REF f027667daa51c93a3aeb40a6fa47219ce039b0c2 + SHA512 c43f8ba767a7c0a5ea0a56fcdeb85dfda845c8284dd7fd2941e17553691a69ab6244cf0cd22dbac2a3823d3573dbd7fdc53c11996a5a5f53afa7e53a50cf51fc HEAD_REF master ) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 9e3b7bd740c80a..8a1d99af78d78f 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -22,7 +22,6 @@ "platform": "!windows" }, "boost-msm", - "boost-program-options", "boost-property-tree", { "name": "boost-regex", From 57bdf1712f589552e2608f4bfc9060b5555df7a2 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 25 Nov 2020 13:24:43 +0100 Subject: [PATCH 0160/1694] set the cmake targets install dir --- ports/mapnik/portfile.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index d6b7564a652b9a..fe32383c4727cf 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF f027667daa51c93a3aeb40a6fa47219ce039b0c2 - SHA512 c43f8ba767a7c0a5ea0a56fcdeb85dfda845c8284dd7fd2941e17553691a69ab6244cf0cd22dbac2a3823d3573dbd7fdc53c11996a5a5f53afa7e53a50cf51fc + REF 410393fefabf2c9d25f6ed3f823868139cbd7467 + SHA512 3452a113946339aae3818d10d4d202ea16a24c4690feadad2cf6c6bba5c5806eb563cc6ab7f2ef4d4fba1c6029a9c15376fd23de8e359f2d2577ac724626a317 HEAD_REF master ) @@ -50,6 +50,7 @@ vcpkg_configure_cmake( -DUSE_EXTERNAL_MAPBOX_POLYLABEL=ON -DUSE_EXTERNAL_MAPBOX_PROTOZERO=ON -DUSE_EXTERNAL_MAPBOX_VARIANT=ON + -DINSTALL_CMAKE_DIR=share/mapnik/cmake ) vcpkg_install_cmake() @@ -96,7 +97,7 @@ if("utility-svg2png" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES svg2png AUTO_CLEAN) endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mapnik) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/mapnik/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From dc32bb8f2db1df7f0938526244a955f882d64e2d Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 25 Nov 2020 13:24:43 +0100 Subject: [PATCH 0161/1694] set the cmake targets install dir --- ports/mapnik/portfile.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index d6b7564a652b9a..fe32383c4727cf 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF f027667daa51c93a3aeb40a6fa47219ce039b0c2 - SHA512 c43f8ba767a7c0a5ea0a56fcdeb85dfda845c8284dd7fd2941e17553691a69ab6244cf0cd22dbac2a3823d3573dbd7fdc53c11996a5a5f53afa7e53a50cf51fc + REF 410393fefabf2c9d25f6ed3f823868139cbd7467 + SHA512 3452a113946339aae3818d10d4d202ea16a24c4690feadad2cf6c6bba5c5806eb563cc6ab7f2ef4d4fba1c6029a9c15376fd23de8e359f2d2577ac724626a317 HEAD_REF master ) @@ -50,6 +50,7 @@ vcpkg_configure_cmake( -DUSE_EXTERNAL_MAPBOX_POLYLABEL=ON -DUSE_EXTERNAL_MAPBOX_PROTOZERO=ON -DUSE_EXTERNAL_MAPBOX_VARIANT=ON + -DINSTALL_CMAKE_DIR=share/mapnik/cmake ) vcpkg_install_cmake() @@ -96,7 +97,7 @@ if("utility-svg2png" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES svg2png AUTO_CLEAN) endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mapnik) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/mapnik/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 9c810e556175e5af3c5c6ba6c6daf137adc6934c Mon Sep 17 00:00:00 2001 From: Joachim Gehweiler <44170764+jgehw@users.noreply.github.com> Date: Wed, 25 Nov 2020 20:18:44 +0100 Subject: [PATCH 0162/1694] [tensorflow] Add C port (#14392) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix build issues occurring from default bazel config being used because customized bazel config is stored in wrong directory * [tensorflow-cc] Update CONTROL and ci.baseline.txt * fix also applies to windows static build * fix debug and static builds as well as library naming for non-linux - add patch to fix debug builds - add patch to fix exports for static linking - really build debug (instead of cloning release) - override bazel build options for debug (work around bazel bug) - bazel doesn't support static libraries: work around by building dynamic library and constructing static linkage commands from build log - Windows .pdb file can't be >4GB even on x64: work around using reduced debug information - Windows doesn't support .lib files >4GB even on x64, so split into multiple libs - vcpkg requires equal amount of libs for debug and release: work around using handcrafted empty dummy libs - fix naming of libs (.dll on Windows and .dylib on macOS) * upgrade tensorflow from v1.14 to v2.3 - adapt patch files to tensorflow code changes - update bazel from v0.25.2 to v3.1 - on Windows use python installed on the host instead of embedded python obtained via vcpkg because embedded python lacks pip, which we need to obtain numpy - on Windows add MSYS2 to the PATH so that bazel tools can access MSYS2 GIT - add support for custom CA certificates when using HTTPS_PROXY * fix execute process macro The existing implementation totally screwed up commands if the command's arguments contained semicolons (this is the case, e.g., in the FindPython modules of the cmake distribution). * extend overriden execute_process to more than one COMMAND as there actually are use cases for this * added another patch required for tensorflow v2.3, fixed path and working directory * Revert "incorporate changes from microsoft:master" * Revert "Revert "incorporate changes from microsoft:master"" * final fixes for static build + improving out messages * enabling linux and osx in CI to see if it works now * simplified code, fixed version numbers, fixed generated include cmake file * fix failing postbuild check on handcrafted empty dummy library by spreading the last real libraries contents over the required number of libraries * remove dead code commit by mistake again * improvements from code review * cleaner fix for debug code * find pip3 in PATH (PYTHON3_DIR apparently not valid for pip3) * fix error in python helper script * fix wrong libname in postbuild script * fix python detection + switch to python on msys2 (instead of embedded python) for Windows as we need numpy * fix order of arguments * fix command (it may contain spaces such as C:\Program Files\...) * revert last commit (root cause for CI failures is something different: there are line breaks in path) * fix regex comparision (value needs to be escaped as it may contains regex special characters such as brackets, eg C:/Program Files (x86)/...) * fix linebreaks in generated file * fix CRT linkage (macOS doesn't support static CRT linkage; it's set to dynamic even static target triplets for macOS and linux) * refactor implemenation to avoid as much code duplication as possible -- algorithmically identical * fix version numbers in helper scripts * enable work-around for Windows until bazel fix is available * install missing python3-pip on linux * fix linux build by patching * apply timeout feature now available via merged master branch * correct linux build patch * improve debug build patches (no functional difference because LOG(FATAL, ...) macro internally anyway calls abort(), which the compiler doesn't detect in debug mode... * improve linux patch * temporarily add debug to inspect what's going on on macOS CI * remove temporary debug code and fix static linking scripts for linux and macOS * fix regex escaping * fix ambiguous match while grepping for the framework link command * extend fix of ambiguous match while grepping for the framework link command * fix what merge of master broke * fix more what got broken by merging master (all packages and their dependencies are now maintained manually instead of using pacman...) * remove "unofficial" from filename * added switch do distinct classic and manifest mode when generating config.cmake file * create symlinks for libraries without version number * fix linux postbuild script * temporarily disable code making problems * add note for linking on Linux and macOS * forget to add README file in previous commit * add file forgotton in macro fixing patch * fix python library path * fix macOS static link command * update linkage instructions in README * Update ports/tensorflow-cc/CONTROL * Update ports/tensorflow-cc/portfile.cmake * Update scripts/ci.baseline.txt * use vcpkg_execute_required_process * pass C_FLAGS and CXX_FLAGS to bazel * fix INTERFACE_INCLUDE_DIRECTORIES * fix optional c/cxx arguments * also add linker opts * update README * merge static libs into one to support force_load (cannot force_load both due to duplicate symbols) * update README * quote python path (it might contain spaces that don't get escaped inside outer quotes of bash command) * fix python path also for static build * add arm(64) as currently unsupported arch * bazel 3.7 is available -> remove workaround * update README, remove necessary c-ares from deps * update msys package * add uwp specific options, and minor general improvements * fix string replace * fix control file and windows path separator * revert backslashes-fix -- the root cause was missing .exe extension * upgrade to tf 2.3.1 * fix hard-coded version * remove uwp work-in-progress code so that PR can be merged * add [tensorflow] C API port * missing in previous commit * fix include file * remove unnecessary suffix * update README and print out usage info in portfile * Update ports/tensorflow-cc/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/tensorflow/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * follow-up to code review * fix suffix parameter * fix quoting * extend linux patch * another try to fix quoting of possibly empty string parameter * different approach to fix empty string arguments * update list of headers for tensorflow 2.3.1 (was still 2.3.0) * Update ports/tensorflow/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * move common stuff into tensorflow-common as discussed in review * Apply suggestions from code review Co-authored-by: nicole mazzuca Co-authored-by: Gehweiler Co-authored-by: wangli28 Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Joachim Gehweiler Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: nicole mazzuca --- ports/tensorflow-cc/CONTROL | 4 +- ports/tensorflow-cc/portfile.cmake | 451 +----------------- .../tensorflow-cc-config-windows-dll.cmake.in | 56 --- .../tensorflow-cc-config-windows-lib.cmake.in | 19 - ports/tensorflow-common/CONTROL | 6 + .../README-linux | 0 .../README-macos | 0 .../README-windows | 0 .../change-macros-for-static-lib.patch | 0 .../convert_lib_params_linux.py | 5 +- .../convert_lib_params_windows.py | 9 +- .../fix-build-error.patch | 0 .../fix-dbg-build-errors.patch | 0 .../fix-linux-build.patch | 13 + .../fix-more-build-errors.patch | 0 .../generate_static_link_cmd_linux.py | 3 +- .../generate_static_link_cmd_macos.py | 5 +- .../generate_static_link_cmd_windows.py | 5 +- ports/tensorflow-common/portfile.cmake | 1 + .../tensorflow-common/tensorflow-common.cmake | 439 +++++++++++++++++ .../tensorflow-config-shared.cmake.in} | 49 +- .../tensorflow-config-static.cmake.in} | 27 +- .../tensorflow-config-windows-dll.cmake.in | 55 +++ .../tensorflow-config-windows-lib.cmake.in | 18 + ports/tensorflow/CONTROL | 6 + ports/tensorflow/portfile.cmake | 19 + 26 files changed, 620 insertions(+), 570 deletions(-) delete mode 100644 ports/tensorflow-cc/tensorflow-cc-config-windows-dll.cmake.in delete mode 100644 ports/tensorflow-cc/tensorflow-cc-config-windows-lib.cmake.in create mode 100644 ports/tensorflow-common/CONTROL rename ports/{tensorflow-cc => tensorflow-common}/README-linux (100%) rename ports/{tensorflow-cc => tensorflow-common}/README-macos (100%) rename ports/{tensorflow-cc => tensorflow-common}/README-windows (100%) rename ports/{tensorflow-cc => tensorflow-common}/change-macros-for-static-lib.patch (100%) rename ports/{tensorflow-cc => tensorflow-common}/convert_lib_params_linux.py (77%) rename ports/{tensorflow-cc => tensorflow-common}/convert_lib_params_windows.py (72%) rename ports/{tensorflow-cc => tensorflow-common}/fix-build-error.patch (100%) rename ports/{tensorflow-cc => tensorflow-common}/fix-dbg-build-errors.patch (100%) rename ports/{tensorflow-cc => tensorflow-common}/fix-linux-build.patch (75%) rename ports/{tensorflow-cc => tensorflow-common}/fix-more-build-errors.patch (100%) rename ports/{tensorflow-cc => tensorflow-common}/generate_static_link_cmd_linux.py (80%) rename ports/{tensorflow-cc => tensorflow-common}/generate_static_link_cmd_macos.py (87%) rename ports/{tensorflow-cc => tensorflow-common}/generate_static_link_cmd_windows.py (86%) create mode 100644 ports/tensorflow-common/portfile.cmake create mode 100644 ports/tensorflow-common/tensorflow-common.cmake rename ports/{tensorflow-cc/tensorflow-cc-config-shared.cmake.in => tensorflow-common/tensorflow-config-shared.cmake.in} (50%) rename ports/{tensorflow-cc/tensorflow-cc-config-static.cmake.in => tensorflow-common/tensorflow-config-static.cmake.in} (53%) create mode 100644 ports/tensorflow-common/tensorflow-config-windows-dll.cmake.in create mode 100644 ports/tensorflow-common/tensorflow-config-windows-lib.cmake.in create mode 100644 ports/tensorflow/CONTROL create mode 100644 ports/tensorflow/portfile.cmake diff --git a/ports/tensorflow-cc/CONTROL b/ports/tensorflow-cc/CONTROL index d422260e33bb20..392ce10136d039 100644 --- a/ports/tensorflow-cc/CONTROL +++ b/ports/tensorflow-cc/CONTROL @@ -1,4 +1,6 @@ Source: tensorflow-cc Version: 2.3.1 -Description: Library for computation using data flow graphs for scalable machine learning +Port-Version: 1 +Homepage: https://github.com/tensorflow/tensorflow +Description: Library for computation using data flow graphs for scalable machine learning (C++ API version) Supports: !(x86|arm|uwp) diff --git a/ports/tensorflow-cc/portfile.cmake b/ports/tensorflow-cc/portfile.cmake index 35dbb5d1b0d3ac..783fe8b70e459b 100644 --- a/ports/tensorflow-cc/portfile.cmake +++ b/ports/tensorflow-cc/portfile.cmake @@ -1,445 +1,10 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "UWP") -set(TF_VERSION 2.3.1) -set(TF_VERSION_SHORT 2.3) - -vcpkg_find_acquire_program(BAZEL) -get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY) -vcpkg_add_to_path(PREPEND ${BAZEL_DIR}) -set(ENV{BAZEL_BIN_PATH} "${BAZEL}") - -function(tensorflow_try_remove_recurse_wait PATH_TO_REMOVE) - file(REMOVE_RECURSE ${PATH_TO_REMOVE}) - if(EXISTS "${PATH_TO_REMOVE}") - vcpkg_execute_required_process(COMMAND ${CMAKE_COMMAND} -E sleep 5 WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-sleep-${TARGET_TRIPLET}) - file(REMOVE_RECURSE ${PATH_TO_REMOVE}) - endif() -endfunction() - -vcpkg_find_acquire_program(GIT) -get_filename_component(GIT_DIR "${GIT}" DIRECTORY) -vcpkg_add_to_path(PREPEND ${GIT_DIR}) - -if(CMAKE_HOST_WIN32) - vcpkg_acquire_msys(MSYS_ROOT PACKAGES bash unzip patch diffutils libintl gzip coreutils mingw-w64-x86_64-python-numpy) - vcpkg_add_to_path(${MSYS_ROOT}/usr/bin) - vcpkg_add_to_path(${MSYS_ROOT}/mingw64/bin) - set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) - - set(ENV{BAZEL_SH} ${MSYS_ROOT}/usr/bin/bash.exe) - set(ENV{BAZEL_VC} $ENV{VCInstallDir}) - set(ENV{BAZEL_VC_FULL_VERSION} $ENV{VCToolsVersion}) - - set(PYTHON3 "${MSYS_ROOT}/mingw64/bin/python3.exe") - vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import site; print(site.getsitepackages()[0])" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-pypath-${TARGET_TRIPLET} OUTPUT_VARIABLE PYTHON_LIB_PATH) -else() - vcpkg_find_acquire_program(PYTHON3) - get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) - vcpkg_add_to_path(PREPEND ${PYTHON3_DIR}) - - vcpkg_execute_required_process(COMMAND ${PYTHON3} -m pip install --user -U numpy WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-pip-${TARGET_TRIPLET}) - vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import site; print(site.getusersitepackages())" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-pypath-${TARGET_TRIPLET} OUTPUT_VARIABLE PYTHON_LIB_PATH) -endif() -set(ENV{PYTHON_BIN_PATH} "${PYTHON3}") -set(ENV{PYTHON_LIB_PATH} "${PYTHON_LIB_PATH}") - -# check if numpy can be loaded -vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import numpy" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-numpy-${TARGET_TRIPLET}) - -# tensorflow has long file names, which will not work on windows -set(ENV{TEST_TMPDIR} ${BUILDTREES_DIR}/.bzl) - -set(ENV{USE_DEFAULT_PYTHON_LIB_PATH} 1) -set(ENV{TF_NEED_KAFKA} 0) -set(ENV{TF_NEED_OPENCL_SYCL} 0) -set(ENV{TF_NEED_AWS} 0) -set(ENV{TF_NEED_GCP} 0) -set(ENV{TF_NEED_HDFS} 0) -set(ENV{TF_NEED_S3} 0) -set(ENV{TF_ENABLE_XLA} 0) -set(ENV{TF_NEED_GDR} 0) -set(ENV{TF_NEED_VERBS} 0) -set(ENV{TF_NEED_OPENCL} 0) -set(ENV{TF_NEED_MPI} 0) -set(ENV{TF_NEED_TENSORRT} 0) -set(ENV{TF_NEED_NGRAPH} 0) -set(ENV{TF_NEED_IGNITE} 0) -set(ENV{TF_NEED_ROCM} 0) -set(ENV{TF_SET_ANDROID_WORKSPACE} 0) -set(ENV{TF_DOWNLOAD_CLANG} 0) -set(ENV{TF_NCCL_VERSION} ${TF_VERSION_SHORT}) -set(ENV{NCCL_INSTALL_PATH} "") -set(ENV{CC_OPT_FLAGS} "/arch:AVX") -set(ENV{TF_NEED_CUDA} 0) -set(ENV{TF_CONFIGURE_IOS} 0) - -if(VCPKG_TARGET_IS_WINDOWS) - set(BAZEL_LIB_NAME tensorflow_cc.dll) - set(PLATFORM_SUFFIX windows) - set(STATIC_LINK_CMD static_link.bat) -elseif(VCPKG_TARGET_IS_OSX) - set(BAZEL_LIB_NAME libtensorflow_cc.dylib) - set(PLATFORM_SUFFIX macos) - set(STATIC_LINK_CMD sh static_link.sh) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(TF_LIB_NAME "libtensorflow_cc.dylib") - set(TF_LIB_NAME_SHORT "libtensorflow_cc.2.dylib") - set(TF_LIB_NAME_FULL "libtensorflow_cc.${TF_VERSION}.dylib") - set(TF_FRAMEWORK_NAME "libtensorflow_framework.dylib") - set(TF_FRAMEWORK_NAME_SHORT "libtensorflow_framework.2.dylib") - set(TF_FRAMEWORK_NAME_FULL "libtensorflow_framework.${TF_VERSION}.dylib") - else() - set(TF_LIB_NAME "libtensorflow_cc.a") - set(TF_LIB_NAME_SHORT "libtensorflow_cc.2.a") - set(TF_LIB_NAME_FULL "libtensorflow_cc.${TF_VERSION}.a") - endif() -else() - set(BAZEL_LIB_NAME libtensorflow_cc.so) - set(PLATFORM_SUFFIX linux) - set(STATIC_LINK_CMD sh static_link.sh) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(TF_LIB_NAME "libtensorflow_cc.so") - set(TF_LIB_NAME_SHORT "libtensorflow_cc.so.2") - set(TF_LIB_NAME_FULL "libtensorflow_cc.so.${TF_VERSION}") - set(TF_FRAMEWORK_NAME "libtensorflow_framework.so") - set(TF_FRAMEWORK_NAME_SHORT "libtensorflow_framework.so.2") - set(TF_FRAMEWORK_NAME_FULL "libtensorflow_framework.so.${TF_VERSION}") - else() - set(TF_LIB_NAME "libtensorflow_cc.a") - set(TF_LIB_NAME_SHORT "libtensorflow_cc.a.2") - set(TF_LIB_NAME_FULL "libtensorflow_cc.a.${TF_VERSION}") - endif() -endif() - -foreach(BUILD_TYPE dbg rel) - # prefer repeated source extraction here for each build type over extracting once above the loop and copying because users reported issues with copying symlinks - set(STATIC_ONLY_PATCHES) - set(LINUX_ONLY_PATCHES) - if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(STATIC_ONLY_PATCHES change-macros-for-static-lib.patch) # there is no static build option - change macros via patch and link library manually at the end - endif() - if(VCPKG_TARGET_IS_LINUX) - set(LINUX_ONLY_PATCHES fix-linux-build.patch) - endif() - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO tensorflow/tensorflow - REF "v${TF_VERSION}" - SHA512 e497ef4564f50abf9f918be4522cf702f4cf945cb1ebf83af1386ac4ddc7373b3ba70c7f803f8ca06faf2c6b5396e60b1e0e9b97bfbd667e733b08b6e6d70ef0 - HEAD_REF master - PATCHES - fix-build-error.patch # Fix namespace error - fix-dbg-build-errors.patch # Fix no return statement - fix-more-build-errors.patch # Fix no return statement - ${STATIC_ONLY_PATCHES} - ${LINUX_ONLY_PATCHES} - ) - - message(STATUS "Configuring TensorFlow (${BUILD_TYPE})") - tensorflow_try_remove_recurse_wait(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}) - file(RENAME ${SOURCE_PATH} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}) - set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}") - - vcpkg_execute_required_process( - COMMAND ${PYTHON3} ${SOURCE_PATH}/configure.py --workspace "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}" - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} - LOGNAME config-${TARGET_TRIPLET}-${BUILD_TYPE} - ) - - if(DEFINED ENV{BAZEL_CUSTOM_CACERTS}) - file(APPEND ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/.bazelrc "startup --host_jvm_args=-Djavax.net.ssl.trustStore='$ENV{BAZEL_CUSTOM_CACERTS}'\n") - message(STATUS "Using custom CA certificate store at: $ENV{BAZEL_CUSTOM_CACERTS}") - if(DEFINED ENV{BAZEL_CUSTOM_CACERTS_PASSWORD}) - file(APPEND ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/.bazelrc "startup --host_jvm_args=-Djavax.net.ssl.trustStorePassword='$ENV{BAZEL_CUSTOM_CACERTS_PASSWORD}'\n") - message(STATUS "Using supplied custom CA certificate store password.") - endif() - else() - if(DEFINED ENV{HTTPS_PROXY}) - message(STATUS "You are using HTTPS_PROXY. In case you encounter bazel certificate errors, you might want to set: BAZEL_CUSTOM_CACERTS=/path/to/trust.store (and optionally BAZEL_CUSTOM_CACERTS_PASSWORD), and to enable vcpkg to actually use it: VCPKG_KEEP_ENV_VARS=BAZEL_CUSTOM_CACERTS;BAZEL_CUSTOM_CACERTS_PASSWORD") - if(CMAKE_HOST_WIN32) - message(STATUS "(For BAZEL_CUSTOM_CACERTS please use forward slashes instead of backslashes on Windows systems.") - endif() - endif() - endif() - - message(STATUS "Warning: Building TensorFlow can take an hour or more.") - set(COPTS) - set(CXXOPTS) - set(LINKOPTS) - if(VCPKG_TARGET_IS_WINDOWS) - set(PLATFORM_COMMAND WINDOWS_COMMAND) - else() - set(PLATFORM_COMMAND UNIX_COMMAND) - endif() - if(BUILD_TYPE STREQUAL dbg) - if(VCPKG_TARGET_IS_WINDOWS) - set(BUILD_OPTS "--compilation_mode=dbg --features=fastbuild") # link with /DEBUG:FASTLINK instead of /DEBUG:FULL to avoid .pdb >4GB error - else() - set(BUILD_OPTS "--compilation_mode=dbg") - endif() - - separate_arguments(VCPKG_C_FLAGS ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS}) - separate_arguments(VCPKG_C_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS_DEBUG}) - foreach(OPT IN LISTS VCPKG_C_FLAGS VCPKG_C_FLAGS_DEBUG) - list(APPEND COPTS "--copt='${OPT}'") - endforeach() - separate_arguments(VCPKG_CXX_FLAGS ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS}) - separate_arguments(VCPKG_CXX_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS_DEBUG}) - foreach(OPT IN LISTS VCPKG_CXX_FLAGS VCPKG_CXX_FLAGS_DEBUG) - list(APPEND CXXOPTS "--cxxopt='${OPT}'") - endforeach() - separate_arguments(VCPKG_LINKER_FLAGS ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS}) - separate_arguments(VCPKG_LINKER_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS_DEBUG}) - foreach(OPT IN LISTS VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_DEBUG) - list(APPEND LINKOPTS "--linkopt='${OPT}'") - endforeach() - else() - set(BUILD_OPTS "--compilation_mode=opt") - - separate_arguments(VCPKG_C_FLAGS ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS}) - separate_arguments(VCPKG_C_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS_RELEASE}) - foreach(OPT IN LISTS VCPKG_C_FLAGS VCPKG_C_FLAGS_RELEASE) - list(APPEND COPTS "--copt='${OPT}'") - endforeach() - separate_arguments(VCPKG_CXX_FLAGS ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS}) - separate_arguments(VCPKG_CXX_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS_RELEASE}) - foreach(OPT IN LISTS VCPKG_CXX_FLAGS VCPKG_CXX_FLAGS_RELEASE) - list(APPEND CXXOPTS "--cxxopt='${OPT}'") - endforeach() - separate_arguments(VCPKG_LINKER_FLAGS ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS}) - separate_arguments(VCPKG_LINKER_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS_RELEASE}) - foreach(OPT IN LISTS VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_RELEASE) - list(APPEND LINKOPTS "--linkopt='${OPT}'") - endforeach() - endif() - - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - if(VCPKG_TARGET_IS_WINDOWS) - list(JOIN COPTS " " COPTS) - list(JOIN CXXOPTS " " CXXOPTS) - list(JOIN LINKOPTS " " LINKOPTS) - vcpkg_execute_build_process( - COMMAND ${BASH} --noprofile --norc -c "'${BAZEL}' build --verbose_failures ${BUILD_OPTS} ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path='${PYTHON3}' --define=no_tensorflow_py_deps=true ///tensorflow:tensorflow_cc.dll ///tensorflow:install_headers" - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} - LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} - ) - else() - vcpkg_execute_build_process( - COMMAND ${BAZEL} build --verbose_failures ${BUILD_OPTS} --python_path=${PYTHON3} ${COPTS} ${CXXOPTS} ${LINKOPTS} --define=no_tensorflow_py_deps=true //tensorflow:${BAZEL_LIB_NAME} //tensorflow:install_headers - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} - LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} - ) - endif() - else() - if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_CRT_LINKAGE STREQUAL static) - if(BUILD_TYPE STREQUAL dbg) - list(APPEND COPTS "--copt=-MTd") - else() - list(APPEND COPTS "--copt=-MT") - endif() - endif() - list(JOIN COPTS " " COPTS) - list(JOIN CXXOPTS " " CXXOPTS) - list(JOIN LINKOPTS " " LINKOPTS) - vcpkg_execute_build_process( - COMMAND ${BASH} --noprofile --norc -c "${BAZEL} build -s --verbose_failures ${BUILD_OPTS} --features=fully_static_link ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path='${PYTHON3}' --define=no_tensorflow_py_deps=true ///tensorflow:tensorflow_cc.dll ///tensorflow:install_headers" - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} - LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} - ) - else() - vcpkg_execute_build_process( - COMMAND ${BAZEL} build -s --verbose_failures ${BUILD_OPTS} ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path=${PYTHON3} --define=no_tensorflow_py_deps=true //tensorflow:${BAZEL_LIB_NAME} //tensorflow:install_headers - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} - LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} - ) - endif() - if(NOT VCPKG_TARGET_IS_OSX) - if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_execute_build_process( - COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_${PLATFORM_SUFFIX}.py" - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow - LOGNAME postbuild1-${TARGET_TRIPLET}-${BUILD_TYPE} - ) - else() - vcpkg_execute_build_process( - COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_${PLATFORM_SUFFIX}.py" "${TF_VERSION}" - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow - LOGNAME postbuild1-${TARGET_TRIPLET}-${BUILD_TYPE} - ) - endif() - endif() - vcpkg_execute_build_process( - COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_${PLATFORM_SUFFIX}.py" "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-${BUILD_TYPE}-err.log" # for some reason stdout of bazel ends up in stderr - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-${TARGET_TRIPLET}-${BUILD_TYPE} - LOGNAME postbuild2-${TARGET_TRIPLET}-${BUILD_TYPE} - ) - vcpkg_execute_build_process( - COMMAND ${STATIC_LINK_CMD} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-${TARGET_TRIPLET}-${BUILD_TYPE} - LOGNAME postbuild3-${TARGET_TRIPLET}-${BUILD_TYPE} - ) - endif() - - if(BUILD_TYPE STREQUAL "dbg") - set(DIR_PREFIX "/debug") - else() - set(DIR_PREFIX "") - endif() - - if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow_cc.dll DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/bin) - # rename before copy because after copy the file might be locked by anti-malware scanners for some time so that renaming fails - file(RENAME ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow_cc.dll.if.lib ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow_cc.lib) - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow_cc.lib DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib) - if(BUILD_TYPE STREQUAL dbg) - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow_cc.pdb DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/bin) - message(STATUS "Warning: debug information tensorflow_cc.pdb will be of limited use because only a reduced set could be produced due to the 4GB internal PDB file limit even on x64.") - endif() - else() - if(BUILD_TYPE STREQUAL dbg) - set(library_parts_variable TF_LIB_PARTS_DEBUG) - else() - set(library_parts_variable TF_LIB_PARTS_RELEASE) - endif() - set(${library_parts_variable}) - - # library might have been split because no more than 4GB are supported even on x64 Windows - foreach(PART_NO RANGE 1 100) - set(source "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow_cc-part${PART_NO}.lib") - if(EXISTS "${source}") - file(COPY "${source}" DESTINATION "${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib") - list(APPEND ${library_parts_variable} "tensorflow_cc-part${PART_NO}.lib") - else() - break() - endif() - endforeach() - endif() - else() - file(COPY - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/${TF_LIB_NAME_FULL} - DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib - ) - - # Note: these use relative links - file(CREATE_LINK ${TF_LIB_NAME_FULL} - ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib/${TF_LIB_NAME_SHORT} - SYMBOLIC - ) - file(CREATE_LINK ${TF_LIB_NAME_FULL} - ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib/${TF_LIB_NAME} - SYMBOLIC - ) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(COPY - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/${TF_FRAMEWORK_NAME_FULL} - DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib - ) - file(CREATE_LINK - ${TF_FRAMEWORK_NAME_FULL} - ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib/${TF_FRAMEWORK_NAME_SHORT} - SYMBOLIC - ) - file(CREATE_LINK - ${TF_FRAMEWORK_NAME_FULL} - ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib/${TF_FRAMEWORK_NAME} - SYMBOLIC - ) - endif() - endif() -endforeach() - -file(COPY - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/ - DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow-external -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(STATUS "Warning: Static TensorFlow build contains several external dependencies that may cause linking conflicts (for example, one cannot use both openssl and TensorFlow in the same project, since TensorFlow contains boringssl).") - if(VCPKG_TARGET_IS_WINDOWS) - message(STATUS "Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to tell the linker to include the whole library, i.e., link using options '/WHOLEARCHIVE:tensorflow_cc-part1.lib /WHOLEARCHIVE:tensorflow_cc-part2.lib ...'") - else() - message(STATUS "Note: There is no separate libtensorflow_framework.a as it got merged into libtensorflow_cc.a to avoid linking conflicts.") - if(VCPKG_TARGET_IS_OSX) - message(STATUS "Note: Beside TensorFlow itself, you'll need to also pass its dependancies to the linker, for example '-ltensorflow_cc -framework CoreFoundation'") - message(STATUS "Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to tell the linker to include the whole library: '-Wl,-force_load,path/to/libtensorflow_cc.a -framework CoreFoundation -framework Security [rest of linker arguments]'") - else() - message(STATUS "Note: Beside TensorFlow itself, you'll need to also pass its dependancies to the linker, for example '-ltensorflow_cc -lm -ldl -lpthread'") - message(STATUS "Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to tell the linker to include the whole library: '-Wl,--whole-archive -ltensorflow_cc -Wl,--no-whole-archive [rest of linker arguments]'") - endif() - endif() - - configure_file( - ${CMAKE_CURRENT_LIST_DIR}/README-${PLATFORM_SUFFIX} - ${CURRENT_PACKAGES_DIR}/share/tensorflow-cc/README - COPYONLY) -endif() - -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tensorflow-cc) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/tensorflow-cc/LICENSE ${CURRENT_PACKAGES_DIR}/share/tensorflow-cc/copyright) - - -# NOTE: if this port ever supports VCPKG_BUILD_TYPE, use that to set these. -set(TENSORFLOW_HAS_RELEASE ON) -set(TENSORFLOW_HAS_DEBUG ON) - -if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - configure_file( - ${CMAKE_CURRENT_LIST_DIR}/tensorflow-cc-config-windows-dll.cmake.in - ${CURRENT_PACKAGES_DIR}/share/tensorflow-cc/tensorflow-cc-config.cmake - @ONLY) - else() - configure_file( - ${CMAKE_CURRENT_LIST_DIR}/tensorflow-cc-config-windows-lib.cmake.in - ${CURRENT_PACKAGES_DIR}/share/tensorflow-cc/tensorflow-cc-config.cmake - @ONLY) - - set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) - - set(prefix [[${TENSORFLOW_INSTALL_PREFIX}]]) - - set(libs_to_link) - foreach(lib IN LISTS TF_LIB_PARTS_RELEASE) - list(APPEND libs_to_link "$<$:${prefix}/lib/${lib}>") - endforeach() - foreach(lib IN LISTS TF_LIB_PARTS_DEBUG) - list(APPEND libs_to_link "$<$:${prefix}/debug/lib/${lib}>") - endforeach() - if(TENSORFLOW_HAS_RELEASE) - set(TF_LIB_PARTS_DEFAULT ${TF_LIB_PARTS_RELEASE}) - set(prefix_DEFAULT "${prefix}") - elseif(TENSORFLOW_HAS_DEBUG) - set(TF_LIB_PARTS_DEFAULT ${TF_LIB_PARTS_DEBUG}) - set(prefix_DEFAULT "${prefix}/debug") - endif() - - foreach(lib IN LISTS TF_LIB_PARTS_DEFAULT) - list(APPEND libs_to_link - "$<$,$>>:${prefix}/lib/${lib}>") - endforeach() - - string(REPLACE ";" "\n\t\t" libs_to_link "${libs_to_link}") - file(APPEND ${CURRENT_PACKAGES_DIR}/share/tensorflow-cc/tensorflow-cc-config.cmake " -target_link_libraries(tensorflow_cc::tensorflow_cc - INTERFACE - ${libs_to_link} -)" - ) - endif() -else() - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - configure_file( - ${CMAKE_CURRENT_LIST_DIR}/tensorflow-cc-config-shared.cmake.in - ${CURRENT_PACKAGES_DIR}/share/tensorflow-cc/tensorflow-cc-config.cmake - @ONLY) - else() - configure_file( - ${CMAKE_CURRENT_LIST_DIR}/tensorflow-cc-config-static.cmake.in - ${CURRENT_PACKAGES_DIR}/share/tensorflow-cc/tensorflow-cc-config.cmake - @ONLY) - endif() -endif() - -message(STATUS "You may want to delete ${CURRENT_BUILDTREES_DIR} and ${BUILDTREES_DIR}/.bzl to free diskspace.") +set(TF_LIB_SUFFIX "_cc") +set(TF_PORT_SUFFIX "-cc") +set(TF_INCLUDE_DIRS "${INSTALL_PREFIX}/${TARGET_TRIPLET}/include/tensorflow-external + ${INSTALL_PREFIX}/${TARGET_TRIPLET}/include/tensorflow-external/src") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../tensorflow-common") +include(tensorflow-common) + +file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow-external) diff --git a/ports/tensorflow-cc/tensorflow-cc-config-windows-dll.cmake.in b/ports/tensorflow-cc/tensorflow-cc-config-windows-dll.cmake.in deleted file mode 100644 index ed67e5ad407fae..00000000000000 --- a/ports/tensorflow-cc/tensorflow-cc-config-windows-dll.cmake.in +++ /dev/null @@ -1,56 +0,0 @@ -if(TARGET tensorflow_cc::tensorflow_cc) - return() -endif() - -add_library(tensorflow_cc::tensorflow_cc SHARED IMPORTED GLOBAL) - -# Compute the installation prefix from this tensorflow-cc-config.cmake file location. -# CMAKE_CURRENT_LIST_DIR = [vcpkg_installed_dir]/[target_triplet]/share/tensorflow-cc -get_filename_component(TENSORFLOW_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) -# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet]/share -get_filename_component(TENSORFLOW_INSTALL_PREFIX "${TENSORFLOW_INSTALL_PREFIX}" DIRECTORY) -# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet] - -target_include_directories(tensorflow_cc::tensorflow_cc - INTERFACE - "${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external" - "${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external/src" -) - -if(@TENSORFLOW_HAS_RELEASE@) - set_target_properties(tensorflow_cc::tensorflow_cc - PROPERTIES - IMPORTED_LOCATION "${TENSORFLOW_INSTALL_PREFIX}/bin/tensorflow_cc.dll" - IMPORTED_IMPLIB "${TENSORFLOW_INSTALL_PREFIX}/lib/tensorflow_cc.lib" - ) - - set_property(TARGET tensorflow_cc::tensorflow_cc - APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE - ) - set_target_properties(tensorflow_cc::tensorflow_cc - PROPERTIES - IMPORTED_LOCATION_RELEASE "${TENSORFLOW_INSTALL_PREFIX}/bin/tensorflow_cc.dll" - IMPORTED_IMPLIB_RELEASE "${TENSORFLOW_INSTALL_PREFIX}/lib/tensorflow_cc.lib" - ) -endif() - -if(@TENSORFLOW_HAS_DEBUG@) - if(NOT @TENSORFLOW_HAS_RELEASE@) - set_target_properties(tensorflow_cc::tensorflow_cc - PROPERTIES - IMPORTED_LOCATION "${TENSORFLOW_INSTALL_PREFIX}/debug/bin/tensorflow_cc.dll" - IMPORTED_IMPLIB "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/tensorflow_cc.lib" - ) - endif() - - set_property(TARGET tensorflow_cc::tensorflow_cc - APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG - ) - set_target_properties(tensorflow_cc::tensorflow_cc - PROPERTIES - IMPORTED_LOCATION_DEBUG "${TENSORFLOW_INSTALL_PREFIX}/debug/bin/tensorflow_cc.dll" - IMPORTED_IMPLIB_DEBUG "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/tensorflow_cc.lib" - ) -endif() - -set(tensorflow_cc_FOUND TRUE) diff --git a/ports/tensorflow-cc/tensorflow-cc-config-windows-lib.cmake.in b/ports/tensorflow-cc/tensorflow-cc-config-windows-lib.cmake.in deleted file mode 100644 index 0eab84c7f025a9..00000000000000 --- a/ports/tensorflow-cc/tensorflow-cc-config-windows-lib.cmake.in +++ /dev/null @@ -1,19 +0,0 @@ -if(TARGET tensorflow_cc::tensorflow_cc) - return() -endif() - -set(tensorflow_cc_FOUND TRUE) - -# Compute the installation prefix from this tensorflow-cc-config.cmake file location. -# CMAKE_CURRENT_LIST_DIR = [vcpkg_installed_dir]/[target_triplet]/share/tensorflow-cc -get_filename_component(TENSORFLOW_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) -# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet]/share -get_filename_component(TENSORFLOW_INSTALL_PREFIX "${TENSORFLOW_INSTALL_PREFIX}" DIRECTORY) -# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet] - -add_library(tensorflow_cc::tensorflow_cc INTERFACE IMPORTED GLOBAL) -target_include_directories(tensorflow_cc::tensorflow_cc - INTERFACE - "${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external" - "${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external/src" -) diff --git a/ports/tensorflow-common/CONTROL b/ports/tensorflow-common/CONTROL new file mode 100644 index 00000000000000..a5f0364afd17eb --- /dev/null +++ b/ports/tensorflow-common/CONTROL @@ -0,0 +1,6 @@ +Source: tensorflow-common +Version: 2.3.1 +Port-Version: 0 +Homepage: https://github.com/tensorflow/tensorflow +Description: This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own. +Supports: false diff --git a/ports/tensorflow-cc/README-linux b/ports/tensorflow-common/README-linux similarity index 100% rename from ports/tensorflow-cc/README-linux rename to ports/tensorflow-common/README-linux diff --git a/ports/tensorflow-cc/README-macos b/ports/tensorflow-common/README-macos similarity index 100% rename from ports/tensorflow-cc/README-macos rename to ports/tensorflow-common/README-macos diff --git a/ports/tensorflow-cc/README-windows b/ports/tensorflow-common/README-windows similarity index 100% rename from ports/tensorflow-cc/README-windows rename to ports/tensorflow-common/README-windows diff --git a/ports/tensorflow-cc/change-macros-for-static-lib.patch b/ports/tensorflow-common/change-macros-for-static-lib.patch similarity index 100% rename from ports/tensorflow-cc/change-macros-for-static-lib.patch rename to ports/tensorflow-common/change-macros-for-static-lib.patch diff --git a/ports/tensorflow-cc/convert_lib_params_linux.py b/ports/tensorflow-common/convert_lib_params_linux.py similarity index 77% rename from ports/tensorflow-cc/convert_lib_params_linux.py rename to ports/tensorflow-common/convert_lib_params_linux.py index ba2c352701c36f..b24d45d634f3aa 100644 --- a/ports/tensorflow-cc/convert_lib_params_linux.py +++ b/ports/tensorflow-common/convert_lib_params_linux.py @@ -1,8 +1,9 @@ import sys version = sys.argv[1] +lib_suffix = "" if len(sys.argv) < 3 else sys.argv[2] -with open(f"libtensorflow_cc.a.{version}-2.params", "w") as f_out: +with open(f"libtensorflow{lib_suffix}.a.{version}-2.params", "w") as f_out: parts = [] with open(f"libtensorflow_framework.so.{version}-2.params", "r") as f_in: skip_next = False @@ -16,7 +17,7 @@ f_out.write(line) parts.append(line) parts = set(parts) - with open(f"libtensorflow_cc.so.{version}-2.params", "r") as f_in: + with open(f"libtensorflow{lib_suffix}.so.{version}-2.params", "r") as f_in: skip_next = False for line in f_in: if skip_next: diff --git a/ports/tensorflow-cc/convert_lib_params_windows.py b/ports/tensorflow-common/convert_lib_params_windows.py similarity index 72% rename from ports/tensorflow-cc/convert_lib_params_windows.py rename to ports/tensorflow-common/convert_lib_params_windows.py index 5fc2fdd68363cb..e150b4e5be525a 100644 --- a/ports/tensorflow-cc/convert_lib_params_windows.py +++ b/ports/tensorflow-common/convert_lib_params_windows.py @@ -1,11 +1,13 @@ import os import sys +lib_suffix = "" if len(sys.argv) < 2 else sys.argv[1] + file_no = 1 -with open("tensorflow_cc.dll-2.params", "r") as f_in: +with open(f"tensorflow{lib_suffix}.dll-2.params", "r") as f_in: lib_name = None acc_size = 0 - f_out = open("tensorflow_cc.lib-2.params-part1", "w") + f_out = open(f"tensorflow{lib_suffix}.lib-2.params-part1", "w") for line in f_in: if line.startswith("/OUT:"): lib_name = line @@ -18,10 +20,9 @@ # we need to split the library if it is >4GB, because it's not supported even on x64 Windows f_out.close() file_no += 1 - f_out = open(f"tensorflow_cc.lib-2.params-part{file_no}", "w") + f_out = open(f"tensorflow{lib_suffix}.lib-2.params-part{file_no}", "w") acc_size = 0 f_out.write(lib_name.replace(".dll", f"-part{file_no}.lib")) acc_size += size f_out.write(line) f_out.close() - diff --git a/ports/tensorflow-cc/fix-build-error.patch b/ports/tensorflow-common/fix-build-error.patch similarity index 100% rename from ports/tensorflow-cc/fix-build-error.patch rename to ports/tensorflow-common/fix-build-error.patch diff --git a/ports/tensorflow-cc/fix-dbg-build-errors.patch b/ports/tensorflow-common/fix-dbg-build-errors.patch similarity index 100% rename from ports/tensorflow-cc/fix-dbg-build-errors.patch rename to ports/tensorflow-common/fix-dbg-build-errors.patch diff --git a/ports/tensorflow-cc/fix-linux-build.patch b/ports/tensorflow-common/fix-linux-build.patch similarity index 75% rename from ports/tensorflow-cc/fix-linux-build.patch rename to ports/tensorflow-common/fix-linux-build.patch index 81a6a3be8c63fb..224f28fe339a9e 100644 --- a/ports/tensorflow-cc/fix-linux-build.patch +++ b/ports/tensorflow-common/fix-linux-build.patch @@ -62,3 +62,16 @@ diff --git a/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc b/ // ==== Snapshot Implementation ==== /* The current snapshot on-disk layout is as follows: + +diff --git a/tensorflow/core/kernels/data/experimental/data_service_dataset_op.cc b/tensorflow/core/kernels/data/experimental/data_service_dataset_op.cc +--- a/tensorflow/core/kernels/data/experimental/data_service_dataset_op.cc ++++ b/tensorflow/core/kernels/data/experimental/data_service_dataset_op.cc +@@ -52,6 +52,8 @@ + /* static */ constexpr const char* const + DataServiceDatasetOp::kMaxOutstandingRequests; + /* static */ constexpr const char* const ++ DataServiceDatasetOp::kTaskRefreshIntervalHintMs; ++/* static */ constexpr const char* const + DataServiceDatasetOp::kIterationCounter; + /* static */ constexpr const char* const DataServiceDatasetOp::kOutputTypes; + /* static */ constexpr const char* const DataServiceDatasetOp::kOutputShapes; diff --git a/ports/tensorflow-cc/fix-more-build-errors.patch b/ports/tensorflow-common/fix-more-build-errors.patch similarity index 100% rename from ports/tensorflow-cc/fix-more-build-errors.patch rename to ports/tensorflow-common/fix-more-build-errors.patch diff --git a/ports/tensorflow-cc/generate_static_link_cmd_linux.py b/ports/tensorflow-common/generate_static_link_cmd_linux.py similarity index 80% rename from ports/tensorflow-cc/generate_static_link_cmd_linux.py rename to ports/tensorflow-common/generate_static_link_cmd_linux.py index 3b7c04f49c8747..34c8db13400919 100644 --- a/ports/tensorflow-cc/generate_static_link_cmd_linux.py +++ b/ports/tensorflow-common/generate_static_link_cmd_linux.py @@ -1,10 +1,11 @@ import re import sys +lib_suffix = "" if len(sys.argv) < 3 else sys.argv[2] with open(sys.argv[1], "r") as f_in: with open("static_link.sh", "w") as f_out: p_cd = re.compile("^\\((cd .*) && \\\\$") - p_linker = re.compile("^\\s*(.+)gcc.+(@bazel-out\\S+libtensorflow_cc\\.so\\.\\d\\.\\d\\.\\d-2\\.params).*") + p_linker = re.compile(fr"^\s*(.+)gcc.+(@bazel-out\S+libtensorflow{lib_suffix}\.so\.\d\.\d\.\d-2\.params).*") f_out.write("#!/bin/bash\n# note: ar/binutils version 2.27 required to support output files > 4GB\n") env = [] for line in f_in: diff --git a/ports/tensorflow-cc/generate_static_link_cmd_macos.py b/ports/tensorflow-common/generate_static_link_cmd_macos.py similarity index 87% rename from ports/tensorflow-cc/generate_static_link_cmd_macos.py rename to ports/tensorflow-common/generate_static_link_cmd_macos.py index f1dfbbc466fcc7..bb8f6faa21f43a 100644 --- a/ports/tensorflow-cc/generate_static_link_cmd_macos.py +++ b/ports/tensorflow-common/generate_static_link_cmd_macos.py @@ -1,10 +1,11 @@ import re import sys +lib_suffix = "" if len(sys.argv) < 3 else sys.argv[2] with open(sys.argv[1], "r") as f_in: with open("static_link.sh", "w") as f_out: p_cd = re.compile("^\\((cd .*) && \\\\$") - p_linker1 = re.compile("^.*cc_wrapper.sh.+-shared.+-o (bazel-out\\S+libtensorflow_cc\\.\\d\\.\\d\\.\\d\\.dylib)") + p_linker1 = re.compile(fr"^.*cc_wrapper.sh.+-shared.+-o (bazel-out\S+libtensorflow{lib_suffix}\.\d\.\d\.\d\.dylib)") p_linker2 = re.compile("^.*cc_wrapper.sh.+-shared.+-o (bazel-out\\S+libtensorflow_framework\\.\\d\\.\\d\\.\\d\\.dylib)") f_out.write("#!/bin/bash\n# note: ar/binutils version 2.27 required to support output files > 4GB\n") env = [] @@ -39,7 +40,7 @@ tmp = [t[16:] for t in tokens if t.startswith("-Wl,-force_load,")] old = set(parts) parts += [t for t in tmp if t not in old] - line = f"libtool -static -o {m2.group(1).replace('_framework', '_cc').replace('.dylib', '.a')} {' '.join(parts)}\n" + line = f"libtool -static -o {m2.group(1).replace('_framework', lib_suffix).replace('.dylib', '.a')} {' '.join(parts)}\n" f_out.write(line) break else: diff --git a/ports/tensorflow-cc/generate_static_link_cmd_windows.py b/ports/tensorflow-common/generate_static_link_cmd_windows.py similarity index 86% rename from ports/tensorflow-cc/generate_static_link_cmd_windows.py rename to ports/tensorflow-common/generate_static_link_cmd_windows.py index 363b3ad884f7f5..780334ad98ab83 100644 --- a/ports/tensorflow-cc/generate_static_link_cmd_windows.py +++ b/ports/tensorflow-common/generate_static_link_cmd_windows.py @@ -2,10 +2,11 @@ import re import sys +lib_suffix = "" if len(sys.argv) < 3 else sys.argv[2] with open(sys.argv[1], "r") as f_in: with open("static_link.bat", "w") as f_out: p_setenv = re.compile("^\s*(SET .+=.*)$") - p_linker = re.compile(".+link\\.exe.+tensorflow_cc\\.dll-2\\.params.*") + p_linker = re.compile(fr".+link\.exe.+tensorflow{lib_suffix}\.dll-2\.params.*") env = [] for line in f_in: if line.startswith("cd"): @@ -28,7 +29,7 @@ t = t[:-len("link.exe")] + "lib.exe\"" elif t == "/DLL" or t.lower()[1:].startswith("defaultlib:") or t.lower()[1:].startswith("ignore") or t.startswith("/OPT:") or t.startswith("/DEF:") or t.startswith("/DEBUG:") or t.startswith("/INCREMENTAL:"): continue - elif t[0] == '@' and t.endswith("tensorflow_cc.dll-2.params"): + elif t[0] == '@' and t.endswith(f"tensorflow{lib_suffix}.dll-2.params"): t = t[:-len("dll-2.params")] + "lib-2.params-part1" params_file = t[1:-len("-part1")] line += t + " " diff --git a/ports/tensorflow-common/portfile.cmake b/ports/tensorflow-common/portfile.cmake new file mode 100644 index 00000000000000..4d51544d829d29 --- /dev/null +++ b/ports/tensorflow-common/portfile.cmake @@ -0,0 +1 @@ +message(FATAL_ERROR "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.") diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake new file mode 100644 index 00000000000000..1f9a7203c59f20 --- /dev/null +++ b/ports/tensorflow-common/tensorflow-common.cmake @@ -0,0 +1,439 @@ +set(TF_VERSION 2.3.1) +set(TF_VERSION_SHORT 2.3) + +vcpkg_find_acquire_program(BAZEL) +get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY) +vcpkg_add_to_path(PREPEND ${BAZEL_DIR}) +set(ENV{BAZEL_BIN_PATH} "${BAZEL}") + +function(tensorflow_try_remove_recurse_wait PATH_TO_REMOVE) + file(REMOVE_RECURSE ${PATH_TO_REMOVE}) + if(EXISTS "${PATH_TO_REMOVE}") + vcpkg_execute_required_process(COMMAND ${CMAKE_COMMAND} -E sleep 5 WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-sleep-${TARGET_TRIPLET}) + file(REMOVE_RECURSE ${PATH_TO_REMOVE}) + endif() +endfunction() + +vcpkg_find_acquire_program(GIT) +get_filename_component(GIT_DIR "${GIT}" DIRECTORY) +vcpkg_add_to_path(PREPEND ${GIT_DIR}) + +if(CMAKE_HOST_WIN32) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES bash unzip patch diffutils libintl gzip coreutils mingw-w64-x86_64-python-numpy) + vcpkg_add_to_path(${MSYS_ROOT}/usr/bin) + vcpkg_add_to_path(${MSYS_ROOT}/mingw64/bin) + set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + + set(ENV{BAZEL_SH} ${MSYS_ROOT}/usr/bin/bash.exe) + set(ENV{BAZEL_VC} $ENV{VCInstallDir}) + set(ENV{BAZEL_VC_FULL_VERSION} $ENV{VCToolsVersion}) + + set(PYTHON3 "${MSYS_ROOT}/mingw64/bin/python3.exe") + vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import site; print(site.getsitepackages()[0])" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-pypath-${TARGET_TRIPLET} OUTPUT_VARIABLE PYTHON_LIB_PATH) +else() + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path(PREPEND ${PYTHON3_DIR}) + + vcpkg_execute_required_process(COMMAND ${PYTHON3} -m pip install --user -U numpy WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-pip-${TARGET_TRIPLET}) + vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import site; print(site.getusersitepackages())" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-pypath-${TARGET_TRIPLET} OUTPUT_VARIABLE PYTHON_LIB_PATH) +endif() +set(ENV{PYTHON_BIN_PATH} "${PYTHON3}") +set(ENV{PYTHON_LIB_PATH} "${PYTHON_LIB_PATH}") + +# check if numpy can be loaded +vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import numpy" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-numpy-${TARGET_TRIPLET}) + +# tensorflow has long file names, which will not work on windows +set(ENV{TEST_TMPDIR} ${BUILDTREES_DIR}/.bzl) + +set(ENV{USE_DEFAULT_PYTHON_LIB_PATH} 1) +set(ENV{TF_NEED_KAFKA} 0) +set(ENV{TF_NEED_OPENCL_SYCL} 0) +set(ENV{TF_NEED_AWS} 0) +set(ENV{TF_NEED_GCP} 0) +set(ENV{TF_NEED_HDFS} 0) +set(ENV{TF_NEED_S3} 0) +set(ENV{TF_ENABLE_XLA} 0) +set(ENV{TF_NEED_GDR} 0) +set(ENV{TF_NEED_VERBS} 0) +set(ENV{TF_NEED_OPENCL} 0) +set(ENV{TF_NEED_MPI} 0) +set(ENV{TF_NEED_TENSORRT} 0) +set(ENV{TF_NEED_NGRAPH} 0) +set(ENV{TF_NEED_IGNITE} 0) +set(ENV{TF_NEED_ROCM} 0) +set(ENV{TF_SET_ANDROID_WORKSPACE} 0) +set(ENV{TF_DOWNLOAD_CLANG} 0) +set(ENV{TF_NCCL_VERSION} ${TF_VERSION_SHORT}) +set(ENV{NCCL_INSTALL_PATH} "") +set(ENV{CC_OPT_FLAGS} "/arch:AVX") +set(ENV{TF_NEED_CUDA} 0) +set(ENV{TF_CONFIGURE_IOS} 0) + +if(VCPKG_TARGET_IS_WINDOWS) + set(BAZEL_LIB_NAME tensorflow${TF_LIB_SUFFIX}.dll) + set(PLATFORM_SUFFIX windows) + set(STATIC_LINK_CMD static_link.bat) +elseif(VCPKG_TARGET_IS_OSX) + set(BAZEL_LIB_NAME libtensorflow${TF_LIB_SUFFIX}.dylib) + set(PLATFORM_SUFFIX macos) + set(STATIC_LINK_CMD sh static_link.sh) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(TF_LIB_NAME "libtensorflow${TF_LIB_SUFFIX}.dylib") + set(TF_LIB_NAME_SHORT "libtensorflow${TF_LIB_SUFFIX}.2.dylib") + set(TF_LIB_NAME_FULL "libtensorflow${TF_LIB_SUFFIX}.${TF_VERSION}.dylib") + set(TF_FRAMEWORK_NAME "libtensorflow_framework.dylib") + set(TF_FRAMEWORK_NAME_SHORT "libtensorflow_framework.2.dylib") + set(TF_FRAMEWORK_NAME_FULL "libtensorflow_framework.${TF_VERSION}.dylib") + else() + set(TF_LIB_NAME "libtensorflow${TF_LIB_SUFFIX}.a") + set(TF_LIB_NAME_SHORT "libtensorflow${TF_LIB_SUFFIX}.2.a") + set(TF_LIB_NAME_FULL "libtensorflow${TF_LIB_SUFFIX}.${TF_VERSION}.a") + endif() +else() + set(BAZEL_LIB_NAME libtensorflow${TF_LIB_SUFFIX}.so) + set(PLATFORM_SUFFIX linux) + set(STATIC_LINK_CMD sh static_link.sh) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(TF_LIB_NAME "libtensorflow${TF_LIB_SUFFIX}.so") + set(TF_LIB_NAME_SHORT "libtensorflow${TF_LIB_SUFFIX}.so.2") + set(TF_LIB_NAME_FULL "libtensorflow${TF_LIB_SUFFIX}.so.${TF_VERSION}") + set(TF_FRAMEWORK_NAME "libtensorflow_framework.so") + set(TF_FRAMEWORK_NAME_SHORT "libtensorflow_framework.so.2") + set(TF_FRAMEWORK_NAME_FULL "libtensorflow_framework.so.${TF_VERSION}") + else() + set(TF_LIB_NAME "libtensorflow${TF_LIB_SUFFIX}.a") + set(TF_LIB_NAME_SHORT "libtensorflow${TF_LIB_SUFFIX}.a.2") + set(TF_LIB_NAME_FULL "libtensorflow${TF_LIB_SUFFIX}.a.${TF_VERSION}") + endif() +endif() + +foreach(BUILD_TYPE dbg rel) + # prefer repeated source extraction here for each build type over extracting once above the loop and copying because users reported issues with copying symlinks + set(STATIC_ONLY_PATCHES) + set(LINUX_ONLY_PATCHES) + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(STATIC_ONLY_PATCHES ../tensorflow-common/change-macros-for-static-lib.patch) # there is no static build option - change macros via patch and link library manually at the end + endif() + if(VCPKG_TARGET_IS_LINUX) + set(LINUX_ONLY_PATCHES ../tensorflow-common/fix-linux-build.patch) + endif() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tensorflow/tensorflow + REF "v${TF_VERSION}" + SHA512 e497ef4564f50abf9f918be4522cf702f4cf945cb1ebf83af1386ac4ddc7373b3ba70c7f803f8ca06faf2c6b5396e60b1e0e9b97bfbd667e733b08b6e6d70ef0 + HEAD_REF master + PATCHES + ../tensorflow-common/fix-build-error.patch # Fix namespace error + ../tensorflow-common/fix-dbg-build-errors.patch # Fix no return statement + ../tensorflow-common/fix-more-build-errors.patch # Fix no return statement + ${STATIC_ONLY_PATCHES} + ${LINUX_ONLY_PATCHES} + ) + + message(STATUS "Configuring TensorFlow (${BUILD_TYPE})") + tensorflow_try_remove_recurse_wait(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}) + file(RENAME ${SOURCE_PATH} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}) + set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}") + + vcpkg_execute_required_process( + COMMAND ${PYTHON3} ${SOURCE_PATH}/configure.py --workspace "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} + LOGNAME config-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + + if(DEFINED ENV{BAZEL_CUSTOM_CACERTS}) + file(APPEND ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/.bazelrc "startup --host_jvm_args=-Djavax.net.ssl.trustStore='$ENV{BAZEL_CUSTOM_CACERTS}'\n") + message(STATUS "Using custom CA certificate store at: $ENV{BAZEL_CUSTOM_CACERTS}") + if(DEFINED ENV{BAZEL_CUSTOM_CACERTS_PASSWORD}) + file(APPEND ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/.bazelrc "startup --host_jvm_args=-Djavax.net.ssl.trustStorePassword='$ENV{BAZEL_CUSTOM_CACERTS_PASSWORD}'\n") + message(STATUS "Using supplied custom CA certificate store password.") + endif() + else() + if(DEFINED ENV{HTTPS_PROXY}) + message(STATUS "You are using HTTPS_PROXY. In case you encounter bazel certificate errors, you might want to set: BAZEL_CUSTOM_CACERTS=/path/to/trust.store (and optionally BAZEL_CUSTOM_CACERTS_PASSWORD), and to enable vcpkg to actually use it: VCPKG_KEEP_ENV_VARS=BAZEL_CUSTOM_CACERTS;BAZEL_CUSTOM_CACERTS_PASSWORD") + if(CMAKE_HOST_WIN32) + message(STATUS "(For BAZEL_CUSTOM_CACERTS please use forward slashes instead of backslashes on Windows systems.") + endif() + endif() + endif() + + message(STATUS "Warning: Building TensorFlow can take an hour or more.") + set(COPTS) + set(CXXOPTS) + set(LINKOPTS) + if(VCPKG_TARGET_IS_WINDOWS) + set(PLATFORM_COMMAND WINDOWS_COMMAND) + else() + set(PLATFORM_COMMAND UNIX_COMMAND) + endif() + if(BUILD_TYPE STREQUAL dbg) + if(VCPKG_TARGET_IS_WINDOWS) + set(BUILD_OPTS "--compilation_mode=dbg --features=fastbuild") # link with /DEBUG:FASTLINK instead of /DEBUG:FULL to avoid .pdb >4GB error + else() + set(BUILD_OPTS "--compilation_mode=dbg") + endif() + + separate_arguments(VCPKG_C_FLAGS ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS}) + separate_arguments(VCPKG_C_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS_DEBUG}) + foreach(OPT IN LISTS VCPKG_C_FLAGS VCPKG_C_FLAGS_DEBUG) + list(APPEND COPTS "--copt='${OPT}'") + endforeach() + separate_arguments(VCPKG_CXX_FLAGS ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS}) + separate_arguments(VCPKG_CXX_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS_DEBUG}) + foreach(OPT IN LISTS VCPKG_CXX_FLAGS VCPKG_CXX_FLAGS_DEBUG) + list(APPEND CXXOPTS "--cxxopt='${OPT}'") + endforeach() + separate_arguments(VCPKG_LINKER_FLAGS ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS}) + separate_arguments(VCPKG_LINKER_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS_DEBUG}) + foreach(OPT IN LISTS VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_DEBUG) + list(APPEND LINKOPTS "--linkopt='${OPT}'") + endforeach() + else() + set(BUILD_OPTS "--compilation_mode=opt") + + separate_arguments(VCPKG_C_FLAGS ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS}) + separate_arguments(VCPKG_C_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS_RELEASE}) + foreach(OPT IN LISTS VCPKG_C_FLAGS VCPKG_C_FLAGS_RELEASE) + list(APPEND COPTS "--copt='${OPT}'") + endforeach() + separate_arguments(VCPKG_CXX_FLAGS ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS}) + separate_arguments(VCPKG_CXX_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS_RELEASE}) + foreach(OPT IN LISTS VCPKG_CXX_FLAGS VCPKG_CXX_FLAGS_RELEASE) + list(APPEND CXXOPTS "--cxxopt='${OPT}'") + endforeach() + separate_arguments(VCPKG_LINKER_FLAGS ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS}) + separate_arguments(VCPKG_LINKER_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS_RELEASE}) + foreach(OPT IN LISTS VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_RELEASE) + list(APPEND LINKOPTS "--linkopt='${OPT}'") + endforeach() + endif() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(VCPKG_TARGET_IS_WINDOWS) + list(JOIN COPTS " " COPTS) + list(JOIN CXXOPTS " " CXXOPTS) + list(JOIN LINKOPTS " " LINKOPTS) + vcpkg_execute_build_process( + COMMAND ${BASH} --noprofile --norc -c "'${BAZEL}' build --verbose_failures ${BUILD_OPTS} ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path='${PYTHON3}' --define=no_tensorflow_py_deps=true ///tensorflow:${BAZEL_LIB_NAME} ///tensorflow:install_headers" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} + LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + else() + vcpkg_execute_build_process( + COMMAND ${BAZEL} build --verbose_failures ${BUILD_OPTS} --python_path=${PYTHON3} ${COPTS} ${CXXOPTS} ${LINKOPTS} --define=no_tensorflow_py_deps=true //tensorflow:${BAZEL_LIB_NAME} //tensorflow:install_headers + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} + LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + endif() + else() + if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_CRT_LINKAGE STREQUAL static) + if(BUILD_TYPE STREQUAL dbg) + list(APPEND COPTS "--copt=-MTd") + else() + list(APPEND COPTS "--copt=-MT") + endif() + endif() + list(JOIN COPTS " " COPTS) + list(JOIN CXXOPTS " " CXXOPTS) + list(JOIN LINKOPTS " " LINKOPTS) + vcpkg_execute_build_process( + COMMAND ${BASH} --noprofile --norc -c "${BAZEL} build -s --verbose_failures ${BUILD_OPTS} --features=fully_static_link ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path='${PYTHON3}' --define=no_tensorflow_py_deps=true ///tensorflow:${BAZEL_LIB_NAME} ///tensorflow:install_headers" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} + LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + else() + vcpkg_execute_build_process( + COMMAND ${BAZEL} build -s --verbose_failures ${BUILD_OPTS} ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path=${PYTHON3} --define=no_tensorflow_py_deps=true //tensorflow:${BAZEL_LIB_NAME} //tensorflow:install_headers + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} + LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + endif() + if(NOT VCPKG_TARGET_IS_OSX) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_execute_build_process( + COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_${PLATFORM_SUFFIX}.py" ${TF_LIB_SUFFIX} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow + LOGNAME postbuild1-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + else() + vcpkg_execute_build_process( + COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_${PLATFORM_SUFFIX}.py" ${TF_VERSION} ${TF_LIB_SUFFIX} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow + LOGNAME postbuild1-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + endif() + endif() + # for some reason stdout of bazel ends up in stderr, so use err log file in the following command + vcpkg_execute_build_process( + COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_${PLATFORM_SUFFIX}.py" "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-${BUILD_TYPE}-err.log" ${TF_LIB_SUFFIX} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-${TARGET_TRIPLET}-${BUILD_TYPE} + LOGNAME postbuild2-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + vcpkg_execute_build_process( + COMMAND ${STATIC_LINK_CMD} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-${TARGET_TRIPLET}-${BUILD_TYPE} + LOGNAME postbuild3-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + endif() + + if(BUILD_TYPE STREQUAL "dbg") + set(DIR_PREFIX "/debug") + else() + set(DIR_PREFIX "") + endif() + + if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow${TF_LIB_SUFFIX}.dll DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/bin) + # rename before copy because after copy the file might be locked by anti-malware scanners for some time so that renaming fails + file(RENAME ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow${TF_LIB_SUFFIX}.dll.if.lib ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow${TF_LIB_SUFFIX}.lib) + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow${TF_LIB_SUFFIX}.lib DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib) + if(BUILD_TYPE STREQUAL dbg) + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow${TF_LIB_SUFFIX}.pdb DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/bin) + message(STATUS "Warning: debug information tensorflow${TF_LIB_SUFFIX}.pdb will be of limited use because only a reduced set could be produced due to the 4GB internal PDB file limit even on x64.") + endif() + else() + if(BUILD_TYPE STREQUAL dbg) + set(library_parts_variable TF_LIB_PARTS_DEBUG) + else() + set(library_parts_variable TF_LIB_PARTS_RELEASE) + endif() + set(${library_parts_variable}) + + # library might have been split because no more than 4GB are supported even on x64 Windows + foreach(PART_NO RANGE 1 100) + set(source "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow${TF_LIB_SUFFIX}-part${PART_NO}.lib") + if(EXISTS "${source}") + file(COPY "${source}" DESTINATION "${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib") + list(APPEND ${library_parts_variable} "tensorflow${TF_LIB_SUFFIX}-part${PART_NO}.lib") + else() + break() + endif() + endforeach() + endif() + else() + file(COPY + ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/${TF_LIB_NAME_FULL} + DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib + ) + + # Note: these use relative links + file(CREATE_LINK ${TF_LIB_NAME_FULL} + ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib/${TF_LIB_NAME_SHORT} + SYMBOLIC + ) + file(CREATE_LINK ${TF_LIB_NAME_FULL} + ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib/${TF_LIB_NAME} + SYMBOLIC + ) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(COPY + ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/${TF_FRAMEWORK_NAME_FULL} + DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib + ) + file(CREATE_LINK + ${TF_FRAMEWORK_NAME_FULL} + ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib/${TF_FRAMEWORK_NAME_SHORT} + SYMBOLIC + ) + file(CREATE_LINK + ${TF_FRAMEWORK_NAME_FULL} + ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib/${TF_FRAMEWORK_NAME} + SYMBOLIC + ) + endif() + endif() +endforeach() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + message(STATUS "Warning: Static TensorFlow build contains several external dependencies that may cause linking conflicts (for example, one cannot use both openssl and TensorFlow in the same project, since TensorFlow contains boringssl).") + if(VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to tell the linker to include the whole library, i.e., link using options '/WHOLEARCHIVE:tensorflow${TF_LIB_SUFFIX}-part1.lib /WHOLEARCHIVE:tensorflow${TF_LIB_SUFFIX}-part2.lib ...'") + else() + message(STATUS "Note: There is no separate libtensorflow_framework.a as it got merged into libtensorflow${TF_LIB_SUFFIX}.a to avoid linking conflicts.") + if(VCPKG_TARGET_IS_OSX) + message(STATUS "Note: Beside TensorFlow itself, you'll need to also pass its dependancies to the linker, for example '-ltensorflow${TF_LIB_SUFFIX} -framework CoreFoundation'") + message(STATUS "Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to tell the linker to include the whole library: '-Wl,-force_load,path/to/libtensorflow${TF_LIB_SUFFIX}.a -framework CoreFoundation -framework Security [rest of linker arguments]'") + else() + message(STATUS "Note: Beside TensorFlow itself, you'll need to also pass its dependancies to the linker, for example '-ltensorflow${TF_LIB_SUFFIX} -lm -ldl -lpthread'") + message(STATUS "Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to tell the linker to include the whole library: '-Wl,--whole-archive -ltensorflow${TF_LIB_SUFFIX} -Wl,--no-whole-archive [rest of linker arguments]'") + endif() + endif() + + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/README-${PLATFORM_SUFFIX} + ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/README + COPYONLY) +endif() + +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/LICENSE ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/copyright) + + +# NOTE: if this port ever supports VCPKG_BUILD_TYPE, use that to set these. +set(TENSORFLOW_HAS_RELEASE ON) +set(TENSORFLOW_HAS_DEBUG ON) + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-dll.cmake.in + ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/tensorflow${TF_PORT_SUFFIX}-config.cmake + @ONLY) + else() + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-lib.cmake.in + ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/tensorflow${TF_PORT_SUFFIX}-config.cmake + @ONLY) + + set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) + + set(prefix [[${TENSORFLOW_INSTALL_PREFIX}]]) + + set(libs_to_link) + foreach(lib IN LISTS TF_LIB_PARTS_RELEASE) + list(APPEND libs_to_link "$<$:${prefix}/lib/${lib}>") + endforeach() + foreach(lib IN LISTS TF_LIB_PARTS_DEBUG) + list(APPEND libs_to_link "$<$:${prefix}/debug/lib/${lib}>") + endforeach() + if(TENSORFLOW_HAS_RELEASE) + set(TF_LIB_PARTS_DEFAULT ${TF_LIB_PARTS_RELEASE}) + set(prefix_DEFAULT "${prefix}") + elseif(TENSORFLOW_HAS_DEBUG) + set(TF_LIB_PARTS_DEFAULT ${TF_LIB_PARTS_DEBUG}) + set(prefix_DEFAULT "${prefix}/debug") + endif() + + foreach(lib IN LISTS TF_LIB_PARTS_DEFAULT) + list(APPEND libs_to_link + "$<$,$>>:${prefix}/lib/${lib}>") + endforeach() + + string(REPLACE ";" "\n\t\t" libs_to_link "${libs_to_link}") + file(APPEND ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/tensorflow${TF_PORT_SUFFIX}-config.cmake " +target_link_libraries(tensorflow${TF_LIB_SUFFIX}::tensorflow${TF_LIB_SUFFIX} + INTERFACE + ${libs_to_link} +)" + ) + endif() +else() + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-shared.cmake.in + ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/tensorflow${TF_PORT_SUFFIX}-config.cmake + @ONLY) + else() + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-static.cmake.in + ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/tensorflow${TF_PORT_SUFFIX}-config.cmake + @ONLY) + endif() +endif() + +message(STATUS "You may want to delete ${CURRENT_BUILDTREES_DIR} and ${BUILDTREES_DIR}/.bzl to free diskspace.") diff --git a/ports/tensorflow-cc/tensorflow-cc-config-shared.cmake.in b/ports/tensorflow-common/tensorflow-config-shared.cmake.in similarity index 50% rename from ports/tensorflow-cc/tensorflow-cc-config-shared.cmake.in rename to ports/tensorflow-common/tensorflow-config-shared.cmake.in index 98149e0004805f..df4ad83b670979 100644 --- a/ports/tensorflow-cc/tensorflow-cc-config-shared.cmake.in +++ b/ports/tensorflow-common/tensorflow-config-shared.cmake.in @@ -1,55 +1,52 @@ -if(TARGET tensorflow_cc::tensorflow_cc OR TARGET tensorflow_cc::tensorflow_framework) - if(NOT (TARGET tensorflow_cc::tensorflow_cc AND TARGET tensorflow_cc::tensorflow_framework)) +if(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ OR TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework) + if(NOT (TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ AND TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework)) message(FATAL_ERROR "Some (but not all) targets in this config.cmake were already defined.") endif() return() endif() -add_library(tensorflow_cc::tensorflow_cc SHARED IMPORTED GLOBAL) -add_library(tensorflow_cc::tensorflow_framework SHARED IMPORTED GLOBAL) +add_library(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ SHARED IMPORTED GLOBAL) +add_library(tensorflow@TF_LIB_SUFFIX@::tensorflow_framework SHARED IMPORTED GLOBAL) -# Compute the installation prefix from this tensorflow-cc-config.cmake file location. -# CMAKE_CURRENT_LIST_DIR = [vcpkg_installed_dir]/[target_triplet]/share/tensorflow-cc +# Compute the installation prefix from this tensorflow@TF_PORT_SUFFIX@-config.cmake file location. +# CMAKE_CURRENT_LIST_DIR = [vcpkg_installed_dir]/[target_triplet]/share/tensorflow@TF_PORT_SUFFIX@ get_filename_component(TENSORFLOW_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) # TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet]/share get_filename_component(TENSORFLOW_INSTALL_PREFIX "${TENSORFLOW_INSTALL_PREFIX}" DIRECTORY) # TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet] -target_include_directories(tensorflow_cc::tensorflow_cc +target_include_directories(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ INTERFACE - "${TENSORFLOW_INSTALL_PREFIX}/include" - "${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external" - "${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external/src" + @TF_INCLUDE_DIRS@ ) -target_include_directories(tensorflow_cc::tensorflow_framework +target_include_directories(tensorflow@TF_LIB_SUFFIX@::tensorflow_framework INTERFACE - "${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external" - "${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external/src" + @TF_INCLUDE_DIRS@ ) if(@TENSORFLOW_HAS_RELEASE@) - set_property(TARGET tensorflow_cc::tensorflow_cc + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ PROPERTY IMPORTED_LOCATION "${TENSORFLOW_INSTALL_PREFIX}/lib/@TF_LIB_NAME@" ) - set_property(TARGET tensorflow_cc::tensorflow_framework + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework PROPERTY IMPORTED_LOCATION "${TENSORFLOW_INSTALL_PREFIX}/lib/@TF_FRAMEWORK_NAME@" ) - set_property(TARGET tensorflow_cc::tensorflow_cc + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE ) - set_property(TARGET tensorflow_cc::tensorflow_framework + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE ) - set_property(TARGET tensorflow_cc::tensorflow_cc + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ PROPERTY IMPORTED_LOCATION_RELEASE "${TENSORFLOW_INSTALL_PREFIX}/lib/@TF_LIB_NAME@" ) - set_property(TARGET tensorflow_cc::tensorflow_framework + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework PROPERTY IMPORTED_LOCATION_RELEASE "${TENSORFLOW_INSTALL_PREFIX}/lib/@TF_FRAMEWORK_NAME@" ) @@ -57,32 +54,32 @@ endif() if(@TENSORFLOW_HAS_DEBUG) if(NOT @TENSORFLOW_HAS_RELEASE) - set_property(TARGET tensorflow_cc::tensorflow_cc + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ PROPERTY IMPORTED_LOCATION "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/@TF_LIB_NAME@" ) - set_property(TARGET tensorflow_cc::tensorflow_framework + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework PROPERTY IMPORTED_LOCATION "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/@TF_FRAMEWORK_NAME@" ) endif() - set_property(TARGET tensorflow_cc::tensorflow_cc + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG ) - set_property(TARGET tensorflow_cc::tensorflow_framework + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG ) - set_property(TARGET tensorflow_cc::tensorflow_cc + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ PROPERTY IMPORTED_LOCATION_DEBUG "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/@TF_LIB_NAME@" ) - set_property(TARGET tensorflow_cc::tensorflow_framework + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework PROPERTY IMPORTED_LOCATION_DEBUG "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/@TF_FRAMEWORK_NAME@" ) endif() -set(tensorflow_cc_FOUND TRUE) +set(tensorflow@TF_LIB_SUFFIX@_FOUND TRUE) set(tensorflow_framework_FOUND TRUE) diff --git a/ports/tensorflow-cc/tensorflow-cc-config-static.cmake.in b/ports/tensorflow-common/tensorflow-config-static.cmake.in similarity index 53% rename from ports/tensorflow-cc/tensorflow-cc-config-static.cmake.in rename to ports/tensorflow-common/tensorflow-config-static.cmake.in index 7f017147065649..bd8510c5e8edd7 100644 --- a/ports/tensorflow-cc/tensorflow-cc-config-static.cmake.in +++ b/ports/tensorflow-common/tensorflow-config-static.cmake.in @@ -1,34 +1,33 @@ -if(TARGET tensorflow_cc::tensorflow_cc) +if(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@) return() endif() -add_library(tensorflow_cc::tensorflow_cc STATIC IMPORTED GLOBAL) +add_library(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ STATIC IMPORTED GLOBAL) -# Compute the installation prefix from this tensorflow-cc-config.cmake file location. -# CMAKE_CURRENT_LIST_DIR = [vcpkg_installed_dir]/[target_triplet]/share/tensorflow-cc +# Compute the installation prefix from this tensorflow@TF_PORT_SUFFIX@-config.cmake file location. +# CMAKE_CURRENT_LIST_DIR = [vcpkg_installed_dir]/[target_triplet]/share/tensorflow@TF_PORT_SUFFIX@ get_filename_component(TENSORFLOW_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) # TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet]/share get_filename_component(TENSORFLOW_INSTALL_PREFIX "${TENSORFLOW_INSTALL_PREFIX}" DIRECTORY) # TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet] -target_include_directories(tensorflow_cc::tensorflow_cc +target_include_directories(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ INTERFACE - "${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external" - "${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external/src" + @TF_INCLUDE_DIRS@ ) if(@TENSORFLOW_HAS_RELEASE@) - set_property(TARGET tensorflow_cc::tensorflow_cc + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ PROPERTY IMPORTED_LOCATION "${TENSORFLOW_INSTALL_PREFIX}/lib/@TF_LIB_NAME@" ) - set_property(TARGET tensorflow_cc::tensorflow_cc + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE ) - set_property(TARGET tensorflow_cc::tensorflow_cc + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ PROPERTY IMPORTED_LOCATION_RELEASE "${TENSORFLOW_INSTALL_PREFIX}/lib/@TF_LIB_NAME@" ) @@ -36,21 +35,21 @@ endif() if(@TENSORFLOW_HAS_DEBUG@) if(NOT @TENSORFLOW_HAS_RELEASE@) - set_property(TARGET tensorflow_cc::tensorflow_cc + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ PROPERTY IMPORTED_LOCATION "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/@TF_LIB_NAME@" ) endif() - set_property(TARGET tensorflow_cc::tensorflow_cc + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG ) - set_property(TARGET tensorflow_cc::tensorflow_cc + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ PROPERTY IMPORTED_LOCATION_DEBUG "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/@TF_LIB_NAME@" ) endif() -set(tensorflow_cc_FOUND TRUE) +set(tensorflow@TF_LIB_SUFFIX@_FOUND TRUE) diff --git a/ports/tensorflow-common/tensorflow-config-windows-dll.cmake.in b/ports/tensorflow-common/tensorflow-config-windows-dll.cmake.in new file mode 100644 index 00000000000000..1c3cfa23eeed8c --- /dev/null +++ b/ports/tensorflow-common/tensorflow-config-windows-dll.cmake.in @@ -0,0 +1,55 @@ +if(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@) + return() +endif() + +add_library(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ SHARED IMPORTED GLOBAL) + +# Compute the installation prefix from this tensorflow@TF_PORT_SUFFIX@-config.cmake file location. +# CMAKE_CURRENT_LIST_DIR = [vcpkg_installed_dir]/[target_triplet]/share/tensorflow@TF_PORT_SUFFIX@ +get_filename_component(TENSORFLOW_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) +# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet]/share +get_filename_component(TENSORFLOW_INSTALL_PREFIX "${TENSORFLOW_INSTALL_PREFIX}" DIRECTORY) +# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet] + +target_include_directories(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + INTERFACE + @TF_INCLUDE_DIRS@ +) + +if(@TENSORFLOW_HAS_RELEASE@) + set_target_properties(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTIES + IMPORTED_LOCATION "${TENSORFLOW_INSTALL_PREFIX}/bin/tensorflow@TF_LIB_SUFFIX@.dll" + IMPORTED_IMPLIB "${TENSORFLOW_INSTALL_PREFIX}/lib/tensorflow@TF_LIB_SUFFIX@.lib" + ) + + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE + ) + set_target_properties(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTIES + IMPORTED_LOCATION_RELEASE "${TENSORFLOW_INSTALL_PREFIX}/bin/tensorflow@TF_LIB_SUFFIX@.dll" + IMPORTED_IMPLIB_RELEASE "${TENSORFLOW_INSTALL_PREFIX}/lib/tensorflow@TF_LIB_SUFFIX@.lib" + ) +endif() + +if(@TENSORFLOW_HAS_DEBUG@) + if(NOT @TENSORFLOW_HAS_RELEASE@) + set_target_properties(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTIES + IMPORTED_LOCATION "${TENSORFLOW_INSTALL_PREFIX}/debug/bin/tensorflow@TF_LIB_SUFFIX@.dll" + IMPORTED_IMPLIB "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/tensorflow@TF_LIB_SUFFIX@.lib" + ) + endif() + + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG + ) + set_target_properties(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTIES + IMPORTED_LOCATION_DEBUG "${TENSORFLOW_INSTALL_PREFIX}/debug/bin/tensorflow@TF_LIB_SUFFIX@.dll" + IMPORTED_IMPLIB_DEBUG "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/tensorflow@TF_LIB_SUFFIX@.lib" + ) +endif() + +set(tensorflow@TF_LIB_SUFFIX@_FOUND TRUE) diff --git a/ports/tensorflow-common/tensorflow-config-windows-lib.cmake.in b/ports/tensorflow-common/tensorflow-config-windows-lib.cmake.in new file mode 100644 index 00000000000000..00382b187cb1e6 --- /dev/null +++ b/ports/tensorflow-common/tensorflow-config-windows-lib.cmake.in @@ -0,0 +1,18 @@ +if(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@) + return() +endif() + +set(tensorflow@TF_LIB_SUFFIX@_FOUND TRUE) + +# Compute the installation prefix from this tensorflow@TF_PORT_SUFFIX@-config.cmake file location. +# CMAKE_CURRENT_LIST_DIR = [vcpkg_installed_dir]/[target_triplet]/share/tensorflow@TF_PORT_SUFFIX@ +get_filename_component(TENSORFLOW_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) +# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet]/share +get_filename_component(TENSORFLOW_INSTALL_PREFIX "${TENSORFLOW_INSTALL_PREFIX}" DIRECTORY) +# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet] + +add_library(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ INTERFACE IMPORTED GLOBAL) +target_include_directories(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + INTERFACE + @TF_INCLUDE_DIRS@ +) diff --git a/ports/tensorflow/CONTROL b/ports/tensorflow/CONTROL new file mode 100644 index 00000000000000..0f775ae8d9d46a --- /dev/null +++ b/ports/tensorflow/CONTROL @@ -0,0 +1,6 @@ +Source: tensorflow +Version: 2.3.1 +Port-Version: 0 +Homepage: https://github.com/tensorflow/tensorflow +Description: Library for computation using data flow graphs for scalable machine learning (C API version) +Supports: !(x86|arm|uwp) diff --git a/ports/tensorflow/portfile.cmake b/ports/tensorflow/portfile.cmake new file mode 100644 index 00000000000000..f3a43d24c2c370 --- /dev/null +++ b/ports/tensorflow/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "uwp") + +set(TF_LIB_SUFFIX "") +set(TF_PORT_SUFFIX "") +set(TF_INCLUDE_DIRS "${INSTALL_PREFIX}/${TARGET_TRIPLET}/include") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../tensorflow-common") +include(tensorflow-common) + +file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/c_api.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) +file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/c_api_experimental.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) +file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tensor_interface.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) +file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_attrtype.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) +file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_datatype.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) +file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_file_statistics.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) +file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_status.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) +file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_tensor.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) +file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/c_api.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager) +file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/c_api_experimental.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager) +file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/dlpack.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager) From 38b419a6ac212f32724cc04b1a87855cb47d261f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 25 Nov 2020 20:23:22 +0100 Subject: [PATCH 0163/1694] [ignition-msgs*] Fix flaky CI tests for ignition-msgs* ports (#14730) Pass ADD_BIN_TO_PATH to vcpkg_install_cmake and remove custom PATH hacks. --- ports/ignition-modularscripts/CONTROL | 3 +-- .../ignition_modular_library.cmake | 2 +- ports/ignition-msgs1/CONTROL | 2 +- ports/ignition-msgs1/portfile.cmake | 10 ---------- ports/ignition-msgs5/CONTROL | 2 +- ports/ignition-msgs5/portfile.cmake | 8 -------- ports/ignition-msgs6/CONTROL | 1 + ports/ignition-msgs6/portfile.cmake | 8 -------- 8 files changed, 5 insertions(+), 31 deletions(-) diff --git a/ports/ignition-modularscripts/CONTROL b/ports/ignition-modularscripts/CONTROL index 98ceba1af5e4c5..647efbbf18cb5d 100644 --- a/ports/ignition-modularscripts/CONTROL +++ b/ports/ignition-modularscripts/CONTROL @@ -1,4 +1,3 @@ Source: ignition-modularscripts -Version: 2020-05-16 -Port-Version: 2 +Version: 2020-11-23 Description: Vcpkg helpers to package ignition libraries diff --git a/ports/ignition-modularscripts/ignition_modular_library.cmake b/ports/ignition-modularscripts/ignition_modular_library.cmake index 77506bb3be344d..9492531e87e826 100644 --- a/ports/ignition-modularscripts/ignition_modular_library.cmake +++ b/ports/ignition-modularscripts/ignition_modular_library.cmake @@ -7,7 +7,7 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC OPTIONS -DBUILD_TESTING=OFF ) - vcpkg_install_cmake() + vcpkg_install_cmake(ADD_BIN_TO_PATH) # If necessary, move the CMake config files if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake") diff --git a/ports/ignition-msgs1/CONTROL b/ports/ignition-msgs1/CONTROL index 1581a5c30f9105..653c5ea94aa48a 100644 --- a/ports/ignition-msgs1/CONTROL +++ b/ports/ignition-msgs1/CONTROL @@ -1,5 +1,5 @@ Source: ignition-msgs1 Version: 1.0.0 -Port-Version: 2 +Port-Version: 3 Build-Depends: ignition-cmake0, ignition-math4, protobuf Description: Middleware protobuf messages for robotics diff --git a/ports/ignition-msgs1/portfile.cmake b/ports/ignition-msgs1/portfile.cmake index d206ded1210075..0b2215f4942819 100644 --- a/ports/ignition-msgs1/portfile.cmake +++ b/ports/ignition-msgs1/portfile.cmake @@ -14,12 +14,6 @@ if(ignition_msgs_CROSSCOMPILING) message(FATAL_ERROR "This port does not currently support triplets that require cross-compilation.") endif() -# This port needs to generate protobuf messages with a custom plugin generator, -# so it needs to have in Windows the relative protobuf dll available in the PATH -set(path_backup $ENV{PATH}) -vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin) -vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/debug/bin) - 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 @@ -27,7 +21,3 @@ ignition_modular_library(NAME msgs SHA512 3a270f0ac988b947091d4626be48fe8cfed5ddfde5a37b9d0f08fddcbf278099ab231fca11e2dd2296ca54e0350ea14e3f685dc238f0827f18f10ab7b75039de # Fix linking order of protobuf libraries (backport of https://bitbucket.org/ignitionrobotics/ign-msgs/pull-requests/151) PATCHES fix-protobuf-static-link-order.patch) - - -# Restore old path -set(ENV{PATH} ${path_backup}) diff --git a/ports/ignition-msgs5/CONTROL b/ports/ignition-msgs5/CONTROL index b1317303b68b91..c9f357b49f4fe9 100644 --- a/ports/ignition-msgs5/CONTROL +++ b/ports/ignition-msgs5/CONTROL @@ -1,6 +1,6 @@ Source: ignition-msgs5 Version: 5.3.0 -Port-Version: 1 +Port-Version: 2 Build-Depends: ignition-modularscripts, ignition-cmake2, ignition-math6, protobuf, tinyxml2 Description: Middleware protobuf messages for robotics Supports: !(arm|uwp) \ No newline at end of file diff --git a/ports/ignition-msgs5/portfile.cmake b/ports/ignition-msgs5/portfile.cmake index 1174cb90681eca..ea54585901ff93 100644 --- a/ports/ignition-msgs5/portfile.cmake +++ b/ports/ignition-msgs5/portfile.cmake @@ -4,17 +4,9 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) -# This port needs to generate protobuf messages with a custom plugin generator, -# so it needs to have in Windows the relative protobuf dll available in the PATH -set(path_backup $ENV{PATH}) -vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin) -vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/debug/bin) - ignition_modular_library(NAME msgs VERSION "5.3.0" SHA512 55c167d00b60ae6da0144a9495e9ac8aed61fcbdc61e057e75d31261e335c573543d60e28a7dc195a7c9849c5c6eb0e088d4f4e79fd927e83470a3f1fabef60e PATCHES "01-protobuf.patch") -# Restore old path -set(ENV{PATH} "${path_backup}") diff --git a/ports/ignition-msgs6/CONTROL b/ports/ignition-msgs6/CONTROL index 70aa5726cbdb0e..b09a4039493585 100644 --- a/ports/ignition-msgs6/CONTROL +++ b/ports/ignition-msgs6/CONTROL @@ -1,5 +1,6 @@ Source: ignition-msgs6 Version: 6.0.0 +Port-Version: 1 Build-Depends: ignition-modularscripts, ignition-cmake2, ignition-math6, protobuf, tinyxml2 Description: Middleware protobuf messages for robotics Supports: !(arm|uwp) diff --git a/ports/ignition-msgs6/portfile.cmake b/ports/ignition-msgs6/portfile.cmake index 0a3ef841eb604d..f79c5aabd22f88 100644 --- a/ports/ignition-msgs6/portfile.cmake +++ b/ports/ignition-msgs6/portfile.cmake @@ -4,15 +4,7 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) -# This port needs to generate protobuf messages with a custom plugin generator, -# so it needs to have in Windows the relative protobuf dll available in the PATH -set(path_backup $ENV{PATH}) -vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin) -vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/debug/bin) - ignition_modular_library(NAME msgs VERSION "6.0.0" SHA512 d1d6f6602ae33ec95b36c5df7815b06970f349492ef0309d8aacbaf2dca0c3e7314bbd64890a2554485fbd52f148a90b7bf54dceb0b3a1dd40eeb1f5bdb9613c) -# Restore old path -set(ENV{PATH} "${path_backup}") From c3984c89d97035087b15dd9c698a09c75a6523da Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Wed, 25 Nov 2020 19:23:45 +0000 Subject: [PATCH 0164/1694] [toml11] fixes installation (#14723) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [toml11] fixes installation * Update ports/toml11/CONTROL Co-authored-by: Adam Johnson Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Adam Johnson --- ports/toml11/CONTROL | 1 + ports/toml11/portfile.cmake | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ports/toml11/CONTROL b/ports/toml11/CONTROL index 2dc57462d3aaf9..ca3483011d5832 100644 --- a/ports/toml11/CONTROL +++ b/ports/toml11/CONTROL @@ -1,4 +1,5 @@ Source: toml11 Version: 3.5.0 +Port-Version: 1 Homepage: https://github.com/ToruNiina/toml11 Description: A C++11 header-only toml parser/encoder depending only on C++ standard library. diff --git a/ports/toml11/portfile.cmake b/ports/toml11/portfile.cmake index bb35b3dc2c7952..46e042e2a4b26b 100644 --- a/ports/toml11/portfile.cmake +++ b/ports/toml11/portfile.cmake @@ -6,8 +6,23 @@ vcpkg_from_github( HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/toml.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/toml DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.hpp") - # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + -Dtoml11_BUILD_TEST=OFF +) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/toml11 TARGET_PATH share/toml11) + +vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/share/toml11/toml11Config.cmake + "\${PACKAGE_PREFIX_DIR}/lib/cmake/toml11/toml11Targets.cmake" + "\${PACKAGE_PREFIX_DIR}/share/toml11/toml11Targets.cmake" +) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) \ No newline at end of file From 102a77c53d2cdcaf9fa45ad2c3dbdc158cd11ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Wed, 25 Nov 2020 20:24:10 +0100 Subject: [PATCH 0165/1694] [bitsery] Update to 5.2.1 (#14722) https://github.com/fraillt/bitsery/releases/tag/v5.2.1 --- ports/bitsery/CONTROL | 2 +- ports/bitsery/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/bitsery/CONTROL b/ports/bitsery/CONTROL index f219deb6eefb6b..30c159d8ba4b76 100644 --- a/ports/bitsery/CONTROL +++ b/ports/bitsery/CONTROL @@ -1,4 +1,4 @@ Source: bitsery -Version: 5.1.0 +Version: 5.2.1 Description: Header only C++ binary serialization library Homepage: https://github.com/fraillt/bitsery diff --git a/ports/bitsery/portfile.cmake b/ports/bitsery/portfile.cmake index 1069ed64c6072a..146f6f75d5a7a8 100644 --- a/ports/bitsery/portfile.cmake +++ b/ports/bitsery/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fraillt/bitsery - REF d7876808195834f05fd84619b8f6b266e5c1d5bd - SHA512 ac2c6e3907f8ee8cf51070b3c00aab9071586510d8cfe30f9660ed5aa9918cd996c806b1db2b46d464f1d933fc41472e5406e63ba4814bdc37d2b0f1ad6e1083 + REF db884a0656a3aabb87da1ae6edf12629507f76a7 + SHA512 7c94a09ed7cf07aa6c347d2960de622c5d69a25c7af501d10224b02f9db1bb191e8a5f7f096de488650f5a164e554b20f950fcdde423afced0ebfed249cb1c3d HEAD_REF master ) @@ -13,7 +13,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets( CONFIG_PATH lib/cmake/${PORT} ) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) From 4d51c05bd8ec101dc26cd9aea807c3c7329377df Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Wed, 25 Nov 2020 13:25:02 -0600 Subject: [PATCH 0166/1694] [duktape] Add VERSION and SOVERSION properties CMake build (#14666) --- ports/duktape/CMakeLists.txt | 2 ++ ports/duktape/CONTROL | 1 + 2 files changed, 3 insertions(+) diff --git a/ports/duktape/CMakeLists.txt b/ports/duktape/CMakeLists.txt index 56303d3d96492a..746aaa910b70d0 100644 --- a/ports/duktape/CMakeLists.txt +++ b/ports/duktape/CMakeLists.txt @@ -17,6 +17,8 @@ file(GLOB_RECURSE DUKTAPE_HEADERS "${CMAKE_CURRENT_LIST_DIR}/src/*.h") add_library(duktape ${DUKTAPE_SOURCES} ${DUKTAPE_HEADERS}) target_include_directories(duktape PRIVATE "${CMAKE_CURRENT_LIST_DIR}/src") set_target_properties(duktape PROPERTIES PUBLIC_HEADER "${DUKTAPE_HEADERS}") +set_target_properties(duktape PROPERTIES VERSION ${duktape_VERSION}) +set_target_properties(duktape PROPERTIES SOVERSION ${duktape_MAJOR_VERSION}) if (BUILD_SHARED_LIBS) target_compile_definitions(duktape PRIVATE -DDUK_F_DLL_BUILD) diff --git a/ports/duktape/CONTROL b/ports/duktape/CONTROL index 907618c35d5bfa..dd0e86447cb1d6 100644 --- a/ports/duktape/CONTROL +++ b/ports/duktape/CONTROL @@ -1,4 +1,5 @@ Source: duktape Version: 2.5.0 +Port-Version: 1 Homepage: https://github.com/svaarala/duktape Description: Embeddable Javascript engine with a focus on portability and compact footprint. From 7a6b666fca10b5142f8ae65e5099c07d2fc17aaf Mon Sep 17 00:00:00 2001 From: SNiLD Date: Wed, 25 Nov 2020 21:26:09 +0200 Subject: [PATCH 0167/1694] [proj] Added support for optionally building the tools (#14629) * Added support for optionally building the tools. * Increase port version. * Do not build tools with CMAKE_DEBUG_POSTFIX. --- ports/proj4/CONTROL | 6 +++++- ports/proj4/portfile.cmake | 16 ++++++++++------ ports/proj4/tools-cmake.patch | 16 ++++++++++++++++ 3 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 ports/proj4/tools-cmake.patch diff --git a/ports/proj4/CONTROL b/ports/proj4/CONTROL index ef83912c6408fc..d7965472d1fdd0 100644 --- a/ports/proj4/CONTROL +++ b/ports/proj4/CONTROL @@ -1,6 +1,6 @@ Source: proj4 Version: 6.3.1 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/OSGeo/PROJ Description: PROJ.4 library for cartographic projections Build-Depends: sqlite3[core] @@ -9,3 +9,7 @@ Default-Features: database Feature: database Build-Depends: sqlite3[tool] (!uwp&!arm) Description: generate database + +Feature: tools +Build-Depends: +Description: generate tools diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index b669bfd729df40..c4e5a5ad111a96 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( fix-sqlite-dependency-export.patch fix-linux-build.patch use-sqlite3-config.patch + tools-cmake.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -22,6 +23,12 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS database BUILD_PROJ_DATABASE + tools BUILD_CCT + tools BUILD_CS2CS + tools BUILD_GEOD + tools BUILD_GIE + tools BUILD_PROJ + tools BUILD_PROJINFO ) if ("database" IN_LIST FEATURES) if (VCPKG_TARGET_IS_WINDOWS) @@ -53,18 +60,15 @@ vcpkg_configure_cmake( -DPROJ_LIB_SUBDIR=lib -DPROJ_INCLUDE_SUBDIR=include -DPROJ_DATA_SUBDIR=share/proj4 - -DBUILD_CCT=OFF - -DBUILD_CS2CS=OFF - -DBUILD_GEOD=OFF - -DBUILD_GIE=OFF - -DBUILD_PROJ=OFF - -DBUILD_PROJINFO=OFF -DPROJ_TESTS=OFF -DEXE_SQLITE3=${SQLITE3_BIN_PATH}/sqlite3${BIN_SUFFIX} ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/proj4) +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES cct cs2cs geod gie proj projinfo AUTO_CLEAN) +endif () file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/proj4/tools-cmake.patch b/ports/proj4/tools-cmake.patch new file mode 100644 index 00000000000000..4e487e6f11ef13 --- /dev/null +++ b/ports/proj4/tools-cmake.patch @@ -0,0 +1,16 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 48c785a..e2b5485 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -69,11 +69,3 @@ if(BUILD_GIE) + include(bin_gie.cmake) + set(BIN_TARGETS ${BIN_TARGETS} gie) + endif() +- +-if(MSVC OR CMAKE_CONFIGURATION_TYPES) +- if(BIN_TARGETS) +- # Add _d suffix for your debug versions of the tools +- set_target_properties(${BIN_TARGETS} PROPERTIES +- DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) +- endif() +-endif() From 6c520a990fd244923b18fc84f7bf6386b0e8896c Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Thu, 26 Nov 2020 02:26:33 +0700 Subject: [PATCH 0168/1694] [boost-locale] Replace VCPKG_TARGET_IS_WINDOWS in b2-options (#14502) * [boost-locale] Use CMAKE_SYSTEM_NAME as a fallback where VCPKG_TARGET_IS_WINDOWS is not available * fix this issue in a different way * Remove comments in b2-options.cmake.in Co-authored-by: nicole mazzuca * fix generate-ports.ps1 Co-authored-by: Nicole Mazzuca --- ports/boost-locale/CONTROL | 3 +- .../{b2-options.cmake => b2-options.cmake.in} | 17 ++++----- ports/boost-locale/portfile.cmake | 9 +++-- scripts/boost/generate-ports.ps1 | 36 ++++++++++++++++--- 4 files changed, 49 insertions(+), 16 deletions(-) rename ports/boost-locale/{b2-options.cmake => b2-options.cmake.in} (65%) diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL index 63714c5a75e59c..306cfa32ac3344 100644 --- a/ports/boost-locale/CONTROL +++ b/ports/boost-locale/CONTROL @@ -1,6 +1,7 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-locale Version: 1.74.0 +Port-Version: 1 Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows) Homepage: https://github.com/boostorg/locale Description: Boost locale module diff --git a/ports/boost-locale/b2-options.cmake b/ports/boost-locale/b2-options.cmake.in similarity index 65% rename from ports/boost-locale/b2-options.cmake rename to ports/boost-locale/b2-options.cmake.in index 6bd353e1d58879..d1df5d6c5152bd 100644 --- a/ports/boost-locale/b2-options.cmake +++ b/ports/boost-locale/b2-options.cmake.in @@ -1,15 +1,16 @@ -if(VCPKG_TARGET_IS_WINDOWS) - if("icu" IN_LIST FEATURES) - set(BOOST_LOCALE_ICU on) - else() - set(BOOST_LOCALE_ICU off) - endif() +set(_B2_OPTIONS_FEATURES "@FEATURES@") +if("icu" IN_LIST _B2_OPTIONS_FEATURES) + set(BOOST_LOCALE_ICU_FEATURE on) +else() + set(BOOST_LOCALE_ICU_FEATURE off) +endif() +if(@VCPKG_TARGET_IS_WINDOWS@) list(APPEND B2_OPTIONS boost.locale.iconv=off boost.locale.posix=off /boost/locale//boost_locale - boost.locale.icu=${BOOST_LOCALE_ICU} + boost.locale.icu=${BOOST_LOCALE_ICU_FEATURE} ) else() find_library(LIBICONV_LIBRARY iconv) @@ -19,7 +20,7 @@ else() boost.locale.iconv=on boost.locale.posix=on /boost/locale//boost_locale - boost.locale.icu=off + boost.locale.icu=${BOOST_LOCALE_ICU_FEATURE} -sICONV_PATH=${LIBICONV_DIR} ) if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index fa62041db33204..445569a41f7ef4 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -12,9 +12,14 @@ vcpkg_from_github( ) include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +configure_file( + "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in" + "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake" + @ONLY +) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} - BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" + BOOST_CMAKE_FRAGMENT "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake" ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index d92ab8adfaf3e1..29ab213dada4e7 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -5,15 +5,27 @@ param ( $portsDir = $null ) +$ErrorActionPreference = 'Stop' + $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition if ($null -eq $portsDir) { $portsDir = "$scriptsDir/../../ports" } +if ($IsWindows) +{ + $vcpkg = "$scriptsDir/../../vcpkg.exe" +} +else +{ + $vcpkg = "$scriptsDir/../../vcpkg" +} + # Optionally clear this array when moving to a new boost version $port_versions = @{ #e.g. "asio" = 1; + "locale" = 1; } $per_port_data = @{ @@ -82,7 +94,7 @@ function Generate() mkdir "$portsDir/boost-$PortName" -erroraction SilentlyContinue | out-null $controlLines = @( - "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1" + "# Automatically generated by scripts/boost/generate-ports.ps1" "Source: boost-$PortName" "Version: $version" ) @@ -106,7 +118,7 @@ function Generate() $controlLines | out-file -enc ascii "$portsDir/boost-$PortName/CONTROL" $portfileLines = @( - "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1" + "# Automatically generated by scripts/boost/generate-ports.ps1" "" ) @@ -167,6 +179,20 @@ function Generate() ")" ) } + elseif (Test-Path "$portsDir/boost-$PortName/b2-options.cmake.in") + { + $portfileLines += @( + 'configure_file(' + ' "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in"' + ' "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"' + ' @ONLY' + ')' + 'boost_modular_build(' + ' SOURCE_PATH ${SOURCE_PATH}' + ' BOOST_CMAKE_FRAGMENT "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"' + ')' + ) + } else { $portfileLines += @( @@ -249,9 +275,9 @@ foreach ($library in $libraries) if (!(Test-Path $archive)) { "Downloading boost/$library..." - & @(vcpkg fetch aria2)[-1] "https://github.com/boostorg/$library/archive/boost-$version.tar.gz" -d "$scriptsDir/downloads" -o "$library-boost-$version.tar.gz" + & @(& $vcpkg fetch aria2)[-1] "https://github.com/boostorg/$library/archive/boost-$version.tar.gz" -d "$scriptsDir/downloads" -o "$library-boost-$version.tar.gz" } - $hash = vcpkg hash $archive + $hash = & $vcpkg hash $archive $unpacked = "$scriptsDir/libs/$library-boost-$version" if (!(Test-Path $unpacked)) { @@ -408,7 +434,7 @@ if ($libraries_in_boost_port.length -gt 1) { $boostDependsList = @($libraries_in_boost_port | % { "boost-$_" } | ? { $_ -notmatch "boost-mpi" }) -join ", " @( - "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1" + "# Automatically generated by scripts/boost/generate-ports.ps1" "Source: boost" "Version: $version" "Port-Version: $($port_versions.boost)" From da8ee6df252286c32172ea4056b52e7e2bc5671d Mon Sep 17 00:00:00 2001 From: mapozyan <66947683+mapozyan@users.noreply.github.com> Date: Wed, 25 Nov 2020 20:28:04 +0100 Subject: [PATCH 0169/1694] [vcpkg] Increment number of retries and timeout of fs.rename() (#13931) * Fix retry logic for fs.rename() * Increase timeout for fs.rename(), add diagnostic message * Make formatting happy * Exponential backoff for archive file rename * Remove random local file from last commit * Remove random local file from last commit * Update toolsrc/src/vcpkg/archives.cpp Co-authored-by: Mikayel Apozyan Co-authored-by: nicole mazzuca --- toolsrc/src/vcpkg/archives.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/toolsrc/src/vcpkg/archives.cpp b/toolsrc/src/vcpkg/archives.cpp index 4c97a7b5affbad..0faf756ad30720 100644 --- a/toolsrc/src/vcpkg/archives.cpp +++ b/toolsrc/src/vcpkg/archives.cpp @@ -1,3 +1,4 @@ +#include #include #include @@ -97,12 +98,16 @@ namespace vcpkg::Archives fs.rename(to_path_partial, to_path, ec); - for (int i = 0; i < 5 && ec; i++) + using namespace std::chrono_literals; + + auto retry_delay = 8ms; + + for (int i = 0; i < 10 && ec; i++) { - i++; using namespace std::chrono_literals; - std::this_thread::sleep_for(i * 100ms); + std::this_thread::sleep_for(retry_delay); fs.rename(to_path_partial, to_path, ec); + retry_delay *= 2; } Checks::check_exit(VCPKG_LINE_INFO, From 2de6629415bff5bba664a84c6c445f873d09f97e Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Wed, 25 Nov 2020 14:35:15 -0500 Subject: [PATCH 0170/1694] [nccl] New Port (#14683) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [nccl] New Port * Update ports/nccl/portfile.cmake * Add usage to vcpkg-cmake-wrapper * Move usage to usage file * Update ports/nccl/portfile.cmake * Don't copy debug libraries because they aren't provided Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/cuda/portfile.cmake | 2 +- ports/nccl/FindNCCL.cmake | 50 +++++++++++++++++++++++++ ports/nccl/portfile.cmake | 55 ++++++++++++++++++++++++++++ ports/nccl/usage | 5 +++ ports/nccl/vcpkg-cmake-wrapper.cmake | 6 +++ ports/nccl/vcpkg.json | 9 +++++ 6 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 ports/nccl/FindNCCL.cmake create mode 100644 ports/nccl/portfile.cmake create mode 100644 ports/nccl/usage create mode 100644 ports/nccl/vcpkg-cmake-wrapper.cmake create mode 100644 ports/nccl/vcpkg.json diff --git a/ports/cuda/portfile.cmake b/ports/cuda/portfile.cmake index 6e5a497da4078a..ecdce4cfb0ba15 100644 --- a/ports/cuda/portfile.cmake +++ b/ports/cuda/portfile.cmake @@ -2,7 +2,7 @@ # Other packages can depend on this package to declare a dependency on CUDA. # If this package is installed, we assume that CUDA is properly installed. -#note: this port must be kept in sync with CUDNN port: every time one is upgraded, the other must be too +#note: this port must be kept in sync with CUDNN and NCCL ports: every time one is upgraded, the other must be too include(${CMAKE_CURRENT_LIST_DIR}/vcpkg_find_cuda.cmake) diff --git a/ports/nccl/FindNCCL.cmake b/ports/nccl/FindNCCL.cmake new file mode 100644 index 00000000000000..72ebd9ad7a7786 --- /dev/null +++ b/ports/nccl/FindNCCL.cmake @@ -0,0 +1,50 @@ +# Find the nccl libraries +# +# The following variables are optionally searched for defaults +# NCCL_ROOT: Base directory where all NCCL components are found +# NCCL_INCLUDE_DIR: Directory where NCCL header is found +# NCCL_LIB_DIR: Directory where NCCL library is found +# +# The following are set after configuration is done: +# NCCL_FOUND +# NCCL_INCLUDE_DIRS +# NCCL_LIBRARIES +# +# Adapted from https://github.com/pytorch/pytorch/blob/master/cmake/Modules/FindNCCL.cmake + +set(NCCL_INCLUDE_DIR $ENV{NCCL_INCLUDE_DIR} CACHE PATH "Folder contains NVIDIA NCCL headers") +set(NCCL_LIB_DIR $ENV{NCCL_LIB_DIR} CACHE PATH "Folder contains NVIDIA NCCL libraries") +set(NCCL_VERSION $ENV{NCCL_VERSION} CACHE STRING "Version of NCCL to build with") + +list(APPEND NCCL_ROOT $ENV{NCCL_ROOT_DIR} ${CUDA_TOOLKIT_ROOT_DIR}) +# Compatible layer for CMake <3.12. NCCL_ROOT will be accounted in for searching paths and libraries for CMake >=3.12. +list(APPEND CMAKE_PREFIX_PATH ${NCCL_ROOT}) + +find_path(NCCL_INCLUDE_DIRS + NAMES nccl.h + HINTS ${NCCL_INCLUDE_DIR}) + +if (USE_STATIC_NCCL) + MESSAGE(STATUS "USE_STATIC_NCCL is set. Linking with static NCCL library.") + SET(NCCL_LIBNAME "nccl_static") + if (NCCL_VERSION) # Prefer the versioned library if a specific NCCL version is specified + set(CMAKE_FIND_LIBRARY_SUFFIXES ".a.${NCCL_VERSION}" ${CMAKE_FIND_LIBRARY_SUFFIXES}) + endif() +else() + SET(NCCL_LIBNAME "nccl") + if (NCCL_VERSION) # Prefer the versioned library if a specific NCCL version is specified + set(CMAKE_FIND_LIBRARY_SUFFIXES ".so.${NCCL_VERSION}" ${CMAKE_FIND_LIBRARY_SUFFIXES}) + endif() +endif() + +find_library(NCCL_LIBRARIES + NAMES ${NCCL_LIBNAME} + HINTS ${NCCL_LIB_DIR}) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(NCCL DEFAULT_MSG NCCL_INCLUDE_DIRS NCCL_LIBRARIES) + +if(NCCL_FOUND) # obtaining NCCL version and some sanity checks + message(STATUS "Found NCCL (include: ${NCCL_INCLUDE_DIRS}, library: ${NCCL_LIBRARIES})") + mark_as_advanced(NCCL_ROOT_DIR NCCL_INCLUDE_DIRS NCCL_LIBRARIES) +endif() diff --git a/ports/nccl/portfile.cmake b/ports/nccl/portfile.cmake new file mode 100644 index 00000000000000..ecdacc23507f3a --- /dev/null +++ b/ports/nccl/portfile.cmake @@ -0,0 +1,55 @@ +vcpkg_fail_port_install(ON_TARGET "Windows" "OSX" ON_ARCH "x86" "arm") + +# note: this port must be kept in sync with CUDA port: every time one is upgraded, the other must be too +set(NCCL_VERSION "2.4.6.1") +set(NCCL_FULL_VERSION "${NCCL_VERSION}-cuda10.1_0") +string(REPLACE "." ";" VERSION_LIST ${NCCL_VERSION}) +list(GET VERSION_LIST 0 NCCL_VERSION_MAJOR) +list(GET VERSION_LIST 1 NCCL_VERSION_MINOR) +list(GET VERSION_LIST 2 NCCL_VERSION_PATCH) + +set(NCCL_DOWNLOAD_LINK "https://anaconda.org/nvidia/nccl/${NCCL_VERSION}/download/linux-64/nccl-${NCCL_FULL_VERSION}.tar.bz2") + +# Try to find NCCL if it exists; only download if it doesn't exist +set(NCCL_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) +find_package(NCCL ${NCCL_VERSION}) +set(CMAKE_MODULE_PATH ${NCCL_PREV_MODULE_PATH}) + +# Download or return +if(NCCL_FOUND) + message(STATUS "Using NCCL located on system.") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + message(STATUS "NCCL not found on system. Downloading...") + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) + + set(SHA512_NCCL "0fe69ad559f70aab97c78906296e2b909b4a9c042a228a2770252b3d03016c7c39acce3c0e0bd0ba651abd63471743dcffdfec307c486989c6e5745634aabde1") + set(NCCL_OS "linux") + + vcpkg_download_distfile(ARCHIVE + URLS ${NCCL_DOWNLOAD_LINK} + FILENAME "nccl-${NCCL_FULL_VERSION}-${NCCL_OS}.tar.bz2" + SHA512 ${SHA512_NCCL} + ) + + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL + ) + + file(INSTALL "${SOURCE_PATH}/include/nccl.h" DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(INSTALL "${SOURCE_PATH}/include/nccl_net.h" DESTINATION ${CURRENT_PACKAGES_DIR}/include) + + file(INSTALL "${SOURCE_PATH}/lib/libnccl.so" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL "${SOURCE_PATH}/lib/libnccl.so.${NCCL_VERSION_MAJOR}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL "${SOURCE_PATH}/lib/libnccl.so.${NCCL_VERSION_MAJOR}.${NCCL_VERSION_MINOR}.${NCCL_VERSION_PATCH}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + + file(INSTALL "${SOURCE_PATH}/info/licenses/LICENSE.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindNCCL.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +endif() + +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/nccl/usage b/ports/nccl/usage new file mode 100644 index 00000000000000..62ebd7bab107e3 --- /dev/null +++ b/ports/nccl/usage @@ -0,0 +1,5 @@ +The package nccl provides CMake variables: + + find_package(NCCL REQUIRED) + target_link_libraries(main PRIVATE ${NCCL_LIBRARIES}) + target_include_directories(main PRIVATE ${NCCL_INCLUDE_DIRS}) diff --git a/ports/nccl/vcpkg-cmake-wrapper.cmake b/ports/nccl/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..27893ec4f3c939 --- /dev/null +++ b/ports/nccl/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(NCCL_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${NCCL_PREV_MODULE_PATH}) diff --git a/ports/nccl/vcpkg.json b/ports/nccl/vcpkg.json new file mode 100644 index 00000000000000..7f4416480fce65 --- /dev/null +++ b/ports/nccl/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "nccl", + "version-string": "2.4.6", + "description": "Optimized primitives for collective multi-GPU communication.", + "supports": "linux & x64", + "dependencies": [ + "cuda" + ] +} From 8132757a9c2582035a577b198e9239d6550a1437 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 25 Nov 2020 21:06:25 +0100 Subject: [PATCH 0171/1694] [vcpkg_fixup_cmake_targets] Add NO_PREFIX_CORRECTION (#12215) * [vcpkg/scripts/fixup_cmake] add option NO_PREFIX_CORRECTION to not apply the * add a bit of explanation why the prefix correction might be incorrect. * apply the if only around the import prefix changes * Update scripts/cmake/vcpkg_fixup_cmake_targets.cmake Co-authored-by: Robert Schumacher Co-authored-by: Robert Schumacher Co-authored-by: Billy Robert O'Neal III --- scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 50 ++++++++++++++----- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index 7e4432e849222c..31bf9351b21b3b 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -27,6 +27,11 @@ ## Passing this option disable such behavior, as it is convenient for ports that install ## more than one CMake package configuration file. ## +## ### NO_PREFIX_CORRECTION +## Disables the correction of_IMPORT_PREFIX done by vcpkg due to moving the targets. +## Currently the correction does not take into account how the files are moved and applies +## I rather simply correction which in some cases will yield the wrong results. +## ## ## Notes ## Transform all `/debug//*targets-debug.cmake` files and move them to `/`. ## Removes all `/debug//*targets.cmake` and `/debug//*config.cmake`. @@ -44,7 +49,7 @@ ## * [nlohmann-json](https://github.com/Microsoft/vcpkg/blob/master/ports/nlohmann-json/portfile.cmake) function(vcpkg_fixup_cmake_targets) # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vfct "DO_NOT_DELETE_PARENT_CONFIG_PATH" "CONFIG_PATH;TARGET_PATH" "") + cmake_parse_arguments(PARSE_ARGV 0 _vfct "DO_NOT_DELETE_PARENT_CONFIG_PATH" "CONFIG_PATH;TARGET_PATH;NO_PREFIX_CORRECTION" "") if(_vfct_UNPARSED_ARGUMENTS) message(FATAL_ERROR "vcpkg_fixup_cmake_targets was passed extra arguments: ${_vfct_UNPARSED_ARGUMENTS}") @@ -160,21 +165,40 @@ function(vcpkg_fixup_cmake_targets) #Fix ${_IMPORT_PREFIX} in cmake generated targets and configs; #Since those can be renamed we have to check in every *.cmake file(GLOB_RECURSE MAIN_CMAKES "${RELEASE_SHARE}/*.cmake") + foreach(MAIN_CMAKE IN LISTS MAIN_CMAKES) file(READ ${MAIN_CMAKE} _contents) - string(REGEX REPLACE - "get_filename_component\\(_IMPORT_PREFIX \"\\\${CMAKE_CURRENT_LIST_FILE}\" PATH\\)(\nget_filename_component\\(_IMPORT_PREFIX \"\\\${_IMPORT_PREFIX}\" PATH\\))*" - "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" - _contents "${_contents}") # see #1044 for details why this replacement is necessary. See #4782 why it must be a regex. - string(REGEX REPLACE - "get_filename_component\\(PACKAGE_PREFIX_DIR \"\\\${CMAKE_CURRENT_LIST_DIR}/\\.\\./(\\.\\./)*\" ABSOLUTE\\)" - "get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE)" - _contents "${_contents}") - string(REGEX REPLACE - "get_filename_component\\(PACKAGE_PREFIX_DIR \"\\\${CMAKE_CURRENT_LIST_DIR}/\\.\\.((\\\\|/)\\.\\.)*\" ABSOLUTE\\)" - "get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE)" - _contents "${_contents}") # This is a meson-related workaround, see https://github.com/mesonbuild/meson/issues/6955 + #This correction is not correct for all cases. To make it correct for all cases it needs to consider + #original folder deepness to CURRENT_PACKAGES_DIR in comparison to the moved to folder deepness which + #is always at least (>=) 2, e.g. share/${PORT}. Currently the code assumes it is always 2 although + #this requirement is only true for the *Config.cmake. The targets are not required to be in the same + #folder as the *Config.cmake! + if(NOT _vfct_NO_PREFIX_CORRECTION) + string(REGEX REPLACE + "get_filename_component\\(_IMPORT_PREFIX \"\\\${CMAKE_CURRENT_LIST_FILE}\" PATH\\)(\nget_filename_component\\(_IMPORT_PREFIX \"\\\${_IMPORT_PREFIX}\" PATH\\))*" + "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" + _contents "${_contents}") # see #1044 for details why this replacement is necessary. See #4782 why it must be a regex. + string(REGEX REPLACE + "get_filename_component\\(PACKAGE_PREFIX_DIR \"\\\${CMAKE_CURRENT_LIST_DIR}/\\.\\./(\\.\\./)*\" ABSOLUTE\\)" + "get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE)" + _contents "${_contents}") + string(REGEX REPLACE + "get_filename_component\\(PACKAGE_PREFIX_DIR \"\\\${CMAKE_CURRENT_LIST_DIR}/\\.\\.((\\\\|/)\\.\\.)*\" ABSOLUTE\\)" + "get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE)" + _contents "${_contents}") # This is a meson-related workaround, see https://github.com/mesonbuild/meson/issues/6955 + endif() + #Fix wrongly absolute paths to install dir with the correct dir using ${_IMPORT_PREFIX} + #This happens if vcpkg built libraries are directly linked to a target instead of using + #an imported target for it. We could add more logic here to identify defect target files. + #Since the replacement here in a multi config build always requires a generator expression + #in front of the absoulte path to ${CURRENT_INSTALLED_DIR}. So the match should always be at + #least >:${CURRENT_INSTALLED_DIR}. + #In general the following generator expressions should be there: + #\$<\$:${CURRENT_INSTALLED_DIR}/debug/lib/somelib> + #and/or + #\$<\$>:${CURRENT_INSTALLED_DIR}/lib/somelib> + #with ${CURRENT_INSTALLED_DIR} being fully expanded string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${_IMPORT_PREFIX}]] _contents "${_contents}") file(WRITE ${MAIN_CMAKE} "${_contents}") endforeach() From 00dba1bbb37fe06fdd0dbf2225167c7f5c60b3b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=82=A5=E7=8C=AB=E9=9B=B6=E9=9B=B6=E4=B8=83?= Date: Thu, 26 Nov 2020 04:09:32 +0800 Subject: [PATCH 0172/1694] [vcpkg] Fix redefinition for OVERLAY_TRIPLETS_ENV (#14744) * Update vcpkgcmdarguments.cpp Fix the bug for master branch, the var of OVERLAY_TRIPLETS_ENV be defined two times (the lines of 923 and 925 ) [69/83] Building CXX object CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o FAILED: CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o /usr/local/bin/g++-6 -DVCPKG_USE_STD_FILESYSTEM=0 -I../include -O3 -DNDEBUG -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.14.sdk -include /Users/lizhipeng/develop/project/git_project/opensource/c++/vcpkg/toolsrc/include/pch.h -std=c++1z -MD -MT CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o -MF CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o.d -o CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o -c ../src/vcpkg/vcpkgcmdarguments.cpp ../src/vcpkg/vcpkgcmdarguments.cpp:925:48: error: redefinition of 'constexpr const vcpkg::StringLiteral vcpkg::VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV' constexpr StringLiteral VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV; ^~~~~~~~~~~~~~~~~~~~ In file included from ../src/vcpkg/vcpkgcmdarguments.cpp:9:0: ../include/vcpkg/vcpkgcmdarguments.h:145:40: note: 'constexpr const vcpkg::StringLiteral vcpkg::VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV' previously defined here constexpr static StringLiteral OVERLAY_TRIPLETS_ENV = "VCPKG_OVERLAY_TRIPLETS"; * Update toolsrc/src/vcpkg/vcpkgcmdarguments.cpp Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- toolsrc/src/vcpkg/vcpkgcmdarguments.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp index ec4eef3a8a8370..d6634985e34cc8 100644 --- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp +++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp @@ -922,7 +922,6 @@ namespace vcpkg constexpr StringLiteral VcpkgCmdArguments::OVERLAY_PORTS_ARG; constexpr StringLiteral VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV; constexpr StringLiteral VcpkgCmdArguments::OVERLAY_TRIPLETS_ARG; - constexpr StringLiteral VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV; constexpr StringLiteral VcpkgCmdArguments::BINARY_SOURCES_ARG; From 9cb3fd1524cf9acc61ced20575fe6bfb82c3a3a7 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Wed, 25 Nov 2020 12:45:36 -0800 Subject: [PATCH 0173/1694] [vcpkg msbuild] Fix the issues introduced in 13755 (#14772) * Fix the issues introduced in 13755 Fixes #14735 * add VcpkgRoot != '' --- scripts/buildsystems/msbuild/vcpkg.props | 2 +- scripts/buildsystems/msbuild/vcpkg.targets | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/buildsystems/msbuild/vcpkg.props b/scripts/buildsystems/msbuild/vcpkg.props index f9f5511f0d24c0..f0806025da4ccd 100644 --- a/scripts/buildsystems/msbuild/vcpkg.props +++ b/scripts/buildsystems/msbuild/vcpkg.props @@ -28,7 +28,7 @@ false true - $([MSbuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), vcpkg.json)) + $([MSbuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), vcpkg.json)) diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 488fd070c2534d..3c0791aabb6f6a 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -13,12 +13,19 @@ $([System.IO.Path]::Combine($(VcpkgRoot), 'scripts\buildsystems\msbuild\vcpkg-general.xml')) + $(VcpkgRoot)\ + $(VcpkgManifestRoot)\ + $([System.IO.Path]::Combine($(VcpkgRoot), 'installed')) $([System.IO.Path]::Combine($(VcpkgManifestRoot), 'vcpkg_installed')) + $(VcpkgInstalledDir)\ + $([System.IO.Path]::Combine($(VcpkgInstalledDir), $(VcpkgTriplet))) $(VcpkgCurrentInstalledDir)\ + Debug Release + debug\ true @@ -44,9 +51,9 @@ - - From 6636a2dbc8fbd01c2992cbc85131753f670f844f Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 27 Nov 2020 07:05:51 +0800 Subject: [PATCH 0174/1694] [ebml/gppanel/matroska/polyhook2/unrar] Fix typos in CONTROL files (#14794) --- ports/ebml/CONTROL | 2 +- ports/gppanel/CONTROL | 2 +- ports/matroska/CONTROL | 2 +- ports/polyhook2/CONTROL | 2 +- ports/unrar/CONTROL | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/ebml/CONTROL b/ports/ebml/CONTROL index 3f16f2ebda3a65..7e491e6fcc9bc7 100644 --- a/ports/ebml/CONTROL +++ b/ports/ebml/CONTROL @@ -1,5 +1,5 @@ Source: ebml Version: 1.4.0 Homepage: https://github.com/Matroska-Org/libebml -Description: a C++ libary to parse EBML files +Description: a C++ library to parse EBML files Supports: !uwp \ No newline at end of file diff --git a/ports/gppanel/CONTROL b/ports/gppanel/CONTROL index f081193dfcfc57..5b6bfcbbef4bfb 100644 --- a/ports/gppanel/CONTROL +++ b/ports/gppanel/CONTROL @@ -2,4 +2,4 @@ Source: gppanel Version: 2020-05-20 Build-Depends: wxwidgets Homepage: https://github.com/woollybah/gppanel -Description: gpPanel is chart libary for wxWidget. It inheritance from wxPanel and use modified wxMathPlot library at chart engine. +Description: gpPanel is chart library for wxWidget. It inheritance from wxPanel and use modified wxMathPlot library at chart engine. diff --git a/ports/matroska/CONTROL b/ports/matroska/CONTROL index 81345c1eb8b58b..ba4f33c2c02b68 100644 --- a/ports/matroska/CONTROL +++ b/ports/matroska/CONTROL @@ -1,6 +1,6 @@ Source: matroska Version: 1.6.2 Homepage: https://github.com/Matroska-Org/libmatroska -Description: a C++ libary to parse Matroska files (.mkv and .mka) +Description: a C++ library to parse Matroska files (.mkv and .mka) Build-Depends: ebml Supports: !uwp \ No newline at end of file diff --git a/ports/polyhook2/CONTROL b/ports/polyhook2/CONTROL index 753b7756f701d3..2bd7dcbbefb42a 100644 --- a/ports/polyhook2/CONTROL +++ b/ports/polyhook2/CONTROL @@ -1,7 +1,7 @@ Source: polyhook2 Version: 2020-09-22 Homepage: https://github.com/stevemk14ebr/PolyHook_2_0 -Description: C++17, x86/x64 Hooking Libary v2.0 +Description: C++17, x86/x64 Hooking Library v2.0 Supports: !(arm|uwp|linux|osx) Default-Features: capstone,zydis,exception,detours,inlinentd,pe,virtuals diff --git a/ports/unrar/CONTROL b/ports/unrar/CONTROL index 26a52bd1dc0af1..1d3149fe52f7e4 100644 --- a/ports/unrar/CONTROL +++ b/ports/unrar/CONTROL @@ -1,4 +1,4 @@ Source: unrar Version: 5.8.1 Homepage: https://www.rarlab.com -Description: rarlab's unrar libary +Description: rarlab's unrar library From c85437573dc4ff049787fe4fb2f49711eeef0c98 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Fri, 27 Nov 2020 05:44:21 -0800 Subject: [PATCH 0175/1694] [vcpkg] Implement VersionedPortfileProvider and BaselineProvider (#14123) * WIP: Get versions from database files * Fix formatting * Provider inherits ResourceBase * Correct versions JSON file location * Fix formatting * Fix formatting * Fix include in versions.h * Fetch port versions using git tree object * Undo changes to x-history * Remove unnecesary moves Co-authored-by: nicole mazzuca * Extract Git manipulation code * [WIP] Review comments * [WIP] Review comments pt. 2 * [WIP] Review comments / fix formatting * Generate baseline.json * Extract deserializers from registries source file * BaselineProvider initial implementation * Modify gitignore * Update .gitignore again * Use JSON deserializer for versions db * Lazy load baseline file * Fetch baseline.json from baseline commit * More git abstractions * Clean up code * Path helpers * Formatting * Move data into impl object * Use implementation object for VersionedPortfileProvider * Reuse cloned instance for checkouts * Code cleanup and formatting * Fix returning dangling reference * Prepare to remove files in port_versions/ * Remove files in port_versions/ * Update .gitignore * Some PR review comments * Use StringView * More StringView conversions * More refactoring * Make some implementation members private * Functions for parsing baseline and version files * Hide deserializers implementation * Check for `versions` feature flag in registries. Co-authored-by: Robert Schumacher Co-authored-by: nicole mazzuca --- .gitignore | 2 + scripts/generatePortVersionsDb.py | 71 +++++-- toolsrc/include/vcpkg/base/jsonreader.h | 3 +- toolsrc/include/vcpkg/portfileprovider.h | 45 ++++ toolsrc/include/vcpkg/vcpkgpaths.h | 27 +++ toolsrc/include/vcpkg/versiondeserializers.h | 37 ++++ toolsrc/include/vcpkg/versions.h | 21 ++ toolsrc/src/vcpkg/portfileprovider.cpp | 190 ++++++++++++++++- toolsrc/src/vcpkg/registries.cpp | 83 ++------ toolsrc/src/vcpkg/vcpkgpaths.cpp | 193 +++++++++++++++++ toolsrc/src/vcpkg/versiondeserializers.cpp | 210 +++++++++++++++++++ toolsrc/src/vcpkg/versions.cpp | 34 +++ toolsrc/windows-bootstrap/vcpkg.vcxproj | 3 + 13 files changed, 832 insertions(+), 87 deletions(-) create mode 100644 toolsrc/include/vcpkg/versiondeserializers.h create mode 100644 toolsrc/src/vcpkg/versiondeserializers.cpp create mode 100644 toolsrc/src/vcpkg/versions.cpp diff --git a/.gitignore b/.gitignore index ed388f4a1c7a48..d12fd1363f3bab 100644 --- a/.gitignore +++ b/.gitignore @@ -295,6 +295,8 @@ __pycache__/ /toolsrc/windows-bootstrap/msbuild.x86.release/ /toolsrc/windows-bootstrap/msbuild.x64.debug/ /toolsrc/windows-bootstrap/msbuild.x64.release/ +#ignore db +/port_versions/ #ignore custom triplets /triplets/* #add vcpkg-designed triplets back in diff --git a/scripts/generatePortVersionsDb.py b/scripts/generatePortVersionsDb.py index cefd61e1c9e912..e3c338c64ebcdc 100644 --- a/scripts/generatePortVersionsDb.py +++ b/scripts/generatePortVersionsDb.py @@ -4,6 +4,7 @@ import subprocess import json import time +import shutil from subprocess import CalledProcessError from json.decoder import JSONDecodeError @@ -14,9 +15,9 @@ def get_current_git_ref(): - output = subprocess.run(['git.exe', '-C', SCRIPT_DIRECTORY, 'rev-parse', '--verify', 'HEAD'], - capture_output=True, - encoding='utf-8') + output = subprocess.run(['git', '-C', SCRIPT_DIRECTORY, 'rev-parse', '--verify', 'HEAD'], + capture_output=True, + encoding='utf-8') if output.returncode == 0: return output.stdout.strip() print(f"Failed to get git ref:", output.stderr.strip(), file=sys.stderr) @@ -25,47 +26,89 @@ def get_current_git_ref(): def generate_port_versions_db(ports_path, db_path, revision): start_time = time.time() - port_names = [item for item in os.listdir(ports_path) if os.path.isdir(os.path.join(ports_path, item))] + + # Assume each directory in ${VCPKG_ROOT}/ports is a different port + port_names = [item for item in os.listdir( + ports_path) if os.path.isdir(os.path.join(ports_path, item))] + port_names.sort() total_count = len(port_names) + + # Dictionary to collect the latest version of each port as baseline + baseline_objects = {} + baseline_objects['default'] = {} + for counter, port_name in enumerate(port_names): containing_dir = os.path.join(db_path, f'{port_name[0]}-') os.makedirs(containing_dir, exist_ok=True) + output_filepath = os.path.join(containing_dir, f'{port_name}.json') - if not os.path.exists(output_filepath): + if not os.path.exists(output_filepath): output = subprocess.run( - [os.path.join(SCRIPT_DIRECTORY, '../vcpkg'), 'x-history', port_name, '--x-json'], + [os.path.join(SCRIPT_DIRECTORY, '../vcpkg'), + 'x-history', port_name, '--x-json'], capture_output=True, encoding='utf-8') + if output.returncode == 0: try: versions_object = json.loads(output.stdout) + + # Put latest version in baseline dictionary + latest_version = versions_object["versions"][0] + baseline_objects['default'][port_name] = { + "version-string": latest_version["version-string"], + "port-version": latest_version["port-version"] + } with open(output_filepath, 'w') as output_file: json.dump(versions_object, output_file) except JSONDecodeError: - print(f'Maformed JSON from vcpkg x-history {port_name}: ', output.stdout.strip(), file=sys.stderr) + print( + f'Malformed JSON from vcpkg x-history {port_name}: ', output.stdout.strip(), file=sys.stderr) else: - print(f'x-history {port_name} failed: ', output.stdout.strip(), file=sys.stderr) + print(f'x-history {port_name} failed: ', + output.stdout.strip(), file=sys.stderr) + # This should be replaced by a progress bar if counter > 0 and counter % 100 == 0: elapsed_time = time.time() - start_time - print(f'Processed {counter} out of {total_count}. Elapsed time: {elapsed_time:.2f} seconds') + print( + f'Processed {counter} out of {total_count}. Elapsed time: {elapsed_time:.2f} seconds') + + # Generate baseline.json + baseline_file_path = os.path.join(db_path, 'baseline.json') + with open(baseline_file_path, 'w') as baseline_output_file: + json.dump(baseline_objects, baseline_output_file) + + # Generate timestamp rev_file = os.path.join(db_path, revision) Path(rev_file).touch() + elapsed_time = time.time() - start_time - print(f'Processed {total_count} total ports. Elapsed time: {elapsed_time:.2f} seconds') - + print( + f'Processed {total_count} total ports. Elapsed time: {elapsed_time:.2f} seconds') + def main(ports_path, db_path): revision = get_current_git_ref() if not revision: print('Couldn\'t fetch current Git revision', file=sys.stderr) sys.exit(1) + rev_file = os.path.join(db_path, revision) if os.path.exists(rev_file): print(f'Database files already exist for commit {revision}') sys.exit(0) - generate_port_versions_db(ports_path=ports_path, db_path=db_path, revision=revision) + + if (os.path.exists(db_path)): + try: + shutil.rmtree(db_path) + except OSError as e: + print(f'Could not delete folder: {db_path}.\nError: {e.strerror}') + + generate_port_versions_db(ports_path=ports_path, + db_path=db_path, + revision=revision) if __name__ == "__main__": - main(ports_path=os.path.join(SCRIPT_DIRECTORY, '../ports'), - db_path=os.path.join(SCRIPT_DIRECTORY, '../port_versions')) + main(ports_path=os.path.join(SCRIPT_DIRECTORY, '../ports'), + db_path=os.path.join(SCRIPT_DIRECTORY, '../port_versions')) diff --git a/toolsrc/include/vcpkg/base/jsonreader.h b/toolsrc/include/vcpkg/base/jsonreader.h index cdd0299d2ff6ad..02c1936e251e57 100644 --- a/toolsrc/include/vcpkg/base/jsonreader.h +++ b/toolsrc/include/vcpkg/base/jsonreader.h @@ -23,7 +23,7 @@ namespace vcpkg::Json Optional visit(Reader&, const Value&); Optional visit(Reader&, const Object&); - protected: + public: virtual Optional visit_null(Reader&); virtual Optional visit_boolean(Reader&, bool); virtual Optional visit_integer(Reader& r, int64_t i); @@ -33,6 +33,7 @@ namespace vcpkg::Json virtual Optional visit_object(Reader&, const Object&); virtual View valid_fields() const; + protected: IDeserializer() = default; IDeserializer(const IDeserializer&) = default; IDeserializer& operator=(const IDeserializer&) = default; diff --git a/toolsrc/include/vcpkg/portfileprovider.h b/toolsrc/include/vcpkg/portfileprovider.h index c127aed40ad77a..610ecb73507278 100644 --- a/toolsrc/include/vcpkg/portfileprovider.h +++ b/toolsrc/include/vcpkg/portfileprovider.h @@ -6,6 +6,7 @@ #include #include +#include namespace vcpkg::PortFileProvider { @@ -36,4 +37,48 @@ namespace vcpkg::PortFileProvider std::vector overlay_ports; mutable std::unordered_map cache; }; + + struct IVersionedPortfileProvider + { + virtual const std::vector& get_port_versions(StringView port_name) const = 0; + + virtual ExpectedS get_control_file( + const vcpkg::Versions::VersionSpec& version_spec) const = 0; + }; + + struct IBaselineProvider + { + virtual Optional get_baseline_version(StringView port_name) const = 0; + }; + + namespace details + { + struct BaselineProviderImpl; + struct VersionedPortfileProviderImpl; + } + + struct VersionedPortfileProvider : IVersionedPortfileProvider, Util::ResourceBase + { + explicit VersionedPortfileProvider(const vcpkg::VcpkgPaths& paths); + ~VersionedPortfileProvider(); + + const std::vector& get_port_versions(StringView port_name) const override; + + ExpectedS get_control_file( + const vcpkg::Versions::VersionSpec& version_spec) const override; + + private: + std::unique_ptr m_impl; + }; + + struct BaselineProvider : IBaselineProvider, Util::ResourceBase + { + explicit BaselineProvider(const vcpkg::VcpkgPaths& paths, const std::string& baseline); + ~BaselineProvider(); + + Optional get_baseline_version(StringView port_name) const override; + + private: + std::unique_ptr m_impl; + }; } diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index def874e7c33ea0..c85eff0ca38025 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -102,11 +102,23 @@ namespace vcpkg fs::path vcpkg_dir_info; fs::path vcpkg_dir_updates; + fs::path baselines_dot_git_dir; + fs::path baselines_work_tree; + fs::path baselines_output; + + fs::path versions_dot_git_dir; + fs::path versions_work_tree; + fs::path versions_output; + fs::path ports_cmake; const fs::path& get_tool_exe(const std::string& tool) const; const std::string& get_tool_version(const std::string& tool) const; + // Git manipulation + fs::path git_checkout_baseline(Files::Filesystem& filesystem, StringView commit_sha) const; + fs::path git_checkout_port(Files::Filesystem& filesystem, StringView port_name, StringView git_tree) const; + Optional get_manifest() const; Optional get_manifest_path() const; const Configuration& get_configuration() const; @@ -133,5 +145,20 @@ namespace vcpkg private: std::unique_ptr m_pimpl; + + static void git_checkout_subpath(const VcpkgPaths& paths, + StringView commit_sha, + const fs::path& subpath, + const fs::path& local_repo, + const fs::path& destination, + const fs::path& dot_git_dir, + const fs::path& work_tree); + + static void git_checkout_object(const VcpkgPaths& paths, + StringView git_object, + const fs::path& local_repo, + const fs::path& destination, + const fs::path& dot_git_dir, + const fs::path& work_tree); }; } diff --git a/toolsrc/include/vcpkg/versiondeserializers.h b/toolsrc/include/vcpkg/versiondeserializers.h new file mode 100644 index 00000000000000..f5ffda101e2293 --- /dev/null +++ b/toolsrc/include/vcpkg/versiondeserializers.h @@ -0,0 +1,37 @@ +#pragma once + +#include + +#include +#include + +#include +#include + +namespace vcpkg +{ + struct VersionDbEntry + { + VersionT version; + Versions::Scheme scheme; + std::string git_tree; + + VersionDbEntry(const std::string& version_string, + int port_version, + Versions::Scheme scheme, + const std::string& git_tree) + : version(VersionT(version_string, port_version)), scheme(scheme), git_tree(git_tree) + { + } + }; + + Json::IDeserializer& get_versiont_deserializer_instance(); + + ExpectedS>> parse_baseline_file(Files::Filesystem& fs, + StringView baseline_name, + const fs::path& baseline_file_path); + + ExpectedS> parse_versions_file(Files::Filesystem& fs, + StringView port_name, + const fs::path& versions_file_path); +} \ No newline at end of file diff --git a/toolsrc/include/vcpkg/versions.h b/toolsrc/include/vcpkg/versions.h index 55586ddcc5fa55..7d5b573c23cb9f 100644 --- a/toolsrc/include/vcpkg/versions.h +++ b/toolsrc/include/vcpkg/versions.h @@ -1,5 +1,7 @@ #pragma once +#include + namespace vcpkg::Versions { enum class Scheme @@ -10,6 +12,25 @@ namespace vcpkg::Versions String }; + struct VersionSpec + { + std::string port_name; + VersionT version; + Scheme scheme; + + VersionSpec(const std::string& port_name, const VersionT& version, Scheme scheme); + + VersionSpec(const std::string& port_name, const std::string& version_string, int port_version, Scheme scheme); + + friend bool operator==(const VersionSpec& lhs, const VersionSpec& rhs); + friend bool operator!=(const VersionSpec& lhs, const VersionSpec& rhs); + }; + + struct VersionSpecHasher + { + std::size_t operator()(const VersionSpec& key) const; + }; + struct Constraint { enum class Type diff --git a/toolsrc/src/vcpkg/portfileprovider.cpp b/toolsrc/src/vcpkg/portfileprovider.cpp index 9c09a23e4fb00b..e3053bfa627be1 100644 --- a/toolsrc/src/vcpkg/portfileprovider.cpp +++ b/toolsrc/src/vcpkg/portfileprovider.cpp @@ -1,3 +1,6 @@ + + +#include #include #include @@ -7,6 +10,33 @@ #include #include #include +#include + +#include + +using namespace vcpkg; +using namespace Versions; + +namespace +{ + Optional get_versions_json_path(const VcpkgPaths& paths, StringView port_name) + { + const auto port_versions_dir_path = paths.root / fs::u8path("port_versions"); + const auto subpath = Strings::concat(port_name.substr(0, 1), "-/", port_name, ".json"); + const auto json_path = port_versions_dir_path / subpath; + if (paths.get_filesystem().exists(json_path)) + { + return json_path; + } + return nullopt; + } + + Optional get_baseline_json_path(const VcpkgPaths& paths, StringView baseline_commit_sha) + { + const auto baseline_json = paths.git_checkout_baseline(paths.get_filesystem(), baseline_commit_sha); + return paths.get_filesystem().exists(baseline_json) ? make_optional(baseline_json) : nullopt; + } +} namespace vcpkg::PortFileProvider { @@ -27,7 +57,7 @@ namespace vcpkg::PortFileProvider return Util::fmap(ports, [](auto&& kvpair) -> const SourceControlFileLocation* { return &kvpair.second; }); } - PathsPortFileProvider::PathsPortFileProvider(const vcpkg::VcpkgPaths& paths_, + PathsPortFileProvider::PathsPortFileProvider(const VcpkgPaths& paths_, const std::vector& overlay_ports_) : paths(paths_) { @@ -80,7 +110,7 @@ namespace vcpkg::PortFileProvider } else { - vcpkg::print_error_message(maybe_scf.error()); + print_error_message(maybe_scf.error()); Checks::exit_with_message( VCPKG_LINE_INFO, "Error: Failed to load port %s from %s", spec, fs::u8string(ports_dir)); } @@ -106,7 +136,7 @@ namespace vcpkg::PortFileProvider } else { - vcpkg::print_error_message(found_scf.error()); + print_error_message(found_scf.error()); Checks::exit_with_message( VCPKG_LINE_INFO, "Error: Failed to load port %s from %s", spec, fs::u8string(ports_dir)); } @@ -148,7 +178,7 @@ namespace vcpkg::PortFileProvider } else { - vcpkg::print_error_message(found_scf.error()); + print_error_message(found_scf.error()); Checks::exit_with_message( VCPKG_LINE_INFO, "Error: Failed to load port %s from %s", spec, fs::u8string(port_directory)); } @@ -224,7 +254,7 @@ namespace vcpkg::PortFileProvider } else { - vcpkg::print_error_message(maybe_scf.error()); + print_error_message(maybe_scf.error()); Checks::exit_with_message( VCPKG_LINE_INFO, "Error: Failed to load port from %s", fs::u8string(ports_dir)); } @@ -257,4 +287,154 @@ namespace vcpkg::PortFileProvider return ret; } + + namespace details + { + struct BaselineProviderImpl + { + BaselineProviderImpl(const VcpkgPaths& paths, const std::string& baseline) + : paths(paths), baseline(baseline) + { + } + ~BaselineProviderImpl() { } + + const std::map>& get_baseline_cache() const + { + return baseline_cache.get_lazy([&]() -> auto { + auto maybe_baseline_file = get_baseline_json_path(paths, baseline); + Checks::check_exit(VCPKG_LINE_INFO, maybe_baseline_file.has_value(), "Couldn't find baseline.json"); + auto baseline_file = maybe_baseline_file.value_or_exit(VCPKG_LINE_INFO); + + auto maybe_baselines_map = parse_baseline_file(paths.get_filesystem(), "default", baseline_file); + Checks::check_exit(VCPKG_LINE_INFO, + maybe_baselines_map.has_value(), + "Error: Couldn't parse baseline `%s` from `%s`", + "default", + fs::u8string(baseline_file)); + auto baselines_map = *maybe_baselines_map.get(); + return std::move(baselines_map); + }); + } + + private: + const VcpkgPaths& paths; + const std::string baseline; + Lazy>> baseline_cache; + }; + + struct VersionedPortfileProviderImpl + { + std::map> versions_cache; + std::unordered_map git_tree_cache; + std::unordered_map control_cache; + + VersionedPortfileProviderImpl(const VcpkgPaths& paths) : paths(paths) { } + ~VersionedPortfileProviderImpl() { } + + const VcpkgPaths& get_paths() const { return paths; } + Files::Filesystem& get_filesystem() const { return paths.get_filesystem(); } + + private: + const VcpkgPaths& paths; + }; + } + + VersionedPortfileProvider::VersionedPortfileProvider(const VcpkgPaths& paths) + : m_impl(std::make_unique(paths)) + { + } + VersionedPortfileProvider::~VersionedPortfileProvider() { } + + const std::vector& VersionedPortfileProvider::get_port_versions(StringView port_name) const + { + auto cache_it = m_impl->versions_cache.find(port_name.to_string()); + if (cache_it != m_impl->versions_cache.end()) + { + return cache_it->second; + } + + auto maybe_versions_file_path = get_versions_json_path(m_impl->get_paths(), port_name); + Checks::check_exit(VCPKG_LINE_INFO, + maybe_versions_file_path.has_value(), + "Error: Couldn't find a versions database file: %s.json.", + port_name); + auto versions_file_path = maybe_versions_file_path.value_or_exit(VCPKG_LINE_INFO); + + auto maybe_version_entries = parse_versions_file(m_impl->get_filesystem(), port_name, versions_file_path); + Checks::check_exit(VCPKG_LINE_INFO, + maybe_version_entries.has_value(), + "Error: Couldn't parse versions from file: %s", + fs::u8string(versions_file_path)); + auto version_entries = maybe_version_entries.value_or_exit(VCPKG_LINE_INFO); + + auto port = port_name.to_string(); + for (auto&& version_entry : version_entries) + { + VersionSpec spec(port, version_entry.version, version_entry.scheme); + m_impl->versions_cache[port].push_back(spec); + m_impl->git_tree_cache.emplace(std::move(spec), std::move(version_entry.git_tree)); + } + return m_impl->versions_cache.at(port); + } + + ExpectedS VersionedPortfileProvider::get_control_file( + const VersionSpec& version_spec) const + { + auto cache_it = m_impl->control_cache.find(version_spec); + if (cache_it != m_impl->control_cache.end()) + { + return cache_it->second; + } + + // Pre-populate versions cache. + get_port_versions(version_spec.port_name); + + auto git_tree_cache_it = m_impl->git_tree_cache.find(version_spec); + if (git_tree_cache_it == m_impl->git_tree_cache.end()) + { + return Strings::concat("No git object SHA for entry %s at version %s.", + version_spec.port_name, + version_spec.version.to_string()); + } + + const std::string git_tree = git_tree_cache_it->second; + auto port_directory = + m_impl->get_paths().git_checkout_port(m_impl->get_filesystem(), version_spec.port_name, git_tree); + + auto maybe_control_file = Paragraphs::try_load_port(m_impl->get_filesystem(), port_directory); + if (auto scf = maybe_control_file.get()) + { + if (scf->get()->core_paragraph->name == version_spec.port_name) + { + return m_impl->control_cache + .emplace(version_spec, SourceControlFileLocation{std::move(*scf), std::move(port_directory)}) + .first->second; + } + return Strings::format("Error: Failed to load port from %s: names did not match: '%s' != '%s'", + fs::u8string(port_directory), + version_spec.port_name, + scf->get()->core_paragraph->name); + } + + print_error_message(maybe_control_file.error()); + return Strings::format( + "Error: Failed to load port %s from %s", version_spec.port_name, fs::u8string(port_directory)); + } + + BaselineProvider::BaselineProvider(const VcpkgPaths& paths, const std::string& baseline) + : m_impl(std::make_unique(paths, baseline)) + { + } + BaselineProvider::~BaselineProvider() { } + + Optional BaselineProvider::get_baseline_version(StringView port_name) const + { + const auto& cache = m_impl->get_baseline_cache(); + auto it = cache.find(port_name.to_string()); + if (it != cache.end()) + { + return it->second; + } + return nullopt; + } } diff --git a/toolsrc/src/vcpkg/registries.cpp b/toolsrc/src/vcpkg/registries.cpp index e481685d932252..7794ed9b016326 100644 --- a/toolsrc/src/vcpkg/registries.cpp +++ b/toolsrc/src/vcpkg/registries.cpp @@ -5,7 +5,9 @@ #include #include +#include #include +#include #include #include @@ -70,32 +72,6 @@ namespace } }; - struct VersionTDeserializer final : Json::IDeserializer - { - StringView type_name() const override { return "a version object"; } - View valid_fields() const override - { - static const StringView t[] = {"version-string", "port-version"}; - return t; - } - - Optional visit_object(Json::Reader& r, const Json::Object& obj) override - { - std::string version; - int port_version = 0; - - r.required_object_field(type_name(), obj, "version-string", version, version_deserializer); - r.optional_object_field(obj, "port-version", port_version, Json::NaturalNumberDeserializer::instance); - - return VersionT{std::move(version), port_version}; - } - - static Json::StringDeserializer version_deserializer; - static VersionTDeserializer instance; - }; - Json::StringDeserializer VersionTDeserializer::version_deserializer{"version"}; - VersionTDeserializer VersionTDeserializer::instance; - struct FilesystemVersionEntryDeserializer final : Json::IDeserializer> { StringView type_name() const override { return "a version entry object"; } @@ -109,7 +85,7 @@ namespace { fs::path registry_path; - auto version = VersionTDeserializer::instance.visit_object(r, obj); + auto version = get_versiont_deserializer_instance().visit_object(r, obj); r.required_object_field( "version entry", obj, "registry-path", registry_path, Json::PathDeserializer::instance); @@ -162,30 +138,6 @@ namespace const fs::path& registry_root; }; - struct BaselineDeserializer final : Json::IDeserializer>> - { - StringView type_name() const override { return "a baseline object"; } - - Optional visit_object(Json::Reader& r, const Json::Object& obj) override - { - std::map> result; - - for (auto pr : obj) - { - const auto& version_value = pr.second; - VersionT version; - r.visit_in_key(version_value, pr.first, version, VersionTDeserializer::instance); - - result.emplace(pr.first.to_string(), std::move(version)); - } - - return std::move(result); - } - - static BaselineDeserializer instance; - }; - BaselineDeserializer BaselineDeserializer::instance; - struct FilesystemRegistry final : RegistryImpl { std::unique_ptr get_port_entry(const VcpkgPaths& paths, StringView port_name) const override @@ -267,6 +219,12 @@ namespace Optional get_baseline_version(const VcpkgPaths& paths, StringView port_name) const override { + if (!paths.get_feature_flags().versions) + { + Checks::check_exit(VCPKG_LINE_INFO, + "This invocation failed because the `versions` feature flag is not enabled."); + } + const auto& baseline_cache = baseline.get([this, &paths] { return load_baseline_versions(paths); }); auto it = baseline_cache.find(port_name); if (it != baseline_cache.end()) @@ -310,26 +268,17 @@ namespace Checks::exit_with_message(VCPKG_LINE_INFO, "Error: `baseline.json` does not have a top-level object."); } - const auto& obj = value.first.object(); - auto baseline_value = obj.get("default"); - if (!baseline_value) - { - Checks::exit_with_message( - VCPKG_LINE_INFO, "Error: `baseline.json` does not contain the baseline \"%s\"", "default"); - } - - Json::Reader r; - std::map> result; - r.visit_in_key(*baseline_value, "default", result, BaselineDeserializer::instance); - - if (r.errors().empty()) + auto maybe_baseline_versions = parse_baseline_file(paths.get_filesystem(), "default", baseline_file); + if (auto baseline_versions = maybe_baseline_versions.get()) { - return result; + return std::move(*baseline_versions); } else { - Checks::exit_with_message( - VCPKG_LINE_INFO, "Error: failed to parse `baseline.json`:\n%s", Strings::join("\n", r.errors())); + Checks::exit_with_message(VCPKG_LINE_INFO, + "Error: failed to parse `%s`:\n%s", + fs::u8string(baseline_file), + maybe_baseline_versions.error()); } } diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index a3ab21629e1f7d..5b33b8db44e47b 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -71,6 +71,15 @@ namespace return result; } + System::CmdLineBuilder git_cmd_builder(const VcpkgPaths& paths, + const fs::path& dot_git_dir, + const fs::path& work_tree) + { + return System::CmdLineBuilder() + .path_arg(paths.get_tool_exe(Tools::GIT)) + .string_arg(Strings::concat("--git-dir=", fs::u8string(dot_git_dir))) + .string_arg(Strings::concat("--work-tree=", fs::u8string(work_tree))); + } } // unnamed namespace namespace vcpkg @@ -353,6 +362,18 @@ If you wish to silence this error and use classic mode, you can: vcpkg_dir_info = vcpkg_dir / fs::u8path("info"); vcpkg_dir_updates = vcpkg_dir / fs::u8path("updates"); + // Versioning paths + const auto versioning_tmp = buildtrees / fs::u8path("versioning_tmp"); + const auto versioning_output = buildtrees / fs::u8path("versioning"); + + baselines_dot_git_dir = versioning_tmp / fs::u8path(".baselines.git"); + baselines_work_tree = versioning_tmp / fs::u8path("baselines-worktree"); + baselines_output = versioning_output / fs::u8path("baselines"); + + versions_dot_git_dir = versioning_tmp / fs::u8path(".versions.git"); + versions_work_tree = versioning_tmp / fs::u8path("versions-worktree"); + versions_output = versioning_output / fs::u8path("versions"); + ports_cmake = filesystem.canonical(VCPKG_LINE_INFO, scripts / fs::u8path("ports.cmake")); for (auto&& overlay_triplets_dir : args.overlay_triplets) @@ -456,6 +477,178 @@ If you wish to silence this error and use classic mode, you can: return m_pimpl->m_tool_cache->get_tool_version(*this, tool); } + void VcpkgPaths::git_checkout_subpath(const VcpkgPaths& paths, + StringView commit_sha, + const fs::path& subpath, + const fs::path& local_repo, + const fs::path& destination, + const fs::path& dot_git_dir, + const fs::path& work_tree) + { + Files::Filesystem& fs = paths.get_filesystem(); + fs.remove_all(work_tree, VCPKG_LINE_INFO); + fs.remove_all(destination, VCPKG_LINE_INFO); + fs.remove_all(dot_git_dir, VCPKG_LINE_INFO); + + // All git commands are run with: --git-dir={dot_git_dir} --work-tree={work_tree_temp} + // git clone --no-checkout --local {vcpkg_root} {dot_git_dir} + System::CmdLineBuilder clone_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree) + .string_arg("clone") + .string_arg("--no-checkout") + .string_arg("--local") + .path_arg(local_repo) + .path_arg(dot_git_dir); + const auto clone_output = System::cmd_execute_and_capture_output(clone_cmd_builder.extract()); + Checks::check_exit(VCPKG_LINE_INFO, + clone_output.exit_code == 0, + "Failed to clone temporary vcpkg instance.\n%s\n", + clone_output.output); + + // git checkout {commit-sha} -- {subpath} + System::CmdLineBuilder checkout_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree) + .string_arg("checkout") + .string_arg(commit_sha) + .string_arg("--") + .path_arg(subpath); + const auto checkout_output = System::cmd_execute_and_capture_output(checkout_cmd_builder.extract()); + Checks::check_exit(VCPKG_LINE_INFO, + checkout_output.exit_code == 0, + "Error: Failed to checkout %s:%s\n%s\n", + commit_sha, + fs::u8string(subpath), + checkout_output.output); + + const fs::path checked_out_path = work_tree / subpath; + const auto& containing_folder = destination.parent_path(); + if (!fs.exists(containing_folder)) + { + fs.create_directories(containing_folder, VCPKG_LINE_INFO); + } + + std::error_code ec; + fs.rename_or_copy(checked_out_path, destination, ".tmp", ec); + fs.remove_all(work_tree, VCPKG_LINE_INFO); + fs.remove_all(dot_git_dir, VCPKG_LINE_INFO); + if (ec) + { + System::printf(System::Color::error, + "Error: Couldn't move checked out files from %s to destination %s", + fs::u8string(checked_out_path), + fs::u8string(destination)); + Checks::exit_fail(VCPKG_LINE_INFO); + } + } + + void VcpkgPaths::git_checkout_object(const VcpkgPaths& paths, + StringView git_object, + const fs::path& local_repo, + const fs::path& destination, + const fs::path& dot_git_dir, + const fs::path& work_tree) + { + Files::Filesystem& fs = paths.get_filesystem(); + fs.remove_all(work_tree, VCPKG_LINE_INFO); + fs.remove_all(destination, VCPKG_LINE_INFO); + + if (!fs.exists(dot_git_dir)) + { + // All git commands are run with: --git-dir={dot_git_dir} --work-tree={work_tree_temp} + // git clone --no-checkout --local {vcpkg_root} {dot_git_dir} + System::CmdLineBuilder clone_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree) + .string_arg("clone") + .string_arg("--no-checkout") + .string_arg("--local") + .path_arg(local_repo) + .path_arg(dot_git_dir); + const auto clone_output = System::cmd_execute_and_capture_output(clone_cmd_builder.extract()); + Checks::check_exit(VCPKG_LINE_INFO, + clone_output.exit_code == 0, + "Failed to clone temporary vcpkg instance.\n%s\n", + clone_output.output); + } + else + { + System::CmdLineBuilder fetch_cmd_builder = + git_cmd_builder(paths, dot_git_dir, work_tree).string_arg("fetch"); + const auto fetch_output = System::cmd_execute_and_capture_output(fetch_cmd_builder.extract()); + Checks::check_exit(VCPKG_LINE_INFO, + fetch_output.exit_code == 0, + "Failed to update refs on temporary vcpkg repository.\n%s\n", + fetch_output.output); + } + + if (!fs.exists(work_tree)) + { + fs.create_directories(work_tree, VCPKG_LINE_INFO); + } + + // git checkout {tree_object} . + System::CmdLineBuilder checkout_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree) + .string_arg("checkout") + .string_arg(git_object) + .string_arg("."); + const auto checkout_output = System::cmd_execute_and_capture_output(checkout_cmd_builder.extract()); + Checks::check_exit(VCPKG_LINE_INFO, checkout_output.exit_code == 0, "Failed to checkout %s", git_object); + + const auto& containing_folder = destination.parent_path(); + if (!fs.exists(containing_folder)) + { + fs.create_directories(containing_folder, VCPKG_LINE_INFO); + } + + std::error_code ec; + fs.rename_or_copy(work_tree, destination, ".tmp", ec); + fs.remove_all(work_tree, VCPKG_LINE_INFO); + if (ec) + { + System::printf(System::Color::error, + "Error: Couldn't move checked out files from %s to destination %s", + fs::u8string(work_tree), + fs::u8string(destination)); + Checks::exit_fail(VCPKG_LINE_INFO); + } + } + + fs::path VcpkgPaths::git_checkout_baseline(Files::Filesystem& fs, StringView commit_sha) const + { + const fs::path local_repo = this->root; + const fs::path destination = this->baselines_output / fs::u8path(commit_sha) / fs::u8path("baseline.json"); + const fs::path baseline_subpath = fs::u8path("port_versions") / fs::u8path("baseline.json"); + + if (!fs.exists(destination)) + { + git_checkout_subpath(*this, + commit_sha, + baseline_subpath, + local_repo, + destination, + this->baselines_dot_git_dir, + this->baselines_work_tree); + } + return destination; + } + + fs::path VcpkgPaths::git_checkout_port(Files::Filesystem& fs, StringView port_name, StringView git_tree) const + { + /* Clone a new vcpkg repository instance using the local instance as base. + * + * The `--git-dir` directory will store all the Git metadata files, + * and the `--work-tree` is the directory where files will be checked out. + * + * Since we are checking a git tree object, all files will be checked out to the root of `work-tree`. + * Because of that, it makes sense to use the git hash as the name for the directory. + */ + const fs::path local_repo = this->root; + const fs::path destination = this->versions_output / fs::u8path(git_tree) / fs::u8path(port_name); + + if (!fs.exists(destination / "CONTROL") && !fs.exists(destination / "vcpkg.json")) + { + git_checkout_object( + *this, git_tree, local_repo, destination, this->versions_dot_git_dir, this->versions_work_tree); + } + return destination; + } + Optional VcpkgPaths::get_manifest() const { if (auto p = m_pimpl->m_manifest_doc.get()) diff --git a/toolsrc/src/vcpkg/versiondeserializers.cpp b/toolsrc/src/vcpkg/versiondeserializers.cpp new file mode 100644 index 00000000000000..276b70e4fa817a --- /dev/null +++ b/toolsrc/src/vcpkg/versiondeserializers.cpp @@ -0,0 +1,210 @@ +#include + +using namespace vcpkg; +using namespace vcpkg::Versions; + +namespace +{ + struct VersionDbEntryDeserializer final : Json::IDeserializer + { + static constexpr StringLiteral VERSION_RELAXED = "version"; + static constexpr StringLiteral VERSION_SEMVER = "version-semver"; + static constexpr StringLiteral VERSION_STRING = "version-string"; + static constexpr StringLiteral VERSION_DATE = "version-date"; + static constexpr StringLiteral PORT_VERSION = "port-version"; + static constexpr StringLiteral GIT_TREE = "git-tree"; + + StringView type_name() const override { return "a version database entry"; } + View valid_fields() const override + { + static const StringView t[] = { + VERSION_RELAXED, VERSION_SEMVER, VERSION_STRING, VERSION_DATE, PORT_VERSION, GIT_TREE}; + return t; + } + + Optional visit_object(Json::Reader& r, const Json::Object& obj) override + { + std::string version; + int port_version = 0; + std::string git_tree; + Versions::Scheme version_scheme = Versions::Scheme::String; + + // Code copy-and-paste'd from sourceparagraph.cpp + static Json::StringDeserializer version_exact_deserializer{"an exact version string"}; + static Json::StringDeserializer version_relaxed_deserializer{"a relaxed version string"}; + static Json::StringDeserializer version_semver_deserializer{"a semantic version string"}; + static Json::StringDeserializer version_date_deserializer{"a date version string"}; + static Json::StringDeserializer git_tree_deserializer("a git object SHA"); + + bool has_exact = r.optional_object_field(obj, VERSION_STRING, version, version_exact_deserializer); + bool has_relax = r.optional_object_field(obj, VERSION_RELAXED, version, version_relaxed_deserializer); + bool has_semver = r.optional_object_field(obj, VERSION_SEMVER, version, version_semver_deserializer); + bool has_date = r.optional_object_field(obj, VERSION_DATE, version, version_date_deserializer); + int num_versions = (int)has_exact + (int)has_relax + (int)has_semver + (int)has_date; + if (num_versions == 0) + { + r.add_generic_error(type_name(), "expected a versioning field (example: ", VERSION_STRING, ")"); + } + else if (num_versions > 1) + { + r.add_generic_error(type_name(), "expected only one versioning field"); + } + else + { + if (has_exact) + version_scheme = Versions::Scheme::String; + else if (has_relax) + version_scheme = Versions::Scheme::Relaxed; + else if (has_semver) + version_scheme = Versions::Scheme::Semver; + else if (has_date) + version_scheme = Versions::Scheme::Date; + else + Checks::unreachable(VCPKG_LINE_INFO); + } + r.optional_object_field(obj, PORT_VERSION, port_version, Json::NaturalNumberDeserializer::instance); + r.required_object_field(type_name(), obj, GIT_TREE, git_tree, git_tree_deserializer); + + return VersionDbEntry(version, port_version, version_scheme, git_tree); + } + + static VersionDbEntryDeserializer instance; + }; + + struct VersionDbEntryArrayDeserializer final : Json::IDeserializer> + { + virtual StringView type_name() const override { return "an array of versions"; } + + virtual Optional> visit_array(Json::Reader& r, const Json::Array& arr) override + { + return r.array_elements(arr, VersionDbEntryDeserializer::instance); + } + + static VersionDbEntryArrayDeserializer instance; + }; + + VersionDbEntryDeserializer VersionDbEntryDeserializer::instance; + VersionDbEntryArrayDeserializer VersionDbEntryArrayDeserializer::instance; + + struct BaselineDeserializer final : Json::IDeserializer>> + { + StringView type_name() const override { return "a baseline object"; } + + Optional visit_object(Json::Reader& r, const Json::Object& obj) override + { + std::map> result; + + for (auto&& pr : obj) + { + const auto& version_value = pr.second; + VersionT version; + r.visit_in_key(version_value, pr.first, version, get_versiont_deserializer_instance()); + + result.emplace(pr.first.to_string(), std::move(version)); + } + + return std::move(result); + } + + static BaselineDeserializer instance; + }; + BaselineDeserializer BaselineDeserializer::instance; + + struct VersionTDeserializer final : Json::IDeserializer + { + StringView type_name() const override { return "a version object"; } + View valid_fields() const override + { + static const StringView t[] = {"version-string", "port-version"}; + return t; + } + + Optional visit_object(Json::Reader& r, const Json::Object& obj) override + { + std::string version; + int port_version = 0; + + r.required_object_field(type_name(), obj, "version-string", version, version_deserializer); + r.optional_object_field(obj, "port-version", port_version, Json::NaturalNumberDeserializer::instance); + + return VersionT{std::move(version), port_version}; + } + + static Json::StringDeserializer version_deserializer; + static VersionTDeserializer instance; + }; + Json::StringDeserializer VersionTDeserializer::version_deserializer{"version"}; + VersionTDeserializer VersionTDeserializer::instance; +} + +namespace vcpkg +{ + Json::IDeserializer& get_versiont_deserializer_instance() { return VersionTDeserializer::instance; } + + ExpectedS>> parse_baseline_file(Files::Filesystem& fs, + StringView baseline_name, + const fs::path& baseline_file_path) + { + if (!fs.exists(baseline_file_path)) + { + return Strings::format("Couldn't find `%s`", fs::u8string(baseline_file_path)); + } + + auto value = Json::parse_file(VCPKG_LINE_INFO, fs, baseline_file_path); + if (!value.first.is_object()) + { + return Strings::format("Error: `%s` does not have a top-level object.", fs::u8string(baseline_file_path)); + } + + const auto& obj = value.first.object(); + auto baseline_value = obj.get(baseline_name); + if (!baseline_value) + { + return Strings::format( + "Error: `%s` does not contain the baseline \"%s\"", fs::u8string(baseline_file_path), baseline_name); + } + + Json::Reader r; + std::map> result; + r.visit_in_key(*baseline_value, baseline_name, result, BaselineDeserializer::instance); + if (!r.errors().empty()) + { + return Strings::format( + "Error: failed to parse `%s`:\n%s", fs::u8string(baseline_file_path), Strings::join("\n", r.errors())); + } + return result; + } + + ExpectedS> parse_versions_file(Files::Filesystem& fs, + StringView port_name, + const fs::path& versions_file_path) + { + (void)port_name; + if (!fs.exists(versions_file_path)) + { + return Strings::format("Couldn't find the versions database file: %s", fs::u8string(versions_file_path)); + } + + auto versions_json = Json::parse_file(VCPKG_LINE_INFO, fs, versions_file_path); + if (!versions_json.first.is_object()) + { + return Strings::format("Error: `%s` does not have a top level object.", fs::u8string(versions_file_path)); + } + + const auto& versions_object = versions_json.first.object(); + auto maybe_versions_array = versions_object.get("versions"); + if (!maybe_versions_array || !maybe_versions_array->is_array()) + { + return Strings::format("Error: `%s` does not contain a versions array.", fs::u8string(versions_file_path)); + } + + std::vector db_entries; + // Avoid warning treated as error. + if (maybe_versions_array != nullptr) + { + Json::Reader r; + r.visit_in_key(*maybe_versions_array, "versions", db_entries, VersionDbEntryArrayDeserializer::instance); + } + return db_entries; + } +} diff --git a/toolsrc/src/vcpkg/versions.cpp b/toolsrc/src/vcpkg/versions.cpp new file mode 100644 index 00000000000000..ac1829712c6f1c --- /dev/null +++ b/toolsrc/src/vcpkg/versions.cpp @@ -0,0 +1,34 @@ +#include + +namespace vcpkg::Versions +{ + VersionSpec::VersionSpec(const std::string& port_name, const VersionT& version, Scheme scheme) + : port_name(port_name), version(version), scheme(scheme) + { + } + + VersionSpec::VersionSpec(const std::string& port_name, + const std::string& version_string, + int port_version, + Scheme scheme) + : port_name(port_name), version(version_string, port_version), scheme(scheme) + { + } + + bool operator==(const VersionSpec& lhs, const VersionSpec& rhs) + { + return std::tie(lhs.port_name, lhs.version, lhs.scheme) == std::tie(rhs.port_name, rhs.version, rhs.scheme); + } + + bool operator!=(const VersionSpec& lhs, const VersionSpec& rhs) { return !(lhs == rhs); } + + std::size_t VersionSpecHasher::operator()(const VersionSpec& key) const + { + using std::hash; + using std::size_t; + using std::string; + + return ((hash()(key.port_name) ^ (hash()(key.version.to_string()) << 1)) >> 1) ^ + (hash()(static_cast(key.scheme)) << 1); + } +} \ No newline at end of file diff --git a/toolsrc/windows-bootstrap/vcpkg.vcxproj b/toolsrc/windows-bootstrap/vcpkg.vcxproj index 5f897bc6730375..16de6e9c45179f 100644 --- a/toolsrc/windows-bootstrap/vcpkg.vcxproj +++ b/toolsrc/windows-bootstrap/vcpkg.vcxproj @@ -267,6 +267,7 @@ + @@ -355,6 +356,8 @@ + + From 88b32e6c0fc0ce01fde65ac73cb58808b0b5723e Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Fri, 27 Nov 2020 19:05:47 -0800 Subject: [PATCH 0176/1694] [vcpkg] Introduce `create_versioned_install_plan()` (#14633) * [vcpkg] Implement constraints in manifests * [vcpkg] Add SourceControlFile::check_against_feature_flags to prevent accidentally ignoring versioning fields * [vcpkg] Switch check_against_feature_flags to accept fs::path * [vcpkg] Implement overrides parsing in manifests * [vcpkg] Address CR comments * [vcpkg] Initial implementation of create_versioned_install_plan() * [vcpkg] Implement port-version minimums * [vcpkg] Implement relaxation phase * [vcpkg] Refactor tests to use check_name_and_version * [vcpkg] Implemented simple relaxed scheme * [vcpkg] More relaxed scheme tests * [vcpkg] Mixed scheme testing * [vcpkg] Support versions and features without defaults * [vcpkg] Support versions and features without defaults 2 * [vcpkg] Only consider greater of toplevel and baseilne * [vcpkg] Implement overrides * [vcpkg] Install defaults * [vcpkg] Handle defaults of transitive packages * [vcpkg] Fix warnings for Span of initializer_list * [vcpkg] Use CMakeVarProvider during versioned install * [vcpkg] Handle inter-feature dependencies * [vcpkg] Correctly handle qualified Dependencies at toplevel * [vcpkg] Address CR comments Co-authored-by: Robert Schumacher --- .../include/vcpkg-test/mockcmakevarprovider.h | 10 +- toolsrc/include/vcpkg/dependencies.h | 10 + toolsrc/include/vcpkg/fwd/portfileprovider.h | 2 + toolsrc/include/vcpkg/packagespec.h | 2 +- toolsrc/include/vcpkg/versions.h | 7 +- toolsrc/include/vcpkg/versiont.h | 8 +- toolsrc/src/vcpkg-test/dependencies.cpp | 1150 +++++++++++++++-- toolsrc/src/vcpkg-test/versionplan.cpp | 152 +++ toolsrc/src/vcpkg/dependencies.cpp | 660 +++++++++- toolsrc/src/vcpkg/packagespec.cpp | 1 + toolsrc/src/vcpkg/portfileprovider.cpp | 2 +- toolsrc/src/vcpkg/versions.cpp | 16 +- toolsrc/src/vcpkg/versiont.cpp | 20 +- 13 files changed, 1908 insertions(+), 132 deletions(-) create mode 100644 toolsrc/src/vcpkg-test/versionplan.cpp diff --git a/toolsrc/include/vcpkg-test/mockcmakevarprovider.h b/toolsrc/include/vcpkg-test/mockcmakevarprovider.h index 15b24b8d05027c..6017457b631d8b 100644 --- a/toolsrc/include/vcpkg-test/mockcmakevarprovider.h +++ b/toolsrc/include/vcpkg-test/mockcmakevarprovider.h @@ -6,19 +6,23 @@ namespace vcpkg::Test { struct MockCMakeVarProvider : CMakeVars::CMakeVarProvider { - void load_generic_triplet_vars(Triplet triplet) const override { generic_triplet_vars[triplet] = {}; } + using SMap = std::unordered_map; + void load_generic_triplet_vars(Triplet triplet) const override + { + generic_triplet_vars.emplace(triplet, SMap{}); + } void load_dep_info_vars(Span specs) const override { for (auto&& spec : specs) - dep_info_vars[spec] = {}; + dep_info_vars.emplace(spec, SMap{}); } void load_tag_vars(Span specs, const PortFileProvider::PortFileProvider& port_provider) const override { for (auto&& spec : specs) - tag_vars[spec.package_spec] = {}; + tag_vars.emplace(spec.package_spec, SMap{}); (void)(port_provider); } diff --git a/toolsrc/include/vcpkg/dependencies.h b/toolsrc/include/vcpkg/dependencies.h index 1ea81c185ebdb9..f4e061b03e9459 100644 --- a/toolsrc/include/vcpkg/dependencies.h +++ b/toolsrc/include/vcpkg/dependencies.h @@ -173,5 +173,15 @@ namespace vcpkg::Dependencies std::vector features, CMakeVars::CMakeVarProvider& var_provider); + /// Contains the ports of the current environment. + /// Feature specifications to resolve dependencies for. + /// Status of installed packages in the current environment. + ExpectedS create_versioned_install_plan(const PortFileProvider::IVersionedPortfileProvider& vprovider, + const PortFileProvider::IBaselineProvider& bprovider, + const CMakeVars::CMakeVarProvider& var_provider, + const std::vector& deps, + const std::vector& overrides, + const PackageSpec& toplevel); + void print_plan(const ActionPlan& action_plan, const bool is_recursive = true, const fs::path& vcpkg_root_dir = {}); } diff --git a/toolsrc/include/vcpkg/fwd/portfileprovider.h b/toolsrc/include/vcpkg/fwd/portfileprovider.h index 08cce132445a69..dc381eb92af81e 100644 --- a/toolsrc/include/vcpkg/fwd/portfileprovider.h +++ b/toolsrc/include/vcpkg/fwd/portfileprovider.h @@ -4,4 +4,6 @@ namespace vcpkg::PortFileProvider { struct PortFileProvider; struct PathsPortFileProvider; + struct IVersionedPortfileProvider; + struct IBaselineProvider; } diff --git a/toolsrc/include/vcpkg/packagespec.h b/toolsrc/include/vcpkg/packagespec.h index d45fb018232051..43be57e68c24a3 100644 --- a/toolsrc/include/vcpkg/packagespec.h +++ b/toolsrc/include/vcpkg/packagespec.h @@ -163,9 +163,9 @@ namespace vcpkg struct DependencyOverride { std::string name; - Versions::Scheme version_scheme = Versions::Scheme::String; std::string version; int port_version = 0; + Versions::Scheme version_scheme = Versions::Scheme::String; Json::Object extra_info; diff --git a/toolsrc/include/vcpkg/versions.h b/toolsrc/include/vcpkg/versions.h index 7d5b573c23cb9f..09df1536665b2e 100644 --- a/toolsrc/include/vcpkg/versions.h +++ b/toolsrc/include/vcpkg/versions.h @@ -4,6 +4,8 @@ namespace vcpkg::Versions { + using Version = VersionT; + enum class Scheme { Relaxed, @@ -16,11 +18,10 @@ namespace vcpkg::Versions { std::string port_name; VersionT version; - Scheme scheme; - VersionSpec(const std::string& port_name, const VersionT& version, Scheme scheme); + VersionSpec(const std::string& port_name, const VersionT& version); - VersionSpec(const std::string& port_name, const std::string& version_string, int port_version, Scheme scheme); + VersionSpec(const std::string& port_name, const std::string& version_string, int port_version); friend bool operator==(const VersionSpec& lhs, const VersionSpec& rhs); friend bool operator!=(const VersionSpec& lhs, const VersionSpec& rhs); diff --git a/toolsrc/include/vcpkg/versiont.h b/toolsrc/include/vcpkg/versiont.h index 506d7090a5b4a3..7819f98759d042 100644 --- a/toolsrc/include/vcpkg/versiont.h +++ b/toolsrc/include/vcpkg/versiont.h @@ -11,15 +11,19 @@ namespace vcpkg VersionT(const std::string& value, int port_version); std::string to_string() const; + void to_string(std::string& out) const; friend bool operator==(const VersionT& left, const VersionT& right); friend bool operator!=(const VersionT& left, const VersionT& right); friend struct VersionTMapLess; + const std::string text() const { return m_text; } + int port_version() const { return m_port_version; } + private: - std::string value; - int port_version; + std::string m_text; + int m_port_version; }; struct VersionDiff diff --git a/toolsrc/src/vcpkg-test/dependencies.cpp b/toolsrc/src/vcpkg-test/dependencies.cpp index 2f82d21b43f9ba..bcc2f14a070d6e 100644 --- a/toolsrc/src/vcpkg-test/dependencies.cpp +++ b/toolsrc/src/vcpkg-test/dependencies.cpp @@ -1,152 +1,1096 @@ #include +#include + #include -#include #include #include +#include + +#include +#include +#include #include #include using namespace vcpkg; -using namespace vcpkg::Parse; -TEST_CASE ("parse depends", "[dependencies]") +using Test::make_control_file; +using Test::make_status_feature_pgh; +using Test::make_status_pgh; +using Test::MockCMakeVarProvider; +using Test::PackageSpecMap; + +struct MockBaselineProvider : PortFileProvider::IBaselineProvider +{ + mutable std::map> v; + + Optional get_baseline_version(StringView name) const override + { + auto it = v.find(name); + if (it == v.end()) return nullopt; + return it->second; + } +}; + +struct MockVersionedPortfileProvider : PortFileProvider::IVersionedPortfileProvider +{ + mutable std::map> v; + + ExpectedS get_control_file( + const vcpkg::Versions::VersionSpec& versionspec) const override + { + return get_control_file(versionspec.port_name, versionspec.version); + } + + ExpectedS get_control_file(const std::string& name, + const vcpkg::Versions::Version& version) const + { + auto it = v.find(name); + if (it == v.end()) return std::string("Unknown port name"); + auto it2 = it->second.find(version); + if (it2 == it->second.end()) return std::string("Unknown port version"); + return it2->second; + } + + virtual const std::vector& get_port_versions(StringView) const override + { + Checks::unreachable(VCPKG_LINE_INFO); + } + + SourceControlFileLocation& emplace(std::string&& name, + Versions::Version&& version, + Versions::Scheme scheme = Versions::Scheme::String) + { + auto it = v.find(name); + if (it == v.end()) + it = v.emplace(name, std::map{}).first; + + auto it2 = it->second.find(version); + if (it2 == it->second.end()) + { + auto scf = std::make_unique(); + auto core = std::make_unique(); + core->name = name; + core->version = version.text(); + core->port_version = version.port_version(); + core->version_scheme = scheme; + scf->core_paragraph = std::move(core); + it2 = it->second.emplace(version, SourceControlFileLocation{std::move(scf), fs::u8path(name)}).first; + } + return it2->second; + } +}; + +using Versions::Constraint; +using Versions::Scheme; + +template +T unwrap(ExpectedS e) +{ + if (!e.has_value()) + { + INFO(e.error()); + REQUIRE(false); + } + return std::move(*e.get()); +} + +static void check_name_and_version(const Dependencies::InstallPlanAction& ipa, + StringLiteral name, + Versions::Version v, + std::initializer_list features = {}) +{ + CHECK(ipa.spec.name() == name); + CHECK(ipa.source_control_file_location.has_value()); + CHECK(ipa.feature_list.size() == features.size() + 1); + { + INFO("ipa.feature_list = [" << Strings::join(", ", ipa.feature_list) << "]"); + for (auto&& f : features) + { + INFO("f = \"" << f.c_str() << "\""); + CHECK(Util::find(ipa.feature_list, f) != ipa.feature_list.end()); + } + CHECK(Util::find(ipa.feature_list, "core") != ipa.feature_list.end()); + } + if (auto scfl = ipa.source_control_file_location.get()) + { + CHECK(scfl->source_control_file->core_paragraph->version == v.text()); + CHECK(scfl->source_control_file->core_paragraph->port_version == v.port_version()); + } +} + +static const PackageSpec& toplevel_spec() +{ + static const PackageSpec ret("toplevel-spec", Test::X86_WINDOWS); + return ret; +} + +TEST_CASE ("basic version install single", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"1", 0}); + + MockCMakeVarProvider var_provider; + + auto install_plan = + unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + REQUIRE(install_plan.install_actions.at(0).spec.name() == "a"); +} + +TEST_CASE ("basic version install detect cycle", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + bp.v["b"] = {"1", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"1", 0}).source_control_file->core_paragraph->dependencies = { + Dependency{"b", {}, {}, DependencyConstraint{}}, + }; + vp.emplace("b", {"1", 0}).source_control_file->core_paragraph->dependencies = { + Dependency{"a", {}, {}, DependencyConstraint{}}, + }; + + MockCMakeVarProvider var_provider; + + auto install_plan = Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec()); + + REQUIRE(!install_plan.has_value()); +} + +TEST_CASE ("basic version install scheme", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + bp.v["b"] = {"1", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"1", 0}).source_control_file->core_paragraph->dependencies = { + Dependency{"b", {}, {}, DependencyConstraint{}}, + }; + vp.emplace("b", {"1", 0}); + + MockCMakeVarProvider var_provider; + + auto install_plan = + unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec())); + + CHECK(install_plan.size() == 2); + + StringLiteral names[] = {"b", "a"}; + for (size_t i = 0; i < install_plan.install_actions.size() && i < 2; ++i) + { + CHECK(install_plan.install_actions[i].spec.name() == names[i]); + } +} + +TEST_CASE ("basic version install scheme diamond", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + bp.v["b"] = {"1", 0}; + bp.v["c"] = {"1", 0}; + bp.v["d"] = {"1", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"1", 0}).source_control_file->core_paragraph->dependencies = { + Dependency{"b", {}, {}, DependencyConstraint{}}, + Dependency{"c", {}, {}, DependencyConstraint{}}, + }; + vp.emplace("b", {"1", 0}).source_control_file->core_paragraph->dependencies = { + Dependency{"c", {}, {}, DependencyConstraint{}}, + Dependency{"d", {}, {}, DependencyConstraint{}}, + }; + vp.emplace("c", {"1", 0}).source_control_file->core_paragraph->dependencies = { + Dependency{"d", {}, {}, DependencyConstraint{}}, + }; + vp.emplace("d", {"1", 0}); + + MockCMakeVarProvider var_provider; + + auto install_plan = + unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec())); + + CHECK(install_plan.size() == 4); + + StringLiteral names[] = {"d", "c", "b", "a"}; + for (size_t i = 0; i < install_plan.install_actions.size() && i < 4; ++i) + { + CHECK(install_plan.install_actions[i].spec.name() == names[i]); + } +} + +TEST_CASE ("basic version install scheme baseline missing", "[versionplan]") +{ + MockBaselineProvider bp; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"1", 0}); + + MockCMakeVarProvider var_provider; + + auto install_plan = Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec()); + + REQUIRE(!install_plan.has_value()); +} + +TEST_CASE ("basic version install scheme baseline missing success", "[versionplan]") { - auto w = parse_dependencies_list("liba (windows)"); - REQUIRE(w); - auto& v = *w.get(); - REQUIRE(v.size() == 1); - REQUIRE(v.at(0).name == "liba"); - REQUIRE(v.at(0).platform.evaluate({{"VCPKG_CMAKE_SYSTEM_NAME", ""}})); - REQUIRE(v.at(0).platform.evaluate({{"VCPKG_CMAKE_SYSTEM_NAME", "WindowsStore"}})); - REQUIRE(!v.at(0).platform.evaluate({{"VCPKG_CMAKE_SYSTEM_NAME", "Darwin"}})); + MockBaselineProvider bp; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"1", 0}); + vp.emplace("a", {"2", 0}); + vp.emplace("a", {"3", 0}); + + MockCMakeVarProvider var_provider; + + auto install_plan = + unwrap(Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Exact, "2"}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"2", 0}); } -TEST_CASE ("filter depends", "[dependencies]") +TEST_CASE ("basic version install scheme baseline", "[versionplan]") { - const std::unordered_map x64_win_cmake_vars{{"VCPKG_TARGET_ARCHITECTURE", "x64"}, - {"VCPKG_CMAKE_SYSTEM_NAME", ""}}; + MockBaselineProvider bp; + bp.v["a"] = {"2", 0}; - const std::unordered_map arm_uwp_cmake_vars{{"VCPKG_TARGET_ARCHITECTURE", "arm"}, - {"VCPKG_CMAKE_SYSTEM_NAME", "WindowsStore"}}; + MockVersionedPortfileProvider vp; + vp.emplace("a", {"1", 0}); + vp.emplace("a", {"2", 0}); + vp.emplace("a", {"3", 0}); + + MockCMakeVarProvider var_provider; - auto deps_ = parse_dependencies_list("liba (!uwp), libb, libc (uwp)"); - REQUIRE(deps_); - auto& deps = *deps_.get(); - auto v = filter_dependencies(deps, Test::X64_WINDOWS, x64_win_cmake_vars); - REQUIRE(v.size() == 2); - REQUIRE(v.at(0).package_spec.name() == "liba"); - REQUIRE(v.at(1).package_spec.name() == "libb"); + auto install_plan = + unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec())); - auto v2 = filter_dependencies(deps, Test::ARM_UWP, arm_uwp_cmake_vars); - REQUIRE(v.size() == 2); - REQUIRE(v2.at(0).package_spec.name() == "libb"); - REQUIRE(v2.at(1).package_spec.name() == "libc"); + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"2", 0}); } -TEST_CASE ("parse feature depends", "[dependencies]") +TEST_CASE ("version string baseline agree", "[versionplan]") { - auto u_ = parse_dependencies_list("libwebp[anim, gif2webp, img2webp, info, mux, nearlossless, " - "simd, cwebp, dwebp], libwebp[vwebp-sdl, extras] (!osx)"); - REQUIRE(u_); - auto& v = *u_.get(); - REQUIRE(v.size() == 2); - auto&& a0 = v.at(0); - REQUIRE(a0.name == "libwebp"); - REQUIRE(a0.features.size() == 9); - REQUIRE(a0.platform.is_empty()); + MockBaselineProvider bp; + bp.v["a"] = {"2", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"1", 0}); + vp.emplace("a", {"2", 0}); + vp.emplace("a", {"3", 0}); + + MockCMakeVarProvider var_provider; + + auto install_plan = Dependencies::create_versioned_install_plan( + vp, bp, var_provider, {Dependency{"a", {}, {}, {Constraint::Type::Exact, "2"}}}, {}, toplevel_spec()); + + REQUIRE(install_plan.has_value()); +} + +TEST_CASE ("version install scheme baseline conflict", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"2", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"1", 0}); + vp.emplace("a", {"2", 0}); + vp.emplace("a", {"3", 0}); + + MockCMakeVarProvider var_provider; + + auto install_plan = + Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Exact, "3"}}, + }, + {}, + toplevel_spec()); + + REQUIRE(!install_plan.has_value()); +} + +TEST_CASE ("version install string port version", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"2", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"2", 0}); + vp.emplace("a", {"2", 1}); + vp.emplace("a", {"2", 2}); + + MockCMakeVarProvider var_provider; + + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 1}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"2", 1}); +} + +TEST_CASE ("version install string port version 2", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"2", 1}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"2", 0}); + vp.emplace("a", {"2", 1}); + vp.emplace("a", {"2", 2}); + + MockCMakeVarProvider var_provider; + + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 0}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"2", 1}); +} + +TEST_CASE ("version install transitive string", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"2", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"2", 0}).source_control_file->core_paragraph->dependencies = { + Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Exact, "1"}}, + }; + vp.emplace("a", {"2", 1}).source_control_file->core_paragraph->dependencies = { + Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Exact, "2"}}, + }; + vp.emplace("b", {"1", 0}); + vp.emplace("b", {"2", 0}); + + MockCMakeVarProvider var_provider; + + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 1}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "b", {"2", 0}); + check_name_and_version(install_plan.install_actions[1], "a", {"2", 1}); +} + +TEST_CASE ("version install simple relaxed", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"2", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"2", 0}, Scheme::Relaxed); + vp.emplace("a", {"3", 0}, Scheme::Relaxed); + + MockCMakeVarProvider var_provider; + + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3", 0}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"3", 0}); +} + +TEST_CASE ("version install transitive relaxed", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"2", 0}; + bp.v["b"] = {"2", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"2", 0}, Scheme::Relaxed); + vp.emplace("a", {"3", 0}, Scheme::Relaxed).source_control_file->core_paragraph->dependencies = { + Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "3"}}, + }; + vp.emplace("b", {"2", 0}, Scheme::Relaxed); + vp.emplace("b", {"3", 0}, Scheme::Relaxed); + + MockCMakeVarProvider var_provider; + + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3", 0}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "b", {"3", 0}); + check_name_and_version(install_plan.install_actions[1], "a", {"3", 0}); +} + +TEST_CASE ("version install diamond relaxed", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"2", 0}; + bp.v["b"] = {"3", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"2", 0}, Scheme::Relaxed); + vp.emplace("a", {"3", 0}, Scheme::Relaxed).source_control_file->core_paragraph->dependencies = { + Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "2", 1}}, + Dependency{"c", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "5", 1}}, + }; + vp.emplace("b", {"2", 1}, Scheme::Relaxed); + vp.emplace("b", {"3", 0}, Scheme::Relaxed).source_control_file->core_paragraph->dependencies = { + Dependency{"c", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "9", 2}}, + }; + vp.emplace("c", {"5", 1}, Scheme::Relaxed); + vp.emplace("c", {"9", 2}, Scheme::Relaxed); + + MockCMakeVarProvider var_provider; + + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3", 0}}, + Dependency{"b", {}, {}, {Constraint::Type::Minimum, "2", 1}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 3); + check_name_and_version(install_plan.install_actions[0], "c", {"9", 2}); + check_name_and_version(install_plan.install_actions[1], "b", {"3", 0}); + check_name_and_version(install_plan.install_actions[2], "a", {"3", 0}); +} + +TEST_CASE ("version install scheme change in port version", "[versionplan]") +{ + MockVersionedPortfileProvider vp; + vp.emplace("a", {"2", 0}).source_control_file->core_paragraph->dependencies = { + Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Exact, "1"}}, + }; + vp.emplace("a", {"2", 1}).source_control_file->core_paragraph->dependencies = { + Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "1", 1}}, + }; + vp.emplace("b", {"1", 0}, Scheme::String); + vp.emplace("b", {"1", 1}, Scheme::Relaxed); + + MockCMakeVarProvider var_provider; + + SECTION ("lower baseline") + { + MockBaselineProvider bp; + bp.v["a"] = {"2", 0}; + + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 1}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "b", {"1", 1}); + check_name_and_version(install_plan.install_actions[1], "a", {"2", 1}); + } + SECTION ("higher baseline") + { + MockBaselineProvider bp; + bp.v["a"] = {"2", 1}; + + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 0}}, + }, + {}, + toplevel_spec())); - auto&& a1 = v.at(1); - REQUIRE(a1.name == "libwebp"); - REQUIRE(a1.features.size() == 2); - REQUIRE(!a1.platform.is_empty()); - REQUIRE(a1.platform.evaluate({{"VCPKG_CMAKE_SYSTEM_NAME", ""}})); - REQUIRE(a1.platform.evaluate({{"VCPKG_CMAKE_SYSTEM_NAME", "Linux"}})); - REQUIRE_FALSE(a1.platform.evaluate({{"VCPKG_CMAKE_SYSTEM_NAME", "Darwin"}})); + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "b", {"1", 1}); + check_name_and_version(install_plan.install_actions[1], "a", {"2", 1}); + } } -TEST_CASE ("qualified dependency", "[dependencies]") +TEST_CASE ("version install simple feature", "[versionplan]") { - using namespace Test; - PackageSpecMap spec_map; - auto spec_a = FullPackageSpec{spec_map.emplace("a", "b, b[b1] (linux)"), {}}; - auto spec_b = FullPackageSpec{spec_map.emplace("b", "", {{"b1", ""}}), {}}; + MockVersionedPortfileProvider vp; + auto a_x = std::make_unique(); + a_x->name = "x"; + vp.emplace("a", {"1", 0}, Scheme::Relaxed).source_control_file->feature_paragraphs.push_back(std::move(a_x)); - PortFileProvider::MapPortFileProvider map_port{spec_map.map}; MockCMakeVarProvider var_provider; - auto plan = vcpkg::Dependencies::create_feature_install_plan(map_port, var_provider, {spec_a}, {}); - REQUIRE(plan.install_actions.size() == 2); - REQUIRE(plan.install_actions.at(0).feature_list == std::vector{"core"}); + SECTION ("with baseline") + { + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {"x"}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}, {"x"}); + } + + SECTION ("without baseline") + { + MockBaselineProvider bp; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan( + vp, + bp, + var_provider, + { + Dependency{"a", {"x"}, {}, {Constraint::Type::Minimum, "1", 0}}, + }, + {}, + toplevel_spec())); - FullPackageSpec linspec_a{{"a", Triplet::from_canonical_name("x64-linux")}, {}}; - var_provider.dep_info_vars[linspec_a.package_spec].emplace("VCPKG_CMAKE_SYSTEM_NAME", "Linux"); - auto plan2 = vcpkg::Dependencies::create_feature_install_plan(map_port, var_provider, {linspec_a}, {}); - REQUIRE(plan2.install_actions.size() == 2); - REQUIRE(plan2.install_actions.at(0).feature_list == std::vector{"b1", "core"}); + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}, {"x"}); + } } -TEST_CASE ("resolve_deps_as_top_level", "[dependencies]") +static std::unique_ptr make_fpgh(std::string name) { - using namespace Test; - PackageSpecMap spec_map; - FullPackageSpec spec_a{spec_map.emplace("a", "b, b[b1] (linux)"), {}}; - FullPackageSpec spec_b{spec_map.emplace("b", "", {{"b1", ""}}), {}}; - FullPackageSpec spec_c{spec_map.emplace("c", "b", {{"c1", "b[b1]"}, {"c2", "c[c1], a"}}, {"c1"}), {"core"}}; - FullPackageSpec spec_d{spec_map.emplace("d", "c[core]"), {}}; + auto f = std::make_unique(); + f->name = std::move(name); + return f; +} + +TEST_CASE ("version install transitive features", "[versionplan]") +{ + MockVersionedPortfileProvider vp; + + auto a_x = make_fpgh("x"); + a_x->dependencies.push_back(Dependency{"b", {"y"}}); + vp.emplace("a", {"1", 0}, Scheme::Relaxed).source_control_file->feature_paragraphs.push_back(std::move(a_x)); + + auto b_y = make_fpgh("y"); + vp.emplace("b", {"1", 0}, Scheme::Relaxed).source_control_file->feature_paragraphs.push_back(std::move(b_y)); - PortFileProvider::MapPortFileProvider map_port{spec_map.map}; MockCMakeVarProvider var_provider; - Triplet t_linux = Triplet::from_canonical_name("x64-linux"); - var_provider.dep_info_vars[{"a", t_linux}].emplace("VCPKG_CMAKE_SYSTEM_NAME", "Linux"); + + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + bp.v["b"] = {"1", 0}; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {"x"}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "b", {"1", 0}, {"y"}); + check_name_and_version(install_plan.install_actions[1], "a", {"1", 0}, {"x"}); +} + +TEST_CASE ("version install transitive feature versioned", "[versionplan]") +{ + MockVersionedPortfileProvider vp; + + auto a_x = make_fpgh("x"); + a_x->dependencies.push_back(Dependency{"b", {"y"}, {}, {Constraint::Type::Minimum, "2", 0}}); + vp.emplace("a", {"1", 0}, Scheme::Relaxed).source_control_file->feature_paragraphs.push_back(std::move(a_x)); + { - auto deps = vcpkg::Dependencies::resolve_deps_as_top_level( - *spec_map.map.at("a").source_control_file, Test::X86_WINDOWS, {}, var_provider); - REQUIRE(deps.size() == 1); - REQUIRE(deps.at(0) == spec_b); + auto b_y = make_fpgh("y"); + vp.emplace("b", {"1", 0}, Scheme::Relaxed).source_control_file->feature_paragraphs.push_back(std::move(b_y)); } { - auto deps = vcpkg::Dependencies::resolve_deps_as_top_level( - *spec_map.map.at("a").source_control_file, t_linux, {}, var_provider); - REQUIRE(deps.size() == 1); - REQUIRE(deps.at(0) == FullPackageSpec({"b", t_linux}, {"b1"})); + auto b_y = make_fpgh("y"); + b_y->dependencies.push_back(Dependency{"c"}); + vp.emplace("b", {"2", 0}, Scheme::Relaxed).source_control_file->feature_paragraphs.push_back(std::move(b_y)); } + + vp.emplace("c", {"1", 0}, Scheme::Relaxed); + + MockCMakeVarProvider var_provider; + + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + bp.v["c"] = {"1", 0}; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {"x"}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 3); + check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}); + check_name_and_version(install_plan.install_actions[1], "b", {"2", 0}, {"y"}); + check_name_and_version(install_plan.install_actions[2], "a", {"1", 0}, {"x"}); +} + +TEST_CASE ("version install constraint-reduction", "[versionplan]") +{ + MockCMakeVarProvider var_provider; + + SECTION ("higher baseline") { - // without defaults - auto deps = vcpkg::Dependencies::resolve_deps_as_top_level( - *spec_map.map.at("c").source_control_file, Test::X86_WINDOWS, {}, var_provider); - REQUIRE(deps.size() == 1); - REQUIRE(deps.at(0) == spec_b); + MockVersionedPortfileProvider vp; + + vp.emplace("b", {"1", 0}, Scheme::Relaxed).source_control_file->core_paragraph->dependencies = { + Dependency{"c", {}, {}, {Constraint::Type::Minimum, "2"}}, + }; + vp.emplace("b", {"2", 0}, Scheme::Relaxed).source_control_file->core_paragraph->dependencies = { + Dependency{"c", {}, {}, {Constraint::Type::Minimum, "1"}}, + }; + + vp.emplace("c", {"1", 0}, Scheme::Relaxed); + // c@2 is used to detect if certain constraints were evaluated + vp.emplace("c", {"2", 0}, Scheme::Relaxed); + + MockBaselineProvider bp; + bp.v["b"] = {"2", 0}; + bp.v["c"] = {"1", 0}; + + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"b", {}, {}, {Constraint::Type::Minimum, "1"}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}); + check_name_and_version(install_plan.install_actions[1], "b", {"2", 0}); } - FullPackageSpec spec_b_with_b1{spec_b.package_spec, {"b1"}}; + + SECTION ("higher toplevel") + { + MockVersionedPortfileProvider vp; + + vp.emplace("b", {"1", 0}, Scheme::Relaxed).source_control_file->core_paragraph->dependencies = { + Dependency{"c", {}, {}, {Constraint::Type::Minimum, "2"}}, + }; + vp.emplace("b", {"2", 0}, Scheme::Relaxed).source_control_file->core_paragraph->dependencies = { + Dependency{"c", {}, {}, {Constraint::Type::Minimum, "1"}}, + }; + + vp.emplace("c", {"1", 0}, Scheme::Relaxed); + // c@2 is used to detect if certain constraints were evaluated + vp.emplace("c", {"2", 0}, Scheme::Relaxed); + + MockBaselineProvider bp; + bp.v["b"] = {"1", 0}; + bp.v["c"] = {"1", 0}; + + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"b", {}, {}, {Constraint::Type::Minimum, "2"}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}); + check_name_and_version(install_plan.install_actions[1], "b", {"2", 0}); + } +} + +TEST_CASE ("version install overrides", "[versionplan]") +{ + MockCMakeVarProvider var_provider; + + MockVersionedPortfileProvider vp; + + vp.emplace("b", {"1", 0}, Scheme::Relaxed); + vp.emplace("b", {"2", 0}, Scheme::Relaxed); + vp.emplace("c", {"1", 0}, Scheme::String); + vp.emplace("c", {"2", 0}, Scheme::String); + + MockBaselineProvider bp; + bp.v["b"] = {"2", 0}; + bp.v["c"] = {"2", 0}; + + SECTION ("string") { - // with defaults of c (c1) - auto deps = vcpkg::Dependencies::resolve_deps_as_top_level( - *spec_map.map.at("c").source_control_file, Test::X86_WINDOWS, {"default"}, var_provider); - REQUIRE(deps.size() == 1); - REQUIRE(deps.at(0) == spec_b_with_b1); + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + {Dependency{"c"}}, + {DependencyOverride{"b", "1"}, DependencyOverride{"c", "1"}}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}); } + + SECTION ("relaxed") { - // with c1 - auto deps = vcpkg::Dependencies::resolve_deps_as_top_level( - *spec_map.map.at("c").source_control_file, Test::X86_WINDOWS, {"c1"}, var_provider); - REQUIRE(deps.size() == 1); - REQUIRE(deps.at(0) == spec_b_with_b1); + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + {Dependency{"b"}}, + {DependencyOverride{"b", "1"}, DependencyOverride{"c", "1"}}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "b", {"1", 0}); } +} + +TEST_CASE ("version install transitive overrides", "[versionplan]") +{ + MockCMakeVarProvider var_provider; + + MockVersionedPortfileProvider vp; + + vp.emplace("b", {"1", 0}, Scheme::Relaxed) + .source_control_file->core_paragraph->dependencies.push_back({"c", {}, {}, {Constraint::Type::Exact, "2", 1}}); + vp.emplace("b", {"2", 0}, Scheme::Relaxed); + vp.emplace("c", {"1", 0}, Scheme::String); + vp.emplace("c", {"2", 1}, Scheme::String); + + MockBaselineProvider bp; + bp.v["b"] = {"2", 0}; + bp.v["c"] = {"2", 1}; + + auto install_plan = + unwrap(Dependencies::create_versioned_install_plan(vp, + bp, + var_provider, + {Dependency{"b"}}, + {DependencyOverride{"b", "1"}, DependencyOverride{"c", "1"}}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}); + check_name_and_version(install_plan.install_actions[1], "b", {"1", 0}); +} + +TEST_CASE ("version install default features", "[versionplan]") +{ + MockVersionedPortfileProvider vp; + + auto a_x = make_fpgh("x"); + auto& a_scf = vp.emplace("a", {"1", 0}, Scheme::Relaxed).source_control_file; + a_scf->core_paragraph->default_features.push_back("x"); + a_scf->feature_paragraphs.push_back(std::move(a_x)); + + MockCMakeVarProvider var_provider; + + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, bp, var_provider, {Dependency{"a"}}, {}, toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}, {"x"}); +} + +TEST_CASE ("version dont install default features", "[versionplan]") +{ + MockVersionedPortfileProvider vp; + + auto a_x = make_fpgh("x"); + auto& a_scf = vp.emplace("a", {"1", 0}, Scheme::Relaxed).source_control_file; + a_scf->core_paragraph->default_features.push_back("x"); + a_scf->feature_paragraphs.push_back(std::move(a_x)); + + MockCMakeVarProvider var_provider; + + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan( + vp, bp, var_provider, {Dependency{"a", {"core"}}}, {}, toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}); +} + +TEST_CASE ("version install transitive default features", "[versionplan]") +{ + MockVersionedPortfileProvider vp; + + auto a_x = make_fpgh("x"); + auto& a_scf = vp.emplace("a", {"1", 0}, Scheme::Relaxed).source_control_file; + a_scf->core_paragraph->default_features.push_back("x"); + a_scf->feature_paragraphs.push_back(std::move(a_x)); + + auto& b_scf = vp.emplace("b", {"1", 0}, Scheme::Relaxed).source_control_file; + b_scf->core_paragraph->dependencies.push_back({"a", {"core"}}); + + MockCMakeVarProvider var_provider; + + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + bp.v["b"] = {"1", 0}; + + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, bp, var_provider, {Dependency{"b"}}, {}, toplevel_spec())); + + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}, {"x"}); + check_name_and_version(install_plan.install_actions[1], "b", {"1", 0}); +} + +static PlatformExpression::Expr parse_platform(StringView l) +{ + return unwrap(PlatformExpression::parse_platform_expression(l, PlatformExpression::MultipleBinaryOperators::Deny)); +} + +TEST_CASE ("version install qualified dependencies", "[versionplan]") +{ + MockVersionedPortfileProvider vp; + + vp.emplace("b", {"1", 0}, Scheme::Relaxed); + vp.emplace("c", {"1", 0}, Scheme::Relaxed); + + MockBaselineProvider bp; + bp.v["b"] = {"1", 0}; + bp.v["c"] = {"1", 0}; + + SECTION ("windows") { - // with c2 implying c1 - auto deps = vcpkg::Dependencies::resolve_deps_as_top_level( - *spec_map.map.at("c").source_control_file, Test::X86_WINDOWS, {"c2"}, var_provider); - REQUIRE(deps.size() == 2); - REQUIRE(deps.at(0) == spec_a); - REQUIRE(deps.at(1) == spec_b_with_b1); + MockCMakeVarProvider var_provider; + var_provider.dep_info_vars[toplevel_spec()] = {{"VCPKG_CMAKE_SYSTEM_NAME", "Windows"}}; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan( + vp, + bp, + var_provider, + {{"b", {}, parse_platform("!linux")}, {"c", {}, parse_platform("linux")}}, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "b", {"1", 0}); } + + SECTION ("linux") { - // d -> c[core] - auto deps = vcpkg::Dependencies::resolve_deps_as_top_level( - *spec_map.map.at("d").source_control_file, Test::X86_WINDOWS, {}, var_provider); - REQUIRE(deps.size() == 1); - REQUIRE(deps.at(0) == spec_c); + MockCMakeVarProvider var_provider; + var_provider.dep_info_vars[toplevel_spec()] = {{"VCPKG_CMAKE_SYSTEM_NAME", "Linux"}}; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan( + vp, + bp, + var_provider, + {{"b", {}, parse_platform("!linux")}, {"c", {}, parse_platform("linux")}}, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}); } } + +TEST_CASE ("version install qualified default suppression", "[versionplan]") +{ + MockVersionedPortfileProvider vp; + + auto& a_scf = vp.emplace("a", {"1", 0}, Scheme::Relaxed).source_control_file; + a_scf->core_paragraph->default_features.push_back("x"); + a_scf->feature_paragraphs.push_back(make_fpgh("x")); + + vp.emplace("b", {"1", 0}, Scheme::Relaxed) + .source_control_file->core_paragraph->dependencies.push_back({"a", {"core"}}); + + MockCMakeVarProvider var_provider; + + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + bp.v["b"] = {"1", 0}; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan( + vp, + bp, + var_provider, + {{"b", {}, parse_platform("!linux")}, {"a", {"core"}, parse_platform("linux")}}, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}, {"x"}); + check_name_and_version(install_plan.install_actions[1], "b", {"1", 0}); +} + +TEST_CASE ("version install qualified transitive", "[versionplan]") +{ + MockVersionedPortfileProvider vp; + + vp.emplace("a", {"1", 0}, Scheme::Relaxed); + vp.emplace("c", {"1", 0}, Scheme::Relaxed); + + auto& b_scf = vp.emplace("b", {"1", 0}, Scheme::Relaxed).source_control_file; + b_scf->core_paragraph->dependencies.push_back({"a", {}, parse_platform("!linux")}); + b_scf->core_paragraph->dependencies.push_back({"c", {}, parse_platform("linux")}); + + MockCMakeVarProvider var_provider; + + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + bp.v["b"] = {"1", 0}; + bp.v["c"] = {"1", 0}; + + auto install_plan = + unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"b"}}, {}, toplevel_spec())); + + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}); + check_name_and_version(install_plan.install_actions[1], "b", {"1", 0}); +} + +TEST_CASE ("version install different vars", "[versionplan]") +{ + MockVersionedPortfileProvider vp; + + auto& b_scf = vp.emplace("b", {"1", 0}, Scheme::Relaxed).source_control_file; + b_scf->core_paragraph->dependencies.push_back({"a", {}, parse_platform("!linux")}); + + auto& a_scf = vp.emplace("a", {"1", 0}, Scheme::Relaxed).source_control_file; + a_scf->core_paragraph->dependencies.push_back({"c", {}, parse_platform("linux")}); + + vp.emplace("c", {"1", 0}, Scheme::Relaxed); + + MockCMakeVarProvider var_provider; + var_provider.dep_info_vars[PackageSpec{"a", Test::X86_WINDOWS}] = {{"VCPKG_CMAKE_SYSTEM_NAME", "Linux"}}; + + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + bp.v["b"] = {"1", 0}; + bp.v["c"] = {"1", 0}; + + auto install_plan = + unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"b"}}, {}, toplevel_spec())); + + REQUIRE(install_plan.size() == 3); + check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}); + check_name_and_version(install_plan.install_actions[1], "a", {"1", 0}); + check_name_and_version(install_plan.install_actions[2], "b", {"1", 0}); +} + +TEST_CASE ("version install qualified features", "[versionplan]") +{ + MockVersionedPortfileProvider vp; + + auto& b_scf = vp.emplace("b", {"1", 0}, Scheme::Relaxed).source_control_file; + b_scf->core_paragraph->default_features.push_back("x"); + b_scf->feature_paragraphs.push_back(make_fpgh("x")); + b_scf->feature_paragraphs.back()->dependencies.push_back({"a", {}, parse_platform("!linux")}); + + auto& a_scf = vp.emplace("a", {"1", 0}, Scheme::Relaxed).source_control_file; + a_scf->core_paragraph->default_features.push_back("y"); + a_scf->feature_paragraphs.push_back(make_fpgh("y")); + a_scf->feature_paragraphs.back()->dependencies.push_back({"c", {}, parse_platform("linux")}); + + auto& c_scf = vp.emplace("c", {"1", 0}, Scheme::Relaxed).source_control_file; + c_scf->core_paragraph->default_features.push_back("z"); + c_scf->feature_paragraphs.push_back(make_fpgh("z")); + c_scf->feature_paragraphs.back()->dependencies.push_back({"d", {}, parse_platform("linux")}); + + vp.emplace("d", {"1", 0}, Scheme::Relaxed); + + MockCMakeVarProvider var_provider; + var_provider.dep_info_vars[PackageSpec{"a", Test::X86_WINDOWS}] = {{"VCPKG_CMAKE_SYSTEM_NAME", "Linux"}}; + + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + bp.v["b"] = {"1", 0}; + bp.v["c"] = {"1", 0}; + bp.v["d"] = {"1", 0}; + + auto install_plan = + unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"b"}}, {}, toplevel_spec())); + + REQUIRE(install_plan.size() == 3); + check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}, {"z"}); + check_name_and_version(install_plan.install_actions[1], "a", {"1", 0}, {"y"}); + check_name_and_version(install_plan.install_actions[2], "b", {"1", 0}, {"x"}); +} + +TEST_CASE ("version install self features", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + + MockVersionedPortfileProvider vp; + auto& a_scf = vp.emplace("a", {"1", 0}).source_control_file; + a_scf->feature_paragraphs.push_back(make_fpgh("x")); + a_scf->feature_paragraphs.back()->dependencies.push_back({"a", {"core", "y"}}); + a_scf->feature_paragraphs.push_back(make_fpgh("y")); + a_scf->feature_paragraphs.push_back(make_fpgh("z")); + + MockCMakeVarProvider var_provider; + + auto install_plan = + unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"a", {"x"}}}, {}, toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}, {"x", "y"}); +} diff --git a/toolsrc/src/vcpkg-test/versionplan.cpp b/toolsrc/src/vcpkg-test/versionplan.cpp new file mode 100644 index 00000000000000..2f82d21b43f9ba --- /dev/null +++ b/toolsrc/src/vcpkg-test/versionplan.cpp @@ -0,0 +1,152 @@ +#include + +#include +#include +#include +#include + +#include +#include + +using namespace vcpkg; +using namespace vcpkg::Parse; + +TEST_CASE ("parse depends", "[dependencies]") +{ + auto w = parse_dependencies_list("liba (windows)"); + REQUIRE(w); + auto& v = *w.get(); + REQUIRE(v.size() == 1); + REQUIRE(v.at(0).name == "liba"); + REQUIRE(v.at(0).platform.evaluate({{"VCPKG_CMAKE_SYSTEM_NAME", ""}})); + REQUIRE(v.at(0).platform.evaluate({{"VCPKG_CMAKE_SYSTEM_NAME", "WindowsStore"}})); + REQUIRE(!v.at(0).platform.evaluate({{"VCPKG_CMAKE_SYSTEM_NAME", "Darwin"}})); +} + +TEST_CASE ("filter depends", "[dependencies]") +{ + const std::unordered_map x64_win_cmake_vars{{"VCPKG_TARGET_ARCHITECTURE", "x64"}, + {"VCPKG_CMAKE_SYSTEM_NAME", ""}}; + + const std::unordered_map arm_uwp_cmake_vars{{"VCPKG_TARGET_ARCHITECTURE", "arm"}, + {"VCPKG_CMAKE_SYSTEM_NAME", "WindowsStore"}}; + + auto deps_ = parse_dependencies_list("liba (!uwp), libb, libc (uwp)"); + REQUIRE(deps_); + auto& deps = *deps_.get(); + auto v = filter_dependencies(deps, Test::X64_WINDOWS, x64_win_cmake_vars); + REQUIRE(v.size() == 2); + REQUIRE(v.at(0).package_spec.name() == "liba"); + REQUIRE(v.at(1).package_spec.name() == "libb"); + + auto v2 = filter_dependencies(deps, Test::ARM_UWP, arm_uwp_cmake_vars); + REQUIRE(v.size() == 2); + REQUIRE(v2.at(0).package_spec.name() == "libb"); + REQUIRE(v2.at(1).package_spec.name() == "libc"); +} + +TEST_CASE ("parse feature depends", "[dependencies]") +{ + auto u_ = parse_dependencies_list("libwebp[anim, gif2webp, img2webp, info, mux, nearlossless, " + "simd, cwebp, dwebp], libwebp[vwebp-sdl, extras] (!osx)"); + REQUIRE(u_); + auto& v = *u_.get(); + REQUIRE(v.size() == 2); + auto&& a0 = v.at(0); + REQUIRE(a0.name == "libwebp"); + REQUIRE(a0.features.size() == 9); + REQUIRE(a0.platform.is_empty()); + + auto&& a1 = v.at(1); + REQUIRE(a1.name == "libwebp"); + REQUIRE(a1.features.size() == 2); + REQUIRE(!a1.platform.is_empty()); + REQUIRE(a1.platform.evaluate({{"VCPKG_CMAKE_SYSTEM_NAME", ""}})); + REQUIRE(a1.platform.evaluate({{"VCPKG_CMAKE_SYSTEM_NAME", "Linux"}})); + REQUIRE_FALSE(a1.platform.evaluate({{"VCPKG_CMAKE_SYSTEM_NAME", "Darwin"}})); +} + +TEST_CASE ("qualified dependency", "[dependencies]") +{ + using namespace Test; + PackageSpecMap spec_map; + auto spec_a = FullPackageSpec{spec_map.emplace("a", "b, b[b1] (linux)"), {}}; + auto spec_b = FullPackageSpec{spec_map.emplace("b", "", {{"b1", ""}}), {}}; + + PortFileProvider::MapPortFileProvider map_port{spec_map.map}; + MockCMakeVarProvider var_provider; + + auto plan = vcpkg::Dependencies::create_feature_install_plan(map_port, var_provider, {spec_a}, {}); + REQUIRE(plan.install_actions.size() == 2); + REQUIRE(plan.install_actions.at(0).feature_list == std::vector{"core"}); + + FullPackageSpec linspec_a{{"a", Triplet::from_canonical_name("x64-linux")}, {}}; + var_provider.dep_info_vars[linspec_a.package_spec].emplace("VCPKG_CMAKE_SYSTEM_NAME", "Linux"); + auto plan2 = vcpkg::Dependencies::create_feature_install_plan(map_port, var_provider, {linspec_a}, {}); + REQUIRE(plan2.install_actions.size() == 2); + REQUIRE(plan2.install_actions.at(0).feature_list == std::vector{"b1", "core"}); +} + +TEST_CASE ("resolve_deps_as_top_level", "[dependencies]") +{ + using namespace Test; + PackageSpecMap spec_map; + FullPackageSpec spec_a{spec_map.emplace("a", "b, b[b1] (linux)"), {}}; + FullPackageSpec spec_b{spec_map.emplace("b", "", {{"b1", ""}}), {}}; + FullPackageSpec spec_c{spec_map.emplace("c", "b", {{"c1", "b[b1]"}, {"c2", "c[c1], a"}}, {"c1"}), {"core"}}; + FullPackageSpec spec_d{spec_map.emplace("d", "c[core]"), {}}; + + PortFileProvider::MapPortFileProvider map_port{spec_map.map}; + MockCMakeVarProvider var_provider; + Triplet t_linux = Triplet::from_canonical_name("x64-linux"); + var_provider.dep_info_vars[{"a", t_linux}].emplace("VCPKG_CMAKE_SYSTEM_NAME", "Linux"); + { + auto deps = vcpkg::Dependencies::resolve_deps_as_top_level( + *spec_map.map.at("a").source_control_file, Test::X86_WINDOWS, {}, var_provider); + REQUIRE(deps.size() == 1); + REQUIRE(deps.at(0) == spec_b); + } + { + auto deps = vcpkg::Dependencies::resolve_deps_as_top_level( + *spec_map.map.at("a").source_control_file, t_linux, {}, var_provider); + REQUIRE(deps.size() == 1); + REQUIRE(deps.at(0) == FullPackageSpec({"b", t_linux}, {"b1"})); + } + { + // without defaults + auto deps = vcpkg::Dependencies::resolve_deps_as_top_level( + *spec_map.map.at("c").source_control_file, Test::X86_WINDOWS, {}, var_provider); + REQUIRE(deps.size() == 1); + REQUIRE(deps.at(0) == spec_b); + } + FullPackageSpec spec_b_with_b1{spec_b.package_spec, {"b1"}}; + { + // with defaults of c (c1) + auto deps = vcpkg::Dependencies::resolve_deps_as_top_level( + *spec_map.map.at("c").source_control_file, Test::X86_WINDOWS, {"default"}, var_provider); + REQUIRE(deps.size() == 1); + REQUIRE(deps.at(0) == spec_b_with_b1); + } + { + // with c1 + auto deps = vcpkg::Dependencies::resolve_deps_as_top_level( + *spec_map.map.at("c").source_control_file, Test::X86_WINDOWS, {"c1"}, var_provider); + REQUIRE(deps.size() == 1); + REQUIRE(deps.at(0) == spec_b_with_b1); + } + { + // with c2 implying c1 + auto deps = vcpkg::Dependencies::resolve_deps_as_top_level( + *spec_map.map.at("c").source_control_file, Test::X86_WINDOWS, {"c2"}, var_provider); + REQUIRE(deps.size() == 2); + REQUIRE(deps.at(0) == spec_a); + REQUIRE(deps.at(1) == spec_b_with_b1); + } + { + // d -> c[core] + auto deps = vcpkg::Dependencies::resolve_deps_as_top_level( + *spec_map.map.at("d").source_control_file, Test::X86_WINDOWS, {}, var_provider); + REQUIRE(deps.size() == 1); + REQUIRE(deps.at(0) == spec_c); + } +} diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index 75509343a37b8c..117a05209e47e3 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -628,7 +628,7 @@ namespace vcpkg::Dependencies auto ctx = [&]() -> const PlatformExpression::Context& { if (!ctx_storage) { - var_provider.load_dep_info_vars({{spec}}); + var_provider.load_dep_info_vars({&spec, 1}); ctx_storage = var_provider.get_dep_info_vars(spec); } return ctx_storage.value_or_exit(VCPKG_LINE_INFO); @@ -1157,4 +1157,662 @@ namespace vcpkg::Dependencies Checks::exit_fail(VCPKG_LINE_INFO); } } + + namespace + { + struct VersionedPackageGraph + { + private: + using IVersionedPortfileProvider = PortFileProvider::IVersionedPortfileProvider; + using IBaselineProvider = PortFileProvider::IBaselineProvider; + + public: + VersionedPackageGraph(const IVersionedPortfileProvider& ver_provider, + const IBaselineProvider& base_provider, + const CMakeVars::CMakeVarProvider& var_provider) + : m_ver_provider(ver_provider), m_base_provider(base_provider), m_var_provider(var_provider) + { + } + + void add_override(const std::string& name, const Versions::Version& v); + + void add_roots(View dep, const PackageSpec& toplevel); + + ExpectedS finalize_extract_plan(); + + private: + const IVersionedPortfileProvider& m_ver_provider; + const IBaselineProvider& m_base_provider; + const CMakeVars::CMakeVarProvider& m_var_provider; + + struct DepSpec + { + PackageSpec spec; + Versions::Version ver; + std::vector features; + }; + + // This object contains the current version within a given column. + // Each "string" scheme text is treated as a separate column + // "relaxed" versions all share the same column + struct VersionSchemeInfo + { + const SourceControlFileLocation* scfl = nullptr; + Versions::Version version; + // This tracks a list of constraint sources for debugging purposes + std::vector origins; + std::map> deps; + + bool is_less_than(const Versions::Version& new_ver) const; + }; + + struct PackageNode : Util::MoveOnlyBase + { + std::map vermap; + std::map exacts; + Optional> relaxed; + std::set features; + bool default_features = true; + + VersionSchemeInfo* get_node(const Versions::Version& ver); + VersionSchemeInfo& emplace_node(Versions::Scheme scheme, const Versions::Version& ver); + }; + + std::vector m_roots; + std::map m_overrides; + std::map m_graph; + + std::pair& emplace_package(const PackageSpec& spec); + + void add_constraint(std::pair& ref, + const Dependency& dep, + const std::string& origin); + void add_constraint(std::pair& ref, + const Versions::Version& ver, + const std::string& origin); + void add_constraint(std::pair& ref, + const std::string& feature, + const std::string& origin); + + void add_constraint_default_features(std::pair& ref, + const std::string& origin); + + void add_feature_to(std::pair& ref, + VersionSchemeInfo& vsi, + const std::string& feature); + + std::vector m_errors; + }; + + VersionedPackageGraph::VersionSchemeInfo& VersionedPackageGraph::PackageNode::emplace_node( + Versions::Scheme scheme, const Versions::Version& ver) + { + auto it = vermap.find(ver); + if (it != vermap.end()) return *it->second; + + VersionSchemeInfo* vsi = nullptr; + if (scheme == Versions::Scheme::String) + { + vsi = &exacts[ver.text()]; + } + else if (scheme == Versions::Scheme::Relaxed) + { + if (auto p = relaxed.get()) + { + vsi = p->get(); + } + else + { + relaxed = std::make_unique(); + vsi = relaxed.get()->get(); + } + } + else + { + // not implemented + Checks::unreachable(VCPKG_LINE_INFO); + } + vermap.emplace(ver, vsi); + return *vsi; + } + + VersionedPackageGraph::VersionSchemeInfo* VersionedPackageGraph::PackageNode::get_node( + const Versions::Version& ver) + { + auto it = vermap.find(ver); + return it == vermap.end() ? nullptr : it->second; + } + + enum class VerComp + { + unk, + lt, + eq, + gt, + }; + static VerComp compare_versions(Versions::Scheme sa, + const Versions::Version& a, + Versions::Scheme sb, + const Versions::Version& b) + { + if (sa != sb) return VerComp::unk; + switch (sa) + { + case Versions::Scheme::String: + { + if (a.text() != b.text()) return VerComp::unk; + if (a.port_version() < b.port_version()) return VerComp::lt; + if (a.port_version() > b.port_version()) return VerComp::gt; + return VerComp::eq; + } + case Versions::Scheme::Relaxed: + { + auto i1 = atoi(a.text().c_str()); + auto i2 = atoi(b.text().c_str()); + if (i1 < i2) return VerComp::lt; + if (i1 > i2) return VerComp::gt; + if (a.port_version() < b.port_version()) return VerComp::lt; + if (a.port_version() > b.port_version()) return VerComp::gt; + return VerComp::eq; + } + default: Checks::unreachable(VCPKG_LINE_INFO); + } + } + + bool VersionedPackageGraph::VersionSchemeInfo::is_less_than(const Versions::Version& new_ver) const + { + Checks::check_exit(VCPKG_LINE_INFO, scfl); + ASSUME(scfl != nullptr); + auto scheme = scfl->source_control_file->core_paragraph->version_scheme; + auto r = compare_versions(scheme, version, scheme, new_ver); + Checks::check_exit(VCPKG_LINE_INFO, r != VerComp::unk); + return r == VerComp::lt; + } + + Versions::Version to_version(const SourceControlFile& scf) + { + return { + scf.core_paragraph->version, + scf.core_paragraph->port_version, + }; + } + Optional to_version(const DependencyConstraint& dc) + { + if (dc.type == Versions::Constraint::Type::None) + { + return nullopt; + } + else + { + return Versions::Version{ + dc.value, + dc.port_version, + }; + } + } + + void VersionedPackageGraph::add_feature_to(std::pair& ref, + VersionSchemeInfo& vsi, + const std::string& feature) + { + auto deps = vsi.scfl->source_control_file->find_dependencies_for_feature(feature); + if (!deps) + { + // This version doesn't have this feature. This may result in an error during finalize if the + // constraint is not removed via upgrades. + return; + } + auto p = vsi.deps.emplace(feature, std::vector{}); + if (!p.second) + { + // This feature has already been handled + return; + } + + for (auto&& dep : *deps.get()) + { + PackageSpec dep_spec(dep.name, ref.first.triplet()); + + if (!dep.platform.is_empty()) + { + auto maybe_vars = m_var_provider.get_dep_info_vars(ref.first); + if (!maybe_vars) + { + m_var_provider.load_dep_info_vars({&ref.first, 1}); + maybe_vars = m_var_provider.get_dep_info_vars(ref.first); + } + + if (!dep.platform.evaluate(maybe_vars.value_or_exit(VCPKG_LINE_INFO))) + { + continue; + } + } + + auto& dep_node = emplace_package(dep_spec); + // Todo: cycle detection + add_constraint(dep_node, dep, ref.first.name()); + + p.first->second.emplace_back(dep_spec, "core"); + for (auto&& f : dep.features) + { + p.first->second.emplace_back(dep_spec, f); + } + } + } + + void VersionedPackageGraph::add_constraint_default_features(std::pair& ref, + const std::string& origin) + { + (void)origin; + if (!ref.second.default_features) + { + ref.second.default_features = true; + + if (auto relaxed = ref.second.relaxed.get()) + { + for (auto&& f : relaxed->get()->scfl->source_control_file->core_paragraph->default_features) + { + add_feature_to(ref, **relaxed, f); + } + } + for (auto&& vsi : ref.second.exacts) + { + for (auto&& f : vsi.second.scfl->source_control_file->core_paragraph->default_features) + { + add_feature_to(ref, vsi.second, f); + } + } + } + } + + void VersionedPackageGraph::add_constraint(std::pair& ref, + const Dependency& dep, + const std::string& origin) + { + auto base_ver = m_base_provider.get_baseline_version(dep.name); + auto dep_ver = to_version(dep.constraint); + + if (auto dv = dep_ver.get()) + { + add_constraint(ref, *dv, origin); + } + + if (auto bv = base_ver.get()) + { + add_constraint(ref, *bv, origin); + } + + for (auto&& f : dep.features) + { + add_constraint(ref, f, origin); + } + } + void VersionedPackageGraph::add_constraint(std::pair& ref, + const Versions::Version& version, + const std::string& origin) + { + auto over_it = m_overrides.find(ref.first.name()); + if (over_it != m_overrides.end() && over_it->second != version) + { + return add_constraint(ref, over_it->second, origin); + } + auto maybe_scfl = m_ver_provider.get_control_file({ref.first.name(), version}); + + if (auto p_scfl = maybe_scfl.get()) + { + auto& exact_ref = + ref.second.emplace_node(p_scfl->source_control_file->core_paragraph->version_scheme, version); + exact_ref.origins.push_back(origin); + + bool replace; + if (exact_ref.scfl == nullptr) + { + replace = true; + } + else if (exact_ref.scfl == p_scfl) + { + replace = false; + } + else + { + replace = exact_ref.is_less_than(version); + } + + if (replace) + { + exact_ref.scfl = p_scfl; + exact_ref.version = to_version(*p_scfl->source_control_file); + exact_ref.deps.clear(); + + add_feature_to(ref, exact_ref, "core"); + + for (auto&& f : ref.second.features) + { + add_feature_to(ref, exact_ref, f); + } + + if (ref.second.default_features) + { + for (auto&& f : p_scfl->source_control_file->core_paragraph->default_features) + { + add_feature_to(ref, exact_ref, f); + } + } + } + } + else + { + m_errors.push_back(maybe_scfl.error()); + } + } + + void VersionedPackageGraph::add_constraint(std::pair& ref, + const std::string& feature, + const std::string& origin) + { + auto inserted = ref.second.features.emplace(feature).second; + if (inserted) + { + if (auto relaxed = ref.second.relaxed.get()) + { + add_feature_to(ref, **relaxed, feature); + } + for (auto&& vsi : ref.second.exacts) + { + add_feature_to(ref, vsi.second, feature); + } + } + (void)origin; + } + + std::pair& VersionedPackageGraph::emplace_package( + const PackageSpec& spec) + { + return *m_graph.emplace(spec, PackageNode{}).first; + } + + static Optional dep_to_version(const std::string& name, + const DependencyConstraint& dc, + const PortFileProvider::IBaselineProvider& base_provider) + { + auto maybe_cons = to_version(dc); + if (maybe_cons) + { + return maybe_cons; + } + else + { + return base_provider.get_baseline_version(name); + } + } + + void VersionedPackageGraph::add_override(const std::string& name, const Versions::Version& v) + { + m_overrides.emplace(name, v); + } + + void VersionedPackageGraph::add_roots(View deps, const PackageSpec& toplevel) + { + auto specs = Util::fmap(deps, [&toplevel](const Dependency& d) { + return PackageSpec{d.name, toplevel.triplet()}; + }); + specs.push_back(toplevel); + Util::sort_unique_erase(specs); + m_var_provider.load_dep_info_vars(specs); + const auto& vars = m_var_provider.get_dep_info_vars(toplevel).value_or_exit(VCPKG_LINE_INFO); + std::vector active_deps; + + for (auto&& dep : deps) + { + PackageSpec spec(dep.name, toplevel.triplet()); + if (!dep.platform.evaluate(vars)) continue; + + active_deps.push_back(&dep); + + // Disable default features for deps with [core] as a dependency + // Note: x[core], x[y] will still eventually depend on defaults due to the second x[y] + if (Util::find(dep.features, "core") != dep.features.end()) + { + auto& node = emplace_package(spec); + node.second.default_features = false; + } + } + + for (auto pdep : active_deps) + { + const auto& dep = *pdep; + PackageSpec spec(dep.name, toplevel.triplet()); + + auto& node = emplace_package(spec); + + auto over_it = m_overrides.find(dep.name); + if (over_it != m_overrides.end()) + { + m_roots.push_back(DepSpec{spec, over_it->second, dep.features}); + add_constraint(node, over_it->second, toplevel.name()); + continue; + } + + auto dep_ver = to_version(dep.constraint); + auto base_ver = m_base_provider.get_baseline_version(dep.name); + if (auto p_dep_ver = dep_ver.get()) + { + m_roots.push_back(DepSpec{spec, *p_dep_ver, dep.features}); + if (auto p_base_ver = base_ver.get()) + { + // Compare version constraint with baseline to only evaluate the "tighter" constraint + auto dep_scfl = m_ver_provider.get_control_file({dep.name, *p_dep_ver}); + auto base_scfl = m_ver_provider.get_control_file({dep.name, *p_base_ver}); + if (dep_scfl && base_scfl) + { + auto r = + compare_versions(dep_scfl.get()->source_control_file->core_paragraph->version_scheme, + *p_dep_ver, + base_scfl.get()->source_control_file->core_paragraph->version_scheme, + *p_base_ver); + if (r == VerComp::lt) + { + add_constraint(node, *p_base_ver, "baseline"); + add_constraint(node, *p_dep_ver, toplevel.name()); + } + else + { + add_constraint(node, *p_dep_ver, toplevel.name()); + add_constraint(node, *p_base_ver, "baseline"); + } + } + else + { + if (!dep_scfl) m_errors.push_back(dep_scfl.error()); + if (!base_scfl) m_errors.push_back(base_scfl.error()); + } + } + else + { + add_constraint(node, *p_dep_ver, toplevel.name()); + } + } + else if (auto p_base_ver = base_ver.get()) + { + m_roots.push_back(DepSpec{spec, *p_base_ver, dep.features}); + add_constraint(node, *p_base_ver, toplevel.name()); + } + else + { + m_errors.push_back(Strings::concat("Cannot resolve unversioned dependency from top-level to ", + dep.name, + " without a baseline entry or override.")); + } + + for (auto&& f : dep.features) + { + add_constraint(node, f, toplevel.name()); + } + if (Util::find(dep.features, "core") == dep.features.end()) + { + add_constraint_default_features(node, toplevel.name()); + } + } + } + + ExpectedS VersionedPackageGraph::finalize_extract_plan() + { + if (m_errors.size() > 0) + { + return Strings::join("\n", m_errors); + } + + ActionPlan ret; + + // second == nullptr means "in progress" + std::map emitted; + struct Frame + { + InstallPlanAction ipa; + std::vector deps; + }; + std::vector stack; + + auto push = [&emitted, this, &stack](const PackageSpec& spec, + const Versions::Version& new_ver) -> Optional { + auto&& node = m_graph[spec]; + auto over_it = m_overrides.find(spec.name()); + + VersionedPackageGraph::VersionSchemeInfo* p_vnode; + if (over_it != m_overrides.end()) + p_vnode = node.get_node(over_it->second); + else + p_vnode = node.get_node(new_ver); + + if (!p_vnode) return Strings::concat("Version was not found during discovery: ", spec, "@", new_ver); + + auto p = emitted.emplace(spec, nullptr); + if (p.second) + { + // Newly inserted + if (over_it == m_overrides.end()) + { + // Not overridden -- Compare against baseline + if (auto baseline = m_base_provider.get_baseline_version(spec.name())) + { + if (auto base_node = node.get_node(*baseline.get())) + { + if (base_node != p_vnode) + { + return Strings::concat("Version conflict on ", + spec.name(), + "@", + new_ver, + ": baseline required ", + *baseline.get()); + } + } + } + } + + // -> Add stack frame + auto maybe_vars = m_var_provider.get_dep_info_vars(spec); + + InstallPlanAction ipa(spec, *p_vnode->scfl, RequestType::USER_REQUESTED, std::move(p_vnode->deps)); + std::vector deps; + for (auto&& f : ipa.feature_list) + { + if (auto maybe_deps = + p_vnode->scfl->source_control_file->find_dependencies_for_feature(f).get()) + { + for (auto&& dep : *maybe_deps) + { + if (dep.name == spec.name()) continue; + + if (!dep.platform.is_empty() && + !dep.platform.evaluate(maybe_vars.value_or_exit(VCPKG_LINE_INFO))) + { + continue; + } + auto maybe_cons = dep_to_version(dep.name, dep.constraint, m_base_provider); + + if (auto cons = maybe_cons.get()) + { + deps.emplace_back(DepSpec{{dep.name, spec.triplet()}, std::move(*cons)}); + } + else + { + return Strings::concat("Cannot resolve unconstrained dependency from ", + spec.name(), + " to ", + dep.name, + " without a baseline entry or override."); + } + } + } + } + stack.push_back(Frame{std::move(ipa), std::move(deps)}); + return nullopt; + } + else + { + // spec already present in map + if (p.first->second == nullptr) + { + return Strings::concat( + "Cycle detected during ", + spec, + ":\n", + Strings::join("\n", stack, [](const auto& p) -> const PackageSpec& { return p.ipa.spec; })); + } + else if (p.first->second != p_vnode) + { + // comparable versions should retrieve the same info node + return Strings::concat( + "Version conflict on ", spec.name(), "@", p.first->second->version, ": required ", new_ver); + } + return nullopt; + } + }; + + for (auto&& root : m_roots) + { + if (auto err = push(root.spec, root.ver)) + { + return std::move(*err.get()); + } + + while (stack.size() > 0) + { + auto& back = stack.back(); + if (back.deps.empty()) + { + emitted[back.ipa.spec] = m_graph[back.ipa.spec].get_node( + to_version(*back.ipa.source_control_file_location.get()->source_control_file)); + ret.install_actions.push_back(std::move(back.ipa)); + stack.pop_back(); + } + else + { + auto dep = std::move(back.deps.back()); + back.deps.pop_back(); + if (auto err = push(dep.spec, dep.ver)) + { + return std::move(*err.get()); + } + } + } + } + return ret; + } + } + + ExpectedS create_versioned_install_plan(const PortFileProvider::IVersionedPortfileProvider& provider, + const PortFileProvider::IBaselineProvider& bprovider, + const CMakeVars::CMakeVarProvider& var_provider, + const std::vector& deps, + const std::vector& overrides, + const PackageSpec& toplevel) + { + VersionedPackageGraph vpg(provider, bprovider, var_provider); + for (auto&& o : overrides) + vpg.add_override(o.name, {o.version, o.port_version}); + vpg.add_roots(deps, toplevel); + return vpg.finalize_extract_plan(); + } } diff --git a/toolsrc/src/vcpkg/packagespec.cpp b/toolsrc/src/vcpkg/packagespec.cpp index a40d30340a1bc5..3f35e118e0e487 100644 --- a/toolsrc/src/vcpkg/packagespec.cpp +++ b/toolsrc/src/vcpkg/packagespec.cpp @@ -273,6 +273,7 @@ namespace vcpkg if (lhs.features != rhs.features) return false; if (!structurally_equal(lhs.platform, rhs.platform)) return false; if (lhs.extra_info != rhs.extra_info) return false; + if (lhs.constraint != rhs.constraint) return false; return true; } diff --git a/toolsrc/src/vcpkg/portfileprovider.cpp b/toolsrc/src/vcpkg/portfileprovider.cpp index e3053bfa627be1..3f4640c979a034 100644 --- a/toolsrc/src/vcpkg/portfileprovider.cpp +++ b/toolsrc/src/vcpkg/portfileprovider.cpp @@ -370,7 +370,7 @@ namespace vcpkg::PortFileProvider auto port = port_name.to_string(); for (auto&& version_entry : version_entries) { - VersionSpec spec(port, version_entry.version, version_entry.scheme); + VersionSpec spec(port, version_entry.version); m_impl->versions_cache[port].push_back(spec); m_impl->git_tree_cache.emplace(std::move(spec), std::move(version_entry.git_tree)); } diff --git a/toolsrc/src/vcpkg/versions.cpp b/toolsrc/src/vcpkg/versions.cpp index ac1829712c6f1c..7f19813ec07562 100644 --- a/toolsrc/src/vcpkg/versions.cpp +++ b/toolsrc/src/vcpkg/versions.cpp @@ -2,22 +2,19 @@ namespace vcpkg::Versions { - VersionSpec::VersionSpec(const std::string& port_name, const VersionT& version, Scheme scheme) - : port_name(port_name), version(version), scheme(scheme) + VersionSpec::VersionSpec(const std::string& port_name, const VersionT& version) + : port_name(port_name), version(version) { } - VersionSpec::VersionSpec(const std::string& port_name, - const std::string& version_string, - int port_version, - Scheme scheme) - : port_name(port_name), version(version_string, port_version), scheme(scheme) + VersionSpec::VersionSpec(const std::string& port_name, const std::string& version_string, int port_version) + : port_name(port_name), version(version_string, port_version) { } bool operator==(const VersionSpec& lhs, const VersionSpec& rhs) { - return std::tie(lhs.port_name, lhs.version, lhs.scheme) == std::tie(rhs.port_name, rhs.version, rhs.scheme); + return std::tie(lhs.port_name, lhs.version) == std::tie(rhs.port_name, rhs.version); } bool operator!=(const VersionSpec& lhs, const VersionSpec& rhs) { return !(lhs == rhs); } @@ -28,7 +25,6 @@ namespace vcpkg::Versions using std::size_t; using std::string; - return ((hash()(key.port_name) ^ (hash()(key.version.to_string()) << 1)) >> 1) ^ - (hash()(static_cast(key.scheme)) << 1); + return hash()(key.port_name) ^ (hash()(key.version.to_string()) >> 1); } } \ No newline at end of file diff --git a/toolsrc/src/vcpkg/versiont.cpp b/toolsrc/src/vcpkg/versiont.cpp index 8853123079da24..09dabb450e5336 100644 --- a/toolsrc/src/vcpkg/versiont.cpp +++ b/toolsrc/src/vcpkg/versiont.cpp @@ -4,24 +4,28 @@ namespace vcpkg { - VersionT::VersionT() noexcept : value("0.0.0"), port_version(0) { } - VersionT::VersionT(std::string&& value, int port_version) : value(std::move(value)), port_version(port_version) { } - VersionT::VersionT(const std::string& value, int port_version) : value(value), port_version(port_version) { } + VersionT::VersionT() noexcept : m_text("0.0.0"), m_port_version(0) { } + VersionT::VersionT(std::string&& value, int port_version) : m_text(std::move(value)), m_port_version(port_version) + { + } + VersionT::VersionT(const std::string& value, int port_version) : m_text(value), m_port_version(port_version) { } - std::string VersionT::to_string() const + std::string VersionT::to_string() const { return Strings::concat(*this); } + void VersionT::to_string(std::string& out) const { - return port_version == 0 ? value : Strings::format("%s#%d", value, port_version); + out.append(m_text); + if (m_port_version) Strings::append(out, '#', m_port_version); } bool operator==(const VersionT& left, const VersionT& right) { - return left.port_version == right.port_version && left.value == right.value; + return left.m_port_version == right.m_port_version && left.m_text == right.m_text; } bool operator!=(const VersionT& left, const VersionT& right) { return !(left == right); } bool VersionTMapLess::operator()(const VersionT& left, const VersionT& right) const { - auto cmp = left.value.compare(right.value); + auto cmp = left.m_text.compare(right.m_text); if (cmp < 0) { return true; @@ -31,7 +35,7 @@ namespace vcpkg return false; } - return left.port_version < right.port_version; + return left.m_port_version < right.m_port_version; } VersionDiff::VersionDiff() noexcept : left(), right() { } From 30e86c6b6be7cc7b8fd7d6eb66abe5e5187c2695 Mon Sep 17 00:00:00 2001 From: TeeVenDick Date: Mon, 30 Nov 2020 05:44:03 +0800 Subject: [PATCH 0177/1694] Fix broken doc link (#14833) --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index df67d63d5d28f3..7d0601c139a3c0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -15,7 +15,7 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too - [Triplet files](users/triplets.md) - [Configuration and Environment](users/config-environment.md) - [Usage with Android](users/android.md) -- [Using a manifest file to declare your dependencies](users/top-level-manifest.md) +- [Using a manifest file to declare your dependencies](users/manifests.md) ### Maintainer help From 51d7d403d93eb08dfcdb4b90e232bdd6557db8af Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 1 Dec 2020 01:39:23 +0800 Subject: [PATCH 0178/1694] [vcpkg] Fix issue in vcpkg.targets that introduced in 13755 (#14797) --- scripts/buildsystems/msbuild/vcpkg.targets | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 3c0791aabb6f6a..0ba7d8918c15f2 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -4,15 +4,17 @@ + + + $([System.IO.Path]::Combine($(VcpkgRoot), 'scripts\buildsystems\msbuild\vcpkg-general.xml')) + + -static $(VcpkgPlatformTarget)-$(VcpkgOSTarget)$(VcpkgLinkage) - - $([System.IO.Path]::Combine($(VcpkgRoot), 'scripts\buildsystems\msbuild\vcpkg-general.xml')) - $(VcpkgRoot)\ $(VcpkgManifestRoot)\ From 00af8d418df92d9cd307f4ae4b207a828894739f Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 30 Nov 2020 09:41:33 -0800 Subject: [PATCH 0179/1694] [freetds] Remove patches and update to a version that no longer needs them (#14529) * [freetds] Remove patches and update to a version that no longer needs them Upstream seems to have version numbered releases but they aren't explicitly numbered well in GitHub, so I've intentionally changed the version-string to something unorderable for now. * Also update to 1.2.11. * Update ports/freetds/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/freetds/fix-encoding-h-dependency.patch | 45 ---------- ports/freetds/portfile.cmake | 9 +- ports/freetds/skip-unit-tests.patch | 89 ------------------- ports/freetds/vcpkg.json | 2 +- 4 files changed, 5 insertions(+), 140 deletions(-) delete mode 100644 ports/freetds/fix-encoding-h-dependency.patch delete mode 100644 ports/freetds/skip-unit-tests.patch diff --git a/ports/freetds/fix-encoding-h-dependency.patch b/ports/freetds/fix-encoding-h-dependency.patch deleted file mode 100644 index 7b2909fec4a39f..00000000000000 --- a/ports/freetds/fix-encoding-h-dependency.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt -index 5d036a1..031b9a2 100644 ---- a/src/odbc/CMakeLists.txt -+++ b/src/odbc/CMakeLists.txt -@@ -30,7 +30,7 @@ add_library(tdsodbc SHARED - target_compile_definitions(tdsodbc PUBLIC DLL_EXPORT=1) - # TODO libiconv, odbcinstlib and other dynamics - target_link_libraries(tdsodbc tds replacements tdsutils ${libs} ${lib_NETWORK} ${lib_BASE}) -- -+add_dependencies(tdsodbc generate_encodings_h) - if(MINGW OR CYGWIN) - set_target_properties(tdsodbc PROPERTIES LINK_FLAGS "--static -Wl,--kill-at -Wl,--enable-stdcall-fixup") - endif(MINGW OR CYGWIN) -@@ -41,6 +41,7 @@ add_library(tdsodbc_static STATIC - native.c sql2tds.c error.c odbc_checks.c sqlwchar.c sqlwparams.h - odbc_export.h error_export.h odbc_data.c ${win_SRCS} - ) -+add_dependencies(tdsodbc_static generate_encodings_h) - if (NOT WIN32) - set_target_properties(tdsodbc_static PROPERTIES POSITION_INDEPENDENT_CODE ON) - endif() -diff --git a/src/tds/CMakeLists.txt b/src/tds/CMakeLists.txt -index d8be1a0..42b6a4d 100644 ---- a/src/tds/CMakeLists.txt -+++ b/src/tds/CMakeLists.txt -@@ -29,6 +29,8 @@ if(PERL_FOUND AND NOT EXISTS "${CMAKE_SOURCE_DIR}/configure") - WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) - endif(PERL_FOUND AND NOT EXISTS "${CMAKE_SOURCE_DIR}/configure") - -+add_custom_target(generate_encodings_h DEPENDS "${CMAKE_BINARY_DIR}/include/freetds/encodings.h") -+ - if(WIN32) - set(add_SRCS sspi.c) - else(WIN32) -@@ -44,9 +46,9 @@ add_library(tds STATIC - bulk.c packet.c stream.c random.c - sec_negotiate_gnutls.h sec_negotiate_openssl.h sec_negotiate.c gssapi.c - tds_willconvert.h num_limits.h tds_types.h -- "${CMAKE_BINARY_DIR}/include/freetds/encodings.h" - ${add_SRCS} - ) -+add_dependencies(tds generate_encodings_h) - if (NOT WIN32) - set_target_properties(tds PROPERTIES POSITION_INDEPENDENT_CODE ON) - endif() diff --git a/ports/freetds/portfile.cmake b/ports/freetds/portfile.cmake index b534c43f9c8560..8cc487770cd698 100644 --- a/ports/freetds/portfile.cmake +++ b/ports/freetds/portfile.cmake @@ -1,12 +1,11 @@ +vcpkg_fail_port_install(ON_TARGET "uwp" "linux" "osx") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO freetds/freetds - REF fbf3bbbbc27283b35a5a6aec9992521e684c9abf # 1.2.5 + REF 16f7a6280c7a19bfe5c60e5d61cc08e3f2dff991 # See https://github.com/microsoft/vcpkg/pull/14120#issuecomment-715896755 HEAD_REF master - SHA512 e18dba16705db951ea52055476fac342c1bb62e90629ef82064ad9d3d4a7f2078e8f7674b1602bc21798240e005052dcbc67cdd0912b47163bd95956128c4677 - PATCHES - skip-unit-tests.patch - fix-encoding-h-dependency.patch + SHA512 34ff10764156bac24444a74b636fafa56adc0097a62a3f3249d4bc09a0cdcaa88aa0c4f26761260c56dd47edf738ff68f647e045f32cac28e0be7f6760f7f90b ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/freetds/skip-unit-tests.patch b/ports/freetds/skip-unit-tests.patch deleted file mode 100644 index 0ec6d8ee43358f..00000000000000 --- a/ports/freetds/skip-unit-tests.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e3840ae..19a22bb 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) -@@ -464,7 +464,7 @@ add_subdirectory(src/dblib) - add_subdirectory(src/odbc) - add_subdirectory(src/apps) - add_subdirectory(src/server) --add_subdirectory(src/pool) -+#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 e83b0b1..017d571 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 aa8a179..b626000 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 7fad8db..3d90456 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 37b47e3..ba17bed 100644 ---- a/src/replacements/CMakeLists.txt -+++ b/src/replacements/CMakeLists.txt -@@ -35,7 +35,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 fee56b3..e7a71f0 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_SOURCE_DIR}/configure") - # get name of null device -diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt -index 2a1935c..a46483e 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/vcpkg.json b/ports/freetds/vcpkg.json index 0c01013ad63a21..d24a72769eda7a 100644 --- a/ports/freetds/vcpkg.json +++ b/ports/freetds/vcpkg.json @@ -1,6 +1,6 @@ { "name": "freetds", - "version-string": "1.2.5", + "version-string": "1.2.11", "description": "Implementation of the Tabular Data Stream protocol", "homepage": "https://www.freetds.org", "supports": "windows & !uwp", From d36d05424649d60a4bfe262702863a57f7810dfd Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 1 Dec 2020 01:48:57 +0800 Subject: [PATCH 0180/1694] [vcpkg baseline] [libass] Fix dependency issue in Linux (#14843) * [libass] Fix dependency issue * format vcpkg.json --- ports/libass/CMakeLists.txt | 8 ++++++-- ports/libass/vcpkg.json | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt index aacf89d86b0b75..b91a6aab22b86e 100644 --- a/ports/libass/CMakeLists.txt +++ b/ports/libass/CMakeLists.txt @@ -20,7 +20,7 @@ add_compile_definitions(CONFIG_FRIBIDI) add_compile_definitions(CONFIG_HARFBUZZ) file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c) - +set(FONTCONFIG_LIBRARAY) if(WIN32) list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") @@ -30,6 +30,9 @@ elseif(APPLE) else() list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$") + + find_package(Fontconfig REQUIRED) + set(FONTCONFIG_LIBRARAY Fontconfig::Fontconfig) endif() find_package(Freetype REQUIRED) @@ -60,7 +63,8 @@ endif() target_link_libraries(ass PRIVATE Freetype::Freetype ${FRIBIDI_LIBRARY} - ${HARFBUZZ_LIBRARY}) + ${HARFBUZZ_LIBRARY} + ${FONTCONFIG_LIBRARY}) install(TARGETS ass RUNTIME DESTINATION bin diff --git a/ports/libass/vcpkg.json b/ports/libass/vcpkg.json index 151d87cdd6a69e..f3532dcfc0f8e6 100644 --- a/ports/libass/vcpkg.json +++ b/ports/libass/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libass", "version-string": "0.14.0", - "port-version": 3, + "port-version": 4, "description": "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format", "homepage": "https://github.com/libass/libass", "dependencies": [ @@ -9,6 +9,10 @@ "name": "dirent", "platform": "windows" }, + { + "name": "fontconfig", + "platform": "linux" + }, "freetype", "fribidi", "harfbuzz" From 99cbdc0ae2d9d3f54479d4db40c6a6665d166bd5 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Mon, 30 Nov 2020 09:50:42 -0800 Subject: [PATCH 0181/1694] [vcpkg_apply_patches] Work around /etc/gitconfig: Permission denied (#14848) Co-authored-by: Robert Schumacher --- scripts/cmake/vcpkg_apply_patches.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/cmake/vcpkg_apply_patches.cmake b/scripts/cmake/vcpkg_apply_patches.cmake index 0ca33bc0db622a..5ca7dbca07ad5d 100644 --- a/scripts/cmake/vcpkg_apply_patches.cmake +++ b/scripts/cmake/vcpkg_apply_patches.cmake @@ -37,6 +37,12 @@ function(vcpkg_apply_patches) cmake_parse_arguments(PARSE_ARGV 0 _ap "QUIET" "SOURCE_PATH" "PATCHES") find_program(GIT NAMES git git.cmd) + if(DEFINED ENV{GIT_CONFIG_NOSYSTEM}) + set(GIT_CONFIG_NOSYSTEM_BACKUP "$ENV{GIT_CONFIG_NOSYSTEM}") + else() + unset(GIT_CONFIG_NOSYSTEM_BACKUP) + endif() + set(ENV{GIT_CONFIG_NOSYSTEM} 1) set(PATCHNUM 0) foreach(PATCH ${_ap_PATCHES}) get_filename_component(ABSOLUTE_PATCH "${PATCH}" ABSOLUTE BASE_DIR "${CURRENT_PORT_DIR}") @@ -57,4 +63,9 @@ function(vcpkg_apply_patches) math(EXPR PATCHNUM "${PATCHNUM}+1") endforeach() + if(DEFINED GIT_CONFIG_NOSYSTEM_BACKUP) + set(ENV{GIT_CONFIG_NOSYSTEM} "${GIT_CONFIG_NOSYSTEM_BACKUP}") + else() + unset(ENV{GIT_CONFIG_NOSYSTEM}) + endif() endfunction() From dc56a03438437e877154f41e722f325df8b2da57 Mon Sep 17 00:00:00 2001 From: yurybura Date: Mon, 30 Nov 2020 20:56:22 +0300 Subject: [PATCH 0182/1694] [llvm] update to 11.0.0 (#13998) * [vcpkg] allow to use semicolons in COMMAND argument * [llvm] update to 11.0.0 * [vcpkg] use latest version * [vcpkg] allow to use semicolons in OPTIONS * fix vcpkg_fixup_cmake_targets * [llvm] fix more install paths, add /bigobj option, fix up CMake targets * Apply suggestions from code review * [llvm] fix clang, flang, lld, mlir and polly CMake targets * [llvm] remove empty include directory /include/flang/Config * [llvm] Flang requires C++17 * [llvm] add /Zc:__cplusplus * [llvm] remove empty include directory include/clang-tidy/plugin * [llvm] try to fix ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc. with patch * [llvm] set tools install dir to tools/llvm * [aws-sdk-cpp] fix build after changes in vcpkg_configure_cmake.cmake * [llvm] disable Flang and OpenMP on Windows Co-authored-by: Nicole Mazzuca --- ports/aws-sdk-cpp/CONTROL | 2 +- ports/aws-sdk-cpp/portfile.cmake | 4 +- ports/llvm/0001-add-msvc-options.patch | 31 ++++ ports/llvm/0001-allow-to-use-commas.patch | 30 ---- ports/llvm/0002-fix-install-paths.patch | 70 +++++++++ ports/llvm/0003-fix-openmp-debug.patch | 22 +++ ports/llvm/0003-fix-vs2019-v16.6.patch | 15 -- ports/llvm/0006-workaround-msvc-bug.patch | 39 +++++ ports/llvm/CONTROL | 23 ++- ports/llvm/portfile.cmake | 178 +++++++++++++++------- scripts/ci.baseline.txt | 3 - scripts/cmake/vcpkg_configure_cmake.cmake | 4 +- 12 files changed, 305 insertions(+), 116 deletions(-) create mode 100644 ports/llvm/0001-add-msvc-options.patch delete mode 100644 ports/llvm/0001-allow-to-use-commas.patch create mode 100644 ports/llvm/0003-fix-openmp-debug.patch delete mode 100644 ports/llvm/0003-fix-vs2019-v16.6.patch create mode 100644 ports/llvm/0006-workaround-msvc-bug.patch diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index ca92ed9585c35e..3be9be28561c93 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,6 +1,6 @@ Source: aws-sdk-cpp Version: 1.8.83 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/aws/aws-sdk-cpp Description: AWS SDK for C++ Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 21aac718aba7a2..03a8929eed82d0 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -15,8 +15,6 @@ set(BUILD_ONLY core) include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) -string(REPLACE ";" "\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}") - if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) set(rpath "@loader_path") else() @@ -31,7 +29,7 @@ vcpkg_configure_cmake( -DENABLE_TESTING=OFF -DFORCE_SHARED_CRT=${FORCE_SHARED_CRT} -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE - -DBUILD_ONLY=${BUILD_ONLY} + "-DBUILD_ONLY=${BUILD_ONLY}" -DBUILD_DEPS=OFF -DCMAKE_INSTALL_RPATH=${rpath} ) diff --git a/ports/llvm/0001-add-msvc-options.patch b/ports/llvm/0001-add-msvc-options.patch new file mode 100644 index 00000000000000..be5ad818964b2b --- /dev/null +++ b/ports/llvm/0001-add-msvc-options.patch @@ -0,0 +1,31 @@ + llvm/cmake/modules/HandleLLVMOptions.cmake | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake +index 5ef22eb493ba..3e2f372e80c9 100644 +--- a/llvm/cmake/modules/HandleLLVMOptions.cmake ++++ b/llvm/cmake/modules/HandleLLVMOptions.cmake +@@ -426,6 +426,12 @@ if( MSVC ) + + append("/Zc:inline" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) + ++ # Some projects use the __cplusplus preprocessor macro to check support for ++ # a particular version of the C++ standard. When this option is not specified ++ # explicitly, macro's value is "199711L" that implies C++98 Standard. ++ # https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/ ++ append("/Zc:__cplusplus" CMAKE_CXX_FLAGS) ++ + # Allow users to request PDBs in release mode. CMake offeres the + # RelWithDebInfo configuration, but it uses different optimization settings + # (/Ob1 vs /Ob2 or -O2 vs -O3). LLVM provides this flag so that users can get +@@ -478,6 +484,10 @@ if( MSVC ) + endif() + endif() + endif() ++ # By default MSVC has a 2^16 limit on the number of sections in an object file, ++ # but in many objects files need more than that. This flag is to increase the ++ # number of sections. ++ append("/bigobj" CMAKE_CXX_FLAGS) + endif( MSVC ) + + # Warnings-as-errors handling for GCC-compatible compilers: diff --git a/ports/llvm/0001-allow-to-use-commas.patch b/ports/llvm/0001-allow-to-use-commas.patch deleted file mode 100644 index 8276efa53476d8..00000000000000 --- a/ports/llvm/0001-allow-to-use-commas.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt -index a02c2a5a23f..bdbf0b1303c 100644 ---- a/llvm/CMakeLists.txt -+++ b/llvm/CMakeLists.txt -@@ -70,6 +70,12 @@ if( LLVM_ENABLE_PROJECTS STREQUAL "all" ) - set( LLVM_ENABLE_PROJECTS ${LLVM_ALL_PROJECTS}) - endif() - -+# Allow to use commas in LLVM_ENABLE_PROJECTS ("llvm,clang,...") -+string(REPLACE "," ";" fixed_LLVM_ENABLE_PROJECTS "${LLVM_ENABLE_PROJECTS}") -+if(NOT fixed_LLVM_ENABLE_PROJECTS STREQUAL LLVM_ENABLE_PROJECTS) -+ set(LLVM_ENABLE_PROJECTS "${fixed_LLVM_ENABLE_PROJECTS}" CACHE STRING "" FORCE) -+endif() -+ - # LLVM_ENABLE_PROJECTS_USED is `ON` if the user has ever used the - # `LLVM_ENABLE_PROJECTS` CMake cache variable. This exists for - # several reasons: -@@ -383,6 +389,12 @@ set(LLVM_TARGETS_TO_BUILD - ${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}) - list(REMOVE_DUPLICATES LLVM_TARGETS_TO_BUILD) - -+# Allow to use commas in the LLVM_TARGETS_TO_BUILD ("X86,AArch64,...") -+string(REPLACE "," ";" fixed_LLVM_TARGETS_TO_BUILD "${LLVM_TARGETS_TO_BUILD}") -+if(NOT fixed_LLVM_TARGETS_TO_BUILD STREQUAL LLVM_TARGETS_TO_BUILD) -+ set(LLVM_TARGETS_TO_BUILD "${fixed_LLVM_TARGETS_TO_BUILD}" CACHE STRING "" FORCE) -+endif() -+ - option(LLVM_ENABLE_PIC "Build Position-Independent Code" ON) - option(LLVM_ENABLE_WARNINGS "Enable compiler warnings." ON) - option(LLVM_ENABLE_MODULES "Compile with C++ modules enabled." OFF) diff --git a/ports/llvm/0002-fix-install-paths.patch b/ports/llvm/0002-fix-install-paths.patch index 5e63424a44d8de..70357a7ba0eb87 100644 --- a/ports/llvm/0002-fix-install-paths.patch +++ b/ports/llvm/0002-fix-install-paths.patch @@ -16,6 +16,58 @@ index d233f552f01..26f502ad2d2 100644 set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS) +diff --git a/flang/cmake/modules/CMakeLists.txt b/flang/cmake/modules/CMakeLists.txt +index d233f552f01..26f502ad2d2 100644 +--- a/flang/cmake/modules/CMakeLists.txt ++++ b/flang/cmake/modules/CMakeLists.txt +@@ -1,11 +1,11 @@ + # 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. +-set(FLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/flang) ++set(FLANG_INSTALL_PACKAGE_DIR share/flang) + set(flang_cmake_builddir "${CMAKE_BINARY_DIR}/${FLANG_INSTALL_PACKAGE_DIR}") + + # Keep this in sync with llvm/cmake/CMakeLists.txt! +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR share/llvm) + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + get_property(FLANG_EXPORTS GLOBAL PROPERTY FLANG_EXPORTS) +diff --git a/lld/cmake/modules/CMakeLists.txt b/lld/cmake/modules/CMakeLists.txt +index d233f552f01..26f502ad2d2 100644 +--- a/lld/cmake/modules/CMakeLists.txt ++++ b/lld/cmake/modules/CMakeLists.txt +@@ -1,11 +1,11 @@ + # 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. +-set(LLD_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/lld) ++set(LLD_INSTALL_PACKAGE_DIR share/lld) + set(lld_cmake_builddir "${CMAKE_BINARY_DIR}/${LLD_INSTALL_PACKAGE_DIR}") + + # Keep this in sync with llvm/cmake/CMakeLists.txt! +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR share/llvm) + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + get_property(LLD_EXPORTS GLOBAL PROPERTY LLD_EXPORTS) +diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake +index 211f9551271..2abe3803f91 100644 +--- a/llvm/cmake/modules/AddLLVM.cmake ++++ b/llvm/cmake/modules/AddLLVM.cmake +@@ -973,10 +973,10 @@ + if(ARG_GEN_CONFIG) + + ## Part 1: Extension header to be included whenever we need extension + # processing. +- set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++ set(LLVM_INSTALL_PACKAGE_DIR share/llvm) + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + file(WRITE + "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake" + "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") + install(FILES diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt index 9cf22b436fa..8eeb27d1794 100644 --- a/llvm/cmake/modules/CMakeLists.txt @@ -26,6 +78,24 @@ index 9cf22b436fa..8eeb27d1794 100644 set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") # 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 d233f552f01..26f502ad2d2 100644 +--- a/mlir/cmake/modules/CMakeLists.txt ++++ b/mlir/cmake/modules/CMakeLists.txt +@@ -1,11 +1,11 @@ + # 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. +-set(MLIR_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir) ++set(MLIR_INSTALL_PACKAGE_DIR share/mlir) + set(mlir_cmake_builddir "${CMAKE_BINARY_DIR}/${MLIR_INSTALL_PACKAGE_DIR}") + + # Keep this in sync with llvm/cmake/CMakeLists.txt! +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR share/llvm) + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + get_property(MLIR_EXPORTS GLOBAL PROPERTY MLIR_EXPORTS) diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt index 211f9551271..2abe3803f91 100644 --- a/polly/cmake/CMakeLists.txt diff --git a/ports/llvm/0003-fix-openmp-debug.patch b/ports/llvm/0003-fix-openmp-debug.patch new file mode 100644 index 00000000000000..577785afdb2492 --- /dev/null +++ b/ports/llvm/0003-fix-openmp-debug.patch @@ -0,0 +1,22 @@ +diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt +index 81275c0483d..61468e048ec 100644 +--- a/openmp/runtime/src/CMakeLists.txt ++++ b/openmp/runtime/src/CMakeLists.txt +@@ -136,7 +136,7 @@ libomp_get_ldflags(LIBOMP_CONFIGURED_LDFLAGS) + add_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES}) + + 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} + ) +@@ -215,7 +215,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/0003-fix-vs2019-v16.6.patch b/ports/llvm/0003-fix-vs2019-v16.6.patch deleted file mode 100644 index 0c89eb5c21484e..00000000000000 --- a/ports/llvm/0003-fix-vs2019-v16.6.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/llvm/include/llvm/Support/ManagedStatic.h b/llvm/include/llvm/Support/ManagedStatic.h -index bbd0d04ed..f2b41422f 100644 ---- a/llvm/include/llvm/Support/ManagedStatic.h -+++ b/llvm/include/llvm/Support/ManagedStatic.h -@@ -40,8 +40,8 @@ template struct object_deleter { - // constexpr, a dynamic initializer may be emitted depending on optimization - // settings. For the affected versions of MSVC, use the old linker - // initialization pattern of not providing a constructor and leaving the fields --// uninitialized. --#if !defined(_MSC_VER) || defined(__clang__) -+// uninitialized. See http://llvm.org/PR41367 for details. -+#if !defined(_MSC_VER) || (_MSC_VER >= 1925) || defined(__clang__) - #define LLVM_USE_CONSTEXPR_CTOR - #endif - diff --git a/ports/llvm/0006-workaround-msvc-bug.patch b/ports/llvm/0006-workaround-msvc-bug.patch new file mode 100644 index 00000000000000..db1574b9ce43d3 --- /dev/null +++ b/ports/llvm/0006-workaround-msvc-bug.patch @@ -0,0 +1,39 @@ +diff --git a/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp b/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp +--- a/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp ++++ b/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp +@@ -10,6 +10,17 @@ + // + //===----------------------------------------------------------------------===// + ++// Disable optimizations to work around MSVC debug mode bug in 32-bit: ++// https://developercommunity.visualstudio.com/content/problem/1179643/msvc-copies-overaligned-non-trivially-copyable-par.html ++// FIXME: Remove this when the issue is closed. ++#if defined(_MSC_VER) && !defined(__clang__) && defined(_M_IX86) ++// We have to disable runtime checks in order to enable optimizations. This is ++// done for the entire file because the problem is actually observed in STL ++// template functions. ++#pragma runtime_checks("", off) ++#pragma optimize("gs", on) ++#endif ++ + #include "llvm/CodeGen/GlobalISel/LegalizerInfo.h" + + using namespace llvm; +diff --git a/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp b/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp +--- a/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp ++++ b/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp +@@ -406,3 +406,13 @@ + 32, 8, AtomicOrdering::NotAtomic })); + } + } ++ ++// This code sequence doesn't do anything, but it covers a previously uncovered ++// codepath that used to crash in MSVC x86_32 debug mode. ++TEST(LegalizerInfoTest, MSVCDebugMiscompile) { ++ const LLT S1 = LLT::scalar(1); ++ const LLT P0 = LLT::pointer(0, 32); ++ LegalizerInfo LI; ++ auto Builder = LI.getActionDefinitionsBuilder(TargetOpcode::G_PTRTOINT); ++ (void)Builder.legalForCartesianProduct({S1}, {P0}); ++} + diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL index c6d6527014467b..933f234d60bf10 100644 --- a/ports/llvm/CONTROL +++ b/ports/llvm/CONTROL @@ -1,6 +1,5 @@ Source: llvm -Version: 10.0.0 -Port-Version: 7 +Version: 11.0.0 Homepage: https://llvm.org/ Description: The LLVM Compiler Infrastructure Supports: !uwp @@ -18,7 +17,7 @@ Build-Depends: llvm[core,target-x86] (x86|x64), llvm[core,target-arm] (arm&!arm6 Feature: target-all Description: Build with all backends. -Build-Depends: llvm[core,target-aarch64,target-amdgpu,target-arm,target-bpf,target-hexagon,target-lanai,target-mips,target-msp430,target-nvptx,target-powerpc,target-riscv,target-sparc,target-systemz,target-webassembly,target-x86,target-xcore] +Build-Depends: llvm[core,target-aarch64,target-amdgpu,target-arm,target-avr,target-bpf,target-hexagon,target-lanai,target-mips,target-msp430,target-nvptx,target-powerpc,target-riscv,target-sparc,target-systemz,target-webassembly,target-x86,target-xcore] Feature: target-aarch64 Description: Build with AArch64 backend. @@ -29,6 +28,9 @@ Description: Build with AMDGPU backend. Feature: target-arm Description: Build with ARM backend. +Feature: target-avr +Description: Build with AVR backend. + Feature: target-bpf Description: Build with BPF backend. @@ -95,14 +97,23 @@ Description: Build Clang tools. Feature: compiler-rt Description: Build compiler's runtime libraries. +Feature: flang +Description: Build Fortran front end. +Build-Depends: llvm[core,mlir] + Feature: lld Description: Build LLVM linker. -Feature: openmp -Description: Build LLVM OpenMP libraries. - Feature: lldb Description: Build LLDB debugger. +Feature: mlir +Description: Build Multi-Level IR Compiler Framework. + +Feature: openmp +Description: Build LLVM OpenMP libraries. +Build-Depends: llvm[core,utils] + Feature: polly Description: Build polyhedral optimizations for LLVM. +Build-Depends: llvm[core,utils] diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 6928676a876054..ddb7db92c80f50 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -1,19 +1,20 @@ -set(VERSION "10.0.0") +set(LLVM_VERSION "11.0.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO llvm/llvm-project - REF llvmorg-10.0.0 - SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0 + REF llvmorg-${LLVM_VERSION} + SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2 HEAD_REF master PATCHES - 0001-allow-to-use-commas.patch - 0002-fix-install-paths.patch - 0003-fix-vs2019-v16.6.patch + 0001-add-msvc-options.patch # Fixed in LLVM 12.0.0 + 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 + 0006-workaround-msvc-bug.patch # Fixed in LLVM 12.0.0 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -24,6 +25,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS enable-rtti LLVM_ENABLE_RTTI ) +# 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 +# and thread "[llvm-dev] Longstanding failing tests - clang-tidy, MachO, Polly" on llvm-dev Jan 21-23 2020. +list(APPEND FEATURE_OPTIONS + -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON +) + # By default assertions are enabled for Debug configuration only. if("enable-assertions" IN_LIST FEATURES) # Force enable assertions for all configurations. @@ -62,12 +71,6 @@ if("clang" IN_LIST FEATURES OR "clang-tools-extra" IN_LIST FEATURES) -DCLANG_ENABLE_STATIC_ANALYZER=OFF ) endif() - if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND FEATURE_OPTIONS - # Disable dl library on Windows - -DDL_LIBRARY_PATH:FILEPATH= - ) - endif() endif() if("clang-tools-extra" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "clang-tools-extra") @@ -75,28 +78,66 @@ endif() if("compiler-rt" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "compiler-rt") endif() +if("flang" IN_LIST FEATURES) + # Disable Flang on Windows (see http://lists.llvm.org/pipermail/flang-dev/2020-July/000448.html). + if(VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Building Flang with MSVC is not supported.") + endif() + list(APPEND LLVM_ENABLE_PROJECTS "flang") + list(APPEND FEATURE_OPTIONS + # Flang requires C++17 + -DCMAKE_CXX_STANDARD=17 + ) +endif() if("lld" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "lld") endif() +if("lldb" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_PROJECTS "lldb") +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.") + endif() list(APPEND LLVM_ENABLE_PROJECTS "openmp") # Perl is required for the OpenMP run-time vcpkg_find_acquire_program(PERL) list(APPEND FEATURE_OPTIONS - -DPERL_EXECUTABLE=${PERL} + "-DPERL_EXECUTABLE=${PERL}" ) -endif() -if("lldb" IN_LIST FEATURES) - list(APPEND LLVM_ENABLE_PROJECTS "lldb") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + list(APPEND FEATURE_OPTIONS + -DLIBOMP_DEFAULT_LIB_NAME=libompd + ) + endif() endif() if("polly" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "polly") endif() set(known_llvm_targets - AArch64 AMDGPU ARM BPF Hexagon Lanai Mips - MSP430 NVPTX PowerPC RISCV Sparc SystemZ - WebAssembly X86 XCore) + AArch64 + AMDGPU + ARM + AVR + BPF + Hexagon + Lanai + Mips + MSP430 + NVPTX + PowerPC + RISCV + Sparc + SystemZ + WebAssembly + X86 + XCore +) set(LLVM_TARGETS_TO_BUILD "") foreach(llvm_target IN LISTS known_llvm_targets) @@ -106,12 +147,9 @@ foreach(llvm_target IN LISTS known_llvm_targets) endif() endforeach() -# Use comma-separated string instead of semicolon-separated string. -# See https://github.com/microsoft/vcpkg/issues/4320 -string(REPLACE ";" "," LLVM_ENABLE_PROJECTS "${LLVM_ENABLE_PROJECTS}") -string(REPLACE ";" "," LLVM_TARGETS_TO_BUILD "${LLVM_TARGETS_TO_BUILD}") - vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) +vcpkg_add_to_path(${PYTHON3_DIR}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/llvm @@ -122,60 +160,88 @@ vcpkg_configure_cmake( -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_BUILD_TESTS=OFF - # Disable optional dependencies to libxml2 and zlib + # Disable optional dependencies to libxml2 and zlib. -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_ENABLE_ZLIB=OFF # Force TableGen to be built with optimization. This will significantly improve build time. -DLLVM_OPTIMIZED_TABLEGEN=ON - # 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 - -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON - -DLLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS} - -DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS_TO_BUILD} - -DPACKAGE_VERSION=${VERSION} - -DPYTHON_EXECUTABLE=${PYTHON3} + "-DLLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS}" + "-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_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}) + if("clang" IN_LIST FEATURES) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/clang TARGET_PATH share/clang) + vcpkg_fixup_cmake_targets(CONFIG_PATH "share/clang" TARGET_PATH "share/clang" DO_NOT_DELETE_PARENT_CONFIG_PATH) + file(INSTALL ${SOURCE_PATH}/clang/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/clang RENAME copyright) +endif() - if(VCPKG_TARGET_IS_WINDOWS) - set(LLVM_EXECUTABLE_REGEX [[^([^.]*|[^.]*\.lld)\.exe$]]) - else() - set(LLVM_EXECUTABLE_REGEX [[^([^.]*|[^.]*\.lld)$]]) +if("clang-tools-extra" IN_LIST FEATURES) + # Remove empty include directory include/clang-tidy/plugin + file(GLOB_RECURSE INCLUDE_CLANG_TIDY_PLUGIN_FILES "${CURRENT_PACKAGES_DIR}/include/clang-tidy/plugin/*") + if(NOT INCLUDE_CLANG_TIDY_PLUGIN_FILES) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/clang-tidy/plugin") endif() +endif() - file(GLOB LLVM_TOOL_FILES "${CURRENT_PACKAGES_DIR}/bin/*") - set(LLVM_TOOLS) - foreach(tool_file IN LISTS LLVM_TOOL_FILES) - get_filename_component(tool_file "${tool_file}" NAME) - if(tool_file MATCHES "${LLVM_EXECUTABLE_REGEX}") - list(APPEND LLVM_TOOLS "${CMAKE_MATCH_1}") - endif() - endforeach() +if("flang" IN_LIST FEATURES) + vcpkg_fixup_cmake_targets(CONFIG_PATH "share/flang" TARGET_PATH "share/flang" DO_NOT_DELETE_PARENT_CONFIG_PATH) + file(INSTALL ${SOURCE_PATH}/flang/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/flang RENAME copyright) + # Remove empty include directory /include/flang/Config + file(GLOB_RECURSE INCLUDE_FLANG_CONFIG_FILES "${CURRENT_PACKAGES_DIR}/include/flang/Config/*") + if(NOT INCLUDE_FLANG_CONFIG_FILES) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/flang/Config") + endif() +endif() + +if("lld" IN_LIST FEATURES) + vcpkg_fixup_cmake_targets(CONFIG_PATH "share/lld" TARGET_PATH "share/lld" DO_NOT_DELETE_PARENT_CONFIG_PATH) + file(INSTALL ${SOURCE_PATH}/lld/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lld RENAME copyright) +endif() - vcpkg_copy_tools( - TOOL_NAMES ${LLVM_TOOLS} - AUTO_CLEAN) +if("mlir" IN_LIST FEATURES) + vcpkg_fixup_cmake_targets(CONFIG_PATH "share/mlir" TARGET_PATH "share/mlir" DO_NOT_DELETE_PARENT_CONFIG_PATH) + file(INSTALL ${SOURCE_PATH}/mlir/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/mlir RENAME copyright) endif() +if("polly" IN_LIST FEATURES) + vcpkg_fixup_cmake_targets(CONFIG_PATH "share/polly" TARGET_PATH "share/polly" DO_NOT_DELETE_PARENT_CONFIG_PATH) + file(INSTALL ${SOURCE_PATH}/polly/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/polly RENAME copyright) +endif() + +vcpkg_fixup_cmake_targets(CONFIG_PATH "share/llvm" TARGET_PATH "share/llvm") +file(INSTALL ${SOURCE_PATH}/llvm/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/llvm RENAME copyright) + +if(VCPKG_TARGET_IS_WINDOWS) + set(LLVM_EXECUTABLE_REGEX [[^([^.]*|[^.]*\.lld)\.exe$]]) +else() + set(LLVM_EXECUTABLE_REGEX [[^([^.]*|[^.]*\.lld)$]]) +endif() + +file(GLOB LLVM_TOOL_FILES "${CURRENT_PACKAGES_DIR}/bin/*") +set(LLVM_TOOLS) +foreach(tool_file IN LISTS LLVM_TOOL_FILES) + get_filename_component(tool_file "${tool_file}" NAME) + if(tool_file MATCHES "${LLVM_EXECUTABLE_REGEX}") + list(APPEND LLVM_TOOLS "${CMAKE_MATCH_1}") + endif() +endforeach() + +vcpkg_copy_tools(TOOL_NAMES ${LLVM_TOOLS} AUTO_CLEAN) + 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) -endif() - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/llvm/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -if("clang" IN_LIST FEATURES) - file(INSTALL ${SOURCE_PATH}/clang/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/clang RENAME copyright) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/tools) endif() # LLVM still generates a few DLLs in the static build: diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1d577800fe37c9..20c48681e77bcc 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -431,9 +431,6 @@ h3:arm64-windows=fail h3:arm-uwp=fail h3:x64-uwp=fail halide:x64-windows-static=fail -# Halide depends on LLVM, which is mis-compiled by MSVC in x86-windows-dbg. -# See https://developercommunity.visualstudio.com/content/problem/1179643/msvc-copies-overaligned-non-trivially-copyable-par.html -halide:x86-windows=skip hdf5:arm64-windows=fail hdf5:arm-uwp=fail hdf5:x64-uwp=fail diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 14df78e53cf96c..2f22d34a14a7ac 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -270,12 +270,12 @@ function(vcpkg_configure_cmake) endforeach() set(rel_command - ${CMAKE_COMMAND} ${_csc_SOURCE_PATH} ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE} + ${CMAKE_COMMAND} ${_csc_SOURCE_PATH} "${_csc_OPTIONS}" "${_csc_OPTIONS_RELEASE}" -G ${GENERATOR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}) set(dbg_command - ${CMAKE_COMMAND} ${_csc_SOURCE_PATH} ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG} + ${CMAKE_COMMAND} ${_csc_SOURCE_PATH} "${_csc_OPTIONS}" "${_csc_OPTIONS_DEBUG}" -G ${GENERATOR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug) From 2f6d9aa947a02d036b50f3fa305e6df2e790f53e Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Mon, 30 Nov 2020 12:05:02 -0600 Subject: [PATCH 0183/1694] [flashlight-cuda] New Port (#14676) * [flashlight-cuda] New Port * Rebase on NCCL port, update commit * Add default feature (fl) --- ports/flashlight-cuda/portfile.cmake | 55 +++++++++++++++++++++ ports/flashlight-cuda/vcpkg.json | 72 ++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+) create mode 100644 ports/flashlight-cuda/portfile.cmake create mode 100644 ports/flashlight-cuda/vcpkg.json diff --git a/ports/flashlight-cuda/portfile.cmake b/ports/flashlight-cuda/portfile.cmake new file mode 100644 index 00000000000000..de9d33b7efb06b --- /dev/null +++ b/ports/flashlight-cuda/portfile.cmake @@ -0,0 +1,55 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebookresearch/flashlight + REF cd0aa18b94340afc7cfa9a14281d1c90c0ed42e1 + SHA512 a11392af82054b63c557214c04e59b362aa1eb5897b30a595b26fd22c37c29571e504346947c6b9cebc4499c3af68d2075fd3144dcc0535a27886e34036ac5ff + HEAD_REF master +) + +################################### Build ################################### +# Default flags +set(FL_DEFAULT_VCPKG_CMAKE_FLAGS + -DFL_BUILD_TESTS=OFF + -DFL_BUILD_EXAMPLES=OFF + -DFL_BACKEND=CUDA # this port is CUDA-backend only + -DFL_BUILD_STANDALONE=OFF + -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT} # for CMake configs/targets + ) + +# Determine which backend to build via specified feature +vcpkg_check_features( + OUT_FEATURE_OPTIONS FL_BACKEND_FEATURE_OPTIONS + FEATURES + lib FL_BUILD_LIBRARIES + fl FL_BUILD_CORE + asr FL_BUILD_APP_ASR + imgclass FL_BUILD_APP_IMG_CLASS +) + +# Build and install +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} ${FL_BACKEND_FEATURE_OPTIONS} +) +vcpkg_install_cmake() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Binaries/tools +set(FLASHLIGHT_TOOLS "") +if ("imgclass" IN_LIST FEATURES) + list(APPEND FLASHLIGHT_TOOLS fl_imageNetResnet34) +endif() +if ("asr" IN_LIST FEATURES) + list(APPEND FLASHLIGHT_TOOLS fl_asr_train fl_asr_test fl_asr_decode) +endif() +list(LENGTH FLASHLIGHT_TOOLS NUM_TOOLS) +if (NUM_TOOLS GREATER 0) + vcpkg_copy_tools(TOOL_NAMES ${FLASHLIGHT_TOOLS} AUTO_CLEAN) +endif() + +# Copyright and license +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/flashlight-cuda RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/flashlight-cuda RENAME license) diff --git a/ports/flashlight-cuda/vcpkg.json b/ports/flashlight-cuda/vcpkg.json new file mode 100644 index 00000000000000..f962304c6227a0 --- /dev/null +++ b/ports/flashlight-cuda/vcpkg.json @@ -0,0 +1,72 @@ +{ + "name": "flashlight-cuda", + "version-string": "20201120", + "port-version": 1, + "description": "A C++ standalone library for machine learning. CUDA backend.", + "supports": "!(windows | osx)", + "default-features": [ + "fl" + ], + "features": { + "asr": { + "description": "flashlight asr app", + "dependencies": [ + { + "name": "flashlight-cuda", + "default-features": false, + "features": [ + "fl" + ] + }, + "gflags", + "libsndfile" + ] + }, + "fl": { + "description": "flashlight core autograd and neural net library", + "dependencies": [ + { + "name": "arrayfire", + "default-features": false, + "features": [ + "cuda" + ] + }, + "cereal", + "cuda", + "cudnn", + { + "name": "flashlight-cuda", + "default-features": false, + "features": [ + "lib" + ] + }, + "nccl", + "openmpi" + ] + }, + "imgclass": { + "description": "flashlight image classification app", + "dependencies": [ + { + "name": "flashlight-cuda", + "default-features": false, + "features": [ + "fl" + ] + }, + "gflags" + ] + }, + "lib": { + "description": "flashlight libraries", + "dependencies": [ + "cub", + "fftw3", + "intel-mkl", + "kenlm" + ] + } + } +} From 8e5865e4052aa330dcbdc0a8a188dcb9bc9bec89 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 30 Nov 2020 19:06:27 +0100 Subject: [PATCH 0184/1694] [tiny-process-library] Bump tiny-process-library to 2.0.4 (#14732) * Bump tiny-process-library to 2.0.3 * fixup * fixup --- ports/tiny-process-library/CONTROL | 4 +-- ports/tiny-process-library/fix-cmake.patch | 40 ---------------------- ports/tiny-process-library/portfile.cmake | 11 +++--- 3 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 ports/tiny-process-library/fix-cmake.patch diff --git a/ports/tiny-process-library/CONTROL b/ports/tiny-process-library/CONTROL index 938277aa99652b..2a6ad9955b7666 100644 --- a/ports/tiny-process-library/CONTROL +++ b/ports/tiny-process-library/CONTROL @@ -1,3 +1,3 @@ Source: tiny-process-library -Version: 2018-12-06 -Description: A small platform independent library +Version: 2.0.4 +Description: A small platform independent library to create and stop new processes in C++ diff --git a/ports/tiny-process-library/fix-cmake.patch b/ports/tiny-process-library/fix-cmake.patch deleted file mode 100644 index c8a264622b81fb..00000000000000 --- a/ports/tiny-process-library/fix-cmake.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ace2879..15c7f44 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.8) - project(tiny-process-library) - - if(MSVC) -+ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) - else() - add_compile_options(-std=c++11 -Wall -Wextra) -@@ -23,7 +24,7 @@ endif() - find_package(Threads REQUIRED) - - target_link_libraries(tiny-process-library ${CMAKE_THREAD_LIBS_INIT}) --target_include_directories(tiny-process-library PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -+target_include_directories(tiny-process-library PUBLIC $) - - option(BUILD_TESTING OFF) - -@@ -34,7 +35,17 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") - - set(BUILD_TESTING ON) - -- install(TARGETS tiny-process-library DESTINATION lib) -+ install(TARGETS tiny-process-library -+ EXPORT ${PROJECT_NAME}-config -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ) -+ install(EXPORT ${PROJECT_NAME}-config -+ FILE unofficial-${PROJECT_NAME}-config.cmake -+ NAMESPACE unofficial::${PROJECT_NAME}:: -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/unofficial-${PROJECT_NAME} -+ ) - install(FILES process.hpp DESTINATION include) - endif() - diff --git a/ports/tiny-process-library/portfile.cmake b/ports/tiny-process-library/portfile.cmake index 8be4a550a4646e..20af73f6a0faee 100644 --- a/ports/tiny-process-library/portfile.cmake +++ b/ports/tiny-process-library/portfile.cmake @@ -2,11 +2,9 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO eidheim/tiny-process-library - REF 273270d0f9d0cf4a8282fadd589060a7b0eab425 - SHA512 f99e586ee6fa9b7c0a3633b59e0e099becba48e2ef375268eeecd9099a233e3b528ba373edc74983d49934ff10f99884fdeb594ff546054fc91d1341d0e86c0a + REF v2.0.4 + SHA512 bbdd268361159b7c64cb60f29afa780ee5e57fa696f0683a55cb9824ec5985c8229a9a8217d2b9ecdd194b9a3acbbd75a1a821392361fbc85b1f6841f40c95db HEAD_REF master - PATCHES - fix-cmake.patch ) vcpkg_configure_cmake( @@ -14,6 +12,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF + -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON ) vcpkg_install_cmake() @@ -21,8 +20,8 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets( - CONFIG_PATH lib/cmake/unofficial-${PORT} - TARGET_PATH share/unofficial-${PORT} + CONFIG_PATH lib/cmake/${PORT} + TARGET_PATH share/${PORT} ) file(REMOVE_RECURSE From a1ff9895ab370c969ca4a2497a1dda6a7654a57f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 30 Nov 2020 19:07:51 +0100 Subject: [PATCH 0185/1694] [vcpkg] Add option cmake-args (#12877) * [vcpkg] Add option cmake-args to pass additional args to the script execution * apply clang format to install.cpp * rename command to x-cmake-args * imply editable if x-cmake-args are not empty. * don't use bitwise or * add a definition for CMAKE_SCRIPT_ARG Co-authored-by: wangli28 --- toolsrc/include/vcpkg/base/system.process.h | 1 + toolsrc/include/vcpkg/build.h | 9 +++-- toolsrc/include/vcpkg/install.h | 6 ++- toolsrc/include/vcpkg/vcpkgcmdarguments.h | 3 ++ toolsrc/src/vcpkg/base/system.process.cpp | 1 + toolsrc/src/vcpkg/build.cpp | 40 +++++++++++++------- toolsrc/src/vcpkg/commands.buildexternal.cpp | 3 +- toolsrc/src/vcpkg/commands.ci.cpp | 3 +- toolsrc/src/vcpkg/commands.setinstalled.cpp | 3 +- toolsrc/src/vcpkg/commands.upgrade.cpp | 3 +- toolsrc/src/vcpkg/install.cpp | 18 +++++---- toolsrc/src/vcpkg/vcpkgcmdarguments.cpp | 3 ++ 12 files changed, 64 insertions(+), 29 deletions(-) diff --git a/toolsrc/include/vcpkg/base/system.process.h b/toolsrc/include/vcpkg/base/system.process.h index e81bcfed78ca92..3b60630bb22949 100644 --- a/toolsrc/include/vcpkg/base/system.process.h +++ b/toolsrc/include/vcpkg/base/system.process.h @@ -15,6 +15,7 @@ namespace vcpkg::System CMakeVariable(const StringView varname, const char* varvalue); CMakeVariable(const StringView varname, const std::string& varvalue); CMakeVariable(const StringView varname, const fs::path& path); + CMakeVariable(std::string var); std::string s; }; diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index 773d3eeefc1cd1..2e3c5fafa5186c 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -56,13 +56,15 @@ namespace vcpkg::Build namespace Command { - int perform_ex(const FullPackageSpec& full_spec, + int perform_ex(const VcpkgCmdArguments& args, + const FullPackageSpec& full_spec, const SourceControlFileLocation& scfl, const PortFileProvider::PathsPortFileProvider& provider, IBinaryProvider& binaryprovider, const IBuildLogsRecorder& build_logs_recorder, const VcpkgPaths& paths); - void perform_and_exit_ex(const FullPackageSpec& full_spec, + void perform_and_exit_ex(const VcpkgCmdArguments& args, + const FullPackageSpec& full_spec, const SourceControlFileLocation& scfl, const PortFileProvider::PathsPortFileProvider& provider, IBinaryProvider& binaryprovider, @@ -232,7 +234,8 @@ namespace vcpkg::Build std::unique_ptr binary_control_file; }; - ExtendedBuildResult build_package(const VcpkgPaths& paths, + ExtendedBuildResult build_package(const VcpkgCmdArguments& args, + const VcpkgPaths& paths, const Dependencies::InstallPlanAction& config, IBinaryProvider& binaries_provider, const IBuildLogsRecorder& build_logs_recorder, diff --git a/toolsrc/include/vcpkg/install.h b/toolsrc/include/vcpkg/install.h index f85d48d8d14513..8187735c5ffa6a 100644 --- a/toolsrc/include/vcpkg/install.h +++ b/toolsrc/include/vcpkg/install.h @@ -59,7 +59,8 @@ namespace vcpkg::Install const fs::path& listfile() const; }; - Build::ExtendedBuildResult perform_install_plan_action(const VcpkgPaths& paths, + Build::ExtendedBuildResult perform_install_plan_action(const VcpkgCmdArguments& args, + const VcpkgPaths& paths, Dependencies::InstallPlanAction& action, StatusParagraphs& status_db, const CMakeVars::CMakeVarProvider& var_provider); @@ -83,7 +84,8 @@ namespace vcpkg::Install const BinaryControlFile& binary_paragraph, StatusParagraphs* status_db); - InstallSummary perform(Dependencies::ActionPlan& action_plan, + InstallSummary perform(const VcpkgCmdArguments& args, + Dependencies::ActionPlan& action_plan, const KeepGoing keep_going, const VcpkgPaths& paths, StatusParagraphs& status_db, diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h index db0d963161cce7..16e433d63d5416 100644 --- a/toolsrc/include/vcpkg/vcpkgcmdarguments.h +++ b/toolsrc/include/vcpkg/vcpkgcmdarguments.h @@ -149,6 +149,9 @@ namespace vcpkg constexpr static StringLiteral BINARY_SOURCES_ARG = "binarysource"; std::vector binary_sources; + constexpr static StringLiteral CMAKE_SCRIPT_ARG = "x-cmake-args"; + std::vector cmake_args; + constexpr static StringLiteral DEBUG_SWITCH = "debug"; Optional debug = nullopt; constexpr static StringLiteral SEND_METRICS_SWITCH = "sendmetrics"; diff --git a/toolsrc/src/vcpkg/base/system.process.cpp b/toolsrc/src/vcpkg/base/system.process.cpp index b330069e669621..d4410e28abf560 100644 --- a/toolsrc/src/vcpkg/base/system.process.cpp +++ b/toolsrc/src/vcpkg/base/system.process.cpp @@ -182,6 +182,7 @@ namespace vcpkg : CMakeVariable(varname, fs::generic_u8string(path)) { } + System::CMakeVariable::CMakeVariable(std::string var) : s(std::move(var)) { } std::string System::make_basic_cmake_cmd(const fs::path& cmake_tool_path, const fs::path& cmake_script, diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 495b517eabdb54..4cc4c2987a7760 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -57,7 +57,8 @@ namespace vcpkg::Build using Dependencies::InstallPlanAction; using Dependencies::InstallPlanType; - void Command::perform_and_exit_ex(const FullPackageSpec& full_spec, + void Command::perform_and_exit_ex(const VcpkgCmdArguments& args, + const FullPackageSpec& full_spec, const SourceControlFileLocation& scfl, const PathsPortFileProvider& provider, IBinaryProvider& binaryprovider, @@ -65,7 +66,7 @@ namespace vcpkg::Build const VcpkgPaths& paths) { Checks::exit_with_code(VCPKG_LINE_INFO, - perform_ex(full_spec, scfl, provider, binaryprovider, build_logs_recorder, paths)); + perform_ex(args, full_spec, scfl, provider, binaryprovider, build_logs_recorder, paths)); } const CommandStructure COMMAND_STRUCTURE = { @@ -81,7 +82,8 @@ namespace vcpkg::Build Checks::exit_with_code(VCPKG_LINE_INFO, perform(args, paths, default_triplet)); } - int Command::perform_ex(const FullPackageSpec& full_spec, + int Command::perform_ex(const VcpkgCmdArguments& args, + const FullPackageSpec& full_spec, const SourceControlFileLocation& scfl, const PathsPortFileProvider& provider, IBinaryProvider& binaryprovider, @@ -134,7 +136,7 @@ namespace vcpkg::Build action->build_options.clean_packages = CleanPackages::NO; const auto build_timer = Chrono::ElapsedTimer::create_started(); - const auto result = Build::build_package(paths, *action, binaryprovider, build_logs_recorder, status_db); + const auto result = Build::build_package(args, paths, *action, binaryprovider, build_logs_recorder, status_db); System::print2("Elapsed time for package ", spec, ": ", build_timer, '\n'); if (result.code == BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES) @@ -182,7 +184,8 @@ namespace vcpkg::Build Checks::check_exit(VCPKG_LINE_INFO, scfl != nullptr, "Error: Couldn't find port '%s'", port_name); ASSUME(scfl != nullptr); - return perform_ex(spec, + return perform_ex(args, + spec, *scfl, provider, args.binary_caching_enabled() ? *binaryprovider : null_binary_provider(), @@ -602,7 +605,8 @@ namespace vcpkg::Build return compiler_info; } - static std::vector get_cmake_build_args(const VcpkgPaths& paths, + static std::vector get_cmake_build_args(const VcpkgCmdArguments& args, + const VcpkgPaths& paths, const Dependencies::InstallPlanAction& action, Triplet triplet) { @@ -631,6 +635,11 @@ namespace vcpkg::Build {"ALL_FEATURES", all_features}, }; + for (auto cmake_arg : args.cmake_args) + { + variables.push_back(System::CMakeVariable{cmake_arg}); + } + if (action.build_options.backcompat_features == BackcompatFeatures::PROHIBIT) { variables.emplace_back("_VCPKG_PROHIBIT_BACKCOMPAT_FEATURES", "1"); @@ -723,7 +732,9 @@ namespace vcpkg::Build } } - static ExtendedBuildResult do_build_package(const VcpkgPaths& paths, const Dependencies::InstallPlanAction& action) + static ExtendedBuildResult do_build_package(const VcpkgCmdArguments& args, + const VcpkgPaths& paths, + const Dependencies::InstallPlanAction& action) { const auto& pre_build_info = action.pre_build_info(VCPKG_LINE_INFO); @@ -753,7 +764,8 @@ namespace vcpkg::Build const auto timer = Chrono::ElapsedTimer::create_started(); - auto command = vcpkg::make_cmake_cmd(paths, paths.ports_cmake, get_cmake_build_args(paths, action, triplet)); + auto command = + vcpkg::make_cmake_cmd(paths, paths.ports_cmake, get_cmake_build_args(args, paths, action, triplet)); const auto& env = paths.get_action_env(action.abi_info.value_or_exit(VCPKG_LINE_INFO)); @@ -849,10 +861,11 @@ namespace vcpkg::Build return {BuildResult::SUCCEEDED, std::move(bcf)}; } - static ExtendedBuildResult do_build_package_and_clean_buildtrees(const VcpkgPaths& paths, + static ExtendedBuildResult do_build_package_and_clean_buildtrees(const VcpkgCmdArguments& args, + const VcpkgPaths& paths, const Dependencies::InstallPlanAction& action) { - auto result = do_build_package(paths, action); + auto result = do_build_package(args, paths, action); if (action.build_options.clean_buildtrees == CleanBuildtrees::YES) { @@ -1078,7 +1091,8 @@ namespace vcpkg::Build } } - ExtendedBuildResult build_package(const VcpkgPaths& paths, + ExtendedBuildResult build_package(const VcpkgCmdArguments& args, + const VcpkgPaths& paths, const Dependencies::InstallPlanAction& action, IBinaryProvider& binaries_provider, const IBuildLogsRecorder& build_logs_recorder, @@ -1122,7 +1136,7 @@ namespace vcpkg::Build auto& abi_info = action.abi_info.value_or_exit(VCPKG_LINE_INFO); if (!abi_info.abi_tag_file) { - return do_build_package_and_clean_buildtrees(paths, action); + return do_build_package_and_clean_buildtrees(args, paths, action); } auto& abi_file = *abi_info.abi_tag_file.get(); @@ -1149,7 +1163,7 @@ namespace vcpkg::Build } } - ExtendedBuildResult result = do_build_package_and_clean_buildtrees(paths, action); + ExtendedBuildResult result = do_build_package_and_clean_buildtrees(args, paths, action); fs.create_directories(abi_package_dir, ec); fs.copy_file(abi_file, abi_file_in_package, fs::copy_options::none, ec); diff --git a/toolsrc/src/vcpkg/commands.buildexternal.cpp b/toolsrc/src/vcpkg/commands.buildexternal.cpp index 25c3f9822d0f81..cbf9c6ec1bdf00 100644 --- a/toolsrc/src/vcpkg/commands.buildexternal.cpp +++ b/toolsrc/src/vcpkg/commands.buildexternal.cpp @@ -36,7 +36,8 @@ namespace vcpkg::Commands::BuildExternal Checks::check_exit( VCPKG_LINE_INFO, maybe_scfl.has_value(), "could not load control file for %s", spec.package_spec.name()); - Build::Command::perform_and_exit_ex(spec, + Build::Command::perform_and_exit_ex(args, + spec, maybe_scfl.value_or_exit(VCPKG_LINE_INFO), provider, args.binary_caching_enabled() ? *binaryprovider : null_binary_provider(), diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp index ee6222d6edbef8..8927c038fa5def 100644 --- a/toolsrc/src/vcpkg/commands.ci.cpp +++ b/toolsrc/src/vcpkg/commands.ci.cpp @@ -525,7 +525,8 @@ namespace vcpkg::Commands::CI else { auto collection_timer = Chrono::ElapsedTimer::create_started(); - auto summary = Install::perform(action_plan, + auto summary = Install::perform(args, + action_plan, Install::KeepGoing::YES, paths, status_db, diff --git a/toolsrc/src/vcpkg/commands.setinstalled.cpp b/toolsrc/src/vcpkg/commands.setinstalled.cpp index 99c41a5b47dadc..28eee6992a78b2 100644 --- a/toolsrc/src/vcpkg/commands.setinstalled.cpp +++ b/toolsrc/src/vcpkg/commands.setinstalled.cpp @@ -103,7 +103,8 @@ namespace vcpkg::Commands::SetInstalled Checks::exit_success(VCPKG_LINE_INFO); } - const auto summary = Install::perform(action_plan, + const auto summary = Install::perform(args, + action_plan, Install::KeepGoing::NO, paths, status_db, diff --git a/toolsrc/src/vcpkg/commands.upgrade.cpp b/toolsrc/src/vcpkg/commands.upgrade.cpp index 0d8a6c4aff6188..2d25be4550bf32 100644 --- a/toolsrc/src/vcpkg/commands.upgrade.cpp +++ b/toolsrc/src/vcpkg/commands.upgrade.cpp @@ -182,7 +182,8 @@ namespace vcpkg::Commands::Upgrade var_provider.load_tag_vars(action_plan, provider); const Install::InstallSummary summary = - Install::perform(action_plan, + Install::perform(args, + action_plan, keep_going, paths, status_db, diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index f3da9c5d672872..06b07fb4c42ebf 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -305,7 +305,8 @@ namespace vcpkg::Install using Build::BuildResult; using Build::ExtendedBuildResult; - static ExtendedBuildResult perform_install_plan_action(const VcpkgPaths& paths, + static ExtendedBuildResult perform_install_plan_action(const VcpkgCmdArguments& args, + const VcpkgPaths& paths, InstallPlanAction& action, StatusParagraphs& status_db, IBinaryProvider& binaries_provider, @@ -336,7 +337,7 @@ namespace vcpkg::Install else System::printf("Building package %s...\n", display_name_with_features); - auto result = Build::build_package(paths, action, binaries_provider, build_logs_recorder, status_db); + auto result = Build::build_package(args, paths, action, binaries_provider, build_logs_recorder, status_db); if (BuildResult::DOWNLOADED == result.code) { @@ -454,7 +455,8 @@ namespace vcpkg::Install TrackedPackageInstallGuard& operator=(const TrackedPackageInstallGuard&) = delete; }; - InstallSummary perform(ActionPlan& action_plan, + InstallSummary perform(const VcpkgCmdArguments& args, + ActionPlan& action_plan, const KeepGoing keep_going, const VcpkgPaths& paths, StatusParagraphs& status_db, @@ -476,7 +478,7 @@ namespace vcpkg::Install { results.emplace_back(action.spec, &action); results.back().build_result = - perform_install_plan_action(paths, action, status_db, binaryprovider, build_logs_recorder); + perform_install_plan_action(args, paths, action, status_db, binaryprovider, build_logs_recorder); } Build::compute_all_abis(paths, action_plan, var_provider, status_db); @@ -487,7 +489,8 @@ namespace vcpkg::Install for (auto&& action : action_plan.install_actions) { TrackedPackageInstallGuard this_install(package_count, results, action.spec); - auto result = perform_install_plan_action(paths, action, status_db, binaryprovider, build_logs_recorder); + auto result = + perform_install_plan_action(args, paths, action, status_db, binaryprovider, build_logs_recorder); if (result.code != BuildResult::SUCCEEDED && keep_going == KeepGoing::NO) { System::print2(Build::create_user_troubleshooting_message(action.spec), '\n'); @@ -759,7 +762,7 @@ namespace vcpkg::Install const bool no_downloads = Util::Sets::contains(options.switches, (OPTION_NO_DOWNLOADS)); const bool only_downloads = Util::Sets::contains(options.switches, (OPTION_ONLY_DOWNLOADS)); const bool is_recursive = Util::Sets::contains(options.switches, (OPTION_RECURSE)); - const bool is_editable = Util::Sets::contains(options.switches, (OPTION_EDITABLE)); + const bool is_editable = Util::Sets::contains(options.switches, (OPTION_EDITABLE)) || !args.cmake_args.empty(); const bool use_aria2 = Util::Sets::contains(options.switches, (OPTION_USE_ARIA2)); const bool clean_after_build = Util::Sets::contains(options.switches, (OPTION_CLEAN_AFTER_BUILD)); const KeepGoing keep_going = @@ -954,7 +957,8 @@ namespace vcpkg::Install } const InstallSummary summary = - perform(action_plan, + perform(args, + action_plan, keep_going, paths, status_db, diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp index d6634985e34cc8..a7e4c975b32b6c 100644 --- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp +++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp @@ -283,6 +283,7 @@ namespace vcpkg {OVERLAY_PORTS_ARG, &VcpkgCmdArguments::overlay_ports}, {OVERLAY_TRIPLETS_ARG, &VcpkgCmdArguments::overlay_triplets}, {BINARY_SOURCES_ARG, &VcpkgCmdArguments::binary_sources}, + {CMAKE_SCRIPT_ARG, &VcpkgCmdArguments::cmake_args}, }; constexpr static std::pair VcpkgCmdArguments::*> switches[] = { @@ -948,4 +949,6 @@ namespace vcpkg constexpr StringLiteral VcpkgCmdArguments::REGISTRIES_FEATURE; constexpr StringLiteral VcpkgCmdArguments::RECURSIVE_DATA_ENV; constexpr StringLiteral VcpkgCmdArguments::VERSIONS_FEATURE; + + constexpr StringLiteral VcpkgCmdArguments::CMAKE_SCRIPT_ARG; } From 885c00abeef36c152b2fdf7e6c98c6b1cfcd0034 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 1 Dec 2020 02:08:38 +0800 Subject: [PATCH 0186/1694] [protobuf] Update to 3.14.0 (#14670) * [protobuf] Update to 3.14.0 * Replace patch CRLF with LF --- ports/protobuf/CONTROL | 3 +-- ports/protobuf/fix-android-log.patch | 28 --------------------------- ports/protobuf/fix-static-build.patch | 2 +- ports/protobuf/fix-uwp.patch | 12 ------------ ports/protobuf/portfile.cmake | 6 ++---- 5 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 ports/protobuf/fix-android-log.patch delete mode 100644 ports/protobuf/fix-uwp.patch diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index 115b306c55ae64..7d67ac742ac82d 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,6 +1,5 @@ Source: protobuf -Version: 3.13.0 -Port-Version: 2 +Version: 3.14.0 Homepage: https://github.com/protocolbuffers/protobuf Description: Protocol Buffers - Google's data interchange format diff --git a/ports/protobuf/fix-android-log.patch b/ports/protobuf/fix-android-log.patch deleted file mode 100644 index 47a935078e1de0..00000000000000 --- a/ports/protobuf/fix-android-log.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake -index 6bf86a277..424854798 100644 ---- a/cmake/libprotobuf-lite.cmake -+++ b/cmake/libprotobuf-lite.cmake -@@ -67,6 +67,9 @@ target_link_libraries(libprotobuf-lite ${CMAKE_THREAD_LIBS_INIT}) - if(protobuf_LINK_LIBATOMIC) - target_link_libraries(libprotobuf-lite atomic) - endif() -+if(${CMAKE_SYSTEM_NAME} STREQUAL "Android") -+ target_link_libraries(libprotobuf-lite log) -+endif() - target_include_directories(libprotobuf-lite PUBLIC ${protobuf_source_dir}/src) - if(MSVC AND protobuf_BUILD_SHARED_LIBS) - target_compile_definitions(libprotobuf-lite -diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake -index 0c12596c2..a5be494fb 100644 ---- a/cmake/libprotobuf.cmake -+++ b/cmake/libprotobuf.cmake -@@ -121,6 +121,9 @@ endif() - if(protobuf_LINK_LIBATOMIC) - target_link_libraries(libprotobuf atomic) - endif() -+if(${CMAKE_SYSTEM_NAME} STREQUAL "Android") -+ target_link_libraries(libprotobuf log) -+endif() - target_include_directories(libprotobuf PUBLIC ${protobuf_source_dir}/src) - if(MSVC AND protobuf_BUILD_SHARED_LIBS) - target_compile_definitions(libprotobuf diff --git a/ports/protobuf/fix-static-build.patch b/ports/protobuf/fix-static-build.patch index 22d99435cdfbe6..0ba4982fe6f84e 100644 --- a/ports/protobuf/fix-static-build.patch +++ b/ports/protobuf/fix-static-build.patch @@ -1,5 +1,5 @@ diff --git a/cmake/install.cmake b/cmake/install.cmake -index be47c54..8b1bd97 100644 +index 4091bc8..9850018 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake @@ -31,7 +31,7 @@ endforeach() diff --git a/ports/protobuf/fix-uwp.patch b/ports/protobuf/fix-uwp.patch deleted file mode 100644 index 44f23579f27842..00000000000000 --- a/ports/protobuf/fix-uwp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 9ca31ac0b..237468c55 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -207,6 +207,7 @@ if (MSVC) - /wd4506 # no definition for inline function 'function' - /wd4800 # 'type' : forcing value to bool 'true' or 'false' (performance warning) - /wd4996 # The compiler encountered a deprecated declaration. -+ /wd4703 # Potentially uninitialized local pointer variable 'name' used. - ) - # Allow big object - add_definitions(/bigobj) diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 47510b5504ac2a..d364878db02ddb 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -1,12 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/protobuf - REF fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a #v3.13.0 - SHA512 b458410311a0905048c86d70ded263ae0cbb6693fd42cba730d3a95c69ca533cf453eb15c5f8bf8b00003ddc63fe96b3c4242907e2d6b00d5bec5d37b2ae1c5e + REF 2514f0bd7da7e2af1bed4c5d1b84f031c4d12c10 #v3.14.0 + SHA512 765fd12786b405eb8b7365f1117fa16d0e268f8677e829e0a91635bb4278295c5e488949726394f84d0993f8ea8205ca66eb1f79c88cc89ad5ac4a2df483d473 HEAD_REF master PATCHES - fix-uwp.patch - fix-android-log.patch fix-static-build.patch ) From b4e3c66e57be094ef5dcb472c8e982c6bf8481a2 Mon Sep 17 00:00:00 2001 From: SvenPStarFinanz Date: Mon, 30 Nov 2020 19:10:08 +0100 Subject: [PATCH 0187/1694] [sqlcipher] Update to 4.4.1 (#14677) * [sqlcipher] Update to 4.4.1 * [sqlcipher] Updated control file to 4.4.1 * Update ports/sqlcipher/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/sqlcipher/portfile.cmake | 4 ++-- ports/sqlcipher/vcpkg.json | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/sqlcipher/portfile.cmake b/ports/sqlcipher/portfile.cmake index 131209ce801665..247901952d51a2 100644 --- a/ports/sqlcipher/portfile.cmake +++ b/ports/sqlcipher/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install( ON_TARGET "UWP" "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sqlcipher/sqlcipher - REF v4.4.0 - SHA512 e6e7b09cc079d75ac0b9e15a256bfe479ce97cfdece3244ca53e2e04b7f1dc1afdc1ee76d07f2629e614c7532cc80eeef6b85ba5952d31a2eaed8d6e84414628 + REF v4.4.1 + SHA512 6bf53c697a1ae1a2714e135ee0645978706f6ee6c0500de9a9953314eda8fc84dc5a4f0beeebb390f14e4552833f11f869ba9846896d40e2e45e483edea09fe5 HEAD_REF master ) diff --git a/ports/sqlcipher/vcpkg.json b/ports/sqlcipher/vcpkg.json index e3f2cb45f8e2a0..8411f44ea7750b 100644 --- a/ports/sqlcipher/vcpkg.json +++ b/ports/sqlcipher/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sqlcipher", - "version-string": "4.4.0", - "port-version": 1, + "version-string": "4.4.1", "description": "SQLCipher extends the SQLite database library to add security enhancements that make it more suitable for encrypted local data storage.", "homepage": "https://www.zetetic.net/sqlcipher", "supports": "windows & !uwp & !static", From 8f116a2fe7203f2e00501cb1e3be6a10a7ab6f08 Mon Sep 17 00:00:00 2001 From: Charles Karney Date: Mon, 30 Nov 2020 13:15:15 -0500 Subject: [PATCH 0188/1694] [geographiclib] Update to version 1.51 (#14711) * [geographiclib] Update to version 1.51 This is just a routine upgrade. * Use git diff to create patch file * Preserve execute permissions on tools * Handle installation of tools so that shared libs are found. Co-authored-by: Charles Karney --- ports/geographiclib/cxx-library-only.patch | 54 +++++++++++++++------- ports/geographiclib/portfile.cmake | 11 ++--- ports/geographiclib/vcpkg.json | 2 +- 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/ports/geographiclib/cxx-library-only.patch b/ports/geographiclib/cxx-library-only.patch index 88ffc812527b38..2e3893a9745fe4 100644 --- a/ports/geographiclib/cxx-library-only.patch +++ b/ports/geographiclib/cxx-library-only.patch @@ -1,8 +1,29 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 30875ddb..34aa6515 100644 +index 345df69b..cb891034 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -464,12 +464,12 @@ endif () +@@ -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 @@ -17,7 +38,7 @@ index 30875ddb..34aa6515 100644 set (MAINTAINER ON) else () set (MAINTAINER OFF) -@@ -496,25 +496,34 @@ if (WIN32) +@@ -466,25 +471,34 @@ if (WIN32) set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") endif () @@ -53,7 +74,7 @@ index 30875ddb..34aa6515 100644 if (GEOGRAPHICLIB_PRECISION EQUAL 2) set (NETGEOGRAPHICLIB_LIBRARIES NETGeographicLib) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 90e773ba..c9a303b0 100644 +index cbc21961..69c923bc 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -33,10 +33,10 @@ configure_file (project-config.cmake.in @@ -69,7 +90,7 @@ index 90e773ba..c9a303b0 100644 NAMESPACE ${PROJECT_NAME}:: FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-namespace-targets.cmake") -@@ -44,15 +44,9 @@ export (TARGETS +@@ -44,13 +44,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.) @@ -77,19 +98,15 @@ index 90e773ba..c9a303b0 100644 - # 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}") -- set (PROJECT_ROOT_DIR "../../..") -else () - set (INSTALL_CMAKE_DIR "cmake") -- set (PROJECT_ROOT_DIR "..") -endif () -+ set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME_LOWER}") -+ set (PROJECT_ROOT_DIR "../..") -+ - # @PROJECT_INCLUDE_DIRS@ is not used in the install tree; reset - # it to prevent the source and build paths appearing in the installed - # config files ++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 b8c028c7..26e4ba14 100644 +index 3fa8ec6a..92c73946 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,7 +1,7 @@ @@ -110,12 +127,17 @@ index b8c028c7..26e4ba14 100644 target_link_libraries (${TOOL} ${PROJECT_LIBRARIES} ${HIGHPREC_LIBRARIES}) -@@ -35,7 +35,7 @@ if (APPLE) +@@ -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 tools) ++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 diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake index 988aef10b58290..e948114cd65649 100644 --- a/ports/geographiclib/portfile.cmake +++ b/ports/geographiclib/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_sourceforge ( OUT_SOURCE_PATH SOURCE_PATH REPO geographiclib REF distrib - FILENAME "GeographicLib-1.50.1.tar.gz" - SHA512 1db874f30957a0edb8a1df3eee6db73cc993629e3005fe912e317a4ba908e7d7580ce483bb0054c4b46370b8edaec989609fb7e4eb6ba00c80182db43db436f1 + FILENAME "GeographicLib-1.51.tar.gz" + SHA512 34487a09fa94a34d24179cfe9fd2e5fdda28675966703ca137cbfe6cc88760c2fbde55f76c464de060b58bfe0a516e22c0f59318cf85ae7cc01c5c6a73dd6ead PATCHES cxx-library-only.patch ) @@ -38,13 +38,8 @@ vcpkg_install_cmake () vcpkg_fixup_cmake_targets (CONFIG_PATH share/geographiclib) vcpkg_copy_pdbs () -file (GLOB TOOL_LIST LIST_DIRECTORIES false - ${CURRENT_PACKAGES_DIR}/tools/*) -if (TOOL_LIST) - file (INSTALL ${TOOL_LIST} - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +if (tools IN_LIST FEATURES) vcpkg_copy_tool_dependencies (${CURRENT_PACKAGES_DIR}/tools/${PORT}) - file (REMOVE ${TOOL_LIST}) endif () file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json index bccf0054fc04a5..18deaa7714082e 100644 --- a/ports/geographiclib/vcpkg.json +++ b/ports/geographiclib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "geographiclib", - "version-string": "1.50.1", + "version-string": "1.51", "description": "GeographicLib, a C++ library for performing geographic conversions", "homepage": "https://geographiclib.sourceforge.io", "features": { From 767ab95b9896161e7d1be369407a61e7db7a0a59 Mon Sep 17 00:00:00 2001 From: Kevin Lalumiere Date: Mon, 30 Nov 2020 13:17:12 -0500 Subject: [PATCH 0189/1694] [hiredis] update to 1.0.0 (Fix #13256) (#14734) * Update to version 1.0.0 Some patches were removed since they are no longer required. Indeed, the repository https://github.com/redis/hiredis@v1.0.0 fixes many of the issues our patches were adressing. * Fix cmake targets for ssl feature --- ports/hiredis/CONTROL | 4 +- ports/hiredis/fix-feature-example.patch | 49 ++----------------- .../fix-pthread.h-not-found-on-windows.patch | 16 ------ ports/hiredis/portfile.cmake | 11 +++-- ports/hiredis/support-static-in-win.patch | 23 ++++----- 5 files changed, 22 insertions(+), 81 deletions(-) delete mode 100644 ports/hiredis/fix-pthread.h-not-found-on-windows.patch diff --git a/ports/hiredis/CONTROL b/ports/hiredis/CONTROL index b16d54e5721406..a331b173517e7e 100644 --- a/ports/hiredis/CONTROL +++ b/ports/hiredis/CONTROL @@ -1,6 +1,6 @@ Source: hiredis -Version: 2019-11-2 -Port-Version: 2 +Version: 1.0.0 +Port-Version: 0 Homepage: https://github.com/redis/hiredis Description: Hiredis is a minimalistic C client library for the Redis database. diff --git a/ports/hiredis/fix-feature-example.patch b/ports/hiredis/fix-feature-example.patch index 4f36087c6a7ed0..2e5259930f2c67 100644 --- a/ports/hiredis/fix-feature-example.patch +++ b/ports/hiredis/fix-feature-example.patch @@ -37,7 +37,7 @@ index dd3a313..8c69d3a 100644 ENDIF() IF (APPLE) -@@ -38,9 +52,21 @@ IF (APPLE) +@@ -38,12 +52,24 @@ IF (APPLE) ENDIF() IF (ENABLE_SSL) @@ -54,54 +54,13 @@ index dd3a313..8c69d3a 100644 + if(WIN32) + TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl OpenSSL::SSL OpenSSL::Crypto ${THREADS_LIBS} crypt32.lib) + else() -+ TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl OpenSSL::SSL OpenSSL::Crypto ${THREADS_LIBS}) ++ TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl OpenSSL::SSL OpenSSL::Crypto ${THREADS_LIBS}) + endif() ENDIF() ADD_EXECUTABLE(example example.c) -TARGET_LINK_LIBRARIES(example hiredis) +TARGET_LINK_LIBRARIES(example hiredis ${LIBEVENT_LIBS}) -diff --git a/examples/example-libuv.c b/examples/example-libuv.c -index a5462d4..9b7ca3e 100644 ---- a/examples/example-libuv.c -+++ b/examples/example-libuv.c -@@ -33,7 +33,9 @@ void disconnectCallback(const redisAsyncContext *c, int status) { - } - - int main (int argc, char **argv) { -+#ifndef _WIN32 - signal(SIGPIPE, SIG_IGN); -+#endif - uv_loop_t* loop = uv_default_loop(); - - redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379); -diff --git a/examples/example-ssl.c b/examples/example-ssl.c -index 81f4648..9f42923 100644 ---- a/examples/example-ssl.c -+++ b/examples/example-ssl.c -@@ -1,6 +1,10 @@ - #include - #include - #include -+#ifdef _WIN32 -+#include -+#include -+#endif - - #include - #include -diff --git a/examples/example.c b/examples/example.c -index 0e93fc8..339e322 100644 ---- a/examples/example.c -+++ b/examples/example.c -@@ -1,6 +1,10 @@ - #include - #include - #include -+#ifdef _WIN32 -+#include -+#include -+#endif - - #include + ADD_EXECUTABLE(example-push example-push.c) + TARGET_LINK_LIBRARIES(example-push hiredis) diff --git a/ports/hiredis/fix-pthread.h-not-found-on-windows.patch b/ports/hiredis/fix-pthread.h-not-found-on-windows.patch deleted file mode 100644 index e927bc4314567a..00000000000000 --- a/ports/hiredis/fix-pthread.h-not-found-on-windows.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/ssl.c b/ssl.c -index 78ab9e4..768f304 100644 ---- a/ssl.c -+++ b/ssl.c -@@ -34,7 +34,11 @@ - #include "async.h" - - #include -+#ifdef _WIN32 -+#include -+#else - #include -+#endif - #include - #include - diff --git a/ports/hiredis/portfile.cmake b/ports/hiredis/portfile.cmake index 4d3a97c7e18395..0c72c83305c558 100644 --- a/ports/hiredis/portfile.cmake +++ b/ports/hiredis/portfile.cmake @@ -5,18 +5,17 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redis/hiredis - REF e777b0295eeeda89ee2ecef6ec5cb54889033d94 - SHA512 9486ce3e40580ca6a1da8a31c3e139eb8b5e17ac1b94bd0987f2435aeb2465ad271784d5e8e83dc6cbaf362f95c9e175efa5fbe80a63c56070ceb212d3d68470 + REF v1.0.0 + SHA512 eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69 HEAD_REF master PATCHES fix-feature-example.patch support-static-in-win.patch fix-timeval.patch - fix-pthread.h-not-found-on-windows.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - ssl ENABLE_SSL + ssl ENABLE_SSL example ENABLE_EXAMPLES ) @@ -31,6 +30,10 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_cmake_targets() +if("ssl" IN_LIST FEATURES) + vcpkg_fixup_cmake_targets(CONFIG_PATH share/hiredis_ssl TARGET_PATH share/hiredis_ssl) +endif() # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/hiredis/support-static-in-win.patch b/ports/hiredis/support-static-in-win.patch index 94e6ebe9d51fc5..47ea4bef666f00 100644 --- a/ports/hiredis/support-static-in-win.patch +++ b/ports/hiredis/support-static-in-win.patch @@ -2,21 +2,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e78894..87aba5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -22,7 +22,7 @@ PROJECT(hiredis VERSION "${VERSION}") +@@ -22,4 +22,4 @@ PROJECT(hiredis VERSION "${VERSION}") + ENDIF() - SET(ENABLE_EXAMPLES OFF CACHE BOOL "Enable building hiredis examples") +-ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) ++ADD_LIBRARY(hiredis ${hiredis_sources}) --ADD_LIBRARY(hiredis SHARED -+ADD_LIBRARY(hiredis - async.c - dict.c - hiredis.c -@@ -60,7 +60,7 @@ IF(ENABLE_SSL) - ENDIF() - ENDIF() - FIND_PACKAGE(OpenSSL REQUIRED) +@@ -60,5 +60,5 @@ IF(ENABLE_SSL) + SET(hiredis_ssl_sources + ssl.c) - ADD_LIBRARY(hiredis_ssl SHARED + ADD_LIBRARY(hiredis_ssl - ssl.c) - TARGET_INCLUDE_DIRECTORIES(hiredis_ssl PRIVATE "${OPENSSL_INCLUDE_DIR}") - TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE ${OPENSSL_LIBRARIES}) + ${hiredis_ssl_sources}) + From 9bcf681c7abea7bd3fc002cf5de3a013b0b2a040 Mon Sep 17 00:00:00 2001 From: Daniel Parker Date: Mon, 30 Nov 2020 13:18:11 -0500 Subject: [PATCH 0190/1694] [jsoncons] Update to version 0.159.0 (#14752) --- ports/jsoncons/CONTROL | 2 +- ports/jsoncons/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/jsoncons/CONTROL b/ports/jsoncons/CONTROL index 1977a21600ea7e..cbb936938d15d9 100644 --- a/ports/jsoncons/CONTROL +++ b/ports/jsoncons/CONTROL @@ -1,4 +1,4 @@ Source: jsoncons -Version: 0.158.0 +Version: 0.159.0 Description: A C++, header-only library for constructing JSON and JSON-like text and binary data formats, with JSON Pointer, JSON Patch, JSONPath, JMESPath, CSV, MessagePack, CBOR, BSON, UBJSON Homepage: https://github.com/danielaparker/jsoncons diff --git a/ports/jsoncons/portfile.cmake b/ports/jsoncons/portfile.cmake index 2ae3c74d8d77c2..ad4500167aa943 100644 --- a/ports/jsoncons/portfile.cmake +++ b/ports/jsoncons/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danielaparker/jsoncons - REF 1d81dc242a0ad29123c4fff4470d5d5e5d461b4a # v0.158.0 - SHA512 f5efaa89263579f77560c1707ec6bcf1ca6a30cce70da144cadfa97301869480326ad5dff241df8b751d190e0d0177fea5de929f8b950f53c87c264332dfe6f4 + REF 6e1476690444d9e77d12740a477fdab12747aff1 # v0.159.0 + SHA512 6b4f9c916d44a445c293b4051a74eb83e75b24b47b427830d52e061e5a29348e6ab90804fabc3009277786c8f8977799a50f23d06433a621a83366062f8b32ed HEAD_REF master ) From a1432420e7ea12782753dc779df9908d905518de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 30 Nov 2020 10:36:22 -0800 Subject: [PATCH 0191/1694] [poco] Fix dependency libmariadb (#14763) * [poco] Fix dependency libmariadb * [poco] Remove link in codes --- ports/libmariadb/CONTROL | 2 +- ports/libmariadb/export-cmake-targets.patch | 12 +- ports/poco/CONTROL | 2 +- ports/poco/fix_dependency.patch | 460 +++++++++++--------- 4 files changed, 255 insertions(+), 221 deletions(-) diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL index 09d3764322c9b8..d7aa3061ed353d 100644 --- a/ports/libmariadb/CONTROL +++ b/ports/libmariadb/CONTROL @@ -1,6 +1,6 @@ Source: libmariadb Version: 3.1.10 -Port-Version: 3 +Port-Version: 4 Homepage: https://github.com/MariaDB/mariadb-connector-c Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases Default-Features: zlib, openssl diff --git a/ports/libmariadb/export-cmake-targets.patch b/ports/libmariadb/export-cmake-targets.patch index 0f9d07c2344e2b..a2581a4c475940 100644 --- a/ports/libmariadb/export-cmake-targets.patch +++ b/ports/libmariadb/export-cmake-targets.patch @@ -1,8 +1,16 @@ diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index 083a863..d911fa7 100644 +index 083a863..6c8d932 100644 --- a/libmariadb/CMakeLists.txt +++ b/libmariadb/CMakeLists.txt -@@ -457,13 +457,25 @@ ENDIF() +@@ -405,6 +405,7 @@ ELSE() + TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE mariadbclient) + SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) + ENDIF() ++TARGET_INCLUDE_DIRECTORIES(libmariadb PUBLIC $) + + TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) + +@@ -457,13 +458,25 @@ ENDIF() INSTALL(TARGETS mariadbclient COMPONENT Development diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL index 275cc58f39a34e..f0e0939877f975 100644 --- a/ports/poco/CONTROL +++ b/ports/poco/CONTROL @@ -1,6 +1,6 @@ Source: poco Version: 1.10.1 -Port-Version: 2 +Port-Version: 3 Build-Depends: expat, pcre, zlib 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 diff --git a/ports/poco/fix_dependency.patch b/ports/poco/fix_dependency.patch index 48c0c5bec446a1..8cb6ed4832f1a4 100644 --- a/ports/poco/fix_dependency.patch +++ b/ports/poco/fix_dependency.patch @@ -1,217 +1,243 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b664afd..e08b6c2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -82,8 +82,6 @@ option(FORCE_OPENSSL "Force usage of OpenSSL even under windows" OFF) - - if(ENABLE_CRYPTO OR ENABLE_NETSSL OR ENABLE_JWT) - find_package(OpenSSL REQUIRED) --else() -- find_package(OpenSSL) - endif() - - if(OPENSSL_FOUND) -@@ -113,24 +111,18 @@ else() - option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" OFF) - endif() - --if(ENABLE_DATA_MYSQL) -- find_package(MySQL REQUIRED) --else() -- find_package(MySQL) --endif() -+option(ENABLE_DATA "Enable Data" OFF) -+option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF) - --if(MYSQL_FOUND) -- option(ENABLE_DATA "Enable Data" ON) -- option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" ON) --else() -- option(ENABLE_DATA "Enable Data" OFF) -- option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF) -+if(ENABLE_DATA_MYSQL) -+ find_package(libmysql) -+ if (NOT libmysql_FOUND) -+ find_package(unofficial-libmariadb CONFIG REQUIRED) -+ endif() - endif() - - if(ENABLE_DATA_POSTGRESQL) - find_package(PostgreSQL REQUIRED) --else() -- find_package(PostgreSQL) - endif() - - if(PostgreSQL_FOUND) -@@ -200,6 +192,9 @@ include(DefinePlatformSpecifc) - # Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file - set(Poco_COMPONENTS "") - -+# Do not declare the link library in the code! -+add_definitions(-DPOCO_NO_AUTOMATIC_LIBS) -+ - if(ENABLE_TESTS) - add_subdirectory(CppUnit) - set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) -@@ -327,8 +322,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS) - list(APPEND Poco_COMPONENTS "Redis") - endif() - --if(EXISTS ${PROJECT_SOURCE_DIR}/PDF AND ENABLE_PDF) -- add_subdirectory(PDF) -+if(ENABLE_PDF) -+ include(SelectLibraryConfigurations) -+ find_library(PocoPDF_LIBRARY_RELEASE NAMES libhpdf) -+ find_library(PocoPDF_LIBRARY_DEBUG NAMES libhpdfd) -+ select_library_configurations(PocoPDF) - list(APPEND Poco_COMPONENTS "PDF") - endif() - -@@ -457,15 +455,6 @@ install( - Devel - ) - --if(POCO_UNBUNDLED) -- install(FILES cmake/FindPCRE.cmake -- DESTINATION "${PocoConfigPackageLocation}") -- install(FILES cmake/V39/FindEXPAT.cmake -- DESTINATION "${PocoConfigPackageLocation}/V39") -- install(FILES cmake/V313/FindSQLite3.cmake -- DESTINATION "${PocoConfigPackageLocation}/V313") --endif() -- - message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") - message(STATUS "${PROJECT_NAME} package version: ${PROJECT_VERSION}") - if(BUILD_SHARED_LIBS) -diff --git a/Data/MySQL/CMakeLists.txt b/Data/MySQL/CMakeLists.txt -index f71b145..7034974 100644 ---- a/Data/MySQL/CMakeLists.txt -+++ b/Data/MySQL/CMakeLists.txt -@@ -21,7 +21,7 @@ set_target_properties(DataMySQL - DEFINE_SYMBOL MySQL_EXPORTS - ) - --target_link_libraries(DataMySQL PUBLIC Poco::Data MySQL::client) -+target_link_libraries(DataMySQL PUBLIC Poco::Data ${MYSQL_LIBRARIES}) - target_include_directories(DataMySQL - PUBLIC - $ -diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt -index b52e2c5..0dcfae2 100644 ---- a/Data/SQLite/CMakeLists.txt -+++ b/Data/SQLite/CMakeLists.txt -@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h") - POCO_HEADERS_AUTO(SQLITE_SRCS ${HDRS_G}) - - if(POCO_UNBUNDLED) -- find_package(SQLite3 REQUIRED) -+ find_package(unofficial-sqlite3 CONFIG REQUIRED) - else() - # sqlite3 - POCO_SOURCES(SQLITE_SRCS sqlite3 -@@ -43,7 +43,7 @@ target_include_directories(DataSQLite - ) - - if(POCO_UNBUNDLED) -- target_link_libraries(DataSQLite PUBLIC SQLite::SQLite3) -+ target_link_libraries(DataSQLite PUBLIC unofficial::sqlite3::sqlite3) - target_compile_definitions(DataSQLite PUBLIC - POCO_UNBUNDLED - SQLITE_THREADSAFE=1 -diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt -index 6f5100f..c9fa2e5 100644 ---- a/Foundation/CMakeLists.txt -+++ b/Foundation/CMakeLists.txt -@@ -35,7 +35,7 @@ POCO_MESSAGES(SRCS Logging src/pocomsg.mc) - # If POCO_UNBUNDLED is enabled we try to find the required packages - # The configuration will fail if the packages are not found - if(POCO_UNBUNDLED) -- find_package(PCRE REQUIRED) -+ find_package(unofficial-pcre CONFIG REQUIRED) - find_package(ZLIB REQUIRED) - - #HACK: Unicode.cpp requires functions from these files. The can't be taken from the library -@@ -101,7 +101,7 @@ set_target_properties(Foundation - ) - - if(POCO_UNBUNDLED) -- target_link_libraries(Foundation PUBLIC Pcre::Pcre ZLIB::ZLIB) -+ target_link_libraries(Foundation PUBLIC unofficial::pcre::pcre ZLIB::ZLIB) - target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) - add_definitions( - -D_pcre_utf8_table1=_poco_pcre_utf8_table1 -diff --git a/Foundation/cmake/PocoFoundationConfig.cmake b/Foundation/cmake/PocoFoundationConfig.cmake -index 46c2d3f..af2e78c 100644 ---- a/Foundation/cmake/PocoFoundationConfig.cmake -+++ b/Foundation/cmake/PocoFoundationConfig.cmake -@@ -2,7 +2,7 @@ if(@POCO_UNBUNDLED@) - include(CMakeFindDependencyMacro) - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") - find_dependency(ZLIB REQUIRED) -- find_dependency(PCRE REQUIRED) -+ find_dependency(unofficial-pcre REQUIRED) - endif() - - include("${CMAKE_CURRENT_LIST_DIR}/PocoFoundationTargets.cmake") -diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt -index 4fbf06f..793285a 100644 ---- a/XML/CMakeLists.txt -+++ b/XML/CMakeLists.txt -@@ -20,7 +20,7 @@ endif() - # If POCO_UNBUNDLED is enabled we try to find the required packages - # The configuration will fail if the packages are not found - if(POCO_UNBUNDLED) -- find_package(EXPAT REQUIRED) -+ find_package(expat CONFIG REQUIRED) - else() - POCO_SOURCES(SRCS expat - src/xmlparse.cpp -@@ -50,7 +50,7 @@ target_include_directories(XML - ) - - if(POCO_UNBUNDLED) -- target_link_libraries(XML PUBLIC EXPAT::EXPAT) -+ target_link_libraries(XML PUBLIC expat::expat) - target_compile_definitions(XML PUBLIC POCO_UNBUNDLED) - else() - if(WIN32) -diff --git a/XML/cmake/PocoXMLConfig.cmake b/XML/cmake/PocoXMLConfig.cmake -index ef58207..4ed94ec 100644 ---- a/XML/cmake/PocoXMLConfig.cmake -+++ b/XML/cmake/PocoXMLConfig.cmake -@@ -4,7 +4,7 @@ if(@POCO_UNBUNDLED@) - if(CMAKE_VERSION VERSION_LESS "3.10") - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/V39") - endif() -- find_dependency(EXPAT REQUIRED) -+ find_dependency(expat CONFIG REQUIRED) - endif() - - include("${CMAKE_CURRENT_LIST_DIR}/PocoXMLTargets.cmake") -diff --git a/cmake/PocoConfig.cmake.in b/cmake/PocoConfig.cmake.in -index 173eacd..936edf4 100644 ---- a/cmake/PocoConfig.cmake.in -+++ b/cmake/PocoConfig.cmake.in -@@ -8,6 +8,13 @@ if (NOT Poco_FIND_COMPONENTS) - return() - endif() - -+include(CMakeFindDependencyMacro) -+find_dependency(ZLIB REQUIRED) -+find_dependency(unofficial-pcre REQUIRED) -+if(Poco_FIND_REQUIRED_XML) -+ find_dependency(expat CONFIG REQUIRED) -+endif() -+ - set(_Poco_FIND_PARTS_REQUIRED) - if (Poco_FIND_REQUIRED) - set(_Poco_FIND_PARTS_REQUIRED REQUIRED) -@@ -23,7 +30,7 @@ set(_Poco_NOTFOUND_MESSAGE) - - # Let components find each other, but don't overwrite CMAKE_PREFIX_PATH - set(_Poco_CMAKE_PREFIX_PATH_old ${CMAKE_PREFIX_PATH}) --set(CMAKE_PREFIX_PATH ${_Poco_install_prefix}) -+set(CMAKE_PREFIX_PATH ${_Poco_install_prefix} ${CMAKE_PREFIX_PATH}) - - foreach(module ${Poco_FIND_COMPONENTS}) - find_package(Poco${module} +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b664afd..aafbf4a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,8 +82,6 @@ option(FORCE_OPENSSL "Force usage of OpenSSL even under windows" OFF) + + if(ENABLE_CRYPTO OR ENABLE_NETSSL OR ENABLE_JWT) + find_package(OpenSSL REQUIRED) +-else() +- find_package(OpenSSL) + endif() + + if(OPENSSL_FOUND) +@@ -113,24 +111,19 @@ else() + option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" OFF) + endif() + +-if(ENABLE_DATA_MYSQL) +- find_package(MySQL REQUIRED) +-else() +- find_package(MySQL) +-endif() ++option(ENABLE_DATA "Enable Data" OFF) ++option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF) + +-if(MYSQL_FOUND) +- option(ENABLE_DATA "Enable Data" ON) +- option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" ON) +-else() +- option(ENABLE_DATA "Enable Data" OFF) +- option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF) ++if(ENABLE_DATA_MYSQL) ++ find_package(libmysql) ++ if (NOT libmysql_FOUND) ++ find_package(unofficial-libmariadb CONFIG REQUIRED) ++ set(MYSQL_LIBRARIES libmariadb) ++ endif() + endif() + + if(ENABLE_DATA_POSTGRESQL) + find_package(PostgreSQL REQUIRED) +-else() +- find_package(PostgreSQL) + endif() + + if(PostgreSQL_FOUND) +@@ -200,6 +193,9 @@ include(DefinePlatformSpecifc) + # Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file + set(Poco_COMPONENTS "") + ++# Do not declare the link library in the code! ++add_definitions(-DPOCO_NO_AUTOMATIC_LIBS) ++ + if(ENABLE_TESTS) + add_subdirectory(CppUnit) + set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) +@@ -327,8 +323,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS) + list(APPEND Poco_COMPONENTS "Redis") + endif() + +-if(EXISTS ${PROJECT_SOURCE_DIR}/PDF AND ENABLE_PDF) +- add_subdirectory(PDF) ++if(ENABLE_PDF) ++ include(SelectLibraryConfigurations) ++ find_library(PocoPDF_LIBRARY_RELEASE NAMES libhpdf) ++ find_library(PocoPDF_LIBRARY_DEBUG NAMES libhpdfd) ++ select_library_configurations(PocoPDF) + list(APPEND Poco_COMPONENTS "PDF") + endif() + +@@ -457,15 +456,6 @@ install( + Devel + ) + +-if(POCO_UNBUNDLED) +- install(FILES cmake/FindPCRE.cmake +- DESTINATION "${PocoConfigPackageLocation}") +- install(FILES cmake/V39/FindEXPAT.cmake +- DESTINATION "${PocoConfigPackageLocation}/V39") +- install(FILES cmake/V313/FindSQLite3.cmake +- DESTINATION "${PocoConfigPackageLocation}/V313") +-endif() +- + message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") + message(STATUS "${PROJECT_NAME} package version: ${PROJECT_VERSION}") + if(BUILD_SHARED_LIBS) +diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt +index 7d1e99e..9d0a85c 100644 +--- a/Data/CMakeLists.txt ++++ b/Data/CMakeLists.txt +@@ -45,7 +45,7 @@ else(ENABLE_DATA_SQLITE) + message(STATUS "SQLite Support Disabled") + endif() + +-if(MYSQL_FOUND AND ENABLE_DATA_MYSQL) ++if((MYSQL_FOUND OR unofficial-libmariadb_FOUND) AND ENABLE_DATA_MYSQL) + message(STATUS "MySQL Support Enabled") + add_subdirectory(MySQL) + else() +diff --git a/Data/MySQL/CMakeLists.txt b/Data/MySQL/CMakeLists.txt +index f71b145..7034974 100644 +--- a/Data/MySQL/CMakeLists.txt ++++ b/Data/MySQL/CMakeLists.txt +@@ -21,7 +21,7 @@ set_target_properties(DataMySQL + DEFINE_SYMBOL MySQL_EXPORTS + ) + +-target_link_libraries(DataMySQL PUBLIC Poco::Data MySQL::client) ++target_link_libraries(DataMySQL PUBLIC Poco::Data ${MYSQL_LIBRARIES}) + target_include_directories(DataMySQL + PUBLIC + $ +diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt +index b52e2c5..0dcfae2 100644 +--- a/Data/SQLite/CMakeLists.txt ++++ b/Data/SQLite/CMakeLists.txt +@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h") + POCO_HEADERS_AUTO(SQLITE_SRCS ${HDRS_G}) + + if(POCO_UNBUNDLED) +- find_package(SQLite3 REQUIRED) ++ find_package(unofficial-sqlite3 CONFIG REQUIRED) + else() + # sqlite3 + POCO_SOURCES(SQLITE_SRCS sqlite3 +@@ -43,7 +43,7 @@ target_include_directories(DataSQLite + ) + + if(POCO_UNBUNDLED) +- target_link_libraries(DataSQLite PUBLIC SQLite::SQLite3) ++ target_link_libraries(DataSQLite PUBLIC unofficial::sqlite3::sqlite3) + target_compile_definitions(DataSQLite PUBLIC + POCO_UNBUNDLED + SQLITE_THREADSAFE=1 +diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt +index 6f5100f..c9fa2e5 100644 +--- a/Foundation/CMakeLists.txt ++++ b/Foundation/CMakeLists.txt +@@ -35,7 +35,7 @@ POCO_MESSAGES(SRCS Logging src/pocomsg.mc) + # If POCO_UNBUNDLED is enabled we try to find the required packages + # The configuration will fail if the packages are not found + if(POCO_UNBUNDLED) +- find_package(PCRE REQUIRED) ++ find_package(unofficial-pcre CONFIG REQUIRED) + find_package(ZLIB REQUIRED) + + #HACK: Unicode.cpp requires functions from these files. The can't be taken from the library +@@ -101,7 +101,7 @@ set_target_properties(Foundation + ) + + if(POCO_UNBUNDLED) +- target_link_libraries(Foundation PUBLIC Pcre::Pcre ZLIB::ZLIB) ++ target_link_libraries(Foundation PUBLIC unofficial::pcre::pcre ZLIB::ZLIB) + target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) + add_definitions( + -D_pcre_utf8_table1=_poco_pcre_utf8_table1 +diff --git a/Foundation/cmake/PocoFoundationConfig.cmake b/Foundation/cmake/PocoFoundationConfig.cmake +index 46c2d3f..af2e78c 100644 +--- a/Foundation/cmake/PocoFoundationConfig.cmake ++++ b/Foundation/cmake/PocoFoundationConfig.cmake +@@ -2,7 +2,7 @@ if(@POCO_UNBUNDLED@) + include(CMakeFindDependencyMacro) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + find_dependency(ZLIB REQUIRED) +- find_dependency(PCRE REQUIRED) ++ find_dependency(unofficial-pcre REQUIRED) + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/PocoFoundationTargets.cmake") +diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt +index 4fbf06f..793285a 100644 +--- a/XML/CMakeLists.txt ++++ b/XML/CMakeLists.txt +@@ -20,7 +20,7 @@ endif() + # If POCO_UNBUNDLED is enabled we try to find the required packages + # The configuration will fail if the packages are not found + if(POCO_UNBUNDLED) +- find_package(EXPAT REQUIRED) ++ find_package(expat CONFIG REQUIRED) + else() + POCO_SOURCES(SRCS expat + src/xmlparse.cpp +@@ -50,7 +50,7 @@ target_include_directories(XML + ) + + if(POCO_UNBUNDLED) +- target_link_libraries(XML PUBLIC EXPAT::EXPAT) ++ target_link_libraries(XML PUBLIC expat::expat) + target_compile_definitions(XML PUBLIC POCO_UNBUNDLED) + else() + if(WIN32) +diff --git a/XML/cmake/PocoXMLConfig.cmake b/XML/cmake/PocoXMLConfig.cmake +index ef58207..4ed94ec 100644 +--- a/XML/cmake/PocoXMLConfig.cmake ++++ b/XML/cmake/PocoXMLConfig.cmake +@@ -4,7 +4,7 @@ if(@POCO_UNBUNDLED@) + if(CMAKE_VERSION VERSION_LESS "3.10") + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/V39") + endif() +- find_dependency(EXPAT REQUIRED) ++ find_dependency(expat CONFIG REQUIRED) + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/PocoXMLTargets.cmake") +diff --git a/cmake/PocoConfig.cmake.in b/cmake/PocoConfig.cmake.in +index 173eacd..936edf4 100644 +--- a/cmake/PocoConfig.cmake.in ++++ b/cmake/PocoConfig.cmake.in +@@ -8,6 +8,13 @@ if (NOT Poco_FIND_COMPONENTS) + return() + endif() + ++include(CMakeFindDependencyMacro) ++find_dependency(ZLIB REQUIRED) ++find_dependency(unofficial-pcre REQUIRED) ++if(Poco_FIND_REQUIRED_XML) ++ find_dependency(expat CONFIG REQUIRED) ++endif() ++ + set(_Poco_FIND_PARTS_REQUIRED) + if (Poco_FIND_REQUIRED) + set(_Poco_FIND_PARTS_REQUIRED REQUIRED) +@@ -23,7 +30,7 @@ set(_Poco_NOTFOUND_MESSAGE) + + # Let components find each other, but don't overwrite CMAKE_PREFIX_PATH + set(_Poco_CMAKE_PREFIX_PATH_old ${CMAKE_PREFIX_PATH}) +-set(CMAKE_PREFIX_PATH ${_Poco_install_prefix}) ++set(CMAKE_PREFIX_PATH ${_Poco_install_prefix} ${CMAKE_PREFIX_PATH}) + + foreach(module ${Poco_FIND_COMPONENTS}) + find_package(Poco${module} +diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h +index b533c9f..e2bb2d3 100644 +--- a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h ++++ b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h +@@ -54,7 +54,6 @@ + #if !defined(MySQL_EXPORTS) + #pragma comment(lib, "PocoDataMySQL" POCO_LIB_SUFFIX) + #endif +- #pragma comment(lib, "libmysql") + #endif + + From 2cd45e20790b81405fd4daa6b1f18458774f6f03 Mon Sep 17 00:00:00 2001 From: victorburckel Date: Mon, 30 Nov 2020 19:37:01 +0100 Subject: [PATCH 0192/1694] [ace] copy generated headers files for tao (#14768) * copy generated files from ace / tao release build folder * Update port version --- ports/ace/CONTROL | 1 + ports/ace/portfile.cmake | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index e0fcc0d8168bcb..f0d1c132175b56 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -2,6 +2,7 @@ Source: ace Version: 6.5.12 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html Description: The ADAPTIVE Communication Environment +Port-Version: 1 Feature: wchar Description: Enable extra wide char functions in ACE diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 00be1e23cad765..399f5c7882cf9d 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -126,6 +126,7 @@ if(VCPKG_TARGET_IS_WINDOWS) LICENSE_SUBPATH COPYING PLATFORM ${MSBUILD_PLATFORM} USE_VCPKG_INTEGRATION + SKIP_CLEAN ) # ACE itself does not define an install target, so it is not clear which @@ -146,6 +147,9 @@ if(VCPKG_TARGET_IS_WINDOWS) DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}) endforeach() endfunction() + + get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) + set(SOURCE_COPY_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}) # Install headers in subdirectory set(ACE_INCLUDE_FOLDERS @@ -160,22 +164,22 @@ if(VCPKG_TARGET_IS_WINDOWS) "ace/os_include/net" "ace/os_include/netinet" "ace/os_include/sys") - install_includes(${ACE_ROOT} "${ACE_INCLUDE_FOLDERS}") + install_includes(${SOURCE_COPY_PATH} "${ACE_INCLUDE_FOLDERS}") if("ssl" IN_LIST FEATURES) - install_includes(${ACE_ROOT} "ace/SSL") + install_includes(${SOURCE_COPY_PATH} "ace/SSL") endif() if("tao" IN_LIST FEATURES) set(ACEXML_INCLUDE_FOLDERS "ACEXML/apps/svcconf" "ACEXML/common" "ACEXML/parser/parser") - install_includes(${ACE_ROOT} "${ACEXML_INCLUDE_FOLDERS}") + install_includes(${SOURCE_COPY_PATH} "${ACEXML_INCLUDE_FOLDERS}") set(ACE_PROTOCOLS_INCLUDE_FOLDERS "ace/HTBP" "ace/INet" "ace/RMCast" "ace/TMCast") - install_includes(${ACE_ROOT}/protocols "${ACE_PROTOCOLS_INCLUDE_FOLDERS}") + install_includes(${SOURCE_COPY_PATH}/protocols "${ACE_PROTOCOLS_INCLUDE_FOLDERS}") - install_includes(${ACE_ROOT} "Kokyu") + install_includes(${SOURCE_COPY_PATH} "Kokyu") set(TAO_ORBSVCS_INCLUDE_FOLDERS "orbsvcs" @@ -209,11 +213,11 @@ if(VCPKG_TARGET_IS_WINDOWS) if("ssl" IN_LIST FEATURES) list(APPEND TAO_ORBSVCS_INCLUDE_FOLDERS "orbsvcs/SSLIOP") endif() - install_includes(${TAO_ROOT}/orbsvcs "${TAO_ORBSVCS_INCLUDE_FOLDERS}") + install_includes(${SOURCE_COPY_PATH}/TAO/orbsvcs "${TAO_ORBSVCS_INCLUDE_FOLDERS}") set(TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS "orbsvcs/FT_ReplicationManager" "orbsvcs/Notify_Service") - install_includes(${TAO_ROOT} "${TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS}") + install_includes(${SOURCE_COPY_PATH}/TAO "${TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS}") set(TAO_INCLUDE_FOLDERS "tao" @@ -255,7 +259,7 @@ if(VCPKG_TARGET_IS_WINDOWS) if("zlib" IN_LIST FEATURES) list(APPEND TAO_INCLUDE_FOLDERS "tao/Compression/zlib") endif() - install_includes(${TAO_ROOT} "${TAO_INCLUDE_FOLDERS}") + install_includes(${SOURCE_COPY_PATH}/TAO "${TAO_INCLUDE_FOLDERS}") endif() # Remove dlls without any export @@ -268,6 +272,8 @@ if(VCPKG_TARGET_IS_WINDOWS) ${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd_dll.pdb) endif() endif() + + vcpkg_clean_msbuild() elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) FIND_PROGRAM(MAKE make) IF (NOT MAKE) From 04aef1c5bf82bb0a9ca714074d905c4d229e509e Mon Sep 17 00:00:00 2001 From: Daniil Dudkin <39276703+unterumarmung@users.noreply.github.com> Date: Mon, 30 Nov 2020 22:37:18 +0400 Subject: [PATCH 0193/1694] [fixed-string] Add library (#14770) * [fixed-string] Add library * [fixed-string] Added new lines to files --- ports/fixed-string/CONTROL | 4 ++++ ports/fixed-string/portfile.cmake | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 ports/fixed-string/CONTROL create mode 100644 ports/fixed-string/portfile.cmake diff --git a/ports/fixed-string/CONTROL b/ports/fixed-string/CONTROL new file mode 100644 index 00000000000000..935b0ff1dc02dc --- /dev/null +++ b/ports/fixed-string/CONTROL @@ -0,0 +1,4 @@ +Source: fixed-string +Version: 0.1.0 +Description: Header-only C++17 library provides a string class with std::array fixed-size semantic. +Homepage: https://github.com/unterumarmung/fixed_string diff --git a/ports/fixed-string/portfile.cmake b/ports/fixed-string/portfile.cmake new file mode 100644 index 00000000000000..760d2d0a632d90 --- /dev/null +++ b/ports/fixed-string/portfile.cmake @@ -0,0 +1,27 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO unterumarmung/fixed_string + REF v0.1.0 + SHA512 759c228e3bc4bc06d58b59bc19756ceb27a6f6104cb0c58288bf3156ca0958e6099741870fa09ba88a5572d17988529992cc5198faab30847118665e626c2ea4 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DFIXED_STRING_OPT_BUILD_EXAMPLES=OFF + -DFIXED_STRING_OPT_BUILD_TESTS=OFF + -DFIXED_STRING_OPT_INSTALL=ON +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fixed_string TARGET_PATH share/fixed_string) + +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) From 580028511e06c975b598856dffbcf051dc1ba02a Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 30 Nov 2020 10:39:10 -0800 Subject: [PATCH 0194/1694] [span-lite] update to 0.9.0 (#14781) --- ports/span-lite/portfile.cmake | 4 ++-- ports/span-lite/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/span-lite/portfile.cmake b/ports/span-lite/portfile.cmake index 0b93ca391cfd54..fd34b69ca06bd1 100644 --- a/ports/span-lite/portfile.cmake +++ b/ports/span-lite/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/span-lite - REF v0.8.1 - SHA512 c0bee9cea29f477ec93f706a455cc900cbb6048e40417ade0878cea3e3591657bb17dcd5f82621da0365477c1a0e0947f8dccef95761323674235adfdaf25c9a + REF v0.9.0 + SHA512 e7d8a5f2e85b4aa7dc148c5a17898729bafa6124affacf66280eaa74c6aad5a4c9a9231e664f95392aa4edb784eaf3e2e3e03d34914c90565b9026744d7f7276 ) vcpkg_configure_cmake( diff --git a/ports/span-lite/vcpkg.json b/ports/span-lite/vcpkg.json index 60458b3dd7d5cd..1227b0a5d05fd2 100644 --- a/ports/span-lite/vcpkg.json +++ b/ports/span-lite/vcpkg.json @@ -1,6 +1,6 @@ { "name": "span-lite", - "version-string": "0.8.1", + "version-string": "0.9.0", "description": "A C++20-like span for C++98, C++11 and later in a single-file header-only library", "homepage": "https://github.com/martinmoene/span-lite" } From 05a027731da774207401137dfae7913028c4bf30 Mon Sep 17 00:00:00 2001 From: Kevin Lu <6320810+kevinlul@users.noreply.github.com> Date: Mon, 30 Nov 2020 13:42:58 -0500 Subject: [PATCH 0195/1694] [fmt] Update to 7.1.3 (#14786) --- ports/fmt/CONTROL | 2 +- ports/fmt/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL index c04d136ab48358..23ea3ec680af39 100644 --- a/ports/fmt/CONTROL +++ b/ports/fmt/CONTROL @@ -1,5 +1,5 @@ Source: fmt -Version: 7.1.2 +Version: 7.1.3 Port-Version: 0 Homepage: https://github.com/fmtlib/fmt Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams. diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 6c37a779374e69..692314ff246b20 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF cc09f1a6798c085c325569ef466bcdcffdc266d4 # v7.1.2 - SHA512 a7bdd62ec98e3098182bc5080938b37284ced83f007ea3ef45e27407c04fc13a9e5852ab959b3d02088286480924c71e9fd23492c20d8752cf7e890b2a1ec52e + REF 7bdf0628b1276379886c7f6dda2cef2b3b374f0b # v7.1.3 + SHA512 52ea8f9d2c0cb52ec3a740e38fcdfd6a0318566e3b599bd2e8d557168642d005c0a59bc213cff2641a88fed3bb771d15f46c39035ccd64809569af982aba47aa HEAD_REF master PATCHES fix-warning4189.patch ) From 5dec5b1d89817c31d248036ab22624ed6d946956 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Mon, 30 Nov 2020 19:43:22 +0100 Subject: [PATCH 0196/1694] [prometheus-cpp] Update to version 0.11.0 (#14792) --- ports/prometheus-cpp/CONTROL | 2 +- ports/prometheus-cpp/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/prometheus-cpp/CONTROL b/ports/prometheus-cpp/CONTROL index aed6c3004179cc..7d521685e1c9cb 100644 --- a/ports/prometheus-cpp/CONTROL +++ b/ports/prometheus-cpp/CONTROL @@ -1,5 +1,5 @@ Source: prometheus-cpp -Version: 0.10.0 +Version: 0.11.0 Description: Prometheus Client Library for Modern C++ Default-Features: compression, pull diff --git a/ports/prometheus-cpp/portfile.cmake b/ports/prometheus-cpp/portfile.cmake index fa8d1c3508026c..5740959021f0d6 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 62897f9e794e9f16471e8a53f367268109e7fa6e # v0.10.0 - SHA512 b065a1caaa29c5e7d31b89f4dc0f0a6309a58322a2c95ad784d47c9717dfb525c4f27df38ef7562e3a1be605898b30caf7702a801928f9b09c30b64f9a2becc8 + REF bb017ec15a824d3301845a1274b4b46a01d6d871 # v0.11.0 + SHA512 5ab3398842305bacf6cd65c700c6856f001bb998b62dea121c119484ccd376115a07afb7d62e6f87c8cbfe4f7ac05d4428121677eb8694eb9c9169465eb3518c HEAD_REF master ) From 0aa861a19757f4f78ecb4b62237e569eafec5317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 30 Nov 2020 11:00:02 -0800 Subject: [PATCH 0197/1694] [devil] Fix pkgconfig on Windows (#14793) --- ports/devil/0005-fix-pkgconfig.patch | 52 ++++++++++++++++++++++++++++ ports/devil/CONTROL | 2 +- ports/devil/portfile.cmake | 3 ++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 ports/devil/0005-fix-pkgconfig.patch diff --git a/ports/devil/0005-fix-pkgconfig.patch b/ports/devil/0005-fix-pkgconfig.patch new file mode 100644 index 00000000000000..d45af68f720ae4 --- /dev/null +++ b/ports/devil/0005-fix-pkgconfig.patch @@ -0,0 +1,52 @@ +diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt +index 4accaa1..c3a1874 100644 +--- a/DevIL/src-IL/CMakeLists.txt ++++ b/DevIL/src-IL/CMakeLists.txt +@@ -160,6 +160,27 @@ if(WIN32) + # Linux uses libIL.so, libILU.so, and libILUT.so, but Windows uses + # DevIL.dll, ILU.dll, and ILUT.dll. + set_target_properties(IL PROPERTIES OUTPUT_NAME "DevIL") ++ ++ configure_file(${CMAKE_CURRENT_LIST_DIR}/pkgconfig/IL.pc.cmake.in ${CMAKE_CURRENT_LIST_DIR}/pkgconfig/DevIL.pc.cmake.in COPYONLY) ++ ++ file(READ ${CMAKE_CURRENT_LIST_DIR}/pkgconfig/DevIL.pc.cmake.in PKGCONFIG_FILE) ++ string(REPLACE "IL" "DevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}") ++ file(WRITE ${CMAKE_CURRENT_LIST_DIR}/pkgconfig/DevIL.pc.cmake.in "${PKGCONFIG_FILE}") ++ ++ file(READ ${CMAKE_CURRENT_LIST_DIR}/../src-ILU/pkgconfig/ILU.pc.cmake.in PKGCONFIG_FILE) ++ string(REPLACE "Requires: IL" "Requires: DevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}") ++ string(REPLACE "Libs.private: -lIL" "Libs.private: -lDevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}") ++ file(WRITE ${CMAKE_CURRENT_LIST_DIR}/../src-ILU/pkgconfig/ILU.pc.cmake.in "${PKGCONFIG_FILE}") ++ ++ file(READ ${CMAKE_CURRENT_LIST_DIR}/../src-ILUT/pkgconfig/ILUT.pc.cmake.in PKGCONFIG_FILE) ++ string(REPLACE "Requires: IL" "Requires: DevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}") ++ string(REPLACE "Libs.private: -lIL" "Libs.private: -lDevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}") ++ file(WRITE ${CMAKE_CURRENT_LIST_DIR}/../src-ILUT/pkgconfig/ILUT.pc.cmake.in "${PKGCONFIG_FILE}") ++ set(PKGCFG_IN_FILE pkgconfig/DevIL.pc.cmake.in) ++ set(PKGCFG_FILE DevIL.pc) ++else(WIN32) ++ set(PKGCFG_IN_FILE pkgconfig/IL.pc.cmake.in) ++ set(PKGCFG_FILE IL.pc) + endif(WIN32) + + if(UNICODE) +@@ -246,8 +267,8 @@ endif() + # TODO: add Requires.private or Libs.private + # (needed to support static linking?) + # TODO: sort out version number +-configure_file( pkgconfig/IL.pc.cmake.in +- ${CMAKE_CURRENT_BINARY_DIR}/IL.pc @ONLY) ++configure_file( ${PKGCFG_IN_FILE} ++ ${CMAKE_CURRENT_BINARY_DIR}/${PKGCFG_FILE} @ONLY) + + + # Installation +@@ -259,7 +280,7 @@ install (TARGETS IL + install (FILES ../include/IL/il.h DESTINATION include/IL) + + install(FILES +- ${CMAKE_CURRENT_BINARY_DIR}/IL.pc ++ ${CMAKE_CURRENT_BINARY_DIR}/${PKGCFG_FILE} + DESTINATION lib/pkgconfig + ) + diff --git a/ports/devil/CONTROL b/ports/devil/CONTROL index 00b069a4fb972f..980c91e1b0e7a7 100644 --- a/ports/devil/CONTROL +++ b/ports/devil/CONTROL @@ -1,6 +1,6 @@ Source: devil Version: 1.8.0 -Port-Version: 6 +Port-Version: 7 Build-Depends: Homepage: https://github.com/DentonW/DevIL Description: A full featured cross-platform image library diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake index c2d098625857cb..36a5dfccd0fe44 100644 --- a/ports/devil/portfile.cmake +++ b/ports/devil/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( 0003_fix-openexr.patch enable-static.patch 0004_compatible-jasper-2-0-20.patch + 0005-fix-pkgconfig.patch ) file(REMOVE ${SOURCE_PATH}/DevIL/src-IL/cmake/FindOpenEXR.cmake) @@ -39,6 +40,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright From c7b167ed351bea5f764f77d392eb8987360d66ad Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 1 Dec 2020 03:00:50 +0800 Subject: [PATCH 0198/1694] [cpp-httplib] Update to 0.7.15 (#14795) --- ports/cpp-httplib/CONTROL | 2 +- ports/cpp-httplib/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cpp-httplib/CONTROL b/ports/cpp-httplib/CONTROL index 4f794d11a08522..2cb8014e9b68e4 100644 --- a/ports/cpp-httplib/CONTROL +++ b/ports/cpp-httplib/CONTROL @@ -1,4 +1,4 @@ Source: cpp-httplib -Version: 0.7.0 +Version: 0.7.15 Homepage: https://github.com/yhirose/cpp-httplib Description: A single file C++11 header-only HTTP/HTTPS server and client library diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake index c23cd61af3517f..721cbf73fbba65 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 v0.7.0 - SHA512 4ffbeb6672dec5f3704d6c3da09acf0e1984b5c7c68455f7fb030a7457bc64983665498015f2372d8a85da02be1750bab03dae956653297ac8efef67ff682854 + REF e1133a2dcb3436ac36c75452a569b609cdb58a0b # v0.7.15 + SHA512 b0ead7fa561f26ebbe407b57b5f96c5ccc76689af28aeb734bd035b373fd63dca0909ea36ef016e426cb068e8712ae361654480695688a5b3979fb0864cec82d HEAD_REF master ) From 08c69f5ddf7c3649ee8027b76f44a49c3b8c2a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 30 Nov 2020 11:01:16 -0800 Subject: [PATCH 0199/1694] [sdl2-image] Fix usage (#14796) --- ports/sdl2-image/CMakeLists.txt | 11 +++++++++-- ports/sdl2-image/CONTROL | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/sdl2-image/CMakeLists.txt b/ports/sdl2-image/CMakeLists.txt index 9cc82de7afe7b4..48afeb538bb47a 100644 --- a/ports/sdl2-image/CMakeLists.txt +++ b/ports/sdl2-image/CMakeLists.txt @@ -110,13 +110,20 @@ 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") +]]) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sdl2-image-config.cmake DESTINATION share/sdl2-image) + install(EXPORT SDL2_image DESTINATION share/sdl2-image/ - FILE sdl2-image-config.cmake + FILE sdl2-image-targets.cmake NAMESPACE SDL2:: ) - message(STATUS "Link-time dependencies:") message(STATUS " " SDL2::SDL2) foreach(DEPENDENCY ${DEPENDENCIES}) diff --git a/ports/sdl2-image/CONTROL b/ports/sdl2-image/CONTROL index 19218ef3e2055d..db07f7630c8db5 100644 --- a/ports/sdl2-image/CONTROL +++ b/ports/sdl2-image/CONTROL @@ -1,5 +1,6 @@ Source: sdl2-image Version: 2.0.5 +Port-Version: 1 Build-Depends: sdl2, libpng Homepage: https://www.libsdl.org/projects/SDL_image 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 From 7e71dac542ae1092b19dc2a5c4447f697910d7ed Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 1 Dec 2020 03:02:53 +0800 Subject: [PATCH 0200/1694] [libevent] Fix library cannot be found (#14805) --- ports/libevent/CONTROL | 1 + .../fix-LibeventConfig_cmake_in_path.patch | 15 ++++++++++++--- ports/libevent/portfile.cmake | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ports/libevent/CONTROL b/ports/libevent/CONTROL index fd98e588a12ddd..b51c55e9f67329 100644 --- a/ports/libevent/CONTROL +++ b/ports/libevent/CONTROL @@ -1,5 +1,6 @@ Source: libevent Version: 2.1.12 +Port-Version: 1 Homepage: https://github.com/libevent/libevent Description: An event notification library Supports: !uwp diff --git a/ports/libevent/fix-LibeventConfig_cmake_in_path.patch b/ports/libevent/fix-LibeventConfig_cmake_in_path.patch index 9566f152cc4b27..819380bec36520 100644 --- a/ports/libevent/fix-LibeventConfig_cmake_in_path.patch +++ b/ports/libevent/fix-LibeventConfig_cmake_in_path.patch @@ -1,13 +1,22 @@ diff --git a/cmake/LibeventConfig.cmake.in b/cmake/LibeventConfig.cmake.in -index 7b808c3..fbf67be 100644 +index 7b808c3..9376a5a 100644 --- a/cmake/LibeventConfig.cmake.in +++ b/cmake/LibeventConfig.cmake.in @@ -58,7 +58,7 @@ endif() - + # Get the path of the current file. get_filename_component(LIBEVENT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_INSTALL_PREFIX "${LIBEVENT_CMAKE_DIR}/../../.." ABSOLUTE) +get_filename_component(_INSTALL_PREFIX "${LIBEVENT_CMAKE_DIR}/../.." ABSOLUTE) - + macro(message_if_needed _flag _msg) if (NOT ${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) +@@ -131,7 +131,7 @@ if(CONFIG_FOR_INSTALL_TREE) + find_library(_event_lib + NAMES "event_${_comp}" + PATHS "${_INSTALL_PREFIX}/lib" +- NO_DEFAULT_PATH) ++ ) + if(_event_lib) + list(APPEND LIBEVENT_LIBRARIES "libevent::${_comp}") + set_case_insensitive_found(${_comp}) diff --git a/ports/libevent/portfile.cmake b/ports/libevent/portfile.cmake index 9865cecea3faae..d6b02bbf707e66 100644 --- a/ports/libevent/portfile.cmake +++ b/ports/libevent/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} does not currently support UWP" ON_TARGET "uwp") +vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH From 72dc22708cc55d92fba930a6b9384d75e3ba04ec Mon Sep 17 00:00:00 2001 From: Eli Arzhannikov Date: Mon, 30 Nov 2020 20:03:40 +0100 Subject: [PATCH 0201/1694] [lapack-reference] add to CMAKE_FIND_LIBRARY_SUFFIXES additional suffixes (#14816) * [lapack-reference] add to CMAKE_FIND_LIBRARY_SUFFIXES additional suffixes with versions for make find_library to able to find libgfortran * restore original value of CMAKE_FIND_LIBRARY_SUFFIXES --- ports/lapack-reference/CONTROL | 2 +- ports/lapack-reference/FindLAPACK.cmake | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/lapack-reference/CONTROL b/ports/lapack-reference/CONTROL index 9ed60cc58fc1f2..701e48b7d3b2f1 100644 --- a/ports/lapack-reference/CONTROL +++ b/ports/lapack-reference/CONTROL @@ -1,6 +1,6 @@ Source: lapack-reference Version: 3.8.0 -Port-Version: 3 +Port-Version: 4 Description: LAPACK — Linear Algebra PACKage http://www.netlib.org/lapack/ Default-Features: blas-select Build-Depends: vcpkg-gfortran (windows) diff --git a/ports/lapack-reference/FindLAPACK.cmake b/ports/lapack-reference/FindLAPACK.cmake index a411c7c18e9a92..f4d25477d8dad4 100644 --- a/ports/lapack-reference/FindLAPACK.cmake +++ b/ports/lapack-reference/FindLAPACK.cmake @@ -110,6 +110,12 @@ set(CMAKE_REQUIRED_QUIET ${LAPACK_FIND_QUIETLY}) set(LAPACK_FOUND FALSE) set(LAPACK95_FOUND FALSE) +# store original values for CMAKE_FIND_LIBRARY_SUFFIXES +set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .so.3gfs .so.3 .so.4 .so.5) +endif() + # TODO: move this stuff to a separate module macro(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _addlibdir _subdirs _blas) @@ -549,3 +555,5 @@ if(NOT TARGET LAPACK::LAPACK) endif() cmake_pop_check_state() +# restore original values for CMAKE_FIND_LIBRARY_SUFFIXES +set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) From e92c6d7c4a19fe1bf58aa7339bb53891c7c7794d Mon Sep 17 00:00:00 2001 From: eao197 Date: Mon, 30 Nov 2020 22:04:05 +0300 Subject: [PATCH 0202/1694] SObjectizer updated to v.5.7.2. (#14844) --- ports/sobjectizer/CONTROL | 4 ---- ports/sobjectizer/portfile.cmake | 4 ++-- ports/sobjectizer/vcpkg.json | 7 +++++++ 3 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 ports/sobjectizer/CONTROL create mode 100644 ports/sobjectizer/vcpkg.json diff --git a/ports/sobjectizer/CONTROL b/ports/sobjectizer/CONTROL deleted file mode 100644 index c6c54d8ceb9eb6..00000000000000 --- a/ports/sobjectizer/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: sobjectizer -Version: 5.7.1 -Homepage: https://github.com/Stiffstream/sobjectizer -Description: SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels. diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index abda8a579998c1..da0800892be55c 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 64e9c1062ef1bbbb67de44426f2eac55d4f5241c # v.5.7.1 - SHA512 aa8f1bc982f1212fd040bb68c52d824f518104f1e5ce6af884ec57ffb70334148765fd44c5f883458e7733cf28ace380c349e68d8dbe19564374ab0afb0b969a + REF 0f261d1f2352d56854bf940dabdd9a4ad527be24 # v.5.7.2 + SHA512 f5b63a82ecc99151ae0b5870f040b59e000c159958232427b1aefa135def722f377906e59cc99e2f0139b36f6f2f2678dff8d8acd03ab03e0b87a4af4f678f13 ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) diff --git a/ports/sobjectizer/vcpkg.json b/ports/sobjectizer/vcpkg.json new file mode 100644 index 00000000000000..60787967ac3d08 --- /dev/null +++ b/ports/sobjectizer/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "sobjectizer", + "version-string": "5.7.2", + "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" +} From 08c2347e4594c91d18dfb66d6313b5784071d0b4 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Mon, 30 Nov 2020 13:57:13 -0600 Subject: [PATCH 0203/1694] [speexdsp] Update CMake script for macOS/Linux (#14758) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [speexdsp] Update CMake script for macOS/Linux * [speexdsp] Update download URL comment Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [speexdsp] update with suggested CMake changes Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/speexdsp/CMakeLists.txt | 112 ++++++++++++++++++++++++++++------ ports/speexdsp/CONTROL | 3 +- ports/speexdsp/portfile.cmake | 32 +++++++--- 3 files changed, 120 insertions(+), 27 deletions(-) diff --git a/ports/speexdsp/CMakeLists.txt b/ports/speexdsp/CMakeLists.txt index a1dec7f3b86a64..6a5f10613ba43a 100644 --- a/ports/speexdsp/CMakeLists.txt +++ b/ports/speexdsp/CMakeLists.txt @@ -1,32 +1,106 @@ cmake_minimum_required(VERSION 3.1) -option(USE_SSE "Use SSE" ON) -project (libspeexdsp) +option(USE_SSE "Use SSE" OFF) +option(USE_NEON "Use NEON" OFF) +option(FIXED_POINT "Use Fixed Point Arithmetic" OFF) -file(GLOB_RECURSE LIBSPEEXDSP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/*.c") -list(FILTER LIBSPEEXDSP_SOURCES EXCLUDE REGEX "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/test.*\\.c") -file(GLOB_RECURSE LIBSPEEXDSP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/*.h") -file(GLOB_RECURSE LIBSPEEXDSP_HEADERS_PUBLIC "${CMAKE_CURRENT_LIST_DIR}/include/**/*.h") +set(LIBSPEEXDSP_VERSION "1.2.0") +set(LIBSPEEXDSP_SOVERSION "1") +project(libspeexdsp) -if (BUILD_SHARED_LIBS) - add_definitions(-D_WINDOWS -D_USRDLL) +set(LIBSPEEXDSP_SOURCES + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/buffer.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/fftwrap.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/filterbank.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/jitter.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/mdf.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/preprocess.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/resample.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/scal.c" +) +set(LIBSPEEXDSP_HEADERS + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/arch.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/bfin.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/fftwrap.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/filterbank.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/fixed_arm4.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/fixed_arm5e.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/fixed_bfin.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/fixed_debug.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/fixed_generic.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/math_approx.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/misc_bfin.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/os_support.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/pseudofloat.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/resample_neon.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/resample_sse.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/smallft.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/stack_alloc.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/vorbis_psy.h" + "${CMAKE_CURRENT_LIST_DIR}/include/speex/speex_buffer.h" +) +set(LIBSPEEXDSP_HEADERS_PUBLIC + "${CMAKE_CURRENT_LIST_DIR}/include/speex/speex_echo.h" + "${CMAKE_CURRENT_LIST_DIR}/include/speex/speex_jitter.h" + "${CMAKE_CURRENT_LIST_DIR}/include/speex/speex_preprocess.h" + "${CMAKE_CURRENT_LIST_DIR}/include/speex/speex_resampler.h" + "${CMAKE_CURRENT_LIST_DIR}/include/speex/speexdsp_types.h" +) + +set(CMAKE_C_VISIBILITY_PRESET hidden) +if (NOT BUILD_SHARED_LIBS) + add_definitions("-DEXPORT=") +elseif(WIN32) + add_definitions("-DEXPORT=") list(APPEND LIBSPEEXDSP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/win32/libspeexdsp.def") -else () - add_definitions(-D_LIB) -endif () +else() + add_definitions("-DEXPORT=__attribute__((visibility(\"default\")))") +endif() -add_definitions(-DHAVE_CONFIG_H -D_WIN32) +if (USE_SSE AND NOT FIXED_POINT) + add_definitions(-DUSE_SSE -DUSE_SSE2) +endif() +if (USE_NEON AND NOT MSVC) + add_definitions(-DUSE_NEON) +endif() -if (USE_SSE) - add_definitions(-D_USE_SSE -D_USE_SSE2) +if (FIXED_POINT) + add_definitions(-DFIXED_POINT -DUSE_KISS_FFT) + list(APPEND LIBSPEEXDSP_SOURCES + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/kiss_fft.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/kiss_fftr.c" + ) + list(APPEND LIBSPEEXDSP_HEADERS + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/_kiss_fft_guts.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/kiss_fft.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/kiss_fftr.h" + ) +else() + add_definitions(-DFLOATING_POINT -DUSE_SMALLFT) + list(APPEND LIBSPEEXDSP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/smallft.c") endif() -include_directories("${CMAKE_CURRENT_LIST_DIR}/include" - "${CMAKE_CURRENT_LIST_DIR}/win32") -add_library(libspeexdsp ${LIBSPEEXDSP_SOURCES} ${LIBSPEEXDSP_HEADERS}) +if (NOT MSVC) + add_definitions(-DVAR_ARRAYS) +endif() + +# Basic speexdsp_config_types.h for Linux support +set(INCLUDE_STDINT "#include ") +set(SIZE16 "int16_t") +set(USIZE16 "uint16_t") +set(SIZE32 "int32_t") +set(USIZE32 "uint32_t") +configure_file("${CMAKE_CURRENT_LIST_DIR}/include/speex/speexdsp_config_types.h.in" + "${CMAKE_CURRENT_BINARY_DIR}/speexdsp_config_types.h" @ONLY) +list(APPEND LIBSPEEXDSP_HEADERS_PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/speexdsp_config_types.h") + +include_directories("${CMAKE_CURRENT_LIST_DIR}/include") -set_target_properties(libspeexdsp PROPERTIES PUBLIC_HEADER "${LIBSPEEXDSP_HEADERS_PUBLIC}") +add_library(speexdsp ${LIBSPEEXDSP_SOURCES} ${LIBSPEEXDSP_HEADERS}) +set_target_properties(speexdsp PROPERTIES PUBLIC_HEADER "${LIBSPEEXDSP_HEADERS_PUBLIC}") +set_target_properties(speexdsp PROPERTIES VERSION "${LIBSPEEXDSP_VERSION}") +set_target_properties(speexdsp PROPERTIES SOVERSION "${LIBSPEEXDSP_SOVERSION}") -install(TARGETS libspeexdsp +install(TARGETS speexdsp ARCHIVE DESTINATION "lib" RUNTIME DESTINATION "bin" PUBLIC_HEADER DESTINATION "include/speex") diff --git a/ports/speexdsp/CONTROL b/ports/speexdsp/CONTROL index 4edbf5f2000020..dbf76057de5fba 100644 --- a/ports/speexdsp/CONTROL +++ b/ports/speexdsp/CONTROL @@ -1,5 +1,6 @@ Source: speexdsp -Version: 1.2.0-2 +Version: 1.2.0 +Port-Version: 3 Homepage: https://speex.org/ Description: A patent-free, Open Source/Free Software DSP library. Build-Depends: diff --git a/ports/speexdsp/portfile.cmake b/ports/speexdsp/portfile.cmake index 3ed106350b682e..429b2f21398ea4 100644 --- a/ports/speexdsp/portfile.cmake +++ b/ports/speexdsp/portfile.cmake @@ -1,10 +1,23 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO xiph/speexdsp - REF 64cbfa9bca7479a758351aa02bb4abdd76baa9e7 #1.2.0 - SHA512 b92488e1efd4d763cd2d438b88a1b708d2a9d8f804dc2b016bfb29c4f7366624d3cf86a23645067393274e100c1bd6467def0eb98575f04ffcaf49b20f1f1105 - HEAD_REF master -) +if(VCPKG_USE_HEAD_VERSION) + vcpkg_from_gitlab( + GITLAB_URL "https://gitlab.xiph.org" + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/speexdsp + HEAD_REF master + ) +else() + # Since the github repo is out-dated, use official download URL for release builds to reduce traffic to the Gitlab host + vcpkg_download_distfile(ARCHIVE + URLS "http://downloads.xiph.org/releases/speex/speexdsp-1.2.0.tar.gz" + FILENAME "speexdsp-1.2.0.tar.gz" + SHA512 e357cd5377415ea66c862302c7cf8bf6a10063cacd903f0846478975b87974cf5bdf00e2c6759d8f4f453c4c869cf284e9dc948a84a83d7b2ab96bd5405c05ec + ) + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF "1.2.0" + ) +endif() file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -12,12 +25,17 @@ set(USE_SSE OFF) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(USE_SSE ON) endif() +set(USE_NEON OFF) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(USE_NEON ON) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DUSE_SSE=${USE_SSE} + -DUSE_NEON=${USE_NEON} ) vcpkg_install_cmake() From 8d4b10689e6515cba4afdd88d73a29983b22ee00 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Mon, 30 Nov 2020 15:49:22 -0800 Subject: [PATCH 0204/1694] [vcpkg] fix feature flags telemetry (#14856) * [vcpkg] fix feature flags telemetry * change to robert's suggestion --- toolsrc/src/vcpkg/metrics.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index 709fc828c42417..0153ff65dfeb56 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -155,8 +155,6 @@ namespace vcpkg::Metrics Json::Array buildtime_names; Json::Array buildtime_times; - Json::Object feature_flags; - void track_property(const std::string& name, const std::string& value) { properties.insert_or_replace(name, Json::Value::string(value)); @@ -174,7 +172,7 @@ namespace vcpkg::Metrics } void track_feature(const std::string& name, bool value) { - feature_flags.insert(name, Json::Value::boolean(value)); + properties.insert("feature-flag-" + name, Json::Value::boolean(value)); } std::string format_event_data_template() const @@ -234,7 +232,6 @@ namespace vcpkg::Metrics base_data.insert("name", Json::Value::string("commandline_test7")); base_data.insert("properties", std::move(props_plus_buildtimes)); base_data.insert("measurements", measurements); - base_data.insert("feature-flags", feature_flags); } return Json::stringify(arr, vcpkg::Json::JsonStyle()); From f430f0c161c0c3723563b7fcb5f4599b0823d2b0 Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Mon, 30 Nov 2020 17:57:40 -0600 Subject: [PATCH 0205/1694] [cudnn] Don't copy debug versions of the lib since they aren't provided (#14736) * [cudnn] Don't copy debug versions of the lib since they aren't provided * Bump port version * add VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES --- ports/cudnn/CONTROL | 2 +- ports/cudnn/portfile.cmake | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ports/cudnn/CONTROL b/ports/cudnn/CONTROL index 386b3fea7a48ae..3166890d3d22a7 100644 --- a/ports/cudnn/CONTROL +++ b/ports/cudnn/CONTROL @@ -1,6 +1,6 @@ Source: cudnn Version: 7.6 -Port-Version: 3 +Port-Version: 4 Description: NVIDIA's cuDNN deep neural network acceleration library Build-Depends: cuda Supports: (windows|linux)&x64 diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index 5902861c5e9eb5..768ef39aa8b24b 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -7,6 +7,7 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") endif() vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) # only release bits are provided #note: this port must be kept in sync with CUDA port: every time one is upgraded, the other must be too set(CUDNN_VERSION "7.6.0") @@ -87,16 +88,11 @@ else() file(INSTALL "${SOURCE_PATH}/Library/include/cudnn.h" DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(INSTALL "${SOURCE_PATH}/Library/lib/x64/cudnn.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(INSTALL "${SOURCE_PATH}/Library/bin/cudnn64_${CUDNN_VERSION_MAJOR}.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL "${SOURCE_PATH}/Library/lib/x64/cudnn.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(INSTALL "${SOURCE_PATH}/Library/bin/cudnn64_${CUDNN_VERSION_MAJOR}.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) elseif(VCPKG_TARGET_IS_LINUX) file(INSTALL "${SOURCE_PATH}/include/cudnn.h" DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION_MAJOR}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION_MAJOR}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) endif() file(INSTALL "${SOURCE_PATH}/info/LICENSE.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 9ee1d5c5b2026c57d12e1b64c73f519eb7a613ab Mon Sep 17 00:00:00 2001 From: General Jack O'Neill Date: Mon, 30 Nov 2020 18:58:22 -0500 Subject: [PATCH 0206/1694] [networkdirect-sdk] Rework portfile.cmake to allow windows x64 and x86, add fail for other triplet combinations, remove all triplets for CI fail list (#14688) * Fix x86 triplets conditional expression * Update CI baseline - remove triplet x86-windows * Change message to fail on arm, linux and osx message * Add UWP to fail message and remove networkdirect-sdk from CI * Fix vcpkg_fail_port_install function * Remove windows x64 and x86 check * Fix misspelled ON_TARGET and change Supports in CONTROL --- ports/networkdirect-sdk/CONTROL | 3 ++- ports/networkdirect-sdk/portfile.cmake | 10 ++-------- scripts/ci.baseline.txt | 6 ------ 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/ports/networkdirect-sdk/CONTROL b/ports/networkdirect-sdk/CONTROL index 158183800d5d31..4863ffae154e7f 100644 --- a/ports/networkdirect-sdk/CONTROL +++ b/ports/networkdirect-sdk/CONTROL @@ -1,5 +1,6 @@ Source: networkdirect-sdk Version: 2.0.1 +Port-Version: 1 Description: The Network Direct architecture allows hardware vendors to expose the advanced capabilities of their networking devices. Homepage: https://www.nuget.org/packages/NetworkDirect -Supports: windows&(x64|x86) \ No newline at end of file +Supports: windows & (x64|x86) & !uwp \ No newline at end of file diff --git a/ports/networkdirect-sdk/portfile.cmake b/ports/networkdirect-sdk/portfile.cmake index 666a31be4b405e..2b97eb8a1a0215 100644 --- a/ports/networkdirect-sdk/portfile.cmake +++ b/ports/networkdirect-sdk/portfile.cmake @@ -1,11 +1,5 @@ #only supports windows -if (VCPKG_CMAKE_SYSTEM_NAME) - message(FATAL_ERROR "networkDirect-sdk only supports windows") -endif() - -if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - message(FATAL_ERROR "networkDirect-sdk only supports x64 and x86") -endif() +vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "linux" "osx") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -37,4 +31,4 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") file(COPY ${SOURCE_PATH}/lib/Win32/ndutil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) endif() -file(COPY ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/networkdirect-sdk/COPYRIGHT) +file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 20c48681e77bcc..af82e2252eda91 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -981,12 +981,6 @@ nethost:x64-uwp=fail nethost:arm-uwp=fail nettle:x64-windows-static=skip nettle:x64-windows=skip -networkdirect-sdk:arm64-windows=fail -networkdirect-sdk:arm-uwp=fail -networkdirect-sdk:x64-linux=fail -networkdirect-sdk:x64-osx=fail -networkdirect-sdk:x64-uwp=fail -networkdirect-sdk:x86-windows=fail ngspice:x64-windows-static=fail nng:arm-uwp=fail nng:x64-uwp=fail From 87a38912e17f250ddb6bc4ca063c42ba0f34d1ce Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 2 Dec 2020 02:01:02 +0800 Subject: [PATCH 0207/1694] [gdal] Fix build errors on linux and osx (#14866) --- ports/gdal/CONTROL | 1 + ports/gdal/portfile.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 00177bc067e003..36944edce4a366 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,5 +1,6 @@ Source: gdal Version: 3.1.3 +Port-Version: 1 Homepage: https://gdal.org/ Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data. Build-Depends: proj4, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib, libgeotiff, cfitsio, json-c (!windows) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 8675d8ced675fa..c1fca47a81e6c0 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -186,6 +186,7 @@ else() set(CONF_OPTS --enable-shared=${BUILD_DYNAMIC} --enable-static=${BUILD_STATIC}) list(APPEND CONF_OPTS --with-proj=${CURRENT_INSTALLED_DIR} --with-libjson-c=${CURRENT_INSTALLED_DIR}) + list(APPEND CONF_OPTS --without-jasper) vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} From 6b8b88945281e816b4c0671d796c0813d81354f2 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Tue, 1 Dec 2020 12:00:00 -0800 Subject: [PATCH 0208/1694] [vcpkg] Expose alpha end-to-end versioning (#14852) * Check for the 'versions' feature flag while installing a manifest * Implement two-level fallback for Baselines: * First, fall back to current repo's baseline.json * Second, fall back to the ports in ports/ * Optimize checking out baseline.json via `git show` * Detect presence of '$x-default-baseline' in the manifest and use that as the baseline commit (to be replaced by Federation functionality) * If port_versions/x-/xyz.json is not found, fall back to ports in ports/ Co-authored-by: Robert Schumacher --- toolsrc/include/vcpkg/portfileprovider.h | 3 +- toolsrc/include/vcpkg/vcpkgpaths.h | 1 + toolsrc/src/vcpkg/install.cpp | 72 ++++++-- toolsrc/src/vcpkg/portfileprovider.cpp | 200 ++++++++++++++++------- toolsrc/src/vcpkg/vcpkgpaths.cpp | 42 +++-- 5 files changed, 233 insertions(+), 85 deletions(-) diff --git a/toolsrc/include/vcpkg/portfileprovider.h b/toolsrc/include/vcpkg/portfileprovider.h index 610ecb73507278..1ce934c9eabecf 100644 --- a/toolsrc/include/vcpkg/portfileprovider.h +++ b/toolsrc/include/vcpkg/portfileprovider.h @@ -73,7 +73,8 @@ namespace vcpkg::PortFileProvider struct BaselineProvider : IBaselineProvider, Util::ResourceBase { - explicit BaselineProvider(const vcpkg::VcpkgPaths& paths, const std::string& baseline); + explicit BaselineProvider(const vcpkg::VcpkgPaths& paths); + BaselineProvider(const vcpkg::VcpkgPaths& paths, const std::string& baseline); ~BaselineProvider(); Optional get_baseline_version(StringView port_name) const override; diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index c85eff0ca38025..257ecf7bbd5c51 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -118,6 +118,7 @@ namespace vcpkg // Git manipulation fs::path git_checkout_baseline(Files::Filesystem& filesystem, StringView commit_sha) const; fs::path git_checkout_port(Files::Filesystem& filesystem, StringView port_name, StringView git_tree) const; + ExpectedS git_show(const std::string& treeish, const fs::path& dot_git_dir) const; Optional get_manifest() const; Optional get_manifest_path() const; diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index 06b07fb4c42ebf..8a9fec96326415 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -835,25 +835,67 @@ namespace vcpkg::Install // remove "core" because resolve_deps_as_top_level uses default-inversion features.erase(core_it); } - auto specs = resolve_deps_as_top_level(manifest_scf, default_triplet, features, var_provider); - auto install_plan = Dependencies::create_feature_install_plan(provider, var_provider, specs, {}); - - for (InstallPlanAction& action : install_plan.install_actions) + if (args.versions_enabled()) { - action.build_options = install_plan_options; - action.build_options.use_head_version = Build::UseHeadVersion::NO; - action.build_options.editable = Build::Editable::NO; + PortFileProvider::VersionedPortfileProvider verprovider(paths); + auto baseprovider = [&]() -> PortFileProvider::BaselineProvider { + if (auto p_baseline = manifest_scf.core_paragraph->extra_info.get("$x-default-baseline")) + { + return PortFileProvider::BaselineProvider(paths, p_baseline->string().to_string()); + } + else + { + return PortFileProvider::BaselineProvider(paths); + } + }(); + + auto install_plan = + Dependencies::create_versioned_install_plan(verprovider, + baseprovider, + var_provider, + manifest_scf.core_paragraph->dependencies, + manifest_scf.core_paragraph->overrides, + {manifest_scf.core_paragraph->name, default_triplet}) + .value_or_exit(VCPKG_LINE_INFO); + + for (InstallPlanAction& action : install_plan.install_actions) + { + action.build_options = install_plan_options; + action.build_options.use_head_version = Build::UseHeadVersion::NO; + action.build_options.editable = Build::Editable::NO; + } + + Commands::SetInstalled::perform_and_exit_ex(args, + paths, + provider, + *binaryprovider, + var_provider, + std::move(install_plan), + dry_run ? Commands::DryRun::Yes : Commands::DryRun::No, + pkgsconfig); } + else + { + auto specs = resolve_deps_as_top_level(manifest_scf, default_triplet, features, var_provider); + auto install_plan = Dependencies::create_feature_install_plan(provider, var_provider, specs, {}); - Commands::SetInstalled::perform_and_exit_ex(args, - paths, - provider, - *binaryprovider, - var_provider, - std::move(install_plan), - dry_run ? Commands::DryRun::Yes : Commands::DryRun::No, - pkgsconfig); + for (InstallPlanAction& action : install_plan.install_actions) + { + action.build_options = install_plan_options; + action.build_options.use_head_version = Build::UseHeadVersion::NO; + action.build_options.editable = Build::Editable::NO; + } + + Commands::SetInstalled::perform_and_exit_ex(args, + paths, + provider, + *binaryprovider, + var_provider, + std::move(install_plan), + dry_run ? Commands::DryRun::Yes : Commands::DryRun::No, + pkgsconfig); + } } const std::vector specs = Util::fmap(args.command_arguments, [&](auto&& arg) { diff --git a/toolsrc/src/vcpkg/portfileprovider.cpp b/toolsrc/src/vcpkg/portfileprovider.cpp index 3f4640c979a034..f22464fbe41f96 100644 --- a/toolsrc/src/vcpkg/portfileprovider.cpp +++ b/toolsrc/src/vcpkg/portfileprovider.cpp @@ -1,5 +1,3 @@ - - #include #include @@ -19,22 +17,28 @@ using namespace Versions; namespace { - Optional get_versions_json_path(const VcpkgPaths& paths, StringView port_name) + ExpectedS get_versions_json_path(const VcpkgPaths& paths, StringView port_name) { - const auto port_versions_dir_path = paths.root / fs::u8path("port_versions"); - const auto subpath = Strings::concat(port_name.substr(0, 1), "-/", port_name, ".json"); - const auto json_path = port_versions_dir_path / subpath; + auto json_path = paths.root / fs::u8path("port_versions") / + fs::u8path(Strings::concat(port_name.substr(0, 1), "-")) / + fs::u8path(Strings::concat(port_name, ".json")); if (paths.get_filesystem().exists(json_path)) { - return json_path; + return std::move(json_path); } - return nullopt; + return {Strings::concat("Error: Versions database file does not exist: ", fs::u8string(json_path)), + expected_right_tag}; } - Optional get_baseline_json_path(const VcpkgPaths& paths, StringView baseline_commit_sha) + ExpectedS get_baseline_json_path(const VcpkgPaths& paths, StringView baseline_commit_sha) { - const auto baseline_json = paths.git_checkout_baseline(paths.get_filesystem(), baseline_commit_sha); - return paths.get_filesystem().exists(baseline_json) ? make_optional(baseline_json) : nullopt; + auto baseline_path = paths.git_checkout_baseline(paths.get_filesystem(), baseline_commit_sha); + if (paths.get_filesystem().exists(baseline_path)) + { + return std::move(baseline_path); + } + return {Strings::concat("Error: Baseline database file does not exist: ", fs::u8string(baseline_path)), + expected_right_tag}; } } @@ -292,34 +296,90 @@ namespace vcpkg::PortFileProvider { struct BaselineProviderImpl { + BaselineProviderImpl(const VcpkgPaths& paths) : paths(paths) { } BaselineProviderImpl(const VcpkgPaths& paths, const std::string& baseline) - : paths(paths), baseline(baseline) + : paths(paths), m_baseline(baseline) { } ~BaselineProviderImpl() { } - const std::map>& get_baseline_cache() const + const Optional>>& get_baseline_cache() const { - return baseline_cache.get_lazy([&]() -> auto { - auto maybe_baseline_file = get_baseline_json_path(paths, baseline); - Checks::check_exit(VCPKG_LINE_INFO, maybe_baseline_file.has_value(), "Couldn't find baseline.json"); - auto baseline_file = maybe_baseline_file.value_or_exit(VCPKG_LINE_INFO); - - auto maybe_baselines_map = parse_baseline_file(paths.get_filesystem(), "default", baseline_file); - Checks::check_exit(VCPKG_LINE_INFO, - maybe_baselines_map.has_value(), - "Error: Couldn't parse baseline `%s` from `%s`", - "default", - fs::u8string(baseline_file)); - auto baselines_map = *maybe_baselines_map.get(); - return std::move(baselines_map); + return baseline_cache.get_lazy([&]() -> Optional>> { + if (auto baseline = m_baseline.get()) + { + auto baseline_file = get_baseline_json_path(paths, *baseline).value_or_exit(VCPKG_LINE_INFO); + + auto maybe_baselines_map = + parse_baseline_file(paths.get_filesystem(), "default", baseline_file); + Checks::check_exit(VCPKG_LINE_INFO, + maybe_baselines_map.has_value(), + "Error: Couldn't parse baseline `%s` from `%s`", + "default", + fs::u8string(baseline_file)); + auto baselines_map = *maybe_baselines_map.get(); + return std::move(baselines_map); + } + else + { + // No baseline was provided, so use current repo + const auto& fs = paths.get_filesystem(); + auto baseline_file = paths.root / fs::u8path("port_versions") / fs::u8path("baseline.json"); + if (fs.exists(baseline_file)) + { + auto maybe_baselines_map = + parse_baseline_file(paths.get_filesystem(), "default", baseline_file); + Checks::check_exit(VCPKG_LINE_INFO, + maybe_baselines_map.has_value(), + "Error: Couldn't parse baseline `%s` from `%s`", + "default", + fs::u8string(baseline_file)); + auto baselines_map = *maybe_baselines_map.get(); + return std::move(baselines_map); + } + else + { + // No baseline file in current repo -- use current port versions. + m_portfile_provider = + std::make_unique(paths, std::vector{}); + return nullopt; + } + } }); } + Optional get_baseline_version(StringView port_name) const + { + const auto& cache = get_baseline_cache(); + if (auto p_cache = cache.get()) + { + auto it = p_cache->find(port_name.to_string()); + if (it != p_cache->end()) + { + return it->second; + } + return nullopt; + } + else + { + auto maybe_scfl = m_portfile_provider->get_control_file(port_name.to_string()); + if (auto p_scfl = maybe_scfl.get()) + { + auto cpgh = p_scfl->source_control_file->core_paragraph.get(); + return VersionT{cpgh->version, cpgh->port_version}; + } + else + { + return nullopt; + } + } + } + private: const VcpkgPaths& paths; - const std::string baseline; - Lazy>> baseline_cache; + const Optional m_baseline; + Lazy>>> baseline_cache; + mutable std::unique_ptr m_portfile_provider; }; struct VersionedPortfileProviderImpl @@ -354,47 +414,70 @@ namespace vcpkg::PortFileProvider } auto maybe_versions_file_path = get_versions_json_path(m_impl->get_paths(), port_name); - Checks::check_exit(VCPKG_LINE_INFO, - maybe_versions_file_path.has_value(), - "Error: Couldn't find a versions database file: %s.json.", - port_name); - auto versions_file_path = maybe_versions_file_path.value_or_exit(VCPKG_LINE_INFO); - - auto maybe_version_entries = parse_versions_file(m_impl->get_filesystem(), port_name, versions_file_path); - Checks::check_exit(VCPKG_LINE_INFO, - maybe_version_entries.has_value(), - "Error: Couldn't parse versions from file: %s", - fs::u8string(versions_file_path)); - auto version_entries = maybe_version_entries.value_or_exit(VCPKG_LINE_INFO); - - auto port = port_name.to_string(); - for (auto&& version_entry : version_entries) + if (auto versions_file_path = maybe_versions_file_path.get()) + { + auto maybe_version_entries = parse_versions_file(m_impl->get_filesystem(), port_name, *versions_file_path); + Checks::check_exit(VCPKG_LINE_INFO, + maybe_version_entries.has_value(), + "Error: Couldn't parse versions from file: %s", + fs::u8string(*versions_file_path)); + auto version_entries = maybe_version_entries.value_or_exit(VCPKG_LINE_INFO); + + auto port = port_name.to_string(); + for (auto&& version_entry : version_entries) + { + VersionSpec spec(port, version_entry.version); + m_impl->versions_cache[port].push_back(spec); + m_impl->git_tree_cache.emplace(std::move(spec), std::move(version_entry.git_tree)); + } + return m_impl->versions_cache.at(port); + } + else { - VersionSpec spec(port, version_entry.version); - m_impl->versions_cache[port].push_back(spec); - m_impl->git_tree_cache.emplace(std::move(spec), std::move(version_entry.git_tree)); + // Fall back to current available version + const auto& paths = m_impl->get_paths(); + auto maybe_port = try_load_registry_port(paths, port_name.to_string()); + if (auto p = maybe_port.get()) + { + auto maybe_error = + p->source_control_file->check_against_feature_flags(p->source_location, paths.get_feature_flags()); + + if (auto error = maybe_error.get()) + { + Checks::exit_with_message(VCPKG_LINE_INFO, "Error: %s", *error); + } + + VersionSpec vspec(port_name.to_string(), + VersionT(p->source_control_file->core_paragraph->version, + p->source_control_file->core_paragraph->port_version)); + m_impl->control_cache.emplace(vspec, std::move(*p)); + return m_impl->versions_cache.emplace(port_name.to_string(), std::vector{vspec}) + .first->second; + } + Checks::exit_with_message(VCPKG_LINE_INFO, "Error: Could not find a definition for port %s", port_name); } - return m_impl->versions_cache.at(port); } ExpectedS VersionedPortfileProvider::get_control_file( const VersionSpec& version_spec) const { + // Pre-populate versions cache. + get_port_versions(version_spec.port_name); + auto cache_it = m_impl->control_cache.find(version_spec); if (cache_it != m_impl->control_cache.end()) { return cache_it->second; } - // Pre-populate versions cache. - get_port_versions(version_spec.port_name); - auto git_tree_cache_it = m_impl->git_tree_cache.find(version_spec); if (git_tree_cache_it == m_impl->git_tree_cache.end()) { - return Strings::concat("No git object SHA for entry %s at version %s.", + return Strings::concat("Error: No git object SHA for entry ", version_spec.port_name, - version_spec.version.to_string()); + " at version ", + version_spec.version, + "."); } const std::string git_tree = git_tree_cache_it->second; @@ -421,6 +504,11 @@ namespace vcpkg::PortFileProvider "Error: Failed to load port %s from %s", version_spec.port_name, fs::u8string(port_directory)); } + BaselineProvider::BaselineProvider(const VcpkgPaths& paths) + : m_impl(std::make_unique(paths)) + { + } + BaselineProvider::BaselineProvider(const VcpkgPaths& paths, const std::string& baseline) : m_impl(std::make_unique(paths, baseline)) { @@ -429,12 +517,6 @@ namespace vcpkg::PortFileProvider Optional BaselineProvider::get_baseline_version(StringView port_name) const { - const auto& cache = m_impl->get_baseline_cache(); - auto it = cache.find(port_name.to_string()); - if (it != cache.end()) - { - return it->second; - } - return nullopt; + return m_impl->get_baseline_version(port_name); } } diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 5b33b8db44e47b..869605ed57a2d9 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -539,6 +539,24 @@ If you wish to silence this error and use classic mode, you can: } } + ExpectedS VcpkgPaths::git_show(const std::string& treeish, const fs::path& dot_git_dir) const + { + // All git commands are run with: --git-dir={dot_git_dir} --work-tree={work_tree_temp} + // git clone --no-checkout --local {vcpkg_root} {dot_git_dir} + System::CmdLineBuilder showcmd = + git_cmd_builder(*this, dot_git_dir, dot_git_dir).string_arg("show").string_arg(treeish); + + auto output = System::cmd_execute_and_capture_output(showcmd.extract()); + if (output.exit_code == 0) + { + return {std::move(output.output), expected_left_tag}; + } + else + { + return {std::move(output.output), expected_right_tag}; + } + } + void VcpkgPaths::git_checkout_object(const VcpkgPaths& paths, StringView git_object, const fs::path& local_repo, @@ -611,19 +629,23 @@ If you wish to silence this error and use classic mode, you can: fs::path VcpkgPaths::git_checkout_baseline(Files::Filesystem& fs, StringView commit_sha) const { - const fs::path local_repo = this->root; - const fs::path destination = this->baselines_output / fs::u8path(commit_sha) / fs::u8path("baseline.json"); - const fs::path baseline_subpath = fs::u8path("port_versions") / fs::u8path("baseline.json"); + const fs::path destination_parent = this->baselines_output / fs::u8path(commit_sha); + const fs::path destination = destination_parent / fs::u8path("baseline.json"); if (!fs.exists(destination)) { - git_checkout_subpath(*this, - commit_sha, - baseline_subpath, - local_repo, - destination, - this->baselines_dot_git_dir, - this->baselines_work_tree); + auto treeish = Strings::concat(commit_sha, ":port_versions/baseline.json"); + auto maybe_contents = git_show(treeish, this->root / fs::u8path(".git")); + if (auto contents = maybe_contents.get()) + { + fs.create_directories(destination_parent, VCPKG_LINE_INFO); + fs.write_contents(destination, *contents, VCPKG_LINE_INFO); + } + else + { + Checks::exit_with_message( + VCPKG_LINE_INFO, "Error: while checking out baseline '%s':\n%s", treeish, maybe_contents.error()); + } } return destination; } From 5cc86c9977b4ef5b2283d6db369ee55828a7c905 Mon Sep 17 00:00:00 2001 From: chausner Date: Tue, 1 Dec 2020 21:34:21 +0100 Subject: [PATCH 0209/1694] [rtaudio] Add new port (#14774) * Add rtaudio 5.1.0 * Convert CONTROL to manifest format * [rtaudio] Mark UWP as unsupported * Add rtaudio:x64-linux=fail to ci.baseline.txt --- ports/rtaudio/LICENSE | 26 ++++++++++++++++++++++++++ ports/rtaudio/portfile.cmake | 27 +++++++++++++++++++++++++++ ports/rtaudio/vcpkg.json | 7 +++++++ scripts/ci.baseline.txt | 1 + 4 files changed, 61 insertions(+) create mode 100644 ports/rtaudio/LICENSE create mode 100644 ports/rtaudio/portfile.cmake create mode 100644 ports/rtaudio/vcpkg.json diff --git a/ports/rtaudio/LICENSE b/ports/rtaudio/LICENSE new file mode 100644 index 00000000000000..4a6357c2b02c80 --- /dev/null +++ b/ports/rtaudio/LICENSE @@ -0,0 +1,26 @@ +RtAudio: a set of realtime audio i/o C++ classes +Copyright (c) 2001-2019 Gary P. Scavone + +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. + +Any person wishing to distribute modifications to the Software is +asked to send the modifications to the original developer so that +they can be incorporated into the canonical version. This is, +however, not a binding provision of this license. + +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/rtaudio/portfile.cmake b/ports/rtaudio/portfile.cmake new file mode 100644 index 00000000000000..68f2ccd65e6779 --- /dev/null +++ b/ports/rtaudio/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_fail_port_install(ON_TARGET "UWP") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO thestk/rtaudio + REF 5.1.0 + SHA512 338a3a14cd4ea665ac7e94a275cb017bffd87cb10eb8ab6784fad320345ee828b8874439edd08c39efa48736edf9aa0622620784adc320473b03a8f81e17fff6 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +# Version 5.1.0 has the license text embedded in the README.md, so we are including it as a standalone file in the vcpkg port +# Current master version of rtaudio has a LICENSE file which should be used instead for ports of future releases +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/ports/rtaudio/vcpkg.json b/ports/rtaudio/vcpkg.json new file mode 100644 index 00000000000000..0d786b05ea01e8 --- /dev/null +++ b/ports/rtaudio/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "rtaudio", + "version-string": "5.1.0", + "description": "A set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound, ASIO and WASAPI) operating systems.", + "homepage": "https://github.com/thestk/rtaudio", + "supports": "!uwp" +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index af82e2252eda91..e14adc596995e1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1326,6 +1326,7 @@ rpclib:arm-uwp=fail rpclib:x64-uwp=fail rsocket:x64-windows=fail rsocket:x64-windows-static=fail +rtaudio:x64-linux=fail rtlsdr:x64-uwp=fail rtlsdr:arm64-windows=fail rtlsdr:arm-uwp=fail From 172525b4cb19e3c2c7c2bded43552092ef895849 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 2 Dec 2020 05:11:19 +0800 Subject: [PATCH 0210/1694] [vcpkg] Remove non-existing 'import' command in vcpkg help information (#14791) * [vcpkg] Remove non-existing 'import' command in vcpkg help information * Remove 'import' in commands.autocomplete.cpp --- toolsrc/src/vcpkg/commands.autocomplete.cpp | 1 - toolsrc/src/vcpkg/vcpkgcmdarguments.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/toolsrc/src/vcpkg/commands.autocomplete.cpp b/toolsrc/src/vcpkg/commands.autocomplete.cpp index 7e9039dcb65910..d61e9119e68e3f 100644 --- a/toolsrc/src/vcpkg/commands.autocomplete.cpp +++ b/toolsrc/src/vcpkg/commands.autocomplete.cpp @@ -76,7 +76,6 @@ namespace vcpkg::Commands::Autocomplete "ci", "depend-info", "env", - "import", "portsdiff", }; diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp index a7e4c975b32b6c..c311d28e941e35 100644 --- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp +++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp @@ -561,7 +561,6 @@ namespace vcpkg table.format("vcpkg export ... [opt]...", "Exports a package"); table.format("vcpkg edit ", "Open up a port for editing (uses " + format_environment_variable("EDITOR") + ", default 'code')"); - table.format("vcpkg import ", "Import a pre-built library"); table.format("vcpkg create [archivename]", "Create a new package"); table.format("vcpkg owns ", "Search for files in installed packages"); table.format("vcpkg depend-info ...", "Display a list of dependencies for packages"); From 9eb8e5112f587c4e6c8f323cc514fc0a4f49bb44 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Tue, 1 Dec 2020 13:18:42 -0800 Subject: [PATCH 0211/1694] [vcpkg] Output versions during install plans (#14882) * [vcpkg] Output versions during install plans * [vcpkg] Display versions for already-installed packages Co-authored-by: Robert Schumacher --- toolsrc/include/vcpkg/sourceparagraph.h | 6 +++ toolsrc/src/vcpkg/dependencies.cpp | 68 +++++++++++++------------ 2 files changed, 42 insertions(+), 32 deletions(-) diff --git a/toolsrc/include/vcpkg/sourceparagraph.h b/toolsrc/include/vcpkg/sourceparagraph.h index 2152e02370801c..ee07826bba2842 100644 --- a/toolsrc/include/vcpkg/sourceparagraph.h +++ b/toolsrc/include/vcpkg/sourceparagraph.h @@ -74,6 +74,8 @@ namespace vcpkg Json::Object extra_info; + VersionT to_versiont() const { return VersionT{version, port_version}; } + friend bool operator==(const SourceParagraph& lhs, const SourceParagraph& rhs); friend bool operator!=(const SourceParagraph& lhs, const SourceParagraph& rhs) { return !(lhs == rhs); } }; @@ -104,6 +106,8 @@ namespace vcpkg Optional check_against_feature_flags(const fs::path& origin, const FeatureFlagSettings& flags) const; + VersionT to_versiont() const { return core_paragraph->to_versiont(); } + friend bool operator==(const SourceControlFile& lhs, const SourceControlFile& rhs); friend bool operator!=(const SourceControlFile& lhs, const SourceControlFile& rhs) { return !(lhs == rhs); } }; @@ -132,6 +136,8 @@ namespace vcpkg return {std::make_unique(source_control_file->clone()), source_location}; } + VersionT to_versiont() const { return source_control_file->to_versiont(); } + std::unique_ptr source_control_file; fs::path source_location; }; diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index 117a05209e47e3..7d69becdf5b31e 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -311,47 +311,52 @@ namespace vcpkg::Dependencies static std::string to_output_string(RequestType request_type, const CStringView s, const Build::BuildPackageOptions& options, - const fs::path& install_port_path, + const SourceControlFileLocation* scfl, + const InstalledPackageView* ipv, const fs::path& builtin_ports_dir) { - if (!builtin_ports_dir.empty() && !Strings::case_insensitive_ascii_starts_with(fs::u8string(install_port_path), - fs::u8string(builtin_ports_dir))) + std::string ret; + switch (request_type) + { + case RequestType::AUTO_SELECTED: Strings::append(ret, " * "); break; + case RequestType::USER_REQUESTED: Strings::append(ret, " "); break; + default: Checks::unreachable(VCPKG_LINE_INFO); + } + Strings::append(ret, s); + if (scfl) + { + Strings::append(ret, " -> ", scfl->to_versiont()); + } + else if (ipv) { - const char* const from_head = options.use_head_version == Build::UseHeadVersion::YES ? " (from HEAD)" : ""; - switch (request_type) + Strings::append(ret, " -> ", VersionT{ipv->core->package.version, ipv->core->package.port_version}); + } + if (options.use_head_version == Build::UseHeadVersion::YES) + { + Strings::append(ret, " (+HEAD)"); + } + if (scfl) + { + const auto s_install_port_path = fs::u8string(scfl->source_location); + if (!builtin_ports_dir.empty() && + !Strings::case_insensitive_ascii_starts_with(s_install_port_path, fs::u8string(builtin_ports_dir))) { - case RequestType::AUTO_SELECTED: - return Strings::format(" * %s%s -- %s", s, from_head, fs::u8string(install_port_path)); - case RequestType::USER_REQUESTED: - return Strings::format(" %s%s -- %s", s, from_head, fs::u8string(install_port_path)); - default: Checks::unreachable(VCPKG_LINE_INFO); + Strings::append(ret, " -- ", s_install_port_path); } } - return to_output_string(request_type, s, options); + return ret; } std::string to_output_string(RequestType request_type, const CStringView s, const Build::BuildPackageOptions& options) { - const char* const from_head = options.use_head_version == Build::UseHeadVersion::YES ? " (from HEAD)" : ""; - - switch (request_type) - { - case RequestType::AUTO_SELECTED: return Strings::format(" * %s%s", s, from_head); - case RequestType::USER_REQUESTED: return Strings::format(" %s%s", s, from_head); - default: Checks::unreachable(VCPKG_LINE_INFO); - } + return to_output_string(request_type, s, options, {}, {}, {}); } std::string to_output_string(RequestType request_type, const CStringView s) { - switch (request_type) - { - case RequestType::AUTO_SELECTED: return Strings::format(" * %s", s); - case RequestType::USER_REQUESTED: return Strings::format(" %s", s); - default: Checks::unreachable(VCPKG_LINE_INFO); - } + return to_output_string(request_type, s, {Build::UseHeadVersion::NO}, {}, {}, {}); } InstallPlanAction::InstallPlanAction() noexcept @@ -1096,13 +1101,12 @@ namespace vcpkg::Dependencies static auto actions_to_output_string = [&](const std::vector& v) { return Strings::join("\n", v, [&](const InstallPlanAction* p) { - if (auto* pscfl = p->source_control_file_location.get()) - { - return to_output_string( - p->request_type, p->displayname(), p->build_options, pscfl->source_location, builtin_ports_dir); - } - - return to_output_string(p->request_type, p->displayname(), p->build_options); + return to_output_string(p->request_type, + p->displayname(), + p->build_options, + p->source_control_file_location.get(), + p->installed_package.get(), + builtin_ports_dir); }); }; From e7a8261f54a4cedb9ff7849f018d776abc44e3b6 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Tue, 1 Dec 2020 13:37:26 -0800 Subject: [PATCH 0212/1694] [vcpkg docs] Check for documentation generation in CI (#14614) * [vcpkg docs] Change how documenting port functions works Instead of using `##`, use comment blocks for documentation. Also, add some minor docs and change RST -> MD so we actually get docs generated. * add CI stuff * regenerate docs * fix vcpkg_find_acquire_program to not use _execute_process --- docs/maintainers/execute_process.md | 1 - docs/maintainers/portfile-functions.md | 9 +- docs/maintainers/vcpkg_add_to_path.md | 1 - docs/maintainers/vcpkg_build_make.md | 4 +- docs/maintainers/vcpkg_build_nmake.md | 2 +- docs/maintainers/vcpkg_build_qmake.md | 10 + .../vcpkg_buildpath_length_warning.md | 11 + docs/maintainers/vcpkg_check_features.md | 1 - docs/maintainers/vcpkg_check_linkage.md | 2 +- docs/maintainers/vcpkg_common_definitions.md | 1 - docs/maintainers/vcpkg_configure_qmake.md | 21 + .../vcpkg_execute_in_download_mode.md | 31 +- .../vcpkg_execute_required_process_repeat.md | 16 + .../vcpkg_extract_source_archive.md | 2 +- .../maintainers/vcpkg_find_acquire_program.md | 46 +- docs/maintainers/vcpkg_find_fortran.md | 3 +- docs/maintainers/vcpkg_fixup_cmake_targets.md | 5 + docs/maintainers/vcpkg_fixup_pkgconfig.md | 2 +- docs/maintainers/vcpkg_from_gitlab.md | 1 - ...cpkg_get_program_files_platform_bitness.md | 13 + docs/maintainers/vcpkg_get_windows_sdk.md | 11 + docs/maintainers/vcpkg_replace_string.md | 11 + docs/regenerate.ps1 | 82 +- scripts/azure-pipelines/azure-pipelines.yml | 16 + .../Check-CMakeFunctionDocumentation.ps1 | 30 + scripts/cmake/execute_process.cmake | 20 +- scripts/cmake/vcpkg_acquire_msys.cmake | 1008 +++++++++-------- scripts/cmake/vcpkg_add_to_path.cmake | 49 +- scripts/cmake/vcpkg_apply_patches.cmake | 64 +- scripts/cmake/vcpkg_build_cmake.cmake | 65 +- scripts/cmake/vcpkg_build_gn.cmake | 32 +- scripts/cmake/vcpkg_build_make.cmake | 97 +- scripts/cmake/vcpkg_build_msbuild.cmake | 126 ++- scripts/cmake/vcpkg_build_ninja.cmake | 32 +- scripts/cmake/vcpkg_build_nmake.cmake | 149 +-- scripts/cmake/vcpkg_build_qmake.cmake | 18 +- .../vcpkg_buildpath_length_warning.cmake | 13 +- scripts/cmake/vcpkg_check_features.cmake | 292 ++--- scripts/cmake/vcpkg_check_linkage.cmake | 65 +- .../vcpkg_clean_executables_in_bin.cmake | 43 +- scripts/cmake/vcpkg_clean_msbuild.cmake | 26 +- scripts/cmake/vcpkg_common_definitions.cmake | 53 +- scripts/cmake/vcpkg_common_functions.cmake | 2 + scripts/cmake/vcpkg_configure_cmake.cmake | 133 +-- scripts/cmake/vcpkg_configure_gn.cmake | 58 +- scripts/cmake/vcpkg_configure_make.cmake | 181 +-- scripts/cmake/vcpkg_configure_meson.cmake | 74 +- scripts/cmake/vcpkg_configure_qmake.cmake | 38 +- scripts/cmake/vcpkg_copy_pdbs.cmake | 49 +- .../cmake/vcpkg_copy_tool_dependencies.cmake | 39 +- scripts/cmake/vcpkg_copy_tools.cmake | 57 +- scripts/cmake/vcpkg_download_distfile.cmake | 104 +- .../cmake/vcpkg_execute_build_process.cmake | 69 +- .../vcpkg_execute_in_download_mode.cmake | 120 +- .../vcpkg_execute_required_process.cmake | 94 +- ...cpkg_execute_required_process_repeat.cmake | 17 +- .../cmake/vcpkg_extract_source_archive.cmake | 61 +- .../vcpkg_extract_source_archive_ex.cmake | 109 +- scripts/cmake/vcpkg_fail_port_install.cmake | 79 +- .../cmake/vcpkg_find_acquire_program.cmake | 96 +- scripts/cmake/vcpkg_find_fortran.cmake | 23 +- scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 101 +- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 90 +- scripts/cmake/vcpkg_from_bitbucket.cmake | 115 +- scripts/cmake/vcpkg_from_git.cmake | 76 +- scripts/cmake/vcpkg_from_github.cmake | 143 +-- scripts/cmake/vcpkg_from_gitlab.cmake | 127 +-- scripts/cmake/vcpkg_from_sourceforge.cmake | 132 +-- ...g_get_program_files_platform_bitness.cmake | 15 +- scripts/cmake/vcpkg_get_windows_sdk.cmake | 14 +- scripts/cmake/vcpkg_install_cmake.cmake | 47 +- scripts/cmake/vcpkg_install_gn.cmake | 44 +- scripts/cmake/vcpkg_install_make.cmake | 44 +- scripts/cmake/vcpkg_install_meson.cmake | 29 +- scripts/cmake/vcpkg_install_msbuild.cmake | 182 +-- scripts/cmake/vcpkg_install_nmake.cmake | 128 +-- scripts/cmake/vcpkg_install_qmake.cmake | 44 +- ...nal_escape_regex_control_characters.cmake} | 2 +- .../cmake/vcpkg_internal_get_cmake_vars.cmake | 54 +- scripts/cmake/vcpkg_prettify_command.cmake | 30 +- scripts/cmake/vcpkg_replace_string.cmake | 20 +- scripts/cmake/vcpkg_test_cmake.cmake | 1 + test.cmake | 9 - 83 files changed, 2850 insertions(+), 2484 deletions(-) create mode 100644 docs/maintainers/vcpkg_build_qmake.md create mode 100644 docs/maintainers/vcpkg_buildpath_length_warning.md create mode 100644 docs/maintainers/vcpkg_configure_qmake.md create mode 100644 docs/maintainers/vcpkg_execute_required_process_repeat.md create mode 100644 docs/maintainers/vcpkg_get_program_files_platform_bitness.md create mode 100644 docs/maintainers/vcpkg_get_windows_sdk.md create mode 100644 docs/maintainers/vcpkg_replace_string.md create mode 100644 scripts/azure-pipelines/windows/Check-CMakeFunctionDocumentation.ps1 rename scripts/cmake/{vcpkg_escape_regex_control_characters.cmake => vcpkg_internal_escape_regex_control_characters.cmake} (64%) delete mode 100644 test.cmake diff --git a/docs/maintainers/execute_process.md b/docs/maintainers/execute_process.md index bafb1e57ccb936..b7d57110c29c1d 100644 --- a/docs/maintainers/execute_process.md +++ b/docs/maintainers/execute_process.md @@ -5,6 +5,5 @@ is enabled. In order to execute a process in Download Mode call `vcpkg_execute_in_download_mode()` instead. - ## Source [scripts/cmake/execute_process.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/execute_process.cmake) diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index 943afa6e752f3f..56e42bbd80887f 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -1,4 +1,4 @@ - + # Portfile helper functions - [execute\_process](execute_process.md) @@ -11,6 +11,8 @@ - [vcpkg\_build\_msbuild](vcpkg_build_msbuild.md) - [vcpkg\_build\_ninja](vcpkg_build_ninja.md) - [vcpkg\_build\_nmake](vcpkg_build_nmake.md) +- [vcpkg\_build\_qmake](vcpkg_build_qmake.md) +- [vcpkg\_buildpath\_length\_warning](vcpkg_buildpath_length_warning.md) - [vcpkg\_check\_features](vcpkg_check_features.md) - [vcpkg\_check\_linkage](vcpkg_check_linkage.md) - [vcpkg\_clean\_executables\_in\_bin](vcpkg_clean_executables_in_bin.md) @@ -20,6 +22,7 @@ - [vcpkg\_configure\_gn](vcpkg_configure_gn.md) - [vcpkg\_configure\_make](vcpkg_configure_make.md) - [vcpkg\_configure\_meson](vcpkg_configure_meson.md) +- [vcpkg\_configure\_qmake](vcpkg_configure_qmake.md) - [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md) - [vcpkg\_copy\_tool\_dependencies](vcpkg_copy_tool_dependencies.md) - [vcpkg\_copy\_tools](vcpkg_copy_tools.md) @@ -27,6 +30,7 @@ - [vcpkg\_execute\_build\_process](vcpkg_execute_build_process.md) - [vcpkg\_execute\_in\_download\_mode](vcpkg_execute_in_download_mode.md) - [vcpkg\_execute\_required\_process](vcpkg_execute_required_process.md) +- [vcpkg\_execute\_required\_process\_repeat](vcpkg_execute_required_process_repeat.md) - [vcpkg\_extract\_source\_archive](vcpkg_extract_source_archive.md) - [vcpkg\_extract\_source\_archive\_ex](vcpkg_extract_source_archive_ex.md) - [vcpkg\_fail\_port\_install](vcpkg_fail_port_install.md) @@ -39,6 +43,8 @@ - [vcpkg\_from\_github](vcpkg_from_github.md) - [vcpkg\_from\_gitlab](vcpkg_from_gitlab.md) - [vcpkg\_from\_sourceforge](vcpkg_from_sourceforge.md) +- [vcpkg\_get\_program\_files\_platform\_bitness](vcpkg_get_program_files_platform_bitness.md) +- [vcpkg\_get\_windows\_sdk](vcpkg_get_windows_sdk.md) - [vcpkg\_install\_cmake](vcpkg_install_cmake.md) - [vcpkg\_install\_gn](vcpkg_install_gn.md) - [vcpkg\_install\_make](vcpkg_install_make.md) @@ -48,3 +54,4 @@ - [vcpkg\_install\_qmake](vcpkg_install_qmake.md) - [vcpkg\_internal\_get\_cmake\_vars](vcpkg_internal_get_cmake_vars.md) - [vcpkg\_prettify\_command](vcpkg_prettify_command.md) +- [vcpkg\_replace\_string](vcpkg_replace_string.md) diff --git a/docs/maintainers/vcpkg_add_to_path.md b/docs/maintainers/vcpkg_add_to_path.md index b47d86cef84399..0c8986276ee322 100644 --- a/docs/maintainers/vcpkg_add_to_path.md +++ b/docs/maintainers/vcpkg_add_to_path.md @@ -21,6 +21,5 @@ The default is to append. * [folly](https://github.com/Microsoft/vcpkg/blob/master/ports/folly/portfile.cmake#L15) * [z3](https://github.com/Microsoft/vcpkg/blob/master/ports/z3/portfile.cmake#L13) - ## Source [scripts/cmake/vcpkg_add_to_path.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_add_to_path.cmake) diff --git a/docs/maintainers/vcpkg_build_make.md b/docs/maintainers/vcpkg_build_make.md index de44a84d4a2ef7..5c7037b68f5168 100644 --- a/docs/maintainers/vcpkg_build_make.md +++ b/docs/maintainers/vcpkg_build_make.md @@ -6,7 +6,7 @@ Build a linux makefile project. ```cmake vcpkg_build_make([BUILD_TARGET ] [ADD_BIN_TO_PATH] - [ENABLE_INSTALL]) + [ENABLE_INSTALL] [MAKEFILE ] [LOGFILE_ROOT ]) ``` @@ -36,7 +36,7 @@ Additional subdir to invoke make in. Useful if only parts of a port should be bu ## Notes: This command should be preceeded by a call to [`vcpkg_configure_make()`](vcpkg_configure_make.md). -You can use the alias [`vcpkg_install_make()`](vcpkg_configure_make.md) function if your CMake script supports the +You can use the alias [`vcpkg_install_make()`](vcpkg_install_make.md) function if your CMake script supports the "install" target ## Examples diff --git a/docs/maintainers/vcpkg_build_nmake.md b/docs/maintainers/vcpkg_build_nmake.md index 1daa0717f14093..337269eeb8a027 100644 --- a/docs/maintainers/vcpkg_build_nmake.md +++ b/docs/maintainers/vcpkg_build_nmake.md @@ -64,7 +64,7 @@ Adds the appropriate Release and Debug `bin\` directories to the path during the ## Notes: This command should be preceeded by a call to [`vcpkg_configure_nmake()`](vcpkg_configure_nmake.md). -You can use the alias [`vcpkg_install_nmake()`](vcpkg_configure_nmake.md) function if your CMake script supports the +You can use the alias [`vcpkg_install_nmake()`](vcpkg_install_nmake.md) function if your CMake script supports the "install" target ## Examples diff --git a/docs/maintainers/vcpkg_build_qmake.md b/docs/maintainers/vcpkg_build_qmake.md new file mode 100644 index 00000000000000..2dab94176d8c9b --- /dev/null +++ b/docs/maintainers/vcpkg_build_qmake.md @@ -0,0 +1,10 @@ +# vcpkg_build_qmake + +Build a qmake-based project, previously configured using vcpkg_configure_qmake. + +```cmake +vcpkg_build_qmake() +``` + +## Source +[scripts/cmake/vcpkg_build_qmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_build_qmake.cmake) diff --git a/docs/maintainers/vcpkg_buildpath_length_warning.md b/docs/maintainers/vcpkg_buildpath_length_warning.md new file mode 100644 index 00000000000000..d766afc9d858ca --- /dev/null +++ b/docs/maintainers/vcpkg_buildpath_length_warning.md @@ -0,0 +1,11 @@ +# vcpkg_buildpath_length_warning + +Warns the user if their vcpkg installation path might be too long for the package they're installing. + +## Usage +```cmake +vcpkg_buildpath_length_warning(13) +``` + +## Source +[scripts/cmake/vcpkg_buildpath_length_warning.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_buildpath_length_warning.cmake) diff --git a/docs/maintainers/vcpkg_check_features.md b/docs/maintainers/vcpkg_check_features.md index cec01dde2ea715..fcf313bfdc6b0b 100644 --- a/docs/maintainers/vcpkg_check_features.md +++ b/docs/maintainers/vcpkg_check_features.md @@ -143,6 +143,5 @@ vcpkg_configure_cmake( * [pcl](https://github.com/microsoft/vcpkg/blob/master/ports/pcl/portfile.cmake) * [rocksdb](https://github.com/microsoft/vcpkg/blob/master/ports/rocksdb/portfile.cmake) - ## Source [scripts/cmake/vcpkg_check_features.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_features.cmake) diff --git a/docs/maintainers/vcpkg_check_linkage.md b/docs/maintainers/vcpkg_check_linkage.md index 406325dba08f84..f9c149b683fc30 100644 --- a/docs/maintainers/vcpkg_check_linkage.md +++ b/docs/maintainers/vcpkg_check_linkage.md @@ -28,7 +28,7 @@ This command will either alter the settings for `VCPKG_LIBRARY_LINKAGE` or fail, ## Examples -* [libimobiledevice](https://github.com/Microsoft/vcpkg/blob/master/ports/libimobiledevice/portfile.cmake) +* [abseil](https://github.com/Microsoft/vcpkg/blob/master/ports/abseil/portfile.cmake) ## Source [scripts/cmake/vcpkg_check_linkage.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_linkage.cmake) diff --git a/docs/maintainers/vcpkg_common_definitions.md b/docs/maintainers/vcpkg_common_definitions.md index 9bbc64b1ef4deb..10e765f1e8c014 100644 --- a/docs/maintainers/vcpkg_common_definitions.md +++ b/docs/maintainers/vcpkg_common_definitions.md @@ -24,6 +24,5 @@ CMAKE_STATIC_LIBRARY_(PREFIX|SUFFIX), CMAKE_SHARED_LIBRARY_(PREFIX|SUFFIX) and C Furthermore the variables CMAKE_FIND_LIBRARY_(PREFIXES|SUFFIXES) are also defined for the target so that portfiles are able to use find_library calls to discover dependent libraries within the current triplet for ports. - ## Source [scripts/cmake/vcpkg_common_definitions.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_common_definitions.cmake) diff --git a/docs/maintainers/vcpkg_configure_qmake.md b/docs/maintainers/vcpkg_configure_qmake.md new file mode 100644 index 00000000000000..5117600dfbf96f --- /dev/null +++ b/docs/maintainers/vcpkg_configure_qmake.md @@ -0,0 +1,21 @@ +# vcpkg_configure_qmake + +Configure a qmake-based project. + +```cmake +vcpkg_configure_qmake( + SOURCE_PATH + [OPTIONS arg1 [arg2 ...]] + [OPTIONS_RELEASE arg1 [arg2 ...]] + [OPTIONS_DEBUG arg1 [arg2 ...]] +) +``` + +### SOURCE_PATH +The path to the *.pro qmake project file. + +### OPTIONS, OPTIONS\_RELEASE, OPTIONS\_DEBUG +The options passed to qmake. + +## Source +[scripts/cmake/vcpkg_configure_qmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_qmake.cmake) diff --git a/docs/maintainers/vcpkg_execute_in_download_mode.md b/docs/maintainers/vcpkg_execute_in_download_mode.md index 0a7f8a8f745d4f..51fa4642081ccf 100644 --- a/docs/maintainers/vcpkg_execute_in_download_mode.md +++ b/docs/maintainers/vcpkg_execute_in_download_mode.md @@ -5,25 +5,30 @@ Execute a process even in download mode. ## Usage ```cmake vcpkg_execute_in_download_mode( - COMMAND [...] - OUTPUT_QUIET ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY - TIMEOUT - RESULT_VARIABLE - OUTPUT_VARIABLE - ERROR_VARIABLE - INPUT_FILE - OUTPUT_FILE - ERROR_FILE - ENCODING + COMMAND [] + [WORKING_DIRECTORY ] + [TIMEOUT ] + [RESULT_VARIABLE ] + [OUTPUT_VARIABLE ] + [ERROR_VARIABLE ] + [INPUT_FILE ] + [OUTPUT_FILE ] + [ERROR_FILE ] + [OUTPUT_QUIET] + [ERROR_QUIET] + [OUTPUT_STRIP_TRAILING_WHITESPACE] + [ERROR_STRIP_TRAILING_WHITESPACE] + [ENCODING ] ) ``` -The signature of this function is identical with `execute_process()` except that +The signature of this function is identical to `execute_process()` except that it only accepts one COMMAND argument, i.e., does not support chaining multiple commands with pipes. -See `execute_process()` for a detailed description of the parameters. +See [`execute_process()`] for a detailed description of the parameters. + +[`execute_process()`]: https://cmake.org/cmake/help/latest/command/execute_process.html ## Source [scripts/cmake/vcpkg_execute_in_download_mode.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_execute_in_download_mode.cmake) diff --git a/docs/maintainers/vcpkg_execute_required_process_repeat.md b/docs/maintainers/vcpkg_execute_required_process_repeat.md new file mode 100644 index 00000000000000..09102ca1a90f1f --- /dev/null +++ b/docs/maintainers/vcpkg_execute_required_process_repeat.md @@ -0,0 +1,16 @@ +# vcpkg_execute_required_process_repeat + +Execute a process until the command succeeds, or until the COUNT is reached. + +## Usage +```cmake +vcpkg_execute_required_process_repeat( + COUNT + COMMAND [] + WORKING_DIRECTORY + LOGNAME +) +``` + +## Source +[scripts/cmake/vcpkg_execute_required_process_repeat.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_execute_required_process_repeat.cmake) diff --git a/docs/maintainers/vcpkg_extract_source_archive.md b/docs/maintainers/vcpkg_extract_source_archive.md index 4971df9604101a..895dd16fc0cd3b 100644 --- a/docs/maintainers/vcpkg_extract_source_archive.md +++ b/docs/maintainers/vcpkg_extract_source_archive.md @@ -15,7 +15,7 @@ The full path to the archive to be extracted. This is usually obtained from calling [`vcpkg_download_distfile`](vcpkg_download_distfile.md). ### TARGET_DIRECTORY -If specified, the archive will be extracted into the target directory instead of `${CURRENT_BUILDTREES_DIR}\src\`. +If specified, the archive will be extracted into the target directory instead of `${CURRENT_BUILDTREES_DIR}/src/`. This can be used to mimic git submodules, by extracting into a subdirectory of another archive. diff --git a/docs/maintainers/vcpkg_find_acquire_program.md b/docs/maintainers/vcpkg_find_acquire_program.md index aef499b12e34b6..ed93ba2cacfaf8 100644 --- a/docs/maintainers/vcpkg_find_acquire_program.md +++ b/docs/maintainers/vcpkg_find_acquire_program.md @@ -13,29 +13,29 @@ This variable specifies both the program to be acquired as well as the out param ## Notes The current list of programs includes: -- 7Z -- ARIA2 (Downloader) -- BISON -- CLANG -- DARK -- DOXYGEN -- FLEX -- GASPREPROCESSOR -- GPERF -- PERL -- PYTHON2 -- PYTHON3 -- GIT -- GN -- GO -- JOM -- MESON -- NASM -- NINJA -- NUGET -- SCONS -- SWIG -- YASM +* 7Z +* ARIA2 (Downloader) +* BISON +* CLANG +* DARK +* DOXYGEN +* FLEX +* GASPREPROCESSOR +* GPERF +* PERL +* PYTHON2 +* PYTHON3 +* GIT +* GN +* GO +* JOM +* MESON +* NASM +* NINJA +* NUGET +* SCONS +* SWIG +* YASM Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_acquire_msys.md). diff --git a/docs/maintainers/vcpkg_find_fortran.md b/docs/maintainers/vcpkg_find_fortran.md index eb04ebdf360aab..4ee10b163e2084 100644 --- a/docs/maintainers/vcpkg_find_fortran.md +++ b/docs/maintainers/vcpkg_find_fortran.md @@ -6,8 +6,7 @@ Windows(x86/x64) Only: If not it will switch/enable MinGW gfortran ## Usage ```cmake -vcpkg_find_fortran( -) +vcpkg_find_fortran() ``` ## Source diff --git a/docs/maintainers/vcpkg_fixup_cmake_targets.md b/docs/maintainers/vcpkg_fixup_cmake_targets.md index 18e8d086797317..5a0b2d64476707 100644 --- a/docs/maintainers/vcpkg_fixup_cmake_targets.md +++ b/docs/maintainers/vcpkg_fixup_cmake_targets.md @@ -27,6 +27,11 @@ By default the parent directory of CONFIG_PATH is removed if it is named "cmake" Passing this option disable such behavior, as it is convenient for ports that install more than one CMake package configuration file. +### NO_PREFIX_CORRECTION +Disables the correction of_IMPORT_PREFIX done by vcpkg due to moving the targets. +Currently the correction does not take into account how the files are moved and applies +I rather simply correction which in some cases will yield the wrong results. + ## Notes Transform all `/debug//*targets-debug.cmake` files and move them to `/`. Removes all `/debug//*targets.cmake` and `/debug//*config.cmake`. diff --git a/docs/maintainers/vcpkg_fixup_pkgconfig.md b/docs/maintainers/vcpkg_fixup_pkgconfig.md index be77ae3471e6cf..48870e972eeced 100644 --- a/docs/maintainers/vcpkg_fixup_pkgconfig.md +++ b/docs/maintainers/vcpkg_fixup_pkgconfig.md @@ -36,7 +36,7 @@ Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself Still work in progress. If there are more cases which can be handled here feel free to add them ## Examples -Just call vcpkg_fixup_pkgconfig() after any install step which installs *.pc files. +Just call `vcpkg_fixup_pkgconfig()` after any install step which installs *.pc files. ## Source [scripts/cmake/vcpkg_fixup_pkgconfig.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_fixup_pkgconfig.cmake) diff --git a/docs/maintainers/vcpkg_from_gitlab.md b/docs/maintainers/vcpkg_from_gitlab.md index fe75ecf9356cff..ceef6f2d44c78a 100644 --- a/docs/maintainers/vcpkg_from_gitlab.md +++ b/docs/maintainers/vcpkg_from_gitlab.md @@ -61,6 +61,5 @@ This exports the `VCPKG_HEAD_VERSION` variable during head builds. * [folly](https://github.com/Microsoft/vcpkg/blob/master/ports/folly/portfile.cmake#L15) * [z3](https://github.com/Microsoft/vcpkg/blob/master/ports/z3/portfile.cmake#L13) - ## Source [scripts/cmake/vcpkg_from_gitlab.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_from_gitlab.cmake) diff --git a/docs/maintainers/vcpkg_get_program_files_platform_bitness.md b/docs/maintainers/vcpkg_get_program_files_platform_bitness.md new file mode 100644 index 00000000000000..a39992f4e0d899 --- /dev/null +++ b/docs/maintainers/vcpkg_get_program_files_platform_bitness.md @@ -0,0 +1,13 @@ +# vcpkg_get_program_files_platform_bitness + +Get the Program Files directory of the current platform's bitness: +either `$ENV{ProgramW6432}` on 64-bit windows, +or `$ENV{PROGRAMFILES}` on 32-bit windows. + +## Usage: +```cmake +vcpkg_get_program_files_platform_bitness() +``` + +## Source +[scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake) diff --git a/docs/maintainers/vcpkg_get_windows_sdk.md b/docs/maintainers/vcpkg_get_windows_sdk.md new file mode 100644 index 00000000000000..b32f3f49d0a3e9 --- /dev/null +++ b/docs/maintainers/vcpkg_get_windows_sdk.md @@ -0,0 +1,11 @@ +# vcpkg_get_windows_sdk + +Get the Windows SDK number. + +## Usage: +```cmake +vcpkg_get_windows_sdk() +``` + +## Source +[scripts/cmake/vcpkg_get_windows_sdk.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_get_windows_sdk.cmake) diff --git a/docs/maintainers/vcpkg_replace_string.md b/docs/maintainers/vcpkg_replace_string.md new file mode 100644 index 00000000000000..5e04d0368c6e3d --- /dev/null +++ b/docs/maintainers/vcpkg_replace_string.md @@ -0,0 +1,11 @@ +# vcpkg_replace_string + +Replace a string in a file. + +```cmake +vcpkg_replace_string(filename match_string replace_string) +``` + + +## Source +[scripts/cmake/vcpkg_replace_string.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_replace_string.cmake) diff --git a/docs/regenerate.ps1 b/docs/regenerate.ps1 index abb91af6113ba6..c984ad77b43541 100644 --- a/docs/regenerate.ps1 +++ b/docs/regenerate.ps1 @@ -1,27 +1,81 @@ -Param([string]$VcpkgRoot = "") +[CmdletBinding()] +Param( + [String]$VcpkgRoot = '' +) -$ErrorActionPreference = "Stop" - -if (!$VcpkgRoot) { - $VcpkgRoot = ".." +if ([String]::IsNullOrEmpty($VcpkgRoot)) { + $VcpkgRoot = "${PSScriptRoot}/.." } $VcpkgRoot = Resolve-Path $VcpkgRoot -if (!(Test-Path "$VcpkgRoot\.vcpkg-root")) { +if (-not (Test-Path "$VcpkgRoot/.vcpkg-root")) { throw "Invalid vcpkg instance, did you forget -VcpkgRoot?" } -Set-Content -Path "$PSScriptRoot\maintainers\portfile-functions.md" -Value "`n`n# Portfile helper functions" +Set-Content ` + -Path "$PSScriptRoot/maintainers/portfile-functions.md" ` + -Value "`n`n# Portfile helper functions" + +Get-ChildItem "$VcpkgRoot/scripts/cmake" -Filter '*.cmake' | ForEach-Object { + $filename = $_ + [String[]]$contents = Get-Content $filename + + if ($contents[0] -eq '# DEPRECATED') { + return + } + + [String]$startCommentRegex = '#\[(=*)\[' + [String]$endCommentRegex = '' + [Bool]$inComment = $False + [Bool]$failThisFile = $False + + $contents = $contents | ForEach-Object { + if (-not $inComment) { + if ($_ -match "^\s*${startCommentRegex}(\.[a-z]*)?:?\s*$") { + if (-not [String]::IsNullOrEmpty($matches[2]) -and $matches[2] -ne '.md') { + Write-Warning "The documentation in ${filename} doesn't seem to be markdown (extension: $($matches[2])). Only markdown is supported; please rewrite the documentation in markdown." + } + $inComment = $True + $endCommentRegex = "\]$($matches[1])\]" + } elseif ($_ -match $startCommentRegex) { + $failThisFile = $True + Write-Warning "Invalid start of comment -- the comment start must be at the beginning of the line. + (on line: `"$_`")" + } else { + # do nothing -- we're outside a comment, so cmake code + } + } else { + if ($_ -match "^\s*#?${endCommentRegex}\s*$") { + $inComment = $False + $endCommentRegex = '' + } elseif ($_ -match $endCommentRegex) { + $failThisFile = $True + Write-Warning "Invalid end of comment -- the comment end must be on it's own on a line. + (on line: `"$_`")" + } else { + # regular documentation line + $_ + } + } + } + + if ($inComment) { + Write-Warning "File ${filename} has an unclosed comment." + return + } + + if ($failThisFile) { + return + } -ls "$VcpkgRoot\scripts\cmake\*.cmake" | % { - $contents = Get-Content $_ ` - | ? { $_ -match "^## |^##`$" } ` - | % { $_ -replace "^## ?","" } if ($contents) { - Set-Content -Path "$PSScriptRoot\maintainers\$($_.BaseName).md" -Value "$($contents -join "`n")`n`n## Source`n[scripts/cmake/$($_.Name)](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/$($_.Name))" - "- [$($_.BaseName -replace "_","\_")]($($_.BaseName).md)" ` - | Out-File -Enc Ascii -Append -FilePath "$PSScriptRoot\maintainers\portfile-functions.md" + Set-Content -Path "$PSScriptRoot/maintainers/$($filename.BaseName).md" -Value "$($contents -join "`n")`n`n## Source`n[scripts/cmake/$($filename.Name)](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/$($filename.Name))" + "- [$($filename.BaseName -replace "_","\_")]($($filename.BaseName).md)" ` + | Out-File -Enc Ascii -Append -FilePath "$PSScriptRoot/maintainers/portfile-functions.md" + } elseif (-not $filename.Name.StartsWith("vcpkg_internal")) { + # don't worry about undocumented internal functions + Write-Warning "The cmake function in file $filename doesn't seem to have any documentation. Make sure the documentation comments are correctly written." } } diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 1a2852cedeede8..03bf38e4cd8dbb 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -39,11 +39,27 @@ stages: filePath: 'scripts/azure-pipelines/windows/Check-ManifestFormatting.ps1' arguments: '-Root .' pwsh: true +- stage: check_documentation_generation + displayName: Check if the documentation has been regenerated correctly + pool: $(windows-pool) + dependsOn: [] + jobs: + - job: + workspace: + clean: resources + steps: + - task: Powershell@2 + displayName: 'Check documentation generation' + inputs: + filePath: 'scripts/azure-pipelines/windows/Check-CMakeFunctionDocumentation.ps1' + arguments: '-Root .' + pwsh: true - stage: run_port_ci displayName: 'Run the Port CI' dependsOn: - check_cxx_formatting - check_manifest_formatting + - check_documentation_generation jobs: - template: windows/azure-pipelines.yml parameters: diff --git a/scripts/azure-pipelines/windows/Check-CMakeFunctionDocumentation.ps1 b/scripts/azure-pipelines/windows/Check-CMakeFunctionDocumentation.ps1 new file mode 100644 index 00000000000000..5505c3401770df --- /dev/null +++ b/scripts/azure-pipelines/windows/Check-CMakeFunctionDocumentation.ps1 @@ -0,0 +1,30 @@ +[CmdletBinding()] +Param( + [Parameter(Mandatory=$True)] + [string]$Root +) + +if (-not (Test-Path "$Root/.vcpkg-root")) +{ + Write-Error "The vcpkg root was not at $Root" + throw +} + +& "$Root/docs/regenerate.ps1" -VcpkgRoot $Root -WarningAction 'Stop' + +$changedFiles = & "$PSScriptRoot/Get-ChangedFiles.ps1" -Directory "$Root/docs" +if ($null -ne $changedFiles) +{ + $msg = @( + "", + "The documentation files do not seem to have been regenerated.", + "Please re-run `docs/regenerate.ps1`." + ) + $msg += "" + + $msg += "This should produce the following diff:" + $msg += git diff "$Root/docs" + + Write-Error ($msg -join "`n") + throw +} diff --git a/scripts/cmake/execute_process.cmake b/scripts/cmake/execute_process.cmake index 76a3d9a8b9d74d..2207cfab25022d 100644 --- a/scripts/cmake/execute_process.cmake +++ b/scripts/cmake/execute_process.cmake @@ -1,10 +1,12 @@ -## # execute_process -## -## Intercepts all calls to execute_process() inside portfiles and fails when Download Mode -## is enabled. -## -## In order to execute a process in Download Mode call `vcpkg_execute_in_download_mode()` instead. -## +#[===[.md: +# execute_process + +Intercepts all calls to execute_process() inside portfiles and fails when Download Mode +is enabled. + +In order to execute a process in Download Mode call `vcpkg_execute_in_download_mode()` instead. +#]===] + if (NOT DEFINED OVERRIDEN_EXECUTE_PROCESS) set(OVERRIDEN_EXECUTE_PROCESS ON) @@ -12,9 +14,5 @@ if (NOT DEFINED OVERRIDEN_EXECUTE_PROCESS) macro(execute_process) message(FATAL_ERROR "This command cannot be executed in Download Mode.\nHalting portfile execution.\n") endmacro() - else() - macro(_execute_process) - execute_process(${ARGV}) - endmacro() endif() endif() diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 49271eeb62066a..ac48d177718f62 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -1,519 +1,521 @@ -## # vcpkg_acquire_msys -## -## Download and prepare an MSYS2 instance. -## -## ## Usage -## ```cmake -## vcpkg_acquire_msys( -## PACKAGES ... -## [NO_DEFAULT_PACKAGES] -## [DIRECT_PACKAGES ...] -## ) -## ``` -## -## ## Parameters -## ### MSYS_ROOT_VAR -## An out-variable that will be set to the path to MSYS2. -## -## ### PACKAGES -## A list of packages to acquire in msys. -## -## To ensure a package is available: `vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.16)` -## -## ### NO_DEFAULT_PACKAGES -## Exclude the normal base packages. -## -## The list of base packages includes: bash, coreutils, sed, grep, gawk, diffutils, make, and pkg-config -## -## ### DIRECT_PACKAGES -## A list of URL/SHA512 pairs to acquire in msys. -## -## This parameter can be used by a port to privately extend the list of msys packages to be acquired. -## The URLs can be found on the msys2 website[1] and should be a direct archive link: -## -## https://repo.msys2.org/mingw/i686/mingw-w64-i686-gettext-0.19.8.1-9-any.pkg.tar.zst -## -## [1] https://packages.msys2.org/search -## -## ## Notes -## A call to `vcpkg_acquire_msys` will usually be followed by a call to `bash.exe`: -## ```cmake -## vcpkg_acquire_msys(MSYS_ROOT) -## set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) -## -## vcpkg_execute_required_process( -## COMMAND ${BASH} --noprofile --norc "${CMAKE_CURRENT_LIST_DIR}\\build.sh" -## WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel -## LOGNAME build-${TARGET_TRIPLET}-rel -## ) -## ``` -## -## ## Examples -## -## * [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) -## * [icu](https://github.com/Microsoft/vcpkg/blob/master/ports/icu/portfile.cmake) -## * [libvpx](https://github.com/Microsoft/vcpkg/blob/master/ports/libvpx/portfile.cmake) +#[===[.md: +# vcpkg_acquire_msys -function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _am "NO_DEFAULT_PACKAGES" "" "PACKAGES;DIRECT_PACKAGES") +Download and prepare an MSYS2 instance. - set(TOTAL_HASH 0) - set(ARCHIVES) +## Usage +```cmake +vcpkg_acquire_msys( + PACKAGES ... + [NO_DEFAULT_PACKAGES] + [DIRECT_PACKAGES ...] +) +``` - set(PACKAGES ${_am_PACKAGES}) +## Parameters +### MSYS_ROOT_VAR +An out-variable that will be set to the path to MSYS2. - if(NOT _am_NO_DEFAULT_PACKAGES) - list(APPEND PACKAGES bash coreutils sed grep gawk diffutils make pkg-config) - endif() +### PACKAGES +A list of packages to acquire in msys. - macro(msys_package_download URL SHA FILENAME) - set(URLS "${URL}") - # Mirror list from https://github.com/msys2/MSYS2-packages/blob/master/pacman-mirrors/mirrorlist.msys - # Sourceforge is not used because it does not keep older package versions - set(MIRRORS - "https://www2.futureware.at/~nickoe/msys2-mirror/" - "https://mirror.yandex.ru/mirrors/msys2/" - "https://mirrors.tuna.tsinghua.edu.cn/msys2/" - "https://mirrors.ustc.edu.cn/msys2/" - "https://mirror.bit.edu.cn/msys2/" - "https://mirror.selfnet.de/msys2/" - "https://mirrors.sjtug.sjtu.edu.cn/msys2/" - ) +To ensure a package is available: `vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.16)` - foreach(MIRROR IN LISTS MIRRORS) - string(REPLACE "https://repo.msys2.org/" "${MIRROR}" MIRROR_URL "${URL}") - list(APPEND URLS "${MIRROR_URL}") - endforeach() - vcpkg_download_distfile(MSYS_ARCHIVE - URLS ${URLS} - SHA512 "${SHA}" - FILENAME "msys-${FILENAME}" - QUIET - ) - string(APPEND TOTAL_HASH "${SHA}") - list(APPEND ARCHIVES "${MSYS_ARCHIVE}") - endmacro() +### NO_DEFAULT_PACKAGES +Exclude the normal base packages. - macro(msys_package) - cmake_parse_arguments(p "ZST;ANY" "URL;NAME;SHA512;VERSION;REPO" "DEPS" ${ARGN}) - if(p_URL AND NOT p_NAME) - if(NOT p_URL MATCHES "^https://repo\\.msys2\\.org/.*/(([^-]+(-[^0-9][^-]*)*)-.+\\.pkg\\.tar\\.(xz|zst))\$") - message(FATAL_ERROR "Regex does not match supplied URL to vcpkg_acquire_msys: ${p_URL}") - endif() - set(FILENAME "${CMAKE_MATCH_1}") - set(p_NAME "${CMAKE_MATCH_2}") - else() - if(p_ZST) - set(EXT zst) - else() - set(EXT xz) - endif() - if(p_ANY) - set(ARCH any) - else() - set(ARCH x86_64) - endif() - if(NOT p_REPO) - set(p_REPO msys/x86_64) - endif() - set(FILENAME "${p_NAME}-${p_VERSION}-${ARCH}.pkg.tar.${EXT}") - set(p_URL "https://repo.msys2.org/${p_REPO}/${FILENAME}") - endif() - if("${p_NAME}" IN_LIST PACKAGES) - list(REMOVE_ITEM PACKAGES "${p_NAME}") - list(APPEND PACKAGES ${p_DEPS}) - msys_package_download("${p_URL}" "${p_SHA512}" "${FILENAME}") +The list of base packages includes: bash, coreutils, sed, grep, gawk, diffutils, make, and pkg-config + +### DIRECT_PACKAGES +A list of URL/SHA512 pairs to acquire in msys. + +This parameter can be used by a port to privately extend the list of msys packages to be acquired. +The URLs can be found on the msys2 website[1] and should be a direct archive link: + + https://repo.msys2.org/mingw/i686/mingw-w64-i686-gettext-0.19.8.1-9-any.pkg.tar.zst + +[1] https://packages.msys2.org/search + +## Notes +A call to `vcpkg_acquire_msys` will usually be followed by a call to `bash.exe`: +```cmake +vcpkg_acquire_msys(MSYS_ROOT) +set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + +vcpkg_execute_required_process( + COMMAND ${BASH} --noprofile --norc "${CMAKE_CURRENT_LIST_DIR}\\build.sh" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel + LOGNAME build-${TARGET_TRIPLET}-rel +) +``` + +## Examples + +* [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) +* [icu](https://github.com/Microsoft/vcpkg/blob/master/ports/icu/portfile.cmake) +* [libvpx](https://github.com/Microsoft/vcpkg/blob/master/ports/libvpx/portfile.cmake) +#]===] + +function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) + # parse parameters such that semicolons in options arguments to COMMAND don't get erased + cmake_parse_arguments(PARSE_ARGV 0 _am "NO_DEFAULT_PACKAGES" "" "PACKAGES;DIRECT_PACKAGES") + + set(TOTAL_HASH 0) + set(ARCHIVES) + + set(PACKAGES ${_am_PACKAGES}) + + if(NOT _am_NO_DEFAULT_PACKAGES) + list(APPEND PACKAGES bash coreutils sed grep gawk diffutils make pkg-config) endif() - endmacro() - unset(N) - foreach(P IN LISTS _am_DIRECT_PACKAGES) - if(NOT DEFINED N) - set(N "${P}") - else() - get_filename_component(FILENAME "${N}" NAME) - msys_package_download("${N}" "${P}" "${FILENAME}") - unset(N) + macro(msys_package_download URL SHA FILENAME) + set(URLS "${URL}") + # Mirror list from https://github.com/msys2/MSYS2-packages/blob/master/pacman-mirrors/mirrorlist.msys + # Sourceforge is not used because it does not keep older package versions + set(MIRRORS + "https://www2.futureware.at/~nickoe/msys2-mirror/" + "https://mirror.yandex.ru/mirrors/msys2/" + "https://mirrors.tuna.tsinghua.edu.cn/msys2/" + "https://mirrors.ustc.edu.cn/msys2/" + "https://mirror.bit.edu.cn/msys2/" + "https://mirror.selfnet.de/msys2/" + "https://mirrors.sjtug.sjtu.edu.cn/msys2/" + ) + + foreach(MIRROR IN LISTS MIRRORS) + string(REPLACE "https://repo.msys2.org/" "${MIRROR}" MIRROR_URL "${URL}") + list(APPEND URLS "${MIRROR_URL}") + endforeach() + vcpkg_download_distfile(MSYS_ARCHIVE + URLS ${URLS} + SHA512 "${SHA}" + FILENAME "msys-${FILENAME}" + QUIET + ) + string(APPEND TOTAL_HASH "${SHA}") + list(APPEND ARCHIVES "${MSYS_ARCHIVE}") + endmacro() + + macro(msys_package) + cmake_parse_arguments(p "ZST;ANY" "URL;NAME;SHA512;VERSION;REPO" "DEPS" ${ARGN}) + if(p_URL AND NOT p_NAME) + if(NOT p_URL MATCHES "^https://repo\\.msys2\\.org/.*/(([^-]+(-[^0-9][^-]*)*)-.+\\.pkg\\.tar\\.(xz|zst))\$") + message(FATAL_ERROR "Regex does not match supplied URL to vcpkg_acquire_msys: ${p_URL}") + endif() + set(FILENAME "${CMAKE_MATCH_1}") + set(p_NAME "${CMAKE_MATCH_2}") + else() + if(p_ZST) + set(EXT zst) + else() + set(EXT xz) + endif() + if(p_ANY) + set(ARCH any) + else() + set(ARCH x86_64) + endif() + if(NOT p_REPO) + set(p_REPO msys/x86_64) + endif() + set(FILENAME "${p_NAME}-${p_VERSION}-${ARCH}.pkg.tar.${EXT}") + set(p_URL "https://repo.msys2.org/${p_REPO}/${FILENAME}") + endif() + if("${p_NAME}" IN_LIST PACKAGES) + list(REMOVE_ITEM PACKAGES "${p_NAME}") + list(APPEND PACKAGES ${p_DEPS}) + msys_package_download("${p_URL}" "${p_SHA512}" "${FILENAME}") + endif() + endmacro() + + unset(N) + foreach(P IN LISTS _am_DIRECT_PACKAGES) + if(NOT DEFINED N) + set(N "${P}") + else() + get_filename_component(FILENAME "${N}" NAME) + msys_package_download("${N}" "${P}" "${FILENAME}") + unset(N) + endif() + endforeach() + if(DEFINED N) + message(FATAL_ERROR "vcpkg_acquire_msys(... DIRECT_PACKAGES ...) requires exactly pairs of URL/SHA512") endif() - endforeach() - if(DEFINED N) - message(FATAL_ERROR "vcpkg_acquire_msys(... DIRECT_PACKAGES ...) requires exactly pairs of URL/SHA512") - endif() - # To add new entries, use https://packages.msys2.org/package/$PACKAGE?repo=msys - msys_package( - URL "https://repo.msys2.org/msys/x86_64/unzip-6.0-2-x86_64.pkg.tar.xz" - SHA512 b8a1e0ce6deff26939cb46267f80ada0a623b7d782e80873cea3d388b4dc3a1053b14d7565b31f70bc904bf66f66ab58ccc1cd6bfa677065de1f279dd331afb9 - DEPS libbz2 - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-2-x86_64.pkg.tar.xz" - SHA512 d128bd1792d0f5750e6a63a24db86a791e7ee457db8c0bef68d217099be4a6eef27c85caf6ad09b0bcd5b3cdac6fc0a2b9842cc58d381a4035505906cc4803ec - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/patch-2.7.6-1-x86_64.pkg.tar.xz" - SHA512 04d06b9d5479f129f56e8290e0afe25217ffa457ec7bed3e576df08d4a85effd80d6e0ad82bd7541043100799b608a64da3c8f535f8ea173d326da6194902e8c - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/gzip-1.10-1-x86_64.pkg.tar.xz" - SHA512 2d0a60f2c384e3b9e2bed2212867c85333545e51ee0f583a33914e488e43c265ed0017cd4430a6e3dafdca99c0414b3756a4b9cc92a6f04d5566eff8b68def75 - DEPS msys2-runtime - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/bash-4.4.023-2-x86_64.pkg.tar.xz" - SHA512 1cf2a07022113010e00e150e7004732013a793d49e7a6ac7c2be27a0b2c0ce3366150584b9974e30df042f8876a84d6a77c1a46f0607e38ebe18f8a25f51c32d - DEPS msys2-runtime - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/autoconf-2.69-5-any.pkg.tar.xz" - SHA512 66b9c97bd3d1dfe2a2ab576235b6b8c204a9e4c099ba14cf5d0139e564bba1e735e3b1083354b4cac8c6c42233cbdd5e1e277e32cadfe24017b94d2fbdeb5617 - DEPS m4 - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/diffutils-3.7-1-x86_64.pkg.tar.xz" - SHA512 0c39837a26b2111bb6310cdfe0bc14656e3d57456ad8023f59c9386634a8f1f236915c79a57348b64c508897c73ed88d8abce2b9ac512a427e9a3956939f2040 - DEPS msys2-runtime - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/binutils-2.34-4-x86_64.pkg.tar.zst" - SHA512 5271288d11489879082bc1f2298bb8bedbcfcf6ee19f8a9b3b552b6a4395543d9385bb833e3c32b1560bff1b411d2be503e2c12a7201bf37b85cfacc5f5baba3 - DEPS libiconv libintl - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/libtool-2.4.6-9-x86_64.pkg.tar.xz" - SHA512 b309799e5a9d248ef66eaf11a0bd21bf4e8b9bd5c677c627ec83fa760ce9f0b54ddf1b62cbb436e641fbbde71e3b61cb71ff541d866f8ca7717a3a0dbeb00ebf - DEPS grep sed coreutils file - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/file-5.39-1-x86_64.pkg.tar.zst" - SHA512 be51dd0f6143a2f34f2a3e7d412866eb12511f25daaf3a5478240537733a67d7797a3a55a8893e5638589c06bca5af20aed5ded7db0bf19fbf52b30fae08cadd - DEPS gcc-libs zlib libbz2 - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/zlib-1.2.11-1-x86_64.pkg.tar.xz" - SHA512 b607da40d3388b440f2a09e154f21966cd55ad77e02d47805f78a9dee5de40226225bf0b8335fdfd4b83f25ead3098e9cb974d4f202f28827f8468e30e3b790d - DEPS gcc-libs - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/bzip2-1.0.8-2-x86_64.pkg.tar.xz" - SHA512 336f5b59eb9cf4e93b537a212509d84f72cd9b8a97bf8ac0596eff298f3c0979bdea6c605244d5913670b9d20b017e5ee327f1e606f546a88e177a03c589a636 - DEPS gcc-libs - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-2-x86_64.pkg.tar.xz" - SHA512 d128bd1792d0f5750e6a63a24db86a791e7ee457db8c0bef68d217099be4a6eef27c85caf6ad09b0bcd5b3cdac6fc0a2b9842cc58d381a4035505906cc4803ec - DEPS gcc-libs - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/coreutils-8.32-1-x86_64.pkg.tar.xz" - SHA512 1a2ae4f296954421ce36f764b9b1c77ca72fc8583c46060b817677d0ad6adc7d7e3c2bbe1ae0179afd116a3d62f28e59eae2f7c84c1c8ffb7d22d2f2b40c0cdc - DEPS libiconv libintl gmp - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/grep-3.0-2-x86_64.pkg.tar.xz" - SHA512 c784d5f8a929ae251f2ffaccf7ab0b3936ae9f012041e8f074826dd6077ad0a859abba19feade1e71b3289cc640626dfe827afe91c272b38a1808f228f2fdd00 - DEPS libiconv libintl libpcre - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/sed-4.8-1-x86_64.pkg.tar.xz" - SHA512 b6e7ed0af9e04aba4992ee26d8616f7ac675c8137bb28558c049d50709afb571b33695ce21d01e5b7fe8e188c008dd2e8cbafc72a7e2a919c2d678506095132b - DEPS libintl - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/libpcre-8.44-1-x86_64.pkg.tar.xz" - SHA512 e9e56386fc5cca0f3c36cee21eda91300d9a13a962ec2f52eeea00f131915daea1cfeb0e1b30704bf3cc4357d941d356e0d72192bab3006c2548e18cd96dad77 - DEPS gcc-libs - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/m4-1.4.18-2-x86_64.pkg.tar.xz" - SHA512 061e9243c1e013aa093546e3872984ad47b7fc9d64d4c39dcce62e750ed632645df00be3fe382a2f55f3bf623dd0d649e2092be23e8f22f921f582e41893e36a - DEPS msys2-runtime - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/automake-wrapper-11-1-any.pkg.tar.xz" - SHA512 0fcfc80c31fd0bda5a46c55e9100a86d2fc788a92c7e2ca4fd281e551375c62eb5b9cc9ad9338bb44a815bf0b1d1b60b882c8e68ca3ea529b442f2d03d1d3e1f - DEPS gawk - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/gawk-5.1.0-1-x86_64.pkg.tar.xz" - SHA512 4e2be747b184f27945df6fb37d52d56fd8117d2fe4b289370bcdb5b15a4cf90cbeaea98cf9e64bcbfa2c13db50d8bd14cbd719c5f31b420842da903006dbc959 - DEPS libintl libreadline mpfr - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/mpfr-4.1.0-1-x86_64.pkg.tar.zst" - SHA512 d64fa60e188124591d41fc097d7eb51d7ea4940bac05cdcf5eafde951ed1eaa174468f5ede03e61106e1633e3428964b34c96de76321ed8853b398fbe8c4d072 - DEPS gmp gcc-libs - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/gmp-6.2.0-1-x86_64.pkg.tar.xz" - SHA512 1389a443e775bb255d905665dd577bef7ed71d51a8c24d118097f8119c08c4dfe67505e88ddd1e9a3764dd1d50ed8b84fa34abefa797d257e90586f0cbf54de8 - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/xz-5.2.5-1-x86_64.pkg.tar.xz" # this seems to require immediate updating on version bumps. - SHA512 99d092c3398277e47586cead103b41e023e9432911fb7bdeafb967b826f6a57d32e58afc94c8230dad5b5ec2aef4f10d61362a6d9e410a6645cf23f076736bba - DEPS liblzma libiconv gettext - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/liblzma-5.2.5-1-x86_64.pkg.tar.xz" - SHA512 8d5c04354fdc7309e73abce679a4369c0be3dc342de51cef9d2a932b7df6a961c8cb1f7e373b1b8b2be40343a95fbd57ac29ebef63d4a2074be1d865e28ca6ad - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/libreadline-8.0.004-1-x86_64.pkg.tar.xz" - SHA512 42760bddedccc8d93507c1e3a7a81595dc6392b5e4319d24a85275eb04c30eb79078e4247eb2cdd00ff3884d932639130c89bf1b559310a17fa4858062491f97 - DEPS ncurses - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/ncurses-6.2-1-x86_64.pkg.tar.xz" - SHA512 d4dc566d3dbd32e7646e328cb350689ede7eaa7008c8ed971072f8869a2986fe3935e7df1700851b52716af7ef20c49f9e6628d3163a5e9208a8872b5014eaea - DEPS msys2-runtime - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/automake1.16-1.16.2-1-any.pkg.tar.zst" - SHA512 568d1250a31a53452e029d1c236da66d67fffa786a8713128027d33a6a9408cda6e493e9c1555a816efee6245b05a1ef8f9ce3482c39de71356c2e983d926bf7 - DEPS perl - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/automake1.15-1.15.1-1-any.pkg.tar.xz" - SHA512 d5bb245ab1bb6b57c40ef97755bfb0919dcceb0eccc33e848809922bf6b032f9e4eb36d89aedf41542051277d92238bd48a74115867db0bbc1e1db1c975cc72c - DEPS perl - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/perl-5.32.0-1-x86_64.pkg.tar.zst" - SHA512 8acc6c4901bd2e24faf1951084d70029847f05e870826e07b8d9a5d90144f4aa0ab6e568e77c28c36650f016ee75ce78b0356c75673b212c992401f7f1543dd8 - DEPS libcrypt - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/libcrypt-2.1-2-x86_64.pkg.tar.xz" - SHA512 59a13f79f560934f880d68209a58a3c39ee4a1d24500035bde90d7a6f6ab0d4f72fe14edea6f19a8eb54d4d53b0b6ad4589b388f1521a07ab24a0f8307619cab - DEPS gcc-libs - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/pkg-config-0.29.2-1-x86_64.pkg.tar.xz" - SHA512 f1d70f0b4ebcfeb3fa2156a7a4f7b0b404795853e05361de14054dc6658a6154915bb982626cbfe76bef0828325f993f30da6817361ca8d7ea440a40023fa864 - DEPS libiconv - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/make-4.3-1-x86_64.pkg.tar.xz" - SHA512 7306dec7859edc27d70a24ab4b396728481484a426c5aa2f7e9fed2635b3b25548b05b7d37a161a86a8edaa5922948bee8c99b1e8a078606e69ca48a433fe321 - DEPS libintl msys2-runtime - ) + # To add new entries, use https://packages.msys2.org/package/$PACKAGE?repo=msys + msys_package( + URL "https://repo.msys2.org/msys/x86_64/unzip-6.0-2-x86_64.pkg.tar.xz" + SHA512 b8a1e0ce6deff26939cb46267f80ada0a623b7d782e80873cea3d388b4dc3a1053b14d7565b31f70bc904bf66f66ab58ccc1cd6bfa677065de1f279dd331afb9 + DEPS libbz2 + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-2-x86_64.pkg.tar.xz" + SHA512 d128bd1792d0f5750e6a63a24db86a791e7ee457db8c0bef68d217099be4a6eef27c85caf6ad09b0bcd5b3cdac6fc0a2b9842cc58d381a4035505906cc4803ec + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/patch-2.7.6-1-x86_64.pkg.tar.xz" + SHA512 04d06b9d5479f129f56e8290e0afe25217ffa457ec7bed3e576df08d4a85effd80d6e0ad82bd7541043100799b608a64da3c8f535f8ea173d326da6194902e8c + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/gzip-1.10-1-x86_64.pkg.tar.xz" + SHA512 2d0a60f2c384e3b9e2bed2212867c85333545e51ee0f583a33914e488e43c265ed0017cd4430a6e3dafdca99c0414b3756a4b9cc92a6f04d5566eff8b68def75 + DEPS msys2-runtime + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/bash-4.4.023-2-x86_64.pkg.tar.xz" + SHA512 1cf2a07022113010e00e150e7004732013a793d49e7a6ac7c2be27a0b2c0ce3366150584b9974e30df042f8876a84d6a77c1a46f0607e38ebe18f8a25f51c32d + DEPS msys2-runtime + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/autoconf-2.69-5-any.pkg.tar.xz" + SHA512 66b9c97bd3d1dfe2a2ab576235b6b8c204a9e4c099ba14cf5d0139e564bba1e735e3b1083354b4cac8c6c42233cbdd5e1e277e32cadfe24017b94d2fbdeb5617 + DEPS m4 + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/diffutils-3.7-1-x86_64.pkg.tar.xz" + SHA512 0c39837a26b2111bb6310cdfe0bc14656e3d57456ad8023f59c9386634a8f1f236915c79a57348b64c508897c73ed88d8abce2b9ac512a427e9a3956939f2040 + DEPS msys2-runtime + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/binutils-2.34-4-x86_64.pkg.tar.zst" + SHA512 5271288d11489879082bc1f2298bb8bedbcfcf6ee19f8a9b3b552b6a4395543d9385bb833e3c32b1560bff1b411d2be503e2c12a7201bf37b85cfacc5f5baba3 + DEPS libiconv libintl + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/libtool-2.4.6-9-x86_64.pkg.tar.xz" + SHA512 b309799e5a9d248ef66eaf11a0bd21bf4e8b9bd5c677c627ec83fa760ce9f0b54ddf1b62cbb436e641fbbde71e3b61cb71ff541d866f8ca7717a3a0dbeb00ebf + DEPS grep sed coreutils file + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/file-5.39-1-x86_64.pkg.tar.zst" + SHA512 be51dd0f6143a2f34f2a3e7d412866eb12511f25daaf3a5478240537733a67d7797a3a55a8893e5638589c06bca5af20aed5ded7db0bf19fbf52b30fae08cadd + DEPS gcc-libs zlib libbz2 + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/zlib-1.2.11-1-x86_64.pkg.tar.xz" + SHA512 b607da40d3388b440f2a09e154f21966cd55ad77e02d47805f78a9dee5de40226225bf0b8335fdfd4b83f25ead3098e9cb974d4f202f28827f8468e30e3b790d + DEPS gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/bzip2-1.0.8-2-x86_64.pkg.tar.xz" + SHA512 336f5b59eb9cf4e93b537a212509d84f72cd9b8a97bf8ac0596eff298f3c0979bdea6c605244d5913670b9d20b017e5ee327f1e606f546a88e177a03c589a636 + DEPS gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-2-x86_64.pkg.tar.xz" + SHA512 d128bd1792d0f5750e6a63a24db86a791e7ee457db8c0bef68d217099be4a6eef27c85caf6ad09b0bcd5b3cdac6fc0a2b9842cc58d381a4035505906cc4803ec + DEPS gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/coreutils-8.32-1-x86_64.pkg.tar.xz" + SHA512 1a2ae4f296954421ce36f764b9b1c77ca72fc8583c46060b817677d0ad6adc7d7e3c2bbe1ae0179afd116a3d62f28e59eae2f7c84c1c8ffb7d22d2f2b40c0cdc + DEPS libiconv libintl gmp + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/grep-3.0-2-x86_64.pkg.tar.xz" + SHA512 c784d5f8a929ae251f2ffaccf7ab0b3936ae9f012041e8f074826dd6077ad0a859abba19feade1e71b3289cc640626dfe827afe91c272b38a1808f228f2fdd00 + DEPS libiconv libintl libpcre + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/sed-4.8-1-x86_64.pkg.tar.xz" + SHA512 b6e7ed0af9e04aba4992ee26d8616f7ac675c8137bb28558c049d50709afb571b33695ce21d01e5b7fe8e188c008dd2e8cbafc72a7e2a919c2d678506095132b + DEPS libintl + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/libpcre-8.44-1-x86_64.pkg.tar.xz" + SHA512 e9e56386fc5cca0f3c36cee21eda91300d9a13a962ec2f52eeea00f131915daea1cfeb0e1b30704bf3cc4357d941d356e0d72192bab3006c2548e18cd96dad77 + DEPS gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/m4-1.4.18-2-x86_64.pkg.tar.xz" + SHA512 061e9243c1e013aa093546e3872984ad47b7fc9d64d4c39dcce62e750ed632645df00be3fe382a2f55f3bf623dd0d649e2092be23e8f22f921f582e41893e36a + DEPS msys2-runtime + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/automake-wrapper-11-1-any.pkg.tar.xz" + SHA512 0fcfc80c31fd0bda5a46c55e9100a86d2fc788a92c7e2ca4fd281e551375c62eb5b9cc9ad9338bb44a815bf0b1d1b60b882c8e68ca3ea529b442f2d03d1d3e1f + DEPS gawk + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/gawk-5.1.0-1-x86_64.pkg.tar.xz" + SHA512 4e2be747b184f27945df6fb37d52d56fd8117d2fe4b289370bcdb5b15a4cf90cbeaea98cf9e64bcbfa2c13db50d8bd14cbd719c5f31b420842da903006dbc959 + DEPS libintl libreadline mpfr + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/mpfr-4.1.0-1-x86_64.pkg.tar.zst" + SHA512 d64fa60e188124591d41fc097d7eb51d7ea4940bac05cdcf5eafde951ed1eaa174468f5ede03e61106e1633e3428964b34c96de76321ed8853b398fbe8c4d072 + DEPS gmp gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/gmp-6.2.0-1-x86_64.pkg.tar.xz" + SHA512 1389a443e775bb255d905665dd577bef7ed71d51a8c24d118097f8119c08c4dfe67505e88ddd1e9a3764dd1d50ed8b84fa34abefa797d257e90586f0cbf54de8 + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/xz-5.2.5-1-x86_64.pkg.tar.xz" # this seems to require immediate updating on version bumps. + SHA512 99d092c3398277e47586cead103b41e023e9432911fb7bdeafb967b826f6a57d32e58afc94c8230dad5b5ec2aef4f10d61362a6d9e410a6645cf23f076736bba + DEPS liblzma libiconv gettext + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/liblzma-5.2.5-1-x86_64.pkg.tar.xz" + SHA512 8d5c04354fdc7309e73abce679a4369c0be3dc342de51cef9d2a932b7df6a961c8cb1f7e373b1b8b2be40343a95fbd57ac29ebef63d4a2074be1d865e28ca6ad + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/libreadline-8.0.004-1-x86_64.pkg.tar.xz" + SHA512 42760bddedccc8d93507c1e3a7a81595dc6392b5e4319d24a85275eb04c30eb79078e4247eb2cdd00ff3884d932639130c89bf1b559310a17fa4858062491f97 + DEPS ncurses + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/ncurses-6.2-1-x86_64.pkg.tar.xz" + SHA512 d4dc566d3dbd32e7646e328cb350689ede7eaa7008c8ed971072f8869a2986fe3935e7df1700851b52716af7ef20c49f9e6628d3163a5e9208a8872b5014eaea + DEPS msys2-runtime + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/automake1.16-1.16.2-1-any.pkg.tar.zst" + SHA512 568d1250a31a53452e029d1c236da66d67fffa786a8713128027d33a6a9408cda6e493e9c1555a816efee6245b05a1ef8f9ce3482c39de71356c2e983d926bf7 + DEPS perl + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/automake1.15-1.15.1-1-any.pkg.tar.xz" + SHA512 d5bb245ab1bb6b57c40ef97755bfb0919dcceb0eccc33e848809922bf6b032f9e4eb36d89aedf41542051277d92238bd48a74115867db0bbc1e1db1c975cc72c + DEPS perl + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/perl-5.32.0-1-x86_64.pkg.tar.zst" + SHA512 8acc6c4901bd2e24faf1951084d70029847f05e870826e07b8d9a5d90144f4aa0ab6e568e77c28c36650f016ee75ce78b0356c75673b212c992401f7f1543dd8 + DEPS libcrypt + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/libcrypt-2.1-2-x86_64.pkg.tar.xz" + SHA512 59a13f79f560934f880d68209a58a3c39ee4a1d24500035bde90d7a6f6ab0d4f72fe14edea6f19a8eb54d4d53b0b6ad4589b388f1521a07ab24a0f8307619cab + DEPS gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/pkg-config-0.29.2-1-x86_64.pkg.tar.xz" + SHA512 f1d70f0b4ebcfeb3fa2156a7a4f7b0b404795853e05361de14054dc6658a6154915bb982626cbfe76bef0828325f993f30da6817361ca8d7ea440a40023fa864 + DEPS libiconv + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/make-4.3-1-x86_64.pkg.tar.xz" + SHA512 7306dec7859edc27d70a24ab4b396728481484a426c5aa2f7e9fed2635b3b25548b05b7d37a161a86a8edaa5922948bee8c99b1e8a078606e69ca48a433fe321 + DEPS libintl msys2-runtime + ) msys_package( - URL "https://repo.msys2.org/msys/x86_64/gettext-devel-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 648f74c23e4f92145cdd0d45ff5285c2df34e855a9e75e5463dd6646967f8cf34a18ce357c6f498a4680e6d7b84e2d1697ba9deee84da8ea6bb14bbdb594ee22 - DEPS gettext - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/gettext-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 c8c42d084c297746548963f7ec7a7df46241886f3e637e779811ee4a8fee6058f892082bb2658f6777cbffba2de4bcdfd68e846ba63c6a6552c9efb0c8c1de50 - DEPS libintl libgettextpo libasprintf - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/libgettextpo-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 480b782a79b0ce71ed9939ae3a6821fc2f5a63358733965c62cee027d0e6c88e255df1d62379ee47f5a7f8ffe163e554e318dba22c67dc67469b10aa3248edf7 - DEPS gcc-libs - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/libasprintf-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 a2e8027b9bbee20f8cf60851130ca2af436641b1fb66054f8deba118da7ebecb1cd188224dcf08e4c5b7cde85b412efab058afef2358e843c9de8eb128ca448c - DEPS gcc-libs - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/findutils-4.7.0-1-x86_64.pkg.tar.xz" - SHA512 fd09a24562b196ff252f4b5de86ed977280306a8c628792930812f146fcf7355f9d87434bbabe25e6cc17d8bd028f6bc68fc02e5bea83137a49cf5cc6f509e10 - DEPS libintl libiconv - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/libintl-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 4e54c252b828c862f376d8f5a2410ee623a43d70cbb07d0b8ac20c25096f59fb3ae8dcd011d1792bec76f0b0b9411d0e184ee23707995761dc50eb76f9fc6b92 - DEPS libiconv - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/libiconv-1.16-2-x86_64.pkg.tar.zst" - SHA512 3ab569eca9887ef85e7dd5dbca3143d8a60f7103f370a7ecc979a58a56b0c8dcf1f54ac3df4495bc306bd44bf36ee285aaebbb221c4eebfc912cf47d347d45fc - DEPS gcc-libs - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/gcc-libs-9.3.0-1-x86_64.pkg.tar.xz" - SHA512 2816afbf45aa0ff47f94a623ad083d9421bca5284dc55683c2f1bc09ea0eadfe720afb75aafef60c2ff6384d051c4fbe2a744bb16a20acf34c04dc59b17c3d8c - DEPS msys2-runtime - ) - msys_package( - URL "https://repo.msys2.org/msys/x86_64/msys2-runtime-3.1.6-3-x86_64.pkg.tar.xz" - SHA512 f094a7f4926195ef7ba015f0c5c56587b1faa94d85530f07aaaa5557a1494c3bd75257d4687c8401cbf1328d23e5586a92b05f0a872caebb1a7e941a07829776 - ) + URL "https://repo.msys2.org/msys/x86_64/gettext-devel-0.19.8.1-1-x86_64.pkg.tar.xz" + SHA512 648f74c23e4f92145cdd0d45ff5285c2df34e855a9e75e5463dd6646967f8cf34a18ce357c6f498a4680e6d7b84e2d1697ba9deee84da8ea6bb14bbdb594ee22 + DEPS gettext + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/gettext-0.19.8.1-1-x86_64.pkg.tar.xz" + SHA512 c8c42d084c297746548963f7ec7a7df46241886f3e637e779811ee4a8fee6058f892082bb2658f6777cbffba2de4bcdfd68e846ba63c6a6552c9efb0c8c1de50 + DEPS libintl libgettextpo libasprintf + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/libgettextpo-0.19.8.1-1-x86_64.pkg.tar.xz" + SHA512 480b782a79b0ce71ed9939ae3a6821fc2f5a63358733965c62cee027d0e6c88e255df1d62379ee47f5a7f8ffe163e554e318dba22c67dc67469b10aa3248edf7 + DEPS gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/libasprintf-0.19.8.1-1-x86_64.pkg.tar.xz" + SHA512 a2e8027b9bbee20f8cf60851130ca2af436641b1fb66054f8deba118da7ebecb1cd188224dcf08e4c5b7cde85b412efab058afef2358e843c9de8eb128ca448c + DEPS gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/findutils-4.7.0-1-x86_64.pkg.tar.xz" + SHA512 fd09a24562b196ff252f4b5de86ed977280306a8c628792930812f146fcf7355f9d87434bbabe25e6cc17d8bd028f6bc68fc02e5bea83137a49cf5cc6f509e10 + DEPS libintl libiconv + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/libintl-0.19.8.1-1-x86_64.pkg.tar.xz" + SHA512 4e54c252b828c862f376d8f5a2410ee623a43d70cbb07d0b8ac20c25096f59fb3ae8dcd011d1792bec76f0b0b9411d0e184ee23707995761dc50eb76f9fc6b92 + DEPS libiconv + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/libiconv-1.16-2-x86_64.pkg.tar.zst" + SHA512 3ab569eca9887ef85e7dd5dbca3143d8a60f7103f370a7ecc979a58a56b0c8dcf1f54ac3df4495bc306bd44bf36ee285aaebbb221c4eebfc912cf47d347d45fc + DEPS gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/gcc-libs-9.3.0-1-x86_64.pkg.tar.xz" + SHA512 2816afbf45aa0ff47f94a623ad083d9421bca5284dc55683c2f1bc09ea0eadfe720afb75aafef60c2ff6384d051c4fbe2a744bb16a20acf34c04dc59b17c3d8c + DEPS msys2-runtime + ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/msys2-runtime-3.1.6-3-x86_64.pkg.tar.xz" + SHA512 f094a7f4926195ef7ba015f0c5c56587b1faa94d85530f07aaaa5557a1494c3bd75257d4687c8401cbf1328d23e5586a92b05f0a872caebb1a7e941a07829776 + ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-numpy-1.19.0-1-any.pkg.tar.zst" - SHA512 15791fff23deda17a4452c9ca3f23210ed77ee20dcdd6e0c31d0e626a63aeb93d15ed814078729101f1cce96129b4b5e3c898396b003d794a52d7169dd027465 - DEPS mingw-w64-x86_64-openblas mingw-w64-x86_64-python - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openblas-0.3.10-2-any.pkg.tar.zst" - SHA512 3cf15ef191ceb303a7e40ad98aca94c56211b245617c17682379b5606a1a76e12d04fa1a83c6109e89620200a74917bcd981380c7749dda12fa8e79f0b923877 - DEPS mingw-w64-x86_64-gcc-libgfortran mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-10.2.0-1-any.pkg.tar.zst" - SHA512 c2dee2957356fa51aae39d907d0cc07f966028b418f74a1ea7ea551ff001c175d86781f980c0cf994207794322dcd369fa122ab78b6c6d0f0ab01e39a754e780 - DEPS mingw-w64-x86_64-gcc-libs - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.5-1-any.pkg.tar.zst" - SHA512 49bbcaa9479ff95fd21b473a1bc286886b204ec3e2e0d9466322e96a9ee07ccd8116024b54b967a87e4752057004475cac5060605e87bd5057de45efe5122a25 - DEPS mingw-w64-x86_64-bzip2 mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libffi mingw-w64-x86_64-mpdecimal mingw-w64-x86_64-ncurses mingw-w64-x86_64-openssl mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-tcl mingw-w64-x86_64-tk mingw-w64-x86_64-xz mingw-w64-x86_64-zlib - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-bzip2-1.0.8-1-any.pkg.tar.xz" - SHA512 6e01b26a2144f99ca00406dbce5b8c3e928ec8a3ff77e0b741b26aaf9c927e9bea8cb1b5f38cd59118307e10dd4523a0ea2a1ea61f798f99e6d605ef1d100503 - DEPS mingw-w64-x86_64-gcc-libs - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpdecimal-2.5.0-1-any.pkg.tar.zst" - SHA512 48130ff676c0235bad4648527021e597ee00aa49a4443740a134005877e2ff2ca27b30a0ac86b923192a65348b36de4e8d3f9c57d76ab42b2e21d1a92dbf7ccf - DEPS mingw-w64-x86_64-gcc-libs - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ncurses-6.2-1-any.pkg.tar.xz" - SHA512 1cbffe0e181a3d4ceaa8f39b2a649584b2c7d689e6a057d85cb9f84edece2cf60eddc220127c7fa4f29e4aa6e8fb4f568ef9d73582d08168607135af977407e0 - DEPS mingw-w64-x86_64-libsystre - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libsystre-1.0.1-4-any.pkg.tar.xz" - SHA512 6540e896636d00d1ea4782965b3fe4d4ef1e32e689a98d25e2987191295b319eb1de2e56be3a4b524ff94f522a6c3e55f8159c1a6f58c8739e90f8e24e2d40d8 - DEPS mingw-w64-x86_64-libtre - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtre-git-r128.6fb7206-2-any.pkg.tar.xz" - NAME mingw-w64-x86_64-libtre - VERSION git-r128.6fb7206-2 - ANY - REPO mingw/x86_64 - SHA512 d595dbcf3a3b6ed098e46f370533ab86433efcd6b4d3dcf00bbe944ab8c17db7a20f6535b523da43b061f071a3b8aa651700b443ae14ec752ae87500ccc0332d - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openssl-1.1.1.g-1-any.pkg.tar.xz" - SHA512 81681089a19cae7dbdee1bc9d3148f03458fa7a1d2fd105be39299b3a0c91b34450bcfe2ad86622bc6819da1558d7217deb0807b4a7bed942a9a7a786fcd54a3 - DEPS mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ca-certificates-20200601-1-any.pkg.tar.zst" - SHA512 21a81e1529a3ad4f6eceb3b7d4e36400712d3a690d3991131573d4aae8364965757f9b02054d93c853eb75fbb7f6173a278b122450c800b2c9a1e8017dd35e28 - DEPS mingw-w64-x86_64-p11-kit - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-p11-kit-0.23.20-2-any.pkg.tar.xz" - SHA512 c441c4928465a98aa53917df737b728275bc0f6e9b41e13de7c665a37d2111b46f057bb652a1d5a6c7cdf8a74ea15e365a727671b698f5bbb5a7cfd0b889935e - DEPS mingw-w64-x86_64-gettext mingw-w64-x86_64-libffi mingw-w64-x86_64-libtasn1 - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtasn1-4.16.0-1-any.pkg.tar.xz" - SHA512 c450cd49391b46af552a89f2f6e2c21dd5da7d40e7456b380290c514a0f06bcbd63f0f972b3c173c4237bec7b652ff22d2d330e8fdf5c888558380bd2667be64 - DEPS mingw-w64-x86_64-gcc-libs - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-sqlite3-3.33.0-1-any.pkg.tar.zst" - SHA512 eae319f87c9849049347f132efc2ecc46e9ac1ead55542e31a3ea216932a4fa5c5bae8d468d2f050e1e22068ac9fbe9d8e1aa7612cc0110cafe6605032adeb0f - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-readline mingw-w64-x86_64-tcl - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-8.0.004-1-any.pkg.tar.xz" - SHA512 e3fb3030a50f677697bec0da39ba2eb979dc28991ad0e29012cbf1bda82723176148510bf924b7fce7a0b79e7b078232d69e07f3fbb7d657b8ee631841730120 - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-termcap - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-termcap-1.3.1-6-any.pkg.tar.zst" - SHA512 602d182ba0f1e20c4c51ae09b327c345bd736e6e4f22cd7d58374ac68c705dd0af97663b9b94d41870457f46bb9110abb29186d182196133618fc460f71d1300 - DEPS mingw-w64-x86_64-gcc-libs - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tk-8.6.10-1-any.pkg.tar.xz" - SHA512 3be88b87d5e77a875ea98f0bce4192242e550eeb1b0d44abfee9c8797135a45dd3219b89006de99458dd3f9ae47da77dccc63dab25cea93fbc285af756264eb8 - DEPS mingw-w64-x86_64-tcl - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tcl-8.6.10-1-any.pkg.tar.xz" - SHA512 c3f21588e19725598878ef13145fbe7a995c2a0c678ef0a4782e28fd64d65fe3271178369bf0c54e92123eba82f2d3da6ae2fc34acd3b20150d1e173be1c0f8f - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-xz-5.2.5-1-any.pkg.tar.xz" - SHA512 0e1336a1565cda6e78996d69ba973aaa3522392ab586f70b0b93dbe09be50baf3e14f8ba0afcc665bc885508f1a898b16f206f89eaa3cbc9985afeea6ff1c02b - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gettext-0.19.8.1-9-any.pkg.tar.zst" - SHA512 571a36cf60e40172aaa7a5a40b1db60bbea145d9f399603a625a57ca106679f6feb53fda73d935ce8f0057935cad5b9a8770ae4f065e54e1554a1932b48eec97 - DEPS mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libiconv - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-10.2.0-1-any.pkg.tar.zst" - SHA512 d17eff08c83d08ef020d999a2ead0d25036ada1c1bf6ed7c02bad9b56840ee5a3304acd790d86f52b83b09c1e788f0cecdf7254dc6760c3c7e478f65882cd32d - DEPS mingw-w64-x86_64-gmp mingw-w64-x86_64-libwinpthread mingw-w64-x86_64-mpc mingw-w64-x86_64-mpfr - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.0-1-any.pkg.tar.zst" - SHA512 e2e561ef7c1bd85bbf021ecbe4df1cfd377a5b426ec0091f267111b9f18d476d5f95a40e0ffbd97aee5f331c49dc7a8dfc2111d54cc979643fae30e564d671aa - DEPS mingw-w64-x86_64-mpfr - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.1.0-2-any.pkg.tar.zst" - SHA512 14739667242b8852f0d26547eb3297899a51fd1edafc7101b4e7489273e1efb9cb8422fc067361e3c3694c2afcc6c49fc89537f9f811ad5b9b595873112ee890 - DEPS mingw-w64-x86_64-gmp - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.0-1-any.pkg.tar.xz" - SHA512 0b22b7363e27cec706eb79ee0c45b5fe7088a5ca69e0868e7366481ed2ea9b3f6623d340cebba0b5ed3d79e4dfc7cf15f53530eb260c6d4057bfc3d92eb8c7bc - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-expat-2.2.9-1-any.pkg.tar.xz" - SHA512 1f747b9c7e6ee680b6d8f76429e81a42e2d4ab72d5d930207c90f4513cca5158c08c8296889fd27fe07a275cdeff5d34b5de0e6d1cd982d2e1d05765d6c8c31a - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libffi-3.3-1-any.pkg.tar.xz" - SHA512 90451ac2dadcd3f1310b6af977d4c56d239500743a3d67e4f8df915e6e6f65f34d4244843d8bac5718642973be5312c17cb3fb0b4c64732cda06437e9f1ce86d - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-1-any.pkg.tar.xz" - SHA512 c8e2fda532c753e0b1004596bf737c3669355f32af9b45d96c23fcef14994ba21ddf4f75138bdecc94cbf8a8c449eff530d24b74a0da47793e24ce92d154f411 - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-7-any.pkg.tar.xz" - SHA512 bbd4a549efc2a5f4b1e9f1be00331e8726d80401a9c6117afa9d5dd92f4ac42a06cf2ce491a988e5c6ed7a6e536f8f1746081f4944bc6d473ccd16390fea27fe - ) - msys_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-8.0.0.5906.c9a21571-1-any.pkg.tar.zst" - NAME mingw-w64-x86_64-libwinpthread - VERSION git-8.0.0.5906.c9a21571-1 - ANY - ZST - REPO mingw/x86_64 - SHA512 a6969a5db1c55ba458c1a047d0a2a9d2db6cc24266ea47f740598b149a601995d2de734a0984ac5e57ee611d5982cbc03fd6fc0f498435e8d6401bf15724caad - ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-numpy-1.19.0-1-any.pkg.tar.zst" + SHA512 15791fff23deda17a4452c9ca3f23210ed77ee20dcdd6e0c31d0e626a63aeb93d15ed814078729101f1cce96129b4b5e3c898396b003d794a52d7169dd027465 + DEPS mingw-w64-x86_64-openblas mingw-w64-x86_64-python + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openblas-0.3.10-2-any.pkg.tar.zst" + SHA512 3cf15ef191ceb303a7e40ad98aca94c56211b245617c17682379b5606a1a76e12d04fa1a83c6109e89620200a74917bcd981380c7749dda12fa8e79f0b923877 + DEPS mingw-w64-x86_64-gcc-libgfortran mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-10.2.0-1-any.pkg.tar.zst" + SHA512 c2dee2957356fa51aae39d907d0cc07f966028b418f74a1ea7ea551ff001c175d86781f980c0cf994207794322dcd369fa122ab78b6c6d0f0ab01e39a754e780 + DEPS mingw-w64-x86_64-gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.5-1-any.pkg.tar.zst" + SHA512 49bbcaa9479ff95fd21b473a1bc286886b204ec3e2e0d9466322e96a9ee07ccd8116024b54b967a87e4752057004475cac5060605e87bd5057de45efe5122a25 + DEPS mingw-w64-x86_64-bzip2 mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libffi mingw-w64-x86_64-mpdecimal mingw-w64-x86_64-ncurses mingw-w64-x86_64-openssl mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-tcl mingw-w64-x86_64-tk mingw-w64-x86_64-xz mingw-w64-x86_64-zlib + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-bzip2-1.0.8-1-any.pkg.tar.xz" + SHA512 6e01b26a2144f99ca00406dbce5b8c3e928ec8a3ff77e0b741b26aaf9c927e9bea8cb1b5f38cd59118307e10dd4523a0ea2a1ea61f798f99e6d605ef1d100503 + DEPS mingw-w64-x86_64-gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpdecimal-2.5.0-1-any.pkg.tar.zst" + SHA512 48130ff676c0235bad4648527021e597ee00aa49a4443740a134005877e2ff2ca27b30a0ac86b923192a65348b36de4e8d3f9c57d76ab42b2e21d1a92dbf7ccf + DEPS mingw-w64-x86_64-gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ncurses-6.2-1-any.pkg.tar.xz" + SHA512 1cbffe0e181a3d4ceaa8f39b2a649584b2c7d689e6a057d85cb9f84edece2cf60eddc220127c7fa4f29e4aa6e8fb4f568ef9d73582d08168607135af977407e0 + DEPS mingw-w64-x86_64-libsystre + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libsystre-1.0.1-4-any.pkg.tar.xz" + SHA512 6540e896636d00d1ea4782965b3fe4d4ef1e32e689a98d25e2987191295b319eb1de2e56be3a4b524ff94f522a6c3e55f8159c1a6f58c8739e90f8e24e2d40d8 + DEPS mingw-w64-x86_64-libtre + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtre-git-r128.6fb7206-2-any.pkg.tar.xz" + NAME mingw-w64-x86_64-libtre + VERSION git-r128.6fb7206-2 + ANY + REPO mingw/x86_64 + SHA512 d595dbcf3a3b6ed098e46f370533ab86433efcd6b4d3dcf00bbe944ab8c17db7a20f6535b523da43b061f071a3b8aa651700b443ae14ec752ae87500ccc0332d + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openssl-1.1.1.g-1-any.pkg.tar.xz" + SHA512 81681089a19cae7dbdee1bc9d3148f03458fa7a1d2fd105be39299b3a0c91b34450bcfe2ad86622bc6819da1558d7217deb0807b4a7bed942a9a7a786fcd54a3 + DEPS mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ca-certificates-20200601-1-any.pkg.tar.zst" + SHA512 21a81e1529a3ad4f6eceb3b7d4e36400712d3a690d3991131573d4aae8364965757f9b02054d93c853eb75fbb7f6173a278b122450c800b2c9a1e8017dd35e28 + DEPS mingw-w64-x86_64-p11-kit + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-p11-kit-0.23.20-2-any.pkg.tar.xz" + SHA512 c441c4928465a98aa53917df737b728275bc0f6e9b41e13de7c665a37d2111b46f057bb652a1d5a6c7cdf8a74ea15e365a727671b698f5bbb5a7cfd0b889935e + DEPS mingw-w64-x86_64-gettext mingw-w64-x86_64-libffi mingw-w64-x86_64-libtasn1 + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtasn1-4.16.0-1-any.pkg.tar.xz" + SHA512 c450cd49391b46af552a89f2f6e2c21dd5da7d40e7456b380290c514a0f06bcbd63f0f972b3c173c4237bec7b652ff22d2d330e8fdf5c888558380bd2667be64 + DEPS mingw-w64-x86_64-gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-sqlite3-3.33.0-1-any.pkg.tar.zst" + SHA512 eae319f87c9849049347f132efc2ecc46e9ac1ead55542e31a3ea216932a4fa5c5bae8d468d2f050e1e22068ac9fbe9d8e1aa7612cc0110cafe6605032adeb0f + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-readline mingw-w64-x86_64-tcl + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-8.0.004-1-any.pkg.tar.xz" + SHA512 e3fb3030a50f677697bec0da39ba2eb979dc28991ad0e29012cbf1bda82723176148510bf924b7fce7a0b79e7b078232d69e07f3fbb7d657b8ee631841730120 + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-termcap + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-termcap-1.3.1-6-any.pkg.tar.zst" + SHA512 602d182ba0f1e20c4c51ae09b327c345bd736e6e4f22cd7d58374ac68c705dd0af97663b9b94d41870457f46bb9110abb29186d182196133618fc460f71d1300 + DEPS mingw-w64-x86_64-gcc-libs + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tk-8.6.10-1-any.pkg.tar.xz" + SHA512 3be88b87d5e77a875ea98f0bce4192242e550eeb1b0d44abfee9c8797135a45dd3219b89006de99458dd3f9ae47da77dccc63dab25cea93fbc285af756264eb8 + DEPS mingw-w64-x86_64-tcl + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tcl-8.6.10-1-any.pkg.tar.xz" + SHA512 c3f21588e19725598878ef13145fbe7a995c2a0c678ef0a4782e28fd64d65fe3271178369bf0c54e92123eba82f2d3da6ae2fc34acd3b20150d1e173be1c0f8f + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-xz-5.2.5-1-any.pkg.tar.xz" + SHA512 0e1336a1565cda6e78996d69ba973aaa3522392ab586f70b0b93dbe09be50baf3e14f8ba0afcc665bc885508f1a898b16f206f89eaa3cbc9985afeea6ff1c02b + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gettext-0.19.8.1-9-any.pkg.tar.zst" + SHA512 571a36cf60e40172aaa7a5a40b1db60bbea145d9f399603a625a57ca106679f6feb53fda73d935ce8f0057935cad5b9a8770ae4f065e54e1554a1932b48eec97 + DEPS mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libiconv + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-10.2.0-1-any.pkg.tar.zst" + SHA512 d17eff08c83d08ef020d999a2ead0d25036ada1c1bf6ed7c02bad9b56840ee5a3304acd790d86f52b83b09c1e788f0cecdf7254dc6760c3c7e478f65882cd32d + DEPS mingw-w64-x86_64-gmp mingw-w64-x86_64-libwinpthread mingw-w64-x86_64-mpc mingw-w64-x86_64-mpfr + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.0-1-any.pkg.tar.zst" + SHA512 e2e561ef7c1bd85bbf021ecbe4df1cfd377a5b426ec0091f267111b9f18d476d5f95a40e0ffbd97aee5f331c49dc7a8dfc2111d54cc979643fae30e564d671aa + DEPS mingw-w64-x86_64-mpfr + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.1.0-2-any.pkg.tar.zst" + SHA512 14739667242b8852f0d26547eb3297899a51fd1edafc7101b4e7489273e1efb9cb8422fc067361e3c3694c2afcc6c49fc89537f9f811ad5b9b595873112ee890 + DEPS mingw-w64-x86_64-gmp + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.0-1-any.pkg.tar.xz" + SHA512 0b22b7363e27cec706eb79ee0c45b5fe7088a5ca69e0868e7366481ed2ea9b3f6623d340cebba0b5ed3d79e4dfc7cf15f53530eb260c6d4057bfc3d92eb8c7bc + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-expat-2.2.9-1-any.pkg.tar.xz" + SHA512 1f747b9c7e6ee680b6d8f76429e81a42e2d4ab72d5d930207c90f4513cca5158c08c8296889fd27fe07a275cdeff5d34b5de0e6d1cd982d2e1d05765d6c8c31a + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libffi-3.3-1-any.pkg.tar.xz" + SHA512 90451ac2dadcd3f1310b6af977d4c56d239500743a3d67e4f8df915e6e6f65f34d4244843d8bac5718642973be5312c17cb3fb0b4c64732cda06437e9f1ce86d + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-1-any.pkg.tar.xz" + SHA512 c8e2fda532c753e0b1004596bf737c3669355f32af9b45d96c23fcef14994ba21ddf4f75138bdecc94cbf8a8c449eff530d24b74a0da47793e24ce92d154f411 + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-7-any.pkg.tar.xz" + SHA512 bbd4a549efc2a5f4b1e9f1be00331e8726d80401a9c6117afa9d5dd92f4ac42a06cf2ce491a988e5c6ed7a6e536f8f1746081f4944bc6d473ccd16390fea27fe + ) + msys_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-8.0.0.5906.c9a21571-1-any.pkg.tar.zst" + NAME mingw-w64-x86_64-libwinpthread + VERSION git-8.0.0.5906.c9a21571-1 + ANY + ZST + REPO mingw/x86_64 + SHA512 a6969a5db1c55ba458c1a047d0a2a9d2db6cc24266ea47f740598b149a601995d2de734a0984ac5e57ee611d5982cbc03fd6fc0f498435e8d6401bf15724caad + ) - if(PACKAGES) - message(FATAL_ERROR "Unknown packages were required for vcpkg_acquire_msys(${_am_PACKAGES}): ${PACKAGES}\nThis can be resolved by explicitly passing URL/SHA pairs to DIRECT_PACKAGES.") - endif() + if(PACKAGES) + message(FATAL_ERROR "Unknown packages were required for vcpkg_acquire_msys(${_am_PACKAGES}): ${PACKAGES}\nThis can be resolved by explicitly passing URL/SHA pairs to DIRECT_PACKAGES.") + endif() - string(SHA512 TOTAL_HASH "${TOTAL_HASH}") - string(SUBSTRING "${TOTAL_HASH}" 0 16 TOTAL_HASH) - set(PATH_TO_ROOT ${DOWNLOADS}/tools/msys2/${TOTAL_HASH}) - if(NOT EXISTS "${PATH_TO_ROOT}") - file(REMOVE_RECURSE ${PATH_TO_ROOT}.tmp) - file(MAKE_DIRECTORY ${PATH_TO_ROOT}.tmp/tmp) - set(I 0) - foreach(ARCHIVE IN LISTS ARCHIVES) - vcpkg_execute_required_process( - ALLOW_IN_DOWNLOAD_MODE - COMMAND ${CMAKE_COMMAND} -E tar xzf ${ARCHIVE} - LOGNAME msys-${TARGET_TRIPLET}-${I} - WORKING_DIRECTORY ${PATH_TO_ROOT}.tmp - ) - math(EXPR I "${I} + 1") - endforeach() - file(RENAME ${PATH_TO_ROOT}.tmp ${PATH_TO_ROOT}) - endif() - message(STATUS "Using msys root at ${DOWNLOADS}/tools/msys2/${TOTAL_HASH}") - set(${PATH_TO_ROOT_OUT} ${PATH_TO_ROOT} PARENT_SCOPE) + string(SHA512 TOTAL_HASH "${TOTAL_HASH}") + string(SUBSTRING "${TOTAL_HASH}" 0 16 TOTAL_HASH) + set(PATH_TO_ROOT ${DOWNLOADS}/tools/msys2/${TOTAL_HASH}) + if(NOT EXISTS "${PATH_TO_ROOT}") + file(REMOVE_RECURSE ${PATH_TO_ROOT}.tmp) + file(MAKE_DIRECTORY ${PATH_TO_ROOT}.tmp/tmp) + set(I 0) + foreach(ARCHIVE IN LISTS ARCHIVES) + vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND ${CMAKE_COMMAND} -E tar xzf ${ARCHIVE} + LOGNAME msys-${TARGET_TRIPLET}-${I} + WORKING_DIRECTORY ${PATH_TO_ROOT}.tmp + ) + math(EXPR I "${I} + 1") + endforeach() + file(RENAME ${PATH_TO_ROOT}.tmp ${PATH_TO_ROOT}) + endif() + message(STATUS "Using msys root at ${DOWNLOADS}/tools/msys2/${TOTAL_HASH}") + set(${PATH_TO_ROOT_OUT} ${PATH_TO_ROOT} PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/vcpkg_add_to_path.cmake b/scripts/cmake/vcpkg_add_to_path.cmake index 05763b2ef2027c..6239db0486fc20 100644 --- a/scripts/cmake/vcpkg_add_to_path.cmake +++ b/scripts/cmake/vcpkg_add_to_path.cmake @@ -1,26 +1,27 @@ -## # vcpkg_add_to_path -## -## Add a directory to the PATH environment variable -## -## ## Usage -## ```cmake -## vcpkg_add_to_path([PREPEND] <${PYTHON3_DIR}>) -## ``` -## -## ## Parameters -## ### -## The directory to add -## -## ### PREPEND -## Prepends the directory. -## -## The default is to append. -## -## ## Examples: -## * [curl](https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake#L75) -## * [folly](https://github.com/Microsoft/vcpkg/blob/master/ports/folly/portfile.cmake#L15) -## * [z3](https://github.com/Microsoft/vcpkg/blob/master/ports/z3/portfile.cmake#L13) -## +#[===[ +# vcpkg_add_to_path + +Add a directory to the PATH environment variable + +## Usage +```cmake +vcpkg_add_to_path([PREPEND] <${PYTHON3_DIR}>) +``` + +## Parameters +### +The directory to add + +### PREPEND +Prepends the directory. + +The default is to append. + +## Examples: +* [curl](https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake#L75) +* [folly](https://github.com/Microsoft/vcpkg/blob/master/ports/folly/portfile.cmake#L15) +* [z3](https://github.com/Microsoft/vcpkg/blob/master/ports/z3/portfile.cmake#L13) +#]===] function(vcpkg_add_to_path) if(NOT "${ARGC}" STREQUAL "1" AND NOT "${ARGC}" STREQUAL "2") message(FATAL_ERROR "vcpkg_add_to_path() only accepts 1 or 2 arguments.") @@ -36,4 +37,4 @@ function(vcpkg_add_to_path) endif() set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${ARGV0}") endif() -endfunction() \ No newline at end of file +endfunction() diff --git a/scripts/cmake/vcpkg_apply_patches.cmake b/scripts/cmake/vcpkg_apply_patches.cmake index 5ca7dbca07ad5d..25ba4533199d76 100644 --- a/scripts/cmake/vcpkg_apply_patches.cmake +++ b/scripts/cmake/vcpkg_apply_patches.cmake @@ -1,34 +1,36 @@ -## # vcpkg_apply_patches -## -## Apply a set of patches to a source tree. This function is deprecated in favor of the `PATCHES` argument to `vcpkg_from_github()` et al. -## -## ## Usage -## ```cmake -## vcpkg_apply_patches( -## SOURCE_PATH <${SOURCE_PATH}> -## [QUIET] -## PATCHES ... -## ) -## ``` -## -## ## Parameters -## ### SOURCE_PATH -## The source path in which apply the patches. By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. -## -## ### PATCHES -## A list of patches that are applied to the source tree. -## -## Generally, these take the form of `${CMAKE_CURRENT_LIST_DIR}/some.patch` to select patches in the `port\\` directory. -## -## ### QUIET -## Disables the warning message upon failure. -## -## This should only be used for edge cases, such as patches that are known to fail even on a clean source tree. -## -## ## Examples -## -## * [libbson](https://github.com/Microsoft/vcpkg/blob/master/ports/libbson/portfile.cmake) -## * [gdal](https://github.com/Microsoft/vcpkg/blob/master/ports/gdal/portfile.cmake) +#[===[.md +# vcpkg_apply_patches + +Apply a set of patches to a source tree. This function is deprecated in favor of the `PATCHES` argument to `vcpkg_from_github()` et al. + +## Usage +```cmake +vcpkg_apply_patches( + SOURCE_PATH <${SOURCE_PATH}> + [QUIET] + PATCHES ... +) +``` + +## Parameters +### SOURCE_PATH +The source path in which apply the patches. By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. + +### PATCHES +A list of patches that are applied to the source tree. + +Generally, these take the form of `${CMAKE_CURRENT_LIST_DIR}/some.patch` to select patches in the `port\\` directory. + +### QUIET +Disables the warning message upon failure. + +This should only be used for edge cases, such as patches that are known to fail even on a clean source tree. + +## Examples + +* [libbson](https://github.com/Microsoft/vcpkg/blob/master/ports/libbson/portfile.cmake) +* [gdal](https://github.com/Microsoft/vcpkg/blob/master/ports/gdal/portfile.cmake) +#]===] include(vcpkg_execute_in_download_mode) diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake index a429ebf4b9ccdb..d463d29c75cb4f 100644 --- a/scripts/cmake/vcpkg_build_cmake.cmake +++ b/scripts/cmake/vcpkg_build_cmake.cmake @@ -1,34 +1,37 @@ -## # vcpkg_build_cmake -## -## Build a cmake project. -## -## ## Usage: -## ```cmake -## vcpkg_build_cmake([DISABLE_PARALLEL] [TARGET ]) -## ``` -## -## ## Parameters: -## ### DISABLE_PARALLEL -## The underlying buildsystem will be instructed to not parallelize -## -## ### TARGET -## The target passed to the cmake build command (`cmake --build . --target `). If not specified, no target will -## be passed. -## -## ### ADD_BIN_TO_PATH -## Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. -## -## ## Notes: -## This command should be preceeded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md). -## You can use the alias [`vcpkg_install_cmake()`](vcpkg_configure_cmake.md) function if your CMake script supports the -## "install" target -## -## ## Examples: -## -## * [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) -## * [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) -## * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) -## * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) +#[===[.md: +# vcpkg_build_cmake + +Build a cmake project. + +## Usage: +```cmake +vcpkg_build_cmake([DISABLE_PARALLEL] [TARGET ]) +``` + +## Parameters: +### DISABLE_PARALLEL +The underlying buildsystem will be instructed to not parallelize + +### TARGET +The target passed to the cmake build command (`cmake --build . --target `). If not specified, no target will +be passed. + +### ADD_BIN_TO_PATH +Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. + +## Notes: +This command should be preceeded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md). +You can use the alias [`vcpkg_install_cmake()`](vcpkg_configure_cmake.md) function if your CMake script supports the +"install" target + +## Examples: + +* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) +* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) +* [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) +* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) +#]===] + function(vcpkg_build_cmake) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 _bc "DISABLE_PARALLEL;ADD_BIN_TO_PATH" "TARGET;LOGFILE_ROOT" "") diff --git a/scripts/cmake/vcpkg_build_gn.cmake b/scripts/cmake/vcpkg_build_gn.cmake index cf0ea89cf8421f..3952e7eedc1cb8 100644 --- a/scripts/cmake/vcpkg_build_gn.cmake +++ b/scripts/cmake/vcpkg_build_gn.cmake @@ -1,18 +1,20 @@ -## # vcpkg_build_gn -## -## Build a GN project -## -## ## Usage: -## ```cmake -## vcpkg_build_gn( -## [TARGETS ...] -## ) -## ``` -## -## ## Parameters: -## ### TARGETS -## Only build the specified targets. +#[===[.md: +# vcpkg_build_gn + +Build a GN project + +## Usage: +```cmake +vcpkg_build_gn( + [TARGETS ...] +) +``` + +## Parameters: +### TARGETS +Only build the specified targets. +#]===] function(vcpkg_build_gn) vcpkg_build_ninja(${ARGN}) -endfunction() \ No newline at end of file +endfunction() diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index d74db5f45a75fc..654fb8799b8d52 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -1,50 +1,53 @@ -## # vcpkg_build_make -## -## Build a linux makefile project. -## -## ## Usage: -## ```cmake -## vcpkg_build_make([BUILD_TARGET ] -## [ADD_BIN_TO_PATH] -## [ENABLE_INSTALL]) -## [MAKEFILE ] -## [LOGFILE_ROOT ]) -## ``` -## -## ### BUILD_TARGET -## The target passed to the make build command (`./make `). If not specified, the 'all' target will -## be passed. -## -## ### ADD_BIN_TO_PATH -## Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. -## -## ### ENABLE_INSTALL -## IF the port supports the install target use vcpkg_install_make() instead of vcpkg_build_make() -## -## ### MAKEFILE -## Specifies the Makefile as a relative path from the root of the sources passed to `vcpkg_configure_make()` -## -## ### BUILD_TARGET -## The target passed to the make build command (`./make `). If not specified, the 'all' target will -## be passed. -## -## ### DISABLE_PARALLEL -## The underlying buildsystem will be instructed to not parallelize -## -## ### SUBPATH -## Additional subdir to invoke make in. Useful if only parts of a port should be built. -## -## ## Notes: -## This command should be preceeded by a call to [`vcpkg_configure_make()`](vcpkg_configure_make.md). -## You can use the alias [`vcpkg_install_make()`](vcpkg_configure_make.md) function if your CMake script supports the -## "install" target -## -## ## Examples -## -## * [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake) -## * [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) -## * [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) -## * [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) +#[===[.md: +# vcpkg_build_make + +Build a linux makefile project. + +## Usage: +```cmake +vcpkg_build_make([BUILD_TARGET ] + [ADD_BIN_TO_PATH] + [ENABLE_INSTALL] + [MAKEFILE ] + [LOGFILE_ROOT ]) +``` + +### BUILD_TARGET +The target passed to the make build command (`./make `). If not specified, the 'all' target will +be passed. + +### ADD_BIN_TO_PATH +Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. + +### ENABLE_INSTALL +IF the port supports the install target use vcpkg_install_make() instead of vcpkg_build_make() + +### MAKEFILE +Specifies the Makefile as a relative path from the root of the sources passed to `vcpkg_configure_make()` + +### BUILD_TARGET +The target passed to the make build command (`./make `). If not specified, the 'all' target will +be passed. + +### DISABLE_PARALLEL +The underlying buildsystem will be instructed to not parallelize + +### SUBPATH +Additional subdir to invoke make in. Useful if only parts of a port should be built. + +## Notes: +This command should be preceeded by a call to [`vcpkg_configure_make()`](vcpkg_configure_make.md). +You can use the alias [`vcpkg_install_make()`](vcpkg_install_make.md) function if your CMake script supports the +"install" target + +## Examples + +* [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake) +* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) +* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) +* [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) +#]===] + function(vcpkg_build_make) if(NOT _VCPKG_CMAKE_VARS_FILE) # vcpkg_build_make called without using vcpkg_configure_make before diff --git a/scripts/cmake/vcpkg_build_msbuild.cmake b/scripts/cmake/vcpkg_build_msbuild.cmake index 19b136cd2995f4..a682c6a17869ba 100644 --- a/scripts/cmake/vcpkg_build_msbuild.cmake +++ b/scripts/cmake/vcpkg_build_msbuild.cmake @@ -1,65 +1,67 @@ -## # vcpkg_build_msbuild -## -## Build a msbuild-based project. Deprecated in favor of `vcpkg_install_msbuild()`. -## -## ## Usage -## ```cmake -## vcpkg_build_msbuild( -## PROJECT_PATH <${SOURCE_PATH}/port.sln> -## [RELEASE_CONFIGURATION ] -## [DEBUG_CONFIGURATION ] -## [TARGET ] -## [TARGET_PLATFORM_VERSION <10.0.15063.0>] -## [PLATFORM <${TRIPLET_SYSTEM_ARCH}>] -## [PLATFORM_TOOLSET <${VCPKG_PLATFORM_TOOLSET}>] -## [OPTIONS ...] -## [OPTIONS_RELEASE ...] -## [OPTIONS_DEBUG ...] -## [USE_VCPKG_INTEGRATION] -## ) -## ``` -## -## ## Parameters -## ### USE_VCPKG_INTEGRATION -## Apply the normal `integrate install` integration for building the project. -## -## By default, projects built with this command will not automatically link libraries or have header paths set. -## -## ### PROJECT_PATH -## The path to the solution (`.sln`) or project (`.vcxproj`) file. -## -## ### RELEASE_CONFIGURATION -## The configuration (``/p:Configuration`` msbuild parameter) used for Release builds. -## -## ### DEBUG_CONFIGURATION -## The configuration (``/p:Configuration`` msbuild parameter) -## used for Debug builds. -## -## ### TARGET_PLATFORM_VERSION -## The WindowsTargetPlatformVersion (``/p:WindowsTargetPlatformVersion`` msbuild parameter) -## -## ### TARGET -## The MSBuild target to build. (``/t:``) -## -## ### PLATFORM -## The platform (``/p:Platform`` msbuild parameter) used for the build. -## -## ### PLATFORM_TOOLSET -## The platform toolset (``/p:PlatformToolset`` msbuild parameter) used for the build. -## -## ### OPTIONS -## Additional options passed to msbuild for all builds. -## -## ### OPTIONS_RELEASE -## Additional options passed to msbuild for Release builds. These are in addition to `OPTIONS`. -## -## ### OPTIONS_DEBUG -## Additional options passed to msbuild for Debug builds. These are in addition to `OPTIONS`. -## -## ## Examples -## -## * [chakracore](https://github.com/Microsoft/vcpkg/blob/master/ports/chakracore/portfile.cmake) -## * [cppunit](https://github.com/Microsoft/vcpkg/blob/master/ports/cppunit/portfile.cmake) +#[===[.md: +# vcpkg_build_msbuild + +Build a msbuild-based project. Deprecated in favor of `vcpkg_install_msbuild()`. + +## Usage +```cmake +vcpkg_build_msbuild( + PROJECT_PATH <${SOURCE_PATH}/port.sln> + [RELEASE_CONFIGURATION ] + [DEBUG_CONFIGURATION ] + [TARGET ] + [TARGET_PLATFORM_VERSION <10.0.15063.0>] + [PLATFORM <${TRIPLET_SYSTEM_ARCH}>] + [PLATFORM_TOOLSET <${VCPKG_PLATFORM_TOOLSET}>] + [OPTIONS ...] + [OPTIONS_RELEASE ...] + [OPTIONS_DEBUG ...] + [USE_VCPKG_INTEGRATION] +) +``` + +## Parameters +### USE_VCPKG_INTEGRATION +Apply the normal `integrate install` integration for building the project. + +By default, projects built with this command will not automatically link libraries or have header paths set. + +### PROJECT_PATH +The path to the solution (`.sln`) or project (`.vcxproj`) file. + +### RELEASE_CONFIGURATION +The configuration (``/p:Configuration`` msbuild parameter) used for Release builds. + +### DEBUG_CONFIGURATION +The configuration (``/p:Configuration`` msbuild parameter) +used for Debug builds. + +### TARGET_PLATFORM_VERSION +The WindowsTargetPlatformVersion (``/p:WindowsTargetPlatformVersion`` msbuild parameter) + +### TARGET +The MSBuild target to build. (``/t:``) + +### PLATFORM +The platform (``/p:Platform`` msbuild parameter) used for the build. + +### PLATFORM_TOOLSET +The platform toolset (``/p:PlatformToolset`` msbuild parameter) used for the build. + +### OPTIONS +Additional options passed to msbuild for all builds. + +### OPTIONS_RELEASE +Additional options passed to msbuild for Release builds. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to msbuild for Debug builds. These are in addition to `OPTIONS`. + +## Examples + +* [chakracore](https://github.com/Microsoft/vcpkg/blob/master/ports/chakracore/portfile.cmake) +* [cppunit](https://github.com/Microsoft/vcpkg/blob/master/ports/cppunit/portfile.cmake) +#]===] function(vcpkg_build_msbuild) # parse parameters such that semicolons in options arguments to COMMAND don't get erased diff --git a/scripts/cmake/vcpkg_build_ninja.cmake b/scripts/cmake/vcpkg_build_ninja.cmake index d49cc5c1fe503b..2c9276e63d5a8a 100644 --- a/scripts/cmake/vcpkg_build_ninja.cmake +++ b/scripts/cmake/vcpkg_build_ninja.cmake @@ -1,17 +1,19 @@ -## # vcpkg_build_ninja -## -## Build a ninja project -## -## ## Usage: -## ```cmake -## vcpkg_build_ninja( -## [TARGETS ...] -## ) -## ``` -## -## ## Parameters: -## ### TARGETS -## Only build the specified targets. +#[===[.md: +# vcpkg_build_ninja + +Build a ninja project + +## Usage: +```cmake +vcpkg_build_ninja( + [TARGETS ...] +) +``` + +## Parameters: +### TARGETS +Only build the specified targets. +#]===] function(vcpkg_build_ninja) # parse parameters such that semicolons in options arguments to COMMAND don't get erased @@ -35,4 +37,4 @@ function(vcpkg_build_ninja) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") build(${TARGET_TRIPLET}-rel) endif() -endfunction() \ No newline at end of file +endfunction() diff --git a/scripts/cmake/vcpkg_build_nmake.cmake b/scripts/cmake/vcpkg_build_nmake.cmake index 7f81ca29322f76..583ea6df21f008 100644 --- a/scripts/cmake/vcpkg_build_nmake.cmake +++ b/scripts/cmake/vcpkg_build_nmake.cmake @@ -1,76 +1,79 @@ -## # vcpkg_build_nmake -## -## Build a msvc makefile project. -## -## ## Usage: -## ```cmake -## vcpkg_build_nmake( -## SOURCE_PATH <${SOURCE_PATH}> -## [NO_DEBUG] -## [TARGET ] -## [PROJECT_SUBPATH <${SUBPATH}>] -## [PROJECT_NAME <${MAKEFILE_NAME}>] -## [PRERUN_SHELL <${SHELL_PATH}>] -## [PRERUN_SHELL_DEBUG <${SHELL_PATH}>] -## [PRERUN_SHELL_RELEASE <${SHELL_PATH}>] -## [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] -## [OPTIONS_RELEASE <-DOPTIMIZE=1>...] -## [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] -## [TARGET ]) -## ``` -## -## ## Parameters -## ### SOURCE_PATH -## Specifies the directory containing the source files. -## By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. -## -## ### PROJECT_SUBPATH -## Specifies the sub directory containing the `makefile.vc`/`makefile.mak`/`makefile.msvc` or other msvc makefile. -## -## ### PROJECT_NAME -## Specifies the name of msvc makefile name. -## Default is `makefile.vc` -## -## ### NO_DEBUG -## This port doesn't support debug mode. -## -## ### ENABLE_INSTALL -## Install binaries after build. -## -## ### PRERUN_SHELL -## Script that needs to be called before build -## -## ### PRERUN_SHELL_DEBUG -## Script that needs to be called before debug build -## -## ### PRERUN_SHELL_RELEASE -## Script that needs to be called before release build -## -## ### OPTIONS -## Additional options passed to generate during the generation. -## -## ### OPTIONS_RELEASE -## Additional options passed to generate during the Release generation. These are in addition to `OPTIONS`. -## -## ### OPTIONS_DEBUG -## Additional options passed to generate during the Debug generation. These are in addition to `OPTIONS`. -## -## ### TARGET -## The target passed to the nmake build command (`nmake/nmake install`). If not specified, no target will -## be passed. -## -## ### ADD_BIN_TO_PATH -## Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. -## -## ## Notes: -## This command should be preceeded by a call to [`vcpkg_configure_nmake()`](vcpkg_configure_nmake.md). -## You can use the alias [`vcpkg_install_nmake()`](vcpkg_configure_nmake.md) function if your CMake script supports the -## "install" target -## -## ## Examples -## -## * [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) -## * [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) +#[===[.md: +# vcpkg_build_nmake + +Build a msvc makefile project. + +## Usage: +```cmake +vcpkg_build_nmake( + SOURCE_PATH <${SOURCE_PATH}> + [NO_DEBUG] + [TARGET ] + [PROJECT_SUBPATH <${SUBPATH}>] + [PROJECT_NAME <${MAKEFILE_NAME}>] + [PRERUN_SHELL <${SHELL_PATH}>] + [PRERUN_SHELL_DEBUG <${SHELL_PATH}>] + [PRERUN_SHELL_RELEASE <${SHELL_PATH}>] + [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] + [OPTIONS_RELEASE <-DOPTIMIZE=1>...] + [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] + [TARGET ]) +``` + +## Parameters +### SOURCE_PATH +Specifies the directory containing the source files. +By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. + +### PROJECT_SUBPATH +Specifies the sub directory containing the `makefile.vc`/`makefile.mak`/`makefile.msvc` or other msvc makefile. + +### PROJECT_NAME +Specifies the name of msvc makefile name. +Default is `makefile.vc` + +### NO_DEBUG +This port doesn't support debug mode. + +### ENABLE_INSTALL +Install binaries after build. + +### PRERUN_SHELL +Script that needs to be called before build + +### PRERUN_SHELL_DEBUG +Script that needs to be called before debug build + +### PRERUN_SHELL_RELEASE +Script that needs to be called before release build + +### OPTIONS +Additional options passed to generate during the generation. + +### OPTIONS_RELEASE +Additional options passed to generate during the Release generation. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to generate during the Debug generation. These are in addition to `OPTIONS`. + +### TARGET +The target passed to the nmake build command (`nmake/nmake install`). If not specified, no target will +be passed. + +### ADD_BIN_TO_PATH +Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. + +## Notes: +This command should be preceeded by a call to [`vcpkg_configure_nmake()`](vcpkg_configure_nmake.md). +You can use the alias [`vcpkg_install_nmake()`](vcpkg_install_nmake.md) function if your CMake script supports the +"install" target + +## Examples + +* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) +* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) +#]===] + function(vcpkg_build_nmake) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 _bn diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake index 5568c080ce3cef..fd00f590f8b0a2 100644 --- a/scripts/cmake/vcpkg_build_qmake.cmake +++ b/scripts/cmake/vcpkg_build_qmake.cmake @@ -1,11 +1,13 @@ -#.rst: -# .. command:: vcpkg_build_qmake -# -# Build a qmake-based project, previously configured using vcpkg_configure_qmake. -# -# :: -# vcpkg_build_qmake() -# +#[===[.md: +# vcpkg_build_qmake + +Build a qmake-based project, previously configured using vcpkg_configure_qmake. + +```cmake +vcpkg_build_qmake() +``` +#]===] + function(vcpkg_build_qmake) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 _csc "SKIP_MAKEFILES" "BUILD_LOGNAME" "TARGETS;RELEASE_TARGETS;DEBUG_TARGETS") diff --git a/scripts/cmake/vcpkg_buildpath_length_warning.cmake b/scripts/cmake/vcpkg_buildpath_length_warning.cmake index b7ef10bb88f13f..c3cc6d0f6d8613 100644 --- a/scripts/cmake/vcpkg_buildpath_length_warning.cmake +++ b/scripts/cmake/vcpkg_buildpath_length_warning.cmake @@ -1,3 +1,14 @@ +#[===[.md: +# vcpkg_buildpath_length_warning + +Warns the user if their vcpkg installation path might be too long for the package they're installing. + +## Usage +```cmake +vcpkg_buildpath_length_warning(13) +``` +#]===] + function(vcpkg_buildpath_length_warning WARNING_LENGTH) string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) if(BUILDTREES_PATH_LENGTH GREATER ${WARNING_LENGTH} AND CMAKE_HOST_WIN32) @@ -5,4 +16,4 @@ function(vcpkg_buildpath_length_warning WARNING_LENGTH) "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." ) endif() -endfunction() \ No newline at end of file +endfunction() diff --git a/scripts/cmake/vcpkg_check_features.cmake b/scripts/cmake/vcpkg_check_features.cmake index 404a1b61db4ca3..c22903eaaf7764 100644 --- a/scripts/cmake/vcpkg_check_features.cmake +++ b/scripts/cmake/vcpkg_check_features.cmake @@ -1,148 +1,150 @@ -## # vcpkg_check_features -## Check if one or more features are a part of a package installation. -## -## ## Usage -## ```cmake -## vcpkg_check_features( -## OUT_FEATURE_OPTIONS -## [FEATURES -## -## [ ] -## ...] -## [INVERTED_FEATURES -## -## [ ] -## ...] -## ) -## ``` -## `vcpkg_check_features()` accepts these parameters: -## -## * `OUT_FEATURE_OPTIONS`: -## An output variable, the function will clear the variable passed to `OUT_FEATURE_OPTIONS` -## and then set it to contain a list of option definitions (`-D=ON|OFF`). -## -## This should be set to `FEATURE_OPTIONS` by convention. -## -## * `FEATURES`: -## A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs. -## For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: -## -## * `-D=ON`, if a feature is specified for installation, -## * `-D=OFF`, otherwise. -## -## * `INVERTED_FEATURES`: -## A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs, uses reversed logic from `FEATURES`. -## For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: -## -## * `-D=OFF`, if a feature is specified for installation, -## * `-D=ON`, otherwise. -## -## -## ## Notes -## -## The `FEATURES` name parameter can be omitted if no `INVERTED_FEATURES` are used. -## -## At least one (`FEATURE_NAME`, `OPTION_NAME`) pair must be passed to the function call. -## -## Arguments passed to `FEATURES` and `INVERTED_FEATURES` are not validated to prevent duplication. -## If the same (`FEATURE_NAME`, `OPTION_NAME`) pair is passed to both lists, -## two conflicting definitions are added to `OUT_FEATURE_OPTIONS`. -## -## -## ## Examples -## -## ### Example 1: Regular features -## -## ```cmake -## $ ./vcpkg install mimalloc[asm,secure] -## -## # ports/mimalloc/portfile.cmake -## vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -## # Keyword FEATURES is optional if INVERTED_FEATURES are not used -## asm MI_SEE_ASM -## override MI_OVERRIDE -## secure MI_SECURE -## ) -## -## vcpkg_configure_cmake( -## SOURCE_PATH ${SOURCE_PATH} -## PREFER_NINJA -## OPTIONS -## # Expands to "-DMI_SEE_ASM=ON; -DMI_OVERRIDE=OFF; -DMI_SECURE=ON" -## ${FEATURE_OPTIONS} -## ) -## ``` -## -## ### Example 2: Inverted features -## -## ```cmake -## $ ./vcpkg install cpprestsdk[websockets] -## -## # ports/cpprestsdk/portfile.cmake -## vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -## INVERTED_FEATURES # <- Keyword INVERTED_FEATURES required -## brotli CPPREST_EXCLUDE_BROTLI -## websockets CPPREST_EXCLUDE_WEBSOCKETS -## ) -## -## vcpkg_configure_cmake( -## SOURCE_PATH ${SOURCE_PATH} -## PREFER_NINJA -## OPTIONS -## # Expands to "-DCPPREST_EXCLUDE_BROTLI=ON; -DCPPREST_EXCLUDE_WEBSOCKETS=OFF" -## ${FEATURE_OPTIONS} -## ) -## ``` -## -## ### Example 3: Set multiple options for same feature -## -## ```cmake -## $ ./vcpkg install pcl[cuda] -## -## # ports/pcl/portfile.cmake -## vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -## cuda WITH_CUDA -## cuda BUILD_CUDA -## cuda BUILD_GPU -## ) -## -## vcpkg_configure_cmake( -## SOURCE_PATH ${SOURCE_PATH} -## PREFER_NINJA -## OPTIONS -## # Expands to "-DWITH_CUDA=ON; -DBUILD_CUDA=ON; -DBUILD_GPU=ON" -## ${FEATURE_OPTIONS} -## ) -## ``` -## -## ### Example 4: Use regular and inverted features -## -## ```cmake -## $ ./vcpkg install rocksdb[tbb] -## -## # ports/rocksdb/portfile.cmake -## vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -## FEATURES # <- Keyword FEATURES is required because INVERTED_FEATURES are being used -## tbb WITH_TBB -## INVERTED_FEATURES -## tbb ROCKSDB_IGNORE_PACKAGE_TBB -## ) -## -## vcpkg_configure_cmake( -## SOURCE_PATH ${SOURCE_PATH} -## PREFER_NINJA -## OPTIONS -## # Expands to "-DWITH_TBB=ON; -DROCKSDB_IGNORE_PACKAGE_TBB=OFF" -## ${FEATURE_OPTIONS} -## ) -## ``` -## -## ## Examples in portfiles -## -## * [cpprestsdk](https://github.com/microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) -## * [pcl](https://github.com/microsoft/vcpkg/blob/master/ports/pcl/portfile.cmake) -## * [rocksdb](https://github.com/microsoft/vcpkg/blob/master/ports/rocksdb/portfile.cmake) -## +#[===[.md: +# vcpkg_check_features +Check if one or more features are a part of a package installation. + +## Usage +```cmake +vcpkg_check_features( + OUT_FEATURE_OPTIONS + [FEATURES + + [ ] + ...] + [INVERTED_FEATURES + + [ ] + ...] +) +``` +`vcpkg_check_features()` accepts these parameters: + +* `OUT_FEATURE_OPTIONS`: + An output variable, the function will clear the variable passed to `OUT_FEATURE_OPTIONS` + and then set it to contain a list of option definitions (`-D=ON|OFF`). + + This should be set to `FEATURE_OPTIONS` by convention. + +* `FEATURES`: + A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs. + For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: + + * `-D=ON`, if a feature is specified for installation, + * `-D=OFF`, otherwise. + +* `INVERTED_FEATURES`: + A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs, uses reversed logic from `FEATURES`. + For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: + + * `-D=OFF`, if a feature is specified for installation, + * `-D=ON`, otherwise. + + +## Notes + +The `FEATURES` name parameter can be omitted if no `INVERTED_FEATURES` are used. + +At least one (`FEATURE_NAME`, `OPTION_NAME`) pair must be passed to the function call. + +Arguments passed to `FEATURES` and `INVERTED_FEATURES` are not validated to prevent duplication. +If the same (`FEATURE_NAME`, `OPTION_NAME`) pair is passed to both lists, +two conflicting definitions are added to `OUT_FEATURE_OPTIONS`. + + +## Examples + +### Example 1: Regular features + +```cmake +$ ./vcpkg install mimalloc[asm,secure] + +# ports/mimalloc/portfile.cmake +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + # Keyword FEATURES is optional if INVERTED_FEATURES are not used + asm MI_SEE_ASM + override MI_OVERRIDE + secure MI_SECURE +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + # Expands to "-DMI_SEE_ASM=ON; -DMI_OVERRIDE=OFF; -DMI_SECURE=ON" + ${FEATURE_OPTIONS} +) +``` + +### Example 2: Inverted features + +```cmake +$ ./vcpkg install cpprestsdk[websockets] + +# ports/cpprestsdk/portfile.cmake +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES # <- Keyword INVERTED_FEATURES required + brotli CPPREST_EXCLUDE_BROTLI + websockets CPPREST_EXCLUDE_WEBSOCKETS +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + # Expands to "-DCPPREST_EXCLUDE_BROTLI=ON; -DCPPREST_EXCLUDE_WEBSOCKETS=OFF" + ${FEATURE_OPTIONS} +) +``` + +### Example 3: Set multiple options for same feature + +```cmake +$ ./vcpkg install pcl[cuda] + +# ports/pcl/portfile.cmake +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + cuda WITH_CUDA + cuda BUILD_CUDA + cuda BUILD_GPU +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + # Expands to "-DWITH_CUDA=ON; -DBUILD_CUDA=ON; -DBUILD_GPU=ON" + ${FEATURE_OPTIONS} +) +``` + +### Example 4: Use regular and inverted features + +```cmake +$ ./vcpkg install rocksdb[tbb] + +# ports/rocksdb/portfile.cmake +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES # <- Keyword FEATURES is required because INVERTED_FEATURES are being used + tbb WITH_TBB + INVERTED_FEATURES + tbb ROCKSDB_IGNORE_PACKAGE_TBB +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + # Expands to "-DWITH_TBB=ON; -DROCKSDB_IGNORE_PACKAGE_TBB=OFF" + ${FEATURE_OPTIONS} +) +``` + +## Examples in portfiles + +* [cpprestsdk](https://github.com/microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) +* [pcl](https://github.com/microsoft/vcpkg/blob/master/ports/pcl/portfile.cmake) +* [rocksdb](https://github.com/microsoft/vcpkg/blob/master/ports/rocksdb/portfile.cmake) +#]===] + function(vcpkg_check_features) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 _vcf "" "OUT_FEATURE_OPTIONS" "FEATURES;INVERTED_FEATURES") diff --git a/scripts/cmake/vcpkg_check_linkage.cmake b/scripts/cmake/vcpkg_check_linkage.cmake index 101adc4fd5864b..9a8a7acb0210b9 100644 --- a/scripts/cmake/vcpkg_check_linkage.cmake +++ b/scripts/cmake/vcpkg_check_linkage.cmake @@ -1,34 +1,37 @@ -## # vcpkg_check_linkage -## -## Asserts the available library and CRT linkage options for the port. -## -## ## Usage -## ```cmake -## vcpkg_check_linkage( -## [ONLY_STATIC_LIBRARY | ONLY_DYNAMIC_LIBRARY] -## [ONLY_STATIC_CRT | ONLY_DYNAMIC_CRT] -## ) -## ``` -## -## ## Parameters -## ### ONLY_STATIC_LIBRARY -## Indicates that this port can only be built with static library linkage. -## -## ### ONLY_DYNAMIC_LIBRARY -## Indicates that this port can only be built with dynamic/shared library linkage. -## -## ### ONLY_STATIC_CRT -## Indicates that this port can only be built with static CRT linkage. -## -## ### ONLY_DYNAMIC_CRT -## Indicates that this port can only be built with dynamic/shared CRT linkage. -## -## ## Notes -## This command will either alter the settings for `VCPKG_LIBRARY_LINKAGE` or fail, depending on what was requested by the user versus what the library supports. -## -## ## Examples -## -## * [libimobiledevice](https://github.com/Microsoft/vcpkg/blob/master/ports/libimobiledevice/portfile.cmake) +#[===[.md: +# vcpkg_check_linkage + +Asserts the available library and CRT linkage options for the port. + +## Usage +```cmake +vcpkg_check_linkage( + [ONLY_STATIC_LIBRARY | ONLY_DYNAMIC_LIBRARY] + [ONLY_STATIC_CRT | ONLY_DYNAMIC_CRT] +) +``` + +## Parameters +### ONLY_STATIC_LIBRARY +Indicates that this port can only be built with static library linkage. + +### ONLY_DYNAMIC_LIBRARY +Indicates that this port can only be built with dynamic/shared library linkage. + +### ONLY_STATIC_CRT +Indicates that this port can only be built with static CRT linkage. + +### ONLY_DYNAMIC_CRT +Indicates that this port can only be built with dynamic/shared CRT linkage. + +## Notes +This command will either alter the settings for `VCPKG_LIBRARY_LINKAGE` or fail, depending on what was requested by the user versus what the library supports. + +## Examples + +* [abseil](https://github.com/Microsoft/vcpkg/blob/master/ports/abseil/portfile.cmake) +#]===] + function(vcpkg_check_linkage) cmake_parse_arguments(_csc "ONLY_STATIC_LIBRARY;ONLY_DYNAMIC_LIBRARY;ONLY_DYNAMIC_CRT;ONLY_STATIC_CRT" "" "" ${ARGN}) diff --git a/scripts/cmake/vcpkg_clean_executables_in_bin.cmake b/scripts/cmake/vcpkg_clean_executables_in_bin.cmake index b479bd3d0de251..077e23cc3f71f0 100644 --- a/scripts/cmake/vcpkg_clean_executables_in_bin.cmake +++ b/scripts/cmake/vcpkg_clean_executables_in_bin.cmake @@ -1,23 +1,26 @@ -## # vcpkg_clean_executables_in_bin -## -## Remove specified executables found in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. If, after all specified executables have been removed, and the `bin` and `debug/bin` directories are empty, then also delete `bin` and `debug/bin` directories. -## -## ## Usage -## ```cmake -## vcpkg_clean_executables_in_bin( -## FILE_NAMES ... -## ) -## ``` -## -## ## Parameters -## ### FILE_NAMES -## A list of executable filenames without extension. -## -## ## Notes -## Generally, there is no need to call this function manually. Instead, pass an extra `AUTO_CLEAN` argument when calling `vcpkg_copy_tools`. -## -## ## Examples -## * [czmq](https://github.com/microsoft/vcpkg/blob/master/ports/czmq/portfile.cmake) +#[===[.md: +# vcpkg_clean_executables_in_bin + +Remove specified executables found in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. If, after all specified executables have been removed, and the `bin` and `debug/bin` directories are empty, then also delete `bin` and `debug/bin` directories. + +## Usage +```cmake +vcpkg_clean_executables_in_bin( + FILE_NAMES ... +) +``` + +## Parameters +### FILE_NAMES +A list of executable filenames without extension. + +## Notes +Generally, there is no need to call this function manually. Instead, pass an extra `AUTO_CLEAN` argument when calling `vcpkg_copy_tools`. + +## Examples +* [czmq](https://github.com/microsoft/vcpkg/blob/master/ports/czmq/portfile.cmake) +#]===] + function(vcpkg_clean_executables_in_bin) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 _vct "" "" "FILE_NAMES") diff --git a/scripts/cmake/vcpkg_clean_msbuild.cmake b/scripts/cmake/vcpkg_clean_msbuild.cmake index b0d77dfd2b6537..ead78706d3cdd4 100644 --- a/scripts/cmake/vcpkg_clean_msbuild.cmake +++ b/scripts/cmake/vcpkg_clean_msbuild.cmake @@ -1,15 +1,17 @@ -## # vcpkg_clean_msbuild -## -## Clean intermediate files generated by `vcpkg_install_msbuild()`. -## -## ## Usage -## ```cmake -## vcpkg_clean_msbuild() -## ``` -## -## ## Examples -## -## * [xalan-c](https://github.com/Microsoft/vcpkg/blob/master/ports/xalan-c/portfile.cmake) +#[===[.md: +# vcpkg_clean_msbuild + +Clean intermediate files generated by `vcpkg_install_msbuild()`. + +## Usage +```cmake +vcpkg_clean_msbuild() +``` + +## Examples + +* [xalan-c](https://github.com/Microsoft/vcpkg/blob/master/ports/xalan-c/portfile.cmake) +#]===] function(vcpkg_clean_msbuild) file(REMOVE_RECURSE diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index 33c66c3ec94cc3..10e5338d0e76fd 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -1,29 +1,30 @@ -## # vcpkg_common_definitions -## -## File contains helpful variabls for portfiles which are commonly needed or used. -## -## ## The following variables are available: -## ```cmake -## VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if -## VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD, OPENBSD. only defined if -## VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "${VCPKG_HOST_PATH_SEPARATOR}"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "") -## VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host -## VCPKG_TARGET_EXECUTABLE_SUFFIX executable suffix of the target -## VCPKG_TARGET_STATIC_LIBRARY_PREFIX static library prefix for target (same as CMAKE_STATIC_LIBRARY_PREFIX) -## VCPKG_TARGET_STATIC_LIBRARY_SUFFIX static library suffix for target (same as CMAKE_STATIC_LIBRARY_SUFFIX) -## VCPKG_TARGET_SHARED_LIBRARY_PREFIX shared library prefix for target (same as CMAKE_SHARED_LIBRARY_PREFIX) -## VCPKG_TARGET_SHARED_LIBRARY_SUFFIX shared library suffix for target (same as CMAKE_SHARED_LIBRARY_SUFFIX) -## VCPKG_TARGET_IMPORT_LIBRARY_PREFIX import library prefix for target (same as CMAKE_IMPORT_LIBRARY_PREFIX) -## VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX import library suffix for target (same as CMAKE_IMPORT_LIBRARY_SUFFIX) -## VCPKG_FIND_LIBRARY_PREFIXES target dependent prefixes used for find_library calls in portfiles -## VCPKG_FIND_LIBRARY_SUFFIXES target dependent suffixes used for find_library calls in portfiles -## VCPKG_SYSTEM_LIBRARIES list of libraries are provide by the toolchain and are not managed by vcpkg -## ``` -## -## CMAKE_STATIC_LIBRARY_(PREFIX|SUFFIX), CMAKE_SHARED_LIBRARY_(PREFIX|SUFFIX) and CMAKE_IMPORT_LIBRARY_(PREFIX|SUFFIX) are defined for the target -## Furthermore the variables CMAKE_FIND_LIBRARY_(PREFIXES|SUFFIXES) are also defined for the target so that -## portfiles are able to use find_library calls to discover dependent libraries within the current triplet for ports. -## +#[===[.md: +# vcpkg_common_definitions + +File contains helpful variabls for portfiles which are commonly needed or used. + +## The following variables are available: +```cmake +VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if +VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD, OPENBSD. only defined if +VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "${VCPKG_HOST_PATH_SEPARATOR}"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "") +VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host +VCPKG_TARGET_EXECUTABLE_SUFFIX executable suffix of the target +VCPKG_TARGET_STATIC_LIBRARY_PREFIX static library prefix for target (same as CMAKE_STATIC_LIBRARY_PREFIX) +VCPKG_TARGET_STATIC_LIBRARY_SUFFIX static library suffix for target (same as CMAKE_STATIC_LIBRARY_SUFFIX) +VCPKG_TARGET_SHARED_LIBRARY_PREFIX shared library prefix for target (same as CMAKE_SHARED_LIBRARY_PREFIX) +VCPKG_TARGET_SHARED_LIBRARY_SUFFIX shared library suffix for target (same as CMAKE_SHARED_LIBRARY_SUFFIX) +VCPKG_TARGET_IMPORT_LIBRARY_PREFIX import library prefix for target (same as CMAKE_IMPORT_LIBRARY_PREFIX) +VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX import library suffix for target (same as CMAKE_IMPORT_LIBRARY_SUFFIX) +VCPKG_FIND_LIBRARY_PREFIXES target dependent prefixes used for find_library calls in portfiles +VCPKG_FIND_LIBRARY_SUFFIXES target dependent suffixes used for find_library calls in portfiles +VCPKG_SYSTEM_LIBRARIES list of libraries are provide by the toolchain and are not managed by vcpkg +``` + +CMAKE_STATIC_LIBRARY_(PREFIX|SUFFIX), CMAKE_SHARED_LIBRARY_(PREFIX|SUFFIX) and CMAKE_IMPORT_LIBRARY_(PREFIX|SUFFIX) are defined for the target +Furthermore the variables CMAKE_FIND_LIBRARY_(PREFIXES|SUFFIXES) are also defined for the target so that +portfiles are able to use find_library calls to discover dependent libraries within the current triplet for ports. +#]===] #Helper variable to identify the Target system. VCPKG_TARGET_IS_ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") diff --git a/scripts/cmake/vcpkg_common_functions.cmake b/scripts/cmake/vcpkg_common_functions.cmake index 4aeb9524a4972e..6b6959cd8c46cf 100644 --- a/scripts/cmake/vcpkg_common_functions.cmake +++ b/scripts/cmake/vcpkg_common_functions.cmake @@ -1 +1,3 @@ +# DEPRECATED + message("${_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}" "vcpkg_common_functions has been removed and all values are automatically provided in all portfile.cmake invocations. Please remove `include(vcpkg_common_functions)`.") diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 2f22d34a14a7ac..8800d45eb2f102 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -1,68 +1,71 @@ -## # vcpkg_configure_cmake -## -## Configure CMake for Debug and Release builds of a project. -## -## ## Usage -## ```cmake -## vcpkg_configure_cmake( -## SOURCE_PATH <${SOURCE_PATH}> -## [PREFER_NINJA] -## [DISABLE_PARALLEL_CONFIGURE] -## [NO_CHARSET_FLAG] -## [GENERATOR <"NMake Makefiles">] -## [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] -## [OPTIONS_RELEASE <-DOPTIMIZE=1>...] -## [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] -## ) -## ``` -## -## ## Parameters -## ### SOURCE_PATH -## Specifies the directory containing the `CMakeLists.txt`. -## By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. -## -## ### PREFER_NINJA -## Indicates that, when available, Vcpkg should use Ninja to perform the build. -## This should be specified unless the port is known to not work under Ninja. -## -## ### DISABLE_PARALLEL_CONFIGURE -## Disables running the CMake configure step in parallel. -## This is needed for libraries which write back into their source directory during configure. -## -## This also disables CMAKE_DISABLE_SOURCE_CHANGES. -## -## ### NO_CHARSET_FLAG -## Disables passing `utf-8` as the default character set to `CMAKE_C_FLAGS` and `CMAKE_CXX_FLAGS`. -## -## This is needed for libraries that set their own source code's character set. -## -## ### GENERATOR -## Specifies the precise generator to use. -## -## This is useful if some project-specific buildsystem has been wrapped in a cmake script that won't perform an actual build. -## If used for this purpose, it should be set to `"NMake Makefiles"`. -## -## ### OPTIONS -## Additional options passed to CMake during the configuration. -## -## ### OPTIONS_RELEASE -## Additional options passed to CMake during the Release configuration. These are in addition to `OPTIONS`. -## -## ### OPTIONS_DEBUG -## Additional options passed to CMake during the Debug configuration. These are in addition to `OPTIONS`. -## -## ### LOGNAME -## Name of the log to write the output of the configure call to. -## -## ## Notes -## This command supplies many common arguments to CMake. To see the full list, examine the source. -## -## ## Examples -## -## * [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) -## * [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) -## * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) -## * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) +#[===[.md: +# vcpkg_configure_cmake + +Configure CMake for Debug and Release builds of a project. + +## Usage +```cmake +vcpkg_configure_cmake( + SOURCE_PATH <${SOURCE_PATH}> + [PREFER_NINJA] + [DISABLE_PARALLEL_CONFIGURE] + [NO_CHARSET_FLAG] + [GENERATOR <"NMake Makefiles">] + [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] + [OPTIONS_RELEASE <-DOPTIMIZE=1>...] + [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] +) +``` + +## Parameters +### SOURCE_PATH +Specifies the directory containing the `CMakeLists.txt`. +By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. + +### PREFER_NINJA +Indicates that, when available, Vcpkg should use Ninja to perform the build. +This should be specified unless the port is known to not work under Ninja. + +### DISABLE_PARALLEL_CONFIGURE +Disables running the CMake configure step in parallel. +This is needed for libraries which write back into their source directory during configure. + +This also disables CMAKE_DISABLE_SOURCE_CHANGES. + +### NO_CHARSET_FLAG +Disables passing `utf-8` as the default character set to `CMAKE_C_FLAGS` and `CMAKE_CXX_FLAGS`. + +This is needed for libraries that set their own source code's character set. + +### GENERATOR +Specifies the precise generator to use. + +This is useful if some project-specific buildsystem has been wrapped in a cmake script that won't perform an actual build. +If used for this purpose, it should be set to `"NMake Makefiles"`. + +### OPTIONS +Additional options passed to CMake during the configuration. + +### OPTIONS_RELEASE +Additional options passed to CMake during the Release configuration. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to CMake during the Debug configuration. These are in addition to `OPTIONS`. + +### LOGNAME +Name of the log to write the output of the configure call to. + +## Notes +This command supplies many common arguments to CMake. To see the full list, examine the source. + +## Examples + +* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) +* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) +* [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) +* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) +#]===] + function(vcpkg_configure_cmake) # parse parameters such that semicolons in arguments to OPTIONS don't get erased cmake_parse_arguments(PARSE_ARGV 0 _csc diff --git a/scripts/cmake/vcpkg_configure_gn.cmake b/scripts/cmake/vcpkg_configure_gn.cmake index 5d083aed8f4b4b..88346340232e0c 100644 --- a/scripts/cmake/vcpkg_configure_gn.cmake +++ b/scripts/cmake/vcpkg_configure_gn.cmake @@ -1,30 +1,32 @@ -## # vcpkg_configure_gn -## -## Generate Ninja (GN) targets -## -## ## Usage: -## ```cmake -## vcpkg_configure_gn( -## 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. +#[===[.md: +# vcpkg_configure_gn + +Generate Ninja (GN) targets + +## Usage: +```cmake +vcpkg_configure_gn( + 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. +#]===] function(vcpkg_configure_gn) # parse parameters such that semicolons in options arguments to COMMAND don't get erased @@ -56,4 +58,4 @@ function(vcpkg_configure_gn) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") generate(${TARGET_TRIPLET}-rel "--args=${_vcg_OPTIONS} ${_vcg_OPTIONS_RELEASE}") endif() -endfunction() \ No newline at end of file +endfunction() diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 8e079b64d2f27a..8a7b27be8901b5 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -1,91 +1,94 @@ -## # vcpkg_configure_make -## -## Configure configure for Debug and Release builds of a project. -## -## ## Usage -## ```cmake -## vcpkg_configure_make( -## SOURCE_PATH <${SOURCE_PATH}> -## [AUTOCONFIG] -## [USE_WRAPPERS] -## [DETERMINE_BUILD_TRIPLET] -## [BUILD_TRIPLET "--host=x64 --build=i686-unknown-pc"] -## [NO_ADDITIONAL_PATHS] -## [CONFIG_DEPENDENT_ENVIRONMENT ...] -## [CONFIGURE_ENVIRONMENT_VARIABLES ...] -## [ADD_BIN_TO_PATH] -## [NO_DEBUG] -## [SKIP_CONFIGURE] -## [PROJECT_SUBPATH <${PROJ_SUBPATH}>] -## [PRERUN_SHELL <${SHELL_PATH}>] -## [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] -## [OPTIONS_RELEASE <-DOPTIMIZE=1>...] -## [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] -## ) -## ``` -## -## ## Parameters -## ### SOURCE_PATH -## Specifies the directory containing the `configure`/`configure.ac`. -## By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. -## -## ### PROJECT_SUBPATH -## Specifies the directory containing the ``configure`/`configure.ac`. -## By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. -## -## ### SKIP_CONFIGURE -## Skip configure process -## -## ### USE_WRAPPERS -## Use autotools ar-lib and compile wrappers (only applies to windows cl and lib) -## -## ### BUILD_TRIPLET -## Used to pass custom --build/--target/--host to configure. Can be globally overwritten by VCPKG_MAKE_BUILD_TRIPLET -## -## ### DETERMINE_BUILD_TRIPLET -## For ports having a configure script following the autotools rules for selecting the triplet -## -## ### NO_ADDITIONAL_PATHS -## Don't pass any additional paths except for --prefix to the configure call -## -## ### AUTOCONFIG -## Need to use autoconfig to generate configure file. -## -## ### PRERUN_SHELL -## Script that needs to be called before configuration (do not use for batch files which simply call autoconf or configure) -## -## ### 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 -## -## ### OPTIONS -## Additional options passed to configure during the configuration. -## -## ### OPTIONS_RELEASE -## Additional options passed to configure during the Release configuration. These are in addition to `OPTIONS`. -## -## ### OPTIONS_DEBUG -## Additional options passed to configure during the Debug configuration. These are in addition to `OPTIONS`. -## -## ### CONFIG_DEPENDENT_ENVIRONMENT -## List of additional configuration dependent environment variables to set. -## Pass SOMEVAR to set the environment and have SOMEVAR_(DEBUG|RELEASE) set in the portfile to the appropriate values -## General environment variables can be set from within the portfile itself. -## -## ### CONFIGURE_ENVIRONMENT_VARIABLES -## List of additional environment variables to pass via the configure call. -## -## ## Notes -## This command supplies many common arguments to configure. To see the full list, examine the source. -## -## ## Examples -## -## * [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake) -## * [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) -## * [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) -## * [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) +#[===[.md: +# vcpkg_configure_make + +Configure configure for Debug and Release builds of a project. + +## Usage +```cmake +vcpkg_configure_make( + SOURCE_PATH <${SOURCE_PATH}> + [AUTOCONFIG] + [USE_WRAPPERS] + [DETERMINE_BUILD_TRIPLET] + [BUILD_TRIPLET "--host=x64 --build=i686-unknown-pc"] + [NO_ADDITIONAL_PATHS] + [CONFIG_DEPENDENT_ENVIRONMENT ...] + [CONFIGURE_ENVIRONMENT_VARIABLES ...] + [ADD_BIN_TO_PATH] + [NO_DEBUG] + [SKIP_CONFIGURE] + [PROJECT_SUBPATH <${PROJ_SUBPATH}>] + [PRERUN_SHELL <${SHELL_PATH}>] + [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] + [OPTIONS_RELEASE <-DOPTIMIZE=1>...] + [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] +) +``` + +## Parameters +### SOURCE_PATH +Specifies the directory containing the `configure`/`configure.ac`. +By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. + +### PROJECT_SUBPATH +Specifies the directory containing the ``configure`/`configure.ac`. +By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. + +### SKIP_CONFIGURE +Skip configure process + +### USE_WRAPPERS +Use autotools ar-lib and compile wrappers (only applies to windows cl and lib) + +### BUILD_TRIPLET +Used to pass custom --build/--target/--host to configure. Can be globally overwritten by VCPKG_MAKE_BUILD_TRIPLET + +### DETERMINE_BUILD_TRIPLET +For ports having a configure script following the autotools rules for selecting the triplet + +### NO_ADDITIONAL_PATHS +Don't pass any additional paths except for --prefix to the configure call + +### AUTOCONFIG +Need to use autoconfig to generate configure file. + +### PRERUN_SHELL +Script that needs to be called before configuration (do not use for batch files which simply call autoconf or configure) + +### 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 + +### OPTIONS +Additional options passed to configure during the configuration. + +### OPTIONS_RELEASE +Additional options passed to configure during the Release configuration. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to configure during the Debug configuration. These are in addition to `OPTIONS`. + +### CONFIG_DEPENDENT_ENVIRONMENT +List of additional configuration dependent environment variables to set. +Pass SOMEVAR to set the environment and have SOMEVAR_(DEBUG|RELEASE) set in the portfile to the appropriate values +General environment variables can be set from within the portfile itself. + +### CONFIGURE_ENVIRONMENT_VARIABLES +List of additional environment variables to pass via the configure call. + +## Notes +This command supplies many common arguments to configure. To see the full list, examine the source. + +## Examples + +* [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake) +* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) +* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) +* [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) +#]===] + macro(_vcpkg_determine_host_mingw out_var) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) set(HOST_ARCH $ENV{PROCESSOR_ARCHITEW6432}) @@ -202,7 +205,7 @@ macro(_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags _SUFFIX) endmacro() function(vcpkg_configure_make) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased + # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 _csc "AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;USE_WRAPPERS;DETERMINE_BUILD_TRIPLET" "SOURCE_PATH;PROJECT_SUBPATH;PRERUN_SHELL;BUILD_TRIPLET" diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 8bcb654d96ad5a..212bcf07605e6b 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -1,38 +1,41 @@ -## # vcpkg_configure_meson -## -## Configure Meson for Debug and Release builds of a project. -## -## ## Usage -## ```cmake -## vcpkg_configure_meson( -## SOURCE_PATH <${SOURCE_PATH}> -## [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] -## [OPTIONS_RELEASE <-DOPTIMIZE=1>...] -## [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] -## ) -## ``` -## -## ## Parameters -## ### SOURCE_PATH -## Specifies the directory containing the `meson.build`. -## By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. -## -## ### OPTIONS -## Additional options passed to Meson during the configuration. -## -## ### OPTIONS_RELEASE -## Additional options passed to Meson during the Release configuration. These are in addition to `OPTIONS`. -## -## ### OPTIONS_DEBUG -## Additional options passed to Meson during the Debug configuration. These are in addition to `OPTIONS`. -## -## ## Notes -## This command supplies many common arguments to Meson. To see the full list, examine the source. -## -## ## Examples -## -## * [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) -## * [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) +#[===[.md: +# vcpkg_configure_meson + +Configure Meson for Debug and Release builds of a project. + +## Usage +```cmake +vcpkg_configure_meson( + SOURCE_PATH <${SOURCE_PATH}> + [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] + [OPTIONS_RELEASE <-DOPTIMIZE=1>...] + [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] +) +``` + +## Parameters +### SOURCE_PATH +Specifies the directory containing the `meson.build`. +By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. + +### OPTIONS +Additional options passed to Meson during the configuration. + +### OPTIONS_RELEASE +Additional options passed to Meson during the Release configuration. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to Meson during the Debug configuration. These are in addition to `OPTIONS`. + +## Notes +This command supplies many common arguments to Meson. To see the full list, examine the source. + +## Examples + +* [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) +* [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) +#]===] + function(vcpkg_internal_meson_generate_native_file) #https://mesonbuild.com/Native-environments.html set(NATIVE "[binaries]\n") #set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT) @@ -60,7 +63,6 @@ function(vcpkg_internal_meson_generate_native_file) #https://mesonbuild.com/Nati string(APPEND NATIVE "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") endif() string(APPEND NATIVE "cmake = '${CMAKE_COMMAND}'\n") - string(APPEND NATIVE "[built-in options]\n") #https://mesonbuild.com/Builtin-options.html if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") string(APPEND NATIVE "cpp_eh='none'\n") # To make sure meson is not adding eh flags by itself using msvc diff --git a/scripts/cmake/vcpkg_configure_qmake.cmake b/scripts/cmake/vcpkg_configure_qmake.cmake index f0baabb6ae63da..6fa3a609a5cc50 100644 --- a/scripts/cmake/vcpkg_configure_qmake.cmake +++ b/scripts/cmake/vcpkg_configure_qmake.cmake @@ -1,19 +1,23 @@ -#.rst: -# .. command:: vcpkg_configure_qmake -# -# Configure a qmake-based project. -# -# :: -# vcpkg_configure_qmake(SOURCE_PATH -# [OPTIONS arg1 [arg2 ...]] -# [OPTIONS_RELEASE arg1 [arg2 ...]] -# [OPTIONS_DEBUG arg1 [arg2 ...]] -# ) -# -# ``SOURCE_PATH`` -# The path to the *.pro qmake project file. -# ``OPTIONS[_RELEASE|_DEBUG]`` -# The options passed to qmake. +#[===[.md: +# vcpkg_configure_qmake + +Configure a qmake-based project. + +```cmake +vcpkg_configure_qmake( + SOURCE_PATH + [OPTIONS arg1 [arg2 ...]] + [OPTIONS_RELEASE arg1 [arg2 ...]] + [OPTIONS_DEBUG arg1 [arg2 ...]] +) +``` + +### SOURCE_PATH +The path to the *.pro qmake project file. + +### OPTIONS, OPTIONS\_RELEASE, OPTIONS\_DEBUG +The options passed to qmake. +#]===] function(vcpkg_configure_qmake) # parse parameters such that semicolons in options arguments to COMMAND don't get erased @@ -127,4 +131,4 @@ function(vcpkg_configure_qmake) endif() endif() -endfunction() \ No newline at end of file +endfunction() diff --git a/scripts/cmake/vcpkg_copy_pdbs.cmake b/scripts/cmake/vcpkg_copy_pdbs.cmake index d3cb7e6ec66c3f..db91420b65e8f8 100644 --- a/scripts/cmake/vcpkg_copy_pdbs.cmake +++ b/scripts/cmake/vcpkg_copy_pdbs.cmake @@ -1,25 +1,28 @@ -## # vcpkg_copy_pdbs -## -## Automatically locate pdbs in the build tree and copy them adjacent to all DLLs. -## -## ## Usage -## ```cmake -## vcpkg_copy_pdbs([BUILD_PATHS <${CURRENT_PACKAGES_DIR}/bin/*.dll> ...]) -## ``` -## -## ## Notes -## This command should always be called by portfiles after they have finished rearranging the binary output. -## -## ## Parameters -## ### BUILD_PATHS -## Path patterns passed to `file(GLOB_RECURSE)` for locating dlls. -## -## Defaults to `${CURRENT_PACKAGES_DIR}/bin/*.dll` and `${CURRENT_PACKAGES_DIR}/debug/bin/*.dll`. -## -## ## Examples -## -## * [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) -## * [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) +#[===[.md: +# vcpkg_copy_pdbs + +Automatically locate pdbs in the build tree and copy them adjacent to all DLLs. + +## Usage +```cmake +vcpkg_copy_pdbs([BUILD_PATHS <${CURRENT_PACKAGES_DIR}/bin/*.dll> ...]) +``` + +## Notes +This command should always be called by portfiles after they have finished rearranging the binary output. + +## Parameters +### BUILD_PATHS +Path patterns passed to `file(GLOB_RECURSE)` for locating dlls. + +Defaults to `${CURRENT_PACKAGES_DIR}/bin/*.dll` and `${CURRENT_PACKAGES_DIR}/debug/bin/*.dll`. + +## Examples + +* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) +* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) +#]===] + function(vcpkg_copy_pdbs) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 _vcp "" "" "BUILD_PATHS") @@ -75,4 +78,4 @@ function(vcpkg_copy_pdbs) endif() endif() -endfunction() \ No newline at end of file +endfunction() diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake index 63e9b6fb1ea27a..ba0f31920b8257 100644 --- a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake +++ b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake @@ -1,21 +1,24 @@ -## # vcpkg_copy_tool_dependencies -## -## Copy all DLL dependencies of built tools into the tool folder. -## -## ## Usage -## ```cmake -## vcpkg_copy_tool_dependencies(<${CURRENT_PACKAGES_DIR}/tools/${PORT}>) -## ``` -## ## Parameters -## The path to the directory containing the tools. -## -## ## Notes -## This command should always be called by portfiles after they have finished rearranging the binary output, if they have any tools. -## -## ## Examples -## -## * [glib](https://github.com/Microsoft/vcpkg/blob/master/ports/glib/portfile.cmake) -## * [fltk](https://github.com/Microsoft/vcpkg/blob/master/ports/fltk/portfile.cmake) +#[===[.md: +# vcpkg_copy_tool_dependencies + +Copy all DLL dependencies of built tools into the tool folder. + +## Usage +```cmake +vcpkg_copy_tool_dependencies(<${CURRENT_PACKAGES_DIR}/tools/${PORT}>) +``` +## Parameters +The path to the directory containing the tools. + +## Notes +This command should always be called by portfiles after they have finished rearranging the binary output, if they have any tools. + +## Examples + +* [glib](https://github.com/Microsoft/vcpkg/blob/master/ports/glib/portfile.cmake) +* [fltk](https://github.com/Microsoft/vcpkg/blob/master/ports/fltk/portfile.cmake) +#]===] + function(vcpkg_copy_tool_dependencies TOOL_DIR) if (VCPKG_TARGET_IS_WINDOWS) find_program(PWSH_EXE pwsh) diff --git a/scripts/cmake/vcpkg_copy_tools.cmake b/scripts/cmake/vcpkg_copy_tools.cmake index 37cfabd3bd72bc..628bfc506435fc 100644 --- a/scripts/cmake/vcpkg_copy_tools.cmake +++ b/scripts/cmake/vcpkg_copy_tools.cmake @@ -1,30 +1,33 @@ -## # vcpkg_copy_tools -## -## Copy tools and all their DLL dependencies into the `tools` folder. -## -## ## Usage -## ```cmake -## vcpkg_copy_tools( -## TOOL_NAMES ... -## [SEARCH_DIR <${CURRENT_PACKAGES_DIR}/bin>] -## [AUTO_CLEAN] -## ) -## ``` -## ## Parameters -## ### TOOL_NAMES -## A list of tool filenames without extension. -## -## ### SEARCH_DIR -## The path to the directory containing the tools. This will be set to `${CURRENT_PACKAGES_DIR}/bin` if ommited. -## -## ### AUTO_CLEAN -## Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. -## -## ## Examples -## -## * [cpuinfo](https://github.com/microsoft/vcpkg/blob/master/ports/cpuinfo/portfile.cmake) -## * [nanomsg](https://github.com/microsoft/vcpkg/blob/master/ports/nanomsg/portfile.cmake) -## * [uriparser](https://github.com/microsoft/vcpkg/blob/master/ports/uriparser/portfile.cmake) +#[===[.md: +# vcpkg_copy_tools + +Copy tools and all their DLL dependencies into the `tools` folder. + +## Usage +```cmake +vcpkg_copy_tools( + TOOL_NAMES ... + [SEARCH_DIR <${CURRENT_PACKAGES_DIR}/bin>] + [AUTO_CLEAN] +) +``` +## Parameters +### TOOL_NAMES +A list of tool filenames without extension. + +### SEARCH_DIR +The path to the directory containing the tools. This will be set to `${CURRENT_PACKAGES_DIR}/bin` if ommited. + +### AUTO_CLEAN +Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. + +## Examples + +* [cpuinfo](https://github.com/microsoft/vcpkg/blob/master/ports/cpuinfo/portfile.cmake) +* [nanomsg](https://github.com/microsoft/vcpkg/blob/master/ports/nanomsg/portfile.cmake) +* [uriparser](https://github.com/microsoft/vcpkg/blob/master/ports/uriparser/portfile.cmake) +#]===] + function(vcpkg_copy_tools) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 _vct "AUTO_CLEAN" "SEARCH_DIR" "TOOL_NAMES") diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake index ff42fd64e50085..8f250c67e1d1b2 100644 --- a/scripts/cmake/vcpkg_download_distfile.cmake +++ b/scripts/cmake/vcpkg_download_distfile.cmake @@ -1,54 +1,56 @@ -## # vcpkg_download_distfile -## -## Download and cache a file needed for this port. -## -## This helper should always be used instead of CMake's built-in `file(DOWNLOAD)` command. -## -## ## Usage -## ```cmake -## vcpkg_download_distfile( -## -## URLS ... -## FILENAME -## SHA512 <5981de...> -## ) -## ``` -## ## Parameters -## ### OUT_VARIABLE -## This variable will be set to the full path to the downloaded file. This can then immediately be passed in to [`vcpkg_extract_source_archive`](vcpkg_extract_source_archive.md) for sources. -## -## ### URLS -## A list of URLs to be consulted. They will be tried in order until one of the downloaded files successfully matches the SHA512 given. -## -## ### FILENAME -## The local name for the file. Files are shared between ports, so the file may need to be renamed to make it clearly attributed to this port and avoid conflicts. -## -## ### SHA512 -## The expected hash for the file. -## -## If this doesn't match the downloaded version, the build will be terminated with a message describing the mismatch. -## -## ### QUIET -## Suppress output on cache hit -## -## ### SKIP_SHA512 -## Skip SHA512 hash check for file. -## -## This switch is only valid when building with the `--head` command line flag. -## -## ### HEADERS -## A list of headers to append to the download request. This can be used for authentication during a download. -## -## Headers should be specified as ": ". -## -## ## Notes -## The helper [`vcpkg_from_github`](vcpkg_from_github.md) should be used for downloading from GitHub projects. -## -## ## Examples -## -## * [apr](https://github.com/Microsoft/vcpkg/blob/master/ports/apr/portfile.cmake) -## * [fontconfig](https://github.com/Microsoft/vcpkg/blob/master/ports/fontconfig/portfile.cmake) -## * [freetype](https://github.com/Microsoft/vcpkg/blob/master/ports/freetype/portfile.cmake) +#[===[.md: +# vcpkg_download_distfile + +Download and cache a file needed for this port. + +This helper should always be used instead of CMake's built-in `file(DOWNLOAD)` command. + +## Usage +```cmake +vcpkg_download_distfile( + + URLS ... + FILENAME + SHA512 <5981de...> +) +``` +## Parameters +### OUT_VARIABLE +This variable will be set to the full path to the downloaded file. This can then immediately be passed in to [`vcpkg_extract_source_archive`](vcpkg_extract_source_archive.md) for sources. + +### URLS +A list of URLs to be consulted. They will be tried in order until one of the downloaded files successfully matches the SHA512 given. + +### FILENAME +The local name for the file. Files are shared between ports, so the file may need to be renamed to make it clearly attributed to this port and avoid conflicts. + +### SHA512 +The expected hash for the file. + +If this doesn't match the downloaded version, the build will be terminated with a message describing the mismatch. + +### QUIET +Suppress output on cache hit + +### SKIP_SHA512 +Skip SHA512 hash check for file. + +This switch is only valid when building with the `--head` command line flag. + +### HEADERS +A list of headers to append to the download request. This can be used for authentication during a download. + +Headers should be specified as ": ". + +## Notes +The helper [`vcpkg_from_github`](vcpkg_from_github.md) should be used for downloading from GitHub projects. + +## Examples + +* [apr](https://github.com/Microsoft/vcpkg/blob/master/ports/apr/portfile.cmake) +* [fontconfig](https://github.com/Microsoft/vcpkg/blob/master/ports/fontconfig/portfile.cmake) +* [freetype](https://github.com/Microsoft/vcpkg/blob/master/ports/freetype/portfile.cmake) +#]===] include(vcpkg_execute_in_download_mode) diff --git a/scripts/cmake/vcpkg_execute_build_process.cmake b/scripts/cmake/vcpkg_execute_build_process.cmake index 9f937418487a23..2fc583d2208ea3 100644 --- a/scripts/cmake/vcpkg_execute_build_process.cmake +++ b/scripts/cmake/vcpkg_execute_build_process.cmake @@ -1,36 +1,39 @@ -## # vcpkg_execute_build_process -## -## Execute a required build process -## -## ## Usage -## ```cmake -## vcpkg_execute_build_process( -## COMMAND [...] -## [NO_PARALLEL_COMMAND [...]] -## WORKING_DIRECTORY -## LOGNAME ) -## ) -## ``` -## ## Parameters -## ### COMMAND -## The command to be executed, along with its arguments. -## -## ### NO_PARALLEL_COMMAND -## Optional parameter which specifies a non-parallel command to attempt if a -## failure potentially due to parallelism is detected. -## -## ### WORKING_DIRECTORY -## The directory to execute the command in. -## -## ### LOGNAME -## The prefix to use for the log files. -## -## This should be a unique name for different triplets so that the logs don't -## conflict when building multiple at once. -## -## ## Examples -## -## * [icu](https://github.com/Microsoft/vcpkg/blob/master/ports/icu/portfile.cmake) +#[===[.md: +# vcpkg_execute_build_process + +Execute a required build process + +## Usage +```cmake +vcpkg_execute_build_process( + COMMAND [...] + [NO_PARALLEL_COMMAND [...]] + WORKING_DIRECTORY + LOGNAME ) +) +``` +## Parameters +### COMMAND +The command to be executed, along with its arguments. + +### NO_PARALLEL_COMMAND +Optional parameter which specifies a non-parallel command to attempt if a +failure potentially due to parallelism is detected. + +### WORKING_DIRECTORY +The directory to execute the command in. + +### LOGNAME +The prefix to use for the log files. + +This should be a unique name for different triplets so that the logs don't +conflict when building multiple at once. + +## Examples + +* [icu](https://github.com/Microsoft/vcpkg/blob/master/ports/icu/portfile.cmake) +#]===] + include(vcpkg_prettify_command) function(vcpkg_execute_build_process) # parse parameters such that semicolons in options arguments to COMMAND don't get erased diff --git a/scripts/cmake/vcpkg_execute_in_download_mode.cmake b/scripts/cmake/vcpkg_execute_in_download_mode.cmake index 752ef40e26ebe5..8ef77372953de8 100644 --- a/scripts/cmake/vcpkg_execute_in_download_mode.cmake +++ b/scripts/cmake/vcpkg_execute_in_download_mode.cmake @@ -1,59 +1,67 @@ -## # vcpkg_execute_in_download_mode -## -## Execute a process even in download mode. -## -## ## Usage -## ```cmake -## vcpkg_execute_in_download_mode( -## COMMAND [...] -## OUTPUT_QUIET ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE -## WORKING_DIRECTORY -## TIMEOUT -## RESULT_VARIABLE -## OUTPUT_VARIABLE -## ERROR_VARIABLE -## INPUT_FILE -## OUTPUT_FILE -## ERROR_FILE -## ENCODING -## ) -## ``` -## -## The signature of this function is identical with `execute_process()` except that -## it only accepts one COMMAND argument, i.e., does not support chaining multiple -## commands with pipes. -## -## See `execute_process()` for a detailed description of the parameters. +#[===[.md: +# vcpkg_execute_in_download_mode + +Execute a process even in download mode. + +## Usage +```cmake +vcpkg_execute_in_download_mode( + COMMAND [] + [WORKING_DIRECTORY ] + [TIMEOUT ] + [RESULT_VARIABLE ] + [OUTPUT_VARIABLE ] + [ERROR_VARIABLE ] + [INPUT_FILE ] + [OUTPUT_FILE ] + [ERROR_FILE ] + [OUTPUT_QUIET] + [ERROR_QUIET] + [OUTPUT_STRIP_TRAILING_WHITESPACE] + [ERROR_STRIP_TRAILING_WHITESPACE] + [ENCODING ] +) +``` + +The signature of this function is identical to `execute_process()` except that +it only accepts one COMMAND argument, i.e., does not support chaining multiple +commands with pipes. + +See [`execute_process()`] for a detailed description of the parameters. + +[`execute_process()`]: https://cmake.org/cmake/help/latest/command/execute_process.html +#]===] + function(vcpkg_execute_in_download_mode) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 vcpkg_execute_in_download_mode - "OUTPUT_QUIET;ERROR_QUIET;OUTPUT_STRIP_TRAILING_WHITESPACE;ERROR_STRIP_TRAILING_WHITESPACE" - "WORKING_DIRECTORY;TIMEOUT;RESULT_VARIABLE;RESULTS_VARIABLE;OUTPUT_VARIABLE;ERROR_VARIABLE;INPUT_FILE;OUTPUT_FILE;ERROR_FILE;ENCODING" - "COMMAND") - - # collect all other present parameters - set(other_args "") - foreach(arg OUTPUT_QUIET ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE) - if(vcpkg_execute_in_download_mode_${arg}) - list(APPEND other_args ${arg}) - endif() - endforeach() - foreach(arg WORKING_DIRECTORY TIMEOUT RESULT_VARIABLE RESULTS_VARIABLE OUTPUT_VARIABLE ERROR_VARIABLE INPUT_FILE OUTPUT_FILE ERROR_FILE ENCODING) - if(vcpkg_execute_in_download_mode_${arg}) - list(APPEND other_args ${arg} ${vcpkg_execute_in_download_mode_${arg}}) + # parse parameters such that semicolons in options arguments to COMMAND don't get erased + cmake_parse_arguments(PARSE_ARGV 0 vcpkg_execute_in_download_mode + "OUTPUT_QUIET;ERROR_QUIET;OUTPUT_STRIP_TRAILING_WHITESPACE;ERROR_STRIP_TRAILING_WHITESPACE" + "WORKING_DIRECTORY;TIMEOUT;RESULT_VARIABLE;RESULTS_VARIABLE;OUTPUT_VARIABLE;ERROR_VARIABLE;INPUT_FILE;OUTPUT_FILE;ERROR_FILE;ENCODING" + "COMMAND") + + # collect all other present parameters + set(other_args "") + foreach(arg OUTPUT_QUIET ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE) + if(vcpkg_execute_in_download_mode_${arg}) + list(APPEND other_args ${arg}) + endif() + endforeach() + foreach(arg WORKING_DIRECTORY TIMEOUT RESULT_VARIABLE RESULTS_VARIABLE OUTPUT_VARIABLE ERROR_VARIABLE INPUT_FILE OUTPUT_FILE ERROR_FILE ENCODING) + if(vcpkg_execute_in_download_mode_${arg}) + list(APPEND other_args ${arg} ${vcpkg_execute_in_download_mode_${arg}}) + endif() + endforeach() + + if (DEFINED VCPKG_DOWNLOAD_MODE) + _execute_process(COMMAND ${vcpkg_execute_in_download_mode_COMMAND} ${other_args}) + else() + execute_process(COMMAND ${vcpkg_execute_in_download_mode_COMMAND} ${other_args}) endif() - endforeach() - - if (DEFINED VCPKG_DOWNLOAD_MODE) - _execute_process(COMMAND ${vcpkg_execute_in_download_mode_COMMAND} ${other_args}) - else() - execute_process(COMMAND ${vcpkg_execute_in_download_mode_COMMAND} ${other_args}) - endif() - - # pass output parameters back to caller's scope - foreach(arg RESULT_VARIABLE RESULTS_VARIABLE OUTPUT_VARIABLE ERROR_VARIABLE) - if(vcpkg_execute_in_download_mode_${arg}) - set(${vcpkg_execute_in_download_mode_${arg}} ${${vcpkg_execute_in_download_mode_${arg}}} PARENT_SCOPE) - endif() - endforeach() + + # pass output parameters back to caller's scope + foreach(arg RESULT_VARIABLE RESULTS_VARIABLE OUTPUT_VARIABLE ERROR_VARIABLE) + if(vcpkg_execute_in_download_mode_${arg}) + set(${vcpkg_execute_in_download_mode_${arg}} ${${vcpkg_execute_in_download_mode_${arg}}} PARENT_SCOPE) + endif() + endforeach() endfunction() diff --git a/scripts/cmake/vcpkg_execute_required_process.cmake b/scripts/cmake/vcpkg_execute_required_process.cmake index 454d97b806a3ee..4b8d24761683d1 100644 --- a/scripts/cmake/vcpkg_execute_required_process.cmake +++ b/scripts/cmake/vcpkg_execute_required_process.cmake @@ -1,49 +1,51 @@ -## # vcpkg_execute_required_process -## -## Execute a process with logging and fail the build if the command fails. -## -## ## Usage -## ```cmake -## vcpkg_execute_required_process( -## COMMAND <${PERL}> [...] -## WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg> -## LOGNAME -## [TIMEOUT ] -## [OUTPUT_VARIABLE ] -## [ERROR_VARIABLE ] -## ) -## ``` -## ## Parameters -## ### ALLOW_IN_DOWNLOAD_MODE -## Allows the command to execute in Download Mode. -## [See execute_process() override](../../scripts/cmake/execute_process.cmake). -## -## ### COMMAND -## The command to be executed, along with its arguments. -## -## ### WORKING_DIRECTORY -## The directory to execute the command in. -## -## ### LOGNAME -## The prefix to use for the log files. -## -## ### TIMEOUT -## Optional timeout after which to terminate the command. -## -## ### OUTPUT_VARIABLE -## Optional variable to receive stdout of the command. -## -## ### ERROR_VARIABLE -## Optional variable to receive stderr of the command. -## -## This should be a unique name for different triplets so that the logs don't conflict when building multiple at once. -## -## ## Examples -## -## * [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) -## * [openssl](https://github.com/Microsoft/vcpkg/blob/master/ports/openssl/portfile.cmake) -## * [boost](https://github.com/Microsoft/vcpkg/blob/master/ports/boost/portfile.cmake) -## * [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake) +#[===[.md: +# vcpkg_execute_required_process + +Execute a process with logging and fail the build if the command fails. + +## Usage +```cmake +vcpkg_execute_required_process( + COMMAND <${PERL}> [...] + WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg> + LOGNAME + [TIMEOUT ] + [OUTPUT_VARIABLE ] + [ERROR_VARIABLE ] +) +``` +## Parameters +### ALLOW_IN_DOWNLOAD_MODE +Allows the command to execute in Download Mode. +[See execute_process() override](../../scripts/cmake/execute_process.cmake). + +### COMMAND +The command to be executed, along with its arguments. + +### WORKING_DIRECTORY +The directory to execute the command in. + +### LOGNAME +The prefix to use for the log files. + +### TIMEOUT +Optional timeout after which to terminate the command. + +### OUTPUT_VARIABLE +Optional variable to receive stdout of the command. + +### ERROR_VARIABLE +Optional variable to receive stderr of the command. + +This should be a unique name for different triplets so that the logs don't conflict when building multiple at once. + +## Examples + +* [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) +* [openssl](https://github.com/Microsoft/vcpkg/blob/master/ports/openssl/portfile.cmake) +* [boost](https://github.com/Microsoft/vcpkg/blob/master/ports/boost/portfile.cmake) +* [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake) +#]===] include(vcpkg_prettify_command) include(vcpkg_execute_in_download_mode) diff --git a/scripts/cmake/vcpkg_execute_required_process_repeat.cmake b/scripts/cmake/vcpkg_execute_required_process_repeat.cmake index 91b847dc5a23d5..ba9debfadc117a 100644 --- a/scripts/cmake/vcpkg_execute_required_process_repeat.cmake +++ b/scripts/cmake/vcpkg_execute_required_process_repeat.cmake @@ -1,4 +1,19 @@ -# Usage: vcpkg_execute_required_process_repeat(COUNT COMMAND [...] WORKING_DIRECTORY LOGNAME ) +#[===[.md: +# vcpkg_execute_required_process_repeat + +Execute a process until the command succeeds, or until the COUNT is reached. + +## Usage +```cmake +vcpkg_execute_required_process_repeat( + COUNT + COMMAND [] + WORKING_DIRECTORY + LOGNAME +) +``` +#]===] + include(vcpkg_prettify_command) function(vcpkg_execute_required_process_repeat) # parse parameters such that semicolons in options arguments to COMMAND don't get erased diff --git a/scripts/cmake/vcpkg_extract_source_archive.cmake b/scripts/cmake/vcpkg_extract_source_archive.cmake index fbae94b5572a0c..631d6da59f9e78 100644 --- a/scripts/cmake/vcpkg_extract_source_archive.cmake +++ b/scripts/cmake/vcpkg_extract_source_archive.cmake @@ -1,32 +1,35 @@ -## # vcpkg_extract_source_archive -## -## Extract an archive into the source directory. Deprecated in favor of [`vcpkg_extract_source_archive_ex`](vcpkg_extract_source_archive_ex.md). -## -## ## Usage -## ```cmake -## vcpkg_extract_source_archive( -## <${ARCHIVE}> [<${TARGET_DIRECTORY}>] -## ) -## ``` -## ## Parameters -## ### ARCHIVE -## The full path to the archive to be extracted. -## -## This is usually obtained from calling [`vcpkg_download_distfile`](vcpkg_download_distfile.md). -## -## ### TARGET_DIRECTORY -## If specified, the archive will be extracted into the target directory instead of `${CURRENT_BUILDTREES_DIR}\src\`. -## -## This can be used to mimic git submodules, by extracting into a subdirectory of another archive. -## -## ## Notes -## This command will also create a tracking file named .extracted in the TARGET_DIRECTORY. This file, when present, will suppress the extraction of the archive. -## -## ## Examples -## -## * [libraw](https://github.com/Microsoft/vcpkg/blob/master/ports/libraw/portfile.cmake) -## * [protobuf](https://github.com/Microsoft/vcpkg/blob/master/ports/protobuf/portfile.cmake) -## * [msgpack](https://github.com/Microsoft/vcpkg/blob/master/ports/msgpack/portfile.cmake) +#[===[.md: +# vcpkg_extract_source_archive + +Extract an archive into the source directory. Deprecated in favor of [`vcpkg_extract_source_archive_ex`](vcpkg_extract_source_archive_ex.md). + +## Usage +```cmake +vcpkg_extract_source_archive( + <${ARCHIVE}> [<${TARGET_DIRECTORY}>] +) +``` +## Parameters +### ARCHIVE +The full path to the archive to be extracted. + +This is usually obtained from calling [`vcpkg_download_distfile`](vcpkg_download_distfile.md). + +### TARGET_DIRECTORY +If specified, the archive will be extracted into the target directory instead of `${CURRENT_BUILDTREES_DIR}/src/`. + +This can be used to mimic git submodules, by extracting into a subdirectory of another archive. + +## Notes +This command will also create a tracking file named .extracted in the TARGET_DIRECTORY. This file, when present, will suppress the extraction of the archive. + +## Examples + +* [libraw](https://github.com/Microsoft/vcpkg/blob/master/ports/libraw/portfile.cmake) +* [protobuf](https://github.com/Microsoft/vcpkg/blob/master/ports/protobuf/portfile.cmake) +* [msgpack](https://github.com/Microsoft/vcpkg/blob/master/ports/msgpack/portfile.cmake) +#]===] + include(vcpkg_execute_required_process) function(vcpkg_extract_source_archive ARCHIVE) diff --git a/scripts/cmake/vcpkg_extract_source_archive_ex.cmake b/scripts/cmake/vcpkg_extract_source_archive_ex.cmake index d1a7febeed0e94..bef245b5acea7d 100644 --- a/scripts/cmake/vcpkg_extract_source_archive_ex.cmake +++ b/scripts/cmake/vcpkg_extract_source_archive_ex.cmake @@ -1,56 +1,59 @@ -## # vcpkg_extract_source_archive_ex -## -## Extract an archive into the source directory. Replaces [`vcpkg_extract_source_archive`](vcpkg_extract_source_archive.md). -## -## ## Usage -## ```cmake -## vcpkg_extract_source_archive_ex( -## SKIP_PATCH_CHECK -## OUT_SOURCE_PATH -## ARCHIVE <${ARCHIVE}> -## [REF <1.0.0>] -## [NO_REMOVE_ONE_LEVEL] -## [WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/src>] -## [PATCHES ...] -## ) -## ``` -## ## Parameters -## ### SKIP_PATCH_CHECK -## If this option is set the failure to apply a patch is ignored. -## -## ### OUT_SOURCE_PATH -## Specifies the out-variable that will contain the extracted location. -## -## This should be set to `SOURCE_PATH` by convention. -## -## ### ARCHIVE -## The full path to the archive to be extracted. -## -## This is usually obtained from calling [`vcpkg_download_distfile`](vcpkg_download_distfile.md). -## -## ### REF -## A friendly name that will be used instead of the filename of the archive. If more than 10 characters it will be truncated. -## -## By convention, this is set to the version number or tag fetched -## -## ### WORKING_DIRECTORY -## If specified, the archive will be extracted into the working directory instead of `${CURRENT_BUILDTREES_DIR}/src/`. -## -## Note that the archive will still be extracted into a subfolder underneath that directory (`${WORKING_DIRECTORY}/${REF}-${HASH}/`). -## -## ### PATCHES -## A list of patches to be applied to the extracted sources. -## -## Relative paths are based on the port directory. -## -## ### NO_REMOVE_ONE_LEVEL -## Specifies that the default removal of the top level folder should not occur. -## -## ## Examples -## -## * [bzip2](https://github.com/Microsoft/vcpkg/blob/master/ports/bzip2/portfile.cmake) -## * [sqlite3](https://github.com/Microsoft/vcpkg/blob/master/ports/sqlite3/portfile.cmake) -## * [cairo](https://github.com/Microsoft/vcpkg/blob/master/ports/cairo/portfile.cmake) +#[===[.md: +# vcpkg_extract_source_archive_ex + +Extract an archive into the source directory. Replaces [`vcpkg_extract_source_archive`](vcpkg_extract_source_archive.md). + +## Usage +```cmake +vcpkg_extract_source_archive_ex( + SKIP_PATCH_CHECK + OUT_SOURCE_PATH + ARCHIVE <${ARCHIVE}> + [REF <1.0.0>] + [NO_REMOVE_ONE_LEVEL] + [WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/src>] + [PATCHES ...] +) +``` +## Parameters +### SKIP_PATCH_CHECK +If this option is set the failure to apply a patch is ignored. + +### OUT_SOURCE_PATH +Specifies the out-variable that will contain the extracted location. + +This should be set to `SOURCE_PATH` by convention. + +### ARCHIVE +The full path to the archive to be extracted. + +This is usually obtained from calling [`vcpkg_download_distfile`](vcpkg_download_distfile.md). + +### REF +A friendly name that will be used instead of the filename of the archive. If more than 10 characters it will be truncated. + +By convention, this is set to the version number or tag fetched + +### WORKING_DIRECTORY +If specified, the archive will be extracted into the working directory instead of `${CURRENT_BUILDTREES_DIR}/src/`. + +Note that the archive will still be extracted into a subfolder underneath that directory (`${WORKING_DIRECTORY}/${REF}-${HASH}/`). + +### PATCHES +A list of patches to be applied to the extracted sources. + +Relative paths are based on the port directory. + +### NO_REMOVE_ONE_LEVEL +Specifies that the default removal of the top level folder should not occur. + +## Examples + +* [bzip2](https://github.com/Microsoft/vcpkg/blob/master/ports/bzip2/portfile.cmake) +* [sqlite3](https://github.com/Microsoft/vcpkg/blob/master/ports/sqlite3/portfile.cmake) +* [cairo](https://github.com/Microsoft/vcpkg/blob/master/ports/cairo/portfile.cmake) +#]===] + include(vcpkg_apply_patches) include(vcpkg_extract_source_archive) diff --git a/scripts/cmake/vcpkg_fail_port_install.cmake b/scripts/cmake/vcpkg_fail_port_install.cmake index 5288226eb87ab2..9e919aa020c139 100644 --- a/scripts/cmake/vcpkg_fail_port_install.cmake +++ b/scripts/cmake/vcpkg_fail_port_install.cmake @@ -1,41 +1,44 @@ -## # vcpkg_fail_port_install -## -## Checks common requirements and fails the current portfile with a (default) error message -## -## ## Usage -## ```cmake -## vcpkg_fail_port_install( -## [ALWAYS] -## [MESSAGE <"Reason for failure">] -## [ON_TARGET [ ...]] -## [ON_ARCH [ ...]] -## [ON_CRT_LINKAGE [ ...]]) -## [ON_LIBRARY_LINKAGE [ ...]] -## ) -## ``` -## -## ## Parameters -## ### MESSAGE -## Additional failure message. If none is given, a default message will be displayed depending on the failure condition. -## -## ### ALWAYS -## Will always fail early -## -## ### ON_TARGET -## Targets for which the build should fail early. Valid targets are `` from `VCPKG_IS_TARGET_` (see `vcpkg_common_definitions.cmake`). -## -## ### ON_ARCH -## Architecture for which the build should fail early. -## -## ### ON_CRT_LINKAGE -## CRT linkage for which the build should fail early. -## -## ### ON_LIBRARY_LINKAGE -## Library linkage for which the build should fail early. -## -## ## Examples -## -## * [aws-lambda-cpp](https://github.com/Microsoft/vcpkg/blob/master/ports/aws-lambda-cpp/portfile.cmake) +#[===[.md: +# vcpkg_fail_port_install + +Checks common requirements and fails the current portfile with a (default) error message + +## Usage +```cmake +vcpkg_fail_port_install( + [ALWAYS] + [MESSAGE <"Reason for failure">] + [ON_TARGET [ ...]] + [ON_ARCH [ ...]] + [ON_CRT_LINKAGE [ ...]]) + [ON_LIBRARY_LINKAGE [ ...]] +) +``` + +## Parameters +### MESSAGE +Additional failure message. If none is given, a default message will be displayed depending on the failure condition. + +### ALWAYS +Will always fail early + +### ON_TARGET +Targets for which the build should fail early. Valid targets are `` from `VCPKG_IS_TARGET_` (see `vcpkg_common_definitions.cmake`). + +### ON_ARCH +Architecture for which the build should fail early. + +### ON_CRT_LINKAGE +CRT linkage for which the build should fail early. + +### ON_LIBRARY_LINKAGE +Library linkage for which the build should fail early. + +## Examples + +* [aws-lambda-cpp](https://github.com/Microsoft/vcpkg/blob/master/ports/aws-lambda-cpp/portfile.cmake) +#]===] + function(vcpkg_fail_port_install) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 _csc "ALWAYS" "MESSAGE" "ON_TARGET;ON_ARCH;ON_CRT_LINKAGE;ON_LIBRARY_LINKAGE") diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 1760c3630cbdac..278d7e6a4f4f6a 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -1,49 +1,51 @@ -## # vcpkg_find_acquire_program -## -## Download or find a well-known tool. -## -## ## Usage -## ```cmake -## vcpkg_find_acquire_program() -## ``` -## ## Parameters -## ### VAR -## This variable specifies both the program to be acquired as well as the out parameter that will be set to the path of the program executable. -## -## ## Notes -## The current list of programs includes: -## -## - 7Z -## - ARIA2 (Downloader) -## - BISON -## - CLANG -## - DARK -## - DOXYGEN -## - FLEX -## - GASPREPROCESSOR -## - GPERF -## - PERL -## - PYTHON2 -## - PYTHON3 -## - GIT -## - GN -## - GO -## - JOM -## - MESON -## - NASM -## - NINJA -## - NUGET -## - SCONS -## - SWIG -## - YASM -## -## Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_acquire_msys.md). -## -## ## Examples -## -## * [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) -## * [openssl](https://github.com/Microsoft/vcpkg/blob/master/ports/openssl/portfile.cmake) -## * [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake) +#[===[.md: +# vcpkg_find_acquire_program + +Download or find a well-known tool. + +## Usage +```cmake +vcpkg_find_acquire_program() +``` +## Parameters +### VAR +This variable specifies both the program to be acquired as well as the out parameter that will be set to the path of the program executable. + +## Notes +The current list of programs includes: + +* 7Z +* ARIA2 (Downloader) +* BISON +* CLANG +* DARK +* DOXYGEN +* FLEX +* GASPREPROCESSOR +* GPERF +* PERL +* PYTHON2 +* PYTHON3 +* GIT +* GN +* GO +* JOM +* MESON +* NASM +* NINJA +* NUGET +* SCONS +* SWIG +* YASM + +Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_acquire_msys.md). + +## Examples + +* [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) +* [openssl](https://github.com/Microsoft/vcpkg/blob/master/ports/openssl/portfile.cmake) +* [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake) +#]===] include(vcpkg_execute_in_download_mode) @@ -464,7 +466,7 @@ function(vcpkg_find_acquire_program VAR) macro(do_version_check) if(VERSION_CMD) - _execute_process( + vcpkg_execute_in_download_mode( COMMAND ${${VAR}} ${VERSION_CMD} WORKING_DIRECTORY ${DOWNLOADS} OUTPUT_VARIABLE ${VAR}_VERSION_OUTPUT diff --git a/scripts/cmake/vcpkg_find_fortran.cmake b/scripts/cmake/vcpkg_find_fortran.cmake index c517fa51bfdb19..fd359d0eeb3f3e 100644 --- a/scripts/cmake/vcpkg_find_fortran.cmake +++ b/scripts/cmake/vcpkg_find_fortran.cmake @@ -1,14 +1,15 @@ -## # vcpkg_find_fortran -## -## Checks if a Fortran compiler can be found. -## Windows(x86/x64) Only: If not it will switch/enable MinGW gfortran -## and return required cmake args for building. -## -## ## Usage -## ```cmake -## vcpkg_find_fortran( -## ) -## ``` +#[===[.md: +# vcpkg_find_fortran + +Checks if a Fortran compiler can be found. +Windows(x86/x64) Only: If not it will switch/enable MinGW gfortran + and return required cmake args for building. + +## Usage +```cmake +vcpkg_find_fortran() +``` +#]===] function(vcpkg_find_fortran additional_cmake_args_out) set(ARGS_OUT) diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index 31bf9351b21b3b..2da44f551eea77 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -1,52 +1,55 @@ -## # vcpkg_fixup_cmake_targets -## -## Merge release and debug CMake targets and configs to support multiconfig generators. -## -## Additionally corrects common issues with targets, such as absolute paths and incorrectly placed binaries. -## -## ## Usage -## ```cmake -## vcpkg_fixup_cmake_targets([CONFIG_PATH ] [TARGET_PATH ] [DO_NOT_DELETE_PARENT_CONFIG_PATH]) -## ``` -## -## ## Parameters -## -## ### CONFIG_PATH -## Subpath currently containing `*.cmake` files subdirectory (like `lib/cmake/${PORT}`). Should be relative to `${CURRENT_PACKAGES_DIR}`. -## -## Defaults to `share/${PORT}`. -## -## ### TARGET_PATH -## Subpath to which the above `*.cmake` files should be moved. Should be relative to `${CURRENT_PACKAGES_DIR}`. -## This needs to be specified if the port name differs from the `find_package()` name. -## -## Defaults to `share/${PORT}`. -## -## ### DO_NOT_DELETE_PARENT_CONFIG_PATH -## By default the parent directory of CONFIG_PATH is removed if it is named "cmake". -## Passing this option disable such behavior, as it is convenient for ports that install -## more than one CMake package configuration file. -## -## ### NO_PREFIX_CORRECTION -## Disables the correction of_IMPORT_PREFIX done by vcpkg due to moving the targets. -## Currently the correction does not take into account how the files are moved and applies -## I rather simply correction which in some cases will yield the wrong results. -## -## ## Notes -## Transform all `/debug//*targets-debug.cmake` files and move them to `/`. -## Removes all `/debug//*targets.cmake` and `/debug//*config.cmake`. -## -## Transform all references matching `/bin/*.exe` to `/tools//*.exe` on Windows. -## Transform all references matching `/bin/*` to `/tools//*` on other platforms. -## -## Fix `${_IMPORT_PREFIX}` in auto generated targets to be one folder deeper. -## Replace `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs and targets. -## -## ## Examples -## -## * [concurrentqueue](https://github.com/Microsoft/vcpkg/blob/master/ports/concurrentqueue/portfile.cmake) -## * [curl](https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake) -## * [nlohmann-json](https://github.com/Microsoft/vcpkg/blob/master/ports/nlohmann-json/portfile.cmake) +#[===[.md: +# vcpkg_fixup_cmake_targets + +Merge release and debug CMake targets and configs to support multiconfig generators. + +Additionally corrects common issues with targets, such as absolute paths and incorrectly placed binaries. + +## Usage +```cmake +vcpkg_fixup_cmake_targets([CONFIG_PATH ] [TARGET_PATH ] [DO_NOT_DELETE_PARENT_CONFIG_PATH]) +``` + +## Parameters + +### CONFIG_PATH +Subpath currently containing `*.cmake` files subdirectory (like `lib/cmake/${PORT}`). Should be relative to `${CURRENT_PACKAGES_DIR}`. + +Defaults to `share/${PORT}`. + +### TARGET_PATH +Subpath to which the above `*.cmake` files should be moved. Should be relative to `${CURRENT_PACKAGES_DIR}`. +This needs to be specified if the port name differs from the `find_package()` name. + +Defaults to `share/${PORT}`. + +### DO_NOT_DELETE_PARENT_CONFIG_PATH +By default the parent directory of CONFIG_PATH is removed if it is named "cmake". +Passing this option disable such behavior, as it is convenient for ports that install +more than one CMake package configuration file. + +### NO_PREFIX_CORRECTION +Disables the correction of_IMPORT_PREFIX done by vcpkg due to moving the targets. +Currently the correction does not take into account how the files are moved and applies +I rather simply correction which in some cases will yield the wrong results. + +## Notes +Transform all `/debug//*targets-debug.cmake` files and move them to `/`. +Removes all `/debug//*targets.cmake` and `/debug//*config.cmake`. + +Transform all references matching `/bin/*.exe` to `/tools//*.exe` on Windows. +Transform all references matching `/bin/*` to `/tools//*` on other platforms. + +Fix `${_IMPORT_PREFIX}` in auto generated targets to be one folder deeper. +Replace `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs and targets. + +## Examples + +* [concurrentqueue](https://github.com/Microsoft/vcpkg/blob/master/ports/concurrentqueue/portfile.cmake) +* [curl](https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake) +* [nlohmann-json](https://github.com/Microsoft/vcpkg/blob/master/ports/nlohmann-json/portfile.cmake) +#]===] + function(vcpkg_fixup_cmake_targets) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 _vfct "DO_NOT_DELETE_PARENT_CONFIG_PATH" "CONFIG_PATH;TARGET_PATH;NO_PREFIX_CORRECTION" "") diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index baccef10023ad8..f003b6d2d8f6d2 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -1,44 +1,46 @@ -## # vcpkg_fixup_pkgconfig -## -## Fix common paths in *.pc files and make everything relativ to $(prefix) -## -## ## Usage -## ```cmake -## vcpkg_fixup_pkgconfig( -## [RELEASE_FILES ...] -## [DEBUG_FILES ...] -## [SYSTEM_LIBRARIES ...] -## [IGNORE_FLAGS ] -## [SKIP_CHECK] -## ) -## ``` -## -## ## Parameters -## ### RELEASE_FILES -## Specifies a list of files to apply the fixes for release paths. -## Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR} without ${CURRENT_PACKAGES_DIR}/debug/ -## -## ### DEBUG_FILES -## Specifies a list of files to apply the fixes for debug paths. -## Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR}/debug/ -## -## ### SYSTEM_LIBRARIES -## If the *.pc file contains system libraries outside vcpkg these need to be listed here. -## VCPKG checks every -l flag for the existence of the required library within vcpkg. -## -## ### IGNORE_FLAGS -## If the *.pc file contains flags in the lib field which are not libraries. These can be listed here -## -## ### SKIP_CHECK -## Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself has unhandled cases. -## -## ## Notes -## Still work in progress. If there are more cases which can be handled here feel free to add them -## -## ## Examples -## Just call vcpkg_fixup_pkgconfig() after any install step which installs *.pc files. - -include(vcpkg_escape_regex_control_characters) +#[===[.md: +# vcpkg_fixup_pkgconfig + +Fix common paths in *.pc files and make everything relativ to $(prefix) + +## Usage +```cmake +vcpkg_fixup_pkgconfig( + [RELEASE_FILES ...] + [DEBUG_FILES ...] + [SYSTEM_LIBRARIES ...] + [IGNORE_FLAGS ] + [SKIP_CHECK] +) +``` + +## Parameters +### RELEASE_FILES +Specifies a list of files to apply the fixes for release paths. +Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR} without ${CURRENT_PACKAGES_DIR}/debug/ + +### DEBUG_FILES +Specifies a list of files to apply the fixes for debug paths. +Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR}/debug/ + +### SYSTEM_LIBRARIES +If the *.pc file contains system libraries outside vcpkg these need to be listed here. +VCPKG checks every -l flag for the existence of the required library within vcpkg. + +### IGNORE_FLAGS +If the *.pc file contains flags in the lib field which are not libraries. These can be listed here + +### SKIP_CHECK +Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself has unhandled cases. + +## Notes +Still work in progress. If there are more cases which can be handled here feel free to add them + +## Examples +Just call `vcpkg_fixup_pkgconfig()` after any install step which installs *.pc files. +#]===] + +include(vcpkg_internal_escape_regex_control_characters) function(vcpkg_fixup_pkgconfig_check_files pkg_cfg_cmd _file _config _system_libs _ignore_flags) # Setup pkg-config paths set(_VCPKG_INSTALLED_PKGCONF "${CURRENT_INSTALLED_DIR}") @@ -136,7 +138,7 @@ function(vcpkg_fixup_pkgconfig_check_files pkg_cfg_cmd _file _config _system_lib foreach(_search_path IN LISTS _pkg_lib_paths_output) debug_message("REMOVING:'${_search_path}'") debug_message("FROM:'${_pkg_libs_output}'") - vcpkg_escape_regex_control_characters(_search_path "${_search_path}") + vcpkg_internal_escape_regex_control_characters(_search_path "${_search_path}") string(REGEX REPLACE "(^[\t ]*|[\t ]+|;[\t ]*)-L${_search_path}([\t ]+|[\t ]*$)" ";" _pkg_libs_output "${_pkg_libs_output}") # Remove search paths from libs endforeach() debug_message("LIBS AFTER -L REMOVAL:'${_pkg_libs_output}'") @@ -169,7 +171,7 @@ function(vcpkg_fixup_pkgconfig_check_files pkg_cfg_cmd _file _config _system_lib debug_message("BEFORE IGNORE FLAGS REMOVAL: ${_pkg_libs_output}") foreach(_ignore IN LISTS _ignore_flags) # Remove ignore with whitespace debug_message("REMOVING FLAG:'${_ignore}'") - vcpkg_escape_regex_control_characters(_ignore "${_ignore}") + vcpkg_internal_escape_regex_control_characters(_ignore "${_ignore}") string(REGEX REPLACE "(^[\t ]*|;[\t ]*|[\t ]+)${_ignore}([\t ]+|[\t ]*;|[\t ]*$)" "\\2" _pkg_libs_output "${_pkg_libs_output}") debug_message("AFTER REMOVAL: ${_pkg_libs_output}") endforeach() @@ -259,7 +261,7 @@ function(vcpkg_fixup_pkgconfig) message(FATAL_ERROR "vcpkg_fixup_pkgconfig was passed extra arguments: ${_vfct_UNPARSED_ARGUMENTS}") endif() - vcpkg_escape_regex_control_characters(_vfpkg_ESCAPED_CURRENT_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}") + vcpkg_internal_escape_regex_control_characters(_vfpkg_ESCAPED_CURRENT_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}") if(NOT _vfpkg_RELEASE_FILES) file(GLOB_RECURSE _vfpkg_RELEASE_FILES "${CURRENT_PACKAGES_DIR}/**/*.pc") list(FILTER _vfpkg_RELEASE_FILES EXCLUDE REGEX "${_vfpkg_ESCAPED_CURRENT_PACKAGES_DIR}/debug/") diff --git a/scripts/cmake/vcpkg_from_bitbucket.cmake b/scripts/cmake/vcpkg_from_bitbucket.cmake index bd4c67ed98e69e..a376e810591b56 100644 --- a/scripts/cmake/vcpkg_from_bitbucket.cmake +++ b/scripts/cmake/vcpkg_from_bitbucket.cmake @@ -1,59 +1,62 @@ -## # vcpkg_from_bitbucket -## -## Download and extract a project from Bitbucket. -## Enables support for installing HEAD `vcpkg.exe install --head `. -## -## ## Usage: -## ```cmake -## vcpkg_from_bitbucket( -## OUT_SOURCE_PATH -## REPO -## [REF ] -## [SHA512 <45d0d7f8cc350...>] -## [HEAD_REF ] -## [PATCHES ...] -## ) -## ``` -## -## ## Parameters: -## ### OUT_SOURCE_PATH -## Specifies the out-variable that will contain the extracted location. -## -## This should be set to `SOURCE_PATH` by convention. -## -## ### REPO -## The organization or user and repository on GitHub. -## -## ### REF -## A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.** -## -## For repositories without official releases, this can be set to the full commit id of the current latest master. -## -## If `REF` is specified, `SHA512` must also be specified. -## -## ### SHA512 -## The SHA512 hash that should match the archive (https://bitbucket.com/${REPO}/get/${REF}.tar.gz). -## -## This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. -## -## ### HEAD_REF -## The unstable git commit-ish (ideally a branch) to pull for `--head` builds. -## -## For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms. -## -## ### PATCHES -## A list of patches to be applied to the extracted sources. -## -## Relative paths are based on the port directory. -## -## ## Notes: -## At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. -## -## This exports the `VCPKG_HEAD_VERSION` variable during head builds. -## -## ## Examples: -## -## * [blaze](https://github.com/Microsoft/vcpkg/blob/master/ports/blaze/portfile.cmake) +#[===[.md: +# vcpkg_from_bitbucket + +Download and extract a project from Bitbucket. +Enables support for installing HEAD `vcpkg.exe install --head `. + +## Usage: +```cmake +vcpkg_from_bitbucket( + OUT_SOURCE_PATH + REPO + [REF ] + [SHA512 <45d0d7f8cc350...>] + [HEAD_REF ] + [PATCHES ...] +) +``` + +## Parameters: +### OUT_SOURCE_PATH +Specifies the out-variable that will contain the extracted location. + +This should be set to `SOURCE_PATH` by convention. + +### REPO +The organization or user and repository on GitHub. + +### REF +A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.** + +For repositories without official releases, this can be set to the full commit id of the current latest master. + +If `REF` is specified, `SHA512` must also be specified. + +### SHA512 +The SHA512 hash that should match the archive (https://bitbucket.com/${REPO}/get/${REF}.tar.gz). + +This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. + +### HEAD_REF +The unstable git commit-ish (ideally a branch) to pull for `--head` builds. + +For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms. + +### PATCHES +A list of patches to be applied to the extracted sources. + +Relative paths are based on the port directory. + +## Notes: +At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. + +This exports the `VCPKG_HEAD_VERSION` variable during head builds. + +## Examples: + +* [blaze](https://github.com/Microsoft/vcpkg/blob/master/ports/blaze/portfile.cmake) +#]===] + function(vcpkg_from_bitbucket) set(oneValueArgs OUT_SOURCE_PATH REPO REF SHA512 HEAD_REF) set(multipleValuesArgs PATCHES) diff --git a/scripts/cmake/vcpkg_from_git.cmake b/scripts/cmake/vcpkg_from_git.cmake index 39469064f34650..54f93996a9650d 100644 --- a/scripts/cmake/vcpkg_from_git.cmake +++ b/scripts/cmake/vcpkg_from_git.cmake @@ -1,40 +1,42 @@ -## # vcpkg_from_git -## -## Download and extract a project from git -## -## ## Usage: -## ```cmake -## vcpkg_from_git( -## OUT_SOURCE_PATH -## URL -## REF <59f7335e4d...> -## [PATCHES ...] -## ) -## ``` -## -## ## Parameters: -## ### OUT_SOURCE_PATH -## Specifies the out-variable that will contain the extracted location. -## -## This should be set to `SOURCE_PATH` by convention. -## -## ### URL -## The url of the git repository. -## -## ### REF -## The git sha of the commit to download. -## -## ### PATCHES -## A list of patches to be applied to the extracted sources. -## -## Relative paths are based on the port directory. -## -## ## Notes: -## `OUT_SOURCE_PATH`, `REF`, and `URL` must be specified. -## -## ## Examples: -## -## * [fdlibm](https://github.com/Microsoft/vcpkg/blob/master/ports/fdlibm/portfile.cmake) +#[===[.md: +# vcpkg_from_git + +Download and extract a project from git + +## Usage: +```cmake +vcpkg_from_git( + OUT_SOURCE_PATH + URL + REF <59f7335e4d...> + [PATCHES ...] +) +``` + +## Parameters: +### OUT_SOURCE_PATH +Specifies the out-variable that will contain the extracted location. + +This should be set to `SOURCE_PATH` by convention. + +### URL +The url of the git repository. + +### REF +The git sha of the commit to download. + +### PATCHES +A list of patches to be applied to the extracted sources. + +Relative paths are based on the port directory. + +## Notes: +`OUT_SOURCE_PATH`, `REF`, and `URL` must be specified. + +## Examples: + +* [fdlibm](https://github.com/Microsoft/vcpkg/blob/master/ports/fdlibm/portfile.cmake) +#]===] include(vcpkg_execute_in_download_mode) diff --git a/scripts/cmake/vcpkg_from_github.cmake b/scripts/cmake/vcpkg_from_github.cmake index 5bc85d0cd4d3ef..f52538c8ef222f 100644 --- a/scripts/cmake/vcpkg_from_github.cmake +++ b/scripts/cmake/vcpkg_from_github.cmake @@ -1,73 +1,76 @@ -## # vcpkg_from_github -## -## Download and extract a project from GitHub. Enables support for `install --head`. -## -## ## Usage: -## ```cmake -## vcpkg_from_github( -## OUT_SOURCE_PATH -## REPO -## [REF ] -## [SHA512 <45d0d7f8cc350...>] -## [HEAD_REF ] -## [PATCHES ...] -## [GITHUB_HOST ] -## [AUTHORIZATION_TOKEN <${SECRET_FROM_FILE}>] -## ) -## ``` -## -## ## Parameters: -## ### OUT_SOURCE_PATH -## Specifies the out-variable that will contain the extracted location. -## -## This should be set to `SOURCE_PATH` by convention. -## -## ### REPO -## The organization or user and repository on GitHub. -## -## ### REF -## A stable git commit-ish (ideally a tag or commit) that will not change contents. **This should not be a branch.** -## -## For repositories without official releases, this can be set to the full commit id of the current latest master. -## -## If `REF` is specified, `SHA512` must also be specified. -## -## ### SHA512 -## The SHA512 hash that should match the archive (https://github.com/${REPO}/archive/${REF}.tar.gz). -## -## This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. -## -## ### HEAD_REF -## The unstable git commit-ish (ideally a branch) to pull for `--head` builds. -## -## For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms. -## -## ### PATCHES -## A list of patches to be applied to the extracted sources. -## -## Relative paths are based on the port directory. -## -## ### GITHUB_HOST -## A replacement host for enterprise GitHub instances. -## -## This field should contain the scheme, host, and port of the desired URL without a trailing slash. -## -## ### AUTHORIZATION_TOKEN -## A token to be passed via the Authorization HTTP header as "token ${AUTHORIZATION_TOKEN}". -## -## ### FILE_DISAMBIGUATOR -## A token to uniquely identify the resulting filename if the SHA512 changes even though a git ref does not, to avoid stepping on the same file name. -## -## ## Notes: -## At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. -## -## This exports the `VCPKG_HEAD_VERSION` variable during head builds. -## -## ## Examples: -## -## * [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) -## * [ms-gsl](https://github.com/Microsoft/vcpkg/blob/master/ports/ms-gsl/portfile.cmake) -## * [beast](https://github.com/Microsoft/vcpkg/blob/master/ports/beast/portfile.cmake) +#[===[.md: +# vcpkg_from_github + +Download and extract a project from GitHub. Enables support for `install --head`. + +## Usage: +```cmake +vcpkg_from_github( + OUT_SOURCE_PATH + REPO + [REF ] + [SHA512 <45d0d7f8cc350...>] + [HEAD_REF ] + [PATCHES ...] + [GITHUB_HOST ] + [AUTHORIZATION_TOKEN <${SECRET_FROM_FILE}>] +) +``` + +## Parameters: +### OUT_SOURCE_PATH +Specifies the out-variable that will contain the extracted location. + +This should be set to `SOURCE_PATH` by convention. + +### REPO +The organization or user and repository on GitHub. + +### REF +A stable git commit-ish (ideally a tag or commit) that will not change contents. **This should not be a branch.** + +For repositories without official releases, this can be set to the full commit id of the current latest master. + +If `REF` is specified, `SHA512` must also be specified. + +### SHA512 +The SHA512 hash that should match the archive (https://github.com/${REPO}/archive/${REF}.tar.gz). + +This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. + +### HEAD_REF +The unstable git commit-ish (ideally a branch) to pull for `--head` builds. + +For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms. + +### PATCHES +A list of patches to be applied to the extracted sources. + +Relative paths are based on the port directory. + +### GITHUB_HOST +A replacement host for enterprise GitHub instances. + +This field should contain the scheme, host, and port of the desired URL without a trailing slash. + +### AUTHORIZATION_TOKEN +A token to be passed via the Authorization HTTP header as "token ${AUTHORIZATION_TOKEN}". + +### FILE_DISAMBIGUATOR +A token to uniquely identify the resulting filename if the SHA512 changes even though a git ref does not, to avoid stepping on the same file name. + +## Notes: +At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. + +This exports the `VCPKG_HEAD_VERSION` variable during head builds. + +## Examples: + +* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) +* [ms-gsl](https://github.com/Microsoft/vcpkg/blob/master/ports/ms-gsl/portfile.cmake) +* [beast](https://github.com/Microsoft/vcpkg/blob/master/ports/beast/portfile.cmake) +#]===] + function(vcpkg_from_github) set(oneValueArgs OUT_SOURCE_PATH REPO REF SHA512 HEAD_REF GITHUB_HOST AUTHORIZATION_TOKEN FILE_DISAMBIGUATOR) set(multipleValuesArgs PATCHES) diff --git a/scripts/cmake/vcpkg_from_gitlab.cmake b/scripts/cmake/vcpkg_from_gitlab.cmake index c4226966144861..354ff85b987cfe 100644 --- a/scripts/cmake/vcpkg_from_gitlab.cmake +++ b/scripts/cmake/vcpkg_from_gitlab.cmake @@ -1,66 +1,67 @@ -## # vcpkg_from_gitlab -## -## Download and extract a project from Gitlab instances. Enables support for `install --head`. -## -## ## Usage: -## ```cmake -## vcpkg_from_gitlab( -## GITLAB_URL -## OUT_SOURCE_PATH -## REPO -## [REF ] -## [SHA512 <45d0d7f8cc350...>] -## [HEAD_REF ] -## [PATCHES ...] -## ) -## ``` -## -## ## Parameters: -## -## ### GITLAB_URL -## The URL of the Gitlab instance to use. -## -## ### OUT_SOURCE_PATH -## Specifies the out-variable that will contain the extracted location. -## -## This should be set to `SOURCE_PATH` by convention. -## -## ### REPO -## The organization or user plus the repository name on the Gitlab instance. -## -## ### REF -## A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.** -## -## For repositories without official releases, this can be set to the full commit id of the current latest master. -## -## If `REF` is specified, `SHA512` must also be specified. -## -## ### SHA512 -## The SHA512 hash that should match the archive (${GITLAB_URL}/${REPO}/-/archive/${REF}/${REPO_NAME}-${REF}.tar.gz). -## The REPO_NAME variable is parsed from the value of REPO. -## -## This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. -## -## ### HEAD_REF -## The unstable git commit-ish (ideally a branch) to pull for `--head` builds. -## -## For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms. -## -## ### PATCHES -## A list of patches to be applied to the extracted sources. -## -## Relative paths are based on the port directory. -## -## ## Notes: -## At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. -## -## This exports the `VCPKG_HEAD_VERSION` variable during head builds. -## -## ## Examples: -## * [curl][https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake#L75] -## * [folly](https://github.com/Microsoft/vcpkg/blob/master/ports/folly/portfile.cmake#L15) -## * [z3](https://github.com/Microsoft/vcpkg/blob/master/ports/z3/portfile.cmake#L13) -## +#[===[.md: +# vcpkg_from_gitlab + +Download and extract a project from Gitlab instances. Enables support for `install --head`. + +## Usage: +```cmake +vcpkg_from_gitlab( + GITLAB_URL + OUT_SOURCE_PATH + REPO + [REF ] + [SHA512 <45d0d7f8cc350...>] + [HEAD_REF ] + [PATCHES ...] +) +``` + +## Parameters: + +### GITLAB_URL +The URL of the Gitlab instance to use. + +### OUT_SOURCE_PATH +Specifies the out-variable that will contain the extracted location. + +This should be set to `SOURCE_PATH` by convention. + +### REPO +The organization or user plus the repository name on the Gitlab instance. + +### REF +A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.** + +For repositories without official releases, this can be set to the full commit id of the current latest master. + +If `REF` is specified, `SHA512` must also be specified. + +### SHA512 +The SHA512 hash that should match the archive (${GITLAB_URL}/${REPO}/-/archive/${REF}/${REPO_NAME}-${REF}.tar.gz). +The REPO_NAME variable is parsed from the value of REPO. + +This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. + +### HEAD_REF +The unstable git commit-ish (ideally a branch) to pull for `--head` builds. + +For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms. + +### PATCHES +A list of patches to be applied to the extracted sources. + +Relative paths are based on the port directory. + +## Notes: +At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. + +This exports the `VCPKG_HEAD_VERSION` variable during head builds. + +## Examples: +* [curl][https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake#L75] +* [folly](https://github.com/Microsoft/vcpkg/blob/master/ports/folly/portfile.cmake#L15) +* [z3](https://github.com/Microsoft/vcpkg/blob/master/ports/z3/portfile.cmake#L13) +#]===] include(vcpkg_execute_in_download_mode) diff --git a/scripts/cmake/vcpkg_from_sourceforge.cmake b/scripts/cmake/vcpkg_from_sourceforge.cmake index 280ad93f86da73..82286b346d02f8 100644 --- a/scripts/cmake/vcpkg_from_sourceforge.cmake +++ b/scripts/cmake/vcpkg_from_sourceforge.cmake @@ -1,68 +1,70 @@ -## # vcpkg_from_sourceforge -## -## Download and extract a project from sourceforge. -## -## ## Usage: -## ```cmake -## vcpkg_from_sourceforge( -## OUT_SOURCE_PATH SOURCE_PATH -## REPO -## [REF <2.1-3>] -## SHA512 <547b417109332...> -## FILENAME -## [DISABLE_SSL] -## [NO_REMOVE_ONE_LEVEL] -## [PATCHES ...] -## ) -## ``` -## -## ## Parameters: -## ### OUT_SOURCE_PATH -## Specifies the out-variable that will contain the extracted location. -## -## This should be set to `SOURCE_PATH` by convention. -## -## ### REPO -## The organization or user and repository (optional) on sourceforge. -## -## ### REF -## A stable version number that will not change contents. -## -## ### FILENAME -## The local name for the file. Files are shared between ports, so the file may need to be renamed to make it clearly attributed to this port and avoid conflicts. -## -## For example, we can get the download link: -## https://sourceforge.net/settings/mirror_choices?projectname=mad&filename=libmad/0.15.1b/libmad-0.15.1b.tar.gz&selected=nchc -## So the REPO is `mad/libmad`, the REF is `0.15.1b`, and the FILENAME is `libmad-0.15.1b.tar.gz` -## -## For some special links: -## https://sourceforge.net/settings/mirror_choices?projectname=soxr&filename=soxr-0.1.3-Source.tar.xz&selected=nchc -## The REPO is `soxr`, REF is not exist, and the FILENAME is `soxr-0.1.3-Source.tar.xz` -## -## ### SHA512 -## The SHA512 hash that should match the archive. -## -## ### WORKING_DIRECTORY -## If specified, the archive will be extracted into the working directory instead of `${CURRENT_BUILDTREES_DIR}/src/`. -## -## Note that the archive will still be extracted into a subfolder underneath that directory (`${WORKING_DIRECTORY}/${REF}-${HASH}/`). -## -## ### PATCHES -## A list of patches to be applied to the extracted sources. -## -## Relative paths are based on the port directory. -## -## ### DISABLE_SSL -## Disable ssl when downloading source. -## -## ### NO_REMOVE_ONE_LEVEL -## Specifies that the default removal of the top level folder should not occur. -## -## ## Examples: -## -## * [cunit](https://github.com/Microsoft/vcpkg/blob/master/ports/cunit/portfile.cmake) -## * [polyclipping](https://github.com/Microsoft/vcpkg/blob/master/ports/polyclipping/portfile.cmake) -## * [tinyfiledialogs](https://github.com/Microsoft/vcpkg/blob/master/ports/tinyfiledialogs/portfile.cmake) +#[===[.md: +# vcpkg_from_sourceforge + +Download and extract a project from sourceforge. + +## Usage: +```cmake +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO + [REF <2.1-3>] + SHA512 <547b417109332...> + FILENAME + [DISABLE_SSL] + [NO_REMOVE_ONE_LEVEL] + [PATCHES ...] +) +``` + +## Parameters: +### OUT_SOURCE_PATH +Specifies the out-variable that will contain the extracted location. + +This should be set to `SOURCE_PATH` by convention. + +### REPO +The organization or user and repository (optional) on sourceforge. + +### REF +A stable version number that will not change contents. + +### FILENAME +The local name for the file. Files are shared between ports, so the file may need to be renamed to make it clearly attributed to this port and avoid conflicts. + +For example, we can get the download link: +https://sourceforge.net/settings/mirror_choices?projectname=mad&filename=libmad/0.15.1b/libmad-0.15.1b.tar.gz&selected=nchc +So the REPO is `mad/libmad`, the REF is `0.15.1b`, and the FILENAME is `libmad-0.15.1b.tar.gz` + +For some special links: +https://sourceforge.net/settings/mirror_choices?projectname=soxr&filename=soxr-0.1.3-Source.tar.xz&selected=nchc +The REPO is `soxr`, REF is not exist, and the FILENAME is `soxr-0.1.3-Source.tar.xz` + +### SHA512 +The SHA512 hash that should match the archive. + +### WORKING_DIRECTORY +If specified, the archive will be extracted into the working directory instead of `${CURRENT_BUILDTREES_DIR}/src/`. + +Note that the archive will still be extracted into a subfolder underneath that directory (`${WORKING_DIRECTORY}/${REF}-${HASH}/`). + +### PATCHES +A list of patches to be applied to the extracted sources. + +Relative paths are based on the port directory. + +### DISABLE_SSL +Disable ssl when downloading source. + +### NO_REMOVE_ONE_LEVEL +Specifies that the default removal of the top level folder should not occur. + +## Examples: + +* [cunit](https://github.com/Microsoft/vcpkg/blob/master/ports/cunit/portfile.cmake) +* [polyclipping](https://github.com/Microsoft/vcpkg/blob/master/ports/polyclipping/portfile.cmake) +* [tinyfiledialogs](https://github.com/Microsoft/vcpkg/blob/master/ports/tinyfiledialogs/portfile.cmake) +#]===] function(vcpkg_from_sourceforge) macro(check_file_content) diff --git a/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake b/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake index ed51b74010ab0f..7e3a5af5265af4 100644 --- a/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake +++ b/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake @@ -1,3 +1,16 @@ +#[===[.md: +# vcpkg_get_program_files_platform_bitness + +Get the Program Files directory of the current platform's bitness: +either `$ENV{ProgramW6432}` on 64-bit windows, +or `$ENV{PROGRAMFILES}` on 32-bit windows. + +## Usage: +```cmake +vcpkg_get_program_files_platform_bitness() +``` +#]===] + function(vcpkg_get_program_files_platform_bitness ret) set(ret_temp $ENV{ProgramW6432}) @@ -7,4 +20,4 @@ function(vcpkg_get_program_files_platform_bitness ret) set(${ret} ${ret_temp} PARENT_SCOPE) -endfunction() \ No newline at end of file +endfunction() diff --git a/scripts/cmake/vcpkg_get_windows_sdk.cmake b/scripts/cmake/vcpkg_get_windows_sdk.cmake index e7d72a1252890b..f16d4f53e8f557 100644 --- a/scripts/cmake/vcpkg_get_windows_sdk.cmake +++ b/scripts/cmake/vcpkg_get_windows_sdk.cmake @@ -1,6 +1,16 @@ -# Returns Windows SDK number via out variable "ret" +#[===[.md: +# vcpkg_get_windows_sdk + +Get the Windows SDK number. + +## Usage: +```cmake +vcpkg_get_windows_sdk() +``` +#]===] + function(vcpkg_get_windows_sdk ret) set(WINDOWS_SDK $ENV{WindowsSDKVersion}) string(REPLACE "\\" "" WINDOWS_SDK "${WINDOWS_SDK}") set(${ret} ${WINDOWS_SDK} PARENT_SCOPE) -endfunction() \ No newline at end of file +endfunction() diff --git a/scripts/cmake/vcpkg_install_cmake.cmake b/scripts/cmake/vcpkg_install_cmake.cmake index ab72d054e4f93a..a1ba0cf2fb0922 100644 --- a/scripts/cmake/vcpkg_install_cmake.cmake +++ b/scripts/cmake/vcpkg_install_cmake.cmake @@ -1,25 +1,28 @@ -## # vcpkg_install_cmake -## -## Build and install a cmake project. -## -## ## Usage: -## ```cmake -## vcpkg_install_cmake(...) -## ``` -## -## ## Parameters: -## See [`vcpkg_build_cmake()`](vcpkg_build_cmake.md). -## -## ## Notes: -## This command transparently forwards to [`vcpkg_build_cmake()`](vcpkg_build_cmake.md), adding a `TARGET install` -## parameter. -## -## ## Examples: -## -## * [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) -## * [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) -## * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) -## * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) +#[===[.md: +# vcpkg_install_cmake + +Build and install a cmake project. + +## Usage: +```cmake +vcpkg_install_cmake(...) +``` + +## Parameters: +See [`vcpkg_build_cmake()`](vcpkg_build_cmake.md). + +## Notes: +This command transparently forwards to [`vcpkg_build_cmake()`](vcpkg_build_cmake.md), adding a `TARGET install` +parameter. + +## Examples: + +* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) +* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) +* [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) +* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) +#]===] + function(vcpkg_install_cmake) vcpkg_build_cmake(LOGFILE_ROOT install TARGET install ${ARGN}) endfunction() diff --git a/scripts/cmake/vcpkg_install_gn.cmake b/scripts/cmake/vcpkg_install_gn.cmake index e71c8c17364498..8dd83510e67b59 100644 --- a/scripts/cmake/vcpkg_install_gn.cmake +++ b/scripts/cmake/vcpkg_install_gn.cmake @@ -1,23 +1,25 @@ -## # vcpkg_install_gn -## -## Installs a GN project -## -## ## Usage: -## ```cmake -## vcpkg_install_gn( -## SOURCE_PATH -## [TARGETS ...] -## ) -## ``` -## -## ## Parameters: -## ### SOURCE_PATH -## The path to the source directory -## -## ### TARGETS -## Only install the specified targets. -## -## Note: includes must be handled separately +#[===[.md: +# vcpkg_install_gn + +Installs a GN project + +## Usage: +```cmake +vcpkg_install_gn( + SOURCE_PATH + [TARGETS ...] +) +``` + +## Parameters: +### SOURCE_PATH +The path to the source directory + +### TARGETS +Only install the specified targets. + +Note: includes must be handled separately +#]===] function(vcpkg_install_gn) # parse parameters such that semicolons in options arguments to COMMAND don't get erased @@ -95,4 +97,4 @@ function(vcpkg_install_gn) install_("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_PACKAGES_DIR}") endif() -endfunction() \ No newline at end of file +endfunction() diff --git a/scripts/cmake/vcpkg_install_make.cmake b/scripts/cmake/vcpkg_install_make.cmake index 4246894686cc83..ce8a782d3c5953 100644 --- a/scripts/cmake/vcpkg_install_make.cmake +++ b/scripts/cmake/vcpkg_install_make.cmake @@ -1,24 +1,26 @@ -## # vcpkg_install_make -## -## Build and install a make project. -## -## ## Usage: -## ```cmake -## vcpkg_install_make(...) -## ``` -## -## ## Parameters: -## See [`vcpkg_build_make()`](vcpkg_build_make.md). -## -## ## Notes: -## This command transparently forwards to [`vcpkg_build_make()`](vcpkg_build_make.md), adding `ENABLE_INSTALL` -## -## ## Examples -## -## * [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake) -## * [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) -## * [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) -## * [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) +#[===[.md: +# vcpkg_install_make + +Build and install a make project. + +## Usage: +```cmake +vcpkg_install_make(...) +``` + +## Parameters: +See [`vcpkg_build_make()`](vcpkg_build_make.md). + +## Notes: +This command transparently forwards to [`vcpkg_build_make()`](vcpkg_build_make.md), adding `ENABLE_INSTALL` + +## Examples + +* [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake) +* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) +* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) +* [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) +#]===] function(vcpkg_install_make) vcpkg_build_make(${ARGN} LOGFILE_ROOT ENABLE_INSTALL) diff --git a/scripts/cmake/vcpkg_install_meson.cmake b/scripts/cmake/vcpkg_install_meson.cmake index 9d9972a0b91bc3..2162029180222c 100644 --- a/scripts/cmake/vcpkg_install_meson.cmake +++ b/scripts/cmake/vcpkg_install_meson.cmake @@ -1,16 +1,19 @@ -## # vcpkg_install_meson -## -## Builds a meson project previously configured with `vcpkg_configure_meson()`. -## -## ## Usage -## ```cmake -## vcpkg_install_meson() -## ``` -## -## ## Examples -## -## * [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) -## * [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) +#[===[.md: +# vcpkg_install_meson + +Builds a meson project previously configured with `vcpkg_configure_meson()`. + +## Usage +```cmake +vcpkg_install_meson() +``` + +## Examples + +* [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) +* [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) +#]===] + function(vcpkg_install_meson) vcpkg_find_acquire_program(NINJA) unset(ENV{DESTDIR}) # installation directory was already specified with '--prefix' option diff --git a/scripts/cmake/vcpkg_install_msbuild.cmake b/scripts/cmake/vcpkg_install_msbuild.cmake index ee3247cfaffafa..cdef344ddbf87b 100644 --- a/scripts/cmake/vcpkg_install_msbuild.cmake +++ b/scripts/cmake/vcpkg_install_msbuild.cmake @@ -1,93 +1,95 @@ -## # vcpkg_install_msbuild -## -## Build and install a msbuild-based project. This replaces `vcpkg_build_msbuild()`. -## -## ## Usage -## ```cmake -## vcpkg_install_msbuild( -## SOURCE_PATH <${SOURCE_PATH}> -## PROJECT_SUBPATH -## [INCLUDES_SUBPATH ] -## [LICENSE_SUBPATH ] -## [RELEASE_CONFIGURATION ] -## [DEBUG_CONFIGURATION ] -## [TARGET ] -## [TARGET_PLATFORM_VERSION <10.0.15063.0>] -## [PLATFORM <${TRIPLET_SYSTEM_ARCH}>] -## [PLATFORM_TOOLSET <${VCPKG_PLATFORM_TOOLSET}>] -## [OPTIONS ...] -## [OPTIONS_RELEASE ...] -## [OPTIONS_DEBUG ...] -## [USE_VCPKG_INTEGRATION] -## [ALLOW_ROOT_INCLUDES | REMOVE_ROOT_INCLUDES] -## ) -## ``` -## -## ## Parameters -## ### SOURCE_PATH -## The path to the root of the source tree. -## -## Because MSBuild uses in-source builds, the source tree will be copied into a temporary location for the build. This -## parameter is the base for that copy and forms the base for all XYZ_SUBPATH options. -## -## ### USE_VCPKG_INTEGRATION -## Apply the normal `integrate install` integration for building the project. -## -## By default, projects built with this command will not automatically link libraries or have header paths set. -## -## ### PROJECT_SUBPATH -## The subpath to the solution (`.sln`) or project (`.vcxproj`) file relative to `SOURCE_PATH`. -## -## ### LICENSE_SUBPATH -## The subpath to the license file relative to `SOURCE_PATH`. -## -## ### INCLUDES_SUBPATH -## The subpath to the includes directory relative to `SOURCE_PATH`. -## -## This parameter should be a directory and should not end in a trailing slash. -## -## ### ALLOW_ROOT_INCLUDES -## Indicates that top-level include files (e.g. `include/zlib.h`) should be allowed. -## -## ### REMOVE_ROOT_INCLUDES -## Indicates that top-level include files (e.g. `include/Makefile.am`) should be removed. -## -## ### SKIP_CLEAN -## Indicates that the intermediate files should not be removed. -## -## Ports using this option should later call [`vcpkg_clean_msbuild()`](vcpkg_clean_msbuild.md) to manually clean up. -## -## ### RELEASE_CONFIGURATION -## The configuration (``/p:Configuration`` msbuild parameter) used for Release builds. -## -## ### DEBUG_CONFIGURATION -## The configuration (``/p:Configuration`` msbuild parameter) used for Debug builds. -## -## ### TARGET_PLATFORM_VERSION -## The WindowsTargetPlatformVersion (``/p:WindowsTargetPlatformVersion`` msbuild parameter) -## -## ### TARGET -## The MSBuild target to build. (``/t:``) -## -## ### PLATFORM -## The platform (``/p:Platform`` msbuild parameter) used for the build. -## -## ### PLATFORM_TOOLSET -## The platform toolset (``/p:PlatformToolset`` msbuild parameter) used for the build. -## -## ### OPTIONS -## Additional options passed to msbuild for all builds. -## -## ### OPTIONS_RELEASE -## Additional options passed to msbuild for Release builds. These are in addition to `OPTIONS`. -## -## ### OPTIONS_DEBUG -## Additional options passed to msbuild for Debug builds. These are in addition to `OPTIONS`. -## -## ## Examples -## -## * [xalan-c](https://github.com/Microsoft/vcpkg/blob/master/ports/xalan-c/portfile.cmake) -## * [libimobiledevice](https://github.com/Microsoft/vcpkg/blob/master/ports/libimobiledevice/portfile.cmake) +#[===[.md: +# vcpkg_install_msbuild + +Build and install a msbuild-based project. This replaces `vcpkg_build_msbuild()`. + +## Usage +```cmake +vcpkg_install_msbuild( + SOURCE_PATH <${SOURCE_PATH}> + PROJECT_SUBPATH + [INCLUDES_SUBPATH ] + [LICENSE_SUBPATH ] + [RELEASE_CONFIGURATION ] + [DEBUG_CONFIGURATION ] + [TARGET ] + [TARGET_PLATFORM_VERSION <10.0.15063.0>] + [PLATFORM <${TRIPLET_SYSTEM_ARCH}>] + [PLATFORM_TOOLSET <${VCPKG_PLATFORM_TOOLSET}>] + [OPTIONS ...] + [OPTIONS_RELEASE ...] + [OPTIONS_DEBUG ...] + [USE_VCPKG_INTEGRATION] + [ALLOW_ROOT_INCLUDES | REMOVE_ROOT_INCLUDES] +) +``` + +## Parameters +### SOURCE_PATH +The path to the root of the source tree. + +Because MSBuild uses in-source builds, the source tree will be copied into a temporary location for the build. This +parameter is the base for that copy and forms the base for all XYZ_SUBPATH options. + +### USE_VCPKG_INTEGRATION +Apply the normal `integrate install` integration for building the project. + +By default, projects built with this command will not automatically link libraries or have header paths set. + +### PROJECT_SUBPATH +The subpath to the solution (`.sln`) or project (`.vcxproj`) file relative to `SOURCE_PATH`. + +### LICENSE_SUBPATH +The subpath to the license file relative to `SOURCE_PATH`. + +### INCLUDES_SUBPATH +The subpath to the includes directory relative to `SOURCE_PATH`. + +This parameter should be a directory and should not end in a trailing slash. + +### ALLOW_ROOT_INCLUDES +Indicates that top-level include files (e.g. `include/zlib.h`) should be allowed. + +### REMOVE_ROOT_INCLUDES +Indicates that top-level include files (e.g. `include/Makefile.am`) should be removed. + +### SKIP_CLEAN +Indicates that the intermediate files should not be removed. + +Ports using this option should later call [`vcpkg_clean_msbuild()`](vcpkg_clean_msbuild.md) to manually clean up. + +### RELEASE_CONFIGURATION +The configuration (``/p:Configuration`` msbuild parameter) used for Release builds. + +### DEBUG_CONFIGURATION +The configuration (``/p:Configuration`` msbuild parameter) used for Debug builds. + +### TARGET_PLATFORM_VERSION +The WindowsTargetPlatformVersion (``/p:WindowsTargetPlatformVersion`` msbuild parameter) + +### TARGET +The MSBuild target to build. (``/t:``) + +### PLATFORM +The platform (``/p:Platform`` msbuild parameter) used for the build. + +### PLATFORM_TOOLSET +The platform toolset (``/p:PlatformToolset`` msbuild parameter) used for the build. + +### OPTIONS +Additional options passed to msbuild for all builds. + +### OPTIONS_RELEASE +Additional options passed to msbuild for Release builds. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to msbuild for Debug builds. These are in addition to `OPTIONS`. + +## Examples + +* [xalan-c](https://github.com/Microsoft/vcpkg/blob/master/ports/xalan-c/portfile.cmake) +* [libimobiledevice](https://github.com/Microsoft/vcpkg/blob/master/ports/libimobiledevice/portfile.cmake) +#]===] include(vcpkg_clean_msbuild) diff --git a/scripts/cmake/vcpkg_install_nmake.cmake b/scripts/cmake/vcpkg_install_nmake.cmake index 05efce2e238e80..5aebdae90ce848 100644 --- a/scripts/cmake/vcpkg_install_nmake.cmake +++ b/scripts/cmake/vcpkg_install_nmake.cmake @@ -1,66 +1,68 @@ -## # vcpkg_install_nmake -## -## Build and install a msvc makefile project. -## -## ## Usage: -## ```cmake -## vcpkg_install_nmake( -## SOURCE_PATH <${SOURCE_PATH}> -## [NO_DEBUG] -## [TARGET ] -## PROJECT_SUBPATH <${SUBPATH}> -## PROJECT_NAME <${MAKEFILE_NAME}> -## [PRERUN_SHELL <${SHELL_PATH}>] -## [PRERUN_SHELL_DEBUG <${SHELL_PATH}>] -## [PRERUN_SHELL_RELEASE <${SHELL_PATH}>] -## [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] -## [OPTIONS_RELEASE <-DOPTIMIZE=1>...] -## [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] -## ``` -## -## ## Parameters -## ### SOURCE_PATH -## Specifies the directory containing the source files. -## By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. -## -## ### PROJECT_SUBPATH -## Specifies the sub directory containing the `makefile.vc`/`makefile.mak`/`makefile.msvc` or other msvc makefile. -## -## ### PROJECT_NAME -## Specifies the name of msvc makefile name. -## Default is makefile.vc -## -## ### NO_DEBUG -## This port doesn't support debug mode. -## -## ### PRERUN_SHELL -## Script that needs to be called before build -## -## ### PRERUN_SHELL_DEBUG -## Script that needs to be called before debug build -## -## ### PRERUN_SHELL_RELEASE -## Script that needs to be called before release build -## -## ### OPTIONS -## Additional options passed to generate during the generation. -## -## ### OPTIONS_RELEASE -## Additional options passed to generate during the Release generation. These are in addition to `OPTIONS`. -## -## ### OPTIONS_DEBUG -## Additional options passed to generate during the Debug generation. These are in addition to `OPTIONS`. -## -## ## Parameters: -## See [`vcpkg_build_nmake()`](vcpkg_build_nmake.md). -## -## ## Notes: -## This command transparently forwards to [`vcpkg_build_nmake()`](vcpkg_build_nmake.md), adding `ENABLE_INSTALL` -## -## ## Examples -## -## * [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) -## * [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) +#[===[.md: +# vcpkg_install_nmake + +Build and install a msvc makefile project. + +## Usage: +```cmake +vcpkg_install_nmake( + SOURCE_PATH <${SOURCE_PATH}> + [NO_DEBUG] + [TARGET ] + PROJECT_SUBPATH <${SUBPATH}> + PROJECT_NAME <${MAKEFILE_NAME}> + [PRERUN_SHELL <${SHELL_PATH}>] + [PRERUN_SHELL_DEBUG <${SHELL_PATH}>] + [PRERUN_SHELL_RELEASE <${SHELL_PATH}>] + [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] + [OPTIONS_RELEASE <-DOPTIMIZE=1>...] + [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] +``` + +## Parameters +### SOURCE_PATH +Specifies the directory containing the source files. +By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. + +### PROJECT_SUBPATH +Specifies the sub directory containing the `makefile.vc`/`makefile.mak`/`makefile.msvc` or other msvc makefile. + +### PROJECT_NAME +Specifies the name of msvc makefile name. +Default is makefile.vc + +### NO_DEBUG +This port doesn't support debug mode. + +### PRERUN_SHELL +Script that needs to be called before build + +### PRERUN_SHELL_DEBUG +Script that needs to be called before debug build + +### PRERUN_SHELL_RELEASE +Script that needs to be called before release build + +### OPTIONS +Additional options passed to generate during the generation. + +### OPTIONS_RELEASE +Additional options passed to generate during the Release generation. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to generate during the Debug generation. These are in addition to `OPTIONS`. + +## Parameters: +See [`vcpkg_build_nmake()`](vcpkg_build_nmake.md). + +## Notes: +This command transparently forwards to [`vcpkg_build_nmake()`](vcpkg_build_nmake.md), adding `ENABLE_INSTALL` + +## Examples + +* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) +* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) +#]===] function(vcpkg_install_nmake) # parse parameters such that semicolons in options arguments to COMMAND don't get erased diff --git a/scripts/cmake/vcpkg_install_qmake.cmake b/scripts/cmake/vcpkg_install_qmake.cmake index 571b55a68300a6..d8362697abc762 100644 --- a/scripts/cmake/vcpkg_install_qmake.cmake +++ b/scripts/cmake/vcpkg_install_qmake.cmake @@ -1,24 +1,26 @@ -## # vcpkg_install_qmake -## -## Build and install a qmake project. -## -## ## Usage: -## ```cmake -## vcpkg_install_qmake(...) -## ``` -## -## ## Parameters: -## See [`vcpkg_build_qmake()`](vcpkg_build_qmake.md). -## -## ## Notes: -## This command transparently forwards to [`vcpkg_build_qmake()`](vcpkg_build_qmake.md). -## -## Additionally, this command will copy produced .libs/.dlls/.as/.dylibs/.sos to the appropriate -## staging directories. -## -## ## Examples -## -## * [libqglviewer](https://github.com/Microsoft/vcpkg/blob/master/ports/libqglviewer/portfile.cmake) +#[===[.md: +# vcpkg_install_qmake + +Build and install a qmake project. + +## Usage: +```cmake +vcpkg_install_qmake(...) +``` + +## Parameters: +See [`vcpkg_build_qmake()`](vcpkg_build_qmake.md). + +## Notes: +This command transparently forwards to [`vcpkg_build_qmake()`](vcpkg_build_qmake.md). + +Additionally, this command will copy produced .libs/.dlls/.as/.dylibs/.sos to the appropriate +staging directories. + +## Examples + +* [libqglviewer](https://github.com/Microsoft/vcpkg/blob/master/ports/libqglviewer/portfile.cmake) +#]===] function(vcpkg_install_qmake) vcpkg_build_qmake(${ARGN}) diff --git a/scripts/cmake/vcpkg_escape_regex_control_characters.cmake b/scripts/cmake/vcpkg_internal_escape_regex_control_characters.cmake similarity index 64% rename from scripts/cmake/vcpkg_escape_regex_control_characters.cmake rename to scripts/cmake/vcpkg_internal_escape_regex_control_characters.cmake index 3d9d92b5e4102c..0655f93db206fc 100644 --- a/scripts/cmake/vcpkg_escape_regex_control_characters.cmake +++ b/scripts/cmake/vcpkg_internal_escape_regex_control_characters.cmake @@ -1,4 +1,4 @@ -function(vcpkg_escape_regex_control_characters out_var string_with_regex_characters) +function(vcpkg_internal_escape_regex_control_characters out_var string_with_regex_characters) string(REGEX REPLACE "[][+.*()^\\$?|]" "\\\\\\0" _escaped_content "${string_with_regex_characters}") set(${out_var} "${_escaped_content}" PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake b/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake index 7f5ed1283d019a..6c705ae8f8f429 100644 --- a/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake +++ b/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake @@ -1,29 +1,31 @@ -## # vcpkg_internal_get_cmake_vars -## -## **Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** -## Runs a cmake configure with a dummy project to extract certain cmake variables -## -## ## Usage -## ```cmake -## vcpkg_internal_get_cmake_vars( -## [OUTPUT_FILE ] -## [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] -## ) -## ``` -## -## ## Parameters -## ### OPTIONS -## Additional options to pass to the test configure call -## -## ### OUTPUT_FILE -## Variable to return the path to the generated cmake file with the detected `CMAKE_` variables set as `VCKPG_DETECTED_` -## -## ## Notes -## If possible avoid usage in portfiles. -## -## ## Examples -## -## * [vcpkg_configure_make](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_make.cmake) +#[===[.md: +# vcpkg_internal_get_cmake_vars + +**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** +Runs a cmake configure with a dummy project to extract certain cmake variables + +## Usage +```cmake +vcpkg_internal_get_cmake_vars( + [OUTPUT_FILE ] + [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] +) +``` + +## Parameters +### OPTIONS +Additional options to pass to the test configure call + +### OUTPUT_FILE +Variable to return the path to the generated cmake file with the detected `CMAKE_` variables set as `VCKPG_DETECTED_` + +## Notes +If possible avoid usage in portfiles. + +## Examples + +* [vcpkg_configure_make](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_make.cmake) +#]===] function(vcpkg_internal_get_cmake_vars) cmake_parse_arguments(PARSE_ARGV 0 _gcv "" "OUTPUT_FILE" "OPTIONS") diff --git a/scripts/cmake/vcpkg_prettify_command.cmake b/scripts/cmake/vcpkg_prettify_command.cmake index c12332b7a5965b..25ad95eecb180e 100644 --- a/scripts/cmake/vcpkg_prettify_command.cmake +++ b/scripts/cmake/vcpkg_prettify_command.cmake @@ -1,17 +1,19 @@ -## # vcpkg_prettify_command -## -## Turns list of command arguments into a formatted string. -## -## ## Usage -## ```cmake -## vcpkg_prettify_command( ) -## ``` -## -## ## Examples -## -## * `scripts/cmake/vcpkg_execute_build_process.cmake` -## * `scripts/cmake/vcpkg_execute_required_process.cmake` -## * `scripts/cmake/vcpkg_execute_required_process_repeat.cmake` +#[===[.md: +# vcpkg_prettify_command + +Turns list of command arguments into a formatted string. + +## Usage +```cmake +vcpkg_prettify_command( ) +``` + +## Examples + +* `scripts/cmake/vcpkg_execute_build_process.cmake` +* `scripts/cmake/vcpkg_execute_required_process.cmake` +* `scripts/cmake/vcpkg_execute_required_process_repeat.cmake` +#]===] macro(vcpkg_prettify_command INPUT_VAR OUTPUT_VAR) set(${OUTPUT_VAR} "") diff --git a/scripts/cmake/vcpkg_replace_string.cmake b/scripts/cmake/vcpkg_replace_string.cmake index 3eb18d0bf75dbf..d24b8677ec0fd6 100644 --- a/scripts/cmake/vcpkg_replace_string.cmake +++ b/scripts/cmake/vcpkg_replace_string.cmake @@ -1,12 +1,14 @@ -#.rst: -# .. command:: vcpkg_replace_string -# -# Replace a string in a file. -# -# :: -# vcpkg_replace_string(filename match_string replace_string) -# -# +#[===[.md: +# vcpkg_replace_string + +Replace a string in a file. + +```cmake +vcpkg_replace_string(filename match_string replace_string) +``` + +#]===] + function(vcpkg_replace_string filename match_string replace_string) file(READ ${filename} _contents) string(REPLACE "${match_string}" "${replace_string}" _contents "${_contents}") diff --git a/scripts/cmake/vcpkg_test_cmake.cmake b/scripts/cmake/vcpkg_test_cmake.cmake index 48d247f676f8c3..f2a8a76b12b9ff 100644 --- a/scripts/cmake/vcpkg_test_cmake.cmake +++ b/scripts/cmake/vcpkg_test_cmake.cmake @@ -1,3 +1,4 @@ +# DEPRECATED function(vcpkg_test_cmake) message("${_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}" "vcpkg_test_cmake was a no-op and has been removed. Please remove the call to `vcpkg_test_cmake()`.") endfunction() diff --git a/test.cmake b/test.cmake deleted file mode 100644 index c239695cbd7b6e..00000000000000 --- a/test.cmake +++ /dev/null @@ -1,9 +0,0 @@ -set(LLVM_EXECUTABLE_REGEX [[^([^.]*|[^.]*\.lld)\.exe$]]) -foreach(el "bugpoint.exe" "ld.lld.exe" "asdf.dll" "asdf") - message(STATUS "Matching ${el}") - if(el MATCHES "${LLVM_EXECUTABLE_REGEX}") - message(STATUS "Matching ${el} - match (${CMAKE_MATCH_1}).") - else() - message(STATUS "Matching ${el} - no match.") - endif() -endforeach() From 611a111ffc3521a31812e638c5f0d9b0a2c52c67 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Tue, 1 Dec 2020 13:49:39 -0800 Subject: [PATCH 0213/1694] [c-ares] Update to 1.17.1. (#14863) Update c-ares to 1.17.1, the current version as of 2020-11-30. The release announcement can be found at https://c-ares.haxx.se/mail/c-ares-archive-2020-11/0008.shtml. Fixes #14828. --- ports/c-ares/CONTROL | 2 +- ports/c-ares/portfile.cmake | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ports/c-ares/CONTROL b/ports/c-ares/CONTROL index 4898ec5dedfc08..c7243e1e8193bc 100644 --- a/ports/c-ares/CONTROL +++ b/ports/c-ares/CONTROL @@ -1,5 +1,5 @@ Source: c-ares -Version: 2019-5-2-1 +Version: 1.17.1 Homepage: https://github.com/c-ares/c-ares Description: A C library for asynchronous DNS requests Supports: !uwp \ No newline at end of file diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index c6835656f5aa36..a42fc9fc3da6ec 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -1,12 +1,10 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "c-ares does not currently support UWP.") -endif() +vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO c-ares/c-ares - REF 9f1fdbf5dd633f81352fac0d6bc0d0c4d45be459 - SHA512 2bb3696e839e37c6f2be4b979ae6d0eab2914d6f0ca043f688e3bb3071d2348cb64424049f019c16bc05d472dd61d5071e865edd229dce023a50f556a1961766 + REF cares-1_17_1 + SHA512 e2a2a40118b128755571274d0cfe7cc822bc18392616378c6dd5f73f210571d7e5005a40ba0763658bdae7f2c7aadb324b2888ad8b4dcb54ad47dfaf97c2ebfc HEAD_REF master ) @@ -46,7 +44,7 @@ endif() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/c-ares) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/c-ares/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/c-ares/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 1d66956bb2b09c4abfdf1f525805dfa5db9ecaa8 Mon Sep 17 00:00:00 2001 From: likle Date: Tue, 1 Dec 2020 22:52:56 +0100 Subject: [PATCH 0214/1694] [cwalk] Add new port (#14801) * added port: cwalk 1.2.5 * Update ports/cwalk/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/cwalk/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/cwalk/portfile.cmake | 22 ++++++++++++++++++++++ ports/cwalk/vcpkg.json | 6 ++++++ 2 files changed, 28 insertions(+) create mode 100644 ports/cwalk/portfile.cmake create mode 100644 ports/cwalk/vcpkg.json diff --git a/ports/cwalk/portfile.cmake b/ports/cwalk/portfile.cmake new file mode 100644 index 00000000000000..419b81efb98f77 --- /dev/null +++ b/ports/cwalk/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO likle/cwalk + REF v1.2.5 + SHA512 904e095e375d0c98dedbb17ddf805397387f8f473a708b310ba3086bbd4445bde7d0a037fbe9caed97c9cc793219a3d976cef010d76a32812c4fe2b3b7cde575 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DENABLE_TESTS=OFF +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cwalk) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/cwalk/vcpkg.json b/ports/cwalk/vcpkg.json new file mode 100644 index 00000000000000..c7d9b713e43018 --- /dev/null +++ b/ports/cwalk/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "cwalk", + "version-string": "1.2.5", + "description": "Path library for C/C++. Cross-Platform for Windows, MacOS and Linux. Supports UNIX and Windows path styles on those platforms.", + "homepage": "https://likle.github.io/cwalk/" +} From 424999658b5783721efde7f5e3ce810760ed2d09 Mon Sep 17 00:00:00 2001 From: Long Huan <8551701+longhuan2018@users.noreply.github.com> Date: Wed, 2 Dec 2020 05:59:39 +0800 Subject: [PATCH 0215/1694] [Proj4] Update to 7.2.0 (#14800) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update proj4 to 7.2.0 * fix cmake find * add tiff,curl feature * fix depends * Update fix-proj4-targets-cmake.patch * fix * remove tiff and curl when static build * fix windows static build error * Update ports/proj4/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * change port version * use find_dependency instead of find_package * Update fix-proj4-targets-cmake.patch * Update fix-proj4-targets-cmake.patch Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/libspatialite/CONTROL | 2 +- ports/libspatialite/portfile.cmake | 4 +- ports/proj4/CONTROL | 11 ++-- ports/proj4/disable-export-namespace.patch | 28 ---------- ports/proj4/disable-projdb-with-arm-uwp.patch | 8 +-- ports/proj4/fix-linux-build.patch | 18 ------- ...ig.patch => fix-proj4-targets-cmake.patch} | 53 +++++++++++-------- .../proj4/fix-sqlite-dependency-export.patch | 13 ----- ports/proj4/fix-win-output-name.patch | 8 +-- ports/proj4/portfile.cmake | 42 ++++++++------- ports/proj4/tools-cmake.patch | 9 ++-- ports/spatialite-tools/CONTROL | 2 +- ports/spatialite-tools/portfile.cmake | 4 +- 13 files changed, 81 insertions(+), 121 deletions(-) delete mode 100644 ports/proj4/disable-export-namespace.patch delete mode 100644 ports/proj4/fix-linux-build.patch rename ports/proj4/{use-sqlite3-config.patch => fix-proj4-targets-cmake.patch} (53%) delete mode 100644 ports/proj4/fix-sqlite-dependency-export.patch diff --git a/ports/libspatialite/CONTROL b/ports/libspatialite/CONTROL index 38b4041f1e6eb4..9cedf5f1748dd8 100644 --- a/ports/libspatialite/CONTROL +++ b/ports/libspatialite/CONTROL @@ -1,6 +1,6 @@ Source: libspatialite Version: 4.3.0a -Port-Version: 6 +Port-Version: 7 Homepage: https://www.gaia-gis.it/gaia-sins/libspatialite-sources Description: SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities. Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index 9f1f3d6bd11e2a..4496656a9c34de 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -44,7 +44,7 @@ if (VCPKG_TARGET_IS_WINDOWS) ${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \ ${LIBXML2_LIBS_DBG} \ ${GEOS_LIBS_DBG} \ - ${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib" + ${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib ole32.lib shell32.lib" ) set(LIBS_ALL_REL "${CURRENT_INSTALLED_DIR}/lib/iconv.lib \ @@ -54,7 +54,7 @@ if (VCPKG_TARGET_IS_WINDOWS) ${CURRENT_INSTALLED_DIR}/lib/zlib.lib \ ${LIBXML2_LIBS_REL} \ ${GEOS_LIBS_REL} \ - ${CURRENT_INSTALLED_DIR}/lib/proj.lib" + ${CURRENT_INSTALLED_DIR}/lib/proj.lib ole32.lib shell32.lib" ) ################ diff --git a/ports/proj4/CONTROL b/ports/proj4/CONTROL index d7965472d1fdd0..6a5133f10d2968 100644 --- a/ports/proj4/CONTROL +++ b/ports/proj4/CONTROL @@ -1,15 +1,18 @@ Source: proj4 -Version: 6.3.1 -Port-Version: 3 +Version: 7.2.0 Homepage: https://github.com/OSGeo/PROJ Description: PROJ.4 library for cartographic projections Build-Depends: sqlite3[core] -Default-Features: database +Default-Features: database,tiff + +Feature: tiff +Build-Depends: tiff +Description: Enable TIFF support to read some grids Feature: database Build-Depends: sqlite3[tool] (!uwp&!arm) Description: generate database Feature: tools -Build-Depends: +Build-Depends: curl Description: generate tools diff --git a/ports/proj4/disable-export-namespace.patch b/ports/proj4/disable-export-namespace.patch deleted file mode 100644 index 87646fe3da9580..00000000000000 --- a/ports/proj4/disable-export-namespace.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 61c69f7..777b5d8 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -28,7 +28,3 @@ install(FILES - install(EXPORT targets - FILE ${PROJECT_NAME_LOWER}-targets.cmake - DESTINATION "${CMAKECONFIGDIR}") --install(EXPORT targets -- NAMESPACE ${PROJECT_NAME}:: -- FILE ${PROJECT_NAME_LOWER}-namespace-targets.cmake -- DESTINATION "${CMAKECONFIGDIR}") -diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in -index c62ecb4..9a52b3b 100644 ---- a/cmake/project-config.cmake.in -+++ b/cmake/project-config.cmake.in -@@ -20,10 +20,9 @@ set (@PROJECT_NAME@_INCLUDE_DIRS "${_ROOT}/@INCLUDEDIR@") - set (@PROJECT_NAME@_LIBRARY_DIRS "${_ROOT}/@LIBDIR@") - set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/@BINDIR@") - --set (@PROJECT_NAME@_LIBRARIES @PROJECT_NAME@::proj) -+set (@PROJECT_NAME@_LIBRARIES proj) - # Read in the exported definition of the library - include ("${_DIR}/@PROJECT_NAME_LOWER@-targets.cmake") --include ("${_DIR}/@PROJECT_NAME_LOWER@-namespace-targets.cmake") - - unset (_ROOT) - unset (_DIR) diff --git a/ports/proj4/disable-projdb-with-arm-uwp.patch b/ports/proj4/disable-projdb-with-arm-uwp.patch index 218a3533531506..411a39860804e2 100644 --- a/ports/proj4/disable-projdb-with-arm-uwp.patch +++ b/ports/proj4/disable-projdb-with-arm-uwp.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9213990..f51cc5e 100644 +index 7d736d129..93d7801dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -224,7 +224,9 @@ set(CMAKECONFIGDIR "${DEFAULT_CMAKEDIR}" - include_directories(${PROJ4_SOURCE_DIR}/src) +@@ -269,7 +269,9 @@ endif() + ################################################################################ + include_directories(${PROJ_SOURCE_DIR}/src) - message(STATUS "") -add_subdirectory(data) +if(BUILD_PROJ_DATABASE) + add_subdirectory(data) diff --git a/ports/proj4/fix-linux-build.patch b/ports/proj4/fix-linux-build.patch deleted file mode 100644 index 0d81ef35d29a4e..00000000000000 --- a/ports/proj4/fix-linux-build.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake -index cf7533b..236581f 100644 ---- a/src/lib_proj.cmake -+++ b/src/lib_proj.cmake -@@ -431,11 +431,11 @@ set(PROJ_LIBRARIES ${PROJ_LIBRARIES} PARENT_SCOPE) - if(UNIX) - find_library(M_LIB m) - if(M_LIB) -- target_link_libraries(${PROJ_CORE_TARGET} -lm) -+ target_link_libraries(${PROJ_CORE_TARGET} PRIVATE -lm) - endif() - endif() - if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT) -- target_link_libraries(${PROJ_CORE_TARGET} ${CMAKE_THREAD_LIBS_INIT}) -+ target_link_libraries(${PROJ_CORE_TARGET} PRIVATE ${CMAKE_THREAD_LIBS_INIT}) - endif() - - include_directories(${SQLITE3_INCLUDE_DIR}) diff --git a/ports/proj4/use-sqlite3-config.patch b/ports/proj4/fix-proj4-targets-cmake.patch similarity index 53% rename from ports/proj4/use-sqlite3-config.patch rename to ports/proj4/fix-proj4-targets-cmake.patch index 050a88415eab8a..73fa76e50948e8 100644 --- a/ports/proj4/use-sqlite3-config.patch +++ b/ports/proj4/fix-proj4-targets-cmake.patch @@ -1,13 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c617912..bed0428 100644 +index 7d736d129..2be8f8be9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -122,7 +122,23 @@ if(NOT EXE_SQLITE3) +@@ -129,7 +129,22 @@ if(NOT EXE_SQLITE3) message(SEND_ERROR "sqlite3 binary not found!") endif() -find_package(Sqlite3 REQUIRED) -+#find_package(Sqlite3 REQUIRED) +find_package(unofficial-sqlite3 CONFIG REQUIRED) +if(unofficial-sqlite3_FOUND) + set(SQLITE3_FOUND true) @@ -27,31 +26,43 @@ index c617912..bed0428 100644 if(NOT SQLITE3_FOUND) message(SEND_ERROR "sqlite3 dependency not found!") endif() +@@ -171,6 +186,7 @@ if(ENABLE_CURL) + find_package(CURL REQUIRED) + if(CURL_FOUND) + set(CURL_ENABLED TRUE) ++ set(CURL_LIBRARY CURL::libcurl) + else() + message(SEND_ERROR "curl dependency not found!") + endif() + diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 92197c8..ab65de7 100644 +index c790fa4a8..6653a28b9 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt -@@ -25,6 +25,10 @@ else () - endif () +@@ -95,6 +95,10 @@ endif () - string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER) -+set(FIND_DEPENDENCY_SQLITE3 "") -+if(NOT BUILD_LIBPROJ_SHARED) -+ set(FIND_DEPENDENCY_SQLITE3 "find_package(unofficial-sqlite3 CONFIG REQUIRED)") -+endif() - configure_file(project-config.cmake.in project-config.cmake @ONLY) - configure_file(project-config-version.cmake.in - project-config-version.cmake @ONLY) + foreach (PROJECT_VARIANT_NAME ${PROJECT_NAME} ${PROJECT_LEGACY_NAME}) + string (TOLOWER "${PROJECT_VARIANT_NAME}" PROJECT_VARIANT_LOWER) ++ set(FIND_DEPENDENCY_SQLITE3 "find_dependency(unofficial-sqlite3 CONFIG)") ++ if(CURL_ENABLED) ++ set(FIND_DEPENDENCY_CURL "find_dependency(CURL CONFIG)") ++ endif() + set (CMAKECONFIGSUBDIR "${CMAKECONFIGDIR}/${PROJECT_VARIANT_LOWER}") + # proj-config.cmake for the install tree. It's installed in + # ${CMAKECONFIGSUBDIR} and @PROJECT_ROOT_DIR@ is the relative + diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in -index 9a52b3b..295d95d 100644 +index 23f997abd..8baef00f0 100644 --- a/cmake/project-config.cmake.in +++ b/cmake/project-config.cmake.in -@@ -13,6 +13,8 @@ message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}") - message (STATUS - "@PROJECT_NAME@ configuration, version ${@PROJECT_NAME@_VERSION}") - -+@FIND_DEPENDENCY_SQLITE3@ +@@ -7,6 +7,10 @@ + # @PROJECT_VARIANT_NAME@_LIBRARY_DIRS = /usr/local/lib + # @PROJECT_VARIANT_NAME@_BINARY_DIRS = /usr/local/bin + # @PROJECT_VARIANT_NAME@_VERSION = 4.9.1 (for example) ++include(CMakeFindDependencyMacro) + ++@FIND_DEPENDENCY_SQLITE3@ ++@FIND_DEPENDENCY_CURL@ + # Tell the user project where to find our headers and libraries get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) - get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE) diff --git a/ports/proj4/fix-sqlite-dependency-export.patch b/ports/proj4/fix-sqlite-dependency-export.patch deleted file mode 100644 index 06ea71c79ba9a3..00000000000000 --- a/ports/proj4/fix-sqlite-dependency-export.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake -index 2e90f98f..dc171e91 100644 ---- a/src/lib_proj.cmake -+++ b/src/lib_proj.cmake -@@ -441,7 +441,7 @@ if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT) - endif() - - include_directories(${SQLITE3_INCLUDE_DIR}) --target_link_libraries(${PROJ_CORE_TARGET} ${SQLITE3_LIBRARY}) -+target_link_libraries(${PROJ_CORE_TARGET} PRIVATE ${SQLITE3_LIBRARY}) - - if(MSVC AND BUILD_LIBPROJ_SHARED) - target_compile_definitions(${PROJ_CORE_TARGET} diff --git a/ports/proj4/fix-win-output-name.patch b/ports/proj4/fix-win-output-name.patch index 5964d11bebf092..09256144109853 100644 --- a/ports/proj4/fix-win-output-name.patch +++ b/ports/proj4/fix-win-output-name.patch @@ -1,13 +1,13 @@ diff --git a/cmake/ProjUtilities.cmake b/cmake/ProjUtilities.cmake -index 1a2b605..cf62f02 100644 +index 6f43edb5c..1ed89d597 100644 --- a/cmake/ProjUtilities.cmake +++ b/cmake/ProjUtilities.cmake -@@ -104,7 +104,7 @@ function(proj_target_output_name TARGET_NAME OUTPUT_NAME) +@@ -51,7 +51,7 @@ function(proj_target_output_name TARGET_NAME OUTPUT_NAME) # On Windows, ABI version is specified using binary file name suffix. # On Unix, suffix is empty and SOVERSION is used instead. - if(WIN32) + if(0) - string(LENGTH "${${PROJECT_INTERN_NAME}_ABI_VERSION}" abilen) + string(LENGTH "${${PROJECT_NAME}_ABI_VERSION}" abilen) if(abilen GREATER 0) - set(SUFFIX "_${${PROJECT_INTERN_NAME}_ABI_VERSION}") + set(SUFFIX "_${${PROJECT_NAME}_ABI_VERSION}") diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index c4e5a5ad111a96..c28b6f2af5fc2d 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -1,35 +1,42 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/PROJ - REF 6.3.1 - SHA512 ec5a2b61b12d3d3ec2456b9e742cf7be98767889c4759334e60276f609054fa8eb59f13f07af38e69e9ee7b6f2b9542e2d5d7806726ce5616062af4de626c6fa + REF 7.2.0 + SHA512 65dfca92b7890a9ffa78f48da443045069a250e2974dcf564fa23ffc297f87235b669983b39906352bd8eb702714b98fd89a4c7beaad4ad70834993a6de85128 HEAD_REF master PATCHES fix-sqlite3-bin.patch - disable-export-namespace.patch disable-projdb-with-arm-uwp.patch fix-win-output-name.patch - fix-sqlite-dependency-export.patch - fix-linux-build.patch - use-sqlite3-config.patch + fix-proj4-targets-cmake.patch tools-cmake.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(VCPKG_BUILD_SHARED_LIBS ON) + set(EXTRA_FEATURES tiff ENABLE_TIFF tools BUILD_PROJSYNC tools ENABLE_CURL) + set(TOOL_NAMES cct cs2cs geod gie proj projinfo projsync) else() set(VCPKG_BUILD_SHARED_LIBS OFF) + set(TOOL_NAMES cct cs2cs geod gie proj projinfo) endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - database BUILD_PROJ_DATABASE - tools BUILD_CCT - tools BUILD_CS2CS - tools BUILD_GEOD - tools BUILD_GIE - tools BUILD_PROJ - tools BUILD_PROJINFO + database BUILD_PROJ_DATABASE + tools BUILD_CCT + tools BUILD_CS2CS + tools BUILD_GEOD + tools BUILD_GIE + tools BUILD_PROJ + tools BUILD_PROJINFO + ${EXTRA_FEATURES} ) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message(WARNING "ENABLE_TIFF ENABLE_CURL and BUILD_PROJSYNC will be off when building static") + set(FEATURE_OPTIONS ${FEATURE_OPTIONS} -DENABLE_TIFF=OFF -DENABLE_CURL=OFF -DBUILD_PROJSYNC=OFF) +endif() + if ("database" IN_LIST FEATURES) if (VCPKG_TARGET_IS_WINDOWS) set(BIN_SUFFIX .exe) @@ -56,18 +63,17 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} - -DBUILD_LIBPROJ_SHARED=${VCPKG_BUILD_SHARED_LIBS} -DPROJ_LIB_SUBDIR=lib -DPROJ_INCLUDE_SUBDIR=include - -DPROJ_DATA_SUBDIR=share/proj4 - -DPROJ_TESTS=OFF + -DPROJ_DATA_SUBDIR=share/${PORT} + -DBUILD_TESTING=OFF -DEXE_SQLITE3=${SQLITE3_BIN_PATH}/sqlite3${BIN_SUFFIX} ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/proj4) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) if ("tools" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES cct cs2cs geod gie proj projinfo AUTO_CLEAN) + vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) endif () file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/proj4/tools-cmake.patch b/ports/proj4/tools-cmake.patch index 4e487e6f11ef13..514a15ad193805 100644 --- a/ports/proj4/tools-cmake.patch +++ b/ports/proj4/tools-cmake.patch @@ -1,12 +1,11 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 48c785a..e2b5485 100644 +index 534bc311b..f9fb0f1bb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -69,11 +69,3 @@ if(BUILD_GIE) - include(bin_gie.cmake) - set(BIN_TARGETS ${BIN_TARGETS} gie) +@@ -83,10 +83,3 @@ if(BUILD_PROJSYNC) endif() -- + + -if(MSVC OR CMAKE_CONFIGURATION_TYPES) - if(BIN_TARGETS) - # Add _d suffix for your debug versions of the tools diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL index fbbad4d411d3ee..99ab33c174b8c8 100644 --- a/ports/spatialite-tools/CONTROL +++ b/ports/spatialite-tools/CONTROL @@ -1,6 +1,6 @@ Source: spatialite-tools Version: 4.3.0 -Port-Version: 5 +Port-Version: 6 Homepage: https://www.gaia-gis.it/fossil/spatialite-tools/index Description: Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries) Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat diff --git a/ports/spatialite-tools/portfile.cmake b/ports/spatialite-tools/portfile.cmake index 540e29b1844ca2..111dc0c4333f43 100644 --- a/ports/spatialite-tools/portfile.cmake +++ b/ports/spatialite-tools/portfile.cmake @@ -54,7 +54,7 @@ set(LIBS_ALL_DBG ${EXPAT_LIBS_DBG} \ ${LDIR}/debug/lib/readosm.lib \ ${LDIR}/debug/lib/zlibd.lib \ - ${LDIR}/debug/lib/proj_d.lib" + ${LDIR}/debug/lib/proj_d.lib ole32.lib shell32.lib" ) set(LIBS_ALL_REL "${ICONV_LIBS_REL} \ @@ -65,7 +65,7 @@ set(LIBS_ALL_REL ${EXPAT_LIBS_REL} \ ${LDIR}/lib/readosm.lib \ ${LDIR}/lib/zlib.lib \ - ${LDIR}/lib/proj.lib" + ${LDIR}/lib/proj.lib ole32.lib shell32.lib" ) if(BUILD_DEBUG_TOOLS) From c70ce898707e8f1a57c069bc83ed1af4b00dff66 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 1 Dec 2020 14:00:09 -0800 Subject: [PATCH 0216/1694] [xbyak] update to 5.991 (#14782) * [xbyak] update to 5.991 * fail port on unsupported arch + true version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * correct version string Co-authored-by: nicole mazzuca Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: nicole mazzuca --- ports/xbyak/portfile.cmake | 25 ++++++++++++++++++------- ports/xbyak/vcpkg.json | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ports/xbyak/portfile.cmake b/ports/xbyak/portfile.cmake index 08584fe5cf5b85..a2a06b1aa8c517 100644 --- a/ports/xbyak/portfile.cmake +++ b/ports/xbyak/portfile.cmake @@ -1,14 +1,25 @@ +vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO herumi/xbyak - REF v5.97 - SHA512 813d5363063b9bd8f3645652826cbbf9c0fdfc7775974bd257b9635ce7d1edbd6a7099216a8e7ec6252cb6e56aa4b6c6f9b0fd84b5748fa79c04abb799731cde + REF 77ffe717376d194f1e5cc910bbd755d99bbba94e # 5.991 + cmake targets + SHA512 4e1ffa98dc63444aebf0a6e7a4ea57a9040cbf261f3a6fa43d23f0361cece71f1f4b597e95b6c85efbd4668e421081730b04ee924450ea0b0114923c36fc9c74 HEAD_REF master ) -# handle license file -file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() -# copy headers -file(GLOB HEADER_FILES ${SOURCE_PATH}/xbyak/*.h) -file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/xbyak) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug + ${CURRENT_PACKAGES_DIR}/lib +) + +file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/xbyak/vcpkg.json b/ports/xbyak/vcpkg.json index 7c42b5c168e168..3f18d44c5c6abf 100644 --- a/ports/xbyak/vcpkg.json +++ b/ports/xbyak/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xbyak", - "version-string": "5.97", + "version-string": "5.991", "description": "Xbyak is a JIT assembler for x86(IA-32)/x64(AMD64, x86-64).", "homepage": "https://github.com/herumi/xbyak", "supports": "!(arm | uwp)" From 75c7a7f5ebef62531afd8d01fd3dc47d4dce1a46 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 1 Dec 2020 23:03:02 +0100 Subject: [PATCH 0217/1694] [elfutils] add new port (#14771) * [elfutils] add new port * update * Update ports/elfutils/configure.ac.patch Fix missing ZSTD linkage * Update ports/elfutils/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * add eflutils on osx on CI skiplist Co-authored-by: wangli28 Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/elfutils/CONTROL | 6 ++++ ports/elfutils/configure.ac.patch | 49 +++++++++++++++++++++++++++++ ports/elfutils/portfile.cmake | 52 +++++++++++++++++++++++++++++++ scripts/ci.baseline.txt | 2 ++ 4 files changed, 109 insertions(+) create mode 100644 ports/elfutils/CONTROL create mode 100644 ports/elfutils/configure.ac.patch create mode 100644 ports/elfutils/portfile.cmake diff --git a/ports/elfutils/CONTROL b/ports/elfutils/CONTROL new file mode 100644 index 00000000000000..8dcee64a73e61a --- /dev/null +++ b/ports/elfutils/CONTROL @@ -0,0 +1,6 @@ +Source: elfutils +Version: 0.182 +Homepage: https://sourceware.org/elfutils/ +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. +Build-Depends: bzip2, zlib, liblzma, zstd +Supports: !windows diff --git a/ports/elfutils/configure.ac.patch b/ports/elfutils/configure.ac.patch new file mode 100644 index 00000000000000..f3372b01626ed8 --- /dev/null +++ b/ports/elfutils/configure.ac.patch @@ -0,0 +1,49 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index e462e7d7a..7f68d0348 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -41,8 +41,8 @@ CLEANFILES += make-debug-archive + + if BUILD_STATIC + libasm = ../libasm/libasm.a +-libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread +-libelf = ../libelf/libelf.a -lz ++libdw = ../libdw/libdw.a $(zip_LIBS) $(libelf) -ldl -lpthread ++libelf = ../libelf/libelf.a $(zip_LIBS) + else + libasm = ../libasm/libasm.so + libdw = ../libdw/libdw.so +diff --git a/configure.ac b/configure.ac +index 5a2dc373e..b1928831e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -383,7 +383,7 @@ AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes) + dnl zlib is mandatory. + save_LIBS="$LIBS" + LIBS= +-eu_ZIPLIB(zlib,ZLIB,z,gzdirect,gzip) ++eu_ZIPLIB(zlib,ZLIB,[z zlib zlibd],gzdirect,gzip) + AS_IF([test "x$with_zlib" = xno], [AC_MSG_ERROR([zlib not found but is required])]) + LIBS="$save_LIBS" + +@@ -391,13 +391,13 @@ dnl Test for bzlib and xz/lzma, gives BZLIB/LZMALIB .am + dnl conditional and config.h USE_BZLIB/USE_LZMALIB/USE_ZSTD #define. + save_LIBS="$LIBS" + LIBS= +-eu_ZIPLIB(bzlib,BZLIB,bz2,BZ2_bzdopen,bzip2) ++eu_ZIPLIB(bzlib,BZLIB,[bz2 bz2d],BZ2_bzdopen,bzip2) + # We need this since bzip2 doesn't have a pkgconfig file. + BZ2_LIB="$LIBS" + AC_SUBST([BZ2_LIB]) +-eu_ZIPLIB(lzma,LZMA,lzma,lzma_auto_decoder,[LZMA (xz)]) ++eu_ZIPLIB(lzma,LZMA,[lzma lzmad],lzma_auto_decoder,[LZMA (xz)]) + AS_IF([test "x$with_lzma" = xyes], [LIBLZMA="liblzma"], [LIBLZMA=""]) + AC_SUBST([LIBLZMA]) +-eu_ZIPLIB(zstd,ZSTD,zstd,ZSTD_decompress,[ZSTD (zst)]) ++eu_ZIPLIB(zstd,ZSTD,[zstd zstdd zstd_static zstd_staticd],ZSTD_decompress,[ZSTD (zst)]) + AS_IF([test "x$with_zstd" = xyes], [LIBZSTD="libzstd"], [LIBLZSTD=""]) + AC_SUBST([LIBZSTD]) +-zip_LIBS="$LIBS" ++zip_LIBS="$LIBS $ac_cv_search_lzma_auto_decoder $ac_cv_search_BZ2_bzdopen $ac_cv_search_gzdirect $ac_cv_search_ZSTD_decompress" + LIBS="$save_LIBS" + AC_SUBST([zip_LIBS]) diff --git a/ports/elfutils/portfile.cmake b/ports/elfutils/portfile.cmake new file mode 100644 index 00000000000000..7b7aae50e13240 --- /dev/null +++ b/ports/elfutils/portfile.cmake @@ -0,0 +1,52 @@ +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL https://sourceware.org/git/elfutils + REF 25d048684a82f9ba701c6939b7f28c3543bb7991 #elfutils-0.182 + + PATCHES configure.ac.patch +) + +vcpkg_find_acquire_program(FLEX) +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") +vcpkg_find_acquire_program(BISON) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${BISON_DIR}") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS --disable-debuginfod + --enable-libdebuginfod=dummy + --with-zlib + --with-bzlib + --with-lzma + --with-zstd + --enable-maintainer-mode + OPTIONS_RELEASE + ac_cv_null_dereference=no # deactivating Werror due to null dereferences since NDEBUG is passed and asserts thus disabled/removed +) + +vcpkg_install_make() +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libdebuginfod.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libdebuginfod.pc") #--disable-debuginfod +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/locale) + +# Remove files with wrong linkage +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(_lib_suffix "${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") +else() + set(_lib_suffix "${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") +endif() +file(GLOB_RECURSE TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}") +file(REMOVE ${TO_REMOVE}) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +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() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e14adc596995e1..e95105dc28568a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -278,6 +278,8 @@ ecsutil:arm-uwp=fail ecsutil:x64-linux=fail ecsutil:x64-osx=fail ecsutil:x64-uwp=fail +# Checks for gnu extension so only works with gcc. +elfutils:x64-osx=fail embree2:x64-linux=fail embree2:x64-osx=fail embree2:x64-windows-static=fail From 92d35c9872425cc0a899fffd51a6dc014aa7553f Mon Sep 17 00:00:00 2001 From: Nemirtingas <9432037+Nemirtingas@users.noreply.github.com> Date: Tue, 1 Dec 2020 23:12:13 +0100 Subject: [PATCH 0218/1694] [opengl] port path fix when crosscompiling (#14724) * Update portfile to use native file path. Fixes cross-compilation paths. * Update portfile.cmake * Update CONTROL * Update ports/opengl/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/opengl/CONTROL | 3 ++- ports/opengl/portfile.cmake | 41 ++++++++++++++++++++++--------------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/ports/opengl/CONTROL b/ports/opengl/CONTROL index 74eff9302d1946..625d51c3518521 100644 --- a/ports/opengl/CONTROL +++ b/ports/opengl/CONTROL @@ -1,3 +1,4 @@ Source: opengl -Version: 0.0-7 +Version: 0.0 +Port-Version: 8 Description: Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics. diff --git a/ports/opengl/portfile.cmake b/ports/opengl/portfile.cmake index 6d27810cbafda9..72625fa15feb30 100644 --- a/ports/opengl/portfile.cmake +++ b/ports/opengl/portfile.cmake @@ -2,13 +2,13 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore vcpkg_get_windows_sdk(WINDOWS_SDK) if (WINDOWS_SDK MATCHES "10.") - set(LIBGLFILEPATH "$ENV{WindowsSdkDir}Lib\\${WINDOWS_SDK}\\um\\${TRIPLET_SYSTEM_ARCH}\\OpenGL32.Lib") - set(LIBGLUFILEPATH "$ENV{WindowsSdkDir}Lib\\${WINDOWS_SDK}\\um\\${TRIPLET_SYSTEM_ARCH}\\GlU32.Lib") - set(HEADERSPATH "$ENV{WindowsSdkDir}Include\\${WINDOWS_SDK}\\um") + file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib" LIBGLFILEPATH) + file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib" LIBGLUFILEPATH) + file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Include/${WINDOWS_SDK}/um" HEADERSPATH) elseif(WINDOWS_SDK MATCHES "8.") - set(LIBGLFILEPATH "$ENV{WindowsSdkDir}Lib\\winv6.3\\um\\${TRIPLET_SYSTEM_ARCH}\\OpenGL32.Lib") - set(LIBGLUFILEPATH "$ENV{WindowsSdkDir}Lib\\winv6.3\\um\\${TRIPLET_SYSTEM_ARCH}\\GlU32.Lib") - set(HEADERSPATH "$ENV{WindowsSdkDir}Include\\um") + file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib" LIBGLFILEPATH) + file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib" LIBGLUFILEPATH) + file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Include/um" HEADERSPATH) else() message(FATAL_ERROR "Portfile not yet configured for Windows SDK with version: ${WINDOWS_SDK}") endif() @@ -21,33 +21,40 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${LIBGLUFILEPATH}") endif() + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/include/gl" INCLUDEGLPATH) + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/opengl" SHAREOPENGLPATH) + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/lib" RELEASELIBPATH) + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug/lib" DEBUGLIBPATH) + file(TO_NATIVE_PATH "${HEADERSPATH}/gl/GL.h" GLGLHPATH) + file(TO_NATIVE_PATH "${HEADERSPATH}/gl/GLU.h" GLGLUHPATH) + file(MAKE_DIRECTORY - ${CURRENT_PACKAGES_DIR}/include/gl - ${CURRENT_PACKAGES_DIR}/share/opengl + "${INCLUDEGLPATH}" + "${SHAREOPENGLPATH}" ) if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(MAKE_DIRECTORY - ${CURRENT_PACKAGES_DIR}/lib + "${RELEASELIBPATH}" ) endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(MAKE_DIRECTORY - ${CURRENT_PACKAGES_DIR}/debug/lib + "${DEBUGLIBPATH}" ) endif() file(COPY - "${HEADERSPATH}\\gl\\GL.h" - "${HEADERSPATH}\\gl\\GLU.h" - DESTINATION ${CURRENT_PACKAGES_DIR}/include/gl + "${GLGLHPATH}" + "${GLGLUHPATH}" + DESTINATION "${INCLUDEGLPATH}" ) if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(COPY ${LIBGLFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY ${LIBGLUFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY ${LIBGLFILEPATH} DESTINATION "${RELEASELIBPATH}") + file(COPY ${LIBGLUFILEPATH} DESTINATION "${RELEASELIBPATH}") endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(COPY ${LIBGLFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY ${LIBGLUFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY ${LIBGLFILEPATH} DESTINATION "${DEBUGLIBPATH}") + file(COPY ${LIBGLUFILEPATH} DESTINATION "${DEBUGLIBPATH}") endif() if (WINDOWS_SDK MATCHES "10.") From 3ee3650ac4c6bc6ce272e7e4c68fbddd12ab870d Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Tue, 1 Dec 2020 23:13:35 +0100 Subject: [PATCH 0219/1694] [ceres] update to 2.0.0 (#14719) --- ports/ceres/0001_cmakelists_fixes.patch | 26 ++-- ports/ceres/0002_use_glog_target.patch | 14 +- .../0003_fix_exported_ceres_config.patch | 98 +++++--------- ports/ceres/0004_fix_find_eigen.patch | 122 ------------------ ports/ceres/CONTROL | 3 +- ports/ceres/portfile.cmake | 5 +- ports/theia/portfile.cmake | 3 + 7 files changed, 62 insertions(+), 209 deletions(-) delete mode 100644 ports/ceres/0004_fix_find_eigen.patch diff --git a/ports/ceres/0001_cmakelists_fixes.patch b/ports/ceres/0001_cmakelists_fixes.patch index 87a3785d5fe2b1..bb594272374dd9 100644 --- a/ports/ceres/0001_cmakelists_fixes.patch +++ b/ports/ceres/0001_cmakelists_fixes.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 02c72b5..62d8c59 100644 +index 33e98b1..f275d68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -374,27 +374,7 @@ if (MINIGLOG) +@@ -426,27 +426,7 @@ if (MINIGLOG) GLOG_LIBRARY) else (MINIGLOG) unset(MINIGLOG_MAX_LOG_LEVEL CACHE) @@ -19,24 +19,28 @@ index 02c72b5..62d8c59 100644 - set(GLOG_GFLAGS_DEPENDENCY_MESSAGE - " Assuming glog was built with gflags support as gflags was found. " - "This will make gflags a public dependency of Ceres.") -- if (NOT GFLAGS_FOUND) +- if (NOT gflags_FOUND) - set(GLOG_GFLAGS_DEPENDENCY_MESSAGE - " Assuming glog was NOT built with gflags support as gflags was " - "not found. If glog was built with gflags, please set the " - "gflags search locations such that it can be found by Ceres. " - "Otherwise, Ceres may fail to link due to missing gflags symbols.") -- endif(NOT GFLAGS_FOUND) +- endif(NOT gflags_FOUND) - message("-- Found Google Log (glog)." ${GLOG_GFLAGS_DEPENDENCY_MESSAGE}) + find_package(Glog REQUIRED) endif (MINIGLOG) - + if (NOT SCHUR_SPECIALIZATIONS) -@@ -917,8 +897,5 @@ install(FILES "${Ceres_BINARY_DIR}/CeresConfig-install.cmake" +@@ -760,12 +740,6 @@ install(FILES "${Ceres_BINARY_DIR}/CeresConfig-install.cmake" DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR}) install(FILES "${Ceres_BINARY_DIR}/CeresConfigVersion.cmake" -- "${Ceres_SOURCE_DIR}/cmake/FindEigen.cmake" -- "${Ceres_SOURCE_DIR}/cmake/FindGlog.cmake" -- "${Ceres_SOURCE_DIR}/cmake/FindGflags.cmake" DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR}) - - # Create an uninstall target to remove all installed files. +-if (GLOG_FOUND AND NOT FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION) +- # Version of glog detected was not built with CMake, install our glog module +- # file to enable detection in CeresConfig. +- install(FILES "${Ceres_SOURCE_DIR}/cmake/FindGlog.cmake" +- DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR}) +-endif() + + if (PROVIDE_UNINSTALL_TARGET) + # Create an uninstall target to remove all installed files. diff --git a/ports/ceres/0002_use_glog_target.patch b/ports/ceres/0002_use_glog_target.patch index 6ca328a8ec1a40..5405ea53df2fb5 100644 --- a/ports/ceres/0002_use_glog_target.patch +++ b/ports/ceres/0002_use_glog_target.patch @@ -1,20 +1,20 @@ diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt -index cc43fec..18b415b 100644 +index 3711222..8646bd0 100644 --- a/internal/ceres/CMakeLists.txt +++ b/internal/ceres/CMakeLists.txt -@@ -152,17 +152,9 @@ else (SCHUR_SPECIALIZATIONS) - endif (SCHUR_SPECIALIZATIONS) - - # Build the list of dependencies for Ceres based on the current configuration. +@@ -174,17 +174,9 @@ endif (SCHUR_SPECIALIZATIONS) + find_package(Threads QUIET) + list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES Threads::Threads) + -if (NOT MINIGLOG AND GLOG_FOUND) - list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES ${GLOG_LIBRARIES}) -- if (GFLAGS_FOUND) +- if (gflags_FOUND) - # If glog & gflags are both found, we assume that glog was built with - # gflags, as it is awkward to perform a try_compile() to verify this - # when gflags is an imported target (as it is in newer versions). - # As glog #includes gflags/gflags.h in glog/logging.h if compiled with - # gflags, it is thus a public dependency for Ceres in this case. -- list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES ${GFLAGS_LIBRARIES}) +- list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES gflags) - endif() -endif (NOT MINIGLOG AND GLOG_FOUND) +if (NOT MINIGLOG) diff --git a/ports/ceres/0003_fix_exported_ceres_config.patch b/ports/ceres/0003_fix_exported_ceres_config.patch index 9b02e99633a7df..332ef595284066 100644 --- a/ports/ceres/0003_fix_exported_ceres_config.patch +++ b/ports/ceres/0003_fix_exported_ceres_config.patch @@ -1,93 +1,63 @@ diff --git a/cmake/CeresConfig.cmake.in b/cmake/CeresConfig.cmake.in -index d0380de..55760a8 100644 +index e5e2976..be1083a 100644 --- a/cmake/CeresConfig.cmake.in +++ b/cmake/CeresConfig.cmake.in -@@ -237,85 +237,13 @@ endif (EIGEN_FOUND) - list(APPEND CERES_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}) +@@ -213,55 +213,13 @@ else (EIGEN3_FOUND) + endif (EIGEN3_FOUND) - # Glog. --# Flag set during configuration and build of Ceres. + # glog (and maybe gflags). +-# +-# Flags set during configuration and build of Ceres. -set(CERES_USES_MINIGLOG @MINIGLOG@) +-set(CERES_GLOG_VERSION @glog_VERSION@) +-set(CERES_GLOG_WAS_BUILT_WITH_CMAKE @FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION@) +- -set(CERES_USES_GFLAGS @GFLAGS@) +-set(CERES_GFLAGS_VERSION @gflags_VERSION@) +- -if (CERES_USES_MINIGLOG) -- set(MINIGLOG_INCLUDE_DIR ${CERES_INCLUDE_DIR}/ceres/internal/miniglog) -- if (NOT CERES_WAS_INSTALLED) -- # When Ceres was exported from the build tree, the miniglog headers -- # will be in Ceres internal source directory, not in the public headers -- # directory (they are copied with the public headers when installed). -- set(MINIGLOG_INCLUDE_DIR -- ${CERES_EXPORTED_SOURCE_DIR}/internal/ceres/miniglog) -- endif() -- if (NOT EXISTS ${MINIGLOG_INCLUDE_DIR}) -- ceres_report_not_found( -- "Failed to find miniglog headers in expected include directory: " -- "${MINIGLOG_INCLUDE_DIR}, but Ceres was compiled with MINIGLOG enabled " -- "(in place of glog).") -- endif (NOT EXISTS ${MINIGLOG_INCLUDE_DIR}) -- list(APPEND CERES_INCLUDE_DIRS ${MINIGLOG_INCLUDE_DIR}) - # Output message at standard log level (not the lower STATUS) so that - # the message is output in GUI during configuration to warn user. -- message("-- Found Ceres compiled with miniglog substitute " +- ceres_message("-- Found Ceres compiled with miniglog substitute " - "for glog, beware this will likely cause problems if glog is later linked.") --else (CERES_USES_MINIGLOG) -- # Append the locations of glog when Ceres was built to the search path hints. -- set(GLOG_WAS_BUILT_WITH_CMAKE @FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION@) -- if (GLOG_WAS_BUILT_WITH_CMAKE) -- set(glog_DIR @glog_DIR@) -- set(GLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION TRUE) +-else(CERES_USES_MINIGLOG) +- if (CERES_GLOG_WAS_BUILT_WITH_CMAKE) +- find_package(glog ${CERES_GLOG_VERSION} CONFIG QUIET) +- set(GLOG_FOUND ${glog_FOUND}) - else() -- list(APPEND GLOG_INCLUDE_DIR_HINTS @GLOG_INCLUDE_DIR@) -- get_filename_component(CERES_BUILD_GLOG_LIBRARY_DIR @GLOG_LIBRARY@ PATH) +- # Version of glog against which Ceres was built was not built with CMake, +- # use the exported glog find_package() module from Ceres to find it again. +- # Append the locations of glog when Ceres was built to the search path hints. +- list(APPEND GLOG_INCLUDE_DIR_HINTS "@GLOG_INCLUDE_DIR@") +- get_filename_component(CERES_BUILD_GLOG_LIBRARY_DIR "@GLOG_LIBRARY@" PATH) - list(APPEND GLOG_LIBRARY_DIR_HINTS ${CERES_BUILD_GLOG_LIBRARY_DIR}) +- +- # Search quietly s/t we control the timing of the error message if not found. +- find_package(Glog QUIET) - endif() +include (CMakeFindDependencyMacro) +find_dependency (glog NO_MODULE) -- # Search quietly s/t we control the timing of the error message if not found. -- find_package(Glog QUIET) - if (GLOG_FOUND) -- message(STATUS "Found required Ceres dependency: glog") -- else (GLOG_FOUND) -- ceres_report_not_found("Missing required Ceres " -- "dependency: glog. Searched using GLOG_INCLUDE_DIR_HINTS: " -- "${GLOG_INCLUDE_DIR_HINTS} and glog_DIR: ${glog_DIR}.") -- endif (GLOG_FOUND) -- list(APPEND CERES_INCLUDE_DIRS ${GLOG_INCLUDE_DIRS}) +- ceres_message(STATUS "Found required Ceres dependency: glog") +- else() +- ceres_report_not_found("Missing required Ceres dependency: glog.") +- endif() - - # gflags is only a public dependency of Ceres via glog, thus is not required - # if Ceres was built with MINIGLOG. - if (CERES_USES_GFLAGS) -- # If gflags was found as an imported CMake target, we need to call -- # find_packge(Gflags) again here, as imported CMake targets are not -- # re-exported. Without this, the 'gflags-shared' target name which is -- # present in CERES_LIBRARIES in this case would not be defined, and so -- # CMake will assume it is a library name (which it is not) and fail to link. -- # -- # Append the locations of gflags when Ceres was built to the search path -- # hints. -- set(GFLAGS_WAS_BUILT_WITH_CMAKE @FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION@) -- if (GFLAGS_WAS_BUILT_WITH_CMAKE) -- set(gflags_DIR @gflags_DIR@) -- set(GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION TRUE) -- else() -- list(APPEND GFLAGS_INCLUDE_DIR_HINTS @GFLAGS_INCLUDE_DIR@) -- get_filename_component(CERES_BUILD_GFLAGS_LIBRARY_DIR @GFLAGS_LIBRARY@ PATH) -- list(APPEND GFLAGS_LIBRARY_DIR_HINTS ${CERES_BUILD_GFLAGS_LIBRARY_DIR}) -- endif() -- - # Search quietly s/t we control the timing of the error message if not found. -- find_package(Gflags QUIET) -- if (GFLAGS_FOUND) -- message(STATUS "Found required Ceres dependency: gflags") +- find_package(gflags ${CERES_GFLAGS_VERSION} QUIET) +- if (gflags_FOUND AND TARGET gflags) +- ceres_message(STATUS "Found required Ceres dependency: gflags") - else() - ceres_report_not_found("Missing required Ceres " -- "dependency: gflags. Searched using GFLAGS_INCLUDE_DIR_HINTS: " -- "${GFLAGS_INCLUDE_DIR_HINTS} and gflags_DIR: ${gflags_DIR}.") +- "dependency: gflags (not found, or not found as exported CMake target).") - endif() -- list(APPEND CERES_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIR_HINTS}) - endif() --endif (CERES_USES_MINIGLOG) -+#SuiteSparse +-endif(CERES_USES_MINIGLOG) ++# SuiteSparse +if (@SUITESPARSE@) + find_dependency(suitesparse CONFIG) +endif() diff --git a/ports/ceres/0004_fix_find_eigen.patch b/ports/ceres/0004_fix_find_eigen.patch deleted file mode 100644 index ad92228c0bc896..00000000000000 --- a/ports/ceres/0004_fix_find_eigen.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7033de0..5235baa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -209,40 +209,40 @@ endif (IOS) - unset(CERES_COMPILE_OPTIONS) - - # Eigen. --find_package(Eigen REQUIRED) --if (EIGEN_FOUND) -- message("-- Found Eigen version ${EIGEN_VERSION}: ${EIGEN_INCLUDE_DIRS}") -- if (EIGEN_VERSION VERSION_LESS 3.1.0) -+find_package(Eigen3 REQUIRED) -+if (EIGEN3_FOUND) -+ message(STATUS "Found Eigen version ${EIGEN3_VERSION_STRING}: ${EIGEN3_INCLUDE_DIRS}") -+ if (EIGEN3_VERSION_STRING VERSION_LESS 3.1.0) - message(FATAL_ERROR "-- Ceres requires Eigen version >= 3.1.0 in order " - "that Eigen/SparseCore be available, detected version of Eigen is: " -- "${EIGEN_VERSION}") -- endif (EIGEN_VERSION VERSION_LESS 3.1.0) -+ "${EIGEN3_VERSION_STRING}") -+ endif (EIGEN3_VERSION_STRING VERSION_LESS 3.1.0) - - if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)" AND -- EIGEN_VERSION VERSION_LESS 3.3.4) -+ EIGEN3_VERSION_STRING VERSION_LESS 3.3.4) - # As per issue #289: https://github.com/ceres-solver/ceres-solver/issues/289 - # the bundle_adjustment_test will fail for Eigen < 3.3.4 on aarch64. - message(FATAL_ERROR "-- Ceres requires Eigen version >= 3.3.4 on aarch64. " -- "Detected version of Eigen is: ${EIGEN_VERSION}.") -+ "Detected version of Eigen is: ${EIGEN3_VERSION_STRING}.") - endif() - - if (EIGENSPARSE) -- message("-- Enabling use of Eigen as a sparse linear algebra library.") -+ message(STATUS "Enabling use of Eigen as a sparse linear algebra library.") - list(APPEND CERES_COMPILE_OPTIONS CERES_USE_EIGEN_SPARSE) -- if (EIGEN_VERSION VERSION_LESS 3.2.2) -+ if (EIGEN3_VERSION_STRING VERSION_LESS 3.2.2) - message(" WARNING:") - message("") -- message(" Your version of Eigen (${EIGEN_VERSION}) is older than ") -+ message(" Your version of Eigen (${EIGEN3_VERSION_STRING}) is older than ") - message(" version 3.2.2. The performance of SPARSE_NORMAL_CHOLESKY ") - message(" and SPARSE_SCHUR linear solvers will suffer.") -- endif (EIGEN_VERSION VERSION_LESS 3.2.2) -+ endif (EIGEN3_VERSION_STRING VERSION_LESS 3.2.2) - else (EIGENSPARSE) - message("-- Disabling use of Eigen as a sparse linear algebra library.") - message(" This does not affect the covariance estimation algorithm ") - message(" which can still use the EIGEN_SPARSE_QR algorithm.") - add_definitions(-DEIGEN_MPL2_ONLY) - endif (EIGENSPARSE) --endif (EIGEN_FOUND) -+endif (EIGEN3_FOUND) - - if (LAPACK) - find_package(LAPACK QUIET) -@@ -562,7 +562,7 @@ include_directories( - # Note that this is *not* propagated to clients, ie CERES_INCLUDE_DIRS - # used by clients after find_package(Ceres) does not identify Eigen as - # as system headers. --include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS}) -+include_directories(${EIGEN3_INCLUDE_DIRS}) - - if (SUITESPARSE) - include_directories(${SUITESPARSE_INCLUDE_DIRS}) -diff --git a/cmake/CeresConfig.cmake.in b/cmake/CeresConfig.cmake.in -index c4ed71f..b3d6a17 100644 ---- a/cmake/CeresConfig.cmake.in -+++ b/cmake/CeresConfig.cmake.in -@@ -202,39 +202,39 @@ set(CERES_VERSION @CERES_VERSION@ ) - - # Eigen. - # Flag set during configuration and build of Ceres. --set(CERES_EIGEN_VERSION @EIGEN_VERSION@) -+set(CERES_EIGEN_VERSION @EIGEN3_VERSION_STRING@) - set(EIGEN_WAS_BUILT_WITH_CMAKE @FOUND_INSTALLED_EIGEN_CMAKE_CONFIGURATION@) - # Append the locations of Eigen when Ceres was built to the search path hints. - if (EIGEN_WAS_BUILT_WITH_CMAKE) - set(Eigen3_DIR @Eigen3_DIR@) - set(EIGEN_PREFER_EXPORTED_EIGEN_CMAKE_CONFIGURATION TRUE) - else() -- list(APPEND EIGEN_INCLUDE_DIR_HINTS @EIGEN_INCLUDE_DIR@) -+ list(APPEND EIGEN_INCLUDE_DIR_HINTS @EIGEN3_INCLUDE_DIR@) - endif() - # Search quietly to control the timing of the error message if not found. The - # search should be for an exact match, but for usability reasons do a soft - # match and reject with an explanation below. --find_package(Eigen ${CERES_EIGEN_VERSION} QUIET) --if (EIGEN_FOUND) -- if (NOT EIGEN_VERSION VERSION_EQUAL CERES_EIGEN_VERSION) -+find_package(Eigen3 ${CERES_EIGEN_VERSION} QUIET) -+if (EIGEN3_FOUND) -+ if (NOT EIGEN3_VERSION_STRING VERSION_EQUAL CERES_EIGEN_VERSION) - # CMake's VERSION check in FIND_PACKAGE() will accept any version >= the - # specified version. However, only version = is supported. Improve - # usability by explaining why we don't accept non-exact version matching. - ceres_report_not_found("Found Eigen dependency, but the version of Eigen " -- "found (${EIGEN_VERSION}) does not exactly match the version of Eigen " -+ "found (${EIGEN3_VERSION_STRING}) does not exactly match the version of Eigen " - "Ceres was compiled with (${CERES_EIGEN_VERSION}). This can cause subtle " - "bugs by triggering violations of the One Definition Rule. See the " - "Wikipedia article http://en.wikipedia.org/wiki/One_Definition_Rule " - "for more details") - endif () - message(STATUS "Found required Ceres dependency: " -- "Eigen version ${CERES_EIGEN_VERSION} in ${EIGEN_INCLUDE_DIRS}") --else (EIGEN_FOUND) -+ "Eigen version ${CERES_EIGEN_VERSION} in ${EIGEN3_INCLUDE_DIRS}") -+else (EIGEN3_FOUND) - ceres_report_not_found("Missing required Ceres " - "dependency: Eigen version ${CERES_EIGEN_VERSION}, please set " -- "EIGEN_INCLUDE_DIR.") --endif (EIGEN_FOUND) --list(APPEND CERES_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}) -+ "EIGEN3_INCLUDE_DIR.") -+endif (EIGEN3_FOUND) -+list(APPEND CERES_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIRS}) - - # Glog. - include (CMakeFindDependencyMacro) diff --git a/ports/ceres/CONTROL b/ports/ceres/CONTROL index 5fb8186add93ee..2ad6f31be325fb 100644 --- a/ports/ceres/CONTROL +++ b/ports/ceres/CONTROL @@ -1,6 +1,5 @@ Source: ceres -Version: 1.14.0 -Port-Version: 10 +Version: 2.0.0 Build-Depends: glog, eigen3 Homepage: https://github.com/ceres-solver/ceres-solver Description: non-linear optimization package diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index e7c455c562097f..c1dca74a95e966 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -9,14 +9,13 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ceres-solver/ceres-solver - REF 1.14.0 - SHA512 6dddddf5bd5834332a69add468578ad527e4d94fe85c9751ddf5fe9ad11a34918bdd9c994c49dd6ffc398333d0ac9752ac89aaef1293e2fe0a55524e303d415d + REF 2.0.0 + SHA512 6379666ef57af4ea85026644fa21365ce18fbaa12d50bd452bcdae0743a7b013effdd42c961e90c31815991bf315bd6904553dcc1a382ff5ed8c7abe9edf9a6c HEAD_REF master PATCHES 0001_cmakelists_fixes.patch 0002_use_glog_target.patch 0003_fix_exported_ceres_config.patch - 0004_fix_find_eigen.patch ) file(REMOVE ${SOURCE_PATH}/cmake/FindCXSparse.cmake) diff --git a/ports/theia/portfile.cmake b/ports/theia/portfile.cmake index 77b4c11c3d58db..e5e7ffcab3de99 100644 --- a/ports/theia/portfile.cmake +++ b/ports/theia/portfile.cmake @@ -19,6 +19,9 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + -DCMAKE_CXX_STANDARD=14 + -DCMAKE_CXX_EXTENSIONS=OFF + -DCMAKE_CXX_STANDARD_REQUIRED=ON -DBUILD_TESTING=OFF -DTHEIA_USE_EXTERNAL_CEREAL=ON -DTHEIA_USE_EXTERNAL_FLANN=ON From c7fb0ebaedfff438f122bbd9862958dfb919645c Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Wed, 2 Dec 2020 05:13:58 +0700 Subject: [PATCH 0220/1694] [many ports] mingw support (#14556) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [vcpkg_configure_make] Only rename import libs on MSVC * [x264] Only rename import libs on MSVC * [x265] Add libc++ and libstdc++ as system libs * [ffmpeg] mingw support * [libvpx] Set AS environment variable * [vcpkg_common_definition] Fix a mistake in the prefix and suffix variables * [vcpkg_configure_make] Strip leading -l from lib list before joining * [mp3lame] Use vcpkg_configure_make + mingw support * [x265] Escape the pluses * [ffmpeg] Add compiler flags for mingw * [ffmpeg] Add WINVER define in mf_utils.c * [ffmpeg] Remove unnecessary patch in 0003-fic-windowsinclude.patch * [mp3lame] Add missing dollar sign Co-authored-by: Matthias C. M. Troffaes * [x265] Remove static lib when building shared with mingw * [libogg] Change library name to libogg on mingw * [libogg] Bump port version * [x265] Remove -l(std)c++ flag in pkgconfig file * [vcpkg_configure_make] Try to fix huge diff * [mp3lame] Add comment on deprecated function lame_init_old Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Matthias C. M. Troffaes Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/ffmpeg/0003-fix-windowsinclude.patch | 15 ---- ports/ffmpeg/0013-define-WINVER.patch | 15 ++++ ports/ffmpeg/portfile.cmake | 76 +++++++++++-------- ports/libogg/CONTROL | 2 +- ports/libogg/portfile.cmake | 4 + ports/libvpx/CONTROL | 2 +- ports/libvpx/portfile.cmake | 2 +- ports/mp3lame/CONTROL | 2 +- ports/mp3lame/portfile.cmake | 66 +++++----------- ...emove_lame_init_old_from_symbol_list.patch | 9 +++ ports/x264/CONTROL | 2 +- ports/x264/portfile.cmake | 2 +- ports/x265/CONTROL | 1 + ports/x265/portfile.cmake | 17 ++++- scripts/cmake/vcpkg_common_definitions.cmake | 4 +- scripts/cmake/vcpkg_configure_make.cmake | 4 +- 16 files changed, 121 insertions(+), 102 deletions(-) create mode 100644 ports/ffmpeg/0013-define-WINVER.patch create mode 100644 ports/mp3lame/remove_lame_init_old_from_symbol_list.patch diff --git a/ports/ffmpeg/0003-fix-windowsinclude.patch b/ports/ffmpeg/0003-fix-windowsinclude.patch index 8fe6a5474ee247..8ac04c8656bf0c 100644 --- a/ports/ffmpeg/0003-fix-windowsinclude.patch +++ b/ports/ffmpeg/0003-fix-windowsinclude.patch @@ -11,18 +11,3 @@ index 9cfbc45..e3447e6 100644 #include #endif -diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c -index 01f0410..dbb0736 100644 ---- a/fftools/ffmpeg.c -+++ b/fftools/ffmpeg.c -@@ -23,6 +23,10 @@ - * multimedia converter based on the FFmpeg libraries - */ - -+#define _WIN32_WINNT 0x0502 // Must be less than 0x0600, because otherwise WinSock2.h defines "pollfd" which then gets redefined in "os_support.h". -+#define WIN32_LEAN_AND_MEAN -+ -+ - #include "config.h" - #include - #include diff --git a/ports/ffmpeg/0013-define-WINVER.patch b/ports/ffmpeg/0013-define-WINVER.patch new file mode 100644 index 00000000000000..295a738e74f7e7 --- /dev/null +++ b/ports/ffmpeg/0013-define-WINVER.patch @@ -0,0 +1,15 @@ +diff --color -Naur src_old/libavcodec/mf_utils.c src/libavcodec/mf_utils.c +--- src_old/libavcodec/mf_utils.c 2020-07-11 05:26:17.000000000 +0700 ++++ src/libavcodec/mf_utils.c 2020-11-13 12:55:57.226976400 +0700 +@@ -22,6 +22,11 @@ + #define _WIN32_WINNT 0x0602 + #endif + ++#if !defined(WINVER) || WINVER < 0x0602 ++#undef WINVER ++#define WINVER 0x0602 ++#endif ++ + #include "mf_utils.h" + #include "libavutil/pixdesc.h" + diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index cbe8df318c16b3..9ba7de91bb9571 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_github( 0010-Fix-x264-detection.patch 0011-Fix-x265-detection.patch 0012-Fix-ssl-110-detection.patch + 0013-define-WINVER.patch ) if (SOURCE_PATH MATCHES " ") @@ -25,7 +26,7 @@ endif() vcpkg_find_acquire_program(YASM) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) #We're assuming that if we're building for Windows we're using MSVC set(INCLUDE_VAR "INCLUDE") set(LIB_PATH_VAR "LIB") @@ -60,7 +61,15 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() set(SHELL ${MSYS_ROOT}/usr/bin/bash.exe) - set(OPTIONS "--toolchain=msvc ${OPTIONS}") + if(VCPKG_TARGET_IS_MINGW) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(OPTIONS "--target-os=mingw32 ${OPTIONS}") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(OPTIONS "--target-os=mingw64 ${OPTIONS}") + endif() + else() + set(OPTIONS "--toolchain=msvc ${OPTIONS}") + endif() else() set(SHELL /bin/sh) endif() @@ -375,7 +384,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() endif() -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_MINGW) + set(OPTIONS "${OPTIONS} --extra_cflags=-D_WIN32_WINNT=0x0601") +elseif(VCPKG_TARGET_IS_WINDOWS) set(OPTIONS "${OPTIONS} --extra-cflags=-DHAVE_UNISTD_H=0") if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MDd --extra-cxxflags=-MDd") @@ -442,36 +453,41 @@ endif() if(VCPKG_TARGET_IS_WINDOWS) file(GLOB DEF_FILES ${CURRENT_PACKAGES_DIR}/lib/*.def ${CURRENT_PACKAGES_DIR}/debug/lib/*.def) - - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(LIB_MACHINE_ARG /machine:ARM) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(LIB_MACHINE_ARG /machine:ARM64) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(LIB_MACHINE_ARG /machine:x86) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(LIB_MACHINE_ARG /machine:x64) - else() - message(FATAL_ERROR "Unsupported target architecture") + + if(NOT VCPKG_TARGET_IS_MINGW) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(LIB_MACHINE_ARG /machine:ARM) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(LIB_MACHINE_ARG /machine:ARM64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(LIB_MACHINE_ARG /machine:x86) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(LIB_MACHINE_ARG /machine:x64) + else() + message(FATAL_ERROR "Unsupported target architecture") + endif() + + foreach(DEF_FILE ${DEF_FILES}) + get_filename_component(DEF_FILE_DIR "${DEF_FILE}" DIRECTORY) + get_filename_component(DEF_FILE_NAME "${DEF_FILE}" NAME) + string(REGEX REPLACE "-[0-9]*\\.def" "${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" OUT_FILE_NAME "${DEF_FILE_NAME}") + file(TO_NATIVE_PATH "${DEF_FILE}" DEF_FILE_NATIVE) + file(TO_NATIVE_PATH "${DEF_FILE_DIR}/${OUT_FILE_NAME}" OUT_FILE_NATIVE) + message(STATUS "Generating ${OUT_FILE_NATIVE}") + vcpkg_execute_required_process( + COMMAND lib.exe /def:${DEF_FILE_NATIVE} /out:${OUT_FILE_NATIVE} ${LIB_MACHINE_ARG} + WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR} + LOGNAME libconvert-${TARGET_TRIPLET} + ) + endforeach() endif() - - foreach(DEF_FILE ${DEF_FILES}) - get_filename_component(DEF_FILE_DIR "${DEF_FILE}" DIRECTORY) - get_filename_component(DEF_FILE_NAME "${DEF_FILE}" NAME) - string(REGEX REPLACE "-[0-9]*\\.def" "${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" OUT_FILE_NAME "${DEF_FILE_NAME}") - file(TO_NATIVE_PATH "${DEF_FILE}" DEF_FILE_NATIVE) - file(TO_NATIVE_PATH "${DEF_FILE_DIR}/${OUT_FILE_NAME}" OUT_FILE_NATIVE) - message(STATUS "Generating ${OUT_FILE_NATIVE}") - vcpkg_execute_required_process( - COMMAND lib.exe /def:${DEF_FILE_NATIVE} /out:${OUT_FILE_NATIVE} ${LIB_MACHINE_ARG} - WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR} - LOGNAME libconvert-${TARGET_TRIPLET} - ) - endforeach() - + file(GLOB EXP_FILES ${CURRENT_PACKAGES_DIR}/lib/*.exp ${CURRENT_PACKAGES_DIR}/debug/lib/*.exp) file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) - list(APPEND FILES_TO_REMOVE ${EXP_FILES} ${LIB_FILES} ${DEF_FILES}) + if(VCPKG_TARGET_IS_MINGW) + file(GLOB LIB_FILES_2 ${CURRENT_PACKAGES_DIR}/bin/*.lib ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib) + endif() + list(APPEND FILES_TO_REMOVE ${EXP_FILES} ${LIB_FILES} ${LIB_FILES_2} ${DEF_FILES}) if(FILES_TO_REMOVE) file(REMOVE ${FILES_TO_REMOVE}) endif() diff --git a/ports/libogg/CONTROL b/ports/libogg/CONTROL index c89497a19fa74f..57d1748eee8fa7 100644 --- a/ports/libogg/CONTROL +++ b/ports/libogg/CONTROL @@ -1,5 +1,5 @@ Source: libogg Version: 1.3.4 -Port-Version: 2 +Port-Version: 3 Description: Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs. Homepage: https://github.com/xiph/ogg diff --git a/ports/libogg/portfile.cmake b/ports/libogg/portfile.cmake index e493687c3e9781..2316a2a8a180c3 100644 --- a/ports/libogg/portfile.cmake +++ b/ports/libogg/portfile.cmake @@ -6,6 +6,10 @@ vcpkg_from_github( HEAD_REF master ) +if(VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string(${SOURCE_PATH}/win32/ogg.def "LIBRARY ogg" "LIBRARY libogg") +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL index 963047270f6ea3..1b171c91ad776b 100644 --- a/ports/libvpx/CONTROL +++ b/ports/libvpx/CONTROL @@ -1,6 +1,6 @@ Source: libvpx Version: 1.9.0 -Port-Version: 3 +Port-Version: 4 Homepage: https://github.com/webmproject/libvpx Description: The reference software implementation for the video coding formats VP8 and VP9. Supports: !(uwp&arm) diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index 1ff1d5c4198f35..fb6a161edbfbb4 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -24,7 +24,7 @@ else() endif() include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake) -yasm_tool_helper(PREPEND_TO_PATH) +yasm_tool_helper(PREPEND_TO_PATH OUT_VAR ENV{AS}) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/ports/mp3lame/CONTROL b/ports/mp3lame/CONTROL index 8db5ca4006a2d2..a239128e45261b 100644 --- a/ports/mp3lame/CONTROL +++ b/ports/mp3lame/CONTROL @@ -1,5 +1,5 @@ Source: mp3lame Version: 3.100 -Port-Version: 4 +Port-Version: 5 Homepage: http://lame.sourceforge.net/ Description: LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL. diff --git a/ports/mp3lame/portfile.cmake b/ports/mp3lame/portfile.cmake index 92447757a31474..06aaf01b9b4e47 100644 --- a/ports/mp3lame/portfile.cmake +++ b/ports/mp3lame/portfile.cmake @@ -6,10 +6,12 @@ vcpkg_from_sourceforge( REF ${VERSION} FILENAME "lame-${VERSION}.tar.gz" SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b - PATCHES 00001-msvc-upgrade-solution-up-to-vc11.patch + PATCHES + 00001-msvc-upgrade-solution-up-to-vc11.patch + remove_lame_init_old_from_symbol_list.patch # deprecated https://github.com/zlargon/lame/blob/master/include/lame.h#L169 ) -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(platform "ARM64") @@ -84,59 +86,31 @@ else() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(OPTIONS --enable-static=yes --enable-shared=no) - set(MP3LAME_LIB "libmp3lame.a") + set(MP3LAME_LIB "libmp3lame.${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") else() set(OPTIONS --enable-shared=yes --enable-static=no) - set(MP3LAME_LIB "libmp3lame.so") + if(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX) + set(MP3LAME_LIB "libmp3lame.${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") + else() + set(MP3LAME_LIB "libmp3lame.${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + endif() endif() - if(NOT DEFINED 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) + if(NOT VCPKG_TARGET_IS_MINGW) + string(APPEND OPTIONS --with-pic=yes) + endif() - message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process( - COMMAND ${SOURCE_PATH}/configure ${OPTIONS} --with-pic=yes --prefix=${CURRENT_PACKAGES_DIR}/debug - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - LOGNAME configure-${TARGET_TRIPLET}-dbg - ) - message(STATUS "Building ${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process( - COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}" - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - LOGNAME install-${TARGET_TRIPLET}-dbg - ) + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + DETERMINE_BUILD_TRIPLET + OPTIONS ${OPTIONS} + ) - file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/bin + vcpkg_install_make() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ) - endif() - - if(NOT DEFINED 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) - - message(STATUS "Configuring ${TARGET_TRIPLET}-rel") - vcpkg_execute_required_process( - COMMAND ${SOURCE_PATH}/configure ${OPTIONS} --with-pic=yes --prefix=${CURRENT_PACKAGES_DIR} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - LOGNAME configure-${TARGET_TRIPLET}-rel - ) - - message(STATUS "Building ${TARGET_TRIPLET}-rel") - vcpkg_execute_required_process( - COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}" - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - LOGNAME install-${TARGET_TRIPLET}-rel - ) - - if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - endif() - - endif() endif() diff --git a/ports/mp3lame/remove_lame_init_old_from_symbol_list.patch b/ports/mp3lame/remove_lame_init_old_from_symbol_list.patch new file mode 100644 index 00000000000000..11d29b2eb1aa57 --- /dev/null +++ b/ports/mp3lame/remove_lame_init_old_from_symbol_list.patch @@ -0,0 +1,9 @@ +diff --color -Naur src_old/include/libmp3lame.sym src/include/libmp3lame.sym +--- src_old/include/libmp3lame.sym 2017-09-07 02:33:35.000000000 +0700 ++++ src/include/libmp3lame.sym 2020-11-12 17:45:59.946448300 +0700 +@@ -1,5 +1,4 @@ + lame_init +-lame_init_old + lame_set_num_samples + lame_get_num_samples + lame_set_in_samplerate diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL index 15e35036a06430..73d74549a1c908 100644 --- a/ports/x264/CONTROL +++ b/ports/x264/CONTROL @@ -1,6 +1,6 @@ Source: x264 Version: 157-303c484ec828ed0 -Port-Version: 13 +Port-Version: 14 Homepage: https://github.com/mirror/x264 Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format Build-Depends: pthread (linux&osx) diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 5c716f0d1b4b1a..32bc1c02098b7b 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -66,7 +66,7 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/lib/libx264.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.lib) elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL index e9d704c74bbfb2..58fe1b99ebd028 100644 --- a/ports/x265/CONTROL +++ b/ports/x265/CONTROL @@ -1,4 +1,5 @@ Source: x265 Version: 3.4 +Port-Version: 1 Homepage: https://github.com/videolan/x265 Description: x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream. diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake index 3b3ecbba690c34..754e4127f2f3da 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -40,13 +40,28 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) endif() -if(WIN32 AND (NOT MINGW)) +if(VCPKG_TARGET_IS_WINDOWS AND (NOT VCPKG_TARGET_IS_MINGW)) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc" "-lx265" "-lx265-static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc" "-lx265" "-lx265-static") endif() endif() +# maybe create vcpkg_regex_replace_string? + +file(READ ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc _contents) +string(REGEX REPLACE "-l(std)?c\\+\\+" "" _contents "${_contents}") +file(WRITE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc "${_contents}") + +file(READ ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc _contents) +string(REGEX REPLACE "-l(std)?c\\+\\+" "" _contents "${_contents}") +file(WRITE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc "${_contents}") + +if(VCPKG_TARGET_IS_MINGW AND ENABLE_SHARED) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libx265.a) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libx265.a) +endif() + if(UNIX) vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES numa) else() diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index 10e5338d0e76fd..f63d6467a1fbad 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -124,10 +124,10 @@ endif() #This allows us scale down on hardcoded target dependent paths in portfiles set(CMAKE_STATIC_LIBRARY_SUFFIX "${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") set(CMAKE_SHARED_LIBRARY_SUFFIX "${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") -set(CMAKE_IMPORT_LIBRARY_SUFFIX "${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}") +set(CMAKE_IMPORT_LIBRARY_SUFFIX "${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") set(CMAKE_STATIC_LIBRARY_PREFIX "${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}") set(CMAKE_SHARED_LIBRARY_PREFIX "${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}") -set(CMAKE_IMPORT_LIBRARY_PREFIX "${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") +set(CMAKE_IMPORT_LIBRARY_PREFIX "${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}") set(CMAKE_FIND_LIBRARY_SUFFIXES "${VCPKG_FIND_LIBRARY_SUFFIXES}" CACHE INTERNAL "") # Required by find_library set(CMAKE_FIND_LIBRARY_PREFIXES "${VCPKG_FIND_LIBRARY_PREFIXES}" CACHE INTERNAL "") # Required by find_library diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 8a7b27be8901b5..e7af4713c8b616 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -484,7 +484,6 @@ function(vcpkg_configure_make) set(ALL_LIBS_LIST ${C_LIBS_LIST} ${CXX_LIBS_LIST}) list(REMOVE_DUPLICATES ALL_LIBS_LIST) list(TRANSFORM ALL_LIBS_LIST STRIP) - #Do lib list transformation from name.lib to -lname if necessary set(_VCPKG_TRANSFORM_LIBS TRUE) if(VCPKG_TARGET_IS_UWP) @@ -501,6 +500,7 @@ function(vcpkg_configure_make) if(VCPKG_TARGET_IS_WINDOWS) list(REMOVE_ITEM ALL_LIBS_LIST "uuid") endif() + list(TRANSFORM ALL_LIBS_LIST REPLACE "^(${_lprefix})" "") endif() list(JOIN ALL_LIBS_LIST " ${_lprefix}" ALL_LIBS_STRING) @@ -681,7 +681,7 @@ function(vcpkg_configure_make) WORKING_DIRECTORY "${TAR_DIR}" LOGNAME config-${TARGET_TRIPLET}-${SHORT_NAME_${_buildtype}} ) - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(GLOB_RECURSE LIBTOOL_FILES "${TAR_DIR}*/libtool") foreach(lt_file IN LISTS LIBTOOL_FILES) file(READ "${lt_file}" _contents) From a011765eece23ac87d59c0b271889a1322007d99 Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Tue, 1 Dec 2020 23:14:46 +0100 Subject: [PATCH 0221/1694] [magnum] fixes installing all dependecies by default (#11225) --- ports/magnum/CONTROL | 62 ++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL index 0a08095051aa19..e7fa5bd9a89c18 100644 --- a/ports/magnum/CONTROL +++ b/ports/magnum/CONTROL @@ -1,6 +1,6 @@ Source: magnum Version: 2020.06 -Port-Version: 1 +Port-Version: 2 Build-Depends: corrade[utility] Description: C++11/C++14 graphics middleware for games and data visualization Homepage: https://magnum.graphics/ @@ -8,27 +8,27 @@ Default-Features: anyaudioimporter, anyimageimporter, anyimageconverter, anyscen Feature: al-info Description: magnum-al-info utility -Build-Depends: magnum[audio] +Build-Depends: magnum[core,audio] Feature: anyimageimporter Description: AnyImageImporter plugin -Build-Depends: magnum[trade] +Build-Depends: magnum[core,trade] Feature: anyaudioimporter Description: AnyAudioImporter plugin -Build-Depends: magnum[audio], corrade[pluginmanager] +Build-Depends: magnum[core,audio], corrade[pluginmanager] Feature: anyimageconverter Description: AnyImageConverter plugin -Build-Depends: magnum[trade] +Build-Depends: magnum[core,trade] Feature: anysceneconverter Description: AnySceneConverter plugin -Build-Depends: magnum[trade] +Build-Depends: magnum[core,trade] Feature: anysceneimporter Description: AnySceneImporter plugin -Build-Depends: magnum[trade] +Build-Depends: magnum[core,trade] Feature: audio Description: Audio library @@ -39,18 +39,18 @@ Description: DebugTools library Feature: distancefieldconverter Description: magnum-distancefieldconverter utility -Build-Depends: magnum[texturetools], magnum[gl] +Build-Depends: magnum[core,texturetools], magnum[core,gl] Feature: fontconverter Description: magnum-fontconverter utility -Build-Depends: magnum[text], magnum[gl] +Build-Depends: magnum[core,text], magnum[core,gl] Feature: gl Description: GL library Feature: gl-info Description: gl-info utility -Build-Depends: magnum[gl] +Build-Depends: magnum[core,gl] Feature: glfwapplication Description: GlfwApplication library @@ -58,35 +58,35 @@ Build-Depends: glfw3 Feature: imageconverter Description: magnum-imageconverter utility -Build-Depends: magnum[trade] +Build-Depends: magnum[core,trade] Feature: magnumfont Description: MagnumFont plugin -Build-Depends: magnum[text] +Build-Depends: magnum[core,text] Feature: magnumfontconverter Description: MagnumFontConverter plugin -Build-Depends: magnum[text], magnum[tgaimageconverter] +Build-Depends: magnum[core,text], magnum[core,tgaimageconverter] Feature: meshtools Description: MeshTools library -Build-Depends: magnum[trade] +Build-Depends: magnum[core,trade] Feature: objimporter Description: ObjImporter plugin -Build-Depends: magnum[trade] +Build-Depends: magnum[core,trade] Feature: tgaimageconverter Description: TgaImageConverter plugin -Build-Depends: magnum[trade] +Build-Depends: magnum[core,trade] Feature: opengltester Description: OpenGLTester library -Build-Depends: corrade[testsuite], magnum[gl] +Build-Depends: corrade[testsuite], magnum[core,gl] Feature: primitives Description: Primitives library -Build-Depends: magnum[trade] +Build-Depends: magnum[core,trade] Feature: sdl2application Description: Sdl2Application library @@ -97,22 +97,22 @@ Description: SceneGraph library Feature: sceneconverter Description: magnum-sceneconverter utility -Build-Depends: magnum[anysceneconverter] +Build-Depends: magnum[core,anysceneconverter] Feature: shaders Description: Shaders library -Build-Depends: magnum[gl] +Build-Depends: magnum[core,gl] Feature: text Description: Text library -Build-Depends: magnum[texturetools], magnum[gl], corrade[pluginmanager] +Build-Depends: magnum[core,texturetools], magnum[core,gl], corrade[pluginmanager] Feature: texturetools Description: TextureTools library Feature: tgaimporter Description: TgaImporter plugin -Build-Depends: magnum[trade] +Build-Depends: magnum[core,trade] Feature: trade Description: Trade library @@ -120,36 +120,36 @@ Build-Depends: corrade[pluginmanager] Feature: wavaudioimporter Description: WavAudioImporter plugin -Build-Depends: magnum[audio] +Build-Depends: magnum[core,audio] Feature: windowlesscglapplication Description: WindowlessCglApplication library -Build-Depends: magnum[gl] +Build-Depends: magnum[core,gl] Feature: cglcontext Description: CglContext library -Build-Depends: magnum[gl] +Build-Depends: magnum[core,gl] Feature: windowlesswglapplication Description: WindowlessWglApplication library -Build-Depends: magnum[gl] +Build-Depends: magnum[core,gl] Feature: wglcontext Description: WglContext library -Build-Depends: magnum[gl] +Build-Depends: magnum[core,gl] Feature: windowlesseglapplication Description: WindowlessEglApplication library -Build-Depends: magnum[gl] +Build-Depends: magnum[core,gl] Feature: eglcontext Description: EglContext library -Build-Depends: magnum[gl] +Build-Depends: magnum[core,gl] Feature: windowlessglxapplication Description: WindowlessGlxApplication library -Build-Depends: magnum[gl] +Build-Depends: magnum[core,gl] Feature: glxcontext Description: GlxContext library -Build-Depends: magnum[gl] +Build-Depends: magnum[core,gl] From 702ea93d7e53ccb90e1d4aba2553b58b4101fd3e Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 2 Dec 2020 06:16:00 +0800 Subject: [PATCH 0222/1694] [redis-plus-plus] Add c++17 feature (#14762) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Build using c++17 standard * Add a feature cxx17 instead * Update ports/redis-plus-plus/portfile.cmake * Update ports/redis-plus-plus/CONTROL * Modify FEATURE_OPTIONS * Modify feature options * Add feature Cxx17 * Modify options * Update ports/redis-plus-plus/portfile.cmake * Update ports/redis-plus-plus/portfile.cmake * Update ports/redis-plus-plus/portfile.cmake * Modify the CONTROL file Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/redis-plus-plus/CONTROL | 6 +++++- ports/redis-plus-plus/portfile.cmake | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ports/redis-plus-plus/CONTROL b/ports/redis-plus-plus/CONTROL index d3b824f607d3c4..90870a2b806faa 100644 --- a/ports/redis-plus-plus/CONTROL +++ b/ports/redis-plus-plus/CONTROL @@ -1,5 +1,9 @@ Source: redis-plus-plus Version: 1.2.1 +Port-Version: 1 Homepage: https://github.com/sewenew/redis-plus-plus Description: This is a C++ client for Redis. It's based on hiredis, and written in C++ 11. -Build-Depends: hiredis \ No newline at end of file +Build-Depends: hiredis + +Feature: cxx17 +Description: Build redis-plus-plus with cxx 17 standard diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake index fae747289238c6..f71256db29beb8 100644 --- a/ports/redis-plus-plus/portfile.cmake +++ b/ports/redis-plus-plus/portfile.cmake @@ -9,6 +9,12 @@ vcpkg_from_github( fix-conversion.patch ) +if("cxx17" IN_LIST FEATURES) + set(REDIS_PLUS_PLUS_CXX_STANDARD 17) +else() + set(REDIS_PLUS_PLUS_CXX_STANDARD 11) +endif() + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(REDIS_PLUS_PLUS_BUILD_STATIC ON) set(REDIS_PLUS_PLUS_BUILD_SHARED OFF) @@ -25,6 +31,7 @@ vcpkg_configure_cmake( -DREDIS_PLUS_PLUS_BUILD_STATIC=${REDIS_PLUS_PLUS_BUILD_STATIC} -DREDIS_PLUS_PLUS_BUILD_SHARED=${REDIS_PLUS_PLUS_BUILD_SHARED} -DREDIS_PLUS_PLUS_BUILD_TEST=OFF + -DREDIS_PLUS_PLUS_CXX_STANDARD=${REDIS_PLUS_PLUS_CXX_STANDARD} ) vcpkg_install_cmake() @@ -34,4 +41,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # 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 ) From 42ad36175ad1ccec3a47ed04e053f0679bd5fad1 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Tue, 1 Dec 2020 16:30:35 -0600 Subject: [PATCH 0223/1694] [openssl] Handle INSTALL_NAME_DIR and OSX_DEPLOYMENT_TARGET for macOS shared builds (#14785) * [openssl] Handle INSTALL_NAME_DIR for macOS shared builds * [openssl] Handle OSX_DEPLOYMENT_TARGET for macOS shared builds --- ports/openssl/CONTROL | 2 +- ports/openssl/unix/CMakeLists.txt | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL index 9efc2f76c696a3..7d970cc7589b83 100644 --- a/ports/openssl/CONTROL +++ b/ports/openssl/CONTROL @@ -1,5 +1,5 @@ Source: openssl Version: 1.1.1h -Port-Version: 2 +Port-Version: 3 Homepage: https://www.openssl.org 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. diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index 8b277d3970dcef..977017f8d55322 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -46,10 +46,12 @@ message("CMAKE_C_COMPILER=${CMAKE_C_COMPILER}") message("COMPILER_ROOT=${COMPILER_ROOT}") message("CMAKE_SYSROOT=${CMAKE_SYSROOT}") message("CMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}") +message("CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}") message("CMAKE_C_FLAGS=${CMAKE_C_FLAGS}") message("CMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}") message("CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}") message("CMAKE_INCLUDE_SYSTEM_FLAG_C=${CMAKE_INCLUDE_SYSTEM_FLAG_C}") +message("CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG=${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}") set(CFLAGS "${CMAKE_C_FLAGS}") if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") @@ -66,6 +68,9 @@ if(CMAKE_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT) elseif(CMAKE_OSX_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT) set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_OSX_SYSROOT}") endif() +if (CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG) + set(CFLAGS "${CFLAGS} ${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}") +endif() string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}") @@ -175,6 +180,26 @@ add_custom_target(build_libs ALL BYPRODUCTS ${INSTALL_LIBS} ) +if((CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") AND BUILD_SHARED_LIBS) + if(DEFINED CMAKE_INSTALL_NAME_DIR) + set(ID_PREFIX "${CMAKE_INSTALL_NAME_DIR}") + else() + set(ID_PREFIX "@rpath") + endif() + + add_custom_command( + TARGET build_libs + 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" + 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" + VERBATIM + ) +endif() + install( FILES ${INSTALL_LIBS} DESTINATION lib From b45a644cec55cc6b065c1c1a62f7a4995fd216f1 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Wed, 2 Dec 2020 11:21:22 -0800 Subject: [PATCH 0224/1694] [docs] fix pwsh sorting (#14914) --- docs/maintainers/portfile-functions.md | 108 ++++++++++++------------- docs/regenerate.ps1 | 21 +++-- 2 files changed, 70 insertions(+), 59 deletions(-) diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index 56e42bbd80887f..e94d47e190c83d 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -1,57 +1,57 @@ -# Portfile helper functions -- [execute\_process](execute_process.md) -- [vcpkg\_acquire\_msys](vcpkg_acquire_msys.md) -- [vcpkg\_add\_to\_path](vcpkg_add_to_path.md) -- [vcpkg\_apply\_patches](vcpkg_apply_patches.md) -- [vcpkg\_build\_cmake](vcpkg_build_cmake.md) -- [vcpkg\_build\_gn](vcpkg_build_gn.md) -- [vcpkg\_build\_make](vcpkg_build_make.md) -- [vcpkg\_build\_msbuild](vcpkg_build_msbuild.md) -- [vcpkg\_build\_ninja](vcpkg_build_ninja.md) -- [vcpkg\_build\_nmake](vcpkg_build_nmake.md) -- [vcpkg\_build\_qmake](vcpkg_build_qmake.md) -- [vcpkg\_buildpath\_length\_warning](vcpkg_buildpath_length_warning.md) -- [vcpkg\_check\_features](vcpkg_check_features.md) -- [vcpkg\_check\_linkage](vcpkg_check_linkage.md) -- [vcpkg\_clean\_executables\_in\_bin](vcpkg_clean_executables_in_bin.md) -- [vcpkg\_clean\_msbuild](vcpkg_clean_msbuild.md) -- [vcpkg\_common\_definitions](vcpkg_common_definitions.md) -- [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md) -- [vcpkg\_configure\_gn](vcpkg_configure_gn.md) -- [vcpkg\_configure\_make](vcpkg_configure_make.md) -- [vcpkg\_configure\_meson](vcpkg_configure_meson.md) -- [vcpkg\_configure\_qmake](vcpkg_configure_qmake.md) -- [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md) -- [vcpkg\_copy\_tool\_dependencies](vcpkg_copy_tool_dependencies.md) -- [vcpkg\_copy\_tools](vcpkg_copy_tools.md) -- [vcpkg\_download\_distfile](vcpkg_download_distfile.md) -- [vcpkg\_execute\_build\_process](vcpkg_execute_build_process.md) -- [vcpkg\_execute\_in\_download\_mode](vcpkg_execute_in_download_mode.md) -- [vcpkg\_execute\_required\_process](vcpkg_execute_required_process.md) -- [vcpkg\_execute\_required\_process\_repeat](vcpkg_execute_required_process_repeat.md) -- [vcpkg\_extract\_source\_archive](vcpkg_extract_source_archive.md) -- [vcpkg\_extract\_source\_archive\_ex](vcpkg_extract_source_archive_ex.md) -- [vcpkg\_fail\_port\_install](vcpkg_fail_port_install.md) -- [vcpkg\_find\_acquire\_program](vcpkg_find_acquire_program.md) -- [vcpkg\_find\_fortran](vcpkg_find_fortran.md) -- [vcpkg\_fixup\_cmake\_targets](vcpkg_fixup_cmake_targets.md) -- [vcpkg\_fixup\_pkgconfig](vcpkg_fixup_pkgconfig.md) -- [vcpkg\_from\_bitbucket](vcpkg_from_bitbucket.md) -- [vcpkg\_from\_git](vcpkg_from_git.md) -- [vcpkg\_from\_github](vcpkg_from_github.md) -- [vcpkg\_from\_gitlab](vcpkg_from_gitlab.md) -- [vcpkg\_from\_sourceforge](vcpkg_from_sourceforge.md) -- [vcpkg\_get\_program\_files\_platform\_bitness](vcpkg_get_program_files_platform_bitness.md) -- [vcpkg\_get\_windows\_sdk](vcpkg_get_windows_sdk.md) -- [vcpkg\_install\_cmake](vcpkg_install_cmake.md) -- [vcpkg\_install\_gn](vcpkg_install_gn.md) -- [vcpkg\_install\_make](vcpkg_install_make.md) -- [vcpkg\_install\_meson](vcpkg_install_meson.md) -- [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md) -- [vcpkg\_install\_nmake](vcpkg_install_nmake.md) -- [vcpkg\_install\_qmake](vcpkg_install_qmake.md) -- [vcpkg\_internal\_get\_cmake\_vars](vcpkg_internal_get_cmake_vars.md) -- [vcpkg\_prettify\_command](vcpkg_prettify_command.md) +# Portfile helper functions +- [execute\_process](execute_process.md) +- [vcpkg\_acquire\_msys](vcpkg_acquire_msys.md) +- [vcpkg\_add\_to\_path](vcpkg_add_to_path.md) +- [vcpkg\_apply\_patches](vcpkg_apply_patches.md) +- [vcpkg\_build\_cmake](vcpkg_build_cmake.md) +- [vcpkg\_build\_gn](vcpkg_build_gn.md) +- [vcpkg\_build\_make](vcpkg_build_make.md) +- [vcpkg\_build\_msbuild](vcpkg_build_msbuild.md) +- [vcpkg\_build\_ninja](vcpkg_build_ninja.md) +- [vcpkg\_build\_nmake](vcpkg_build_nmake.md) +- [vcpkg\_build\_qmake](vcpkg_build_qmake.md) +- [vcpkg\_buildpath\_length\_warning](vcpkg_buildpath_length_warning.md) +- [vcpkg\_check\_features](vcpkg_check_features.md) +- [vcpkg\_check\_linkage](vcpkg_check_linkage.md) +- [vcpkg\_clean\_executables\_in\_bin](vcpkg_clean_executables_in_bin.md) +- [vcpkg\_clean\_msbuild](vcpkg_clean_msbuild.md) +- [vcpkg\_common\_definitions](vcpkg_common_definitions.md) +- [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md) +- [vcpkg\_configure\_gn](vcpkg_configure_gn.md) +- [vcpkg\_configure\_make](vcpkg_configure_make.md) +- [vcpkg\_configure\_meson](vcpkg_configure_meson.md) +- [vcpkg\_configure\_qmake](vcpkg_configure_qmake.md) +- [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md) +- [vcpkg\_copy\_tool\_dependencies](vcpkg_copy_tool_dependencies.md) +- [vcpkg\_copy\_tools](vcpkg_copy_tools.md) +- [vcpkg\_download\_distfile](vcpkg_download_distfile.md) +- [vcpkg\_execute\_build\_process](vcpkg_execute_build_process.md) +- [vcpkg\_execute\_in\_download\_mode](vcpkg_execute_in_download_mode.md) +- [vcpkg\_execute\_required\_process](vcpkg_execute_required_process.md) +- [vcpkg\_execute\_required\_process\_repeat](vcpkg_execute_required_process_repeat.md) +- [vcpkg\_extract\_source\_archive](vcpkg_extract_source_archive.md) +- [vcpkg\_extract\_source\_archive\_ex](vcpkg_extract_source_archive_ex.md) +- [vcpkg\_fail\_port\_install](vcpkg_fail_port_install.md) +- [vcpkg\_find\_acquire\_program](vcpkg_find_acquire_program.md) +- [vcpkg\_find\_fortran](vcpkg_find_fortran.md) +- [vcpkg\_fixup\_cmake\_targets](vcpkg_fixup_cmake_targets.md) +- [vcpkg\_fixup\_pkgconfig](vcpkg_fixup_pkgconfig.md) +- [vcpkg\_from\_bitbucket](vcpkg_from_bitbucket.md) +- [vcpkg\_from\_git](vcpkg_from_git.md) +- [vcpkg\_from\_github](vcpkg_from_github.md) +- [vcpkg\_from\_gitlab](vcpkg_from_gitlab.md) +- [vcpkg\_from\_sourceforge](vcpkg_from_sourceforge.md) +- [vcpkg\_get\_program\_files\_platform\_bitness](vcpkg_get_program_files_platform_bitness.md) +- [vcpkg\_get\_windows\_sdk](vcpkg_get_windows_sdk.md) +- [vcpkg\_install\_cmake](vcpkg_install_cmake.md) +- [vcpkg\_install\_gn](vcpkg_install_gn.md) +- [vcpkg\_install\_make](vcpkg_install_make.md) +- [vcpkg\_install\_meson](vcpkg_install_meson.md) +- [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md) +- [vcpkg\_install\_nmake](vcpkg_install_nmake.md) +- [vcpkg\_install\_qmake](vcpkg_install_qmake.md) +- [vcpkg\_internal\_get\_cmake\_vars](vcpkg_internal_get_cmake_vars.md) +- [vcpkg\_prettify\_command](vcpkg_prettify_command.md) - [vcpkg\_replace\_string](vcpkg_replace_string.md) diff --git a/docs/regenerate.ps1 b/docs/regenerate.ps1 index c984ad77b43541..3593746adb71f6 100644 --- a/docs/regenerate.ps1 +++ b/docs/regenerate.ps1 @@ -13,9 +13,7 @@ if (-not (Test-Path "$VcpkgRoot/.vcpkg-root")) { throw "Invalid vcpkg instance, did you forget -VcpkgRoot?" } -Set-Content ` - -Path "$PSScriptRoot/maintainers/portfile-functions.md" ` - -Value "`n`n# Portfile helper functions" +$tableOfContents = @() Get-ChildItem "$VcpkgRoot/scripts/cmake" -Filter '*.cmake' | ForEach-Object { $filename = $_ @@ -72,10 +70,23 @@ Get-ChildItem "$VcpkgRoot/scripts/cmake" -Filter '*.cmake' | ForEach-Object { if ($contents) { Set-Content -Path "$PSScriptRoot/maintainers/$($filename.BaseName).md" -Value "$($contents -join "`n")`n`n## Source`n[scripts/cmake/$($filename.Name)](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/$($filename.Name))" - "- [$($filename.BaseName -replace "_","\_")]($($filename.BaseName).md)" ` - | Out-File -Enc Ascii -Append -FilePath "$PSScriptRoot/maintainers/portfile-functions.md" + + $tableOfContents += $filename.BaseName } elseif (-not $filename.Name.StartsWith("vcpkg_internal")) { # don't worry about undocumented internal functions Write-Warning "The cmake function in file $filename doesn't seem to have any documentation. Make sure the documentation comments are correctly written." } } + +$portfileFunctionsContent = @( + '', + '', + '# Portfile helper functions') + +$tableOfContents | Sort-Object -Culture '' | ForEach-Object { + $portfileFunctionsContent += "- [$($_ -replace '_','\_')]($_.md)" +} + +Set-Content ` + -Path "$PSScriptRoot/maintainers/portfile-functions.md" ` + -Value ($portfileFunctionsContent -join "`n") From 29e09486af34665af8a98d5011c3cd75b1fdebe0 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Wed, 2 Dec 2020 12:58:01 -0800 Subject: [PATCH 0225/1694] [vcpkg] fix compile on vs2015 (#14915) * [vcpkg] fix compile on vs2015 * format --- toolsrc/src/vcpkg/install.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index 8a9fec96326415..eee0eca0ed881e 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -839,20 +839,21 @@ namespace vcpkg::Install if (args.versions_enabled()) { PortFileProvider::VersionedPortfileProvider verprovider(paths); - auto baseprovider = [&]() -> PortFileProvider::BaselineProvider { + auto baseprovider = [&]() -> std::unique_ptr { if (auto p_baseline = manifest_scf.core_paragraph->extra_info.get("$x-default-baseline")) { - return PortFileProvider::BaselineProvider(paths, p_baseline->string().to_string()); + return std::make_unique(paths, + p_baseline->string().to_string()); } else { - return PortFileProvider::BaselineProvider(paths); + return std::make_unique(paths); } }(); auto install_plan = Dependencies::create_versioned_install_plan(verprovider, - baseprovider, + *baseprovider, var_provider, manifest_scf.core_paragraph->dependencies, manifest_scf.core_paragraph->overrides, From 7f0652ceadc54be225f0187fa6c17fa1f7ae5232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 2 Dec 2020 13:05:52 -0800 Subject: [PATCH 0226/1694] [aws-sdk-cpp] Restore AWSSDKConfig.cmake and add usage (#14868) --- ports/aws-sdk-cpp/CONTROL | 2 +- ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch | 20 ++++++++++++++++++++ ports/aws-sdk-cpp/portfile.cmake | 7 +++++-- ports/aws-sdk-cpp/usage | 17 +++++++++++++++++ 4 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch create mode 100644 ports/aws-sdk-cpp/usage diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index 3be9be28561c93..0492d09f818c77 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,6 +1,6 @@ Source: aws-sdk-cpp Version: 1.8.83 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/aws/aws-sdk-cpp Description: AWS SDK for C++ Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream diff --git a/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch b/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch new file mode 100644 index 00000000000000..0c1c1c5255c18a --- /dev/null +++ b/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake +index c2f643e..5a4d8d2 100644 +--- a/cmake/AWSSDKConfig.cmake ++++ b/cmake/AWSSDKConfig.cmake +@@ -43,7 +43,6 @@ endif() + + # On Windows, dlls are treated as runtime target and installed in bindir + if (WIN32 AND AWSSDK_INSTALL_AS_SHARED_LIBS) +- set(AWSSDK_INSTALL_LIBDIR "${AWSSDK_INSTALL_BINDIR}") + # If installed CMake scripts are associated with dll library, define USE_IMPORT_EXPORT for customers + add_definitions(-DUSE_IMPORT_EXPORT) + endif() +@@ -54,7 +53,6 @@ endif() + get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) + get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) +-get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) + get_filename_component(AWS_NATIVE_SDK_ROOT "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE) + + set(CPP_STANDARD "11" CACHE STRING "Flag to upgrade the C++ standard used. The default is 11. The minimum is 11.") diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 03a8929eed82d0..26f7bb8afb4f6a 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF e98e5732ec7319051f162f7314ae361c85d0a8c9 # 1.8.83 SHA512 da540db60551be833ea0315dd93241f9740ab953ed5657c1c7a8c401ae52a4e75b116758420b0a8a4ebb79358dff8377f5e052b180b36f0af27a36003f28bd56 HEAD_REF master - PATCHES patch-relocatable-rpath.patch + PATCHES + patch-relocatable-rpath.patch + fix-AWSSDKCONFIG.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) @@ -60,7 +62,6 @@ endforeach() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/share/AWSSDK ${CURRENT_PACKAGES_DIR}/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/nuget @@ -82,5 +83,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(APPEND ${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif") endif() +configure_file(${CURRENT_PORT_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) + # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/aws-sdk-cpp/usage b/ports/aws-sdk-cpp/usage new file mode 100644 index 00000000000000..9a9bca1c6f9f8a --- /dev/null +++ b/ports/aws-sdk-cpp/usage @@ -0,0 +1,17 @@ +The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: + + find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED) + target_include_directories(main PRVATE ${AWSSDK_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES}) + + find_package(aws-cpp-sdk-core CONFIG REQUIRED) + target_link_libraries(main PRIVATE aws-cpp-sdk-core) + + find_package(aws-cpp-sdk-dynamodb CONFIG REQUIRED) + target_link_libraries(main PRIVATE aws-cpp-sdk-dynamodb) + + find_package(aws-cpp-sdk-kinesis CONFIG REQUIRED) + target_link_libraries(main PRIVATE aws-cpp-sdk-kinesis) + + find_package(aws-cpp-sdk-s3 CONFIG REQUIRED) + target_link_libraries(main PRIVATE aws-cpp-sdk-s3) From e682da24601e59ad3f0123df529fdd839bd8944f Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 3 Dec 2020 05:07:37 +0800 Subject: [PATCH 0227/1694] [osg] Update dependency (#14790) --- ports/osg/CONTROL | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index 241d89f52b09b4..1a1fb7d6b8a1ad 100644 --- a/ports/osg/CONTROL +++ b/ports/osg/CONTROL @@ -1,9 +1,9 @@ Source: osg Version: 3.6.5 -Port-Version: 3 +Port-Version: 4 Homepage: https://github.com/openscenegraph/OpenSceneGraph Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit. -Build-Depends: zlib, fontconfig, boost-asio (!windows), boost-core (!windows), boost-logic (!windows), boost-lexical-cast (!windows), boost-smart-ptr (!windows), boost-tuple (!windows), boost-bind (!windows), freeglut (windows), expat (windows), openimageio (osx) +Build-Depends: zlib, fontconfig, freeglut (windows), expat (windows), openimageio (osx) Feature: collada Description: Support for Collada (.dae) files @@ -19,7 +19,7 @@ Build-Depends: freetype, sdl1, sdl2, libiconv (windows) Feature: plugins Description: Build OSG Plugins - Disable for compile testing examples on a time limit -Build-Depends: freetype, sdl1, curl, openexr, ilmbase, gdal, giflib (windows), jasper, libjpeg-turbo, libpng, tiff, libxml2 (windows), libiconv (windows), libgta, liblas, nvtt, coin +Build-Depends: freetype, sdl1, curl, openexr, ilmbase, gdal, giflib (windows), jasper, libjpeg-turbo, libpng, tiff, libxml2 (windows), libiconv (windows), libgta, liblas, nvtt (!x86), coin, boost-asio (!windows), boost-core (!windows), boost-logic (!windows), boost-lexical-cast (!windows), boost-smart-ptr (!windows), boost-tuple (!windows), boost-bind (!windows) Feature: packages Description: Set to ON to generate CPack configuration files and packaging targets From 7c4c1c2b9496133423889027b5aa25e2f672250e Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 3 Dec 2020 13:24:26 -0800 Subject: [PATCH 0228/1694] [vcpkg baseline][vtk-m] fix the sha512 (#14884) * [vtk-m] fix the sha512 * Bump version * add FILE_DISAMBIGUATOR to vcpkg_from_gitlab * actually use the file disambiguator * regenerate docs * [moos-core] Add DISABLE_PARALLEL_CONFIGURE Co-authored-by: NancyLi1013 --- docs/maintainers/vcpkg_from_github.md | 1 + docs/maintainers/vcpkg_from_gitlab.md | 4 ++++ ports/moos-core/CONTROL | 3 ++- ports/moos-core/portfile.cmake | 1 + ports/vtk-m/CONTROL | 1 + ports/vtk-m/portfile.cmake | 3 ++- scripts/cmake/vcpkg_from_github.cmake | 1 + scripts/cmake/vcpkg_from_gitlab.cmake | 14 ++++++++++++-- 8 files changed, 24 insertions(+), 4 deletions(-) diff --git a/docs/maintainers/vcpkg_from_github.md b/docs/maintainers/vcpkg_from_github.md index 64ff2b1955a2ed..ded5dfb0dbea0a 100644 --- a/docs/maintainers/vcpkg_from_github.md +++ b/docs/maintainers/vcpkg_from_github.md @@ -13,6 +13,7 @@ vcpkg_from_github( [PATCHES ...] [GITHUB_HOST ] [AUTHORIZATION_TOKEN <${SECRET_FROM_FILE}>] + [FILE_DISAMBIGUATOR ] ) ``` diff --git a/docs/maintainers/vcpkg_from_gitlab.md b/docs/maintainers/vcpkg_from_gitlab.md index ceef6f2d44c78a..aa5cc800d7058a 100644 --- a/docs/maintainers/vcpkg_from_gitlab.md +++ b/docs/maintainers/vcpkg_from_gitlab.md @@ -12,6 +12,7 @@ vcpkg_from_gitlab( [SHA512 <45d0d7f8cc350...>] [HEAD_REF ] [PATCHES ...] + [FILE_DISAMBIGUATOR ] ) ``` @@ -51,6 +52,9 @@ A list of patches to be applied to the extracted sources. Relative paths are based on the port directory. +### FILE_DISAMBIGUATOR +A token to uniquely identify the resulting filename if the SHA512 changes even though a git ref does not, to avoid stepping on the same file name. + ## Notes: At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. diff --git a/ports/moos-core/CONTROL b/ports/moos-core/CONTROL index 15a5a5e1f7c0b9..1d1e20d0920c12 100644 --- a/ports/moos-core/CONTROL +++ b/ports/moos-core/CONTROL @@ -1,4 +1,5 @@ Source: moos-core -Version: 10.4.0-4 +Version: 10.4.0 +Port-Version: 5 Description: A very light weight, easy to use middleware. Homepage: https://sites.google.com/site/moossoftware/ diff --git a/ports/moos-core/portfile.cmake b/ports/moos-core/portfile.cmake index b3bdda6ff95e88..197467428edef2 100644 --- a/ports/moos-core/portfile.cmake +++ b/ports/moos-core/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS -DCMAKE_ENABLE_EXPORT=OFF ) diff --git a/ports/vtk-m/CONTROL b/ports/vtk-m/CONTROL index 6fe2933c298fcf..e221eeccecd23c 100644 --- a/ports/vtk-m/CONTROL +++ b/ports/vtk-m/CONTROL @@ -1,5 +1,6 @@ Source: vtk-m Version: 1.5.0 +Port-Version: 1 Homepage: https://gitlab.kitware.com/vtk/vtk-m/ Description: VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures. Supports: x64 & !uwp diff --git a/ports/vtk-m/portfile.cmake b/ports/vtk-m/portfile.cmake index 658a12d2ea5889..c33eb065fdca9a 100644 --- a/ports/vtk-m/portfile.cmake +++ b/ports/vtk-m/portfile.cmake @@ -41,7 +41,8 @@ vcpkg_from_gitlab(GITLAB_URL "https://gitlab.kitware.com" OUT_SOURCE_PATH SOURCE_PATH REPO vtk/vtk-m REF f2aa6ad5be1a97e3fb41ef4680ee2c76c3434ac0 # v1.5.0 Version is strongly locked to VTK 9.0. Upgrading will most likly brake the VTK build - SHA512 2f2a273f74d9a583df9e25a4792440d8d89652fa14b3153f2ea5afbd329b50970e7b9bd68e0ccd036baf5c1f3ad7a8302d95c01dbb30d9a46c045987eebf5370) + SHA512 35e8a2c0ad6cd3c1f02a71a50d781c89f93909ad27030b406fd69f4fea5c1862c48a6e541fd07562947322c3a69bdfdb54206ae51bb86ef7a710f9e9898e9638 + FILE_DISAMBIGUATOR 1) # For people only wanting vtk-m and not VTK #REF 74ffad9bd0679d061bc87e544a728f1c3c926269 # v1.5.1 #SHA512 c9e1c18432b6c11ae086445255acf9477fe4c888122a2b2a9713dc63a40d2e4c2375742157526b5f0869f14c62a4ad66d81ee58d6cc75a1d53a1d615525a03c9) diff --git a/scripts/cmake/vcpkg_from_github.cmake b/scripts/cmake/vcpkg_from_github.cmake index f52538c8ef222f..1c1b71679f95b8 100644 --- a/scripts/cmake/vcpkg_from_github.cmake +++ b/scripts/cmake/vcpkg_from_github.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( [PATCHES ...] [GITHUB_HOST ] [AUTHORIZATION_TOKEN <${SECRET_FROM_FILE}>] + [FILE_DISAMBIGUATOR ] ) ``` diff --git a/scripts/cmake/vcpkg_from_gitlab.cmake b/scripts/cmake/vcpkg_from_gitlab.cmake index 354ff85b987cfe..865c5326ea3a14 100644 --- a/scripts/cmake/vcpkg_from_gitlab.cmake +++ b/scripts/cmake/vcpkg_from_gitlab.cmake @@ -13,6 +13,7 @@ vcpkg_from_gitlab( [SHA512 <45d0d7f8cc350...>] [HEAD_REF ] [PATCHES ...] + [FILE_DISAMBIGUATOR ] ) ``` @@ -52,6 +53,9 @@ A list of patches to be applied to the extracted sources. Relative paths are based on the port directory. +### FILE_DISAMBIGUATOR +A token to uniquely identify the resulting filename if the SHA512 changes even though a git ref does not, to avoid stepping on the same file name. + ## Notes: At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. @@ -66,7 +70,7 @@ This exports the `VCPKG_HEAD_VERSION` variable during head builds. include(vcpkg_execute_in_download_mode) function(vcpkg_from_gitlab) - set(oneValueArgs OUT_SOURCE_PATH GITLAB_URL USER REPO REF SHA512 HEAD_REF) + set(oneValueArgs OUT_SOURCE_PATH GITLAB_URL USER REPO REF SHA512 HEAD_REF FILE_DISAMBIGUATOR) set(multipleValuesArgs PATCHES) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 _vdud "" "${oneValueArgs}" "${multipleValuesArgs}") @@ -119,11 +123,17 @@ function(vcpkg_from_gitlab) endif() string(REPLACE "/" "-" SANITIZED_REF "${_vdud_REF}") + set(downloaded_file_name "${ORG_NAME}-${REPO_NAME}-${SANITIZED_REF}") + if (_vdud_FILE_DISAMBIGUATOR) + set(downloaded_file_name "${downloaded_file_name}-${_vdud_FILE_DISAMBIGUATOR}") + endif() + + set(downloaded_file_name "${downloaded_file_name}.tar.gz") vcpkg_download_distfile(ARCHIVE URLS "${GITLAB_LINK}/-/archive/${_vdud_REF}/${REPO_NAME}-${_vdud_REF}.tar.gz" SHA512 "${_vdud_SHA512}" - FILENAME "${ORG_NAME}-${REPO_NAME}-${SANITIZED_REF}.tar.gz" + FILENAME "${downloaded_file_name}" ) vcpkg_extract_source_archive_ex( From 64ce005c035a738d0259ef59118ddac4e45e3728 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 4 Dec 2020 05:56:56 +0800 Subject: [PATCH 0229/1694] [microsoft-signalr] Fix build error on Linux (#14872) * [microsoft-signalr] Fix build failed on Linux * Nicole CRs Co-authored-by: Nicole Mazzuca Co-authored-by: Billy Robert O'Neal III --- ports/microsoft-signalr/CONTROL | 3 ++- ports/microsoft-signalr/portfile.cmake | 3 ++- .../remove-fno-rtti-compile-option.patch | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/microsoft-signalr/remove-fno-rtti-compile-option.patch diff --git a/ports/microsoft-signalr/CONTROL b/ports/microsoft-signalr/CONTROL index 0cec60bf9f9bfa..6b0f314a33c334 100644 --- a/ports/microsoft-signalr/CONTROL +++ b/ports/microsoft-signalr/CONTROL @@ -1,5 +1,6 @@ Source: microsoft-signalr -Version: 0.1.0-alpha1-1 +Version: 0.1.0-alpha1 +Port-Version: 2 Description: C++ Client for ASP.NET Core SignalR. Default-Features: default-features Homepage: https://github.com/aspnet/SignalR-Client-Cpp diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake index e566f594e49a3b..ff5b6074c7ca99 100644 --- a/ports/microsoft-signalr/portfile.cmake +++ b/ports/microsoft-signalr/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF v0.1.0-alpha1 SHA512 d37eea194b0352a08dd89ac7622bdd6224312ad48a31d8ab36627a8aaff5e795e3513ad010eed516703f6da842a95119c1a4a290b145a43e91ff80a37fff8676 HEAD_REF master + PATCHES remove-fno-rtti-compile-option.patch ) vcpkg_check_features( @@ -30,6 +31,6 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(COPY ${SOURCE_PATH}/third-party-notices.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/microsoft-signalr) +file(COPY ${SOURCE_PATH}/third-party-notices.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) vcpkg_copy_pdbs() \ No newline at end of file diff --git a/ports/microsoft-signalr/remove-fno-rtti-compile-option.patch b/ports/microsoft-signalr/remove-fno-rtti-compile-option.patch new file mode 100644 index 00000000000000..4c2aac20c7b305 --- /dev/null +++ b/ports/microsoft-signalr/remove-fno-rtti-compile-option.patch @@ -0,0 +1,17 @@ +diff --git a/src/signalrclient/CMakeLists.txt b/src/signalrclient/CMakeLists.txt +index 42d64d3..10fa72f 100644 +--- a/src/signalrclient/CMakeLists.txt ++++ b/src/signalrclient/CMakeLists.txt +@@ -58,10 +58,10 @@ else() + target_compile_options(signalrclient PRIVATE -Wall) + endif() + +- # GCC on OSX has a bug with exceptions and no-rtti that can cause crashes +- if(NOT APPLE) ++ # boost-asio (a dependency) doesn't support fno-rtti anymore ++ if(0) + target_compile_options(signalrclient PRIVATE -fno-rtti) + endif() + target_compile_options(signalrclient PRIVATE -Wextra -Wpedantic -Wno-unknown-pragmas) + endif() + From 7ccbae719b8fc8816ea1f3bf8203afd0f46209e3 Mon Sep 17 00:00:00 2001 From: chausner Date: Thu, 3 Dec 2020 23:12:40 +0100 Subject: [PATCH 0230/1694] [vcpkg bootstrap] Include "zip" as required apt dependency in bootstrap error message (#14803) --- scripts/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index e5503f3866d75d..fa1a64622e34c9 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -74,7 +74,7 @@ vcpkgCheckRepoTool() __tool=$1 if ! command -v "$__tool" >/dev/null 2>&1 ; then echo "Could not find $__tool. Please install it (and other dependencies) with:" - echo "sudo apt-get install curl unzip tar" + echo "sudo apt-get install curl zip unzip tar" exit 1 fi } From 89681a240366c05d10d7dd184403fb1bbdf64c7c Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Thu, 3 Dec 2020 18:27:06 -0500 Subject: [PATCH 0231/1694] [monkeys-audio] Update to 565d. (#14913) Co-authored-by: Billy Robert O'Neal III --- ports/monkeys-audio/CONTROL | 2 +- ports/monkeys-audio/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/monkeys-audio/CONTROL b/ports/monkeys-audio/CONTROL index 4ccdbc52a51cb7..6a9b6a2a3c9740 100644 --- a/ports/monkeys-audio/CONTROL +++ b/ports/monkeys-audio/CONTROL @@ -1,5 +1,5 @@ Source: monkeys-audio -Version: 5.59 +Version: 5.65 Homepage: https://monkeysaudio.com Description: Monkey's Audio is an excellent audio compression tool which has multiple advantages over traditional methods. Audio files compressed with it end with .ape extension. diff --git a/ports/monkeys-audio/portfile.cmake b/ports/monkeys-audio/portfile.cmake index 4fed4a0520431d..338310604b45fd 100644 --- a/ports/monkeys-audio/portfile.cmake +++ b/ports/monkeys-audio/portfile.cmake @@ -2,12 +2,12 @@ vcpkg_fail_port_install(ON_TARGET "UWP" "OSX" "Linux") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) -set(MA_VERSION 559c) +set(MA_VERSION 565d) vcpkg_download_distfile(ARCHIVE URLS "https://monkeysaudio.com/files/MAC_SDK_${MA_VERSION}.zip" FILENAME "MAC_SDK_${MA_VERSION}.zip" - SHA512 83ed3e2a4de62cb95e508a12146cecfe6bb584ce3cb30c20ae2f8e2f76839f4a83a4a0f68399a68dfd56829bcd5678824bcdf46730ae6662e14a5248522c0554 + SHA512 785273b4fe19dad284b2c51fb648b2cbae66af069fac75745909862e084e8bfe175703b0997b20cd15a54985e8d707810d8cdcc849692767e71ace924ddfd951 ) vcpkg_extract_source_archive_ex( From 016f4f9701d573287bf8dd7a956f287670247ee2 Mon Sep 17 00:00:00 2001 From: Francisco Pombal Date: Thu, 3 Dec 2020 23:32:00 +0000 Subject: [PATCH 0232/1694] [libtorrent] Update to 1.2.11 (#14755) --- ports/libtorrent/CONTROL | 6 +- .../add-datetime-to-boost-libs.patch | 16 --- ports/libtorrent/fix_python_cmake.patch | 130 ------------------ ports/libtorrent/portfile.cmake | 6 +- 4 files changed, 4 insertions(+), 154 deletions(-) delete mode 100644 ports/libtorrent/add-datetime-to-boost-libs.patch delete mode 100644 ports/libtorrent/fix_python_cmake.patch diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL index 707cf8a4389129..566948d4b41c28 100644 --- a/ports/libtorrent/CONTROL +++ b/ports/libtorrent/CONTROL @@ -1,6 +1,5 @@ Source: libtorrent -Version: 1.2.10 -Port-Version: 2 +Version: 1.2.11 Homepage: https://github.com/arvidn/libtorrent Description: An efficient feature complete C++ BitTorrent implementation Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config, boost-iterator, boost-scope-exit, boost-multiprecision, boost-pool, boost-variant @@ -17,11 +16,10 @@ Build-Depends: libiconv (windows) Description: build with libiconv on Windows Feature: python -Build-Depends: boost-python, libtorrent[deprfun] +Build-Depends: boost-python Description: build the python bindings in bindings/python directory Feature: test -Build-Depends: libtorrent[deprfun] Description: build the libtorrent tests Feature: tools diff --git a/ports/libtorrent/add-datetime-to-boost-libs.patch b/ports/libtorrent/add-datetime-to-boost-libs.patch deleted file mode 100644 index e9eeae91921ae1..00000000000000 --- a/ports/libtorrent/add-datetime-to-boost-libs.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9efd451fb..7ff587631 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -719,9 +719,9 @@ else() - endif() - - # Boost --find_public_dependency(Boost REQUIRED COMPONENTS system) -+find_public_dependency(Boost REQUIRED COMPONENTS system date_time) - target_include_directories(torrent-rasterbar PUBLIC ${Boost_INCLUDE_DIRS}) --target_link_libraries(torrent-rasterbar PUBLIC ${Boost_SYSTEM_LIBRARY}) -+target_link_libraries(torrent-rasterbar PUBLIC ${Boost_LIBRARIES}) - - if (exceptions) - if (MSVC) diff --git a/ports/libtorrent/fix_python_cmake.patch b/ports/libtorrent/fix_python_cmake.patch deleted file mode 100644 index f114b8621a351e..00000000000000 --- a/ports/libtorrent/fix_python_cmake.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt -index 53e09439f..de027f965 100644 ---- a/bindings/python/CMakeLists.txt -+++ b/bindings/python/CMakeLists.txt -@@ -1,7 +1,6 @@ - # To build python bindings we need a python executable and boost python module. Unfortunately, - # their names might not be interlinked and we can not implement a general solution. --# The code below assumes default boost installation, when the module for python 2 is named --# 'python' and the module for python 3 is named 'python3'. -+# The code below assumes default boost installation, when the module for python 3 is named 'python3'. - # To customize that one can provide a name for the Boost::python module via - # 'boost-python-module-name' variable when invoking cmake. - # E.g. on Gentoo with python 3.6 and Boost::python library name 'libboost_python-3.6.so' -@@ -15,12 +14,9 @@ - # Sets _ret to a list of python versions (major.minor) that use the same MSVC runtime as this build does - # assumes MSVC was detected already - # See https://en.wikipedia.org/wiki/Microsoft_Visual_C++#Internal_version_numbering -+# See https://devguide.python.org/#status-of-python-branches for supported python versions - function(_get_compatible_python_versions _ret) -- if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16) -- list(APPEND _tmp 2.6 2.7 3.0 3.1 3.2) -- elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17) -- list(APPEND _tmp 3.3 3.4) -- elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 20) -+ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 20) - list(APPEND _tmp 3.5 3.6 3.7 3.8) - endif() - set(${_ret} ${_tmp} PARENT_SCOPE) -@@ -31,23 +27,22 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC" AND NOT skip-python-runtime-test) - _get_compatible_python_versions(Python_ADDITIONAL_VERSIONS) - endif() - --find_package(PythonInterp REQUIRED) -+find_package(Python3 COMPONENTS Interpreter Development REQUIRED) - if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC" AND NOT skip-python-runtime-test) -- message(STATUS "Testing found python version. Requested: ${Python_ADDITIONAL_VERSIONS}, found: ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") -- if (NOT "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" IN_LIST Python_ADDITIONAL_VERSIONS) -- message(FATAL_ERROR "Incompatible Python and C runtime: MSVC ${CMAKE_CXX_COMPILER_VERSION} and Python ${PYTHON_VERSION_STRING}") -+ message(STATUS "Testing found python version. Requested: ${Python_ADDITIONAL_VERSIONS}, found: ${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}") -+ if (NOT "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" IN_LIST Python_ADDITIONAL_VERSIONS) -+ message(FATAL_ERROR "Incompatible Python and C runtime: MSVC ${CMAKE_CXX_COMPILER_VERSION} and Python ${Python3_VERSION}") - endif() - endif() - --set(Python_ADDITIONAL_VERSIONS "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") --find_package(PythonLibs REQUIRED) -+set(Python_ADDITIONAL_VERSIONS "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}") - - if (NOT boost-python-module-name) - # use active python - # if (PYTHON_VERSION_STRING VERSION_GREATER_EQUAL "3") - # set(_boost-python-module-name "python${PYTHON_VERSION_MAJOR}") - # else() -- set(_boost-python-module-name "python") # to overwrite possible value from a previous run -+ set(_boost-python-module-name "python${Python3_VERSION_MAJOR}") # to overwrite possible value from a previous run - # endif() - endif() - -@@ -55,7 +50,7 @@ set(boost-python-module-name ${_boost-python-module-name} CACHE STRING "Boost:py - - find_package(Boost REQUIRED COMPONENTS ${boost-python-module-name}) - --python_add_module(python-libtorrent -+Python3_add_library(python-libtorrent STATIC - src/module.cpp - src/sha1_hash.cpp - src/converters.cpp -@@ -80,12 +75,12 @@ python_add_module(python-libtorrent - - set_target_properties(python-libtorrent - PROPERTIES -- OUTPUT_NAME libtorrent -+ OUTPUT_NAME torrent - ) - - target_include_directories(python-libtorrent - PRIVATE -- ${PYTHON_INCLUDE_DIRS} -+ ${Python3_INCLUDE_DIRS} - ) - - string(TOUPPER "${boost-python-module-name}" boost_python_module_name_uppercase) -@@ -96,7 +91,7 @@ target_link_libraries(python-libtorrent - # Boost::python adds that but without a path to the library. Therefore we have to either - # provide the path (but, unfortunately, FindPythonLibs.cmake does not return the library dir), - # or give the full file name here (this FindPythonLibs.cmake provides to us). -- ${PYTHON_LIBRARIES} -+ ${Python3_LIBRARIES} - ) - - # Bindings module uses deprecated libtorrent features, thus we disable these warnings -@@ -108,7 +103,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - endif() - - execute_process(COMMAND -- ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig; -+ ${Python3_EXECUTABLE} -c "import distutils.sysconfig; - print(';'.join(map(str, [ - distutils.sysconfig.get_python_lib(plat_specific=True, prefix=''), - distutils.sysconfig.get_config_var('EXT_SUFFIX') -@@ -119,13 +114,11 @@ list(GET _python_sysconfig_vars 0 PYTHON_SITE_PACKAGES) - list(GET _python_sysconfig_vars 1 PYTHON_EXT_SUFFIX) - - message(STATUS "Python site packages: ${PYTHON_SITE_PACKAGES}") --# python 2 does not provide the 'EXT_SUFFIX' sysconfig variable, so we use cmake default then --if (NOT "${PYTHON_EXT_SUFFIX}" STREQUAL "None") -- message(STATUS "Python extension suffix: ${PYTHON_EXT_SUFFIX}") -- # we mimic the name, created by setuptools -- # example: libtorrent.cpython-36m-x86_64-linux-gnu.so -- set_target_properties(python-libtorrent PROPERTIES SUFFIX ${PYTHON_EXT_SUFFIX}) --endif() -+ -+message(STATUS "Python extension suffix: ${PYTHON_EXT_SUFFIX}") -+# we mimic the name, created by setuptools -+# example: libtorrent.cpython-36m-x86_64-linux-gnu.so -+set_target_properties(python-libtorrent PROPERTIES SUFFIX ${PYTHON_EXT_SUFFIX}) - - set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.cmake.in") - set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py") -@@ -135,8 +128,8 @@ set(DEPS python-libtorrent "${SETUP_PY}") - configure_file(${SETUP_PY_IN} ${SETUP_PY} @ONLY) - - add_custom_command(OUTPUT ${OUTPUT} -- COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} build -b "${CMAKE_CURRENT_SOURCE_DIR}" -- COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} egg_info -b "${CMAKE_CURRENT_SOURCE_DIR}" -+ COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} build -b "${CMAKE_CURRENT_SOURCE_DIR}" -+ COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} egg_info -b "${CMAKE_CURRENT_SOURCE_DIR}" - COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT} - DEPENDS ${DEPS}) - diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index e548b9b44187d5..ec1d7d07561333 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -37,12 +37,10 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF libtorrent-1.2.10 - SHA512 e6de939fb6527783695e0b6623ddbe27f85842a36c0899b93ea0284cb3c6f3d14b8c39e29316adb3bf9acac7804f38385cc06854a32df28e7f4f6839af9f382d + REF v1.2.11 + SHA512 d502286f67bf462f14169daafe12b94ca723598530c85360c3a4b3c73535202b63632036248fdecc942cb559e66e6a5cb5afa830dc78bbff72a6c9a330710b62 HEAD_REF RC_1_2 PATCHES - add-datetime-to-boost-libs.patch - fix_python_cmake.patch ${ICONV_PATCH} ) From 852b81f4afa50d79ea92ff5445bee9c1b78785d8 Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Fri, 4 Dec 2020 03:37:14 +0200 Subject: [PATCH 0233/1694] [magic-enum] Update to v0.7.1 (#14904) --- ports/magic-enum/CONTROL | 2 +- ports/magic-enum/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/magic-enum/CONTROL b/ports/magic-enum/CONTROL index 51bc8e7f723c02..25dc3520f99d2d 100644 --- a/ports/magic-enum/CONTROL +++ b/ports/magic-enum/CONTROL @@ -1,4 +1,4 @@ Source: magic-enum -Version: 0.7.0 +Version: 0.7.1 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 diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index d2437e02e6359c..11b48af3b5f1ae 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/magic_enum - REF v0.7.0 - SHA512 f56c081063846b87e8b811babe9a0e961efd29bef52359e14cb33773f8393640196c0808e201800c3adb82d0bf362d1f941e31df0fc3739d35a367f918409822 + REF v0.7.1 + SHA512 0eff2901d9829289fa36811fd428a9a6b66d6b88971948a385c9e74e5bbe3f52f4b80321c96a4d002bfe2c9b3d45e9bae8fbe17d718643fa318ab845b887be09 HEAD_REF master ) From 2683906786d0825b0a464f73950a4de37023a090 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Thu, 3 Dec 2020 20:37:33 -0500 Subject: [PATCH 0234/1694] [google-cloud-cpp] update to latest release (v1.21.0) (#14886) Co-authored-by: Billy Robert O'Neal III --- ports/google-cloud-cpp/CONTROL | 2 +- ports/google-cloud-cpp/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index 43818b2298b13c..bc8df7224988dc 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,5 +1,5 @@ Source: google-cloud-cpp -Version: 1.20.0 +Version: 1.21.0 Build-Depends: abseil, grpc, curl[ssl], crc32c, nlohmann-json Description: C++ Client Libraries for Google Cloud Platform APIs. Homepage: https://github.com/googleapis/google-cloud-cpp diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index cdab0a1a75905f..5dbf51f5ce2564 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.20.0 - SHA512 47af82c1d34a6e2981f627c89994fd832d2cea33d196439db0605c40efaf8db4ba074d556ece3a80a7404cceab09a0f216cc2dc0a8fac7eb2ff9674545f47fa9 + REF v1.21.0 + SHA512 a7988156cef199934ad471eb79724c59eb5a2ff941d71887257c5e95a39d1c78ee9e4295a6e42585a3ce11a4cd9d10af64fbf423560936b8546b26c772e6fa2c HEAD_REF master ) From c6fac34c5269df5fbc2e19a4020e6db34276bb00 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Fri, 4 Dec 2020 12:57:13 -0800 Subject: [PATCH 0235/1694] [vcpkg] Error on '#' in version strings to avoid confusion (#14927) * [vcpkg] Refactor deserializers to reduce duplicate functionality * [vcpkg] Error on '#' in version strings to avoid confusion with port-version * [vcpkg] Improve error message * [vcpkg] Reorder field output * [vcpkg] Fix tests Co-authored-by: Robert Schumacher --- toolsrc/include/vcpkg/base/jsonreader.h | 3 +- toolsrc/include/vcpkg/base/util.h | 10 + toolsrc/include/vcpkg/versiondeserializers.h | 31 ++- toolsrc/include/vcpkg/versiont.h | 2 +- toolsrc/src/vcpkg-test/manifests.cpp | 105 +++++++++- toolsrc/src/vcpkg/commands.porthistory.cpp | 6 +- toolsrc/src/vcpkg/sourceparagraph.cpp | 114 ++-------- toolsrc/src/vcpkg/versiondeserializers.cpp | 209 ++++++++++++++----- 8 files changed, 315 insertions(+), 165 deletions(-) diff --git a/toolsrc/include/vcpkg/base/jsonreader.h b/toolsrc/include/vcpkg/base/jsonreader.h index 02c1936e251e57..bea60e7ce5b644 100644 --- a/toolsrc/include/vcpkg/base/jsonreader.h +++ b/toolsrc/include/vcpkg/base/jsonreader.h @@ -33,13 +33,14 @@ namespace vcpkg::Json virtual Optional visit_object(Reader&, const Object&); virtual View valid_fields() const; + virtual ~IDeserializer() = default; + protected: IDeserializer() = default; IDeserializer(const IDeserializer&) = default; IDeserializer& operator=(const IDeserializer&) = default; IDeserializer(IDeserializer&&) = default; IDeserializer& operator=(IDeserializer&&) = default; - virtual ~IDeserializer() = default; }; struct Reader diff --git a/toolsrc/include/vcpkg/base/util.h b/toolsrc/include/vcpkg/base/util.h index ca5104c234c631..b5ad1d04f05e57 100644 --- a/toolsrc/include/vcpkg/base/util.h +++ b/toolsrc/include/vcpkg/base/util.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include @@ -28,6 +29,15 @@ namespace vcpkg::Util { return std::find(container.begin(), container.end(), item) != container.end(); } + template + std::vector concat(View r1, View r2) + { + std::vector v; + v.reserve(r1.size() + r2.size()); + v.insert(v.end(), r1.begin(), r1.end()); + v.insert(v.end(), r2.begin(), r2.end()); + return v; + } } namespace Sets diff --git a/toolsrc/include/vcpkg/versiondeserializers.h b/toolsrc/include/vcpkg/versiondeserializers.h index f5ffda101e2293..249d685cbbbb16 100644 --- a/toolsrc/include/vcpkg/versiondeserializers.h +++ b/toolsrc/include/vcpkg/versiondeserializers.h @@ -13,19 +13,32 @@ namespace vcpkg struct VersionDbEntry { VersionT version; - Versions::Scheme scheme; + Versions::Scheme scheme = Versions::Scheme::String; std::string git_tree; - - VersionDbEntry(const std::string& version_string, - int port_version, - Versions::Scheme scheme, - const std::string& git_tree) - : version(VersionT(version_string, port_version)), scheme(scheme), git_tree(git_tree) - { - } }; Json::IDeserializer& get_versiont_deserializer_instance(); + std::unique_ptr> make_version_deserializer(StringLiteral type_name); + + struct SchemedVersion + { + Versions::Scheme scheme = Versions::Scheme::String; + VersionT versiont; + }; + + Optional visit_optional_schemed_deserializer(StringView parent_type, + Json::Reader& r, + const Json::Object& obj); + SchemedVersion visit_required_schemed_deserializer(StringView parent_type, + Json::Reader& r, + const Json::Object& obj); + View schemed_deserializer_fields(); + + void serialize_schemed_version(Json::Object& out_obj, + Versions::Scheme scheme, + const std::string& version, + int port_version, + bool always_emit_port_version = false); ExpectedS>> parse_baseline_file(Files::Filesystem& fs, StringView baseline_name, diff --git a/toolsrc/include/vcpkg/versiont.h b/toolsrc/include/vcpkg/versiont.h index 7819f98759d042..910183b9d49223 100644 --- a/toolsrc/include/vcpkg/versiont.h +++ b/toolsrc/include/vcpkg/versiont.h @@ -23,7 +23,7 @@ namespace vcpkg private: std::string m_text; - int m_port_version; + int m_port_version = 0; }; struct VersionDiff diff --git a/toolsrc/src/vcpkg-test/manifests.cpp b/toolsrc/src/vcpkg-test/manifests.cpp index 32aa11f8a7a73d..f03caf3bf76bd7 100644 --- a/toolsrc/src/vcpkg-test/manifests.cpp +++ b/toolsrc/src/vcpkg-test/manifests.cpp @@ -115,6 +115,103 @@ TEST_CASE ("manifest versioning", "[manifests]") "version-semver": "1.2.3-rc3" })json", true); + + test_parse_manifest(R"json({ + "name": "zlib", + "version-string": "abcd#1" + })json", + true); + test_parse_manifest(R"json({ + "name": "zlib", + "version": "abcd#1" + })json", + true); + test_parse_manifest(R"json({ + "name": "zlib", + "version-date": "abcd#1" + })json", + true); + test_parse_manifest(R"json({ + "name": "zlib", + "version-semver": "abcd#1" + })json", + true); +} + +TEST_CASE ("manifest constraints error hash", "[manifests]") +{ + test_parse_manifest(R"json({ + "name": "zlib", + "version-string": "abcd", + "dependencies": [ + { + "name": "b", + "version=": "5#1" + } + ] +} +)json", + true); + + test_parse_manifest(R"json({ + "name": "zlib", + "version-string": "abcd", + "dependencies": [ + { + "name": "d", + "version>=": "2018-09-01#1" + } + ] +})json", + true); +} + +TEST_CASE ("manifest overrides error hash", "[manifests]") +{ + test_parse_manifest(R"json({ + "name": "zlib", + "version-string": "abcd", + "overrides": [ + { + "name": "d", + "version-string": "abcd#1" + } + ] +})json", + true); + test_parse_manifest(R"json({ + "name": "zlib", + "version-string": "abcd", + "overrides": [ + { + "name": "d", + "version-date": "2018-01-01#1" + } + ] +})json", + true); + test_parse_manifest(R"json({ + "name": "zlib", + "version-string": "abcd", + "overrides": [ + { + "name": "d", + "version": "1.2#1" + } + ] +})json", + true); + test_parse_manifest(R"json({ + "name": "zlib", + "version-string": "abcd", + "overrides": [ + { + "name": "d", + "version-semver": "1.2#1" + } + ] +})json", + true); } TEST_CASE ("manifest constraints", "[manifests]") @@ -286,13 +383,13 @@ TEST_CASE ("manifest overrides", "[manifests]") "overrides": [ { "name": "abc", - "port-version": 5, - "version-string": "hello" + "version-string": "hello", + "port-version": 5 }, { "name": "abcd", - "port-version": 7, - "version-string": "hello" + "version-string": "hello", + "port-version": 7 } ] } diff --git a/toolsrc/src/vcpkg/commands.porthistory.cpp b/toolsrc/src/vcpkg/commands.porthistory.cpp index 045562136bc9b9..7efb36bd18f078 100644 --- a/toolsrc/src/vcpkg/commands.porthistory.cpp +++ b/toolsrc/src/vcpkg/commands.porthistory.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include namespace vcpkg::Commands::PortHistory @@ -230,8 +231,9 @@ namespace vcpkg::Commands::PortHistory { Json::Object object; object.insert("git-tree", Json::Value::string(version.git_tree)); - object.insert("version-string", Json::Value::string(version.version)); - object.insert("port-version", Json::Value::integer(version.port_version)); + + serialize_schemed_version( + object, Versions::Scheme::String, version.version, version.port_version, true); versions_json.push_back(std::move(object)); } diff --git a/toolsrc/src/vcpkg/sourceparagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp index f05ebb619e130c..f80a1494e5d963 100644 --- a/toolsrc/src/vcpkg/sourceparagraph.cpp +++ b/toolsrc/src/vcpkg/sourceparagraph.cpp @@ -11,6 +11,7 @@ #include #include #include +#include namespace vcpkg { @@ -487,12 +488,12 @@ namespace vcpkg r.optional_object_field(obj, PLATFORM, dep.platform, PlatformExprDeserializer::instance); - static Json::StringDeserializer version_deserializer{"a version"}; + static auto version_deserializer = make_version_deserializer("a version"); auto has_eq_constraint = - r.optional_object_field(obj, VERSION_EQ, dep.constraint.value, version_deserializer); + r.optional_object_field(obj, VERSION_EQ, dep.constraint.value, *version_deserializer); auto has_ge_constraint = - r.optional_object_field(obj, VERSION_GE, dep.constraint.value, version_deserializer); + r.optional_object_field(obj, VERSION_GE, dep.constraint.value, *version_deserializer); auto has_port_ver = r.optional_object_field( obj, PORT_VERSION, dep.constraint.port_version, Json::NaturalNumberDeserializer::instance); @@ -548,23 +549,11 @@ namespace vcpkg virtual StringView type_name() const override { return "an override"; } constexpr static StringLiteral NAME = "name"; - constexpr static StringLiteral PORT_VERSION = "port-version"; - constexpr static StringLiteral VERSION_RELAXED = "version"; - constexpr static StringLiteral VERSION_SEMVER = "version-semver"; - constexpr static StringLiteral VERSION_DATE = "version-date"; - constexpr static StringLiteral VERSION_STRING = "version-string"; virtual Span valid_fields() const override { - static const StringView t[] = { - NAME, - PORT_VERSION, - VERSION_RELAXED, - VERSION_SEMVER, - VERSION_DATE, - VERSION_STRING, - }; - + static const StringView u[] = {NAME}; + static const auto t = Util::Vectors::concat(schemed_deserializer_fields(), u); return t; } @@ -576,40 +565,12 @@ namespace vcpkg Versions::Scheme& version_scheme, int& port_version) { - static Json::StringDeserializer version_exact_deserializer{"an exact version string"}; - static Json::StringDeserializer version_relaxed_deserializer{"a relaxed version string"}; - static Json::StringDeserializer version_semver_deserializer{"a semantic version string"}; - static Json::StringDeserializer version_date_deserializer{"a date version string"}; - r.required_object_field(type_name, obj, NAME, name, Json::IdentifierDeserializer::instance); - bool has_exact = r.optional_object_field(obj, VERSION_STRING, version, version_exact_deserializer); - bool has_relax = r.optional_object_field(obj, VERSION_RELAXED, version, version_relaxed_deserializer); - bool has_semver = r.optional_object_field(obj, VERSION_SEMVER, version, version_semver_deserializer); - bool has_date = r.optional_object_field(obj, VERSION_DATE, version, version_date_deserializer); - int num_versions = (int)has_exact + (int)has_relax + (int)has_semver + (int)has_date; - if (num_versions == 0) - { - r.add_generic_error(type_name, "expected a versioning field (example: ", VERSION_STRING, ")"); - } - else if (num_versions > 1) - { - r.add_generic_error(type_name, "expected only one versioning field"); - } - else - { - if (has_exact) - version_scheme = Versions::Scheme::String; - else if (has_relax) - version_scheme = Versions::Scheme::Relaxed; - else if (has_semver) - version_scheme = Versions::Scheme::Semver; - else if (has_date) - version_scheme = Versions::Scheme::Date; - else - Checks::unreachable(VCPKG_LINE_INFO); - } - r.optional_object_field(obj, PORT_VERSION, port_version, Json::NaturalNumberDeserializer::instance); + auto schemed_version = visit_required_schemed_deserializer(type_name, r, obj); + version = schemed_version.versiont.text(); + version_scheme = schemed_version.scheme; + port_version = schemed_version.versiont.port_version(); } virtual Optional visit_object(Json::Reader& r, const Json::Object& obj) override @@ -634,11 +595,6 @@ namespace vcpkg DependencyOverrideDeserializer DependencyOverrideDeserializer::instance; constexpr StringLiteral DependencyOverrideDeserializer::NAME; - constexpr StringLiteral DependencyOverrideDeserializer::VERSION_STRING; - constexpr StringLiteral DependencyOverrideDeserializer::VERSION_RELAXED; - constexpr StringLiteral DependencyOverrideDeserializer::VERSION_SEMVER; - constexpr StringLiteral DependencyOverrideDeserializer::VERSION_DATE; - constexpr StringLiteral DependencyOverrideDeserializer::PORT_VERSION; // reasoning for these two distinct types -- FeatureDeserializer and ArrayFeatureDeserializer: // `"features"` may be defined in one of two ways: @@ -909,15 +865,6 @@ namespace vcpkg virtual StringView type_name() const override { return "a manifest"; } constexpr static StringLiteral NAME = "name"; - - // Default is a relaxed semver-like version - constexpr static StringLiteral VERSION_RELAXED = "version"; - constexpr static StringLiteral VERSION_SEMVER = "version-semver"; - constexpr static StringLiteral VERSION_DATE = "version-date"; - // Legacy version string, accepts arbitrary string values. - constexpr static StringLiteral VERSION_STRING = "version-string"; - - constexpr static StringLiteral PORT_VERSION = "port-version"; constexpr static StringLiteral MAINTAINERS = "maintainers"; constexpr static StringLiteral DESCRIPTION = "description"; constexpr static StringLiteral HOMEPAGE = "homepage"; @@ -932,13 +879,8 @@ namespace vcpkg virtual Span valid_fields() const override { - static const StringView t[] = { + static const StringView u[] = { NAME, - VERSION_STRING, - VERSION_RELAXED, - VERSION_SEMVER, - VERSION_DATE, - PORT_VERSION, MAINTAINERS, DESCRIPTION, HOMEPAGE, @@ -951,6 +893,7 @@ namespace vcpkg SUPPORTS, OVERRIDES, }; + static const auto t = Util::Vectors::concat(schemed_deserializer_fields(), u); return t; } @@ -1014,11 +957,6 @@ namespace vcpkg ManifestDeserializer ManifestDeserializer::instance; constexpr StringLiteral ManifestDeserializer::NAME; - constexpr StringLiteral ManifestDeserializer::VERSION_STRING; - constexpr StringLiteral ManifestDeserializer::VERSION_RELAXED; - constexpr StringLiteral ManifestDeserializer::VERSION_SEMVER; - constexpr StringLiteral ManifestDeserializer::VERSION_DATE; - constexpr StringLiteral ManifestDeserializer::PORT_VERSION; constexpr StringLiteral ManifestDeserializer::MAINTAINERS; constexpr StringLiteral ManifestDeserializer::DESCRIPTION; constexpr StringLiteral ManifestDeserializer::HOMEPAGE; @@ -1329,17 +1267,6 @@ namespace vcpkg } }; - auto version_field = [](Versions::Scheme version_scheme) { - switch (version_scheme) - { - case Versions::Scheme::String: return ManifestDeserializer::VERSION_STRING; - case Versions::Scheme::Semver: return ManifestDeserializer::VERSION_SEMVER; - case Versions::Scheme::Relaxed: return ManifestDeserializer::VERSION_RELAXED; - case Versions::Scheme::Date: return ManifestDeserializer::VERSION_DATE; - default: Checks::unreachable(VCPKG_LINE_INFO); - } - }; - auto serialize_override = [&](Json::Array& arr, const DependencyOverride& dep) { auto& dep_obj = arr.push_back(Json::Object()); for (const auto& el : dep.extra_info) @@ -1349,12 +1276,7 @@ namespace vcpkg dep_obj.insert(DependencyOverrideDeserializer::NAME, Json::Value::string(dep.name)); - if (dep.port_version != 0) - { - dep_obj.insert(DependencyDeserializer::PORT_VERSION, Json::Value::integer(dep.port_version)); - } - - dep_obj.insert(version_field(dep.version_scheme), Json::Value::string(dep.version)); + serialize_schemed_version(dep_obj, dep.version_scheme, dep.version, dep.port_version); }; Json::Object obj; @@ -1365,12 +1287,12 @@ namespace vcpkg } obj.insert(ManifestDeserializer::NAME, Json::Value::string(scf.core_paragraph->name)); - obj.insert(version_field(scf.core_paragraph->version_scheme), Json::Value::string(scf.core_paragraph->version)); - if (scf.core_paragraph->port_version != 0 || debug) - { - obj.insert(ManifestDeserializer::PORT_VERSION, Json::Value::integer(scf.core_paragraph->port_version)); - } + serialize_schemed_version(obj, + scf.core_paragraph->version_scheme, + scf.core_paragraph->version, + scf.core_paragraph->port_version, + debug); serialize_paragraph(obj, ManifestDeserializer::MAINTAINERS, scf.core_paragraph->maintainers); serialize_paragraph(obj, ManifestDeserializer::DESCRIPTION, scf.core_paragraph->description); diff --git a/toolsrc/src/vcpkg/versiondeserializers.cpp b/toolsrc/src/vcpkg/versiondeserializers.cpp index 276b70e4fa817a..1557f4be9540b1 100644 --- a/toolsrc/src/vcpkg/versiondeserializers.cpp +++ b/toolsrc/src/vcpkg/versiondeserializers.cpp @@ -1,71 +1,176 @@ +#include + #include using namespace vcpkg; using namespace vcpkg::Versions; +static constexpr StringLiteral VERSION_RELAXED = "version"; +static constexpr StringLiteral VERSION_SEMVER = "version-semver"; +static constexpr StringLiteral VERSION_STRING = "version-string"; +static constexpr StringLiteral VERSION_DATE = "version-date"; +static constexpr StringLiteral PORT_VERSION = "port-version"; + namespace { - struct VersionDbEntryDeserializer final : Json::IDeserializer + struct VersionDeserializer final : Json::IDeserializer { - static constexpr StringLiteral VERSION_RELAXED = "version"; - static constexpr StringLiteral VERSION_SEMVER = "version-semver"; - static constexpr StringLiteral VERSION_STRING = "version-string"; - static constexpr StringLiteral VERSION_DATE = "version-date"; - static constexpr StringLiteral PORT_VERSION = "port-version"; - static constexpr StringLiteral GIT_TREE = "git-tree"; + VersionDeserializer(StringLiteral type) : m_type(type) { } + StringView type_name() const override { return m_type; } - StringView type_name() const override { return "a version database entry"; } - View valid_fields() const override + Optional visit_string(Json::Reader& r, StringView sv) override { - static const StringView t[] = { - VERSION_RELAXED, VERSION_SEMVER, VERSION_STRING, VERSION_DATE, PORT_VERSION, GIT_TREE}; - return t; + StringView pv(std::find(sv.begin(), sv.end(), '#'), sv.end()); + if (pv.size() == 1) + { + r.add_generic_error(type_name(), "invalid character '#' in version text"); + } + else if (pv.size() > 1) + { + r.add_generic_error(type_name(), + "invalid character '#' in version text. Did you mean \"port-version\": ", + pv.substr(1), + "?"); + } + return sv.to_string(); } + StringLiteral m_type; + }; +} - Optional visit_object(Json::Reader& r, const Json::Object& obj) override +namespace vcpkg +{ + std::unique_ptr> make_version_deserializer(StringLiteral type_name) + { + return std::make_unique(type_name); + } + + SchemedVersion visit_required_schemed_deserializer(StringView parent_type, Json::Reader& r, const Json::Object& obj) + { + auto maybe_schemed_version = visit_optional_schemed_deserializer(parent_type, r, obj); + if (auto p = maybe_schemed_version.get()) { - std::string version; - int port_version = 0; - std::string git_tree; - Versions::Scheme version_scheme = Versions::Scheme::String; - - // Code copy-and-paste'd from sourceparagraph.cpp - static Json::StringDeserializer version_exact_deserializer{"an exact version string"}; - static Json::StringDeserializer version_relaxed_deserializer{"a relaxed version string"}; - static Json::StringDeserializer version_semver_deserializer{"a semantic version string"}; - static Json::StringDeserializer version_date_deserializer{"a date version string"}; - static Json::StringDeserializer git_tree_deserializer("a git object SHA"); + return std::move(*p); + } + else + { + r.add_generic_error(parent_type, "expected a versioning field (example: ", VERSION_STRING, ")"); + return {}; + } + } + Optional visit_optional_schemed_deserializer(StringView parent_type, + Json::Reader& r, + const Json::Object& obj) + { + Versions::Scheme version_scheme = Versions::Scheme::String; + std::string version; + int port_version = 0; + + static VersionDeserializer version_exact_deserializer{"an exact version string"}; + static VersionDeserializer version_relaxed_deserializer{"a relaxed version string"}; + static VersionDeserializer version_semver_deserializer{"a semantic version string"}; + static VersionDeserializer version_date_deserializer{"a date version string"}; + + bool has_exact = r.optional_object_field(obj, VERSION_STRING, version, version_exact_deserializer); + bool has_relax = r.optional_object_field(obj, VERSION_RELAXED, version, version_relaxed_deserializer); + bool has_semver = r.optional_object_field(obj, VERSION_SEMVER, version, version_semver_deserializer); + bool has_date = r.optional_object_field(obj, VERSION_DATE, version, version_date_deserializer); + int num_versions = (int)has_exact + (int)has_relax + (int)has_semver + (int)has_date; + bool has_port_version = + r.optional_object_field(obj, PORT_VERSION, port_version, Json::NaturalNumberDeserializer::instance); - bool has_exact = r.optional_object_field(obj, VERSION_STRING, version, version_exact_deserializer); - bool has_relax = r.optional_object_field(obj, VERSION_RELAXED, version, version_relaxed_deserializer); - bool has_semver = r.optional_object_field(obj, VERSION_SEMVER, version, version_semver_deserializer); - bool has_date = r.optional_object_field(obj, VERSION_DATE, version, version_date_deserializer); - int num_versions = (int)has_exact + (int)has_relax + (int)has_semver + (int)has_date; - if (num_versions == 0) + if (num_versions == 0) + { + if (!has_port_version) { - r.add_generic_error(type_name(), "expected a versioning field (example: ", VERSION_STRING, ")"); + return nullopt; } - else if (num_versions > 1) + else { - r.add_generic_error(type_name(), "expected only one versioning field"); + r.add_generic_error(parent_type, "unexpected \"port_version\" without a versioning field"); } + } + else if (num_versions > 1) + { + r.add_generic_error(parent_type, "expected only one versioning field"); + } + else + { + if (has_exact) + version_scheme = Versions::Scheme::String; + else if (has_relax) + version_scheme = Versions::Scheme::Relaxed; + else if (has_semver) + version_scheme = Versions::Scheme::Semver; + else if (has_date) + version_scheme = Versions::Scheme::Date; else + Checks::unreachable(VCPKG_LINE_INFO); + } + + return SchemedVersion{version_scheme, {version, port_version}}; + } + + View schemed_deserializer_fields() + { + static const StringView t[] = {VERSION_RELAXED, VERSION_SEMVER, VERSION_STRING, VERSION_DATE, PORT_VERSION}; + return t; + } + + void serialize_schemed_version(Json::Object& out_obj, + Versions::Scheme scheme, + const std::string& version, + int port_version, + bool always_emit_port_version) + { + auto version_field = [](Versions::Scheme version_scheme) { + switch (version_scheme) { - if (has_exact) - version_scheme = Versions::Scheme::String; - else if (has_relax) - version_scheme = Versions::Scheme::Relaxed; - else if (has_semver) - version_scheme = Versions::Scheme::Semver; - else if (has_date) - version_scheme = Versions::Scheme::Date; - else - Checks::unreachable(VCPKG_LINE_INFO); + case Versions::Scheme::String: return VERSION_STRING; + case Versions::Scheme::Semver: return VERSION_SEMVER; + case Versions::Scheme::Relaxed: return VERSION_RELAXED; + case Versions::Scheme::Date: return VERSION_DATE; + default: Checks::unreachable(VCPKG_LINE_INFO); } - r.optional_object_field(obj, PORT_VERSION, port_version, Json::NaturalNumberDeserializer::instance); - r.required_object_field(type_name(), obj, GIT_TREE, git_tree, git_tree_deserializer); + }; + + out_obj.insert(version_field(scheme), Json::Value::string(version)); - return VersionDbEntry(version, port_version, version_scheme, git_tree); + if (port_version != 0 || always_emit_port_version) + { + out_obj.insert(PORT_VERSION, Json::Value::integer(port_version)); + } + } + +} + +namespace +{ + struct VersionDbEntryDeserializer final : Json::IDeserializer + { + static constexpr StringLiteral GIT_TREE = "git-tree"; + + StringView type_name() const override { return "a version database entry"; } + View valid_fields() const override + { + static const StringView u[] = {GIT_TREE}; + static const auto t = vcpkg::Util::Vectors::concat(schemed_deserializer_fields(), u); + return t; + } + + Optional visit_object(Json::Reader& r, const Json::Object& obj) override + { + VersionDbEntry ret; + + auto schemed_version = visit_required_schemed_deserializer(type_name(), r, obj); + ret.scheme = schemed_version.scheme; + ret.version = std::move(schemed_version.versiont); + + static Json::StringDeserializer git_tree_deserializer("a git object SHA"); + + r.required_object_field(type_name(), obj, GIT_TREE, ret.git_tree, git_tree_deserializer); + + return std::move(ret); } static VersionDbEntryDeserializer instance; @@ -115,7 +220,7 @@ namespace StringView type_name() const override { return "a version object"; } View valid_fields() const override { - static const StringView t[] = {"version-string", "port-version"}; + static const StringView t[] = {VERSION_STRING, PORT_VERSION}; return t; } @@ -124,16 +229,16 @@ namespace std::string version; int port_version = 0; - r.required_object_field(type_name(), obj, "version-string", version, version_deserializer); - r.optional_object_field(obj, "port-version", port_version, Json::NaturalNumberDeserializer::instance); + static VersionDeserializer version_deserializer{"version"}; + + r.required_object_field(type_name(), obj, VERSION_STRING, version, version_deserializer); + r.optional_object_field(obj, PORT_VERSION, port_version, Json::NaturalNumberDeserializer::instance); return VersionT{std::move(version), port_version}; } - - static Json::StringDeserializer version_deserializer; static VersionTDeserializer instance; }; - Json::StringDeserializer VersionTDeserializer::version_deserializer{"version"}; + VersionTDeserializer VersionTDeserializer::instance; } From c71d2f19f81f944b6a87fd59ccde354348201cb8 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 4 Dec 2020 14:01:11 -0800 Subject: [PATCH 0236/1694] Fix failures when parsing the default options for binary caching not being emitted. (#14945) * Fix failures when parsing the default options for binary caching not beging emitted. Resolves #14922. --- toolsrc/include/vcpkg/base/parse.h | 2 ++ toolsrc/src/vcpkg/base/parse.cpp | 2 ++ toolsrc/src/vcpkg/binarycaching.cpp | 1 + toolsrc/src/vcpkg/versiondeserializers.cpp | 13 +++++++------ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/toolsrc/include/vcpkg/base/parse.h b/toolsrc/include/vcpkg/base/parse.h index cc5db02d375ca6..b3577e82119e89 100644 --- a/toolsrc/include/vcpkg/base/parse.h +++ b/toolsrc/include/vcpkg/base/parse.h @@ -16,6 +16,7 @@ namespace vcpkg::Parse { virtual ~IParseError() = default; virtual std::string format() const = 0; + virtual const std::string& get_message() const = 0; }; struct ParseError : IParseError @@ -38,6 +39,7 @@ namespace vcpkg::Parse const std::string message; virtual std::string format() const override; + virtual const std::string& get_message() const override; }; struct ParserBase diff --git a/toolsrc/src/vcpkg/base/parse.cpp b/toolsrc/src/vcpkg/base/parse.cpp index c6a7de83d32974..a082c4d9c710b5 100644 --- a/toolsrc/src/vcpkg/base/parse.cpp +++ b/toolsrc/src/vcpkg/base/parse.cpp @@ -50,6 +50,8 @@ namespace vcpkg::Parse "^\n"); } + const std::string& ParseError::get_message() const { return this->message; } + ParserBase::ParserBase(StringView text, StringView origin, TextRowCol init_rowcol) : m_it(text.begin(), text.end()) , m_start_of_line(m_it) diff --git a/toolsrc/src/vcpkg/binarycaching.cpp b/toolsrc/src/vcpkg/binarycaching.cpp index 8624cb3d3115fd..3c471bd1310b88 100644 --- a/toolsrc/src/vcpkg/binarycaching.cpp +++ b/toolsrc/src/vcpkg/binarycaching.cpp @@ -1131,6 +1131,7 @@ ExpectedS> vcpkg::create_binary_provider_from_c BinaryConfigParser default_parser("default,readwrite", "", &s); default_parser.parse(); + if (auto err = default_parser.get_error()) return err->get_message(); BinaryConfigParser env_parser(env_string, "VCPKG_BINARY_SOURCES", &s); env_parser.parse(); diff --git a/toolsrc/src/vcpkg/versiondeserializers.cpp b/toolsrc/src/vcpkg/versiondeserializers.cpp index 1557f4be9540b1..5c57a99222e650 100644 --- a/toolsrc/src/vcpkg/versiondeserializers.cpp +++ b/toolsrc/src/vcpkg/versiondeserializers.cpp @@ -5,14 +5,15 @@ using namespace vcpkg; using namespace vcpkg::Versions; -static constexpr StringLiteral VERSION_RELAXED = "version"; -static constexpr StringLiteral VERSION_SEMVER = "version-semver"; -static constexpr StringLiteral VERSION_STRING = "version-string"; -static constexpr StringLiteral VERSION_DATE = "version-date"; -static constexpr StringLiteral PORT_VERSION = "port-version"; - namespace { + constexpr StringLiteral VERSION_RELAXED = "version"; + constexpr StringLiteral VERSION_SEMVER = "version-semver"; + constexpr StringLiteral VERSION_STRING = "version-string"; + constexpr StringLiteral VERSION_DATE = "version-date"; + constexpr StringLiteral PORT_VERSION = "port-version"; + constexpr StringLiteral GIT_TREE = "git-tree"; + struct VersionDeserializer final : Json::IDeserializer { VersionDeserializer(StringLiteral type) : m_type(type) { } From 750e62834ac0b77c1c68529344481fcdb6c7d55a Mon Sep 17 00:00:00 2001 From: Bruno Carvalho Date: Fri, 4 Dec 2020 20:33:20 -0300 Subject: [PATCH 0237/1694] [Chipmunk] build via cmake (#14776) --- ports/chipmunk/CONTROL | 1 + ports/chipmunk/portfile.cmake | 78 ++++++++++------------------------- scripts/ci.baseline.txt | 5 --- 3 files changed, 23 insertions(+), 61 deletions(-) diff --git a/ports/chipmunk/CONTROL b/ports/chipmunk/CONTROL index 7437c78d8e4986..d5948caf797d34 100644 --- a/ports/chipmunk/CONTROL +++ b/ports/chipmunk/CONTROL @@ -1,4 +1,5 @@ Source: chipmunk Version: 7.0.3 +Port-Version: 1 Homepage: https://github.com/slembcke/Chipmunk2D Description: A fast and lightweight 2D game physics library. \ No newline at end of file diff --git a/ports/chipmunk/portfile.cmake b/ports/chipmunk/portfile.cmake index 5b148640fa2b41..f0f72cd6cb1425 100644 --- a/ports/chipmunk/portfile.cmake +++ b/ports/chipmunk/portfile.cmake @@ -1,23 +1,3 @@ -#architecture detection -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(CHIPMUNK_ARCH Win32) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(CHIPMUNK_ARCH x64) -else() - message(FATAL_ERROR "unsupported architecture") -endif() - -#linking -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(CHIPMUNK_CONFIGURATION_SUFFIX " DLL") -else() - if (VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(CHIPMUNK_CONFIGURATION_SUFFIX "") - else() - set(CHIPMUNK_CONFIGURATION_SUFFIX " SCRT") - endif() -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO slembcke/Chipmunk2D @@ -26,48 +6,34 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/msvc/VS2015/chipmunk/chipmunk.vcxproj - RELEASE_CONFIGURATION "Release${CHIPMUNK_CONFIGURATION_SUFFIX}" - DEBUG_CONFIGURATION "Debug${CHIPMUNK_CONFIGURATION_SUFFIX}" +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KEYSTONE_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" KEYSTONE_BUILD_SHARED) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_DEMOS=OFF + -DBUILD_SHARED=${KEYSTONE_BUILD_SHARED} + -DBUILD_STATIC=${KEYSTONE_BUILD_STATIC} + -DINSTALL_STATIC=${KEYSTONE_BUILD_STATIC} ) -message(STATUS "Installing") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(INSTALL - "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Debug${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.dll" - "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Debug${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb" - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin - ) - file(INSTALL - "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.dll" - "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb" - DESTINATION ${CURRENT_PACKAGES_DIR}/bin - ) -else() - file(INSTALL - "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb" - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - ) - file(INSTALL - "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb" - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - ) +vcpkg_install_cmake() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +endif() + +file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll) +if(DLLS) + file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE ${DLLS}) endif() -file(INSTALL - "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Debug${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.lib" - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib -) -file(INSTALL - "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.lib" - DESTINATION ${CURRENT_PACKAGES_DIR}/lib -) file(INSTALL ${SOURCE_PATH}/include/chipmunk DESTINATION ${CURRENT_PACKAGES_DIR}/include ) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/chipmunk RENAME copyright) - -message(STATUS "Installing done") +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e95105dc28568a..d775cadbfc35cf 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -100,11 +100,6 @@ chartdir:arm64-windows=fail chartdir:arm-uwp=fail chartdir:x64-uwp=fail chartdir:x64-windows-static=fail -chipmunk:arm64-windows=fail -chipmunk:arm-uwp=fail -chipmunk:x64-linux=fail -chipmunk:x64-osx=fail -chipmunk:x64-uwp=fail chmlib:arm-uwp=fail chmlib:x64-uwp=fail # Chromium Base requires a recent version of Clang to be installed. From b0419f769283b9ca530a04419532f1f3d7321a29 Mon Sep 17 00:00:00 2001 From: Francois Rivard <74623412+frivard-coveo@users.noreply.github.com> Date: Fri, 4 Dec 2020 18:34:04 -0500 Subject: [PATCH 0238/1694] Change Nuget binary cache pre-release info to always start with letters (#14857) --- toolsrc/src/vcpkg-test/binarycaching.cpp | 42 ++++++++++++------------ toolsrc/src/vcpkg/binarycaching.cpp | 6 ++-- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/toolsrc/src/vcpkg-test/binarycaching.cpp b/toolsrc/src/vcpkg-test/binarycaching.cpp index cb0d7cb99d5d58..eefe2a9c1c2bd5 100644 --- a/toolsrc/src/vcpkg-test/binarycaching.cpp +++ b/toolsrc/src/vcpkg-test/binarycaching.cpp @@ -29,28 +29,28 @@ using namespace vcpkg; TEST_CASE ("reformat_version semver-ish", "[reformat_version]") { - REQUIRE(reformat_version("0.0.0", "abitag") == "0.0.0-abitag"); - REQUIRE(reformat_version("1.0.1", "abitag") == "1.0.1-abitag"); - REQUIRE(reformat_version("1.01.000", "abitag") == "1.1.0-abitag"); - REQUIRE(reformat_version("1.2", "abitag") == "1.2.0-abitag"); - REQUIRE(reformat_version("v52", "abitag") == "52.0.0-abitag"); - REQUIRE(reformat_version("v09.01.02", "abitag") == "9.1.2-abitag"); - REQUIRE(reformat_version("1.1.1q", "abitag") == "1.1.1-abitag"); - REQUIRE(reformat_version("1", "abitag") == "1.0.0-abitag"); + REQUIRE(reformat_version("0.0.0", "abitag") == "0.0.0-vcpkgabitag"); + REQUIRE(reformat_version("1.0.1", "abitag") == "1.0.1-vcpkgabitag"); + REQUIRE(reformat_version("1.01.000", "abitag") == "1.1.0-vcpkgabitag"); + REQUIRE(reformat_version("1.2", "abitag") == "1.2.0-vcpkgabitag"); + REQUIRE(reformat_version("v52", "abitag") == "52.0.0-vcpkgabitag"); + REQUIRE(reformat_version("v09.01.02", "abitag") == "9.1.2-vcpkgabitag"); + REQUIRE(reformat_version("1.1.1q", "abitag") == "1.1.1-vcpkgabitag"); + REQUIRE(reformat_version("1", "abitag") == "1.0.0-vcpkgabitag"); } TEST_CASE ("reformat_version date", "[reformat_version]") { - REQUIRE(reformat_version("2020-06-26", "abitag") == "2020.6.26-abitag"); - REQUIRE(reformat_version("20-06-26", "abitag") == "0.0.0-abitag"); - REQUIRE(reformat_version("2020-06-26-release", "abitag") == "2020.6.26-abitag"); - REQUIRE(reformat_version("2020-06-26000", "abitag") == "2020.6.26-abitag"); + REQUIRE(reformat_version("2020-06-26", "abitag") == "2020.6.26-vcpkgabitag"); + REQUIRE(reformat_version("20-06-26", "abitag") == "0.0.0-vcpkgabitag"); + REQUIRE(reformat_version("2020-06-26-release", "abitag") == "2020.6.26-vcpkgabitag"); + REQUIRE(reformat_version("2020-06-26000", "abitag") == "2020.6.26-vcpkgabitag"); } TEST_CASE ("reformat_version generic", "[reformat_version]") { - REQUIRE(reformat_version("apr", "abitag") == "0.0.0-abitag"); - REQUIRE(reformat_version("", "abitag") == "0.0.0-abitag"); + REQUIRE(reformat_version("apr", "abitag") == "0.0.0-vcpkgabitag"); + REQUIRE(reformat_version("", "abitag") == "0.0.0-vcpkgabitag"); } TEST_CASE ("generate_nuspec", "[generate_nuspec]") @@ -96,7 +96,7 @@ Build-Depends: bzip NugetReference ref(ipa); - REQUIRE(ref.nupkg_filename() == "zlib2_x64-windows.1.5.0-packageabi.nupkg"); + REQUIRE(ref.nupkg_filename() == "zlib2_x64-windows.1.5.0-vcpkgpackageabi.nupkg"); { auto nuspec = generate_nuspec(paths, ipa, ref, {}); @@ -108,7 +108,7 @@ Build-Depends: bzip std::string expected = R"( zlib2_x64-windows - 1.5.0-packageabi + 1.5.0-vcpkgpackageabi vcpkg NOT FOR DIRECT USE. Automatically generated cache package. @@ -140,7 +140,7 @@ Features: a, b std::string expected = R"( zlib2_x64-windows - 1.5.0-packageabi + 1.5.0-vcpkgpackageabi vcpkg NOT FOR DIRECT USE. Automatically generated cache package. @@ -172,7 +172,7 @@ Features: a, b std::string expected = R"( zlib2_x64-windows - 1.5.0-packageabi + 1.5.0-vcpkgpackageabi vcpkg NOT FOR DIRECT USE. Automatically generated cache package. @@ -267,7 +267,7 @@ Description: a spiffy compression library wrapper packageconfig = generate_nuget_packages_config(plan); REQUIRE(packageconfig == R"( - + )"); @@ -290,8 +290,8 @@ Description: a spiffy compression library wrapper packageconfig = generate_nuget_packages_config(plan); REQUIRE(packageconfig == R"( - - + + )"); } diff --git a/toolsrc/src/vcpkg/binarycaching.cpp b/toolsrc/src/vcpkg/binarycaching.cpp index 3c471bd1310b88..4e21fc62a98d34 100644 --- a/toolsrc/src/vcpkg/binarycaching.cpp +++ b/toolsrc/src/vcpkg/binarycaching.cpp @@ -1180,7 +1180,7 @@ std::string vcpkg::reformat_version(const std::string& version, const std::strin auto major = trim_leading_zeroes(sm.str(1)); auto minor = sm.size() > 2 && !sm.str(2).empty() ? trim_leading_zeroes(sm.str(2).substr(1)) : "0"; auto patch = sm.size() > 3 && !sm.str(3).empty() ? trim_leading_zeroes(sm.str(3).substr(1)) : "0"; - return Strings::concat(major, '.', minor, '.', patch, "-", abi_tag); + return Strings::concat(major, '.', minor, '.', patch, "-vcpkg", abi_tag); } static const std::regex date_matcher(R"((\d\d\d\d)-(\d\d)-(\d\d).*)"); @@ -1191,11 +1191,11 @@ std::string vcpkg::reformat_version(const std::string& version, const std::strin trim_leading_zeroes(sm.str(2)), '.', trim_leading_zeroes(sm.str(3)), - "-", + "-vcpkg", abi_tag); } - return Strings::concat("0.0.0-", abi_tag); + return Strings::concat("0.0.0-vcpkg", abi_tag); } details::NuGetRepoInfo details::get_nuget_repo_info_from_env() From d0581b1a4848f3312db647fa5f84fcb7e70cd551 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 4 Dec 2020 15:59:14 -0800 Subject: [PATCH 0239/1694] [nghttp2] Update to 1.42.0. (#14862) --- ports/nghttp2/CONTROL | 2 +- ports/nghttp2/portfile.cmake | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/nghttp2/CONTROL b/ports/nghttp2/CONTROL index 6afd6f83b1a254..7f0bf107d6f8df 100644 --- a/ports/nghttp2/CONTROL +++ b/ports/nghttp2/CONTROL @@ -1,4 +1,4 @@ Source: nghttp2 -Version: 1.39.2-2 +Version: 1.42.0 Homepage: https://github.com/nghttp2/nghttp2 Description: Implementation of the Hypertext Transfer Protocol version 2 in C diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index c7b5a5388d6bf0..9ed523648d0bf7 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -1,5 +1,5 @@ set(LIB_NAME nghttp2) -set(LIB_VERSION 1.39.2) +set(LIB_VERSION 1.42.0) set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz) @@ -7,7 +7,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 REF v${LIB_VERSION} - SHA512 1ddfb8c6538e209e39199fb5e2f9c262d58d188f25c98cd03f9f733bb261055b7625f0f79863731b112e69bc40c9d6a7d10d4fe69f56c615127e03277ee3af1d + SHA512 717494c9aa4eda64414535752df947d62311e7aed5cc6c4936400fcb2c9fc2818923668bcabc3e1bc61154d660f6765dad120e5a113d9eee3e934d66ee63a406 HEAD_REF master ) @@ -30,6 +30,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) From 86b0673bd332977e03b4aeb798b8644914db49e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 4 Dec 2020 16:15:10 -0800 Subject: [PATCH 0240/1694] [aws-sdk-cpp] Add find_dependency to AWSSDKConfig.cmake and fix usage (#14936) --- ports/aws-sdk-cpp/CONTROL | 4 ++-- ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch | 17 ++++++++++++++--- ports/aws-sdk-cpp/usage | 12 ------------ 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index 0492d09f818c77..1b46d7d3664fb3 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,9 +1,9 @@ Source: aws-sdk-cpp Version: 1.8.83 -Port-Version: 3 +Port-Version: 4 Homepage: https://github.com/aws/aws-sdk-cpp Description: AWS SDK for C++ -Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream +Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream, zlib Default-Features: dynamodb, s3, kinesis # Automatically generated by generateFeatures.ps1 diff --git a/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch b/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch index 0c1c1c5255c18a..f35d1be1c45936 100644 --- a/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch +++ b/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch @@ -1,8 +1,19 @@ diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake -index c2f643e..5a4d8d2 100644 +index c2f643e..4fb4a2f 100644 --- a/cmake/AWSSDKConfig.cmake +++ b/cmake/AWSSDKConfig.cmake -@@ -43,7 +43,6 @@ endif() +@@ -24,6 +24,10 @@ if(AWSSDK_FOUND) + return() + endif() + ++include(CMakeFindDependencyMacro) ++find_dependency(OpenSSL) ++find_dependency(ZLIB) ++ + include(${CMAKE_CURRENT_LIST_DIR}/AWSSDKConfigVersion.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/sdksCommon.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/platformDeps.cmake) +@@ -43,7 +47,6 @@ endif() # On Windows, dlls are treated as runtime target and installed in bindir if (WIN32 AND AWSSDK_INSTALL_AS_SHARED_LIBS) @@ -10,7 +21,7 @@ index c2f643e..5a4d8d2 100644 # If installed CMake scripts are associated with dll library, define USE_IMPORT_EXPORT for customers add_definitions(-DUSE_IMPORT_EXPORT) endif() -@@ -54,7 +53,6 @@ endif() +@@ -54,7 +57,6 @@ endif() get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) diff --git a/ports/aws-sdk-cpp/usage b/ports/aws-sdk-cpp/usage index 9a9bca1c6f9f8a..7f3176483522cf 100644 --- a/ports/aws-sdk-cpp/usage +++ b/ports/aws-sdk-cpp/usage @@ -3,15 +3,3 @@ The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED) target_include_directories(main PRVATE ${AWSSDK_INCLUDE_DIRS}) target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES}) - - find_package(aws-cpp-sdk-core CONFIG REQUIRED) - target_link_libraries(main PRIVATE aws-cpp-sdk-core) - - find_package(aws-cpp-sdk-dynamodb CONFIG REQUIRED) - target_link_libraries(main PRIVATE aws-cpp-sdk-dynamodb) - - find_package(aws-cpp-sdk-kinesis CONFIG REQUIRED) - target_link_libraries(main PRIVATE aws-cpp-sdk-kinesis) - - find_package(aws-cpp-sdk-s3 CONFIG REQUIRED) - target_link_libraries(main PRIVATE aws-cpp-sdk-s3) From 5dbdb59398d1c7b60fc174bdc9f08feda2b25cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 4 Dec 2020 16:38:05 -0800 Subject: [PATCH 0241/1694] [opencascade] Fix static build (#14901) --- ports/opencascade/CONTROL | 4 +- ports/opencascade/fix-build-with-vs2017.patch | 13 ++++ ports/opencascade/fix-static-build.patch | 76 +++++++++++++++++++ ports/opencascade/portfile.cmake | 72 +++++++++++------- 4 files changed, 134 insertions(+), 31 deletions(-) create mode 100644 ports/opencascade/fix-build-with-vs2017.patch create mode 100644 ports/opencascade/fix-static-build.patch diff --git a/ports/opencascade/CONTROL b/ports/opencascade/CONTROL index a171581b606133..7d26a2cc495a5f 100644 --- a/ports/opencascade/CONTROL +++ b/ports/opencascade/CONTROL @@ -1,9 +1,9 @@ Source: opencascade Version: 7.4.0 -Port-Version: 1 +Port-Version: 2 Build-Depends: freetype Description: Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE. -Supports: !(uwp|osx|linux|arm|static) +Supports: !(uwp|osx|linux|arm) Feature: freeimage Build-Depends: freeimage diff --git a/ports/opencascade/fix-build-with-vs2017.patch b/ports/opencascade/fix-build-with-vs2017.patch new file mode 100644 index 00000000000000..53b0ab0ea837c8 --- /dev/null +++ b/ports/opencascade/fix-build-with-vs2017.patch @@ -0,0 +1,13 @@ +diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake +index 203ca6b..4ff433a 100644 +--- a/adm/cmake/occt_defs_flags.cmake ++++ b/adm/cmake/occt_defs_flags.cmake +@@ -18,7 +18,7 @@ endif() + + # Turn off the "improved inline analyzer" that stalls on x86 release builds using MSVC 16.7 for 32-bit + if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8) +- if (MSVC) ++ if (MSVC AND MSVC_VERSION GREATER 1919) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /d2DeepThoughtInliner-") + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /d2DeepThoughtInliner-") + endif() diff --git a/ports/opencascade/fix-static-build.patch b/ports/opencascade/fix-static-build.patch new file mode 100644 index 00000000000000..05c105f588e45d --- /dev/null +++ b/ports/opencascade/fix-static-build.patch @@ -0,0 +1,76 @@ +diff --git a/adm/cmake/freetype.cmake b/adm/cmake/freetype.cmake +index 7f6f950..ca0c525 100644 +--- a/adm/cmake/freetype.cmake ++++ b/adm/cmake/freetype.cmake +@@ -111,6 +111,8 @@ if (IS_BUILTIN_SEARCH_REQUIRED) + endif() + + find_package(Freetype) ++ find_package(freetype CONFIG REQUIRED) ++ set(FREETYPE_LIBRARY freetype) + + # restore ENV{FREETYPE_DIR} + if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}") +@@ -230,6 +232,22 @@ endif() + # set 3RDPARTY_FREETYPE_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_LIBRARY + set (3RDPARTY_FREETYPE_LIBRARY "3RDPARTY_FREETYPE_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to freetype library" FORCE) + ++ if (BUILD_SHARED_LIBS) ++ if (CMAKE_BUILD_TYPE STREQUAL "Debug") ++ get_target_property(3RDPARTY_FREETYPE_LIBRARY freetype IMPORTED_IMPLIB_DEBUG) ++ else() ++ get_target_property(3RDPARTY_FREETYPE_LIBRARY freetype IMPORTED_IMPLIB_RELEASE) ++ endif() ++ else() ++ if (CMAKE_BUILD_TYPE STREQUAL "Debug") ++ get_target_property(3RDPARTY_FREETYPE_LIBRARY freetype IMPORTED_LOCATION_DEBUG) ++ else() ++ get_target_property(3RDPARTY_FREETYPE_LIBRARY freetype IMPORTED_LOCATION_RELEASE) ++ endif() ++ endif() ++ get_filename_component(3RDPARTY_FREETYPE_LIBRARY_DIR ${3RDPARTY_FREETYPE_LIBRARY} DIRECTORY) ++ ++ if(0) + if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}") + find_library (3RDPARTY_FREETYPE_LIBRARY ${CSF_FREETYPE} + PATHS "${3RDPARTY_FREETYPE_LIBRARY_DIR}" "${3RDPARTY_FREETYPE_DIR}" +@@ -257,9 +275,10 @@ endif() + + set (3RDPARTY_FREETYPE_LIBRARY "" CACHE FILEPATH "The path to freetype library" FORCE) + endif() ++ endif() + + # freetype shared library +- if (WIN32) ++ if (0) + if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}") + + set (CMAKE_FIND_LIBRARY_SUFFIXES .dll) +diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake +index f59b163..92175e4 100644 +--- a/adm/cmake/occt_toolkit.cmake ++++ b/adm/cmake/occt_toolkit.cmake +@@ -208,7 +208,7 @@ if (EXECUTABLE_PROJECT) + else() + add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES}) + +- if (MSVC) ++ if (MSVC AND BUILD_SHARED_LIBS) + install (FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb + CONFIGURATIONS Debug RelWithDebInfo + DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}") +diff --git a/src/Font/Font_FontMgr.cxx b/src/Font/Font_FontMgr.cxx +index 4fad2f6..ba64b51 100644 +--- a/src/Font/Font_FontMgr.cxx ++++ b/src/Font/Font_FontMgr.cxx +@@ -36,10 +36,6 @@ IMPLEMENT_STANDARD_RTTIEXT(Font_FontMgr,Standard_Transient) + #include + #include + +- #ifdef _MSC_VER +- #pragma comment (lib, "freetype.lib") +- #endif +- + namespace + { + diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index dd953124859a26..0a8bff0447a499 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -1,5 +1,4 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "OSX" "Linux") -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -7,9 +6,18 @@ vcpkg_from_github( REF V7_4_0 SHA512 595ad7226b9365c1a7670b77001f71787a5d8aaa4a93a4a4d8eb938564670d79ae5a247ae7cc770b5da53c9a9f2e4166ba6e5ae104c1f2debad19ec2187f4a56 HEAD_REF master - PATCHES fix-msvc-32bit-builds.patch + PATCHES + fix-msvc-32bit-builds.patch + fix-build-with-vs2017.patch + fix-static-build.patch ) +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_TYPE "Shared") +else() + set(BUILD_TYPE "Static") +endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "freeimage" USE_FREEIMAGE "tbb" USE_TBB @@ -24,25 +32,21 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS - -DBUILD_LIBRARY_TYPE="Shared" + OPTIONS ${FEATURE_OPTIONS} + -DBUILD_LIBRARY_TYPE=${BUILD_TYPE} -DBUILD_MODULE_Draw=OFF -DINSTALL_DIR_LAYOUT=Unix -DBUILD_SAMPLES_MFC=OFF -DBUILD_SAMPLES_QT=OFF -DBUILD_DOC_Overview=OFF - ## Options from vcpkg_check_features() - ${FEATURE_OPTIONS} + -DINSTALL_TEST_CASES=OFF + -DINSTALL_SAMPLES=OFF ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/opencascade TARGET_PATH share/opencascade) -# debug creates libd and bind directories that need moving -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bind ${CURRENT_PACKAGES_DIR}/debug/bin) - # Remove libd to lib, libd just has cmake files we dont want too file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/libd ${CURRENT_PACKAGES_DIR}/debug/lib) @@ -50,26 +54,36 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/debug/libd ${CURRENT_PACKAGES_DIR}/debug/lib file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -# fix paths in target files -list(APPEND TARGET_FILES - ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEApplicationFrameworkTargets-debug.cmake - ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADECompileDefinitionsAndFlags-debug.cmake - ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEDataExchangeTargets-debug.cmake - ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEFoundationClassesTargets-debug.cmake - ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingAlgorithmsTargets-debug.cmake - ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingDataTargets-debug.cmake - ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEVisualizationTargets-debug.cmake -) -foreach(TARGET_FILE ${TARGET_FILES}) - file(READ ${TARGET_FILE} filedata) - string(REGEX REPLACE "libd" "lib" filedata "${filedata}") - string(REGEX REPLACE "bind" "bin" filedata "${filedata}") - file(WRITE ${TARGET_FILE} ${filedata}) -endforeach() -# the bin directory ends up with bat files that are noise, let's clean that up -file(GLOB BATS ${CURRENT_PACKAGES_DIR}/bin/*.bat) -file(REMOVE_RECURSE ${BATS}) +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + # debug creates libd and bind directories that need moving + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bind ${CURRENT_PACKAGES_DIR}/debug/bin) + + # fix paths in target files + list(APPEND TARGET_FILES + ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEApplicationFrameworkTargets-debug.cmake + ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADECompileDefinitionsAndFlags-debug.cmake + ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEDataExchangeTargets-debug.cmake + ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEFoundationClassesTargets-debug.cmake + ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingAlgorithmsTargets-debug.cmake + ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingDataTargets-debug.cmake + ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEVisualizationTargets-debug.cmake + ) + + foreach(TARGET_FILE ${TARGET_FILES}) + file(READ ${TARGET_FILE} filedata) + string(REGEX REPLACE "libd" "lib" filedata "${filedata}") + string(REGEX REPLACE "bind" "bin" filedata "${filedata}") + file(WRITE ${TARGET_FILE} ${filedata}) + endforeach() + # the bin directory ends up with bat files that are noise, let's clean that up + file(GLOB BATS ${CURRENT_PACKAGES_DIR}/bin/*.bat) + file(REMOVE_RECURSE ${BATS}) +else() + # remove scripts in bin dir + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() file(INSTALL ${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 3c452ea2b3c087d9ea54241f6cba922f623a6dbe Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Fri, 4 Dec 2020 18:38:44 -0600 Subject: [PATCH 0242/1694] [cuda] Add ENV CUDA_HOME to path hints (#14880) --- ports/cuda/CONTROL | 2 +- ports/cuda/vcpkg_find_cuda.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/cuda/CONTROL b/ports/cuda/CONTROL index 21221160867b73..8b0c0a671c087f 100644 --- a/ports/cuda/CONTROL +++ b/ports/cuda/CONTROL @@ -1,5 +1,5 @@ Source: cuda Version: 10.1 -Port-Version: 4 +Port-Version: 5 Description: A parallel computing platform and programming model Homepage: https://developer.nvidia.com/cuda-toolkit diff --git a/ports/cuda/vcpkg_find_cuda.cmake b/ports/cuda/vcpkg_find_cuda.cmake index 28796008401d93..f04d5098360452 100644 --- a/ports/cuda/vcpkg_find_cuda.cmake +++ b/ports/cuda/vcpkg_find_cuda.cmake @@ -9,6 +9,7 @@ function(vcpkg_find_cuda) set(CUDA_PATHS ENV CUDA_PATH + ENV CUDA_HOME ENV CUDA_BIN_PATH ENV CUDA_PATH_V11_0 ENV CUDA_PATH_V10_2 From 420a203f6a0d71aaa6c4ad5db8f35be1ba6ddb50 Mon Sep 17 00:00:00 2001 From: ppenguin Date: Sat, 5 Dec 2020 08:39:22 +0800 Subject: [PATCH 0243/1694] [termcolor]; Add termcolor (#14897) --- ports/termcolor/portfile.cmake | 17 +++++++++++++++++ ports/termcolor/vcpkg.json | 6 ++++++ 2 files changed, 23 insertions(+) create mode 100644 ports/termcolor/portfile.cmake create mode 100644 ports/termcolor/vcpkg.json diff --git a/ports/termcolor/portfile.cmake b/ports/termcolor/portfile.cmake new file mode 100644 index 00000000000000..7ff0af33dedd3f --- /dev/null +++ b/ports/termcolor/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ikalnytskyi/termcolor + REF v1.0.1 + SHA512 15deaa7d225fa7934c207e6a57d89fd4c0ea5ebef38c4ff58ff27e19f444b030c265406a525f545592d67cff2b24ed839992693bb6d043cb3d8bca986c53fd95 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +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) diff --git a/ports/termcolor/vcpkg.json b/ports/termcolor/vcpkg.json new file mode 100644 index 00000000000000..b226e8d3a89b97 --- /dev/null +++ b/ports/termcolor/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "termcolor", + "version-string": "1.0.1", + "description": "Termcolor is a header-only C++ library for printing colored messages to the terminal.", + "homepage": "https://github.com/ikalnytskyi/termcolor" +} From ddb0ef3d965895f188d717c03ff04926f575cf13 Mon Sep 17 00:00:00 2001 From: Radames Cruz Date: Fri, 4 Dec 2020 16:40:35 -0800 Subject: [PATCH 0244/1694] [kuku] Add new port (#14898) --- ports/kuku/CMakeLists-windows.patch | 15 +++++++++++++++ ports/kuku/CONTROL | 4 ++++ ports/kuku/portfile.cmake | 24 ++++++++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 ports/kuku/CMakeLists-windows.patch create mode 100644 ports/kuku/CONTROL create mode 100644 ports/kuku/portfile.cmake diff --git a/ports/kuku/CMakeLists-windows.patch b/ports/kuku/CMakeLists-windows.patch new file mode 100644 index 00000000000000..88ce013e20cb77 --- /dev/null +++ b/ports/kuku/CMakeLists-windows.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c4a87db..10d3eb2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,10 +13,6 @@ cmake_minimum_required(VERSION 3.12) + + project(Kuku VERSION 2.0.0 LANGUAGES CXX C) + +-if(${MSVC}) +- message(FATAL_ERROR "Please build using the attached Visual Studio solution/project files.") +-endif() +- + ######################## + # Global configuration # + ######################## diff --git a/ports/kuku/CONTROL b/ports/kuku/CONTROL new file mode 100644 index 00000000000000..2e377be56c718b --- /dev/null +++ b/ports/kuku/CONTROL @@ -0,0 +1,4 @@ +Source: kuku +Version: 2.0 +Homepage: https://github.com/microsoft/Kuku +Description: Kuku is a simple open-source (MIT licensed) cuckoo hashing library developed by the Cryptography and Privacy Research group at Microsoft. diff --git a/ports/kuku/portfile.cmake b/ports/kuku/portfile.cmake new file mode 100644 index 00000000000000..975dda6d8d69ac --- /dev/null +++ b/ports/kuku/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/Kuku + REF e7cd2d6ad7f8886061c8e4b85890ede69cec3929 + SHA512 8220a8e839bd247d6a8d1049562028c620353d0cabee0681383d1457bda544ff1394709eeaa82a92a8c0d3491cc9f15de1a14b78a86e8f97ee1da68eb50c982e + HEAD_REF master + PATCHES CMakeLists-windows.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Kuku-2.0) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 7590430f2509144a411fb64751e089ad9925a164 Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Fri, 4 Dec 2020 18:41:12 -0600 Subject: [PATCH 0245/1694] [flashlight-cuda] Add stb as dependency, bump port commit (#14912) --- ports/flashlight-cuda/portfile.cmake | 4 ++-- ports/flashlight-cuda/vcpkg.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/flashlight-cuda/portfile.cmake b/ports/flashlight-cuda/portfile.cmake index de9d33b7efb06b..080e7f5e318952 100644 --- a/ports/flashlight-cuda/portfile.cmake +++ b/ports/flashlight-cuda/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookresearch/flashlight - REF cd0aa18b94340afc7cfa9a14281d1c90c0ed42e1 - SHA512 a11392af82054b63c557214c04e59b362aa1eb5897b30a595b26fd22c37c29571e504346947c6b9cebc4499c3af68d2075fd3144dcc0535a27886e34036ac5ff + REF 94486a1108fd0511a05523bfa1cf734bc14022f7 + SHA512 73a7547a26020be21d26393c2758cc235b452a0fb5d8537777bdbcc556f71846e07eca649167902dd7d0743cb7d10738b4e38cd7fe69b51b6122f3241e2edd84 HEAD_REF master ) diff --git a/ports/flashlight-cuda/vcpkg.json b/ports/flashlight-cuda/vcpkg.json index f962304c6227a0..2526e88bdbc02e 100644 --- a/ports/flashlight-cuda/vcpkg.json +++ b/ports/flashlight-cuda/vcpkg.json @@ -1,7 +1,6 @@ { "name": "flashlight-cuda", - "version-string": "20201120", - "port-version": 1, + "version-string": "20201201", "description": "A C++ standalone library for machine learning. CUDA backend.", "supports": "!(windows | osx)", "default-features": [ @@ -43,7 +42,8 @@ ] }, "nccl", - "openmpi" + "openmpi", + "stb" ] }, "imgclass": { From eac1190232220dd7cf4430d6a7e9a9c1d72926cd Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Fri, 4 Dec 2020 18:47:00 -0600 Subject: [PATCH 0246/1694] [arrayfire] Update port to fix cuSparse issue with CUDA 10.1 (#14911) --- ports/arrayfire/build.patch | 43 +++++++++++++++++++++++-------------- ports/arrayfire/vcpkg.json | 1 + 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/ports/arrayfire/build.patch b/ports/arrayfire/build.patch index c952f5f6213793..b2a4f279f2997e 100644 --- a/ports/arrayfire/build.patch +++ b/ports/arrayfire/build.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e1108c60..670f271b 100644 +index 1f30a5b3..f93e4ed9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,18 +104,11 @@ mark_as_advanced( @@ -62,13 +62,6 @@ index 2c7b96ea..b5006ee0 100644 endif() # Libraries -diff --git a/assets b/assets -index cd08d749..c53bfab9 160000 ---- a/assets -+++ b/assets -@@ -1 +1 @@ --Subproject commit cd08d749611b324012555ad6f23fd76c5465bd6c -+Subproject commit c53bfab909adfeed626f91ed419555711e20bca5 diff --git a/src/api/unified/CMakeLists.txt b/src/api/unified/CMakeLists.txt index 967eaa63..ff04392c 100644 --- a/src/api/unified/CMakeLists.txt @@ -131,7 +124,7 @@ index 170bb0f3..c6e20177 100644 arrayfire_set_default_cxx_flags(afcpu) diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt -index 7e3e4089..bbd8d838 100644 +index 7e3e4089..a3a53087 100644 --- a/src/backend/cuda/CMakeLists.txt +++ b/src/backend/cuda/CMakeLists.txt @@ -110,7 +110,11 @@ cuda_include_directories( @@ -147,6 +140,31 @@ index 7e3e4089..bbd8d838 100644 endif() file(GLOB jit_src "kernel/jit.cuh") +@@ -240,9 +244,14 @@ if(AF_WITH_NONFREE) + set(cxx_definitions -DAF_WITH_NONFREE_SIFT) + endif() + ++# New API of cuSparse was introduced in 10.1.168 for Linux and the older ++# 10.1.105 fix version doesn't it. Unfortunately, the new API was introduced in ++# in a fix release of CUDA - unconventionally. As CMake's FindCUDA module ++# doesn't provide patch/fix version number, we use 10.2 as the minimum ++# CUDA version to enable this new cuSparse API. + if(CUDA_VERSION_MAJOR VERSION_GREATER 10 OR + (UNIX AND +- CUDA_VERSION_MAJOR VERSION_EQUAL 10 AND CUDA_VERSION_MINOR VERSION_GREATER 0)) ++ CUDA_VERSION_MAJOR VERSION_EQUAL 10 AND CUDA_VERSION_MINOR VERSION_GREATER 1)) + list(APPEND cxx_definitions -DAF_USE_NEW_CUSPARSE_API) + endif() + +@@ -301,7 +310,7 @@ set_target_properties(af_cuda_static_cuda_library + + if(CUDA_VERSION_MAJOR VERSION_GREATER 10 OR + (UNIX AND +- CUDA_VERSION_MAJOR VERSION_EQUAL 10 AND CUDA_VERSION_MINOR VERSION_GREATER 0)) ++ CUDA_VERSION_MAJOR VERSION_EQUAL 10 AND CUDA_VERSION_MINOR VERSION_GREATER 1)) + target_compile_definitions(af_cuda_static_cuda_library PRIVATE AF_USE_NEW_CUSPARSE_API) + endif() + diff --git a/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt b/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt index 9a796c9e..d9864b00 100644 --- a/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt @@ -191,10 +209,3 @@ index d618ff2f..9f517398 100644 ) set_target_properties(opencl_sort_by_key_${SBK_TYPE} -diff --git a/test/data b/test/data -index 408f4405..6a48c886 160000 ---- a/test/data -+++ b/test/data -@@ -1 +1 @@ --Subproject commit 408f44059015c57a66e13b4c98df86ebcb427950 -+Subproject commit 6a48c88658bcd68392e99344714cb0dccd4ec285 diff --git a/ports/arrayfire/vcpkg.json b/ports/arrayfire/vcpkg.json index ee80e879d8d0c2..d2dd8b3081949a 100644 --- a/ports/arrayfire/vcpkg.json +++ b/ports/arrayfire/vcpkg.json @@ -1,6 +1,7 @@ { "name": "arrayfire", "version-string": "3.7.3", + "port-version": 2, "description": "ArrayFire is a general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.", "supports": "x64", "dependencies": [ From 3643a87a984037df73005221cf32f8606c678bb5 Mon Sep 17 00:00:00 2001 From: Odysseas Georgoudis Date: Sat, 5 Dec 2020 02:47:20 +0200 Subject: [PATCH 0247/1694] [quill] Update 1.6.0 (#14916) * Update quill to 1.6.0 * revert enabling arm windows build * Update portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/quill/CONTROL | 2 +- ports/quill/portfile.cmake | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ports/quill/CONTROL b/ports/quill/CONTROL index e6a4da865aadab..30f3ccddf8b0b6 100644 --- a/ports/quill/CONTROL +++ b/ports/quill/CONTROL @@ -1,5 +1,5 @@ Source: quill -Version: 1.5.2 +Version: 1.6.0 Homepage: https://github.com/odygrd/quill/ Description: C++14 Asynchronous Low Latency Logging Library Supports: !(arm|uwp|android) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 746e710d4bd25c..91c197b81d90cb 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill - REF 5a4dbedd2e59249719f0053b86f521c2b8cfca83 # v1.5.2 - SHA512 3328d13acf65364ee51fa954e279e854c867d542ec1dc6ce0ee1385fd53a9105009f56d8fa5ccd6e623dc19dba25e7b3ce0f4974756e9a461e77a05ce1a3aac2 + REF a893abd49188c5567340ae38fd14ecbac02286f7 # v1.6.0 + SHA512 35b20c12b441e96af17cc373004c040dc8b8b43263d12924d60ea8068ccb4e2eaa4cd8e5a4099cc5d46f6f8f1651252d1f041287c76579dca87b6a1c6a729612 HEAD_REF master ) @@ -17,7 +18,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DQUILL_FMT_EXTERNAL=ON + -DQUILL_FMT_EXTERNAL=ON ) vcpkg_install_cmake() From 70a79011d94f9405b3330705a78e6eb5f8cc62a6 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 5 Dec 2020 08:48:25 +0800 Subject: [PATCH 0248/1694] [libpqxx] update to 7.2.1 (#14921) --- ports/libpqxx/CONTROL | 2 +- ports/libpqxx/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/libpqxx/CONTROL b/ports/libpqxx/CONTROL index 8692e13dd15b91..b32a7c39b2269b 100644 --- a/ports/libpqxx/CONTROL +++ b/ports/libpqxx/CONTROL @@ -1,5 +1,5 @@ Source: libpqxx -Version: 7.2.0 +Version: 7.2.1 Homepage: https://github.com/jtv/libpqxx Description: The official C++ client API for PostgreSQL Build-Depends: libpq[core] diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake index 6c234bb318a392..8f18f039f7d4e3 100644 --- a/ports/libpqxx/portfile.cmake +++ b/ports/libpqxx/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jtv/libpqxx - REF 5015f8aa620ed8103840549b57fb46a5524f41ce # 7.2.0 - SHA512 54f8886dd5189785c13f6d5c6a7f9d417474a2250d00bd0eff346d3e307ca6cc0fca11136c924b5c231833b0d6ec7e6680114682022e2b065921a4fe8eecdef5 + REF e63674fec320624e0bea32e5e5b7b5ff2c6c269d # 7.2.1 + SHA512 681ae839f6c6d4706ec59eab60516ce7c43abbfa0115a50ce2dc4c09b5107762ae71f00aa56a8b6019965c3138deaf3c42cb761e7fddd4d522169d92a11c0867 HEAD_REF master ) From 58ad3d442eee3e83ac7bc1584fe5916ce8bf1bb0 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Fri, 4 Dec 2020 16:49:07 -0800 Subject: [PATCH 0249/1694] [usockets] Fix build issue with feature ssl (#14935) --- ports/usockets/CMakeLists.txt | 4 +++- ports/usockets/CONTROL | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/usockets/CMakeLists.txt b/ports/usockets/CMakeLists.txt index 0a5fd0dae2e0ed..a57ce6b08a626e 100644 --- a/ports/usockets/CMakeLists.txt +++ b/ports/usockets/CMakeLists.txt @@ -24,8 +24,10 @@ set(USOCKETS_EXT_INCLUDE_DIR ) set(USOCKETS_EXT_LIBS ) if (CMAKE_USE_OPENSSL) + # It requires C++17 or later, see https://github.com/uNetworking/uSockets/blob/master/Makefile#L43 + set(CMAKE_CXX_STANDARD 17) find_package(OpenSSL REQUIRED) - file(GLOB SSL_SOURCES src/crypto/*.c) + file(GLOB SSL_SOURCES src/crypto/*.c*) list(APPEND SOURCES ${SSL_SOURCES}) list(APPEND USOCKETS_EXT_LIBS OpenSSL::SSL OpenSSL::Crypto) endif() diff --git a/ports/usockets/CONTROL b/ports/usockets/CONTROL index 7d7efdb48e886e..e8dc13ac68ca08 100644 --- a/ports/usockets/CONTROL +++ b/ports/usockets/CONTROL @@ -1,5 +1,6 @@ Source: usockets Version: 0.6.0 +Port-Version: 1 Build-Depends:libuv Description: Miniscule cross-platform eventing, networking & crypto for async applications From c4f2b04c7818789edd6c66558ca23c820dca4d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Mon, 7 Dec 2020 00:15:28 +0100 Subject: [PATCH 0250/1694] [pugixml] Update to 1.11.1 (#14813) --- ports/pugixml/CONTROL | 5 ++- ports/pugixml/portfile.cmake | 5 ++- .../pugixml-v1.10_fix_debug_pkgconfig.patch | 31 ------------------- 3 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 ports/pugixml/pugixml-v1.10_fix_debug_pkgconfig.patch diff --git a/ports/pugixml/CONTROL b/ports/pugixml/CONTROL index 2d4b2a42c9d27f..65e6732495b46c 100644 --- a/ports/pugixml/CONTROL +++ b/ports/pugixml/CONTROL @@ -1,5 +1,4 @@ Source: pugixml -Version: 1.10 -Port-Version: 2 +Version: 1.11.1 Homepage: https://github.com/zeux/pugixml -Description: C++ XML processing library +Description: Light-weight, simple and fast XML parser for C++ with XPath support diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index a96d0adbe69227..72381eb5d8d0da 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/pugixml - REF v1.10 - SHA512 0634053d4f757b9293997763bb2e51595197c192f3974e954975d6d6ff91e4a6cb7c194efa530e0eef1a2a93db16592c5630010b6482430dff5ffc6879e84b6a + REF v1.11.1 + SHA512 94a79a28d96e763cdd8951c4d0b20aefb43cd1b32cbf5a5354b09f2636710e960e2dbfa56534b61c8d6ddecb2126a006e5f485c1465a97376e1cc077df25f16e HEAD_REF master - PATCHES pugixml-v1.10_fix_debug_pkgconfig.patch # Upstream: https://github.com/zeux/pugixml/pull/363 ) vcpkg_configure_cmake( diff --git a/ports/pugixml/pugixml-v1.10_fix_debug_pkgconfig.patch b/ports/pugixml/pugixml-v1.10_fix_debug_pkgconfig.patch deleted file mode 100644 index 24d428d98a1c32..00000000000000 --- a/ports/pugixml/pugixml-v1.10_fix_debug_pkgconfig.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f043962..b281cba 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -94,6 +94,16 @@ install(TARGETS ${LIBRARY} EXPORT pugixml-config - install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX}) - install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) - -+if (USE_POSTFIX) -+ if(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo) -+ set(LIB_POSTFIX "_r") -+ elseif(CMAKE_BUILD_TYPE MATCHES MinSizeRel) -+ set(LIB_POSTFIX "_m") -+ elseif(CMAKE_BUILD_TYPE MATCHES Debug) -+ set(LIB_POSTFIX "_d") -+ endif() -+endif() -+ - configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY) - install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig) - -diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in -index f9c3fd4..7958774 100644 ---- a/scripts/pugixml.pc.in -+++ b/scripts/pugixml.pc.in -@@ -8,4 +8,4 @@ Description: Light-weight, simple and fast XML parser for C++ with XPath support - URL: https://pugixml.org/ - Version: @pugixml_VERSION@ - Cflags: -I${includedir} --Libs: -L${libdir} -lpugixml -+Libs: -L${libdir} -lpugixml@LIB_POSTFIX@ From 8c9137f26353552c604045d019238dd01ad7927e Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Sun, 6 Dec 2020 15:26:58 -0800 Subject: [PATCH 0251/1694] [vcpkg] Add --nuget-description option for `vcpkg export` (#14953) --- toolsrc/include/vcpkg/base/xmlserializer.h | 31 +++++ toolsrc/include/vcpkg/binarycaching.private.h | 23 ---- toolsrc/src/vcpkg-test/binarycaching.cpp | 1 + toolsrc/src/vcpkg/base/xmlserializer.cpp | 113 ++++++++++++++++++ toolsrc/src/vcpkg/binarycaching.cpp | 108 +---------------- toolsrc/src/vcpkg/export.cpp | 85 +++++++------ toolsrc/windows-bootstrap/vcpkg.vcxproj | 2 + 7 files changed, 199 insertions(+), 164 deletions(-) create mode 100644 toolsrc/include/vcpkg/base/xmlserializer.h create mode 100644 toolsrc/src/vcpkg/base/xmlserializer.cpp diff --git a/toolsrc/include/vcpkg/base/xmlserializer.h b/toolsrc/include/vcpkg/base/xmlserializer.h new file mode 100644 index 00000000000000..33b7c0811fb11c --- /dev/null +++ b/toolsrc/include/vcpkg/base/xmlserializer.h @@ -0,0 +1,31 @@ +#pragma once + +#include +#include + +#include + +namespace vcpkg +{ + struct XmlSerializer + { + XmlSerializer& emit_declaration(); + XmlSerializer& open_tag(StringLiteral sl); + XmlSerializer& start_complex_open_tag(StringLiteral sl); + XmlSerializer& text_attr(StringLiteral name, StringView content); + XmlSerializer& finish_complex_open_tag(); + XmlSerializer& finish_self_closing_complex_tag(); + XmlSerializer& close_tag(StringLiteral sl); + XmlSerializer& text(StringView sv); + XmlSerializer& simple_tag(StringLiteral tag, StringView content); + XmlSerializer& line_break(); + + std::string buf; + + private: + XmlSerializer& emit_pending_indent(); + + int m_indent = 0; + bool m_pending_indent = false; + }; +} diff --git a/toolsrc/include/vcpkg/binarycaching.private.h b/toolsrc/include/vcpkg/binarycaching.private.h index 209807ccc5051d..2ac44679297fd8 100644 --- a/toolsrc/include/vcpkg/binarycaching.private.h +++ b/toolsrc/include/vcpkg/binarycaching.private.h @@ -48,27 +48,4 @@ namespace vcpkg const Dependencies::InstallPlanAction& action, const NugetReference& ref, details::NuGetRepoInfo rinfo = details::get_nuget_repo_info_from_env()); - - struct XmlSerializer - { - XmlSerializer& emit_declaration(); - XmlSerializer& open_tag(StringLiteral sl); - XmlSerializer& start_complex_open_tag(StringLiteral sl); - XmlSerializer& text_attr(StringLiteral name, StringView content); - XmlSerializer& finish_complex_open_tag(); - XmlSerializer& finish_self_closing_complex_tag(); - XmlSerializer& close_tag(StringLiteral sl); - XmlSerializer& text(StringView sv); - XmlSerializer& simple_tag(StringLiteral tag, StringView content); - XmlSerializer& line_break(); - - std::string buf; - - private: - XmlSerializer& emit_pending_indent(); - - int m_indent = 0; - bool m_pending_indent = false; - }; - } diff --git a/toolsrc/src/vcpkg-test/binarycaching.cpp b/toolsrc/src/vcpkg-test/binarycaching.cpp index eefe2a9c1c2bd5..3cede064c585bb 100644 --- a/toolsrc/src/vcpkg-test/binarycaching.cpp +++ b/toolsrc/src/vcpkg-test/binarycaching.cpp @@ -1,6 +1,7 @@ #include #include +#include #include #include diff --git a/toolsrc/src/vcpkg/base/xmlserializer.cpp b/toolsrc/src/vcpkg/base/xmlserializer.cpp new file mode 100644 index 00000000000000..535a0a92b38069 --- /dev/null +++ b/toolsrc/src/vcpkg/base/xmlserializer.cpp @@ -0,0 +1,113 @@ +#include +#include + +namespace vcpkg +{ + XmlSerializer& XmlSerializer::emit_declaration() + { + buf.append(R"()"); + return *this; + } + XmlSerializer& XmlSerializer::open_tag(StringLiteral sl) + { + emit_pending_indent(); + Strings::append(buf, '<', sl, '>'); + m_indent += 2; + return *this; + } + XmlSerializer& XmlSerializer::start_complex_open_tag(StringLiteral sl) + { + emit_pending_indent(); + Strings::append(buf, '<', sl); + m_indent += 2; + return *this; + } + XmlSerializer& XmlSerializer::text_attr(StringLiteral name, StringView content) + { + if (m_pending_indent) + { + m_pending_indent = false; + buf.append(m_indent, ' '); + } + else + { + buf.push_back(' '); + } + Strings::append(buf, name, "=\""); + text(content); + Strings::append(buf, '"'); + return *this; + } + XmlSerializer& XmlSerializer::finish_complex_open_tag() + { + emit_pending_indent(); + Strings::append(buf, '>'); + return *this; + } + XmlSerializer& XmlSerializer::finish_self_closing_complex_tag() + { + emit_pending_indent(); + Strings::append(buf, "/>"); + m_indent -= 2; + return *this; + } + XmlSerializer& XmlSerializer::close_tag(StringLiteral sl) + { + m_indent -= 2; + emit_pending_indent(); + Strings::append(buf, "'); + return *this; + } + XmlSerializer& XmlSerializer::text(StringView sv) + { + emit_pending_indent(); + for (auto ch : sv) + { + if (ch == '&') + { + buf.append("&"); + } + else if (ch == '<') + { + buf.append("<"); + } + else if (ch == '>') + { + buf.append(">"); + } + else if (ch == '"') + { + buf.append("""); + } + else if (ch == '\'') + { + buf.append("'"); + } + else + { + buf.push_back(ch); + } + } + return *this; + } + XmlSerializer& XmlSerializer::simple_tag(StringLiteral tag, StringView content) + { + return emit_pending_indent().open_tag(tag).text(content).close_tag(tag); + } + XmlSerializer& XmlSerializer::line_break() + { + buf.push_back('\n'); + m_pending_indent = true; + return *this; + } + XmlSerializer& XmlSerializer::emit_pending_indent() + { + if (m_pending_indent) + { + m_pending_indent = false; + buf.append(m_indent, ' '); + } + return *this; + } + +} diff --git a/toolsrc/src/vcpkg/binarycaching.cpp b/toolsrc/src/vcpkg/binarycaching.cpp index 4e21fc62a98d34..966c2e77b7446c 100644 --- a/toolsrc/src/vcpkg/binarycaching.cpp +++ b/toolsrc/src/vcpkg/binarycaching.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -699,113 +700,6 @@ namespace vcpkg }; } -XmlSerializer& XmlSerializer::emit_declaration() -{ - buf.append(R"()"); - return *this; -} -XmlSerializer& XmlSerializer::open_tag(StringLiteral sl) -{ - emit_pending_indent(); - Strings::append(buf, '<', sl, '>'); - m_indent += 2; - return *this; -} -XmlSerializer& XmlSerializer::start_complex_open_tag(StringLiteral sl) -{ - emit_pending_indent(); - Strings::append(buf, '<', sl); - m_indent += 2; - return *this; -} -XmlSerializer& XmlSerializer::text_attr(StringLiteral name, StringView content) -{ - if (m_pending_indent) - { - m_pending_indent = false; - buf.append(m_indent, ' '); - } - else - { - buf.push_back(' '); - } - Strings::append(buf, name, "=\""); - text(content); - Strings::append(buf, '"'); - return *this; -} -XmlSerializer& XmlSerializer::finish_complex_open_tag() -{ - emit_pending_indent(); - Strings::append(buf, '>'); - return *this; -} -XmlSerializer& XmlSerializer::finish_self_closing_complex_tag() -{ - emit_pending_indent(); - Strings::append(buf, "/>"); - m_indent -= 2; - return *this; -} -XmlSerializer& XmlSerializer::close_tag(StringLiteral sl) -{ - m_indent -= 2; - emit_pending_indent(); - Strings::append(buf, "'); - return *this; -} -XmlSerializer& XmlSerializer::text(StringView sv) -{ - emit_pending_indent(); - for (auto ch : sv) - { - if (ch == '&') - { - buf.append("&"); - } - else if (ch == '<') - { - buf.append("<"); - } - else if (ch == '>') - { - buf.append(">"); - } - else if (ch == '"') - { - buf.append("""); - } - else if (ch == '\'') - { - buf.append("'"); - } - else - { - buf.push_back(ch); - } - } - return *this; -} -XmlSerializer& XmlSerializer::simple_tag(StringLiteral tag, StringView content) -{ - return emit_pending_indent().open_tag(tag).text(content).close_tag(tag); -} -XmlSerializer& XmlSerializer::line_break() -{ - buf.push_back('\n'); - m_pending_indent = true; - return *this; -} -XmlSerializer& XmlSerializer::emit_pending_indent() -{ - if (m_pending_indent) - { - m_pending_indent = false; - buf.append(m_indent, ' '); - } - return *this; -} - IBinaryProvider& vcpkg::null_binary_provider() { static NullBinaryProvider p; diff --git a/toolsrc/src/vcpkg/export.cpp b/toolsrc/src/vcpkg/export.cpp index 6d0c95aa81ef7e..b5c36ff87092fb 100644 --- a/toolsrc/src/vcpkg/export.cpp +++ b/toolsrc/src/vcpkg/export.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -28,37 +29,47 @@ namespace vcpkg::Export const fs::path& targets_redirect_path, const fs::path& props_redirect_path, const std::string& nuget_id, - const std::string& nupkg_version) + const std::string& nupkg_version, + const std::string& nuget_description) { - static constexpr auto CONTENT_TEMPLATE = R"( - - - @NUGET_ID@ - @VERSION@ - vcpkg - - Vcpkg NuGet export - - - - - - - - - - -)"; - - std::string nuspec_file_content = Strings::replace_all(CONTENT_TEMPLATE, "@NUGET_ID@", nuget_id); - nuspec_file_content = Strings::replace_all(std::move(nuspec_file_content), "@VERSION@", nupkg_version); - nuspec_file_content = - Strings::replace_all(std::move(nuspec_file_content), "@RAW_EXPORTED_DIR@", raw_exported_dir); - nuspec_file_content = Strings::replace_all( - std::move(nuspec_file_content), "@TARGETS_REDIRECT_PATH@", fs::u8string(targets_redirect_path)); - nuspec_file_content = Strings::replace_all( - std::move(nuspec_file_content), "@PROPS_REDIRECT_PATH@", fs::u8string(props_redirect_path)); - return nuspec_file_content; + XmlSerializer xml; + xml.open_tag("package").line_break(); + xml.open_tag("metadata").line_break(); + xml.simple_tag("id", nuget_id).line_break(); + xml.simple_tag("version", nupkg_version).line_break(); + xml.simple_tag("authors", "vcpkg").line_break(); + xml.simple_tag("description", nuget_description).line_break(); + xml.close_tag("metadata").line_break(); + xml.open_tag("files").line_break(); + xml.start_complex_open_tag("file") + .text_attr("src", raw_exported_dir + "\\installed\\**") + .text_attr("target", "installed") + .finish_self_closing_complex_tag(); + + xml.start_complex_open_tag("file") + .text_attr("src", raw_exported_dir + "\\scripts\\**") + .text_attr("target", "scripts") + .finish_self_closing_complex_tag(); + + xml.start_complex_open_tag("file") + .text_attr("src", raw_exported_dir + "\\.vcpkg-root") + .text_attr("target", "") + .finish_self_closing_complex_tag(); + + xml.start_complex_open_tag("file") + .text_attr("src", fs::u8string(targets_redirect_path)) + .text_attr("target", Strings::concat("build\\native\\", nuget_id, ".targets")) + .finish_self_closing_complex_tag(); + + xml.start_complex_open_tag("file") + .text_attr("src", fs::u8string(props_redirect_path)) + .text_attr("target", Strings::concat("build\\native\\", nuget_id, ".props")) + .finish_self_closing_complex_tag(); + + xml.close_tag("files").line_break(); + xml.close_tag("package").line_break(); + + return std::move(xml.buf); } static std::string create_targets_redirect(const std::string& target_path) noexcept @@ -123,6 +134,7 @@ namespace vcpkg::Export static fs::path do_nuget_export(const VcpkgPaths& paths, const std::string& nuget_id, const std::string& nuget_version, + const std::string& nuget_description, const fs::path& raw_exported_dir, const fs::path& output_dir) { @@ -145,7 +157,7 @@ namespace vcpkg::Export fs.write_contents(props_redirect, props_redirect_content, VCPKG_LINE_INFO); const std::string nuspec_file_content = create_nuspec_file_contents( - raw_exported_dir.string(), targets_redirect, props_redirect, nuget_id, nuget_version); + raw_exported_dir.string(), targets_redirect, props_redirect, nuget_id, nuget_version, nuget_description); const fs::path nuspec_file_path = paths.buildsystems / "tmp" / "vcpkg.export.nuspec"; fs.write_contents(nuspec_file_path, nuspec_file_content, VCPKG_LINE_INFO); @@ -284,6 +296,7 @@ namespace vcpkg::Export Optional maybe_nuget_id; Optional maybe_nuget_version; + Optional maybe_nuget_description; IFW::Options ifw_options; Prefab::Options prefab_options; @@ -300,6 +313,7 @@ namespace vcpkg::Export static constexpr StringLiteral OPTION_ZIP = "zip"; static constexpr StringLiteral OPTION_SEVEN_ZIP = "7zip"; static constexpr StringLiteral OPTION_NUGET_ID = "nuget-id"; + static constexpr StringLiteral OPTION_NUGET_DESCRIPTION = "nuget-description"; static constexpr StringLiteral OPTION_NUGET_VERSION = "nuget-version"; static constexpr StringLiteral OPTION_IFW_REPOSITORY_URL = "ifw-repository-url"; static constexpr StringLiteral OPTION_IFW_PACKAGES_DIR_PATH = "ifw-packages-directory-path"; @@ -334,10 +348,11 @@ namespace vcpkg::Export {OPTION_ALL_INSTALLED, "Export all installed packages"}, }}; - static constexpr std::array EXPORT_SETTINGS = {{ + static constexpr std::array EXPORT_SETTINGS = {{ {OPTION_OUTPUT, "Specify the output name (used to construct filename)"}, {OPTION_OUTPUT_DIR, "Specify the output directory for produced artifacts"}, {OPTION_NUGET_ID, "Specify the id for the exported NuGet package (overrides --output)"}, + {OPTION_NUGET_DESCRIPTION, "Specify a description for the exported NuGet package"}, {OPTION_NUGET_VERSION, "Specify the version for the exported NuGet package"}, {OPTION_IFW_REPOSITORY_URL, "Specify the remote repository URL for the online installer"}, {OPTION_IFW_PACKAGES_DIR_PATH, "Specify the temporary directory path for the repacked packages"}, @@ -456,6 +471,7 @@ namespace vcpkg::Export { {OPTION_NUGET_ID, ret.maybe_nuget_id}, {OPTION_NUGET_VERSION, ret.maybe_nuget_version}, + {OPTION_NUGET_DESCRIPTION, ret.maybe_nuget_description}, }); options_implies(OPTION_IFW, @@ -567,8 +583,9 @@ namespace vcpkg::Export const std::string nuget_id = opts.maybe_nuget_id.value_or(raw_exported_dir_path.filename().string()); const std::string nuget_version = opts.maybe_nuget_version.value_or("1.0.0"); - const fs::path output_path = - do_nuget_export(paths, nuget_id, nuget_version, raw_exported_dir_path, opts.output_dir); + const std::string nuget_description = opts.maybe_nuget_description.value_or("Vcpkg NuGet export"); + const fs::path output_path = do_nuget_export( + paths, nuget_id, nuget_version, nuget_description, raw_exported_dir_path, opts.output_dir); System::print2(System::Color::success, "NuGet package exported at: ", fs::u8string(output_path), "\n"); System::printf(R"( diff --git a/toolsrc/windows-bootstrap/vcpkg.vcxproj b/toolsrc/windows-bootstrap/vcpkg.vcxproj index 16de6e9c45179f..b11d5540c751ec 100644 --- a/toolsrc/windows-bootstrap/vcpkg.vcxproj +++ b/toolsrc/windows-bootstrap/vcpkg.vcxproj @@ -205,6 +205,7 @@ + @@ -296,6 +297,7 @@ + From 426217bb17212f0d2bea70024f900c01c7b7f09d Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Sun, 6 Dec 2020 15:31:34 -0800 Subject: [PATCH 0252/1694] [vcpkg] Add versioning fields to schema (#14947) --- scripts/vcpkg.schema.json | 256 +++++++++++++++++++++++++++----------- 1 file changed, 180 insertions(+), 76 deletions(-) diff --git a/scripts/vcpkg.schema.json b/scripts/vcpkg.schema.json index ae20ad6e3298bc..723b14646b06d9 100644 --- a/scripts/vcpkg.schema.json +++ b/scripts/vcpkg.schema.json @@ -21,6 +21,69 @@ } ] }, + "version-text": { + "type": "string", + "pattern": "[^#]+" + }, + "has-schemed-version": { + "type": "object", + "oneOf": [ + { + "properties": { + "version-string": { + "description": "Text used to identify an arbitrary version", + "type": "string", + "pattern": "^[^#]+$" + } + }, + "required": [ + "version-string" + ] + }, + { + "properties": { + "version": { + "description": "A relaxed version string (1.2.3.4...)", + "type": "string", + "pattern": "^\\d+(\\.\\d+)*$" + } + }, + "required": [ + "version" + ] + }, + { + "properties": { + "version-semver": { + "description": "A semantic version string. See https://semver.org/", + "type": "string", + "pattern": "^\\d+\\.\\d+\\.\\d+([+-].+)?$" + } + }, + "required": [ + "version-semver" + ] + }, + { + "properties": { + "version-date": { + "description": "A date version string (e.g. 2020-01-20)", + "type": "string", + "pattern": "^\\d{4}-\\d{2}-\\d{2}(\\.\\d+)*$" + } + }, + "required": [ + "version-date" + ] + } + ] + }, + "port-version": { + "description": "A non-negative integer indicating the port revision. If this field doesn't exist, it's assumed to be `0`.", + "type": "integer", + "minimum": 0, + "default": 0 + }, "package-name": { "description": "Name of a package.", "allOf": [ @@ -71,6 +134,14 @@ }, "platform": { "$ref": "#/definitions/platform-expression" + }, + "version>=": { + "description": "Minimum required port version", + "$ref": "#/definitions/version-text" + }, + "port-version": { + "description": "Minimum port revision (defaults to 0)", + "$ref": "#/definitions/port-version" } }, "patternProperties": { @@ -92,6 +163,28 @@ } ] }, + "override": { + "description": "A version override.", + "type": "object", + "properties": { + "name": { + "$ref": "#/definitions/identifier" + }, + "version": { + "$ref": "#/definitions/version-text" + }, + "port-version": { + "$ref": "#/definitions/port-version" + } + }, + "patternProperties": { + "^\\$": {} + }, + "required": [ + "name", + "version" + ] + }, "platform-expression": { "description": "A specification of a set of platforms. See https://github.com/microsoft/vcpkg/blob/master/docs/specifications/manifests.md#definitions.", "type": "string" @@ -125,82 +218,93 @@ } }, "type": "object", - "properties": { - "name": { - "$ref": "#/definitions/package-name" - }, - "version-string": { - "description": "A string without semantic meaning, equivalent to `CONTROL`'s `Version` field.", - "type": "string" - }, - "port-version": { - "description": "A non-negative integer. If this field doesn't exist, it's assumed to be `0`.", - "type": "integer", - "minimum": 0, - "default": 0 - }, - "maintainers": { - "description": "An array of strings which contain the authors of a package", - "type": "array", - "items": { - "type": "string" - } - }, - "description": { - "$ref": "#/definitions/description-field" - }, - "homepage": { - "description": "A url which points to the homepage of a package.", - "type": "string", - "format": "uri" - }, - "documentation": { - "description": "A url which points to the documentation of a package.", - "type": "string", - "format": "uri" - }, - "license": { - "description": "An SPDX license expression at version 3.9.", - "type": "string" - }, - "dependencies": { - "description": "Dependencies that are always required.", - "type": "array", - "items": { - "$ref": "#/definitions/dependency" - } - }, - "dev-dependencies": { - "description": "Dependencies only required for developers (testing and the like).", - "type": "array", - "items": { - "$ref": "#/definitions/dependency" - } - }, - "features": { - "description": "An array of features supported by the package", - "type": "array", - "items": { - "$ref": "#/definitions/feature" - } - }, - "default-features": { - "description": "Features enabled by default with the package.", - "type": "array", - "items": { - "$ref": "#/definitions/identifier" - } + "allOf": [ + { + "properties": { + "name": { + "description": "The name of the top-level package", + "$ref": "#/definitions/package-name" + }, + "version-string": {}, + "version": {}, + "version-date": {}, + "version-semver": {}, + "port-version": { + "$ref": "#/definitions/port-version" + }, + "maintainers": { + "description": "An array of strings which contain the authors of a package", + "type": "array", + "items": { + "type": "string" + } + }, + "description": { + "$ref": "#/definitions/description-field" + }, + "homepage": { + "description": "A url which points to the homepage of a package.", + "type": "string", + "format": "uri" + }, + "documentation": { + "description": "A url which points to the documentation of a package.", + "type": "string", + "format": "uri" + }, + "license": { + "description": "An SPDX license expression at version 3.9.", + "type": "string" + }, + "dependencies": { + "description": "Dependencies that are always required.", + "type": "array", + "items": { + "$ref": "#/definitions/dependency" + } + }, + "overrides": { + "description": "Version overrides for dependencies.", + "type": "array", + "items": { + "$ref": "#/definitions/override" + } + }, + "dev-dependencies": { + "description": "Dependencies only required for developers (testing and the like).", + "type": "array", + "items": { + "$ref": "#/definitions/dependency" + } + }, + "features": { + "description": "An array of features supported by the package", + "type": "array", + "items": { + "$ref": "#/definitions/feature" + } + }, + "default-features": { + "description": "Features enabled by default with the package.", + "type": "array", + "items": { + "$ref": "#/definitions/identifier" + } + }, + "supports": { + "$ref": "#/definitions/platform-expression" + } + }, + "patternProperties": { + "^\\$": {} + }, + "required": [ + "name" + ], + "additionalProperties": false }, - "supports": { - "$ref": "#/definitions/platform-expression" + { + "$ref": "#/definitions/has-schemed-version" } - }, - "patternProperties": { - "^\\$": {} - }, - "required": [ - "name", - "version-string" - ], - "additionalProperties": false + ] } From 1a42aa6d7e4a1af4c49f692b33db38e2e352c351 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Mon, 7 Dec 2020 08:25:38 -0800 Subject: [PATCH 0253/1694] [pegtl] Update to 3.0.0 release (#14841) --- ports/pegtl/CONTROL | 2 +- ports/pegtl/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/pegtl/CONTROL b/ports/pegtl/CONTROL index be3e18fc5e406f..4fdc23ea38b9c6 100644 --- a/ports/pegtl/CONTROL +++ b/ports/pegtl/CONTROL @@ -1,4 +1,4 @@ Source: pegtl -Version: 3.0.0-pre-70971f4 +Version: 2020-12-07 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 diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake index 6735a36efd0341..cde2031469b9ba 100644 --- a/ports/pegtl/portfile.cmake +++ b/ports/pegtl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taocpp/pegtl - REF 70971f441d7611ba3905b5c0d5c8bf4338602ef2 - SHA512 8ff0f06eaa59e547e4f00002d27241f99f06b398d7cd021c3b8475431d59234d0aa32fff8ce74faee3468c9fb542020326547a6d9cd7b98561b3bdd233a1e715 + REF 93b53c80058b2632a7260ab10ef2a06abcc0fc7f + SHA512 83b198465bca60b95c670aa72681aed0448025b506c6f6a196446608eb47ee9d8828c51ac8735caa2b2ec1e53d6a13bd6ad287a4abb8690a570036b90918907a HEAD_REF master ) From 93c7a1fed5cb9be8d3c061aba13439049101b4db Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Mon, 7 Dec 2020 08:25:55 -0800 Subject: [PATCH 0254/1694] [cppgraphqlgen] Update to v3.3.0 (#14842) --- ports/cppgraphqlgen/CONTROL | 4 ++-- ports/cppgraphqlgen/portfile.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL index 3eff11f55c8dd4..30694fac4a9e37 100644 --- a/ports/cppgraphqlgen/CONTROL +++ b/ports/cppgraphqlgen/CONTROL @@ -1,5 +1,5 @@ Source: cppgraphqlgen -Version: 3.2.4 -Build-Depends: boost-filesystem (!uwp&!windows), boost-program-options, pegtl, rapidjson +Version: 2020-12-07 +Build-Depends: boost-program-options, pegtl, rapidjson Description: C++ GraphQL schema service generator Homepage: https://github.com/microsoft/cppgraphqlgen diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 4deb05aee68f78..662a38db91e3fb 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 v3.2.4 - SHA512 8a73124604f40fdb2d422da4ad8e9c190be5bd2d9dbda92c856f7bb0a716a5a79c1f607526196758a72d1ad4c02795e86eb17c726ad371fe03ceb590e15905e0 + REF fb4a589c84c102d867e7bfb03884d40f7776315b + SHA512 88fedd83b49ae25f2165cff8e3a5e3e46ed853312658924f08b3192c790e92583dc8b8f7a88f39ec17798bd7d986143a78633a89d3867400539c4d315015e29b HEAD_REF master ) From 0e47eee00c6253c8f1da29ba1612911978ef3167 Mon Sep 17 00:00:00 2001 From: HrOokami <4591995+faserg1@users.noreply.github.com> Date: Mon, 7 Dec 2020 19:27:33 +0300 Subject: [PATCH 0255/1694] [ATK] Installing .pc files (#14972) --- ports/atk/{CMakeLists.txt => CMakeLists.txt.in} | 17 ++++++++++++++--- ports/atk/CONTROL | 1 + ports/atk/portfile.cmake | 14 +++++++++++++- 3 files changed, 28 insertions(+), 4 deletions(-) rename ports/atk/{CMakeLists.txt => CMakeLists.txt.in} (87%) diff --git a/ports/atk/CMakeLists.txt b/ports/atk/CMakeLists.txt.in similarity index 87% rename from ports/atk/CMakeLists.txt rename to ports/atk/CMakeLists.txt.in index e26d8649e41a1c..d8b84882369d99 100644 --- a/ports/atk/CMakeLists.txt +++ b/ports/atk/CMakeLists.txt.in @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.0) project(atk C) -set(ATK_LIB_SUFFIX 1.0) -set(ATK_DLL_SUFFIX 1) -set(GLIB_LIB_VERSION 2.0) +set(ATK_LIB_SUFFIX @ATK_LIB_SUFFIX@) +set(ATK_DLL_SUFFIX @ATK_DLL_SUFFIX@) +set(GLIB_LIB_VERSION @GLIB_LIB_VERSION@) if(BUILD_SHARED_LIBS) set(ATK_EXPORT_MACRO DLL_EXPORT) @@ -142,3 +142,14 @@ message(STATUS " " ${LIBINTL_LIBRARY}) foreach(GL ${GLIB_LIBRARIES}) message(STATUS " " ${GL}) endforeach() + +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${CMAKE_INSTALL_PREFIX}) +set(libdir ${CMAKE_INSTALL_PREFIX}/lib) +set(includedir ${CMAKE_INSTALL_PREFIX}/include) +set(ATK_API_VERSION @ATK_API_VERSION@) +set(VERSION @ATK_VERSION@) +set(GLIB_PACKAGES "glib-${GLIB_LIB_VERSION} gobject-${GLIB_LIB_VERSION} gmodule-${GLIB_LIB_VERSION}") + +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/atk.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/atk.pc" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/atk.pc" DESTINATION lib/pkgconfig) \ No newline at end of file diff --git a/ports/atk/CONTROL b/ports/atk/CONTROL index bcfc01d1655faa..686e7fe6e5afcd 100644 --- a/ports/atk/CONTROL +++ b/ports/atk/CONTROL @@ -1,5 +1,6 @@ Source: atk Version: 2.24.0-5 +Port-Version: 1 Homepage: https://developer.gnome.org/atk/ Description: GNOME Accessibility Toolkit Build-Depends: glib, gettext diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index a0d01285969697..916b5095bca53d 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -15,7 +15,17 @@ vcpkg_extract_source_archive_ex( fix-linux-config.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +# Here are used API version of library, not the version of library itself +set(ATK_LIB_SUFFIX 1.0) +set(ATK_DLL_SUFFIX 1) + +set(GLIB_LIB_VERSION 2.0) +if (WIN32) + set(ATK_API_VERSION ${ATK_LIB_SUFFIX}) +else() + set(ATK_API_VERSION ${ATK_DLL_SUFFIX}) +endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in" "${SOURCE_PATH}/CMakeLists.txt" @ONLY) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -30,4 +40,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From a22352e209ea9e41b9e99ba7ed898e5106950f20 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 8 Dec 2020 00:27:48 +0800 Subject: [PATCH 0256/1694] [nanobench] update to 4.3.0 (#14975) --- ports/nanobench/CONTROL | 2 +- ports/nanobench/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/nanobench/CONTROL b/ports/nanobench/CONTROL index f8366a089e4fb7..7e01f0e1f1c849 100644 --- a/ports/nanobench/CONTROL +++ b/ports/nanobench/CONTROL @@ -1,4 +1,4 @@ Source: nanobench -Version: 4.0.0 +Version: 4.3.0 Homepage: https://nanobench.ankerl.com Description: Simple, fast, accurate single-header microbenchmarking functionality for C++11/14/17/20 diff --git a/ports/nanobench/portfile.cmake b/ports/nanobench/portfile.cmake index 272306f264a76e..86b144ca5f102b 100644 --- a/ports/nanobench/portfile.cmake +++ b/ports/nanobench/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinus/nanobench - REF c534992696b9341274c6714931d0064d74239fcb #v4.0.0 - SHA512 09078f1100c6f843e7646b8aaab687c32e71ba2dc05a2a5b282c72ab064ceffbf4aeb5ad14c4a2bdbe2ea66dca9cd207dee5eade44f77844cddfa490b4c09c32 + REF ee8b36e956bb2b8753dd1f6732b4d9d90afb09f9 #v4.3.0 + SHA512 46807f3b945d062dd3c829ec349cc892f9b2334c8a3c74c1225b0cd918af6864a1e539ac2bbad0ee6e20d285b5ad8e307e72996f2531377c55683cb0593ed3e7 HEAD_REF master ) From 66f04044c547b4dcd6e406771de0c0ed355e72cc Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 8 Dec 2020 00:28:07 +0800 Subject: [PATCH 0257/1694] [EASTL] update to 3.17.03 (#14980) --- ports/eastl/CONTROL | 2 +- ports/eastl/fix_cmake_install.patch | 12 ++++++++---- ports/eastl/portfile.cmake | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL index 4c2814f2e55826..da3a4b734c0c99 100644 --- a/ports/eastl/CONTROL +++ b/ports/eastl/CONTROL @@ -1,5 +1,5 @@ Source: eastl -Version: 3.16.07 +Version: 3.17.03 Homepage: https://github.com/electronicarts/EASTL Description: Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations. Build-Depends: eabase diff --git a/ports/eastl/fix_cmake_install.patch b/ports/eastl/fix_cmake_install.patch index bc8433c075429b..a2dbfd8215744d 100644 --- a/ports/eastl/fix_cmake_install.patch +++ b/ports/eastl/fix_cmake_install.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b8171cd..44120cc 100644 +index e8700dc..6d3e2f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,12 +4,17 @@ @@ -20,7 +20,7 @@ index b8171cd..44120cc 100644 #------------------------------------------------------------------------------------------- # Compiler Flags #------------------------------------------------------------------------------------------- -@@ -41,10 +46,46 @@ add_definitions(-DEASTL_OPENSOURCE=1) +@@ -41,7 +46,10 @@ add_definitions(-DEASTL_OPENSOURCE=1) #------------------------------------------------------------------------------------------- # Include dirs #------------------------------------------------------------------------------------------- @@ -32,7 +32,10 @@ index b8171cd..44120cc 100644 #------------------------------------------------------------------------------------------- # Dependencies - #------------------------------------------------------------------------------------------- +@@ -50,5 +58,39 @@ if (NOT TARGET EABase) + add_subdirectory(test/packages/EABase) + endif() + -target_link_libraries(EASTL EABase) +target_link_libraries(EASTL PUBLIC EABase) + @@ -62,10 +65,11 @@ index b8171cd..44120cc 100644 + +install(TARGETS EASTL LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") +install(DIRECTORY "include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - ++ +install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake" + DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION} +) + diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index a446670a546947..1bef06c771a740 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO electronicarts/EASTL - REF 1cf6182218bec79ece0b91e762f507e8c027807c # 3.16.07 - SHA512 a0d140a6ff202eb9360a7cbb4ae59881458b628a7bc5ffb19864aba585fd0b02c7f7a2692df2e1c52aa58bc3c3471f27b365fa7770b7d84c038d24884db10b9b + REF 41bd2e4466e33b979d2afc37f9b98dacf1eab50b #v 3.17.03 + SHA512 3011a0a08701b683e22cc624167b4f65fce8b16d0f7a03675f6a1d5b02313c5b763bcc6c8091f65728ed60ceee8d585cbdb1968a35fb24954f4f66afabb23865 HEAD_REF master PATCHES fix_cmake_install.patch From 7a812d02f6d9a22898b2fac14caa7edd246d475a Mon Sep 17 00:00:00 2001 From: OWenT Date: Tue, 8 Dec 2020 00:28:27 +0800 Subject: [PATCH 0258/1694] [libcopp] Update to 1.3.3 (#14981) --- ports/libcopp/CONTROL | 2 +- ports/libcopp/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/libcopp/CONTROL b/ports/libcopp/CONTROL index 568bf6ea9171ef..f554f4ef5bc3a1 100644 --- a/ports/libcopp/CONTROL +++ b/ports/libcopp/CONTROL @@ -1,5 +1,5 @@ Source: libcopp -Version: 1.3.2 +Version: 1.3.3 Description: A cross-platfrom coroutine library for C++ Maintainer: owent Homepage: https://libcopp.atframe.work/ diff --git a/ports/libcopp/portfile.cmake b/ports/libcopp/portfile.cmake index fbf0e8791be2d3..18165b3d612b3a 100644 --- a/ports/libcopp/portfile.cmake +++ b/ports/libcopp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO owt5008137/libcopp - REF c61ac3bd5f9d2a74e58a800caa7230bbe8170d8b # 1.3.2 - SHA512 e1a3e6bbff2dbe1530447300a0a65a2f142cca32e79cb43b0d7b0b4bc5a2444fe49bfdfd7017e8de5ef6f31f32d88a9d94fddb07608ed4982be929155d47183b + REF 0b77f07d25ca61ec6d10080fa75152ecb4b0a7d3 # 1.3.3 + SHA512 03a88456530f0c9973d84a2feabff89bd17ffca850b69c033e1fe9d2077042156e4b2f3352a158a8e4d5dff7640dac540b95f158bda4bb9b73441d6cba699070 HEAD_REF v2 ) From e30e0e6a414169332c789d13b583ddf5c32b0f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Thieffry?= Date: Mon, 7 Dec 2020 17:34:47 +0100 Subject: [PATCH 0259/1694] [ NASM ] Update version from 2.14.02 to 2.15.05 (#14970) * Bump NASM version from 2.14.02 to 2.15.05 The previous version is not available anymore at https://fossies.org/windows/misc/nasm-2.14.02-win32.zip . libjpeg-turbo builds fine now. * [freetds] Disable parallel configure Co-authored-by: JackBoosY --- ports/freetds/portfile.cmake | 1 + ports/freetds/vcpkg.json | 1 + scripts/cmake/vcpkg_find_acquire_program.cmake | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/freetds/portfile.cmake b/ports/freetds/portfile.cmake index 8cc487770cd698..c3f0b5f948e05a 100644 --- a/ports/freetds/portfile.cmake +++ b/ports/freetds/portfile.cmake @@ -30,6 +30,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS ${FEATURE_OPTIONS} ) diff --git a/ports/freetds/vcpkg.json b/ports/freetds/vcpkg.json index d24a72769eda7a..b653876fcb2600 100644 --- a/ports/freetds/vcpkg.json +++ b/ports/freetds/vcpkg.json @@ -1,6 +1,7 @@ { "name": "freetds", "version-string": "1.2.11", + "port-version": 1, "description": "Implementation of the Tabular Data Stream protocol", "homepage": "https://www.freetds.org", "supports": "windows & !uwp", diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 278d7e6a4f4f6a..f8fc6f6f4e2532 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -79,7 +79,7 @@ function(vcpkg_find_acquire_program VAR) set(HASH d353d3dc743ebdc6d1e9f6f2b7a6db3c387c1ce6c890bae8adc8ae5deae8404f4c5e3cf249d1e151e7256d4c5ee9cd317e6c41f3b6f244340de18a24b938e0c4) elseif(VAR MATCHES "NASM") set(PROGNAME nasm) - set(NASM_VERSION 2.14.02) + set(NASM_VERSION 2.15.05) set(PATHS ${DOWNLOADS}/tools/nasm/nasm-${NASM_VERSION}) set(BREW_PACKAGE_NAME "nasm") set(APT_PACKAGE_NAME "nasm") @@ -88,7 +88,7 @@ function(vcpkg_find_acquire_program VAR) "https://fossies.org/windows/misc/nasm-${NASM_VERSION}-win32.zip" ) set(ARCHIVE "nasm-${NASM_VERSION}-win32.zip") - set(HASH a0f16a9f3b668b086e3c4e23a33ff725998e120f2e3ccac8c28293fd4faeae6fc59398919e1b89eed7461685d2730de02f2eb83e321f73609f35bf6b17a23d1e) + set(HASH 9412b8caa07e15eac8f500f6f8fab9f038d95dc25e0124b08a80645607cf5761225f98546b52eac7b894420d64f26c3cbf22c19cd286bbe583f7c964256c97ed) elseif(VAR MATCHES "YASM") set(PROGNAME yasm) set(YASM_VERSION 1.3.0.6.g1962) From 2f3e7c95614ce2429233ca78f288f82a1763daa5 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Mon, 7 Dec 2020 09:10:23 -0800 Subject: [PATCH 0260/1694] [vcpkg] Add SemVer and Date versioning schemes (#14889) * [vcpkg] Add semver versioning scheme * Remove unnecessary code * Fix SemVer comparison and add sorting test * Add date scheme * PR comments * Use a different column for date and semver schemes. * Use locale agnostic conversion to long * Add tests for version scheme change * Validate version strings before parsing * Format * Improve error messages * PR comments * PR comments pt. 2 --- scripts/generateBaseline.py | 50 +++ toolsrc/include/vcpkg/versions.h | 44 +++ toolsrc/src/vcpkg-test/dependencies.cpp | 456 ++++++++++++++++++++++++ toolsrc/src/vcpkg/dependencies.cpp | 62 ++-- toolsrc/src/vcpkg/versions.cpp | 217 +++++++++++ 5 files changed, 803 insertions(+), 26 deletions(-) create mode 100644 scripts/generateBaseline.py diff --git a/scripts/generateBaseline.py b/scripts/generateBaseline.py new file mode 100644 index 00000000000000..45c424a7df362d --- /dev/null +++ b/scripts/generateBaseline.py @@ -0,0 +1,50 @@ +import os +import json +import subprocess +import sys + +SCRIPT_DIRECTORY = os.path.dirname(os.path.abspath(__file__)) + + +def generate_baseline(ports_path, output_filepath): + port_names = [item for item in os.listdir( + ports_path) if os.path.isdir(os.path.join(ports_path, item))] + port_names.sort() + + total = len(port_names) + baseline_versions = {} + for counter, port_name in enumerate(port_names): + vcpkg_exe = os.path.join(SCRIPT_DIRECTORY, '../vcpkg') + print(f'[{counter + 1}/{total}] Getting package info for {port_name}') + output = subprocess.run( + [vcpkg_exe, 'x-package-info', '--x-json', port_name], + capture_output=True, + encoding='utf-8') + + if output.returncode == 0: + package_info = json.loads(output.stdout) + port_info = package_info['results'][port_name] + + version = {} + for scheme in ['version-string', 'version-semver', 'version-date', 'version']: + if scheme in port_info: + version[scheme] = package_info['results'][port_name][scheme] + break + version['port-version'] = 0 + if 'port-version' in port_info: + version['port-version'] = port_info['port-version'] + baseline_versions[port_name] = version + else: + print(f'x-package-info --x-json {port_name} failed: ', output.stdout.strip(), file=sys.stderr) + + output = {} + output['default'] = baseline_versions + + with open(output_filepath, 'r') as output_file: + json.dump(baseline_versions, output_file) + sys.exit(0) + + +if __name__ == '__main__': + generate_baseline( + ports_path=f'{SCRIPT_DIRECTORY}/../ports', output_filepath='baseline.json') diff --git a/toolsrc/include/vcpkg/versions.h b/toolsrc/include/vcpkg/versions.h index 09df1536665b2e..19b5546eaf2c10 100644 --- a/toolsrc/include/vcpkg/versions.h +++ b/toolsrc/include/vcpkg/versions.h @@ -6,6 +6,14 @@ namespace vcpkg::Versions { using Version = VersionT; + enum class VerComp + { + unk, + lt, + eq, + gt, + }; + enum class Scheme { Relaxed, @@ -32,6 +40,42 @@ namespace vcpkg::Versions std::size_t operator()(const VersionSpec& key) const; }; + struct RelaxedVersion + { + std::string original_string; + std::vector version; + + static ExpectedS from_string(const std::string& str); + }; + + struct SemanticVersion + { + std::string original_string; + std::string version_string; + std::string prerelease_string; + + std::vector version; + std::vector identifiers; + + static ExpectedS from_string(const std::string& str); + }; + + struct DateVersion + { + std::string original_string; + std::string version_string; + std::string identifiers_string; + + std::vector identifiers; + + static ExpectedS from_string(const std::string& str); + }; + + VerComp compare(const std::string& a, const std::string& b, Scheme scheme); + VerComp compare(const RelaxedVersion& a, const RelaxedVersion& b); + VerComp compare(const SemanticVersion& a, const SemanticVersion& b); + VerComp compare(const DateVersion& a, const DateVersion& b); + struct Constraint { enum class Type diff --git a/toolsrc/src/vcpkg-test/dependencies.cpp b/toolsrc/src/vcpkg-test/dependencies.cpp index bcc2f14a070d6e..2aae7fffacf818 100644 --- a/toolsrc/src/vcpkg-test/dependencies.cpp +++ b/toolsrc/src/vcpkg-test/dependencies.cpp @@ -121,6 +121,42 @@ static void check_name_and_version(const Dependencies::InstallPlanAction& ipa, } } +static void check_semver_version(const ExpectedS& maybe_version, + const std::string& version_string, + const std::string& prerelease_string, + uint64_t major, + uint64_t minor, + uint64_t patch, + const std::vector& identifiers) +{ + auto actual_version = unwrap(maybe_version); + CHECK(actual_version.version_string == version_string); + CHECK(actual_version.prerelease_string == prerelease_string); + REQUIRE(actual_version.version.size() == 3); + CHECK(actual_version.version[0] == major); + CHECK(actual_version.version[1] == minor); + CHECK(actual_version.version[2] == patch); + CHECK(actual_version.identifiers == identifiers); +} + +static void check_relaxed_version(const ExpectedS& maybe_version, + const std::vector& version) +{ + auto actual_version = unwrap(maybe_version); + CHECK(actual_version.version == version); +} + +static void check_date_version(const ExpectedS& maybe_version, + const std::string& version_string, + const std::string& identifiers_string, + const std::vector& identifiers) +{ + auto actual_version = unwrap(maybe_version); + CHECK(actual_version.version_string == version_string); + CHECK(actual_version.identifiers_string == identifiers_string); + CHECK(actual_version.identifiers == identifiers); +} + static const PackageSpec& toplevel_spec() { static const PackageSpec ret("toplevel-spec", Test::X86_WINDOWS); @@ -506,6 +542,426 @@ TEST_CASE ("version install diamond relaxed", "[versionplan]") check_name_and_version(install_plan.install_actions[2], "a", {"3", 0}); } +TEST_CASE ("version parse semver", "[versionplan]") +{ + auto version_basic = Versions::SemanticVersion::from_string("1.2.3"); + check_semver_version(version_basic, "1.2.3", "", 1, 2, 3, {}); + + auto version_simple_tag = Versions::SemanticVersion::from_string("1.0.0-alpha"); + check_semver_version(version_simple_tag, "1.0.0", "alpha", 1, 0, 0, {"alpha"}); + + auto version_alphanumeric_tag = Versions::SemanticVersion::from_string("1.0.0-0alpha0"); + check_semver_version(version_alphanumeric_tag, "1.0.0", "0alpha0", 1, 0, 0, {"0alpha0"}); + + auto version_complex_tag = Versions::SemanticVersion::from_string("1.0.0-alpha.1.0.0"); + check_semver_version(version_complex_tag, "1.0.0", "alpha.1.0.0", 1, 0, 0, {"alpha", "1", "0", "0"}); + + auto version_complexer_tag = Versions::SemanticVersion::from_string("1.0.0-alpha.1.x.y.z.0-alpha.0-beta.l-a-s-t"); + check_semver_version(version_complexer_tag, + "1.0.0", + "alpha.1.x.y.z.0-alpha.0-beta.l-a-s-t", + 1, + 0, + 0, + {"alpha", "1", "x", "y", "z", "0-alpha", "0-beta", "l-a-s-t"}); + + auto version_ridiculous_tag = Versions::SemanticVersion::from_string("1.0.0----------------------------------"); + check_semver_version(version_ridiculous_tag, + "1.0.0", + "---------------------------------", + 1, + 0, + 0, + {"---------------------------------"}); + + auto version_build_tag = Versions::SemanticVersion::from_string("1.0.0+build"); + check_semver_version(version_build_tag, "1.0.0", "", 1, 0, 0, {}); + + auto version_prerelease_build_tag = Versions::SemanticVersion::from_string("1.0.0-alpha+build"); + check_semver_version(version_prerelease_build_tag, "1.0.0", "alpha", 1, 0, 0, {"alpha"}); + + auto version_invalid_incomplete = Versions::SemanticVersion::from_string("1.0-alpha"); + CHECK(!version_invalid_incomplete.has_value()); + + auto version_invalid_leading_zeroes = Versions::SemanticVersion::from_string("1.02.03-alpha+build"); + CHECK(!version_invalid_leading_zeroes.has_value()); + + auto version_invalid_leading_zeroes_in_tag = Versions::SemanticVersion::from_string("1.0.0-01"); + CHECK(!version_invalid_leading_zeroes_in_tag.has_value()); + + auto version_invalid_characters = Versions::SemanticVersion::from_string("1.0.0-alpha#2"); + CHECK(!version_invalid_characters.has_value()); +} + +TEST_CASE ("version parse relaxed", "[versionplan]") +{ + auto version_basic = Versions::RelaxedVersion::from_string("1.2.3"); + check_relaxed_version(version_basic, {1, 2, 3}); + + auto version_short = Versions::RelaxedVersion::from_string("1"); + check_relaxed_version(version_short, {1}); + + auto version_long = + Versions::RelaxedVersion::from_string("1.20.300.4000.50000.6000000.70000000.80000000.18446744073709551610"); + check_relaxed_version(version_long, {1, 20, 300, 4000, 50000, 6000000, 70000000, 80000000, 18446744073709551610}); + + auto version_invalid_characters = Versions::RelaxedVersion::from_string("1.a.0"); + CHECK(!version_invalid_characters.has_value()); + + auto version_invalid_identifiers_2 = Versions::RelaxedVersion::from_string("1.1a.2"); + CHECK(!version_invalid_identifiers_2.has_value()); + + auto version_invalid_leading_zeroes = Versions::RelaxedVersion::from_string("01.002.003"); + CHECK(!version_invalid_leading_zeroes.has_value()); +} + +TEST_CASE ("version parse date", "[versionplan]") +{ + auto version_basic = Versions::DateVersion::from_string("2020-12-25"); + check_date_version(version_basic, "2020-12-25", "", {}); + + auto version_identifiers = Versions::DateVersion::from_string("2020-12-25.1.2.3"); + check_date_version(version_identifiers, "2020-12-25", "1.2.3", {1, 2, 3}); + + auto version_invalid_date = Versions::DateVersion::from_string("2020-1-1"); + CHECK(!version_invalid_date.has_value()); + + auto version_invalid_identifiers = Versions::DateVersion::from_string("2020-01-01.alpha"); + CHECK(!version_invalid_identifiers.has_value()); + + auto version_invalid_identifiers_2 = Versions::DateVersion::from_string("2020-01-01.2a"); + CHECK(!version_invalid_identifiers_2.has_value()); + + auto version_invalid_leading_zeroes = Versions::DateVersion::from_string("2020-01-01.01"); + CHECK(!version_invalid_leading_zeroes.has_value()); +} + +TEST_CASE ("version sort semver", "[versionplan]") +{ + std::vector versions{unwrap(Versions::SemanticVersion::from_string("1.0.0")), + unwrap(Versions::SemanticVersion::from_string("0.0.0")), + unwrap(Versions::SemanticVersion::from_string("1.1.0")), + unwrap(Versions::SemanticVersion::from_string("2.0.0")), + unwrap(Versions::SemanticVersion::from_string("1.1.1")), + unwrap(Versions::SemanticVersion::from_string("1.0.1")), + unwrap(Versions::SemanticVersion::from_string("1.0.0-alpha.1")), + unwrap(Versions::SemanticVersion::from_string("1.0.0-beta")), + unwrap(Versions::SemanticVersion::from_string("1.0.0-alpha")), + unwrap(Versions::SemanticVersion::from_string("1.0.0-alpha.beta")), + unwrap(Versions::SemanticVersion::from_string("1.0.0-rc")), + unwrap(Versions::SemanticVersion::from_string("1.0.0-beta.2")), + unwrap(Versions::SemanticVersion::from_string("1.0.0-beta.20")), + unwrap(Versions::SemanticVersion::from_string("1.0.0-beta.3")), + unwrap(Versions::SemanticVersion::from_string("1.0.0-1")), + unwrap(Versions::SemanticVersion::from_string("1.0.0-0alpha"))}; + + std::sort(std::begin(versions), std::end(versions), [](const auto& lhs, const auto& rhs) -> bool { + return Versions::compare(lhs, rhs) == Versions::VerComp::lt; + }); + + CHECK(versions[0].original_string == "0.0.0"); + CHECK(versions[1].original_string == "1.0.0-1"); + CHECK(versions[2].original_string == "1.0.0-0alpha"); + CHECK(versions[3].original_string == "1.0.0-alpha"); + CHECK(versions[4].original_string == "1.0.0-alpha.1"); + CHECK(versions[5].original_string == "1.0.0-alpha.beta"); + CHECK(versions[6].original_string == "1.0.0-beta"); + CHECK(versions[7].original_string == "1.0.0-beta.2"); + CHECK(versions[8].original_string == "1.0.0-beta.3"); + CHECK(versions[9].original_string == "1.0.0-beta.20"); + CHECK(versions[10].original_string == "1.0.0-rc"); + CHECK(versions[11].original_string == "1.0.0"); + CHECK(versions[12].original_string == "1.0.1"); + CHECK(versions[13].original_string == "1.1.0"); + CHECK(versions[14].original_string == "1.1.1"); + CHECK(versions[15].original_string == "2.0.0"); +} + +TEST_CASE ("version sort relaxed", "[versionplan]") +{ + std::vector versions{unwrap(Versions::RelaxedVersion::from_string("1.0.0")), + unwrap(Versions::RelaxedVersion::from_string("1.0")), + unwrap(Versions::RelaxedVersion::from_string("1")), + unwrap(Versions::RelaxedVersion::from_string("2")), + unwrap(Versions::RelaxedVersion::from_string("1.1")), + unwrap(Versions::RelaxedVersion::from_string("1.10.1")), + unwrap(Versions::RelaxedVersion::from_string("1.0.1")), + unwrap(Versions::RelaxedVersion::from_string("1.0.0.1")), + unwrap(Versions::RelaxedVersion::from_string("1.0.0.2"))}; + + std::sort(std::begin(versions), std::end(versions), [](const auto& lhs, const auto& rhs) -> bool { + return Versions::compare(lhs, rhs) == Versions::VerComp::lt; + }); + + CHECK(versions[0].original_string == "1"); + CHECK(versions[1].original_string == "1.0"); + CHECK(versions[2].original_string == "1.0.0"); + CHECK(versions[3].original_string == "1.0.0.1"); + CHECK(versions[4].original_string == "1.0.0.2"); + CHECK(versions[5].original_string == "1.0.1"); + CHECK(versions[6].original_string == "1.1"); + CHECK(versions[7].original_string == "1.10.1"); + CHECK(versions[8].original_string == "2"); +} + +TEST_CASE ("version sort date", "[versionplan]") +{ + std::vector versions{unwrap(Versions::DateVersion::from_string("2021-01-01.2")), + unwrap(Versions::DateVersion::from_string("2021-01-01.1")), + unwrap(Versions::DateVersion::from_string("2021-01-01.1.1")), + unwrap(Versions::DateVersion::from_string("2021-01-01.1.0")), + unwrap(Versions::DateVersion::from_string("2021-01-01")), + unwrap(Versions::DateVersion::from_string("2021-01-01")), + unwrap(Versions::DateVersion::from_string("2020-12-25")), + unwrap(Versions::DateVersion::from_string("2020-12-31")), + unwrap(Versions::DateVersion::from_string("2021-01-01.10"))}; + + std::sort(std::begin(versions), std::end(versions), [](const auto& lhs, const auto& rhs) -> bool { + return Versions::compare(lhs, rhs) == Versions::VerComp::lt; + }); + + CHECK(versions[0].original_string == "2020-12-25"); + CHECK(versions[1].original_string == "2020-12-31"); + CHECK(versions[2].original_string == "2021-01-01"); + CHECK(versions[3].original_string == "2021-01-01"); + CHECK(versions[4].original_string == "2021-01-01.1"); + CHECK(versions[5].original_string == "2021-01-01.1.0"); + CHECK(versions[6].original_string == "2021-01-01.1.1"); + CHECK(versions[7].original_string == "2021-01-01.2"); + CHECK(versions[8].original_string == "2021-01-01.10"); +} + +TEST_CASE ("version install simple semver", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"2.0.0", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"2.0.0", 0}, Scheme::Semver); + vp.emplace("a", {"3.0.0", 0}, Scheme::Semver); + + MockCMakeVarProvider var_provider; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan( + vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3.0.0", 0}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"3.0.0", 0}); +} + +TEST_CASE ("version install transitive semver", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"2.0.0", 0}; + bp.v["b"] = {"2.0.0", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"2.0.0", 0}, Scheme::Semver); + vp.emplace("a", {"3.0.0", 0}, Scheme::Semver).source_control_file->core_paragraph->dependencies = { + Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "3.0.0"}}, + }; + vp.emplace("b", {"2.0.0", 0}, Scheme::Semver); + vp.emplace("b", {"3.0.0", 0}, Scheme::Semver); + + MockCMakeVarProvider var_provider; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan( + vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3.0.0", 0}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "b", {"3.0.0", 0}); + check_name_and_version(install_plan.install_actions[1], "a", {"3.0.0", 0}); +} + +TEST_CASE ("version install diamond semver", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"2.0.0", 0}; + bp.v["b"] = {"3.0.0", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"2.0.0", 0}, Scheme::Semver); + vp.emplace("a", {"3.0.0", 0}, Scheme::Semver).source_control_file->core_paragraph->dependencies = { + Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "2.0.0", 1}}, + Dependency{"c", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "5.0.0", 1}}, + }; + vp.emplace("b", {"2.0.0", 1}, Scheme::Semver); + vp.emplace("b", {"3.0.0", 0}, Scheme::Semver).source_control_file->core_paragraph->dependencies = { + Dependency{"c", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "9.0.0", 2}}, + }; + vp.emplace("c", {"5.0.0", 1}, Scheme::Semver); + vp.emplace("c", {"9.0.0", 2}, Scheme::Semver); + + MockCMakeVarProvider var_provider; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan( + vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3.0.0", 0}}, + Dependency{"b", {}, {}, {Constraint::Type::Minimum, "2.0.0", 1}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 3); + check_name_and_version(install_plan.install_actions[0], "c", {"9.0.0", 2}); + check_name_and_version(install_plan.install_actions[1], "b", {"3.0.0", 0}); + check_name_and_version(install_plan.install_actions[2], "a", {"3.0.0", 0}); +} + +TEST_CASE ("version install simple date", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"2020-02-01", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"2020-02-01", 0}, Scheme::Date); + vp.emplace("a", {"2020-03-01", 0}, Scheme::Date); + + MockCMakeVarProvider var_provider; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan( + vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2020-03-01", 0}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"2020-03-01", 0}); +} + +TEST_CASE ("version install transitive date", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"2020-01-01.2", 0}; + bp.v["b"] = {"2020-01-01.3", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"2020-01-01.2", 0}, Scheme::Date); + vp.emplace("a", {"2020-01-01.3", 0}, Scheme::Date).source_control_file->core_paragraph->dependencies = { + Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "2020-01-01.3"}}, + }; + vp.emplace("b", {"2020-01-01.2", 0}, Scheme::Date); + vp.emplace("b", {"2020-01-01.3", 0}, Scheme::Date); + + MockCMakeVarProvider var_provider; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan( + vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2020-01-01.3", 0}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "b", {"2020-01-01.3", 0}); + check_name_and_version(install_plan.install_actions[1], "a", {"2020-01-01.3", 0}); +} + +TEST_CASE ("version install diamond date", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"2020-01-02", 0}; + bp.v["b"] = {"2020-01-03", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"2020-01-02", 0}, Scheme::Date); + vp.emplace("a", {"2020-01-03", 0}, Scheme::Date).source_control_file->core_paragraph->dependencies = { + Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "2020-01-02", 1}}, + Dependency{"c", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "2020-01-05", 1}}, + }; + vp.emplace("b", {"2020-01-02", 1}, Scheme::Date); + vp.emplace("b", {"2020-01-03", 0}, Scheme::Date).source_control_file->core_paragraph->dependencies = { + Dependency{"c", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "2020-01-09", 2}}, + }; + vp.emplace("c", {"2020-01-05", 1}, Scheme::Date); + vp.emplace("c", {"2020-01-09", 2}, Scheme::Date); + + MockCMakeVarProvider var_provider; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan( + vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2020-01-03", 0}}, + Dependency{"b", {}, {}, {Constraint::Type::Minimum, "2020-01-02", 1}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 3); + check_name_and_version(install_plan.install_actions[0], "c", {"2020-01-09", 2}); + check_name_and_version(install_plan.install_actions[1], "b", {"2020-01-03", 0}); + check_name_and_version(install_plan.install_actions[2], "a", {"2020-01-03", 0}); +} + +TEST_CASE ("version install scheme failure", "[versionplan]") +{ + MockVersionedPortfileProvider vp; + vp.emplace("a", {"1.0.0", 0}, Scheme::Semver); + vp.emplace("a", {"1.0.1", 0}, Scheme::Relaxed); + vp.emplace("a", {"1.0.2", 0}, Scheme::Semver); + + MockCMakeVarProvider var_provider; + + SECTION ("lower baseline") + { + MockBaselineProvider bp; + bp.v["a"] = {"1.0.0", 0}; + + auto install_plan = Dependencies::create_versioned_install_plan( + vp, + bp, + var_provider, + {Dependency{"a", {}, {}, {Constraint::Type::Minimum, "1.0.1", 0}}}, + {}, + toplevel_spec()); + + REQUIRE(!install_plan.error().empty()); + CHECK(install_plan.error() == "Version conflict on a@1.0.1: baseline required 1.0.0"); + } + SECTION ("higher baseline") + { + MockBaselineProvider bp; + bp.v["a"] = {"1.0.2", 0}; + + auto install_plan = Dependencies::create_versioned_install_plan( + vp, + bp, + var_provider, + {Dependency{"a", {}, {}, {Constraint::Type::Minimum, "1.0.1", 0}}}, + {}, + toplevel_spec()); + + REQUIRE(!install_plan.error().empty()); + CHECK(install_plan.error() == "Version conflict on a@1.0.1: baseline required 1.0.2"); + } +} + TEST_CASE ("version install scheme change in port version", "[versionplan]") { MockVersionedPortfileProvider vp; diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index 7d69becdf5b31e..e7768f2bfd4dbd 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -1215,6 +1215,8 @@ namespace vcpkg::Dependencies std::map vermap; std::map exacts; Optional> relaxed; + Optional> semver; + Optional> date; std::set features; bool default_features = true; @@ -1271,6 +1273,30 @@ namespace vcpkg::Dependencies vsi = relaxed.get()->get(); } } + else if (scheme == Versions::Scheme::Semver) + { + if (auto p = semver.get()) + { + vsi = p->get(); + } + else + { + semver = std::make_unique(); + vsi = semver.get()->get(); + } + } + else if (scheme == Versions::Scheme::Date) + { + if (auto p = date.get()) + { + vsi = p->get(); + } + else + { + date = std::make_unique(); + vsi = date.get()->get(); + } + } else { // not implemented @@ -1287,40 +1313,24 @@ namespace vcpkg::Dependencies return it == vermap.end() ? nullptr : it->second; } - enum class VerComp - { - unk, - lt, - eq, - gt, - }; + using Versions::VerComp; + static VerComp compare_versions(Versions::Scheme sa, const Versions::Version& a, Versions::Scheme sb, const Versions::Version& b) { if (sa != sb) return VerComp::unk; - switch (sa) + + if (a.text() != b.text()) { - case Versions::Scheme::String: - { - if (a.text() != b.text()) return VerComp::unk; - if (a.port_version() < b.port_version()) return VerComp::lt; - if (a.port_version() > b.port_version()) return VerComp::gt; - return VerComp::eq; - } - case Versions::Scheme::Relaxed: - { - auto i1 = atoi(a.text().c_str()); - auto i2 = atoi(b.text().c_str()); - if (i1 < i2) return VerComp::lt; - if (i1 > i2) return VerComp::gt; - if (a.port_version() < b.port_version()) return VerComp::lt; - if (a.port_version() > b.port_version()) return VerComp::gt; - return VerComp::eq; - } - default: Checks::unreachable(VCPKG_LINE_INFO); + auto result = Versions::compare(a.text(), b.text(), sa); + if (result != VerComp::eq) return result; } + + if (a.port_version() < b.port_version()) return VerComp::lt; + if (a.port_version() > b.port_version()) return VerComp::gt; + return VerComp::eq; } bool VersionedPackageGraph::VersionSchemeInfo::is_less_than(const Versions::Version& new_ver) const diff --git a/toolsrc/src/vcpkg/versions.cpp b/toolsrc/src/vcpkg/versions.cpp index 7f19813ec07562..5ea2a8182e5f73 100644 --- a/toolsrc/src/vcpkg/versions.cpp +++ b/toolsrc/src/vcpkg/versions.cpp @@ -1,7 +1,29 @@ +#include + #include +#include + namespace vcpkg::Versions { + namespace + { + Optional as_numeric(StringView str) + { + uint64_t res = 0; + size_t digits = 0; + for (auto&& ch : str) + { + uint64_t digit_value = static_cast(ch) - static_cast('0'); + if (digit_value > 9) return nullopt; + if (res > std::numeric_limits::max() / 10 - digit_value) return nullopt; + ++digits; + res = res * 10 + digit_value; + } + return res; + } + } + VersionSpec::VersionSpec(const std::string& port_name, const VersionT& version) : port_name(port_name), version(version) { @@ -27,4 +49,199 @@ namespace vcpkg::Versions return hash()(key.port_name) ^ (hash()(key.version.to_string()) >> 1); } + + ExpectedS RelaxedVersion::from_string(const std::string& str) + { + std::regex relaxed_scheme_match("^(0|[1-9][0-9]*)(\\.(0|[1-9][0-9]*))*"); + + if (!std::regex_match(str, relaxed_scheme_match)) + { + return Strings::format( + "Error: String `%s` must only contain dot-separated numeric values without leading zeroes.", str); + } + + return RelaxedVersion{str, Util::fmap(Strings::split(str, '.'), [](auto&& strval) -> uint64_t { + return as_numeric(strval).value_or_exit(VCPKG_LINE_INFO); + })}; + } + + ExpectedS SemanticVersion::from_string(const std::string& str) + { + // Suggested regex by semver.org + std::regex semver_scheme_match("^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)" + "(?:-((?:0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9][0-9]*|[0-9]" + "*[a-zA-Z-][0-9a-zA-Z-]*))*))?" + "(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"); + + if (!std::regex_match(str, semver_scheme_match)) + { + return Strings::format( + "Error: String `%s` is not a valid Semantic Version string, consult https://semver.org", str); + } + + SemanticVersion ret; + ret.original_string = str; + ret.version_string = str; + + auto build_found = ret.version_string.find('+'); + if (build_found != std::string::npos) + { + ret.version_string.resize(build_found); + } + + auto prerelease_found = ret.version_string.find('-'); + if (prerelease_found != std::string::npos) + { + ret.prerelease_string = ret.version_string.substr(prerelease_found + 1); + ret.identifiers = Strings::split(ret.prerelease_string, '.'); + ret.version_string.resize(prerelease_found); + } + + std::regex version_match("(0|[1-9][0-9]*)(\\.(0|[1-9][0-9]*)){2}"); + if (!std::regex_match(ret.version_string, version_match)) + { + return Strings::format("Error: String `%s` does not follow the required MAJOR.MINOR.PATCH format.", + ret.version_string); + } + + auto parts = Strings::split(ret.version_string, '.'); + ret.version = Util::fmap( + parts, [](auto&& strval) -> uint64_t { return as_numeric(strval).value_or_exit(VCPKG_LINE_INFO); }); + + return ret; + } + + ExpectedS DateVersion::from_string(const std::string& str) + { + std::regex date_scheme_match("([0-9]{4}-[0-9]{2}-[0-9]{2})(\\.(0|[1-9][0-9]*))*"); + if (!std::regex_match(str, date_scheme_match)) + { + return Strings::format("Error: String `%s` is not a valid date version." + "Date section must follow the format YYYY-MM-DD and disambiguators must be " + "dot-separated positive integer values without leading zeroes.", + str); + } + + DateVersion ret; + ret.original_string = str; + ret.version_string = str; + + auto identifiers_found = ret.version_string.find('.'); + if (identifiers_found != std::string::npos) + { + ret.identifiers_string = ret.version_string.substr(identifiers_found + 1); + ret.identifiers = Util::fmap(Strings::split(ret.identifiers_string, '.'), [](auto&& strval) -> uint64_t { + return as_numeric(strval).value_or_exit(VCPKG_LINE_INFO); + }); + ret.version_string.resize(identifiers_found); + } + + return ret; + } + + VerComp compare(const std::string& a, const std::string& b, Scheme scheme) + { + if (scheme == Scheme::String) + { + return (a == b) ? VerComp::eq : VerComp::unk; + } + if (scheme == Scheme::Semver) + { + return compare(SemanticVersion::from_string(a).value_or_exit(VCPKG_LINE_INFO), + SemanticVersion::from_string(b).value_or_exit(VCPKG_LINE_INFO)); + } + if (scheme == Scheme::Relaxed) + { + return compare(RelaxedVersion::from_string(a).value_or_exit(VCPKG_LINE_INFO), + RelaxedVersion::from_string(b).value_or_exit(VCPKG_LINE_INFO)); + } + if (scheme == Scheme::Date) + { + return compare(DateVersion::from_string(a).value_or_exit(VCPKG_LINE_INFO), + DateVersion::from_string(b).value_or_exit(VCPKG_LINE_INFO)); + } + Checks::unreachable(VCPKG_LINE_INFO); + } + + VerComp compare(const RelaxedVersion& a, const RelaxedVersion& b) + { + if (a.original_string == b.original_string) return VerComp::eq; + + if (a.version < b.version) return VerComp::lt; + if (a.version > b.version) return VerComp::gt; + Checks::unreachable(VCPKG_LINE_INFO); + } + + VerComp compare(const SemanticVersion& a, const SemanticVersion& b) + { + if (a.version_string == b.version_string) + { + if (a.prerelease_string == b.prerelease_string) return VerComp::eq; + if (a.prerelease_string.empty()) return VerComp::gt; + if (b.prerelease_string.empty()) return VerComp::lt; + } + + // Compare version elements left-to-right. + if (a.version < b.version) return VerComp::lt; + if (a.version > b.version) return VerComp::gt; + + // Compare identifiers left-to-right. + auto count = std::min(a.identifiers.size(), b.identifiers.size()); + for (size_t i = 0; i < count; ++i) + { + auto&& iden_a = a.identifiers[i]; + auto&& iden_b = b.identifiers[i]; + + auto a_numeric = as_numeric(iden_a); + auto b_numeric = as_numeric(iden_b); + + // Numeric identifiers always have lower precedence than non-numeric identifiers. + if (a_numeric.has_value() && !b_numeric.has_value()) return VerComp::lt; + if (!a_numeric.has_value() && b_numeric.has_value()) return VerComp::gt; + + // Identifiers consisting of only digits are compared numerically. + if (a_numeric.has_value() && b_numeric.has_value()) + { + auto a_value = a_numeric.value_or_exit(VCPKG_LINE_INFO); + auto b_value = b_numeric.value_or_exit(VCPKG_LINE_INFO); + + if (a_value < b_value) return VerComp::lt; + if (a_value > b_value) return VerComp::gt; + continue; + } + + // Identifiers with letters or hyphens are compared lexically in ASCII sort order. + auto strcmp_result = std::strcmp(iden_a.c_str(), iden_b.c_str()); + if (strcmp_result < 0) return VerComp::lt; + if (strcmp_result > 0) return VerComp::gt; + } + + // A larger set of pre-release fields has a higher precedence than a smaller set, if all of the preceding + // identifiers are equal. + if (a.identifiers.size() < b.identifiers.size()) return VerComp::lt; + if (a.identifiers.size() > b.identifiers.size()) return VerComp::gt; + + // This should be unreachable since direct string comparisons of version_string and prerelease_string should + // handle this case. If we ever land here, then there's a bug in the the parsing on + // SemanticVersion::from_string(). + Checks::unreachable(VCPKG_LINE_INFO); + } + + VerComp compare(const Versions::DateVersion& a, const Versions::DateVersion& b) + { + if (a.version_string == b.version_string) + { + if (a.identifiers_string == b.identifiers_string) return VerComp::eq; + if (a.identifiers_string.empty() && !b.identifiers_string.empty()) return VerComp::lt; + if (!a.identifiers_string.empty() && b.identifiers_string.empty()) return VerComp::gt; + } + + // The date parts in our scheme is lexicographically sortable. + if (a.version_string < b.version_string) return VerComp::lt; + if (a.version_string > b.version_string) return VerComp::gt; + if (a.identifiers < b.identifiers) return VerComp::lt; + if (a.identifiers > b.identifiers) return VerComp::gt; + + Checks::unreachable(VCPKG_LINE_INFO); + } } \ No newline at end of file From e4a01db3729b70c980c72a06b4c5372b280613e4 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 7 Dec 2020 11:17:46 -0800 Subject: [PATCH 0261/1694] 2020-12-07 Build Fixes (#14986) From most recent completed nightly build: https://dev.azure.com/vcpkg/public/_build/results?buildId=46182 PASSING, REMOVE FROM FAIL LIST: ignition-msgs5:x64-linux (.\scripts\ci.baseline.txt) I'm assuming this got fixed by @strega-nil 's llvm changes: https://github.com/microsoft/vcpkg/pull/14399 PASSING, REMOVE FROM FAIL LIST: libraqm:x64-windows-static (.\scripts\ci.baseline.txt) Cause unknown. PASSING, REMOVE FROM FAIL LIST: openssl-windows:arm-uwp (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: openssl-windows:x64-uwp (.\scripts\ci.baseline.txt) Probably fixed by https://github.com/microsoft/vcpkg/pull/14308 ; also removed Supports: excluded entries for these. PASSING, REMOVE FROM FAIL LIST: speexdsp:x64-osx (.\scripts\ci.baseline.txt) Probably fixed by https://github.com/microsoft/vcpkg/pull/14758 PASSING, REMOVE FROM FAIL LIST: sundials:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: sundials:x64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: sundials:x86-windows (.\scripts\ci.baseline.txt) Probably fixed by https://github.com/microsoft/vcpkg/pull/14618 PASSING, REMOVE FROM FAIL LIST: wepoll:arm-uwp (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: wepoll:x64-uwp (.\scripts\ci.baseline.txt) Probably fixed by https://github.com/microsoft/vcpkg/pull/14456 -- and also fixed missing Supports. REGRESSION: ceres:x64-windows. If expected, add ceres:x64-windows=fail to .\scripts\ci.baseline.txt. REGRESSION: ceres:x86-windows. If expected, add ceres:x86-windows=fail to .\scripts\ci.baseline.txt. Probably broken by https://github.com/microsoft/vcpkg/pull/14719 ; ceres has: ``` if (BUILD_BENCHMARKS) find_package(benchmark QUIET) if (benchmark_FOUND) message("-- Found Google benchmark library. Building Ceres benchmarks.") else() message("-- Failed to find Google benchmark library, disabling build of benchmarks.") update_cache_variable(BUILD_BENCHMARKS OFF) endif() mark_as_advanced(benchmark_DIR) endif() ``` so it passed there because Google Benchmark was not also installed. Worked around by `-DBUILD_BENCHMARKS=OFF`. REGRESSION: dirent:arm64-windows. If expected, add dirent:arm64-windows=fail to .\scripts\ci.baseline.txt. Transient: ``` -- Downloading https://github.com/tronkko/dirent/archive/1.23.2.tar.gz... -- Downloading https://github.com/tronkko/dirent/archive/1.23.2.tar.gz... Failed. Status: 28;"Timeout was reached" CMake Error at scripts/cmake/vcpkg_download_distfile.cmake:184 (message): ``` REGRESSION: discord-rpc:arm64-windows. If expected, add discord-rpc:arm64-windows=fail to .\scripts\ci.baseline.txt. Transient: ``` -- Downloading https://github.com/discordapp/discord-rpc/archive/v3.4.0.tar.gz... -- Downloading https://github.com/discordapp/discord-rpc/archive/v3.4.0.tar.gz... Failed. Status: 28;"Timeout was reached" CMake Error at scripts/cmake/vcpkg_download_distfile.cmake:184 (message): ``` REGRESSION: libunibreak:x86-windows. If expected, add libunibreak:x86-windows=fail to .\scripts\ci.baseline.txt. Transient: ``` -- Note: libunibreak only supports static library linkage. Building static library. -- Downloading https://github.com/adah1972/libunibreak/archive/8df6ef4ebe5dbd2a49539d05366337ab7fb57ae3.tar.gz... -- Downloading https://github.com/adah1972/libunibreak/archive/8df6ef4ebe5dbd2a49539d05366337ab7fb57ae3.tar.gz... Failed. Status: 28;"Timeout was reached" ``` REGRESSION: libzip:x86-windows. If expected, add libzip:x86-windows=fail to .\scripts\ci.baseline.txt. Transient: ``` -- Downloading https://github.com/nih-at/libzip/archive/66e496489bdae81bfda8b0088172871d8fda0032.tar.gz... -- Downloading https://github.com/nih-at/libzip/archive/66e496489bdae81bfda8b0088172871d8fda0032.tar.gz... Failed. Status: 28;"Timeout was reached" CMake Error at scripts/cmake/vcpkg_download_distfile.cmake:184 (message): ``` REGRESSION: ocilib:x64-windows-static. If expected, add ocilib:x64-windows-static=fail to .\scripts\ci.baseline.txt. Probably broken by https://github.com/microsoft/vcpkg/pull/13158 but it passed there: (Link target) -> chromium_base.lib(stack_trace_win.obj) : error LNK2001: unresolved external symbol __imp_SymCleanup [D:\buildtrees\ocilib\x64-windows-static-rel\4fc7a69e6d-337dbe59ca.clean\proj\dll\ocilib_dll_vs2019.vcxproj] Looks like it was skipped before that PR because the port conflicts with chromium-base which couldn't have been caught in that PR. Putting it back on ci.baseline.txt. REGRESSION: osgearth:x64-windows. If expected, add osgearth:x64-windows=fail to .\scripts\ci.baseline.txt. REGRESSION: osgearth:x86-windows. If expected, add osgearth:x86-windows=fail to .\scripts\ci.baseline.txt. Cause unknown. I think we should skip this one in ci.baseline.txt since I've never seen it work OK. REGRESSION: qt5-tools:x64-windows-static. If expected, add qt5-tools:x64-windows-static=fail to .\scripts\ci.baseline.txt. Last I heard @ras0219 was investigating this one but that's been a while now. I pinged him again. --- ports/ceres/CONTROL | 24 ------------------ ports/ceres/portfile.cmake | 1 + ports/ceres/vcpkg.json | 52 ++++++++++++++++++++++++++++++++++++++ ports/wepoll/CONTROL | 4 --- ports/wepoll/vcpkg.json | 8 ++++++ scripts/ci.baseline.txt | 20 ++------------- 6 files changed, 63 insertions(+), 46 deletions(-) delete mode 100644 ports/ceres/CONTROL create mode 100644 ports/ceres/vcpkg.json delete mode 100644 ports/wepoll/CONTROL create mode 100644 ports/wepoll/vcpkg.json diff --git a/ports/ceres/CONTROL b/ports/ceres/CONTROL deleted file mode 100644 index 2ad6f31be325fb..00000000000000 --- a/ports/ceres/CONTROL +++ /dev/null @@ -1,24 +0,0 @@ -Source: ceres -Version: 2.0.0 -Build-Depends: glog, eigen3 -Homepage: https://github.com/ceres-solver/ceres-solver -Description: non-linear optimization package - -Feature: lapack -Build-Depends: lapack -Description: Use Lapack in Ceres - -Feature: suitesparse -Build-Depends: ceres[lapack], suitesparse[core] -Description: SuiteSparse support for Ceres - -Feature: cxsparse -Build-Depends: suitesparse[core] -Description: CXSparse support for Ceres - -Feature: eigensparse -Description: Use of Eigen as a sparse linear algebra library in Ceres - -Feature: tools -Build-Depends: gflags -Description: Ceres tools diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index c1dca74a95e966..d106217e627fa7 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -38,6 +38,7 @@ vcpkg_configure_cmake( OPTIONS ${FEATURE_OPTIONS} -DEXPORT_BUILD_DIR=ON + -DBUILD_BENCHMARKS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT_VALUE} diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json new file mode 100644 index 00000000000000..7a717783396a54 --- /dev/null +++ b/ports/ceres/vcpkg.json @@ -0,0 +1,52 @@ +{ + "name": "ceres", + "version-string": "2.0.0", + "port-version": 1, + "description": "non-linear optimization package", + "homepage": "https://github.com/ceres-solver/ceres-solver", + "dependencies": [ + "eigen3", + "glog" + ], + "features": { + "cxsparse": { + "description": "CXSparse support for Ceres", + "dependencies": [ + { + "name": "suitesparse", + "default-features": false + } + ] + }, + "eigensparse": { + "description": "Use of Eigen as a sparse linear algebra library in Ceres" + }, + "lapack": { + "description": "Use Lapack in Ceres", + "dependencies": [ + "lapack" + ] + }, + "suitesparse": { + "description": "SuiteSparse support for Ceres", + "dependencies": [ + { + "name": "ceres", + "features": [ + "lapack" + ] + }, + { + "name": "suitesparse", + "default-features": false + } + ] + }, + "tools": { + "description": "Ceres tools", + "dependencies": [ + "gflags" + ] + } + } +} diff --git a/ports/wepoll/CONTROL b/ports/wepoll/CONTROL deleted file mode 100644 index f4882434a3f610..00000000000000 --- a/ports/wepoll/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: wepoll -Version: 1.5.8 -Description: Fast epoll for windows -Homepage: https://github.com/piscisaureus/wepoll diff --git a/ports/wepoll/vcpkg.json b/ports/wepoll/vcpkg.json new file mode 100644 index 00000000000000..c2d14c63730b74 --- /dev/null +++ b/ports/wepoll/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "wepoll", + "version-string": "1.5.8", + "port-version": 1, + "description": "Fast epoll for windows", + "homepage": "https://github.com/piscisaureus/wepoll", + "supports": "windows" +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d775cadbfc35cf..79728d8629b3b9 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -456,7 +456,6 @@ ignition-common1:x64-linux=fail ignition-msgs1:arm64-windows=fail ignition-msgs1:arm-uwp=fail ignition-msgs1:x64-uwp=fail -ignition-msgs5:x64-linux=fail ignition-msgs5:arm64-windows=fail ignition-msgs5:arm-uwp=fail ignition-msgs5:x64-uwp=fail @@ -688,11 +687,8 @@ libqcow:x64-windows=skip libqcow:x64-linux=skip libqcow:x86-windows=skip libqcow:arm64-windows=skip - -libraqm:x64-windows-static=fail librdkafka:arm-uwp=fail librdkafka:x64-uwp=fail - # Conflicts with openssl boringssl:arm64-windows = skip boringssl:arm-uwp = skip @@ -993,9 +989,10 @@ numactl:x86-windows=fail nvtt:arm64-windows=fail nvtt:arm-uwp=fail nvtt:x64-uwp=fail -ocilib:arm64-windows=fail ocilib:arm-uwp=fail +ocilib:arm64-windows=fail ocilib:x64-uwp=fail +ocilib:x64-windows-static=fail octomap:arm-uwp=fail octomap:x64-uwp=fail ode:arm64-windows=fail @@ -1101,10 +1098,6 @@ openssl-uwp:x64-osx=fail openssl-uwp:x64-windows=fail openssl-uwp:x64-windows-static=fail openssl-uwp:x86-windows=fail -openssl-windows:arm-uwp=fail -openssl-windows:x64-linux=fail -openssl-windows:x64-osx=fail -openssl-windows:x64-uwp=fail opentracing:arm-uwp=fail opentracing:x64-uwp=fail openvpn3:x64-osx=fail @@ -1454,17 +1447,12 @@ spdk-isal:x64-windows=fail spdk-isal:x64-windows-static=fail spdk-isal:x86-windows=fail speexdsp:x64-linux=fail -speexdsp:x64-osx=fail spirv-tools:arm-uwp=fail spirv-tools:x64-uwp=fail stormlib:arm-uwp=fail stormlib:x64-uwp=fail stxxl:arm-uwp=fail stxxl:x64-uwp=fail -# Sundials was broken by Ninja 1.9.0 https://github.com/ninja-build/ninja/pull/1406 -sundials:arm64-windows=fail -sundials:x64-windows=fail -sundials:x86-windows=fail systemc:arm64-windows=fail systemc:arm-uwp=fail systemc:x64-uwp=fail @@ -1587,10 +1575,6 @@ vxl:x64-windows = skip vxl:x64-windows-static = skip vxl:x86-windows = skip wampcc:arm64-windows=fail -wepoll:arm-uwp=fail -wepoll:x64-uwp=fail -wepoll:x64-linux=fail -wepoll:x64-osx=fail wildmidi:x64-osx=fail wincrypt:x64-linux=fail wincrypt:x64-osx=fail From 84985f6eb8fa3f3d8ddedccc51cd0a7c2d7ad7a9 Mon Sep 17 00:00:00 2001 From: Sander Cox Date: Tue, 8 Dec 2020 01:06:02 +0100 Subject: [PATCH 0262/1694] [vcpkg] x_vcpkg_install_local_dependencies fixes (#14977) * Conversion to PARSE_ARGV was missing parameter * Cannot install for interface_libraries --- scripts/buildsystems/vcpkg.cmake | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 55516b1f72ec94..d721bbafa36149 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -503,14 +503,17 @@ endfunction() # DESTINATION - the runtime directory for those targets (usually `bin`) function(x_vcpkg_install_local_dependencies) if(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp") - cmake_parse_arguments(PARSE_ARGV __VCPKG_APPINSTALL "" "DESTINATION" "TARGETS") + cmake_parse_arguments(PARSE_ARGV 0 __VCPKG_APPINSTALL "" "DESTINATION" "TARGETS") _vcpkg_set_powershell_path() foreach(TARGET IN LISTS __VCPKG_APPINSTALL_TARGETS) - install(CODE "message(\"-- Installing app dependencies for ${TARGET}...\") - execute_process(COMMAND \"${_VCPKG_POWERSHELL_PATH}\" -noprofile -executionpolicy Bypass -file \"${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1\" - -targetBinary \"\${CMAKE_INSTALL_PREFIX}/${__VCPKG_APPINSTALL_DESTINATION}/$\" - -installedDir \"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin\" - -OutVariable out)") + get_target_property(TARGETTYPE ${TARGET} TYPE) + if(NOT TARGETTYPE STREQUAL "INTERFACE_LIBRARY") + install(CODE "message(\"-- Installing app dependencies for ${TARGET}...\") + execute_process(COMMAND \"${_VCPKG_POWERSHELL_PATH}\" -noprofile -executionpolicy Bypass -file \"${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1\" + -targetBinary \"\${CMAKE_INSTALL_PREFIX}/${__VCPKG_APPINSTALL_DESTINATION}/$\" + -installedDir \"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin\" + -OutVariable out)") + endif() endforeach() endif() endfunction() From 3320d36d82f19cbb830b4f2ebdd240d94cd1a2ba Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Mon, 7 Dec 2020 18:17:19 -0800 Subject: [PATCH 0263/1694] [vcpkg_fixup_pkgconfig] Handle spaces in path, do not validate individual libraries (#13126) --- docs/maintainers/vcpkg_fixup_pkgconfig.md | 21 +- ports/ceres/portfile.cmake | 2 + ports/libbson/CONTROL | 2 +- ports/libbson/portfile.cmake | 4 + ports/mongo-c-driver/CONTROL | 4 +- ports/mongo-c-driver/portfile.cmake | 3 + ports/nettle/CONTROL | 2 +- ports/nettle/portfile.cmake | 4 +- ports/x265/CONTROL | 2 +- ports/x265/portfile.cmake | 11 + scripts/azure-pipelines/end-to-end-tests.ps1 | 12 + scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 358 +++++-------------- 12 files changed, 148 insertions(+), 277 deletions(-) diff --git a/docs/maintainers/vcpkg_fixup_pkgconfig.md b/docs/maintainers/vcpkg_fixup_pkgconfig.md index 48870e972eeced..70b4fb124aa0e6 100644 --- a/docs/maintainers/vcpkg_fixup_pkgconfig.md +++ b/docs/maintainers/vcpkg_fixup_pkgconfig.md @@ -7,8 +7,6 @@ Fix common paths in *.pc files and make everything relativ to $(prefix) vcpkg_fixup_pkgconfig( [RELEASE_FILES ...] [DEBUG_FILES ...] - [SYSTEM_LIBRARIES ...] - [IGNORE_FLAGS ] [SKIP_CHECK] ) ``` @@ -22,21 +20,24 @@ Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR} without ${CURR Specifies a list of files to apply the fixes for debug paths. Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR}/debug/ -### SYSTEM_LIBRARIES -If the *.pc file contains system libraries outside vcpkg these need to be listed here. -VCPKG checks every -l flag for the existence of the required library within vcpkg. +### SKIP_CHECK +Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself has unhandled cases. -### IGNORE_FLAGS -If the *.pc file contains flags in the lib field which are not libraries. These can be listed here +### SYSTEM_PACKAGES (deprecated) +This argument has been deprecated and has no effect. -### SKIP_CHECK -Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself has unhandled cases. +### SYSTEM_LIBRARIES (deprecated) +This argument has been deprecated and has no effect. + +### IGNORE_FLAGS (deprecated) +This argument has been deprecated and has no effect. ## Notes Still work in progress. If there are more cases which can be handled here feel free to add them ## Examples -Just call `vcpkg_fixup_pkgconfig()` after any install step which installs *.pc files. + +* [brotli](https://github.com/Microsoft/vcpkg/blob/master/ports/brotli/portfile.cmake) ## Source [scripts/cmake/vcpkg_fixup_pkgconfig.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_fixup_pkgconfig.cmake) diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index d106217e627fa7..fd8d0ec40d6b3d 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -41,6 +41,8 @@ vcpkg_configure_cmake( -DBUILD_BENCHMARKS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF + -DBUILD_BENCHMARKS=OFF + -DPROVIDE_UNINSTALL_TARGET=OFF -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT_VALUE} -DLIB_SUFFIX=${LIB_SUFFIX} ) diff --git a/ports/libbson/CONTROL b/ports/libbson/CONTROL index 6c929c8830e620..c74336ee5b3d2b 100644 --- a/ports/libbson/CONTROL +++ b/ports/libbson/CONTROL @@ -1,5 +1,5 @@ Source: libbson Version: 1.16.1 -Port-Version: 1 +Port-Version: 2 Description: libbson is a library providing useful routines related to building, parsing, and iterating BSON documents. Homepage: https://github.com/mongodb/libbson diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index 8430b3ef62c959..477f2eb671cdf1 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -20,6 +20,8 @@ file(READ ${CMAKE_CURRENT_LIST_DIR}/CONTROL _contents) string(REGEX MATCH "\nVersion:[ ]*[^ \n]+" _contents "${_contents}") string(REGEX REPLACE ".+Version:[ ]*([\\.0-9]+).*" "\\1" BUILD_VERSION "${_contents}") +file(WRITE "${BUILD_VERSION}" ${SOURCE_PATH}/VERSION_CURRENT) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -31,6 +33,7 @@ vcpkg_configure_cmake( -DENABLE_EXAMPLES=OFF -DENABLE_STATIC=${ENABLE_STATIC} -DBUILD_VERSION=${BUILD_VERSION} + -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON ) vcpkg_install_cmake() @@ -44,6 +47,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) else() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libbson-${PORT_POSTFIX} TARGET_PATH share/bson-${PORT_POSTFIX}) endif() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver) diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL index 7bbddb172e2b87..5cc9c336ea59a5 100644 --- a/ports/mongo-c-driver/CONTROL +++ b/ports/mongo-c-driver/CONTROL @@ -1,6 +1,6 @@ Source: mongo-c-driver -Version: 1.16.1-1 -Port-Version: 1 +Version: 1.16.1 +Port-Version: 3 Build-Depends: libbson, openssl (!windows), zlib Description: Client library written in C for MongoDB. Homepage: https://github.com/mongodb/mongo-c-driver diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 74a1d8c0d27175..9ddf3a6b41da61 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -40,6 +40,8 @@ file(READ ${CMAKE_CURRENT_LIST_DIR}/CONTROL _contents) string(REGEX MATCH "\nVersion:[ ]*[^ \n]+" _contents "${_contents}") string(REGEX REPLACE ".+Version:[ ]*([\\.0-9]+).*" "\\1" BUILD_VERSION "${_contents}") +file(WRITE "${BUILD_VERSION}" ${SOURCE_PATH}/VERSION_CURRENT) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -55,6 +57,7 @@ vcpkg_configure_cmake( -DENABLE_ZLIB=SYSTEM -DENABLE_STATIC=${ENABLE_STATIC} -DBUILD_VERSION=${BUILD_VERSION} + -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON ${FEATURE_OPTIONS} ) diff --git a/ports/nettle/CONTROL b/ports/nettle/CONTROL index 49308ce9580128..e8cffedd7d0b91 100644 --- a/ports/nettle/CONTROL +++ b/ports/nettle/CONTROL @@ -1,6 +1,6 @@ Source: nettle Version: 3.5.1 -Port-Version: 4 +Port-Version: 5 Homepage: https://git.lysator.liu.se/nettle/nettle Description: Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space. Build-Depends: gmp, vs-yasm (windows), yasm-tool-helper (windows) diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake index 2d3fc952abfc54..616d9af2888326 100644 --- a/ports/nettle/portfile.cmake +++ b/ports/nettle/portfile.cmake @@ -84,7 +84,7 @@ if(VCPKG_TARGET_IS_WINDOWS) set(exec_prefix "\${prefix}") set(libdir "\${prefix}/lib") set(includedir "\${prefix}/include") - set(LIBS -lnettle -lgmp) + set(LIBS "-lnettle -lgmp") configure_file("${SOURCE_PATH}/nettle.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/nettle.pc" @ONLY) set(HOGWEED -lhogweed) set(LIBS -lnettle) @@ -93,7 +93,7 @@ if(VCPKG_TARGET_IS_WINDOWS) set(exec_prefix "\${prefix}") set(libdir "\${prefix}/lib") set(includedir "\${prefix}/../include") - set(LIBS -lnettled -lgmpd) + set(LIBS "-lnettled -lgmpd") configure_file("${SOURCE_PATH}/nettle.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/nettle.pc" @ONLY) set(LIBS -lnettled) set(HOGWEED -lhogweedd) diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL index 58fe1b99ebd028..269a4c30d37068 100644 --- a/ports/x265/CONTROL +++ b/ports/x265/CONTROL @@ -1,5 +1,5 @@ Source: x265 Version: 3.4 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/videolan/x265 Description: x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream. diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake index 754e4127f2f3da..01fa6688df0557 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -63,6 +63,17 @@ if(VCPKG_TARGET_IS_MINGW AND ENABLE_SHARED) endif() if(UNIX) + foreach(FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc") + if(EXISTS "${FILE}") + file(READ "${FILE}" _contents) + string(REPLACE " -lstdc++" "" _contents "${_contents}") + string(REPLACE " -lc++" "" _contents "${_contents}") + string(REPLACE " -lgcc_s" "" _contents "${_contents}") + string(REPLACE " -lgcc" "" _contents "${_contents}") + string(REPLACE " -lrt" "" _contents "${_contents}") + file(WRITE "${FILE}" "${_contents}") + endif() + endforeach() vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES numa) else() vcpkg_fixup_pkgconfig() diff --git a/scripts/azure-pipelines/end-to-end-tests.ps1 b/scripts/azure-pipelines/end-to-end-tests.ps1 index 3b6fe5aaaa3fa6..99e56ce45db0cf 100644 --- a/scripts/azure-pipelines/end-to-end-tests.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests.ps1 @@ -91,6 +91,18 @@ function Run-Vcpkg { ./vcpkg @testArgs } +##### Test spaces in the path +Refresh-TestRoot +$CurrentTest = "zlib with spaces in path" +Write-Host $CurrentTest +./vcpkg install zlib "--triplet" $Triplet ` + "--no-binarycaching" ` + "--x-buildtrees-root=$TestingRoot/build Trees" ` + "--x-install-root=$TestingRoot/instalL ed" ` + "--x-packages-root=$TestingRoot/packaG es" +Throw-IfFailed + +##### Binary caching tests if (-not $IsLinux -and -not $IsMacOS) { Refresh-TestRoot # Test msbuild props and targets diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index f003b6d2d8f6d2..8f0d950eef5b70 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -8,8 +8,6 @@ Fix common paths in *.pc files and make everything relativ to $(prefix) vcpkg_fixup_pkgconfig( [RELEASE_FILES ...] [DEBUG_FILES ...] - [SYSTEM_LIBRARIES ...] - [IGNORE_FLAGS ] [SKIP_CHECK] ) ``` @@ -23,37 +21,40 @@ Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR} without ${CURR Specifies a list of files to apply the fixes for debug paths. Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR}/debug/ -### SYSTEM_LIBRARIES -If the *.pc file contains system libraries outside vcpkg these need to be listed here. -VCPKG checks every -l flag for the existence of the required library within vcpkg. +### SKIP_CHECK +Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself has unhandled cases. -### IGNORE_FLAGS -If the *.pc file contains flags in the lib field which are not libraries. These can be listed here +### SYSTEM_PACKAGES (deprecated) +This argument has been deprecated and has no effect. -### SKIP_CHECK -Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself has unhandled cases. +### SYSTEM_LIBRARIES (deprecated) +This argument has been deprecated and has no effect. + +### IGNORE_FLAGS (deprecated) +This argument has been deprecated and has no effect. ## Notes Still work in progress. If there are more cases which can be handled here feel free to add them ## Examples -Just call `vcpkg_fixup_pkgconfig()` after any install step which installs *.pc files. + +* [brotli](https://github.com/Microsoft/vcpkg/blob/master/ports/brotli/portfile.cmake) #]===] -include(vcpkg_internal_escape_regex_control_characters) -function(vcpkg_fixup_pkgconfig_check_files pkg_cfg_cmd _file _config _system_libs _ignore_flags) - # Setup pkg-config paths - set(_VCPKG_INSTALLED_PKGCONF "${CURRENT_INSTALLED_DIR}") - set(_VCPKG_PACKAGES_PKGCONF "${CURRENT_PACKAGES_DIR}") - +function(vcpkg_fixup_pkgconfig_check_files pkg_cfg_cmd _file _config) set(PATH_SUFFIX_DEBUG /debug) - set(PKGCONFIG_INSTALLED_DIR "${_VCPKG_INSTALLED_PKGCONF}${PATH_SUFFIX_${_config}}/lib/pkgconfig") - set(PKGCONFIG_INSTALLED_SHARE_DIR "${_VCPKG_INSTALLED_PKGCONF}/share/pkgconfig") - set(PKGCONFIG_PACKAGES_DIR "${_VCPKG_PACKAGES_PKGCONF}${PATH_SUFFIX_${_config}}/lib/pkgconfig") - set(PKGCONFIG_PACKAGES_SHARE_DIR "${_VCPKG_PACKAGES_PKGCONF}/share/pkgconfig") - - if(ENV{PKG_CONFIG_PATH}) - set(BACKUP_ENV_PKG_CONFIG_PATH_${_config} $ENV{PKG_CONFIG_PATH}) + set(PATH_SUFFIX_RELEASE) + set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib/pkgconfig") + set(PKGCONFIG_INSTALLED_SHARE_DIR "${CURRENT_INSTALLED_DIR}/share/pkgconfig") + set(PKGCONFIG_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}${PATH_SUFFIX_${_config}}/lib/pkgconfig") + set(PKGCONFIG_PACKAGES_SHARE_DIR "${CURRENT_PACKAGES_DIR}/share/pkgconfig") + + if(DEFINED ENV{PKG_CONFIG_PATH}) + set(BACKUP_ENV_PKG_CONFIG_PATH "$ENV{PKG_CONFIG_PATH}") + else() + unset(BACKUP_ENV_PKG_CONFIG_PATH) + endif() + if(DEFINED ENV{PKG_CONFIG_PATH} AND NOT ENV{PKG_CONFIG_PATH} STREQUAL "") set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") else() set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}") @@ -81,194 +82,31 @@ function(vcpkg_fixup_pkgconfig_check_files pkg_cfg_cmd _file _config _system_lib debug_message("pkg-config output:${_pkg_output}") debug_message("pkg-config error output:${_pkg_error_out}") endif() - - # Get all required libs. --static means we get all libraries required for static linkage - # which is the worst case and includes the case without --static - # This retests already tested *.pc files since pkg-config will recursivly search for - # required packages and add there link flags to the one being tested - # as such NOT_STATIC_PKGCONFIG might be used to deactivate the --static arg to pkg-config - - execute_process(COMMAND "${pkg_cfg_cmd}" --print-errors ${PKGCONFIG_STATIC} --libs ${_package_name} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" - RESULT_VARIABLE _pkg_error_var - OUTPUT_VARIABLE _pkg_libs_output - ERROR_VARIABLE _pkg_error_out - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_STRIP_TRAILING_WHITESPACE - ) - if(NOT _pkg_error_var EQUAL 0) - message(STATUS "pkg_cfg_cmd call with:${pkg_cfg_cmd} --libs ${_package_name} failed") - message(STATUS "pkg-config call failed with error code:${_pkg_error_var}") - message(STATUS "pkg-config output:${_pkg_libs_output}") - message(FATAL_ERROR "pkg-config error output:${_pkg_error_out}") - else() - debug_message("pkg-config returned:${_pkg_error_var}") - debug_message("pkg-config output:${_pkg_libs_output}") - debug_message("pkg-config error output:${_pkg_error_out}") - endif() - - execute_process(COMMAND "${pkg_cfg_cmd}" --print-errors --static --libs-only-L ${_package_name} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" - RESULT_VARIABLE _pkg_error_var - OUTPUT_VARIABLE _pkg_lib_paths_output - ERROR_VARIABLE _pkg_error_out - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_STRIP_TRAILING_WHITESPACE - ) - - if(NOT _pkg_error_var EQUAL 0) - message(STATUS "pkg_cfg_cmd call with:${pkg_cfg_cmd} --libs-only-L ${_package_name} failed") - message(STATUS "pkg-config call failed with error code:${_pkg_error_var}") - message(STATUS "pkg-config output:${_pkg_lib_paths_output}") - message(FATAL_ERROR "pkg-config error output:${_pkg_error_out}") - else() - debug_message("pkg-config returned:${_pkg_error_var}") - debug_message("pkg-config output:${_pkg_lib_paths_output}") - debug_message("pkg-config error output:${_pkg_error_out}") - endif() - - string(REPLACE "\\ " "##" _pkg_lib_paths_output "${_pkg_lib_paths_output}") # Whitespace path protection - string(REGEX REPLACE "(^[\t ]*|[\t ]+)-L" ";" _pkg_lib_paths_output "${_pkg_lib_paths_output}") - debug_message("-L LIST TRANSFORMATION:'${_pkg_lib_paths_output}'") - string(REGEX REPLACE "^[\t ]*;" "" _pkg_lib_paths_output "${_pkg_lib_paths_output}") - string(REPLACE "##" "\\ " _pkg_lib_paths_output "${_pkg_lib_paths_output}") - - list(REMOVE_DUPLICATES _pkg_lib_paths_output) # We don't care about linker order and repeats - ## Remove search paths from LIBS - foreach(_search_path IN LISTS _pkg_lib_paths_output) - debug_message("REMOVING:'${_search_path}'") - debug_message("FROM:'${_pkg_libs_output}'") - vcpkg_internal_escape_regex_control_characters(_search_path "${_search_path}") - string(REGEX REPLACE "(^[\t ]*|[\t ]+|;[\t ]*)-L${_search_path}([\t ]+|[\t ]*$)" ";" _pkg_libs_output "${_pkg_libs_output}") # Remove search paths from libs - endforeach() - debug_message("LIBS AFTER -L REMOVAL:'${_pkg_libs_output}'") - - #Make the remaining libs a proper CMake List - string(REPLACE "\\ " "##" _pkg_libs_output "${_pkg_libs_output}") # Whitespace path protection - string(REGEX REPLACE "(^[\t ]*|[\t ]+)-l" ";-l" _pkg_libs_output "${_pkg_libs_output}") - string(REGEX REPLACE "[\t ]*(-pthreads?)" ";\\1" _pkg_libs_output "${_pkg_libs_output}") # handle pthread without -l here (makes a lot of problems otherwise) - string(REGEX REPLACE "^[\t ]*;[\t ]*" "" _pkg_libs_output "${_pkg_libs_output}") - string(REPLACE "##" "\\ " _pkg_libs_output "${_pkg_libs_output}") - - #Windows path transformations - if(CMAKE_HOST_WIN32) - string(REGEX REPLACE "(^|;)/([a-zA-Z])/" "\\1\\2:/" _pkg_lib_paths_output "${_pkg_lib_paths_output}") - string(REGEX REPLACE " /([a-zA-Z])/" ";\\1:/" _pkg_libs_output "${_pkg_libs_output}") - string(REGEX REPLACE "-l/([a-zA-Z])/" "-l\\1:/" _pkg_libs_output "${_pkg_libs_output}") - debug_message("pkg-config output lib paths after replacement (cmake style):${_pkg_lib_paths_output}") - debug_message("pkg-config output lib after replacement (cmake style):${_pkg_libs_output}") - endif() - - if("${_config}" STREQUAL "DEBUG") - set(lib_suffixes d _d _debug -s -sd _s _sd -static -staticd _static _staticd) - elseif("${_config}" STREQUAL "RELEASE") - set(lib_suffixes -s _s -static _static) + if(DEFINED BACKUP_ENV_PKG_CONFIG_PATH) + set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH}") else() - message(FATAL_ERROR "Unknown configuration in vcpkg_fixup_pkgconfig_check_libraries!") + unset(ENV{PKG_CONFIG_PATH}) endif() - - debug_message("IGNORED FLAGS:'${_ignore_flags}'") - debug_message("BEFORE IGNORE FLAGS REMOVAL: ${_pkg_libs_output}") - foreach(_ignore IN LISTS _ignore_flags) # Remove ignore with whitespace - debug_message("REMOVING FLAG:'${_ignore}'") - vcpkg_internal_escape_regex_control_characters(_ignore "${_ignore}") - string(REGEX REPLACE "(^[\t ]*|;[\t ]*|[\t ]+)${_ignore}([\t ]+|[\t ]*;|[\t ]*$)" "\\2" _pkg_libs_output "${_pkg_libs_output}") - debug_message("AFTER REMOVAL: ${_pkg_libs_output}") - endforeach() - - string(REGEX REPLACE ";?[\t ]*;[\t ]*" ";" _pkg_libs_output "${_pkg_libs_output}") # Double ;; and Whitespace before/after ; removal - - debug_message("SYSTEM LIBRARIES:'${_system_libs}'") - debug_message("LIBRARIES in PC:'${_pkg_libs_output}'") - foreach(_system_lib IN LISTS _system_libs) # Remove system libs with whitespace - debug_message("REMOVING:'${_system_lib}'") - debug_message("FROM:'${_pkg_libs_output}'") - string(REGEX REPLACE "(^[\t ]*|;[\t ]*|[\t ]+)(-l?)${_system_lib}([\t ]+|[\t ]*;|[\t ]*$)" "\\3" _pkg_libs_output "${_pkg_libs_output}") - string(REGEX REPLACE "(^[\t ]*|;[\t ]*|[\t ]+)${_system_lib}([\t ]+|[\t ]*;|[\t ]*$)" "\\2" _pkg_libs_output "${_pkg_libs_output}") - string(TOLOWER "${_system_lib}" _system_lib_lower) - string(REGEX REPLACE "(^[\t ]*|;[\t ]*|[\t ]+)(-l?)${_system_lib_lower}([\t ]+|[\t ]*;|[\t ]*$)" "\\3" _pkg_libs_output "${_pkg_libs_output}") - string(REGEX REPLACE "(^[\t ]*|;[\t ]*|[\t ]+)${_system_lib_lower}([\t ]+|[\t ]*;|[\t ]*$)" "\\2" _pkg_libs_output "${_pkg_libs_output}") - debug_message("AFTER REMOVAL:'${_pkg_libs_output}'") - endforeach() - list(REMOVE_DUPLICATES _pkg_libs_output) # We don't care about linker order and repeats - - string(REGEX REPLACE ";?[\t ]*;[\t ]*" ";" _pkg_libs_output "${_pkg_libs_output}") # Double ;; and Whitespace before/after ; removal - - debug_message("Library search paths:${_pkg_lib_paths_output}") - debug_message("Libraries to search:${_pkg_libs_output}") - set(CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP ${CMAKE_FIND_LIBRARY_SUFFIXES}) - list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll.a .a) - foreach(_lib IN LISTS _pkg_libs_output) - if(EXISTS "${_lib}" OR "x${_lib}x" STREQUAL "xx" ) # eat; all ok _lib is a fullpath to a library or empty - continue() - elseif (_lib MATCHES "^-l(.+)$") - debug_message("Library match: CMAKE_MATCH_1:${CMAKE_MATCH_1}") - set(_libname "${CMAKE_MATCH_1}") - if(EXISTS "${_libname}") - debug_message("${_libname} detected as an existing full path!") - continue() # fullpath in -l argument and exists; all ok - endif() - debug_message("CHECK_LIB_${_libname}_${_config} before: ${CHECK_LIB_${_libname}_${_config}}") - find_library(CHECK_LIB_${_libname}_${_config} NAMES ${_libname} PATHS ${_pkg_lib_paths_output} "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib" NO_DEFAULT_PATH) - debug_message("CHECK_LIB_${_libname}_${_config} after: ${CHECK_LIB_${_libname}_${_config}}") - if(CHECK_LIB_${_libname}_${_config}) - unset(CHECK_LIB_${_libname}_${_config} CACHE) # need to unset or else other configurations will not check correctly - debug_message("CHECK_LIB_${_libname}_${_config} after unset: ${CHECK_LIB_${_libname}_${_config}}") - continue() # found library; all ok - endif() - debug_message("Searching with additional suffixes: '${lib_suffixes}'") - foreach(_lib_suffix IN LISTS lib_suffixes) - string(REPLACE ".dll.a|.a|.lib|.so" "" _name_without_extension "${_libname}") - set(search_name ${_name_without_extension}${_lib_suffix}) - debug_message("Search name: '${search_name}'") - debug_message("CHECK_LIB_${search_name}_${_config} before: ${CHECK_LIB_${search_name}_${_config}}") - debug_message("Search paths:'${_pkg_lib_paths_output}' '${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib'") - find_library(CHECK_LIB_${search_name}_${_config} NAMES ${search_name} PATHS ${_pkg_lib_paths_output} "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib" NO_DEFAULT_PATH) - debug_message("CHECK_LIB_${search_name}_${_config} after: ${CHECK_LIB_${search_name}_${_config}}") - if(CHECK_LIB_${search_name}_${_config}) - message(FATAL_ERROR "Found ${CHECK_LIB_${search_name}_${_config}} with additional '${_lib_suffix}' suffix! Please correct the *.pc file!") - unset(CHECK_LIB_${search_name}_${_config} CACHE) # need to unset or else other configurations will not check correctly - endif() - endforeach() - # Reaching here means error! - message(STATUS "CHECK_LIB_${_libname}_${_config}:${CHECK_LIB_${_libname}_${_config}}") - message(FATAL_ERROR "Library \"${_libname}\" was not found! If it is a system library use the SYSTEM_LIBRARIES parameter for the vcpkg_fixup_pkgconfig call! Otherwise, correct the *.pc file") - else () - message(FATAL_ERROR "Unhandled string \"${_lib}\" was found! If it is a system library use the SYSTEM_LIBRARIES parameter for the vcpkg_fixup_pkgconfig call! Otherwise, correct the *.pc file or add the case to vcpkg_fixup_pkgconfig") - endif() - endforeach() - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP}) endfunction() function(vcpkg_fixup_pkgconfig) # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vfpkg "SKIP_CHECK;NOT_STATIC_PKGCONFIG" "" "RELEASE_FILES;DEBUG_FILES;SYSTEM_LIBRARIES;SYSTEM_PACKAGES;IGNORE_FLAGS") - - # Note about SYSTEM_PACKAGES: pkg-config requires all packages mentioned in pc files to exists. Otherwise pkg-config will fail to find the pkg. - # As such naming any SYSTEM_PACKAGES is damned to fail which is why it is not mentioned in the docs at the beginning. - if(VCPKG_SYSTEM_LIBRARIES) - list(APPEND _vfpkg_SYSTEM_LIBRARIES ${VCPKG_SYSTEM_LIBRARIES}) - endif() + cmake_parse_arguments(PARSE_ARGV 0 _vfpkg "SKIP_CHECK" "" "RELEASE_FILES;DEBUG_FILES;SYSTEM_LIBRARIES;SYSTEM_PACKAGES;IGNORE_FLAGS") - if(_vfpkg_NOT_STATIC_PKGCONFIG) - set(PKGCONFIG_STATIC) - else() - set(PKGCONFIG_STATIC --static) - endif() - if(_vfpkg_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "vcpkg_fixup_pkgconfig was passed extra arguments: ${_vfct_UNPARSED_ARGUMENTS}") + message(FATAL_ERROR "vcpkg_fixup_pkgconfig() was passed extra arguments: ${_vfct_UNPARSED_ARGUMENTS}") endif() - vcpkg_internal_escape_regex_control_characters(_vfpkg_ESCAPED_CURRENT_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}") - if(NOT _vfpkg_RELEASE_FILES) - file(GLOB_RECURSE _vfpkg_RELEASE_FILES "${CURRENT_PACKAGES_DIR}/**/*.pc") - list(FILTER _vfpkg_RELEASE_FILES EXCLUDE REGEX "${_vfpkg_ESCAPED_CURRENT_PACKAGES_DIR}/debug/") + if((DEFINED _vfpkg_RELEASE_FILES AND NOT DEFINED _vfpkg_DEBUG_FILES) OR (NOT DEFINED _vfpkg_RELEASE_FILES AND DEFINED _vfpkg_DEBUG_FILES)) + message(FATAL_ERROR "vcpkg_fixup_pkgconfig() requires both or neither of DEBUG_FILES and RELEASE_FILES") endif() - if(NOT _vfpkg_DEBUG_FILES) + if(NOT DEFINED _vfpkg_RELEASE_FILES) + file(GLOB_RECURSE _vfpkg_RELEASE_FILES "${CURRENT_PACKAGES_DIR}/**/*.pc") file(GLOB_RECURSE _vfpkg_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/**/*.pc") + if(_vfpkg_DEBUG_FILES) + list(REMOVE_ITEM _vfpkg_RELEASE_FILES ${_vfpkg_DEBUG_FILES}) + endif() endif() vcpkg_find_acquire_program(PKGCONFIG) @@ -278,60 +116,71 @@ function(vcpkg_fixup_pkgconfig) string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}") string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}") - debug_message("Release Files: ${_vfpkg_RELEASE_FILES}") - foreach(_file ${_vfpkg_RELEASE_FILES}) - message(STATUS "Fixing pkgconfig file: ${_file}") - get_filename_component(PKG_LIB_SEARCH_PATH "${_file}" DIRECTORY) - file(RELATIVE_PATH RELATIVE_PC_PATH "${PKG_LIB_SEARCH_PATH}" "${CURRENT_PACKAGES_DIR}") - string(REGEX REPLACE "/$" "" RELATIVE_PC_PATH "${RELATIVE_PC_PATH}") - #Correct *.pc file - file(READ "${_file}" _contents) - string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "${_VCPKG_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "${_VCPKG_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") - string(REGEX REPLACE "^prefix[\t ]*=[^\n]*" "" _contents "${_contents}") - string(REGEX REPLACE "[\n]prefix[\t ]*=[^\n]*" "" _contents "${_contents}") - file(WRITE "${_file}" "prefix=\${pcfiledir}/${RELATIVE_PC_PATH}\n${_contents}") - unset(PKG_LIB_SEARCH_PATH) - endforeach() - - if(NOT _vfpkg_SKIP_CHECK) # The check can only run after all files have been corrected! - foreach(_file ${_vfpkg_RELEASE_FILES}) - vcpkg_fixup_pkgconfig_check_files("${PKGCONFIG}" "${_file}" "RELEASE" "${_vfpkg_SYSTEM_LIBRARIES}" "${_vfpkg_IGNORE_FLAGS}") + foreach(CONFIG RELEASE DEBUG) + debug_message("${CONFIG} Files: ${_vfpkg_${CONFIG}_FILES}") + if(VCPKG_BUILD_TYPE STREQUAL "debug" AND CONFIG STREQUAL "RELEASE") + continue() + endif() + if(VCPKG_BUILD_TYPE STREQUAL "release" AND CONFIG STREQUAL "DEBUG") + continue() + endif() + foreach(_file ${_vfpkg_${CONFIG}_FILES}) + message(STATUS "Fixing pkgconfig file: ${_file}") + get_filename_component(PKG_LIB_SEARCH_PATH "${_file}" DIRECTORY) + if(CONFIG STREQUAL "DEBUG") + file(RELATIVE_PATH RELATIVE_PC_PATH "${PKG_LIB_SEARCH_PATH}" "${CURRENT_PACKAGES_DIR}/debug/") + else() + file(RELATIVE_PATH RELATIVE_PC_PATH "${PKG_LIB_SEARCH_PATH}" "${CURRENT_PACKAGES_DIR}") + endif() + # strip trailing slash + string(REGEX REPLACE "/$" "" RELATIVE_PC_PATH "${RELATIVE_PC_PATH}") + #Correct *.pc file + file(READ "${_file}" _contents) + string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") + string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") + string(REPLACE "${_VCPKG_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") + string(REPLACE "${_VCPKG_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") + string(REGEX REPLACE "(^|\n)prefix[\t ]*=[^\n]*" "" _contents "${_contents}") + if(CONFIG STREQUAL "DEBUG") + string(REPLACE "}/debug" "}" _contents "${_contents}") + # Prefix points at the debug subfolder + string(REPLACE "\${prefix}/include" "\${prefix}/../include" _contents "${_contents}") + string(REPLACE "\${prefix}/share" "\${prefix}/../share" _contents "${_contents}") + endif() + string(REGEX REPLACE " -L(\\\${[^}]*}[^ \n\t]*)" " -L\"\\1\"" _contents "${_contents}") + string(REGEX REPLACE " -I(\\\${[^}]*}[^ \n\t]*)" " -I\"\\1\"" _contents "${_contents}") + string(REGEX REPLACE " -l(\\\${[^}]*}[^ \n\t]*)" " -l\"\\1\"" _contents "${_contents}") + # This section fuses XYZ.private and XYZ according to VCPKG_LIBRARY_LINKAGE + # + # Pkgconfig searches Requires.private transitively for Cflags in the dynamic case, + # which prevents us from removing it. + # + # Once this transformation is complete, users of vcpkg should never need to pass + # --static. + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Libs comes before Libs.private + string(REGEX REPLACE "(^|\n)(Libs: [^\n]*)(.*)\nLibs.private:( [^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") + # Libs.private comes before Libs + string(REGEX REPLACE "(^|\n)Libs.private:( [^\n]*)(.*\nLibs: [^\n]*)" "\\3\\2" _contents "${_contents}") + # Only Libs.private + string(REGEX REPLACE "(^|\n)Libs.private: " "\\1Libs: " _contents "${_contents}") + # Requires comes before Requires.private + string(REGEX REPLACE "(^|\n)(Requires: [^\n]*)(.*)\nRequires.private:( [^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") + # Requires.private comes before Requires + string(REGEX REPLACE "(^|\n)Requires.private:( [^\n]*)(.*\nRequires: [^\n]*)" "\\3\\2" _contents "${_contents}") + # Only Requires.private + string(REGEX REPLACE "(^|\n)Requires.private: " "\\1Requires: " _contents "${_contents}") + endif() + file(WRITE "${_file}" "prefix=\${pcfiledir}/${RELATIVE_PC_PATH}\n${_contents}") + unset(PKG_LIB_SEARCH_PATH) endforeach() - endif() - debug_message("Debug Files: ${_vfpkg_DEBUG_FILES}") - foreach(_file ${_vfpkg_DEBUG_FILES}) - message(STATUS "Fixing pkgconfig file: ${_file}") - get_filename_component(PKG_LIB_SEARCH_PATH "${_file}" DIRECTORY) - file(RELATIVE_PATH RELATIVE_PC_PATH "${PKG_LIB_SEARCH_PATH}" "${CURRENT_PACKAGES_DIR}/debug/") - string(REGEX REPLACE "/$" "" RELATIVE_PC_PATH "${RELATIVE_PC_PATH}") - string(REGEX REPLACE "/pkgconfig/?" "" PKG_LIB_SEARCH_PATH "${PKG_LIB_SEARCH_PATH}") - #Correct *.pc file - file(READ "${_file}" _contents) - string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "${_VCPKG_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "${_VCPKG_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "debug/include" "../include" _contents "${_contents}") - string(REPLACE "\${prefix}/include" "\${prefix}/../include" _contents "${_contents}") - string(REPLACE "debug/share" "../share" _contents "${_contents}") - string(REPLACE "\${prefix}/share" "\${prefix}/../share" _contents "${_contents}") - string(REPLACE "debug/lib" "lib" _contents "${_contents}") # the prefix will contain the debug keyword - string(REGEX REPLACE "^prefix[\t ]*=[^\n]*" "" _contents "${_contents}") # make pc file relocatable - string(REGEX REPLACE "[\n]prefix[\t ]*=[^\n]*" "" _contents "${_contents}") # make pc file relocatable - string(REPLACE "\${prefix}/debug" "\${prefix}" _contents "${_contents}") # replace remaining debug paths if they exist. - file(WRITE "${_file}" "prefix=\${pcfiledir}/${RELATIVE_PC_PATH}\n${_contents}") - unset(PKG_LIB_SEARCH_PATH) + if(NOT _vfpkg_SKIP_CHECK) # The check can only run after all files have been corrected! + foreach(_file ${_vfpkg_${CONFIG}_FILES}) + vcpkg_fixup_pkgconfig_check_files("${PKGCONFIG}" "${_file}" "${CONFIG}") + endforeach() + endif() endforeach() - - if(NOT _vfpkg_SKIP_CHECK) # The check can only run after all files have been corrected! - foreach(_file ${_vfpkg_DEBUG_FILES}) - vcpkg_fixup_pkgconfig_check_files("${PKGCONFIG}" "${_file}" "DEBUG" "${_vfpkg_SYSTEM_LIBRARIES}" "${_vfpkg_IGNORE_FLAGS}") - endforeach() - endif() debug_message("Fixing pkgconfig --- finished") set(VCPKG_FIXUP_PKGCONFIG_CALLED TRUE CACHE INTERNAL "See below" FORCE) @@ -340,14 +189,3 @@ function(vcpkg_fixup_pkgconfig) # or check if this function has been called if *.pc files are detected. # The same is true for vcpkg_fixup_cmake_targets endfunction() - - - # script to test the function locally without running vcpkg. Uncomment fix filepaths and use cmake -P vcpkg_fixup_pkgconfig - # set(_file "G:\\xlinux\\packages\\xlib_x64-windows\\lib\\pkgconfig\\x11.pc") - # include(${CMAKE_CURRENT_LIST_DIR}/vcpkg_common_definitions.cmake) - # file(READ "${_file}" _contents) - # set(CURRENT_INSTALLED_DIR "G:/xlinux/installed/x64-windows") - # set(CURRENT_PACKAGES_DIR "G:/xlinux/packages/xlib_x64-windows") - # set(_vfpkg_SYSTEM_LIBRARIES "blu\\ ub") - # set(_vfpkg_SYSTEM_PACKAGES "szip") - # vcpkg_fixup_pkgconfig_check_libraries("RELEASE" _contents "${_vfpkg_SYSTEM_LIBRARIES}" "${_vfpkg_SYSTEM_PACKAGES}") From 6cdf83639a1a38da65ff1990aed6306e1465e2c8 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 9 Dec 2020 01:57:58 +0800 Subject: [PATCH 0264/1694] [cimg] update to 2.9.4 (#14923) * [cimg] update to 2.9.4 * Add fixup function * Delete fixup function --- ports/cimg/CONTROL | 2 +- ports/cimg/portfile.cmake | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL index 93a2e4ee708f60..6d7389d54f71ac 100644 --- a/ports/cimg/CONTROL +++ b/ports/cimg/CONTROL @@ -1,4 +1,4 @@ Source: cimg -Version: 2.6.2 +Version: 2.9.4 Homepage: https://github.com/dtschump/CImg Description: The CImg Library is a small, open-source, and modern C++ toolkit for image processing diff --git a/ports/cimg/portfile.cmake b/ports/cimg/portfile.cmake index 0550ca028f8309..98b9c25d6b0d58 100644 --- a/ports/cimg/portfile.cmake +++ b/ports/cimg/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "dtschump/CImg" - REF v.2.6.2 + REF a0e7ecb55130bdf90756033c1e1470eae4b88c1a #v2.9.4 HEAD_REF master - SHA512 6571c646c2d1c007212b3c8cd6794ff1722a0ffc4fcbbe26499cf1e74d3490e893cac5868c5b513602b336b5609316cd7f67c2e1f89b04fe79df5f93b9c6be7a) + SHA512 0fc814b67ce9f035a68308850117b40cb54d731cb559bf1b6f46e1ec1e29d473e805818018ac411529b51510468cfbe4427aa52a354f919d7f1ce84bd285a47d) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -14,8 +14,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() # Move cmake files, ensuring they will be 3 directories up the import prefix -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/cimg) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(INSTALL ${SOURCE_PATH}/Licence_CeCILL-C_V1-en.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cimg RENAME copyright) -file(INSTALL ${SOURCE_PATH}/Licence_CeCILL_V2-en.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cimg RENAME copyright2) +file(INSTALL ${SOURCE_PATH}/Licence_CeCILL-C_V1-en.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/Licence_CeCILL_V2-en.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright2) From 2277a22aeaad40b83839ae622709bb3001963f9c Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 8 Dec 2020 18:58:49 +0100 Subject: [PATCH 0265/1694] [fontconfig] fix dll name in def file (#14946) * [fontconfig] fix dll name in def file * make the patch conditional --- ports/fontconfig/CONTROL | 1 + ports/fontconfig/fix_def_dll_name.patch | 13 +++++++++++++ ports/fontconfig/portfile.cmake | 5 +++++ 3 files changed, 19 insertions(+) create mode 100644 ports/fontconfig/fix_def_dll_name.patch diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL index 636b7499a3f145..fcdf2f768db268 100644 --- a/ports/fontconfig/CONTROL +++ b/ports/fontconfig/CONTROL @@ -1,5 +1,6 @@ Source: fontconfig Version: 2.13.1 +Port-Version: 1 Homepage: https://www.freedesktop.org/software/fontconfig/front.html Description: Library for configuring and customizing font access. Build-Depends: freetype, expat, libiconv, dirent, pthread, json-c, dirent, libuuid (!windows&!osx), gettext \ No newline at end of file diff --git a/ports/fontconfig/fix_def_dll_name.patch b/ports/fontconfig/fix_def_dll_name.patch new file mode 100644 index 00000000000000..cae76fc93a14e0 --- /dev/null +++ b/ports/fontconfig/fix_def_dll_name.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 3cf93a7f8..c80f4dd83 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -218,7 +218,7 @@ fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES) + (cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \ + $(GREP) '^Fc[^ ]* *(' | $(SED) -e 's/ *(.*$$//' -e 's/^/ /' | \ + sort; \ +- echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \ ++ echo LIBRARY fontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \ + echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@ + @ ! $(GREP) -q FcERROR $@ || ($(RM) $@; false) + diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index b4641e3525eada..150bca5e9554bd 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -1,5 +1,9 @@ set(FONTCONFIG_VERSION 2.13.1) +if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS) + set(PATCHES fix_def_dll_name.patch) +endif() + vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH @@ -10,6 +14,7 @@ vcpkg_from_gitlab( PATCHES remove_tests.patch build.patch build2.patch + ${PATCHES} ) vcpkg_find_acquire_program(GPERF) From d8299bc07231f9271a27bcc22953cf706973409a Mon Sep 17 00:00:00 2001 From: OWenT Date: Wed, 9 Dec 2020 01:59:36 +0800 Subject: [PATCH 0266/1694] [libcopp] Update to 1.3.4 (#14996) (#14997) --- ports/libcopp/CONTROL | 2 +- ports/libcopp/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/libcopp/CONTROL b/ports/libcopp/CONTROL index f554f4ef5bc3a1..dcb8a8db935851 100644 --- a/ports/libcopp/CONTROL +++ b/ports/libcopp/CONTROL @@ -1,5 +1,5 @@ Source: libcopp -Version: 1.3.3 +Version: 1.3.4 Description: A cross-platfrom coroutine library for C++ Maintainer: owent Homepage: https://libcopp.atframe.work/ diff --git a/ports/libcopp/portfile.cmake b/ports/libcopp/portfile.cmake index 18165b3d612b3a..0b74e7b923d57b 100644 --- a/ports/libcopp/portfile.cmake +++ b/ports/libcopp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO owt5008137/libcopp - REF 0b77f07d25ca61ec6d10080fa75152ecb4b0a7d3 # 1.3.3 - SHA512 03a88456530f0c9973d84a2feabff89bd17ffca850b69c033e1fe9d2077042156e4b2f3352a158a8e4d5dff7640dac540b95f158bda4bb9b73441d6cba699070 + REF d7ee2550fdcaf3961e4284bb5218e3ed05be437c # 1.3.4 + SHA512 0fa7a83c17046e187183d0244828e82adeb5e39e75b27757d1b540fd8948c48b02de40edea706d588ba553a276c4f2f8e9e3dad78065e515a1652abe4fbea8b0 HEAD_REF v2 ) From 79d407ba28ef979452af0d51567a4cd1648d30ed Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Tue, 8 Dec 2020 10:46:46 -0800 Subject: [PATCH 0267/1694] [vcpkg] Fix uploading to Azure DevOps Artifacts (#14952) --- docs/users/binarycaching.md | 45 ++++++++++++++-- toolsrc/src/vcpkg/binarycaching.cpp | 81 ++++++++++++++++------------- 2 files changed, 88 insertions(+), 38 deletions(-) diff --git a/docs/users/binarycaching.md b/docs/users/binarycaching.md index c3fb98a4ff731e..9df885f4c3bdb1 100644 --- a/docs/users/binarycaching.md +++ b/docs/users/binarycaching.md @@ -86,7 +86,7 @@ More information about Azure DevOps Artifacts' NuGet support is available in the ## Configuration -Binary caching is configured via a combination of defaults, the environment variable `VCPKG_BINARY_SOURCES` (set to `;;...`), and the command line option `--binarysource=`. Source options are evaluated in order of defaults, then environment, then command line. +Binary caching is configured via a combination of defaults, the environment variable `VCPKG_BINARY_SOURCES` (set to `;;...`), and the command line option `--binarysource=`. Source options are evaluated in order of defaults, then environment, then command line. Binary caching can be completely disabled by passing `--binarysource=clear` as the last command line option. By default, zip-based archives will be cached at the first valid location of: @@ -115,6 +115,47 @@ By default, zip-based archives will be cached at the first valid location of: The `` optional parameter for certain sources controls whether they will be consulted for downloading binaries (`read`), whether on-demand builds will be uploaded to that remote (`write`), or both (`readwrite`). +### Nuget Provider Configuration + +#### Credentials + +Many NuGet servers require additional credentials to access. The most flexible way to supply credentials is via the `nugetconfig` provider with a custom `nuget.config` file. See https://docs.microsoft.com/en-us/nuget/consume-packages/consuming-packages-authenticated-feeds for more information on authenticating via `nuget.config`. + +However, it is still possible to authenticate against many servers using NuGet's built-in credential providers or via customizing your environment's default `nuget.config`. The default config can be extended via nuget client calls such as +``` +nuget sources add -Name MyRemote -Source https://... -Username $user -Password $pass +``` +and then passed to vcpkg via `--binarysource=nuget,MyRemote,readwrite`. You can get a path to the precise copy of NuGet used by vcpkg by running `vcpkg fetch nuget`, which will report something like: +``` +$ vcpkg fetch nuget +/vcpkg/downloads/tools/nuget-5.5.1-linux/nuget.exe +``` +Non-Windows users will need to call this through mono via `mono /path/to/nuget.exe sources add ...`. + +##### Credential Example for Azure Dev Ops +```bash +# On Linux or OSX +$ mono `vcpkg fetch nuget | tail -n1` sources add \ + -name ADO \ + -Source https://pkgs.dev.azure.com/$ORG/_packaging/$FEEDNAME/nuget/v3/index.json \ + -Username $USERNAME \ + -Password $PAT +$ export VCPKG_BINARY_SOURCES="nuget,ADO,readwrite" +``` +```powershell +# On Windows Powershell +PS> & $(vcpkg fetch nuget | select -last 1) sources add ` + -name ADO ` + -Source https://pkgs.dev.azure.com/$ORG/_packaging/$FEEDNAME/nuget/v3/index.json ` + -Username $USERNAME ` + -Password $PAT +PS> $env:VCPKG_BINARY_SOURCES="nuget,ADO,readwrite" +``` + +We recommend using a Personal Access Token (PAT) as the password for maximum security. You can generate a PAT in User Settings -> Personal Access Tokens or `https://dev.azure.com/$ORG/_usersSettings/tokens`. + +#### `metadata.repository` + The `nuget` and `nugetconfig` source providers additionally respect certain environment variables while generating nuget packages. The `metadata.repository` field of any packages will be generated as: ``` @@ -128,8 +169,6 @@ or ``` if the appropriate environment variables are defined and non-empty. This is specifically used to associate packages in GitHub Packages with the _building_ project and not intended to associate with the original package sources. -Finally, binary caching can be completely disabled by passing `--no-binarycaching` on the command line. - ## Implementation Notes (internal details subject to change without notice) Binary caching relies on hashing everything that contributes to a particular package build. This includes: diff --git a/toolsrc/src/vcpkg/binarycaching.cpp b/toolsrc/src/vcpkg/binarycaching.cpp index 966c2e77b7446c..c73e789d0a631b 100644 --- a/toolsrc/src/vcpkg/binarycaching.cpp +++ b/toolsrc/src/vcpkg/binarycaching.cpp @@ -378,6 +378,45 @@ namespace { } + int run_nuget_commandline(const std::string& cmdline) + { + if (m_interactive) + { + return System::cmd_execute(cmdline); + } + + auto res = System::cmd_execute_and_capture_output(cmdline); + if (Debug::g_debugging) + { + System::print2(res.output); + } + if (res.output.find("Authentication may require manual action.") != std::string::npos) + { + System::print2(System::Color::warning, + "One or more NuGet credential providers requested manual action. Add the binary " + "source 'interactive' to allow interactivity.\n"); + } + else if (res.output.find("Response status code does not indicate success: 401 (Unauthorized)") != + std::string::npos && + res.exit_code != 0) + { + System::print2(System::Color::warning, + "One or more NuGet credential providers failed to authenticate. See " + "https://github.com/Microsoft/vcpkg/tree/master/docs/users/binarycaching.md for " + "more details on how to provide credentials.\n"); + } + else if (res.output.find("for example \"-ApiKey AzureDevOps\"") != std::string::npos) + { + auto res2 = System::cmd_execute_and_capture_output(cmdline + " -ApiKey AzureDevOps"); + if (Debug::g_debugging) + { + System::print2(res2.output); + } + return res2.exit_code; + } + return res.exit_code; + } + void prefetch(const VcpkgPaths& paths, std::vector& actions) override { if (m_read_sources.empty() && m_read_configs.empty()) return; @@ -482,19 +521,7 @@ namespace [&] { generate_packages_config(); - if (Debug::g_debugging) - System::cmd_execute(cmdline); - else - { - auto res = System::cmd_execute_and_capture_output(cmdline); - if (res.output.find("Authentication may require manual action.") != std::string::npos) - { - System::print2( - System::Color::warning, - "One or more NuGet credential providers requested manual action. Add the binary " - "source 'interactive' to allow interactivity.\n"); - } - } + run_nuget_commandline(cmdline); }(); Util::erase_remove_if(nuget_refs, [&](const std::pair& nuget_ref) -> bool { @@ -555,12 +582,7 @@ namespace .string_arg("-ForceEnglishOutput"); if (!m_interactive) cmdline.string_arg("-NonInteractive"); - auto pack_rc = [&] { - if (Debug::g_debugging) - return System::cmd_execute(cmdline); - else - return System::cmd_execute_and_capture_output(cmdline).exit_code; - }(); + auto pack_rc = run_nuget_commandline(cmdline.extract()); if (pack_rc != 0) { @@ -585,12 +607,7 @@ namespace System::print2("Uploading binaries for ", spec, " to NuGet source ", write_src, ".\n"); - auto rc = [&] { - if (Debug::g_debugging) - return System::cmd_execute(cmd); - else - return System::cmd_execute_and_capture_output(cmd).exit_code; - }(); + auto rc = run_nuget_commandline(cmd.extract()); if (rc != 0) { @@ -617,12 +634,7 @@ namespace System::print2( "Uploading binaries for ", spec, " using NuGet config ", fs::u8string(write_cfg), ".\n"); - auto rc = [&] { - if (Debug::g_debugging) - return System::cmd_execute(cmd); - else - return System::cmd_execute_and_capture_output(cmd).exit_code; - }(); + auto rc = run_nuget_commandline(cmd.extract()); if (rc != 0) { @@ -1176,13 +1188,12 @@ void vcpkg::help_topic_binary_caching(const VcpkgPaths&) { HelpTableFormatter tbl; tbl.text("Vcpkg can cache compiled packages to accelerate restoration on a single machine or across the network." - " This functionality is currently enabled by default and can be disabled by either passing " - "`--no-binarycaching` to every vcpkg command line or setting the environment variable " - "`VCPKG_FEATURE_FLAGS` to `-binarycaching`."); + " By default, vcpkg will save builds to a local machine cache. This can be disabled by passing " + "`--binarysource=clear` as the last option on the command line."); tbl.blank(); tbl.blank(); tbl.text( - "Once caching is enabled, it can be further configured by either passing `--binarysource=` options " + "Binary caching can be further configured by either passing `--binarysource=` options " "to every command line or setting the `VCPKG_BINARY_SOURCES` environment variable to a set of sources (Ex: " "\";;...\"). Command line sources are interpreted after environment sources."); tbl.blank(); From ba9e885a3c98059025ca0aee0e398fa062b30355 Mon Sep 17 00:00:00 2001 From: Peter Verswyvelen Date: Wed, 9 Dec 2020 20:52:46 +0100 Subject: [PATCH 0268/1694] [libjpeg-turbo] Enabled jpeg7 and jpeg8 APIs (#14483) --- ports/libjpeg-turbo/CONTROL | 7 +++++++ ports/libjpeg-turbo/portfile.cmake | 17 ++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index 3ee860999a74b5..f8a66e50cc6206 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,4 +1,11 @@ Source: libjpeg-turbo Version: 2.0.5 +Port-Version: 1 Homepage: https://github.com/libjpeg-turbo/libjpeg-turbo 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. + +Feature: jpeg7 +Description: Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!) + +Feature: jpeg8 +Description: Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!) diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 95fae01c2b3afc..f4a55e0783c018 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -28,6 +28,11 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_CRT_DLL) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + jpeg7 WITH_JPEG7 + jpeg8 WITH_JPEG8 +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -37,6 +42,7 @@ vcpkg_configure_cmake( -DENABLE_EXECUTABLES=OFF -DINSTALL_DOCS=OFF -DWITH_CRT_DLL=${WITH_CRT_DLL} + ${FEATURE_OPTIONS} ${LIBJPEGTURBO_SIMD} OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) @@ -62,24 +68,17 @@ else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() endif() -file(COPY +file(INSTALL ${SOURCE_PATH}/LICENSE.md - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + 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}/share/man) -file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) -file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) -if(EXE OR DEBUG_EXE) - file(REMOVE ${EXE} ${DEBUG_EXE}) -endif() - file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jpeg) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo/copyright) vcpkg_copy_pdbs() From c56ca3c0cb52766bf103aa2ad044ce51b95f9cfd Mon Sep 17 00:00:00 2001 From: dweckmann Date: Wed, 9 Dec 2020 20:56:56 +0100 Subject: [PATCH 0269/1694] [pcl] Fix build when librealsense2 is present (#14960) --- ports/pcl/CONTROL | 1 + ports/pcl/portfile.cmake | 1 + ports/pcl/realsense2.patch | 13 +++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 ports/pcl/realsense2.patch diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL index f44015523a03e6..4590159012fe65 100644 --- a/ports/pcl/CONTROL +++ b/ports/pcl/CONTROL @@ -1,5 +1,6 @@ Source: pcl Version: 1.11.1 +Port-Version: 1 Homepage: https://github.com/PointCloudLibrary/pcl Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing. Build-Depends: eigen3, flann, qhull, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-sort, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index de5752e7459452..6fe027ce9cb7c0 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( fix-link-libpng.patch remove-broken-targets.patch fix-check-sse.patch + realsense2.patch ) file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindFLANN.cmake) diff --git a/ports/pcl/realsense2.patch b/ports/pcl/realsense2.patch new file mode 100644 index 00000000000000..cfe2cc41f1b255 --- /dev/null +++ b/ports/pcl/realsense2.patch @@ -0,0 +1,13 @@ +diff --git a/io/src/real_sense_2_grabber.cpp b/io/src/real_sense_2_grabber.cpp +index d13231e..06d1238 100644 +--- a/io/src/real_sense_2_grabber.cpp ++++ b/io/src/real_sense_2_grabber.cpp +@@ -287,7 +287,7 @@ namespace pcl + cloud->width = sp.width (); + cloud->height = sp.height (); + cloud->is_dense = false; +- cloud->points.resize ( size () ); ++ cloud->points.resize ( points.size () ); + + const auto cloud_vertices_ptr = points.get_vertices (); + const auto cloud_texture_ptr = points.get_texture_coordinates (); From df22a11f2b406ea578ba94d051a5674165686e20 Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Wed, 9 Dec 2020 19:57:17 +0000 Subject: [PATCH 0270/1694] Explicitly set x86_64 architecture for x64-osx triplet (#15001) --- triplets/x64-osx.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/triplets/x64-osx.cmake b/triplets/x64-osx.cmake index af3a8c3483028e..8cd8c90b4a69ab 100644 --- a/triplets/x64-osx.cmake +++ b/triplets/x64-osx.cmake @@ -3,3 +3,4 @@ set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_OSX_ARCHITECTURES x86_64) From 5d5fe5db67e0c740b7f607a4e423eec16f993a6d Mon Sep 17 00:00:00 2001 From: Kevin Lalumiere Date: Wed, 9 Dec 2020 14:58:59 -0500 Subject: [PATCH 0271/1694] [libxml2] fix build failure with x64-linux-dynamic (#14991) --- ports/libxml2/CMakeLists.txt | 13 +++++++++++++ ports/libxml2/CONTROL | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt index 323f64c34eb60d..bdc3939bff1325 100644 --- a/ports/libxml2/CMakeLists.txt +++ b/ports/libxml2/CMakeLists.txt @@ -108,6 +108,19 @@ if(INSTALL_HEADERS) set_target_properties(libxml2 PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}") endif() target_include_directories(libxml2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/include include ${LIBLZMA_INCLUDE_DIRS}) +get_property(LIBRARIES TARGET Iconv::Iconv PROPERTY INTERFACE_LINK_LIBRARIES) +if(LIBRARIES) + set_property(TARGET Iconv::Iconv PROPERTY INTERFACE_LINK_LIBRARIES "") + foreach(LIBRARY ${LIBRARIES}) + # Since `libc.so` has no SONAME, CMake maps e.g. `/usr/lib/x86_64-linux-gnu/libc.so` to `-llibc`. + # This is not found: it should be mapped to `-lc`. + if(LIBRARY MATCHES "/libc\\.so$") + set_property(TARGET Iconv::Iconv APPEND PROPERTY INTERFACE_LINK_LIBRARIES "c") + else() + set_property(TARGET Iconv::Iconv APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${LIBRARY}") + endif() + endforeach() +endif() target_link_libraries(libxml2 PRIVATE Iconv::Iconv ZLIB::ZLIB diff --git a/ports/libxml2/CONTROL b/ports/libxml2/CONTROL index 462ecfec676d6e..fe8dec589f3cac 100644 --- a/ports/libxml2/CONTROL +++ b/ports/libxml2/CONTROL @@ -1,6 +1,6 @@ Source: libxml2 Version: 2.9.10 -Port-Version: 1 +Port-Version: 2 Homepage: https://xmlsoft.org/ Description: Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform) Build-Depends: zlib, libiconv, liblzma From 24bf31177114e2d37fcec21a333b07fa735732e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20L=C3=B3pez=20Fueyo?= Date: Thu, 10 Dec 2020 19:17:16 +0100 Subject: [PATCH 0272/1694] [curl] Update to 7.74.0 (#15041) --- ports/curl/CONTROL | 3 +-- ports/curl/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index ad919d564b21da..72bc677bb492e4 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,6 +1,5 @@ Source: curl -Version: 7.73.0 -Port-Version: 4 +Version: 7.74.0 Build-Depends: zlib Homepage: https://github.com/curl/curl Description: A library for transferring data with URLs diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index d0d89fd6e06485..c2e53d4c3ac9ef 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 315ee3fe75dade912b48a21ceec9ccda0230d937 #curl-7_73_0 - SHA512 db9385d63688256c335f08fe044c67e7c17e2fbcbb47df234d5f9a1586b259edb07a37845c2ad85d2da00738b19dc0e718d91d05b2881c2828fec2660f858444 + REF e052859759b34d0e05ce0f17244873e5cd7b457b #curl-7_74_0 + SHA512 3dbbab00dda4f0e7d012fab358d2dd1362ff0c0f59c81f638fb547acba6f74a61c306906892447af3b18e8b0ebb93ebb8e0ac77e92247864bfa3a9c4ce7ea1d0 HEAD_REF master PATCHES 0002_fix_uwp.patch From b4b835bd59f8ce67d3cb26ab9e6e7e8244a6a203 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Thu, 10 Dec 2020 12:27:02 -0600 Subject: [PATCH 0273/1694] [speexdsp] Fix include directories for Linux builds (#15036) --- ports/speexdsp/CMakeLists.txt | 1 + ports/speexdsp/CONTROL | 2 +- scripts/ci.baseline.txt | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/speexdsp/CMakeLists.txt b/ports/speexdsp/CMakeLists.txt index 6a5f10613ba43a..4f5abea48cf876 100644 --- a/ports/speexdsp/CMakeLists.txt +++ b/ports/speexdsp/CMakeLists.txt @@ -94,6 +94,7 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/include/speex/speexdsp_config_types.h. list(APPEND LIBSPEEXDSP_HEADERS_PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/speexdsp_config_types.h") include_directories("${CMAKE_CURRENT_LIST_DIR}/include") +include_directories("${CMAKE_CURRENT_BINARY_DIR}") add_library(speexdsp ${LIBSPEEXDSP_SOURCES} ${LIBSPEEXDSP_HEADERS}) set_target_properties(speexdsp PROPERTIES PUBLIC_HEADER "${LIBSPEEXDSP_HEADERS_PUBLIC}") diff --git a/ports/speexdsp/CONTROL b/ports/speexdsp/CONTROL index dbf76057de5fba..59ba0f4c0f8744 100644 --- a/ports/speexdsp/CONTROL +++ b/ports/speexdsp/CONTROL @@ -1,6 +1,6 @@ Source: speexdsp Version: 1.2.0 -Port-Version: 3 +Port-Version: 4 Homepage: https://speex.org/ Description: A patent-free, Open Source/Free Software DSP library. Build-Depends: diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 79728d8629b3b9..af8a9664215c08 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1446,7 +1446,6 @@ spdk-isal:x64-uwp=fail spdk-isal:x64-windows=fail spdk-isal:x64-windows-static=fail spdk-isal:x86-windows=fail -speexdsp:x64-linux=fail spirv-tools:arm-uwp=fail spirv-tools:x64-uwp=fail stormlib:arm-uwp=fail From 9cf3b420cf9916970934f456d28e74fa75b8f474 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 10 Dec 2020 10:31:40 -0800 Subject: [PATCH 0274/1694] [tcl, anyrpc, ois, osgearth] Build Fixes 2020-12-09 (#15030) --- ports/anyrpc/CONTROL | 4 ---- ports/anyrpc/portfile.cmake | 1 + ports/anyrpc/vcpkg.json | 7 +++++++ ports/ois/CONTROL | 4 ---- ports/ois/portfile.cmake | 1 + ports/ois/vcpkg.json | 7 +++++++ scripts/ci.baseline.txt | 5 +++-- 7 files changed, 19 insertions(+), 10 deletions(-) delete mode 100644 ports/anyrpc/CONTROL create mode 100644 ports/anyrpc/vcpkg.json delete mode 100644 ports/ois/CONTROL create mode 100644 ports/ois/vcpkg.json diff --git a/ports/anyrpc/CONTROL b/ports/anyrpc/CONTROL deleted file mode 100644 index a76346057cb20d..00000000000000 --- a/ports/anyrpc/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: anyrpc -Version: 2020-01-13-1 -Homepage: https://github.com/sgieseking/anyrpc -Description: A multiprotocol remote procedure call system for C++. diff --git a/ports/anyrpc/portfile.cmake b/ports/anyrpc/portfile.cmake index 843e83609f1442..513c37cd91cb72 100644 --- a/ports/anyrpc/portfile.cmake +++ b/ports/anyrpc/portfile.cmake @@ -11,6 +11,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARE vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF diff --git a/ports/anyrpc/vcpkg.json b/ports/anyrpc/vcpkg.json new file mode 100644 index 00000000000000..f71f684cc7fbcb --- /dev/null +++ b/ports/anyrpc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "anyrpc", + "version-string": "2020-01-13", + "port-version": 2, + "description": "A multiprotocol remote procedure call system for C++.", + "homepage": "https://github.com/sgieseking/anyrpc" +} diff --git a/ports/ois/CONTROL b/ports/ois/CONTROL deleted file mode 100644 index b43ed59dd9ecaf..00000000000000 --- a/ports/ois/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ois -Version: 1.5-1 -Description: Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatiable with many systems and operating systems. -Homepage: https://wgois.github.io/OIS/ \ No newline at end of file diff --git a/ports/ois/portfile.cmake b/ports/ois/portfile.cmake index f35d3d5378139d..84859bb096aed5 100644 --- a/ports/ois/portfile.cmake +++ b/ports/ois/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE ) vcpkg_install_cmake() diff --git a/ports/ois/vcpkg.json b/ports/ois/vcpkg.json new file mode 100644 index 00000000000000..2b6b7140f896fc --- /dev/null +++ b/ports/ois/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ois", + "version-string": "1.5", + "port-version": 2, + "description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatiable with many systems and operating systems.", + "homepage": "https://wgois.github.io/OIS/" +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index af8a9664215c08..cf3dbfae391cd1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1122,9 +1122,11 @@ opusfile:arm-uwp=fail opusfile:x64-uwp=fail orocos-kdl:arm-uwp=fail orocos-kdl:x64-uwp=fail -osgearth:x64-osx=fail osgearth:x64-linux=fail +osgearth:x64-osx=fail osgearth:x64-windows-static=fail +osgearth:x64-windows=fail +osgearth:x86-windows=fail paho-mqtt:arm-uwp=fail paho-mqtt:x64-uwp=fail pangomm:x64-osx=fail @@ -1461,7 +1463,6 @@ tbb:x64-uwp=fail tcl:arm-uwp=fail tcl:arm64-windows=fail tcl:x64-uwp=fail -tcl:x64-osx=fail teemo:x64-uwp=fail teemo:arm-uwp=fail teemo:arm64-windows=fail From c8b390164c54c09ce747f19e34f060c9c7655fc3 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Thu, 10 Dec 2020 15:25:00 -0600 Subject: [PATCH 0275/1694] [freetype] Make zlib and brotli features (#14917) --- ports/freetype/CONTROL | 13 ++++++-- ports/freetype/fix-exports.patch | 10 ++++-- ports/freetype/portfile.cmake | 14 +++++++-- ports/freetype/vcpkg-cmake-wrapper.cmake | 39 ++++++++++++++++-------- 4 files changed, 56 insertions(+), 20 deletions(-) diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL index 47ae9d67bf4a4d..55358c608f891a 100644 --- a/ports/freetype/CONTROL +++ b/ports/freetype/CONTROL @@ -1,10 +1,13 @@ Source: freetype Version: 2.10.2 -Port-Version: 5 -Build-Depends: zlib, brotli +Port-Version: 6 Homepage: https://www.freetype.org/ Description: A library to render fonts. -Default-Features: bzip2, png +Default-Features: zlib, bzip2, png, brotli + +Feature: zlib +Build-Depends: zlib +Description: Use zlib instead of internal library for DEFLATE Feature: bzip2 Build-Depends: bzip2 @@ -13,3 +16,7 @@ Description: Support bzip2 compressed fonts. Feature: png Build-Depends: libpng Description: Support PNG compressed OpenType embedded bitmaps. + +Feature: brotli +Build-Depends: brotli +Description: Support decompression of WOFF2 streams diff --git a/ports/freetype/fix-exports.patch b/ports/freetype/fix-exports.patch index f0ef422d39e236..9cad1dc3782623 100644 --- a/ports/freetype/fix-exports.patch +++ b/ports/freetype/fix-exports.patch @@ -11,18 +11,24 @@ index 04ce73a..ee3cc05 100644 target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS}) list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "zlib") endif () -@@ -562,8 +562,15 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) +@@ -562,8 +562,21 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) install( EXPORT freetype-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype - FILE freetype-config.cmake COMPONENT headers) + -+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake" ++ if(ZLIB_FOUND) ++ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake" +[[include(CMakeFindDependencyMacro) +find_dependency(ZLIB) +include("${CMAKE_CURRENT_LIST_DIR}/freetype-targets.cmake") +]]) ++ else() ++ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake" ++[[include("${CMAKE_CURRENT_LIST_DIR}/freetype-targets.cmake") ++]]) ++ endif() + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype) endif () diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 08260fa55282f0..98cb13b9847a72 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -16,19 +16,21 @@ vcpkg_from_sourceforge( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + zlib FT_WITH_ZLIB bzip2 FT_WITH_BZIP2 png FT_WITH_PNG + brotli FT_WITH_BROTLI INVERTED_FEATURES + zlib CMAKE_DISABLE_FIND_PACKAGE_ZLIB bzip2 CMAKE_DISABLE_FIND_PACKAGE_BZip2 png CMAKE_DISABLE_FIND_PACKAGE_PNG + brotli CMAKE_DISABLE_FIND_PACKAGE_BrotliDec ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DFT_WITH_ZLIB=ON # Force system zlib. - -DFT_WITH_BROTLI=ON -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=ON ${FEATURE_OPTIONS} ) @@ -73,6 +75,10 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if("zlib" IN_LIST FEATURES) + set(USE_ZLIB ON) + endif() + if("bzip2" IN_LIST FEATURES) set(USE_BZIP2 ON) endif() @@ -81,6 +87,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(USE_PNG ON) endif() + if("brotli" IN_LIST FEATURES) + set(USE_BROTLI ON) + endif() + configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) endif() diff --git a/ports/freetype/vcpkg-cmake-wrapper.cmake b/ports/freetype/vcpkg-cmake-wrapper.cmake index 355ddbcf575eeb..42bf9e1fa72c39 100644 --- a/ports/freetype/vcpkg-cmake-wrapper.cmake +++ b/ports/freetype/vcpkg-cmake-wrapper.cmake @@ -1,6 +1,8 @@ _find_package(${ARGS}) -find_package(ZLIB) +if(@USE_ZLIB@) + find_package(ZLIB) +endif() if(@USE_BZIP2@) find_package(BZip2) @@ -10,16 +12,20 @@ if(@USE_PNG@) find_package(PNG) endif() -find_library(BROTLIDEC_LIBRARY_RELEASE NAMES brotlidec brotlidec-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) -find_library(BROTLIDEC_LIBRARY_DEBUG NAMES brotlidec brotlidec-static brotlidecd brotlidec-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) -find_library(BROTLICOMMON_LIBRARY_RELEASE NAMES brotlicommon brotlicommon-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) -find_library(BROTLICOMMON_LIBRARY_DEBUG NAMES brotlicommon brotlicommon-static brotlicommond brotlicommon-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) -include(SelectLibraryConfigurations) -select_library_configurations(BROTLIDEC) -select_library_configurations(BROTLICOMMON) +if(@USE_BROTLI@) + find_library(BROTLIDEC_LIBRARY_RELEASE NAMES brotlidec brotlidec-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) + find_library(BROTLIDEC_LIBRARY_DEBUG NAMES brotlidec brotlidec-static brotlidecd brotlidec-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + find_library(BROTLICOMMON_LIBRARY_RELEASE NAMES brotlicommon brotlicommon-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) + find_library(BROTLICOMMON_LIBRARY_DEBUG NAMES brotlicommon brotlicommon-static brotlicommond brotlicommon-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + include(SelectLibraryConfigurations) + select_library_configurations(BROTLIDEC) + select_library_configurations(BROTLICOMMON) +endif(@USE_BROTLI@) if(TARGET Freetype::Freetype) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) + if(@USE_ZLIB@) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) + endif() if(@USE_BZIP2@) set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2) @@ -28,11 +34,16 @@ if(TARGET Freetype::Freetype) if(@USE_PNG@) set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES PNG::PNG) endif() - target_link_libraries(Freetype::Freetype INTERFACE ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) + + if(@USE_BROTLI@) + target_link_libraries(Freetype::Freetype INTERFACE ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) + endif() endif() if(FREETYPE_LIBRARIES) - list(APPEND FREETYPE_LIBRARIES ${ZLIB_LIBRARIES}) + if(@USE_ZLIB@) + list(APPEND FREETYPE_LIBRARIES ${ZLIB_LIBRARIES}) + endif() if(@USE_BZIP2@) list(APPEND FREETYPE_LIBRARIES ${BZIP2_LIBRARIES}) @@ -41,6 +52,8 @@ if(FREETYPE_LIBRARIES) if(@USE_PNG@) list(APPEND FREETYPE_LIBRARIES ${PNG_LIBRARIES}) endif() - - list(APPEND FREETYPE_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) + + if(@USE_BROTLI@) + list(APPEND FREETYPE_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) + endif() endif() From 6bac700ee5d25a6a47ed37746105380a93689903 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Thu, 10 Dec 2020 20:54:34 -0800 Subject: [PATCH 0276/1694] [vcpkg] Improve error messages for incomplete Mono (#14948) * [vcpkg] Improve error messages for incomplete Mono * [vcpkg] Add mono upgrade notice for Ubuntu 18.04 users * [vcpkg] Fix always failing to check CMake version due to preferring 'error' constructor in ExpectedS * [vcpkg] Eagerly display the 'Ubuntu needs new mono' message to avoid users needing to install it twice Co-authored-by: Robert Schumacher --- toolsrc/include/vcpkg/base/expected.h | 5 +- toolsrc/src/vcpkg/tools.cpp | 111 +++++++++++++++++--------- 2 files changed, 78 insertions(+), 38 deletions(-) diff --git a/toolsrc/include/vcpkg/base/expected.h b/toolsrc/include/vcpkg/base/expected.h index 12bb647273e923..13e7b4bcbf61d3 100644 --- a/toolsrc/include/vcpkg/base/expected.h +++ b/toolsrc/include/vcpkg/base/expected.h @@ -110,7 +110,10 @@ namespace vcpkg // Constructors are intentionally implicit ExpectedT(const S& s, ExpectedRightTag = {}) : m_s(s) { } - ExpectedT(S&& s, ExpectedRightTag = {}) : m_s(std::move(s)) { } + template::value>> + ExpectedT(S&& s, ExpectedRightTag = {}) : m_s(std::move(s)) + { + } ExpectedT(const T& t, ExpectedLeftTag = {}) : m_t(t) { } template::value>> diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index 69ad05d385e8f7..0b82e7780656aa 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -83,12 +83,23 @@ namespace vcpkg const bool has_tool_entry = std::regex_search(XML.cbegin(), XML.cend(), match_tool_entry, tool_regex); if (!has_tool_entry) { + StringLiteral add_info = ""; + if (tool == "mono") + { +#if defined(__APPLE__) + add_info = " (brew install mono)"; +#else + add_info = " (e.g. sudo apt install mono-complete). Ubuntu 18.04 users may " + "need a newer version of mono, available at https://www.mono-project.com/download/stable/"; +#endif + } return Strings::format("Could not automatically acquire %s because there is no entry in %s for os=%s. You " - "may be able to install %s via your system package manager.", + "may be able to install %s via your system package manager%s.", tool, fs::u8string(XML_PATH), OS_STRING, - tool); + tool, + add_info); } const std::string tool_data = @@ -139,7 +150,7 @@ namespace vcpkg virtual std::array default_min_version() const = 0; virtual void add_special_paths(std::vector& out_candidate_paths) const { (void)out_candidate_paths; } - virtual Optional get_version(const VcpkgPaths& paths, const fs::path& path_to_exe) const = 0; + virtual ExpectedS get_version(const VcpkgPaths& paths, const fs::path& path_to_exe) const = 0; }; static Optional find_first_with_sufficient_version(const VcpkgPaths& paths, @@ -222,10 +233,9 @@ namespace vcpkg const ToolProvider& tool_provider, const ToolData& tool_data) { - const auto downloaded_path = fetch_tool(paths, tool_provider.tool_data_name(), tool_data); - const auto downloaded_version = - tool_provider.get_version(paths, downloaded_path).value_or_exit(VCPKG_LINE_INFO); - return {downloaded_path, downloaded_version}; + auto downloaded_path = fetch_tool(paths, tool_provider.tool_data_name(), tool_data); + auto downloaded_version = tool_provider.get_version(paths, downloaded_path).value_or_exit(VCPKG_LINE_INFO); + return {std::move(downloaded_path), std::move(downloaded_version)}; } static PathAndVersion get_path(const VcpkgPaths& paths, const ToolProvider& tool) @@ -285,13 +295,15 @@ namespace vcpkg (void)out_candidate_paths; #endif } - virtual Optional get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override + virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { const std::string cmd = Strings::format(R"("%s" --version)", fs::u8string(path_to_exe)); - const auto rc = System::cmd_execute_and_capture_output(cmd); + auto rc = System::cmd_execute_and_capture_output(cmd); if (rc.exit_code != 0) { - return nullopt; + return {Strings::concat( + std::move(rc.output), "\n\nFailed to get version of ", fs::u8string(path_to_exe), "\n"), + expected_right_tag}; } /* Sample output: @@ -299,7 +311,8 @@ cmake version 3.10.2 CMake suite maintained and supported by Kitware (kitware.com/cmake). */ - return StringView::find_exactly_one_enclosed(rc.output, "cmake version ", "\n").to_string(); + return {StringView::find_exactly_one_enclosed(rc.output, "cmake version ", "\n").to_string(), + expected_left_tag}; } }; @@ -311,19 +324,21 @@ CMake suite maintained and supported by Kitware (kitware.com/cmake). virtual const std::string& exe_stem() const override { return m_exe; } virtual std::array default_min_version() const override { return {3, 5, 1}; } - virtual Optional get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override + virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { const std::string cmd = Strings::format(R"("%s" --version)", fs::u8string(path_to_exe)); - const auto rc = System::cmd_execute_and_capture_output(cmd); + auto rc = System::cmd_execute_and_capture_output(cmd); if (rc.exit_code != 0) { - return nullopt; + return {Strings::concat( + std::move(rc.output), "\n\nFailed to get version of ", fs::u8string(path_to_exe), "\n"), + expected_right_tag}; } /* Sample output: 1.8.2 */ - return rc.output; + return {std::move(rc.output), expected_left_tag}; } }; @@ -335,7 +350,7 @@ CMake suite maintained and supported by Kitware (kitware.com/cmake). virtual const std::string& exe_stem() const override { return m_exe; } virtual std::array default_min_version() const override { return {4, 6, 2}; } - virtual Optional get_version(const VcpkgPaths& paths, const fs::path& path_to_exe) const override + virtual ExpectedS get_version(const VcpkgPaths& paths, const fs::path& path_to_exe) const override { System::CmdLineBuilder cmd; #ifndef _WIN32 @@ -344,10 +359,23 @@ CMake suite maintained and supported by Kitware (kitware.com/cmake). (void)paths; #endif cmd.path_arg(path_to_exe); - const auto rc = System::cmd_execute_and_capture_output(cmd.extract()); + auto rc = System::cmd_execute_and_capture_output(cmd.extract()); if (rc.exit_code != 0) { - return nullopt; +#ifndef _WIN32 + return {Strings::concat( + std::move(rc.output), + "\n\nFailed to get version of ", + fs::u8string(path_to_exe), + "\nThis may be caused by an incomplete mono installation. Full mono is " + "available on some systems via `sudo apt install mono-complete`. Ubuntu 18.04 users may " + "need a newer version of mono, available at https://www.mono-project.com/download/stable/"), + expected_right_tag}; +#else + return {Strings::concat( + std::move(rc.output), "\n\nFailed to get version of ", fs::u8string(path_to_exe), "\n"), + expected_right_tag}; +#endif } /* Sample output: @@ -357,7 +385,8 @@ Type 'NuGet help ' for help on a specific command. [[[List of available commands follows]]] */ - return StringView::find_exactly_one_enclosed(rc.output, "NuGet Version: ", "\n").to_string(); + return {StringView::find_exactly_one_enclosed(rc.output, "NuGet Version: ", "\n").to_string(), + expected_left_tag}; } }; @@ -383,13 +412,15 @@ Type 'NuGet help ' for help on a specific command. #endif } - virtual Optional get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override + virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { const std::string cmd = Strings::format(R"("%s" --version)", fs::u8string(path_to_exe)); - const auto rc = System::cmd_execute_and_capture_output(cmd); + auto rc = System::cmd_execute_and_capture_output(cmd); if (rc.exit_code != 0) { - return nullopt; + return {Strings::concat( + std::move(rc.output), "\n\nFailed to get version of ", fs::u8string(path_to_exe), "\n"), + expected_right_tag}; } /* Sample output: @@ -398,7 +429,7 @@ git version 2.17.1.windows.2 const auto idx = rc.output.find("git version "); Checks::check_exit( VCPKG_LINE_INFO, idx != std::string::npos, "Unexpected format of git version string: %s", rc.output); - return rc.output.substr(idx); + return {rc.output.substr(idx), expected_left_tag}; } }; @@ -410,13 +441,15 @@ git version 2.17.1.windows.2 virtual const std::string& exe_stem() const override { return m_exe; } virtual std::array default_min_version() const override { return {0, 0, 0}; } - virtual Optional get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override + virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { - const auto rc = System::cmd_execute_and_capture_output( + auto rc = System::cmd_execute_and_capture_output( System::CmdLineBuilder().path_arg(path_to_exe).string_arg("--version").extract()); if (rc.exit_code != 0) { - return nullopt; + return {Strings::concat( + std::move(rc.output), "\n\nFailed to get version of ", fs::u8string(path_to_exe), "\n"), + expected_right_tag}; } /* Sample output: @@ -425,7 +458,7 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50 const auto idx = rc.output.find("Mono JIT compiler version "); Checks::check_exit( VCPKG_LINE_INFO, idx != std::string::npos, "Unexpected format of mono version string: %s", rc.output); - return rc.output.substr(idx); + return {rc.output.substr(idx), expected_left_tag}; } }; @@ -450,19 +483,21 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50 // "Qt" / "QtIFW-3.1.0" / "bin" / "installerbase.exe"); } - virtual Optional get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override + virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { const std::string cmd = Strings::format(R"("%s" --framework-version)", fs::u8string(path_to_exe)); - const auto rc = System::cmd_execute_and_capture_output(cmd); + auto rc = System::cmd_execute_and_capture_output(cmd); if (rc.exit_code != 0) { - return nullopt; + return {Strings::concat( + std::move(rc.output), "\n\nFailed to get version of ", fs::u8string(path_to_exe), "\n"), + expected_right_tag}; } /* Sample output: 3.1.81 */ - return rc.output; + return {std::move(rc.output), expected_left_tag}; } }; @@ -475,17 +510,19 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50 virtual const std::string& exe_stem() const override { return m_exe; } virtual std::array default_min_version() const override { return {7, 0, 3}; } - virtual Optional get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override + virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { - const auto pwsh_invocation = System::cmd_execute_and_capture_output( + auto rc = System::cmd_execute_and_capture_output( System::CmdLineBuilder().path_arg(path_to_exe).string_arg("--version").extract()); - if (pwsh_invocation.exit_code != 0) + if (rc.exit_code != 0) { - return nullopt; + return {Strings::concat( + std::move(rc.output), "\n\nFailed to get version of ", fs::u8string(path_to_exe), "\n"), + expected_right_tag}; } // Sample output: PowerShell 7.0.3\r\n - auto output = std::move(pwsh_invocation.output); + auto output = std::move(rc.output); if (!Strings::starts_with(output, "PowerShell ")) { Checks::exit_with_message( @@ -493,7 +530,7 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50 } output.erase(0, 11); - return Strings::trim(std::move(output)); + return {Strings::trim(std::move(output)), expected_left_tag}; } }; From 48ff65635b4b22f4f6026abcfc4d565dd8da070c Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 11 Dec 2020 23:16:29 +0100 Subject: [PATCH 0277/1694] [OpenCV] fix compatibility with VTK9 (#12785) --- ports/ceres/portfile.cmake | 6 + ports/ceres/vcpkg.json | 2 +- ports/opencv2/CONTROL | 6 +- ports/opencv2/portfile.cmake | 12 - ports/opencv3/0005-fix-vtk9.patch | 484 ++++++++++++++++++ ports/opencv3/CONTROL | 2 +- ports/opencv3/portfile.cmake | 97 ++-- ports/opencv4/0006-fix-vtk9.patch | 41 ++ ports/opencv4/0007-fix-vtk9-contrib.patch | 470 +++++++++++++++++ ports/opencv4/CONTROL | 2 +- ports/opencv4/portfile.cmake | 19 +- ports/tesseract/CONTROL | 4 +- ports/tesseract/portfile.cmake | 10 + ports/vtk/module-name-mangling.patch | 18 + ports/vtk/portfile.cmake | 23 +- scripts/test_ports/vcpkg-ci-opencv/CONTROL | 6 + .../test_ports/vcpkg-ci-opencv/portfile.cmake | 1 + 17 files changed, 1124 insertions(+), 79 deletions(-) create mode 100644 ports/opencv3/0005-fix-vtk9.patch create mode 100644 ports/opencv4/0006-fix-vtk9.patch create mode 100644 ports/opencv4/0007-fix-vtk9-contrib.patch create mode 100644 ports/vtk/module-name-mangling.patch create mode 100644 scripts/test_ports/vcpkg-ci-opencv/CONTROL create mode 100644 scripts/test_ports/vcpkg-ci-opencv/portfile.cmake diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index fd8d0ec40d6b3d..e581306236a28b 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -54,6 +54,12 @@ if(VCPKG_TARGET_IS_WINDOWS) else() vcpkg_fixup_cmake_targets(CONFIG_PATH lib${LIB_SUFFIX}/cmake/Ceres) endif() +file(READ ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake CERES_CONFIG) +string(REPLACE "set_target_properties(ceres PROPERTIES INTERFACE_LINK_LIBRARIES Ceres::ceres)" + "set_target_properties(ceres PROPERTIES INTERFACE_LINK_LIBRARIES Ceres::ceres) + set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD_REQUIRED ON)" CERES_CONFIG "${CERES_CONFIG}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake "${CERES_CONFIG}") vcpkg_copy_pdbs() diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json index 7a717783396a54..d89a0179f90fa3 100644 --- a/ports/ceres/vcpkg.json +++ b/ports/ceres/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ceres", "version-string": "2.0.0", - "port-version": 1, + "port-version": 2, "description": "non-linear optimization package", "homepage": "https://github.com/ceres-solver/ceres-solver", "dependencies": [ diff --git a/ports/opencv2/CONTROL b/ports/opencv2/CONTROL index 621cb34bd3ad15..1e9f57cdbb96ed 100644 --- a/ports/opencv2/CONTROL +++ b/ports/opencv2/CONTROL @@ -1,6 +1,6 @@ Source: opencv2 Version: 2.4.13.7 -Port-Version: 3 +Port-Version: 4 Build-Depends: zlib Description: computer vision library, version 2 Default-Features: eigen, jpeg, opengl, png, tiff @@ -45,9 +45,5 @@ Feature: tiff Build-Depends: tiff Description: TIFF support for opencv -Feature: vtk -Build-Depends: vtk -Description: vtk support for opencv - Feature: world Description: Compile to a single package support for opencv diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake index 8e1fca5fb9bc8c..6cd8b48a7b9f93 100644 --- a/ports/opencv2/portfile.cmake +++ b/ports/opencv2/portfile.cmake @@ -45,23 +45,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "world" BUILD_opencv_world ) -set(WITH_VTK OFF) -if("vtk" IN_LIST FEATURES) - set(WITH_VTK ON) -endif() - set(WITH_MSMF ON) if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) set(WITH_MSMF OFF) endif() -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - if (WITH_VTK) - message(WARNING "VTK is currently unsupported in this build configuration, turning it off") - set(WITH_VTK OFF) - endif() -endif() - if("ffmpeg" IN_LIST FEATURES) if(VCPKG_TARGET_IS_UWP) set(VCPKG_C_FLAGS "/sdl- ${VCPKG_C_FLAGS}") diff --git a/ports/opencv3/0005-fix-vtk9.patch b/ports/opencv3/0005-fix-vtk9.patch new file mode 100644 index 00000000000000..137302ee37150e --- /dev/null +++ b/ports/opencv3/0005-fix-vtk9.patch @@ -0,0 +1,484 @@ +diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake +index 1495688..4c83504 100644 +--- a/cmake/OpenCVDetectVTK.cmake ++++ b/cmake/OpenCVDetectVTK.cmake +@@ -1,12 +1,30 @@ ++# VTK 9.0 ++if(NOT VTK_FOUND) ++ find_package(VTK 9 QUIET NAMES vtk COMPONENTS ++ FiltersExtraction ++ FiltersSources ++ FiltersTexture ++ IOExport ++ IOGeometry ++ IOPLY ++ InteractionStyle ++ RenderingCore ++ RenderingLOD ++ RenderingOpenGL2 ++ NO_MODULE) ++endif() ++ + # VTK 6.x components +-find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) +-IF(VTK_FOUND) +- IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var. ++if(NOT VTK_FOUND) ++ find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) ++ IF(VTK_FOUND) ++ IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var. + find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE) +- ELSE(VTK_RENDERING_BACKEND) ++ ELSE(VTK_RENDERING_BACKEND) + find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) +- ENDIF(VTK_RENDERING_BACKEND) +-ENDIF(VTK_FOUND) ++ ENDIF(VTK_RENDERING_BACKEND) ++ ENDIF(VTK_FOUND) ++endif() + + # VTK 5.x components + if(NOT VTK_FOUND) +diff --git a/modules/viz/CMakeLists.txt b/modules/viz/CMakeLists.txt +index 256b464..92698c3 100644 +--- a/modules/viz/CMakeLists.txt ++++ b/modules/viz/CMakeLists.txt +@@ -3,7 +3,6 @@ if(NOT HAVE_VTK) + endif() + + set(the_description "Viz") +-include(${VTK_USE_FILE}) + + if(NOT BUILD_SHARED_LIBS) + # We observed conflict between builtin 3rdparty libraries and +@@ -27,7 +26,14 @@ endif() + ocv_warnings_disable(CMAKE_CXX_FLAGS -Winconsistent-missing-override -Wsuggest-override) + + ocv_define_module(viz opencv_core WRAP python) +-ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) ++ ++if (VTK_VERSION VERSION_LESS "8.90.0") ++ include(${VTK_USE_FILE}) ++ ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) ++else () ++ ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) ++ vtk_module_autoinit(TARGETS ${the_module} MODULES ${VTK_LIBRARIES}) ++endif() + + if(APPLE AND BUILD_opencv_viz) + ocv_target_link_libraries(${the_module} PRIVATE "-framework Cocoa") +diff --git a/modules/viz/src/precomp.hpp b/modules/viz/src/precomp.hpp +index f92fdb6..4c4bf7c 100644 +--- a/modules/viz/src/precomp.hpp ++++ b/modules/viz/src/precomp.hpp +@@ -133,7 +133,8 @@ + #include + #include + #include +-#include "vtkCallbackCommand.h" ++#include ++#include + + #if !defined(_WIN32) || defined(__CYGWIN__) + # include /* unlink */ +@@ -149,6 +150,11 @@ + #include "vtk/vtkTrajectorySource.h" + #include "vtk/vtkImageMatSource.h" + ++#if VTK_MAJOR_VERSION >= 9 ++typedef vtkIdType const * CellIterT; ++#else ++typedef vtkIdType * CellIterT; ++#endif + + #include + #include +diff --git a/modules/viz/src/types.cpp b/modules/viz/src/types.cpp +index 65571a1..e9a470c 100644 +--- a/modules/viz/src/types.cpp ++++ b/modules/viz/src/types.cpp +@@ -97,10 +97,12 @@ cv::viz::Mesh cv::viz::Mesh::load(const String& file, int type) + // Now handle the polygons + vtkSmartPointer polygons = polydata->GetPolys(); + mesh.polygons.create(1, polygons->GetSize(), CV_32SC1); ++ mesh.polygons = 0; + int* poly_ptr = mesh.polygons.ptr(); + + polygons->InitTraversal(); +- vtkIdType nr_cell_points, *cell_points; ++ vtkIdType nr_cell_points; ++ CellIterT cell_points; + while (polygons->GetNextCell(nr_cell_points, cell_points)) + { + *poly_ptr++ = nr_cell_points; +diff --git a/modules/viz/src/vizimpl.cpp b/modules/viz/src/vizimpl.cpp +index 23cba75..89f1249 100644 +--- a/modules/viz/src/vizimpl.cpp ++++ b/modules/viz/src/vizimpl.cpp +@@ -55,8 +55,17 @@ cv::viz::Viz3d::VizImpl::VizImpl(const String &name) : spin_once_state_(false), + + // Create render window + window_ = vtkSmartPointer::New(); +- cv::Vec2i window_size = cv::Vec2i(window_->GetScreenSize()) / 2; +- window_->SetSize(window_size.val); ++ int * sz = window_->GetScreenSize(); ++ if (sz) ++ { ++ cv::Vec2i window_size = cv::Vec2i(sz) / 2; ++ window_->SetSize(window_size.val); ++ } ++ else ++ { ++ int new_sz[2] = { 640, 480 }; ++ window_->SetSize(new_sz); ++ } + window_->AddRenderer(renderer_); + + // Create the interactor style +diff --git a/modules/viz/src/vtk/vtkOBJWriter.cpp b/modules/viz/src/vtk/vtkOBJWriter.cpp +index 296b6eb..2e5764f 100644 +--- a/modules/viz/src/vtk/vtkOBJWriter.cpp ++++ b/modules/viz/src/vtk/vtkOBJWriter.cpp +@@ -72,7 +72,7 @@ void cv::viz::vtkOBJWriter::WriteData() + } + + vtkDebugMacro(<<"Opening vtk file for writing..."); +- ostream *outfilep = new ofstream(this->FileName, ios::out); ++ std::ostream *outfilep = new std::ofstream(this->FileName, ios::out); + if (outfilep->fail()) + { + vtkErrorMacro(<< "Unable to open file: "<< this->FileName); +@@ -127,7 +127,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out verts if any + if (input->GetNumberOfVerts() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetVerts(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +@@ -141,7 +142,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out lines if any + if (input->GetNumberOfLines() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetLines(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +@@ -162,7 +164,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out polys if any + if (input->GetNumberOfPolys() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetPolys(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +@@ -191,7 +194,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out tstrips if any + if (input->GetNumberOfStrips() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetStrips(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +diff --git a/modules/viz/src/vtk/vtkXYZReader.cpp b/modules/viz/src/vtk/vtkXYZReader.cpp +index 57726ea..3b9265f 100644 +--- a/modules/viz/src/vtk/vtkXYZReader.cpp ++++ b/modules/viz/src/vtk/vtkXYZReader.cpp +@@ -77,7 +77,7 @@ int cv::viz::vtkXYZReader::RequestData(vtkInformation*, vtkInformationVector**, + } + + // Open the input file. +- ifstream fin(this->FileName); ++ std::ifstream fin(this->FileName); + if(!fin) + { + vtkErrorMacro("Error opening file " << this->FileName); +diff --git a/modules/viz/src/vtk/vtkXYZWriter.cpp b/modules/viz/src/vtk/vtkXYZWriter.cpp +index cf95e3c..56a26b3 100644 +--- a/modules/viz/src/vtk/vtkXYZWriter.cpp ++++ b/modules/viz/src/vtk/vtkXYZWriter.cpp +@@ -69,7 +69,7 @@ void cv::viz::vtkXYZWriter::WriteData() + } + + vtkDebugMacro(<<"Opening vtk file for writing..."); +- ostream *outfilep = new ofstream(this->FileName, ios::out); ++ std::ostream *outfilep = new std::ofstream(this->FileName, ios::out); + if (outfilep->fail()) + { + vtkErrorMacro(<< "Unable to open file: "<< this->FileName); +diff --git a/modules/viz/test/test_tutorial2.cpp b/modules/viz/test/test_tutorial2.cpp +index 6b2972f..a4b5b99 100644 +--- a/modules/viz/test/test_tutorial2.cpp ++++ b/modules/viz/test/test_tutorial2.cpp +@@ -28,7 +28,7 @@ static void tutorial2() + /// Rodrigues vector + Vec3d rot_vec = Vec3d::all(0); + double translation_phase = 0.0, translation = 0.0; +- while(!myWindow.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + /* Rotation using rodrigues */ + /// Rotate around (1,1,1) +@@ -45,7 +45,7 @@ static void tutorial2() + + myWindow.setWidgetPose("Cube Widget", pose); + +- myWindow.spinOnce(1, true); ++ myWindow.spinOnce(100, true); + } + } + +diff --git a/modules/viz/test/test_tutorial3.cpp b/modules/viz/test/test_tutorial3.cpp +index 232130f..32e33b1 100644 +--- a/modules/viz/test/test_tutorial3.cpp ++++ b/modules/viz/test/test_tutorial3.cpp +@@ -48,7 +48,7 @@ static void tutorial3(bool camera_pov) + myWindow.setViewerPose(camera_pose); + + /// Start event loop. +- myWindow.spin(); ++ myWindow.spinOnce(500, true); + } + + TEST(Viz, tutorial3_global_view) +diff --git a/modules/viz/test/test_viz3d.cpp b/modules/viz/test/test_viz3d.cpp +index cdf8a00..4ab05c3 100644 +--- a/modules/viz/test/test_viz3d.cpp ++++ b/modules/viz/test/test_viz3d.cpp +@@ -59,7 +59,7 @@ TEST(Viz_viz3d, DISABLED_develop) + //cv::Mat cloud = cv::viz::readCloud(get_dragon_ply_file_path()); + //---->>>>> + +- viz.spin(); ++ viz.spinOnce(500, true); + } + + }} // namespace +diff --git a/modules/viz/test/tests_simple.cpp b/modules/viz/test/tests_simple.cpp +index 12d696d..5584483 100644 +--- a/modules/viz/test/tests_simple.cpp ++++ b/modules/viz/test/tests_simple.cpp +@@ -56,7 +56,7 @@ TEST(Viz, show_cloud_bluberry) + viz.showWidget("dragon", WCloud(dragon_cloud, Color::bluberry()), pose); + + viz.showWidget("text2d", WText("Bluberry cloud", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_random_color) +@@ -73,7 +73,7 @@ TEST(Viz, show_cloud_random_color) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("dragon", WCloud(dragon_cloud, colors), pose); + viz.showWidget("text2d", WText("Random color cloud", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_masked) +@@ -91,7 +91,7 @@ TEST(Viz, show_cloud_masked) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("dragon", WCloud(dragon_cloud), pose); + viz.showWidget("text2d", WText("Nan masked cloud", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_collection) +@@ -109,7 +109,7 @@ TEST(Viz, show_cloud_collection) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("ccol", ccol); + viz.showWidget("text2d", WText("Cloud collection", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_painted_clouds) +@@ -124,7 +124,7 @@ TEST(Viz, show_painted_clouds) + viz.showWidget("cloud3", WPaintedCloud(cloud, Vec3d(0.0, 0.0, -1.0), Vec3d(0.0, 0.0, 1.0), Color::blue(), Color::red())); + viz.showWidget("arrow", WArrow(Vec3d(0.0, 1.0, -1.0), Vec3d(0.0, 1.0, 1.0), 0.009, Color::raspberry())); + viz.showWidget("text2d", WText("Painted clouds", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_mesh) +@@ -137,7 +137,7 @@ TEST(Viz, show_mesh) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("mesh", WMesh(mesh), pose); + viz.showWidget("text2d", WText("Just mesh", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_mesh_random_colors) +@@ -152,7 +152,7 @@ TEST(Viz, show_mesh_random_colors) + viz.showWidget("mesh", WMesh(mesh), pose); + viz.setRenderingProperty("mesh", SHADING, SHADING_PHONG); + viz.showWidget("text2d", WText("Random color mesh", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_widget_merger) +@@ -173,7 +173,7 @@ TEST(Viz, show_widget_merger) + viz.showWidget("coo", WCoordinateSystem()); + viz.showWidget("merger", merger); + viz.showWidget("text2d", WText("Widget merger", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_textured_mesh) +@@ -210,7 +210,7 @@ TEST(Viz, show_textured_mesh) + viz.showWidget("mesh", WMesh(mesh)); + viz.setRenderingProperty("mesh", SHADING, SHADING_PHONG); + viz.showWidget("text2d", WText("Textured mesh", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_polyline) +@@ -229,7 +229,7 @@ TEST(Viz, show_polyline) + viz.showWidget("polyline", WPolyLine(polyline, colors)); + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("text2d", WText("Polyline", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_sampled_normals) +@@ -244,7 +244,7 @@ TEST(Viz, show_sampled_normals) + viz.showWidget("normals", WCloudNormals(mesh.cloud, mesh.normals, 30, 0.1f, Color::green()), pose); + viz.setRenderingProperty("normals", LINE_WIDTH, 2.0); + viz.showWidget("text2d", WText("Cloud or mesh normals", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_shaded_by_normals) +@@ -260,7 +260,7 @@ TEST(Viz, show_cloud_shaded_by_normals) + Viz3d viz("show_cloud_shaded_by_normals"); + viz.showWidget("cloud", cloud, pose); + viz.showWidget("text2d", WText("Cloud shaded by normals", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_trajectories) +@@ -287,15 +287,15 @@ TEST(Viz, show_trajectories) + viz.showWidget("text2d", WText("Different kinds of supported trajectories", Point(20, 20), 20, Color::green())); + + int i = 0; +- while(!viz.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + double a = --i % 360; + Vec3d pose(sin(a * CV_PI/180), 0.7, cos(a * CV_PI/180)); + viz.setViewerPose(makeCameraPose(pose * 7.5, Vec3d(0.0, 0.5, 0.0), Vec3d(0.0, 0.1, 0.0))); +- viz.spinOnce(20, true); ++ viz.spinOnce(100, true); + } + viz.resetCamera(); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_trajectory_reposition) +@@ -306,7 +306,7 @@ TEST(Viz, show_trajectory_reposition) + viz.showWidget("coos", WCoordinateSystem()); + viz.showWidget("sub3", WTrajectory(Mat(path).rowRange(0, (int)path.size()/3), WTrajectory::BOTH, 0.2, Color::brown()), path.front().inv()); + viz.showWidget("text2d", WText("Trajectory resposition to origin", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_camera_positions) +@@ -330,7 +330,7 @@ TEST(Viz, show_camera_positions) + viz.showWidget("pos3", WCameraPosition(0.75), poses[1]); + viz.showWidget("pos4", WCameraPosition(K, gray, 3, Color::indigo()), poses[1]); + viz.showWidget("text2d", WText("Camera positions with images", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_overlay_image) +@@ -353,16 +353,16 @@ TEST(Viz, show_overlay_image) + viz.showWidget("text2d", WText("Overlay images", Point(20, 20), 20, Color::green())); + + int i = 0; +- while(!viz.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + double a = ++i % 360; + Vec3d pose(sin(a * CV_PI/180), 0.7, cos(a * CV_PI/180)); + viz.setViewerPose(makeCameraPose(pose * 3, Vec3d(0.0, 0.5, 0.0), Vec3d(0.0, 0.1, 0.0))); + viz.getWidget("img1").cast().setImage(lena * pow(sin(i*10*CV_PI/180) * 0.5 + 0.5, 1.0)); +- viz.spinOnce(1, true); ++ viz.spinOnce(100, true); + } + viz.showWidget("text2d", WText("Overlay images (stopped)", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + +@@ -376,7 +376,7 @@ TEST(Viz, show_image_method) + viz.showImage(lena, lena.size()); + viz.spinOnce(1500, true); + +- cv::viz::imshow("show_image_method", make_gray(lena)).spin(); ++ cv::viz::imshow("show_image_method", make_gray(lena)).spinOnce(500, true); + } + + TEST(Viz, show_image_3d) +@@ -398,13 +398,13 @@ TEST(Viz, show_image_3d) + viz.showWidget("text2d", WText("Images in 3D", Point(20, 20), 20, Color::green())); + + int i = 0; +- while(!viz.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + viz.getWidget("img0").cast().setImage(lena * pow(sin(i++*7.5*CV_PI/180) * 0.5 + 0.5, 1.0)); +- viz.spinOnce(1, true); ++ viz.spinOnce(100, true); + } + viz.showWidget("text2d", WText("Images in 3D (stopped)", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_simple_widgets) +@@ -431,10 +431,10 @@ TEST(Viz, show_simple_widgets) + + viz.showWidget("grid1", WGrid(Vec2i(7,7), Vec2d::all(0.75), Color::gray()), Affine3d().translate(Vec3d(0.0, 0.0, -1.0))); + +- viz.spin(); ++ viz.spinOnce(500, true); + viz.getWidget("text2d").cast().setText("Different simple widgets (updated)"); + viz.getWidget("text3d").cast().setText("Updated text 3D"); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_follower) +@@ -446,9 +446,9 @@ TEST(Viz, show_follower) + viz.showWidget("t3d_2", WText3D("Simple 3D follower", Point3d(-0.5, -0.5, 0.5), 0.125, true, Color::green())); + viz.showWidget("text2d", WText("Follower: text always facing camera", Point(20, 20), 20, Color::green())); + viz.setBackgroundMeshLab(); +- viz.spin(); ++ viz.spinOnce(500, true); + viz.getWidget("t3d_2").cast().setText("Updated follower 3D"); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + }} // namespace diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL index f6c2f926b003ae..e48c5dc1ddb3da 100644 --- a/ports/opencv3/CONTROL +++ b/ports/opencv3/CONTROL @@ -1,6 +1,6 @@ Source: opencv3 Version: 3.4.10 -Port-Version: 2 +Port-Version: 4 Build-Depends: zlib Homepage: https://github.com/opencv/opencv Description: computer vision library diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 98f3b32ed9352d..e194e0e9aceeab 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( 0001-disable-downloading.patch 0002-install-options.patch 0003-force-package-requirements.patch + 0005-fix-vtk9.patch 0009-fix-uwp.patch ) @@ -44,11 +45,12 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "qt" WITH_QT "sfm" BUILD_opencv_sfm "tiff" WITH_TIFF + "vtk" WITH_VTK "webp" WITH_WEBP "world" BUILD_opencv_world ) -# Cannot use vcpkg_check_features() for "dnn", "ipp", ovis", "tbb", and "vtk". +# Cannot use vcpkg_check_features() for "dnn", "ipp", ovis", "tbb" # As the respective value of their variables can be unset conditionally. set(BUILD_opencv_dnn OFF) if("dnn" IN_LIST FEATURES) @@ -74,11 +76,6 @@ if("tbb" IN_LIST FEATURES) set(WITH_TBB ON) endif() -set(WITH_VTK OFF) -if("vtk" IN_LIST FEATURES) - set(WITH_VTK ON) -endif() - if("dnn" IN_LIST FEATURES) vcpkg_download_distfile(TINYDNN_ARCHIVE URLS "https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz" @@ -214,11 +211,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(WITH_TBB OFF) endif() - if (WITH_VTK) - message(WARNING "VTK is currently unsupported in this build configuration, turning it off") - set(WITH_VTK OFF) - endif() - if (VCPKG_TARGET_IS_WINDOWS AND BUILD_opencv_ovis) message(WARNING "OVIS is currently unsupported in this build configuration, turning it off") set(BUILD_opencv_ovis OFF) @@ -258,6 +250,7 @@ vcpkg_configure_cmake( -DOPENCV_CONFIG_INSTALL_PATH=share/opencv -DINSTALL_TO_MANGLED_PATHS=OFF -DOPENCV_FFMPEG_USE_FIND_PACKAGE=FFMPEG + -DOPENCV_FFMPEG_SKIP_BUILD_CHECK=TRUE -DCMAKE_DEBUG_POSTFIX=d -DOPENCV_DLLVERSION= -DOPENCV_DEBUG_POSTFIX=d @@ -320,7 +313,6 @@ vcpkg_configure_cmake( -DWITH_PROTOBUF=${BUILD_opencv_flann} -DWITH_OPENCLAMDBLAS=OFF -DWITH_TBB=${WITH_TBB} - -DWITH_VTK=${WITH_VTK} -DWITH_OPENJPEG=OFF ###### WITH PROPERTIES explicitly disabled, they have problems with libraries if already installed by user and that are "involuntarily" found during install -DWITH_LAPACK=OFF @@ -339,17 +331,16 @@ vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake OPENCV_MODULES) - string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)" - "set(CMAKE_IMPORT_FILE_VERSION 1) -find_package(Protobuf REQUIRED) -if(Protobuf_FOUND) + set(DEPS_STRING "include(CMakeFindDependencyMacro) +find_dependency(protobuf CONFIG) +if(protobuf_FOUND) if(TARGET protobuf::libprotobuf) - add_library(libprotobuf INTERFACE IMPORTED) + add_library (libprotobuf INTERFACE IMPORTED) set_target_properties(libprotobuf PROPERTIES INTERFACE_LINK_LIBRARIES protobuf::libprotobuf ) else() - add_library(libprotobuf UNKNOWN IMPORTED) + add_library (libprotobuf UNKNOWN IMPORTED) set_target_properties(libprotobuf PROPERTIES IMPORTED_LOCATION \"${Protobuf_LIBRARY}\" INTERFACE_INCLUDE_DIRECTORIES \"${Protobuf_INCLUDE_DIR}\" @@ -357,25 +348,64 @@ if(Protobuf_FOUND) ) endif() endif() -find_package(CUDA QUIET) -find_package(Threads QUIET) -find_package(TIFF QUIET) -find_package(HDF5 QUIET) -find_package(Freetype QUIET) -find_package(Ogre QUIET) -find_package(gflags QUIET) -find_package(Ceres QUIET) -find_package(ade QUIET) -find_package(VTK QUIET) -find_package(OpenMP QUIET) -find_package(Tesseract QUIET) -find_package(OpenEXR QUIET) +find_dependency(Threads)") + if("tiff" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(TIFF)") + endif() + if("cuda" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(CUDA)") + endif() + if(BUILD_opencv_quality) + string(APPEND DEPS_STRING " +# C language is required for try_compile tests in FindHDF5 +enable_language(C) +find_dependency(HDF5) +find_dependency(Tesseract)") + endif() + if(WITH_TBB) + string(APPEND DEPS_STRING "\nfind_dependency(TBB)") + endif() + if("vtk" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(VTK)") + endif() + if("sfm" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(gflags CONFIG)\nfind_dependency(Ceres CONFIG)") + endif() + if("eigen" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(Eigen3 CONFIG)") + endif() + if("openexr" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)") + endif() + if(WITH_OPENMP) + string(APPEND DEPS_STRING "\nfind_dependency(OpenMP CONFIG)") + endif() + if(BUILD_opencv_ovis) + string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)") + endif() + if("qt" IN_LIST FEATURES) + string(APPEND DEPS_STRING " set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) +find_dependency(Qt5 COMPONENTS OpenGL Concurrent Test)") + endif() + if("ade" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(ade)") + endif() + if("gdcm" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(GDCM)") + endif() -find_package(Qt5 COMPONENTS OpenGL Concurrent Test QUIET) -find_package(GDCM QUIET)" OPENCV_MODULES "${OPENCV_MODULES}") + string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)" + "set(CMAKE_IMPORT_FILE_VERSION 1)\n${DEPS_STRING}" OPENCV_MODULES "${OPENCV_MODULES}") + + if(WITH_OPENMP) + string(REPLACE "set_target_properties(opencv_core PROPERTIES + INTERFACE_LINK_LIBRARIES \"" + "set_target_properties(opencv_core PROPERTIES + INTERFACE_LINK_LIBRARIES \"\$;" OPENCV_MODULES "${OPENCV_MODULES}") + endif() if(BUILD_opencv_ovis) string(REPLACE "OgreGLSupportStatic" @@ -384,6 +414,7 @@ find_package(GDCM QUIET)" OPENCV_MODULES "${OPENCV_MODULES}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() diff --git a/ports/opencv4/0006-fix-vtk9.patch b/ports/opencv4/0006-fix-vtk9.patch new file mode 100644 index 00000000000000..7942b0aa4d8b43 --- /dev/null +++ b/ports/opencv4/0006-fix-vtk9.patch @@ -0,0 +1,41 @@ +diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake +index 0f2b958..4c83504 100644 +--- a/cmake/OpenCVDetectVTK.cmake ++++ b/cmake/OpenCVDetectVTK.cmake +@@ -1,12 +1,30 @@ ++# VTK 9.0 ++if(NOT VTK_FOUND) ++ find_package(VTK 9 QUIET NAMES vtk COMPONENTS ++ FiltersExtraction ++ FiltersSources ++ FiltersTexture ++ IOExport ++ IOGeometry ++ IOPLY ++ InteractionStyle ++ RenderingCore ++ RenderingLOD ++ RenderingOpenGL2 ++ NO_MODULE) ++endif() ++ + # VTK 6.x components +-find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) +-IF(VTK_FOUND) +- IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var. ++if(NOT VTK_FOUND) ++ find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) ++ IF(VTK_FOUND) ++ IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var. + find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE) +- ELSE(VTK_RENDERING_BACKEND) ++ ELSE(VTK_RENDERING_BACKEND) + find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) +- ENDIF(VTK_RENDERING_BACKEND) +-ENDIF(VTK_FOUND) ++ ENDIF(VTK_RENDERING_BACKEND) ++ ENDIF(VTK_FOUND) ++endif() + + # VTK 5.x components + if(NOT VTK_FOUND) diff --git a/ports/opencv4/0007-fix-vtk9-contrib.patch b/ports/opencv4/0007-fix-vtk9-contrib.patch new file mode 100644 index 00000000000000..1db18f1c640611 --- /dev/null +++ b/ports/opencv4/0007-fix-vtk9-contrib.patch @@ -0,0 +1,470 @@ +diff --git a/modules/viz/CMakeLists.txt b/modules/viz/CMakeLists.txt +index 89a9c3e098..3426e1dd26 100644 +--- a/modules/viz/CMakeLists.txt ++++ b/modules/viz/CMakeLists.txt +@@ -3,7 +3,9 @@ if(NOT HAVE_VTK) + endif() + + set(the_description "Viz") +-include(${VTK_USE_FILE}) ++if(VTK_VERSION VERSION_LESS 8.90) ++ include(${VTK_USE_FILE}) ++endif() + + if(NOT BUILD_SHARED_LIBS) + # We observed conflict between builtin 3rdparty libraries and +diff --git a/modules/viz/src/precomp.hpp b/modules/viz/src/precomp.hpp +index f92fdb6ac2..4c4bf7c599 100644 +--- a/modules/viz/src/precomp.hpp ++++ b/modules/viz/src/precomp.hpp +@@ -133,7 +133,8 @@ + #include + #include + #include +-#include "vtkCallbackCommand.h" ++#include ++#include + + #if !defined(_WIN32) || defined(__CYGWIN__) + # include /* unlink */ +@@ -149,6 +150,11 @@ + #include "vtk/vtkTrajectorySource.h" + #include "vtk/vtkImageMatSource.h" + ++#if VTK_MAJOR_VERSION >= 9 ++typedef vtkIdType const * CellIterT; ++#else ++typedef vtkIdType * CellIterT; ++#endif + + #include + #include +diff --git a/modules/viz/src/types.cpp b/modules/viz/src/types.cpp +index 65571a192e..0e14477891 100644 +--- a/modules/viz/src/types.cpp ++++ b/modules/viz/src/types.cpp +@@ -100,7 +100,8 @@ cv::viz::Mesh cv::viz::Mesh::load(const String& file, int type) + int* poly_ptr = mesh.polygons.ptr(); + + polygons->InitTraversal(); +- vtkIdType nr_cell_points, *cell_points; ++ vtkIdType nr_cell_points; ++ CellIterT cell_points; + while (polygons->GetNextCell(nr_cell_points, cell_points)) + { + *poly_ptr++ = nr_cell_points; +diff --git a/modules/viz/src/vizimpl.cpp b/modules/viz/src/vizimpl.cpp +index 2c291c0569..2c7ce997a4 100644 +--- a/modules/viz/src/vizimpl.cpp ++++ b/modules/viz/src/vizimpl.cpp +@@ -55,8 +55,17 @@ cv::viz::Viz3d::VizImpl::VizImpl(const String &name) : spin_once_state_(false), + + // Create render window + window_ = vtkSmartPointer::New(); +- cv::Vec2i window_size = cv::Vec2i(window_->GetScreenSize()) / 2; +- window_->SetSize(window_size.val); ++ int * sz = window_->GetScreenSize(); ++ if (sz) ++ { ++ cv::Vec2i window_size = cv::Vec2i(sz) / 2; ++ window_->SetSize(window_size.val); ++ } ++ else ++ { ++ int new_sz[2] = { 640, 480 }; ++ window_->SetSize(new_sz); ++ } + window_->AddRenderer(renderer_); + + // Create the interactor style +diff --git a/modules/viz/src/vtk/vtkOBJWriter.cpp b/modules/viz/src/vtk/vtkOBJWriter.cpp +index 296b6eb065..2e5764fc27 100644 +--- a/modules/viz/src/vtk/vtkOBJWriter.cpp ++++ b/modules/viz/src/vtk/vtkOBJWriter.cpp +@@ -72,7 +72,7 @@ void cv::viz::vtkOBJWriter::WriteData() + } + + vtkDebugMacro(<<"Opening vtk file for writing..."); +- ostream *outfilep = new ofstream(this->FileName, ios::out); ++ std::ostream *outfilep = new std::ofstream(this->FileName, ios::out); + if (outfilep->fail()) + { + vtkErrorMacro(<< "Unable to open file: "<< this->FileName); +@@ -127,7 +127,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out verts if any + if (input->GetNumberOfVerts() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetVerts(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +@@ -141,7 +142,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out lines if any + if (input->GetNumberOfLines() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetLines(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +@@ -162,7 +164,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out polys if any + if (input->GetNumberOfPolys() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetPolys(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +@@ -191,7 +194,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out tstrips if any + if (input->GetNumberOfStrips() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetStrips(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +diff --git a/modules/viz/src/vtk/vtkXYZReader.cpp b/modules/viz/src/vtk/vtkXYZReader.cpp +index 57726eae9b..3b9265fed6 100644 +--- a/modules/viz/src/vtk/vtkXYZReader.cpp ++++ b/modules/viz/src/vtk/vtkXYZReader.cpp +@@ -77,7 +77,7 @@ int cv::viz::vtkXYZReader::RequestData(vtkInformation*, vtkInformationVector**, + } + + // Open the input file. +- ifstream fin(this->FileName); ++ std::ifstream fin(this->FileName); + if(!fin) + { + vtkErrorMacro("Error opening file " << this->FileName); +diff --git a/modules/viz/src/vtk/vtkXYZWriter.cpp b/modules/viz/src/vtk/vtkXYZWriter.cpp +index cf95e3c6a0..56a26b38a0 100644 +--- a/modules/viz/src/vtk/vtkXYZWriter.cpp ++++ b/modules/viz/src/vtk/vtkXYZWriter.cpp +@@ -69,7 +69,7 @@ void cv::viz::vtkXYZWriter::WriteData() + } + + vtkDebugMacro(<<"Opening vtk file for writing..."); +- ostream *outfilep = new ofstream(this->FileName, ios::out); ++ std::ostream *outfilep = new std::ofstream(this->FileName, ios::out); + if (outfilep->fail()) + { + vtkErrorMacro(<< "Unable to open file: "<< this->FileName); + +diff --git a/modules/viz/test/test_tutorial2.cpp b/modules/viz/test/test_tutorial2.cpp +index 6b2972f0af..a4b5b99582 100644 +--- a/modules/viz/test/test_tutorial2.cpp ++++ b/modules/viz/test/test_tutorial2.cpp +@@ -28,7 +28,7 @@ static void tutorial2() + /// Rodrigues vector + Vec3d rot_vec = Vec3d::all(0); + double translation_phase = 0.0, translation = 0.0; +- while(!myWindow.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + /* Rotation using rodrigues */ + /// Rotate around (1,1,1) +@@ -45,7 +45,7 @@ static void tutorial2() + + myWindow.setWidgetPose("Cube Widget", pose); + +- myWindow.spinOnce(1, true); ++ myWindow.spinOnce(100, true); + } + } + +diff --git a/modules/viz/test/test_tutorial3.cpp b/modules/viz/test/test_tutorial3.cpp +index 232130f0a6..32e33b1902 100644 +--- a/modules/viz/test/test_tutorial3.cpp ++++ b/modules/viz/test/test_tutorial3.cpp +@@ -48,7 +48,7 @@ static void tutorial3(bool camera_pov) + myWindow.setViewerPose(camera_pose); + + /// Start event loop. +- myWindow.spin(); ++ myWindow.spinOnce(500, true); + } + + TEST(Viz, tutorial3_global_view) +diff --git a/modules/viz/test/test_viz3d.cpp b/modules/viz/test/test_viz3d.cpp +index cdf8a00ad7..4ab05c3e0a 100644 +--- a/modules/viz/test/test_viz3d.cpp ++++ b/modules/viz/test/test_viz3d.cpp +@@ -59,7 +59,7 @@ TEST(Viz_viz3d, DISABLED_develop) + //cv::Mat cloud = cv::viz::readCloud(get_dragon_ply_file_path()); + //---->>>>> + +- viz.spin(); ++ viz.spinOnce(500, true); + } + + }} // namespace +diff --git a/modules/viz/test/tests_simple.cpp b/modules/viz/test/tests_simple.cpp +index 12d696dfba..5584483f4f 100644 +--- a/modules/viz/test/tests_simple.cpp ++++ b/modules/viz/test/tests_simple.cpp +@@ -56,7 +56,7 @@ TEST(Viz, show_cloud_bluberry) + viz.showWidget("dragon", WCloud(dragon_cloud, Color::bluberry()), pose); + + viz.showWidget("text2d", WText("Bluberry cloud", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_random_color) +@@ -73,7 +73,7 @@ TEST(Viz, show_cloud_random_color) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("dragon", WCloud(dragon_cloud, colors), pose); + viz.showWidget("text2d", WText("Random color cloud", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_masked) +@@ -91,7 +91,7 @@ TEST(Viz, show_cloud_masked) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("dragon", WCloud(dragon_cloud), pose); + viz.showWidget("text2d", WText("Nan masked cloud", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_collection) +@@ -109,7 +109,7 @@ TEST(Viz, show_cloud_collection) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("ccol", ccol); + viz.showWidget("text2d", WText("Cloud collection", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_painted_clouds) +@@ -124,7 +124,7 @@ TEST(Viz, show_painted_clouds) + viz.showWidget("cloud3", WPaintedCloud(cloud, Vec3d(0.0, 0.0, -1.0), Vec3d(0.0, 0.0, 1.0), Color::blue(), Color::red())); + viz.showWidget("arrow", WArrow(Vec3d(0.0, 1.0, -1.0), Vec3d(0.0, 1.0, 1.0), 0.009, Color::raspberry())); + viz.showWidget("text2d", WText("Painted clouds", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_mesh) +@@ -137,7 +137,7 @@ TEST(Viz, show_mesh) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("mesh", WMesh(mesh), pose); + viz.showWidget("text2d", WText("Just mesh", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_mesh_random_colors) +@@ -152,7 +152,7 @@ TEST(Viz, show_mesh_random_colors) + viz.showWidget("mesh", WMesh(mesh), pose); + viz.setRenderingProperty("mesh", SHADING, SHADING_PHONG); + viz.showWidget("text2d", WText("Random color mesh", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_widget_merger) +@@ -173,7 +173,7 @@ TEST(Viz, show_widget_merger) + viz.showWidget("coo", WCoordinateSystem()); + viz.showWidget("merger", merger); + viz.showWidget("text2d", WText("Widget merger", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_textured_mesh) +@@ -210,7 +210,7 @@ TEST(Viz, show_textured_mesh) + viz.showWidget("mesh", WMesh(mesh)); + viz.setRenderingProperty("mesh", SHADING, SHADING_PHONG); + viz.showWidget("text2d", WText("Textured mesh", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_polyline) +@@ -229,7 +229,7 @@ TEST(Viz, show_polyline) + viz.showWidget("polyline", WPolyLine(polyline, colors)); + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("text2d", WText("Polyline", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_sampled_normals) +@@ -244,7 +244,7 @@ TEST(Viz, show_sampled_normals) + viz.showWidget("normals", WCloudNormals(mesh.cloud, mesh.normals, 30, 0.1f, Color::green()), pose); + viz.setRenderingProperty("normals", LINE_WIDTH, 2.0); + viz.showWidget("text2d", WText("Cloud or mesh normals", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_shaded_by_normals) +@@ -260,7 +260,7 @@ TEST(Viz, show_cloud_shaded_by_normals) + Viz3d viz("show_cloud_shaded_by_normals"); + viz.showWidget("cloud", cloud, pose); + viz.showWidget("text2d", WText("Cloud shaded by normals", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_trajectories) +@@ -287,15 +287,15 @@ TEST(Viz, show_trajectories) + viz.showWidget("text2d", WText("Different kinds of supported trajectories", Point(20, 20), 20, Color::green())); + + int i = 0; +- while(!viz.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + double a = --i % 360; + Vec3d pose(sin(a * CV_PI/180), 0.7, cos(a * CV_PI/180)); + viz.setViewerPose(makeCameraPose(pose * 7.5, Vec3d(0.0, 0.5, 0.0), Vec3d(0.0, 0.1, 0.0))); +- viz.spinOnce(20, true); ++ viz.spinOnce(100, true); + } + viz.resetCamera(); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_trajectory_reposition) +@@ -306,7 +306,7 @@ TEST(Viz, show_trajectory_reposition) + viz.showWidget("coos", WCoordinateSystem()); + viz.showWidget("sub3", WTrajectory(Mat(path).rowRange(0, (int)path.size()/3), WTrajectory::BOTH, 0.2, Color::brown()), path.front().inv()); + viz.showWidget("text2d", WText("Trajectory resposition to origin", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_camera_positions) +@@ -330,7 +330,7 @@ TEST(Viz, show_camera_positions) + viz.showWidget("pos3", WCameraPosition(0.75), poses[1]); + viz.showWidget("pos4", WCameraPosition(K, gray, 3, Color::indigo()), poses[1]); + viz.showWidget("text2d", WText("Camera positions with images", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_overlay_image) +@@ -353,16 +353,16 @@ TEST(Viz, show_overlay_image) + viz.showWidget("text2d", WText("Overlay images", Point(20, 20), 20, Color::green())); + + int i = 0; +- while(!viz.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + double a = ++i % 360; + Vec3d pose(sin(a * CV_PI/180), 0.7, cos(a * CV_PI/180)); + viz.setViewerPose(makeCameraPose(pose * 3, Vec3d(0.0, 0.5, 0.0), Vec3d(0.0, 0.1, 0.0))); + viz.getWidget("img1").cast().setImage(lena * pow(sin(i*10*CV_PI/180) * 0.5 + 0.5, 1.0)); +- viz.spinOnce(1, true); ++ viz.spinOnce(100, true); + } + viz.showWidget("text2d", WText("Overlay images (stopped)", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + +@@ -376,7 +376,7 @@ TEST(Viz, show_image_method) + viz.showImage(lena, lena.size()); + viz.spinOnce(1500, true); + +- cv::viz::imshow("show_image_method", make_gray(lena)).spin(); ++ cv::viz::imshow("show_image_method", make_gray(lena)).spinOnce(500, true); + } + + TEST(Viz, show_image_3d) +@@ -398,13 +398,13 @@ TEST(Viz, show_image_3d) + viz.showWidget("text2d", WText("Images in 3D", Point(20, 20), 20, Color::green())); + + int i = 0; +- while(!viz.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + viz.getWidget("img0").cast().setImage(lena * pow(sin(i++*7.5*CV_PI/180) * 0.5 + 0.5, 1.0)); +- viz.spinOnce(1, true); ++ viz.spinOnce(100, true); + } + viz.showWidget("text2d", WText("Images in 3D (stopped)", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_simple_widgets) +@@ -431,10 +431,10 @@ TEST(Viz, show_simple_widgets) + + viz.showWidget("grid1", WGrid(Vec2i(7,7), Vec2d::all(0.75), Color::gray()), Affine3d().translate(Vec3d(0.0, 0.0, -1.0))); + +- viz.spin(); ++ viz.spinOnce(500, true); + viz.getWidget("text2d").cast().setText("Different simple widgets (updated)"); + viz.getWidget("text3d").cast().setText("Updated text 3D"); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_follower) +@@ -446,9 +446,9 @@ TEST(Viz, show_follower) + viz.showWidget("t3d_2", WText3D("Simple 3D follower", Point3d(-0.5, -0.5, 0.5), 0.125, true, Color::green())); + viz.showWidget("text2d", WText("Follower: text always facing camera", Point(20, 20), 20, Color::green())); + viz.setBackgroundMeshLab(); +- viz.spin(); ++ viz.spinOnce(500, true); + viz.getWidget("t3d_2").cast().setText("Updated follower 3D"); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + }} // namespace + +diff --git a/modules/viz/CMakeLists.txt b/modules/viz/CMakeLists.txt +index 3426e1dd26..cd225960ce 100644 +--- a/modules/viz/CMakeLists.txt ++++ b/modules/viz/CMakeLists.txt +@@ -3,9 +3,6 @@ if(NOT HAVE_VTK) + endif() + + set(the_description "Viz") +-if(VTK_VERSION VERSION_LESS 8.90) +- include(${VTK_USE_FILE}) +-endif() + + if(NOT BUILD_SHARED_LIBS) + # We observed conflict between builtin 3rdparty libraries and +@@ -37,7 +34,14 @@ ocv_add_accuracy_tests() + ocv_add_perf_tests() + ocv_add_samples(opencv_imgproc opencv_calib3d opencv_features2d opencv_flann) + +-ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) ++ ++if (VTK_VERSION VERSION_LESS "8.90.0") ++ include(${VTK_USE_FILE}) ++ ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) ++else () ++ ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) ++ vtk_module_autoinit(TARGETS ${the_module} MODULES ${VTK_LIBRARIES}) ++endif() + + if(APPLE AND BUILD_opencv_viz) + ocv_target_link_libraries(${the_module} PRIVATE "-framework Cocoa") +diff --git a/modules/viz/src/types.cpp b/modules/viz/src/types.cpp +index 0e14477891..e9a470cf83 100644 +--- a/modules/viz/src/types.cpp ++++ b/modules/viz/src/types.cpp +@@ -97,6 +97,7 @@ cv::viz::Mesh cv::viz::Mesh::load(const String& file, int type) + // Now handle the polygons + vtkSmartPointer polygons = polydata->GetPolys(); + mesh.polygons.create(1, polygons->GetSize(), CV_32SC1); ++ mesh.polygons = 0; + int* poly_ptr = mesh.polygons.ptr(); + + polygons->InitTraversal(); diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL index 0c928ab7b3d598..1a688290040fff 100644 --- a/ports/opencv4/CONTROL +++ b/ports/opencv4/CONTROL @@ -88,7 +88,7 @@ Build-Depends: tiff Description: TIFF support for opencv Feature: vtk -Build-Depends: vtk +Build-Depends: opencv4[contrib], vtk Description: vtk support for opencv Feature: webp diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 4c7d900c644a4a..23c9184e7d5487 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_from_github( 0002-install-options.patch 0003-force-package-requirements.patch 0004-fix-policy-CMP0057.patch + 0006-fix-vtk9.patch 0006-jpeg2000_getref.patch 0009-fix-uwp.patch 0010-fix-interface_link_libraries.patch # Remove this patch when the next update @@ -48,11 +49,12 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "qt" WITH_QT "sfm" BUILD_opencv_sfm "tiff" WITH_TIFF + "vtk" WITH_VTK "webp" WITH_WEBP "world" BUILD_opencv_world ) -# Cannot use vcpkg_check_features() for "dnn", ipp", "openmp", "ovis", "tbb", and "vtk". +# Cannot use vcpkg_check_features() for "dnn", ipp", "openmp", "ovis", "tbb" # As the respective value of their variables can be unset conditionally. set(BUILD_opencv_dnn OFF) if("dnn" IN_LIST FEATURES) @@ -87,11 +89,6 @@ if("tbb" IN_LIST FEATURES) set(WITH_TBB ON) endif() -set(WITH_VTK OFF) -if("vtk" IN_LIST FEATURES) - set(WITH_VTK ON) -endif() - if("dnn" IN_LIST FEATURES) vcpkg_download_distfile(TINYDNN_ARCHIVE URLS "https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz" @@ -128,6 +125,7 @@ if("contrib" IN_LIST FEATURES) HEAD_REF master PATCHES 0005-add-missing-stdexcept-include.patch + 0007-fix-vtk9-contrib.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -256,11 +254,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(WITH_TBB OFF) endif() - if (WITH_VTK) - message(WARNING "VTK is currently unsupported in this build configuration, turning it off") - set(WITH_VTK OFF) - endif() - if (VCPKG_TARGET_IS_WINDOWS AND BUILD_opencv_ovis) message(WARNING "OVIS is currently unsupported in this build configuration, turning it off") set(BUILD_opencv_ovis OFF) @@ -291,6 +284,7 @@ vcpkg_configure_cmake( -DOPENCV_CONFIG_INSTALL_PATH=share/opencv -DINSTALL_TO_MANGLED_PATHS=OFF -DOPENCV_FFMPEG_USE_FIND_PACKAGE=FFMPEG + -DOPENCV_FFMPEG_SKIP_BUILD_CHECK=TRUE -DCMAKE_DEBUG_POSTFIX=d -DOPENCV_DLLVERSION= -DOPENCV_DEBUG_POSTFIX=d @@ -351,7 +345,6 @@ vcpkg_configure_cmake( -DWITH_OPENMP=${WITH_OPENMP} -DWITH_PROTOBUF=${BUILD_opencv_dnn} -DWITH_TBB=${WITH_TBB} - -DWITH_VTK=${WITH_VTK} -DWITH_OPENJPEG=OFF ###### WITH PROPERTIES explicitly disabled, they have problems with libraries if already installed by user and that are "involuntarily" found during install -DWITH_LAPACK=OFF @@ -406,7 +399,7 @@ find_dependency(Tesseract)") if(WITH_TBB) string(APPEND DEPS_STRING "\nfind_dependency(TBB)") endif() - if(WITH_VTK) + if("vtk" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(VTK)") endif() if("sfm" IN_LIST FEATURES) diff --git a/ports/tesseract/CONTROL b/ports/tesseract/CONTROL index eb90d70e1017ae..530abc04dc7cea 100644 --- a/ports/tesseract/CONTROL +++ b/ports/tesseract/CONTROL @@ -1,9 +1,9 @@ Source: tesseract Version: 4.1.1 -Port-Version: 3 +Port-Version: 5 Homepage: https://github.com/tesseract-ocr/tesseract Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google. -Build-Depends: leptonica +Build-Depends: leptonica, libarchive Feature: training-tools Description: build training tools diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index d141625b62a586..d08e319071dd3d 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -39,6 +39,16 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +file(READ ${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake TESSERACT_CONFIG) +string(REPLACE "find_package(Leptonica REQUIRED)" + "find_package(Leptonica REQUIRED) +find_package(OpenSSL REQUIRED) +find_package(ZLIB REQUIRED) +find_package(BZip2 REQUIRED) +find_package(LibXml2 REQUIRED) +find_package(zstd REQUIRED) +find_package(LibLZMA REQUIRED)" TESSERACT_CONFIG "${TESSERACT_CONFIG}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake "${TESSERACT_CONFIG}") vcpkg_copy_tools(TOOL_NAMES tesseract AUTO_CLEAN) diff --git a/ports/vtk/module-name-mangling.patch b/ports/vtk/module-name-mangling.patch new file mode 100644 index 00000000000000..d1bc96c3961099 --- /dev/null +++ b/ports/vtk/module-name-mangling.patch @@ -0,0 +1,18 @@ +--- a/CMake/vtkModule.cmake ++++ b/CMake/vtkModule.cmake +@@ -4409,6 +4409,15 @@ endif ()\n\n") + foreach (_vtk_export_module IN LISTS _vtk_export_MODULES) + get_property(_vtk_export_target_name GLOBAL + PROPERTY "_vtk_module_${_vtk_export_module}_target_name") ++ # Use the export name of the target if it has one set. ++ get_property(_vtk_export_target_has_export_name ++ TARGET "${_vtk_export_target_name}" ++ PROPERTY EXPORT_NAME SET) ++ if (_vtk_export_target_has_export_name) ++ get_property(_vtk_export_target_name ++ TARGET "${_vtk_export_target_name}" ++ PROPERTY EXPORT_NAME) ++ endif () + set(_vtk_export_base "_vtk_module_find_package_${_vtk_export_module}") + get_property(_vtk_export_packages GLOBAL + PROPERTY "${_vtk_export_base}") diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index d2dc3e2c7a6bc2..c3ebfbe6e82648 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -123,9 +123,10 @@ vcpkg_from_github( vtkm.patch # To include an external VTKm build (v.1.5 required) pegtl.patch pythonwrapper.patch # Required by ParaView to Wrap required classes - NoUndefDebug.patch # Required to link against correct Python library depending on build type. + NoUndefDebug.patch # Required to link against correct Python library depending on build type. python_debug.patch fix-using-hdf5.patch + module-name-mangling.patch # Last patch TODO: Patch out internal loguru FindExpat.patch # The find_library calls are taken care of by vcpkg-cmake-wrapper.cmake of expat ) @@ -271,29 +272,25 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -# ============================================================================= -# Handle copyright -file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/vtk") ## Files Modules needed by ParaView if("paraview" IN_LIST FEATURES) - set(VTK_CMAKE_NEEDED vtkCompilerChecks vtkCompilerPlatformFlags vtkCompilerExtraFlags vtkInitializeBuildType + set(VTK_CMAKE_NEEDED vtkCompilerChecks vtkCompilerPlatformFlags vtkCompilerExtraFlags vtkInitializeBuildType vtkSupportMacros vtkDirectories vtkVersion FindPythonModules vtkModuleDebugging vtkExternalData) foreach(module ${VTK_CMAKE_NEEDED}) file(INSTALL "${SOURCE_PATH}/CMake/${module}.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk") endforeach() - + ## Check List on UPDATE !! file(INSTALL "${SOURCE_PATH}/CMake/vtkRequireLargeFilesSupport.cxx" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk") file(INSTALL "${SOURCE_PATH}/GUISupport/Qt/QVTKOpenGLWidget.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # Legacy header - + file(INSTALL "${SOURCE_PATH}/Common/Core/vtkRange.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK file(INSTALL "${SOURCE_PATH}/Common/Core/vtkRangeIterableTraits.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK file(INSTALL "${SOURCE_PATH}/Common/DataModel/vtkCompositeDataSetNodeReference.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK - #ParaView requires some internal headers + #ParaView requires some internal headers file(INSTALL "${SOURCE_PATH}/Rendering/Annotation/vtkScalarBarActorInternal.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") file(INSTALL "${SOURCE_PATH}/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") file(INSTALL "${SOURCE_PATH}/Rendering/OpenGL2/vtkCompositePolyDataMapper2Internal.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") @@ -306,13 +303,13 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(INSTALL ${STATIC_PYTHON_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}) endif() endif() - + #remove one get_filename_component(_vtk_module_import_prefix "${_vtk_module_import_prefix}" DIRECTORY) from vtk-prefix.cmake and VTK-vtk-module-properties and vtk-python.cmake set(filenames_fix_prefix vtk-prefix VTK-vtk-module-properties vtk-python) foreach(name IN LISTS filenames_fix_prefix) if(EXISTS "${CURRENT_PACKAGES_DIR}/share/vtk/${name}.cmake") file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/${name}.cmake" _contents) - string(REPLACE + string(REPLACE [[set(_vtk_module_import_prefix "${CMAKE_CURRENT_LIST_DIR}") get_filename_component(_vtk_module_import_prefix "${_vtk_module_import_prefix}" DIRECTORY)]] [[set(_vtk_module_import_prefix "${CMAKE_CURRENT_LIST_DIR}")]] _contents "${_contents}") @@ -321,3 +318,7 @@ else() debug_message("FILE:${CURRENT_PACKAGES_DIR}/share/vtk/${name}.cmake does not exist! No prefix correction!") endif() endforeach() + +# ============================================================================= +# Handle copyright +file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/test_ports/vcpkg-ci-opencv/CONTROL b/scripts/test_ports/vcpkg-ci-opencv/CONTROL new file mode 100644 index 00000000000000..3456988cf41908 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-opencv/CONTROL @@ -0,0 +1,6 @@ +Source: vcpkg-ci-opencv +Version: 1 +Port-Version: 1 +Homepage: https://github.com/microsoft/vcpkg +Description: Port to force features of certain ports within CI +Build-Depends: opencv[nonfree,ade,contrib,dnn,eigen,ffmpeg,gdcm,ipp,jasper,jpeg,openexr,opengl,openmp,png,qt,sfm,tiff,vtk] diff --git a/scripts/test_ports/vcpkg-ci-opencv/portfile.cmake b/scripts/test_ports/vcpkg-ci-opencv/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-opencv/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file From 85073a1c4bcdd5099aa905f503234408fa042c7d Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Sat, 12 Dec 2020 01:17:43 +0300 Subject: [PATCH 0278/1694] [sail] Add new port (#14925) --- ports/sail/portfile.cmake | 42 +++++++++++++++++++++++++++++++++++++++ ports/sail/usage | 14 +++++++++++++ ports/sail/vcpkg.json | 13 ++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 ports/sail/portfile.cmake create mode 100644 ports/sail/usage create mode 100644 ports/sail/vcpkg.json diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake new file mode 100644 index 00000000000000..a5d5633ee3646b --- /dev/null +++ b/ports/sail/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_fail_port_install(ON_TARGET "UWP" "OSX" "Linux") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO smoked-herring/sail + REF v0.9.0-pre10 + SHA512 d38a3c7d33495c84d7ada91a4131d32ce61f3fdf32a7e0631b28e7d8492fa4cb672eea09ef8cf0272dabd57f640b090749e3ecd863be577af2b98763873dc57d + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DSAIL_VCPKG_PORT=ON + -DSAIL_BUILD_EXAMPLES=OFF + -DSAIL_BUILD_TESTS=OFF +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +# Remove duplicate files +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share) + +# Move codecs +file(RENAME ${CURRENT_PACKAGES_DIR}/lib/sail ${CURRENT_PACKAGES_DIR}/bin/sail) +file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sail ${CURRENT_PACKAGES_DIR}/debug/bin/sail) + +# Move cmake configs +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sail) + +# Fix pkg-config files +vcpkg_fixup_pkgconfig() + +# Handle usage +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/sail/usage b/ports/sail/usage new file mode 100644 index 00000000000000..d117e68bc6b34d --- /dev/null +++ b/ports/sail/usage @@ -0,0 +1,14 @@ +The package sail provides CMake targets: + +C libraries: + + find_package(Sail CONFIG REQUIRED) + target_link_libraries(main PRIVATE SAIL::sail) + +C++ bindings: + + find_package(Sail CONFIG REQUIRED) + target_link_libraries(main PRIVATE SAIL::sail-c++) + +For dynamic builds, please also copy SAIL codecs (bin/sail) and their dependencies +into the application directory. diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json new file mode 100644 index 00000000000000..01e6c6408253c4 --- /dev/null +++ b/ports/sail/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "sail", + "version-string": "0.9.0-pre10", + "description": "The missing small and fast image decoding library for humans (not for machines)", + "homepage": "https://github.com/smoked-herring/sail", + "supports": "windows & !static & !uwp", + "dependencies": [ + "giflib", + "libjpeg-turbo", + "libpng", + "tiff" + ] +} From 3ecfeb789f4336bb68baf86fe5e057e8a9a5d230 Mon Sep 17 00:00:00 2001 From: Jesse Farebrother Date: Fri, 11 Dec 2020 15:18:42 -0700 Subject: [PATCH 0279/1694] [sdl2] Don't propagate shared link options (#14992) --- ports/sdl2/no-propagate-shared-link-options.patch | 13 +++++++++++++ ports/sdl2/portfile.cmake | 1 + ports/sdl2/vcpkg.json | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/sdl2/no-propagate-shared-link-options.patch diff --git a/ports/sdl2/no-propagate-shared-link-options.patch b/ports/sdl2/no-propagate-shared-link-options.patch new file mode 100644 index 00000000000000..5a26ad3c58f673 --- /dev/null +++ b/ports/sdl2/no-propagate-shared-link-options.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7dfd35389..648218cc5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2062,7 +2062,7 @@ if(SDL_SHARED) + set_target_properties(SDL2 PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB") + endif() + set(_INSTALL_LIBS "SDL2" ${_INSTALL_LIBS}) +- target_link_libraries(SDL2 ${EXTRA_LIBS} ${EXTRA_LDFLAGS}) ++ target_link_libraries(SDL2 PRIVATE ${EXTRA_LIBS} ${EXTRA_LDFLAGS}) + target_include_directories(SDL2 PUBLIC "$" $ $) + if (NOT ANDROID) + set_target_properties(SDL2 PROPERTIES DEBUG_POSTFIX "${SDL_CMAKE_DEBUG_POSTFIX}") diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index e1c027bf75cbba..837ef4f7067a78 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_extract_source_archive_ex( 0006-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch 0007-sdl2-skip-ibus-on-linux.patch 0008-fix-macos-metal-test.patch + no-propagate-shared-link-options.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index e05f94106847ac..5445b69d7a46b7 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2", "version-string": "2.0.12", - "port-version": 7, + "port-version": 8, "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", "features": { From acc9f481e07ddaae0e601d22963019f141c96155 Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Fri, 11 Dec 2020 22:19:33 +0000 Subject: [PATCH 0280/1694] [libpng] Fix cross-compilation on macOS (#15002) --- ports/libpng/CONTROL | 2 +- ports/libpng/macos-arch-fix.patch | 62 +++++++++++++++++++++++++++++++ ports/libpng/portfile.cmake | 1 + 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 ports/libpng/macos-arch-fix.patch diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL index d45c0268e596d5..acaecea106a68d 100644 --- a/ports/libpng/CONTROL +++ b/ports/libpng/CONTROL @@ -1,6 +1,6 @@ Source: libpng Version: 1.6.37 -Port-Version: 13 +Port-Version: 14 Build-Depends: zlib Homepage: https://github.com/glennrp/libpng Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files. diff --git a/ports/libpng/macos-arch-fix.patch b/ports/libpng/macos-arch-fix.patch new file mode 100644 index 00000000000000..5dd637695d2acb --- /dev/null +++ b/ports/libpng/macos-arch-fix.patch @@ -0,0 +1,62 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6451fcf1b..dbd5016ca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -63,11 +63,22 @@ option(PNG_HARDWARE_OPTIMIZATIONS "Enable hardware optimizations" ON) + set(PNG_PREFIX "" CACHE STRING "Prefix to add to the API function names") + set(DFA_XTRA "" CACHE FILEPATH "File containing extra configuration settings") + ++# CMake currently sets CMAKE_SYSTEM_PROCESSOR to one of x86_64 or arm64 on macOS, ++# based upon the OS architecture, not the target architecture. As such, we need ++# to check CMAKE_OSX_ARCHITECTURES to identify which hardware-specific flags to ++# enable. Note that this will fail if you attempt to build a universal binary in ++# a single cmake invokation. ++if (APPLE AND CMAKE_OSX_ARCHITECTURES) ++ set(TARGET_ARCH ${CMAKE_OSX_ARCHITECTURES}) ++else() ++ set(TARGET_ARCH ${CMAKE_SYSTEM_PROCESSOR}) ++endif() ++ + if(PNG_HARDWARE_OPTIMIZATIONS) + + # set definitions and sources for arm +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR +- CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") ++if(TARGET_ARCH MATCHES "^arm" OR ++ TARGET_ARCH MATCHES "^aarch64") + set(PNG_ARM_NEON_POSSIBLE_VALUES check on off) + set(PNG_ARM_NEON "check" CACHE STRING "Enable ARM NEON optimizations: + check: (default) use internal checking code; +@@ -121,8 +132,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^powerpc*" OR + endif() + + # set definitions and sources for intel +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?86" OR +- CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*") ++if(TARGET_ARCH MATCHES "^i?86" OR ++ TARGET_ARCH MATCHES "^x86_64*") + set(PNG_INTEL_SSE_POSSIBLE_VALUES on off) + set(PNG_INTEL_SSE "on" CACHE STRING "Enable INTEL_SSE optimizations: + off: disable the optimizations") +@@ -171,8 +182,8 @@ endif() + else(PNG_HARDWARE_OPTIMIZATIONS) + + # set definitions and sources for arm +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR +- CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") ++if(TARGET_ARCH MATCHES "^arm" OR ++ TARGET_ARCH MATCHES "^aarch64") + add_definitions(-DPNG_ARM_NEON_OPT=0) + endif() + +@@ -183,8 +194,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^powerpc*" OR + endif() + + # set definitions and sources for intel +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?86" OR +- CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*") ++if(TARGET_ARCH MATCHES "^i?86" OR ++ TARGET_ARCH MATCHES "^x86_64") + add_definitions(-DPNG_INTEL_SSE_OPT=0) + endif() + diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index d75eedb4b604fa..6727fca2a99805 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -43,6 +43,7 @@ vcpkg_from_github( pkgconfig.2.patch ${APNG_EXTRA_PATCH} fix-export-targets.patch + macos-arch-fix.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) From 911b5db25234c7f8990629cbc5a2215c72751f20 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Sat, 12 Dec 2020 08:59:14 +0800 Subject: [PATCH 0281/1694] [opencascade] Fix OpenCASCADE_INSTALL_PREFIX path in config (#15056) --- ports/opencascade/CONTROL | 2 +- ports/opencascade/fix-install-prefix-path.patch | 12 ++++++++++++ ports/opencascade/portfile.cmake | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 ports/opencascade/fix-install-prefix-path.patch diff --git a/ports/opencascade/CONTROL b/ports/opencascade/CONTROL index 7d26a2cc495a5f..d16b19ff84ee7c 100644 --- a/ports/opencascade/CONTROL +++ b/ports/opencascade/CONTROL @@ -1,6 +1,6 @@ Source: opencascade Version: 7.4.0 -Port-Version: 2 +Port-Version: 3 Build-Depends: freetype Description: Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE. Supports: !(uwp|osx|linux|arm) diff --git a/ports/opencascade/fix-install-prefix-path.patch b/ports/opencascade/fix-install-prefix-path.patch new file mode 100644 index 00000000000000..38c07c21da3172 --- /dev/null +++ b/ports/opencascade/fix-install-prefix-path.patch @@ -0,0 +1,12 @@ +diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in +index 4937103b..cd35e07d 100644 +--- a/adm/templates/OpenCASCADEConfig.cmake.in ++++ b/adm/templates/OpenCASCADEConfig.cmake.in +@@ -23,6 +23,7 @@ set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@") + # - in Windows style: $INSTALL_DIR/cmake + get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) ++get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) + if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$") + get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) + endif() diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index 0a8bff0447a499..90676ada2b4dd1 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( fix-msvc-32bit-builds.patch fix-build-with-vs2017.patch fix-static-build.patch + fix-install-prefix-path.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) From b9c332b1bbd50a33f265c94368bd88bf1b0d06b7 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Sat, 12 Dec 2020 09:00:02 +0800 Subject: [PATCH 0282/1694] [mp3lame] Fix lib suffix on Unix (#15058) --- ports/mp3lame/CONTROL | 2 +- ports/mp3lame/portfile.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/mp3lame/CONTROL b/ports/mp3lame/CONTROL index a239128e45261b..7e090c2e9665dc 100644 --- a/ports/mp3lame/CONTROL +++ b/ports/mp3lame/CONTROL @@ -1,5 +1,5 @@ Source: mp3lame Version: 3.100 -Port-Version: 5 +Port-Version: 6 Homepage: http://lame.sourceforge.net/ Description: LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL. diff --git a/ports/mp3lame/portfile.cmake b/ports/mp3lame/portfile.cmake index 06aaf01b9b4e47..f30f9e2cbac62d 100644 --- a/ports/mp3lame/portfile.cmake +++ b/ports/mp3lame/portfile.cmake @@ -86,13 +86,13 @@ else() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(OPTIONS --enable-static=yes --enable-shared=no) - set(MP3LAME_LIB "libmp3lame.${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + set(MP3LAME_LIB "libmp3lame${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") else() set(OPTIONS --enable-shared=yes --enable-static=no) if(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX) - set(MP3LAME_LIB "libmp3lame.${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") + set(MP3LAME_LIB "libmp3lame${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") else() - set(MP3LAME_LIB "libmp3lame.${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + set(MP3LAME_LIB "libmp3lame${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") endif() endif() @@ -116,5 +116,5 @@ endif() file(COPY ${SOURCE_PATH}/include/lame.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/lame) configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -configure_file(${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in ${CURRENT_PACKAGES_DIR}/share/mp3lame/mp3lame-config.cmake @ONLY) +configure_file(${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/mp3lame-config.cmake @ONLY) file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) From 178350716c8e64769717daadd69139a7201052bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20B=C3=A9dard-Couture?= Date: Fri, 11 Dec 2020 20:00:37 -0500 Subject: [PATCH 0283/1694] Update to v2.7.0 (#15057) --- ports/taskflow/CONTROL | 2 +- ports/taskflow/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/taskflow/CONTROL b/ports/taskflow/CONTROL index 6bdca9e432c4f9..6576a0ad55b9c3 100644 --- a/ports/taskflow/CONTROL +++ b/ports/taskflow/CONTROL @@ -1,4 +1,4 @@ Source: taskflow -Version: 2.6.0 +Version: 2.7.0 Description: Fast Parallel Tasking Programming Library using Modern C++. Homepage: https://github.com/taskflow/taskflow diff --git a/ports/taskflow/portfile.cmake b/ports/taskflow/portfile.cmake index 1e87d0b56f341d..b1bfdf04fd8453 100644 --- a/ports/taskflow/portfile.cmake +++ b/ports/taskflow/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taskflow/taskflow - REF v2.6.0 - SHA512 43b023c7d744ae1e0baf6f504f32da481e950ec5cc34fe5511e4bbb8905203e4726917ee103b1c02544a75c6216c2ca481034be810b61a35511a3d7a2b278133 + REF v2.7.0 + SHA512 1498739cfe5af9ce66815a82c18edde38a4806d9288c8c7859b8f1621f8353258adfaf80275d4a2294cc3dc09365d8a18219210453aa1b7bb7658abd026b13f2 HEAD_REF master ) From 14e3da11168d52e779062a1a8906c12c367a580b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 11 Dec 2020 17:40:21 -0800 Subject: [PATCH 0284/1694] [openssl] Remove extra slashes when installing usage (#15062) --- ports/openssl/CONTROL | 2 +- ports/openssl/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL index 7d970cc7589b83..bda3d35af7f287 100644 --- a/ports/openssl/CONTROL +++ b/ports/openssl/CONTROL @@ -1,5 +1,5 @@ Source: openssl Version: 1.1.1h -Port-Version: 3 +Port-Version: 4 Homepage: https://www.openssl.org 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. diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index e4619e3543e600..b8666ed2289502 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -22,4 +22,4 @@ else() endif() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") From 6a1daaa94beb3f2faff229feebbae78838571c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 11 Dec 2020 17:41:02 -0800 Subject: [PATCH 0285/1694] [sentry-native] Fix sentry-config-cmake.in (#15042) --- ports/sentry-native/CONTROL | 1 + ports/sentry-native/fix-config-cmake.patch | 23 ++++++++++++++++++++++ ports/sentry-native/portfile.cmake | 4 +++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 ports/sentry-native/fix-config-cmake.patch diff --git a/ports/sentry-native/CONTROL b/ports/sentry-native/CONTROL index ed8004c6fc6e64..404da1cdd1ad83 100644 --- a/ports/sentry-native/CONTROL +++ b/ports/sentry-native/CONTROL @@ -1,5 +1,6 @@ Source: sentry-native Version: 0.4.4 +Port-Version: 1 Homepage: https://sentry.io/ Description: Sentry SDK for C, C++ and native applications. Build-Depends: curl (!windows) diff --git a/ports/sentry-native/fix-config-cmake.patch b/ports/sentry-native/fix-config-cmake.patch new file mode 100644 index 00000000000000..3e7a33120bdd87 --- /dev/null +++ b/ports/sentry-native/fix-config-cmake.patch @@ -0,0 +1,23 @@ +diff --git a/sentry-config.cmake.in b/sentry-config.cmake.in +index 89ea345..21d8732 100644 +--- a/sentry-config.cmake.in ++++ b/sentry-config.cmake.in +@@ -5,7 +5,7 @@ set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@) + + if(SENTRY_BACKEND STREQUAL "crashpad") + if(@SENTRY_CRASHPAD_SYSTEM@) +- find_package(crashpad REQUIRED) ++ find_dependency(crashpad) + else() + include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake") + endif() +@@ -14,7 +14,7 @@ endif() + include("${CMAKE_CURRENT_LIST_DIR}/sentry-targets.cmake") + + if(SENTRY_TRANSPORT STREQUAL "curl" AND NOT @BUILD_SHARED_LIBS@) +- find_package(CURL REQUIRED) ++ find_dependency(CURL) + set_property(TARGET sentry::sentry APPEND +- PROPERTY INTERFACE_LINK_LIBRARIES ${CURL_LIBRARIES}) ++ PROPERTY INTERFACE_LINK_LIBRARIES CURL::libcurl) + endif() diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index d4b6d313d69e83..63eda4d3d4ea3d 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -9,8 +9,10 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES fix-warningC5105.patch NO_REMOVE_ONE_LEVEL + PATCHES + fix-warningC5105.patch + fix-config-cmake.patch ) if (NOT DEFINED SENTRY_BACKEND) From 24935e70e39a2301031aa26d78e1cd9eb47c055e Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Sat, 12 Dec 2020 01:42:38 +0000 Subject: [PATCH 0286/1694] [vcpkg] Don't require native tools on arm64 macOS (#15045) --- toolsrc/src/vcpkg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index bba64bbbfe5f3f..bfdc6ac4fbb4b0 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -239,7 +239,7 @@ int main(const int argc, const char* const* const argv) load_config(fs); #if (defined(__aarch64__) || defined(__arm__) || defined(__s390x__) || defined(_M_ARM) || defined(_M_ARM64)) && \ - !defined(_WIN32) + !defined(_WIN32) && !defined(__APPLE__) if (!System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value()) { Checks::exit_with_message( From 7fcfb2092edd7e73fdddfdeea58acfc956de5eef Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Sat, 12 Dec 2020 17:35:03 -0600 Subject: [PATCH 0287/1694] [arrayfire] Remove forge and graphics deps from port (#15027) --- ports/arrayfire/build.patch | 47 ++++++++++++++++++++++------------ ports/arrayfire/portfile.cmake | 16 ++++++++++++ ports/arrayfire/vcpkg.json | 4 +-- 3 files changed, 48 insertions(+), 19 deletions(-) diff --git a/ports/arrayfire/build.patch b/ports/arrayfire/build.patch index b2a4f279f2997e..c5239389144ed4 100644 --- a/ports/arrayfire/build.patch +++ b/ports/arrayfire/build.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1f30a5b3..f93e4ed9 100644 +index 1f30a5b3..7b62e003 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -104,18 +104,11 @@ mark_as_advanced( +@@ -104,8 +104,6 @@ mark_as_advanced( CUDA_HOST_COMPILER CUDA_USE_STATIC_CUDA_RUNTIME CUDA_rt_LIBRARY @@ -11,17 +11,7 @@ index 1f30a5b3..f93e4ed9 100644 ADDR2LINE_PROGRAM Backtrace_LIBRARY AF_WITH_STATIC_MKL - ) - --#Configure forge submodule --#forge is included in ALL target if AF_BUILD_FORGE is ON --#otherwise, forge is not built at all --include(AFconfigure_forge_submodule) -- - configure_file( - ${ArrayFire_SOURCE_DIR}/CMakeModules/version.hpp.in - ${ArrayFire_BINARY_DIR}/version.hpp -@@ -159,9 +152,7 @@ if(NOT LAPACK_FOUND) +@@ -159,9 +157,7 @@ if(NOT LAPACK_FOUND) endif() endif() @@ -32,7 +22,7 @@ index 1f30a5b3..f93e4ed9 100644 add_subdirectory(src/backend/common) add_subdirectory(src/api/c) add_subdirectory(src/api/cpp) -@@ -269,10 +260,6 @@ install(DIRECTORY examples/ #NOTE The slash at the end is important +@@ -269,10 +265,6 @@ install(DIRECTORY examples/ #NOTE The slash at the end is important DESTINATION ${AF_INSTALL_EXAMPLE_DIR} COMPONENT examples) @@ -62,6 +52,28 @@ index 2c7b96ea..b5006ee0 100644 endif() # Libraries +diff --git a/CMakeModules/AFconfigure_forge_submodule.cmake b/CMakeModules/AFconfigure_forge_submodule.cmake +index d16849f0..36ab01b6 100644 +--- a/CMakeModules/AFconfigure_forge_submodule.cmake ++++ b/CMakeModules/AFconfigure_forge_submodule.cmake +@@ -39,13 +39,13 @@ if(AF_BUILD_FORGE) + COMPONENT common_backend_dependencies) + set_property(TARGET forge APPEND_STRING PROPERTY COMPILE_FLAGS " -w") + else(AF_BUILD_FORGE) +- set(FG_VERSION "1.0.0") ++ set(FG_VERSION "1.0.5") + set(FG_VERSION_MAJOR 1) + set(FG_VERSION_MINOR 0) +- set(FG_VERSION_PATCH 0) ++ set(FG_VERSION_PATCH 5) + set(FG_API_VERSION_CURRENT 10) + configure_file( +- ${PROJECT_SOURCE_DIR}/extern/forge/CMakeModules/version.h.in +- ${PROJECT_BINARY_DIR}/extern/forge/include/fg/version.h ++ ${AF_FORGE_PATH}/CMakeModules/version.h.in ++ ${AF_FORGE_PATH}/include/fg/version.h + ) + endif(AF_BUILD_FORGE) diff --git a/src/api/unified/CMakeLists.txt b/src/api/unified/CMakeLists.txt index 967eaa63..ff04392c 100644 --- a/src/api/unified/CMakeLists.txt @@ -76,7 +88,7 @@ index 967eaa63..ff04392c 100644 Boost::boost ${CMAKE_DL_LIBS} diff --git a/src/backend/common/CMakeLists.txt b/src/backend/common/CMakeLists.txt -index c9fe0889..4fdfeb66 100644 +index c9fe0889..f97bf0e8 100644 --- a/src/backend/common/CMakeLists.txt +++ b/src/backend/common/CMakeLists.txt @@ -77,12 +77,15 @@ else() @@ -97,8 +109,11 @@ index c9fe0889..4fdfeb66 100644 ) if(AF_BUILD_FORGE) -@@ -95,8 +98,6 @@ target_include_directories(afcommon_interface +@@ -93,10 +96,9 @@ target_include_directories(afcommon_interface + INTERFACE + ${ArrayFire_SOURCE_DIR}/src/backend ${ArrayFire_BINARY_DIR} ++ ${AF_FORGE_PATH}/include # passed via vcpkg SYSTEM INTERFACE $<$:${OPENGL_INCLUDE_DIR}> - ${ArrayFire_SOURCE_DIR}/extern/forge/include diff --git a/ports/arrayfire/portfile.cmake b/ports/arrayfire/portfile.cmake index ebc0616b193174..607d873f7d2cff 100644 --- a/ports/arrayfire/portfile.cmake +++ b/ports/arrayfire/portfile.cmake @@ -16,6 +16,20 @@ vcpkg_from_github( HEAD_REF master ) +# Get forge. We only need headers and aren't actually linking. +# We don't want to use the vcpkg dependency since it is broken in many +# environments - see https://github.com/microsoft/vcpkg/issues/14864. This +# can be relaxed when the issue is fixed. Forge and its dependencies +# are still runtime dependencies, so the user can use the graphics +# library by installing forge and freeimage. +vcpkg_from_github( + OUT_SOURCE_PATH FORGE_PATH + REPO arrayfire/forge + REF 1a0f0cb6371a8c8053ab5eb7cbe3039c95132389 # v1.0.5 + SHA512 8f8607421880a0f0013380eb5efb3a4f05331cd415d68c9cd84dd57eb727da1df6223fc6d65b106675d6aa09c3388359fab64443c31fadadf7641161be6b3b89 + HEAD_REF master +) + ################################### Build ################################### # Default flags @@ -26,6 +40,8 @@ set(AF_DEFAULT_VCPKG_CMAKE_FLAGS -DUSE_CPU_MKL=ON -DUSE_OPENCL_MKL=ON -DAF_CPU_THREAD_PATH=${CPU_THREADS_PATH} # for building the arrayfire cpu threads lib + -DAF_FORGE_PATH=${FORGE_PATH} # forge headers for building the graphics lib + -DAF_BUILD_FORGE=OFF -DAF_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT} # for CMake configs/targets ) diff --git a/ports/arrayfire/vcpkg.json b/ports/arrayfire/vcpkg.json index d2dd8b3081949a..e6f2c8874f847d 100644 --- a/ports/arrayfire/vcpkg.json +++ b/ports/arrayfire/vcpkg.json @@ -1,14 +1,12 @@ { "name": "arrayfire", "version-string": "3.7.3", - "port-version": 2, + "port-version": 3, "description": "ArrayFire is a general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.", "supports": "x64", "dependencies": [ "boost-compute", "boost-stacktrace", - "forge", - "freeimage", "glad", "spdlog" ], From fcf1c4e7924e2dcb162b7364a9e673010e86b5d9 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 12 Dec 2020 18:38:14 -0500 Subject: [PATCH 0288/1694] [hyperscan] Remove erroneous python3 dependency. (#15080) --- ports/hyperscan/CONTROL | 4 +++- ports/hyperscan/portfile.cmake | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/hyperscan/CONTROL b/ports/hyperscan/CONTROL index ff18d2c9a78616..3c6e5e956ed218 100644 --- a/ports/hyperscan/CONTROL +++ b/ports/hyperscan/CONTROL @@ -1,5 +1,7 @@ Source: hyperscan Version: 5.3.0 +Port-Version: 1 Homepage: https://www.hyperscan.io Description: A regular expression library with O(length of input) match times that takes advantage of Intel hardware to provide blazing speed. -Build-Depends: boost-array, boost-chrono, boost-config, boost-core, boost-crc, boost-detail, boost-functional, boost-regex, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-utility, boost-dynamic-bitset, boost-random, boost-graph, boost-multi-array, boost-icl, boost-ptr-container, pcre, python3, ragel +Build-Depends: boost-array, boost-chrono, boost-config, boost-core, boost-crc, boost-detail, boost-functional, boost-regex, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-utility, boost-dynamic-bitset, boost-random, boost-graph, boost-multi-array, boost-icl, boost-ptr-container, pcre, ragel +Supports: !arm diff --git a/ports/hyperscan/portfile.cmake b/ports/hyperscan/portfile.cmake index a52ef7d8976060..2aec198d3a5caa 100644 --- a/ports/hyperscan/portfile.cmake +++ b/ports/hyperscan/portfile.cmake @@ -13,12 +13,11 @@ vcpkg_from_github( ) vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY) -vcpkg_add_to_path(${PYTHON3_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS "-DPYTHON_EXECUTABLE=${PYTHON3}" ) vcpkg_install_cmake() From d972714d01f23502cb3774dd49e8ea29e7de4d8b Mon Sep 17 00:00:00 2001 From: Tetsuya Hayashi Date: Tue, 15 Dec 2020 02:50:58 +0900 Subject: [PATCH 0289/1694] Avoid C4819 warning during bootstrap-vcpkg.bat (#15095) --- toolsrc/src/vcpkg/export.prefab.cpp | 52 ++++++++++++++--------------- toolsrc/src/vcpkg/registries.cpp | 3 +- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/toolsrc/src/vcpkg/export.prefab.cpp b/toolsrc/src/vcpkg/export.prefab.cpp index a1a6eb5f102afe..ce4e0cf6a88b42 100644 --- a/toolsrc/src/vcpkg/export.prefab.cpp +++ b/toolsrc/src/vcpkg/export.prefab.cpp @@ -335,32 +335,32 @@ namespace vcpkg::Export::Prefab /* prefab - └── - ├── aar - │   ├── AndroidManifest.xml - │   ├── META-INF - │   │   └── LICENCE - │   └── prefab - │   ├── modules - │   │   └── - │   │   ├── include - │   │   ├── libs - │   │   │   ├── android.arm64-v8a - │   │   │   │   ├── abi.json - │   │   │   │   └── lib.so - │   │   │   ├── android.armeabi-v7a - │   │   │   │   ├── abi.json - │   │   │   │   └── lib.so - │   │   │   ├── android.x86 - │   │   │   │   ├── abi.json - │   │   │   │   └── lib.so - │   │   │   └── android.x86_64 - │   │   │   ├── abi.json - │   │   │   └── lib.so - │   │   └── module.json - │   └── prefab.json - ├── -.aar - └── pom.xml + +-- + +-- aar + | +-- AndroidManifest.xml + | +-- META-INF + | | +-- LICENCE + | +-- prefab + | +-- modules + | | +-- + | | +-- include + | | +-- libs + | | | +-- android.arm64-v8a + | | | | +-- abi.json + | | | | +-- lib.so + | | | +-- android.armeabi-v7a + | | | | +-- abi.json + | | | | +-- lib.so + | | | +-- android.x86 + | | | | +-- abi.json + | | | | +-- lib.so + | | | +-- android.x86_64 + | | | +-- abi.json + | | | +-- lib.so + | | +-- module.json + | +-- prefab.json + +-- -.aar + +-- pom.xml */ std::unordered_map version_map; diff --git a/toolsrc/src/vcpkg/registries.cpp b/toolsrc/src/vcpkg/registries.cpp index 7794ed9b016326..51c8849c97fcf7 100644 --- a/toolsrc/src/vcpkg/registries.cpp +++ b/toolsrc/src/vcpkg/registries.cpp @@ -243,7 +243,8 @@ namespace fs::path path_to_registry_database(const VcpkgPaths& paths) const { fs::path path_to_db = paths.config_root_dir / path; - path_to_db /= fs::u8path({'\xF0', '\x9F', '\x98', '\x87'}); // utf-8 for 😇 + path_to_db /= fs::u8path( + {'\xF0', '\x9F', '\x98', '\x87'}); // utf-8 for https://emojipedia.org/smiling-face-with-halo/ return path_to_db; } From f2f594eb3eb0f11d9ef45ba5dd1f3a1d79bd1faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 14 Dec 2020 10:17:29 -0800 Subject: [PATCH 0290/1694] [fontconfig] Disable install data files (#15060) --- ports/fontconfig/CONTROL | 2 +- ports/fontconfig/disable-install-data.patch | 14 ++++++++++++++ ports/fontconfig/portfile.cmake | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 ports/fontconfig/disable-install-data.patch diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL index fcdf2f768db268..d02960b62064f4 100644 --- a/ports/fontconfig/CONTROL +++ b/ports/fontconfig/CONTROL @@ -1,6 +1,6 @@ Source: fontconfig Version: 2.13.1 -Port-Version: 1 +Port-Version: 2 Homepage: https://www.freedesktop.org/software/fontconfig/front.html Description: Library for configuring and customizing font access. Build-Depends: freetype, expat, libiconv, dirent, pthread, json-c, dirent, libuuid (!windows&!osx), gettext \ No newline at end of file diff --git a/ports/fontconfig/disable-install-data.patch b/ports/fontconfig/disable-install-data.patch new file mode 100644 index 00000000000000..e15253264b4308 --- /dev/null +++ b/ports/fontconfig/disable-install-data.patch @@ -0,0 +1,14 @@ +diff --git a/po-conf/LINGUAS b/po-conf/LINGUAS +index 0d5d97c..e7604c1 100644 +--- a/po-conf/LINGUAS ++++ b/po-conf/LINGUAS +@@ -1,2 +1 @@ + # Please keep this list sorted alphabetically. +-zh_CN +diff --git a/po/LINGUAS b/po/LINGUAS +index 0d5d97c..e7604c1 100644 +--- a/po/LINGUAS ++++ b/po/LINGUAS +@@ -1,2 +1 @@ + # Please keep this list sorted alphabetically. +-zh_CN diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 150bca5e9554bd..cf840dd122f74e 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_gitlab( PATCHES remove_tests.patch build.patch build2.patch + disable-install-data.patch ${PATCHES} ) From c7f2296b64190b24d49877080bf02466f59ba6e0 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Mon, 14 Dec 2020 11:24:19 -0800 Subject: [PATCH 0291/1694] [vcpkg] Adhere to older draft schema to improve compatibility with editors (such as VS) (#15084) --- scripts/vcpkg.schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/vcpkg.schema.json b/scripts/vcpkg.schema.json index 723b14646b06d9..9df3620869354b 100644 --- a/scripts/vcpkg.schema.json +++ b/scripts/vcpkg.schema.json @@ -1,6 +1,6 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "$schema": "http://json-schema.org/draft-04/schema#", + "id": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "title": "Vcpkg manifest", "description": "Vcpkg manifest file. See https://github.com/microsoft/vcpkg/blob/master/docs/specifications/manifests.md.", "definitions": { From 7a28b8396dff110304f335d40d9eee0e5ffd1c34 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Mon, 14 Dec 2020 11:39:50 -0800 Subject: [PATCH 0292/1694] [glbinding] Improve usage information (#15082) --- ports/glbinding/CONTROL | 5 ----- ports/glbinding/portfile.cmake | 1 + ports/glbinding/usage | 4 ++++ ports/glbinding/vcpkg.json | 10 ++++++++++ 4 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 ports/glbinding/CONTROL create mode 100644 ports/glbinding/usage create mode 100644 ports/glbinding/vcpkg.json diff --git a/ports/glbinding/CONTROL b/ports/glbinding/CONTROL deleted file mode 100644 index 5bef7210a16266..00000000000000 --- a/ports/glbinding/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: glbinding -Version: 3.1.0-2 -Description: glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API -Homepage: https://github.com/cginternals/glbinding -Build-Depends: egl-registry diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake index 78484437bf2815..6aa2e4e393e0e5 100644 --- a/ports/glbinding/portfile.cmake +++ b/ports/glbinding/portfile.cmake @@ -56,3 +56,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR) # Handle copyright file(RENAME ${CURRENT_PACKAGES_DIR}/share/glbinding/LICENSE ${CURRENT_PACKAGES_DIR}/share/glbinding/copyright) +configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/glbinding/usage @ONLY) diff --git a/ports/glbinding/usage b/ports/glbinding/usage new file mode 100644 index 00000000000000..010a5c6da3e848 --- /dev/null +++ b/ports/glbinding/usage @@ -0,0 +1,4 @@ +The package glbinding:@TARGET_TRIPLET@ provides CMake targets: + + find_package(glbinding CONFIG REQUIRED) + target_link_libraries(main PRIVATE glbinding::glbinding glbinding::glbinding-aux) diff --git a/ports/glbinding/vcpkg.json b/ports/glbinding/vcpkg.json new file mode 100644 index 00000000000000..4a13308968ca2a --- /dev/null +++ b/ports/glbinding/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "glbinding", + "version-string": "3.1.0", + "port-version": 3, + "description": "glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API", + "homepage": "https://github.com/cginternals/glbinding", + "dependencies": [ + "egl-registry" + ] +} From 17d37d125e704b2e78b6f3e3eadb851ad59e1ba4 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Mon, 14 Dec 2020 12:02:22 -0800 Subject: [PATCH 0293/1694] [vcpkg] Disable survey message (#14954) --- toolsrc/src/vcpkg.cpp | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index bfdc6ac4fbb4b0..f128210fd22588 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -84,28 +84,6 @@ static void inner(vcpkg::Files::Filesystem& fs, const VcpkgCmdArguments& args) !args.output_json()) { Commands::Version::warn_if_vcpkg_version_mismatch(paths); - std::string surveydate = *GlobalState::g_surveydate.lock(); - auto maybe_surveydate = Chrono::CTime::parse(surveydate); - if (auto p_surveydate = maybe_surveydate.get()) - { - const auto now = Chrono::CTime::get_current_date_time().value_or_exit(VCPKG_LINE_INFO); - const auto delta = now.to_time_point() - p_surveydate->to_time_point(); - if (std::chrono::duration_cast(delta).count() > SURVEY_INTERVAL_IN_HOURS) - { - std::default_random_engine generator( - static_cast(now.to_time_point().time_since_epoch().count())); - std::uniform_int_distribution distribution(1, 4); - - if (distribution(generator) == 1) - { - Metrics::g_metrics.lock()->track_property("surveyprompt", "true"); - System::print2( - System::Color::success, - "Your feedback is important to improve Vcpkg! Please take 3 minutes to complete our survey " - "by running: vcpkg contact --survey\n"); - } - } - } } if (const auto command_function = find_command(Commands::get_available_paths_commands())) From fc11268ab724fdbf93bf46d59d5b6a79471a2c99 Mon Sep 17 00:00:00 2001 From: gritukan <58486012+gritukan@users.noreply.github.com> Date: Tue, 15 Dec 2020 03:23:56 +0300 Subject: [PATCH 0294/1694] Properly index package actions in log (#15076) --- toolsrc/src/vcpkg/install.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index eee0eca0ed881e..dd89a75673bbcf 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -435,13 +435,14 @@ namespace vcpkg::Install SpecSummary* current_summary = nullptr; Chrono::ElapsedTimer build_timer = Chrono::ElapsedTimer::create_started(); - TrackedPackageInstallGuard(const size_t package_count, + TrackedPackageInstallGuard(const size_t action_index, + const size_t action_count, std::vector& results, const PackageSpec& spec) { results.emplace_back(spec, nullptr); current_summary = &results.back(); - System::printf("Starting package %zd/%zd: %s\n", results.size(), package_count, spec.to_string()); + System::printf("Starting package %zd/%zd: %s\n", action_index, action_count, spec.to_string()); } ~TrackedPackageInstallGuard() @@ -465,12 +466,13 @@ namespace vcpkg::Install const CMakeVars::CMakeVarProvider& var_provider) { std::vector results; - const size_t package_count = action_plan.remove_actions.size() + action_plan.install_actions.size(); + const size_t action_count = action_plan.remove_actions.size() + action_plan.install_actions.size(); + size_t action_index = 1; const auto timer = Chrono::ElapsedTimer::create_started(); for (auto&& action : action_plan.remove_actions) { - TrackedPackageInstallGuard this_install(package_count, results, action.spec); + TrackedPackageInstallGuard this_install(action_index++, action_count, results, action.spec); Remove::perform_remove_plan_action(paths, action, Remove::Purge::YES, &status_db); } @@ -488,7 +490,7 @@ namespace vcpkg::Install for (auto&& action : action_plan.install_actions) { - TrackedPackageInstallGuard this_install(package_count, results, action.spec); + TrackedPackageInstallGuard this_install(action_index++, action_count, results, action.spec); auto result = perform_install_plan_action(args, paths, action, status_db, binaryprovider, build_logs_recorder); if (result.code != BuildResult::SUCCEEDED && keep_going == KeepGoing::NO) From 553e60b72163f08375207a0b6db63041fe256d0a Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Tue, 15 Dec 2020 10:26:00 -0800 Subject: [PATCH 0295/1694] [vcpkg] Refactor end-to-end tests (#15081) * [vcpkg] Refactor end-to-end tests * [vcpkg] Cherry-pick x-builtin-ports-root from #14999 * [vcpkg] Move create test from unit tests to e2e Co-authored-by: Robert Schumacher --- .../backcompat-helpers.ps1 | 26 ++ .../end-to-end-tests-dir/binarycaching.ps1 | 81 ++++++ .../end-to-end-tests-dir/cli.ps1 | 11 + .../end-to-end-tests-dir/create.ps1 | 10 + .../integrate-install.ps1 | 28 +++ .../end-to-end-tests-dir/spaces.ps1 | 11 + .../end-to-end-tests-prelude.ps1 | 64 +++++ scripts/azure-pipelines/end-to-end-tests.ps1 | 230 +----------------- scripts/ports.cmake | 4 +- toolsrc/include/vcpkg/vcpkgcmdarguments.h | 2 + toolsrc/include/vcpkg/vcpkgpaths.h | 3 +- toolsrc/src/vcpkg-test/arguments.cpp | 4 + toolsrc/src/vcpkg-test/commands.create.cpp | 27 -- toolsrc/src/vcpkg/commands.create.cpp | 6 +- toolsrc/src/vcpkg/vcpkgcmdarguments.cpp | 2 + toolsrc/src/vcpkg/vcpkgpaths.cpp | 2 + 16 files changed, 264 insertions(+), 247 deletions(-) create mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1 create mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1 create mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/cli.ps1 create mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/create.ps1 create mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1 create mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1 create mode 100644 scripts/azure-pipelines/end-to-end-tests-prelude.ps1 delete mode 100644 toolsrc/src/vcpkg-test/commands.create.cpp diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1 new file mode 100644 index 00000000000000..5b6b1c10f1fa38 --- /dev/null +++ b/scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1 @@ -0,0 +1,26 @@ +. $PSScriptRoot/../end-to-end-tests-prelude.ps1 + +# Test that prohibiting backcompat features actually prohibits +$backcompatFeaturePorts = @('vcpkg-uses-test-cmake', 'vcpkg-uses-vcpkg-common-functions') +foreach ($backcompatFeaturePort in $backcompatFeaturePorts) { + $succeedArgs = $commonArgs + @('install',$backcompatFeaturePort,'--no-binarycaching') + $failArgs = $succeedArgs + @('--x-prohibit-backcompat-features') + $CurrentTest = "Should fail: ./vcpkg $($failArgs -join ' ')" + Write-Host $CurrentTest + ./vcpkg @failArgs + if ($LastExitCode -ne 0) { + Write-Host "... failed (this is good!)" + } else { + throw $CurrentTest + } + + # Install failed when prohibiting backcompat features, so it should succeed if we allow them + $CurrentTest = "Should succeeed: ./vcpkg $($succeedArgs -join ' ')" + Write-Host $CurrentTest + ./vcpkg @succeedArgs + if ($LastExitCode -ne 0) { + throw $CurrentTest + } else { + Write-Host "... succeeded." + } +} diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1 new file mode 100644 index 00000000000000..2b7e84fbd94748 --- /dev/null +++ b/scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1 @@ -0,0 +1,81 @@ +. $PSScriptRoot/../end-to-end-tests-prelude.ps1 + +# Test simple installation +Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--binarycaching", "--x-binarysource=clear;files,$ArchiveRoot,write;nuget,$NuGetRoot,readwrite")) +Throw-IfFailed +Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" + +# Test simple removal +Run-Vcpkg -TestArgs ($commonArgs + @("remove", "rapidjson")) +Throw-IfFailed +Require-FileNotExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" + +# Test restoring from files archive +Remove-Item -Recurse -Force $installRoot +Remove-Item -Recurse -Force $buildtreesRoot +Run-Vcpkg -TestArgs ($commonArgs + @("install","rapidjson","--binarycaching","--x-binarysource=clear;files,$ArchiveRoot,read")) +Throw-IfFailed +Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" +Require-FileNotExists "$buildtreesRoot/rapidjson/src" +Require-FileExists "$buildtreesRoot/detect_compiler" + +# Test --no-binarycaching +Remove-Item -Recurse -Force $installRoot +Remove-Item -Recurse -Force $buildtreesRoot +Run-Vcpkg -TestArgs ($commonArgs + @("install","rapidjson","--no-binarycaching","--x-binarysource=clear;files,$ArchiveRoot,read")) +Throw-IfFailed +Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" +Require-FileExists "$buildtreesRoot/rapidjson/src" +Require-FileExists "$buildtreesRoot/detect_compiler" + +# Test --editable +Remove-Item -Recurse -Force $installRoot +Remove-Item -Recurse -Force $buildtreesRoot +Run-Vcpkg -TestArgs ($commonArgs + @("install","rapidjson","--editable","--x-binarysource=clear;files,$ArchiveRoot,read")) +Throw-IfFailed +Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" +Require-FileExists "$buildtreesRoot/rapidjson/src" +Require-FileNotExists "$buildtreesRoot/detect_compiler" + +# Test restoring from nuget +Remove-Item -Recurse -Force $installRoot +Remove-Item -Recurse -Force $buildtreesRoot +Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--binarycaching", "--x-binarysource=clear;nuget,$NuGetRoot")) +Throw-IfFailed +Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" +Require-FileNotExists "$buildtreesRoot/rapidjson/src" + +# Test four-phase flow +Remove-Item -Recurse -Force $installRoot -ErrorAction SilentlyContinue +Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--dry-run", "--x-write-nuget-packages-config=$TestingRoot/packages.config")) +Throw-IfFailed +Require-FileNotExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" +Require-FileNotExists "$buildtreesRoot/rapidjson/src" +Require-FileExists "$TestingRoot/packages.config" +if ($IsLinux -or $IsMacOS) { + mono $(./vcpkg fetch nuget) restore $TestingRoot/packages.config -OutputDirectory "$NuGetRoot2" -Source "$NuGetRoot" +} else { + & $(./vcpkg fetch nuget) restore $TestingRoot/packages.config -OutputDirectory "$NuGetRoot2" -Source "$NuGetRoot" +} +Throw-IfFailed +Remove-Item -Recurse -Force $NuGetRoot -ErrorAction SilentlyContinue +mkdir $NuGetRoot +Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "tinyxml", "--binarycaching", "--x-binarysource=clear;nuget,$NuGetRoot2;nuget,$NuGetRoot,write")) +Throw-IfFailed +Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" +Require-FileExists "$installRoot/$Triplet/include/tinyxml.h" +Require-FileNotExists "$buildtreesRoot/rapidjson/src" +Require-FileExists "$buildtreesRoot/tinyxml/src" +if ((Get-ChildItem $NuGetRoot -Filter '*.nupkg' | Measure-Object).Count -ne 1) { + throw "In '$CurrentTest': did not create exactly 1 NuGet package" +} + +# Test export +$CurrentTest = 'Exporting' +Require-FileNotExists "$TestingRoot/vcpkg-export-output" +Require-FileNotExists "$TestingRoot/vcpkg-export.1.0.0.nupkg" +Require-FileNotExists "$TestingRoot/vcpkg-export-output.zip" +Run-Vcpkg -TestArgs ($commonArgs + @("export", "rapidjson", "tinyxml", "--nuget", "--nuget-id=vcpkg-export", "--nuget-version=1.0.0", "--output=vcpkg-export-output", "--raw", "--zip", "--output-dir=$TestingRoot")) +Require-FileExists "$TestingRoot/vcpkg-export-output" +Require-FileExists "$TestingRoot/vcpkg-export.1.0.0.nupkg" +Require-FileExists "$TestingRoot/vcpkg-export-output.zip" diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/cli.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/cli.ps1 new file mode 100644 index 00000000000000..47f624fa8f6fc5 --- /dev/null +++ b/scripts/azure-pipelines/end-to-end-tests-dir/cli.ps1 @@ -0,0 +1,11 @@ +. $PSScriptRoot/../end-to-end-tests-prelude.ps1 + +# Test bad command lines +Run-Vcpkg -TestArgs ($commonArgs + @("install", "zlib", "--vcpkg-rootttttt", "C:\")) +Throw-IfNotFailed + +Run-Vcpkg -TestArgs ($commonArgs + @("install", "zlib", "--vcpkg-rootttttt=C:\")) +Throw-IfNotFailed + +Run-Vcpkg -TestArgs ($commonArgs + @("install", "zlib", "--fast")) # NB: --fast is not a switch +Throw-IfNotFailed diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/create.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/create.ps1 new file mode 100644 index 00000000000000..53686fe5095da5 --- /dev/null +++ b/scripts/azure-pipelines/end-to-end-tests-dir/create.ps1 @@ -0,0 +1,10 @@ +. $PSScriptRoot/../end-to-end-tests-prelude.ps1 + +# Test vcpkg create +$CurrentTest = "create zlib" +Write-Host $CurrentTest +./vcpkg --x-builtin-ports-root=$TestingRoot/ports create zlib https://github.com/madler/zlib/archive/v1.2.11.tar.gz zlib-1.2.11.tar.gz +Throw-IfFailed + +Require-FileExists "$TestingRoot/ports/zlib/portfile.cmake" +Require-FileExists "$TestingRoot/ports/zlib/vcpkg.json" diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1 new file mode 100644 index 00000000000000..38769775141764 --- /dev/null +++ b/scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1 @@ -0,0 +1,28 @@ +if (-not $IsLinux -and -not $IsMacOS) { + . $PSScriptRoot/../end-to-end-tests-prelude.ps1 + + # Test msbuild props and targets + $CurrentTest = "zlib:x86-windows-static msbuild scripts\testing\integrate-install\..." + Write-Host $CurrentTest + ./vcpkg $commonArgs install zlib:x86-windows-static --x-binarysource=clear + Throw-IfFailed + foreach ($project in @("VcpkgTriplet", "VcpkgTriplet2", "VcpkgUseStatic", "VcpkgUseStatic2")) { + $CurrentTest = "msbuild scripts\testing\integrate-install\$project.vcxproj" + ./vcpkg $commonArgs env "msbuild scripts\testing\integrate-install\$project.vcxproj /p:VcpkgRoot=$TestingRoot /p:IntDir=$TestingRoot\int\ /p:OutDir=$TestingRoot\out\ " + Throw-IfFailed + Remove-Item -Recurse -Force $TestingRoot\int + Remove-Item -Recurse -Force $TestingRoot\out + } + $CurrentTest = "zlib:x86-windows msbuild scripts\testing\integrate-install\..." + Write-Host $CurrentTest + ./vcpkg $commonArgs install zlib:x86-windows --x-binarysource=clear + Throw-IfFailed + foreach ($project in @("Project1", "NoProps")) { + $CurrentTest = "msbuild scripts\testing\integrate-install\$project.vcxproj" + Write-Host $CurrentTest + ./vcpkg $commonArgs env "msbuild scripts\testing\integrate-install\$project.vcxproj /p:VcpkgRoot=$TestingRoot /p:IntDir=$TestingRoot\int\ /p:OutDir=$TestingRoot\out\ " + Throw-IfFailed + Remove-Item -Recurse -Force $TestingRoot\int + Remove-Item -Recurse -Force $TestingRoot\out + } +} diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1 new file mode 100644 index 00000000000000..49796c1b063218 --- /dev/null +++ b/scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1 @@ -0,0 +1,11 @@ +. $PSScriptRoot/../end-to-end-tests-prelude.ps1 + +##### Test spaces in the path +$CurrentTest = "zlib with spaces in path" +Write-Host $CurrentTest +./vcpkg install zlib "--triplet" $Triplet ` + "--no-binarycaching" ` + "--x-buildtrees-root=$TestingRoot/build Trees" ` + "--x-install-root=$TestingRoot/instalL ed" ` + "--x-packages-root=$TestingRoot/packaG es" +Throw-IfFailed diff --git a/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 b/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 new file mode 100644 index 00000000000000..057df9fa66a8e5 --- /dev/null +++ b/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 @@ -0,0 +1,64 @@ +$TestingRoot = Join-Path $WorkingRoot 'testing' +$buildtreesRoot = Join-Path $TestingRoot 'buildtrees' +$installRoot = Join-Path $TestingRoot 'installed' +$packagesRoot = Join-Path $TestingRoot 'packages' +$NuGetRoot = Join-Path $TestingRoot 'nuget' +$NuGetRoot2 = Join-Path $TestingRoot 'nuget2' +$ArchiveRoot = Join-Path $TestingRoot 'archives' +$VersionFilesRoot = Join-Path $TestingRoot 'version-test' +$commonArgs = @( + "--triplet", + $Triplet, + "--x-buildtrees-root=$buildtreesRoot", + "--x-install-root=$installRoot", + "--x-packages-root=$packagesRoot", + "--overlay-ports=scripts/e2e_ports" +) +$CurrentTest = 'unassigned' + +function Refresh-TestRoot { + Remove-Item -Recurse -Force $TestingRoot -ErrorAction SilentlyContinue + mkdir $TestingRoot | Out-Null + mkdir $NuGetRoot | Out-Null +} + +function Require-FileExists { + [CmdletBinding()] + Param( + [string]$File + ) + if (-Not (Test-Path $File)) { + throw "'$CurrentTest' failed to create file '$File'" + } +} + +function Require-FileNotExists { + [CmdletBinding()] + Param( + [string]$File + ) + if (Test-Path $File) { + throw "'$CurrentTest' should not have created file '$File'" + } +} + +function Throw-IfFailed { + if ($LASTEXITCODE -ne 0) { + throw "'$CurrentTest' had a step with a nonzero exit code" + } +} + +function Throw-IfNotFailed { + if ($LASTEXITCODE -eq 0) { + throw "'$CurrentTest' had a step with an unexpectedly zero exit code" + } +} + +function Run-Vcpkg { + param([string[]]$TestArgs) + $CurrentTest = "./vcpkg $($testArgs -join ' ')" + Write-Host $CurrentTest + ./vcpkg @testArgs +} + +Refresh-TestRoot diff --git a/scripts/azure-pipelines/end-to-end-tests.ps1 b/scripts/azure-pipelines/end-to-end-tests.ps1 index 99e56ce45db0cf..f6b5c2e6bf9bbc 100644 --- a/scripts/azure-pipelines/end-to-end-tests.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests.ps1 @@ -24,229 +24,25 @@ Param( [string]$Triplet, [Parameter(Mandatory = $true)] [ValidateNotNullOrEmpty()] - [string]$WorkingRoot + [string]$WorkingRoot, + [Parameter(Mandatory = $false)] + [ValidateNotNullOrEmpty()] + [string]$Filter ) $ErrorActionPreference = "Stop" -$TestingRoot = Join-Path $WorkingRoot 'testing' -$buildtreesRoot = Join-Path $TestingRoot 'buildtrees' -$installRoot = Join-Path $TestingRoot 'installed' -$packagesRoot = Join-Path $TestingRoot 'packages' -$NuGetRoot = Join-Path $TestingRoot 'nuget' -$NuGetRoot2 = Join-Path $TestingRoot 'nuget2' -$ArchiveRoot = Join-Path $TestingRoot 'archives' -$commonArgs = @( - "--triplet", - $Triplet, - "--x-buildtrees-root=$buildtreesRoot", - "--x-install-root=$installRoot", - "--x-packages-root=$packagesRoot", - "--overlay-ports=scripts/e2e_ports" -) -$CurrentTest = 'unassigned' - -function Refresh-TestRoot { - Remove-Item -Recurse -Force $TestingRoot -ErrorAction SilentlyContinue - mkdir $TestingRoot - mkdir $NuGetRoot -} - -function Require-FileExists { - [CmdletBinding()] - Param( - [string]$File - ) - if (-Not (Test-Path $File)) { - throw "'$CurrentTest' failed to create file '$File'" - } -} - -function Require-FileNotExists { - [CmdletBinding()] - Param( - [string]$File - ) - if (Test-Path $File) { - throw "'$CurrentTest' should not have created file '$File'" - } -} - -function Throw-IfFailed { - if ($LASTEXITCODE -ne 0) { - throw "'$CurrentTest' had a step with a nonzero exit code" - } -} - -function Throw-IfNotFailed { - if ($LASTEXITCODE -eq 0) { - throw "'$CurrentTest' had a step with an unexpectedly zero exit code" - } -} - -function Run-Vcpkg { - param([string[]]$TestArgs) - $CurrentTest = "./vcpkg $($testArgs -join ' ')" - Write-Host $CurrentTest - ./vcpkg @testArgs +$AllTests = Get-ChildItem $PSScriptRoot/end-to-end-tests-dir/*.ps1 +if ($Filter -ne $Null) { + $AllTests = $AllTests | ? { $_ -match $Filter } } +$n = 1 +$m = $AllTests.Count -##### Test spaces in the path -Refresh-TestRoot -$CurrentTest = "zlib with spaces in path" -Write-Host $CurrentTest -./vcpkg install zlib "--triplet" $Triplet ` - "--no-binarycaching" ` - "--x-buildtrees-root=$TestingRoot/build Trees" ` - "--x-install-root=$TestingRoot/instalL ed" ` - "--x-packages-root=$TestingRoot/packaG es" -Throw-IfFailed - -##### Binary caching tests -if (-not $IsLinux -and -not $IsMacOS) { - Refresh-TestRoot - # Test msbuild props and targets - $CurrentTest = "zlib:x86-windows-static msbuild scripts\testing\integrate-install\..." - Write-Host $CurrentTest - ./vcpkg $commonArgs install zlib:x86-windows-static --x-binarysource=clear - Throw-IfFailed - foreach ($project in @("VcpkgTriplet", "VcpkgTriplet2", "VcpkgUseStatic", "VcpkgUseStatic2")) { - $CurrentTest = "msbuild scripts\testing\integrate-install\$project.vcxproj" - ./vcpkg $commonArgs env "msbuild scripts\testing\integrate-install\$project.vcxproj /p:VcpkgRoot=$TestingRoot /p:IntDir=$TestingRoot\int\ /p:OutDir=$TestingRoot\out\ " - Throw-IfFailed - Remove-Item -Recurse -Force $TestingRoot\int - Remove-Item -Recurse -Force $TestingRoot\out - } - $CurrentTest = "zlib:x86-windows msbuild scripts\testing\integrate-install\..." - Write-Host $CurrentTest - ./vcpkg $commonArgs install zlib:x86-windows --x-binarysource=clear - Throw-IfFailed - foreach ($project in @("Project1", "NoProps")) { - $CurrentTest = "msbuild scripts\testing\integrate-install\$project.vcxproj" - Write-Host $CurrentTest - ./vcpkg $commonArgs env "msbuild scripts\testing\integrate-install\$project.vcxproj /p:VcpkgRoot=$TestingRoot /p:IntDir=$TestingRoot\int\ /p:OutDir=$TestingRoot\out\ " - Throw-IfFailed - Remove-Item -Recurse -Force $TestingRoot\int - Remove-Item -Recurse -Force $TestingRoot\out - } +$AllTests | % { + Write-Host "[end-to-end-tests.ps1] [$n/$m] Running suite $_" + & $_ + $n += 1 } -Refresh-TestRoot - -# Test simple installation -Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--binarycaching", "--x-binarysource=clear;files,$ArchiveRoot,write;nuget,$NuGetRoot,readwrite")) -Throw-IfFailed -Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" - -# Test simple removal -Run-Vcpkg -TestArgs ($commonArgs + @("remove", "rapidjson")) -Throw-IfFailed -Require-FileNotExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" - -# Test restoring from files archive -Remove-Item -Recurse -Force $installRoot -Remove-Item -Recurse -Force $buildtreesRoot -Run-Vcpkg -TestArgs ($commonArgs + @("install","rapidjson","--binarycaching","--x-binarysource=clear;files,$ArchiveRoot,read")) -Throw-IfFailed -Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" -Require-FileNotExists "$buildtreesRoot/rapidjson/src" -Require-FileExists "$buildtreesRoot/detect_compiler" - -# Test --no-binarycaching -Remove-Item -Recurse -Force $installRoot -Remove-Item -Recurse -Force $buildtreesRoot -Run-Vcpkg -TestArgs ($commonArgs + @("install","rapidjson","--no-binarycaching","--x-binarysource=clear;files,$ArchiveRoot,read")) -Throw-IfFailed -Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" -Require-FileExists "$buildtreesRoot/rapidjson/src" -Require-FileExists "$buildtreesRoot/detect_compiler" - -# Test --editable -Remove-Item -Recurse -Force $installRoot -Remove-Item -Recurse -Force $buildtreesRoot -Run-Vcpkg -TestArgs ($commonArgs + @("install","rapidjson","--editable","--x-binarysource=clear;files,$ArchiveRoot,read")) -Throw-IfFailed -Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" -Require-FileExists "$buildtreesRoot/rapidjson/src" -Require-FileNotExists "$buildtreesRoot/detect_compiler" - -# Test restoring from nuget -Remove-Item -Recurse -Force $installRoot -Remove-Item -Recurse -Force $buildtreesRoot -Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--binarycaching", "--x-binarysource=clear;nuget,$NuGetRoot")) -Throw-IfFailed -Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" -Require-FileNotExists "$buildtreesRoot/rapidjson/src" - -# Test four-phase flow -Remove-Item -Recurse -Force $installRoot -ErrorAction SilentlyContinue -Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--dry-run", "--x-write-nuget-packages-config=$TestingRoot/packages.config")) -Throw-IfFailed -Require-FileNotExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" -Require-FileNotExists "$buildtreesRoot/rapidjson/src" -Require-FileExists "$TestingRoot/packages.config" -if ($IsLinux -or $IsMacOS) { - mono $(./vcpkg fetch nuget) restore $TestingRoot/packages.config -OutputDirectory "$NuGetRoot2" -Source "$NuGetRoot" -} else { - & $(./vcpkg fetch nuget) restore $TestingRoot/packages.config -OutputDirectory "$NuGetRoot2" -Source "$NuGetRoot" -} -Throw-IfFailed -Remove-Item -Recurse -Force $NuGetRoot -ErrorAction SilentlyContinue -mkdir $NuGetRoot -Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "tinyxml", "--binarycaching", "--x-binarysource=clear;nuget,$NuGetRoot2;nuget,$NuGetRoot,write")) -Throw-IfFailed -Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" -Require-FileExists "$installRoot/$Triplet/include/tinyxml.h" -Require-FileNotExists "$buildtreesRoot/rapidjson/src" -Require-FileExists "$buildtreesRoot/tinyxml/src" -if ((Get-ChildItem $NuGetRoot -Filter '*.nupkg' | Measure-Object).Count -ne 1) { - throw "In '$CurrentTest': did not create exactly 1 NuGet package" -} - -# Test that prohibiting backcompat features actually prohibits -$backcompatFeaturePorts = @('vcpkg-uses-test-cmake', 'vcpkg-uses-vcpkg-common-functions') -foreach ($backcompatFeaturePort in $backcompatFeaturePorts) { - $succeedArgs = $commonArgs + @('install',$backcompatFeaturePort,'--no-binarycaching') - $failArgs = $succeedArgs + @('--x-prohibit-backcompat-features') - $CurrentTest = "Should fail: ./vcpkg $($failArgs -join ' ')" - Write-Host $CurrentTest - ./vcpkg @failArgs - if ($LastExitCode -ne 0) { - Write-Host "... failed (this is good!)" - } else { - throw $CurrentTest - } - - # Install failed when prohibiting backcompat features, so it should succeed if we allow them - $CurrentTest = "Should succeeed: ./vcpkg $($succeedArgs -join ' ')" - Write-Host $CurrentTest - ./vcpkg @succeedArgs - if ($LastExitCode -ne 0) { - throw $CurrentTest - } else { - Write-Host "... succeeded." - } -} - -# Test export -$CurrentTest = 'Prepare for export test' -Write-Host $CurrentTest -Require-FileNotExists "$TestingRoot/vcpkg-export-output" -Require-FileNotExists "$TestingRoot/vcpkg-export.1.0.0.nupkg" -Require-FileNotExists "$TestingRoot/vcpkg-export-output.zip" -Run-Vcpkg -TestArgs ($commonArgs + @("export", "rapidjson", "tinyxml", "--nuget", "--nuget-id=vcpkg-export", "--nuget-version=1.0.0", "--output=vcpkg-export-output", "--raw", "--zip", "--output-dir=$TestingRoot")) -Require-FileExists "$TestingRoot/vcpkg-export-output" -Require-FileExists "$TestingRoot/vcpkg-export.1.0.0.nupkg" -Require-FileExists "$TestingRoot/vcpkg-export-output.zip" - -# Test bad command lines -Run-Vcpkg -TestArgs ($commonArgs + @("install", "zlib", "--vcpkg-rootttttt", "C:\")) -Throw-IfNotFailed - -Run-Vcpkg -TestArgs ($commonArgs + @("install", "zlib", "--vcpkg-rootttttt=C:\")) -Throw-IfNotFailed - -Run-Vcpkg -TestArgs ($commonArgs + @("install", "zlib", "--fast")) # NB: --fast is not a switch -Throw-IfNotFailed - $LASTEXITCODE = 0 diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 9381b3d1aeb6bc..723d7e1df72677 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -140,7 +140,9 @@ if(CMD MATCHES "^BUILD$") elseif(CMD MATCHES "^CREATE$") file(TO_NATIVE_PATH ${VCPKG_ROOT_DIR} NATIVE_VCPKG_ROOT_DIR) file(TO_NATIVE_PATH ${DOWNLOADS} NATIVE_DOWNLOADS) - set(PORT_PATH "${VCPKG_ROOT_DIR}/ports/${PORT}") + if(NOT DEFINED PORT_PATH) + set(PORT_PATH "${VCPKG_ROOT_DIR}/ports/${PORT}") + endif() file(TO_NATIVE_PATH ${PORT_PATH} NATIVE_PORT_PATH) set(PORTFILE_PATH "${PORT_PATH}/portfile.cmake") file(TO_NATIVE_PATH ${PORTFILE_PATH} NATIVE_PORTFILE_PATH) diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h index 16e433d63d5416..f18f4843cb82f0 100644 --- a/toolsrc/include/vcpkg/vcpkgcmdarguments.h +++ b/toolsrc/include/vcpkg/vcpkgcmdarguments.h @@ -132,6 +132,8 @@ namespace vcpkg std::unique_ptr packages_root_dir; constexpr static StringLiteral SCRIPTS_ROOT_DIR_ARG = "x-scripts-root"; std::unique_ptr scripts_root_dir; + constexpr static StringLiteral BUILTIN_PORTS_ROOT_DIR_ARG = "x-builtin-ports-root"; + std::unique_ptr builtin_ports_root_dir; constexpr static StringLiteral DEFAULT_VISUAL_STUDIO_PATH_ENV = "VCPKG_VISUAL_STUDIO_PATH"; std::unique_ptr default_visual_studio_path; diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index 257ecf7bbd5c51..e71f28b0a6886b 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -91,6 +91,7 @@ namespace vcpkg fs::path community_triplets; fs::path scripts; fs::path prefab; + fs::path builtin_ports; fs::path tools; fs::path buildsystems; @@ -142,7 +143,7 @@ namespace vcpkg // the directory of the builtin ports // this should be used only for helper commands, not core commands like `install`. - fs::path builtin_ports_directory() const { return root / fs::u8path("ports"); } + fs::path builtin_ports_directory() const { return this->builtin_ports; } private: std::unique_ptr m_pimpl; diff --git a/toolsrc/src/vcpkg-test/arguments.cpp b/toolsrc/src/vcpkg-test/arguments.cpp index 00a1beb8174016..f5cbf7b15eacba 100644 --- a/toolsrc/src/vcpkg-test/arguments.cpp +++ b/toolsrc/src/vcpkg-test/arguments.cpp @@ -14,6 +14,7 @@ TEST_CASE ("VcpkgCmdArguments from lowercase argument sequence", "[arguments]") std::vector t = {"--vcpkg-root", "C:\\vcpkg", "--x-scripts-root=C:\\scripts", + "--x-builtin-ports-root=C:\\ports", "--debug", "--sendmetrics", "--printmetrics", @@ -25,6 +26,7 @@ TEST_CASE ("VcpkgCmdArguments from lowercase argument sequence", "[arguments]") REQUIRE(*v.vcpkg_root_dir == "C:\\vcpkg"); REQUIRE(*v.scripts_root_dir == "C:\\scripts"); + REQUIRE(*v.builtin_ports_root_dir == "C:\\ports"); REQUIRE(v.debug); REQUIRE(*v.debug.get()); REQUIRE(v.send_metrics); @@ -46,6 +48,7 @@ TEST_CASE ("VcpkgCmdArguments from uppercase argument sequence", "[arguments]") std::vector t = {"--VCPKG-ROOT", "C:\\vcpkg", "--X-SCRIPTS-ROOT=C:\\scripts", + "--X-BUILTIN-PORTS-ROOT=C:\\ports", "--DEBUG", "--SENDMETRICS", "--PRINTMETRICS", @@ -57,6 +60,7 @@ TEST_CASE ("VcpkgCmdArguments from uppercase argument sequence", "[arguments]") REQUIRE(*v.vcpkg_root_dir == "C:\\vcpkg"); REQUIRE(*v.scripts_root_dir == "C:\\scripts"); + REQUIRE(*v.builtin_ports_root_dir == "C:\\ports"); REQUIRE(v.debug); REQUIRE(*v.debug.get()); REQUIRE(v.send_metrics); diff --git a/toolsrc/src/vcpkg-test/commands.create.cpp b/toolsrc/src/vcpkg-test/commands.create.cpp deleted file mode 100644 index 8b8dfa2307662b..00000000000000 --- a/toolsrc/src/vcpkg-test/commands.create.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include - -#include - -#include -#include -#include - -#include -#include - -TEST_CASE ("create smoke test", "[commands-create]") -{ - using namespace vcpkg; - static const std::string argsRaw[] = {"create", "zlib2", "http://zlib.net/zlib-1.2.11.tar.gz", "zlib-1.2.11.zip"}; - - auto& fsWrapper = Files::get_real_filesystem(); - VcpkgCmdArguments args = VcpkgCmdArguments::create_from_arg_sequence(std::begin(argsRaw), std::end(argsRaw)); - VcpkgPaths paths(fsWrapper, args); - const auto exit_code = Commands::Create::perform(args, paths); - REQUIRE(exit_code == 0); - const auto expected_port = paths.builtin_ports_directory() / fs::u8path("zlib2"); - const auto expected_portfile_cmake = expected_port / fs::u8path("portfile.cmake"); - const auto lines = fsWrapper.read_lines(expected_portfile_cmake); - REQUIRE(lines.has_value()); - fsWrapper.remove_all(expected_port, ignore_errors); -} diff --git a/toolsrc/src/vcpkg/commands.create.cpp b/toolsrc/src/vcpkg/commands.create.cpp index c3268bd5eb4d03..28f0377c58f9d0 100644 --- a/toolsrc/src/vcpkg/commands.create.cpp +++ b/toolsrc/src/vcpkg/commands.create.cpp @@ -34,7 +34,11 @@ namespace vcpkg::Commands::Create const std::string port_name = args.command_arguments.at(0); const std::string url = remove_trailing_slashes(args.command_arguments.at(1)); - std::vector cmake_args{{"CMD", "CREATE"}, {"PORT", port_name}, {"URL", url}}; + std::vector cmake_args{ + {"CMD", "CREATE"}, + {"PORT", port_name}, + {"URL", url}, + {"PORT_PATH", fs::generic_u8string(paths.builtin_ports_directory() / fs::u8path(port_name))}}; if (args.command_arguments.size() >= 3) { diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp index c311d28e941e35..5b25b32d8af5e2 100644 --- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp +++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp @@ -276,6 +276,7 @@ namespace vcpkg {INSTALL_ROOT_DIR_ARG, &VcpkgCmdArguments::install_root_dir}, {PACKAGES_ROOT_DIR_ARG, &VcpkgCmdArguments::packages_root_dir}, {SCRIPTS_ROOT_DIR_ARG, &VcpkgCmdArguments::scripts_root_dir}, + {BUILTIN_PORTS_ROOT_DIR_ARG, &VcpkgCmdArguments::builtin_ports_root_dir}, }; constexpr static std::pair VcpkgCmdArguments::*> @@ -913,6 +914,7 @@ namespace vcpkg constexpr StringLiteral VcpkgCmdArguments::INSTALL_ROOT_DIR_ARG; constexpr StringLiteral VcpkgCmdArguments::PACKAGES_ROOT_DIR_ARG; constexpr StringLiteral VcpkgCmdArguments::SCRIPTS_ROOT_DIR_ARG; + constexpr StringLiteral VcpkgCmdArguments::BUILTIN_PORTS_ROOT_DIR_ARG; constexpr StringLiteral VcpkgCmdArguments::DEFAULT_VISUAL_STUDIO_PATH_ENV; diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 869605ed57a2d9..5c7e6a77e817bb 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -340,6 +340,8 @@ If you wish to silence this error and use classic mode, you can: packages = process_output_directory(filesystem, root, args.packages_root_dir.get(), "packages", VCPKG_LINE_INFO); scripts = process_input_directory(filesystem, root, args.scripts_root_dir.get(), "scripts", VCPKG_LINE_INFO); + builtin_ports = + process_output_directory(filesystem, root, args.builtin_ports_root_dir.get(), "ports", VCPKG_LINE_INFO); prefab = root / fs::u8path("prefab"); if (args.default_visual_studio_path) From 9c75a2946e37989d87a636b5ef5ef27834d140c3 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Tue, 15 Dec 2020 10:27:32 -0800 Subject: [PATCH 0296/1694] [vcpkg] Fix CMAKE_CURRENT_LIST_DIR in load_dep_info_vars() (#15110) Co-authored-by: Robert Schumacher --- toolsrc/include/vcpkg/base/files.h | 4 ++ toolsrc/src/vcpkg/base/files.cpp | 24 ++++++++ toolsrc/src/vcpkg/cmakevars.cpp | 91 ++++++++++++++---------------- 3 files changed, 70 insertions(+), 49 deletions(-) diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h index b05f79a05b668a..a6cc06c199c2f7 100644 --- a/toolsrc/include/vcpkg/base/files.h +++ b/toolsrc/include/vcpkg/base/files.h @@ -184,6 +184,10 @@ namespace vcpkg::Files std::error_code& ec) = 0; void write_contents(const fs::path& path, const std::string& data, LineInfo linfo); virtual void write_contents(const fs::path& file_path, const std::string& data, std::error_code& ec) = 0; + void write_contents_and_dirs(const fs::path& path, const std::string& data, LineInfo linfo); + virtual void write_contents_and_dirs(const fs::path& file_path, + const std::string& data, + std::error_code& ec) = 0; void rename(const fs::path& oldpath, const fs::path& newpath, LineInfo linfo); virtual void rename(const fs::path& oldpath, const fs::path& newpath, std::error_code& ec) = 0; virtual void rename_or_copy(const fs::path& oldpath, diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp index 891207445f89dc..b0717f2d6c2e0e 100644 --- a/toolsrc/src/vcpkg/base/files.cpp +++ b/toolsrc/src/vcpkg/base/files.cpp @@ -465,6 +465,14 @@ namespace vcpkg::Files this->write_contents(path, data, ec); if (ec) Checks::exit_with_message(linfo, "error writing file: %s: %s", fs::u8string(path), ec.message()); } + void Filesystem::write_contents_and_dirs(const fs::path& path, const std::string& data, LineInfo linfo) + { + std::error_code ec; + this->write_contents_and_dirs(path, data, ec); + if (ec) + Checks::exit_with_message( + linfo, "error writing file and creating directories: %s: %s", fs::u8string(path), ec.message()); + } void Filesystem::rename(const fs::path& oldpath, const fs::path& newpath, LineInfo linfo) { std::error_code ec; @@ -1149,6 +1157,22 @@ namespace vcpkg::Files } } + virtual void write_contents_and_dirs(const fs::path& file_path, + const std::string& data, + std::error_code& ec) override + { + write_contents(file_path, data, ec); + if (ec) + { + create_directories(file_path.parent_path(), ec); + if (ec) + { + return; + } + write_contents(file_path, data, ec); + } + } + virtual fs::path absolute(const fs::path& path, std::error_code& ec) const override { #if VCPKG_USE_STD_FILESYSTEM diff --git a/toolsrc/src/vcpkg/cmakevars.cpp b/toolsrc/src/vcpkg/cmakevars.cpp index 39a4d18b0776a0..8a90e574bab459 100644 --- a/toolsrc/src/vcpkg/cmakevars.cpp +++ b/toolsrc/src/vcpkg/cmakevars.cpp @@ -34,9 +34,9 @@ namespace vcpkg::CMakeVars void load_generic_triplet_vars(Triplet triplet) const override; - void load_dep_info_vars(Span specs) const override; + void load_dep_info_vars(View specs) const override; - void load_tag_vars(Span specs, + void load_tag_vars(View specs, const PortFileProvider::PortFileProvider& port_provider) const override; Optional&> get_generic_triplet_vars( @@ -50,9 +50,9 @@ namespace vcpkg::CMakeVars public: fs::path create_tag_extraction_file( - const Span>& spec_abi_settings) const; + const View> spec_abi_settings) const; - fs::path create_dep_info_extraction_file(const Span specs) const; + fs::path create_dep_info_extraction_file(const View specs) const; void launch_and_split(const fs::path& script_path, std::vector>>& vars) const; @@ -71,26 +71,16 @@ namespace vcpkg::CMakeVars return std::make_unique(paths); } - fs::path TripletCMakeVarProvider::create_tag_extraction_file( - const Span>& spec_abi_settings) const + static std::string create_extraction_file_prelude(const VcpkgPaths& paths, + const std::map& emitted_triplets) { - Files::Filesystem& fs = paths.get_filesystem(); - static int tag_extract_id = 0; - - std::string extraction_file("include(\"" + fs::generic_u8string(get_tags_path) + "\")\n\n"); - - std::map emitted_triplets; - int emitted_triplet_id = 0; - for (const auto& spec_abi_setting : spec_abi_settings) - { - emitted_triplets[spec_abi_setting.first->package_spec.triplet()] = emitted_triplet_id++; - } + const auto& fs = paths.get_filesystem(); + std::string extraction_file("macro(vcpkg_triplet_file VCPKG_TRIPLET_ID)\n"); - Strings::append(extraction_file, "macro(vcpkg_triplet_file VCPKG_TRIPLET_ID)\n"); Strings::append(extraction_file, "set(_vcpkg_triplet_file_BACKUP_CURRENT_LIST_FILE \"${CMAKE_CURRENT_LIST_FILE}\")\n"); - for (auto& p : emitted_triplets) + for (auto&& p : emitted_triplets) { auto path_to_triplet = paths.get_triplet_file_path(p.first); Strings::append(extraction_file, "if(VCPKG_TRIPLET_ID EQUAL ", p.second, ")\n"); @@ -99,14 +89,33 @@ namespace vcpkg::CMakeVars Strings::append( extraction_file, "get_filename_component(CMAKE_CURRENT_LIST_DIR \"${CMAKE_CURRENT_LIST_FILE}\" DIRECTORY)\n"); - Strings::append(extraction_file, fs.read_contents(paths.get_triplet_file_path(p.first), VCPKG_LINE_INFO)); + Strings::append(extraction_file, fs.read_contents(path_to_triplet, VCPKG_LINE_INFO)); Strings::append(extraction_file, "\nendif()\n"); } Strings::append(extraction_file, - "set(CMAKE_CURRENT_LIST_FILE \"${_vcpkg_triplet_file_BACKUP_CURRENT_LIST_FILE}\")\n"); - Strings::append(extraction_file, - "get_filename_component(CMAKE_CURRENT_LIST_DIR \"${CMAKE_CURRENT_LIST_FILE}\" DIRECTORY)\n"); - Strings::append(extraction_file, "endmacro()\n"); + R"( +set(CMAKE_CURRENT_LIST_FILE "${_vcpkg_triplet_file_BACKUP_CURRENT_LIST_FILE}") +get_filename_component(CMAKE_CURRENT_LIST_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY) +endmacro() +)"); + return extraction_file; + } + + fs::path TripletCMakeVarProvider::create_tag_extraction_file( + const View> spec_abi_settings) const + { + Files::Filesystem& fs = paths.get_filesystem(); + static int tag_extract_id = 0; + + std::map emitted_triplets; + int emitted_triplet_id = 0; + for (const auto& spec_abi_setting : spec_abi_settings) + { + emitted_triplets[spec_abi_setting.first->package_spec.triplet()] = emitted_triplet_id++; + } + std::string extraction_file = create_extraction_file_prelude(paths, emitted_triplets); + + Strings::append(extraction_file, "\ninclude(\"" + fs::generic_u8string(get_tags_path) + "\")\n\n"); for (const auto& spec_abi_setting : spec_abi_settings) { @@ -125,37 +134,25 @@ namespace vcpkg::CMakeVars } fs::path path = paths.buildtrees / Strings::concat(tag_extract_id++, ".vcpkg_tags.cmake"); - - fs.create_directories(paths.buildtrees, ignore_errors); - fs.write_contents(path, extraction_file, VCPKG_LINE_INFO); - + fs.write_contents_and_dirs(path, extraction_file, VCPKG_LINE_INFO); return path; } - fs::path TripletCMakeVarProvider::create_dep_info_extraction_file(const Span specs) const + fs::path TripletCMakeVarProvider::create_dep_info_extraction_file(const View specs) const { static int dep_info_id = 0; Files::Filesystem& fs = paths.get_filesystem(); - std::string extraction_file("include(\"" + fs::generic_u8string(get_dep_info_path) + "\")\n\n"); - std::map emitted_triplets; int emitted_triplet_id = 0; for (const auto& spec : specs) { emitted_triplets[spec.triplet()] = emitted_triplet_id++; } - Strings::append(extraction_file, "macro(vcpkg_triplet_file VCPKG_TRIPLET_ID)\n"); - for (auto& p : emitted_triplets) - { - Strings::append(extraction_file, - "if(VCPKG_TRIPLET_ID EQUAL ", - p.second, - ")\n", - fs.read_contents(paths.get_triplet_file_path(p.first), VCPKG_LINE_INFO), - "\nendif()\n"); - } - Strings::append(extraction_file, "endmacro()\n"); + + std::string extraction_file = create_extraction_file_prelude(paths, emitted_triplets); + + Strings::append(extraction_file, "\ninclude(\"" + fs::generic_u8string(get_dep_info_path) + "\")\n\n"); for (const PackageSpec& spec : specs) { @@ -164,11 +161,7 @@ namespace vcpkg::CMakeVars } fs::path path = paths.buildtrees / Strings::concat(dep_info_id++, ".vcpkg_dep_info.cmake"); - - std::error_code ec; - fs.create_directories(paths.buildtrees, ec); - fs.write_contents(path, extraction_file, VCPKG_LINE_INFO); - + fs.write_contents_and_dirs(path, extraction_file, VCPKG_LINE_INFO); return path; } @@ -237,7 +230,7 @@ namespace vcpkg::CMakeVars std::make_move_iterator(vars.front().end())); } - void TripletCMakeVarProvider::load_dep_info_vars(Span specs) const + void TripletCMakeVarProvider::load_dep_info_vars(View specs) const { if (specs.size() == 0) return; std::vector>> vars(specs.size()); @@ -260,7 +253,7 @@ namespace vcpkg::CMakeVars } } - void TripletCMakeVarProvider::load_tag_vars(Span specs, + void TripletCMakeVarProvider::load_tag_vars(View specs, const PortFileProvider::PortFileProvider& port_provider) const { if (specs.size() == 0) return; From 1c62d05b327846f350164658f01b8a77d72cf455 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Tue, 15 Dec 2020 10:28:20 -0800 Subject: [PATCH 0297/1694] [vcpkg] Remove extra indirection in IVersionedPortfileProvider/IBaselineProvider (#15010) * [vcpkg] Remove extra indirection in IVersionedPortfileProvider/IBaselineProvider * [vcpkg] Address CR comment Co-authored-by: Robert Schumacher --- toolsrc/include/vcpkg/portfileprovider.h | 37 +--- toolsrc/src/vcpkg/install.cpp | 11 +- toolsrc/src/vcpkg/portfileprovider.cpp | 222 +++++++++++------------ 3 files changed, 117 insertions(+), 153 deletions(-) diff --git a/toolsrc/include/vcpkg/portfileprovider.h b/toolsrc/include/vcpkg/portfileprovider.h index 1ce934c9eabecf..9dbd5ec51acce9 100644 --- a/toolsrc/include/vcpkg/portfileprovider.h +++ b/toolsrc/include/vcpkg/portfileprovider.h @@ -41,6 +41,7 @@ namespace vcpkg::PortFileProvider struct IVersionedPortfileProvider { virtual const std::vector& get_port_versions(StringView port_name) const = 0; + virtual ~IVersionedPortfileProvider() = default; virtual ExpectedS get_control_file( const vcpkg::Versions::VersionSpec& version_spec) const = 0; @@ -48,38 +49,12 @@ namespace vcpkg::PortFileProvider struct IBaselineProvider { - virtual Optional get_baseline_version(StringView port_name) const = 0; - }; - - namespace details - { - struct BaselineProviderImpl; - struct VersionedPortfileProviderImpl; - } - - struct VersionedPortfileProvider : IVersionedPortfileProvider, Util::ResourceBase - { - explicit VersionedPortfileProvider(const vcpkg::VcpkgPaths& paths); - ~VersionedPortfileProvider(); - - const std::vector& get_port_versions(StringView port_name) const override; - - ExpectedS get_control_file( - const vcpkg::Versions::VersionSpec& version_spec) const override; + virtual ~IBaselineProvider() = default; - private: - std::unique_ptr m_impl; + virtual Optional get_baseline_version(StringView port_name) const = 0; }; - struct BaselineProvider : IBaselineProvider, Util::ResourceBase - { - explicit BaselineProvider(const vcpkg::VcpkgPaths& paths); - BaselineProvider(const vcpkg::VcpkgPaths& paths, const std::string& baseline); - ~BaselineProvider(); - - Optional get_baseline_version(StringView port_name) const override; - - private: - std::unique_ptr m_impl; - }; + std::unique_ptr make_baseline_provider(const vcpkg::VcpkgPaths& paths); + std::unique_ptr make_baseline_provider(const vcpkg::VcpkgPaths& paths, StringView baseline); + std::unique_ptr make_versioned_portfile_provider(const vcpkg::VcpkgPaths& paths); } diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index dd89a75673bbcf..a07fb431c32475 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -840,21 +840,20 @@ namespace vcpkg::Install if (args.versions_enabled()) { - PortFileProvider::VersionedPortfileProvider verprovider(paths); - auto baseprovider = [&]() -> std::unique_ptr { + auto verprovider = PortFileProvider::make_versioned_portfile_provider(paths); + auto baseprovider = [&]() -> std::unique_ptr { if (auto p_baseline = manifest_scf.core_paragraph->extra_info.get("$x-default-baseline")) { - return std::make_unique(paths, - p_baseline->string().to_string()); + return PortFileProvider::make_baseline_provider(paths, p_baseline->string().to_string()); } else { - return std::make_unique(paths); + return PortFileProvider::make_baseline_provider(paths); } }(); auto install_plan = - Dependencies::create_versioned_install_plan(verprovider, + Dependencies::create_versioned_install_plan(*verprovider, *baseprovider, var_provider, manifest_scf.core_paragraph->dependencies, diff --git a/toolsrc/src/vcpkg/portfileprovider.cpp b/toolsrc/src/vcpkg/portfileprovider.cpp index f22464fbe41f96..edc527c2402905 100644 --- a/toolsrc/src/vcpkg/portfileprovider.cpp +++ b/toolsrc/src/vcpkg/portfileprovider.cpp @@ -292,16 +292,15 @@ namespace vcpkg::PortFileProvider return ret; } - namespace details + namespace { - struct BaselineProviderImpl + struct BaselineProviderImpl : IBaselineProvider, Util::ResourceBase { BaselineProviderImpl(const VcpkgPaths& paths) : paths(paths) { } - BaselineProviderImpl(const VcpkgPaths& paths, const std::string& baseline) - : paths(paths), m_baseline(baseline) + BaselineProviderImpl(const VcpkgPaths& paths, StringView baseline) + : paths(paths), m_baseline(baseline.to_string()) { } - ~BaselineProviderImpl() { } const Optional>>& get_baseline_cache() const { @@ -348,7 +347,7 @@ namespace vcpkg::PortFileProvider }); } - Optional get_baseline_version(StringView port_name) const + virtual Optional get_baseline_version(StringView port_name) const override { const auto& cache = get_baseline_cache(); if (auto p_cache = cache.get()) @@ -382,141 +381,132 @@ namespace vcpkg::PortFileProvider mutable std::unique_ptr m_portfile_provider; }; - struct VersionedPortfileProviderImpl + struct VersionedPortfileProviderImpl : IVersionedPortfileProvider, Util::ResourceBase { - std::map> versions_cache; - std::unordered_map git_tree_cache; - std::unordered_map control_cache; - VersionedPortfileProviderImpl(const VcpkgPaths& paths) : paths(paths) { } - ~VersionedPortfileProviderImpl() { } - - const VcpkgPaths& get_paths() const { return paths; } - Files::Filesystem& get_filesystem() const { return paths.get_filesystem(); } - private: - const VcpkgPaths& paths; - }; - } + virtual const std::vector& get_port_versions(StringView port_name) const override + { + auto cache_it = versions_cache.find(port_name.to_string()); + if (cache_it != versions_cache.end()) + { + return cache_it->second; + } - VersionedPortfileProvider::VersionedPortfileProvider(const VcpkgPaths& paths) - : m_impl(std::make_unique(paths)) - { - } - VersionedPortfileProvider::~VersionedPortfileProvider() { } + auto maybe_versions_file_path = get_versions_json_path(get_paths(), port_name); + if (auto versions_file_path = maybe_versions_file_path.get()) + { + auto maybe_version_entries = parse_versions_file(get_filesystem(), port_name, *versions_file_path); + Checks::check_exit(VCPKG_LINE_INFO, + maybe_version_entries.has_value(), + "Error: Couldn't parse versions from file: %s", + fs::u8string(*versions_file_path)); + auto version_entries = maybe_version_entries.value_or_exit(VCPKG_LINE_INFO); + + auto port = port_name.to_string(); + for (auto&& version_entry : version_entries) + { + VersionSpec spec(port, version_entry.version); + versions_cache[port].push_back(spec); + git_tree_cache.emplace(std::move(spec), std::move(version_entry.git_tree)); + } + return versions_cache.at(port); + } + else + { + // Fall back to current available version + auto maybe_port = try_load_registry_port(paths, port_name.to_string()); + if (auto p = maybe_port.get()) + { + auto maybe_error = p->source_control_file->check_against_feature_flags( + p->source_location, paths.get_feature_flags()); - const std::vector& VersionedPortfileProvider::get_port_versions(StringView port_name) const - { - auto cache_it = m_impl->versions_cache.find(port_name.to_string()); - if (cache_it != m_impl->versions_cache.end()) - { - return cache_it->second; - } + if (auto error = maybe_error.get()) + { + Checks::exit_with_message(VCPKG_LINE_INFO, "Error: %s", *error); + } - auto maybe_versions_file_path = get_versions_json_path(m_impl->get_paths(), port_name); - if (auto versions_file_path = maybe_versions_file_path.get()) - { - auto maybe_version_entries = parse_versions_file(m_impl->get_filesystem(), port_name, *versions_file_path); - Checks::check_exit(VCPKG_LINE_INFO, - maybe_version_entries.has_value(), - "Error: Couldn't parse versions from file: %s", - fs::u8string(*versions_file_path)); - auto version_entries = maybe_version_entries.value_or_exit(VCPKG_LINE_INFO); - - auto port = port_name.to_string(); - for (auto&& version_entry : version_entries) - { - VersionSpec spec(port, version_entry.version); - m_impl->versions_cache[port].push_back(spec); - m_impl->git_tree_cache.emplace(std::move(spec), std::move(version_entry.git_tree)); + VersionSpec vspec(port_name.to_string(), + VersionT(p->source_control_file->core_paragraph->version, + p->source_control_file->core_paragraph->port_version)); + control_cache.emplace(vspec, std::move(*p)); + return versions_cache.emplace(port_name.to_string(), std::vector{vspec}) + .first->second; + } + Checks::exit_with_message( + VCPKG_LINE_INFO, "Error: Could not find a definition for port %s", port_name); + } } - return m_impl->versions_cache.at(port); - } - else - { - // Fall back to current available version - const auto& paths = m_impl->get_paths(); - auto maybe_port = try_load_registry_port(paths, port_name.to_string()); - if (auto p = maybe_port.get()) + + virtual ExpectedS get_control_file( + const VersionSpec& version_spec) const override { - auto maybe_error = - p->source_control_file->check_against_feature_flags(p->source_location, paths.get_feature_flags()); + // Pre-populate versions cache. + get_port_versions(version_spec.port_name); - if (auto error = maybe_error.get()) + auto cache_it = control_cache.find(version_spec); + if (cache_it != control_cache.end()) { - Checks::exit_with_message(VCPKG_LINE_INFO, "Error: %s", *error); + return cache_it->second; } - VersionSpec vspec(port_name.to_string(), - VersionT(p->source_control_file->core_paragraph->version, - p->source_control_file->core_paragraph->port_version)); - m_impl->control_cache.emplace(vspec, std::move(*p)); - return m_impl->versions_cache.emplace(port_name.to_string(), std::vector{vspec}) - .first->second; - } - Checks::exit_with_message(VCPKG_LINE_INFO, "Error: Could not find a definition for port %s", port_name); - } - } - - ExpectedS VersionedPortfileProvider::get_control_file( - const VersionSpec& version_spec) const - { - // Pre-populate versions cache. - get_port_versions(version_spec.port_name); - - auto cache_it = m_impl->control_cache.find(version_spec); - if (cache_it != m_impl->control_cache.end()) - { - return cache_it->second; - } + auto git_tree_cache_it = git_tree_cache.find(version_spec); + if (git_tree_cache_it == git_tree_cache.end()) + { + return Strings::concat("Error: No git object SHA for entry ", + version_spec.port_name, + " at version ", + version_spec.version, + "."); + } - auto git_tree_cache_it = m_impl->git_tree_cache.find(version_spec); - if (git_tree_cache_it == m_impl->git_tree_cache.end()) - { - return Strings::concat("Error: No git object SHA for entry ", - version_spec.port_name, - " at version ", - version_spec.version, - "."); - } + const std::string git_tree = git_tree_cache_it->second; + auto port_directory = get_paths().git_checkout_port(get_filesystem(), version_spec.port_name, git_tree); - const std::string git_tree = git_tree_cache_it->second; - auto port_directory = - m_impl->get_paths().git_checkout_port(m_impl->get_filesystem(), version_spec.port_name, git_tree); + auto maybe_control_file = Paragraphs::try_load_port(get_filesystem(), port_directory); + if (auto scf = maybe_control_file.get()) + { + if (scf->get()->core_paragraph->name == version_spec.port_name) + { + return control_cache + .emplace(version_spec, + SourceControlFileLocation{std::move(*scf), std::move(port_directory)}) + .first->second; + } + return Strings::format("Error: Failed to load port from %s: names did not match: '%s' != '%s'", + fs::u8string(port_directory), + version_spec.port_name, + scf->get()->core_paragraph->name); + } - auto maybe_control_file = Paragraphs::try_load_port(m_impl->get_filesystem(), port_directory); - if (auto scf = maybe_control_file.get()) - { - if (scf->get()->core_paragraph->name == version_spec.port_name) - { - return m_impl->control_cache - .emplace(version_spec, SourceControlFileLocation{std::move(*scf), std::move(port_directory)}) - .first->second; + print_error_message(maybe_control_file.error()); + return Strings::format( + "Error: Failed to load port %s from %s", version_spec.port_name, fs::u8string(port_directory)); } - return Strings::format("Error: Failed to load port from %s: names did not match: '%s' != '%s'", - fs::u8string(port_directory), - version_spec.port_name, - scf->get()->core_paragraph->name); - } - print_error_message(maybe_control_file.error()); - return Strings::format( - "Error: Failed to load port %s from %s", version_spec.port_name, fs::u8string(port_directory)); + const VcpkgPaths& get_paths() const { return paths; } + Files::Filesystem& get_filesystem() const { return paths.get_filesystem(); } + + private: + const VcpkgPaths& paths; + mutable std::map> versions_cache; + mutable std::unordered_map git_tree_cache; + mutable std::unordered_map control_cache; + }; } - BaselineProvider::BaselineProvider(const VcpkgPaths& paths) - : m_impl(std::make_unique(paths)) + std::unique_ptr make_baseline_provider(const vcpkg::VcpkgPaths& paths) { + return std::make_unique(paths); } - BaselineProvider::BaselineProvider(const VcpkgPaths& paths, const std::string& baseline) - : m_impl(std::make_unique(paths, baseline)) + std::unique_ptr make_baseline_provider(const vcpkg::VcpkgPaths& paths, StringView baseline) { + return std::make_unique(paths, baseline); } - BaselineProvider::~BaselineProvider() { } - Optional BaselineProvider::get_baseline_version(StringView port_name) const + std::unique_ptr make_versioned_portfile_provider(const vcpkg::VcpkgPaths& paths) { - return m_impl->get_baseline_version(port_name); + return std::make_unique(paths); } } From bafe5594e87fdfc01f1e9463486e05dd1d1f5a39 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Tue, 15 Dec 2020 14:31:10 -0800 Subject: [PATCH 0298/1694] [vcpkg] fix v140. again (#15116) --- toolsrc/include/vcpkg/versiondeserializers.h | 7 ++++++- toolsrc/src/vcpkg/versiondeserializers.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/toolsrc/include/vcpkg/versiondeserializers.h b/toolsrc/include/vcpkg/versiondeserializers.h index 249d685cbbbb16..2efe340d7477f7 100644 --- a/toolsrc/include/vcpkg/versiondeserializers.h +++ b/toolsrc/include/vcpkg/versiondeserializers.h @@ -22,6 +22,11 @@ namespace vcpkg struct SchemedVersion { + SchemedVersion() = default; + SchemedVersion(Versions::Scheme scheme_, VersionT versiont_) : scheme(scheme_), versiont(std::move(versiont_)) + { + } + Versions::Scheme scheme = Versions::Scheme::String; VersionT versiont; }; @@ -47,4 +52,4 @@ namespace vcpkg ExpectedS> parse_versions_file(Files::Filesystem& fs, StringView port_name, const fs::path& versions_file_path); -} \ No newline at end of file +} diff --git a/toolsrc/src/vcpkg/versiondeserializers.cpp b/toolsrc/src/vcpkg/versiondeserializers.cpp index 5c57a99222e650..ec27fb8c8cd102 100644 --- a/toolsrc/src/vcpkg/versiondeserializers.cpp +++ b/toolsrc/src/vcpkg/versiondeserializers.cpp @@ -109,7 +109,7 @@ namespace vcpkg Checks::unreachable(VCPKG_LINE_INFO); } - return SchemedVersion{version_scheme, {version, port_version}}; + return SchemedVersion(version_scheme, VersionT{version, port_version}); } View schemed_deserializer_fields() From 53ea1a31e01db1b1ca11b57278807067b982d774 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Wed, 16 Dec 2020 01:37:00 +0300 Subject: [PATCH 0299/1694] [mongo-c-driver] Fix Git too long path error with -c (#14825) Co-authored-by: Billy Robert O'Neal III --- scripts/cmake/vcpkg_apply_patches.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_apply_patches.cmake b/scripts/cmake/vcpkg_apply_patches.cmake index 25ba4533199d76..a3b6a46ee0ec25 100644 --- a/scripts/cmake/vcpkg_apply_patches.cmake +++ b/scripts/cmake/vcpkg_apply_patches.cmake @@ -51,7 +51,7 @@ function(vcpkg_apply_patches) message(STATUS "Applying patch ${PATCH}") set(LOGNAME patch-${TARGET_TRIPLET}-${PATCHNUM}) vcpkg_execute_in_download_mode( - COMMAND ${GIT} --work-tree=. --git-dir=.git apply "${ABSOLUTE_PATCH}" --ignore-whitespace --whitespace=nowarn --verbose + COMMAND ${GIT} -c core.longpaths=true --work-tree=. --git-dir=.git apply "${ABSOLUTE_PATCH}" --ignore-whitespace --whitespace=nowarn --verbose OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-out.log ERROR_VARIABLE error WORKING_DIRECTORY ${_ap_SOURCE_PATH} From c2e77bc17abd956762f0227da6a09aca6a54c0ca Mon Sep 17 00:00:00 2001 From: Bruk Tedla <40060643+brukted@users.noreply.github.com> Date: Wed, 16 Dec 2020 01:46:58 +0300 Subject: [PATCH 0300/1694] [imgui] Add experimental docking feature (#13899) --- ports/imgui/CONTROL | 5 ++++- ports/imgui/portfile.cmake | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL index 76730383ded9d0..949951acd12362 100644 --- a/ports/imgui/CONTROL +++ b/ports/imgui/CONTROL @@ -1,6 +1,6 @@ Source: imgui Version: 1.79 -Port-Version: 1 +Port-Version: 3 Homepage: https://github.com/ocornut/imgui Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies. @@ -76,3 +76,6 @@ Description: Install the libigl-imgui headers Feature: wchar32 Description: Use WCHAR32 instead of WCHAR16 + +Feature: docking-experimental +Description: Build with docking support diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index a826ddb1facf11..2238ca888caa3e 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -1,12 +1,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_github( +if ("docking-experimental" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ocornut/imgui + REF 682249396f02b8c21e5ff333ab4a1969c89387ad + SHA512 95f17c14e0a8f10dfc51fd1b30894f9905433fac8f9a93b6c545a542df5eb20be68f40996080a85cba934107ce19fff91a1df1edad1a1b5a0030e8f626e1985d + HEAD_REF docking + ) +else() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui REF v1.79 SHA512 35ed7af89123e09989ef81085f19ed15f97f4798e2b35834fd8b4ae918889b51132d85901f867ab2f379711a734bc7b2edd309d74f3f7527eaaaebfd766d3737 HEAD_REF master -) + ) +endif() file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) From a48f2b52361f56791d9b706e3dcf2ea94c835356 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Wed, 16 Dec 2020 06:00:41 +0700 Subject: [PATCH 0301/1694] [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (#14969) --- docs/maintainers/manifest-files.md | 1 + ports/boost-accumulators/CONTROL | 4 +- ports/boost-accumulators/portfile.cmake | 2 +- ports/boost-algorithm/CONTROL | 2 +- ports/boost-algorithm/portfile.cmake | 2 +- ports/boost-align/CONTROL | 2 +- ports/boost-align/portfile.cmake | 2 +- ports/boost-any/CONTROL | 2 +- ports/boost-any/portfile.cmake | 2 +- ports/boost-array/CONTROL | 2 +- ports/boost-array/portfile.cmake | 2 +- ports/boost-asio/CONTROL | 2 +- ports/boost-asio/portfile.cmake | 2 +- ports/boost-assert/CONTROL | 2 +- ports/boost-assert/portfile.cmake | 2 +- ports/boost-assign/CONTROL | 2 +- ports/boost-assign/portfile.cmake | 2 +- ports/boost-atomic/CONTROL | 2 +- ports/boost-atomic/portfile.cmake | 2 +- ports/boost-beast/CONTROL | 2 +- ports/boost-beast/portfile.cmake | 2 +- ports/boost-bimap/CONTROL | 2 +- ports/boost-bimap/portfile.cmake | 2 +- ports/boost-bind/CONTROL | 2 +- ports/boost-bind/portfile.cmake | 2 +- ports/boost-callable-traits/CONTROL | 2 +- ports/boost-callable-traits/portfile.cmake | 2 +- ports/boost-chrono/CONTROL | 4 +- ports/boost-chrono/portfile.cmake | 2 +- ports/boost-circular-buffer/CONTROL | 2 +- ports/boost-circular-buffer/portfile.cmake | 2 +- ports/boost-compatibility/CONTROL | 2 +- ports/boost-compatibility/portfile.cmake | 2 +- ports/boost-compute/CONTROL | 4 +- ports/boost-compute/portfile.cmake | 2 +- ports/boost-concept-check/CONTROL | 2 +- ports/boost-concept-check/portfile.cmake | 2 +- ports/boost-config/CONTROL | 2 +- ports/boost-config/portfile.cmake | 2 +- ports/boost-container-hash/CONTROL | 2 +- ports/boost-container-hash/portfile.cmake | 2 +- ports/boost-container/CONTROL | 2 +- ports/boost-container/portfile.cmake | 2 +- ports/boost-context/CONTROL | 2 +- ports/boost-context/portfile.cmake | 2 +- ports/boost-contract/CONTROL | 4 +- ports/boost-contract/portfile.cmake | 2 +- ports/boost-conversion/CONTROL | 4 +- ports/boost-conversion/portfile.cmake | 2 +- ports/boost-convert/CONTROL | 2 +- ports/boost-convert/portfile.cmake | 2 +- ports/boost-core/CONTROL | 2 +- ports/boost-core/portfile.cmake | 2 +- ports/boost-coroutine/CONTROL | 2 +- ports/boost-coroutine/portfile.cmake | 2 +- ports/boost-coroutine2/CONTROL | 2 +- ports/boost-coroutine2/portfile.cmake | 2 +- ports/boost-crc/CONTROL | 2 +- ports/boost-crc/portfile.cmake | 2 +- ports/boost-date-time/CONTROL | 2 +- ports/boost-date-time/portfile.cmake | 2 +- ports/boost-detail/CONTROL | 2 +- ports/boost-detail/portfile.cmake | 2 +- ports/boost-dll/CONTROL | 2 +- ports/boost-dll/portfile.cmake | 2 +- ports/boost-dynamic-bitset/CONTROL | 2 +- ports/boost-dynamic-bitset/portfile.cmake | 2 +- ports/boost-endian/CONTROL | 2 +- ports/boost-endian/portfile.cmake | 2 +- ports/boost-exception/CONTROL | 2 +- ports/boost-exception/portfile.cmake | 2 +- ports/boost-fiber/CONTROL | 2 +- ports/boost-fiber/portfile.cmake | 2 +- ports/boost-filesystem/CONTROL | 2 +- ports/boost-filesystem/portfile.cmake | 2 +- ports/boost-flyweight/CONTROL | 2 +- ports/boost-flyweight/portfile.cmake | 2 +- ports/boost-foreach/CONTROL | 2 +- ports/boost-foreach/portfile.cmake | 2 +- ports/boost-format/CONTROL | 2 +- ports/boost-format/portfile.cmake | 2 +- ports/boost-function-types/CONTROL | 2 +- ports/boost-function-types/portfile.cmake | 2 +- ports/boost-function/CONTROL | 4 +- ports/boost-function/portfile.cmake | 2 +- ports/boost-functional/CONTROL | 4 +- ports/boost-functional/portfile.cmake | 2 +- ports/boost-fusion/CONTROL | 4 +- ports/boost-fusion/portfile.cmake | 2 +- ports/boost-geometry/CONTROL | 2 +- ports/boost-geometry/portfile.cmake | 2 +- ports/boost-gil/CONTROL | 2 +- ports/boost-gil/portfile.cmake | 2 +- ports/boost-graph-parallel/CONTROL | 2 +- ports/boost-graph-parallel/portfile.cmake | 2 +- ports/boost-graph/CONTROL | 4 +- ports/boost-graph/portfile.cmake | 2 +- ports/boost-hana/CONTROL | 2 +- ports/boost-hana/portfile.cmake | 2 +- ports/boost-heap/CONTROL | 2 +- ports/boost-heap/portfile.cmake | 2 +- ports/boost-histogram/CONTROL | 2 +- ports/boost-histogram/portfile.cmake | 2 +- ports/boost-hof/CONTROL | 2 +- ports/boost-hof/portfile.cmake | 2 +- ports/boost-icl/CONTROL | 2 +- ports/boost-icl/portfile.cmake | 2 +- ports/boost-integer/CONTROL | 2 +- ports/boost-integer/portfile.cmake | 2 +- ports/boost-interprocess/CONTROL | 2 +- ports/boost-interprocess/portfile.cmake | 2 +- ports/boost-interval/CONTROL | 2 +- ports/boost-interval/portfile.cmake | 2 +- ports/boost-intrusive/CONTROL | 2 +- ports/boost-intrusive/portfile.cmake | 2 +- ports/boost-io/CONTROL | 2 +- ports/boost-io/portfile.cmake | 2 +- ports/boost-iostreams/CONTROL | 2 +- ports/boost-iostreams/portfile.cmake | 2 +- ports/boost-iterator/CONTROL | 2 +- ports/boost-iterator/portfile.cmake | 2 +- ports/boost-lambda/CONTROL | 2 +- ports/boost-lambda/portfile.cmake | 2 +- ports/boost-lexical-cast/CONTROL | 2 +- ports/boost-lexical-cast/portfile.cmake | 2 +- ports/boost-local-function/CONTROL | 4 +- ports/boost-local-function/portfile.cmake | 2 +- ports/boost-locale/CONTROL | 4 +- ports/boost-lockfree/CONTROL | 2 +- ports/boost-lockfree/portfile.cmake | 2 +- ports/boost-log/CONTROL | 2 +- ports/boost-log/portfile.cmake | 2 +- ports/boost-logic/CONTROL | 2 +- ports/boost-logic/portfile.cmake | 2 +- ports/boost-math/CONTROL | 2 +- ports/boost-math/portfile.cmake | 2 +- ports/boost-metaparse/CONTROL | 2 +- ports/boost-metaparse/portfile.cmake | 2 +- ports/boost-modular-build-helper/CONTROL | 2 +- .../user-config.jam | 26 ++++++-- ports/boost-move/CONTROL | 2 +- ports/boost-move/portfile.cmake | 2 +- ports/boost-mp11/CONTROL | 2 +- ports/boost-mp11/portfile.cmake | 2 +- ports/boost-mpi/CONTROL | 2 +- ports/boost-mpi/portfile.cmake | 2 +- ports/boost-mpl/CONTROL | 2 +- ports/boost-mpl/portfile.cmake | 2 +- ports/boost-msm/CONTROL | 4 +- ports/boost-msm/portfile.cmake | 2 +- ports/boost-multi-array/CONTROL | 2 +- ports/boost-multi-array/portfile.cmake | 2 +- ports/boost-multi-index/CONTROL | 2 +- ports/boost-multi-index/portfile.cmake | 2 +- ports/boost-multiprecision/CONTROL | 2 +- ports/boost-multiprecision/portfile.cmake | 2 +- ports/boost-nowide/CONTROL | 2 +- ports/boost-nowide/portfile.cmake | 2 +- ports/boost-numeric-conversion/CONTROL | 2 +- ports/boost-numeric-conversion/portfile.cmake | 2 +- ports/boost-odeint/CONTROL | 2 +- ports/boost-odeint/portfile.cmake | 2 +- ports/boost-optional/CONTROL | 2 +- ports/boost-optional/portfile.cmake | 2 +- ports/boost-outcome/CONTROL | 2 +- ports/boost-outcome/portfile.cmake | 2 +- ports/boost-parameter-python/CONTROL | 2 +- ports/boost-parameter-python/portfile.cmake | 2 +- ports/boost-parameter/CONTROL | 2 +- ports/boost-parameter/portfile.cmake | 2 +- ports/boost-phoenix/CONTROL | 2 +- ports/boost-phoenix/portfile.cmake | 2 +- ports/boost-poly-collection/CONTROL | 2 +- ports/boost-poly-collection/portfile.cmake | 2 +- ports/boost-polygon/CONTROL | 2 +- ports/boost-polygon/portfile.cmake | 2 +- ports/boost-pool/CONTROL | 2 +- ports/boost-pool/portfile.cmake | 2 +- ports/boost-predef/CONTROL | 2 +- ports/boost-predef/portfile.cmake | 2 +- ports/boost-preprocessor/CONTROL | 2 +- ports/boost-preprocessor/portfile.cmake | 2 +- ports/boost-process/CONTROL | 2 +- ports/boost-process/portfile.cmake | 2 +- ports/boost-program-options/CONTROL | 2 +- ports/boost-program-options/portfile.cmake | 2 +- ports/boost-property-map/CONTROL | 2 +- ports/boost-property-map/portfile.cmake | 2 +- ports/boost-property-tree/CONTROL | 2 +- ports/boost-property-tree/portfile.cmake | 2 +- ports/boost-proto/CONTROL | 4 +- ports/boost-proto/portfile.cmake | 2 +- ports/boost-ptr-container/CONTROL | 2 +- ports/boost-ptr-container/portfile.cmake | 2 +- ports/boost-python/CONTROL | 2 +- ports/boost-python/portfile.cmake | 2 +- ports/boost-qvm/CONTROL | 2 +- ports/boost-qvm/portfile.cmake | 2 +- ports/boost-random/CONTROL | 2 +- ports/boost-random/portfile.cmake | 2 +- ports/boost-range/CONTROL | 2 +- ports/boost-range/portfile.cmake | 2 +- ports/boost-ratio/CONTROL | 2 +- ports/boost-ratio/portfile.cmake | 2 +- ports/boost-rational/CONTROL | 2 +- ports/boost-rational/portfile.cmake | 2 +- ports/boost-regex/CONTROL | 2 +- ports/boost-regex/portfile.cmake | 2 +- ports/boost-safe-numerics/CONTROL | 2 +- ports/boost-safe-numerics/portfile.cmake | 2 +- ports/boost-scope-exit/CONTROL | 4 +- ports/boost-scope-exit/portfile.cmake | 2 +- ports/boost-serialization/CONTROL | 2 +- ports/boost-serialization/portfile.cmake | 2 +- ports/boost-signals2/CONTROL | 2 +- ports/boost-signals2/portfile.cmake | 2 +- ports/boost-smart-ptr/CONTROL | 2 +- ports/boost-smart-ptr/portfile.cmake | 2 +- ports/boost-sort/CONTROL | 2 +- ports/boost-sort/portfile.cmake | 2 +- ports/boost-spirit/CONTROL | 4 +- ports/boost-spirit/portfile.cmake | 2 +- ports/boost-stacktrace/CONTROL | 2 +- ports/boost-stacktrace/portfile.cmake | 2 +- ports/boost-statechart/CONTROL | 2 +- ports/boost-statechart/portfile.cmake | 2 +- ports/boost-static-assert/CONTROL | 2 +- ports/boost-static-assert/portfile.cmake | 2 +- ports/boost-static-string/CONTROL | 2 +- ports/boost-static-string/portfile.cmake | 2 +- ports/boost-stl-interfaces/CONTROL | 2 +- ports/boost-stl-interfaces/portfile.cmake | 2 +- ports/boost-system/CONTROL | 2 +- ports/boost-system/portfile.cmake | 2 +- ports/boost-test/CONTROL | 2 +- ports/boost-test/portfile.cmake | 2 +- ports/boost-thread/CONTROL | 2 +- ports/boost-thread/portfile.cmake | 2 +- ports/boost-throw-exception/CONTROL | 2 +- ports/boost-throw-exception/portfile.cmake | 2 +- ports/boost-timer/CONTROL | 2 +- ports/boost-timer/portfile.cmake | 2 +- ports/boost-tokenizer/CONTROL | 2 +- ports/boost-tokenizer/portfile.cmake | 2 +- ports/boost-tti/CONTROL | 2 +- ports/boost-tti/portfile.cmake | 2 +- ports/boost-tuple/CONTROL | 2 +- ports/boost-tuple/portfile.cmake | 2 +- ports/boost-type-erasure/CONTROL | 4 +- ports/boost-type-erasure/portfile.cmake | 2 +- ports/boost-type-index/CONTROL | 2 +- ports/boost-type-index/portfile.cmake | 2 +- ports/boost-type-traits/CONTROL | 2 +- ports/boost-type-traits/portfile.cmake | 2 +- ports/boost-typeof/CONTROL | 2 +- ports/boost-typeof/portfile.cmake | 2 +- ports/boost-ublas/CONTROL | 4 +- ports/boost-ublas/portfile.cmake | 2 +- ports/boost-units/CONTROL | 4 +- ports/boost-units/portfile.cmake | 2 +- ports/boost-unordered/CONTROL | 2 +- ports/boost-unordered/portfile.cmake | 2 +- ports/boost-utility/CONTROL | 2 +- ports/boost-utility/portfile.cmake | 2 +- ports/boost-uuid/CONTROL | 2 +- ports/boost-uuid/portfile.cmake | 2 +- ports/boost-variant/CONTROL | 2 +- ports/boost-variant/portfile.cmake | 2 +- ports/boost-variant2/CONTROL | 2 +- ports/boost-variant2/portfile.cmake | 2 +- ports/boost-vmd/CONTROL | 2 +- ports/boost-vmd/portfile.cmake | 2 +- ports/boost-wave/CONTROL | 2 +- ports/boost-wave/portfile.cmake | 2 +- ports/boost-winapi/CONTROL | 2 +- ports/boost-winapi/portfile.cmake | 2 +- ports/boost-xpressive/CONTROL | 4 +- ports/boost-xpressive/portfile.cmake | 2 +- ports/boost-yap/CONTROL | 2 +- ports/boost-yap/portfile.cmake | 2 +- ports/boost/CONTROL | 4 +- ports/icu/CONTROL | 2 +- ports/icu/mingw-remove-bsymbolic.patch | 26 ++++++++ ...mingw-remove-version-from-link-flags.patch | 48 ++++++++++++++ ports/icu/portfile.cmake | 62 ++++++++++++++----- scripts/boost/generate-ports.ps1 | 6 +- toolsrc/src/vcpkg/platform-expression.cpp | 3 + 287 files changed, 446 insertions(+), 326 deletions(-) create mode 100644 ports/icu/mingw-remove-bsymbolic.patch create mode 100644 ports/icu/mingw-remove-version-from-link-flags.patch diff --git a/docs/maintainers/manifest-files.md b/docs/maintainers/manifest-files.md index 001ca871d676b5..3e79aa08a0ca2d 100644 --- a/docs/maintainers/manifest-files.md +++ b/docs/maintainers/manifest-files.md @@ -392,6 +392,7 @@ These predefined identifier expressions are computed from standard triplet setti - `arm` - `VCPKG_TARGET_ARCHITECTURE` == `"arm"` or `VCPKG_TARGET_ARCHITECTURE` == `"arm64"` - `arm64` - `VCPKG_TARGET_ARCHITECTURE` == `"arm64"` - `windows` - `VCPKG_CMAKE_SYSTEM_NAME` == `""` or `VCPKG_CMAKE_SYSTEM_NAME` == `"WindowsStore"` +- `mingw` - `VCPKG_CMAKE_SYSTEM_NAME` == `"MinGW"` - `uwp` - `VCPKG_CMAKE_SYSTEM_NAME` == `"WindowsStore"` - `linux` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Linux"` - `osx` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Darwin"` diff --git a/ports/boost-accumulators/CONTROL b/ports/boost-accumulators/CONTROL index ae078631a764de..7daae9eeee7e63 100644 --- a/ports/boost-accumulators/CONTROL +++ b/ports/boost-accumulators/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-accumulators Version: 1.74.0 -Build-Depends: boost-array, boost-assert, boost-circular-buffer, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-interval, boost-iterator, boost-mpl, boost-numeric-conversion, boost-odeint, boost-parameter, boost-preprocessor, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-ublas, boost-utility, boost-vcpkg-helpers +Build-Depends: boost-array, boost-assert, boost-circular-buffer, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-interval, boost-iterator, boost-mpl, boost-numeric-conversion, boost-odeint, boost-parameter, boost-preprocessor, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-typeof, boost-ublas, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/accumulators Description: Boost accumulators module diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake index aebba77c4cfe6f..e5c361ce33fad9 100644 --- a/ports/boost-accumulators/portfile.cmake +++ b/ports/boost-accumulators/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-algorithm/CONTROL b/ports/boost-algorithm/CONTROL index f6824b8648b78d..8f2ce3b972c07f 100644 --- a/ports/boost-algorithm/CONTROL +++ b/ports/boost-algorithm/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-algorithm Version: 1.74.0 Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-iterator, boost-mpl, boost-range, boost-regex, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake index 6086431e01edf3..29892af8c74844 100644 --- a/ports/boost-algorithm/portfile.cmake +++ b/ports/boost-algorithm/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-align/CONTROL b/ports/boost-align/CONTROL index b877b1203a271a..69d35c4ffc1cbc 100644 --- a/ports/boost-align/CONTROL +++ b/ports/boost-align/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-align Version: 1.74.0 Build-Depends: boost-assert, boost-config, boost-core, boost-static-assert, boost-vcpkg-helpers diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake index bc9859442e5e54..c732f88f0cf1ba 100644 --- a/ports/boost-align/portfile.cmake +++ b/ports/boost-align/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-any/CONTROL b/ports/boost-any/CONTROL index 8f2f9e1e41729e..fc3e6a08d5f77e 100644 --- a/ports/boost-any/CONTROL +++ b/ports/boost-any/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-any Version: 1.74.0 Build-Depends: boost-config, boost-core, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake index cf924bbe1e05c7..cdf0befa347bc2 100644 --- a/ports/boost-any/portfile.cmake +++ b/ports/boost-any/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-array/CONTROL b/ports/boost-array/CONTROL index 69aa2fdd9c27ec..4fcadee898e8c7 100644 --- a/ports/boost-array/CONTROL +++ b/ports/boost-array/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-array Version: 1.74.0 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake index 23840b5d974d79..5abc31b600e100 100644 --- a/ports/boost-array/portfile.cmake +++ b/ports/boost-array/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-asio/CONTROL b/ports/boost-asio/CONTROL index 0296a486a84571..dfcf9a53e7dd40 100644 --- a/ports/boost-asio/CONTROL +++ b/ports/boost-asio/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-asio Version: 1.74.0 Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!arm&!uwp&!emscripten), boost-date-time, boost-detail, boost-function, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, openssl diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index c6353405a077f5..aed5015ac4f967 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-assert/CONTROL b/ports/boost-assert/CONTROL index f4bf44f66f17c8..581a70a3198ed4 100644 --- a/ports/boost-assert/CONTROL +++ b/ports/boost-assert/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-assert Version: 1.74.0 Build-Depends: boost-config, boost-vcpkg-helpers diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake index 8831d2228d4644..bb8ba42aa518c3 100644 --- a/ports/boost-assert/portfile.cmake +++ b/ports/boost-assert/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-assign/CONTROL b/ports/boost-assign/CONTROL index 8d412de258ff0f..db31f6adbe279a 100644 --- a/ports/boost-assign/CONTROL +++ b/ports/boost-assign/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-assign Version: 1.74.0 Build-Depends: boost-array, boost-config, boost-detail, boost-move, boost-mpl, boost-preprocessor, boost-ptr-container, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake index 12bff8808a55f5..51bbe7c3dbeac0 100644 --- a/ports/boost-assign/portfile.cmake +++ b/ports/boost-assign/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-atomic/CONTROL b/ports/boost-atomic/CONTROL index 08c21e6d0fbada..28d5001cd1e288 100644 --- a/ports/boost-atomic/CONTROL +++ b/ports/boost-atomic/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-atomic Version: 1.74.0 Build-Depends: boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index ffca86176b6f60..88dd04b482d41b 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-beast/CONTROL b/ports/boost-beast/CONTROL index 42c591a678e28c..42bf41852fb06d 100644 --- a/ports/boost-beast/CONTROL +++ b/ports/boost-beast/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-beast Version: 1.74.0 Build-Depends: boost-asio (!emscripten), boost-assert, boost-bind, boost-config, boost-container, boost-core, boost-endian, boost-intrusive, boost-logic, boost-mp11, boost-optional, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake index 81e6a298e009d6..17036d7144b49e 100644 --- a/ports/boost-beast/portfile.cmake +++ b/ports/boost-beast/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-bimap/CONTROL b/ports/boost-bimap/CONTROL index b43166d9f4fc30..2401040b04f15d 100644 --- a/ports/boost-bimap/CONTROL +++ b/ports/boost-bimap/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-bimap Version: 1.74.0 Build-Depends: boost-concept-check, boost-config, boost-container-hash, boost-core, boost-functional, boost-iterator, boost-lambda, boost-mpl, boost-multi-index, boost-preprocessor, boost-property-map, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake index 5da4fd8984962c..f99baafbd7c4fc 100644 --- a/ports/boost-bimap/portfile.cmake +++ b/ports/boost-bimap/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-bind/CONTROL b/ports/boost-bind/CONTROL index ad5eeeeefcfe03..f31b60f55eed63 100644 --- a/ports/boost-bind/CONTROL +++ b/ports/boost-bind/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-bind Version: 1.74.0 Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake index f807e684d57eb0..f5b3c60eb75e84 100644 --- a/ports/boost-bind/portfile.cmake +++ b/ports/boost-bind/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-callable-traits/CONTROL b/ports/boost-callable-traits/CONTROL index 5cba4b5d854bef..f27896fc86d094 100644 --- a/ports/boost-callable-traits/CONTROL +++ b/ports/boost-callable-traits/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-callable-traits Version: 1.74.0 Build-Depends: boost-vcpkg-helpers diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake index cd6afaa9fcbe83..032732318ae932 100644 --- a/ports/boost-callable-traits/portfile.cmake +++ b/ports/boost-callable-traits/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-chrono/CONTROL b/ports/boost-chrono/CONTROL index a0f86d71fb665a..b73d4cac23e11b 100644 --- a/ports/boost-chrono/CONTROL +++ b/ports/boost-chrono/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-chrono Version: 1.74.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-move, boost-mpl, boost-predef, boost-ratio, boost-static-assert, boost-system, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi +Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-move, boost-mpl, boost-predef, boost-ratio, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/chrono Description: Boost chrono module diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake index 0c3e269742bdef..cfe2aff23ba6e1 100644 --- a/ports/boost-chrono/portfile.cmake +++ b/ports/boost-chrono/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-circular-buffer/CONTROL b/ports/boost-circular-buffer/CONTROL index 22b9de39f54bdf..253e4a761ca943 100644 --- a/ports/boost-circular-buffer/CONTROL +++ b/ports/boost-circular-buffer/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-circular-buffer Version: 1.74.0 Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-move, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake index 7bed552c0356f1..6d1c0cc254cf38 100644 --- a/ports/boost-circular-buffer/portfile.cmake +++ b/ports/boost-circular-buffer/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-compatibility/CONTROL b/ports/boost-compatibility/CONTROL index 8834e27b0624b9..f76b74f8277655 100644 --- a/ports/boost-compatibility/CONTROL +++ b/ports/boost-compatibility/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-compatibility Version: 1.74.0 Build-Depends: boost-vcpkg-helpers diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake index 35e0f02399279d..5e9b619cd7a534 100644 --- a/ports/boost-compatibility/portfile.cmake +++ b/ports/boost-compatibility/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-compute/CONTROL b/ports/boost-compute/CONTROL index 1629b64ff12006..75aa5cce3c2602 100644 --- a/ports/boost-compute/CONTROL +++ b/ports/boost-compute/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-compute Version: 1.74.0 -Build-Depends: boost-algorithm, boost-array, boost-assert, boost-chrono, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-function-types, boost-fusion, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-preprocessor, boost-property-tree, boost-proto, boost-range, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-uuid, boost-vcpkg-helpers +Build-Depends: boost-algorithm, boost-array, boost-assert, boost-chrono, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-function-types, boost-fusion, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-preprocessor, boost-property-tree, boost-proto, boost-range, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tuple, boost-type-traits, boost-typeof, boost-utility, boost-uuid, boost-vcpkg-helpers Homepage: https://github.com/boostorg/compute Description: Boost compute module diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake index ad9c9c058dbe53..bd5d73778f0d01 100644 --- a/ports/boost-compute/portfile.cmake +++ b/ports/boost-compute/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-concept-check/CONTROL b/ports/boost-concept-check/CONTROL index 1711fd3abe3239..b02db5c9260f36 100644 --- a/ports/boost-concept-check/CONTROL +++ b/ports/boost-concept-check/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-concept-check Version: 1.74.0 Build-Depends: boost-config, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index 82e1b76afac687..9719f5de0d2049 100644 --- a/ports/boost-concept-check/portfile.cmake +++ b/ports/boost-concept-check/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-config/CONTROL b/ports/boost-config/CONTROL index 24ff2fb938b8c8..f9ff2551893064 100644 --- a/ports/boost-config/CONTROL +++ b/ports/boost-config/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-config Version: 1.74.0 Build-Depends: boost-compatibility, boost-vcpkg-helpers diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index 03aa3667c9a7d5..cc8d18e7771d6c 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-container-hash/CONTROL b/ports/boost-container-hash/CONTROL index 5ea095077f757d..31cd1ebf44c93f 100644 --- a/ports/boost-container-hash/CONTROL +++ b/ports/boost-container-hash/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-container-hash Version: 1.74.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake index f3e879cc761073..c64d18aa8e4f3a 100644 --- a/ports/boost-container-hash/portfile.cmake +++ b/ports/boost-container-hash/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-container/CONTROL b/ports/boost-container/CONTROL index ae85a4c9143707..5ce8a865551452 100644 --- a/ports/boost-container/CONTROL +++ b/ports/boost-container/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-container Version: 1.74.0 Build-Depends: boost-assert, boost-build, boost-config, boost-container-hash, boost-core, boost-integer, boost-intrusive, boost-modular-build-helper, boost-move, boost-static-assert, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake index 0a63f8c3701f6c..151ddb81930bc2 100644 --- a/ports/boost-container/portfile.cmake +++ b/ports/boost-container/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-context/CONTROL b/ports/boost-context/CONTROL index fcf1b3cde6c2f4..75e8a7fa0068f5 100644 --- a/ports/boost-context/CONTROL +++ b/ports/boost-context/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-context Version: 1.74.0 Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-integer, boost-modular-build-helper, boost-pool, boost-predef, boost-smart-ptr, boost-thread, boost-vcpkg-helpers diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index b21de86921283a..cc05aaaa0fd69c 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-contract/CONTROL b/ports/boost-contract/CONTROL index 3388041f9a6a7e..deb9b2284e735a 100644 --- a/ports/boost-contract/CONTROL +++ b/ports/boost-contract/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-contract Version: 1.74.0 -Build-Depends: boost-any, boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-function-types, boost-modular-build-helper, boost-mpl, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-thread, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers +Build-Depends: boost-any, boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-function-types, boost-modular-build-helper, boost-mpl, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-thread, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/contract Description: Boost contract module diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake index e37c851b088edc..e203ffd0f66cbc 100644 --- a/ports/boost-contract/portfile.cmake +++ b/ports/boost-contract/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-conversion/CONTROL b/ports/boost-conversion/CONTROL index 4435dfad3776c7..df2d1e565d63db 100644 --- a/ports/boost-conversion/CONTROL +++ b/ports/boost-conversion/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-conversion Version: 1.74.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-smart-ptr, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers +Build-Depends: boost-assert, boost-config, boost-core, boost-smart-ptr, boost-throw-exception, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/conversion Description: Boost conversion module diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake index 629a3d432be8a9..8a0f3621d54ae3 100644 --- a/ports/boost-conversion/portfile.cmake +++ b/ports/boost-conversion/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-convert/CONTROL b/ports/boost-convert/CONTROL index 2ce7e763dbe380..8ce2e8bb01deb4 100644 --- a/ports/boost-convert/CONTROL +++ b/ports/boost-convert/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-convert Version: 1.74.0 Build-Depends: boost-config, boost-core, boost-function-types, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-parameter, boost-range, boost-spirit, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake index b008b117ecb2eb..2885a94abbeeff 100644 --- a/ports/boost-convert/portfile.cmake +++ b/ports/boost-convert/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-core/CONTROL b/ports/boost-core/CONTROL index 467fa9a9c04277..fafe3892a1d590 100644 --- a/ports/boost-core/CONTROL +++ b/ports/boost-core/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-core Version: 1.74.0 Build-Depends: boost-config, boost-vcpkg-helpers diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake index f8530ecec47d1f..16fe559264d234 100644 --- a/ports/boost-core/portfile.cmake +++ b/ports/boost-core/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-coroutine/CONTROL b/ports/boost-coroutine/CONTROL index 2546515c1211bd..4ac348b63eda96 100644 --- a/ports/boost-coroutine/CONTROL +++ b/ports/boost-coroutine/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-coroutine Version: 1.74.0 Build-Depends: boost-assert, boost-build, boost-config, boost-context (!uwp&!emscripten), boost-core, boost-detail, boost-exception, boost-integer, boost-modular-build-helper, boost-move, boost-system, boost-thread, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake index 37897644759f0b..796768648c5cf7 100644 --- a/ports/boost-coroutine/portfile.cmake +++ b/ports/boost-coroutine/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-coroutine2/CONTROL b/ports/boost-coroutine2/CONTROL index 01ab3720d8891d..2d2d2b7ef8ec83 100644 --- a/ports/boost-coroutine2/CONTROL +++ b/ports/boost-coroutine2/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-coroutine2 Version: 1.74.0 Build-Depends: boost-assert, boost-config, boost-context (!uwp&!emscripten), boost-detail, boost-vcpkg-helpers diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake index 4503c5dbdc2684..5c75be709696cc 100644 --- a/ports/boost-coroutine2/portfile.cmake +++ b/ports/boost-coroutine2/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-crc/CONTROL b/ports/boost-crc/CONTROL index bb65b120560ada..d5d18f3b27846c 100644 --- a/ports/boost-crc/CONTROL +++ b/ports/boost-crc/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-crc Version: 1.74.0 Build-Depends: boost-array, boost-compatibility, boost-config, boost-integer, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake index 94b2124f595c0d..a0ed847c07ebb0 100644 --- a/ports/boost-crc/portfile.cmake +++ b/ports/boost-crc/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-date-time/CONTROL b/ports/boost-date-time/CONTROL index 67baa29c327d13..8475d4bd795361 100644 --- a/ports/boost-date-time/CONTROL +++ b/ports/boost-date-time/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-date-time Version: 1.74.0 Build-Depends: boost-algorithm, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-numeric-conversion, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake index 158f82f69ff395..94b40bebc1ae83 100644 --- a/ports/boost-date-time/portfile.cmake +++ b/ports/boost-date-time/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-detail/CONTROL b/ports/boost-detail/CONTROL index 900a8afb59dd0b..62ea25cb13df11 100644 --- a/ports/boost-detail/CONTROL +++ b/ports/boost-detail/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-detail Version: 1.74.0 Build-Depends: boost-compatibility, boost-config, boost-preprocessor, boost-vcpkg-helpers diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake index 08f9494cc6234c..a739eb87e370ed 100644 --- a/ports/boost-detail/portfile.cmake +++ b/ports/boost-detail/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-dll/CONTROL b/ports/boost-dll/CONTROL index 21ab52080e69b1..a23e863d8458d1 100644 --- a/ports/boost-dll/CONTROL +++ b/ports/boost-dll/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-dll Version: 1.74.0 Build-Depends: boost-assert, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-move, boost-predef, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-throw-exception, boost-type-index, boost-type-traits, boost-vcpkg-helpers, boost-winapi diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake index 878579c31c011a..94238e2ec91bfa 100644 --- a/ports/boost-dll/portfile.cmake +++ b/ports/boost-dll/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-dynamic-bitset/CONTROL b/ports/boost-dynamic-bitset/CONTROL index df6c4777f528ab..9c7ab3c76aaa9d 100644 --- a/ports/boost-dynamic-bitset/CONTROL +++ b/ports/boost-dynamic-bitset/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-dynamic-bitset Version: 1.74.0 Build-Depends: boost-core, boost-vcpkg-helpers diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake index 63fa95a657a203..9281610767e432 100644 --- a/ports/boost-dynamic-bitset/portfile.cmake +++ b/ports/boost-dynamic-bitset/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-endian/CONTROL b/ports/boost-endian/CONTROL index 857c63fda29c8e..43a9af4e1e2d1d 100644 --- a/ports/boost-endian/CONTROL +++ b/ports/boost-endian/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-endian Version: 1.74.0 Build-Depends: boost-config, boost-core, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake index ce9cf3dea7031d..d9238acac4e896 100644 --- a/ports/boost-endian/portfile.cmake +++ b/ports/boost-endian/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-exception/CONTROL b/ports/boost-exception/CONTROL index 7b80a0e9421495..e56767b4d505bc 100644 --- a/ports/boost-exception/CONTROL +++ b/ports/boost-exception/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-exception Version: 1.74.0 Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-modular-build-helper, boost-smart-ptr, boost-tuple, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake index b30571f54d8f28..4bc2b7130eab3f 100644 --- a/ports/boost-exception/portfile.cmake +++ b/ports/boost-exception/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-fiber/CONTROL b/ports/boost-fiber/CONTROL index 527a98b3cf1950..cad5392eec2359 100644 --- a/ports/boost-fiber/CONTROL +++ b/ports/boost-fiber/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-fiber Version: 1.74.0 Build-Depends: boost-algorithm, boost-assert, boost-build, boost-config, boost-context (!uwp&!emscripten), boost-core, boost-detail, boost-filesystem (!uwp), boost-format, boost-intrusive, boost-modular-build-helper, boost-predef, boost-smart-ptr, boost-vcpkg-helpers diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake index 2431043baf0678..f78be9cb66f18b 100644 --- a/ports/boost-fiber/portfile.cmake +++ b/ports/boost-fiber/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-filesystem/CONTROL b/ports/boost-filesystem/CONTROL index d4d64031b78936..626ad74a557c89 100644 --- a/ports/boost-filesystem/CONTROL +++ b/ports/boost-filesystem/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-filesystem Version: 1.74.0 Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-predef, boost-smart-ptr, boost-system, boost-type-traits, boost-vcpkg-helpers, boost-winapi diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake index 435b40964cd579..30ae416c73d322 100644 --- a/ports/boost-filesystem/portfile.cmake +++ b/ports/boost-filesystem/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-flyweight/CONTROL b/ports/boost-flyweight/CONTROL index eac6bec49e872a..f54ae464a77e2e 100644 --- a/ports/boost-flyweight/CONTROL +++ b/ports/boost-flyweight/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-flyweight Version: 1.74.0 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-functional, boost-interprocess, boost-mpl, boost-multi-index, boost-parameter, boost-preprocessor, boost-serialization, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake index e2b8378ebc4e0f..a84c5203eec59e 100644 --- a/ports/boost-flyweight/portfile.cmake +++ b/ports/boost-flyweight/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-foreach/CONTROL b/ports/boost-foreach/CONTROL index 4c82f57eb33015..7ea6007ef2f0a0 100644 --- a/ports/boost-foreach/CONTROL +++ b/ports/boost-foreach/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-foreach Version: 1.74.0 Build-Depends: boost-config, boost-core, boost-detail, boost-iterator, boost-mpl, boost-range, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake index 9bb6e8dc0e52be..4c3dc627b8b8e5 100644 --- a/ports/boost-foreach/portfile.cmake +++ b/ports/boost-foreach/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-format/CONTROL b/ports/boost-format/CONTROL index 5063bdb0303028..9b18e6a641d02b 100644 --- a/ports/boost-format/CONTROL +++ b/ports/boost-format/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-format Version: 1.74.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-optional, boost-smart-ptr, boost-throw-exception, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake index 763ca2e6b6027f..4f2ab130c7957b 100644 --- a/ports/boost-format/portfile.cmake +++ b/ports/boost-format/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-function-types/CONTROL b/ports/boost-function-types/CONTROL index 5bce4883aadf57..877bc5ecb1ee61 100644 --- a/ports/boost-function-types/CONTROL +++ b/ports/boost-function-types/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-function-types Version: 1.74.0 Build-Depends: boost-config, boost-core, boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake index a79b3db47878ae..da59bd54c338c1 100644 --- a/ports/boost-function-types/portfile.cmake +++ b/ports/boost-function-types/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-function/CONTROL b/ports/boost-function/CONTROL index a8551567e13270..0d19ff3a57038a 100644 --- a/ports/boost-function/CONTROL +++ b/ports/boost-function/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-function Version: 1.74.0 -Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-integer, boost-preprocessor, boost-throw-exception, boost-type-index, boost-typeof, boost-type-traits, boost-vcpkg-helpers +Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-integer, boost-preprocessor, boost-throw-exception, boost-type-index, boost-type-traits, boost-typeof, boost-vcpkg-helpers Homepage: https://github.com/boostorg/function Description: Boost function module diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake index 2f67eedc4897ef..6aee9e2c4d4482 100644 --- a/ports/boost-function/portfile.cmake +++ b/ports/boost-function/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-functional/CONTROL b/ports/boost-functional/CONTROL index 788baec69f32e4..9049dd1f149a99 100644 --- a/ports/boost-functional/CONTROL +++ b/ports/boost-functional/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-functional Version: 1.74.0 -Build-Depends: boost-config, boost-core, boost-mpl, boost-preprocessor, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers +Build-Depends: boost-config, boost-core, boost-mpl, boost-preprocessor, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/functional Description: Boost functional module diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake index d0dd7b8c692416..f3f8b4f5276350 100644 --- a/ports/boost-functional/portfile.cmake +++ b/ports/boost-functional/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-fusion/CONTROL b/ports/boost-fusion/CONTROL index 0a75be7613559f..fdf484688dd041 100644 --- a/ports/boost-fusion/CONTROL +++ b/ports/boost-fusion/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-fusion Version: 1.74.0 -Build-Depends: boost-config, boost-container-hash, boost-core, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-static-assert, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers +Build-Depends: boost-config, boost-container-hash, boost-core, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-static-assert, boost-tuple, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/fusion Description: Boost fusion module diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake index 018e56531bab54..f8cc3753f9aa61 100644 --- a/ports/boost-fusion/portfile.cmake +++ b/ports/boost-fusion/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-geometry/CONTROL b/ports/boost-geometry/CONTROL index fa5dac261cf0a9..bb11730e6fbf1d 100644 --- a/ports/boost-geometry/CONTROL +++ b/ports/boost-geometry/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-geometry Version: 1.74.0 Build-Depends: boost-algorithm, boost-array, boost-assert, boost-concept-check, boost-config, boost-container, boost-core, boost-detail, boost-function-types, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-move, boost-mpl, boost-multiprecision, boost-numeric-conversion, boost-polygon, boost-qvm, boost-range, boost-rational, boost-serialization, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tokenizer, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake index f63c49f8db9114..f2bbc7a794bf67 100644 --- a/ports/boost-geometry/portfile.cmake +++ b/ports/boost-geometry/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-gil/CONTROL b/ports/boost-gil/CONTROL index 6b8d04af886dd4..3f66f43feb708e 100644 --- a/ports/boost-gil/CONTROL +++ b/ports/boost-gil/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-gil Version: 1.74.0 Build-Depends: boost-assert, boost-concept-check, boost-config, boost-core, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-mp11, boost-numeric-conversion, boost-preprocessor, boost-utility, boost-variant2, boost-vcpkg-helpers diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake index 06dd860c78ec98..fc37be834126c1 100644 --- a/ports/boost-gil/portfile.cmake +++ b/ports/boost-gil/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-graph-parallel/CONTROL b/ports/boost-graph-parallel/CONTROL index 94bf264f7edd74..e3681bc348dc91 100644 --- a/ports/boost-graph-parallel/CONTROL +++ b/ports/boost-graph-parallel/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-graph-parallel Version: 1.74.0 Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-detail, boost-dynamic-bitset, boost-filesystem (!uwp), boost-foreach, boost-function, boost-graph, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-property-map, boost-random, boost-serialization, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake index e5cbd150857ae0..fdf04461becb9d 100644 --- a/ports/boost-graph-parallel/portfile.cmake +++ b/ports/boost-graph-parallel/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-graph/CONTROL b/ports/boost-graph/CONTROL index 00df634d61dc92..0597af8d908f1f 100644 --- a/ports/boost-graph/CONTROL +++ b/ports/boost-graph/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-graph Version: 1.74.0 -Build-Depends: boost-algorithm, boost-any, boost-array, boost-assert, boost-bimap, boost-bind, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-multi-index, boost-optional, boost-parameter, boost-preprocessor, boost-property-map, boost-property-tree, boost-random, boost-range, boost-regex, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-test (!uwp), boost-throw-exception, boost-tti, boost-tuple, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-xpressive +Build-Depends: boost-algorithm, boost-any, boost-array, boost-assert, boost-bimap, boost-bind, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-multi-index, boost-optional, boost-parameter, boost-preprocessor, boost-property-map, boost-property-tree, boost-random, boost-range, boost-regex, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-test (!uwp), boost-throw-exception, boost-tti, boost-tuple, boost-type-traits, boost-typeof, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-xpressive Homepage: https://github.com/boostorg/graph Description: Boost graph module diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake index 3f59530ec00eb1..24024486405125 100644 --- a/ports/boost-graph/portfile.cmake +++ b/ports/boost-graph/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-hana/CONTROL b/ports/boost-hana/CONTROL index 016096d294e4f5..f372c7c14be05e 100644 --- a/ports/boost-hana/CONTROL +++ b/ports/boost-hana/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-hana Version: 1.74.0 Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index 12506e8e97b1f0..e66b7415d41a97 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-heap/CONTROL b/ports/boost-heap/CONTROL index 2e3c38b9204bfb..794dc13e0221eb 100644 --- a/ports/boost-heap/CONTROL +++ b/ports/boost-heap/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-heap Version: 1.74.0 Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-core, boost-integer, boost-intrusive, boost-iterator, boost-parameter, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index 8b3ff1c11ece51..592d977fed6834 100644 --- a/ports/boost-heap/portfile.cmake +++ b/ports/boost-heap/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-histogram/CONTROL b/ports/boost-histogram/CONTROL index 6f78a2e832e55c..26a17ae3a4dca7 100644 --- a/ports/boost-histogram/CONTROL +++ b/ports/boost-histogram/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-histogram Version: 1.74.0 Build-Depends: boost-config, boost-core, boost-mp11, boost-serialization, boost-throw-exception, boost-variant2, boost-vcpkg-helpers diff --git a/ports/boost-histogram/portfile.cmake b/ports/boost-histogram/portfile.cmake index 95badd96fad089..b1670c3eac0109 100644 --- a/ports/boost-histogram/portfile.cmake +++ b/ports/boost-histogram/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-hof/CONTROL b/ports/boost-hof/CONTROL index 99ba69069e68b0..07a3470a9ad6f3 100644 --- a/ports/boost-hof/CONTROL +++ b/ports/boost-hof/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-hof Version: 1.74.0 Build-Depends: boost-vcpkg-helpers diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake index 86dacc70e8a4b7..b2f3f21dcf61e7 100644 --- a/ports/boost-hof/portfile.cmake +++ b/ports/boost-hof/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-icl/CONTROL b/ports/boost-icl/CONTROL index 15254568d15a0b..530cc704a45830 100644 --- a/ports/boost-icl/CONTROL +++ b/ports/boost-icl/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-icl Version: 1.74.0 Build-Depends: boost-assert, boost-concept-check, boost-config, boost-container, boost-date-time, boost-detail, boost-iterator, boost-move, boost-mpl, boost-range, boost-rational, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake index 885f256638da67..78f00bfcb6d22e 100644 --- a/ports/boost-icl/portfile.cmake +++ b/ports/boost-icl/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-integer/CONTROL b/ports/boost-integer/CONTROL index 38fab87f764b99..0b5f2a742b5691 100644 --- a/ports/boost-integer/CONTROL +++ b/ports/boost-integer/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-integer Version: 1.74.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake index fe073609a25e2b..16deb73c906e8c 100644 --- a/ports/boost-integer/portfile.cmake +++ b/ports/boost-integer/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-interprocess/CONTROL b/ports/boost-interprocess/CONTROL index 9159159bd0bdb1..ae99b535c77d0c 100644 --- a/ports/boost-interprocess/CONTROL +++ b/ports/boost-interprocess/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-interprocess Version: 1.74.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-integer, boost-intrusive, boost-move, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-winapi diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake index 51773f9d9548c6..5f51e2618e4faf 100644 --- a/ports/boost-interprocess/portfile.cmake +++ b/ports/boost-interprocess/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-interval/CONTROL b/ports/boost-interval/CONTROL index e19c60929a50ba..d840bf034fd99a 100644 --- a/ports/boost-interval/CONTROL +++ b/ports/boost-interval/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-interval Version: 1.74.0 Build-Depends: boost-compatibility, boost-config, boost-logic, boost-vcpkg-helpers diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake index 7d821e6ecf882f..e336ee1bdc47a3 100644 --- a/ports/boost-interval/portfile.cmake +++ b/ports/boost-interval/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-intrusive/CONTROL b/ports/boost-intrusive/CONTROL index 683bac4fc7db20..6ec28a6b33bdf1 100644 --- a/ports/boost-intrusive/CONTROL +++ b/ports/boost-intrusive/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-intrusive Version: 1.74.0 Build-Depends: boost-assert, boost-config, boost-container-hash, boost-core, boost-integer, boost-move, boost-static-assert, boost-vcpkg-helpers diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake index e7830aa9bbbef4..36a0c3f5d432f3 100644 --- a/ports/boost-intrusive/portfile.cmake +++ b/ports/boost-intrusive/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-io/CONTROL b/ports/boost-io/CONTROL index 9c5e44512908a0..a2dd7887b2e50b 100644 --- a/ports/boost-io/CONTROL +++ b/ports/boost-io/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-io Version: 1.74.0 Build-Depends: boost-config, boost-vcpkg-helpers diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake index b66db694edf1a0..41d325c231da4a 100644 --- a/ports/boost-io/portfile.cmake +++ b/ports/boost-io/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL index 1897ad16d2e38e..babcd6bd3e39df 100644 --- a/ports/boost-iostreams/CONTROL +++ b/ports/boost-iostreams/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-iostreams Version: 1.74.0 Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, liblzma, zlib, zstd diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index b9f58e836c0291..6dcb9943813acb 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-iterator/CONTROL b/ports/boost-iterator/CONTROL index 5a428e7191d4f5..767c8bc7b808e0 100644 --- a/ports/boost-iterator/CONTROL +++ b/ports/boost-iterator/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-iterator Version: 1.74.0 Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-conversion, boost-core, boost-detail, boost-function-types, boost-fusion, boost-mpl, boost-optional, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake index d0701a987c29eb..c2e190f7fad221 100644 --- a/ports/boost-iterator/portfile.cmake +++ b/ports/boost-iterator/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-lambda/CONTROL b/ports/boost-lambda/CONTROL index 06c8e93af282b1..3a6a5962c51c90 100644 --- a/ports/boost-lambda/CONTROL +++ b/ports/boost-lambda/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-lambda Version: 1.74.0 Build-Depends: boost-bind, boost-config, boost-detail, boost-mpl, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake index 0288b2e46b95e8..584b135c5683da 100644 --- a/ports/boost-lambda/portfile.cmake +++ b/ports/boost-lambda/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-lexical-cast/CONTROL b/ports/boost-lexical-cast/CONTROL index 061d3e61601caa..e9537e2e98c067 100644 --- a/ports/boost-lexical-cast/CONTROL +++ b/ports/boost-lexical-cast/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-lexical-cast Version: 1.74.0 Build-Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-integer, boost-numeric-conversion, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake index 86d5b3413dbb52..6d7e839c12df4a 100644 --- a/ports/boost-lexical-cast/portfile.cmake +++ b/ports/boost-lexical-cast/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-local-function/CONTROL b/ports/boost-local-function/CONTROL index 73521ec03a3ee5..638b9caeb01dce 100644 --- a/ports/boost-local-function/CONTROL +++ b/ports/boost-local-function/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-local-function Version: 1.74.0 -Build-Depends: boost-config, boost-mpl, boost-preprocessor, boost-scope-exit, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers +Build-Depends: boost-config, boost-mpl, boost-preprocessor, boost-scope-exit, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/local_function Description: Boost local_function module diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake index 60691774c7cc32..5a283822f7cd0b 100644 --- a/ports/boost-local-function/portfile.cmake +++ b/ports/boost-local-function/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL index 306cfa32ac3344..4c37a064f1dc12 100644 --- a/ports/boost-locale/CONTROL +++ b/ports/boost-locale/CONTROL @@ -1,8 +1,8 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-locale Version: 1.74.0 -Port-Version: 1 -Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows) +Port-Version: 3 +Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows&!mingw) Homepage: https://github.com/boostorg/locale Description: Boost locale module Supports: !uwp diff --git a/ports/boost-lockfree/CONTROL b/ports/boost-lockfree/CONTROL index e3fac6b3d3fc99..702814aaaeb2f4 100644 --- a/ports/boost-lockfree/CONTROL +++ b/ports/boost-lockfree/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-lockfree Version: 1.74.0 Build-Depends: boost-align, boost-array, boost-assert, boost-atomic, boost-config, boost-core, boost-integer, boost-mpl, boost-parameter, boost-predef, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake index 9c96cc915eb926..c3aeb98c95b560 100644 --- a/ports/boost-lockfree/portfile.cmake +++ b/ports/boost-lockfree/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-log/CONTROL b/ports/boost-log/CONTROL index 1e80846af814fe..326620a7b3e6ee 100644 --- a/ports/boost-log/CONTROL +++ b/ports/boost-log/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-log Version: 1.74.0 Build-Depends: boost-align, boost-array, boost-asio (!emscripten), boost-assert, boost-atomic, boost-bind, boost-build, boost-compatibility, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-exception, boost-filesystem (!uwp), boost-function-types, boost-fusion, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iterator, boost-lexical-cast, boost-locale (!uwp), boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-parameter, boost-phoenix, boost-predef, boost-preprocessor, boost-property-tree, boost-proto, boost-random, boost-range, boost-regex, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-thread, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi, boost-xpressive diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake index 1bf23bf3246207..a4d9f952281333 100644 --- a/ports/boost-log/portfile.cmake +++ b/ports/boost-log/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-logic/CONTROL b/ports/boost-logic/CONTROL index ea1a2adc89a46a..adbd4f26e6a62d 100644 --- a/ports/boost-logic/CONTROL +++ b/ports/boost-logic/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-logic Version: 1.74.0 Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake index dbed689ceb6c9f..ce546c7b8a8433 100644 --- a/ports/boost-logic/portfile.cmake +++ b/ports/boost-logic/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-math/CONTROL b/ports/boost-math/CONTROL index caa3d6c24b9ae5..7faf2a5ecf4cda 100644 --- a/ports/boost-math/CONTROL +++ b/ports/boost-math/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-math Version: 1.74.0 Build-Depends: boost-array, boost-assert, boost-atomic, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-modular-build-helper, boost-mp11, boost-mpl, boost-predef, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake index 326b94d5586352..dbfb6d17139bd8 100644 --- a/ports/boost-math/portfile.cmake +++ b/ports/boost-math/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-metaparse/CONTROL b/ports/boost-metaparse/CONTROL index a770ad0093d4d2..b7b40f4a2d4bcc 100644 --- a/ports/boost-metaparse/CONTROL +++ b/ports/boost-metaparse/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-metaparse Version: 1.74.0 Build-Depends: boost-config, boost-mpl, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake index 96849893dac3a4..3505d37599e768 100644 --- a/ports/boost-metaparse/portfile.cmake +++ b/ports/boost-metaparse/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index 42efdcaf8df702..b43e12f795ff8b 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,4 +1,4 @@ Source: boost-modular-build-helper Version: 1.74.0 -Port-Version: 1 +Port-Version: 2 Build-Depends: boost-uninstall \ No newline at end of file diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam index 685c26c4ed1cb7..3290a86e0c4c39 100644 --- a/ports/boost-modular-build-helper/user-config.jam +++ b/ports/boost-modular-build-helper/user-config.jam @@ -55,14 +55,28 @@ if "@VCPKG_PLATFORM_TOOLSET@" != "external" } else { - lib icuuc : : "@CURRENT_INSTALLED_DIR@/lib/libicuuc.a" release : : ; - lib icuuc : : "@CURRENT_INSTALLED_DIR@/debug/lib/libicuuc.a" debug : : ; + if "@CMAKE_SYSTEM_NAME@" = "Windows" # We are hopelessly stuck inside boost-modular-build-helper, only this works + { + lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icuuc : : icuucd "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - lib icuin : : "@CURRENT_INSTALLED_DIR@/lib/libicui18n.a" release : : ; - lib icuin : : "@CURRENT_INSTALLED_DIR@/debug/lib/libicui18n.a" debug : : ; + lib icuin : : icuin "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icuin : : icuind "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - lib icudt : : "@CURRENT_INSTALLED_DIR@/lib/libicudata.a" release : : ; - lib icudt : : "@CURRENT_INSTALLED_DIR@/debug/lib/libicudata.a" debug : : ; + lib icudt : : icudt "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icudt : : icudtd "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + } + else + { + lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + + lib icuin : : icui18n "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icuin : : icui18n "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + + lib icudt : : icudata "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icudt : : icudata "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + } } lib iconv : : "@LIBICONV_LIBRARY@" shared shared release : : ; diff --git a/ports/boost-move/CONTROL b/ports/boost-move/CONTROL index 34c8b2cb7ded2b..8553ea4dbfac57 100644 --- a/ports/boost-move/CONTROL +++ b/ports/boost-move/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-move Version: 1.74.0 Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-static-assert, boost-vcpkg-helpers diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake index e04b2d37c0e588..b0a770e4762402 100644 --- a/ports/boost-move/portfile.cmake +++ b/ports/boost-move/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-mp11/CONTROL b/ports/boost-mp11/CONTROL index 38edc681957eec..1050a1cc6bda4b 100644 --- a/ports/boost-mp11/CONTROL +++ b/ports/boost-mp11/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-mp11 Version: 1.74.0 Build-Depends: boost-vcpkg-helpers diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake index 7544f6ad0c6d66..139e102440c094 100644 --- a/ports/boost-mp11/portfile.cmake +++ b/ports/boost-mp11/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-mpi/CONTROL b/ports/boost-mpi/CONTROL index 290b2ae2d2fa37..271e5cb93c9979 100644 --- a/ports/boost-mpi/CONTROL +++ b/ports/boost-mpi/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-mpi Version: 1.74.0 Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-optional, boost-python (!uwp&!(arm&windows)&!emscripten), boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, mpi diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake index a5abbdb4489dd7..592fe1a763d9e1 100644 --- a/ports/boost-mpi/portfile.cmake +++ b/ports/boost-mpi/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-mpl/CONTROL b/ports/boost-mpl/CONTROL index 3b0ec0fd656cc5..d136638247eba9 100644 --- a/ports/boost-mpl/CONTROL +++ b/ports/boost-mpl/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-mpl Version: 1.74.0 Build-Depends: boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake index a1bf6205d12a10..9a0d41fdbf6046 100644 --- a/ports/boost-mpl/portfile.cmake +++ b/ports/boost-mpl/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-msm/CONTROL b/ports/boost-msm/CONTROL index 826d25e38cce7c..a7f887510a0052 100644 --- a/ports/boost-msm/CONTROL +++ b/ports/boost-msm/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-msm Version: 1.74.0 -Build-Depends: boost-any, boost-assert, boost-bind, boost-circular-buffer, boost-config, boost-core, boost-detail, boost-function, boost-fusion, boost-mpl, boost-parameter, boost-phoenix, boost-preprocessor, boost-proto, boost-serialization, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers +Build-Depends: boost-any, boost-assert, boost-bind, boost-circular-buffer, boost-config, boost-core, boost-detail, boost-function, boost-fusion, boost-mpl, boost-parameter, boost-phoenix, boost-preprocessor, boost-proto, boost-serialization, boost-tuple, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/msm Description: Boost msm module diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake index fee2a3054dd252..f0bfe596ffc6a8 100644 --- a/ports/boost-msm/portfile.cmake +++ b/ports/boost-msm/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-multi-array/CONTROL b/ports/boost-multi-array/CONTROL index 3435e129823eb7..c9b81696e680d3 100644 --- a/ports/boost-multi-array/CONTROL +++ b/ports/boost-multi-array/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-multi-array Version: 1.74.0 Build-Depends: boost-compatibility, boost-config, boost-vcpkg-helpers diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake index 614461d306c81f..642082354a3ac0 100644 --- a/ports/boost-multi-array/portfile.cmake +++ b/ports/boost-multi-array/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-multi-index/CONTROL b/ports/boost-multi-index/CONTROL index 2330164d535bc2..8bd6dee7f56e77 100644 --- a/ports/boost-multi-index/CONTROL +++ b/ports/boost-multi-index/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-multi-index Version: 1.74.0 Build-Depends: boost-assert, boost-bind, boost-compatibility, boost-config, boost-container-hash, boost-core, boost-detail, boost-foreach, boost-functional, boost-integer, boost-iterator, boost-move, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake index 268783bfe6c62d..3b153f5ae7089c 100644 --- a/ports/boost-multi-index/portfile.cmake +++ b/ports/boost-multi-index/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-multiprecision/CONTROL b/ports/boost-multiprecision/CONTROL index e939a8124ed1b6..1963b37e38f688 100644 --- a/ports/boost-multiprecision/CONTROL +++ b/ports/boost-multiprecision/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-multiprecision Version: 1.74.0 Build-Depends: boost-array, boost-assert, boost-atomic, boost-config, boost-container-hash, boost-core, boost-functional, boost-integer, boost-lexical-cast, boost-mpl, boost-predef, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake index 5a12230c810438..37a8925960eb4b 100644 --- a/ports/boost-multiprecision/portfile.cmake +++ b/ports/boost-multiprecision/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-nowide/CONTROL b/ports/boost-nowide/CONTROL index 221d419c21dacd..ce6153b2892b71 100644 --- a/ports/boost-nowide/CONTROL +++ b/ports/boost-nowide/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-nowide Version: 1.74.0 Build-Depends: boost-build, boost-config, boost-filesystem (!uwp), boost-modular-build-helper, boost-vcpkg-helpers diff --git a/ports/boost-nowide/portfile.cmake b/ports/boost-nowide/portfile.cmake index fe64820aeab0dc..4083f7afdcb897 100644 --- a/ports/boost-nowide/portfile.cmake +++ b/ports/boost-nowide/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-numeric-conversion/CONTROL b/ports/boost-numeric-conversion/CONTROL index f289df710dfb31..4ae32dff34688e 100644 --- a/ports/boost-numeric-conversion/CONTROL +++ b/ports/boost-numeric-conversion/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-numeric-conversion Version: 1.74.0 Build-Depends: boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake index 0fe82be7279420..73d1221c9f8a4d 100644 --- a/ports/boost-numeric-conversion/portfile.cmake +++ b/ports/boost-numeric-conversion/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-odeint/CONTROL b/ports/boost-odeint/CONTROL index 33c6ff6fb197b7..9e11d759f2342e 100644 --- a/ports/boost-odeint/CONTROL +++ b/ports/boost-odeint/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-odeint Version: 1.74.0 Build-Depends: boost-array, boost-assert, boost-bind, boost-compute, boost-config, boost-core, boost-function, boost-fusion, boost-iterator, boost-math, boost-mpl, boost-multi-array, boost-preprocessor, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-units, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake index 6998fa4fad9f7b..620d657ebe96e6 100644 --- a/ports/boost-odeint/portfile.cmake +++ b/ports/boost-odeint/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-optional/CONTROL b/ports/boost-optional/CONTROL index 7bd7114f48dacd..1b4acb31eafd65 100644 --- a/ports/boost-optional/CONTROL +++ b/ports/boost-optional/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-optional Version: 1.74.0 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-move, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake index 04484bef2000c6..dd49e1a3818cc5 100644 --- a/ports/boost-optional/portfile.cmake +++ b/ports/boost-optional/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-outcome/CONTROL b/ports/boost-outcome/CONTROL index 45132fad192600..ada9df4e058904 100644 --- a/ports/boost-outcome/CONTROL +++ b/ports/boost-outcome/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-outcome Version: 1.74.0 Build-Depends: boost-config, boost-throw-exception, boost-vcpkg-helpers diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake index 7fc140e919276e..3c3077eced609d 100644 --- a/ports/boost-outcome/portfile.cmake +++ b/ports/boost-outcome/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-parameter-python/CONTROL b/ports/boost-parameter-python/CONTROL index e5acabb8fdc579..e8a3149b0f6fc0 100644 --- a/ports/boost-parameter-python/CONTROL +++ b/ports/boost-parameter-python/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-parameter-python Version: 1.74.0 Build-Depends: boost-mpl, boost-parameter, boost-preprocessor, boost-python (!uwp&!(arm&windows)&!emscripten), boost-vcpkg-helpers diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake index 7530e00b28df4c..5cbb96924d891e 100644 --- a/ports/boost-parameter-python/portfile.cmake +++ b/ports/boost-parameter-python/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-parameter/CONTROL b/ports/boost-parameter/CONTROL index 8f443338e5df1f..5c58884b3cefe2 100644 --- a/ports/boost-parameter/CONTROL +++ b/ports/boost-parameter/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-parameter Version: 1.74.0 Build-Depends: boost-config, boost-core, boost-function, boost-fusion, boost-mp11, boost-mpl, boost-optional, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake index 252c1e729b97b1..ff2f51ff5cf4c2 100644 --- a/ports/boost-parameter/portfile.cmake +++ b/ports/boost-parameter/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-phoenix/CONTROL b/ports/boost-phoenix/CONTROL index d7e87736f7d9f5..43a3add46d6434 100644 --- a/ports/boost-phoenix/CONTROL +++ b/ports/boost-phoenix/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-phoenix Version: 1.74.0 Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-fusion, boost-mpl, boost-predef, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake index 4d3deea8cbebe5..76f51053161e82 100644 --- a/ports/boost-phoenix/portfile.cmake +++ b/ports/boost-phoenix/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-poly-collection/CONTROL b/ports/boost-poly-collection/CONTROL index 977808c8a8f1de..ad98b5c70193b0 100644 --- a/ports/boost-poly-collection/CONTROL +++ b/ports/boost-poly-collection/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-poly-collection Version: 1.74.0 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-iterator, boost-mp11, boost-mpl, boost-type-erasure, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake index 0780a7670d8b55..00169163ece20c 100644 --- a/ports/boost-poly-collection/portfile.cmake +++ b/ports/boost-poly-collection/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-polygon/CONTROL b/ports/boost-polygon/CONTROL index 81ebada514e98d..9516e2c03115ec 100644 --- a/ports/boost-polygon/CONTROL +++ b/ports/boost-polygon/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-polygon Version: 1.74.0 Build-Depends: boost-config, boost-integer, boost-vcpkg-helpers diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake index e1fbc2b9a1ac62..672784fcec215c 100644 --- a/ports/boost-polygon/portfile.cmake +++ b/ports/boost-polygon/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-pool/CONTROL b/ports/boost-pool/CONTROL index 1eebeccbdd40a4..4b52837853d70c 100644 --- a/ports/boost-pool/CONTROL +++ b/ports/boost-pool/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-pool Version: 1.74.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers, boost-winapi diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake index f7aae091a99a84..bd2c49661a9897 100644 --- a/ports/boost-pool/portfile.cmake +++ b/ports/boost-pool/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-predef/CONTROL b/ports/boost-predef/CONTROL index 7898cb435f8d19..44e1074c02b37f 100644 --- a/ports/boost-predef/CONTROL +++ b/ports/boost-predef/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-predef Version: 1.74.0 Build-Depends: boost-vcpkg-helpers diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake index af2dd728c25566..2bf83a7a05fdb2 100644 --- a/ports/boost-predef/portfile.cmake +++ b/ports/boost-predef/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-preprocessor/CONTROL b/ports/boost-preprocessor/CONTROL index 2cd698f2e7ee02..5caf6de22f7052 100644 --- a/ports/boost-preprocessor/CONTROL +++ b/ports/boost-preprocessor/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-preprocessor Version: 1.74.0 Build-Depends: boost-vcpkg-helpers diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake index 015450b606321d..ab5b9acd957d5b 100644 --- a/ports/boost-preprocessor/portfile.cmake +++ b/ports/boost-preprocessor/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-process/CONTROL b/ports/boost-process/CONTROL index 7fb827ee8f8b1b..952de81d6a7185 100644 --- a/ports/boost-process/CONTROL +++ b/ports/boost-process/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-process Version: 1.74.0 Build-Depends: boost-algorithm, boost-asio (!emscripten), boost-config, boost-core, boost-filesystem (!uwp), boost-fusion, boost-iterator, boost-move, boost-optional, boost-system, boost-tokenizer, boost-type-index, boost-vcpkg-helpers, boost-winapi diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index 277fd87701d43f..78283981ddb255 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-program-options/CONTROL b/ports/boost-program-options/CONTROL index e1590bd80b366c..e562e77ca7297f 100644 --- a/ports/boost-program-options/CONTROL +++ b/ports/boost-program-options/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-program-options Version: 1.74.0 Build-Depends: boost-any, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake index 0272ab0117b9a6..0252c4e5eda752 100644 --- a/ports/boost-program-options/portfile.cmake +++ b/ports/boost-program-options/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-property-map/CONTROL b/ports/boost-property-map/CONTROL index c42a932abdd670..dd2af6e77d721c 100644 --- a/ports/boost-property-map/CONTROL +++ b/ports/boost-property-map/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-property-map Version: 1.74.0 Build-Depends: boost-any, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-multi-index, boost-optional, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake index 1c6ca2c5e597c7..821e75bdcb6deb 100644 --- a/ports/boost-property-map/portfile.cmake +++ b/ports/boost-property-map/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-property-tree/CONTROL b/ports/boost-property-tree/CONTROL index 28d003761a6b40..e060e128534632 100644 --- a/ports/boost-property-tree/CONTROL +++ b/ports/boost-property-tree/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-property-tree Version: 1.74.0 Build-Depends: boost-any, boost-assert, boost-bind, boost-compatibility, boost-config, boost-core, boost-format, boost-iterator, boost-mpl, boost-multi-index, boost-optional, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake index ab74a3269b27fb..eeb2588f705f89 100644 --- a/ports/boost-property-tree/portfile.cmake +++ b/ports/boost-property-tree/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-proto/CONTROL b/ports/boost-proto/CONTROL index cd16e66d65e9ce..b1794f7d32e948 100644 --- a/ports/boost-proto/CONTROL +++ b/ports/boost-proto/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-proto Version: 1.74.0 -Build-Depends: boost-config, boost-core, boost-detail, boost-fusion, boost-mpl, boost-preprocessor, boost-range, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers +Build-Depends: boost-config, boost-core, boost-detail, boost-fusion, boost-mpl, boost-preprocessor, boost-range, boost-static-assert, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/proto Description: Boost proto module diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake index 6d9c05e1730ea6..c2f5c0ca4fcce6 100644 --- a/ports/boost-proto/portfile.cmake +++ b/ports/boost-proto/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-ptr-container/CONTROL b/ports/boost-ptr-container/CONTROL index c8cffa5fda1052..7f866ff9e777be 100644 --- a/ports/boost-ptr-container/CONTROL +++ b/ports/boost-ptr-container/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-ptr-container Version: 1.74.0 Build-Depends: boost-array, boost-assert, boost-circular-buffer, boost-config, boost-core, boost-iterator, boost-mpl, boost-range, boost-serialization, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake index f8951bccef5db7..421f9715823d75 100644 --- a/ports/boost-ptr-container/portfile.cmake +++ b/ports/boost-ptr-container/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL index 648dcb3a9e4225..af0039b1a0fd18 100644 --- a/ports/boost-python/CONTROL +++ b/ports/boost-python/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-python Version: 1.74.0 Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3 diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index e0ecc3b3c5ad76..3999d7d07decdd 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-qvm/CONTROL b/ports/boost-qvm/CONTROL index 922b8b5a09021e..976bd630cb15f0 100644 --- a/ports/boost-qvm/CONTROL +++ b/ports/boost-qvm/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-qvm Version: 1.74.0 Build-Depends: boost-assert, boost-exception, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake index 340bece25a115e..e912783d78f905 100644 --- a/ports/boost-qvm/portfile.cmake +++ b/ports/boost-qvm/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-random/CONTROL b/ports/boost-random/CONTROL index 4deed44738583b..a2ca50c6abffaa 100644 --- a/ports/boost-random/CONTROL +++ b/ports/boost-random/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-random Version: 1.74.0 Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-dynamic-bitset, boost-integer, boost-io, boost-math, boost-modular-build-helper, boost-mpl, boost-multiprecision, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake index d6b5b934107ed1..cc5e3f66957276 100644 --- a/ports/boost-random/portfile.cmake +++ b/ports/boost-random/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-range/CONTROL b/ports/boost-range/CONTROL index 3455e6c07b1fc4..d9ec39b03b9344 100644 --- a/ports/boost-range/CONTROL +++ b/ports/boost-range/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-range Version: 1.74.0 Build-Depends: boost-array, boost-assert, boost-concept-check, boost-config, boost-container-hash, boost-conversion, boost-core, boost-detail, boost-integer, boost-iterator, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-regex, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake index 927bb361a1e249..50fc98f9af834c 100644 --- a/ports/boost-range/portfile.cmake +++ b/ports/boost-range/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-ratio/CONTROL b/ports/boost-ratio/CONTROL index f86ebc93ccc23e..0cfebf969c7ef5 100644 --- a/ports/boost-ratio/CONTROL +++ b/ports/boost-ratio/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-ratio Version: 1.74.0 Build-Depends: boost-config, boost-core, boost-integer, boost-mpl, boost-rational, boost-static-assert, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake index ef078630bedf28..13b7e0a4a1f5c1 100644 --- a/ports/boost-ratio/portfile.cmake +++ b/ports/boost-ratio/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-rational/CONTROL b/ports/boost-rational/CONTROL index 552f16404074a2..6d54d9f3e2395b 100644 --- a/ports/boost-rational/CONTROL +++ b/ports/boost-rational/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-rational Version: 1.74.0 Build-Depends: boost-assert, boost-config, boost-integer, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake index ff20946293432e..4091d81b05bc8f 100644 --- a/ports/boost-rational/portfile.cmake +++ b/ports/boost-rational/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-regex/CONTROL b/ports/boost-regex/CONTROL index ae428297137a42..5fc4a86a27713e 100644 --- a/ports/boost-regex/CONTROL +++ b/ports/boost-regex/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-regex Version: 1.74.0 Build-Depends: boost-assert, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-predef, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake index 8efe2ae88fcd55..93823f7208b478 100644 --- a/ports/boost-regex/portfile.cmake +++ b/ports/boost-regex/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-safe-numerics/CONTROL b/ports/boost-safe-numerics/CONTROL index c4194f5a1cead4..016088e0e9165d 100644 --- a/ports/boost-safe-numerics/CONTROL +++ b/ports/boost-safe-numerics/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-safe-numerics Version: 1.74.0 Build-Depends: boost-concept-check, boost-config, boost-core, boost-integer, boost-logic, boost-mp11, boost-vcpkg-helpers diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake index 80b98d6b48fe63..d0337ede8fef19 100644 --- a/ports/boost-safe-numerics/portfile.cmake +++ b/ports/boost-safe-numerics/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-scope-exit/CONTROL b/ports/boost-scope-exit/CONTROL index 8aaf116fc840bc..483bd125c62377 100644 --- a/ports/boost-scope-exit/CONTROL +++ b/ports/boost-scope-exit/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-scope-exit Version: 1.74.0 -Build-Depends: boost-config, boost-detail, boost-function, boost-preprocessor, boost-typeof, boost-type-traits, boost-vcpkg-helpers +Build-Depends: boost-config, boost-detail, boost-function, boost-preprocessor, boost-type-traits, boost-typeof, boost-vcpkg-helpers Homepage: https://github.com/boostorg/scope_exit Description: Boost scope_exit module diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake index 8d30e99bb9be56..e6ebbf60c040e2 100644 --- a/ports/boost-scope-exit/portfile.cmake +++ b/ports/boost-scope-exit/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-serialization/CONTROL b/ports/boost-serialization/CONTROL index f8503d868f8cea..0863c242fd010c 100644 --- a/ports/boost-serialization/CONTROL +++ b/ports/boost-serialization/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-serialization Version: 1.74.0 Build-Depends: boost-array, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-spirit, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake index 14df37eef9ba8c..da56bf0f9dcb01 100644 --- a/ports/boost-serialization/portfile.cmake +++ b/ports/boost-serialization/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-signals2/CONTROL b/ports/boost-signals2/CONTROL index a45238d7951d5c..45756359cb03fe 100644 --- a/ports/boost-signals2/CONTROL +++ b/ports/boost-signals2/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-signals2 Version: 1.74.0 Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-iterator, boost-mpl, boost-optional, boost-parameter, boost-predef, boost-preprocessor, boost-smart-ptr, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake index 9d0d1051bc9f2b..7d45fdebf771ea 100644 --- a/ports/boost-signals2/portfile.cmake +++ b/ports/boost-signals2/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-smart-ptr/CONTROL b/ports/boost-smart-ptr/CONTROL index 95a857967abdad..adfc17d3bdb678 100644 --- a/ports/boost-smart-ptr/CONTROL +++ b/ports/boost-smart-ptr/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-smart-ptr Version: 1.74.0 Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-move, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake index f8a737f7e927e4..b4a51a944bceb8 100644 --- a/ports/boost-smart-ptr/portfile.cmake +++ b/ports/boost-smart-ptr/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-sort/CONTROL b/ports/boost-sort/CONTROL index ad7d8d929ca9e1..a9fe86fb49ab56 100644 --- a/ports/boost-sort/CONTROL +++ b/ports/boost-sort/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-sort Version: 1.74.0 Build-Depends: boost-integer, boost-range, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake index 59f3e721fa9223..9737c5212d6d8c 100644 --- a/ports/boost-sort/portfile.cmake +++ b/ports/boost-sort/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-spirit/CONTROL b/ports/boost-spirit/CONTROL index f1e8aa7efadcfa..d113d3f78fadf9 100644 --- a/ports/boost-spirit/CONTROL +++ b/ports/boost-spirit/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-spirit Version: 1.74.0 -Build-Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-endian, boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iterator, boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers +Build-Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-endian, boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iterator, boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-type-traits, boost-typeof, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers Homepage: https://github.com/boostorg/spirit Description: Boost spirit module diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake index c80785aa34638f..cfac19be57a34c 100644 --- a/ports/boost-spirit/portfile.cmake +++ b/ports/boost-spirit/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-stacktrace/CONTROL b/ports/boost-stacktrace/CONTROL index a3b948b8e19957..d02394f4283bea 100644 --- a/ports/boost-stacktrace/CONTROL +++ b/ports/boost-stacktrace/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-stacktrace Version: 1.74.0 Build-Depends: boost-array, boost-build, boost-config, boost-container-hash, boost-core, boost-modular-build-helper, boost-predef, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake index 14fd345d321a3f..f86f55f960b07f 100644 --- a/ports/boost-stacktrace/portfile.cmake +++ b/ports/boost-stacktrace/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-statechart/CONTROL b/ports/boost-statechart/CONTROL index 9cae4b706de417..287fc06e20d5de 100644 --- a/ports/boost-statechart/CONTROL +++ b/ports/boost-statechart/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-statechart Version: 1.74.0 Build-Depends: boost-assert, boost-bind, boost-config, boost-conversion, boost-core, boost-detail, boost-function, boost-mpl, boost-smart-ptr, boost-static-assert, boost-thread, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake index 556321099fe811..54de3aa44549f6 100644 --- a/ports/boost-statechart/portfile.cmake +++ b/ports/boost-statechart/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-static-assert/CONTROL b/ports/boost-static-assert/CONTROL index fde3aa1013afbe..ed90a1771ad557 100644 --- a/ports/boost-static-assert/CONTROL +++ b/ports/boost-static-assert/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-static-assert Version: 1.74.0 Build-Depends: boost-config, boost-detail, boost-vcpkg-helpers diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake index 91cf83b0d922c3..b4d04e3a501a7f 100644 --- a/ports/boost-static-assert/portfile.cmake +++ b/ports/boost-static-assert/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-static-string/CONTROL b/ports/boost-static-string/CONTROL index 5473762ce9ab32..9a1d5566c2b30e 100644 --- a/ports/boost-static-string/CONTROL +++ b/ports/boost-static-string/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-static-string Version: 1.74.0 Build-Depends: boost-assert, boost-container-hash, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-static-string/portfile.cmake b/ports/boost-static-string/portfile.cmake index f620f08c553193..88d875d907b8bf 100644 --- a/ports/boost-static-string/portfile.cmake +++ b/ports/boost-static-string/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-stl-interfaces/CONTROL b/ports/boost-stl-interfaces/CONTROL index 6698392ac37a09..62e41b70371686 100644 --- a/ports/boost-stl-interfaces/CONTROL +++ b/ports/boost-stl-interfaces/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-stl-interfaces Version: 1.74.0 Build-Depends: boost-assert, boost-config, boost-vcpkg-helpers diff --git a/ports/boost-stl-interfaces/portfile.cmake b/ports/boost-stl-interfaces/portfile.cmake index ee03b843e55f8f..a17264a900f45e 100644 --- a/ports/boost-stl-interfaces/portfile.cmake +++ b/ports/boost-stl-interfaces/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-system/CONTROL b/ports/boost-system/CONTROL index d6467d473d9911..9aefa00e152fba 100644 --- a/ports/boost-system/CONTROL +++ b/ports/boost-system/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-system Version: 1.74.0 Build-Depends: boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-vcpkg-helpers, boost-winapi diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake index 9a8125580ed87f..affc1b4493a19c 100644 --- a/ports/boost-system/portfile.cmake +++ b/ports/boost-system/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_buildpath_length_warning(37) diff --git a/ports/boost-test/CONTROL b/ports/boost-test/CONTROL index bac3f677eadd45..4e3908cbbb41ff 100644 --- a/ports/boost-test/CONTROL +++ b/ports/boost-test/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-test Version: 1.74.0 Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index 8782922e3e9632..b97f54725d9e1d 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL index 3c071fd45a83b9..242ae047d4309d 100644 --- a/ports/boost-thread/CONTROL +++ b/ports/boost-thread/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-thread Version: 1.74.0 Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index 269f94e2a9702b..af45035a9c28e0 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-throw-exception/CONTROL b/ports/boost-throw-exception/CONTROL index 291e006326fd75..f6416dbeff00e2 100644 --- a/ports/boost-throw-exception/CONTROL +++ b/ports/boost-throw-exception/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-throw-exception Version: 1.74.0 Build-Depends: boost-assert, boost-config, boost-vcpkg-helpers diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake index 4e1baad63e286c..b0dd9d16821a6c 100644 --- a/ports/boost-throw-exception/portfile.cmake +++ b/ports/boost-throw-exception/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-timer/CONTROL b/ports/boost-timer/CONTROL index 9f6ff90fd6985b..bc3675b993a421 100644 --- a/ports/boost-timer/CONTROL +++ b/ports/boost-timer/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-timer Version: 1.74.0 Build-Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-predef, boost-system, boost-throw-exception, boost-vcpkg-helpers diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake index e0d1a67480b8e7..a14c723b61b3db 100644 --- a/ports/boost-timer/portfile.cmake +++ b/ports/boost-timer/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-tokenizer/CONTROL b/ports/boost-tokenizer/CONTROL index 799c5f05457ff4..da83ee431dd21d 100644 --- a/ports/boost-tokenizer/CONTROL +++ b/ports/boost-tokenizer/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-tokenizer Version: 1.74.0 Build-Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake index 05e12f658e56eb..b262ad3464b400 100644 --- a/ports/boost-tokenizer/portfile.cmake +++ b/ports/boost-tokenizer/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-tti/CONTROL b/ports/boost-tti/CONTROL index 56ad077e46ea6e..12617f73f40633 100644 --- a/ports/boost-tti/CONTROL +++ b/ports/boost-tti/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-tti Version: 1.74.0 Build-Depends: boost-config, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake index f91d3f2d2db6a7..ccef15caa70559 100644 --- a/ports/boost-tti/portfile.cmake +++ b/ports/boost-tti/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-tuple/CONTROL b/ports/boost-tuple/CONTROL index 78790d39432564..e28415a0f12a7e 100644 --- a/ports/boost-tuple/CONTROL +++ b/ports/boost-tuple/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-tuple Version: 1.74.0 Build-Depends: boost-config, boost-core, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake index 6841e443699322..184e176859e1ba 100644 --- a/ports/boost-tuple/portfile.cmake +++ b/ports/boost-tuple/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-type-erasure/CONTROL b/ports/boost-type-erasure/CONTROL index 3374c3f2ddf5ee..15c8612c58c5ca 100644 --- a/ports/boost-type-erasure/CONTROL +++ b/ports/boost-type-erasure/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-type-erasure Version: 1.74.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-fusion, boost-iterator, boost-modular-build-helper, boost-mp11, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-thread, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-vmd +Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-fusion, boost-iterator, boost-modular-build-helper, boost-mp11, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-thread, boost-throw-exception, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers, boost-vmd Homepage: https://github.com/boostorg/type_erasure Description: Boost type_erasure module diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake index dc8fcefa758b04..3277da4e0fcfdf 100644 --- a/ports/boost-type-erasure/portfile.cmake +++ b/ports/boost-type-erasure/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-type-index/CONTROL b/ports/boost-type-index/CONTROL index fcfa2272034ecb..44d913ae125ae9 100644 --- a/ports/boost-type-index/CONTROL +++ b/ports/boost-type-index/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-type-index Version: 1.74.0 Build-Depends: boost-config, boost-container-hash, boost-core, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake index d24367d6fd919d..571f4c98e663d0 100644 --- a/ports/boost-type-index/portfile.cmake +++ b/ports/boost-type-index/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-type-traits/CONTROL b/ports/boost-type-traits/CONTROL index a5c67a52705096..7d3a192b6cbf9c 100644 --- a/ports/boost-type-traits/CONTROL +++ b/ports/boost-type-traits/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-type-traits Version: 1.74.0 Build-Depends: boost-config, boost-detail, boost-static-assert, boost-vcpkg-helpers diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake index 971e4e673568bc..de4caf559c821e 100644 --- a/ports/boost-type-traits/portfile.cmake +++ b/ports/boost-type-traits/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-typeof/CONTROL b/ports/boost-typeof/CONTROL index bcca6743ab7d17..706cd46e14492f 100644 --- a/ports/boost-typeof/CONTROL +++ b/ports/boost-typeof/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-typeof Version: 1.74.0 Build-Depends: boost-config, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake index 4e292759eb9bf2..3ad43602999a4d 100644 --- a/ports/boost-typeof/portfile.cmake +++ b/ports/boost-typeof/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-ublas/CONTROL b/ports/boost-ublas/CONTROL index 6002ff3a2feee1..5cfa577c06a83c 100644 --- a/ports/boost-ublas/CONTROL +++ b/ports/boost-ublas/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-ublas Version: 1.74.0 -Build-Depends: boost-compute, boost-concept-check, boost-config, boost-core, boost-iterator, boost-mpl, boost-range, boost-serialization, boost-smart-ptr, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers +Build-Depends: boost-compute, boost-concept-check, boost-config, boost-core, boost-iterator, boost-mpl, boost-range, boost-serialization, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/ublas Description: Boost ublas module diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake index 3dc4c29724087b..5437fc444ce4d8 100644 --- a/ports/boost-ublas/portfile.cmake +++ b/ports/boost-ublas/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-units/CONTROL b/ports/boost-units/CONTROL index 9119c89c627fd8..c037bfbaea7259 100644 --- a/ports/boost-units/CONTROL +++ b/ports/boost-units/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-units Version: 1.74.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-io, boost-lambda, boost-math, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers +Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-io, boost-lambda, boost-math, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/units Description: Boost units module diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake index c5ad517206a469..26198d9a5da4ba 100644 --- a/ports/boost-units/portfile.cmake +++ b/ports/boost-units/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-unordered/CONTROL b/ports/boost-unordered/CONTROL index f2e489f8fbf0c3..ab147a528289c3 100644 --- a/ports/boost-unordered/CONTROL +++ b/ports/boost-unordered/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-unordered Version: 1.74.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container, boost-container-hash, boost-core, boost-detail, boost-functional, boost-move, boost-predef, boost-preprocessor, boost-smart-ptr, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake index b4a9d3e034b545..8ddacd79754a7d 100644 --- a/ports/boost-unordered/portfile.cmake +++ b/ports/boost-unordered/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-utility/CONTROL b/ports/boost-utility/CONTROL index b83c4c3a6306be..74c4f342da80a0 100644 --- a/ports/boost-utility/CONTROL +++ b/ports/boost-utility/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-utility Version: 1.74.0 Build-Depends: boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-io, boost-preprocessor, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake index 8458951085ee84..d166642805eccc 100644 --- a/ports/boost-utility/portfile.cmake +++ b/ports/boost-utility/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-uuid/CONTROL b/ports/boost-uuid/CONTROL index c4a80cbfddab55..6a553b31bd1367 100644 --- a/ports/boost-uuid/CONTROL +++ b/ports/boost-uuid/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-uuid Version: 1.74.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container-hash, boost-conversion, boost-core, boost-integer, boost-io, boost-move, boost-numeric-conversion, boost-predef, boost-random, boost-serialization, boost-static-assert, boost-throw-exception, boost-tti, boost-type-traits, boost-vcpkg-helpers, boost-winapi diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake index fb8d6c47ec619d..fe90339f3e51fa 100644 --- a/ports/boost-uuid/portfile.cmake +++ b/ports/boost-uuid/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-variant/CONTROL b/ports/boost-variant/CONTROL index 67609a8d92a949..d9dcb0acf5498b 100644 --- a/ports/boost-variant/CONTROL +++ b/ports/boost-variant/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-variant Version: 1.74.0 Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-move, boost-mpl, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake index 710f3a9a6c2d1d..6bd5ded8a9c449 100644 --- a/ports/boost-variant/portfile.cmake +++ b/ports/boost-variant/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-variant2/CONTROL b/ports/boost-variant2/CONTROL index af73b7a3b1cf37..76f6ff577d4330 100644 --- a/ports/boost-variant2/CONTROL +++ b/ports/boost-variant2/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-variant2 Version: 1.74.0 Build-Depends: boost-config, boost-detail, boost-integer, boost-mp11, boost-vcpkg-helpers diff --git a/ports/boost-variant2/portfile.cmake b/ports/boost-variant2/portfile.cmake index 3535dedf6b275e..128809d8f4644e 100644 --- a/ports/boost-variant2/portfile.cmake +++ b/ports/boost-variant2/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-vmd/CONTROL b/ports/boost-vmd/CONTROL index e9472648f2021d..045bcba9f43044 100644 --- a/ports/boost-vmd/CONTROL +++ b/ports/boost-vmd/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-vmd Version: 1.74.0 Build-Depends: boost-preprocessor, boost-vcpkg-helpers diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake index 8a8e03a1e05bd3..bba7e7d065a16f 100644 --- a/ports/boost-vmd/portfile.cmake +++ b/ports/boost-vmd/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-wave/CONTROL b/ports/boost-wave/CONTROL index 008afdab79e646..d8d683b9e9171d 100644 --- a/ports/boost-wave/CONTROL +++ b/ports/boost-wave/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-wave Version: 1.74.0 Build-Depends: boost-assert, boost-build, boost-concept-check, boost-config, boost-core, boost-detail, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-multi-index, boost-pool, boost-preprocessor, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake index 08bad0823f8c53..325fd0ffc09de2 100644 --- a/ports/boost-wave/portfile.cmake +++ b/ports/boost-wave/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-winapi/CONTROL b/ports/boost-winapi/CONTROL index 7b647c9931e951..ba62e109a5e352 100644 --- a/ports/boost-winapi/CONTROL +++ b/ports/boost-winapi/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-winapi Version: 1.74.0 Build-Depends: boost-config, boost-predef, boost-vcpkg-helpers diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake index 96c8daff8d5e1a..f43b5a74f951bb 100644 --- a/ports/boost-winapi/portfile.cmake +++ b/ports/boost-winapi/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-xpressive/CONTROL b/ports/boost-xpressive/CONTROL index 4096a14072d5f9..5a01b5e6e5ad51 100644 --- a/ports/boost-xpressive/CONTROL +++ b/ports/boost-xpressive/CONTROL @@ -1,6 +1,6 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-xpressive Version: 1.74.0 -Build-Depends: boost-assert, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-exception, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers +Build-Depends: boost-assert, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-exception, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/xpressive Description: Boost xpressive module diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake index 383947e2bb39f7..83e6aeb012ea9f 100644 --- a/ports/boost-xpressive/portfile.cmake +++ b/ports/boost-xpressive/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost-yap/CONTROL b/ports/boost-yap/CONTROL index d47eea6008d709..76143a5c8d654d 100644 --- a/ports/boost-yap/CONTROL +++ b/ports/boost-yap/CONTROL @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-yap Version: 1.74.0 Build-Depends: boost-hana, boost-preprocessor, boost-type-index, boost-vcpkg-helpers diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake index 8784ad1f8cdba1..ed02bb3c08c223 100644 --- a/ports/boost-yap/portfile.cmake +++ b/ports/boost-yap/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index f27b3583446794..dcc502b65cea01 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,10 +1,10 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 Source: boost Version: 1.74.0 Port-Version: Homepage: https://boost.org Description: Peer-reviewed portable C++ source libraries -Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio (!emscripten), boost-assert, boost-assign, boost-atomic, boost-beast (!emscripten), boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-context (!uwp&!emscripten), boost-contract, boost-conversion, boost-convert, boost-core, boost-coroutine (!arm&!uwp&!emscripten), boost-coroutine2 (!emscripten), boost-crc, boost-date-time, boost-detail, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (!osx&!uwp&!arm&!emscripten), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-functional, boost-function-types, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-histogram, boost-hof, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lambda, boost-lexical-cast, boost-locale (!uwp), boost-local-function, boost-lockfree, boost-log (!uwp&!emscripten), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-nowide, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-optional, boost-outcome, boost-parameter, boost-parameter-python (!emscripten), boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process (!emscripten), boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (!uwp&!(arm&windows)&!emscripten), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-scope-exit, boost-serialization, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-static-string, boost-stl-interfaces, boost-system, boost-test (!uwp), boost-thread, boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure, boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-variant2, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap +Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio (!emscripten), boost-assert, boost-assign, boost-atomic, boost-beast (!emscripten), boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-context (!uwp&!emscripten), boost-contract, boost-conversion, boost-convert, boost-core, boost-coroutine (!arm&!uwp&!emscripten), boost-coroutine2 (!emscripten), boost-crc, boost-date-time, boost-detail, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (!osx&!uwp&!arm&!emscripten), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-function-types, boost-functional, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-histogram, boost-hof, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lambda, boost-lexical-cast, boost-local-function, boost-locale (!uwp), boost-lockfree, boost-log (!uwp&!emscripten), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multi-array, boost-multi-index, boost-multiprecision, boost-nowide, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-optional, boost-outcome, boost-parameter, boost-parameter-python (!emscripten), boost-phoenix, boost-poly-collection, boost-polygon, boost-pool, boost-predef, boost-preprocessor, boost-process (!emscripten), boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (!uwp&!(arm&windows)&!emscripten), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-scope-exit, boost-serialization, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-static-string, boost-stl-interfaces, boost-system, boost-test (!uwp), boost-thread, boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-type-erasure, boost-type-index, boost-type-traits, boost-typeof, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-variant2, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap Feature: mpi Description: Build with MPI support diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL index 411e6867bd1e00..344d34c517dce1 100644 --- a/ports/icu/CONTROL +++ b/ports/icu/CONTROL @@ -1,6 +1,6 @@ Source: icu Version: 67.1 -Port-Version: 6 +Port-Version: 7 Homepage: http://icu-project.org/apiref/icu4c/ Description: Mature and widely used Unicode and localization library. Supports: !(arm|uwp) diff --git a/ports/icu/mingw-remove-bsymbolic.patch b/ports/icu/mingw-remove-bsymbolic.patch new file mode 100644 index 00000000000000..984bba29344c6c --- /dev/null +++ b/ports/icu/mingw-remove-bsymbolic.patch @@ -0,0 +1,26 @@ +diff --git a/source/config/mh-mingw b/source/config/mh-mingw +index a28e47b..7d77ec0 100644 +--- a/source/config/mh-mingw ++++ b/source/config/mh-mingw +@@ -57,7 +57,7 @@ LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS) + #LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) + + ## Shared library options +-LD_SOOPTIONS= -Wl,-Bsymbolic ++LD_SOOPTIONS= + + ## Commands to make a shared library + SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# +diff --git a/source/config/mh-mingw64 b/source/config/mh-mingw64 +index afe2c0e..ca0b8d4 100644 +--- a/source/config/mh-mingw64 ++++ b/source/config/mh-mingw64 +@@ -57,7 +57,7 @@ LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS) + #LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) + + ## Shared library options +-LD_SOOPTIONS= -Wl,-Bsymbolic ++LD_SOOPTIONS= + + ## Commands to make a shared library + SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# diff --git a/ports/icu/mingw-remove-version-from-link-flags.patch b/ports/icu/mingw-remove-version-from-link-flags.patch new file mode 100644 index 00000000000000..a0b4657ecf05b7 --- /dev/null +++ b/ports/icu/mingw-remove-version-from-link-flags.patch @@ -0,0 +1,48 @@ +diff --git a/source/config/mh-mingw b/source/config/mh-mingw +index 7d77ec0..30f6e5b 100644 +--- a/source/config/mh-mingw ++++ b/source/config/mh-mingw +@@ -101,11 +101,14 @@ LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) + #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}" + #SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}" + +-#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" +-ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" +-ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" +-ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" +-ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" ++#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)" ++ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)" ++ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)" ++ICULIBS_LX="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUTEX_STUBNAME)$(ICULIBSUFFIX)" ++ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)" ++ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)" ++ICULIBS_CTESTFW="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX)" ++ICULIBS_TOOLUTIL="-l$(ICUPREFIX)tu$(ICULIBSUFFIX)" + #SH# + #SH## ICULIBS is the set of libraries your application should link + #SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well. +diff --git a/source/config/mh-mingw64 b/source/config/mh-mingw64 +index ca0b8d4..fb64c56 100644 +--- a/source/config/mh-mingw64 ++++ b/source/config/mh-mingw64 +@@ -101,11 +101,14 @@ LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) + #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}" + #SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}" + +-#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" +-ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" +-ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" +-ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" +-ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" ++#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)" ++ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)" ++ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)" ++ICULIBS_LX="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUTEX_STUBNAME)$(ICULIBSUFFIX)" ++ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)" ++ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)" ++ICULIBS_CTESTFW="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX)" ++ICULIBS_TOOLUTIL="-l$(ICUPREFIX)tu$(ICULIBSUFFIX)" + #SH# + #SH## ICULIBS is the set of libraries your application should link + #SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well. diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index ffddfe572808e1..988620486e6308 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -20,6 +20,8 @@ vcpkg_extract_source_archive_ex( ${CMAKE_CURRENT_LIST_DIR}/remove-MD-from-configure.patch ${CMAKE_CURRENT_LIST_DIR}/fix_parallel_build_on_windows.patch ${CMAKE_CURRENT_LIST_DIR}/fix-extra.patch + ${CMAKE_CURRENT_LIST_DIR}/mingw-remove-bsymbolic.patch + ${CMAKE_CURRENT_LIST_DIR}/mingw-remove-version-from-link-flags.patch ) vcpkg_find_acquire_program(PYTHON3) @@ -74,7 +76,11 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) else() - set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --host=i686-pc-mingw32") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --host=x86_64-w64-mingw32") + else() + set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --host=i686-w64-mingw32") + endif() # Acquire tools vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.16) @@ -88,12 +94,23 @@ else() set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.16) file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source) - if(VCPKG_CRT_LINKAGE STREQUAL static) - set(ICU_RUNTIME "-MT") + if(NOT VCPKG_TARGET_IS_MINGW) + set(PLATFORM "MSYS/MSVC") + if(VCPKG_CRT_LINKAGE STREQUAL static) + set(ICU_RUNTIME "-MT") + else() + set(ICU_RUNTIME "-MD") + endif() + set(EXTRA_RELEASE_FLAGS "${ICU_RUNTIME} -O2 -Oi -Zi -FS") + set(RELEASE_LDFLAGS "-DEBUG -INCREMENTAL:NO -OPT:REF -OPT:ICF") + set(EXTRA_DEBUG_FLAGS "${ICU_RUNTIME}d -Od -Zi -FS -RTC1") + set(DEBUG_LDFLAGS "-DEBUG") else() - set(ICU_RUNTIME "-MD") + set(PLATFORM "MinGW") + set(ENV{CC} "${CMAKE_C_COMPILER}") + set(ENV{CXX} "${CMAKE_CXX_COMPILER}") endif() - + if(CMAKE_HOST_WIN32 AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") set(ICU_MSVC_CROSS_COMPILE_TO_ARM ON) # Need the buildtrees dir, as the required files (e.g. icucross.mk) are not part of the installed package @@ -111,12 +128,12 @@ else() message(STATUS "Configuring ${RELEASE_TRIPLET}") file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}) file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}) - set(ENV{CFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi -FS ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}") - set(ENV{CXXFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi -FS ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE}") - set(ENV{LDFLAGS} "-DEBUG -INCREMENTAL:NO -OPT:REF -OPT:ICF") + set(ENV{CFLAGS} "${EXTRA_RELEASE_FLAGS} ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}") + set(ENV{CXXFLAGS} "${EXTRA_RELEASE_FLAGS} ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE}") + set(ENV{LDFLAGS} "${RELEASE_LDFLAGS}") vcpkg_execute_required_process( COMMAND ${BASH} --noprofile --norc -c - "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELEASE}" + "${SOURCE_PATH}/source/runConfigureICU ${PLATFORM} ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELEASE}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" LOGNAME "configure-${RELEASE_TRIPLET}") message(STATUS "Configuring ${RELEASE_TRIPLET} done") @@ -127,12 +144,12 @@ else() message(STATUS "Configuring ${DEBUG_TRIPLET}") file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}) file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}) - set(ENV{CFLAGS} "${ICU_RUNTIME}d -Od -Zi -FS -RTC1 ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}") - set(ENV{CXXFLAGS} "${ICU_RUNTIME}d -Od -Zi -FS -RTC1 ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG}") - set(ENV{LDFLAGS} "-DEBUG") + set(ENV{CFLAGS} "${EXTRA_DEBUG_FLAGS} ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}") + set(ENV{CXXFLAGS} "${EXTRA_DEBUG_FLAGS} ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG}") + set(ENV{LDFLAGS} "${DEBUG_LDFLAGS}") vcpkg_execute_required_process( COMMAND ${BASH} --noprofile --norc -c - "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEBUG}" + "${SOURCE_PATH}/source/runConfigureICU ${PLATFORM} ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEBUG}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}" LOGNAME "configure-${DEBUG_TRIPLET}") message(STATUS "Configuring ${DEBUG_TRIPLET} done") @@ -175,9 +192,20 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") message(STATUS "Package ${DEBUG_TRIPLET} done") endif() +if(NOT VCPKG_TARGET_IS_MINGW) # MinGW already has its files placed in the correct directory + file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/bin + ${CURRENT_PACKAGES_DIR}/debug/bin) +else() + file(GLOB ICU_TOOLS + ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_HOST_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_HOST_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/icu-config + ${CURRENT_PACKAGES_DIR}/debug/bin/icu-config) + file(REMOVE ${ICU_TOOLS}) +endif() + file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/share ${CURRENT_PACKAGES_DIR}/debug/share @@ -206,11 +234,11 @@ else() # see https://gitlab.kitware.com/cmake/cmake/issues/16617 foreach(MODULE dt in io tu uc) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/sicu${MODULE}.lib ${CURRENT_PACKAGES_DIR}/lib/icu${MODULE}.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/sicu${MODULE}${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/lib/icu${MODULE}${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sicu${MODULE}d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/icu${MODULE}d.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sicu${MODULE}d${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/icu${MODULE}d${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) endif() endforeach() diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 29ab213dada4e7..b6cbdc98d8e06d 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -25,7 +25,7 @@ else # Optionally clear this array when moving to a new boost version $port_versions = @{ #e.g. "asio" = 1; - "locale" = 1; + "locale" = 3; } $per_port_data = @{ @@ -328,7 +328,7 @@ foreach ($library in $libraries) elseif ($_ -match "none|none_t") { "optional" } elseif ($_ -eq "limits") { "compatibility" } elseif ($_ -match "cstdfloat|math_fwd") { "math" } - elseif ($_ -eq "cast") { "conversion"; "numeric_conversion" } # DEPRECATED header file, includes and + elseif ($_ -eq "cast") { "conversion"; "numeric_conversion" } # DEPRECATED header file, includes and elseif ($_ -match "polymorphic_cast|implicit_cast") { "conversion" } elseif ($_ -eq "nondet_random") { "random" } elseif ($_ -eq "memory_order") { "atomic" } @@ -400,7 +400,7 @@ foreach ($library in $libraries) } elseif ($library -eq "locale") { - $deps += @("libiconv (!uwp&!windows)", "boost-system") + $deps += @("libiconv (!uwp&!windows&!mingw)", "boost-system") } elseif ($library -eq "asio") { diff --git a/toolsrc/src/vcpkg/platform-expression.cpp b/toolsrc/src/vcpkg/platform-expression.cpp index 9132d4be47e377..b87ca4ce91bd5b 100644 --- a/toolsrc/src/vcpkg/platform-expression.cpp +++ b/toolsrc/src/vcpkg/platform-expression.cpp @@ -23,6 +23,7 @@ namespace vcpkg::PlatformExpression wasm32, windows, + mingw, linux, osx, uwp, @@ -41,6 +42,7 @@ namespace vcpkg::PlatformExpression {"arm64", Identifier::arm64}, {"wasm32", Identifier::wasm32}, {"windows", Identifier::windows}, + {"mingw", Identifier::mingw}, {"linux", Identifier::linux}, {"osx", Identifier::osx}, {"uwp", Identifier::uwp}, @@ -382,6 +384,7 @@ namespace vcpkg::PlatformExpression case Identifier::windows: return true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "") || true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "WindowsStore"); + case Identifier::mingw: return true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "MinGW"); case Identifier::linux: return true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "Linux"); case Identifier::osx: return true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "Darwin"); case Identifier::uwp: From 498bf43744b42daf0aa84c08b648840b7f9ecfe2 Mon Sep 17 00:00:00 2001 From: Jocelyn GENNESSEAUX Date: Wed, 16 Dec 2020 00:18:13 +0100 Subject: [PATCH 0302/1694] p-ranav/csv2 update (#15104) --- ports/p-ranav-csv2/CONTROL | 2 +- ports/p-ranav-csv2/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/p-ranav-csv2/CONTROL b/ports/p-ranav-csv2/CONTROL index 349d7df53e5128..003c97b0bf3f1b 100644 --- a/ports/p-ranav-csv2/CONTROL +++ b/ports/p-ranav-csv2/CONTROL @@ -1,4 +1,4 @@ Source: p-ranav-csv2 -Version: 2020-06-02 +Version: 2020-12-14 Homepage: https://github.com/p-ranav/csv2 Description: CSV for modern C++ diff --git a/ports/p-ranav-csv2/portfile.cmake b/ports/p-ranav-csv2/portfile.cmake index 32942c90e222ca..99196f53d25129 100644 --- a/ports/p-ranav-csv2/portfile.cmake +++ b/ports/p-ranav-csv2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO p-ranav/csv2 - REF d659f90b637bb0de6c32246583fc4bb7caade215 - SHA512 d00b1356907a7e22529e3ac4a7b979c6868311e8a98e4fd8b0a8b1f0d94b2425854242649a80a933084202834f5cee1fe17b51476fcc17e87b00e1e3cb8ed0e9 + REF a20992f7a1b75215609037c4cc66f690e8691aab + SHA512 4459f34d3d3d2c256743d93dd9c66ac584366120e3c8829173e6f047bf7dce2b08284c82af360a274dea0d43f5d6e1c84bcae51bf4de97751cf41a2fd48cb62b HEAD_REF master ) From db4afa4d9c74d255469e003bd8cabb087a4f93c8 Mon Sep 17 00:00:00 2001 From: ewertons Date: Tue, 15 Dec 2020 15:19:17 -0800 Subject: [PATCH 0303/1694] Azure-IoT-Sdk for C release 2020-12-09 (#15109) --- ports/azure-c-shared-utility/CONTROL | 2 +- ports/azure-c-shared-utility/portfile.cmake | 4 ++-- ports/azure-iot-sdk-c/CONTROL | 3 +-- ports/azure-iot-sdk-c/portfile.cmake | 4 ++-- ports/azure-uamqp-c/CONTROL | 2 +- ports/azure-uamqp-c/portfile.cmake | 4 ++-- ports/azure-uhttp-c/CONTROL | 2 +- ports/azure-uhttp-c/portfile.cmake | 4 ++-- ports/azure-umqtt-c/CONTROL | 2 +- ports/azure-umqtt-c/portfile.cmake | 4 ++-- 10 files changed, 15 insertions(+), 16 deletions(-) diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL index 6546575b1f0f68..4a2422cfb94dea 100644 --- a/ports/azure-c-shared-utility/CONTROL +++ b/ports/azure-c-shared-utility/CONTROL @@ -1,5 +1,5 @@ Source: azure-c-shared-utility -Version: 2020-07-19 +Version: 2020-12-09 Description: Azure C SDKs common code Homepage: https://github.com/Azure/azure-c-shared-utility Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index ccc9b681d10e87..f35e5ea3054ccb 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -16,8 +16,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 65c27eb4ab9a8bbe36b4d7c5a0e9ad305becb8b4 - SHA512 48c65111b12e895f9c2087964d7291e6d1629242194fed9b33ead8ca438f16c803786cd55761eabdd12d47c9920542cff0e510bf16f16cac1d60049ba205df0e + REF 6f7bbcd23b39481dc0cf93185555d2513beea1ea + SHA512 d1b77b155497e02f802e3f02d89ecbc4cb3d4507bc61f1feca8e6baad627e05e0f744dd5b4d0148a47021eb2308d9053d0fedbf95e40cff001250bca392fd5af HEAD_REF master PATCHES fix-utilityFunctions-conditions.patch diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 6344bdeabad213..456ec806a6493f 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -1,6 +1,5 @@ Source: azure-iot-sdk-c -Version: 2020-07-19 -Port-Version: 1 +Version: 2020-12-09 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c Description: A C99 SDK for connecting devices to Microsoft Azure IoT services Homepage: https://github.com/Azure/azure-iot-sdk-c diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index db460aaecf7547..39def6f618da3b 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -15,8 +15,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF f464326f10cbba497b71c4aa263b6a22e1b375fe - SHA512 32dfb2ac697755af3646b07259298fc2f27007ab1a0a27da0be4f597c82dd2f8bbad6f07b4ed01dfbb62d86649d4be913c59e1e76b33efec112beaaba550d375 + REF f5da5a4138cee23f400971558784e3eff40b92ec + SHA512 f5aff4b185cde01ba9e4e57a8f9d696b4139162c040fcd464bd16b37364da0cc692fe148a842cc0c54018831b5874ee822f949a0fd6ea8f261a8155196d36404 HEAD_REF master PATCHES improve-external-deps.patch diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL index ddd6fe2da1bb8e..c6f9cb6fee0ae4 100644 --- a/ports/azure-uamqp-c/CONTROL +++ b/ports/azure-uamqp-c/CONTROL @@ -1,5 +1,5 @@ Source: azure-uamqp-c -Version: 2020-07-19 +Version: 2020-12-09 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c Description: AMQP library for C Homepage: https://github.com/Azure/azure-uamqp-c diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index e154414fc2d6b6..01145f8af0fddb 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -12,8 +12,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF 9e851bd6db08d6d2d08d1ef469d1e6fc4795382d - SHA512 efe0b9ed8a949af67e958b1516f499f57a0838a847e92d6c932058e931d2536038e7d49d63597e21de0a6f2af22bc179a6d99c8b8077451f906118b0b65e1417 + REF c88abeab27ece7f13911d73202f44212c3e08953 + SHA512 befb7ad72ea61713b043a4a4bdf70f454aac5f4590ca84aa7f4d9b7c8447b643fb37028173774451cfbe00119937f857680cd827d90e676ee558a18a1b6442bb HEAD_REF master ) endif() diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL index b64573024fb0f7..20a43ec8f612c1 100644 --- a/ports/azure-uhttp-c/CONTROL +++ b/ports/azure-uhttp-c/CONTROL @@ -1,5 +1,5 @@ Source: azure-uhttp-c -Version: 2020-07-19 +Version: 2020-12-09 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c Description: Azure HTTP Library written in C Homepage: https://github.com/Azure/azure-uhttp-c diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index 1e05b1cfa93c54..4df75216c9478e 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -12,8 +12,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF ef8ba1591b0f825315b78380331ff9290197db02 - SHA512 3e0434272de684a43189d491c16ab7e20ffcfd08f8addb01f64caa446211faa67e45aa51c403520df6a105cc9ac50b85de1b9e0954510fd4232c0f19d01fea9c + REF c22177c4cae57992e45e2b0db3f624c31b0f4666 + SHA512 70c011486aaf3e5af81e781d5183dcb3b6da234f9b41af9138e726bea1fd19326979a95d59bcb4314781d7ee4ef0c7fdfa9b30928a0688024d3fd93cb4168217 HEAD_REF master ) endif() diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL index 755b0160e9bc3f..17cb9e39aba7fa 100644 --- a/ports/azure-umqtt-c/CONTROL +++ b/ports/azure-umqtt-c/CONTROL @@ -1,5 +1,5 @@ Source: azure-umqtt-c -Version: 2020-07-19 +Version: 2020-12-09 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c Description: General purpose library for communication over the mqtt protocol Homepage: https://github.com/Azure/azure-umqtt-c diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index 84fba09b62871a..084bc58bb1ab2d 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -12,8 +12,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 165f6f52f8b2aec54a28ea5ede41736589726cd0 - SHA512 af56db89ddbae1a8067d3b1c7f85ecf085fb6bf529d01f74dd301e6994b20e6f1a821fd7d5116b53d1a8911ccc463149a53a5611e650c3aeb63893012206ffb8 + REF 478fd8e757dadfe2ca5fcd3953aeba24a14a98e1 + SHA512 bece2a30abb88dd97b97e399b8e63f6833b052c01c2f779070d52bbc916af604568bf5098d5f994d278d70591b11c45a5fcca9350226eb6e59b04e53c2780bc4 HEAD_REF master ) endif() From 4af8f552906567595ba6a1192d11c6a0016ca48b Mon Sep 17 00:00:00 2001 From: Markus Rickert Date: Wed, 16 Dec 2020 00:20:43 +0100 Subject: [PATCH 0304/1694] [NLopt] Update to 2.7.0 (#15105) --- ...iler-complaint-about-negating-unsign.patch | 31 ------------------- ports/nlopt/CONTROL | 4 --- ports/nlopt/portfile.cmake | 6 ++-- ports/nlopt/vcpkg.json | 6 ++++ 4 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 ports/nlopt/0001-suppress-MS-compiler-complaint-about-negating-unsign.patch delete mode 100644 ports/nlopt/CONTROL create mode 100644 ports/nlopt/vcpkg.json diff --git a/ports/nlopt/0001-suppress-MS-compiler-complaint-about-negating-unsign.patch b/ports/nlopt/0001-suppress-MS-compiler-complaint-about-negating-unsign.patch deleted file mode 100644 index cd5fed49a760cb..00000000000000 --- a/ports/nlopt/0001-suppress-MS-compiler-complaint-about-negating-unsign.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 004f415c5d04dd1f616a953eb8ad078a20b72c58 Mon Sep 17 00:00:00 2001 -From: "Steven G. Johnson" -Date: Sat, 9 May 2020 13:56:40 -0400 -Subject: [PATCH] suppress MS compiler complaint about negating unsigned - (closes #330) - ---- - src/util/sobolseq.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/util/sobolseq.c b/src/util/sobolseq.c -index 6626f51..848ff68 100644 ---- a/src/util/sobolseq.c -+++ b/src/util/sobolseq.c -@@ -93,7 +93,12 @@ static unsigned rightzero32(uint32_t n) - const uint32_t a = 0x05f66a47; /* magic number, found by brute force */ - static const unsigned decode[32] = { 0, 1, 2, 26, 23, 3, 15, 27, 24, 21, 19, 4, 12, 16, 28, 6, 31, 25, 22, 14, 20, 18, 11, 5, 30, 13, 17, 10, 29, 9, 8, 7 }; - n = ~n; /* change to rightmost-one problem */ -- n = a * (n & (-n)); /* store in n to make sure mult. is 32 bits */ -+#ifdef _MSC_VER -+#pragma warning(suppress:4146) -+ n = a * (n & (-n)); /* same as below, but suppress spurious warning/error with MS compiler about negating unsigned int */ -+#else -+ n = a * (n & (-n)); /* store in n to make sure mult. is 32 bits */ -+#endif - return decode[n >> 27]; - #endif - } --- -2.26.2.windows.1 - diff --git a/ports/nlopt/CONTROL b/ports/nlopt/CONTROL deleted file mode 100644 index 8d1344934f8920..00000000000000 --- a/ports/nlopt/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nlopt -Version: 2.6.2-1 -Homepage: https://github.com/stevengj/nlopt -Description: a library for nonlinear local and global optimization, for functions with and without gradient information. diff --git a/ports/nlopt/portfile.cmake b/ports/nlopt/portfile.cmake index 157a3ccac4235c..114ee72e5b11a0 100644 --- a/ports/nlopt/portfile.cmake +++ b/ports/nlopt/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevengj/nlopt - REF v2.6.2 - SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b + REF v2.7.0 + SHA512 3c41cab357b50adf50fe2d6225409ade8c5e8ee3576e3680ab29dded29ed7d328bc3d51d3a50054630159c319dca69e47ff08dc5df891b180b7d7e8fcbc27694 HEAD_REF master - PATCHES - 0001-suppress-MS-compiler-complaint-about-negating-unsign.patch ) vcpkg_configure_cmake( diff --git a/ports/nlopt/vcpkg.json b/ports/nlopt/vcpkg.json new file mode 100644 index 00000000000000..7097097133dce5 --- /dev/null +++ b/ports/nlopt/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "nlopt", + "version-string": "2.7.0", + "description": "a library for nonlinear local and global optimization, for functions with and without gradient information.", + "homepage": "https://github.com/stevengj/nlopt" +} From 698a7d9fd99cbcca96b033bcf5dcd0d22d34819e Mon Sep 17 00:00:00 2001 From: Roel Standaert Date: Wed, 16 Dec 2020 00:34:57 +0100 Subject: [PATCH 0305/1694] [wt] Update to 4.5.0 (#15136) --- ports/wt/CONTROL | 2 +- ports/wt/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/wt/CONTROL b/ports/wt/CONTROL index c8ea4d02c5552d..50ae4fbc78ae83 100644 --- a/ports/wt/CONTROL +++ b/ports/wt/CONTROL @@ -1,5 +1,5 @@ Source: wt -Version: 4.4.0 +Version: 4.5.0 Homepage: https://github.com/emweb/wt Description: Wt is a C++ library for developing web applications Build-Depends: zlib, libpng, pango (!windows), harfbuzz (!windows), libharu, glew, boost-algorithm, boost-array, boost-asio, boost-bind, boost-config, boost-container-hash, boost-filesystem, boost-fusion, boost-interprocess, boost-lexical-cast, boost-logic, boost-math, boost-multi-index, boost-optional, boost-phoenix, boost-pool, boost-program-options, boost-range, boost-serialization, boost-smart-ptr, boost-spirit, boost-system, boost-thread, boost-tokenizer, boost-tuple, boost-ublas, boost-variant diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index f324772210e758..d7d70dab77e5ad 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 9c6b7807b4fdaefe659ff9ab8ff4ba3937e62b2f # 4.4.0 - SHA512 d9947180bb82750f9fa81212d343e8a719e6085e4c41327fd178ce0f93c5ef0f5a11e64d066871ac339abc973081cbd9580042fb8625f3cf3738a722439ba1e3 + REF d3ee790da1826529e3d025d919f5c3608d029562 # 4.5.0 + SHA512 2fe66269bb59db81d3611f2857ac3ba0ae7448a54d216bd7aa72701f1e6e291a738421f460f4614198785bbd084ab1e19e84a3f67cbc15556015e2f259941f11 HEAD_REF master PATCHES 0002-link-glew.patch From e805a9c6b7d371e799c025faeef97f16ec8b8871 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 16 Dec 2020 07:38:34 +0800 Subject: [PATCH 0306/1694] [osg] build failure (#15044) --- ports/osg/CONTROL | 2 +- ports/osg/fix-example-application.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index 1a1fb7d6b8a1ad..854c181a942a35 100644 --- a/ports/osg/CONTROL +++ b/ports/osg/CONTROL @@ -1,6 +1,6 @@ Source: osg Version: 3.6.5 -Port-Version: 4 +Port-Version: 5 Homepage: https://github.com/openscenegraph/OpenSceneGraph Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit. Build-Depends: zlib, fontconfig, freeglut (windows), expat (windows), openimageio (osx) diff --git a/ports/osg/fix-example-application.patch b/ports/osg/fix-example-application.patch index 3b4da587dd7656..ebef27fd4764f6 100644 --- a/ports/osg/fix-example-application.patch +++ b/ports/osg/fix-example-application.patch @@ -8,7 +8,7 @@ index df859d0..123313a 100644 SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32) + + find_package(EXPAT REQUIRED) -+ find_package(Iconv CONFIG REQUIRED) ++ find_package(Iconv REQUIRED) + + list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) ELSE() @@ -24,7 +24,7 @@ index 071ab26..bf8d85f 100644 +IF (WIN32) + find_package(EXPAT REQUIRED) -+ find_package(Iconv CONFIG REQUIRED) ++ find_package(Iconv REQUIRED) + + list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) +ENDIF() From 29be95e84310c6940802a329175ec8c073f871d6 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 16 Dec 2020 01:21:39 +0100 Subject: [PATCH 0307/1694] update comms lib to latest (#15138) --- ports/comms-ublox/portfile.cmake | 4 ++-- ports/comms-ublox/vcpkg.json | 2 +- ports/comms/portfile.cmake | 4 ++-- ports/comms/vcpkg.json | 2 +- ports/commsdsl/portfile.cmake | 4 ++-- ports/commsdsl/vcpkg.json | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ports/comms-ublox/portfile.cmake b/ports/comms-ublox/portfile.cmake index e308ccd7b25a0e..87011252dc9354 100644 --- a/ports/comms-ublox/portfile.cmake +++ b/ports/comms-ublox/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/cc.ublox.generated - REF v0.19.1 - SHA512 4f599bc052ea4f4dd4158c7e2d2bd4020393802d8f2bcd97637a618190789cd5797e3e3b56da868949a261d1d4a34b4bf613a97ad28e0da87f82b3f5452498e7 + REF v0.20 + SHA512 ceb0a8c524ce0857e77eaf0971c062d86d3c5588507755095e8f8080ab665d88af9c69dd136a9c5a38a895496f03e2764d1e892ca16318a5494c02178f5d389a HEAD_REF master PATCHES fix-comms.patch diff --git a/ports/comms-ublox/vcpkg.json b/ports/comms-ublox/vcpkg.json index 30825b80c54b51..2c18c713c36b91 100644 --- a/ports/comms-ublox/vcpkg.json +++ b/ports/comms-ublox/vcpkg.json @@ -1,6 +1,6 @@ { "name": "comms-ublox", - "version-string": "0.19.1", + "version-string": "0.20.0", "description": "UBLOX (UBX) protocol definition, generated out of cc.ublox.commsdsl", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/cc.ublox.generated", diff --git a/ports/comms/portfile.cmake b/ports/comms/portfile.cmake index 6a93de71f43ee0..5a2a6d2fadc4e7 100644 --- a/ports/comms/portfile.cmake +++ b/ports/comms/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/comms_champion - REF v3.1.2 - SHA512 0610997fde77f3b244693a676323fbb63a411504e6cc9bd6faa03bfe7a8a17882a55c6114637d34f4dd88c55e07a1ca71b19a86042e7167ae15684c14260fa54 + REF v3.1.3 + SHA512 80aa3e0e53f3de21b8dcb4f02765f59ff58fc8c1b9e21beb09de26a3dd07fc4d6a3bc9fe78fb1c6cc633caabb1dd088f220d077b4a3a0d534cb1d243959c5a08 HEAD_REF master ) diff --git a/ports/comms/vcpkg.json b/ports/comms/vcpkg.json index f65aa56dcde3ca..cabbd6dee9c2e4 100644 --- a/ports/comms/vcpkg.json +++ b/ports/comms/vcpkg.json @@ -1,6 +1,6 @@ { "name": "comms", - "version-string": "3.1.2", + "version-string": "3.1.3", "description": "COMMS is the C++(11) headers only, platform independent library, which makes the implementation of a communication protocol to be an easy and relatively quick process.", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/comms_champion" diff --git a/ports/commsdsl/portfile.cmake b/ports/commsdsl/portfile.cmake index c785fd80aa8678..0aaba7e8c0f317 100644 --- a/ports/commsdsl/portfile.cmake +++ b/ports/commsdsl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/commsdsl - REF v3.5.4 - SHA512 d2bbb5332606d86200645f628507da966b385c2d8f0010e8cb83e0cdb3f3384272021db24ccb9418c69b4bd61a38edc18149cd0f7adbbbbc30168d0a15abef58 + REF v3.6 + SHA512 80fab2e567191a468a079dd9964a651293d8e7996141a973e77d4bdfaa96bfc346156f50ce484be1dc2b3d9e661cccce0e712c70876f7b322bc459f81a328496 HEAD_REF master ) diff --git a/ports/commsdsl/vcpkg.json b/ports/commsdsl/vcpkg.json index 9a3830be68ccd3..6b4b8b6a42dc66 100644 --- a/ports/commsdsl/vcpkg.json +++ b/ports/commsdsl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "commsdsl", - "version-string": "3.5.4", + "version-string": "3.6.0", "description": "DSL schemas parser and code generator for CommsChampion Ecosystem", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/commsdsl", From 8cb6e2aa9b85a9daeaecc70e32fec9bc79562e9a Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 16 Dec 2020 11:45:49 -0800 Subject: [PATCH 0308/1694] [openexr] Remove python dependency of openexr. (#15147) In https://github.com/microsoft/vcpkg/pull/14891 @Hoikas points out that the port depends on Python but the portfile.cmake explicitly disables it with `-DPYILMBASE_ENABLE=FALSE`. --- ports/openexr/CONTROL | 7 ------- ports/openexr/vcpkg.json | 11 +++++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 ports/openexr/CONTROL create mode 100644 ports/openexr/vcpkg.json diff --git a/ports/openexr/CONTROL b/ports/openexr/CONTROL deleted file mode 100644 index 0a725a0424a3a9..00000000000000 --- a/ports/openexr/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: openexr -Version: 2.5.0 -Port-Version: 1 -Homepage: https://www.openexr.com/ -Description: OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications -Build-Depends: zlib, python3 -Supports: !uwp diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json new file mode 100644 index 00000000000000..1d7f178bf65089 --- /dev/null +++ b/ports/openexr/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "openexr", + "version-string": "2.5.0", + "port-version": 2, + "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications", + "homepage": "https://www.openexr.com/", + "supports": "!uwp", + "dependencies": [ + "zlib" + ] +} From e93e8c9a549aef25296772a80e019250de2966e5 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Wed, 16 Dec 2020 13:14:35 -0800 Subject: [PATCH 0309/1694] [vcpkg ci] upload diff from clang-format to artifacts (#15141) * [vcpkg ci] upload diff from clang-format to artifacts this allows people who do not have access to clang-format to format their code via diff --- format.diff | 0 scripts/azure-pipelines/Create-FormatDiff.ps1 | 20 ++++++ scripts/azure-pipelines/Format-CxxCode.ps1 | 49 ++++++++++++++ scripts/azure-pipelines/azure-pipelines.yml | 65 ++++++++----------- .../Check-CMakeFunctionDocumentation.ps1 | 30 --------- .../windows/Check-CxxFormatting.ps1 | 55 ---------------- .../windows/Check-ManifestFormatting.ps1 | 49 -------------- .../windows/Get-ChangedFiles.ps1 | 9 --- 8 files changed, 97 insertions(+), 180 deletions(-) create mode 100644 format.diff create mode 100644 scripts/azure-pipelines/Create-FormatDiff.ps1 create mode 100644 scripts/azure-pipelines/Format-CxxCode.ps1 delete mode 100644 scripts/azure-pipelines/windows/Check-CMakeFunctionDocumentation.ps1 delete mode 100644 scripts/azure-pipelines/windows/Check-CxxFormatting.ps1 delete mode 100644 scripts/azure-pipelines/windows/Check-ManifestFormatting.ps1 delete mode 100644 scripts/azure-pipelines/windows/Get-ChangedFiles.ps1 diff --git a/format.diff b/format.diff new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/scripts/azure-pipelines/Create-FormatDiff.ps1 b/scripts/azure-pipelines/Create-FormatDiff.ps1 new file mode 100644 index 00000000000000..59911808921e56 --- /dev/null +++ b/scripts/azure-pipelines/Create-FormatDiff.ps1 @@ -0,0 +1,20 @@ +[CmdletBinding(PositionalBinding=$False)] +Param( + [Parameter(Mandatory=$True)] + [String]$DiffFile +) + +Start-Process -FilePath 'git' -ArgumentList 'diff' ` + -NoNewWindow -Wait ` + -RedirectStandardOutput $DiffFile +if (0 -ne (Get-Item -LiteralPath $DiffFile).Length) +{ + $msg = @( + 'The formatting of the files in the repo were not what we expected,', + 'or the documentation was not regenerated.', + 'Please access the diff from format.diff in the build artifacts,' + 'and apply the patch with `git apply`' + ) + Write-Error ($msg -join "`n") + throw +} \ No newline at end of file diff --git a/scripts/azure-pipelines/Format-CxxCode.ps1 b/scripts/azure-pipelines/Format-CxxCode.ps1 new file mode 100644 index 00000000000000..a20a9ce0ba3d12 --- /dev/null +++ b/scripts/azure-pipelines/Format-CxxCode.ps1 @@ -0,0 +1,49 @@ +[CmdletBinding()] +Param( + [Parameter(Mandatory=$True)] + [string]$Root +) + +$Root = Resolve-Path -LiteralPath $Root + +$clangFormat = Get-Command 'clang-format' -ErrorAction 'SilentlyContinue' +if ($null -ne $clangFormat) +{ + $clangFormat = $clangFormat.Source +} + +if ($IsWindows) +{ + if ([String]::IsNullOrEmpty($clangFormat) -or -not (Test-Path $clangFormat)) + { + $clangFormat = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\Llvm\x64\bin\clang-format.exe' + } + if (-not (Test-Path $clangFormat)) + { + $clangFormat = 'C:\Program Files\LLVM\bin\clang-format.exe' + } +} + +if ([String]::IsNullOrEmpty($clangFormat) -or -not (Test-Path $clangFormat)) +{ + Write-Error 'clang-format not found; is it installed?' + throw +} + +$toolsrc = Get-Item "$Root/toolsrc" +Push-Location $toolsrc + +try +{ + $files = Get-ChildItem -Recurse -LiteralPath "$toolsrc/src" -Filter '*.cpp' + $files += Get-ChildItem -Recurse -LiteralPath "$toolsrc/include/vcpkg" -Filter '*.h' + $files += Get-ChildItem -Recurse -LiteralPath "$toolsrc/include/vcpkg-test" -Filter '*.h' + $files += Get-Item "$toolsrc/include/pch.h" + $fileNames = $files.FullName + + & $clangFormat -style=file -i @fileNames +} +finally +{ + Pop-Location +} diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 03bf38e4cd8dbb..b7121bb08d9616 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -7,59 +7,50 @@ variables: osx-pool: 'PrOsx-2020-09-28' stages: -- stage: check_cxx_formatting - displayName: 'Check the formatting of the C++' +- stage: FormatChecks + displayName: 'Formatting and Documentation Checks' pool: $(windows-pool) jobs: - job: workspace: clean: resources + variables: + - name: VCPKG_DOWNLOADS + value: D:\downloads + - name: DiffFile + value: $(Build.ArtifactStagingDirectory)\format.diff steps: - task: Powershell@2 - displayName: 'Check C++ Formatting' + displayName: 'Format C++' inputs: - filePath: 'scripts/azure-pipelines/windows/Check-CxxFormatting.ps1' + filePath: 'scripts/azure-pipelines/Format-CxxCode.ps1' arguments: '-Root .' pwsh: true -- stage: check_manifest_formatting - displayName: Check the formatting of port manifests - pool: $(windows-pool) - dependsOn: [] - variables: - - name: VCPKG_DOWNLOADS - value: D:\downloads - jobs: - - job: - workspace: - clean: resources - steps: - task: Powershell@2 - displayName: 'Check port manifest Formatting' + displayName: 'Generate Documentation' inputs: - filePath: 'scripts/azure-pipelines/windows/Check-ManifestFormatting.ps1' - arguments: '-Root .' + filePath: 'docs/regenerate.ps1' + arguments: '-VcpkgRoot . -WarningAction Stop' pwsh: true -- stage: check_documentation_generation - displayName: Check if the documentation has been regenerated correctly - pool: $(windows-pool) - dependsOn: [] - jobs: - - job: - workspace: - clean: resources - steps: + - script: .\bootstrap-vcpkg.bat + displayName: 'Build vcpkg' + - script: '.\vcpkg format-manifest --all' + displayName: 'Format Manifests' - task: Powershell@2 - displayName: 'Check documentation generation' + displayName: 'Create Diff' inputs: - filePath: 'scripts/azure-pipelines/windows/Check-CMakeFunctionDocumentation.ps1' - arguments: '-Root .' + filePath: scripts/azure-pipelines/Create-FormatDiff.ps1 + arguments: '-DiffFile $(DiffFile)' pwsh: true -- stage: run_port_ci - displayName: 'Run the Port CI' - dependsOn: - - check_cxx_formatting - - check_manifest_formatting - - check_documentation_generation + - task: PublishBuildArtifacts@1 + condition: failed() + displayName: 'Publish C++ Diff' + inputs: + PathtoPublish: '$(DiffFile)' + ArtifactName: 'format.diff' +- stage: RunPrTests + displayName: 'Run PR Tests:' + dependsOn: FormatChecks jobs: - template: windows/azure-pipelines.yml parameters: diff --git a/scripts/azure-pipelines/windows/Check-CMakeFunctionDocumentation.ps1 b/scripts/azure-pipelines/windows/Check-CMakeFunctionDocumentation.ps1 deleted file mode 100644 index 5505c3401770df..00000000000000 --- a/scripts/azure-pipelines/windows/Check-CMakeFunctionDocumentation.ps1 +++ /dev/null @@ -1,30 +0,0 @@ -[CmdletBinding()] -Param( - [Parameter(Mandatory=$True)] - [string]$Root -) - -if (-not (Test-Path "$Root/.vcpkg-root")) -{ - Write-Error "The vcpkg root was not at $Root" - throw -} - -& "$Root/docs/regenerate.ps1" -VcpkgRoot $Root -WarningAction 'Stop' - -$changedFiles = & "$PSScriptRoot/Get-ChangedFiles.ps1" -Directory "$Root/docs" -if ($null -ne $changedFiles) -{ - $msg = @( - "", - "The documentation files do not seem to have been regenerated.", - "Please re-run `docs/regenerate.ps1`." - ) - $msg += "" - - $msg += "This should produce the following diff:" - $msg += git diff "$Root/docs" - - Write-Error ($msg -join "`n") - throw -} diff --git a/scripts/azure-pipelines/windows/Check-CxxFormatting.ps1 b/scripts/azure-pipelines/windows/Check-CxxFormatting.ps1 deleted file mode 100644 index eaa9e692b09c91..00000000000000 --- a/scripts/azure-pipelines/windows/Check-CxxFormatting.ps1 +++ /dev/null @@ -1,55 +0,0 @@ -[CmdletBinding()] -Param( - [Parameter(Mandatory=$True)] - [string]$Root, - [Parameter()] - [switch]$IgnoreErrors # allows one to just format -) - -$clangFormat = 'C:\Program Files\LLVM\bin\clang-format.exe' -if (-not (Test-Path $clangFormat)) -{ - $clangFormat = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\Llvm\x64\bin\clang-format.exe' - if (-not (Test-Path $clangFormat)) - { - Write-Error 'clang-format not found; is it installed in the CI machines?' - throw - } -} - -$toolsrc = Get-Item "$Root/toolsrc" -Push-Location $toolsrc - -try -{ - $files = Get-ChildItem -Recurse -LiteralPath "$toolsrc/src" -Filter '*.cpp' - $files += Get-ChildItem -Recurse -LiteralPath "$toolsrc/include/vcpkg" -Filter '*.h' - $files += Get-ChildItem -Recurse -LiteralPath "$toolsrc/include/vcpkg-test" -Filter '*.h' - $files += Get-Item "$toolsrc/include/pch.h" - $fileNames = $files.FullName - - & $clangFormat -style=file -i @fileNames - - $changedFiles = & "$PSScriptRoot/Get-ChangedFiles.ps1" -Directory $toolsrc - if (-not $IgnoreErrors -and $null -ne $changedFiles) - { - $msg = @( - "", - "The formatting of the C++ files didn't match our expectation.", - "See github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md#vcpkg-internal-code for solution." - ) - $msg += "File list:" - $msg += " $changedFiles" - $msg += "" - - $msg += "clang-format should produce the following diff:" - $msg += git diff $toolsrc - - Write-Error ($msg -join "`n") - throw - } -} -finally -{ - Pop-Location -} diff --git a/scripts/azure-pipelines/windows/Check-ManifestFormatting.ps1 b/scripts/azure-pipelines/windows/Check-ManifestFormatting.ps1 deleted file mode 100644 index 75924c24af9dff..00000000000000 --- a/scripts/azure-pipelines/windows/Check-ManifestFormatting.ps1 +++ /dev/null @@ -1,49 +0,0 @@ -[CmdletBinding()] -Param( - [Parameter(Mandatory=$True)] - [string]$Root, - [Parameter()] - [switch]$IgnoreErrors # allows one to just format -) - -$portsTree = Get-Item "$Root/ports" - -if (-not (Test-Path "$Root/.vcpkg-root")) -{ - Write-Error "The vcpkg root was not at $Root" - throw -} - -if (-not (Test-Path "$Root/vcpkg.exe")) -{ - & "$Root/bootstrap-vcpkg.bat" - if (-not $?) - { - Write-Error "Bootstrapping vcpkg failed" - throw - } -} - -& "$Root/vcpkg.exe" 'format-manifest' '--all' -if (-not $?) -{ - Write-Error "Failed formatting manifests; are they well-formed?" - throw -} - -$changedFiles = & "$PSScriptRoot/Get-ChangedFiles.ps1" -Directory $portsTree -if (-not $IgnoreErrors -and $null -ne $changedFiles) -{ - $msg = @( - "", - "The formatting of the manifest files didn't match our expectation.", - "See github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md#manifest for solution." - ) - $msg += "" - - $msg += "vcpkg should produce the following diff:" - $msg += git diff $portsTree - - Write-Error ($msg -join "`n") - throw -} diff --git a/scripts/azure-pipelines/windows/Get-ChangedFiles.ps1 b/scripts/azure-pipelines/windows/Get-ChangedFiles.ps1 deleted file mode 100644 index e299369a047538..00000000000000 --- a/scripts/azure-pipelines/windows/Get-ChangedFiles.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -[CmdletBinding()] -Param( - [Parameter(Mandatory=$True)] - [string]$Directory -) - -git status --porcelain $Directory | ForEach-Object { - (-split $_)[1] -} From 9afb9e182acca1208efa05b9ab7924bc793133e8 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 16 Dec 2020 15:02:24 -0800 Subject: [PATCH 0310/1694] [boost-modular-build-helper] Specify msvc version in user-config.jam (#15137) --- .../boost-modular-build.cmake | 14 ++++++++++---- ports/boost-modular-build-helper/user-config.jam | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 06cebed399326c..67ad37248792d3 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -318,13 +318,16 @@ function(boost_modular_build) set(TOOLSET_OPTIONS "${TOOLSET_OPTIONS} -Zl /AI\"${PLATFORM_WINMD_DIR}\" WindowsApp.lib /ZW -DVirtualAlloc=VirtualAllocFromApp -D_WIN32_WINNT=0x0A00") endif() - configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam @ONLY) - configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam @ONLY) - + set(MSVC_VERSION) if(VCPKG_PLATFORM_TOOLSET MATCHES "v142") list(APPEND _bm_OPTIONS toolset=msvc) - elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v14.") + set(MSVC_VERSION 14.2) + elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141") + list(APPEND _bm_OPTIONS toolset=msvc) + set(MSVC_VERSION 14.1) + elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v140") list(APPEND _bm_OPTIONS toolset=msvc) + set(MSVC_VERSION 14.0) elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v120") list(APPEND _bm_OPTIONS toolset=msvc) elseif(VCPKG_PLATFORM_TOOLSET MATCHES "external") @@ -333,6 +336,9 @@ function(boost_modular_build) message(FATAL_ERROR "Unsupported value for VCPKG_PLATFORM_TOOLSET: '${VCPKG_PLATFORM_TOOLSET}'") endif() + configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam @ONLY) + configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam @ONLY) + ###################### # Perform build + Package ###################### diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam index 3290a86e0c4c39..cb0e537008e531 100644 --- a/ports/boost-modular-build-helper/user-config.jam +++ b/ports/boost-modular-build-helper/user-config.jam @@ -2,7 +2,7 @@ import toolset ; if "@VCPKG_PLATFORM_TOOLSET@" != "external" { - using msvc : : cl.exe + using msvc : @MSVC_VERSION@ : cl.exe : "@NOTHING_BAT@" @TOOLSET_OPTIONS@ From 90e14483f44ad1d4737fab36f80ec2e78f757d10 Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Thu, 17 Dec 2020 02:12:26 -0600 Subject: [PATCH 0311/1694] [oneDNN] New port (#15068) --- ports/onednn/portfile.cmake | 25 +++++++++++++++++++++++++ ports/onednn/vcpkg.json | 6 ++++++ 2 files changed, 31 insertions(+) create mode 100644 ports/onednn/portfile.cmake create mode 100644 ports/onednn/vcpkg.json diff --git a/ports/onednn/portfile.cmake b/ports/onednn/portfile.cmake new file mode 100644 index 00000000000000..4a9600ac7fd2ae --- /dev/null +++ b/ports/onednn/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oneapi-src/oneDNN + REF v2.0 + SHA512 740fa871e29edc8bb8a54d4ba615e856712f7f63efe4c70f4a3d5f6d143d60bc51366b9355ab4b6702718ba711b48350ea49b1335ec10c1dc4f655cc9728ff3e + HEAD_REF master +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(DNNL_OPTIONS "-DDNNL_LIBRARY_TYPE=STATIC") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${DNNL_OPTIONS} +) +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Copyright and license +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/onednn/vcpkg.json b/ports/onednn/vcpkg.json new file mode 100644 index 00000000000000..7ceebd191b0225 --- /dev/null +++ b/ports/onednn/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "onednn", + "version-string": "2.0", + "description": "oneAPI Deep Neural Network Library (oneDNN)", + "supports": "x64 & !uwp" +} From 928bbb25c1fdb64e1da7aa5813d36708e1941d59 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 17 Dec 2020 16:13:09 +0800 Subject: [PATCH 0312/1694] [Realsense2] Update to 2.40.0 (#15156) --- ports/realsense2/CONTROL | 2 +- ports/realsense2/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/realsense2/CONTROL b/ports/realsense2/CONTROL index e7f215c354a8d4..3b422832672601 100644 --- a/ports/realsense2/CONTROL +++ b/ports/realsense2/CONTROL @@ -1,5 +1,5 @@ Source: realsense2 -Version: 2.39.0 +Version: 2.40.0 Homepage: https://github.com/IntelRealSense/librealsense Description: Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300). Build-Depends: libusb(linux) diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index 3844ac917760d4..fc218d2795750a 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IntelRealSense/librealsense - REF d8f5d4212df85522a14b4a7b83bf4d54219b06fa #v2.39.0 - SHA512 1a902ab333fea7ebacad6d445594d4f5a40d5914dafc6aa258a0676481c1cea65b9780f0695e14e02dcbf05b6096df82533adbdf77fa10baabb3f167ceccc307 + REF aae6f315ce80ff80df5bc9439b4ee852187533c1 #v2.40.0 + SHA512 6d8d0837bd2d502a84e4a8193a9bf5f2cb27c1ca97fceffc9d5bc81c6ed5a2d2b5c79e2fc3446f34425d3db0693de02c561b9ba276e59598b33d928f0799fba4 HEAD_REF master PATCHES fix_openni2.patch From 8ca011dcc0f8b5e3a169f51f06e395dd98f8d23d Mon Sep 17 00:00:00 2001 From: Long Huan <8551701+longhuan2018@users.noreply.github.com> Date: Thu, 17 Dec 2020 16:14:10 +0800 Subject: [PATCH 0313/1694] [readosm] Update to 1.1.0a (#15038) --- ports/readosm/CONTROL | 6 +- ports/readosm/fix-makefiles.patch | 9 +- ports/readosm/fix-version-macro.patch | 13 --- ports/readosm/portfile.cmake | 145 +++++++++++++------------- scripts/ci.baseline.txt | 2 + 5 files changed, 82 insertions(+), 93 deletions(-) delete mode 100644 ports/readosm/fix-version-macro.patch diff --git a/ports/readosm/CONTROL b/ports/readosm/CONTROL index 7a2d817ff7f5d9..686cc22c9c4797 100644 --- a/ports/readosm/CONTROL +++ b/ports/readosm/CONTROL @@ -1,7 +1,5 @@ Source: readosm -Version: 1.1.0 -Port-Version: 3 +Version: 1.1.0a Homepage: https://www.gaia-gis.it/gaia-sins/readosm-sources Description: ReadOSM is an open source library to extract valid data from within an Open Street Map input file (.osm or .osm.pbf) -Build-Depends: expat, zlib -Supports: !(linux|osx|uwp) +Build-Depends: expat, zlib \ No newline at end of file diff --git a/ports/readosm/fix-makefiles.patch b/ports/readosm/fix-makefiles.patch index 3904b5136aa488..ea78af8572c730 100644 --- a/ports/readosm/fix-makefiles.patch +++ b/ports/readosm/fix-makefiles.patch @@ -1,13 +1,13 @@ diff --git a/makefile.vc b/makefile.vc -index 791aedf..d294548 100644 +index 8edb536b9..33fd83e35 100644 --- a/makefile.vc +++ b/makefile.vc @@ -8,7 +8,7 @@ LIBOBJ = src\readosm.obj src\osmxml.obj \ src\protobuf.obj src\osm_objects.obj READOSM_DLL = readosm$(VERSION).dll --CFLAGS = /nologo -IC:\OSGeo4W\include -Iheaders $(OPTFLAGS) -+CFLAGS = /nologo -I$(INSTALLED_ROOT)\include -Iheaders $(OPTFLAGS) +-CFLAGS = /nologo -I. -Iheaders -IC:\OSGeo4W\include $(OPTFLAGS) ++CFLAGS = /nologo -I. -Iheaders -I$(INSTALLED_ROOT)\include $(OPTFLAGS) default: all @@ -15,7 +15,7 @@ index 791aedf..d294548 100644 $(READOSM_DLL): readosm_i.lib readosm_i.lib: $(LIBOBJ) -- link /debug /dll /out:$(READOSM_DLL) \ +- link /dll /out:$(READOSM_DLL) \ + link $(LINK_FLAGS) /dll /out:$(READOSM_DLL) \ /implib:readosm_i.lib $(LIBOBJ) \ - C:\OSGeo4w\lib\libexpat.lib C:\OSGeo4w\lib\zlib.lib @@ -32,6 +32,7 @@ index 791aedf..d294548 100644 del *.pdb install: all + diff --git a/nmake.opt b/nmake.opt index 5e45c0e..61c44f9 100644 --- a/nmake.opt diff --git a/ports/readosm/fix-version-macro.patch b/ports/readosm/fix-version-macro.patch deleted file mode 100644 index b091b33597974a..00000000000000 --- a/ports/readosm/fix-version-macro.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/readosm.c b/src/readosm.c -index e1dda27..7977339 100644 ---- a/src/readosm.c -+++ b/src/readosm.c -@@ -50,7 +50,7 @@ - - #if defined(_WIN32) && !defined(__MINGW32__) - /* MSVC: avoiding to include at all config.h */ --#define VERSION 1.1.0 -+#define VERSION "1.1.0" - #else - #include "config.h" - #endif diff --git a/ports/readosm/portfile.cmake b/ports/readosm/portfile.cmake index 522e6fdf53b99d..9316b7d853c153 100644 --- a/ports/readosm/portfile.cmake +++ b/ports/readosm/portfile.cmake @@ -1,88 +1,89 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP") - +set(READOSM_VERSION_STR "1.1.0a") vcpkg_download_distfile(ARCHIVE - URLS "http://www.gaia-gis.it/gaia-sins/readosm-sources/readosm-1.1.0.tar.gz" - FILENAME "readosm-1.1.0.tar.gz" - SHA512 d3581f564c4461c6a1a3d5fd7d18a262c884b2ac935530064bfaebd6c05d692fb92cc600fb40e87e03f7160ebf0eeeb05f51a0e257935d056b233fe28fc01a11 + URLS "http://www.gaia-gis.it/gaia-sins/readosm-sources/readosm-${READOSM_VERSION_STR}.tar.gz" + FILENAME "readosm-${READOSM_VERSION_STR}.tar.gz" + SHA512 ec8516cdd0b02027cef8674926653f8bc76e2082c778b02fb2ebcfa6d01e21757aaa4fd5d5104059e2f5ba97190183e60184f381bfd592a635805aa35cd7a682 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES fix-makefiles.patch - fix-version-macro.patch -) - -find_program(NMAKE nmake) + ) -if(VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(LIBS_ALL_DBG "\"${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd.lib\" \"${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib\"") - set(LIBS_ALL_REL "\"${CURRENT_INSTALLED_DIR}/lib/libexpat.lib\" \"${CURRENT_INSTALLED_DIR}/lib/zlib.lib\"") - set(CL_FLAGS_DBG "/MDd /Zi") - set(CL_FLAGS_REL "/MD /Ox") -else() - set(LIBS_ALL_DBG "\"${CURRENT_INSTALLED_DIR}/debug/lib/libexpatdMD.lib\" \"${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib\"") - set(LIBS_ALL_REL "\"${CURRENT_INSTALLED_DIR}/lib/libexpatMD.lib\" \"${CURRENT_INSTALLED_DIR}/lib/zlib.lib\"") - set(CL_FLAGS_DBG "/MTd /Zi") - set(CL_FLAGS_REL "/MT /Ox") -endif() - -################ -# Debug build -################ -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - message(STATUS "Building ${TARGET_TRIPLET}-dbg") - - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug" INST_DIR_DBG) + if(VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(CL_FLAGS_DBG "/MDd /Zi") + set(CL_FLAGS_REL "/MD /Ox") + set(EXPAT_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libexpat.lib") + set(EXPAT_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd.lib") + else() + set(CL_FLAGS_DBG "/MTd /Zi") + set(CL_FLAGS_REL "/MT /Ox") + set(EXPAT_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libexpatMD.lib") + set(EXPAT_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatdMD.lib") + endif() - vcpkg_execute_required_process( - COMMAND ${NMAKE} -f makefile.vc clean install - INST_DIR="${INST_DIR_DBG}" INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}" "LINK_FLAGS=/debug" "CL_FLAGS=${CL_FLAGS_DBG}" - "LIBS_ALL=${LIBS_ALL_DBG}" - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME nmake-build-${TARGET_TRIPLET}-debug - ) - vcpkg_copy_pdbs() - message(STATUS "Building ${TARGET_TRIPLET}-dbg done") -endif() + if(VCPKG_TARGET_IS_UWP) + set(UWP_LIBS windowsapp.lib) + set(UWP_LINK_FLAGS /APPCONTAINER) + endif() -################ -# Release build -################ -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - message(STATUS "Building ${TARGET_TRIPLET}-rel") + set(LIBS_ALL_DBG + "${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \ + ${UWP_LIBS} \ + ${EXPAT_LIBS_DBG}" + ) + set(LIBS_ALL_REL + "${CURRENT_INSTALLED_DIR}/lib/zlib.lib \ + ${UWP_LIBS} \ + ${EXPAT_LIBS_REL}" + ) - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL) - vcpkg_execute_required_process( - COMMAND ${NMAKE} -f makefile.vc clean install - INST_DIR="${INST_DIR_REL}" INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}" "LINK_FLAGS=" "CL_FLAGS=${CL_FLAGS_REL}" - "LIBS_ALL=${LIBS_ALL_REL}" - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME nmake-build-${TARGET_TRIPLET}-release - ) - message(STATUS "Building ${TARGET_TRIPLET}-rel done") -endif() + string(REPLACE "/" "\\\\" INST_DIR ${CURRENT_PACKAGES_DIR}) + list(APPEND OPTIONS_RELEASE + "LINK_FLAGS=${UWP_LINK_FLAGS}" "INST_DIR=${INST_DIR}" "CL_FLAGS=${CL_FLAGS_REL}" "LIBS_ALL=${LIBS_ALL_REL}" + ) + list(APPEND OPTIONS_DEBUG + "LINK_FLAGS=${UWP_LINK_FLAGS} /debug" "INST_DIR=${INST_DIR}\\debug" "CL_FLAGS=${CL_FLAGS_DBG}" "LIBS_ALL=${LIBS_ALL_DBG}" + ) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + vcpkg_install_nmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + OPTIONS_DEBUG + ${OPTIONS_DEBUG} + ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib) -else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/readosm.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib) + else() + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/readosm.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib ${CURRENT_PACKAGES_DIR}/lib/readosm.lib) - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib) endif() -endif() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX + vcpkg_extract_source_archive_ex( + ARCHIVE ${ARCHIVE} + OUT_SOURCE_PATH SOURCE_PATH + ) -message(STATUS "Packaging ${TARGET_TRIPLET} done") + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + "LIBS=-lpthread -ldl -lstdc++ -lm" + ) + + vcpkg_install_make() + vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) +endif() -#Handle copyright +# Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index cf3dbfae391cd1..03b011fef455e1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1426,6 +1426,8 @@ soundtouch:x64-windows-static=fail spaceland:arm64-windows=fail spaceland:arm-uwp=fail spaceland:x64-uwp=fail +spatialite-tools:x64-linux=fail +spatialite-tools:x64-osx=fail spdk:x64-linux=fail spdk-dpdk:arm64-windows=fail spdk-dpdk:arm-uwp=fail From 238d00f65c5919f61a5c401ab542bebc12072840 Mon Sep 17 00:00:00 2001 From: Alexander Puzicha <44292150+FlyingdutchmanC@users.noreply.github.com> Date: Thu, 17 Dec 2020 09:14:31 +0100 Subject: [PATCH 0314/1694] [eigen3] update to 3.3.9 (#15022) --- ports/eigen3/CONTROL | 3 +-- ...disable_pkgconfig_absolute_path_check.patch | 18 ++++++++++++++++++ ports/eigen3/portfile.cmake | 8 +++++--- 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 ports/eigen3/disable_pkgconfig_absolute_path_check.patch diff --git a/ports/eigen3/CONTROL b/ports/eigen3/CONTROL index f1180da6653088..e285c62d28635a 100644 --- a/ports/eigen3/CONTROL +++ b/ports/eigen3/CONTROL @@ -1,5 +1,4 @@ Source: eigen3 -Version: 3.3.7 -Port-Version: 8 +Version: 3.3.9 Homepage: http://eigen.tuxfamily.org Description: C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms. diff --git a/ports/eigen3/disable_pkgconfig_absolute_path_check.patch b/ports/eigen3/disable_pkgconfig_absolute_path_check.patch new file mode 100644 index 00000000000000..cfa96434059774 --- /dev/null +++ b/ports/eigen3/disable_pkgconfig_absolute_path_check.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dbb9bcf..84c413c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -407,11 +407,13 @@ set(PKGCONFIG_INSTALL_DIR + CACHE STRING "The directory relative to CMAKE_PREFIX_PATH where eigen3.pc is installed" + ) + ++if(0) + foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) + if(IS_ABSOLUTE "${${var}}") + message(FATAL_ERROR "${var} must be relative to CMAKE_PREFIX_PATH. Got: ${${var}}") + endif() + endforeach() ++endif() + + # similar to set_target_properties but append the property instead of overwriting it + macro(ei_add_target_property target prop value) diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 4fc9c7cc391473..4b1a74f9ebd8f1 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -4,10 +4,12 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO libeigen/eigen - REF 3.3.7 - SHA512 4cc3717b9cbe78335e05f724919497214edd482d4812aeb1a9fd6da5b3f6d1b194bb93ed0dab9e734b4334a5b88e8f8c339c43c1b2044332286ef5e758f9ecf4 + REF 3.3.9 + SHA512 16244cc89f2e1879543232b965cbf653b3ccf10e967c8c437a41e27d8320392bdf584d8c24b8a97406ab7d1481d5154da74e0702ec1334ae6a46de83f4573a46 HEAD_REF master - PATCHES fix-cuda-error.patch # issue https://gitlab.com/libeigen/eigen/-/issues/1526 + PATCHES + disable_pkgconfig_absolute_path_check.patch + fix-cuda-error.patch # issue https://gitlab.com/libeigen/eigen/-/issues/1526 ) vcpkg_configure_cmake( From 9af2ca99e83cf6e852523e4e387bbdab3ace873b Mon Sep 17 00:00:00 2001 From: ankurverma85 <31362771+ankurverma85@users.noreply.github.com> Date: Thu, 17 Dec 2020 00:15:40 -0800 Subject: [PATCH 0315/1694] [coin] x64-windows-statid-md fixes (#15125) --- ports/coin/CONTROL | 2 +- ports/coin/portfile.cmake | 90 ++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 44 deletions(-) diff --git a/ports/coin/CONTROL b/ports/coin/CONTROL index b6214a9a7d2fcb..f5147e350793fb 100644 --- a/ports/coin/CONTROL +++ b/ports/coin/CONTROL @@ -1,6 +1,6 @@ Source: coin Version: 4.0.0 -Port-Version: 1 +Port-Version: 2 Description: A high-level 3D visualization library with Open Inventor 2.1 API Build-Depends: boost-assert, boost-config, boost-lexical-cast, boost-math, boost-smart-ptr, boost-static-assert, opengl-registry Homepage: https://github.com/coin3d/coin diff --git a/ports/coin/portfile.cmake b/ports/coin/portfile.cmake index 8039845d842e35..830bd64f9770bf 100644 --- a/ports/coin/portfile.cmake +++ b/ports/coin/portfile.cmake @@ -1,43 +1,47 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64") - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Coin3D/coin - REF Coin-4.0.0 - SHA512 8a0289cab3e02a7417022fe659ec30a2dd705b9bacb254e0269ada9155c76c6aea0285c475cd6e663f5d7f2b49e60244b16baac7188d57e3d7f8ab08d228f21f - HEAD_REF master - PATCHES - disable-cpackd.patch -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(COIN_BUILD_MSVC_STATIC_RUNTIME ON) - set(COIN_BUILD_SHARED_LIBS OFF) -else() - set(COIN_BUILD_MSVC_STATIC_RUNTIME OFF) - set(COIN_BUILD_SHARED_LIBS ON) -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DCOIN_BUILD_DOCUMENTATION=OFF - -DCOIN_BUILD_MSVC_STATIC_RUNTIME=${COIN_BUILD_MSVC_STATIC_RUNTIME} - -DCOIN_BUILD_SHARED_LIBS=${COIN_BUILD_SHARED_LIBS} - -DCOIN_BUILD_TESTS=OFF -) - -vcpkg_install_cmake() -vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Coin-4.0.0) - -file(INSTALL ${SOURCE_PATH}/COPYING 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) -endif() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Coin/profiler) +vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Coin3D/coin + REF Coin-4.0.0 + SHA512 8a0289cab3e02a7417022fe659ec30a2dd705b9bacb254e0269ada9155c76c6aea0285c475cd6e663f5d7f2b49e60244b16baac7188d57e3d7f8ab08d228f21f + HEAD_REF master + PATCHES + disable-cpackd.patch +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(COIN_BUILD_SHARED_LIBS OFF) +else() + set(COIN_BUILD_SHARED_LIBS ON) +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(COIN_BUILD_MSVC_STATIC_RUNTIME OFF) +elseif(VCPKG_CRT_LINKAGE STREQUAL static) + set(COIN_BUILD_MSVC_STATIC_RUNTIME ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCOIN_BUILD_DOCUMENTATION=OFF + -DCOIN_BUILD_MSVC_STATIC_RUNTIME=${COIN_BUILD_MSVC_STATIC_RUNTIME} + -DCOIN_BUILD_SHARED_LIBS=${COIN_BUILD_SHARED_LIBS} + -DCOIN_BUILD_TESTS=OFF +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Coin-4.0.0) + +file(INSTALL ${SOURCE_PATH}/COPYING 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) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Coin/profiler) From cafa556d288feb79c98f6815630f6b5692a60b38 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 17 Dec 2020 09:16:17 +0100 Subject: [PATCH 0316/1694] [mdns] added new port (#15142) --- ports/mdns/portfile.cmake | 21 +++++++++++++++++++++ ports/mdns/vcpkg.json | 6 ++++++ 2 files changed, 27 insertions(+) create mode 100644 ports/mdns/portfile.cmake create mode 100644 ports/mdns/vcpkg.json diff --git a/ports/mdns/portfile.cmake b/ports/mdns/portfile.cmake new file mode 100644 index 00000000000000..d465759444e0be --- /dev/null +++ b/ports/mdns/portfile.cmake @@ -0,0 +1,21 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mjansson/mdns + REF 1.1 + SHA512 03e4682d87e9c1157bba04e04a3dfbb2ed7e25df31f00834fbc7bf4275e5c7f7406e590c8bdc386a4e6fbe6a5667f700e146d39758aa8ee0a47f735547cacd31 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DMDNS_BUILD_EXAMPLE=OFF +) + +vcpkg_install_cmake() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/mdns/vcpkg.json b/ports/mdns/vcpkg.json new file mode 100644 index 00000000000000..d86276ac0667c7 --- /dev/null +++ b/ports/mdns/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "mdns", + "version-string": "1.1", + "description": "Public domain mDNS/DNS-SD library in C", + "homepage": "https://github.com/mjansson/mdns" +} From 6aa9285f0d008dd662a7384345dbc1a05836f24f Mon Sep 17 00:00:00 2001 From: Gyusun Yeom Date: Thu, 17 Dec 2020 17:16:41 +0900 Subject: [PATCH 0317/1694] [breakpad] Support breakpad_client on Linux & macOS (#15092) --- ports/breakpad/CMakeLists.txt | 83 ++++++++++++++++++++---------- ports/breakpad/CONTROL | 1 + ports/breakpad/check_getcontext.cc | 9 ++++ ports/breakpad/portfile.cmake | 17 +++++- 4 files changed, 81 insertions(+), 29 deletions(-) create mode 100644 ports/breakpad/check_getcontext.cc diff --git a/ports/breakpad/CMakeLists.txt b/ports/breakpad/CMakeLists.txt index 113002943f4352..352cefde698e28 100644 --- a/ports/breakpad/CMakeLists.txt +++ b/ports/breakpad/CMakeLists.txt @@ -21,8 +21,16 @@ option(INSTALL_HEADERS "Install header files" ${DEFAULT_INSTALL_HEADERS}) # libbreakpad target file(GLOB_RECURSE LIBBREAKPAD_SOURCES src/processor/*.cc) -list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX - "_unittest|synth_minidump|/tests|/testdata|/linux|/mac|/android|/solaris|microdump_stackwalk|minidump_dump|minidump_stackwalk") +if(WIN32) + list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX + "_unittest|synth_minidump|/tests|/testdata|/linux|/mac|/android|/solaris|microdump_stackwalk|minidump_dump|minidump_stackwalk") +elseif(APPLE) + list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX + "_unittest|synth_minidump|/tests|/testdata|/linux|/windows|/android|/solaris|microdump_stackwalk|minidump_dump|minidump_stackwalk") +else() + list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX + "_unittest|synth_minidump|/tests|/testdata|/mac|/windows|/android|/solaris|microdump_stackwalk|minidump_dump|minidump_stackwalk") +endif() find_library(LIBDISASM_LIB NAMES libdisasmd libdisasm) @@ -37,35 +45,50 @@ target_include_directories(libbreakpad set(TARGETS libbreakpad) if(WIN32) - # libbreakpad_client target does not currently work on non-windows - if(WIN32) - file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES src/client/windows/*.cc src/common/windows/*.cc) - include_directories("$ENV{VSINSTALLDIR}/DIA SDK/include") - elseif(APPLE) - add_definitions(-DHAVE_MACH_O_NLIST_H) - file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES src/client/mac/*.cc src/common/mac/*.cc) - else() - add_definitions(-DHAVE_A_OUT_H) - file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES src/client/linux/*.cc src/common/linux/*.cc) - endif() - file(GLOB LIBBREAKPAD_COMMON_SOURCES src/common/*.cc src/common/*.c src/client/*.cc) - list(APPEND LIBBREAKPAD_CLIENT_SOURCES ${LIBBREAKPAD_COMMON_SOURCES}) - list(FILTER LIBBREAKPAD_CLIENT_SOURCES EXCLUDE REGEX "/tests|/unittests|_unittest") - if(WIN32) - list(FILTER LIBBREAKPAD_CLIENT_SOURCES EXCLUDE REGEX "language.cc|path_helper.cc|stabs_to_module.cc|stabs_reader.cc|minidump_file_writer.cc") + file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES src/client/windows/*.cc src/common/windows/*.cc) + include_directories("$ENV{VSINSTALLDIR}/DIA SDK/include") +elseif(APPLE) + add_definitions(-DHAVE_MACH_O_NLIST_H) + file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES src/client/mac/*.cc src/common/mac/*.cc) + list(APPEND LIBBREAKPAD_CLIENT_SOURCES src/common/mac/MachIPC.mm) +else() + add_definitions(-DHAVE_A_OUT_H) + file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES src/client/linux/*.cc src/common/linux/*.cc) +endif() +file(GLOB LIBBREAKPAD_COMMON_SOURCES src/common/*.cc src/common/*.c src/client/*.cc) +list(APPEND LIBBREAKPAD_CLIENT_SOURCES ${LIBBREAKPAD_COMMON_SOURCES}) +list(FILTER LIBBREAKPAD_CLIENT_SOURCES EXCLUDE REGEX "/sender|/tests|/unittests|/testcases|_unittest|_test") +if(WIN32) + list(FILTER LIBBREAKPAD_CLIENT_SOURCES EXCLUDE REGEX "language.cc|path_helper.cc|stabs_to_module.cc|stabs_reader.cc|minidump_file_writer.cc") +elseif(NOT APPLE) + try_compile(HAVE_GETCONTEXT ${CMAKE_BINARY_DIR}/check_getcontext ${CMAKE_CURRENT_LIST_DIR}/check_getcontext.cc OUTPUT_VARIABLE BUILD_OUT) + if (NOT HAVE_GETCONTEXT) + enable_language(ASM) + list(APPEND LIBBREAKPAD_CLIENT_SOURCES src/common/linux/breakpad_getcontext.S) endif() +endif() - add_library(libbreakpad_client ${LIBBREAKPAD_CLIENT_SOURCES}) +add_library(libbreakpad_client ${LIBBREAKPAD_CLIENT_SOURCES}) +if(WIN32) target_link_libraries(libbreakpad_client PRIVATE wininet.lib) - - target_include_directories(libbreakpad_client - PUBLIC - $ - $ - ) - list(APPEND TARGETS libbreakpad_client) +elseif(APPLE) + find_library(CoreFoundation_FRAMEWORK CoreFoundation) + target_link_libraries(libbreakpad_client PRIVATE ${CoreFoundation_FRAMEWORK}) +else() + find_library(PTHREAD_LIBRARIES pthread) + target_link_libraries(libbreakpad_client PRIVATE ${PTHREAD_LIBRARIES}) + if (HAVE_GETCONTEXT) + target_compile_definitions(libbreakpad_client PRIVATE HAVE_GETCONTEXT=1) + endif() endif() +target_include_directories(libbreakpad_client + PUBLIC + $ + $ +) +list(APPEND TARGETS libbreakpad_client) + # installation install(TARGETS ${TARGETS} EXPORT unofficial-breakpad-targets RUNTIME DESTINATION bin @@ -77,9 +100,15 @@ if(INSTALL_HEADERS) if(WIN32) set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests") elseif(APPLE) - set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/windows|/solaris|/android|/dwarf|/tests|/testdata|/unittests|/*proj|/gcov") + set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/windows|/solaris|/android|/dwarf|/tests|/testdata|/unittests|/sender|/testapp|/*proj|/gcov") else() set(HEADER_EXCLUDE_REGEX "/apple|/ios|/client/linux/data|/client/linux/sender|/windows|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests") + install( + DIRECTORY src/third_party/lss + DESTINATION include/third_party + FILES_MATCHING PATTERN "*.h" + REGEX "${HEADER_EXCLUDE_REGEX}" EXCLUDE + ) endif() install( DIRECTORY src/client src/common src/google_breakpad diff --git a/ports/breakpad/CONTROL b/ports/breakpad/CONTROL index ccafe9918c26c1..110b225b049b4a 100644 --- a/ports/breakpad/CONTROL +++ b/ports/breakpad/CONTROL @@ -1,5 +1,6 @@ Source: breakpad Version: 2020-09-14 +Port-Version: 1 Build-Depends: libdisasm Homepage: https://github.com/google/breakpad Description: a set of client and server components which implement a crash-reporting system. diff --git a/ports/breakpad/check_getcontext.cc b/ports/breakpad/check_getcontext.cc new file mode 100644 index 00000000000000..762147479f5c69 --- /dev/null +++ b/ports/breakpad/check_getcontext.cc @@ -0,0 +1,9 @@ +#include +#include + +int main() { + ucontext_t context; + getcontext(&context); + + return 0; +} diff --git a/ports/breakpad/portfile.cmake b/ports/breakpad/portfile.cmake index 27761bc216c1f9..aafbb4bc931942 100644 --- a/ports/breakpad/portfile.cmake +++ b/ports/breakpad/portfile.cmake @@ -3,14 +3,27 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/breakpad - REF 9c4671f2e3a63c0f155d9b2511192d0b5fa7f760 # accessed on 2020-09-14 + REF 9c4671f2e3a63c0f155d9b2511192d0b5fa7f760 # accessed on 2020-09-14 SHA512 4c9ed9b675a772f9a6a84692865381130901820cb395b725511e7a9e2cbf4aaa5212a9ef5f87086baf58bb9d729082232b564bd827a205f87b5c1ffc1c53892a HEAD_REF master PATCHES fix-unique_ptr.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +if(VCPKG_HOST_IS_LINUX) + vcpkg_from_git( + OUT_SOURCE_PATH LSS_SOURCE_PATH + URL https://chromium.googlesource.com/linux-syscall-support + REF 7bde79cc274d06451bf65ae82c012a5d3e476b5a + ) + + file(RENAME ${LSS_SOURCE_PATH} ${SOURCE_PATH}/src/third_party/lss) +endif() + +file( + COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${CMAKE_CURRENT_LIST_DIR}/check_getcontext.cc + DESTINATION ${SOURCE_PATH} +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} From 6da627e514dea831cd2844eb416f4f542b30a889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nagy-Egri=20M=C3=A1t=C3=A9=20Ferenc?= Date: Thu, 17 Dec 2020 09:18:20 +0100 Subject: [PATCH 0318/1694] [clrng] Add new port: clRNG (#14876) --- ports/clrng/001-build-fixup.patch | 124 ++++++++++++++++++++++++++++++ ports/clrng/CONTROL | 6 ++ ports/clrng/portfile.cmake | 48 ++++++++++++ 3 files changed, 178 insertions(+) create mode 100644 ports/clrng/001-build-fixup.patch create mode 100644 ports/clrng/CONTROL create mode 100644 ports/clrng/portfile.cmake diff --git a/ports/clrng/001-build-fixup.patch b/ports/clrng/001-build-fixup.patch new file mode 100644 index 00000000000000..4bdd727ee82f39 --- /dev/null +++ b/ports/clrng/001-build-fixup.patch @@ -0,0 +1,124 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 65f51db..f010bb8 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -31,7 +31,7 @@ + # ######################################################################## + + +-cmake_minimum_required( VERSION 2.8.10 ) ++cmake_minimum_required( VERSION 3.0 ) + + if( CMAKE_GENERATOR MATCHES "NMake" ) + option( NMAKE_COMPILE_VERBOSE "Print compile and link strings to the console" OFF ) +@@ -127,7 +127,6 @@ if( BUILD64 ) + set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE ) + message( STATUS "64bit build - FIND_LIBRARY_USE_LIB64_PATHS TRUE" ) + +- set( SUFFIX_LIB_DEFAULT "64" ) + else( ) + set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE ) + message( STATUS "32bit build - FIND_LIBRARY_USE_LIB64_PATHS FALSE" ) +@@ -161,7 +160,8 @@ set( SUFFIX_BIN ${SUFFIX_BIN_DEFAULT} CACHE STRING "String to append to 'bin' in + #endif( ) + + # This will define OPENCL_FOUND +-find_package( OpenCL ) ++find_package( OpenCL REQUIRED ) ++find_package( Threads REQUIRED ) + + if( (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_LESS 2.8) ) + message( STATUS "Cmake version 2.8 or greater needed to use GTest" ) +@@ -170,7 +170,7 @@ else() + find_package( GTest ) + + # Hack to get googletest v1.6 to work with vs2012 +- if( MSVC11 ) ++ if( 0 ) + add_definitions( "/D_VARIADIC_MAX=10" ) + endif( ) + endif() +@@ -196,7 +196,7 @@ get_filename_component( C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME_WE ) + # message( "CMAKE_C_COMPILER: " ${CMAKE_C_COMPILER} ) + + # Set common compile and link options +-if( MSVC ) ++if( 0 ) + # Following options for nMake + message( STATUS "Detected MSVS Ver: " ${MSVC_VERSION} ) + +@@ -206,6 +206,7 @@ if( MSVC ) + string( REGEX REPLACE "/STACK:[0-9]+" "" CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}" ) + + elseif( CMAKE_COMPILER_IS_GNUCXX ) ++ if( 0 ) + message( STATUS "Detected GNU fortran compiler." ) + EXEC_PROGRAM( ${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE vnum ) + STRING(REGEX REPLACE ".*([0-9])\\.([0-9])\\.([0-9]).*" "\\1\\2\\3" vnum ${vnum}) +@@ -216,6 +217,7 @@ elseif( CMAKE_COMPILER_IS_GNUCXX ) + + set( CMAKE_CXX_FLAGS "-pthread ${CMAKE_CXX_FLAGS}" ) + set( CMAKE_C_FLAGS "-std=c11 -Wall -pedantic-errors -pthread ${CMAKE_C_FLAGS}" ) ++ endif() + + if( BUILD64 ) + set( CMAKE_CXX_FLAGS "-m64 ${CMAKE_CXX_FLAGS}" ) +diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt +index dbe479d..8717e58 100644 +--- a/src/library/CMakeLists.txt ++++ b/src/library/CMakeLists.txt +@@ -62,8 +62,6 @@ set( clRNG.Headers private.h + + set( clRNG.Files ${clRNG.Source} ${clRNG.Headers} ) + +-# Include standard OpenCL headers +-include_directories( ${OPENCL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/include ../include ) + + if(BUILD_SHARED_LIBRARY) + add_library( clRNG SHARED ${clRNG.Files} ) +@@ -72,6 +70,15 @@ else() + endif() + target_link_libraries( clRNG ${OPENCL_LIBRARIES} ) + ++target_link_libraries( clRNG PUBLIC ++ OpenCL::OpenCL ++ Threads::Threads ++) ++target_include_directories( clRNG PUBLIC ++ $ ++ $ ++) ++ + set_target_properties( clRNG PROPERTIES VERSION ${CLRNG_VERSION} ) + set_target_properties( clRNG PROPERTIES SOVERSION ${CLRNG_SOVERSION} ) + set_target_properties( clRNG PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" ) +@@ -89,7 +96,7 @@ install( TARGETS clRNG + EXPORT clRNG-Targets + RUNTIME DESTINATION bin${SUFFIX_BIN} + LIBRARY DESTINATION lib${SUFFIX_LIB} +- ARCHIVE DESTINATION lib${SUFFIX_LIB}/import ++ ARCHIVE DESTINATION lib${SUFFIX_LIB} + ) + + # CMake config files for clRNG +@@ -139,9 +146,9 @@ endif( ) + include( InstallRequiredSystemLibraries ) + + # Install necessary runtime files for debug builds +-install( PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} +- CONFIGURATIONS Debug +- DESTINATION ${CLRNG_RUNTIME_DESTINATION} ) ++#install( PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ++# CONFIGURATIONS Debug ++# DESTINATION ${CLRNG_RUNTIME_DESTINATION} ) + + # Install all *.pdb files for debug builds + install( DIRECTORY ${PROJECT_BINARY_DIR}/staging/ +@@ -152,6 +159,6 @@ install( DIRECTORY ${PROJECT_BINARY_DIR}/staging/ + + # Install a snapshot of the source as it was for this build; useful for the .pdb's + install( DIRECTORY ${PROJECT_SOURCE_DIR} +- DESTINATION ${CLRNG_RUNTIME_DESTINATION} ++ DESTINATION "." + OPTIONAL + CONFIGURATIONS Debug ) diff --git a/ports/clrng/CONTROL b/ports/clrng/CONTROL new file mode 100644 index 00000000000000..35c19e5e64a611 --- /dev/null +++ b/ports/clrng/CONTROL @@ -0,0 +1,6 @@ +Source: clrng +Version: 2020-12-01 +Build-Depends: opencl +Supports: !arm64 +Homepage: https://github.com/clMathLibraries/clRNG +Description: clRNG is a library for uniform random number generation in OpenCL. diff --git a/ports/clrng/portfile.cmake b/ports/clrng/portfile.cmake new file mode 100644 index 00000000000000..d6a390a3e3f670 --- /dev/null +++ b/ports/clrng/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_fail_port_install(ON_ARCH "arm64") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO clMathLibraries/clRNG + REF 4a16519ddf52ee0a5f0b7e6288b0803b9019c13b + SHA512 28bda5d2a156e7394917f8c40bd1e8e7b52cf680abc0ef50c2650b1d546c0a1d0bd47ceeccce3cd7c79c90a15494c3d27829e153613a7d8e18267ce7262eeb6e + HEAD_REF master + PATCHES + 001-build-fixup.patch +) + +file(REMOVE ${SOURCE_PATH}/src/FindOpenCL.cmake) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT VCPKG_CMAKE_SYSTEM_NAME) + set(R123_SSE_FLAG [[-DCMAKE_C_FLAGS="/DR123_USE_SSE=0"]]) +endif() + +# We only have x64 and x86 as valid archs, as arm64 fails fast +string(COMPARE EQUAL "${VCPKG_TARGET_ARCHITECTURE}" "x64" BUILD64) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBRARY) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/src + PREFER_NINJA + OPTIONS + -DBUILD_SHARED_LIBRARY=${BUILD_SHARED_LIBRARY} + -DBUILD64=${BUILD64} + -DBUILD_TEST=OFF + -DBUILD_CLIENT=OFF + ${R123_SSE_FLAG} +) + +vcpkg_install_cmake() + +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") +endif() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clRNG) + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 9ce275b5240244d4f85ab7d927fae6aa3cfaf728 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 17 Dec 2020 00:19:02 -0800 Subject: [PATCH 0319/1694] [docs] Document acceptable uses for features. (#15171) --- docs/maintainers/maintainer-guide.md | 87 ++++++++++++++++++++++------ 1 file changed, 68 insertions(+), 19 deletions(-) diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md index 372771b0816608..734bcc5d9fe935 100644 --- a/docs/maintainers/maintainer-guide.md +++ b/docs/maintainers/maintainer-guide.md @@ -1,36 +1,36 @@ # Maintainer Guidelines and Policies -This document lists a set of policies that you should apply when adding or updating a port recipe. -It is intended to serve the role of -[Debian's Policy Manual](https://www.debian.org/doc/debian-policy/), -[Homebrew's Maintainer Guidelines](https://docs.brew.sh/Maintainer-Guidelines), and +This document lists a set of policies that you should apply when adding or updating a port recipe. +It is intended to serve the role of +[Debian's Policy Manual](https://www.debian.org/doc/debian-policy/), +[Homebrew's Maintainer Guidelines](https://docs.brew.sh/Maintainer-Guidelines), and [Homebrew's Formula Cookbook](https://docs.brew.sh/Formula-Cookbook). ## PR Structure ### Make separate Pull Requests per port -Whenever possible, separate changes into multiple PRs. +Whenever possible, separate changes into multiple PRs. This makes them significantly easier to review and prevents issues with one set of changes from holding up every other change. ### Avoid trivial changes in untouched files -For example, avoid reformatting or renaming variables in portfiles that otherwise have no reason to be modified for the issue at hand. -However, if you need to modify the file for the primary purpose of the PR (updating the library), +For example, avoid reformatting or renaming variables in portfiles that otherwise have no reason to be modified for the issue at hand. +However, if you need to modify the file for the primary purpose of the PR (updating the library), then obviously beneficial changes like fixing typos are appreciated! ### Check names against other repositories -A good service to check many at once is [Repology](https://repology.org/). -If the library you are adding could be confused with another one, +A good service to check many at once is [Repology](https://repology.org/). +If the library you are adding could be confused with another one, consider renaming to make it clear. ### Use GitHub Draft PRs -GitHub Draft PRs are a great way to get CI or human feedback on work that isn't yet ready to merge. +GitHub Draft PRs are a great way to get CI or human feedback on work that isn't yet ready to merge. Most new PRs should be opened as drafts and converted to normal PRs once the CI passes. -More information about GitHub Draft PRs: +More information about GitHub Draft PRs: https://github.blog/2019-02-14-introducing-draft-pull-requests/ ## Portfiles @@ -46,26 +46,75 @@ At this time, the following helpers are deprecated: ### Avoid excessive comments in portfiles -Ideally, portfiles should be short, simple, and as declarative as possible. +Ideally, portfiles should be short, simple, and as declarative as possible. Remove any boiler plate comments introduced by the `create` command before submitting a PR. +## Features + +### Do not use features to implement alternatives + +Features must be treated as additive functionality. If port[featureA] installs and port[featureB] installs, then port[featureA,featureB] must install. Moreover, if a second port depends on [featureA] and a third port depends on [featureB], installing both the second and third ports should have their dependencies satisfied. + +Libraries in this situation must choose one of the available options as expressed in vcpkg, and users who want a different setting must use overlay ports at this time. + +Existing examples we would not accept today retained for backwards compatibility: + * `libgit2`, `libzip`, `open62541` all have features for selecting a TLS or crypto backend. Note that `curl` has different crypto backend options but allows selecting between them at runtime, meaning the above tenet is maintained. + * `darknet` has `opencv2`, `opencv3`, features to control which version of opencv to use for its dependencies. + +### A feature may engage preview or beta functionality + +Notwithstanding the above, if there is a preview branch or similar where the preview functionality has a high probability of not disrupting the non-preview functionality (for example, no API removals), a feature is acceptable to model this setting. + +Examples: + * The Azure SDKs (of the form `azure-Xxx`) have a `public-preview` feature. + * `imgui` has an `experimental-docking` feature which engages their preview docking branch which uses a merge commit attached to each of their public numbered releases. + +### Do not use features to control alternatives in published interfaces + +If a consumer of a port depends on only the core functionality of that port, with high probability they must not be broken by turning on the feature. This is even more important when the alternative is not directly controlled by the consumer, but by compiler settings like `/std:c++17` / `-std=c++17`. + +Existing examples we would not accept today retained for backwards compatibility: + * `redis-plus-plus[cxx17]` controls a polyfill but does not bake the setting into the installed tree. + * `ace[wchar]` changes all APIs to accept `const wchar_t*` rather than `const char*`. + +### A feature may replace polyfills with aliases provided that replacement is baked into the installed tree + +Notwithstanding the above, ports may remove polyfills with a feature, as long as: + 1. Turning on the feature changes the polyfills to aliases of the polyfilled entity + 2. The state of the polyfill is baked into the installed headers, such that ABI mismatch "impossible" runtime errors are unlikely + 3. It is possible for a consumer of the port to write code which works in both modes, for example by using a typedef which is either polyfilled or not + +Example: + * `abseil[cxx17]` changes `absl::string_view` to a replacement or `std::string_view`; the patch +https://github.com/microsoft/vcpkg/blob/981e65ce0ac1f6c86e5a5ded7824db8780173c76/ports/abseil/fix-cxx-standard.patch implements the baking requirement + +### Recommended solutions + +If it's critical to expose the underlying alternatives, we recommend providing messages at build time to instruct the user on how to copy the port into a private overlay: +```cmake +set(USING_DOG 0) +message(STATUS "This version of LibContosoFrobnicate uses the Kittens backend. To use the Dog backend instead, create an overlay port of this with USING_DOG set to 1 and the `kittens` dependency replaced with `dog`.") +message(STATUS "This recipe is at ${CMAKE_CURRENT_LIST_DIR}") +message(STATUS "See the overlay ports documentation at https://github.com/microsoft/vcpkg/blob/master/docs/specifications/ports-overlay.md") +``` + ## Build Techniques ### Do not use vendored dependencies -Do not use embedded copies of libraries. +Do not use embedded copies of libraries. All dependencies should be split out and packaged separately so they can be updated and maintained. ### Prefer using CMake -When multiple buildsystems are available, prefer using CMake. +When multiple buildsystems are available, prefer using CMake. Additionally, when appropriate, it can be easier and more maintainable to rewrite alternative buildsystems into CMake using `file(GLOB)` directives. Examples: [abseil](../../ports/abseil/portfile.cmake) ### Choose either static or shared binaries -By default, `vcpkg_configure_cmake()` will pass in the appropriate setting for `BUILD_SHARED_LIBS`, +By default, `vcpkg_configure_cmake()` will pass in the appropriate setting for `BUILD_SHARED_LIBS`, however for libraries that don't respect that variable, you can switch on `VCPKG_LIBRARY_LINKAGE`: ```cmake @@ -83,8 +132,8 @@ vcpkg_configure_cmake( ### When defining features, explicitly control dependencies -When defining a feature that captures an optional dependency, -ensure that the dependency will not be used accidentally when the feature is not explicitly enabled. +When defining a feature that captures an optional dependency, +ensure that the dependency will not be used accidentally when the feature is not explicitly enabled. ```cmake if ("zlib" IN_LIST FEATURES) @@ -113,7 +162,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - ${FEATURE_OPTIONS} + ${FEATURE_OPTIONS} ) ``` @@ -168,7 +217,7 @@ Common options that allow avoiding patching: ### Prefer patching over overriding `VCPKG_` values -Some variables prefixed with `VCPKG_` have an equivalent `CMAKE_`. +Some variables prefixed with `VCPKG_` have an equivalent `CMAKE_`. However, not all of them are passed to the internal package build [(see implementation: Windows toolchain)](../../scripts/toolchains/windows.cmake). Consider the following example: From 02952c78985a4762696252adb8cf955631e91812 Mon Sep 17 00:00:00 2001 From: Kevin Lalumiere Date: Thu, 17 Dec 2020 03:20:34 -0500 Subject: [PATCH 0320/1694] [vcpkg] Fix warning (as error) when building vcpgk/toolsrc with clang++ 10 or g++ 9.3 (see #15148) (#15149) --- toolsrc/include/vcpkg/portfileprovider.h | 1 + toolsrc/src/vcpkg-test/dependencies.cpp | 2 +- toolsrc/src/vcpkg/versiondeserializers.cpp | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolsrc/include/vcpkg/portfileprovider.h b/toolsrc/include/vcpkg/portfileprovider.h index 9dbd5ec51acce9..b93c58e8c44613 100644 --- a/toolsrc/include/vcpkg/portfileprovider.h +++ b/toolsrc/include/vcpkg/portfileprovider.h @@ -12,6 +12,7 @@ namespace vcpkg::PortFileProvider { struct PortFileProvider { + virtual ~PortFileProvider() = default; virtual ExpectedS get_control_file(const std::string& src_name) const = 0; virtual std::vector load_all_control_files() const = 0; }; diff --git a/toolsrc/src/vcpkg-test/dependencies.cpp b/toolsrc/src/vcpkg-test/dependencies.cpp index 2aae7fffacf818..d1834b13dfa66c 100644 --- a/toolsrc/src/vcpkg-test/dependencies.cpp +++ b/toolsrc/src/vcpkg-test/dependencies.cpp @@ -603,7 +603,7 @@ TEST_CASE ("version parse relaxed", "[versionplan]") auto version_long = Versions::RelaxedVersion::from_string("1.20.300.4000.50000.6000000.70000000.80000000.18446744073709551610"); - check_relaxed_version(version_long, {1, 20, 300, 4000, 50000, 6000000, 70000000, 80000000, 18446744073709551610}); + check_relaxed_version(version_long, {1, 20, 300, 4000, 50000, 6000000, 70000000, 80000000, 18446744073709551610u}); auto version_invalid_characters = Versions::RelaxedVersion::from_string("1.a.0"); CHECK(!version_invalid_characters.has_value()); diff --git a/toolsrc/src/vcpkg/versiondeserializers.cpp b/toolsrc/src/vcpkg/versiondeserializers.cpp index ec27fb8c8cd102..ee64630e3286e6 100644 --- a/toolsrc/src/vcpkg/versiondeserializers.cpp +++ b/toolsrc/src/vcpkg/versiondeserializers.cpp @@ -12,7 +12,6 @@ namespace constexpr StringLiteral VERSION_STRING = "version-string"; constexpr StringLiteral VERSION_DATE = "version-date"; constexpr StringLiteral PORT_VERSION = "port-version"; - constexpr StringLiteral GIT_TREE = "git-tree"; struct VersionDeserializer final : Json::IDeserializer { From 21e5b6cdb48003da713506f48533d3359b763441 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 17 Dec 2020 09:45:35 +0100 Subject: [PATCH 0321/1694] remove not needed fonts installation Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/mapnik/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index fe32383c4727cf..9e48b89d0dd28d 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -58,7 +58,6 @@ vcpkg_install_cmake() # copy plugins into tool path, if any plugin is installed if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/plugins) file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - #file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() vcpkg_copy_pdbs() From 2d19edbbfd5256b537f0e2540cc5fcdb4801bbd8 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 17 Dec 2020 09:45:35 +0100 Subject: [PATCH 0322/1694] remove not needed fonts installation Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/mapnik/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index fe32383c4727cf..9e48b89d0dd28d 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -58,7 +58,6 @@ vcpkg_install_cmake() # copy plugins into tool path, if any plugin is installed if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/plugins) file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - #file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() vcpkg_copy_pdbs() From c85e6b77a7904010cb13962a71d4e1c1c83e26f2 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Thu, 17 Dec 2020 11:35:08 -0800 Subject: [PATCH 0323/1694] [vcpkg] `VCPKG_ENV_PASSTHROUGH_UNTRACKED` (#15115) * [vcpkg] Add VCPKG_ENV_PASSTHROUGH_UNTRACKED * [vcpkg] CR comments Co-authored-by: Robert Schumacher --- docs/users/triplets.md | 12 ++++++++--- .../end-to-end-tests-dir/env-passthrough.ps1 | 21 +++++++++++++++++++ .../testing/env-passthrough/passthrough.cmake | 6 ++++++ scripts/vcpkg_get_tags.cmake | 1 + toolsrc/include/vcpkg/build.h | 1 + toolsrc/src/vcpkg/build.cpp | 18 +++++++++++----- toolsrc/src/vcpkg/commands.env.cpp | 7 +++++++ 7 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/env-passthrough.ps1 create mode 100644 scripts/testing/env-passthrough/passthrough.cmake diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 9903b197ca8630..37efd590d09838 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -102,14 +102,20 @@ See the [`"supports"`](../maintainers/manifest-files.md#supports) manifest file ### VCPKG_ENV_PASSTHROUGH Instructs vcpkg to allow additional environment variables into the build process. -On Windows, vcpkg builds packages in a special clean environment that is isolated from the current command prompt to ensure build reliability and consistency. - -This triplet option can be set to a list of additional environment variables that will be added to the clean environment. +On Windows, vcpkg builds packages in a special clean environment that is isolated from the current command prompt to +ensure build reliability and consistency. This triplet option can be set to a list of additional environment variables +that will be added to the clean environment. The values of these environment variables will be hashed into the package +abi -- to pass through environment variables without abi tracking, see `VCPKG_ENV_PASSTHROUGH_UNTRACKED`. See also the `vcpkg env` command for how you can inspect the precise environment that will be used. > Implementers' Note: this list is extracted via the `vcpkg_get_tags` mechanism. +### VCPKG_ENV_PASSTHROUGH_UNTRACKED +Instructs vcpkg to allow additional environment variables into the build process without abi tracking. + +See `VCPKG_ENV_PASSTHROUGH`. + ### VCPKG_VISUAL_STUDIO_PATH Specifies the Visual Studio installation to use. diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/env-passthrough.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/env-passthrough.ps1 new file mode 100644 index 00000000000000..6de1335d7cb09b --- /dev/null +++ b/scripts/azure-pipelines/end-to-end-tests-dir/env-passthrough.ps1 @@ -0,0 +1,21 @@ +if (-not $IsLinux -and -not $IsMacOS) { + . $PSScriptRoot/../end-to-end-tests-prelude.ps1 + + $env:_VCPKG_TEST_TRACKED = "a" + $env:_VCPKG_TEST_UNTRACKED = "b" + + $x = ./vcpkg "--overlay-triplets=$PSScriptRoot/../../testing/env-passthrough" env "echo %_VCPKG_TEST_TRACKED% %_VCPKG_TEST_TRACKED2% %_VCPKG_TEST_UNTRACKED% %_VCPKG_TEST_UNTRACKED2%" + if ($x -ne "%_VCPKG_TEST_TRACKED% %_VCPKG_TEST_TRACKED2% %_VCPKG_TEST_UNTRACKED% %_VCPKG_TEST_UNTRACKED2%") + { + throw "env should have cleaned the environment ($x)" + } + + $y = ./vcpkg "--overlay-triplets=$PSScriptRoot/../../testing/env-passthrough" env --triplet passthrough "echo %_VCPKG_TEST_TRACKED% %_VCPKG_TEST_TRACKED2% %_VCPKG_TEST_UNTRACKED% %_VCPKG_TEST_UNTRACKED2%" + if ($y -ne "a %_VCPKG_TEST_TRACKED2% b %_VCPKG_TEST_UNTRACKED2%") + { + throw "env should have kept the environment ($y)" + } + + rm env:_VCPKG_TEST_TRACKED + rm env:_VCPKG_TEST_UNTRACKED +} \ No newline at end of file diff --git a/scripts/testing/env-passthrough/passthrough.cmake b/scripts/testing/env-passthrough/passthrough.cmake new file mode 100644 index 00000000000000..071b8381ea60b7 --- /dev/null +++ b/scripts/testing/env-passthrough/passthrough.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +set(VCPKG_ENV_PASSTHROUGH _VCPKG_TEST_TRACKED _VCPKG_TEST_TRACKED2) +set(VCPKG_ENV_PASSTHROUGH_UNTRACKED _VCPKG_TEST_UNTRACKED _VCPKG_TEST_UNTRACKED2) diff --git a/scripts/vcpkg_get_tags.cmake b/scripts/vcpkg_get_tags.cmake index bec5d933120786..749b06e5a9f12c 100644 --- a/scripts/vcpkg_get_tags.cmake +++ b/scripts/vcpkg_get_tags.cmake @@ -24,6 +24,7 @@ e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f") message("c35112b6-d1ba-415b-aa5d-81de856ef8eb VCPKG_PUBLIC_ABI_OVERRIDE=${VCPKG_PUBLIC_ABI_OVERRIDE} VCPKG_ENV_PASSTHROUGH=${VCPKG_ENV_PASSTHROUGH} +VCPKG_ENV_PASSTHROUGH_UNTRACKED=${VCPKG_ENV_PASSTHROUGH_UNTRACKED} VCPKG_LOAD_VCVARS_ENV=${VCPKG_LOAD_VCVARS_ENV} e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f 8c504940-be29-4cba-9f8f-6cd83e9d87b7") diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index 2e3c5fafa5186c..88a12e5c168ec2 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -213,6 +213,7 @@ namespace vcpkg::Build Optional build_type; Optional public_abi_override; std::vector passthrough_env_vars; + std::vector passthrough_env_vars_tracked; fs::path toolchain_file() const; bool using_vcvars() const; diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 4cc4c2987a7760..b01162b4f3815c 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -896,11 +896,13 @@ namespace vcpkg::Build Hash::Algorithm::Sha1)); } - for (const auto& env_var : pre_build_info.passthrough_env_vars) + for (const auto& env_var : pre_build_info.passthrough_env_vars_tracked) { - abi_tag_entries.emplace_back( - "ENV:" + env_var, - Hash::get_string_hash(System::get_environment_variable(env_var).value_or(""), Hash::Algorithm::Sha1)); + if (auto e = System::get_environment_variable(env_var)) + { + abi_tag_entries.emplace_back( + "ENV:" + env_var, Hash::get_string_hash(e.value_or_exit(VCPKG_LINE_INFO), Hash::Algorithm::Sha1)); + } } } @@ -1305,6 +1307,7 @@ namespace vcpkg::Build CHAINLOAD_TOOLCHAIN_FILE, BUILD_TYPE, ENV_PASSTHROUGH, + ENV_PASSTHROUGH_UNTRACKED, PUBLIC_ABI_OVERRIDE, LOAD_VCVARS_ENV, }; @@ -1318,6 +1321,7 @@ namespace vcpkg::Build {"VCPKG_CHAINLOAD_TOOLCHAIN_FILE", VcpkgTripletVar::CHAINLOAD_TOOLCHAIN_FILE}, {"VCPKG_BUILD_TYPE", VcpkgTripletVar::BUILD_TYPE}, {"VCPKG_ENV_PASSTHROUGH", VcpkgTripletVar::ENV_PASSTHROUGH}, + {"VCPKG_ENV_PASSTHROUGH_UNTRACKED", VcpkgTripletVar::ENV_PASSTHROUGH_UNTRACKED}, {"VCPKG_PUBLIC_ABI_OVERRIDE", VcpkgTripletVar::PUBLIC_ABI_OVERRIDE}, {"VCPKG_LOAD_VCVARS_ENV", VcpkgTripletVar::LOAD_VCVARS_ENV}, }; @@ -1365,7 +1369,11 @@ namespace vcpkg::Build variable_value); break; case VcpkgTripletVar::ENV_PASSTHROUGH: - passthrough_env_vars = Strings::split(variable_value, ';'); + passthrough_env_vars_tracked = Strings::split(variable_value, ';'); + Util::Vectors::append(&passthrough_env_vars, passthrough_env_vars_tracked); + break; + case VcpkgTripletVar::ENV_PASSTHROUGH_UNTRACKED: + Util::Vectors::append(&passthrough_env_vars, Strings::split(variable_value, ';')); break; case VcpkgTripletVar::PUBLIC_ABI_OVERRIDE: public_abi_override = variable_value.empty() ? nullopt : Optional{variable_value}; diff --git a/toolsrc/src/vcpkg/commands.env.cpp b/toolsrc/src/vcpkg/commands.env.cpp index eadfd5bc0d9856..d05a6ef50e21b3 100644 --- a/toolsrc/src/vcpkg/commands.env.cpp +++ b/toolsrc/src/vcpkg/commands.env.cpp @@ -75,6 +75,13 @@ namespace vcpkg::Commands::Env extra_env.emplace("PYTHONPATH", fs::u8string(paths.installed / fs::u8path(triplet.to_string()) / fs::u8path("python"))); if (path_vars.size() > 0) extra_env.emplace("PATH", Strings::join(";", path_vars)); + for (auto&& passthrough : pre_build_info.passthrough_env_vars) + { + if (auto e = System::get_environment_variable(passthrough)) + { + extra_env.emplace(passthrough, e.value_or_exit(VCPKG_LINE_INFO)); + } + } auto env = [&] { auto clean_env = System::get_modified_clean_environment(extra_env); From 4bc59bf805d65e6357f6435a0202ceb45ca20105 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 18 Dec 2020 03:53:17 +0800 Subject: [PATCH 0324/1694] [osgearth/rocksdb] Update to latest release (#14976) --- ports/osgearth/CONTROL | 5 +- ports/osgearth/RocksDB.patch | 79 ------ ports/osgearth/portfile.cmake | 24 +- ports/rocksdb/0001-disable-gtest.patch | 13 - .../rocksdb/0002-only-build-one-flavor.patch | 4 +- ports/rocksdb/0003-use-find-package.patch | 29 +- .../0004-add-config-to-findpackage.patch | 13 - .../0004-fix-dependency-in-config.patch | 22 ++ .../0005-backport-msvc-fixes-pr-7439.patch | 256 ------------------ .../0005-do-not-install-cmake-modules.patch | 13 + ports/rocksdb/CONTROL | 2 +- ports/rocksdb/portfile.cmake | 43 ++- ports/rocksdb/vcpkg-cmake-wrapper.cmake | 9 - 13 files changed, 101 insertions(+), 411 deletions(-) delete mode 100644 ports/osgearth/RocksDB.patch delete mode 100644 ports/rocksdb/0001-disable-gtest.patch delete mode 100644 ports/rocksdb/0004-add-config-to-findpackage.patch create mode 100644 ports/rocksdb/0004-fix-dependency-in-config.patch delete mode 100644 ports/rocksdb/0005-backport-msvc-fixes-pr-7439.patch create mode 100644 ports/rocksdb/0005-do-not-install-cmake-modules.patch delete mode 100644 ports/rocksdb/vcpkg-cmake-wrapper.cmake diff --git a/ports/osgearth/CONTROL b/ports/osgearth/CONTROL index 6a23c4d31db7b0..c6d7b7a13cb5ae 100644 --- a/ports/osgearth/CONTROL +++ b/ports/osgearth/CONTROL @@ -1,6 +1,5 @@ Source: osgearth -Version: 3.0 -Port-Version: 2 +Version: 3.1 Homepage: https://github.com/gwaldron/osgearth Description: osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping. -Build-Depends: osg[plugins] +Build-Depends: osg[plugins] \ No newline at end of file diff --git a/ports/osgearth/RocksDB.patch b/ports/osgearth/RocksDB.patch deleted file mode 100644 index c73cdad19b869d..00000000000000 --- a/ports/osgearth/RocksDB.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/CMakeModules/FindRocksDB.cmake b/CMakeModules/FindRocksDB.cmake -index b0692b0..984d3f2 100644 ---- a/CMakeModules/FindRocksDB.cmake -+++ b/CMakeModules/FindRocksDB.cmake -@@ -39,5 +39,49 @@ find_package_handle_standard_args(ROCKSDB - "Could NOT find ROCKSDB" - ) - -+if(ROCKSDB_FOUND) -+ FIND_PACKAGE(ZLIB REQUIRED) -+ -+ include(SelectLibraryConfigurations) -+ # Find Snappy library -+ find_library(SNAPPY_LIBRARY_DEBUG NAMES snappyd) -+ find_library(SNAPPY_LIBRARY_RELEASE NAMES snappy) -+ select_library_configurations(SNAPPY) -+ find_package_handle_standard_args(SNAPPY -+ FOUND_VAR -+ SNAPPY_FOUND -+ REQUIRED_VARS -+ SNAPPY_LIBRARY -+ FAIL_MESSAGE -+ "Could NOT find SNAPPY" -+ ) -+ -+ # Find LZ4 library -+ find_library(LZ4_LIBRARY_DEBUG NAMES lz4d) -+ find_library(LZ4_LIBRARY_RELEASE NAMES lz4) -+ select_library_configurations(LZ4) -+ find_package_handle_standard_args(LZ4 -+ FOUND_VAR -+ LZ4_FOUND -+ REQUIRED_VARS -+ LZ4_LIBRARY -+ FAIL_MESSAGE -+ "Could NOT find LZ4" -+ ) -+ -+ # Find ZSTD library -+ find_library(ZSTD_LIBRARY_DEBUG NAMES zstdd) -+ find_library(ZSTD_LIBRARY_RELEASE NAMES zstd) -+ select_library_configurations(ZSTD) -+ find_package_handle_standard_args(ZSTD -+ FOUND_VAR -+ ZSTD_FOUND -+ REQUIRED_VARS -+ ZSTD_LIBRARY -+ FAIL_MESSAGE -+ "Could NOT find ZSTD_" -+ ) -+endif(ROCKSDB_FOUND) -+ - set(ROCKSDB_INCLUDE_DIRS ${ROCKSDB_INCLUDE_DIR} ) - set(ROCKSDB_LIBRARIES ${ROCKSDB_LIBRARY}) -diff --git a/src/osgEarthDrivers/cache_rocksdb/CMakeLists.txt b/src/osgEarthDrivers/cache_rocksdb/CMakeLists.txt -index ecaac34..b4ec764 100644 ---- a/src/osgEarthDrivers/cache_rocksdb/CMakeLists.txt -+++ b/src/osgEarthDrivers/cache_rocksdb/CMakeLists.txt -@@ -34,7 +34,19 @@ IF(ROCKSDB_FOUND OR RocksDB_FOUND) - RocksDBCacheDriver.cpp - ) - -- SET(TARGET_LIBRARIES_VARS ROCKSDB_LIBRARY ZLIB_LIBRARY) -+ if(SNAPPY_FOUND) -+ SET(ROCKSDB_DEPENDENT_LIBRARY ${ROCKSDB_DEPENDENT_LIBRARY} ${SNAPPY_LIBRARY}) -+ endif(SNAPPY_FOUND) -+ -+ if(LZ4_FOUND) -+ SET(ROCKSDB_DEPENDENT_LIBRARY ${ROCKSDB_DEPENDENT_LIBRARY} ${LZ4_LIBRARY}) -+ endif(LZ4_FOUND) -+ -+ if(ZSTD_FOUND) -+ SET(ROCKSDB_DEPENDENT_LIBRARY ${ROCKSDB_DEPENDENT_LIBRARY} ${ZSTD_LIBRARY}) -+ endif(ZSTD_FOUND) -+ -+ SET(TARGET_LIBRARIES_VARS ROCKSDB_LIBRARY ZLIB_LIBRARY ROCKSDB_DEPENDENT_LIBRARY) - - IF(MSVC) - SET(TARGET_EXTERNAL_LIBRARIES ws2_32 winmm rpcrt4 shlwapi) diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 5dc2109122bd88..7f8f9be1e3ff10 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -10,16 +10,21 @@ string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/osg/" "" OSG_PLUGINS_SUBDIR "${OS vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth - REF dc73ac92b19fff1427414cfb981b6018c0ed88a1 #version 3.0 - SHA512 86c287a75946b902c05897d3952c9ff201853599d52023c7b2c850f2253b7e738c4b54ac7ae947bf0909b3aaf074bdb1472f4e92c59cd919458933a72fd13b80 + REF 342fcadf4c8892ba84841cb5b4162bdc51519e3c #version 3.1 + SHA512 03378a918306846d2144e545785c783b01e33fa2dd5c77d16d390a275217b6ce7a3a743c35ae99a497b272a7516b055442c0a891bd312cce727a5538b40364f5 HEAD_REF master - PATCHES - RocksDB.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DOSGEARTH_BUILD_EXAMPLES=OFF + -DOSGEARTH_BUILD_TESTS=OFF + -DOSGEARTH_BUILD_DOCS=OFF + -DOSGEARTH_BUILD_PROCEDURAL_NODEKIT=OFF + -DOSGEARTH_BUILD_TRITON_NODEKIT=OFF + -DOSGEARTH_BUILD_SILVERLINING_NODEKIT=OFF ) vcpkg_install_cmake() @@ -32,13 +37,13 @@ file(MAKE_DIRECTORY ${OSGEARTH_TOOL_PATH}) file(MAKE_DIRECTORY ${OSGEARTH_TOOL_PLUGIN_PATH}) file(GLOB OSGEARTH_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe) -file(GLOB OSGDB_PLUGINS ${CURRENT_PACKAGES_DIR}/bin/osgdb*.dll) +file(GLOB OSGDB_PLUGINS ${CURRENT_PACKAGES_DIR}/bin/${OSG_PLUGINS_SUBDIR}/osgdb*.dll) file(COPY ${OSGEARTH_TOOLS} DESTINATION ${OSGEARTH_TOOL_PATH}) file(COPY ${OSGDB_PLUGINS} DESTINATION ${OSGEARTH_TOOL_PLUGIN_PATH}) file(REMOVE_RECURSE ${OSGEARTH_TOOLS}) -file(REMOVE_RECURSE ${OSGDB_PLUGINS}) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/${OSG_PLUGINS_SUBDIR}) #Debug file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -50,14 +55,13 @@ file(MAKE_DIRECTORY ${OSGEARTH_DEBUG_TOOL_PATH}) file(MAKE_DIRECTORY ${OSGEARTH_DEBUG_TOOL_PLUGIN_PATH}) file(GLOB OSGEARTH_DEBUG_TOOLS ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) -file(GLOB OSGDB_DEBUG_PLUGINS ${CURRENT_PACKAGES_DIR}/debug/bin/osgdb*.dll) +file(GLOB OSGDB_DEBUG_PLUGINS ${CURRENT_PACKAGES_DIR}/debug/bin/${OSG_PLUGINS_SUBDIR}/osgdb*.dll) file(COPY ${OSGEARTH_DEBUG_TOOLS} DESTINATION ${OSGEARTH_DEBUG_TOOL_PATH}) file(COPY ${OSGDB_DEBUG_PLUGINS} DESTINATION ${OSGEARTH_DEBUG_TOOL_PLUGIN_PATH}) file(REMOVE_RECURSE ${OSGEARTH_DEBUG_TOOLS}) -file(REMOVE_RECURSE ${OSGDB_DEBUG_PLUGINS}) - +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/${OSG_PLUGINS_SUBDIR}) # 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) \ No newline at end of file diff --git a/ports/rocksdb/0001-disable-gtest.patch b/ports/rocksdb/0001-disable-gtest.patch deleted file mode 100644 index 9c99f78adf16bb..00000000000000 --- a/ports/rocksdb/0001-disable-gtest.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 01eea8889..14a4b1a40 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1015,7 +1015,7 @@ endif() - option(WITH_ALL_TESTS "Build all test, rather than a small subset" ON) - - if(WITH_TESTS OR WITH_BENCHMARK_TOOLS) -- add_subdirectory(third-party/gtest-1.8.1/fused-src/gtest) -+ #add_subdirectory(third-party/gtest-1.8.1/fused-src/gtest) - add_library(testharness STATIC - test_util/mock_time_env.cc - test_util/testharness.cc) diff --git a/ports/rocksdb/0002-only-build-one-flavor.patch b/ports/rocksdb/0002-only-build-one-flavor.patch index ec1051ac60e6d4..4ee4d23932726d 100644 --- a/ports/rocksdb/0002-only-build-one-flavor.patch +++ b/ports/rocksdb/0002-only-build-one-flavor.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9c8f3346..74c2d263c 100644 +index 6761929..4d2b0a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -938,13 +938,17 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) +@@ -987,13 +987,17 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination}) diff --git a/ports/rocksdb/0003-use-find-package.patch b/ports/rocksdb/0003-use-find-package.patch index 47da318a1fb752..e05de2a4bb3964 100644 --- a/ports/rocksdb/0003-use-find-package.patch +++ b/ports/rocksdb/0003-use-find-package.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 36eddb32b..97a93601b 100644 +index 6761929..6f74d31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,7 @@ include(CMakeDependentOption) @@ -23,7 +23,14 @@ index 36eddb32b..97a93601b 100644 add_definitions(-DSNAPPY) list(APPEND THIRDPARTY_LIBS Snappy::snappy) endif() -@@ -163,10 +160,9 @@ else() +@@ -157,16 +154,19 @@ else() + endif() + + if(WITH_LZ4) +- find_package(lz4 REQUIRED) ++ find_package(lz4 CONFIG REQUIRED) + add_definitions(-DLZ4) + list(APPEND THIRDPARTY_LIBS lz4::lz4) endif() if(WITH_ZSTD) @@ -32,7 +39,23 @@ index 36eddb32b..97a93601b 100644 add_definitions(-DZSTD) - include_directories(${ZSTD_INCLUDE_DIR}) - list(APPEND THIRDPARTY_LIBS zstd::zstd) -+ list(APPEND THIRDPARTY_LIBS libzstd) ++ if(TARGET zstd::libzstd_shared) ++ list(APPEND THIRDPARTY_LIBS zstd::libzstd_shared) ++ elseif(TARGET zstd::libzstd_static) ++ list(APPEND THIRDPARTY_LIBS zstd::libzstd_static) ++ endif() endif() endif() +@@ -375,9 +375,9 @@ endif() + + option(WITH_TBB "build with Threading Building Blocks (TBB)" OFF) + if(WITH_TBB) +- find_package(TBB REQUIRED) ++ find_package(TBB CONFIG REQUIRED) + add_definitions(-DTBB) +- list(APPEND THIRDPARTY_LIBS TBB::TBB) ++ list(APPEND THIRDPARTY_LIBS TBB::tbb) + endif() + + # Stall notifications eat some performance from inserts diff --git a/ports/rocksdb/0004-add-config-to-findpackage.patch b/ports/rocksdb/0004-add-config-to-findpackage.patch deleted file mode 100644 index 68df561e4cbc00..00000000000000 --- a/ports/rocksdb/0004-add-config-to-findpackage.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9c8f3346..11aa70db9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -154,7 +154,7 @@ else() - endif() - - if(WITH_LZ4) -- find_package(lz4 REQUIRED) -+ find_package(lz4 CONFIG REQUIRED) - add_definitions(-DLZ4) - list(APPEND THIRDPARTY_LIBS lz4::lz4) - endif() diff --git a/ports/rocksdb/0004-fix-dependency-in-config.patch b/ports/rocksdb/0004-fix-dependency-in-config.patch new file mode 100644 index 00000000000000..a2cde0d7b132ad --- /dev/null +++ b/ports/rocksdb/0004-fix-dependency-in-config.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/RocksDBConfig.cmake.in b/cmake/RocksDBConfig.cmake.in +index 0bd14be..f9f6aa8 100644 +--- a/cmake/RocksDBConfig.cmake.in ++++ b/cmake/RocksDBConfig.cmake.in +@@ -37,7 +37,7 @@ if(@WITH_LZ4@) + endif() + + if(@WITH_ZSTD@) +- find_dependency(zstd) ++ find_dependency(zstd CONFIG) + endif() + + if(@WITH_NUMA@) +@@ -45,7 +45,7 @@ if(@WITH_NUMA@) + endif() + + if(@WITH_TBB@) +- find_dependency(TBB) ++ find_dependency(TBB CONFIG) + endif() + + find_dependency(Threads) diff --git a/ports/rocksdb/0005-backport-msvc-fixes-pr-7439.patch b/ports/rocksdb/0005-backport-msvc-fixes-pr-7439.patch deleted file mode 100644 index 7daedb27daf9c1..00000000000000 --- a/ports/rocksdb/0005-backport-msvc-fixes-pr-7439.patch +++ /dev/null @@ -1,256 +0,0 @@ -diff --git a/.circleci/config.yml b/.circleci/config.yml -index d656a1961..c088ee4ee 100644 ---- a/.circleci/config.yml -+++ b/.circleci/config.yml -@@ -234,7 +234,7 @@ jobs: - name: "Test RocksDB" - shell: powershell.exe - command: | -- build_tools\run_ci_db_test.ps1 -SuiteRun db_basic_test,db_test,db_test2,env_basic_test,env_test,db_merge_operand_test -Concurrency 16 -+ build_tools\run_ci_db_test.ps1 -SuiteRun db_basic_test,db_test,db_test2,db_merge_operand_test,bloom_test,c_test,coding_test,crc32c_test,dynamic_bloom_test,env_basic_test,env_test,hash_test,random_test -Concurrency 16 - - build-linux-java: - machine: -diff --git a/db/c_test.c b/db/c_test.c -index 4fb7d016d..a01336738 100644 ---- a/db/c_test.c -+++ b/db/c_test.c -@@ -58,7 +58,11 @@ static void StartPhase(const char* name) { - static const char* GetTempDir(void) { - const char* ret = getenv("TEST_TMPDIR"); - if (ret == NULL || ret[0] == '\0') -- ret = "/tmp"; -+#ifdef OS_WIN -+ ret = getenv("TEMP"); -+#else -+ ret = "/tmp"; -+#endif - return ret; - } - #ifdef _MSC_VER -diff --git a/db/perf_context_test.cc b/db/perf_context_test.cc -index 0410ada7a..5a714b9b8 100644 ---- a/db/perf_context_test.cc -+++ b/db/perf_context_test.cc -@@ -817,6 +817,13 @@ TEST_F(PerfContextTest, PerfContextByLevelGetSet) { - } - - TEST_F(PerfContextTest, CPUTimer) { -+ if (Env::Default()->NowCPUNanos() == 0) { -+ // TODO: This should be a GTEST_SKIP when the embedded gtest is updated -+ // to 1.10 or higher. -+ GTEST_SUCCESS_("Skipped on target without NowCPUNanos support"); -+ return; -+ } -+ - DestroyDB(kDbName, Options()); - auto db = OpenDb(); - WriteOptions write_options; -diff --git a/file/filename.cc b/file/filename.cc -index 968adbaa7..0ac4e6ef8 100644 ---- a/file/filename.cc -+++ b/file/filename.cc -@@ -461,8 +461,8 @@ Status GetInfoLogFiles(Env* env, const std::string& db_log_dir, - std::string NormalizePath(const std::string& path) { - std::string dst; - for (auto c : path) { -- if (!dst.empty() && c == kFilePathSeparator && -- dst.back() == kFilePathSeparator) { -+ if (!dst.empty() && (c == kFilePathSeparator || c == '/') && -+ (dst.back() == kFilePathSeparator || dst.back() == '/')) { - continue; - } - dst.push_back(c); -diff --git a/port/win/port_win.cc b/port/win/port_win.cc -index 2d99a7a9b..f33ee20c4 100644 ---- a/port/win/port_win.cc -+++ b/port/win/port_win.cc -@@ -100,6 +100,15 @@ bool CondVar::TimedWait(uint64_t abs_time_us) { - - // Caller must ensure that mutex is held prior to calling this method - std::unique_lock lk(mu_->getLock(), std::adopt_lock); -+ -+ // Work around https://github.com/microsoft/STL/issues/369 -+#if defined(_MSC_VER) && \ -+ (!defined(_MSVC_STL_UPDATE) || _MSVC_STL_UPDATE < 202008L) -+ if (relTimeUs == microseconds::zero()) { -+ lk.unlock(); -+ lk.lock(); -+ } -+#endif - #ifndef NDEBUG - mu_->locked_ = false; - #endif -diff --git a/port/win/port_win.h b/port/win/port_win.h -index a3ffd559c..2c5b8ff05 100644 ---- a/port/win/port_win.h -+++ b/port/win/port_win.h -@@ -283,7 +283,7 @@ extern const size_t kPageSize; - #endif - - static inline void AsmVolatilePause() { --#if defined(_M_IX86) || defined(_M_X64) -+#if defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM64) || defined(_M_ARM) - YieldProcessor(); - #endif - // it would be nice to get "wfe" on ARM here -diff --git a/third-party/folly/folly/chrono/Hardware.h b/third-party/folly/folly/chrono/Hardware.h -index ec7be82e8..6635b8717 100644 ---- a/third-party/folly/folly/chrono/Hardware.h -+++ b/third-party/folly/folly/chrono/Hardware.h -@@ -10,7 +10,7 @@ - #include - #include - --#if _MSC_VER -+#if _MSC_VER && (defined(_M_IX86) || defined(_M_X64)) - extern "C" std::uint64_t __rdtsc(); - #pragma intrinsic(__rdtsc) - #endif -@@ -18,7 +18,7 @@ extern "C" std::uint64_t __rdtsc(); - namespace folly { - - inline std::uint64_t hardware_timestamp() { --#if _MSC_VER -+#if _MSC_VER && (defined(_M_IX86) || defined(_M_X64)) - return __rdtsc(); - #elif __GNUC__ && (__i386__ || FOLLY_X64) - return __builtin_ia32_rdtsc(); -diff --git a/util/filelock_test.cc b/util/filelock_test.cc -index 611cd46c6..fe2f7e0d8 100644 ---- a/util/filelock_test.cc -+++ b/util/filelock_test.cc -@@ -127,9 +127,11 @@ TEST_F(LockTest, LockBySameThread) { - // re-acquire the lock on the same file. This should fail. - Status s = LockFile(&lock2); - ASSERT_TRUE(s.IsIOError()); -+#ifndef OS_WIN - // Validate that error message contains current thread ID. - ASSERT_TRUE(s.ToString().find(ToString(Env::Default()->GetThreadID())) != - std::string::npos); -+#endif - - // check the file is locked - ASSERT_TRUE( AssertFileIsLocked() ); -diff --git a/util/math.h b/util/math.h -index 2e57c1c08..24fc840e4 100644 ---- a/util/math.h -+++ b/util/math.h -@@ -21,13 +21,23 @@ inline int FloorLog2(T v) { - assert(v > 0); - #ifdef _MSC_VER - static_assert(sizeof(T) <= sizeof(uint64_t), "type too big"); -- unsigned long lz = 0; -+ unsigned long idx = 0; - if (sizeof(T) <= sizeof(uint32_t)) { -- _BitScanReverse(&lz, static_cast(v)); -+ _BitScanReverse(&idx, static_cast(v)); - } else { -- _BitScanReverse64(&lz, static_cast(v)); -+#if defined(_M_X64) || defined(_M_ARM64) -+ _BitScanReverse64(&idx, static_cast(v)); -+#else -+ const auto vh = static_cast(static_cast(v) >> 32); -+ if (vh != 0) { -+ _BitScanReverse(&idx, static_cast(vh)); -+ idx += 32; -+ } else { -+ _BitScanReverse(&idx, static_cast(v)); -+ } -+#endif - } -- return 63 - static_cast(lz); -+ return idx; - #else - static_assert(sizeof(T) <= sizeof(unsigned long long), "type too big"); - if (sizeof(T) <= sizeof(unsigned int)) { -@@ -54,7 +64,16 @@ inline int CountTrailingZeroBits(T v) { - if (sizeof(T) <= sizeof(uint32_t)) { - _BitScanForward(&tz, static_cast(v)); - } else { -+#if defined(_M_X64) || defined(_M_ARM64) - _BitScanForward64(&tz, static_cast(v)); -+#else -+ _BitScanForward(&tz, static_cast(v)); -+ if (tz == 0) { -+ _BitScanForward(&tz, -+ static_cast(static_cast(v) >> 32)); -+ tz += 32; -+ } -+#endif - } - return static_cast(tz); - #else -@@ -69,6 +88,29 @@ inline int CountTrailingZeroBits(T v) { - #endif - } - -+#if defined(_MSC_VER) && !defined(_M_X64) -+namespace detail { -+template -+int BitsSetToOneFallback(T v) { -+ const int kBits = static_cast(sizeof(T)) * 8; -+ static_assert((kBits & (kBits - 1)) == 0, "must be power of two bits"); -+ // we static_cast these bit patterns in order to truncate them to the correct -+ // size -+ v = static_cast(v - ((v >> 1) & static_cast(0x5555555555555555ull))); -+ v = static_cast((v & static_cast(0x3333333333333333ull)) + -+ ((v >> 2) & static_cast(0x3333333333333333ull))); -+ v = static_cast((v + (v >> 4)) & static_cast(0x0F0F0F0F0F0F0F0Full)); -+ for (int shift_bits = 8; shift_bits < kBits; shift_bits <<= 1) { -+ v += static_cast(v >> shift_bits); -+ } -+ // we want the bottom "slot" that's big enough to represent a value up to -+ // (and including) kBits. -+ return static_cast(v & static_cast(kBits | (kBits - 1))); -+} -+ -+} // namespace detail -+#endif -+ - // Number of bits set to 1. Also known as "population count". - template - inline int BitsSetToOne(T v) { -@@ -80,11 +122,27 @@ inline int BitsSetToOne(T v) { - constexpr auto mm = 8 * sizeof(uint32_t) - 1; - // The bit mask is to neutralize sign extension on small signed types - constexpr uint32_t m = (uint32_t{1} << ((8 * sizeof(T)) & mm)) - 1; -+#if defined(_M_X64) || defined(_M_IX86) - return static_cast(__popcnt(static_cast(v) & m)); -+#else -+ return static_cast(detail::BitsSetToOneFallback(v) & m); -+#endif - } else if (sizeof(T) == sizeof(uint32_t)) { -+#if defined(_M_X64) || defined(_M_IX86) - return static_cast(__popcnt(static_cast(v))); -+#else -+ return detail::BitsSetToOneFallback(static_cast(v)); -+#endif - } else { -+#ifdef _M_X64 - return static_cast(__popcnt64(static_cast(v))); -+#elif defined(_M_IX86) -+ return static_cast( -+ __popcnt(static_cast(static_cast(v) >> 32) + -+ __popcnt(static_cast(v)))); -+#else -+ return detail::BitsSetToOneFallback(static_cast(v)); -+#endif - } - #else - static_assert(sizeof(T) <= sizeof(unsigned long long), "type too big"); -diff --git a/util/xxh3p.h b/util/xxh3p.h -index d1fc2bba2..05696cecd 100644 ---- a/util/xxh3p.h -+++ b/util/xxh3p.h -@@ -253,7 +253,9 @@ XXH_FORCE_INLINE U64x2 XXH_vec_mule(U32x4 a, U32x4 b) { - #if defined(XXH_NO_PREFETCH) - # define XXH_PREFETCH(ptr) (void)(ptr) /* disabled */ - #else --# if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_I86)) /* _mm_prefetch() is not defined outside of x86/x64 */ -+#if defined(_MSC_VER) && \ -+ (defined(_M_X64) || \ -+ defined(_M_IX86)) /* _mm_prefetch() is not defined outside of x86/x64 */ - # include /* https://msdn.microsoft.com/fr-fr/library/84szxsww(v=vs.90).aspx */ - # define XXH_PREFETCH(ptr) _mm_prefetch((const char*)(ptr), _MM_HINT_T0) - # elif defined(__GNUC__) && ( (__GNUC__ >= 4) || ( (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1) ) ) diff --git a/ports/rocksdb/0005-do-not-install-cmake-modules.patch b/ports/rocksdb/0005-do-not-install-cmake-modules.patch new file mode 100644 index 00000000000000..6517537c08f53a --- /dev/null +++ b/ports/rocksdb/0005-do-not-install-cmake-modules.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ad4b711..b2061ae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -981,7 +981,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) + + install(DIRECTORY include/rocksdb COMPONENT devel DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + +- install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination}) ++ #install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination}) + + if(NOT ROCKSDB_BUILD_SHARED) + install( diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index 7d5474d9f98df3..b63c6774e2cdba 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -1,5 +1,5 @@ Source: rocksdb -Version: 6.13.3 +Version: 6.14.6 Homepage: https://github.com/facebook/rocksdb Description: A library that provides an embeddable, persistent key-value store for fast storage Default-Features: zlib diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 497b166558cf7b..80a47d31715a0e 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -3,15 +3,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb - REF v6.13.3 - SHA512 9c1a9de2321d86a454e4fddc72965c55352902d4f55fc2e5bdc8cc5f081e8a2251a431c29c7a6108504456b148c4244a18bab2b261aaad9afcf290ae9cd5d724 + REF ed4316166f67ec892603014634840d29f460f611 # v6.14.6 + SHA512 a880a760f6f5a0a591c14fe942914a3ea85c387a901a922955bb2373ae903f96c6035cac8732d3000a3cbe6313016bfb21168bd3d8a7debf5a28c6e5c0aefb3f HEAD_REF master PATCHES - 0001-disable-gtest.patch 0002-only-build-one-flavor.patch 0003-use-find-package.patch - 0004-add-config-to-findpackage.patch - 0005-backport-msvc-fixes-pr-7439.patch # https://github.com/facebook/rocksdb/pull/7439 + 0004-fix-dependency-in-config.patch + 0005-do-not-install-cmake-modules.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_MD_LIBRARY) @@ -33,22 +32,22 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DWITH_GFLAGS=OFF - -DWITH_TESTS=OFF - -DWITH_BENCHMARK_TOOLS=OFF - -DWITH_TOOLS=OFF - -DWITH_FOLLY_DISTRIBUTED_MUTEX=OFF - -DUSE_RTTI=1 - -DROCKSDB_INSTALL_ON_WINDOWS=ON - -DFAIL_ON_WARNINGS=OFF - -DWITH_MD_LIBRARY=${WITH_MD_LIBRARY} - -DPORTABLE=ON - -DCMAKE_DEBUG_POSTFIX=d - -DROCKSDB_BUILD_SHARED=${ROCKSDB_BUILD_SHARED} - -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE - ${FEATURE_OPTIONS} + -DWITH_GFLAGS=OFF + -DWITH_TESTS=OFF + -DWITH_BENCHMARK_TOOLS=OFF + -DWITH_TOOLS=OFF + -DWITH_FOLLY_DISTRIBUTED_MUTEX=OFF + -DUSE_RTTI=1 + -DROCKSDB_INSTALL_ON_WINDOWS=ON + -DFAIL_ON_WARNINGS=OFF + -DWITH_MD_LIBRARY=${WITH_MD_LIBRARY} + -DPORTABLE=ON + -DCMAKE_DEBUG_POSTFIX=d + -DROCKSDB_BUILD_SHARED=${ROCKSDB_BUILD_SHARED} + -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE + ${FEATURE_OPTIONS} ) vcpkg_install_cmake() @@ -58,6 +57,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/rocksdb) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE.Apache DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${SOURCE_PATH}/LICENSE.leveldb DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${SOURCE_PATH}/LICENSE.leveldb DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() diff --git a/ports/rocksdb/vcpkg-cmake-wrapper.cmake b/ports/rocksdb/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 455facf22bfcd6..00000000000000 --- a/ports/rocksdb/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,9 +0,0 @@ -_find_package(${ARGS}) -if(NOT TARGET RocksDB::rocksdb AND TARGET RocksDB::rocksdb-shared) - add_library(RocksDB::rocksdb INTERFACE IMPORTED) - set_target_properties(RocksDB::rocksdb PROPERTIES INTERFACE_LINK_LIBRARIES "RocksDB::rocksdb-shared") -endif() -if(TARGET RocksDB::rocksdb AND NOT TARGET RocksDB::rocksdb-shared) - add_library(RocksDB::rocksdb-shared INTERFACE IMPORTED) - set_target_properties(RocksDB::rocksdb-shared PROPERTIES INTERFACE_LINK_LIBRARIES "RocksDB::rocksdb") -endif() From 5a55e20a1d0999c9ac9c92c3e3c1577c5434e118 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 18 Dec 2020 13:20:39 +0800 Subject: [PATCH 0325/1694] [cppmicroservices] Fix warning C4834 (#15177) Co-authored-by: Cheney-Wang --- ports/cppmicroservices/CONTROL | 3 ++- .../cppmicroservices/fix-warning-c4834.patch | 25 +++++++++++++++++++ ports/cppmicroservices/portfile.cmake | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 ports/cppmicroservices/fix-warning-c4834.patch diff --git a/ports/cppmicroservices/CONTROL b/ports/cppmicroservices/CONTROL index 91748199f6674e..2db76b91d418dd 100644 --- a/ports/cppmicroservices/CONTROL +++ b/ports/cppmicroservices/CONTROL @@ -1,5 +1,6 @@ Source: cppmicroservices -Version: 3.4.0-1 +Version: 3.4.0 +Port-Version: 2 Homepage: https://github.com/CppMicroServices/CppMicroServices Description: An OSGi-like C++ dynamic module system and service registry Build-Depends: gtest \ No newline at end of file diff --git a/ports/cppmicroservices/fix-warning-c4834.patch b/ports/cppmicroservices/fix-warning-c4834.patch new file mode 100644 index 00000000000000..893b28d30e827f --- /dev/null +++ b/ports/cppmicroservices/fix-warning-c4834.patch @@ -0,0 +1,25 @@ +diff --git a/httpservice/src/ServletContainer.cpp b/httpservice/src/ServletContainer.cpp +index b4af8c9..8713066 100644 +--- a/httpservice/src/ServletContainer.cpp ++++ b/httpservice/src/ServletContainer.cpp +@@ -279,7 +279,9 @@ void ServletContainer::SetContextPath(const std::string& path) + + std::string ServletContainer::GetContextPath() const + { +- return Lock(d->m_Mutex), d->m_ContextPath; ++ Lock l(d->m_Mutex); ++ US_UNUSED(l); ++ return d->m_ContextPath; + } + + void ServletContainer::Start() +@@ -306,6 +308,8 @@ std::shared_ptr ServletContainer::GetContext( + std::string ServletContainer::GetContextPath( + const ServletContext* /*context*/) const + { +- return Lock(d->m_Mutex), d->m_ContextPath; ++ Lock l(d->m_Mutex); ++ US_UNUSED(l); ++ return d->m_ContextPath; + } + } diff --git a/ports/cppmicroservices/portfile.cmake b/ports/cppmicroservices/portfile.cmake index 47df1e14e69866..47c209a8773a77 100644 --- a/ports/cppmicroservices/portfile.cmake +++ b/ports/cppmicroservices/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES werror.patch fix-dependency-gtest.patch + fix-warning-c4834.patch ) vcpkg_configure_cmake( @@ -22,7 +23,6 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - vcpkg_fixup_cmake_targets() # Handle copyright From f120568c34238d35a5dedad1ba6c6b907b0efcfe Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Fri, 18 Dec 2020 12:04:07 +0100 Subject: [PATCH 0326/1694] [comms] fixes debug build configuration (#15159) * set include directory correctly * Revert "set include directory correctly" This reverts commit bde9f290215dc685acdf115e5c2a5f332e2bbeb2. * try suggested fix * try changes * apply fix for comms-ublox * fix commsdsl * try moving in port dir * Revert "try moving in port dir" This reverts commit 93546df6880c621aa3db36e7f60ef4bc7062d0e0. * set port version * fix port version Co-authored-by: Victor Romero * add usage file to comms * add line to usage Co-authored-by: Victor Romero --- ports/comms-ublox/portfile.cmake | 6 ++++-- ports/comms-ublox/vcpkg.json | 1 + ports/comms/portfile.cmake | 10 ++++++---- ports/comms/usage | 4 ++++ ports/comms/vcpkg.json | 1 + ports/commsdsl/portfile.cmake | 4 ++++ ports/commsdsl/vcpkg.json | 1 + 7 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 ports/comms/usage diff --git a/ports/comms-ublox/portfile.cmake b/ports/comms-ublox/portfile.cmake index 87011252dc9354..1bd6a77451d6f5 100644 --- a/ports/comms-ublox/portfile.cmake +++ b/ports/comms-ublox/portfile.cmake @@ -21,8 +21,10 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ublox/cmake TARGET_PATH share/ublox) +# currently this is only a header only library. after moving lib/ublox to share this lib path will be empty +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/comms-ublox/vcpkg.json b/ports/comms-ublox/vcpkg.json index 2c18c713c36b91..65b4f327f3efb0 100644 --- a/ports/comms-ublox/vcpkg.json +++ b/ports/comms-ublox/vcpkg.json @@ -1,6 +1,7 @@ { "name": "comms-ublox", "version-string": "0.20.0", + "port-version": 1, "description": "UBLOX (UBX) protocol definition, generated out of cc.ublox.commsdsl", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/cc.ublox.generated", diff --git a/ports/comms/portfile.cmake b/ports/comms/portfile.cmake index 5a2a6d2fadc4e7..d1526e236e0b46 100644 --- a/ports/comms/portfile.cmake +++ b/ports/comms/portfile.cmake @@ -16,9 +16,11 @@ vcpkg_configure_cmake( -DCC_NO_UNIT_TESTS=ON ) vcpkg_install_cmake() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/LibComms/cmake TARGET_PATH share/LibComms) +# currently this is only a header only library. after moving lib/LibComms to share this lib path will be empty +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # 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) +configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) \ No newline at end of file diff --git a/ports/comms/usage b/ports/comms/usage new file mode 100644 index 00000000000000..9273c02836ec10 --- /dev/null +++ b/ports/comms/usage @@ -0,0 +1,4 @@ +The package comms provides CMake targets: + + find_package(LibComms CONFIG REQUIRED) + target_link_libraries(main PRIVATE cc::comms) diff --git a/ports/comms/vcpkg.json b/ports/comms/vcpkg.json index cabbd6dee9c2e4..3135806859424b 100644 --- a/ports/comms/vcpkg.json +++ b/ports/comms/vcpkg.json @@ -1,6 +1,7 @@ { "name": "comms", "version-string": "3.1.3", + "port-version": 1, "description": "COMMS is the C++(11) headers only, platform independent library, which makes the implementation of a communication protocol to be an easy and relatively quick process.", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/comms_champion" diff --git a/ports/commsdsl/portfile.cmake b/ports/commsdsl/portfile.cmake index 0aaba7e8c0f317..df428c0f88089d 100644 --- a/ports/commsdsl/portfile.cmake +++ b/ports/commsdsl/portfile.cmake @@ -24,7 +24,11 @@ vcpkg_copy_tools( AUTO_CLEAN ) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/LibCommsdsl/cmake TARGET_PATH share/LibCommsdsl) +# after fixing the following dirs are empty file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/LibCommsdsl") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/LibCommsdsl") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/commsdsl/vcpkg.json b/ports/commsdsl/vcpkg.json index 6b4b8b6a42dc66..c01c9e27d2f216 100644 --- a/ports/commsdsl/vcpkg.json +++ b/ports/commsdsl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "commsdsl", "version-string": "3.6.0", + "port-version": 1, "description": "DSL schemas parser and code generator for CommsChampion Ecosystem", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/commsdsl", From 0266f6cdf1e72a679746a11546155f05f667bc6a Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 18 Dec 2020 15:00:45 -0500 Subject: [PATCH 0327/1694] [python3] Build interpreter (#14891) --- docs/maintainers/vcpkg_build_make.md | 6 +- ports/python3/0001-static-library.patch | 13 +- ports/python3/0002-static-crt.patch | 28 -- ports/python3/0002-use-vcpkg-zlib.patch | 39 ++ .../0003-devendor-external-dependencies.patch | 117 ++++++ ports/python3/0004-dont-copy-vcruntime.patch | 26 ++ .../0005-only-build-required-projects.patch | 60 +++ .../python3/0006-fix-duplicate-symbols.patch | 39 ++ ports/python3/CONTROL | 8 - ports/python3/openssl.props.in | 14 + ports/python3/portfile.cmake | 386 +++++++----------- ports/python3/python_vcpkg.props.in | 35 ++ ports/python3/vcpkg.json | 32 ++ scripts/ci.baseline.txt | 3 - scripts/cmake/vcpkg_build_make.cmake | 16 +- .../cmake/vcpkg_copy_tool_dependencies.cmake | 2 +- 16 files changed, 542 insertions(+), 282 deletions(-) delete mode 100644 ports/python3/0002-static-crt.patch create mode 100644 ports/python3/0002-use-vcpkg-zlib.patch create mode 100644 ports/python3/0003-devendor-external-dependencies.patch create mode 100644 ports/python3/0004-dont-copy-vcruntime.patch create mode 100644 ports/python3/0005-only-build-required-projects.patch create mode 100644 ports/python3/0006-fix-duplicate-symbols.patch delete mode 100644 ports/python3/CONTROL create mode 100644 ports/python3/openssl.props.in create mode 100644 ports/python3/python_vcpkg.props.in create mode 100644 ports/python3/vcpkg.json diff --git a/docs/maintainers/vcpkg_build_make.md b/docs/maintainers/vcpkg_build_make.md index 5c7037b68f5168..892448b40843c8 100644 --- a/docs/maintainers/vcpkg_build_make.md +++ b/docs/maintainers/vcpkg_build_make.md @@ -25,8 +25,10 @@ IF the port supports the install target use vcpkg_install_make() instead of vcpk Specifies the Makefile as a relative path from the root of the sources passed to `vcpkg_configure_make()` ### BUILD_TARGET -The target passed to the make build command (`./make `). If not specified, the 'all' target will -be passed. +The target passed to the make build command (`./make `). Defaults to 'all'. + +### INSTALL_TARGET +The target passed to the make build command (`./make `) if `ENABLE_INSTALL` is used. Defaults to 'install'. ### DISABLE_PARALLEL The underlying buildsystem will be instructed to not parallelize diff --git a/ports/python3/0001-static-library.patch b/ports/python3/0001-static-library.patch index e0824849a84257..f7d46d0942bb2f 100644 --- a/ports/python3/0001-static-library.patch +++ b/ports/python3/0001-static-library.patch @@ -1,16 +1,16 @@ -From dffd6c572fb60f955bf3d98a87e5739163ab8f3f Mon Sep 17 00:00:00 2001 +From 4bd06273a9ed63f17966f113dc61a6051bad8b86 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Thu, 28 May 2020 17:25:21 -0400 -Subject: [PATCH 1/2] static library +Subject: [PATCH 1/6] static library builds the pythoncore as a static library instead of a DLL --- - PC/pyconfig.h | 6 ++++++ + PC/pyconfig.h | 7 +++++++ PCbuild/pythoncore.vcxproj | 16 ++++++++++++++-- - 2 files changed, 20 insertions(+), 2 deletions(-) + 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/PC/pyconfig.h b/PC/pyconfig.h -index 02216b5068..d359c884e2 100644 +index 02216b5068..7e0ba881a5 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -252,6 +252,7 @@ typedef int pid_t; @@ -21,7 +21,7 @@ index 02216b5068..d359c884e2 100644 #if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED) # define Py_ENABLE_SHARED 1 /* standard symbol for shared library */ # define MS_COREDLL /* deprecated old symbol */ -@@ -277,6 +278,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ +@@ -277,6 +278,12 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ # endif /* _DEBUG */ # endif /* _MSC_VER */ # endif /* Py_BUILD_CORE */ @@ -30,6 +30,7 @@ index 02216b5068..d359c884e2 100644 +# pragma comment(lib, "version.lib") +# pragma comment(lib, "shlwapi.lib") +# pragma comment(lib, "ws2_32.lib") ++# pragma comment(lib, "pathcch.lib") #endif /* MS_COREDLL */ #if defined(MS_WIN64) diff --git a/ports/python3/0002-static-crt.patch b/ports/python3/0002-static-crt.patch deleted file mode 100644 index 5044507ec930c7..00000000000000 --- a/ports/python3/0002-static-crt.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 28fe1e90fc4d34381553b7faf2f4c331bcaef669 Mon Sep 17 00:00:00 2001 -From: Adam Johnson -Date: Thu, 28 May 2020 17:36:31 -0400 -Subject: [PATCH 2/2] static crt - -changes crt linkage of pythoncore to static. ---- - PCbuild/pythoncore.vcxproj | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index dbe236829a..1a4ddb5cea 100644 ---- a/PCbuild/pythoncore.vcxproj -+++ b/PCbuild/pythoncore.vcxproj -@@ -104,6 +104,10 @@ - $(zlibDir);%(AdditionalIncludeDirectories) - _USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions) - _Py_HAVE_ZLIB;%(PreprocessorDefinitions) -+ MultiThreadedDebug -+ MultiThreadedDebug -+ MultiThreaded -+ MultiThreaded - - - version.lib;shlwapi.lib;ws2_32.lib;pathcch.lib;%(AdditionalDependencies) --- -2.28.0.windows.1 - diff --git a/ports/python3/0002-use-vcpkg-zlib.patch b/ports/python3/0002-use-vcpkg-zlib.patch new file mode 100644 index 00000000000000..c7f9dd60e0224b --- /dev/null +++ b/ports/python3/0002-use-vcpkg-zlib.patch @@ -0,0 +1,39 @@ +From 196555707236f4387875749f66620fb519166963 Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Wed, 9 Sep 2020 15:20:36 -0400 +Subject: [PATCH 2/6] use vcpkg zlib + +building without zlib is not a supported configuration, per the warning +messages. +--- + PCbuild/pythoncore.vcxproj | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj +index dbe236829a..5f30a35eb3 100644 +--- a/PCbuild/pythoncore.vcxproj ++++ b/PCbuild/pythoncore.vcxproj +@@ -507,8 +507,10 @@ + + + +- ++ + ++ ++ + + + +@@ -556,7 +558,7 @@ + + + +- ++ + + + +-- +2.28.0.windows.1 + diff --git a/ports/python3/0003-devendor-external-dependencies.patch b/ports/python3/0003-devendor-external-dependencies.patch new file mode 100644 index 00000000000000..25e3a1489a8fa5 --- /dev/null +++ b/ports/python3/0003-devendor-external-dependencies.patch @@ -0,0 +1,117 @@ +From 6c5c3793cbc6ba2a1d0d623a2bdaa9c2125be516 Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Wed, 9 Sep 2020 15:24:38 -0400 +Subject: [PATCH 3/6] devendor external dependencies + +externally fetched libraries may cause linker errors resulting from +duplicate symbols in downstream projects. +--- + PCbuild/_bz2.vcxproj | 4 +++- + PCbuild/_lzma.vcxproj | 5 ++--- + PCbuild/_sqlite3.vcxproj | 2 +- + PCbuild/_ssl.vcxproj | 2 +- + PCbuild/pyexpat.vcxproj | 6 ++++-- + 5 files changed, 11 insertions(+), 8 deletions(-) + +diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj +index 3fe95fbf83..6b12e8818e 100644 +--- a/PCbuild/_bz2.vcxproj ++++ b/PCbuild/_bz2.vcxproj +@@ -101,6 +101,8 @@ + + + ++ ++ + + + +@@ -109,7 +111,7 @@ + + + +- ++ + + + +diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj +index fe076a6fc5..70cc61dd95 100644 +--- a/PCbuild/_lzma.vcxproj ++++ b/PCbuild/_lzma.vcxproj +@@ -94,10 +94,9 @@ + + + $(lzmaDir)src/liblzma/api;%(AdditionalIncludeDirectories) +- WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LZMA_API_STATIC;%(PreprocessorDefinitions) ++ WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + + +- $(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies) + + + +@@ -111,7 +110,7 @@ + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + +- ++ + {12728250-16eC-4dc6-94d7-e21dd88947f8} + false + +diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj +index 7e0062692b..6fb3279a20 100644 +--- a/PCbuild/_sqlite3.vcxproj ++++ b/PCbuild/_sqlite3.vcxproj +@@ -127,7 +127,7 @@ + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + +- ++ + {a1a295e5-463c-437f-81ca-1f32367685da} + false + +diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj +index 4907f49b66..4dffa202b7 100644 +--- a/PCbuild/_ssl.vcxproj ++++ b/PCbuild/_ssl.vcxproj +@@ -99,7 +99,7 @@ + + + +- ++ + _CRT_SECURE_NO_WARNINGS;$(PreprocessorDefinitions) + + +diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj +index b2d9f5d57d..4efb826a05 100644 +--- a/PCbuild/pyexpat.vcxproj ++++ b/PCbuild/pyexpat.vcxproj +@@ -89,17 +89,19 @@ + + + +- ++ + $(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_STATIC;%(PreprocessorDefinitions) + + +- ++ + + + + + ++ ++ + + + +-- +2.28.0.windows.1 + diff --git a/ports/python3/0004-dont-copy-vcruntime.patch b/ports/python3/0004-dont-copy-vcruntime.patch new file mode 100644 index 00000000000000..174c27e5c9ea51 --- /dev/null +++ b/ports/python3/0004-dont-copy-vcruntime.patch @@ -0,0 +1,26 @@ +From 8086c67fa7ada1888a7808cbdc6fe74b62abe5b1 Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Wed, 9 Sep 2020 16:12:49 -0400 +Subject: [PATCH 4/6] dont copy vcruntime + +VCRUNTIME140.dll should not be redistributed, ever. +--- + PCbuild/pythoncore.vcxproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj +index 5f30a35eb3..3cf21ba39c 100644 +--- a/PCbuild/pythoncore.vcxproj ++++ b/PCbuild/pythoncore.vcxproj +@@ -565,7 +565,7 @@ + + + +- ++ + + + +-- +2.28.0.windows.1 + diff --git a/ports/python3/0005-only-build-required-projects.patch b/ports/python3/0005-only-build-required-projects.patch new file mode 100644 index 00000000000000..dbbe372340118a --- /dev/null +++ b/ports/python3/0005-only-build-required-projects.patch @@ -0,0 +1,60 @@ +From 6492277e39dbe7dd77d32fdc9ae4b989213ef3c6 Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Wed, 9 Sep 2020 20:15:58 -0400 +Subject: [PATCH 5/6] only build required projects + +strips out tests and unsupported externals (eg tkinter). +--- + PCbuild/_ssl.vcxproj | 2 +- + PCbuild/pcbuild.proj | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj +index 4dffa202b7..e661cb6fb6 100644 +--- a/PCbuild/_ssl.vcxproj ++++ b/PCbuild/_ssl.vcxproj +@@ -111,7 +111,7 @@ + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + +- ++ + {86937f53-c189-40ef-8ce8-8759d8e7d480} + false + +diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj +index 4d416c589e..ede9868a8f 100644 +--- a/PCbuild/pcbuild.proj ++++ b/PCbuild/pcbuild.proj +@@ -45,21 +45,21 @@ + false + + +- ++ + +- ++ + +- ++ + + + + + + +- +- +- +- ++ ++ ++ ++ + + + +-- +2.28.0.windows.1 + diff --git a/ports/python3/0006-fix-duplicate-symbols.patch b/ports/python3/0006-fix-duplicate-symbols.patch new file mode 100644 index 00000000000000..251c0186abf282 --- /dev/null +++ b/ports/python3/0006-fix-duplicate-symbols.patch @@ -0,0 +1,39 @@ +From 62e082c1eba79d46ba8ab4b7a556a57a2253d555 Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Fri, 11 Sep 2020 12:35:36 -0400 +Subject: [PATCH 6/6] fix duplicate symbols + +--- + Modules/_winapi.c | 2 +- + Modules/overlapped.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Modules/_winapi.c b/Modules/_winapi.c +index e1672c4785..27148094d2 100644 +--- a/Modules/_winapi.c ++++ b/Modules/_winapi.c +@@ -304,7 +304,7 @@ static PyMemberDef overlapped_members[] = { + {NULL} + }; + +-PyTypeObject OverlappedType = { ++static PyTypeObject OverlappedType = { + PyVarObject_HEAD_INIT(NULL, 0) + /* tp_name */ "_winapi.Overlapped", + /* tp_basicsize */ sizeof(OverlappedObject), +diff --git a/Modules/overlapped.c b/Modules/overlapped.c +index cd7869fa8a..319ea0a4b7 100644 +--- a/Modules/overlapped.c ++++ b/Modules/overlapped.c +@@ -1756,7 +1756,7 @@ static PyGetSetDef Overlapped_getsets[] = { + {NULL}, + }; + +-PyTypeObject OverlappedType = { ++static PyTypeObject OverlappedType = { + PyVarObject_HEAD_INIT(NULL, 0) + /* tp_name */ "_overlapped.Overlapped", + /* tp_basicsize */ sizeof(OverlappedObject), +-- +2.28.0.windows.1 + diff --git a/ports/python3/CONTROL b/ports/python3/CONTROL deleted file mode 100644 index 9085950fd19073..00000000000000 --- a/ports/python3/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: python3 -Version: 3.9.0 -Homepage: https://github.com/python/cpython -Description: The Python programming language as an embeddable library -Build-Depends: libffi, openssl, zlib (!uwp&!windows) - -Feature: enable-shared -Description: Build shared libraries in addition to static ones built by default diff --git a/ports/python3/openssl.props.in b/ports/python3/openssl.props.in new file mode 100644 index 00000000000000..1d404ad57c115f --- /dev/null +++ b/ports/python3/openssl.props.in @@ -0,0 +1,14 @@ + + + + + Crypt32.lib;ws2_32.lib;%(AdditionalDependencies) + + ${CRYPTO_RELEASE};${SSL_RELEASE};%(AdditionalDependencies) + + + ${CRYPTO_DEBUG};${SSL_DEBUG};%(AdditionalDependencies) + + + + diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 40b1aeacb15ae1..711b317e02c448 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -8,17 +8,19 @@ set(PYTHON_VERSION_MINOR 9) set(PYTHON_VERSION_PATCH 0) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) -if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - list(APPEND PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-static-library.patch) - endif() - if (VCPKG_CRT_LINKAGE STREQUAL static) - list(APPEND PATCHES ${CMAKE_CURRENT_LIST_DIR}/0002-static-crt.patch) - endif() +set(PATCHES + 0002-use-vcpkg-zlib.patch + 0003-devendor-external-dependencies.patch + 0004-dont-copy-vcruntime.patch + 0005-only-build-required-projects.patch + 0006-fix-duplicate-symbols.patch +) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(PREPEND PATCHES 0001-static-library.patch) endif() vcpkg_from_github( - OUT_SOURCE_PATH TEMP_SOURCE_PATH + OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython REF v${PYTHON_VERSION} SHA512 39d304cae181674c4872c63768c0e5aeace2c92eb6d5ea550428d65c8571bc60922b3a3d484b51c46b466aadb7e27500559cafec13a489b48613bbb3fe6a5a5d @@ -26,228 +28,154 @@ vcpkg_from_github( PATCHES ${PATCHES} ) -if("enable-shared" IN_LIST FEATURES) - set(_ENABLED_SHARED --enable-shared) - if(VCPKG_TARGET_IS_LINUX) - message(WARNING"Feature enable-shared requires libffi-devel from the system package manager, please install it on Ubuntu system via sudo apt-get install libffi-dev.") +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) + find_library(CRYPTO_RELEASE NAMES libcrypto PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(CRYPTO_DEBUG NAMES libcrypto PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(EXPAT_RELEASE NAMES libexpat libexpatMD PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(EXPAT_DEBUG NAMES libexpatd libexpatdMD PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(FFI_RELEASE NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(FFI_DEBUG NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(LZMA_RELEASE NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(LZMA_DEBUG NAMES lzmad PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(SQLITE_DEBUG NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(SSL_RELEASE NAMES libssl PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(SSL_DEBUG NAMES libssl PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + else() + message(STATUS "WARNING: Static builds of Python will not have C extension modules available.") + endif() + find_library(ZLIB_RELEASE NAMES zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(ZLIB_DEBUG NAMES zlib zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + + configure_file(${SOURCE_PATH}/PC/pyconfig.h ${SOURCE_PATH}/PC/pyconfig.h) + configure_file(${CMAKE_CURRENT_LIST_DIR}/python_vcpkg.props.in ${SOURCE_PATH}/PCbuild/python_vcpkg.props) + configure_file(${CMAKE_CURRENT_LIST_DIR}/openssl.props.in ${SOURCE_PATH}/PCbuild/openssl.props) + file(WRITE ${SOURCE_PATH}/PCbuild/libffi.props + " + " + ) + + if(PYTHON_ALLOW_EXTENSIONS) + set(OPTIONS + "/p:IncludeExtensions=true" + "/p:IncludeExternals=true" + "/p:IncludeCTypes=true" + "/p:IncludeSSL=true" + "/p:IncludeTkinter=false" + "/p:IncludeTests=false" + "/p:ForceImportBeforeCppTargets=${SOURCE_PATH}/PCbuild/python_vcpkg.props" + ) + else() + set(OPTIONS + "/p:IncludeExtensions=false" + "/p:IncludeExternals=false" + "/p:IncludeTests=false" + "/p:ForceImportBeforeCppTargets=${SOURCE_PATH}/PCbuild/python_vcpkg.props" + ) + endif() + if(VCPKG_TARGET_IS_UWP) + list(APPEND OPTIONS "/p:IncludeUwp=true") + else() + list(APPEND OPTIONS "/p:IncludeUwp=false") + endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND OPTIONS "/p:_VcpkgPythonLinkage=DynamicLibrary") + else() + list(APPEND OPTIONS "/p:_VcpkgPythonLinkage=StaticLibrary") endif() -else() - unset(_ENABLED_SHARED) -endif() -if (VCPKG_TARGET_IS_WINDOWS) - if(DEFINED _ENABLED_SHARED) - message(WARNING "enable-shared requested, by Windows build already produce a shared library by default") - endif() - set(SOURCE_PATH "${TEMP_SOURCE_PATH}-Lib-Win") - file(REMOVE_RECURSE ${SOURCE_PATH}) - file(RENAME "${TEMP_SOURCE_PATH}" ${SOURCE_PATH}) - - if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") - set(BUILD_ARCH "Win32") - set(OUT_DIR "win32") - elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64") - set(BUILD_ARCH "x64") - set(OUT_DIR "amd64") - else() - message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") - endif() - - vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/PCBuild/pythoncore.vcxproj - PLATFORM ${BUILD_ARCH}) - - file(INSTALL - "${SOURCE_PATH}/Include/" - "${SOURCE_PATH}/PC/pyconfig.h" - DESTINATION "${CURRENT_PACKAGES_DIR}/include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" - FILES_MATCHING PATTERN *.h - ) - file(INSTALL - "${SOURCE_PATH}/Lib" - DESTINATION - "${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}" - ) - file(INSTALL - "${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.lib" - DESTINATION - "${CURRENT_PACKAGES_DIR}/lib" - ) - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(INSTALL "${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - endif() - - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL "${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(INSTALL "${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - endif() - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_copy_pdbs() - endif() - # Handle copyright - file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR} RENAME copyright) - -elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(SOURCE_PATH_DEBUG "${TEMP_SOURCE_PATH}-${TARGET_TRIPLET}-debug") - endif() - - set(SOURCE_PATH_RELEASE "${TEMP_SOURCE_PATH}-${TARGET_TRIPLET}-release") - file(REMOVE_RECURSE ${SOURCE_PATH_RELEASE}) - file(GLOB FILES ${TEMP_SOURCE_PATH}/*) - file(COPY ${FILES} DESTINATION ${SOURCE_PATH_RELEASE}) - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE ${SOURCE_PATH_DEBUG}) - file(RENAME "${TEMP_SOURCE_PATH}" ${SOURCE_PATH_DEBUG}) - endif() - - find_program(MAKE make) - if (NOT MAKE) - message(FATAL_ERROR "MAKE not found") - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - ################ - # Release build - ################ - message(STATUS "Configuring ${TARGET_TRIPLET}-rel") - set(OUT_PATH_RELEASE ${SOURCE_PATH_RELEASE}/../../make-build-${TARGET_TRIPLET}-release) - file(MAKE_DIRECTORY ${OUT_PATH_RELEASE}) - - if(VCPKG_TARGET_IS_OSX) - vcpkg_execute_build_process( - COMMAND - "${SOURCE_PATH_RELEASE}/configure" - ${_ENABLED_SHARED} - --prefix=${OUT_PATH_RELEASE} - --with-openssl=${CURRENT_INSTALLED_DIR} - "CPPFLAGS=-I${CURRENT_INSTALLED_DIR}/include -framework CoreFoundation" "LDFLAGS=-L${CURRENT_INSTALLED_DIR}/lib" "LIBS=-liconv" - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME config-${TARGET_TRIPLET}-rel - ) - else() - vcpkg_execute_build_process( - COMMAND - "${SOURCE_PATH_RELEASE}/configure" - ${_ENABLED_SHARED} - --prefix=${OUT_PATH_RELEASE} - --with-openssl=${CURRENT_INSTALLED_DIR} - "CPPFLAGS=-I${CURRENT_INSTALLED_DIR}/include" "LDFLAGS=-L${CURRENT_INSTALLED_DIR}/lib" - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME config-${TARGET_TRIPLET}-rel - ) - endif() - - message(STATUS "Building ${TARGET_TRIPLET}-rel") - - vcpkg_execute_build_process( - COMMAND make install -j ${VCPKG_CONCURRENCY} - NO_PARALLEL_COMMAND make install - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME make-build-${TARGET_TRIPLET}-release - ) - - message(STATUS "Installing ${TARGET_TRIPLET}-rel headers...") - file(INSTALL "${OUT_PATH_RELEASE}/include/" - DESTINATION ${CURRENT_PACKAGES_DIR}/include - FILES_MATCHING PATTERN *.h - ) - - message(STATUS "Installing ${TARGET_TRIPLET}-rel lib files...") - file(GLOB PY_LIBS - ${OUT_PATH_RELEASE}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/*) - file(INSTALL ${PY_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/Lib - PATTERN "*.pyc" EXCLUDE - PATTERN "*__pycache__*" EXCLUDE - ) - - message(STATUS "Installing ${TARGET_TRIPLET}-rel share files...") - file(GLOB PKGCFG ${OUT_PATH_RELEASE}/lib/pkgconfig/*) - file(INSTALL ${PKGCFG} DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR} - PATTERN "*.pyc" EXCLUDE - PATTERN "*__pycache__*" EXCLUDE - ) - - message(STATUS "Installing ${TARGET_TRIPLET}-rel Python library files...") - file(GLOB LIBS - ${OUT_PATH_RELEASE}/lib/libpython${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.*) - if (NOT LIBS) - file(GLOB LIBS ${OUT_PATH_RELEASE}/lib64/*) - endif() - file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib - PATTERN "*.pyc" EXCLUDE - PATTERN "*__pycache__*" EXCLUDE - ) - - message(STATUS "Installing ${TARGET_TRIPLET}-rel done") - - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - ################ - # Debug build - ################ - message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") - set(OUT_PATH_DEBUG ${SOURCE_PATH_DEBUG}/../../make-build-${TARGET_TRIPLET}-debug) - file(MAKE_DIRECTORY ${OUT_PATH_DEBUG}) - - if(VCPKG_TARGET_IS_OSX) - vcpkg_execute_build_process( - COMMAND - "${SOURCE_PATH_DEBUG}/configure" - --with-pydebug - ${_ENABLED_SHARED} - --prefix=${OUT_PATH_DEBUG} - --with-openssl=${CURRENT_INSTALLED_DIR}/debug - "CPPFLAGS=-I${CURRENT_INSTALLED_DIR}/include -framework CoreFoundation" "LDFLAGS=-L${CURRENT_INSTALLED_DIR}/debug/lib" "LIBS=-liconv" - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - LOGNAME config-${TARGET_TRIPLET}-debug - ) - else() - vcpkg_execute_build_process( - COMMAND - "${SOURCE_PATH_DEBUG}/configure" - --with-pydebug - ${_ENABLED_SHARED} - --prefix=${OUT_PATH_DEBUG} - --with-openssl=${CURRENT_INSTALLED_DIR}/debug - "CPPFLAGS=-I${CURRENT_INSTALLED_DIR}/include" "LDFLAGS=-L${CURRENT_INSTALLED_DIR}/debug/lib" - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - LOGNAME config-${TARGET_TRIPLET}-debug - ) - endif() - - message(STATUS "Building ${TARGET_TRIPLET}-dbg") - vcpkg_execute_build_process( - COMMAND make install -j ${VCPKG_CONCURRENCY} - NO_PARALLEL_COMMAND make install - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - LOGNAME make-build-${TARGET_TRIPLET}-debug - ) - - message(STATUS "Installing ${TARGET_TRIPLET}-dbg Python library files...") - file(GLOB LIBS - ${OUT_PATH_DEBUG}/lib/libpython${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}d.*) - if (NOT LIBS) - file(GLOB LIBS - ${OUT_PATH_DEBUG}/lib64/*) - endif() - file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - PATTERN "*.pyc" EXCLUDE - PATTERN "*__pycache__*" EXCLUDE - ) - - message(STATUS "Installing ${TARGET_TRIPLET}-dbg done") - - endif() - # Handle copyright - file(INSTALL ${SOURCE_PATH_RELEASE}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR} RENAME copyright) + # _freeze_importlib.exe is run as part of the build process, so make sure the required dynamic libs are available. + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/debug/bin") + endif() + + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH "PCbuild/pcbuild.proj" + OPTIONS ${OPTIONS} + LICENSE_SUBPATH "LICENSE" + SKIP_CLEAN + ) + + # The extension modules must be placed in the DLLs directory, so we can't use vcpkg_copy_tools() + if(PYTHON_ALLOW_EXTENSIONS) + file(GLOB_RECURSE PYTHON_EXTENSIONS "${CURRENT_BUILDTREES_DIR}/*.pyd") + list(FILTER PYTHON_EXTENSIONS EXCLUDE REGEX [[.*_d\.pyd]]) + file(COPY ${PYTHON_EXTENSIONS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/DLLs") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/DLLs") + file(REMOVE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/DLLs/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.dll") + endif() + + file(COPY "${SOURCE_PATH}/Include/" "${SOURCE_PATH}/PC/pyconfig.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" + FILES_MATCHING PATTERN *.h + ) + file(COPY "${SOURCE_PATH}/Lib" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + # Remove any extension libraries and other unversioned binaries that could conflict with the python2 port. + # You don't need to link against these anyway. + file(GLOB PYTHON_LIBS + "${CURRENT_PACKAGES_DIR}/lib/*.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/*.lib" + ) + list(FILTER PYTHON_LIBS EXCLUDE REGEX [[python[0-9]*(_d)?\.lib$]]) + file(GLOB PYTHON_INSTALLERS "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wininst-*.exe") + file(REMOVE ${PYTHON_LIBS} ${PYTHON_INSTALLERS}) + + if(PYTHON_ALLOW_EXTENSIONS) + message(STATUS "Bootstrapping pip") + vcpkg_execute_required_process(COMMAND python -m ensurepip + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}" + LOGNAME "ensurepip-${TARGET_TRIPLET}" + ) + endif() + + vcpkg_clean_msbuild() +else() + set(OPTIONS + "--with-openssl=${CURRENT_INSTALLED_DIR}" + "--with-ensurepip" + [[--with-suffix=""]] + "--with-system-expat" + ) + if(VCPKG_TARGET_IS_OSX) + list(APPEND OPTIONS "LIBS=-liconv -lintl") + endif() + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${OPTIONS} + OPTIONS_DEBUG "--with-pydebug" + ) + vcpkg_install_make(ADD_BIN_TO_PATH INSTALL_TARGET altinstall) + + file(COPY "${CURRENT_PACKAGES_DIR}/bin/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + # Makefiles, c files, __pycache__, and other junk. + file(GLOB PYTHON_LIB_DIRS LIST_DIRECTORIES true + "${CURRENT_PACKAGES_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/*" + "${CURRENT_PACKAGES_DIR}/debug/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/*") + list(FILTER PYTHON_LIB_DIRS INCLUDE REGEX [[config-[0-9].*.*]]) + file(REMOVE_RECURSE ${PYTHON_LIB_DIRS}) + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}d") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man1") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") + + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") endif() diff --git a/ports/python3/python_vcpkg.props.in b/ports/python3/python_vcpkg.props.in new file mode 100644 index 00000000000000..efad43bbd20bfa --- /dev/null +++ b/ports/python3/python_vcpkg.props.in @@ -0,0 +1,35 @@ + + + + + + _Py_HAVE_ZLIB;%(PreprocessorDefinitions) + XML_STATIC;%(PreprocessorDefinitions) + + ${CURRENT_INSTALLED_DIR}/include;%(AdditionalIncludeDirectories) + + + MultiThreadedDebug + MultiThreaded + MultiThreadedDebugDLL + MultiThreadedDLL + + + + + ${ZLIB_RELEASE};%(AdditionalDependencies) + + + ${ZLIB_DEBUG};%(AdditionalDependencies) + + + + + ${BZ2_RELEASE};${EXPAT_RELEASE};${FFI_RELEASE};${LZMA_RELEASE};${SQLITE_RELEASE};%(AdditionalDependencies) + + + ${BZ2_DEBUG};${EXPAT_DEBUG};${FFI_DEBUG};${LZMA_DEBUG};${SQLITE_DEBUG};%(AdditionalDependencies) + + + + diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json new file mode 100644 index 00000000000000..5907ab9b90012b --- /dev/null +++ b/ports/python3/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "python3", + "version-string": "3.9.0", + "port-version": 1, + "description": "The Python programming language", + "homepage": "https://github.com/python/cpython", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "bzip2", + "platform": "!(windows & static)" + }, + "expat", + { + "name": "libffi", + "platform": "!(windows & static)" + }, + { + "name": "liblzma", + "platform": "!(windows & static)" + }, + { + "name": "openssl", + "platform": "!(windows & static)" + }, + { + "name": "sqlite3", + "platform": "!(windows & static)" + }, + "zlib" + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 03b011fef455e1..21d28b38c063c8 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1204,9 +1204,6 @@ python2:arm-uwp=fail python2:x64-linux=fail python2:x64-osx=fail python2:x64-uwp=fail -python3:arm64-windows=fail -python3:arm-uwp=fail -python3:x64-uwp=fail qhull:x64-uwp=fail qhull:arm-uwp=fail qpid-proton:arm-uwp=fail diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 654fb8799b8d52..451bd6aa133e35 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -26,8 +26,10 @@ IF the port supports the install target use vcpkg_install_make() instead of vcpk Specifies the Makefile as a relative path from the root of the sources passed to `vcpkg_configure_make()` ### BUILD_TARGET -The target passed to the make build command (`./make `). If not specified, the 'all' target will -be passed. +The target passed to the make build command (`./make `). Defaults to 'all'. + +### INSTALL_TARGET +The target passed to the make build command (`./make `) if `ENABLE_INSTALL` is used. Defaults to 'install'. ### DISABLE_PARALLEL The underlying buildsystem will be instructed to not parallelize @@ -56,7 +58,7 @@ function(vcpkg_build_make) include("${_VCPKG_CMAKE_VARS_FILE}") # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _bc "ADD_BIN_TO_PATH;ENABLE_INSTALL;DISABLE_PARALLEL" "LOGFILE_ROOT;BUILD_TARGET;SUBPATH;MAKEFILE" "") + cmake_parse_arguments(PARSE_ARGV 0 _bc "ADD_BIN_TO_PATH;ENABLE_INSTALL;DISABLE_PARALLEL" "LOGFILE_ROOT;BUILD_TARGET;SUBPATH;MAKEFILE;INSTALL_TARGET" "") if(NOT _bc_LOGFILE_ROOT) set(_bc_LOGFILE_ROOT "build") @@ -70,6 +72,10 @@ function(vcpkg_build_make) set(_bc_MAKEFILE Makefile) endif() + if(NOT _bc_INSTALL_TARGET) + set(_bc_INSTALL_TARGET "install") + endif() + if(WIN32) set(_VCPKG_PREFIX ${CURRENT_PACKAGES_DIR}) set(_VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR}) @@ -93,7 +99,7 @@ function(vcpkg_build_make) string(REPLACE " " "\\\ " _VCPKG_PACKAGE_PREFIX ${CURRENT_PACKAGES_DIR}) # Don't know why '/cygdrive' is suddenly a requirement here. (at least for x264) string(REGEX REPLACE "([a-zA-Z]):/" "/cygdrive/\\1/" _VCPKG_PACKAGE_PREFIX "${_VCPKG_PACKAGE_PREFIX}") - set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} install DESTDIR=${_VCPKG_PACKAGE_PREFIX}) + set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} ${_bc_INSTALL_TARGET} DESTDIR=${_VCPKG_PACKAGE_PREFIX}) #TODO: optimize for install-data (release) and install-exec (release/debug) else() # Compiler requriements @@ -106,7 +112,7 @@ function(vcpkg_build_make) # Set make command and install command set(MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j 1 -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) - set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} install DESTDIR=${CURRENT_PACKAGES_DIR}) + set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} ${_bc_INSTALL_TARGET} DESTDIR=${CURRENT_PACKAGES_DIR}) endif() # Since includes are buildtype independent those are setup by vcpkg_configure_make diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake index ba0f31920b8257..73a9cc4e6275b7 100644 --- a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake +++ b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake @@ -26,7 +26,7 @@ function(vcpkg_copy_tool_dependencies TOOL_DIR) message(FATAL_ERROR "Could not find PowerShell Core; please open an issue to report this.") endif() macro(search_for_dependencies PATH_TO_SEARCH) - file(GLOB TOOLS "${TOOL_DIR}/*.exe" "${TOOL_DIR}/*.dll") + file(GLOB TOOLS "${TOOL_DIR}/*.exe" "${TOOL_DIR}/*.dll" "${TOOL_DIR}/*.pyd") foreach(TOOL IN LISTS TOOLS) vcpkg_execute_required_process( COMMAND "${PWSH_EXE}" -noprofile -executionpolicy Bypass -nologo From 854a38c1ffdf2248512e7b53c20cf78a3b872081 Mon Sep 17 00:00:00 2001 From: Long Huan <8551701+longhuan2018@users.noreply.github.com> Date: Sat, 19 Dec 2020 04:02:48 +0800 Subject: [PATCH 0328/1694] [librttopo]new port (#15037) --- ports/librttopo/CONTROL | 5 + ports/librttopo/fix-geoconfig.patch | 37 ++++++ ports/librttopo/fix-makefiles.patch | 35 ++++++ ports/librttopo/portfile.cmake | 54 +++++++++ ports/librttopo/rttopo_config.h.in | 168 ++++++++++++++++++++++++++++ 5 files changed, 299 insertions(+) create mode 100644 ports/librttopo/CONTROL create mode 100644 ports/librttopo/fix-geoconfig.patch create mode 100644 ports/librttopo/fix-makefiles.patch create mode 100644 ports/librttopo/portfile.cmake create mode 100644 ports/librttopo/rttopo_config.h.in diff --git a/ports/librttopo/CONTROL b/ports/librttopo/CONTROL new file mode 100644 index 00000000000000..fd8e85fbbcd96d --- /dev/null +++ b/ports/librttopo/CONTROL @@ -0,0 +1,5 @@ +Source: librttopo +Version: 1.1.0-2 +Homepage: https://git.osgeo.org/gitea/rttopo/librttopo +Description: The RT Topology Library exposes an API to create and manage standard (ISO 13249 aka SQL/MM) topologies using user-provided [data stores] (doc/DATASTORES.md) and released under the GNU GPL license (version 2 or later). +Build-Depends: geos diff --git a/ports/librttopo/fix-geoconfig.patch b/ports/librttopo/fix-geoconfig.patch new file mode 100644 index 00000000000000..db6910c8835648 --- /dev/null +++ b/ports/librttopo/fix-geoconfig.patch @@ -0,0 +1,37 @@ +diff --git a/configure.ac b/configure.ac +index a9561069c..7adef1bf5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -87,6 +87,7 @@ AC_CONFIG_FILES([Makefile \ + #----------------------------------------------------------------------- + # --with-geosconfig + # ++if 0; then + AC_ARG_WITH([geosconfig], + [AS_HELP_STRING([--with-geosconfig=FILE], [specify an alternative geos-config file])], + [GEOSCONFIG="$withval"], [GEOSCONFIG=""]) +@@ -112,6 +113,7 @@ fi + # Extract the linker and include flags + GEOS_LDFLAGS=`$GEOSCONFIG --ldflags` + GEOS_CFLAGS=-I`$GEOSCONFIG --includes` ++fi + AC_SUBST([GEOS_LDFLAGS]) + AC_SUBST([GEOS_CFLAGS]) + # Ensure that we can parse geos_c.h +@@ -120,6 +122,7 @@ CPPFLAGS="$GEOS_CFLAGS" + AC_CHECK_HEADERS([geos_c.h],, [AC_MSG_ERROR([could not find geos_c.h - you may need to specify the directory of a geos-config file using --with-geosconfig])]) + CPPFLAGS="$CPPFLAGS_SAVE" + # Ensure we can link against libgeos_c ++if 0; then + LIBS_SAVE="$LIBS" + LIBS="$GEOS_LDFLAGS" + AC_SEARCH_LIBS(GEOSContext_setErrorMessageHandler_r,geos_c,,AC_MSG_ERROR([could not find libgeos_c (or obsolete 'libgeos_c' < v.3.5.0 found) - you may need to specify the directory of a geos-config file using --with-geosconfig])) +@@ -127,6 +130,8 @@ LIBS="$LIBS_SAVE" + LIBS="$LIBS $GEOS_LDFLAGS -lgeos_c" + GEOS_MAJOR_VERSION=`$GEOSCONFIG --version | cut -d. -f1 | sed 's/[[^0-9]]//g'` + GEOS_MINOR_VERSION=`$GEOSCONFIG --version | cut -d. -f2 | sed 's/[[^0-9]]//g'` ++fi ++LIBS="$LIBS $GEOS_LDFLAGS" + RTGEOM_GEOS_VERSION="$GEOS_MAJOR_VERSION$GEOS_MINOR_VERSION" + AC_DEFINE_UNQUOTED([RTGEOM_GEOS_VERSION], [$RTGEOM_GEOS_VERSION], [GEOS library version]) + AC_SUBST([RTGEOM_GEOS_VERSION]) diff --git a/ports/librttopo/fix-makefiles.patch b/ports/librttopo/fix-makefiles.patch new file mode 100644 index 00000000000000..41c6c8f9268772 --- /dev/null +++ b/ports/librttopo/fix-makefiles.patch @@ -0,0 +1,35 @@ +diff --git a/makefile.vc b/makefile.vc +index 1f790f0de..2f7e00f7b 100644 +--- a/makefile.vc ++++ b/makefile.vc +@@ -17,11 +17,11 @@ LIBOBJ = src\box2d.obj src\bytebuffer.obj src\g_box.obj \ + src\rtout_kml.obj src\rtout_svg.obj src\rtout_twkb.obj src\rtout_wkb.obj \ + src\rtout_wkt.obj src\rtout_x3d.obj src\rtpoint.obj src\rtpoly.obj src\rtprint.obj \ + src\rtpsurface.obj src\rtspheroid.obj src\rtstroke.obj src\rttin.obj src\rttree.obj \ +- src\rttriangle.obj src\rtutil.obj src\stringbuffer.obj src\varint.obj ++ src\rttriangle.obj src\rtutil.obj src\stringbuffer.obj src\varint.obj src\rtt_tpsnap.obj + + LIBRTTOPO_DLL = librttopo$(VERSION).dll + +-CFLAGS = /nologo -IC:\OSGeo4W\include -I. -Iheaders $(OPTFLAGS) ++CFLAGS = /nologo -I. -Iheaders $(OPTFLAGS) + + default: all + + +diff --git a/nmake.opt b/nmake.opt +index 938979df1..ea80dab00 100644 +--- a/nmake.opt ++++ b/nmake.opt +@@ -1,9 +1,8 @@ + # Directory tree where RTTOPO will be installed. +-INSTDIR=C:\OSGeo4W ++INSTDIR=$(INSTALLDIR) + + # Uncomment the first for an optimized build, or the second for debug. +-OPTFLAGS= /nologo /Ox /fp:precise /W4 /MD /D_CRT_SECURE_NO_WARNINGS \ +- /DDLL_EXPORT ++OPTFLAGS= /nologo /fp:precise /W4 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS + #OPTFLAGS= /nologo /Zi /MD /Fdlibrttopo.pdb /DDLL_EXPORT + + # Set the version number for the DLL. Normally we leave this blank since diff --git a/ports/librttopo/portfile.cmake b/ports/librttopo/portfile.cmake new file mode 100644 index 00000000000000..77d7b5932b3377 --- /dev/null +++ b/ports/librttopo/portfile.cmake @@ -0,0 +1,54 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +# NOTE: update the version and checksum for new LIBRTTOPO release +set(LIBRTTOPO_VERSION_STR "1.1.0-2") +set(LIBRTTOPO_PACKAGE_SUM "cc2f646dd9ac3099c77e621984cdd2baa676ed1d8e6aaa9642afe2855e6fdef585603cc052ca09084204a1325e38bb626133072fbb5080e8adc369cc4854c40e") + +vcpkg_download_distfile(ARCHIVE + URLS "https://salsa.debian.org/debian-gis-team/librttopo/-/archive/debian/${LIBRTTOPO_VERSION_STR}/librttopo-debian-${LIBRTTOPO_VERSION_STR}.tar.gz" + FILENAME "librttopo${LIBRTTOPO_VERSION_STR}.zip" + SHA512 ${LIBRTTOPO_PACKAGE_SUM} +) + +vcpkg_extract_source_archive_ex( + ARCHIVE ${ARCHIVE} + OUT_SOURCE_PATH SOURCE_PATH + PATCHES + fix-makefiles.patch + fix-geoconfig.patch +) + +if (VCPKG_TARGET_IS_WINDOWS) + set(SRID_MAX 999999) + set(SRID_USR_MAX 998999) + configure_file(${CMAKE_CURRENT_LIST_DIR}/rttopo_config.h.in ${SOURCE_PATH}/src/rttopo_config.h @ONLY) + configure_file(${SOURCE_PATH}/headers/librttopo_geom.h.in ${SOURCE_PATH}/headers/librttopo_geom.h @ONLY) + + vcpkg_build_nmake( + SOURCE_PATH ${SOURCE_PATH} + TARGET librttopo.lib + ) + + file(GLOB LIBRTTOPO_INCLUDE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/headers/*.h) + file(COPY ${LIBRTTOPO_INCLUDE} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/librttopo.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/librttopo.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + "GEOS_MAJOR_VERSION=3" + "GEOS_MINOR_VERSION=8" + OPTIONS_DEBUG + "GEOS_LDFLAGS=-lgeos_cd -lgeosd -lm" + OPTIONS_RELEASE + "GEOS_LDFLAGS=-lgeos_c -lgeos -lm" + ) + + vcpkg_install_make() +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/librttopo/rttopo_config.h.in b/ports/librttopo/rttopo_config.h.in new file mode 100644 index 00000000000000..b4b1a39299f976 --- /dev/null +++ b/ports/librttopo/rttopo_config.h.in @@ -0,0 +1,168 @@ +/* src/rttopo_config.h. Generated from rttopo_config.h.in by configure. */ +/* src/rttopo_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ASSERT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_CTYPE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the `fdatasync' function. */ +#define HAVE_FDATASYNC 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FLOAT_H 1 + +/* Define to 1 if you have the `ftruncate' function. */ +#define HAVE_FTRUNCATE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GEOS_C_H 1 + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `localtime_r' function. */ +#define HAVE_LOCALTIME_R 1 + +/* Define to 1 if `lstat' has the bug that it succeeds when given the + zero-length file name argument. */ +/* #undef HAVE_LSTAT_EMPTY_STRING_BUG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MATH_H 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + +/* Define to 1 if you have the `sqrt' function. */ +/* #undef HAVE_SQRT */ + +/* Define to 1 if `stat' has the bug that it succeeds when given the + zero-length file name argument. */ +/* #undef HAVE_STAT_EMPTY_STRING_BUG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDARG_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strcasecmp' function. */ +#define HAVE_STRCASECMP 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strncasecmp' function. */ +#define HAVE_STRNCASECMP 1 + +/* Define to 1 if you have the `strstr' function. */ +#define HAVE_STRSTR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* rtgeom version */ +#define LIBRTGEOM_VERSION "1.1.0" + +/* Define to 1 if `lstat' dereferences a symlink specified with a trailing + slash. */ +#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Must be defined in order to disable debug mode. */ +#undef NDEBUG + +/* Name of package */ +#define PACKAGE "librttopo" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "strk@kbt.io" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "librttopo" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "librttopo 1.1.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "librttopo" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.1.0" + +/* RTGEOM Debug level */ +#define RTGEOM_DEBUG_LEVEL 0 + +/* GEOS library version */ +#define RTGEOM_GEOS_VERSION 38 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 + +/* Define to 1 if your declares `struct tm'. */ +/* #undef TM_IN_SYS_TIME */ + +/* Version number of package */ +#define VERSION "1.1.0" + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `long int' if does not define. */ +/* #undef off_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +/* Define to empty if the keyword `volatile' does not work. Warning: valid + code using `volatile' can become incorrect without. Disable with care. */ +/* #undef volatile */ From a1ceac8e499642292d5308b260d4288e99c42637 Mon Sep 17 00:00:00 2001 From: nanoric <475647575@qq.com> Date: Sat, 19 Dec 2020 04:05:16 +0800 Subject: [PATCH 0329/1694] Fixed internal compiler error when using newer GCC@master. (#15188) --- toolsrc/src/vcpkg/base/json.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolsrc/src/vcpkg/base/json.cpp b/toolsrc/src/vcpkg/base/json.cpp index 0355b0c9417e83..4a784235e089f2 100644 --- a/toolsrc/src/vcpkg/base/json.cpp +++ b/toolsrc/src/vcpkg/base/json.cpp @@ -71,7 +71,8 @@ namespace vcpkg::Json else { destroy_underlying(); - new (&(this->*mp)) T(std::move(other.*mp)); + auto* address = &(this->*mp); + new (address) T(std::move(other.*mp)); tag = vk; } From 8973f48be49a85f27df316c68a8ee038ef484e57 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Fri, 18 Dec 2020 12:06:00 -0800 Subject: [PATCH 0330/1694] [pegtl] Update to release version 3.1.0 (#15186) --- ports/pegtl/CONTROL | 2 +- ports/pegtl/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/pegtl/CONTROL b/ports/pegtl/CONTROL index 4fdc23ea38b9c6..5330daf1aa546e 100644 --- a/ports/pegtl/CONTROL +++ b/ports/pegtl/CONTROL @@ -1,4 +1,4 @@ Source: pegtl -Version: 2020-12-07 +Version: 3.1.0 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 diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake index cde2031469b9ba..470ca9930cb9d5 100644 --- a/ports/pegtl/portfile.cmake +++ b/ports/pegtl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taocpp/pegtl - REF 93b53c80058b2632a7260ab10ef2a06abcc0fc7f - SHA512 83b198465bca60b95c670aa72681aed0448025b506c6f6a196446608eb47ee9d8828c51ac8735caa2b2ec1e53d6a13bd6ad287a4abb8690a570036b90918907a + REF 3.1.0 + SHA512 b142d60fab4e3ba39cefbf3569add33400f759e4539714f1164cd10ea869e312b2cd8bfa23dca9f012f8ae8574c84263f471950d6480d42c61be0057b67d4dfc HEAD_REF master ) @@ -23,4 +23,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/pegtl/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) # Handle copyright -file(RENAME ${CURRENT_PACKAGES_DIR}/share/pegtl/LICENSE ${CURRENT_PACKAGES_DIR}/share/pegtl/copyright) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/pegtl/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) From 0de7fae8c64b299e7f83e9160d96bbdee5a4e860 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 18 Dec 2020 21:06:21 +0100 Subject: [PATCH 0331/1694] [freetype] avoid target_link_libraries call since qt6 does not like it. (#15112) --- ports/freetype/CONTROL | 2 +- ports/freetype/vcpkg-cmake-wrapper.cmake | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL index 55358c608f891a..c005318a2447c9 100644 --- a/ports/freetype/CONTROL +++ b/ports/freetype/CONTROL @@ -1,6 +1,6 @@ Source: freetype Version: 2.10.2 -Port-Version: 6 +Port-Version: 7 Homepage: https://www.freetype.org/ Description: A library to render fonts. Default-Features: zlib, bzip2, png, brotli diff --git a/ports/freetype/vcpkg-cmake-wrapper.cmake b/ports/freetype/vcpkg-cmake-wrapper.cmake index 42bf9e1fa72c39..2f4656bf143995 100644 --- a/ports/freetype/vcpkg-cmake-wrapper.cmake +++ b/ports/freetype/vcpkg-cmake-wrapper.cmake @@ -34,9 +34,15 @@ if(TARGET Freetype::Freetype) if(@USE_PNG@) set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES PNG::PNG) endif() - if(@USE_BROTLI@) - target_link_libraries(Freetype::Freetype INTERFACE ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) + if(BROTLIDEC_LIBRARY_DEBUG) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$:${BROTLIDEC_LIBRARY_DEBUG}>) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$:${BROTLICOMMON_LIBRARY_DEBUG}>) + endif() + if(BROTLIDEC_LIBRARY_RELEASE) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$>:${BROTLIDEC_LIBRARY_RELEASE}>) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$>:${BROTLICOMMON_LIBRARY_RELEASE}>) + endif() endif() endif() From 9e92557da6341327f448f4a206099f3dbd43d262 Mon Sep 17 00:00:00 2001 From: eao197 Date: Fri, 18 Dec 2020 23:06:51 +0300 Subject: [PATCH 0332/1694] SObjectizer updated to v.5.7.2.1. (#15182) --- ports/sobjectizer/portfile.cmake | 4 ++-- ports/sobjectizer/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index da0800892be55c..8ea1b0ecc8d54b 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 0f261d1f2352d56854bf940dabdd9a4ad527be24 # v.5.7.2 - SHA512 f5b63a82ecc99151ae0b5870f040b59e000c159958232427b1aefa135def722f377906e59cc99e2f0139b36f6f2f2678dff8d8acd03ab03e0b87a4af4f678f13 + REF 04ec6fcf63eb977e9f45348b7c05b0d98c8f0b60 # v.5.7.2.1 + SHA512 b2550d7bf7f3e405fccff02ae12fd2a235016c5c8bdcfc0bb1baf3a91f90369d68b2c57dbecbc990a8627338b7dcd6b3d32b681aaf0335dde0b2672003fe38ec ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) diff --git a/ports/sobjectizer/vcpkg.json b/ports/sobjectizer/vcpkg.json index 60787967ac3d08..ab7b3369d75582 100644 --- a/ports/sobjectizer/vcpkg.json +++ b/ports/sobjectizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sobjectizer", - "version-string": "5.7.2", + "version-string": "5.7.2.1", "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" From b2c1288a6e3697b762e69ab8789f93f7a280c3ed Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Fri, 18 Dec 2020 21:07:41 +0100 Subject: [PATCH 0333/1694] [civetweb] Disable extensive log output for debug builds (#15168) --- ports/civetweb/CONTROL | 1 + .../add-option-to-disable-debug-tools.patch | 36 +++++++++++++++++++ ports/civetweb/portfile.cmake | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 ports/civetweb/add-option-to-disable-debug-tools.patch diff --git a/ports/civetweb/CONTROL b/ports/civetweb/CONTROL index 4026126bc48581..395e244651db4d 100644 --- a/ports/civetweb/CONTROL +++ b/ports/civetweb/CONTROL @@ -1,5 +1,6 @@ Source: civetweb Version: 1.13 +Port-Version: 1 Homepage: https://github.com/civetweb/civetweb Description: Easy to use, powerful, C/C++ embeddable web server. Supports: !uwp diff --git a/ports/civetweb/add-option-to-disable-debug-tools.patch b/ports/civetweb/add-option-to-disable-debug-tools.patch new file mode 100644 index 00000000000000..5cf276886ac426 --- /dev/null +++ b/ports/civetweb/add-option-to-disable-debug-tools.patch @@ -0,0 +1,36 @@ +From 111672d5437a3c7f02b66d730be5000dade58bff Mon Sep 17 00:00:00 2001 +From: Gregor Jasny +Date: Tue, 15 Dec 2020 14:38:37 +0100 +Subject: [PATCH] CMake: Add option to disable Debug tools +Origin: https://github.com/civetweb/civetweb/pull/952 + +Sometimes one needs the CMake `Debug` build type +to select the Windows Debug runtime. But at the same +time the verbose logging output might be unwanted. + +This PR adds the `CIVETWEB_ENABLE_DEBUG_TOOLS` option +to disable extensive logging and assertion. +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 368e5640..000f7972 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -476,8 +476,11 @@ endif() + + + # Set up the definitions ++option(CIVETWEB_ENABLE_DEBUG_TOOLS "For Debug builds enable verbose logging and assertions" ON) + if (${CMAKE_BUILD_TYPE} MATCHES "[Dd]ebug") +- add_definitions(-DDEBUG) ++ if(CIVETWEB_ENABLE_DEBUG_TOOLS) ++ add_definitions(-DDEBUG) ++ endif() + add_definitions(-O0) + add_definitions(-g) + endif() +-- +2.29.2 + diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake index 5e26a31717ef59..2dae7f4d64025b 100644 --- a/ports/civetweb/portfile.cmake +++ b/ports/civetweb/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( REF 8e243456965c9be5212cb96519da69cd54550e3d # v1.13 SHA512 6f9daf404975697c6b7a56cc71006aaf14442acf545e483d8a7b845f255d5e5d6e08194fe3350a667e0b737b6924c9d39b025b587af27e7f12cd7b64f314eb70 HEAD_REF master + PATCHES "add-option-to-disable-debug-tools.patch" ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -19,6 +20,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DCIVETWEB_BUILD_TESTING=OFF + -DCIVETWEB_ENABLE_DEBUG_TOOLS=OFF -DCIVETWEB_ENABLE_ASAN=OFF -DCIVETWEB_ENABLE_CXX=ON -DCIVETWEB_ENABLE_IPV6=ON From e6f1230b66bf5548dce8d0a156980d5b868a50d2 Mon Sep 17 00:00:00 2001 From: Long Huan <8551701+longhuan2018@users.noreply.github.com> Date: Tue, 22 Dec 2020 00:56:24 +0800 Subject: [PATCH 0334/1694] [libspatialite] Update 5.0.0 (#15040) * update to 5.0.0 * update * update * fix static build failed * remove fix-latin-literals.patch * Update portfile.cmake --- ports/libspatialite/CONTROL | 6 +- ports/libspatialite/fix-configure-debug.patch | 58 --- ports/libspatialite/fix-latin-literals.patch | 108 ------ ports/libspatialite/fix-linux-configure.patch | 191 ++++------ ports/libspatialite/fix-makefiles.patch | 39 +- ports/libspatialite/fix-sources.patch | 32 -- ports/libspatialite/geos-config-debug.in | 75 ---- ports/libspatialite/geos-config.in | 75 ---- ports/libspatialite/portfile.cmake | 332 ++++++------------ ports/spatialite-tools/CONTROL | 2 +- ports/spatialite-tools/portfile.cmake | 4 +- 11 files changed, 186 insertions(+), 736 deletions(-) delete mode 100644 ports/libspatialite/fix-configure-debug.patch delete mode 100644 ports/libspatialite/fix-latin-literals.patch delete mode 100644 ports/libspatialite/fix-sources.patch delete mode 100644 ports/libspatialite/geos-config-debug.in delete mode 100644 ports/libspatialite/geos-config.in diff --git a/ports/libspatialite/CONTROL b/ports/libspatialite/CONTROL index 9cedf5f1748dd8..0fbb05f8bc813c 100644 --- a/ports/libspatialite/CONTROL +++ b/ports/libspatialite/CONTROL @@ -1,7 +1,5 @@ Source: libspatialite -Version: 4.3.0a -Port-Version: 7 +Version: 5.0.0 Homepage: https://www.gaia-gis.it/gaia-sins/libspatialite-sources Description: SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities. -Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv - +Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv, librttopo \ No newline at end of file diff --git a/ports/libspatialite/fix-configure-debug.patch b/ports/libspatialite/fix-configure-debug.patch deleted file mode 100644 index 77a4c77a0628dc..00000000000000 --- a/ports/libspatialite/fix-configure-debug.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/configure b/configure -index aafdad55b..11dde35fa 100644 ---- a/configure -+++ b/configure -@@ -18089,7 +18089,7 @@ return GEOSCoveredBy (); - return 0; - } - _ACEOF --for ac_lib in '' geos_c; do -+for ac_lib in '' geos_cd; do - if test -z "$ac_lib"; then - ac_res="none required" - else -@@ -18124,7 +18124,7 @@ else - fi - - LIBS="$LIBS_SAVE" -- LIBS="$LIBS $GEOS_LDFLAGS -lgeos_c" -+ LIBS="$LIBS $GEOS_LDFLAGS -lgeos_cd" - - #----------------------------------------------------------------------- - # --enable-controlpoints -@@ -18176,7 +18176,7 @@ return GEOSDelaunayTriangulation (); - return 0; - } - _ACEOF --for ac_lib in '' geos_c; do -+for ac_lib in '' geos_cd; do - if test -z "$ac_lib"; then - ac_res="none required" - else -@@ -18240,7 +18240,7 @@ fi - done - - _save_libs="$LIBS" -- LIBS=$LIBS' -llwgeom -lgeos_c' -+ LIBS=$LIBS' -llwgeom -lgeos_cd' - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main() { return lwgeom_make_valid(); return 0; } -@@ -18255,7 +18255,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$_save_libs" -- LIBS=$LIBS' -llwgeom -lgeos_c' -+ LIBS=$LIBS' -llwgeom -lgeos_cd' - # - # testing for PostGIS 2.1 - lwgeom_set_handlers - # -@@ -18283,7 +18283,7 @@ return lwgeom_set_handlers (); - return 0; - } - _ACEOF --for ac_lib in '' geos_c; do -+for ac_lib in '' geos_cd; do - if test -z "$ac_lib"; then - ac_res="none required" - else diff --git a/ports/libspatialite/fix-latin-literals.patch b/ports/libspatialite/fix-latin-literals.patch deleted file mode 100644 index 3060593e7ac177..00000000000000 --- a/ports/libspatialite/fix-latin-literals.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/src/srsinit/epsg_inlined_prussian.c b/src/srsinit/epsg_inlined_prussian.c -index a5c8334..dd75dde 100644 ---- a/src/srsinit/epsg_inlined_prussian.c -+++ b/src/srsinit/epsg_inlined_prussian.c -@@ -282,10 +282,10 @@ initialize_epsg_prussian(int filter,struct epsg_defs **first, struct epsg_defs * - add_srs_wkt(p,10,"PARAMETER[\"central_meridian\",17.11233917],"); - add_srs_wkt(p,11,"PARAMETER[\"false_easting\",0],PARAMETER[\"false_northing\",0],"); - add_srs_wkt(p,12,"AUTHORITY[\"mj10777.de\",\"187913\"],AXIS[\"x\",NORTH],AXIS[\"y\",EAST]]"); -- p = add_epsg_def(filter,first,last,187914,"mj10777.de",187914,"DHDN / Soldner 14 Gröditzberg I"); -+ p = add_epsg_def(filter,first,last,187914,"mj10777.de",187914,u8"DHDN / Soldner 14 Gr\u00f6ditzberg I"); - add_proj4text(p,0,"+proj=cass +lat_0=51.17819342 +lon_0=15.76127086 "); - add_proj4text(p,1,"+x_0=0 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs"); -- add_srs_wkt(p,0,"PROJCS[\"DHDN / Soldner 14 Gröditzberg I\","); -+ add_srs_wkt(p,0,u8"PROJCS[\"DHDN / Soldner 14 Gr\u00f6ditzberg I\","); - add_srs_wkt(p,1,"GEOGCS[\"DHDN\","); - add_srs_wkt(p,2,"DATUM[\"Deutsches_Hauptdreiecksnetz\",SPHEROID[\"Bessel 1841\","); - add_srs_wkt(p,3,"6377397.155,299.1528128,AUTHORITY[\"EPSG\",\"7004\"]],"); -@@ -346,10 +346,10 @@ initialize_epsg_prussian(int filter,struct epsg_defs **first, struct epsg_defs * - add_srs_wkt(p,10,"PARAMETER[\"central_meridian\",14.70144539],"); - add_srs_wkt(p,11,"PARAMETER[\"false_easting\",0],PARAMETER[\"false_northing\",0],"); - add_srs_wkt(p,12,"AUTHORITY[\"mj10777.de\",\"187916\"],AXIS[\"x\",NORTH],AXIS[\"y\",EAST]]"); -- p = add_epsg_def(filter,first,last,187918,"mj10777.de",187918,"DHDN / Soldner 18 Müggelberg 600"); -+ p = add_epsg_def(filter,first,last,187918,u8"mj10777.de",187918,"DHDN / Soldner 18 M\u00fcggelberg 600"); - add_proj4text(p,0,"+proj=cass +lat_0=52.41864827777778 +lon_0=13.62720366666667 "); - add_proj4text(p,1,"+x_0=0 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs"); -- add_srs_wkt(p,0,"PROJCS[\"DHDN / Soldner 18 Müggelberg 600\","); -+ add_srs_wkt(p,0,u8"PROJCS[\"DHDN / Soldner 18 M\u00fcggelberg 600\","); - add_srs_wkt(p,1,"GEOGCS[\"DHDN\","); - add_srs_wkt(p,2,"DATUM[\"Deutsches_Hauptdreiecksnetz\",SPHEROID[\"Bessel 1841\","); - add_srs_wkt(p,3,"6377397.155,299.1528128,AUTHORITY[\"EPSG\",\"7004\"]],"); -@@ -362,10 +362,10 @@ initialize_epsg_prussian(int filter,struct epsg_defs **first, struct epsg_defs * - add_srs_wkt(p,10,"PARAMETER[\"central_meridian\",13.62720366666667],"); - add_srs_wkt(p,11,"PARAMETER[\"false_easting\",0],PARAMETER[\"false_northing\",0],"); - add_srs_wkt(p,12,"AUTHORITY[\"mj10777.de\",\"187918\"],AXIS[\"x\",NORTH],AXIS[\"y\",EAST]]"); -- p = add_epsg_def(filter,first,last,187919,"mj10777.de",187919,"DHDN / Soldner 19 Götzer Berg 650"); -+ p = add_epsg_def(filter,first,last,187919,"mj10777.de",187919,u8"DHDN / Soldner 19 G\u00f6tzer Berg 650"); - add_proj4text(p,0,"+proj=cass +lat_0=52.43725961111112 +lon_0=12.72882972222223 "); - add_proj4text(p,1,"+x_0=0 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs"); -- add_srs_wkt(p,0,"PROJCS[\"DHDN / Soldner 19 Götzer Berg 650\","); -+ add_srs_wkt(p,0,u8"PROJCS[\"DHDN / Soldner 19 G\u00f6tzer Berg 650\","); - add_srs_wkt(p,1,"GEOGCS[\"DHDN\","); - add_srs_wkt(p,2,"DATUM[\"Deutsches_Hauptdreiecksnetz\",SPHEROID[\"Bessel 1841\","); - add_srs_wkt(p,3,"6377397.155,299.1528128,AUTHORITY[\"EPSG\",\"7004\"]],"); -@@ -458,10 +458,10 @@ initialize_epsg_prussian(int filter,struct epsg_defs **first, struct epsg_defs * - add_srs_wkt(p,10,"PARAMETER[\"central_meridian\",9.23411097],"); - add_srs_wkt(p,11,"PARAMETER[\"false_easting\",0],PARAMETER[\"false_northing\",0],"); - add_srs_wkt(p,12,"AUTHORITY[\"mj10777.de\",\"187924\"],AXIS[\"x\",NORTH],AXIS[\"y\",EAST]]"); -- p = add_epsg_def(filter,first,last,187925,"mj10777.de",187925,"DHDN / Soldner 25 Rathkrügen"); -+ p = add_epsg_def(filter,first,last,187925,"mj10777.de",187925,u8"DHDN / Soldner 25 Rathkr\u00fcgen"); - add_proj4text(p,0,"+proj=cass +lat_0=53.81839364 +lon_0=10.04220189 "); - add_proj4text(p,1,"+x_0=0 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs"); -- add_srs_wkt(p,0,"PROJCS[\"DHDN / Soldner 25 Rathkrügen\","); -+ add_srs_wkt(p,0,u8"PROJCS[\"DHDN / Soldner 25 Rathkr\u00fcgen\","); - add_srs_wkt(p,1,"GEOGCS[\"DHDN\","); - add_srs_wkt(p,2,"DATUM[\"Deutsches_Hauptdreiecksnetz\",SPHEROID[\"Bessel 1841\","); - add_srs_wkt(p,3,"6377397.155,299.1528128,AUTHORITY[\"EPSG\",\"7004\"]],"); -@@ -570,10 +570,10 @@ initialize_epsg_prussian(int filter,struct epsg_defs **first, struct epsg_defs * - add_srs_wkt(p,10,"PARAMETER[\"central_meridian\",8.84051853],"); - add_srs_wkt(p,11,"PARAMETER[\"false_easting\",0],PARAMETER[\"false_northing\",0],"); - add_srs_wkt(p,12,"AUTHORITY[\"mj10777.de\",\"187931\"],AXIS[\"x\",NORTH],AXIS[\"y\",EAST]]"); -- p = add_epsg_def(filter,first,last,187932,"mj10777.de",187932,"DHDN / Soldner 32 Münster"); -+ p = add_epsg_def(filter,first,last,187932,"mj10777.de",187932,u8"DHDN / Soldner 32 M\u00fcnster"); - add_proj4text(p,0,"+proj=cass +lat_0=51.96547642 +lon_0=7.62334994 "); - add_proj4text(p,1,"+x_0=0 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs"); -- add_srs_wkt(p,0,"PROJCS[\"DHDN / Soldner 32 Münster\","); -+ add_srs_wkt(p,0,u8"PROJCS[\"DHDN / Soldner 32 M\u00fcnster\","); - add_srs_wkt(p,1,"GEOGCS[\"DHDN\","); - add_srs_wkt(p,2,"DATUM[\"Deutsches_Hauptdreiecksnetz\",SPHEROID[\"Bessel 1841\","); - add_srs_wkt(p,3,"6377397.155,299.1528128,AUTHORITY[\"EPSG\",\"7004\"]],"); -@@ -634,10 +634,10 @@ initialize_epsg_prussian(int filter,struct epsg_defs **first, struct epsg_defs * - add_srs_wkt(p,10,"PARAMETER[\"central_meridian\",9.50203072],"); - add_srs_wkt(p,11,"PARAMETER[\"false_easting\",0],PARAMETER[\"false_northing\",0],"); - add_srs_wkt(p,12,"AUTHORITY[\"mj10777.de\",\"187935\"],AXIS[\"x\",NORTH],AXIS[\"y\",EAST]]"); -- p = add_epsg_def(filter,first,last,187936,"mj10777.de",187936,"DHDN / Soldner 36 Schaumburg, Schloßturm"); -+ p = add_epsg_def(filter,first,last,187936,"mj10777.de",187936,u8"DHDN / Soldner 36 Schaumburg, Schlo\u00dfturm"); - add_proj4text(p,0,"+proj=cass +lat_0=50.34048964 +lon_0=7.97808156 "); - add_proj4text(p,1,"+x_0=0 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs"); -- add_srs_wkt(p,0,"PROJCS[\"DHDN / Soldner 36 Schaumburg, Schloßturm\","); -+ add_srs_wkt(p,0,u8"PROJCS[\"DHDN / Soldner 36 Schaumburg, Schlo\u00dfturm\","); - add_srs_wkt(p,1,"GEOGCS[\"DHDN\","); - add_srs_wkt(p,2,"DATUM[\"Deutsches_Hauptdreiecksnetz\",SPHEROID[\"Bessel 1841\","); - add_srs_wkt(p,3,"6377397.155,299.1528128,AUTHORITY[\"EPSG\",\"7004\"]],"); -@@ -666,10 +666,10 @@ initialize_epsg_prussian(int filter,struct epsg_defs **first, struct epsg_defs * - add_srs_wkt(p,10,"PARAMETER[\"central_meridian\",7.60594289],"); - add_srs_wkt(p,11,"PARAMETER[\"false_easting\",0],PARAMETER[\"false_northing\",0],"); - add_srs_wkt(p,12,"AUTHORITY[\"mj10777.de\",\"187937\"],AXIS[\"x\",NORTH],AXIS[\"y\",EAST]]"); -- p = add_epsg_def(filter,first,last,187938,"mj10777.de",187938,"DHDN / Soldner 38 Cöln, Dom"); -+ p = add_epsg_def(filter,first,last,187938,"mj10777.de",187938,u8"DHDN / Soldner 38 C\u00f6ln, Dom"); - add_proj4text(p,0,"+proj=cass +lat_0=50.94257242 +lon_0=6.95897600 "); - add_proj4text(p,1,"+x_0=0 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs"); -- add_srs_wkt(p,0,"PROJCS[\"DHDN / Soldner 38 Cöln, Dom\","); -+ add_srs_wkt(p,0,u8"PROJCS[\"DHDN / Soldner 38 C\u00f6ln, Dom\","); - add_srs_wkt(p,1,"GEOGCS[\"DHDN\","); - add_srs_wkt(p,2,"DATUM[\"Deutsches_Hauptdreiecksnetz\",SPHEROID[\"Bessel 1841\","); - add_srs_wkt(p,3,"6377397.155,299.1528128,AUTHORITY[\"EPSG\",\"7004\"]],"); -@@ -682,10 +682,10 @@ initialize_epsg_prussian(int filter,struct epsg_defs **first, struct epsg_defs * - add_srs_wkt(p,10,"PARAMETER[\"central_meridian\",6.95897600],"); - add_srs_wkt(p,11,"PARAMETER[\"false_easting\",0],PARAMETER[\"false_northing\",0],"); - add_srs_wkt(p,12,"AUTHORITY[\"mj10777.de\",\"187938\"],AXIS[\"x\",NORTH],AXIS[\"y\",EAST]]"); -- p = add_epsg_def(filter,first,last,187939,"mj10777.de",187939,"DHDN / Soldner 39 Langschoß"); -+ p = add_epsg_def(filter,first,last,187939,u8"mj10777.de",187939,"DHDN / Soldner 39 Langscho\u00df"); - add_proj4text(p,0,"+proj=cass +lat_0=50.66738711 +lon_0=6.28935703 "); - add_proj4text(p,1,"+x_0=0 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs"); -- add_srs_wkt(p,0,"PROJCS[\"DHDN / Soldner 39 Langschoß\","); -+ add_srs_wkt(p,0,u8"PROJCS[\"DHDN / Soldner 39 Langscho\u00df\","); - add_srs_wkt(p,1,"GEOGCS[\"DHDN\","); - add_srs_wkt(p,2,"DATUM[\"Deutsches_Hauptdreiecksnetz\",SPHEROID[\"Bessel 1841\","); - add_srs_wkt(p,3,"6377397.155,299.1528128,AUTHORITY[\"EPSG\",\"7004\"]],"); diff --git a/ports/libspatialite/fix-linux-configure.patch b/ports/libspatialite/fix-linux-configure.patch index 59afa8c49508c4..426ab3b3527f6f 100644 --- a/ports/libspatialite/fix-linux-configure.patch +++ b/ports/libspatialite/fix-linux-configure.patch @@ -1,135 +1,62 @@ -diff --git a/configure b/configure -index aafdad5..fe46039 100644 ---- a/configure -+++ b/configure -@@ -17448,6 +17448,7 @@ fi - # --enable-proj - # - # Check whether --enable-proj was given. -+ - if test "${enable_proj+set}" = set; then : - enableval=$enable_proj; - else -@@ -17469,122 +17470,6 @@ fi +diff --git a/configure.ac b/configure.ac +index ead87caff..47abb90f0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -302,6 +302,7 @@ if test x"$enable_geos" != "xno"; then + #----------------------------------------------------------------------- + # --with-geosconfig + # ++ if 0; then + AC_ARG_WITH([geosconfig], + [AS_HELP_STRING([--with-geosconfig=FILE], [specify an alternative geos-config file])], + [GEOSCONFIG="$withval"], [GEOSCONFIG=""]) +@@ -327,6 +328,7 @@ if test x"$enable_geos" != "xno"; then + # Extract the linker and include flags + GEOS_LDFLAGS=`$GEOSCONFIG --ldflags` + GEOS_CFLAGS=-I`$GEOSCONFIG --includes` ++ fi + AC_SUBST([GEOS_LDFLAGS]) + AC_SUBST([GEOS_CFLAGS]) + # Ensure that we can parse geos_c.h +@@ -335,11 +337,14 @@ if test x"$enable_geos" != "xno"; then + AC_CHECK_HEADERS([geos_c.h],, [AC_MSG_ERROR([could not find geos_c.h - you may need to specify the directory of a geos-config file using --with-geosconfig])]) + CPPFLAGS="$CPPFLAGS_SAVE" + # Ensure we can link against libgeos_c ++ if 0; then + LIBS_SAVE="$LIBS" + LIBS="$GEOS_LDFLAGS" + AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([could not find libgeos_c (or obsolete 'libgeos_c' < v.3.3.0 found) - you may need to specify the directory of a geos-config file using --with-geosconfig])) + LIBS="$LIBS_SAVE" + LIBS="$LIBS $GEOS_LDFLAGS -lgeos_c" ++ fi ++ LIBS="$LIBS $GEOS_LDFLAGS" - done + #----------------------------------------------------------------------- + # --enable-controlpoints +@@ -358,7 +363,7 @@ if test x"$enable_geos" != "xno"; then + [--enable-geosadvanced], [enables GEOS advanced features [default=yes]])], + [], [enable_geosadvanced=yes]) + if test x"$enable_geosadvanced" != "xno"; then +- AC_SEARCH_LIBS(GEOSDelaunayTriangulation,geos_c,,AC_MSG_ERROR(['libgeos_c' (>= v.3.4.0) is required but it doesn't seem to be installed on this system. You may need to try re-running configure with a --disable-geosadvanced parameter.])) ++ #AC_SEARCH_LIBS(GEOSDelaunayTriangulation,geos_c,,AC_MSG_ERROR(['libgeos_c' (>= v.3.4.0) is required but it doesn't seem to be installed on this system. You may need to try re-running configure with a --disable-geosadvanced parameter.])) + AC_DEFINE(GEOS_ADVANCED) + fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pj_init_plus" >&5 --$as_echo_n "checking for library containing pj_init_plus... " >&6; } --if ${ac_cv_search_pj_init_plus+:} 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 pj_init_plus (); --int --main () --{ --return pj_init_plus (); -- ; -- return 0; --} --_ACEOF --for ac_lib in '' proj; do -- if test -z "$ac_lib"; then -- ac_res="none required" -- else -- ac_res=-l$ac_lib -- LIBS="-l$ac_lib -lm $ac_func_search_save_LIBS" -- fi -- if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_search_pj_init_plus=$ac_res --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext -- if ${ac_cv_search_pj_init_plus+:} false; then : -- break --fi --done --if ${ac_cv_search_pj_init_plus+:} false; then : -- --else -- ac_cv_search_pj_init_plus=no --fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pj_init_plus" >&5 --$as_echo "$ac_cv_search_pj_init_plus" >&6; } --ac_res=$ac_cv_search_pj_init_plus --if test "$ac_res" != no; then : -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -- --else -- as_fn_error $? "'libproj' is required but it doesn't seem to be installed on this system." "$LINENO" 5 --fi -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pj_init_ctx" >&5 --$as_echo_n "checking for library containing pj_init_ctx... " >&6; } --if ${ac_cv_search_pj_init_ctx+:} 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 pj_init_ctx (); --int --main () --{ --return pj_init_ctx (); -- ; -- return 0; --} --_ACEOF --for ac_lib in '' proj; do -- if test -z "$ac_lib"; then -- ac_res="none required" -- else -- ac_res=-l$ac_lib -- LIBS="-l$ac_lib -lm $ac_func_search_save_LIBS" -- fi -- if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_search_pj_init_ctx=$ac_res --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext -- if ${ac_cv_search_pj_init_ctx+:} false; then : -- break --fi --done --if ${ac_cv_search_pj_init_ctx+:} false; then : -- --else -- ac_cv_search_pj_init_ctx=no --fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pj_init_ctx" >&5 --$as_echo "$ac_cv_search_pj_init_ctx" >&6; } --ac_res=$ac_cv_search_pj_init_ctx --if test "$ac_res" != no; then : -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -- --else -- as_fn_error $? "'libproj' is required but the version on this system does not support the required features (Version 4.8.0 or later is needed)." "$LINENO" 5 --fi -- - else - $as_echo "#define OMIT_PROJ 1" >>confdefs.h +@@ -369,7 +374,7 @@ if test x"$enable_geos" != "xno"; then + [--enable-geosreentrant], [enables GEOS reentrant (fully thread safe) [default=yes]])], + [], [enable_geosreentrant=yes]) + if test x"$enable_geosreentrant" != "xno"; then +- AC_SEARCH_LIBS(GEOSContext_setErrorMessageHandler_r,geos_c,,AC_MSG_ERROR(['libgeos_c' (>= v.3.5.0) is required but it doesn't seem to be installed on this system. You may need to try re-running configure with a --disable-geosreentrant parameter.])) ++ #AC_SEARCH_LIBS(GEOSContext_setErrorMessageHandler_r,geos_c,,AC_MSG_ERROR(['libgeos_c' (>= v.3.5.0) is required but it doesn't seem to be installed on this system. You may need to try re-running configure with a --disable-geosreentrant parameter.])) + AC_DEFINE(GEOS_REENTRANT) + fi + +@@ -390,7 +395,7 @@ if test x"$enable_geos" != "xno"; then + [--enable-geos370], [enables GEOS 3.7.0 features [default=yes]])], + [], [enable_geos370=yes]) + if test x"$enable_geos370" != "xno"; then +- AC_SEARCH_LIBS(GEOSFrechetDistance_r,geos_c,,AC_MSG_ERROR(['libgeos_c' (>= v.3.7.0) is required but it doesn't seem to be installed on this system. You may need to try re-running configure with a --disable-geos370 parameter.])) ++ #AC_SEARCH_LIBS(GEOSFrechetDistance_r,geos_c,,AC_MSG_ERROR(['libgeos_c' (>= v.3.7.0) is required but it doesn't seem to be installed on this system. You may need to try re-running configure with a --disable-geos370 parameter.])) + AC_DEFINE(GEOS_370) + fi diff --git a/ports/libspatialite/fix-makefiles.patch b/ports/libspatialite/fix-makefiles.patch index 9372739bbbbfcc..6466020bcd7b8d 100644 --- a/ports/libspatialite/fix-makefiles.patch +++ b/ports/libspatialite/fix-makefiles.patch @@ -1,51 +1,34 @@ diff --git a/makefile.vc b/makefile.vc -index 9b9e8ee..b524a27 100644 +index 120090eba..049c0d0b0 100644 --- a/makefile.vc +++ b/makefile.vc -@@ -59,7 +59,7 @@ LIBOBJ = src\gaiaaux\gg_sqlaux.obj src\gaiaaux\gg_utf8.obj \ - src\versioninfo\version.obj src\virtualtext\virtualtext.obj +@@ -93,7 +93,7 @@ LIBOBJ = src\gaiaaux\gg_sqlaux.obj src\gaiaaux\gg_utf8.obj \ SPATIALITE_DLL = spatialite$(VERSION).dll --CFLAGS = /nologo -I.\src\headers -I. -IC:\OSGeo4W\include $(OPTFLAGS) -+CFLAGS = /nologo -I.\src\headers -I. -I$(INSTALLED_ROOT)\include $(OPTFLAGS) + CFLAGS = /nologo -I.\src\headers -I.\src\topology \ +- -I. -IC:\OSGeo4W\include $(OPTFLAGS) ++ -I. $(OPTFLAGS) default: all -@@ -73,12 +73,9 @@ spatialite.lib: $(LIBOBJ) +@@ -107,12 +107,9 @@ spatialite.lib: $(LIBOBJ) $(SPATIALITE_DLL): spatialite_i.lib spatialite_i.lib: $(LIBOBJ) -- link /debug /dll /out:$(SPATIALITE_DLL) \ +- link /dll /out:$(SPATIALITE_DLL) \ + link $(LINK_FLAGS) /dll /out:$(SPATIALITE_DLL) \ /implib:spatialite_i.lib $(LIBOBJ) \ - C:\OSGeo4W\lib\proj_i.lib C:\OSGeo4W\lib\geos_c.lib \ - C:\OSGeo4w\lib\freexl_i.lib C:\OSGeo4w\lib\iconv.lib \ - C:\OSGeo4W\lib\sqlite3_i.lib C:\OSGeo4W\lib\zlib.lib \ -- C:\OSGeo4W\lib\libxml2.lib +- C:\OSGeo4W\lib\libxml2.lib C:\OSGeo4W\lib\librttopo.lib + $(LIBS_ALL) if exist $(SPATIALITE_DLL).manifest mt -manifest \ $(SPATIALITE_DLL).manifest -outputresource:$(SPATIALITE_DLL);2 -@@ -90,16 +87,7 @@ clean: - del *.exp - del *.manifest - del *.lib -- del src\gaiaaux\*.obj -- del src\gaiaexif\*.obj -- del src\gaiageo\*.obj -- del src\spatialite\*.obj -- del src\srsinit\*.obj -- del src\versioninfo\*.obj -- del src\virtualtext\*.obj -- del src\wfs\*.obj -- del src\dxf\*.obj -- del src\md5\*.obj -+ forfiles /m *.obj* /s /c "cmd /c del @path" & exit 0 - del *.pdb - install: all diff --git a/nmake.opt b/nmake.opt -index 0960ec1..276bc84 100644 +index c048aa758..be68e21cd 100644 --- a/nmake.opt +++ b/nmake.opt @@ -1,8 +1,8 @@ @@ -54,8 +37,8 @@ index 0960ec1..276bc84 100644 +INSTDIR=$(INST_DIR) # Uncomment the first for an optimized build, or the second for debug. --OPTFLAGS= /nologo /Ox /fp:precise /W3 /MD /D_CRT_SECURE_NO_WARNINGS \ -+OPTFLAGS= /nologo /fp:precise /W3 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS \ +-OPTFLAGS= /nologo /Ox /fp:precise /W4 /MD /D_CRT_SECURE_NO_WARNINGS \ ++OPTFLAGS= /nologo /fp:precise /W4 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS \ /DDLL_EXPORT /DYY_NO_UNISTD_H #OPTFLAGS= /nologo /Zi /MD /Fdspatialite.pdb /DDLL_EXPORT diff --git a/ports/libspatialite/fix-sources.patch b/ports/libspatialite/fix-sources.patch deleted file mode 100644 index 63def0d3ca70ed..00000000000000 --- a/ports/libspatialite/fix-sources.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/config-msvc.h b/config-msvc.h -index 9c7f477..a812546 100644 ---- a/config-msvc.h -+++ b/config-msvc.h -@@ -143,7 +143,7 @@ - #define HAVE_SYS_TYPES_H 1 - - /* Define to 1 if you have the header file. */ --#define HAVE_UNISTD_H 1 -+#undef HAVE_UNISTD_H - - /* Define to 1 if you have the header file. */ - #define HAVE_ZLIB_H 1 -diff --git a/src/gaiageo/gg_extras.c b/src/gaiageo/gg_extras.c -index ff3dd7c..49ec986 100644 ---- a/src/gaiageo/gg_extras.c -+++ b/src/gaiageo/gg_extras.c -@@ -59,14 +59,6 @@ the terms of any one of the MPL, the GPL or the LGPL. - #include - #include - --#if defined(_WIN32) && !defined(__MINGW32__) --static double --rint (double x) --{ -- return floor (x + 0.5); --} --#endif -- - static void - auxGridSnapPoint (int dimension_model, gaiaPointPtr pt, gaiaGeomCollPtr result, - double origin_x, double origin_y, double origin_z, diff --git a/ports/libspatialite/geos-config-debug.in b/ports/libspatialite/geos-config-debug.in deleted file mode 100644 index d274c2a68a9f52..00000000000000 --- a/ports/libspatialite/geos-config-debug.in +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ - -usage() -{ - cat <&2 -fi -while test $# -gt 0; do -case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; -esac -case $1 in - --prefix) - echo ${prefix} - ;; - --version) - echo 3.6.3 - ;; - --cflags) - echo -I${prefix}/include - ;; - --libs) - # TODO: make an alias for --clibs - # see http://trac.osgeo.org/geos/ticket/497 - echo -L${libdir} -lgeosd - ;; - --clibs) - echo -L${libdir} -lgeos_cd - ;; - --cclibs) - echo -L${libdir} -lgeosd - ;; - --static-clibs) - echo -L${libdir} -lgeos_cd -lgeosd -lm - ;; - --static-cclibs) - echo -L${libdir} -lgeosd -lm - ;; - --ldflags) - echo -L${libdir} -lgeos_cd -lgeosd -lstdc++ -lm - ;; - --includes) - echo ${prefix}/include - ;; - --jtsport) - echo 1.13.0 - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - diff --git a/ports/libspatialite/geos-config.in b/ports/libspatialite/geos-config.in deleted file mode 100644 index a2a6d5d1717197..00000000000000 --- a/ports/libspatialite/geos-config.in +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ - -usage() -{ - cat <&2 -fi -while test $# -gt 0; do -case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; -esac -case $1 in - --prefix) - echo ${prefix} - ;; - --version) - echo 3.6.3 - ;; - --cflags) - echo -I${prefix}/include - ;; - --libs) - # TODO: make an alias for --clibs - # see http://trac.osgeo.org/geos/ticket/497 - echo -L${libdir} -lgeos - ;; - --clibs) - echo -L${libdir} -lgeos_c - ;; - --cclibs) - echo -L${libdir} -lgeos - ;; - --static-clibs) - echo -L${libdir} -lgeos_c -lgeos -lm - ;; - --static-cclibs) - echo -L${libdir} -lgeos -lm - ;; - --ldflags) - echo -L${libdir} -lgeos_c -lgeos -lstdc++ -lm - ;; - --includes) - echo ${prefix}/include - ;; - --jtsport) - echo 1.13.0 - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index 4496656a9c34de..fff7d69c7f007f 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -1,237 +1,127 @@ -set(LIBSPATIALITE_VERSION_STR "4.3.0a") +set(LIBSPATIALITE_VERSION_STR "5.0.0") vcpkg_download_distfile(ARCHIVE URLS "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${LIBSPATIALITE_VERSION_STR}.tar.gz" FILENAME "libspatialite-${LIBSPATIALITE_VERSION_STR}.tar.gz" - SHA512 adfd63e8dde0f370b07e4e7bb557647d2bfb5549205b60bdcaaca69ff81298a3d885e7c1ca515ef56dd0aca152ae940df8b5dbcb65bb61ae0a9337499895c3c0 + SHA512 df72a3434d6e49f8836a9de2340f343a53f0673d0d17693cdb0f4971928b7c8bf40df44b21c0861945a9c81058e939acd1714b0b426ce9aa2ff7b0e8e6b196a7 ) -if (VCPKG_TARGET_IS_WINDOWS) - find_program(NMAKE nmake) - - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES - fix-makefiles.patch - fix-sources.patch - fix-latin-literals.patch - ) - - # fix most of the problems when spacebar is in the path - set(CURRENT_INSTALLED_DIR "\"${CURRENT_INSTALLED_DIR}\"") - - if(VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(CL_FLAGS_DBG "/MDd /Zi /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") - set(CL_FLAGS_REL "/MD /Ox /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") - set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib") - set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib") - set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib") - set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib") - else() - set(CL_FLAGS_DBG "/MTd /Zi /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") - set(CL_FLAGS_REL "/MT /Ox /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") - set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib ${CURRENT_INSTALLED_DIR}/lib/geos.lib") - set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/geosd.lib") - set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib") - set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib") - endif() - - set(LIBS_ALL_DBG - "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib \ - ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib \ - ${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \ - ${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib \ - ${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \ - ${LIBXML2_LIBS_DBG} \ - ${GEOS_LIBS_DBG} \ - ${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib ole32.lib shell32.lib" - ) - set(LIBS_ALL_REL - "${CURRENT_INSTALLED_DIR}/lib/iconv.lib \ - ${CURRENT_INSTALLED_DIR}/lib/charset.lib \ - ${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \ - ${CURRENT_INSTALLED_DIR}/lib/freexl.lib \ - ${CURRENT_INSTALLED_DIR}/lib/zlib.lib \ - ${LIBXML2_LIBS_REL} \ - ${GEOS_LIBS_REL} \ - ${CURRENT_INSTALLED_DIR}/lib/proj.lib ole32.lib shell32.lib" - ) - - ################ - # Debug build - ################ - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - message(STATUS "Building ${TARGET_TRIPLET}-dbg") - - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug" INST_DIR_DBG) - - vcpkg_execute_required_process( - COMMAND ${NMAKE} -f makefile.vc clean install - "INST_DIR=\"${INST_DIR_DBG}\"" INSTALLED_ROOT=${CURRENT_INSTALLED_DIR} "LINK_FLAGS=/debug" "CL_FLAGS=${CL_FLAGS_DBG}" "LIBS_ALL=${LIBS_ALL_DBG}" - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME nmake-build-${TARGET_TRIPLET}-debug - ) - message(STATUS "Building ${TARGET_TRIPLET}-dbg done") - vcpkg_copy_pdbs() - endif() - - ################ - # Release build - ################ - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - message(STATUS "Building ${TARGET_TRIPLET}-rel") - - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL) - vcpkg_execute_required_process( - COMMAND ${NMAKE} -f makefile.vc clean install - "INST_DIR=\"${INST_DIR_REL}\"" INSTALLED_ROOT=${CURRENT_INSTALLED_DIR} "LINK_FLAGS=" "CL_FLAGS=${CL_FLAGS_REL}" "LIBS_ALL=${LIBS_ALL_REL}" - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME nmake-build-${TARGET_TRIPLET}-release - ) - message(STATUS "Building ${TARGET_TRIPLET}-rel done") - endif() +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + fix-makefiles.patch + fix-linux-configure.patch +) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libspatialite RENAME copyright) +if (VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib") + set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib") + set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib") + set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib") + set(LIBRTTOPO_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/librttopo.lib") + set(LIBRTTOPO_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/librttopo.lib") + else() + set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib ${CURRENT_INSTALLED_DIR}/lib/geos.lib") + set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/geosd.lib") + set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib") + set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib") + set(LIBRTTOPO_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/librttopo.lib") + set(LIBRTTOPO_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/librttopo.lib") + endif() - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(LIBS_ALL_DBG + "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib \ + ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib \ + ${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \ + ${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib \ + ${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \ + ${LIBXML2_LIBS_DBG} \ + ${GEOS_LIBS_DBG} \ + ${LIBRTTOPO_LIBS_DBG} \ + ${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib ole32.lib shell32.lib" + ) + set(LIBS_ALL_REL + "${CURRENT_INSTALLED_DIR}/lib/iconv.lib \ + ${CURRENT_INSTALLED_DIR}/lib/charset.lib \ + ${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \ + ${CURRENT_INSTALLED_DIR}/lib/freexl.lib \ + ${CURRENT_INSTALLED_DIR}/lib/zlib.lib \ + ${LIBXML2_LIBS_REL} \ + ${GEOS_LIBS_REL} \ + ${LIBRTTOPO_LIBS_REL} \ + ${CURRENT_INSTALLED_DIR}/lib/proj.lib ole32.lib shell32.lib" + ) + + string(REPLACE "/" "\\\\" INST_DIR ${CURRENT_PACKAGES_DIR}) + list(APPEND OPTIONS_RELEASE + "INST_DIR=${INST_DIR}" "LIBS_ALL=${LIBS_ALL_REL}" + ) + list(APPEND OPTIONS_DEBUG + "LINK_FLAGS=/debug" "INST_DIR=${INST_DIR}\\debug" "LIBS_ALL=${LIBS_ALL_DBG}" + ) + + vcpkg_install_nmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + "CL_FLAGS=/DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + OPTIONS_DEBUG + ${OPTIONS_DEBUG} + ) + + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib) - else() + else() + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/spatialite.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/spatialite.lib) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib ${CURRENT_PACKAGES_DIR}/lib/spatialite.lib) - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib) - endif() - endif() - - message(STATUS "Packaging ${TARGET_TRIPLET} done") -elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX - # Check build system first - find_program(MAKE make) - if (NOT MAKE) - message(FATAL_ERROR "MAKE not found") + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib ${CURRENT_PACKAGES_DIR}/lib/spatialite.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib) endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - ################ - # Release build - ################ - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH_RELEASE - ARCHIVE ${ARCHIVE} - REF release - PATCHES - fix-sources.patch - fix-latin-literals.patch - fix-linux-configure.patch - ) - message(STATUS "Configuring ${TARGET_TRIPLET}-rel") - set(OUT_PATH_RELEASE ${SOURCE_PATH_RELEASE}/../../make-build-${TARGET_TRIPLET}-release) - file(REMOVE_RECURSE ${OUT_PATH_RELEASE}) - file(MAKE_DIRECTORY ${OUT_PATH_RELEASE}) - set(prefix ${CURRENT_INSTALLED_DIR}) - set(exec_prefix ${prefix}/bin) - set(includedir ${prefix}/include) - set(libdir ${prefix}/lib) - configure_file(${CMAKE_CURRENT_LIST_DIR}/geos-config.in - ${SOURCE_PATH_RELEASE}/geos-config @ONLY) - vcpkg_execute_required_process( - COMMAND chmod -R 777 ${SOURCE_PATH_RELEASE}/geos-config - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME config-${TARGET_TRIPLET}-rel - ) - vcpkg_execute_required_process( - COMMAND "${SOURCE_PATH_RELEASE}/configure" --prefix=${OUT_PATH_RELEASE} "CFLAGS=-I${includedir} ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" "LDFLAGS=-L${libdir}" "LIBS=-lpthread -ldl -lproj" "--with-geosconfig=${SOURCE_PATH_RELEASE}/geos-config" "LIBXML2_LIBS=-lxml2 -llzma" "LIBXML2_CFLAGS=${includedir}" - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME config-${TARGET_TRIPLET}-rel - ) - - message(STATUS "Building ${TARGET_TRIPLET}-rel") - vcpkg_execute_build_process( - COMMAND make -j ${VCPKG_CONCURRENCY} - NO_PARALLEL_COMMAND make - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME make-build-${TARGET_TRIPLET}-release - ) - - message(STATUS "Installing ${TARGET_TRIPLET}-rel") - vcpkg_execute_required_process( - COMMAND make install - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME make-install-${TARGET_TRIPLET}-release - ) - - set(VERSION ${LIBSPATIALITE_VERSION_STR}) - configure_file(${SOURCE_PATH_RELEASE}/spatialite.pc.in - ${OUT_PATH_RELEASE}/lib/pkgconfig/spatialite.pc @ONLY) - file(COPY ${OUT_PATH_RELEASE}/lib DESTINATION ${CURRENT_PACKAGES_DIR}) - file(COPY ${OUT_PATH_RELEASE}/include DESTINATION ${CURRENT_PACKAGES_DIR}) - file(INSTALL ${SOURCE_PATH_RELEASE}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libspatialite RENAME copyright) - message(STATUS "Installing ${TARGET_TRIPLET}-rel done") +elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX + if(VCPKG_TARGET_IS_LINUX) + set(STDLIB stdc++) + else() + set(STDLIB c++) endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - ################ - # Debug build - ################ - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH_DEBUG - ARCHIVE ${ARCHIVE} - REF debug - PATCHES - fix-sources.patch - fix-latin-literals.patch - fix-configure-debug.patch - fix-linux-configure.patch - ) - message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") - set(OUT_PATH_DEBUG ${SOURCE_PATH_DEBUG}/../../make-build-${TARGET_TRIPLET}-debug) - file(REMOVE_RECURSE ${OUT_PATH_DEBUG}) - file(MAKE_DIRECTORY ${OUT_PATH_DEBUG}) - set(prefix ${CURRENT_INSTALLED_DIR}) - set(exec_prefix ${prefix}/debug/bin) - set(includedir ${prefix}/include) - set(libdir ${prefix}/debug/lib) - configure_file(${CMAKE_CURRENT_LIST_DIR}/geos-config-debug.in - ${SOURCE_PATH_DEBUG}/geos-config @ONLY) - vcpkg_execute_required_process( - COMMAND chmod -R 777 ${SOURCE_PATH_DEBUG}/geos-config - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - LOGNAME config-${TARGET_TRIPLET}-debug - ) - vcpkg_execute_required_process( - COMMAND "${SOURCE_PATH_DEBUG}/configure" --prefix=${OUT_PATH_DEBUG} "CFLAGS=-I${includedir} ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" "LDFLAGS=-L${libdir}" "LIBS=-lpthread -ldl -lproj" "--with-geosconfig=${SOURCE_PATH_DEBUG}/geos-config" "LIBXML2_LIBS=-lxml2 -llzmad" "LIBXML2_CFLAGS=${includedir}" - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - LOGNAME config-${TARGET_TRIPLET}-debug - ) - - message(STATUS "Building ${TARGET_TRIPLET}-dbg") - vcpkg_execute_build_process( - COMMAND make -j ${VCPKG_CONCURRENCY} - NO_PARALLEL_COMMAND make - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - LOGNAME make-build-${TARGET_TRIPLET}-debug - ) - - message(STATUS "Installing ${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process( - COMMAND make -j install - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - LOGNAME make-install-${TARGET_TRIPLET}-debug - ) - - set(VERSION ${LIBSPATIALITE_VERSION_STR}) - configure_file(${SOURCE_PATH_DEBUG}/spatialite.pc.in - ${OUT_PATH_DEBUG}/lib/pkgconfig/spatialite.pc @ONLY) - file(COPY ${OUT_PATH_DEBUG}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug) - message(STATUS "Installing ${TARGET_TRIPLET}-dbg done") - endif() -else() # Other build system - message(FATAL_ERROR "Unsupport build system.") -endif() \ No newline at end of file + list(APPEND OPTIONS_RELEASE + "LIBXML2_LIBS=-lxml2 -llzma" + "GEOS_LDFLAGS=-lgeos_c -lgeos -l${STDLIB}" + ) + list(APPEND OPTIONS_DEBUG + "LIBXML2_LIBS=-lxml2 -llzmad" + "GEOS_LDFLAGS=-lgeos_cd -lgeosd -l${STDLIB}" + ) + + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + "CFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" + "LIBS=-lpthread -ldl -lm -l${STDLIB}" + "LIBXML2_CFLAGS=-I\"${CURRENT_INSTALLED_DIR}/include\"" + "--enable-rttopo" + "--enable-gcp" + "--enable-geocallbacks" + "--disable-examples" + "--disable-minizip" + OPTIONS_DEBUG + ${OPTIONS_DEBUG} + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + ) + + vcpkg_install_make() + vcpkg_fixup_pkgconfig() +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL index 99ab33c174b8c8..f2c8384a8e247d 100644 --- a/ports/spatialite-tools/CONTROL +++ b/ports/spatialite-tools/CONTROL @@ -1,6 +1,6 @@ Source: spatialite-tools Version: 4.3.0 -Port-Version: 6 +Port-Version: 7 Homepage: https://www.gaia-gis.it/fossil/spatialite-tools/index Description: Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries) Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat diff --git a/ports/spatialite-tools/portfile.cmake b/ports/spatialite-tools/portfile.cmake index 111dc0c4333f43..a9ef6ec3d26163 100644 --- a/ports/spatialite-tools/portfile.cmake +++ b/ports/spatialite-tools/portfile.cmake @@ -37,8 +37,8 @@ else() set(GEOS_LIBS_DBG "${LDIR}/debug/lib/geos_cd.lib ${LDIR}/debug/lib/geosd.lib") set(LIBXML2_LIBS_REL "${LDIR}/lib/libxml2.lib ${LDIR}/lib/lzma.lib ws2_32.lib") set(LIBXML2_LIBS_DBG "${LDIR}/debug/lib/libxml2.lib ${LDIR}/debug/lib/lzmad.lib ws2_32.lib") - set(SPATIALITE_LIBS_REL "${LDIR}/lib/spatialite.lib ${LDIR}/lib/freexl.lib") - set(SPATIALITE_LIBS_DBG "${LDIR}/debug/lib/spatialite.lib ${LDIR}/debug/lib/freexl.lib") + set(SPATIALITE_LIBS_REL "${LDIR}/lib/spatialite.lib ${LDIR}/lib/freexl.lib ${LDIR}/lib/librttopo.lib") + set(SPATIALITE_LIBS_DBG "${LDIR}/debug/lib/spatialite.lib ${LDIR}/debug/lib/freexl.lib ${LDIR}/debug/lib/librttopo.lib") set(ICONV_LIBS_REL "${LDIR}/lib/iconv.lib ${LDIR}/lib/charset.lib") set(ICONV_LIBS_DBG "${LDIR}/debug/lib/iconv.lib ${LDIR}/debug/lib/charset.lib ") set(EXPAT_LIBS_REL "${LDIR}/lib/libexpatMD.lib") From 26e782dddb82c1acd340de0019720acc731b855c Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Tue, 22 Dec 2020 00:01:18 +0700 Subject: [PATCH 0335/1694] [mingw] Use find_file to find compiler, fall back to unprefixed windres if the prefixed version doesn't exist (#15179) --- scripts/toolchains/mingw.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/toolchains/mingw.cmake b/scripts/toolchains/mingw.cmake index 55dc2034de82ca..630a49623d634f 100644 --- a/scripts/toolchains/mingw.cmake +++ b/scripts/toolchains/mingw.cmake @@ -21,9 +21,12 @@ foreach(lang C CXX) set(CMAKE_${lang}_COMPILER_TARGET "${CMAKE_SYSTEM_PROCESSOR}-windows-gnu" CACHE STRING "") endforeach() -set(CMAKE_C_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc.exe" CACHE STRING "") -set(CMAKE_CXX_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-g++.exe" CACHE STRING "") -set(CMAKE_RC_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-windres.exe" CACHE STRING "") +find_file(CMAKE_C_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc.exe") +find_file(CMAKE_CXX_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-g++.exe") +find_file(CMAKE_RC_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-windres.exe") +if(NOT CMAKE_RC_COMPILER) + find_file(CMAKE_RC_COMPILER "windres.exe") +endif() get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) From aef98ae58116e2c55011374054a3a0f170b7fb6a Mon Sep 17 00:00:00 2001 From: wangqr Date: Tue, 22 Dec 2020 01:11:41 +0800 Subject: [PATCH 0336/1694] [avisynthplus] Update to 3.6.1 (#15214) * [avisynthplus] Update to 3.6.1 * [avisynthplus] Do not limit system to Windows AVS+ supports linux and macOS. The OS limit was introduced in e7dc93f2026c171073bc30e3f8235c9caba419bc * Update vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/avisynthplus/portfile.cmake | 6 +++--- ports/avisynthplus/vcpkg.json | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ports/avisynthplus/portfile.cmake b/ports/avisynthplus/portfile.cmake index 467e8dd9174519..e60a12149f2da1 100644 --- a/ports/avisynthplus/portfile.cmake +++ b/ports/avisynthplus/portfile.cmake @@ -1,12 +1,12 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_LIBRARY_LINKAGE "static" ON_TARGET "UWP" "OSX" "Linux") +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_LIBRARY_LINKAGE "static" ON_TARGET "UWP") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AviSynth/AviSynthPlus - REF v3.6.0 - SHA512 040e9f2c99973eb96b0f1ba373627c3c43ff17ed8339ea850aebc2306228384175cb37c418a139f865c396c70c2d254cd8a40838f577f184a4c161b258328dd5 + REF v3.6.1 + SHA512 7104c334769aacf3b1c14491c2e0cdd6586d6ea68dae7d10e7955ac56c6277fe4ae189d30ebd161baeda80e65e80fc49d4b2aed476272dd1aa235e7c8f0209d9 HEAD_REF master ) diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json index b6796ad53c1384..d55ecf20ce10d3 100644 --- a/ports/avisynthplus/vcpkg.json +++ b/ports/avisynthplus/vcpkg.json @@ -1,8 +1,7 @@ { "name": "avisynthplus", - "version-string": "3.6.0", - "port-version": 1, + "version-string": "3.6.1", "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness", "homepage": "http://avs-plus.net/", - "supports": "windows & !arm & !uwp & !static" + "supports": "!arm & !uwp & !static" } From 7507c24a1c8e6d16aba9ce63e52c86280aac177c Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 21 Dec 2020 09:19:57 -0800 Subject: [PATCH 0337/1694] Print failing upload attempts in !debug. (#15206) Other changes: * Changed Strings::replace_all to use more StringView * Introduced Strings::inplace_replace_all for the common x = replace_all(move(x) pattern and tests -> Also fixed bug if the search string was empty consuming infinite memory! * Added many missing {}s in binarycaching.cpp --- toolsrc/include/vcpkg/base/strings.h | 6 +- toolsrc/include/vcpkg/base/stringview.h | 31 +-- toolsrc/src/vcpkg-test/strings.cpp | 41 +++ toolsrc/src/vcpkg/base/strings.cpp | 21 +- toolsrc/src/vcpkg/base/stringview.cpp | 10 +- toolsrc/src/vcpkg/binarycaching.cpp | 303 +++++++++++++++++++---- toolsrc/src/vcpkg/commands.integrate.cpp | 6 +- toolsrc/src/vcpkg/export.chocolatey.cpp | 30 ++- toolsrc/src/vcpkg/export.prefab.cpp | 34 +-- 9 files changed, 369 insertions(+), 113 deletions(-) diff --git a/toolsrc/include/vcpkg/base/strings.h b/toolsrc/include/vcpkg/base/strings.h index 5113ff2fc3bf4b..16b39001bda33c 100644 --- a/toolsrc/include/vcpkg/base/strings.h +++ b/toolsrc/include/vcpkg/base/strings.h @@ -188,7 +188,11 @@ namespace vcpkg::Strings return join(delimiter, v, [](const Element& x) -> const Element& { return x; }); } - std::string replace_all(std::string&& s, const std::string& search, StringView rep); + std::string replace_all(std::string&& s, StringView search, StringView rep); + + void inplace_replace_all(std::string& s, StringView search, StringView rep); + + void inplace_replace_all(std::string& s, char search, char rep) noexcept; std::string trim(std::string&& s); diff --git a/toolsrc/include/vcpkg/base/stringview.h b/toolsrc/include/vcpkg/base/stringview.h index 9238990fef737b..aba27f9d138010 100644 --- a/toolsrc/include/vcpkg/base/stringview.h +++ b/toolsrc/include/vcpkg/base/stringview.h @@ -14,43 +14,44 @@ namespace vcpkg { static std::vector find_all_enclosed(const StringView& input, const std::string& left_delim, - const std::string& right_delim); + const std::string& right_delim) noexcept; static StringView find_exactly_one_enclosed(const StringView& input, const std::string& left_tag, - const std::string& right_tag); + const std::string& right_tag) noexcept; static Optional find_at_most_one_enclosed(const StringView& input, const std::string& left_tag, - const std::string& right_tag); + const std::string& right_tag) noexcept; constexpr StringView() = default; - StringView(const std::string& s); // Implicit by design + StringView(const std::string& s) noexcept; // Implicit by design // NOTE: we do this instead of the delegating constructor since delegating ctors are a perf footgun template - constexpr StringView(const char (&arr)[Sz]) : m_ptr(arr), m_size(Sz - 1) + constexpr StringView(const char (&arr)[Sz]) noexcept : m_ptr(arr), m_size(Sz - 1) { } - constexpr StringView(const char* ptr, size_t size) : m_ptr(ptr), m_size(size) { } - constexpr StringView(const char* b, const char* e) : m_ptr(b), m_size(static_cast(e - b)) { } + constexpr StringView(const char* ptr, size_t size) noexcept : m_ptr(ptr), m_size(size) { } + constexpr StringView(const char* b, const char* e) noexcept : m_ptr(b), m_size(static_cast(e - b)) { } - constexpr const char* begin() const { return m_ptr; } - constexpr const char* end() const { return m_ptr + m_size; } + constexpr const char* begin() const noexcept { return m_ptr; } + constexpr const char* end() const noexcept { return m_ptr + m_size; } - std::reverse_iterator rbegin() const { return std::make_reverse_iterator(end()); } - std::reverse_iterator rend() const { return std::make_reverse_iterator(begin()); } + std::reverse_iterator rbegin() const noexcept { return std::make_reverse_iterator(end()); } + std::reverse_iterator rend() const noexcept { return std::make_reverse_iterator(begin()); } - constexpr const char* data() const { return m_ptr; } - constexpr size_t size() const { return m_size; } + constexpr const char* data() const noexcept { return m_ptr; } + constexpr size_t size() const noexcept { return m_size; } + constexpr bool empty() const noexcept { return m_size == 0; } std::string to_string() const; void to_string(std::string& out) const; - StringView substr(size_t pos, size_t count = std::numeric_limits::max()) const; + StringView substr(size_t pos, size_t count = std::numeric_limits::max()) const noexcept; - constexpr char byte_at_index(size_t pos) const { return m_ptr[pos]; } + constexpr char byte_at_index(size_t pos) const noexcept { return m_ptr[pos]; } private: const char* m_ptr = 0; diff --git a/toolsrc/src/vcpkg-test/strings.cpp b/toolsrc/src/vcpkg-test/strings.cpp index ecf0524bc73530..32fe5b3afac856 100644 --- a/toolsrc/src/vcpkg-test/strings.cpp +++ b/toolsrc/src/vcpkg-test/strings.cpp @@ -71,3 +71,44 @@ TEST_CASE ("edit distance", "[strings]") REQUIRE(byte_edit_distance("", "hello") == 5); REQUIRE(byte_edit_distance("world", "") == 5); } + +TEST_CASE ("replace_all", "[strings]") +{ + REQUIRE(vcpkg::Strings::replace_all("literal", "ter", "x") == "lixal"); +} + +TEST_CASE ("inplace_replace_all", "[strings]") +{ + using vcpkg::Strings::inplace_replace_all; + std::string target; + inplace_replace_all(target, "", "content"); + REQUIRE(target.empty()); + target = "aa"; + inplace_replace_all(target, "a", "content"); + REQUIRE(target == "contentcontent"); + inplace_replace_all(target, "content", ""); + REQUIRE(target.empty()); + target = "ababababa"; + inplace_replace_all(target, "aba", "X"); + REQUIRE(target == "XbXba"); + target = "ababababa"; + inplace_replace_all(target, "aba", "aba"); + REQUIRE(target == "ababababa"); +} + +TEST_CASE ("inplace_replace_all(char)", "[strings]") +{ + using vcpkg::Strings::inplace_replace_all; + static_assert(noexcept(inplace_replace_all(std::declval(), 'a', 'a'))); + + std::string target; + inplace_replace_all(target, ' ', '?'); + REQUIRE(target.empty()); + target = "hello"; + inplace_replace_all(target, 'l', 'w'); + REQUIRE(target == "hewwo"); + inplace_replace_all(target, 'w', 'w'); + REQUIRE(target == "hewwo"); + inplace_replace_all(target, 'x', '?'); + REQUIRE(target == "hewwo"); +} diff --git a/toolsrc/src/vcpkg/base/strings.cpp b/toolsrc/src/vcpkg/base/strings.cpp index a59cdaceb7cca0..d8377e39445382 100644 --- a/toolsrc/src/vcpkg/base/strings.cpp +++ b/toolsrc/src/vcpkg/base/strings.cpp @@ -126,15 +126,30 @@ bool Strings::starts_with(StringView s, StringView pattern) return std::equal(s.begin(), s.begin() + pattern.size(), pattern.begin(), pattern.end()); } -std::string Strings::replace_all(std::string&& s, const std::string& search, StringView rep) +std::string Strings::replace_all(std::string&& s, StringView search, StringView rep) { + inplace_replace_all(s, search, rep); + return std::move(s); +} + +void Strings::inplace_replace_all(std::string& s, StringView search, StringView rep) +{ + if (search.empty()) + { + return; + } + size_t pos = 0; - while ((pos = s.find(search, pos)) != std::string::npos) + while ((pos = s.find(search.data(), pos, search.size())) != std::string::npos) { s.replace(pos, search.size(), rep.data(), rep.size()); pos += rep.size(); } - return std::move(s); +} + +void Strings::inplace_replace_all(std::string& s, char search, char rep) noexcept +{ + std::replace(s.begin(), s.end(), search, rep); } std::string Strings::trim(std::string&& s) diff --git a/toolsrc/src/vcpkg/base/stringview.cpp b/toolsrc/src/vcpkg/base/stringview.cpp index 6e03ba543eabf8..3b980a1955f46c 100644 --- a/toolsrc/src/vcpkg/base/stringview.cpp +++ b/toolsrc/src/vcpkg/base/stringview.cpp @@ -8,7 +8,7 @@ namespace vcpkg { std::vector StringView::find_all_enclosed(const StringView& input, const std::string& left_delim, - const std::string& right_delim) + const std::string& right_delim) noexcept { auto it_left = input.begin(); auto it_right = input.begin(); @@ -35,7 +35,7 @@ namespace vcpkg StringView StringView::find_exactly_one_enclosed(const StringView& input, const std::string& left_tag, - const std::string& right_tag) + const std::string& right_tag) noexcept { std::vector result = find_all_enclosed(input, left_tag, right_tag); Checks::check_exit(VCPKG_LINE_INFO, @@ -50,7 +50,7 @@ namespace vcpkg Optional StringView::find_at_most_one_enclosed(const StringView& input, const std::string& left_tag, - const std::string& right_tag) + const std::string& right_tag) noexcept { std::vector result = find_all_enclosed(input, left_tag, right_tag); Checks::check_exit(VCPKG_LINE_INFO, @@ -69,12 +69,12 @@ namespace vcpkg return result.front(); } - StringView::StringView(const std::string& s) : m_ptr(s.data()), m_size(s.size()) { } + StringView::StringView(const std::string& s) noexcept : m_ptr(s.data()), m_size(s.size()) { } std::string StringView::to_string() const { return std::string(m_ptr, m_size); } void StringView::to_string(std::string& s) const { s.append(m_ptr, m_size); } - StringView StringView::substr(size_t pos, size_t count) const + StringView StringView::substr(size_t pos, size_t count) const noexcept { if (pos > m_size) { diff --git a/toolsrc/src/vcpkg/binarycaching.cpp b/toolsrc/src/vcpkg/binarycaching.cpp index c73e789d0a631b..cf4888e1be92ba 100644 --- a/toolsrc/src/vcpkg/binarycaching.cpp +++ b/toolsrc/src/vcpkg/binarycaching.cpp @@ -38,7 +38,10 @@ std::unordered_map vcpkg: { std::unordered_map checked; for (auto&& action : plan.install_actions) + { checked.emplace(&action, RestoreResult::missing); + } + provider.precheck(paths, checked); return checked; } @@ -107,10 +110,12 @@ namespace { ArchivesBinaryProvider(std::vector&& read_dirs, std::vector&& write_dirs, - std::vector&& put_url_templates) + std::vector&& put_url_templates, + std::vector&& secrets) : m_read_dirs(std::move(read_dirs)) , m_write_dirs(std::move(write_dirs)) , m_put_url_templates(std::move(put_url_templates)) + , m_secrets(std::move(secrets)) { } @@ -177,12 +182,21 @@ namespace if (code >= 200 && code < 300) { http_remotes_pushed++; + continue; } - else + + auto safe_url = url; + if (!Debug::g_debugging.load(std::memory_order_relaxed)) { - Debug::print("Failed to upload to ", url, ": ", code, '\n'); + for (const auto& secret : m_secrets) + { + Strings::inplace_replace_all(safe_url, secret, "*** SECRET ***"); + } } + + System::print2(System::Color::warning, "Failed to upload to ", safe_url, ": ", code, '\n'); } + if (!m_put_url_templates.empty()) { System::print2("Uploaded binaries to ", http_remotes_pushed, " HTTP remotes.\n"); @@ -197,9 +211,14 @@ namespace fs.create_directories(archive_path.parent_path(), ignore_errors); std::error_code ec; if (m_write_dirs.size() > 1) + { fs.copy_file(tmp_archive_path, archive_path, fs::copy_options::overwrite_existing, ec); + } else + { fs.rename_or_copy(tmp_archive_path, archive_path, ".tmp", ec); + } + if (ec) { System::printf(System::Color::warning, @@ -208,7 +227,9 @@ namespace ec.message()); } else + { System::printf("Stored binary cache: %s\n", fs::u8string(archive_path)); + } } // In the case of 1 write dir, the file will be moved instead of copied if (m_write_dirs.size() != 1) @@ -223,7 +244,10 @@ namespace for (auto&& result_pair : results_map) { - if (result_pair.second != RestoreResult::missing) continue; + if (result_pair.second != RestoreResult::missing) + { + continue; + } const auto& abi_tag = result_pair.first->abi_info.value_or_exit(VCPKG_LINE_INFO).package_abi; std::error_code ec; @@ -246,6 +270,7 @@ namespace std::vector m_read_dirs; std::vector m_write_dirs; std::vector m_put_url_templates; + std::vector m_secrets; std::set m_restored; }; @@ -266,7 +291,10 @@ namespace for (auto&& action : actions) { auto abi = action->package_abi(); - if (!abi) continue; + if (!abi) + { + continue; + } specs.push_back(action->spec); auto pkgdir = paths.package_dir(action->spec); @@ -311,9 +339,11 @@ namespace RestoreResult try_restore(const VcpkgPaths&, const Dependencies::InstallPlanAction& action) override { if (Util::Sets::contains(m_restored, action.spec)) + { return RestoreResult::success; - else - return RestoreResult::missing; + } + + return RestoreResult::missing; } void precheck(const VcpkgPaths&, std::unordered_map& results_map) override @@ -332,7 +362,12 @@ namespace urls.push_back(Strings::replace_all(std::string(url_template), "", *abi.get())); url_actions.push_back(result_pair.first); } - if (urls.empty()) break; + + if (urls.empty()) + { + break; + } + auto codes = Downloads::url_heads(urls); Checks::check_exit(VCPKG_LINE_INFO, codes.size() == url_actions.size()); for (size_t i = 0; i < codes.size(); ++i) @@ -360,6 +395,7 @@ namespace { v.erase(0, n); } + return v; } @@ -390,6 +426,7 @@ namespace { System::print2(res.output); } + if (res.output.find("Authentication may require manual action.") != std::string::npos) { System::print2(System::Color::warning, @@ -412,14 +449,19 @@ namespace { System::print2(res2.output); } + return res2.exit_code; } + return res.exit_code; } void prefetch(const VcpkgPaths& paths, std::vector& actions) override { - if (m_read_sources.empty() && m_read_configs.empty()) return; + if (m_read_sources.empty() && m_read_configs.empty()) + { + return; + } auto& fs = paths.get_filesystem(); @@ -427,7 +469,10 @@ namespace for (auto&& action : actions) { - if (!action->has_package_abi()) continue; + if (!action->has_package_abi()) + { + continue; + } auto& spec = action->spec; fs.remove_all(paths.package_dir(spec), VCPKG_LINE_INFO); @@ -435,7 +480,10 @@ namespace nuget_refs.emplace_back(spec, NugetReference(*action)); } - if (nuget_refs.empty()) return; + if (nuget_refs.empty()) + { + return; + } System::print2("Attempting to fetch ", nuget_refs.size(), " packages from nuget.\n"); @@ -447,11 +495,13 @@ namespace xml.open_tag("packages").line_break(); for (auto&& nuget_ref : nuget_refs) + { xml.start_complex_open_tag("package") .text_attr("id", nuget_ref.second.id) .text_attr("version", nuget_ref.second.version) .finish_self_closing_complex_tag() .line_break(); + } xml.close_tag("packages").line_break(); paths.get_filesystem().write_contents(packages_config, xml.buf, VCPKG_LINE_INFO); @@ -483,7 +533,11 @@ namespace .string_arg("-Verbosity") .string_arg("detailed") .string_arg("-ForceEnglishOutput"); - if (!m_interactive) cmdline.string_arg("-NonInteractive"); + if (!m_interactive) + { + cmdline.string_arg("-NonInteractive"); + } + cmdlines.push_back(cmdline.extract()); } for (auto&& cfg : m_read_configs) @@ -509,7 +563,11 @@ namespace .string_arg("-Verbosity") .string_arg("detailed") .string_arg("-ForceEnglishOutput"); - if (!m_interactive) cmdline.string_arg("-NonInteractive"); + if (!m_interactive) + { + cmdline.string_arg("-NonInteractive"); + } + cmdlines.push_back(cmdline.extract()); } @@ -517,7 +575,10 @@ namespace for (const auto& cmdline : cmdlines) { - if (nuget_refs.empty()) break; + if (nuget_refs.empty()) + { + break; + } [&] { generate_packages_config(); @@ -536,10 +597,8 @@ namespace m_restored.emplace(nuget_ref.first); return true; } - else - { - return false; - } + + return false; }); } @@ -554,13 +613,19 @@ namespace RestoreResult try_restore(const VcpkgPaths&, const Dependencies::InstallPlanAction& action) override { if (Util::Sets::contains(m_restored, action.spec)) + { return RestoreResult::success; - else - return RestoreResult::missing; + } + + return RestoreResult::missing; } void push_success(const VcpkgPaths& paths, const Dependencies::InstallPlanAction& action) override { - if (m_write_sources.empty() && m_write_configs.empty()) return; + if (m_write_sources.empty() && m_write_configs.empty()) + { + return; + } + auto& spec = action.spec; NugetReference nuget_ref(action); @@ -603,12 +668,15 @@ namespace .string_arg("-ForceEnglishOutput") .string_arg("-Source") .string_arg(write_src); - if (!m_interactive) cmd.string_arg("-NonInteractive"); + + if (!m_interactive) + { + cmd.string_arg("-NonInteractive"); + } System::print2("Uploading binaries for ", spec, " to NuGet source ", write_src, ".\n"); auto rc = run_nuget_commandline(cmd.extract()); - if (rc != 0) { System::print2(System::Color::error, @@ -629,7 +697,10 @@ namespace .string_arg("-ForceEnglishOutput") .string_arg("-ConfigFile") .path_arg(write_cfg); - if (!m_interactive) cmd.string_arg("-NonInteractive"); + if (!m_interactive) + { + cmd.string_arg("-NonInteractive"); + } System::print2( "Uploading binaries for ", spec, " using NuGet config ", fs::u8string(write_cfg), ".\n"); @@ -644,6 +715,7 @@ namespace " failed. Use --debug for more information.\n"); } } + paths.get_filesystem().remove(nupkg_path, ignore_errors); } } @@ -731,16 +803,25 @@ namespace path.make_preferred(); const auto status = fs::stdfs::status(path); if (!fs::stdfs::exists(status)) + { return {"Path to VCPKG_DEFAULT_BINARY_CACHE does not exist: " + fs::u8string(path), expected_right_tag}; + } + if (!fs::stdfs::is_directory(status)) + { return {"Value of environment variable VCPKG_DEFAULT_BINARY_CACHE is not a directory: " + fs::u8string(path), expected_right_tag}; + } + if (!path.is_absolute()) + { return {"Value of environment variable VCPKG_DEFAULT_BINARY_CACHE is not absolute: " + fs::u8string(path), expected_right_tag}; + } + return {std::move(path), expected_left_tag}; } p /= fs::u8path("vcpkg/archives"); @@ -774,6 +855,8 @@ namespace std::vector configs_to_read; std::vector configs_to_write; + std::vector secrets; + void clear() { m_cleared = true; @@ -786,6 +869,7 @@ namespace sources_to_write.clear(); configs_to_read.clear(); configs_to_write.clear(); + secrets.clear(); } }; @@ -814,37 +898,61 @@ namespace Strings::append(segment, n); auto ch = cur(); if (ch == Unicode::end_of_file || ch == ',' || ch == ';') + { break; - else if (ch == '`') + } + + if (ch == '`') { ch = next(); if (ch == Unicode::end_of_file) + { add_error("unexpected eof: trailing unescaped backticks (`) are not allowed"); + } else + { Unicode::utf8_append_code_point(segment, ch); + } + next(); } else + { Checks::unreachable(VCPKG_LINE_INFO); + } } segments.emplace_back(std::move(loc), std::move(segment)); auto ch = cur(); if (ch == Unicode::end_of_file || ch == ';') + { break; - else if (ch == ',') + } + + if (ch == ',') { next(); continue; } - else - Checks::unreachable(VCPKG_LINE_INFO); + + Checks::unreachable(VCPKG_LINE_INFO); + } + + if (segments.size() != 1 || !segments[0].second.empty()) + { + handle_segments(std::move(segments)); } - if (segments.size() != 1 || !segments[0].second.empty()) handle_segments(std::move(segments)); segments.clear(); - if (get_error()) return; - if (cur() == ';') next(); + if (get_error()) + { + return; + } + + if (cur() == ';') + { + next(); + } } } @@ -889,8 +997,11 @@ namespace if (segments[0].second == "clear") { if (segments.size() != 1) + { return add_error("unexpected arguments: binary config 'clear' does not take arguments", segments[1].first); + } + state->clear(); } else if (segments[0].second == "files") @@ -907,48 +1018,67 @@ namespace return add_error("expected arguments: path arguments for binary config strings must be absolute", segments[1].first); } + handle_readwrite(state->archives_to_read, state->archives_to_write, std::move(p), segments, 2); if (segments.size() > 3) + { return add_error("unexpected arguments: binary config 'files' requires 1 or 2 arguments", segments[3].first); + } } else if (segments[0].second == "interactive") { if (segments.size() > 1) + { return add_error("unexpected arguments: binary config 'interactive' does not accept any arguments", segments[1].first); + } + state->interactive = true; } else if (segments[0].second == "nugetconfig") { if (segments.size() < 2) + { return add_error( "expected arguments: binary config 'nugetconfig' requires at least a source argument", segments[0].first); + } auto p = fs::u8path(segments[1].second); if (!p.is_absolute()) + { return add_error("expected arguments: path arguments for binary config strings must be absolute", segments[1].first); + } + handle_readwrite(state->configs_to_read, state->configs_to_write, std::move(p), segments, 2); if (segments.size() > 3) + { return add_error("unexpected arguments: binary config 'nugetconfig' requires 1 or 2 arguments", segments[3].first); + } } else if (segments[0].second == "nuget") { if (segments.size() < 2) + { return add_error("expected arguments: binary config 'nuget' requires at least a source argument", segments[0].first); + } auto&& p = segments[1].second; if (p.empty()) + { return add_error("unexpected arguments: binary config 'nuget' requires non-empty source"); + } handle_readwrite(state->sources_to_read, state->sources_to_write, std::move(p), segments, 2); if (segments.size() > 3) + { return add_error("unexpected arguments: binary config 'nuget' requires 1 or 2 arguments", segments[3].first); + } } else if (segments[0].second == "default") { @@ -959,7 +1089,10 @@ namespace } const auto& maybe_home = default_cache_path(); - if (!maybe_home.has_value()) return add_error(maybe_home.error(), segments[0].first); + if (!maybe_home.has_value()) + { + return add_error(maybe_home.error(), segments[0].first); + } handle_readwrite( state->archives_to_read, state->archives_to_write, fs::path(*maybe_home.get()), segments, 1); @@ -973,30 +1106,43 @@ namespace "expected arguments: binary config 'azblob' requires at least a base-url and a SAS token", segments[0].first); } + if (!Strings::starts_with(segments[1].second, "https://")) { return add_error( "invalid argument: binary config 'azblob' requires an https base url as the first argument", segments[1].first); } + if (Strings::starts_with(segments[2].second, "?")) { return add_error("invalid argument: binary config 'azblob' requires a SAS token without a " "preceeding '?' as the second argument", segments[2].first); } - auto p = segments[1].second; - if (p.back() != '/') p.push_back('/'); - p.append(".zip"); - if (!Strings::starts_with(segments[2].second, "?")) p.push_back('?'); - p.append(segments[2].second); - handle_readwrite( - state->url_templates_to_get, state->azblob_templates_to_put, std::move(p), segments, 3); + if (segments.size() > 4) { return add_error("unexpected arguments: binary config 'azblob' requires 2 or 3 arguments", segments[4].first); } + + auto p = segments[1].second; + if (p.back() != '/') + { + p.push_back('/'); + } + + p.append(".zip"); + if (!Strings::starts_with(segments[2].second, "?")) + { + p.push_back('?'); + } + + p.append(segments[2].second); + state->secrets.push_back(segments[2].second); + handle_readwrite( + state->url_templates_to_get, state->azblob_templates_to_put, std::move(p), segments, 3); } else { @@ -1016,9 +1162,13 @@ ExpectedS> vcpkg::create_binary_provider_from_c { const auto& cachepath = default_cache_path(); if (cachepath.has_value()) + { Debug::print("Default binary cache path is: ", fs::u8string(*cachepath.get()), '\n'); + } else + { Debug::print("No binary cache path. Reason: ", cachepath.error(), '\n'); + } } return create_binary_provider_from_configs_pure(env_string, args); @@ -1029,39 +1179,63 @@ ExpectedS> vcpkg::create_binary_provider_from_c { { auto metrics = Metrics::g_metrics.lock(); - if (!env_string.empty()) metrics->track_property("VCPKG_BINARY_SOURCES", "defined"); - if (args.size() != 0) metrics->track_property("binarycaching-source", "defined"); + if (!env_string.empty()) + { + metrics->track_property("VCPKG_BINARY_SOURCES", "defined"); + } + + if (args.size() != 0) + { + metrics->track_property("binarycaching-source", "defined"); + } } State s; BinaryConfigParser default_parser("default,readwrite", "", &s); default_parser.parse(); - if (auto err = default_parser.get_error()) return err->get_message(); + if (auto err = default_parser.get_error()) + { + return err->get_message(); + } BinaryConfigParser env_parser(env_string, "VCPKG_BINARY_SOURCES", &s); env_parser.parse(); - if (auto err = env_parser.get_error()) return err->format(); + if (auto err = env_parser.get_error()) + { + return err->format(); + } + for (auto&& arg : args) { BinaryConfigParser arg_parser(arg, "", &s); arg_parser.parse(); - if (auto err = arg_parser.get_error()) return err->format(); + if (auto err = arg_parser.get_error()) + { + return err->format(); + } } - if (s.m_cleared) Metrics::g_metrics.lock()->track_property("binarycaching-clear", "defined"); + if (s.m_cleared) + { + Metrics::g_metrics.lock()->track_property("binarycaching-clear", "defined"); + } std::vector> providers; if (!s.archives_to_read.empty() || !s.archives_to_write.empty() || !s.azblob_templates_to_put.empty()) { - providers.push_back(std::make_unique( - std::move(s.archives_to_read), std::move(s.archives_to_write), std::move(s.azblob_templates_to_put))); + providers.push_back(std::make_unique(std::move(s.archives_to_read), + std::move(s.archives_to_write), + std::move(s.azblob_templates_to_put), + std::move(s.secrets))); } + if (!s.url_templates_to_get.empty()) { Metrics::g_metrics.lock()->track_property("binarycaching-url-get", "defined"); providers.push_back(std::make_unique(std::move(s.url_templates_to_get))); } + if (!s.sources_to_read.empty() || !s.sources_to_write.empty() || !s.configs_to_read.empty() || !s.configs_to_write.empty()) { @@ -1112,13 +1286,20 @@ details::NuGetRepoInfo details::get_nuget_repo_info_from_env() Metrics::g_metrics.lock()->track_property("VCPKG_NUGET_REPOSITORY", "defined"); return {std::move(*p)}; } + auto gh_repo = System::get_environment_variable("GITHUB_REPOSITORY").value_or(""); - if (gh_repo.empty()) return {}; + if (gh_repo.empty()) + { + return {}; + } + auto gh_server = System::get_environment_variable("GITHUB_SERVER_URL").value_or(""); - if (gh_server.empty()) return {}; + if (gh_server.empty()) + { + return {}; + } Metrics::g_metrics.lock()->track_property("GITHUB_REPOSITORY", "defined"); - return {Strings::concat(gh_server, '/', gh_repo, ".git"), System::get_environment_variable("GITHUB_REF").value_or(""), System::get_environment_variable("GITHUB_SHA").value_or("")}; @@ -1155,12 +1336,17 @@ std::string vcpkg::generate_nuspec(const VcpkgPaths& paths, { Strings::append(description, " ", dep.name(), '\n'); } + XmlSerializer xml; xml.open_tag("package").line_break(); xml.open_tag("metadata").line_break(); xml.simple_tag("id", ref.id).line_break(); xml.simple_tag("version", ref.version).line_break(); - if (!scf.core_paragraph->homepage.empty()) xml.simple_tag("projectUrl", scf.core_paragraph->homepage); + if (!scf.core_paragraph->homepage.empty()) + { + xml.simple_tag("projectUrl", scf.core_paragraph->homepage); + } + xml.simple_tag("authors", "vcpkg").line_break(); xml.simple_tag("description", description).line_break(); xml.open_tag("packageTypes"); @@ -1169,10 +1355,19 @@ std::string vcpkg::generate_nuspec(const VcpkgPaths& paths, if (!rinfo.repo.empty()) { xml.start_complex_open_tag("repository").text_attr("type", "git").text_attr("url", rinfo.repo); - if (!rinfo.branch.empty()) xml.text_attr("branch", rinfo.branch); - if (!rinfo.commit.empty()) xml.text_attr("commit", rinfo.commit); + if (!rinfo.branch.empty()) + { + xml.text_attr("branch", rinfo.branch); + } + + if (!rinfo.commit.empty()) + { + xml.text_attr("commit", rinfo.commit); + } + xml.finish_self_closing_complex_tag().line_break(); } + xml.close_tag("metadata").line_break(); xml.open_tag("files"); xml.start_complex_open_tag("file") @@ -1237,6 +1432,7 @@ void vcpkg::help_topic_binary_caching(const VcpkgPaths&) fs::u8string(*p), "\nThis consults %LOCALAPPDATA%/%APPDATA% on Windows and $XDG_CACHE_HOME or $HOME on other platforms.\n"); } + System::print2("\nExtended documentation is available at " "https://github.com/Microsoft/vcpkg/tree/master/docs/users/binarycaching.md \n"); } @@ -1256,6 +1452,7 @@ std::string vcpkg::generate_nuget_packages_config(const Dependencies::ActionPlan .finish_self_closing_complex_tag() .line_break(); } + xml.close_tag("packages").line_break(); return std::move(xml.buf); } diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp index ce15222558acc4..1b1dee6901cfa6 100644 --- a/toolsrc/src/vcpkg/commands.integrate.cpp +++ b/toolsrc/src/vcpkg/commands.integrate.cpp @@ -112,8 +112,8 @@ namespace vcpkg::Commands::Integrate )"; std::string content = Strings::replace_all(CONTENT_TEMPLATE, "@NUGET_ID@", nuget_id); - content = Strings::replace_all(std::move(content), "@VCPKG_DIR@", vcpkg_root_dir.string()); - content = Strings::replace_all(std::move(content), "@VERSION@", nupkg_version); + Strings::inplace_replace_all(content, "@VCPKG_DIR@", vcpkg_root_dir.string()); + Strings::inplace_replace_all(content, "@VERSION@", nupkg_version); return content; } #endif @@ -393,7 +393,7 @@ CMake projects should use: "-DCMAKE_TOOLCHAIN_FILE=%s" System::print2(System::Color::success, "Created nupkg: ", fs::u8string(nuget_package), '\n'); auto source_path = fs::u8string(buildsystems_dir); - source_path = Strings::replace_all(std::move(source_path), "`", "``"); + Strings::inplace_replace_all(source_path, "`", "``"); System::printf(R"( With a project open, go to Tools->NuGet Package Manager->Package Manager Console and paste: diff --git a/toolsrc/src/vcpkg/export.chocolatey.cpp b/toolsrc/src/vcpkg/export.chocolatey.cpp index 099bcf400e9b2d..b9f14a4d1e2a2f 100644 --- a/toolsrc/src/vcpkg/export.chocolatey.cpp +++ b/toolsrc/src/vcpkg/export.chocolatey.cpp @@ -27,7 +27,7 @@ namespace vcpkg::Export::Chocolatey Checks::exit_with_message(VCPKG_LINE_INFO, "Cannot find desired dependency version."); } std::string nuspec_dependency = Strings::replace_all(CONTENT_TEMPLATE, "@PACKAGE_ID@", depend); - nuspec_dependency = Strings::replace_all(std::move(nuspec_dependency), "@PACKAGE_VERSION@", found->second); + Strings::inplace_replace_all(nuspec_dependency, "@PACKAGE_VERSION@", found->second); nuspec_dependencies += nuspec_dependency; } return nuspec_dependencies; @@ -64,17 +64,15 @@ namespace vcpkg::Export::Chocolatey } std::string nuspec_file_content = Strings::replace_all(CONTENT_TEMPLATE, "@PACKAGE_ID@", binary_paragraph.spec.name()); - nuspec_file_content = - Strings::replace_all(std::move(nuspec_file_content), "@PACKAGE_VERSION@", package_version->second); - nuspec_file_content = Strings::replace_all( - std::move(nuspec_file_content), "@PACKAGE_MAINTAINER@", chocolatey_options.maybe_maintainer.value_or("")); - nuspec_file_content = Strings::replace_all( - std::move(nuspec_file_content), "@PACKAGE_DESCRIPTION@", Strings::join("\n", binary_paragraph.description)); - nuspec_file_content = - Strings::replace_all(std::move(nuspec_file_content), "@EXPORTED_ROOT_DIR@", exported_root_dir); - nuspec_file_content = Strings::replace_all(std::move(nuspec_file_content), - "@PACKAGE_DEPENDENCIES@", - create_nuspec_dependencies(binary_paragraph, packages_version)); + Strings::inplace_replace_all(nuspec_file_content, "@PACKAGE_VERSION@", package_version->second); + Strings::inplace_replace_all( + nuspec_file_content, "@PACKAGE_MAINTAINER@", chocolatey_options.maybe_maintainer.value_or("")); + Strings::inplace_replace_all( + nuspec_file_content, "@PACKAGE_DESCRIPTION@", Strings::join("\n", binary_paragraph.description)); + Strings::inplace_replace_all(nuspec_file_content, "@EXPORTED_ROOT_DIR@", exported_root_dir); + Strings::inplace_replace_all(nuspec_file_content, + "@PACKAGE_DEPENDENCIES@", + create_nuspec_dependencies(binary_paragraph, packages_version)); return nuspec_file_content; } @@ -179,10 +177,10 @@ if (Test-Path $installedDir) const BinaryParagraph& binary_paragraph = action.core_paragraph().value_or_exit(VCPKG_LINE_INFO); auto norm_version = binary_paragraph.version; - // normalize the version string to be separated by dots to be compliant with Nusepc. - norm_version = Strings::replace_all(std::move(norm_version), "-", "."); - norm_version = Strings::replace_all(std::move(norm_version), "_", "."); - norm_version = norm_version + chocolatey_options.maybe_version_suffix.value_or(""); + // normalize the version string to be separated by dots to be compliant with Nuspec. + Strings::inplace_replace_all(norm_version, '-', '.'); + Strings::inplace_replace_all(norm_version, '_', '.'); + norm_version += chocolatey_options.maybe_version_suffix.value_or(""); packages_version.insert(std::make_pair(binary_paragraph.spec.name(), norm_version)); } diff --git a/toolsrc/src/vcpkg/export.prefab.cpp b/toolsrc/src/vcpkg/export.prefab.cpp index ce4e0cf6a88b42..38d4568a8c4f71 100644 --- a/toolsrc/src/vcpkg/export.prefab.cpp +++ b/toolsrc/src/vcpkg/export.prefab.cpp @@ -103,9 +103,9 @@ namespace vcpkg::Export::Prefab "stl":"@STL@" })"; std::string json = Strings::replace_all(std::move(TEMPLATE), "@ABI@", abi); - json = Strings::replace_all(std::move(json), "@API@", std::to_string(api)); - json = Strings::replace_all(std::move(json), "@NDK@", std::to_string(ndk)); - json = Strings::replace_all(std::move(json), "@STL@", stl); + Strings::inplace_replace_all(json, "@API@", std::to_string(api)); + Strings::inplace_replace_all(json, "@NDK@", std::to_string(ndk)); + Strings::inplace_replace_all(json, "@STL@", stl); return json; } @@ -117,7 +117,7 @@ namespace vcpkg::Export::Prefab })"; std::string json = Strings::replace_all(std::move(TEMPLATE), "@LIBRARY_NAME@", null_if_empty(library_name)); - json = Strings::replace_all(std::move(json), "@LIBRARIES@", null_if_empty_array(jsonify(export_libraries))); + Strings::inplace_replace_all(json, "@LIBRARIES@", null_if_empty_array(jsonify(export_libraries))); return json; } @@ -130,8 +130,8 @@ namespace vcpkg::Export::Prefab })"; std::string json = Strings::replace_all(std::move(TEMPLATE), "@LIBRARY_NAME@", null_if_empty(library_name)); - json = Strings::replace_all(std::move(json), "@LIBRARIES@", jsonify(export_libraries)); - json = Strings::replace_all(std::move(json), "@ANDROID_METADATA@", android.to_json()); + Strings::inplace_replace_all(json, "@LIBRARIES@", jsonify(export_libraries)); + Strings::inplace_replace_all(json, "@ANDROID_METADATA@", android.to_json()); return json; } @@ -146,9 +146,9 @@ namespace vcpkg::Export::Prefab "version":"@PACKAGE_VERSION@" })"; std::string json = Strings::replace_all(std::move(TEMPLATE), "@PACKAGE_NAME@", name); - json = Strings::replace_all(std::move(json), "@PACKAGE_SCHEMA@", std::to_string(schema)); - json = Strings::replace_all(std::move(json), "@PACKAGE_DEPS@", deps); - json = Strings::replace_all(std::move(json), "@PACKAGE_VERSION@", version); + Strings::inplace_replace_all(json, "@PACKAGE_SCHEMA@", std::to_string(schema)); + Strings::inplace_replace_all(json, "@PACKAGE_DEPS@", deps); + Strings::inplace_replace_all(json, "@PACKAGE_VERSION@", version); return json; } @@ -426,9 +426,9 @@ namespace vcpkg::Export::Prefab )"; std::string manifest = Strings::replace_all(std::move(MANIFEST_TEMPLATE), "@GROUP_ID@", group_id); - manifest = Strings::replace_all(std::move(manifest), "@ARTIFACT_ID@", artifact_id); - manifest = Strings::replace_all(std::move(manifest), "@MIN_SDK_VERSION@", sdk_min_version); - manifest = Strings::replace_all(std::move(manifest), "@SDK_TARGET_VERSION@", sdk_target_version); + Strings::inplace_replace_all(manifest, "@ARTIFACT_ID@", artifact_id); + Strings::inplace_replace_all(manifest, "@MIN_SDK_VERSION@", sdk_min_version); + Strings::inplace_replace_all(manifest, "@SDK_TARGET_VERSION@", sdk_target_version); fs::path manifest_path = package_directory / "AndroidManifest.xml"; fs::path prefab_path = prefab_directory / "prefab.json"; @@ -484,8 +484,8 @@ namespace vcpkg::Export::Prefab runtime )"; std::string pom = Strings::replace_all(std::move(maven_pom), "@GROUP_ID@", group_id); - pom = Strings::replace_all(std::move(pom), "@ARTIFACT_ID@", it.name()); - pom = Strings::replace_all(std::move(pom), "@VERSION@", version_map[it.name()]); + Strings::inplace_replace_all(pom, "@ARTIFACT_ID@", it.name()); + Strings::inplace_replace_all(pom, "@VERSION@", version_map[it.name()]); pom_dependencies.push_back(pom); pm.dependencies.push_back(it.name()); } @@ -670,9 +670,9 @@ namespace vcpkg::Export::Prefab )"; std::string pom = Strings::replace_all(std::move(POM), "@GROUP_ID@", group_id); - pom = Strings::replace_all(std::move(pom), "@ARTIFACT_ID@", artifact_id); - pom = Strings::replace_all(std::move(pom), "@DEPENDENCIES@", Strings::join("\n", pom_dependencies)); - pom = Strings::replace_all(std::move(pom), "@VERSION@", norm_version); + Strings::inplace_replace_all(pom, "@ARTIFACT_ID@", artifact_id); + Strings::inplace_replace_all(pom, "@DEPENDENCIES@", Strings::join("\n", pom_dependencies)); + Strings::inplace_replace_all(pom, "@VERSION@", norm_version); utils.write_contents(pom_path, pom, VCPKG_LINE_INFO); From c6db6dcbee8f08b44b20cbcecd12e61f3a389c80 Mon Sep 17 00:00:00 2001 From: dweckmann Date: Mon, 21 Dec 2020 20:17:30 +0100 Subject: [PATCH 0338/1694] [qt5] Fix linux dynamic build (#15005) --- ports/qt5-base/CONTROL | 2 +- ports/qt5-base/cmake/install_qt.cmake | 27 ++++++++++++++++++++++- ports/qt5-base/portfile.cmake | 18 ++++++++++++---- scripts/cmake/vcpkg_build_qmake.cmake | 31 +++++++++++++++++++++++---- 4 files changed, 68 insertions(+), 10 deletions(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 34209500bf4408..cae36be5a92290 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,6 +1,6 @@ Source: qt5-base Version: 5.15.1 -Port-Version: 2 +Port-Version: 3 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, zstd, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) diff --git a/ports/qt5-base/cmake/install_qt.cmake b/ports/qt5-base/cmake/install_qt.cmake index 640a308de50d49..39781cebe01ee7 100644 --- a/ports/qt5-base/cmake/install_qt.cmake +++ b/ports/qt5-base/cmake/install_qt.cmake @@ -60,7 +60,23 @@ function(install_qt) foreach(_buildname ${BUILDTYPES}) set(_build_triplet ${TARGET_TRIPLET}-${_short_name_${_buildname}}) - vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/bin") + set(_installed_prefix_ "${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}") + set(_installed_libpath_ "${_installed_prefix_}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_installed_prefix_}/lib/manual-link/") + + vcpkg_add_to_path(PREPEND "${_installed_prefix_}/bin") + vcpkg_add_to_path(PREPEND "${_installed_prefix_}/lib") + + # We set LD_LIBRARY_PATH ENV variable to allow executing Qt tools (rcc,...) even with dynamic linking + if(CMAKE_HOST_UNIX) + if(DEFINED ENV{LD_LIBRARY_PATH}) + set(_ld_library_path_defined_ TRUE) + set(_ld_library_path_backup_ $ENV{LD_LIBRARY_PATH}) + set(ENV{LD_LIBRARY_PATH} "${_installed_libpath_}${VCPKG_HOST_PATH_SEPARATOR}${_ld_library_path_backup_}") + else() + set(_ld_library_path_defined_ FALSE) + set(ENV{LD_LIBRARY_PATH} "${_installed_libpath_}") + endif() + endif() if(VCPKG_TARGET_IS_OSX) # For some reason there will be an error on MacOSX without this clean! @@ -100,5 +116,14 @@ function(install_qt) ) message(STATUS "Package ${_build_triplet} done") set(ENV{PATH} "${_path}") + + # Restore backup + if(CMAKE_HOST_UNIX) + if(_ld_library_path_defined_) + set(ENV{LD_LIBRARY_PATH} "${_ld_library_path_backup_}") + else() + unset(ENV{LD_LIBRARY_PATH}) + endif() + endif() endforeach() endfunction() diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index a3e9d05ec294b8..73d3b836a3f260 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -120,10 +120,14 @@ find_library(LIBPNG_RELEASE NAMES png16 libpng16 PATHS "${CURRENT_INSTALLED_DIR} find_library(LIBPNG_DEBUG NAMES png16 png16d libpng16 libpng16d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(PSQL_RELEASE NAMES pq libpq PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) find_library(PSQL_DEBUG NAMES pq libpq pqd libpqd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(PSQL_COMMON_RELEASE NAMES pgcommon libpgcommon PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) -find_library(PSQL_COMMON_DEBUG NAMES pgcommon libpgcommon pgcommond libpgcommond PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(PSQL_PORT_RELEASE NAMES pgport libpgport PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) -find_library(PSQL_PORT_DEBUG NAMES pgport libpgport pgportd libpgportd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + +if(NOT (PSQL_RELEASE MATCHES ".*\.so") AND NOT (PSQL_DEBUG MATCHES ".*\.so")) + find_library(PSQL_COMMON_RELEASE NAMES pgcommon libpgcommon PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) + find_library(PSQL_COMMON_DEBUG NAMES pgcommon libpgcommon pgcommond libpgcommond PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(PSQL_PORT_RELEASE NAMES pgport libpgport PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) + find_library(PSQL_PORT_DEBUG NAMES pgport libpgport pgportd libpgportd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +endif() + find_library(PCRE2_RELEASE NAMES pcre2-16 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(PCRE2_DEBUG NAMES pcre2-16 pcre2-16d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(FREETYPE_RELEASE NAMES freetype PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) #zlib, bzip2, libpng @@ -169,6 +173,8 @@ find_library(EXPAT_RELEASE NAMES expat PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_D find_library(EXPAT_DEBUG NAMES expat PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) #Dependent libraries +find_library(ZSTD_RELEASE NAMES zstd zstd_static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ZSTD_DEBUG NAMES zstdd zstd_staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(BZ2_RELEASE bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(BZ2_DEBUG bz2 bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(SSL_RELEASE ssl ssleay32 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) @@ -197,6 +203,8 @@ set(RELEASE_OPTIONS "ICU_LIBS=${ICU_RELEASE}" "QMAKE_LIBS_PRIVATE+=${BZ2_RELEASE}" "QMAKE_LIBS_PRIVATE+=${LIBPNG_RELEASE}" + "QMAKE_LIBS_PRIVATE+=${ICU_RELEASE}" + "QMAKE_LIBS_PRIVATE+=${ZSTD_RELEASE}" ) set(DEBUG_OPTIONS "LIBJPEG_LIBS=${JPEG_DEBUG}" @@ -207,6 +215,8 @@ set(DEBUG_OPTIONS "ICU_LIBS=${ICU_DEBUG}" "QMAKE_LIBS_PRIVATE+=${BZ2_DEBUG}" "QMAKE_LIBS_PRIVATE+=${LIBPNG_DEBUG}" + "QMAKE_LIBS_PRIVATE+=${ICU_DEBUG}" + "QMAKE_LIBS_PRIVATE+=${ZSTD_DEBUG}" ) diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake index fd00f590f8b0a2..6b85234c838793 100644 --- a/scripts/cmake/vcpkg_build_qmake.cmake +++ b/scripts/cmake/vcpkg_build_qmake.cmake @@ -69,15 +69,38 @@ function(vcpkg_build_qmake) unset(_buildname) foreach(_buildname ${BUILDTYPES}) - set(_BUILD_PREFIX "${_path_suffix_${_buildname}}") - vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}${_BUILD_PREFIX}/bin") - vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}${_BUILD_PREFIX}/lib") + set(_installed_prefix_ "${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}") + set(_installed_libpath_ "${_installed_prefix_}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_installed_prefix_}/lib/manual-link/") + + vcpkg_add_to_path(PREPEND "${_installed_prefix_}/bin") + vcpkg_add_to_path(PREPEND "${_installed_prefix_}/lib") + + # We set LD_LIBRARY_PATH ENV variable to allow executing Qt tools (rcc,...) even with dynamic linking + if(CMAKE_HOST_UNIX) + if(DEFINED ENV{LD_LIBRARY_PATH}) + set(_ld_library_path_defined_ TRUE) + set(_ld_library_path_backup_ $ENV{LD_LIBRARY_PATH}) + set(ENV{LD_LIBRARY_PATH} "${_installed_libpath_}${VCPKG_HOST_PATH_SEPARATOR}${_ld_library_path_backup_}") + else() + set(_ld_library_path_defined_ FALSE) + set(ENV{LD_LIBRARY_PATH} "${_installed_libpath_}") + endif() + endif() + list(APPEND _csc_${_buildname}_TARGETS ${_csc_TARGETS}) if(NOT _csc_SKIP_MAKEFILES) run_jom(qmake_all makefiles ${_short_name_${_buildname}}) endif() run_jom("${_csc_${_buildname}_TARGETS}" ${_csc_BUILD_LOGNAME} ${_short_name_${_buildname}}) - unset(_BUILD_PREFIX) + + # Restore backup + if(CMAKE_HOST_UNIX) + if(_ld_library_path_defined_) + set(ENV{LD_LIBRARY_PATH} "${_ld_library_path_backup_}") + else() + unset(ENV{LD_LIBRARY_PATH}) + endif() + endif() endforeach() # Restore the original value of ENV{PATH} From b69f18a8b10f83541fe7d23e0d16ffcc077f3952 Mon Sep 17 00:00:00 2001 From: Matt Haynie Date: Mon, 21 Dec 2020 12:13:32 -0800 Subject: [PATCH 0339/1694] Write manifest "vcpkg install" output to stdout (#15187) --- scripts/buildsystems/vcpkg.cmake | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index d721bbafa36149..bc54afb709ec47 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -392,7 +392,12 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT _CMAKE_IN_TRY_COMPILE list(APPEND _VCPKG_ADDITIONAL_MANIFEST_PARAMS "--x-no-default-features") endif() - file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/vcpkg-manifest-install.log" _VCPKG_MANIFEST_INSTALL_LOG) + if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.18") + set(_VCPKG_MANIFEST_INSTALL_ECHO_PARAMS ECHO_OUTPUT_VARIABLE ECHO_ERROR_VARIABLE) + else() + set(_VCPKG_MANIFEST_INSTALL_ECHO_PARAMS) + endif() + execute_process( COMMAND "${_VCPKG_EXECUTABLE}" install --triplet "${VCPKG_TARGET_TRIPLET}" @@ -402,11 +407,15 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT _CMAKE_IN_TRY_COMPILE "--x-install-root=${_VCPKG_INSTALLED_DIR}" ${_VCPKG_ADDITIONAL_MANIFEST_PARAMS} ${VCPKG_INSTALL_OPTIONS} - OUTPUT_FILE "${_VCPKG_MANIFEST_INSTALL_LOG}" - ERROR_FILE "${_VCPKG_MANIFEST_INSTALL_LOG}" + OUTPUT_VARIABLE _VCPKG_MANIFEST_INSTALL_LOGTEXT + ERROR_VARIABLE _VCPKG_MANIFEST_INSTALL_LOGTEXT RESULT_VARIABLE _VCPKG_INSTALL_RESULT + ${_VCPKG_MANIFEST_INSTALL_ECHO_PARAMS} ) + file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/vcpkg-manifest-install.log" _VCPKG_MANIFEST_INSTALL_LOGFILE) + file(WRITE "${_VCPKG_MANIFEST_INSTALL_LOGFILE}" "${_VCPKG_MANIFEST_INSTALL_LOGTEXT}") + if (_VCPKG_INSTALL_RESULT EQUAL 0) message(STATUS "Running vcpkg install - done") @@ -415,7 +424,7 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT _CMAKE_IN_TRY_COMPILE "${_VCPKG_INSTALLED_DIR}/vcpkg/status") else() message(STATUS "Running vcpkg install - failed") - _vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${_VCPKG_MANIFEST_INSTALL_LOG}") + _vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${_VCPKG_MANIFEST_INSTALL_LOGFILE}") endif() endif() endif() From 23a76427edf367f256dde321eec14b1cc2b90b00 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Mon, 21 Dec 2020 15:40:21 -0800 Subject: [PATCH 0340/1694] [vcpkg registries] support versions (#15114) * [vcpkg registries] support versions This PR merges the Registries changes and the versioning changes, so that one can use both at the same time. There is one major difference between this PR and the RFC (#13590), which is that instead of version files looking like: ```json [ ... ] ``` version files look like: ``` { "versions": [ ... ] } ``` this is to support interop between this PR and existing demos and the like; fixing this, along with perhaps renaming `port_versions` to `port-versions` should be done after this is merged, should be a trivial change. --- .../end-to-end-tests-dir/create.ps1 | 4 +- .../integrate-install.ps1 | 14 +- .../end-to-end-tests-dir/registries.ps1 | 13 + .../end-to-end-tests-dir/spaces.ps1 | 4 +- .../end-to-end-tests-prelude.ps1 | 21 +- scripts/azure-pipelines/end-to-end-tests.ps1 | 2 +- .../vcpkg-uses-test-cmake/portfile.cmake | 0 .../vcpkg-uses-test-cmake/vcpkg.json | 0 .../portfile.cmake | 0 .../vcpkg.json | 0 scripts/e2e_ports/port_versions/baseline.json | 3 + .../v-/vcpkg-internal-e2e-test-port.json | 8 + .../portfile.cmake | 1 + .../vcpkg-internal-e2e-test-port/vcpkg.json | 4 + toolsrc/include/vcpkg/base/files.h | 6 + toolsrc/include/vcpkg/base/jsonreader.h | 2 +- toolsrc/include/vcpkg/configuration.h | 9 + .../include/vcpkg/configurationdeserializer.h | 66 -- toolsrc/include/vcpkg/fwd/registries.h | 3 +- toolsrc/include/vcpkg/portfileprovider.h | 13 +- toolsrc/include/vcpkg/registries.h | 46 +- toolsrc/include/vcpkg/sourceparagraph.h | 4 +- toolsrc/include/vcpkg/vcpkgcmdarguments.h | 2 + toolsrc/include/vcpkg/vcpkgpaths.h | 3 +- toolsrc/include/vcpkg/versiondeserializers.h | 15 - toolsrc/src/vcpkg-test/dependencies.cpp | 5 +- toolsrc/src/vcpkg-test/registries.cpp | 132 +++ toolsrc/src/vcpkg/base/files.cpp | 8 +- toolsrc/src/vcpkg/configuration.cpp | 91 +- toolsrc/src/vcpkg/install.cpp | 18 +- toolsrc/src/vcpkg/paragraphs.cpp | 28 +- toolsrc/src/vcpkg/portfileprovider.cpp | 340 +++--- toolsrc/src/vcpkg/registries.cpp | 968 ++++++++++++++---- toolsrc/src/vcpkg/vcpkgcmdarguments.cpp | 1 + toolsrc/src/vcpkg/vcpkgpaths.cpp | 18 +- toolsrc/src/vcpkg/versiondeserializers.cpp | 136 --- toolsrc/src/vcpkg/versions.cpp | 2 +- 37 files changed, 1231 insertions(+), 759 deletions(-) create mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 rename scripts/e2e_ports/{ => overlays}/vcpkg-uses-test-cmake/portfile.cmake (100%) rename scripts/e2e_ports/{ => overlays}/vcpkg-uses-test-cmake/vcpkg.json (100%) rename scripts/e2e_ports/{ => overlays}/vcpkg-uses-vcpkg-common-functions/portfile.cmake (100%) rename scripts/e2e_ports/{ => overlays}/vcpkg-uses-vcpkg-common-functions/vcpkg.json (100%) create mode 100644 scripts/e2e_ports/port_versions/baseline.json create mode 100644 scripts/e2e_ports/port_versions/v-/vcpkg-internal-e2e-test-port.json create mode 100644 scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake create mode 100644 scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json delete mode 100644 toolsrc/include/vcpkg/configurationdeserializer.h create mode 100644 toolsrc/src/vcpkg-test/registries.cpp diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/create.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/create.ps1 index 53686fe5095da5..9d59da5396e671 100644 --- a/scripts/azure-pipelines/end-to-end-tests-dir/create.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-dir/create.ps1 @@ -1,8 +1,8 @@ . $PSScriptRoot/../end-to-end-tests-prelude.ps1 # Test vcpkg create -$CurrentTest = "create zlib" -Write-Host $CurrentTest +$Script:CurrentTest = "create zlib" +Write-Host $Script:CurrentTest ./vcpkg --x-builtin-ports-root=$TestingRoot/ports create zlib https://github.com/madler/zlib/archive/v1.2.11.tar.gz zlib-1.2.11.tar.gz Throw-IfFailed diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1 index 38769775141764..38362ba8cb777d 100644 --- a/scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1 @@ -2,24 +2,24 @@ if (-not $IsLinux -and -not $IsMacOS) { . $PSScriptRoot/../end-to-end-tests-prelude.ps1 # Test msbuild props and targets - $CurrentTest = "zlib:x86-windows-static msbuild scripts\testing\integrate-install\..." - Write-Host $CurrentTest + $Script:CurrentTest = "zlib:x86-windows-static msbuild scripts\testing\integrate-install\..." + Write-Host $Script:CurrentTest ./vcpkg $commonArgs install zlib:x86-windows-static --x-binarysource=clear Throw-IfFailed foreach ($project in @("VcpkgTriplet", "VcpkgTriplet2", "VcpkgUseStatic", "VcpkgUseStatic2")) { - $CurrentTest = "msbuild scripts\testing\integrate-install\$project.vcxproj" + $Script:CurrentTest = "msbuild scripts\testing\integrate-install\$project.vcxproj" ./vcpkg $commonArgs env "msbuild scripts\testing\integrate-install\$project.vcxproj /p:VcpkgRoot=$TestingRoot /p:IntDir=$TestingRoot\int\ /p:OutDir=$TestingRoot\out\ " Throw-IfFailed Remove-Item -Recurse -Force $TestingRoot\int Remove-Item -Recurse -Force $TestingRoot\out } - $CurrentTest = "zlib:x86-windows msbuild scripts\testing\integrate-install\..." - Write-Host $CurrentTest + $Script:CurrentTest = "zlib:x86-windows msbuild scripts\testing\integrate-install\..." + Write-Host $Script:CurrentTest ./vcpkg $commonArgs install zlib:x86-windows --x-binarysource=clear Throw-IfFailed foreach ($project in @("Project1", "NoProps")) { - $CurrentTest = "msbuild scripts\testing\integrate-install\$project.vcxproj" - Write-Host $CurrentTest + $Script:CurrentTest = "msbuild scripts\testing\integrate-install\$project.vcxproj" + Write-Host $Script:CurrentTest ./vcpkg $commonArgs env "msbuild scripts\testing\integrate-install\$project.vcxproj /p:VcpkgRoot=$TestingRoot /p:IntDir=$TestingRoot\int\ /p:OutDir=$TestingRoot\out\ " Throw-IfFailed Remove-Item -Recurse -Force $TestingRoot\int diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 new file mode 100644 index 00000000000000..b985a61f56d841 --- /dev/null +++ b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 @@ -0,0 +1,13 @@ +. "$PSScriptRoot/../end-to-end-tests-prelude.ps1" + + +$commonArgs += @("--x-builtin-port-versions-dir=$PSScriptRoot/../../e2e_ports/port_versions") + +Run-Vcpkg install @commonArgs 'vcpkg-internal-e2e-test-port' +Throw-IfNotFailed + +Run-Vcpkg install @commonArgs --feature-flags=registries 'vcpkg-internal-e2e-test-port' +Throw-IfFailed + +Run-Vcpkg install @commonArgs --feature-flags=registries 'zlib' +Throw-IfFailed diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1 index 49796c1b063218..b7aaf6462c6e42 100644 --- a/scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1 @@ -1,8 +1,8 @@ . $PSScriptRoot/../end-to-end-tests-prelude.ps1 ##### Test spaces in the path -$CurrentTest = "zlib with spaces in path" -Write-Host $CurrentTest +$Script:CurrentTest = "zlib with spaces in path" +Write-Host $Script:CurrentTest ./vcpkg install zlib "--triplet" $Triplet ` "--no-binarycaching" ` "--x-buildtrees-root=$TestingRoot/build Trees" ` diff --git a/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 b/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 index 057df9fa66a8e5..0c675e9bf23506 100644 --- a/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 @@ -12,9 +12,9 @@ $commonArgs = @( "--x-buildtrees-root=$buildtreesRoot", "--x-install-root=$installRoot", "--x-packages-root=$packagesRoot", - "--overlay-ports=scripts/e2e_ports" + "--overlay-ports=scripts/e2e_ports/overlays" ) -$CurrentTest = 'unassigned' +$Script:CurrentTest = 'unassigned' function Refresh-TestRoot { Remove-Item -Recurse -Force $TestingRoot -ErrorAction SilentlyContinue @@ -28,7 +28,7 @@ function Require-FileExists { [string]$File ) if (-Not (Test-Path $File)) { - throw "'$CurrentTest' failed to create file '$File'" + throw "'$Script:CurrentTest' failed to create file '$File'" } } @@ -38,26 +38,29 @@ function Require-FileNotExists { [string]$File ) if (Test-Path $File) { - throw "'$CurrentTest' should not have created file '$File'" + throw "'$Script:CurrentTest' should not have created file '$File'" } } function Throw-IfFailed { if ($LASTEXITCODE -ne 0) { - throw "'$CurrentTest' had a step with a nonzero exit code" + throw "'$Script:CurrentTest' had a step with a nonzero exit code" } } function Throw-IfNotFailed { if ($LASTEXITCODE -eq 0) { - throw "'$CurrentTest' had a step with an unexpectedly zero exit code" + throw "'$Script:CurrentTest' had a step with an unexpectedly zero exit code" } } function Run-Vcpkg { - param([string[]]$TestArgs) - $CurrentTest = "./vcpkg $($testArgs -join ' ')" - Write-Host $CurrentTest + Param( + [Parameter(ValueFromRemainingArguments)] + [string[]]$TestArgs + ) + $Script:CurrentTest = "./vcpkg $($testArgs -join ' ')" + Write-Host $Script:CurrentTest ./vcpkg @testArgs } diff --git a/scripts/azure-pipelines/end-to-end-tests.ps1 b/scripts/azure-pipelines/end-to-end-tests.ps1 index f6b5c2e6bf9bbc..029120d5460e1d 100644 --- a/scripts/azure-pipelines/end-to-end-tests.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests.ps1 @@ -34,7 +34,7 @@ $ErrorActionPreference = "Stop" $AllTests = Get-ChildItem $PSScriptRoot/end-to-end-tests-dir/*.ps1 if ($Filter -ne $Null) { - $AllTests = $AllTests | ? { $_ -match $Filter } + $AllTests = $AllTests | ? { $_.Name -match $Filter } } $n = 1 $m = $AllTests.Count diff --git a/scripts/e2e_ports/vcpkg-uses-test-cmake/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake similarity index 100% rename from scripts/e2e_ports/vcpkg-uses-test-cmake/portfile.cmake rename to scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake diff --git a/scripts/e2e_ports/vcpkg-uses-test-cmake/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json similarity index 100% rename from scripts/e2e_ports/vcpkg-uses-test-cmake/vcpkg.json rename to scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json diff --git a/scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake similarity index 100% rename from scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/portfile.cmake rename to scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake diff --git a/scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json similarity index 100% rename from scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/vcpkg.json rename to scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json diff --git a/scripts/e2e_ports/port_versions/baseline.json b/scripts/e2e_ports/port_versions/baseline.json new file mode 100644 index 00000000000000..953e8752d5ae58 --- /dev/null +++ b/scripts/e2e_ports/port_versions/baseline.json @@ -0,0 +1,3 @@ +{ + "vcpkg-internal-e2e-test-port": { "version-string": "1.0.0" } +} diff --git a/scripts/e2e_ports/port_versions/v-/vcpkg-internal-e2e-test-port.json b/scripts/e2e_ports/port_versions/v-/vcpkg-internal-e2e-test-port.json new file mode 100644 index 00000000000000..ce7698ebb8d1d0 --- /dev/null +++ b/scripts/e2e_ports/port_versions/v-/vcpkg-internal-e2e-test-port.json @@ -0,0 +1,8 @@ +{ + "versions": [ + { + "version-string": "1.0.0", + "git-tree": "1dc3e42a3c0cafe2884d379af4399273238b986e" + } + ] +} diff --git a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake b/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake new file mode 100644 index 00000000000000..065116c276adcf --- /dev/null +++ b/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json b/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json new file mode 100644 index 00000000000000..a25da6d2369849 --- /dev/null +++ b/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "vcpkg-internal-e2e-test-port", + "version-string": "1.0.0" +} diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h index a6cc06c199c2f7..69ec41fe311d1f 100644 --- a/toolsrc/include/vcpkg/base/files.h +++ b/toolsrc/include/vcpkg/base/files.h @@ -239,6 +239,12 @@ namespace vcpkg::Files virtual void current_path(const fs::path& path, std::error_code&) = 0; void current_path(const fs::path& path, LineInfo li); + // if the path does not exist, then (try_|)take_exclusive_file_lock attempts to create the file + // (but not any path members above the file itself) + // in other words, if `/a/b` is a directory, and you're attempting to lock `/a/b/c`, + // then these lock functions create `/a/b/c` if it doesn't exist; + // however, if `/a/b` doesn't exist, then the functions will fail. + // waits forever for the file lock virtual fs::SystemHandle take_exclusive_file_lock(const fs::path& path, std::error_code&) = 0; // waits, at most, 1.5 seconds, for the file lock diff --git a/toolsrc/include/vcpkg/base/jsonreader.h b/toolsrc/include/vcpkg/base/jsonreader.h index bea60e7ce5b644..da086fa028cf9f 100644 --- a/toolsrc/include/vcpkg/base/jsonreader.h +++ b/toolsrc/include/vcpkg/base/jsonreader.h @@ -75,13 +75,13 @@ namespace vcpkg::Json }; std::vector m_path; + public: // checks that an object doesn't contain any fields which both: // * don't start with a `$` // * are not in `valid_fields` // if known_fields.empty(), then it's treated as if all field names are valid void check_for_unexpected_fields(const Object& obj, View valid_fields, StringView type_name); - public: template void required_object_field( StringView type, const Object& obj, StringView key, Type& place, IDeserializer& visitor) diff --git a/toolsrc/include/vcpkg/configuration.h b/toolsrc/include/vcpkg/configuration.h index 4cba88fe5e06e5..6d6a9b1f447a9e 100644 --- a/toolsrc/include/vcpkg/configuration.h +++ b/toolsrc/include/vcpkg/configuration.h @@ -1,6 +1,10 @@ #pragma once #include +#include + +#include +#include #include @@ -12,5 +16,10 @@ namespace vcpkg // `registries` and `default_registry`. The fall back logic is // taken care of in RegistrySet. RegistrySet registry_set; + + void validate_feature_flags(const FeatureFlagSettings& flags); }; + + std::unique_ptr> make_configuration_deserializer( + const fs::path& config_directory); } diff --git a/toolsrc/include/vcpkg/configurationdeserializer.h b/toolsrc/include/vcpkg/configurationdeserializer.h deleted file mode 100644 index d6b2393567a432..00000000000000 --- a/toolsrc/include/vcpkg/configurationdeserializer.h +++ /dev/null @@ -1,66 +0,0 @@ -#pragma once - -#include - -#include - -#include -#include -#include -#include -#include - -#include -#include - -namespace vcpkg -{ - struct RegistryImplDeserializer : Json::IDeserializer> - { - constexpr static StringLiteral KIND = "kind"; - constexpr static StringLiteral PATH = "path"; - - constexpr static StringLiteral KIND_BUILTIN = "builtin"; - constexpr static StringLiteral KIND_FILESYSTEM = "filesystem"; - - virtual StringView type_name() const override; - virtual View valid_fields() const override; - - virtual Optional> visit_null(Json::Reader&) override; - virtual Optional> visit_object(Json::Reader&, const Json::Object&) override; - - static RegistryImplDeserializer instance; - }; - - struct RegistryDeserializer final : Json::IDeserializer - { - constexpr static StringLiteral PACKAGES = "packages"; - - virtual StringView type_name() const override; - virtual View valid_fields() const override; - - virtual Optional visit_object(Json::Reader&, const Json::Object&) override; - }; - - struct ConfigurationDeserializer final : Json::IDeserializer - { - virtual StringView type_name() const override { return "a configuration object"; } - - constexpr static StringLiteral DEFAULT_REGISTRY = "default-registry"; - constexpr static StringLiteral REGISTRIES = "registries"; - virtual View valid_fields() const override - { - constexpr static StringView t[] = {DEFAULT_REGISTRY, REGISTRIES}; - return t; - } - - virtual Optional visit_object(Json::Reader& r, const Json::Object& obj) override; - - ConfigurationDeserializer(const VcpkgCmdArguments& args); - - private: - bool print_json; - - bool registries_enabled; - }; -} diff --git a/toolsrc/include/vcpkg/fwd/registries.h b/toolsrc/include/vcpkg/fwd/registries.h index 7352c429d175f4..73783cc6bb5bf4 100644 --- a/toolsrc/include/vcpkg/fwd/registries.h +++ b/toolsrc/include/vcpkg/fwd/registries.h @@ -2,7 +2,8 @@ namespace vcpkg { - struct RegistryImpl; + struct RegistryEntry; + struct RegistryImplementation; struct Registry; struct RegistrySet; } diff --git a/toolsrc/include/vcpkg/portfileprovider.h b/toolsrc/include/vcpkg/portfileprovider.h index b93c58e8c44613..fde28b0dfe4504 100644 --- a/toolsrc/include/vcpkg/portfileprovider.h +++ b/toolsrc/include/vcpkg/portfileprovider.h @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -41,21 +42,19 @@ namespace vcpkg::PortFileProvider struct IVersionedPortfileProvider { - virtual const std::vector& get_port_versions(StringView port_name) const = 0; + virtual View get_port_versions(StringView port_name) const = 0; virtual ~IVersionedPortfileProvider() = default; virtual ExpectedS get_control_file( - const vcpkg::Versions::VersionSpec& version_spec) const = 0; + const Versions::VersionSpec& version_spec) const = 0; }; struct IBaselineProvider { - virtual ~IBaselineProvider() = default; - virtual Optional get_baseline_version(StringView port_name) const = 0; + virtual ~IBaselineProvider() = default; }; - std::unique_ptr make_baseline_provider(const vcpkg::VcpkgPaths& paths); - std::unique_ptr make_baseline_provider(const vcpkg::VcpkgPaths& paths, StringView baseline); - std::unique_ptr make_versioned_portfile_provider(const vcpkg::VcpkgPaths& paths); + std::unique_ptr make_baseline_provider(const VcpkgPaths&); + std::unique_ptr make_versioned_portfile_provider(const VcpkgPaths&); } diff --git a/toolsrc/include/vcpkg/registries.h b/toolsrc/include/vcpkg/registries.h index 1f8c0f393b13a8..006bc789d17c97 100644 --- a/toolsrc/include/vcpkg/registries.h +++ b/toolsrc/include/vcpkg/registries.h @@ -1,8 +1,11 @@ #pragma once +#include +#include #include #include +#include #include #include @@ -17,40 +20,45 @@ namespace vcpkg { struct RegistryEntry { - // returns fs::path() if version doesn't exist - virtual fs::path get_port_directory(const VcpkgPaths& paths, const VersionT& version) const = 0; + virtual View get_port_versions() const = 0; + + virtual ExpectedS get_path_to_version(const VcpkgPaths& paths, const VersionT& version) const = 0; virtual ~RegistryEntry() = default; }; - struct RegistryImpl + struct RegistryImplementation { // returns nullptr if the port doesn't exist virtual std::unique_ptr get_port_entry(const VcpkgPaths& paths, StringView port_name) const = 0; + // appends the names of the ports to the out parameter + // may result in duplicated port names; make sure to Util::sort_unique_erase at the end virtual void get_all_port_names(std::vector& port_names, const VcpkgPaths& paths) const = 0; virtual Optional get_baseline_version(const VcpkgPaths& paths, StringView port_name) const = 0; - virtual ~RegistryImpl() = default; + virtual ~RegistryImplementation() = default; }; struct Registry { // requires: static_cast(implementation) - Registry(std::vector&& packages, std::unique_ptr&& implementation); + Registry(std::vector&& packages, std::unique_ptr&& implementation); Registry(std::vector&&, std::nullptr_t) = delete; // always ordered lexicographically View packages() const { return packages_; } - const RegistryImpl& implementation() const { return *implementation_; } + const RegistryImplementation& implementation() const { return *implementation_; } + + static std::unique_ptr builtin_registry(std::string&& baseline = {}); - static std::unique_ptr builtin_registry(); + friend RegistrySet; // for experimental_set_builtin_registry_baseline private: std::vector packages_; - std::unique_ptr implementation_; + std::unique_ptr implementation_; }; // this type implements the registry fall back logic from the registries RFC: @@ -65,20 +73,34 @@ namespace vcpkg // finds the correct registry for the port name // Returns the null pointer if there is no registry set up for that name - const RegistryImpl* registry_for_port(StringView port_name) const; + const RegistryImplementation* registry_for_port(StringView port_name) const; + Optional baseline_for_port(const VcpkgPaths& paths, StringView port_name) const; View registries() const { return registries_; } - const RegistryImpl* default_registry() const { return default_registry_.get(); } + const RegistryImplementation* default_registry() const { return default_registry_.get(); } // TODO: figure out how to get this to return an error (or maybe it should be a warning?) void add_registry(Registry&& r); - void set_default_registry(std::unique_ptr&& r); + void set_default_registry(std::unique_ptr&& r); void set_default_registry(std::nullptr_t r); + // this exists in order to allow versioning and registries to be developed and tested separately + void experimental_set_builtin_registry_baseline(StringView baseline) const; + + // returns whether the registry set has any modifications to the default + // (i.e., whether `default_registry` was set, or `registries` had any entries) + // for checking against the registry feature flag. + bool has_modifications() const; + private: - std::unique_ptr default_registry_; + std::unique_ptr default_registry_; std::vector registries_; }; + std::unique_ptr>> + get_registry_implementation_deserializer(const fs::path& configuration_directory); + + std::unique_ptr>> get_registry_array_deserializer( + const fs::path& configuration_directory); } diff --git a/toolsrc/include/vcpkg/sourceparagraph.h b/toolsrc/include/vcpkg/sourceparagraph.h index ee07826bba2842..50417b8adc4061 100644 --- a/toolsrc/include/vcpkg/sourceparagraph.h +++ b/toolsrc/include/vcpkg/sourceparagraph.h @@ -116,8 +116,8 @@ namespace vcpkg Json::Object serialize_debug_manifest(const SourceControlFile& scf); /// - /// Full metadata of a package: core and other features. As well as the location the SourceControlFile was - /// loaded from. + /// Full metadata of a package: core and other features, + /// as well as the port directory the SourceControlFile was loaded from /// struct SourceControlFileLocation { diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h index f18f4843cb82f0..2677e6811bcb8c 100644 --- a/toolsrc/include/vcpkg/vcpkgcmdarguments.h +++ b/toolsrc/include/vcpkg/vcpkgcmdarguments.h @@ -134,6 +134,8 @@ namespace vcpkg std::unique_ptr scripts_root_dir; constexpr static StringLiteral BUILTIN_PORTS_ROOT_DIR_ARG = "x-builtin-ports-root"; std::unique_ptr builtin_ports_root_dir; + constexpr static StringLiteral BUILTIN_PORT_VERSIONS_DIR_ARG = "x-builtin-port-versions-dir"; + std::unique_ptr builtin_port_versions_dir; constexpr static StringLiteral DEFAULT_VISUAL_STUDIO_PATH_ENV = "VCPKG_VISUAL_STUDIO_PATH"; std::unique_ptr default_visual_studio_path; diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index e71f28b0a6886b..1f562c151773f1 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -92,6 +92,7 @@ namespace vcpkg fs::path scripts; fs::path prefab; fs::path builtin_ports; + fs::path builtin_port_versions; fs::path tools; fs::path buildsystems; @@ -116,7 +117,7 @@ namespace vcpkg const fs::path& get_tool_exe(const std::string& tool) const; const std::string& get_tool_version(const std::string& tool) const; - // Git manipulation + // Git manipulation in the vcpkg directory fs::path git_checkout_baseline(Files::Filesystem& filesystem, StringView commit_sha) const; fs::path git_checkout_port(Files::Filesystem& filesystem, StringView port_name, StringView git_tree) const; ExpectedS git_show(const std::string& treeish, const fs::path& dot_git_dir) const; diff --git a/toolsrc/include/vcpkg/versiondeserializers.h b/toolsrc/include/vcpkg/versiondeserializers.h index 2efe340d7477f7..02696d39b9895e 100644 --- a/toolsrc/include/vcpkg/versiondeserializers.h +++ b/toolsrc/include/vcpkg/versiondeserializers.h @@ -10,13 +10,6 @@ namespace vcpkg { - struct VersionDbEntry - { - VersionT version; - Versions::Scheme scheme = Versions::Scheme::String; - std::string git_tree; - }; - Json::IDeserializer& get_versiont_deserializer_instance(); std::unique_ptr> make_version_deserializer(StringLiteral type_name); @@ -44,12 +37,4 @@ namespace vcpkg const std::string& version, int port_version, bool always_emit_port_version = false); - - ExpectedS>> parse_baseline_file(Files::Filesystem& fs, - StringView baseline_name, - const fs::path& baseline_file_path); - - ExpectedS> parse_versions_file(Files::Filesystem& fs, - StringView port_name, - const fs::path& versions_file_path); } diff --git a/toolsrc/src/vcpkg-test/dependencies.cpp b/toolsrc/src/vcpkg-test/dependencies.cpp index d1834b13dfa66c..07f9d0852c48f0 100644 --- a/toolsrc/src/vcpkg-test/dependencies.cpp +++ b/toolsrc/src/vcpkg-test/dependencies.cpp @@ -54,10 +54,7 @@ struct MockVersionedPortfileProvider : PortFileProvider::IVersionedPortfileProvi return it2->second; } - virtual const std::vector& get_port_versions(StringView) const override - { - Checks::unreachable(VCPKG_LINE_INFO); - } + virtual View get_port_versions(StringView) const override { Checks::unreachable(VCPKG_LINE_INFO); } SourceControlFileLocation& emplace(std::string&& name, Versions::Version&& version, diff --git a/toolsrc/src/vcpkg-test/registries.cpp b/toolsrc/src/vcpkg-test/registries.cpp new file mode 100644 index 00000000000000..1c839409d9353a --- /dev/null +++ b/toolsrc/src/vcpkg-test/registries.cpp @@ -0,0 +1,132 @@ +#include + +#include + +#include + +using namespace vcpkg; + +namespace +{ + struct TestRegistryImplementation final : RegistryImplementation + { + std::unique_ptr get_port_entry(const VcpkgPaths&, StringView) const override { return nullptr; } + + void get_all_port_names(std::vector&, const VcpkgPaths&) const override { } + + Optional get_baseline_version(const VcpkgPaths&, StringView) const override { return nullopt; } + + int number; + + TestRegistryImplementation(int n) : number(n) { } + }; + + Registry make_registry(int n, std::vector&& port_names) + { + return {std::move(port_names), std::make_unique(n)}; + } + + int get_tri_num(const RegistryImplementation& r) + { + if (auto tri = dynamic_cast(&r)) + { + return tri->number; + } + else + { + return -1; + } + } + + // test functions which parse string literals, so no concerns about failure + Json::Value parse_json(StringView sv) { return Json::parse(sv).value_or_exit(VCPKG_LINE_INFO).first; } +} + +TEST_CASE ("registry_set_selects_registry", "[registries]") +{ + RegistrySet set; + set.set_default_registry(std::make_unique(0)); + + set.add_registry(make_registry(1, {"p1", "q1", "r1"})); + set.add_registry(make_registry(2, {"p2", "q2", "r2"})); + + auto reg = set.registry_for_port("p1"); + REQUIRE(reg); + CHECK(get_tri_num(*reg) == 1); + reg = set.registry_for_port("r2"); + REQUIRE(reg); + CHECK(get_tri_num(*reg) == 2); + reg = set.registry_for_port("a"); + REQUIRE(reg); + CHECK(get_tri_num(*reg) == 0); + + set.set_default_registry(nullptr); + + reg = set.registry_for_port("q1"); + REQUIRE(reg); + CHECK(get_tri_num(*reg) == 1); + reg = set.registry_for_port("p2"); + REQUIRE(reg); + CHECK(get_tri_num(*reg) == 2); + reg = set.registry_for_port("a"); + CHECK_FALSE(reg); +} + +TEST_CASE ("registry_parsing", "[registries]") +{ + Json::Reader r; + auto registry_impl_des = get_registry_implementation_deserializer({}); + + auto test_json = parse_json(R"json( +{ + "kind": "builtin" +} + )json"); + auto registry_impl = r.visit(test_json, *registry_impl_des); + REQUIRE(registry_impl); + CHECK(*registry_impl.get()); + CHECK(r.errors().empty()); + + test_json = parse_json(R"json( +{ + "kind": "builtin", + "baseline": "hi" +} + )json"); + registry_impl = r.visit(test_json, *registry_impl_des); + REQUIRE(registry_impl); + CHECK(*registry_impl.get()); + CHECK(r.errors().empty()); + + test_json = parse_json(R"json( +{ + "kind": "builtin", + "path": "a/b" +} + )json"); + registry_impl = r.visit(test_json, *registry_impl_des); + CHECK_FALSE(r.errors().empty()); + r.errors().clear(); + + test_json = parse_json(R"json( +{ + "kind": "filesystem", + "path": "a/b/c" +} + )json"); + registry_impl = r.visit(test_json, *registry_impl_des); + REQUIRE(registry_impl); + CHECK(*registry_impl.get()); + CHECK(r.errors().empty()); + + test_json = parse_json(R"json( +{ + "kind": "filesystem", + "path": "/a/b/c" +} + )json"); + registry_impl = r.visit(test_json, *registry_impl_des); + REQUIRE(registry_impl); + CHECK(*registry_impl.get()); + CHECK(r.errors().empty()); +} diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp index b0717f2d6c2e0e..ce68741d5eeaed 100644 --- a/toolsrc/src/vcpkg/base/files.cpp +++ b/toolsrc/src/vcpkg/base/files.cpp @@ -1216,7 +1216,7 @@ namespace vcpkg::Files { } -#if defined(WIN32) +#if defined(_WIN32) void assign_busy_error(std::error_code& ec) { ec.assign(ERROR_BUSY, std::system_category()); } bool operator()(std::error_code& ec) @@ -1242,7 +1242,7 @@ namespace vcpkg::Files res.system_handle = reinterpret_cast(handle); return true; } -#else // ^^^ WIN32 / !WIN32 vvv +#else // ^^^ _WIN32 / !_WIN32 vvv int fd = -1; void assign_busy_error(std::error_code& ec) { ec.assign(EBUSY, std::generic_category()); } @@ -1252,7 +1252,7 @@ namespace vcpkg::Files ec.clear(); if (fd == -1) { - fd = ::open(native.c_str(), 0); + fd = ::open(native.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (fd < 0) { ec.assign(errno, std::generic_category()); @@ -1335,7 +1335,7 @@ namespace vcpkg::Files virtual void unlock_file_lock(fs::SystemHandle handle, std::error_code& ec) override { -#if defined(WIN32) +#if defined(_WIN32) if (CloseHandle(reinterpret_cast(handle.system_handle)) == 0) { ec.assign(GetLastError(), std::system_category()); diff --git a/toolsrc/src/vcpkg/configuration.cpp b/toolsrc/src/vcpkg/configuration.cpp index f062af51d37d20..3fa02876ffde8b 100644 --- a/toolsrc/src/vcpkg/configuration.cpp +++ b/toolsrc/src/vcpkg/configuration.cpp @@ -2,66 +2,83 @@ #include #include -#include #include -namespace vcpkg +namespace { - Optional ConfigurationDeserializer::visit_object(Json::Reader& r, const Json::Object& obj) - { - RegistrySet registries; + using namespace vcpkg; - bool registries_feature_flags_warning = false; + struct ConfigurationDeserializer final : Json::IDeserializer + { + virtual StringView type_name() const override { return "a configuration object"; } + constexpr static StringLiteral DEFAULT_REGISTRY = "default-registry"; + constexpr static StringLiteral REGISTRIES = "registries"; + virtual View valid_fields() const override { - std::unique_ptr default_registry; - if (r.optional_object_field(obj, DEFAULT_REGISTRY, default_registry, RegistryImplDeserializer::instance)) - { - if (!registries_enabled) - { - registries_feature_flags_warning = true; - } - else - { - registries.set_default_registry(std::move(default_registry)); - } - } + constexpr static StringView t[] = {DEFAULT_REGISTRY, REGISTRIES}; + return t; } - static Json::ArrayDeserializer array_of_registries{"an array of registries"}; + virtual Optional visit_object(Json::Reader& r, const Json::Object& obj) override; - std::vector regs; - r.optional_object_field(obj, REGISTRIES, regs, array_of_registries); + ConfigurationDeserializer(const fs::path& configuration_directory); + + private: + fs::path configuration_directory; + }; + + constexpr StringLiteral ConfigurationDeserializer::DEFAULT_REGISTRY; + constexpr StringLiteral ConfigurationDeserializer::REGISTRIES; - if (!regs.empty() && !registries_enabled) + Optional ConfigurationDeserializer::visit_object(Json::Reader& r, const Json::Object& obj) + { + RegistrySet registries; + + auto impl_des = get_registry_implementation_deserializer(configuration_directory); + + std::unique_ptr default_registry; + if (r.optional_object_field(obj, DEFAULT_REGISTRY, default_registry, *impl_des)) { - registries_feature_flags_warning = true; - regs.clear(); + registries.set_default_registry(std::move(default_registry)); } + auto reg_des = get_registry_array_deserializer(configuration_directory); + std::vector regs; + r.optional_object_field(obj, REGISTRIES, regs, *reg_des); + for (Registry& reg : regs) { registries.add_registry(std::move(reg)); } - if (registries_feature_flags_warning && !print_json) + return Configuration{std::move(registries)}; + } + + ConfigurationDeserializer::ConfigurationDeserializer(const fs::path& configuration_directory) + : configuration_directory(configuration_directory) + { + } + +} + +std::unique_ptr> vcpkg::make_configuration_deserializer( + const fs::path& config_directory) +{ + return std::make_unique(config_directory); +} + +namespace vcpkg +{ + void Configuration::validate_feature_flags(const FeatureFlagSettings& flags) + { + if (!flags.registries && registry_set.has_modifications()) { System::printf(System::Color::warning, "Warning: configuration specified the \"registries\" or \"default-registries\" field, but " "the %s feature flag was not enabled.\n", VcpkgCmdArguments::REGISTRIES_FEATURE); + registry_set = RegistrySet(); } - - return Configuration{std::move(registries)}; - } - - constexpr StringLiteral ConfigurationDeserializer::DEFAULT_REGISTRY; - constexpr StringLiteral ConfigurationDeserializer::REGISTRIES; - - ConfigurationDeserializer::ConfigurationDeserializer(const VcpkgCmdArguments& args) - { - registries_enabled = args.registries_enabled(); - print_json = args.output_json(); } - } diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index a07fb431c32475..50f07c7326918e 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -16,6 +17,7 @@ #include #include #include +#include namespace vcpkg::Install { @@ -841,16 +843,12 @@ namespace vcpkg::Install if (args.versions_enabled()) { auto verprovider = PortFileProvider::make_versioned_portfile_provider(paths); - auto baseprovider = [&]() -> std::unique_ptr { - if (auto p_baseline = manifest_scf.core_paragraph->extra_info.get("$x-default-baseline")) - { - return PortFileProvider::make_baseline_provider(paths, p_baseline->string().to_string()); - } - else - { - return PortFileProvider::make_baseline_provider(paths); - } - }(); + auto baseprovider = PortFileProvider::make_baseline_provider(paths); + if (auto p_baseline = manifest_scf.core_paragraph->extra_info.get("$x-default-baseline")) + { + paths.get_configuration().registry_set.experimental_set_builtin_registry_baseline( + p_baseline->string()); + } auto install_plan = Dependencies::create_versioned_install_plan(*verprovider, diff --git a/toolsrc/src/vcpkg/paragraphs.cpp b/toolsrc/src/vcpkg/paragraphs.cpp index 421f28b002df17..32103c76b9e6f6 100644 --- a/toolsrc/src/vcpkg/paragraphs.cpp +++ b/toolsrc/src/vcpkg/paragraphs.cpp @@ -357,14 +357,23 @@ namespace vcpkg::Paragraphs return res; } - ExpectedS> pghs = get_paragraphs(fs, path_to_control); - if (auto vector_pghs = pghs.get()) + + if (fs.exists(path_to_control)) { - return SourceControlFile::parse_control_file(fs::u8string(path_to_control), std::move(*vector_pghs)); + ExpectedS> pghs = get_paragraphs(fs, path_to_control); + if (auto vector_pghs = pghs.get()) + { + return SourceControlFile::parse_control_file(fs::u8string(path_to_control), std::move(*vector_pghs)); + } + auto error_info = std::make_unique(); + error_info->name = fs::u8string(path.filename()); + error_info->error = pghs.error(); + return error_info; } + auto error_info = std::make_unique(); error_info->name = fs::u8string(path.filename()); - error_info->error = pghs.error(); + error_info->error = "Failed to find either a CONTROL file or vcpkg.json file."; return error_info; } @@ -423,15 +432,8 @@ namespace vcpkg::Paragraphs auto baseline_version = impl->get_baseline_version(paths, port_name); if (port_entry && baseline_version) { - auto port_path = port_entry->get_port_directory(paths, *baseline_version.get()); - if (port_path.empty()) - { - Debug::print("Registry for port `", - port_name, - "` is incorrect - baseline port version `", - baseline_version.get()->to_string(), - "` not found."); - } + auto port_path = + port_entry->get_path_to_version(paths, *baseline_version.get()).value_or_exit(VCPKG_LINE_INFO); auto maybe_spgh = try_load_port(fs, port_path); if (const auto spgh = maybe_spgh.get()) { diff --git a/toolsrc/src/vcpkg/portfileprovider.cpp b/toolsrc/src/vcpkg/portfileprovider.cpp index edc527c2402905..c956dfe9b06506 100644 --- a/toolsrc/src/vcpkg/portfileprovider.cpp +++ b/toolsrc/src/vcpkg/portfileprovider.cpp @@ -17,29 +17,25 @@ using namespace Versions; namespace { - ExpectedS get_versions_json_path(const VcpkgPaths& paths, StringView port_name) - { - auto json_path = paths.root / fs::u8path("port_versions") / - fs::u8path(Strings::concat(port_name.substr(0, 1), "-")) / - fs::u8path(Strings::concat(port_name, ".json")); - if (paths.get_filesystem().exists(json_path)) - { - return std::move(json_path); - } - return {Strings::concat("Error: Versions database file does not exist: ", fs::u8string(json_path)), - expected_right_tag}; - } + using namespace vcpkg; - ExpectedS get_baseline_json_path(const VcpkgPaths& paths, StringView baseline_commit_sha) + struct OverlayRegistryEntry final : RegistryEntry { - auto baseline_path = paths.git_checkout_baseline(paths.get_filesystem(), baseline_commit_sha); - if (paths.get_filesystem().exists(baseline_path)) + OverlayRegistryEntry(fs::path&& p, VersionT&& v) : path(p), version(v) { } + + View get_port_versions() const override { return {&version, 1}; } + ExpectedS get_path_to_version(const VcpkgPaths&, const VersionT& v) const override { - return std::move(baseline_path); + if (v == version) + { + return path; + } + return Strings::format("Version %s not found; only %s is available.", v.to_string(), version.to_string()); } - return {Strings::concat("Error: Baseline database file does not exist: ", fs::u8string(baseline_path)), - expected_right_tag}; - } + + fs::path path; + VersionT version; + }; } namespace vcpkg::PortFileProvider @@ -95,9 +91,9 @@ namespace vcpkg::PortFileProvider } } - static Optional try_load_overlay_port(const Files::Filesystem& fs, - View overlay_ports, - const std::string& spec) + static std::unique_ptr try_load_overlay_port(const Files::Filesystem& fs, + View overlay_ports, + const std::string& spec) { for (auto&& ports_dir : overlay_ports) { @@ -105,11 +101,12 @@ namespace vcpkg::PortFileProvider if (Paragraphs::is_port_directory(fs, ports_dir)) { auto maybe_scf = Paragraphs::try_load_port(fs, ports_dir); - if (auto scf = maybe_scf.get()) + if (auto scfp = maybe_scf.get()) { - if (scf->get()->core_paragraph->name == spec) + auto& scf = *scfp; + if (scf->core_paragraph->name == spec) { - return SourceControlFileLocation{std::move(*scf), ports_dir}; + return std::make_unique(fs::path(ports_dir), scf->to_versiont()); } } else @@ -126,17 +123,18 @@ namespace vcpkg::PortFileProvider if (Paragraphs::is_port_directory(fs, ports_spec)) { auto found_scf = Paragraphs::try_load_port(fs, ports_spec); - if (auto scf = found_scf.get()) + if (auto scfp = found_scf.get()) { - if (scf->get()->core_paragraph->name == spec) + auto& scf = *scfp; + if (scf->core_paragraph->name == spec) { - return SourceControlFileLocation{std::move(*scf), std::move(ports_spec)}; + return std::make_unique(std::move(ports_spec), scf->to_versiont()); } Checks::exit_with_message(VCPKG_LINE_INFO, "Error: Failed to load port from %s: names did not match: '%s' != '%s'", fs::u8string(ports_spec), spec, - scf->get()->core_paragraph->name); + scf->core_paragraph->name); } else { @@ -146,61 +144,38 @@ namespace vcpkg::PortFileProvider } } } - return nullopt; + return nullptr; } - static Optional try_load_registry_port(const VcpkgPaths& paths, const std::string& spec) + static std::pair, Optional> try_load_registry_port_and_baseline( + const VcpkgPaths& paths, const std::string& spec) { - const auto& fs = paths.get_filesystem(); if (auto registry = paths.get_configuration().registry_set.registry_for_port(spec)) { - auto baseline_version = registry->get_baseline_version(paths, spec); auto entry = registry->get_port_entry(paths, spec); - if (entry && baseline_version) + auto maybe_baseline = registry->get_baseline_version(paths, spec); + if (entry) { - auto port_directory = entry->get_port_directory(paths, *baseline_version.get()); - if (port_directory.empty()) + if (!maybe_baseline) { - Checks::exit_with_message(VCPKG_LINE_INFO, - "Error: registry is incorrect. Baseline version for port `%s` is `%s`, " - "but that version is not in the registry.\n", - spec, - baseline_version.get()->to_string()); - } - auto found_scf = Paragraphs::try_load_port(fs, port_directory); - if (auto scf = found_scf.get()) - { - if (scf->get()->core_paragraph->name == spec) + if (entry->get_port_versions().size() == 1) { - return SourceControlFileLocation{std::move(*scf), std::move(port_directory)}; + maybe_baseline = entry->get_port_versions()[0]; } - Checks::exit_with_message(VCPKG_LINE_INFO, - "Error: Failed to load port from %s: names did not match: '%s' != '%s'", - fs::u8string(port_directory), - spec, - scf->get()->core_paragraph->name); - } - else - { - print_error_message(found_scf.error()); - Checks::exit_with_message( - VCPKG_LINE_INFO, "Error: Failed to load port %s from %s", spec, fs::u8string(port_directory)); } + return {std::move(entry), std::move(maybe_baseline)}; } else { - Debug::print("Failed to find port `", - spec, - "` in registry:", - entry ? " entry found;" : " no entry found;", - baseline_version ? " baseline version found\n" : " no baseline version found\n"); + Debug::print("Failed to find port `", spec, "` in registry: no entry found.\n"); } } else { Debug::print("Failed to find registry for port: `", spec, "`.\n"); } - return nullopt; + + return {nullptr, nullopt}; } ExpectedS PathsPortFileProvider::get_control_file(const std::string& spec) const @@ -209,18 +184,49 @@ namespace vcpkg::PortFileProvider if (cache_it == cache.end()) { const auto& fs = paths.get_filesystem(); - auto maybe_port = try_load_overlay_port(fs, overlay_ports, spec); - if (!maybe_port) + + std::unique_ptr port; + VersionT port_version; + + auto maybe_overlay_port = try_load_overlay_port(fs, overlay_ports, spec); + if (maybe_overlay_port) + { + port_version = maybe_overlay_port->version; + port = std::move(maybe_overlay_port); + } + else { - maybe_port = try_load_registry_port(paths, spec); + auto maybe_registry_port = try_load_registry_port_and_baseline(paths, spec); + port = std::move(maybe_registry_port.first); + if (auto version = maybe_registry_port.second.get()) + { + port_version = std::move(*version); + } + else if (port) + { + return std::string("No baseline version available."); + } } - if (auto p = maybe_port.get()) + + if (port) { - auto maybe_error = - p->source_control_file->check_against_feature_flags(p->source_location, paths.get_feature_flags()); - if (maybe_error) return std::move(*maybe_error.get()); + auto port_path = port->get_path_to_version(paths, port_version).value_or_exit(VCPKG_LINE_INFO); + auto maybe_scfl = Paragraphs::try_load_port(fs, port_path); + if (auto p = maybe_scfl.get()) + { + auto maybe_error = (*p)->check_against_feature_flags(port_path, paths.get_feature_flags()); + if (maybe_error) return std::move(*maybe_error.get()); - cache_it = cache.emplace(spec, std::move(*p)).first; + cache_it = + cache.emplace(spec, SourceControlFileLocation{std::move(*p), std::move(port_path)}).first; + } + else + { + return Strings::format("Error: when loading port `%s` from directory `%s`:\n%s\n", + spec, + fs::u8string(port_path), + maybe_scfl.error()->error); + } } } @@ -296,179 +302,86 @@ namespace vcpkg::PortFileProvider { struct BaselineProviderImpl : IBaselineProvider, Util::ResourceBase { - BaselineProviderImpl(const VcpkgPaths& paths) : paths(paths) { } - BaselineProviderImpl(const VcpkgPaths& paths, StringView baseline) - : paths(paths), m_baseline(baseline.to_string()) - { - } - - const Optional>>& get_baseline_cache() const - { - return baseline_cache.get_lazy([&]() -> Optional>> { - if (auto baseline = m_baseline.get()) - { - auto baseline_file = get_baseline_json_path(paths, *baseline).value_or_exit(VCPKG_LINE_INFO); - - auto maybe_baselines_map = - parse_baseline_file(paths.get_filesystem(), "default", baseline_file); - Checks::check_exit(VCPKG_LINE_INFO, - maybe_baselines_map.has_value(), - "Error: Couldn't parse baseline `%s` from `%s`", - "default", - fs::u8string(baseline_file)); - auto baselines_map = *maybe_baselines_map.get(); - return std::move(baselines_map); - } - else - { - // No baseline was provided, so use current repo - const auto& fs = paths.get_filesystem(); - auto baseline_file = paths.root / fs::u8path("port_versions") / fs::u8path("baseline.json"); - if (fs.exists(baseline_file)) - { - auto maybe_baselines_map = - parse_baseline_file(paths.get_filesystem(), "default", baseline_file); - Checks::check_exit(VCPKG_LINE_INFO, - maybe_baselines_map.has_value(), - "Error: Couldn't parse baseline `%s` from `%s`", - "default", - fs::u8string(baseline_file)); - auto baselines_map = *maybe_baselines_map.get(); - return std::move(baselines_map); - } - else - { - // No baseline file in current repo -- use current port versions. - m_portfile_provider = - std::make_unique(paths, std::vector{}); - return nullopt; - } - } - }); - } + BaselineProviderImpl(const VcpkgPaths& paths_) : paths(paths_) { } virtual Optional get_baseline_version(StringView port_name) const override { - const auto& cache = get_baseline_cache(); - if (auto p_cache = cache.get()) + auto it = m_baseline_cache.find(port_name); + if (it != m_baseline_cache.end()) { - auto it = p_cache->find(port_name.to_string()); - if (it != p_cache->end()) - { - return it->second; - } - return nullopt; + return it->second; } else { - auto maybe_scfl = m_portfile_provider->get_control_file(port_name.to_string()); - if (auto p_scfl = maybe_scfl.get()) - { - auto cpgh = p_scfl->source_control_file->core_paragraph.get(); - return VersionT{cpgh->version, cpgh->port_version}; - } - else - { - return nullopt; - } + auto version = paths.get_configuration().registry_set.baseline_for_port(paths, port_name); + m_baseline_cache.emplace(port_name.to_string(), version); + return version; } } private: - const VcpkgPaths& paths; - const Optional m_baseline; - Lazy>>> baseline_cache; - mutable std::unique_ptr m_portfile_provider; + const VcpkgPaths& paths; // TODO: remove this data member + mutable std::map, std::less<>> m_baseline_cache; }; struct VersionedPortfileProviderImpl : IVersionedPortfileProvider, Util::ResourceBase { - VersionedPortfileProviderImpl(const VcpkgPaths& paths) : paths(paths) { } + VersionedPortfileProviderImpl(const VcpkgPaths& paths_) : paths(paths_) { } - virtual const std::vector& get_port_versions(StringView port_name) const override + virtual View get_port_versions(StringView port_name) const override { - auto cache_it = versions_cache.find(port_name.to_string()); - if (cache_it != versions_cache.end()) + auto entry_it = m_entry_cache.find(port_name.to_string()); + if (entry_it != m_entry_cache.end()) { - return cache_it->second; + return entry_it->second->get_port_versions(); } - auto maybe_versions_file_path = get_versions_json_path(get_paths(), port_name); - if (auto versions_file_path = maybe_versions_file_path.get()) + auto entry = try_load_registry_port_and_baseline(paths, port_name.to_string()); + if (!entry.first) { - auto maybe_version_entries = parse_versions_file(get_filesystem(), port_name, *versions_file_path); - Checks::check_exit(VCPKG_LINE_INFO, - maybe_version_entries.has_value(), - "Error: Couldn't parse versions from file: %s", - fs::u8string(*versions_file_path)); - auto version_entries = maybe_version_entries.value_or_exit(VCPKG_LINE_INFO); - - auto port = port_name.to_string(); - for (auto&& version_entry : version_entries) - { - VersionSpec spec(port, version_entry.version); - versions_cache[port].push_back(spec); - git_tree_cache.emplace(std::move(spec), std::move(version_entry.git_tree)); - } - return versions_cache.at(port); - } - else - { - // Fall back to current available version - auto maybe_port = try_load_registry_port(paths, port_name.to_string()); - if (auto p = maybe_port.get()) - { - auto maybe_error = p->source_control_file->check_against_feature_flags( - p->source_location, paths.get_feature_flags()); - - if (auto error = maybe_error.get()) - { - Checks::exit_with_message(VCPKG_LINE_INFO, "Error: %s", *error); - } - - VersionSpec vspec(port_name.to_string(), - VersionT(p->source_control_file->core_paragraph->version, - p->source_control_file->core_paragraph->port_version)); - control_cache.emplace(vspec, std::move(*p)); - return versions_cache.emplace(port_name.to_string(), std::vector{vspec}) - .first->second; - } Checks::exit_with_message( VCPKG_LINE_INFO, "Error: Could not find a definition for port %s", port_name); } + auto it = m_entry_cache.emplace(port_name.to_string(), std::move(entry.first)); + return it.first->second->get_port_versions(); } - virtual ExpectedS get_control_file( - const VersionSpec& version_spec) const override + ExpectedS get_control_file(const VersionSpec& version_spec) const override { - // Pre-populate versions cache. - get_port_versions(version_spec.port_name); - - auto cache_it = control_cache.find(version_spec); - if (cache_it != control_cache.end()) + auto cache_it = m_control_cache.find(version_spec); + if (cache_it != m_control_cache.end()) { return cache_it->second; } - auto git_tree_cache_it = git_tree_cache.find(version_spec); - if (git_tree_cache_it == git_tree_cache.end()) + auto entry_it = m_entry_cache.find(version_spec.port_name); + if (entry_it == m_entry_cache.end()) { - return Strings::concat("Error: No git object SHA for entry ", - version_spec.port_name, - " at version ", - version_spec.version, - "."); + auto reg_for_port = + paths.get_configuration().registry_set.registry_for_port(version_spec.port_name); + + if (!reg_for_port) + { + return Strings::format("Error: no registry set up for port %s", version_spec.port_name); + } + + auto entry = reg_for_port->get_port_entry(paths, version_spec.port_name); + entry_it = m_entry_cache.emplace(version_spec.port_name, std::move(entry)).first; } - const std::string git_tree = git_tree_cache_it->second; - auto port_directory = get_paths().git_checkout_port(get_filesystem(), version_spec.port_name, git_tree); + auto maybe_path = entry_it->second->get_path_to_version(paths, version_spec.version); + if (!maybe_path.has_value()) + { + return std::move(maybe_path).error(); + } + auto& port_directory = *maybe_path.get(); - auto maybe_control_file = Paragraphs::try_load_port(get_filesystem(), port_directory); + auto maybe_control_file = Paragraphs::try_load_port(paths.get_filesystem(), port_directory); if (auto scf = maybe_control_file.get()) { if (scf->get()->core_paragraph->name == version_spec.port_name) { - return control_cache + return m_control_cache .emplace(version_spec, SourceControlFileLocation{std::move(*scf), std::move(port_directory)}) .first->second; @@ -484,14 +397,10 @@ namespace vcpkg::PortFileProvider "Error: Failed to load port %s from %s", version_spec.port_name, fs::u8string(port_directory)); } - const VcpkgPaths& get_paths() const { return paths; } - Files::Filesystem& get_filesystem() const { return paths.get_filesystem(); } - private: - const VcpkgPaths& paths; - mutable std::map> versions_cache; - mutable std::unordered_map git_tree_cache; - mutable std::unordered_map control_cache; + const VcpkgPaths& paths; // TODO: remove this data member + mutable std::unordered_map m_control_cache; + mutable std::map, std::less<>> m_entry_cache; }; } @@ -500,11 +409,6 @@ namespace vcpkg::PortFileProvider return std::make_unique(paths); } - std::unique_ptr make_baseline_provider(const vcpkg::VcpkgPaths& paths, StringView baseline) - { - return std::make_unique(paths, baseline); - } - std::unique_ptr make_versioned_portfile_provider(const vcpkg::VcpkgPaths& paths) { return std::make_unique(paths); diff --git a/toolsrc/src/vcpkg/registries.cpp b/toolsrc/src/vcpkg/registries.cpp index 51c8849c97fcf7..22ac26fd9dbb63 100644 --- a/toolsrc/src/vcpkg/registries.cpp +++ b/toolsrc/src/vcpkg/registries.cpp @@ -3,8 +3,9 @@ #include #include -#include +#include #include +#include #include #include #include @@ -16,341 +17,695 @@ namespace { using namespace vcpkg; - struct BuiltinEntry final : RegistryEntry + using Baseline = std::map>; + + static fs::path port_versions_dir = fs::u8path("port_versions"); + + // this class is an implementation detail of `BuiltinRegistryEntry`; + // when `BuiltinRegistryEntry` is using a port versions file for a port, + // it uses this as it's underlying type; + // when `BuiltinRegistryEntry` is using a port tree, it uses the scfl + struct GitRegistryEntry { - fs::path port_directory; + explicit GitRegistryEntry(std::string&& port_name) : port_name(port_name) { } - BuiltinEntry(fs::path&& p) : port_directory(std::move(p)) { } + std::string port_name; - fs::path get_port_directory(const VcpkgPaths&, const VersionT&) const override { return port_directory; } + // these two map port versions to git trees + // these shall have the same size, and git_trees[i] shall be the git tree for port_versions[i] + std::vector port_versions; + std::vector git_trees; }; - struct BuiltinRegistry final : RegistryImpl + struct BuiltinRegistryEntry final : RegistryEntry { - std::unique_ptr get_port_entry(const VcpkgPaths& paths, StringView port_name) const override + explicit BuiltinRegistryEntry(std::unique_ptr&& entry) + : git_entry(std::move(entry)), scfl(nullptr) + { + } + explicit BuiltinRegistryEntry(std::unique_ptr&& scfl_) + : git_entry(nullptr), scfl(std::move(scfl_)), scfl_version(scfl->to_versiont()) { - auto p = paths.builtin_ports_directory() / fs::u8path(port_name); - if (paths.get_filesystem().exists(p)) + } + + View get_port_versions() const override + { + if (git_entry) { - return std::make_unique(std::move(p)); + return git_entry->port_versions; } else { - return nullptr; + return {&scfl_version, 1}; } } + ExpectedS get_path_to_version(const VcpkgPaths&, const VersionT& version) const override; - void get_all_port_names(std::vector& names, const VcpkgPaths& paths) const override - { - const auto& fs = paths.get_filesystem(); - auto port_dirs = fs.get_files_non_recursive(paths.builtin_ports_directory()); - Util::sort(port_dirs); + // exactly one of these two shall be null - Util::erase_remove_if(port_dirs, - [&](auto&& port_dir_entry) { return port_dir_entry.filename() == ".DS_Store"; }); + // if we find a versions.json, this shall be non-null and BuiltinRegistryEntry uses git_entry's implementation + std::unique_ptr git_entry; + // otherwise, if we don't find a versions.json, + // we fall back to just using the version in the ports directory, and this is the non-null one + std::unique_ptr scfl; + VersionT scfl_version; // this exists so that we can return a pointer to it + }; - std::transform(port_dirs.begin(), port_dirs.end(), std::back_inserter(names), [](const fs::path& p) { - return fs::u8string(p.filename()); - }); - } + struct FilesystemRegistryEntry final : RegistryEntry + { + explicit FilesystemRegistryEntry(std::string&& port_name) : port_name(port_name) { } - Optional get_baseline_version(const VcpkgPaths&, StringView) const override { return VersionT{}; } + View get_port_versions() const override { return port_versions; } + + ExpectedS get_path_to_version(const VcpkgPaths& paths, const VersionT& version) const override; + + std::string port_name; + + // these two map port versions to paths + // these shall have the same size, and paths[i] shall be the path for port_versions[i] + std::vector port_versions; + std::vector version_paths; }; - struct FilesystemEntry final : RegistryEntry + struct BuiltinRegistry final : RegistryImplementation { - std::map versions; + BuiltinRegistry(std::string&& baseline) : m_baseline_identifier(std::move(baseline)) { } - fs::path get_port_directory(const VcpkgPaths&, const VersionT& version) const override - { - auto it = versions.find(version); - if (it != versions.end()) - { - return it->second; - } - return {}; - } + std::unique_ptr get_port_entry(const VcpkgPaths& paths, StringView port_name) const override; + + void get_all_port_names(std::vector&, const VcpkgPaths&) const override; + + Optional get_baseline_version(const VcpkgPaths& paths, StringView port_name) const override; + + ~BuiltinRegistry() = default; + + std::string m_baseline_identifier; + DelayedInit m_baseline; }; - struct FilesystemVersionEntryDeserializer final : Json::IDeserializer> + struct FilesystemRegistry final : RegistryImplementation { - StringView type_name() const override { return "a version entry object"; } - View valid_fields() const override + FilesystemRegistry(fs::path&& path, std::string&& baseline) + : m_path(std::move(path)), m_baseline_identifier(baseline) { - static const StringView t[] = {"version-string", "port-version", "registry-path"}; - return t; } - Optional> visit_object(Json::Reader& r, const Json::Object& obj) override - { - fs::path registry_path; + std::unique_ptr get_port_entry(const VcpkgPaths&, StringView) const override; - auto version = get_versiont_deserializer_instance().visit_object(r, obj); + void get_all_port_names(std::vector&, const VcpkgPaths&) const override; - r.required_object_field( - "version entry", obj, "registry-path", registry_path, Json::PathDeserializer::instance); - // registry_path should look like `/blah/foo` - if (registry_path.has_root_name() || !registry_path.has_root_directory()) - { - r.add_generic_error(type_name(), "must be an absolute path without a drive name"); - registry_path.clear(); - } + Optional get_baseline_version(const VcpkgPaths&, StringView) const override; + + private: + fs::path m_path; + std::string m_baseline_identifier; + DelayedInit m_baseline; + }; - return std::pair{std::move(version).value_or(VersionT{}), std::move(registry_path)}; + ExpectedS get_git_baseline_json_path(const VcpkgPaths& paths, StringView baseline_commit_sha) + { + auto baseline_path = paths.git_checkout_baseline(paths.get_filesystem(), baseline_commit_sha); + if (paths.get_filesystem().exists(baseline_path)) + { + return std::move(baseline_path); } + return {Strings::concat("Error: Baseline database file does not exist: ", fs::u8string(baseline_path)), + expected_right_tag}; + } + + struct VersionDbEntry + { + VersionT version; + Versions::Scheme scheme = Versions::Scheme::String; - static FilesystemVersionEntryDeserializer instance; + // only one of these may be non-empty + std::string git_tree; + fs::path path; }; - FilesystemVersionEntryDeserializer FilesystemVersionEntryDeserializer::instance; - struct FilesystemEntryDeserializer final : Json::IDeserializer + // VersionDbType::Git => VersionDbEntry.git_tree is filled + // VersionDbType::Filesystem => VersionDbEntry.path is filled + enum class VersionDbType { - StringView type_name() const override { return "a registry entry object"; } + Git, + Filesystem, + }; - Optional visit_array(Json::Reader& r, const Json::Array& arr) override + fs::path relative_path_to_versions(StringView port_name); + ExpectedS> load_versions_file(Files::Filesystem& fs, + VersionDbType vdb, + const fs::path& port_versions, + StringView port_name, + const fs::path& registry_root = {}); + + // returns nullopt if the baseline is valid, but doesn't contain the specified baseline, + // or (equivalently) if the baseline does not exist. + ExpectedS> parse_baseline_versions(StringView contents, StringView baseline); + ExpectedS> load_baseline_versions(const VcpkgPaths& paths, + const fs::path& path_to_baseline, + StringView identifier = {}); + + void load_all_port_names_from_port_versions(std::vector& out, + const VcpkgPaths& paths, + const fs::path& port_versions_path) + { + for (auto super_directory : fs::directory_iterator(port_versions_path)) { - FilesystemEntry res; + if (!fs::is_directory(paths.get_filesystem().status(VCPKG_LINE_INFO, super_directory))) continue; - std::pair buffer; - for (std::size_t idx = 0; idx < arr.size(); ++idx) + for (auto file : fs::directory_iterator(super_directory)) { - r.visit_at_index( - arr[idx], static_cast(idx), buffer, FilesystemVersionEntryDeserializer::instance); + auto filename = fs::u8string(file.path().filename()); + if (!Strings::ends_with(filename, ".json")) continue; - auto it = res.versions.lower_bound(buffer.first); - if (it == res.versions.end() || it->first != buffer.first) - { - buffer.second = registry_root / fs::lexically_normal(buffer.second).relative_path(); - res.versions.insert(it, std::move(buffer)); - } - else if (buffer.first != VersionT{}) + auto port_name = filename.substr(0, filename.size() - 5); + if (!Json::PackageNameDeserializer::is_package_name(port_name)) { - r.add_generic_error( - type_name(), "Gave multiple definitions for version: ", buffer.first.to_string()); + Checks::exit_with_message( + VCPKG_LINE_INFO, "Error: found invalid port version file name: `%s`.", fs::u8string(file)); } + out.push_back(std::move(port_name)); } - - return res; } + } - FilesystemEntryDeserializer(const fs::path& p) : registry_root(p) { } - - const fs::path& registry_root; - }; + // { RegistryImplementation - struct FilesystemRegistry final : RegistryImpl + // { BuiltinRegistry::RegistryImplementation + std::unique_ptr BuiltinRegistry::get_port_entry(const VcpkgPaths& paths, StringView port_name) const { - std::unique_ptr get_port_entry(const VcpkgPaths& paths, StringView port_name) const override + auto versions_path = paths.builtin_port_versions / relative_path_to_versions(port_name); + if (paths.get_feature_flags().registries && paths.get_filesystem().exists(versions_path)) { - const auto& fs = paths.get_filesystem(); - auto entry_path = this->path_to_port_entry(paths, port_name); - if (!fs.exists(entry_path)) + auto maybe_version_entries = + load_versions_file(paths.get_filesystem(), VersionDbType::Git, paths.builtin_port_versions, port_name); + Checks::check_exit( + VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: %s", maybe_version_entries.error()); + auto version_entries = std::move(maybe_version_entries).value_or_exit(VCPKG_LINE_INFO); + + auto res = + std::make_unique(std::make_unique(port_name.to_string())); + auto gre = res->git_entry.get(); + for (auto&& version_entry : version_entries) { - Debug::print( - "Failed to find entry for port `", port_name, "` in file: ", fs::u8string(entry_path), "\n"); - return nullptr; + gre->port_versions.push_back(version_entry.version); + gre->git_trees.push_back(version_entry.git_tree); } - std::error_code ec; - auto json_document = Json::parse_file(fs, entry_path, ec); + return res; + } - if (auto p = json_document.get()) + // Fall back to current available version + auto port_directory = paths.builtin_ports_directory() / fs::u8path(port_name); + if (paths.get_filesystem().exists(port_directory)) + { + auto found_scf = Paragraphs::try_load_port(paths.get_filesystem(), port_directory); + if (auto scfp = found_scf.get()) { - Json::Reader r; - auto real_path = paths.config_root_dir / path; - FilesystemEntryDeserializer deserializer{real_path}; - auto entry = r.visit(p->first, deserializer); - auto pentry = entry.get(); - if (pentry && r.errors().empty()) + auto& scf = *scfp; + auto maybe_error = scf->check_against_feature_flags(port_directory, paths.get_feature_flags()); + if (maybe_error) { - return std::make_unique(std::move(*pentry)); + Checks::exit_with_message(VCPKG_LINE_INFO, "Parsing manifest failed: %s", *maybe_error.get()); } - else + + if (scf->core_paragraph->name == port_name) { - vcpkg::Checks::exit_with_message(VCPKG_LINE_INFO, - "Failed to parse the port entry for port `%s` at `%s`.\n%s", - port_name, - fs::u8string(entry_path), - Strings::join("\n", r.errors())); + return std::make_unique( + std::make_unique(std::move(scf), std::move(port_directory))); } + Checks::exit_with_message(VCPKG_LINE_INFO, + "Error: Failed to load port from %s: names did not match: '%s' != '%s'", + fs::u8string(port_directory), + port_name, + scf->core_paragraph->name); } - else - { - Debug::print("Failed to parse json document: ", json_document.error()->format(), "\n"); - } - - return nullptr; } - void get_all_port_names(std::vector& port_names, const VcpkgPaths& paths) const override + return nullptr; + } + + Baseline parse_builtin_baseline(const VcpkgPaths& paths, StringView baseline_identifier) + { + auto path_to_baseline = paths.builtin_port_versions / fs::u8path("baseline.json"); + auto res_baseline = load_baseline_versions(paths, path_to_baseline, baseline_identifier); + + if (!res_baseline.has_value()) { - std::error_code ec; - for (const auto& super_dir : fs::directory_iterator(path)) - { - if (!fs::is_directory(paths.get_filesystem().status(super_dir, ec))) - { - continue; - } + Checks::exit_with_message(VCPKG_LINE_INFO, res_baseline.error()); + } + auto opt_baseline = res_baseline.get(); + if (auto p = opt_baseline->get()) + { + return std::move(*p); + } - auto super_dir_filename = fs::u8string(super_dir.path().filename()); - if (!Strings::ends_with(super_dir_filename, "-")) - { - continue; - } + if (baseline_identifier.size() == 0) + { + return {}; + } - super_dir_filename.pop_back(); - for (const auto& database_entry : fs::directory_iterator(super_dir)) - { - auto database_entry_filename = database_entry.path().filename(); - auto database_entry_filename_str = fs::u8string(database_entry_filename); + if (baseline_identifier == "default") + { + Checks::exit_with_message(VCPKG_LINE_INFO, + "Couldn't find explicitly specified baseline `\"default\"` in the baseline file.", + baseline_identifier); + } - if (!Strings::starts_with(database_entry_filename_str, super_dir_filename) || - !Strings::ends_with(database_entry_filename_str, ".json")) - { - Debug::print("Unexpected file in database (this is not an error): ", - fs::u8string(database_entry.path()), - "\n"); - continue; - } + // attempt to check out the baseline: + auto maybe_path = get_git_baseline_json_path(paths, baseline_identifier); + if (!maybe_path.has_value()) + { + Checks::exit_with_message(VCPKG_LINE_INFO, + "Couldn't find explicitly specified baseline `\"%s\"` in the baseline file, " + "and there was no baseline at that commit or the commit didn't exist.\n%s", + baseline_identifier, + maybe_path.error()); + } - port_names.push_back(fs::u8string(database_entry_filename.replace_extension())); - } - } + res_baseline = load_baseline_versions(paths, *maybe_path.get()); + if (!res_baseline.has_value()) + { + Checks::exit_with_message(VCPKG_LINE_INFO, res_baseline.error()); + } + opt_baseline = res_baseline.get(); + if (auto p = opt_baseline->get()) + { + return std::move(*p); } - Optional get_baseline_version(const VcpkgPaths& paths, StringView port_name) const override + Checks::exit_with_message(VCPKG_LINE_INFO, + "Couldn't find explicitly specified baseline `\"%s\"` in the baseline " + "file, and the `\"default\"` baseline does not exist at that commit.", + baseline_identifier); + } + Optional BuiltinRegistry::get_baseline_version(const VcpkgPaths& paths, StringView port_name) const + { + if (paths.get_feature_flags().registries) { - if (!paths.get_feature_flags().versions) + const auto& baseline = m_baseline.get( + [this, &paths]() -> Baseline { return parse_builtin_baseline(paths, m_baseline_identifier); }); + + auto it = baseline.find(port_name); + if (it != baseline.end()) { - Checks::check_exit(VCPKG_LINE_INFO, - "This invocation failed because the `versions` feature flag is not enabled."); + return it->second; } + } - const auto& baseline_cache = baseline.get([this, &paths] { return load_baseline_versions(paths); }); - auto it = baseline_cache.find(port_name); - if (it != baseline_cache.end()) + // fall back to using the ports directory version + auto maybe_scf = + Paragraphs::try_load_port(paths.get_filesystem(), paths.builtin_ports_directory() / fs::u8path(port_name)); + if (auto pscf = maybe_scf.get()) + { + auto& scf = *pscf; + return scf->to_versiont(); + } + Debug::print("Failed to load port `", port_name, "` from the ports tree: ", maybe_scf.error()->error, "\n"); + return nullopt; + } + + void BuiltinRegistry::get_all_port_names(std::vector& out, const VcpkgPaths& paths) const + { + if (paths.get_feature_flags().registries && paths.get_filesystem().exists(paths.builtin_port_versions)) + { + load_all_port_names_from_port_versions(out, paths, paths.builtin_port_versions); + } + + for (auto port_directory : fs::directory_iterator(paths.builtin_ports_directory())) + { + if (!fs::is_directory(paths.get_filesystem().status(VCPKG_LINE_INFO, port_directory))) continue; + auto filename = fs::u8string(port_directory.path().filename()); + if (filename == ".DS_Store") continue; + out.push_back(filename); + } + } + // } BuiltinRegistry::RegistryImplementation + + // { FilesystemRegistry::RegistryImplementation + Baseline parse_filesystem_baseline(const VcpkgPaths& paths, const fs::path& root, StringView baseline_identifier) + { + auto path_to_baseline = root / port_versions_dir / fs::u8path("baseline.json"); + auto res_baseline = load_baseline_versions(paths, path_to_baseline, baseline_identifier); + if (auto opt_baseline = res_baseline.get()) + { + if (auto p = opt_baseline->get()) { - return it->second; + return std::move(*p); } - else + + if (baseline_identifier.size() == 0) { - return nullopt; + return {}; } + + Checks::exit_with_message( + VCPKG_LINE_INFO, + "Error: could not find explicitly specified baseline `\"%s\"` in baseline file `%s`.", + baseline_identifier, + fs::u8string(path_to_baseline)); } - FilesystemRegistry(fs::path&& path_) : path(path_) { } + Checks::exit_with_message(VCPKG_LINE_INFO, res_baseline.error()); + } + Optional FilesystemRegistry::get_baseline_version(const VcpkgPaths& paths, StringView port_name) const + { + const auto& baseline = m_baseline.get( + [this, &paths]() -> Baseline { return parse_filesystem_baseline(paths, m_path, m_baseline_identifier); }); - private: - fs::path path_to_registry_database(const VcpkgPaths& paths) const + auto it = baseline.find(port_name); + if (it != baseline.end()) { - fs::path path_to_db = paths.config_root_dir / path; - path_to_db /= fs::u8path( - {'\xF0', '\x9F', '\x98', '\x87'}); // utf-8 for https://emojipedia.org/smiling-face-with-halo/ - return path_to_db; + return it->second; } - - fs::path path_to_port_entry(const VcpkgPaths& paths, StringView port_name) const + else { - Checks::check_exit(VCPKG_LINE_INFO, port_name.size() != 0); - fs::path path_to_entry = path_to_registry_database(paths); - path_to_entry /= fs::u8path({port_name.byte_at_index(0), '-'}); - path_to_entry /= fs::u8path(port_name); - path_to_entry += fs::u8path(".json"); - - return path_to_entry; + return nullopt; } + } - std::map> load_baseline_versions(const VcpkgPaths& paths) const + std::unique_ptr FilesystemRegistry::get_port_entry(const VcpkgPaths& paths, + StringView port_name) const + { + auto maybe_version_entries = load_versions_file( + paths.get_filesystem(), VersionDbType::Filesystem, m_path / port_versions_dir, port_name, m_path); + Checks::check_exit( + VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: %s", maybe_version_entries.error()); + auto version_entries = std::move(maybe_version_entries).value_or_exit(VCPKG_LINE_INFO); + + auto res = std::make_unique(port_name.to_string()); + for (auto&& version_entry : version_entries) { - auto baseline_file = path_to_registry_database(paths) / fs::u8path("baseline.json"); + res->port_versions.push_back(std::move(version_entry.version)); + res->version_paths.push_back(std::move(version_entry.path)); + } + return res; + } + + void FilesystemRegistry::get_all_port_names(std::vector& out, const VcpkgPaths& paths) const + { + load_all_port_names_from_port_versions(out, paths, m_path / port_versions_dir); + } + // } FilesystemRegistry::RegistryImplementation + + // } RegistryImplementation + + // { RegistryEntry - auto value = Json::parse_file(VCPKG_LINE_INFO, paths.get_filesystem(), baseline_file); - if (!value.first.is_object()) + // { BuiltinRegistryEntry::RegistryEntry + ExpectedS BuiltinRegistryEntry::get_path_to_version(const VcpkgPaths& paths, + const VersionT& version) const + { + if (git_entry) + { + auto it = std::find(git_entry->port_versions.begin(), git_entry->port_versions.end(), version); + if (it == git_entry->port_versions.end()) { - Checks::exit_with_message(VCPKG_LINE_INFO, "Error: `baseline.json` does not have a top-level object."); + return Strings::concat( + "Error: No version entry for ", git_entry->port_name, " at version ", version, "."); } - auto maybe_baseline_versions = parse_baseline_file(paths.get_filesystem(), "default", baseline_file); - if (auto baseline_versions = maybe_baseline_versions.get()) + const auto& git_tree = git_entry->git_trees[it - git_entry->port_versions.begin()]; + return paths.git_checkout_port(paths.get_filesystem(), git_entry->port_name, git_tree); + } + + if (scfl_version == version) + { + return scfl->source_location; + } + + auto& name = scfl->source_control_file->core_paragraph->name; + return Strings::format( + "Error: no version entry for %s at version %s.\n" + "We are currently using the version in the ports tree, since no %s.json was found in port_versions.", + name, + scfl->to_versiont().to_string(), + name); + } + // } BuiltinRegistryEntry::RegistryEntry + + // { FilesystemRegistryEntry::RegistryEntry + ExpectedS FilesystemRegistryEntry::get_path_to_version(const VcpkgPaths&, const VersionT& version) const + { + auto it = std::find(port_versions.begin(), port_versions.end(), version); + if (it == port_versions.end()) + { + return Strings::concat("Error: No version entry for ", port_name, " at version ", version, "."); + } + return version_paths[it - port_versions.begin()]; + } + // } FilesystemRegistryEntry::RegistryEntry + + // } RegistryEntry +} + +// deserializers +namespace +{ + using namespace vcpkg; + + struct BaselineDeserializer final : Json::IDeserializer>> + { + StringView type_name() const override { return "a baseline object"; } + + Optional visit_object(Json::Reader& r, const Json::Object& obj) override + { + std::map> result; + + for (auto pr : obj) { - return std::move(*baseline_versions); + const auto& version_value = pr.second; + VersionT version; + r.visit_in_key(version_value, pr.first, version, get_versiont_deserializer_instance()); + + result.emplace(pr.first.to_string(), std::move(version)); } - else + + return std::move(result); + } + + static BaselineDeserializer instance; + }; + BaselineDeserializer BaselineDeserializer::instance; + + struct VersionDbEntryDeserializer final : Json::IDeserializer + { + static constexpr StringLiteral GIT_TREE = "git-tree"; + static constexpr StringLiteral PATH = "path"; + + StringView type_name() const override { return "a version database entry"; } + View valid_fields() const override + { + static const StringView u_git[] = {GIT_TREE}; + static const StringView u_path[] = {PATH}; + static const auto t_git = vcpkg::Util::Vectors::concat(schemed_deserializer_fields(), u_git); + static const auto t_path = vcpkg::Util::Vectors::concat(schemed_deserializer_fields(), u_path); + + return type == VersionDbType::Git ? t_git : t_path; + } + + Optional visit_object(Json::Reader& r, const Json::Object& obj) override + { + VersionDbEntry ret; + + auto schemed_version = visit_required_schemed_deserializer(type_name(), r, obj); + ret.scheme = schemed_version.scheme; + ret.version = std::move(schemed_version.versiont); + + static Json::StringDeserializer git_tree_deserializer("a git object SHA"); + static Json::StringDeserializer path_deserializer("a registry path"); + + switch (type) { - Checks::exit_with_message(VCPKG_LINE_INFO, - "Error: failed to parse `%s`:\n%s", - fs::u8string(baseline_file), - maybe_baseline_versions.error()); + case VersionDbType::Git: + { + r.required_object_field(type_name(), obj, GIT_TREE, ret.git_tree, git_tree_deserializer); + break; + } + case VersionDbType::Filesystem: + { + std::string path_res; + r.required_object_field(type_name(), obj, PATH, path_res, path_deserializer); + fs::path p = fs::u8path(path_res); + if (p.is_absolute()) + { + r.add_generic_error("a registry path", + "A registry path may not be absolute, and must start with a `$` to mean " + "the registry root; e.g., `$/foo/bar`."); + return ret; + } + else if (p.empty()) + { + r.add_generic_error("a registry path", "A registry path must not be empty."); + return ret; + } + + auto it = p.begin(); + if (*it != "$") + { + r.add_generic_error( + "a registry path", + "A registry path must start with `$` to mean the registry root; e.g., `$/foo/bar`"); + } + + ret.path = registry_root; + ++it; + std::for_each(it, p.end(), [&r, &ret](const fs::path& p) { + if (p == "..") + { + r.add_generic_error("a registry path", "A registry path must not contain `..`."); + } + else + { + ret.path /= p; + } + }); + + break; + } } + + return ret; } - fs::path path; - DelayedInit>> baseline; + VersionDbEntryDeserializer(VersionDbType type, const fs::path& root) : type(type), registry_root(root) { } + + VersionDbType type; + fs::path registry_root; }; -} -namespace vcpkg -{ - std::unique_ptr Registry::builtin_registry() { return std::make_unique(); } + struct VersionDbEntryArrayDeserializer final : Json::IDeserializer> + { + virtual StringView type_name() const override { return "an array of versions"; } - Registry::Registry(std::vector&& packages, std::unique_ptr&& impl) - : packages_(std::move(packages)), implementation_(std::move(impl)) + virtual Optional> visit_array(Json::Reader& r, const Json::Array& arr) override + { + return r.array_elements(arr, underlying); + } + + VersionDbEntryArrayDeserializer(VersionDbType type, const fs::path& root) : underlying{type, root} { } + + VersionDbEntryDeserializer underlying; + }; + + struct RegistryImplDeserializer : Json::IDeserializer> { - Checks::check_exit(VCPKG_LINE_INFO, implementation_ != nullptr); - } + constexpr static StringLiteral KIND = "kind"; + constexpr static StringLiteral BASELINE = "baseline"; + constexpr static StringLiteral PATH = "path"; + + constexpr static StringLiteral KIND_BUILTIN = "builtin"; + constexpr static StringLiteral KIND_FILESYSTEM = "filesystem"; + + virtual StringView type_name() const override { return "a registry"; } + virtual View valid_fields() const override; - RegistryImplDeserializer RegistryImplDeserializer::instance; + virtual Optional> visit_null(Json::Reader&) override; + virtual Optional> visit_object(Json::Reader&, + const Json::Object&) override; - StringView RegistryImplDeserializer::type_name() const { return "a registry"; } + RegistryImplDeserializer(const fs::path& configuration_directory) + : config_directory(configuration_directory) { } + fs::path config_directory; + }; constexpr StringLiteral RegistryImplDeserializer::KIND; + constexpr StringLiteral RegistryImplDeserializer::BASELINE; constexpr StringLiteral RegistryImplDeserializer::PATH; constexpr StringLiteral RegistryImplDeserializer::KIND_BUILTIN; constexpr StringLiteral RegistryImplDeserializer::KIND_FILESYSTEM; + struct RegistryDeserializer final : Json::IDeserializer + { + constexpr static StringLiteral PACKAGES = "packages"; + + virtual StringView type_name() const override { return "a registry"; } + virtual View valid_fields() const override; + + virtual Optional visit_object(Json::Reader&, const Json::Object&) override; + + explicit RegistryDeserializer(const fs::path& configuration_directory) : impl_des(configuration_directory) { } + + RegistryImplDeserializer impl_des; + }; + constexpr StringLiteral RegistryDeserializer::PACKAGES; + View RegistryImplDeserializer::valid_fields() const { - static const StringView t[] = {KIND, PATH}; + static const StringView t[] = {KIND, BASELINE, PATH}; + return t; + } + View valid_builtin_fields() + { + static const StringView t[] = { + RegistryImplDeserializer::KIND, + RegistryImplDeserializer::BASELINE, + RegistryDeserializer::PACKAGES, + }; + return t; + } + View valid_filesystem_fields() + { + static const StringView t[] = { + RegistryImplDeserializer::KIND, + RegistryImplDeserializer::BASELINE, + RegistryImplDeserializer::PATH, + RegistryDeserializer::PACKAGES, + }; return t; } - Optional> RegistryImplDeserializer::visit_null(Json::Reader&) { return nullptr; } + Optional> RegistryImplDeserializer::visit_null(Json::Reader&) + { + return nullptr; + } - Optional> RegistryImplDeserializer::visit_object(Json::Reader& r, - const Json::Object& obj) + Optional> RegistryImplDeserializer::visit_object(Json::Reader& r, + const Json::Object& obj) { static Json::StringDeserializer kind_deserializer{"a registry implementation kind"}; + static Json::StringDeserializer baseline_deserializer{"a baseline"}; std::string kind; + std::string baseline; + r.required_object_field(type_name(), obj, KIND, kind, kind_deserializer); + r.optional_object_field(obj, BASELINE, baseline, baseline_deserializer); + + std::unique_ptr res; if (kind == KIND_BUILTIN) { - if (obj.contains(PATH)) - { - r.add_extra_field_error("a builtin registry", PATH); - } - return static_cast>(std::make_unique()); + r.check_for_unexpected_fields(obj, valid_builtin_fields(), "a builtin registry"); + res = std::make_unique(std::move(baseline)); } else if (kind == KIND_FILESYSTEM) { + r.check_for_unexpected_fields(obj, valid_filesystem_fields(), "a filesystem registry"); + fs::path path; r.required_object_field("a filesystem registry", obj, PATH, path, Json::PathDeserializer::instance); - return static_cast>(std::make_unique(std::move(path))); + res = std::make_unique(config_directory / path, std::move(baseline)); } else { + StringLiteral valid_kinds[] = {KIND_BUILTIN, KIND_FILESYSTEM}; + r.add_generic_error(type_name(), + "Field \"kind\" did not have an expected value (expected one of: \"", + Strings::join("\", \"", valid_kinds), + "\", found \"", + kind, + "\")."); return nullopt; } - } - StringView RegistryDeserializer::type_name() const { return "a registry"; } - - constexpr StringLiteral RegistryDeserializer::PACKAGES; + return std::move(res); + } View RegistryDeserializer::valid_fields() const { static const StringView t[] = { RegistryImplDeserializer::KIND, + RegistryImplDeserializer::BASELINE, RegistryImplDeserializer::PATH, PACKAGES, }; @@ -359,7 +714,7 @@ namespace vcpkg Optional RegistryDeserializer::visit_object(Json::Reader& r, const Json::Object& obj) { - auto impl = RegistryImplDeserializer::instance.visit_object(r, obj); + auto impl = impl_des.visit_object(r, obj); if (!impl.has_value()) { @@ -375,9 +730,159 @@ namespace vcpkg return Registry{std::move(packages), std::move(impl).value_or_exit(VCPKG_LINE_INFO)}; } + fs::path relative_path_to_versions(StringView port_name) + { + auto port_filename = fs::u8path(port_name.to_string() + ".json"); + return fs::u8path({port_name.byte_at_index(0), '-'}) / port_filename; + } + + ExpectedS> load_versions_file(Files::Filesystem& fs, + VersionDbType type, + const fs::path& port_versions, + StringView port_name, + const fs::path& registry_root) + { + Checks::check_exit(VCPKG_LINE_INFO, + !(type == VersionDbType::Filesystem && registry_root.empty()), + "Bug in vcpkg; type should never = Filesystem when registry_root is empty."); + + auto versions_file_path = port_versions / relative_path_to_versions(port_name); + + if (!fs.exists(versions_file_path)) + { + return Strings::format("Couldn't find the versions database file: %s", fs::u8string(versions_file_path)); + } + + auto maybe_contents = fs.read_contents(versions_file_path); + if (!maybe_contents.has_value()) + { + return Strings::format("Failed to load the versions database file %s: %s", + fs::u8string(versions_file_path), + maybe_contents.error().message()); + } + + auto maybe_versions_json = Json::parse(*maybe_contents.get()); + if (!maybe_versions_json.has_value()) + { + return Strings::format( + "Error: failed to parse versions file for `%s`: %s", port_name, maybe_versions_json.error()->format()); + } + if (!maybe_versions_json.get()->first.is_object()) + { + return Strings::format("Error: versions file for `%s` does not have a top level object.", port_name); + } + + const auto& versions_object = maybe_versions_json.get()->first.object(); + auto maybe_versions_array = versions_object.get("versions"); + if (!maybe_versions_array || !maybe_versions_array->is_array()) + { + return Strings::format("Error: versions file for `%s` does not contain a versions array.", port_name); + } + + std::vector db_entries; + VersionDbEntryArrayDeserializer deserializer{type, registry_root}; + // Avoid warning treated as error. + if (maybe_versions_array != nullptr) + { + Json::Reader r; + r.visit_in_key(*maybe_versions_array, "versions", db_entries, deserializer); + if (!r.errors().empty()) + { + return Strings::format( + "Error: failed to parse versions file for `%s`:\n%s", port_name, Strings::join("\n", r.errors())); + } + } + return db_entries; + } + + ExpectedS> parse_baseline_versions(StringView contents, StringView baseline) + { + auto maybe_value = Json::parse(contents); + if (!maybe_value.has_value()) + { + return Strings::format("Error: failed to parse baseline file: %s", maybe_value.error()->format()); + } + + auto& value = *maybe_value.get(); + + if (!value.first.is_object()) + { + return std::string("Error: baseline does not have a top-level object."); + } + + auto real_baseline = baseline.size() == 0 ? "default" : baseline; + + const auto& obj = value.first.object(); + auto baseline_value = obj.get(real_baseline); + if (!baseline_value) + { + return {nullopt, expected_left_tag}; + } + + Json::Reader r; + std::map> result; + r.visit_in_key(*baseline_value, real_baseline, result, BaselineDeserializer::instance); + if (r.errors().empty()) + { + return {std::move(result), expected_left_tag}; + } + else + { + Checks::exit_with_message( + VCPKG_LINE_INFO, "Error: failed to parse baseline:\n%s", Strings::join("\n", r.errors())); + } + } + + ExpectedS> load_baseline_versions(const VcpkgPaths& paths, + const fs::path& path_to_baseline, + StringView baseline) + { + auto maybe_contents = paths.get_filesystem().read_contents(path_to_baseline); + if (auto contents = maybe_contents.get()) + { + return parse_baseline_versions(*contents, baseline); + } + else if (maybe_contents.error() == std::errc::no_such_file_or_directory) + { + return {nullopt, expected_left_tag}; + } + else + { + return Strings::format("Error: failed to read file `%s`: %s", + fs::u8string(path_to_baseline), + maybe_contents.error().message()); + } + } +} + +namespace vcpkg +{ + std::unique_ptr>> + get_registry_implementation_deserializer(const fs::path& configuration_directory) + { + return std::make_unique(configuration_directory); + } + std::unique_ptr>> get_registry_array_deserializer( + const fs::path& configuration_directory) + { + return std::make_unique>( + "an array of registries", RegistryDeserializer(configuration_directory)); + } + + std::unique_ptr Registry::builtin_registry(std::string&& baseline) + { + return std::make_unique(std::move(baseline)); + } + + Registry::Registry(std::vector&& packages, std::unique_ptr&& impl) + : packages_(std::move(packages)), implementation_(std::move(impl)) + { + Checks::check_exit(VCPKG_LINE_INFO, implementation_ != nullptr); + } + RegistrySet::RegistrySet() : default_registry_(Registry::builtin_registry()), registries_() { } - const RegistryImpl* RegistrySet::registry_for_port(StringView name) const + const RegistryImplementation* RegistrySet::registry_for_port(StringView name) const { for (const auto& registry : registries()) { @@ -390,8 +895,63 @@ namespace vcpkg return default_registry(); } + Optional RegistrySet::baseline_for_port(const VcpkgPaths& paths, StringView port_name) const + { + auto impl = registry_for_port(port_name); + if (!impl) return nullopt; + return impl->get_baseline_version(paths, port_name); + } + void RegistrySet::add_registry(Registry&& r) { registries_.push_back(std::move(r)); } - void RegistrySet::set_default_registry(std::unique_ptr&& r) { default_registry_ = std::move(r); } + void RegistrySet::set_default_registry(std::unique_ptr&& r) + { + default_registry_ = std::move(r); + } void RegistrySet::set_default_registry(std::nullptr_t) { default_registry_.reset(); } + + void RegistrySet::experimental_set_builtin_registry_baseline(StringView baseline) const + { + // to check if we should warn + bool default_registry_is_builtin = false; + if (auto builtin_registry = dynamic_cast(default_registry_.get())) + { + default_registry_is_builtin = true; + builtin_registry->m_baseline_identifier.assign(baseline.begin(), baseline.end()); + } + + if (!default_registry_is_builtin || registries_.size() != 0) + { + System::print2(System::Color::warning, + "Warning: when using the registries feature, one should not use `\"$x-default-baseline\"` " + "to set the baseline.\n", + " Instead, use the \"baseline\" field of the registry."); + } + + for (auto& reg : registries_) + { + if (auto builtin_registry = dynamic_cast(reg.implementation_.get())) + { + builtin_registry->m_baseline_identifier.assign(baseline.begin(), baseline.end()); + } + } + } + + bool RegistrySet::has_modifications() const + { + if (!registries_.empty()) + { + return true; + } + if (auto builtin_reg = dynamic_cast(default_registry_.get())) + { + if (builtin_reg->m_baseline_identifier.empty()) + { + return false; + } + return true; + } + // default_registry_ is not a BuiltinRegistry + return true; + } } diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp index 5b25b32d8af5e2..0310a01ae3c6e2 100644 --- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp +++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp @@ -277,6 +277,7 @@ namespace vcpkg {PACKAGES_ROOT_DIR_ARG, &VcpkgCmdArguments::packages_root_dir}, {SCRIPTS_ROOT_DIR_ARG, &VcpkgCmdArguments::scripts_root_dir}, {BUILTIN_PORTS_ROOT_DIR_ARG, &VcpkgCmdArguments::builtin_ports_root_dir}, + {BUILTIN_PORT_VERSIONS_DIR_ARG, &VcpkgCmdArguments::builtin_port_versions_dir}, }; constexpr static std::pair VcpkgCmdArguments::*> diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 5c7e6a77e817bb..a4125876171772 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -89,9 +88,9 @@ namespace vcpkg const fs::path& filepath) { Json::Reader reader; - ConfigurationDeserializer deserializer(args); + auto deserializer = make_configuration_deserializer(filepath.parent_path()); - auto parsed_config_opt = reader.visit(obj, deserializer); + auto parsed_config_opt = reader.visit(obj, *deserializer); if (!reader.errors().empty()) { System::print2(System::Color::error, "Errors occurred while parsing ", fs::u8string(filepath), "\n"); @@ -103,6 +102,8 @@ namespace vcpkg Checks::exit_fail(VCPKG_LINE_INFO); } + parsed_config_opt.get()->validate_feature_flags(args.feature_flag_settings()); + return std::move(parsed_config_opt).value_or_exit(VCPKG_LINE_INFO); } @@ -342,6 +343,8 @@ If you wish to silence this error and use classic mode, you can: scripts = process_input_directory(filesystem, root, args.scripts_root_dir.get(), "scripts", VCPKG_LINE_INFO); builtin_ports = process_output_directory(filesystem, root, args.builtin_ports_root_dir.get(), "ports", VCPKG_LINE_INFO); + builtin_port_versions = process_output_directory( + filesystem, root, args.builtin_port_versions_dir.get(), "port_versions", VCPKG_LINE_INFO); prefab = root / fs::u8path("prefab"); if (args.default_visual_studio_path) @@ -493,11 +496,13 @@ If you wish to silence this error and use classic mode, you can: fs.remove_all(dot_git_dir, VCPKG_LINE_INFO); // All git commands are run with: --git-dir={dot_git_dir} --work-tree={work_tree_temp} - // git clone --no-checkout --local {vcpkg_root} {dot_git_dir} + // git clone --no-checkout --local --no-hardlinks {vcpkg_root} {dot_git_dir} + // note that `--no-hardlinks` is added because otherwise, git fails to clone in some cases System::CmdLineBuilder clone_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree) .string_arg("clone") .string_arg("--no-checkout") .string_arg("--local") + .string_arg("--no-hardlinks") .path_arg(local_repo) .path_arg(dot_git_dir); const auto clone_output = System::cmd_execute_and_capture_output(clone_cmd_builder.extract()); @@ -578,6 +583,7 @@ If you wish to silence this error and use classic mode, you can: .string_arg("clone") .string_arg("--no-checkout") .string_arg("--local") + .string_arg("--no-hardlinks") .path_arg(local_repo) .path_arg(dot_git_dir); const auto clone_output = System::cmd_execute_and_capture_output(clone_cmd_builder.extract()); @@ -662,8 +668,8 @@ If you wish to silence this error and use classic mode, you can: * Since we are checking a git tree object, all files will be checked out to the root of `work-tree`. * Because of that, it makes sense to use the git hash as the name for the directory. */ - const fs::path local_repo = this->root; - const fs::path destination = this->versions_output / fs::u8path(git_tree) / fs::u8path(port_name); + const fs::path& local_repo = this->root; + fs::path destination = this->versions_output / fs::u8path(git_tree) / fs::u8path(port_name); if (!fs.exists(destination / "CONTROL") && !fs.exists(destination / "vcpkg.json")) { diff --git a/toolsrc/src/vcpkg/versiondeserializers.cpp b/toolsrc/src/vcpkg/versiondeserializers.cpp index ee64630e3286e6..d791e3e14569a0 100644 --- a/toolsrc/src/vcpkg/versiondeserializers.cpp +++ b/toolsrc/src/vcpkg/versiondeserializers.cpp @@ -146,75 +146,6 @@ namespace vcpkg namespace { - struct VersionDbEntryDeserializer final : Json::IDeserializer - { - static constexpr StringLiteral GIT_TREE = "git-tree"; - - StringView type_name() const override { return "a version database entry"; } - View valid_fields() const override - { - static const StringView u[] = {GIT_TREE}; - static const auto t = vcpkg::Util::Vectors::concat(schemed_deserializer_fields(), u); - return t; - } - - Optional visit_object(Json::Reader& r, const Json::Object& obj) override - { - VersionDbEntry ret; - - auto schemed_version = visit_required_schemed_deserializer(type_name(), r, obj); - ret.scheme = schemed_version.scheme; - ret.version = std::move(schemed_version.versiont); - - static Json::StringDeserializer git_tree_deserializer("a git object SHA"); - - r.required_object_field(type_name(), obj, GIT_TREE, ret.git_tree, git_tree_deserializer); - - return std::move(ret); - } - - static VersionDbEntryDeserializer instance; - }; - - struct VersionDbEntryArrayDeserializer final : Json::IDeserializer> - { - virtual StringView type_name() const override { return "an array of versions"; } - - virtual Optional> visit_array(Json::Reader& r, const Json::Array& arr) override - { - return r.array_elements(arr, VersionDbEntryDeserializer::instance); - } - - static VersionDbEntryArrayDeserializer instance; - }; - - VersionDbEntryDeserializer VersionDbEntryDeserializer::instance; - VersionDbEntryArrayDeserializer VersionDbEntryArrayDeserializer::instance; - - struct BaselineDeserializer final : Json::IDeserializer>> - { - StringView type_name() const override { return "a baseline object"; } - - Optional visit_object(Json::Reader& r, const Json::Object& obj) override - { - std::map> result; - - for (auto&& pr : obj) - { - const auto& version_value = pr.second; - VersionT version; - r.visit_in_key(version_value, pr.first, version, get_versiont_deserializer_instance()); - - result.emplace(pr.first.to_string(), std::move(version)); - } - - return std::move(result); - } - - static BaselineDeserializer instance; - }; - BaselineDeserializer BaselineDeserializer::instance; - struct VersionTDeserializer final : Json::IDeserializer { StringView type_name() const override { return "a version object"; } @@ -245,71 +176,4 @@ namespace namespace vcpkg { Json::IDeserializer& get_versiont_deserializer_instance() { return VersionTDeserializer::instance; } - - ExpectedS>> parse_baseline_file(Files::Filesystem& fs, - StringView baseline_name, - const fs::path& baseline_file_path) - { - if (!fs.exists(baseline_file_path)) - { - return Strings::format("Couldn't find `%s`", fs::u8string(baseline_file_path)); - } - - auto value = Json::parse_file(VCPKG_LINE_INFO, fs, baseline_file_path); - if (!value.first.is_object()) - { - return Strings::format("Error: `%s` does not have a top-level object.", fs::u8string(baseline_file_path)); - } - - const auto& obj = value.first.object(); - auto baseline_value = obj.get(baseline_name); - if (!baseline_value) - { - return Strings::format( - "Error: `%s` does not contain the baseline \"%s\"", fs::u8string(baseline_file_path), baseline_name); - } - - Json::Reader r; - std::map> result; - r.visit_in_key(*baseline_value, baseline_name, result, BaselineDeserializer::instance); - if (!r.errors().empty()) - { - return Strings::format( - "Error: failed to parse `%s`:\n%s", fs::u8string(baseline_file_path), Strings::join("\n", r.errors())); - } - return result; - } - - ExpectedS> parse_versions_file(Files::Filesystem& fs, - StringView port_name, - const fs::path& versions_file_path) - { - (void)port_name; - if (!fs.exists(versions_file_path)) - { - return Strings::format("Couldn't find the versions database file: %s", fs::u8string(versions_file_path)); - } - - auto versions_json = Json::parse_file(VCPKG_LINE_INFO, fs, versions_file_path); - if (!versions_json.first.is_object()) - { - return Strings::format("Error: `%s` does not have a top level object.", fs::u8string(versions_file_path)); - } - - const auto& versions_object = versions_json.first.object(); - auto maybe_versions_array = versions_object.get("versions"); - if (!maybe_versions_array || !maybe_versions_array->is_array()) - { - return Strings::format("Error: `%s` does not contain a versions array.", fs::u8string(versions_file_path)); - } - - std::vector db_entries; - // Avoid warning treated as error. - if (maybe_versions_array != nullptr) - { - Json::Reader r; - r.visit_in_key(*maybe_versions_array, "versions", db_entries, VersionDbEntryArrayDeserializer::instance); - } - return db_entries; - } } diff --git a/toolsrc/src/vcpkg/versions.cpp b/toolsrc/src/vcpkg/versions.cpp index 5ea2a8182e5f73..239c0e72859a0e 100644 --- a/toolsrc/src/vcpkg/versions.cpp +++ b/toolsrc/src/vcpkg/versions.cpp @@ -244,4 +244,4 @@ namespace vcpkg::Versions Checks::unreachable(VCPKG_LINE_INFO); } -} \ No newline at end of file +} From 788c4e2cba650691a8ce699a1c83b30d2ab38c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 21 Dec 2020 19:22:13 -0800 Subject: [PATCH 0341/1694] [ffmpeg] fix up the pkgconfig files (#15127) --- ports/ffmpeg/CONTROL | 2 +- ports/ffmpeg/portfile.cmake | 42 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 0667d882267826..49db6d023db2bb 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,6 +1,6 @@ Source: ffmpeg Version: 4.3.1 -Port-Version: 8 +Port-Version: 9 Homepage: https://ffmpeg.org 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. diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 9ba7de91bb9571..c41f37c7c12276 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -511,6 +511,48 @@ endif() vcpkg_copy_pdbs() +if (VCPKG_TARGET_IS_WINDOWS) + # Translate cygpath to local path + set(CYGPATH_CMD "${MSYS_ROOT}/usr/bin/cygpath.exe" -w) + + foreach(PKGCONFIG_PATH "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + file(GLOB PKGCONFIG_FILES "${PKGCONFIG_PATH}/*.pc") + foreach(PKGCONFIG_FILE IN LISTS PKGCONFIG_FILES) + file(READ "${PKGCONFIG_FILE}" PKGCONFIG_CONTENT) + foreach(PATH_NAME prefix libdir includedir) + string(REGEX MATCH "${PATH_NAME}=[^\n]*\n" PATH_VALUE "${PKGCONFIG_CONTENT}") + string(REPLACE "${PATH_NAME}=" "" PATH_VALUE "${PATH_VALUE}") + string(REPLACE "\n" "" PATH_VALUE "${PATH_VALUE}") + set("${PATH_NAME}_cygpath" "${PATH_VALUE}") + endforeach() + execute_process( + COMMAND ${CYGPATH_CMD} "${prefix_cygpath}" + OUTPUT_VARIABLE FIXED_PREFIX_PATH + ) + string(REPLACE "\n" "" FIXED_PREFIX_PATH "${FIXED_PREFIX_PATH}") + file(TO_CMAKE_PATH "${FIXED_PREFIX_PATH}" FIXED_PREFIX_PATH) + execute_process( + COMMAND ${CYGPATH_CMD} "${libdir_cygpath}" + OUTPUT_VARIABLE FIXED_LIBDIR_PATH + ) + string(REPLACE "\n" "" FIXED_LIBDIR_PATH ${FIXED_LIBDIR_PATH}) + file(TO_CMAKE_PATH ${FIXED_LIBDIR_PATH} FIXED_LIBDIR_PATH) + execute_process( + COMMAND ${CYGPATH_CMD} "${includedir_cygpath}" + OUTPUT_VARIABLE FIXED_INCLUDE_PATH + ) + string(REPLACE "\n" "" FIXED_INCLUDE_PATH "${FIXED_INCLUDE_PATH}") + file(TO_CMAKE_PATH ${FIXED_INCLUDE_PATH} FIXED_INCLUDE_PATH) + + vcpkg_replace_string("${PKGCONFIG_FILE}" "${prefix_cygpath}" "${FIXED_PREFIX_PATH}") + vcpkg_replace_string("${PKGCONFIG_FILE}" "${libdir_cygpath}" "${FIXED_LIBDIR_PATH}") + vcpkg_replace_string("${PKGCONFIG_FILE}" "${includedir_cygpath}" "${FIXED_INCLUDE_PATH}") + endforeach() + endforeach() +endif() + +vcpkg_fixup_pkgconfig() + # Handle copyright file(STRINGS ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-out.log LICENSE_STRING REGEX "License: .*" LIMIT_COUNT 1) if(LICENSE_STRING STREQUAL "License: LGPL version 2.1 or later") From c5692a33d8a13f9f59369c3b3f3fc2f026e1d3b7 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 22 Dec 2020 14:52:58 -0800 Subject: [PATCH 0342/1694] [opentracing] Update VMs 2020-12 (#15151) * Add meson from https://github.com/microsoft/vcpkg/pull/12860/ * Add autoconf-archive from https://github.com/microsoft/vcpkg/pull/13081/ * Add kf5windowsystem libs from https://github.com/microsoft/vcpkg/pull/13467/ * Open the FTP and SFTP ports from https://github.com/microsoft/vcpkg/pull/14412/ * Add libxcb-util0-dev from https://github.com/microsoft/vcpkg/pull/14678/ * Add libasound2-dev from https://github.com/microsoft/vcpkg/pull/14774 * Remove no longer necessary apt-mark calls. * Update nasm on Linux. * Fix longstanding bug where Storage was publicly accessible and change to generate SAS token rather than File Share * Delete no longer necessary azure storage firewall rules. * Install the newer Windows SDK with the VS installer instead of manually. * Install the VS2015 and VS2017 compilers. * Update Powershell-Core to 7.1.0. * Update source of WDK. * Update pools. * [opentracing] Repair arm64-windows failures caused by mojibake in `expected.hpp` and errors in opentracing-cpp's lint for arm64 where it thinks exceptions are disabled when they are enabled. Fixes: C:\Dev\vcpkg\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\3rd_party\include\opentracing/expected/expected.hpp(1): warning C4828: The file contains a character starting at offset 0x4a77 that is illegal in the current source character set (codepage 65001). Fixes: D:\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\include\opentracing/tracer.h:223:5: error: cannot use 'try' with exceptions disabled [clang-diagnostic-error] try { ^ * [mmloader] Patch out overrides of CMAKE_C_FLAGS and CMAKE_CXX_FLAGS that inserted /WX. Note that this port sets /GS-, possibly because it may be for authoring shellcode. * Bump storage API version to 2020-04-08. --- ports/mmloader/CONTROL | 8 -- ports/mmloader/fix_c_and_cxx_flags.patch | 32 ++++++ ports/mmloader/portfile.cmake | 9 +- ports/mmloader/vcpkg.json | 13 +++ ports/opentracing/CONTROL | 5 - ports/opentracing/portfile.cmake | 16 +-- ports/opentracing/repair_mojibake.patch | 59 +++++++++++ ports/opentracing/vcpkg.json | 8 ++ scripts/azure-pipelines/azure-pipelines.yml | 4 +- .../azure-pipelines/linux/azure-pipelines.yml | 2 +- scripts/azure-pipelines/linux/create-vmss.ps1 | 98 +++++++++++++------ .../azure-pipelines/linux/provision-image.sh | 42 +++----- .../azure-pipelines/test-modified-ports.ps1 | 39 ++++++-- .../azure-pipelines/windows-unstable/job.yml | 5 - .../windows/azure-pipelines.yml | 7 +- .../azure-pipelines/windows/create-vmss.ps1 | 83 +++++++++------- .../windows/initialize-environment.ps1 | 42 -------- .../windows/provision-image.txt | 72 ++++---------- scripts/ci.baseline.txt | 1 - scripts/vcpkgTools.xml | 8 +- toolsrc/src/vcpkg/base/downloads.cpp | 1 + 21 files changed, 311 insertions(+), 243 deletions(-) delete mode 100644 ports/mmloader/CONTROL create mode 100644 ports/mmloader/fix_c_and_cxx_flags.patch create mode 100644 ports/mmloader/vcpkg.json delete mode 100644 ports/opentracing/CONTROL create mode 100644 ports/opentracing/repair_mojibake.patch create mode 100644 ports/opentracing/vcpkg.json delete mode 100644 scripts/azure-pipelines/windows/initialize-environment.ps1 diff --git a/ports/mmloader/CONTROL b/ports/mmloader/CONTROL deleted file mode 100644 index e575560629f0cd..00000000000000 --- a/ports/mmloader/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: mmloader -Version: 2020-05-15 -Description: A library for loading dll module bypassing windows PE loader from memory (x86/x64) -Homepage: http://tishion.github.io/mmLoader/ -Supports: (x86|x64)&windows&static - -Feature: shellcode -Description: Generate mmLoader shell code headers diff --git a/ports/mmloader/fix_c_and_cxx_flags.patch b/ports/mmloader/fix_c_and_cxx_flags.patch new file mode 100644 index 00000000000000..501ce40cd7f880 --- /dev/null +++ b/ports/mmloader/fix_c_and_cxx_flags.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7a22b56..2ce1bd8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,24 +47,11 @@ set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CONFIGURATION_TYPES Debug Release) + + # Default compile flags +-set(CMAKE_CXX_FLAGS +- "/DWIN32 /D_WINDOWS /W3 /WX /GR /GS- /Gy /FAcs /Z7 /DEBUG" ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GS-" + CACHE STRING "default C++ compile flags" FORCE) +-set(CMAKE_CXX_FLAGS_DEBUG +- "/MTd /Ob0 /Od" +- CACHE STRING "default C++ compile flags for debug build" FORCE) +-set(CMAKE_CXX_FLAGS_RELEASE +- "/MT /O2 /Ob2 /DNDEBUG" +- CACHE STRING "default C++ compile flags for release build" FORCE) +-set(CMAKE_C_FLAGS +- "/DWIN32 /D_WINDOWS /W3 /WX /GR /GS- /Gy /FAcs /Z7 /DEBUG" ++set(CMAKE_C_FLAGS ++ "${CMAKE_C_FLAGS} /GS-" + CACHE STRING "default C++ compile flags" FORCE) +-set(CMAKE_C_FLAGS_DEBUG +- "/MTd /Ob0 /Od" +- CACHE STRING "default C++ compile flags for debug build" FORCE) +-set(CMAKE_C_FLAGS_RELEASE +- "/MT /O2 /Ob2 /DNDEBUG" +- CACHE STRING "default C++ compile flags for release build" FORCE) + + message(STATUS "CMAKE_CXX_FLAGS=" ${CMAKE_CXX_FLAGS}) + message(STATUS "CMAKE_CXX_FLAGS_DEBUG=" ${CMAKE_CXX_FLAGS_DEBUG}) diff --git a/ports/mmloader/portfile.cmake b/ports/mmloader/portfile.cmake index 2a3411ce34faec..c1f1684468af6a 100644 --- a/ports/mmloader/portfile.cmake +++ b/ports/mmloader/portfile.cmake @@ -1,4 +1,3 @@ - # fail early for unsupported triplets vcpkg_fail_port_install( MESSAGE "mmLoader supports only x86/x64-windows-static triplets" @@ -15,6 +14,8 @@ vcpkg_from_github( REF 1.0.0 SHA512 ceb2ab4b60d74209fa46d198cde6fd87a97d911abb875ac35383288a67828d0420bb38ff8d2f17dd4a3f46ba3abf554152d1246eeb05215258e8af64ac4a39de HEAD_REF master + PATCHES + fix_c_and_cxx_flags.patch ) # feature @@ -30,13 +31,13 @@ vcpkg_configure_cmake( ) # pre-clean -file(REMOVE_RECURSE ${SOURCE_PATH}/output) +file(REMOVE_RECURSE "${SOURCE_PATH}/output") # build and install vcpkg_install_cmake(DISABLE_PARALLEL) # remove the debug/include directory -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # collect license files -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/mmloader/vcpkg.json b/ports/mmloader/vcpkg.json new file mode 100644 index 00000000000000..a48ecb38b209a5 --- /dev/null +++ b/ports/mmloader/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "mmloader", + "version-string": "2020-05-15", + "port-version": 1, + "description": "A library for loading dll module bypassing windows PE loader from memory (x86/x64)", + "homepage": "http://tishion.github.io/mmLoader/", + "supports": "(x86 | x64) & windows & static", + "features": { + "shellcode": { + "description": "Generate mmLoader shell code headers" + } + } +} diff --git a/ports/opentracing/CONTROL b/ports/opentracing/CONTROL deleted file mode 100644 index 08c664f1b8a732..00000000000000 --- a/ports/opentracing/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: opentracing -Version: 1.6.0 -Description: C++ implementation of the OpenTracing API -Homepage: https://opentracing.io -Supports: !uwp \ No newline at end of file diff --git a/ports/opentracing/portfile.cmake b/ports/opentracing/portfile.cmake index 817b2a5a11f6e7..61c1516cb3f201 100644 --- a/ports/opentracing/portfile.cmake +++ b/ports/opentracing/portfile.cmake @@ -1,9 +1,7 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) - message(FATAL_ERROR "Error: UWP build is not supported.") -endif() +vcpkg_fail_port_install(ON_TARGET uwp) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set( LOCAL_OPTIONS + set(LOCAL_OPTIONS -DBUILD_STATIC_LIBS=OFF ) else() @@ -16,13 +14,15 @@ vcpkg_from_github( REPO opentracing/opentracing-cpp REF 4bb431f7728eaf383a07e86f9754a5b67575dab0 # v1.6.0 SHA512 1c69ff4cfd5f6037a48815367d3026c1bf06c3c49ebf232a64c43167385fb62e444c3b3224fc38f68ef0fdb378e3736db6ee6ba57160e6e578c87c09e92e527e + PATCHES + repair_mojibake.patch ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS - ${OPTIONS} + -DENABLE_LINTING=OFF ${LOCAL_OPTIONS} ) @@ -54,7 +54,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAM endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/opentracing RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Remove duplicate headers -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/opentracing/repair_mojibake.patch b/ports/opentracing/repair_mojibake.patch new file mode 100644 index 00000000000000..ae427e661aaea0 --- /dev/null +++ b/ports/opentracing/repair_mojibake.patch @@ -0,0 +1,59 @@ +From 31c92781ac953cb83963cfe5ac30324579fa7b2d Mon Sep 17 00:00:00 2001 +From: Billy Robert O'Neal III +Date: Fri, 18 Dec 2020 10:07:02 -0800 +Subject: [PATCH] Repair mojibake in expected.hpp + +The affected characters herein triggered warnings +C:\Dev\vcpkg\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\3rd_party\include\opentracing/expected/expected.hpp(1): warning C4828: The file contains a character starting at offset 0x4a77 that is illegal in the current source character set (codepage 65001). +--- + 3rd_party/include/opentracing/expected/expected.hpp | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/3rd_party/include/opentracing/expected/expected.hpp b/3rd_party/include/opentracing/expected/expected.hpp +index 8283a77..0d21d43 100644 +--- a/3rd_party/include/opentracing/expected/expected.hpp ++++ b/3rd_party/include/opentracing/expected/expected.hpp +@@ -778,13 +778,13 @@ class expected + // expected())),E> map(F&& func) ; + + // template +-// see below bind(F&& func); ++// 'see below' bind(F&& func); + + // template + // expected catch_error(F&& f); + + // template +-// see below then(F&& func); ++// 'see below' then(F&& func); + + private: + bool has_value_; +@@ -955,9 +955,9 @@ class expected + return ! has_value() && std::is_base_of< Ex, decltype( get_unexpected().value() ) >::value; + } + +-// template constexpr see below unwrap() const&; ++// template constexpr 'see below' unwrap() const&; + // +-// template see below unwrap() &&; ++// template 'see below' unwrap() &&; + + // factories + +@@ -968,13 +968,13 @@ class expected + // expected map(F&& func) ; + // + // template +-// see below bind(F&& func) ; ++// 'see below' bind(F&& func) ; + // + // template + // expected catch_error(F&& f); + // + // template +-// see below then(F&& func); ++// 'see below' then(F&& func); + + private: + bool has_value_; diff --git a/ports/opentracing/vcpkg.json b/ports/opentracing/vcpkg.json new file mode 100644 index 00000000000000..d61870038912f7 --- /dev/null +++ b/ports/opentracing/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "opentracing", + "version-string": "1.6.0", + "port-version": 1, + "description": "C++ implementation of the OpenTracing API", + "homepage": "https://opentracing.io", + "supports": "!uwp" +} diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index b7121bb08d9616..762c161ec008c3 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-2020-08-12' - linux-pool: 'PrLin-2020-08-12' + windows-pool: 'PrWin-2020-12-17' + linux-pool: 'PrLin-2020-12-16' osx-pool: 'PrOsx-2020-09-28' stages: diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index d7bd09fe2aeef7..018203a6a9c3c6 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -41,7 +41,7 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -ArchivesRoot /archives -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -UseEnvironmentSasToken -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' - bash: | df -h displayName: 'Report on Disk Space After Build' diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1 index 169a80fc938224..55484f29b6c13e 100755 --- a/scripts/azure-pipelines/linux/create-vmss.ps1 +++ b/scripts/azure-pipelines/linux/create-vmss.ps1 @@ -64,7 +64,9 @@ Write-Progress ` -Status 'Creating virtual network' ` -PercentComplete (100 / $TotalProgress * $CurrentProgress++) -$allowHttp = New-AzNetworkSecurityRuleConfig ` +$allFirewallRules = @() + +$allFirewallRules += New-AzNetworkSecurityRuleConfig ` -Name AllowHTTP ` -Description 'Allow HTTP(S)' ` -Access Allow ` @@ -76,49 +78,49 @@ $allowHttp = New-AzNetworkSecurityRuleConfig ` -DestinationAddressPrefix * ` -DestinationPortRange @(80, 443) -$allowDns = New-AzNetworkSecurityRuleConfig ` +$allFirewallRules += New-AzNetworkSecurityRuleConfig ` + -Name AllowSFTP ` + -Description 'Allow (S)FTP' ` + -Access Allow ` + -Protocol Tcp ` + -Direction Outbound ` + -Priority 1009 ` + -SourceAddressPrefix * ` + -SourcePortRange * ` + -DestinationAddressPrefix * ` + -DestinationPortRange @(21, 22) + +$allFirewallRules += New-AzNetworkSecurityRuleConfig ` -Name AllowDNS ` -Description 'Allow DNS' ` -Access Allow ` -Protocol * ` -Direction Outbound ` - -Priority 1009 ` + -Priority 1010 ` -SourceAddressPrefix * ` -SourcePortRange * ` -DestinationAddressPrefix * ` -DestinationPortRange 53 -$allowGit = New-AzNetworkSecurityRuleConfig ` +$allFirewallRules += New-AzNetworkSecurityRuleConfig ` -Name AllowGit ` -Description 'Allow git' ` -Access Allow ` -Protocol Tcp ` -Direction Outbound ` - -Priority 1010 ` + -Priority 1011 ` -SourceAddressPrefix * ` -SourcePortRange * ` -DestinationAddressPrefix * ` -DestinationPortRange 9418 -$allowStorage = New-AzNetworkSecurityRuleConfig ` - -Name AllowStorage ` - -Description 'Allow Storage' ` - -Access Allow ` - -Protocol * ` - -Direction Outbound ` - -Priority 1011 ` - -SourceAddressPrefix VirtualNetwork ` - -SourcePortRange * ` - -DestinationAddressPrefix Storage ` - -DestinationPortRange * - -$denyEverythingElse = New-AzNetworkSecurityRuleConfig ` +$allFirewallRules += New-AzNetworkSecurityRuleConfig ` -Name DenyElse ` -Description 'Deny everything else' ` -Access Deny ` -Protocol * ` -Direction Outbound ` - -Priority 1012 ` + -Priority 1013 ` -SourceAddressPrefix * ` -SourcePortRange * ` -DestinationAddressPrefix * ` @@ -129,13 +131,14 @@ $NetworkSecurityGroup = New-AzNetworkSecurityGroup ` -Name $NetworkSecurityGroupName ` -ResourceGroupName $ResourceGroupName ` -Location $Location ` - -SecurityRules @($allowHttp, $allowDns, $allowGit, $allowStorage, $denyEverythingElse) + -SecurityRules $allFirewallRules $SubnetName = $ResourceGroupName + 'Subnet' $Subnet = New-AzVirtualNetworkSubnetConfig ` -Name $SubnetName ` -AddressPrefix "10.0.0.0/16" ` - -NetworkSecurityGroup $NetworkSecurityGroup + -NetworkSecurityGroup $NetworkSecurityGroup ` + -ServiceEndpoint "Microsoft.Storage" $VirtualNetworkName = $ResourceGroupName + 'Network' $VirtualNetwork = New-AzVirtualNetwork ` @@ -170,8 +173,31 @@ $StorageContext = New-AzStorageContext ` -StorageAccountName $StorageAccountName ` -StorageAccountKey $StorageAccountKey -New-AzStorageShare -Name 'archives' -Context $StorageContext -Set-AzStorageShareQuota -ShareName 'archives' -Context $StorageContext -Quota 1024 +New-AzStorageContainer -Name archives -Context $StorageContext -Permission Off +$StartTime = [DateTime]::Now +$ExpiryTime = $StartTime.AddMonths(6) + +$SasToken = New-AzStorageAccountSASToken ` + -Service Blob ` + -Permission "racwdlup" ` + -Context $StorageContext ` + -StartTime $StartTime ` + -ExpiryTime $ExpiryTime ` + -ResourceType Service,Container,Object ` + -Protocol HttpsOnly + +$SasToken = $SasToken.Substring(1) # strip leading ? + +# Note that we put the storage account into the firewall after creating the above SAS token or we +# would be denied since the person running this script isn't one of the VMs we're creating here. +Set-AzStorageAccount ` + -ResourceGroupName $ResourceGroupName ` + -AccountName $StorageAccountName ` + -NetworkRuleSet ( ` + @{bypass="AzureServices"; ` + virtualNetworkRules=( ` + @{VirtualNetworkResourceId=$VirtualNetwork.Subnets[0].Id;Action="allow"}); ` + defaultAction="Deny"}) #################################################################################################### Write-Progress ` @@ -220,15 +246,23 @@ Write-Progress ` -Status 'Running provisioning script provision-image.sh in VM' ` -PercentComplete (100 / $TotalProgress * $CurrentProgress++) -$ProvisionImageResult = Invoke-AzVMRunCommand ` - -ResourceGroupName $ResourceGroupName ` - -VMName $ProtoVMName ` - -CommandId 'RunShellScript' ` - -ScriptPath "$PSScriptRoot\provision-image.sh" ` - -Parameter @{StorageAccountName=$StorageAccountName; ` - StorageAccountKey=$StorageAccountKey;} - -Write-Host "provision-image.sh output: $($ProvisionImageResult.value.Message)" +$tempScript = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName() + ".sh" +try { + $script = Get-Content "$PSScriptRoot\provision-image.sh" -Encoding utf8NoBOM + $script += "echo `"PROVISIONED_AZURE_STORAGE_NAME=\`"$StorageAccountName\`"`" | sudo tee -a /etc/environment" + $script += "echo `"PROVISIONED_AZURE_STORAGE_SAS_TOKEN=\`"$SasToken\`"`" | sudo tee -a /etc/environment" + Set-Content -Path $tempScript -Value $script -Encoding utf8NoBOM + + $ProvisionImageResult = Invoke-AzVMRunCommand ` + -ResourceGroupName $ResourceGroupName ` + -VMName $ProtoVMName ` + -CommandId 'RunShellScript' ` + -ScriptPath $tempScript + + Write-Host "provision-image.sh output: $($ProvisionImageResult.value.Message)" +} finally { + Remove-Item $tempScript -Recurse -Force +} #################################################################################################### Write-Progress ` diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 4936cf719074b5..c04f4b3caac191 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -11,11 +11,12 @@ APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \ libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev \ 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 libgles2-mesa-dev ruby-full pkg-config" + xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \ + pkg-config meson" # Additionally required by qt5-base APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \ - libxcb1-dev libx11-xcb-dev libxcb-glx0-dev" + libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev" # Additionally required by qt5-base for qt5-x11extras APT_PACKAGES="$APT_PACKAGES libxkbcommon-dev libxcb-keysyms1-dev \ @@ -26,31 +27,29 @@ APT_PACKAGES="$APT_PACKAGES libxkbcommon-dev libxcb-keysyms1-dev \ # Additionally required by libhdfs3 APT_PACKAGES="$APT_PACKAGES libkrb5-dev" +# Additionally required by kf5windowsystem +APT_PACKAGES="$APT_PACKAGES libxcb-res0-dev" + # Additionally required by mesa APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-mako" # Additionally required by some packages to install additional python packages APT_PACKAGES="$APT_PACKAGES python3-pip" +# Additionally required by rtaudio +APT_PACKAGES="$APT_PACKAGES libasound2-dev" + # Additionally required/installed by Azure DevOps Scale Set Agents APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu60" sudo apt -y install $APT_PACKAGES -# Delete /etc/debian_version to prevent Azure Pipelines Scale Set Agents from -# removing some of the above -sudo apt-mark hold libcurl4 -sudo apt-mark hold liblttng-ust0 -sudo apt-mark hold libkrb5-3 -sudo apt-mark hold zlib1g -sudo apt-mark hold libicu60 - # 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.14.02/nasm-2.14.02.tar.gz -tar -xf nasm-2.14.02.tar.gz -cd nasm-2.14.02/ +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 sudo make install cd ~ @@ -75,19 +74,4 @@ sudo apt update sudo add-apt-repository universe sudo apt install -y powershell -if [ -z "$StorageAccountName" ]; then -echo "No storage account supplied, skipping." -else -echo "Mapping storage account" - -# Write SMB credentials -sudo mkdir /etc/smbcredentials -smbCredentialFile=/etc/smbcredentials/$StorageAccountName.cred -echo "username=$StorageAccountName" | sudo tee $smbCredentialFile > /dev/null -echo "password=$StorageAccountKey" | sudo tee -a $smbCredentialFile > /dev/null -sudo chmod 600 $smbCredentialFile - -# Mount the archives SMB share to /archives -sudo mkdir /archives -m=777 -echo "//$StorageAccountName.file.core.windows.net/archives /archives cifs nofail,vers=3.0,credentials=$smbCredentialFile,serverino,dir_mode=0777,file_mode=0777 0 0" | sudo tee -a /etc/fstab -fi +# provision-image.ps1 will append installation of the SAS token here diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 98ffbf53a9f0b3..546545579e4a24 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -18,14 +18,17 @@ The Azure Pipelines artifacts directory. If not supplied, defaults to the curren .PARAMETER ArchivesRoot Equivalent to '-BinarySourceStub "files,$ArchivesRoot"' +.PARAMETER UseEnvironmentSasToken +Equivalent to '-BinarySourceStub "x-azblob,https://$($env:PROVISIONED_AZURE_STORAGE_NAME).blob.core.windows.net/archives,$($env:PROVISIONED_AZURE_STORAGE_SAS_TOKEN)"' + .PARAMETER BinarySourceStub The type and parameters of the binary source. Shared across runs of this script. If this parameter is not set, binary caching will not be used. Example: "files,W:\" .PARAMETER BuildReason The reason Azure Pipelines is running this script (controls in which mode Binary Caching is used). -If ArchivesRoot is not set, this parameter has no effect. If ArchivesRoot is set and this is not, -binary caching will default to read-write mode. +If BinarySourceStub is not set, this parameter has no effect. If BinarySourceStub is set and this is +not, binary caching will default to read-write mode. #> [CmdletBinding(DefaultParameterSetName="ArchivesRoot")] @@ -40,6 +43,8 @@ Param( $ArtifactStagingDirectory = '.', [Parameter(ParameterSetName='ArchivesRoot')] $ArchivesRoot = $null, + [switch] + $UseEnvironmentSasToken = $false, [Parameter(ParameterSetName='BinarySourceStub')] $BinarySourceStub = $null, $BuildReason = $null @@ -50,12 +55,32 @@ if (-Not (Test-Path "triplets/$Triplet.cmake")) { throw } +$usingBinaryCaching = $true +if ([string]::IsNullOrWhiteSpace($BinarySourceStub)) { + if ([string]::IsNullOrWhiteSpace($ArchivesRoot)) { + if ($UseEnvironmentSasToken) { + $BinarySourceStub = "x-azblob,https://$($env:PROVISIONED_AZURE_STORAGE_NAME).blob.core.windows.net/archives,$($env:PROVISIONED_AZURE_STORAGE_SAS_TOKEN)" + } else { + $usingBinaryCaching = $false + } + } else { + if ($UseEnvironmentSasToken) { + Write-Error "Only one binary caching setting may be used." + throw + } else { + $BinarySourceStub = "files,$ArchivesRoot" + } + } +} elseif ((-Not [string]::IsNullOrWhiteSpace($ArchivesRoot)) -Or $UseEnvironmentSasToken) { + Write-Error "Only one binary caching setting may be used." + throw +} + $env:VCPKG_DOWNLOADS = Join-Path $WorkingRoot 'downloads' $buildtreesRoot = Join-Path $WorkingRoot 'buildtrees' $installRoot = Join-Path $WorkingRoot 'installed' $packagesRoot = Join-Path $WorkingRoot 'packages' -$usingBinaryCaching = -Not ([string]::IsNullOrWhiteSpace($ArchivesRoot)) -Or -Not ([string]::IsNullOrWhiteSpace($BinarySourceStub)) $commonArgs = @() if ($usingBinaryCaching) { $commonArgs += @('--binarycaching') @@ -84,12 +109,8 @@ if ($usingBinaryCaching) { Write-Host "Build reason was $BuildReason, using binary caching in write only mode." $binaryCachingMode = 'write' } - if ([string]::IsNullOrWhiteSpace($ArchivesRoot)) { - $commonArgs += @("--binarysource=clear;$BinarySourceStub,$binaryCachingMode") - } - else { - $commonArgs += @("--binarysource=clear;files,$ArchivesRoot,$binaryCachingMode") - } + + $commonArgs += @("--binarysource=clear;$BinarySourceStub,$binaryCachingMode") } if ($Triplet -eq 'x64-linux') { diff --git a/scripts/azure-pipelines/windows-unstable/job.yml b/scripts/azure-pipelines/windows-unstable/job.yml index 0907ca6d94cdc4..256990e5eb4f6b 100644 --- a/scripts/azure-pipelines/windows-unstable/job.yml +++ b/scripts/azure-pipelines/windows-unstable/job.yml @@ -56,11 +56,6 @@ 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: 'Initialize Environment' - inputs: - filePath: 'scripts/azure-pipelines/windows/initialize-environment.ps1' - pwsh: true - task: PowerShell@2 displayName: 'Report on Disk Space' condition: always() diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 069c2e0952a46d..b9bf49e227a680 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -16,11 +16,6 @@ jobs: value: D:\downloads steps: - - task: PowerShell@2 - displayName: 'Initialize Environment' - inputs: - filePath: 'scripts/azure-pipelines/windows/initialize-environment.ps1' - pwsh: true - task: PowerShell@2 displayName: 'Report on Disk Space' condition: always() @@ -57,7 +52,7 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -ArchivesRoot W:\ -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -UseEnvironmentSasToken -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' pwsh: true - task: PowerShell@2 displayName: 'Report on Disk Space After Build' diff --git a/scripts/azure-pipelines/windows/create-vmss.ps1 b/scripts/azure-pipelines/windows/create-vmss.ps1 index 1fcec50ed2fb8a..608465100f6dfe 100644 --- a/scripts/azure-pipelines/windows/create-vmss.ps1 +++ b/scripts/azure-pipelines/windows/create-vmss.ps1 @@ -70,7 +70,9 @@ Write-Progress ` -Status 'Creating virtual network' ` -PercentComplete (100 / $TotalProgress * $CurrentProgress++) -$allowHttp = New-AzNetworkSecurityRuleConfig ` +$allFirewallRules = @() + +$allFirewallRules += New-AzNetworkSecurityRuleConfig ` -Name AllowHTTP ` -Description 'Allow HTTP(S)' ` -Access Allow ` @@ -82,75 +84,67 @@ $allowHttp = New-AzNetworkSecurityRuleConfig ` -DestinationAddressPrefix * ` -DestinationPortRange @(80, 443) -$allowDns = New-AzNetworkSecurityRuleConfig ` +$allFirewallRules += New-AzNetworkSecurityRuleConfig ` + -Name AllowSFTP ` + -Description 'Allow (S)FTP' ` + -Access Allow ` + -Protocol Tcp ` + -Direction Outbound ` + -Priority 1009 ` + -SourceAddressPrefix * ` + -SourcePortRange * ` + -DestinationAddressPrefix * ` + -DestinationPortRange @(21, 22) + +$allFirewallRules += New-AzNetworkSecurityRuleConfig ` -Name AllowDNS ` -Description 'Allow DNS' ` -Access Allow ` -Protocol * ` -Direction Outbound ` - -Priority 1009 ` + -Priority 1010 ` -SourceAddressPrefix * ` -SourcePortRange * ` -DestinationAddressPrefix * ` -DestinationPortRange 53 -$allowGit = New-AzNetworkSecurityRuleConfig ` +$allFirewallRules += New-AzNetworkSecurityRuleConfig ` -Name AllowGit ` -Description 'Allow git' ` -Access Allow ` -Protocol Tcp ` -Direction Outbound ` - -Priority 1010 ` + -Priority 1011 ` -SourceAddressPrefix * ` -SourcePortRange * ` -DestinationAddressPrefix * ` -DestinationPortRange 9418 -if (-Not $Unstable) { - $allowStorage = New-AzNetworkSecurityRuleConfig ` - -Name AllowStorage ` - -Description 'Allow Storage' ` - -Access Allow ` - -Protocol * ` - -Direction Outbound ` - -Priority 1011 ` - -SourceAddressPrefix VirtualNetwork ` - -SourcePortRange * ` - -DestinationAddressPrefix Storage ` - -DestinationPortRange * -} - -$denyEverythingElse = New-AzNetworkSecurityRuleConfig ` +$allFirewallRules += New-AzNetworkSecurityRuleConfig ` -Name DenyElse ` -Description 'Deny everything else' ` -Access Deny ` -Protocol * ` -Direction Outbound ` - -Priority 1012 ` + -Priority 1013 ` -SourceAddressPrefix * ` -SourcePortRange * ` -DestinationAddressPrefix * ` -DestinationPortRange * $NetworkSecurityGroupName = $ResourceGroupName + 'NetworkSecurity' -$securityRules = @($allowHttp, $allowDns, $allowGit); -if (-Not $Unstable) { - $securityRules += @($allowStorage) -} - -$securityRules += @($denyEverythingElse) - $NetworkSecurityGroup = New-AzNetworkSecurityGroup ` -Name $NetworkSecurityGroupName ` -ResourceGroupName $ResourceGroupName ` -Location $Location ` - -SecurityRules $securityRules + -SecurityRules $allFirewallRules $SubnetName = $ResourceGroupName + 'Subnet' $Subnet = New-AzVirtualNetworkSubnetConfig ` -Name $SubnetName ` -AddressPrefix "10.0.0.0/16" ` - -NetworkSecurityGroup $NetworkSecurityGroup + -NetworkSecurityGroup $NetworkSecurityGroup ` + -ServiceEndpoint "Microsoft.Storage" $VirtualNetworkName = $ResourceGroupName + 'Network' $VirtualNetwork = New-AzVirtualNetwork ` @@ -186,8 +180,31 @@ if (-Not $Unstable) { -StorageAccountName $StorageAccountName ` -StorageAccountKey $StorageAccountKey - New-AzStorageShare -Name 'archives' -Context $StorageContext - Set-AzStorageShareQuota -ShareName 'archives' -Context $StorageContext -Quota 2048 + New-AzStorageContainer -Name archives -Context $StorageContext -Permission Off + $StartTime = [DateTime]::Now + $ExpiryTime = $StartTime.AddMonths(6) + + $SasToken = New-AzStorageAccountSASToken ` + -Service Blob ` + -Permission "racwdlup" ` + -Context $StorageContext ` + -StartTime $StartTime ` + -ExpiryTime $ExpiryTime ` + -ResourceType Service,Container,Object ` + -Protocol HttpsOnly + + $SasToken = $SasToken.Substring(1) # strip leading ? + + # Note that we put the storage account into the firewall after creating the above SAS token or we + # would be denied since the person running this script isn't one of the VMs we're creating here. + Set-AzStorageAccount ` + -ResourceGroupName $ResourceGroupName ` + -AccountName $StorageAccountName ` + -NetworkRuleSet ( ` + @{bypass="AzureServices"; ` + virtualNetworkRules=( ` + @{VirtualNetworkResourceId=$VirtualNetwork.Subnets[0].Id;Action="allow"}); ` + defaultAction="Deny"}) } #################################################################################################### @@ -234,7 +251,7 @@ Write-Progress ` $provisionParameters = @{AdminUserPassword = $AdminPW;} if (-Not $Unstable) { $provisionParameters['StorageAccountName'] = $StorageAccountName - $provisionParameters['StorageAccountKey'] = $StorageAccountKey + $provisionParameters['StorageAccountSasToken'] = $SasToken } $ProvisionImageResult = Invoke-AzVMRunCommand ` diff --git a/scripts/azure-pipelines/windows/initialize-environment.ps1 b/scripts/azure-pipelines/windows/initialize-environment.ps1 deleted file mode 100644 index 24520802e4f66a..00000000000000 --- a/scripts/azure-pipelines/windows/initialize-environment.ps1 +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: MIT -# -<# -.SYNOPSIS -Sets up the environment to run other vcpkg CI steps in an Azure Pipelines job. - -.DESCRIPTION -This script maps network drives from infrastructure and cleans out anything that -might have been leftover from a previous run. -#> - -if ([string]::IsNullOrWhiteSpace($env:StorageAccountName) -or [string]::IsNullOrWhiteSpace($env:StorageAccountKey)) { - Write-Host 'No storage account and/or key set, skipping mount of W:\' -} else { - $StorageAccountName = $env:StorageAccountName - $StorageAccountKey = $env:StorageAccountKey - - Write-Host 'Setting up archives mount' - if (-Not (Test-Path W:)) { - net use W: "\\$StorageAccountName.file.core.windows.net\archives" /u:"AZURE\$StorageAccountName" $StorageAccountKey - } -} - -Write-Host 'Creating downloads directory' -mkdir D:\downloads -ErrorAction SilentlyContinue - -# Delete entries in the downloads folder, except: -# those in the 'tools' folder -# those last accessed in the last 30 days -Get-ChildItem -Path D:\downloads -Exclude "tools" ` - | Where-Object{ $_.LastAccessTime -lt (get-Date).AddDays(-30) } ` - | ForEach-Object{Remove-Item -Path $_ -Recurse -Force} - -# Msys sometimes leaves a database lock file laying around, especially if there was a failed job -# which causes unrelated failures in jobs that run later on the machine. -# work around this by just removing the vcpkg installed msys2 if it exists -if( Test-Path D:\downloads\tools\msys2 ) -{ - Write-Host "removing previously installed msys2" - Remove-Item D:\downloads\tools\msys2 -Recurse -Force -} diff --git a/scripts/azure-pipelines/windows/provision-image.txt b/scripts/azure-pipelines/windows/provision-image.txt index b43b1bf87c198c..e3e04be28e0df6 100644 --- a/scripts/azure-pipelines/windows/provision-image.txt +++ b/scripts/azure-pipelines/windows/provision-image.txt @@ -20,17 +20,18 @@ The administrator user's password; if this is $null, or not passed, then the script assumes it's running on an administrator account. .PARAMETER StorageAccountName -The name of the storage account. Stored in the environment variable %StorageAccountName%. +The name of the storage account. Stored in the environment variable %PROVISIONED_AZURE_STORAGE_NAME%. Used by the CI system to access the global storage. -.PARAMETER StorageAccountKey -The key of the storage account. Stored in the environment variable %StorageAccountKey%. +.PARAMETER StorageAccountSasToken +The SAS token to access the storage account. Stored in the environment variable +%PROVISIONED_AZURE_STORAGE_SAS_TOKEN%. Used by the CI system to access the global storage. #> param( [string]$AdminUserPassword = $null, [string]$StorageAccountName = $null, - [string]$StorageAccountKey = $null + [string]$StorageAccountSasToken = $null ) $ErrorActionPreference = 'Stop' @@ -88,9 +89,9 @@ if ([string]::IsNullOrEmpty($AdminUserPassword)) { $PsExecArgs += $StorageAccountName } - if (-Not ([string]::IsNullOrWhiteSpace($StorageAccountKey))) { - $PsExecArgs += '-StorageAccountKey' - $PsExecArgs += $StorageAccountKey + if (-Not ([string]::IsNullOrWhiteSpace($StorageAccountSasToken))) { + $PsExecArgs += '-StorageAccountSasToken' + $PsExecArgs += $StorageAccountSasToken } Write-Host "Executing: $PsExecPath $PsExecArgs" @@ -114,15 +115,16 @@ $Workloads = @( 'Microsoft.VisualStudio.Component.VC.ATLMFC', 'Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre', 'Microsoft.VisualStudio.Component.Windows10SDK.18362', + 'Microsoft.VisualStudio.Component.Windows10SDK.19041', 'Microsoft.Net.Component.4.8.SDK', 'Microsoft.Component.NetFX.Native', 'Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset', - 'Microsoft.VisualStudio.Component.VC.Llvm.Clang' + 'Microsoft.VisualStudio.Component.VC.Llvm.Clang', + 'Microsoft.VisualStudio.Component.VC.v141.x86.x64', + 'Microsoft.VisualStudio.Component.VC.140' ) -$WindowsSDKUrl = 'https://download.microsoft.com/download/1/c/3/1c3d5161-d9e9-4e4b-9b43-b70fe8be268c/windowssdk/winsdksetup.exe' - -$WindowsWDKUrl = 'https://download.microsoft.com/download/1/a/7/1a730121-7aa7-46f7-8978-7db729aa413d/wdk/wdksetup.exe' +$WindowsWDKUrl = 'https://go.microsoft.com/fwlink/?linkid=2128854' $MpiUrl = 'https://download.microsoft.com/download/a/5/2/a5207ca5-1203-491a-8fb8-906fd68ae623/msmpisetup.exe' @@ -133,7 +135,7 @@ $CudaFeatures = 'nvcc_10.1 cuobjdump_10.1 nvprune_10.1 cupti_10.1 gpu_library_ad 'cusparse_dev_10.1 nvgraph_10.1 nvgraph_dev_10.1 npp_10.1 npp_dev_10.1 nvrtc_10.1 nvrtc_dev_10.1 nvml_dev_10.1 ' + ` 'occupancy_calculator_10.1 fortran_examples_10.1' -$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.0.3/PowerShell-7.0.3-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.1.0/PowerShell-7.1.0-win-x64.msi' $ErrorActionPreference = 'Stop' $ProgressPreference = 'SilentlyContinue' @@ -294,43 +296,6 @@ Function InstallZip { } } -<# -.SYNOPSIS -Installs Windows SDK version 2004 - -.DESCRIPTION -Downloads the Windows SDK installer located at $Url, and installs it with the -correct flags. - -.PARAMETER Url -The URL of the installer. -#> -Function InstallWindowsSDK { - Param( - [String]$Url - ) - - try { - Write-Host 'Downloading Windows SDK...' - [string]$installerPath = Get-TempFilePath -Extension 'exe' - curl.exe -L -o $installerPath -s -S $Url - Write-Host 'Installing Windows SDK...' - $proc = Start-Process -FilePath $installerPath -ArgumentList @('/features', '+', '/q') -Wait -PassThru - $exitCode = $proc.ExitCode - if ($exitCode -eq 0) { - Write-Host 'Installation successful!' - } - else { - Write-Error "Installation failed! Exited with $exitCode." - throw - } - } - catch { - Write-Error "Failed to install Windows SDK! $($_.Exception.Message)" - throw - } -} - <# .SYNOPSIS Installs Windows WDK version 2004 @@ -467,7 +432,6 @@ if ($null -eq $av) { } InstallVisualStudio -Workloads $Workloads -BootstrapperUrl $VisualStudioBootstrapperUrl -Nickname 'Stable' -InstallWindowsSDK -Url $WindowsSDKUrl InstallWindowsWDK -Url $WindowsWDKUrl InstallMpi -Url $MpiUrl InstallCuda -Url $CudaUrl -Features $CudaFeatures @@ -477,14 +441,14 @@ if ([string]::IsNullOrWhiteSpace($StorageAccountName)) { } else { Write-Host 'Storing storage account name to environment' Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' ` - -Name StorageAccountName ` + -Name PROVISIONED_AZURE_STORAGE_NAME ` -Value $StorageAccountName } -if ([string]::IsNullOrWhiteSpace($StorageAccountKey)) { +if ([string]::IsNullOrWhiteSpace($StorageAccountSasToken)) { Write-Host 'No storage account key configured.' } else { Write-Host 'Storing storage account key to environment' Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' ` - -Name StorageAccountKey ` - -Value $StorageAccountKey + -Name PROVISIONED_AZURE_STORAGE_SAS_TOKEN ` + -Value $StorageAccountSasToken } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 21d28b38c063c8..088f09ca2ac4cc 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1315,7 +1315,6 @@ rpclib:arm-uwp=fail rpclib:x64-uwp=fail rsocket:x64-windows=fail rsocket:x64-windows-static=fail -rtaudio:x64-linux=fail rtlsdr:x64-uwp=fail rtlsdr:arm64-windows=fail rtlsdr:arm-uwp=fail diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 04f5d192c4274f..4e20684aecb75a 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -134,10 +134,10 @@ ninja-freebsd-1.8.2.zip - 7.0.3 + 7.1.0 pwsh.exe - https://github.com/PowerShell/PowerShell/releases/download/v7.0.3/PowerShell-7.0.3-win-x86.zip - 2e410fc5e429fc6ad478976eff3efcffe9d53a0620c7c31c2b8bfe1f0976cade74632fc202bf58959cec111f03b824ba42ad4d74c8a66d67ec21bbfe9b9c626d - PowerShell-7.0.3-win-x86.zip + https://github.com/PowerShell/PowerShell/releases/download/v7.1.0/PowerShell-7.1.0-win-x86.zip + ea6ed619c784af65b09a5e98cdfc0d41333ba7373b7409e488ec70aaf1e0c4e5568e846d2b1748d72c3e3a9c1a4827f0ba29e9f6e93e79b4f49312ca40af6d2a + PowerShell-7.1.0-win-x86.zip diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp index e263f703758423..50c4c2a0a617a3 100644 --- a/toolsrc/src/vcpkg/base/downloads.cpp +++ b/toolsrc/src/vcpkg/base/downloads.cpp @@ -303,6 +303,7 @@ namespace vcpkg::Downloads cmd.string_arg("-w").string_arg(Strings::concat("\\n", guid_marker, "%{http_code}")); cmd.string_arg(url); cmd.string_arg("-T").path_arg(file); + cmd.string_arg("-H").string_arg("x-ms-version: 2020-04-08"); cmd.string_arg("-H").string_arg("x-ms-blob-type: BlockBlob"); int code = 0; auto res = System::cmd_execute_and_stream_lines(cmd, [&code](const std::string& line) { From 1553c966f8adce184639517d315a4b04c62c723a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Wed, 23 Dec 2020 02:19:18 -0500 Subject: [PATCH 0343/1694] [many ports] add GnuPG libraries (#13950) --- ports/gpgme/CONTROL | 10 ++++++ ports/gpgme/disable-docs.patch | 13 ++++++++ ports/gpgme/disable-tests.patch | 51 +++++++++++++++++++++++++++++ ports/gpgme/portfile.cmake | 35 ++++++++++++++++++++ ports/libassuan/CONTROL | 6 ++++ ports/libassuan/fix-pkgconfig.patch | 11 +++++++ ports/libassuan/portfile.cmake | 27 +++++++++++++++ ports/libgcrypt/CONTROL | 6 ++++ ports/libgcrypt/fix-pkgconfig.patch | 11 +++++++ ports/libgcrypt/portfile.cmake | 27 +++++++++++++++ ports/libgpg-error/CONTROL | 5 +++ ports/libgpg-error/portfile.cmake | 25 ++++++++++++++ 12 files changed, 227 insertions(+) create mode 100644 ports/gpgme/CONTROL create mode 100644 ports/gpgme/disable-docs.patch create mode 100644 ports/gpgme/disable-tests.patch create mode 100644 ports/gpgme/portfile.cmake create mode 100644 ports/libassuan/CONTROL create mode 100644 ports/libassuan/fix-pkgconfig.patch create mode 100644 ports/libassuan/portfile.cmake create mode 100644 ports/libgcrypt/CONTROL create mode 100644 ports/libgcrypt/fix-pkgconfig.patch create mode 100644 ports/libgcrypt/portfile.cmake create mode 100644 ports/libgpg-error/CONTROL create mode 100644 ports/libgpg-error/portfile.cmake diff --git a/ports/gpgme/CONTROL b/ports/gpgme/CONTROL new file mode 100644 index 00000000000000..90c025ce5b01df --- /dev/null +++ b/ports/gpgme/CONTROL @@ -0,0 +1,10 @@ +Source: gpgme +Version: 1.14.0 +Homepage: https://gnupg.org/software/gpgme/index.html +Description: A library designed to make access to GnuPG easier for applications +Build-Depends: libgpg-error, libassuan +Default-Features: cpp +Supports: !windows + +Feature: cpp +Description: C++ bindings diff --git a/ports/gpgme/disable-docs.patch b/ports/gpgme/disable-docs.patch new file mode 100644 index 00000000000000..b45ca6ec618122 --- /dev/null +++ b/ports/gpgme/disable-docs.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index 1772d69..9bf9863 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -45,7 +45,7 @@ else + tests = + endif + +-SUBDIRS = src ${tests} doc lang ++SUBDIRS = src ${tests} lang + + # Fix the version of the spec file. + dist-hook: gen-ChangeLog diff --git a/ports/gpgme/disable-tests.patch b/ports/gpgme/disable-tests.patch new file mode 100644 index 00000000000000..c7158508f82eb9 --- /dev/null +++ b/ports/gpgme/disable-tests.patch @@ -0,0 +1,51 @@ +From b05747aea79083106b27ac7d829db3e65e192682 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Thu, 29 Oct 2020 13:23:56 -0400 +Subject: [PATCH] cpp,python: Respect --disable-gpg-test for tests + +* lang/cpp/Makefile.am: Respect --disable-gpg-test +* lang/python/Makefile.am: Respect --disable-gpg-test + +This is similar to the qt that had it already enabled +--- + lang/cpp/Makefile.am | 8 +++++++- + lang/python/Makefile.am | 8 +++++++- + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/lang/cpp/Makefile.am b/lang/cpp/Makefile.am +index 724da6ca..70ca7462 100644 +--- a/lang/cpp/Makefile.am ++++ b/lang/cpp/Makefile.am +@@ -18,6 +18,12 @@ + # License along with this program; if not, see . + # SPDX-License-Identifier: LGPL-2.1-or-later + +-SUBDIRS = src tests ++if RUN_GPG_TESTS ++tests = tests ++else ++tests = ++endif ++ ++SUBDIRS = src ${tests} + + EXTRA_DIST = README +diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am +index 845b7b17..68b98e8e 100644 +--- a/lang/python/Makefile.am ++++ b/lang/python/Makefile.am +@@ -23,7 +23,13 @@ EXTRA_DIST = \ + gpgme.i \ + helpers.c helpers.h private.h + +-SUBDIRS = . tests examples doc src ++if RUN_GPG_TESTS ++tests = tests ++else ++tests = ++endif ++ ++SUBDIRS = . ${tests} examples doc src + + .PHONY: prepare + prepare: copystamp diff --git a/ports/gpgme/portfile.cmake b/ports/gpgme/portfile.cmake new file mode 100644 index 00000000000000..bf4c34bbbcd3a0 --- /dev/null +++ b/ports/gpgme/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platform" ON_TARGET "Windows") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gpg/gpgme + REF gpgme-1.14.0 + SHA512 b4608fd1d9a4122d8886917274e323afc9a30494c13a3dea51e17e9779f925bf8d67e584434d6a13018f274a6cbcf0a5e36f2fea794a065906bbb556b765398e + HEAD_REF master + PATCHES + disable-tests.patch + disable-docs.patch +) + +list(REMOVE_ITEM FEATURES core) +string(REPLACE ";" "," LANGUAGES "${FEATURES}") + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + --disable-gpgconf-test + --disable-gpg-test + --disable-gpgsm-test + --disable-g13-test + --enable-languages=${LANGUAGES} + --with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error + --with-libassuan-prefix=${CURRENT_INSTALLED_DIR}/tools/libassuan +) + +vcpkg_install_make() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Gpgmepp) +vcpkg_copy_pdbs() + +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/libassuan/CONTROL b/ports/libassuan/CONTROL new file mode 100644 index 00000000000000..e6bb54b5fd33d1 --- /dev/null +++ b/ports/libassuan/CONTROL @@ -0,0 +1,6 @@ +Source: libassuan +Version: 2.5.3 +Homepage: https://gnupg.org/software/libassuan/index.html +Description: A library implementing the so-called Assuan protocol +Build-Depends: libgpg-error +Supports: !windows diff --git a/ports/libassuan/fix-pkgconfig.patch b/ports/libassuan/fix-pkgconfig.patch new file mode 100644 index 00000000000000..8b8672e03e6abd --- /dev/null +++ b/ports/libassuan/fix-pkgconfig.patch @@ -0,0 +1,11 @@ +diff --git a/src/libassuan.pc.in b/src/libassuan.pc.in +index 4e952d7..83ba872 100644 +--- a/src/libassuan.pc.in ++++ b/src/libassuan.pc.in +@@ -10,5 +10,5 @@ Description: IPC library for the GnuPG components + Requires: gpg-error + Version: @PACKAGE_VERSION@ + Cflags: @LIBASSUAN_CONFIG_CFLAGS@ +-Libs: @LIBASSUAN_CONFIG_LIBS@ ++Libs: -L${libdir} @LIBASSUAN_CONFIG_LIBS@ + URL: https://www.gnupg.org/related_software/libassuan/index.html diff --git a/ports/libassuan/portfile.cmake b/ports/libassuan/portfile.cmake new file mode 100644 index 00000000000000..50f26d494c5673 --- /dev/null +++ b/ports/libassuan/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platform" ON_TARGET "Windows") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gpg/libassuan + REF libassuan-2.5.3 + SHA512 5ec896eca6d9d7bec83aa400c8e2dc6f2b09c013050efb2125e2f2a4bd00f179723254483637ca4b7bc30bba951fc985e7ba7db98081606bb106caa7a2622dbe + HEAD_REF master + PATCHES + fix-pkgconfig.patch +) + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + --disable-doc + --disable-silent-rules + --with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libgcrypt/CONTROL b/ports/libgcrypt/CONTROL new file mode 100644 index 00000000000000..6a9fe7d5b99e7a --- /dev/null +++ b/ports/libgcrypt/CONTROL @@ -0,0 +1,6 @@ +Source: libgcrypt +Version: 1.8.6 +Homepage: https://gnupg.org/software/libgcrypt/index.html +Description: A library implementing the so-called Assuan protocol +Build-Depends: libgpg-error +Supports: linux|osx \ No newline at end of file diff --git a/ports/libgcrypt/fix-pkgconfig.patch b/ports/libgcrypt/fix-pkgconfig.patch new file mode 100644 index 00000000000000..0c269b2a6b64b5 --- /dev/null +++ b/ports/libgcrypt/fix-pkgconfig.patch @@ -0,0 +1,11 @@ +diff --git a/src/libgcrypt.pc.in b/src/libgcrypt.pc.in +index ec68fa2..6bf7a07 100644 +--- a/src/libgcrypt.pc.in ++++ b/src/libgcrypt.pc.in +@@ -13,5 +13,5 @@ Description: General purpose cryptographic library + Requires: gpg-error + Version: @PACKAGE_VERSION@ + Cflags: @LIBGCRYPT_CONFIG_CFLAGS@ +-Libs: @LIBGCRYPT_CONFIG_LIBS@ ++Libs: -L${libdir} @LIBGCRYPT_CONFIG_LIBS@ + URL: https://www.gnupg.org/software/libgcrypt/index.html diff --git a/ports/libgcrypt/portfile.cmake b/ports/libgcrypt/portfile.cmake new file mode 100644 index 00000000000000..6b782f0e60518d --- /dev/null +++ b/ports/libgcrypt/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platform" ON_TARGET "Windows") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gpg/libgcrypt + REF libgcrypt-1.8.6 + SHA512 85005b159048b7b47b3fc77e8be5b5b317b1ae73ef536d4e2d78496763b7b8c4f80c70016ed27fc60e998cbc7642d3cf487bd4c5e5a5d8abc8f8d51e02f330d1 + HEAD_REF master + PATCHES + fix-pkgconfig.patch +) + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + --disable-doc + --disable-silent-rules + --with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libgpg-error/CONTROL b/ports/libgpg-error/CONTROL new file mode 100644 index 00000000000000..754d20d3da1496 --- /dev/null +++ b/ports/libgpg-error/CONTROL @@ -0,0 +1,5 @@ +Source: libgpg-error +Version: 1.39 +Homepage: https://gnupg.org/software/libgpg-error/index.html +Description: A common dependency of all GnuPG components +Supports: !windows diff --git a/ports/libgpg-error/portfile.cmake b/ports/libgpg-error/portfile.cmake new file mode 100644 index 00000000000000..a6dc3e8439a8b5 --- /dev/null +++ b/ports/libgpg-error/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platform" ON_TARGET "Windows") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gpg/libgpg-error + REF libgpg-error-1.39 + SHA512 c8ca3fc9f1bec90a84214c8fed6073f5a0f6f6880c166a8737a24e0eee841ed5f0f3c94028b50b76535cb2e06f0362b19638e429b4cdc399487d6001b977bbbe + HEAD_REF master +) + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + --disable-tests + --disable-doc + --disable-silent-rules +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 8b2086ec7150151a88a3ef829b13a4f7d45d2ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 22 Dec 2020 23:19:50 -0800 Subject: [PATCH 0344/1694] [curl] Add feature idn2 (#14807) Thanks for fixing phantom dependencies! --- ports/curl/0012-fix-dependency-idn2.patch | 51 +++++++++++++++++++++++ ports/curl/CONTROL | 7 +++- ports/curl/portfile.cmake | 4 +- 3 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 ports/curl/0012-fix-dependency-idn2.patch diff --git a/ports/curl/0012-fix-dependency-idn2.patch b/ports/curl/0012-fix-dependency-idn2.patch new file mode 100644 index 00000000000000..19d5b12307d36f --- /dev/null +++ b/ports/curl/0012-fix-dependency-idn2.patch @@ -0,0 +1,51 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dc7223b..a661cb8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -620,9 +620,6 @@ if(NOT CURL_DISABLE_LDAPS) + check_include_file_concat("ldapssl.h" HAVE_LDAPSSL_H) + endif() + +-# Check for idn +-check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) +- + # Check for symbol dlopen (same as HAVE_LIBDL) + check_library_exists("${CURL_LIBS}" dlopen "" HAVE_DLOPEN) + +@@ -870,6 +867,20 @@ if(CURL_CA_PATH_SET AND NOT USE_OPENSSL AND NOT USE_MBEDTLS) + "Set CURL_CA_PATH=none or enable one of those TLS backends.") + endif() + ++if (CMAKE_USE_IDN2) ++ include(FindPackageHandleStandardArgs) ++ include(SelectLibraryConfigurations) ++ ++ find_path(LIBIDN2_INCLUDE_DIRS idn2.h) ++ find_library(LIBIDN2_LIBRARY_DEBUG NAMES libidn2 idn2 PATHS ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib NO_DEFAULT_PATH Release RelWithDebInfo MinSizeRel) ++ find_library(LIBIDN2_LIBRARY_RELEASE NAMES libidn2 idn2 PATHS ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib NO_DEFAULT_PATH Debug) ++ select_library_configurations(LIBIDN2) ++ ++ add_definitions(-DHAVE_IDN2_H -DHAVE_LIBIDN2) ++ include_directories(${LIBIDN2_INCLUDE_DIRS}) ++ link_libraries(${LIBIDN2_LIBRARY}) ++endif() ++ + # Check for header files + if(NOT UNIX) + check_include_file_concat("windows.h" HAVE_WINDOWS_H) +@@ -906,7 +917,6 @@ check_include_file_concat("crypto.h" HAVE_CRYPTO_H) + check_include_file_concat("err.h" HAVE_ERR_H) + check_include_file_concat("errno.h" HAVE_ERRNO_H) + check_include_file_concat("fcntl.h" HAVE_FCNTL_H) +-check_include_file_concat("idn2.h" HAVE_IDN2_H) + check_include_file_concat("ifaddrs.h" HAVE_IFADDRS_H) + check_include_file_concat("io.h" HAVE_IO_H) + check_include_file_concat("krb.h" HAVE_KRB_H) +@@ -1362,7 +1372,6 @@ _add_if("libz" HAVE_LIBZ) + _add_if("brotli" HAVE_BROTLI) + _add_if("zstd" HAVE_ZSTD) + _add_if("AsynchDNS" USE_ARES OR USE_THREADS_POSIX OR USE_THREADS_WIN32) +-_add_if("IDN" HAVE_LIBIDN2) + _add_if("Largefile" (CURL_SIZEOF_CURL_OFF_T GREATER 4) AND + ((SIZEOF_OFF_T GREATER 4) OR USE_WIN32_LARGE_FILES)) + # TODO SSP1 (Schannel) check is missing diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 72bc677bb492e4..82698dca916072 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,4 +1,5 @@ Source: curl +Port-Version: 1 Version: 7.74.0 Build-Depends: zlib Homepage: https://github.com/curl/curl @@ -51,4 +52,8 @@ Description: SSPI support Feature: brotli Build-Depends: brotli -Description: brotli support (brotli) \ No newline at end of file +Description: brotli support (brotli) + +Feature: idn2 +Build-Depends: libidn2 +Description: idn2 support (libidn2) \ No newline at end of file diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index c2e53d4c3ac9ef..6e18aecd05d2ef 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( 0009_fix_openssl_config.patch 0010_fix_othertests_cmake.patch 0011_fix_static_build.patch + 0012-fix-dependency-idn2.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) @@ -41,6 +42,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS brotli CURL_BROTLI schannel CMAKE_USE_SCHANNEL sectransp CMAKE_USE_SECTRANSP + idn2 CMAKE_USE_IDN2 INVERTED_FEATURES non-http HTTP_ONLY @@ -186,4 +188,4 @@ elseif(VCPKG_TARGET_IS_LINUX) endif() file(INSTALL ${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 41d5806e339714f40fa881f267824783aeede55a Mon Sep 17 00:00:00 2001 From: Long Huan <8551701+longhuan2018@users.noreply.github.com> Date: Wed, 23 Dec 2020 15:21:14 +0800 Subject: [PATCH 0345/1694] [spatialite-tools]update to 5.0.0 (#15039) --- ports/spatialite-tools/CONTROL | 5 +- .../fix-linux-configure.patch | 35 +++ ports/spatialite-tools/fix-makefiles.patch | 39 ++-- ports/spatialite-tools/portfile.cmake | 218 ++++++++++-------- scripts/ci.baseline.txt | 2 - 5 files changed, 183 insertions(+), 116 deletions(-) create mode 100644 ports/spatialite-tools/fix-linux-configure.patch diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL index f2c8384a8e247d..a698cc8b92c0fd 100644 --- a/ports/spatialite-tools/CONTROL +++ b/ports/spatialite-tools/CONTROL @@ -1,6 +1,5 @@ Source: spatialite-tools -Version: 4.3.0 -Port-Version: 7 +Version: 5.0.0 Homepage: https://www.gaia-gis.it/fossil/spatialite-tools/index Description: Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries) -Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat +Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat, librttopo \ No newline at end of file diff --git a/ports/spatialite-tools/fix-linux-configure.patch b/ports/spatialite-tools/fix-linux-configure.patch new file mode 100644 index 00000000000000..b31544b77cf23e --- /dev/null +++ b/ports/spatialite-tools/fix-linux-configure.patch @@ -0,0 +1,35 @@ +diff --git a/configure.ac b/configure.ac +index ff15f2922..c254b3619 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -142,6 +142,7 @@ fi + AC_ARG_WITH([geosconfig], + [AS_HELP_STRING([--with-geosconfig=FILE], [specify an alternative geos-config file])], + [GEOSCONFIG="$withval"], [GEOSCONFIG=""]) ++if 0; then + if test "x$GEOSCONFIG" = "x"; then + # GEOSCONFIG was not specified, so search within the current path + AC_PATH_PROG([GEOSCONFIG], [geos-config]) +@@ -164,6 +165,7 @@ fi + # Extract the linker and include flags + GEOS_LDFLAGS=`$GEOSCONFIG --ldflags` + GEOS_CPPFLAGS=-I`$GEOSCONFIG --includes` ++fi + AC_SUBST([GEOS_LDFLAGS]) + AC_SUBST([GEOS_CPPFLAGS]) + # Ensure that we can parse geos_c.h +@@ -172,11 +174,14 @@ CPPFLAGS="$GEOS_CPPFLAGS" + AC_CHECK_HEADERS([geos_c.h],, [AC_MSG_ERROR([could not find geos_c.h - you may need to specify the directory of a geos-config file using --with-geosconfig])]) + CPPFLAGS="$CPPFLAGS_SAVE" + # Ensure we can link against libgeos_c ++if 0; then + LIBS_SAVE="$LIBS" + LIBS="$GEOS_LDFLAGS" + AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR([could not find libgeos_c - you may need to specify the directory of a geos-config file using --with-geosconfig])) + LIBS="$LIBS_SAVE" + LIBS=$LIBS$GEOS_LDFLAGS' -lgeos_c' ++fi ++LIBS="$LIBS $GEOS_LDFLAGS" + + PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], , AC_MSG_ERROR(['libspatialite' is required but it doesn't seem to be installed on this system.])) + AC_SUBST(LIBSPATIALITE_CFLAGS) diff --git a/ports/spatialite-tools/fix-makefiles.patch b/ports/spatialite-tools/fix-makefiles.patch index ff6e0ad0de1c3b..a5a579686bbd7f 100644 --- a/ports/spatialite-tools/fix-makefiles.patch +++ b/ports/spatialite-tools/fix-makefiles.patch @@ -1,18 +1,18 @@ diff --git a/makefile.vc b/makefile.vc -index 33c85d2..c811e7d 100644 +index 53ef75197..d48fb02db 100644 --- a/makefile.vc +++ b/makefile.vc -@@ -15,7 +15,7 @@ SPATIALITE_OSM_RAW_EXE = spatialite_osm_raw.exe +@@ -16,7 +16,7 @@ SPATIALITE_OSM_RAW_EXE = spatialite_osm_raw.exe SPATIALITE_OSM_FILTER_EXE = spatialite_osm_filter.exe SPATIALITE_GML_EXE = spatialite_gml.exe -CFLAGS = /nologo -IC:\OSGeo4W\include $(OPTFLAGS) -+CFLAGS = /nologo -I$(INSTALLED_ROOT)\include $(OPTFLAGS) ++CFLAGS = /nologo $(OPTFLAGS) default: all -@@ -26,89 +26,58 @@ all: $(SPATIALITE_EXE) $(SHP_DOCTOR_EXE) $(SPATIALITE_TOOL_EXE) \ - $(SPATIALITE_OSM_FILTER_EXE) +@@ -27,96 +27,63 @@ all: $(SPATIALITE_EXE) $(SHP_DOCTOR_EXE) $(SPATIALITE_TOOL_EXE) \ + $(SPATIALITE_OSM_FILTER_EXE) $(SHP_SANITIZE_EXE) $(SPATIALITE_EXE): shell.obj - cl shell.obj C:\OSGeo4W\lib\proj_i.lib \ @@ -27,7 +27,7 @@ index 33c85d2..c811e7d 100644 - cl exif_loader.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl exif_loader.obj $(LIBS_ALL) ++ cl exif_loader.obj $(LIBS_ALL) if exist $(EXIF_LOADER_EXE).manifest mt -manifest \ $(EXIF_LOADER_EXE).manifest -outputresource:$(EXIF_LOADER_EXE);1 @@ -35,15 +35,23 @@ index 33c85d2..c811e7d 100644 - cl shp_doctor.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl shp_doctor.obj $(LIBS_ALL) ++ cl shp_doctor.obj $(LIBS_ALL) if exist $(SHP_DOCTOR_EXE).manifest mt -manifest \ $(SHP_DOCTOR_EXE).manifest -outputresource:$(SHP_DOCTOR_EXE);1 + $(SHP_SANITIZE_EXE): shp_sanitize.obj +- cl shp_sanitize.obj C:\OSGeo4W\lib\proj_i.lib \ +- C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ +- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib ++ cl shp_sanitize.obj $(LIBS_ALL) + if exist $(SHP_SANITIZE_EXE).manifest mt -manifest \ + $(SHP_SANITIZE_EXE).manifest -outputresource:$(SHP_SANITIZE_EXE);1 + $(SPATIALITE_NETWORK_EXE): spatialite_network.obj - cl spatialite_network.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_network.obj $(LIBS_ALL) ++ cl spatialite_network.obj $(LIBS_ALL) if exist $(SPATIALITE_NETWORK_EXE).manifest mt -manifest \ $(SPATIALITE_TOOL_EXE).manifest \ -outputresource:$(SPATIALITE_TOOL_EXE);1 @@ -52,7 +60,7 @@ index 33c85d2..c811e7d 100644 - cl spatialite_tool.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_tool.obj $(LIBS_ALL) ++ cl spatialite_tool.obj $(LIBS_ALL) if exist $(SPATIALITE_TOOL_EXE).manifest mt -manifest \ $(SPATIALITE_TOOL_EXE).manifest \ -outputresource:$(SPATIALITE_TOOL_EXE);1 @@ -64,7 +72,7 @@ index 33c85d2..c811e7d 100644 - C:\OSGeo4W\lib\libexpat.lib \ - C:\OSGeo4W\lib\zlib.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_osm_net.obj $(LIBS_ALL) ++ cl spatialite_osm_net.obj $(LIBS_ALL) if exist $(SPATIALITE_OSM_EXE).manifest mt -manifest \ $(SPATIALITE_OSM_EXE).manifest \ -outputresource:$(SPATIALITE_OSM_NET_EXE);1 @@ -76,7 +84,7 @@ index 33c85d2..c811e7d 100644 - C:\OSGeo4W\lib\libexpat.lib \ - C:\OSGeo4W\lib\zlib.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_osm_map.obj $(LIBS_ALL) ++ cl spatialite_osm_map.obj $(LIBS_ALL) if exist $(SPATIALITE_OSM_MAP_EXE).manifest mt -manifest \ $(SPATIALITE_OSM_MAP_EXE).manifest \ -outputresource:$(SPATIALITE_OSM_MAP_EXE);1 @@ -86,7 +94,7 @@ index 33c85d2..c811e7d 100644 - C:\OSGeo4W\lib\iconv.lib \ - C:\OSGeo4W\lib\libexpat.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_gml.obj $(LIBS_ALL) ++ cl spatialite_gml.obj $(LIBS_ALL) if exist $(SPATIALITE_GML_EXE).manifest mt -manifest \ $(SPATIALITE_GML_EXE).manifest \ -outputresource:$(SPATIALITE_GML_EXE);1 @@ -98,7 +106,7 @@ index 33c85d2..c811e7d 100644 - C:\OSGeo4W\lib\libexpat.lib \ - C:\OSGeo4W\lib\zlib.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_osm_raw.obj $(LIBS_ALL) ++ cl spatialite_osm_raw.obj $(LIBS_ALL) if exist $(SPATIALITE_OSM_RAW_EXE).manifest mt -manifest \ $(SPATIALITE_OSM_RAW_EXE).manifest \ -outputresource:$(SPATIALITE_OSM_RAW_EXE);1 @@ -107,12 +115,13 @@ index 33c85d2..c811e7d 100644 - cl spatialite_osm_filter.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_osm_filter.obj $(LIBS_ALL) ++ cl spatialite_osm_filter.obj $(LIBS_ALL) if exist $(SPATIALITE_OSM_FILTER_EXE).manifest mt -manifest \ $(SPATIALITE_OSM_FILTER_EXE).manifest \ -outputresource:$(SPATIALITE_OSM_FILTER_EXE);1 + diff --git a/nmake.opt b/nmake.opt -index 4f4a953..d9efecf 100644 +index 4f4a9538e..d9efecf7b 100644 --- a/nmake.opt +++ b/nmake.opt @@ -1,8 +1,8 @@ diff --git a/ports/spatialite-tools/portfile.cmake b/ports/spatialite-tools/portfile.cmake index a9ef6ec3d26163..4b53010a3d3985 100644 --- a/ports/spatialite-tools/portfile.cmake +++ b/ports/spatialite-tools/portfile.cmake @@ -1,120 +1,146 @@ -option(BUILD_DEBUG_TOOLS "Build debug version of tools" OFF) - +set(SPATIALITE_TOOLS_VERSION_STR "5.0.0") vcpkg_download_distfile(ARCHIVE - URLS "http://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-4.3.0.tar.gz" - FILENAME "spatialite-tools-4.3.0.tar.gz" - SHA512 e1de27c1c65ff2ff0b08583113517bea74edf33fff59ad6e9c77492ea3ae87d9c0f17d7670ee6602b32eea73ad3678bb5410ef2c6fac6e213bf2e341a907db88 + URLS "http://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz" + FILENAME "spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz" + SHA512 a1497824df2c45ffa1ba6b4ec53794c2c4779b6357885ee6f1243f2bff137c3e4dd93b0a802239ced73f66be22faf0081b83bf0ad4effb8a04052712625865d1 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES + fix-linux-configure.patch fix-makefiles.patch ) -find_program(NMAKE nmake) - -set(LDIR "\"${CURRENT_INSTALLED_DIR}\"") +if (VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib") + set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib") + set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib") + set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib") + set(SPATIALITE_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/spatialite.lib") + set(SPATIALITE_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib") + set(ICONV_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/iconv.lib") + set(ICONV_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib") + set(EXPAT_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libexpat.lib") + set(EXPAT_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd.lib") + else() + set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib ${CURRENT_INSTALLED_DIR}/lib/geos.lib") + set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/geosd.lib") + set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib") + set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib") + set(SPATIALITE_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/spatialite.lib ${CURRENT_INSTALLED_DIR}/lib/freexl.lib ${CURRENT_INSTALLED_DIR}/lib/librttopo.lib") + set(SPATIALITE_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib ${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib ${CURRENT_INSTALLED_DIR}/debug/lib/librttopo.lib") + set(ICONV_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/lib/charset.lib") + set(ICONV_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib") + set(EXPAT_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libexpatMD.lib") + set(EXPAT_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatdMD.lib") + endif() -if(VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(CL_FLAGS_DBG "/MDd /Zi /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") - set(CL_FLAGS_REL "/MD /Ox /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") - set(GEOS_LIBS_REL "${LDIR}/lib/geos_c.lib") - set(GEOS_LIBS_DBG "${LDIR}/debug/lib/geos_cd.lib") - set(LIBXML2_LIBS_REL "${LDIR}/lib/libxml2.lib") - set(LIBXML2_LIBS_DBG "${LDIR}/debug/lib/libxml2.lib") - set(SPATIALITE_LIBS_REL "${LDIR}/lib/spatialite.lib") - set(SPATIALITE_LIBS_DBG "${LDIR}/debug/lib/spatialite.lib") - set(ICONV_LIBS_REL "${LDIR}/lib/iconv.lib") - set(ICONV_LIBS_DBG "${LDIR}/debug/lib/iconv.lib") - set(EXPAT_LIBS_REL "${LDIR}/lib/libexpat.lib") - set(EXPAT_LIBS_DBG "${LDIR}/debug/lib/libexpatd.lib") -else() - set(CL_FLAGS_DBG "/MTd /Zi /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") - set(CL_FLAGS_REL "/MT /Ox /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") - set(GEOS_LIBS_REL "${LDIR}/lib/geos_c.lib ${LDIR}/lib/geos.lib") - set(GEOS_LIBS_DBG "${LDIR}/debug/lib/geos_cd.lib ${LDIR}/debug/lib/geosd.lib") - set(LIBXML2_LIBS_REL "${LDIR}/lib/libxml2.lib ${LDIR}/lib/lzma.lib ws2_32.lib") - set(LIBXML2_LIBS_DBG "${LDIR}/debug/lib/libxml2.lib ${LDIR}/debug/lib/lzmad.lib ws2_32.lib") - set(SPATIALITE_LIBS_REL "${LDIR}/lib/spatialite.lib ${LDIR}/lib/freexl.lib ${LDIR}/lib/librttopo.lib") - set(SPATIALITE_LIBS_DBG "${LDIR}/debug/lib/spatialite.lib ${LDIR}/debug/lib/freexl.lib ${LDIR}/debug/lib/librttopo.lib") - set(ICONV_LIBS_REL "${LDIR}/lib/iconv.lib ${LDIR}/lib/charset.lib") - set(ICONV_LIBS_DBG "${LDIR}/debug/lib/iconv.lib ${LDIR}/debug/lib/charset.lib ") - set(EXPAT_LIBS_REL "${LDIR}/lib/libexpatMD.lib") - set(EXPAT_LIBS_DBG "${LDIR}/debug/lib/libexpatdMD.lib") -endif() + if(VCPKG_TARGET_IS_UWP) + set(UWP_LIBS windowsapp.lib) + set(UWP_LINK_FLAGS /APPCONTAINER) + endif() -set(LIBS_ALL_DBG - "${ICONV_LIBS_DBG} \ - ${LDIR}/debug/lib/sqlite3.lib \ - ${SPATIALITE_LIBS_DBG} \ - ${LIBXML2_LIBS_DBG} \ - ${GEOS_LIBS_DBG} \ - ${EXPAT_LIBS_DBG} \ - ${LDIR}/debug/lib/readosm.lib \ - ${LDIR}/debug/lib/zlibd.lib \ - ${LDIR}/debug/lib/proj_d.lib ole32.lib shell32.lib" - ) -set(LIBS_ALL_REL - "${ICONV_LIBS_REL} \ - ${LDIR}/lib/sqlite3.lib \ - ${SPATIALITE_LIBS_REL} \ - ${LIBXML2_LIBS_REL} \ - ${GEOS_LIBS_REL} \ - ${EXPAT_LIBS_REL} \ - ${LDIR}/lib/readosm.lib \ - ${LDIR}/lib/zlib.lib \ - ${LDIR}/lib/proj.lib ole32.lib shell32.lib" - ) + set(LIBS_ALL_DBG + "${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \ + ${CURRENT_INSTALLED_DIR}/debug/lib/readosm.lib \ + ${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \ + ${LIBXML2_LIBS_DBG} \ + ${GEOS_LIBS_DBG} \ + ${ICONV_LIBS_DBG} \ + ${SPATIALITE_LIBS_DBG} \ + ${EXPAT_LIBS_DBG} \ + ${UWP_LIBS} \ + ${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib ole32.lib shell32.lib" + ) + set(LIBS_ALL_REL + "${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \ + ${CURRENT_INSTALLED_DIR}/lib/readosm.lib \ + ${CURRENT_INSTALLED_DIR}/lib/zlib.lib \ + ${LIBXML2_LIBS_REL} \ + ${GEOS_LIBS_REL} \ + ${ICONV_LIBS_REL} \ + ${SPATIALITE_LIBS_REL} \ + ${EXPAT_LIBS_REL} \ + ${UWP_LIBS} \ + ${CURRENT_INSTALLED_DIR}/lib/proj.lib ole32.lib shell32.lib" + ) -if(BUILD_DEBUG_TOOLS) - ################ - # Debug build - ################ - message(STATUS "Building ${TARGET_TRIPLET}-dgb") + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR) + list(APPEND OPTIONS_RELEASE + "LINK_FLAGS=${UWP_LINK_FLAGS}" "INST_DIR=${INST_DIR}" "LIBS_ALL=${LIBS_ALL_REL}" + ) + list(APPEND OPTIONS_DEBUG + "LINK_FLAGS=/debug ${UWP_LINK_FLAGS}" "INST_DIR=${INST_DIR}\\debug" "LIBS_ALL=${LIBS_ALL_DBG}" + ) - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL) - vcpkg_execute_required_process( - COMMAND ${NMAKE} -f makefile.vc clean install - "INST_DIR=\"${INST_DIR_REL}\"" "INSTALLED_ROOT=${LDIR}" "CL_FLAGS=${CL_FLAGS_DBG}" "LIBS_ALL=${LIBS_ALL_DBG}" - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME nmake-build-${TARGET_TRIPLET}-debug - ) - message(STATUS "Building ${TARGET_TRIPLET}-dbg done") - set(EXE_FOLDER ${CURRENT_PACKAGES_DIR}/bin/) -else() - ################ - # Release build - ################ - message(STATUS "Building ${TARGET_TRIPLET}-rel") + vcpkg_install_nmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + "CL_FLAGS=/DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + OPTIONS_DEBUG + ${OPTIONS_DEBUG} + ) - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL) - vcpkg_execute_required_process( - COMMAND ${NMAKE} -f makefile.vc clean install - "INST_DIR=\"${INST_DIR_REL}\"" "INSTALLED_ROOT=${LDIR}" "CL_FLAGS=${CL_FLAGS_REL}" "LIBS_ALL=${LIBS_ALL_REL}" - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME nmake-build-${TARGET_TRIPLET}-release - ) - message(STATUS "Building ${TARGET_TRIPLET}-rel done") - set(EXE_FOLDER ${CURRENT_PACKAGES_DIR}/bin/) -endif() + list(APPEND TOOL_EXES + shp_sanitize + spatialite_osm_filter + spatialite_osm_raw + spatialite_gml + spatialite_osm_map + exif_loader + spatialite_osm_net + spatialite_network + spatialite_tool + shp_doctor + spatialite + ) + vcpkg_copy_tools(TOOL_NAMES ${TOOL_EXES} AUTO_CLEAN) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX + if(VCPKG_TARGET_IS_LINUX) + set(LIBS "-lpthread -ldl -lm -lz -lstdc++") + else() + set(LIBS "-lpthread -ldl -lm -lz -lc++ -liconv -lc") + endif() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}/) -file(GLOB EXES "${EXE_FOLDER}/*.exe") -file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(REMOVE ${EXES}) + list(APPEND OPTIONS_RELEASE + "LIBXML2_LIBS=-lxml2 -llzma" + "GEOS_LDFLAGS=-lgeos_c -lgeos" + ) + list(APPEND OPTIONS_DEBUG + "LIBXML2_LIBS=-lxml2 -llzmad" + "GEOS_LDFLAGS=-lgeos_cd -lgeosd" + ) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include) + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + "CFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" + "LIBXML2_CFLAGS=-I\"${CURRENT_INSTALLED_DIR}/include\"" + "LIBS=${LIBS}" + "--disable-minizip" + OPTIONS_DEBUG + ${OPTIONS_DEBUG} + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + ) -if(NOT BUILD_DEBUG_TOOLS AND VCPKG_CRT_LINKAGE STREQUAL dynamic) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_install_make() + vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) endif() -message(STATUS "Packaging ${TARGET_TRIPLET} done") +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) # Allow empty include directory set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 088f09ca2ac4cc..24c51949d081b7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1422,8 +1422,6 @@ soundtouch:x64-windows-static=fail spaceland:arm64-windows=fail spaceland:arm-uwp=fail spaceland:x64-uwp=fail -spatialite-tools:x64-linux=fail -spatialite-tools:x64-osx=fail spdk:x64-linux=fail spdk-dpdk:arm64-windows=fail spdk-dpdk:arm-uwp=fail From df394614666a8d29d943d6b2b3f7423d28e50218 Mon Sep 17 00:00:00 2001 From: Vincent Gao Date: Wed, 23 Dec 2020 15:22:11 +0800 Subject: [PATCH 0346/1694] [ctp] bugfix for linux-x64 and file name case sensitivity (#15183) --- ports/ctp/CONTROL | 1 + ports/ctp/portfile.cmake | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ports/ctp/CONTROL b/ports/ctp/CONTROL index 86eeff004dee86..e47dbd8e2a5c01 100644 --- a/ports/ctp/CONTROL +++ b/ports/ctp/CONTROL @@ -1,5 +1,6 @@ Source: ctp Version: 6.3.15_20190220_se +Port-Version: 1 Homepage: http://www.sfit.com.cn/index.htm 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. diff --git a/ports/ctp/portfile.cmake b/ports/ctp/portfile.cmake index f8efa19255c2a6..4b7ae6654a373d 100644 --- a/ports/ctp/portfile.cmake +++ b/ports/ctp/portfile.cmake @@ -22,8 +22,8 @@ elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(ARCH_ARCHIVE "6.3.15_20190220_tradeapi64_se_windows.zip") set(ARCH_ARCHIVE_DATACOLLECT "6.3.15_20190220_clientdll64_windows.zip") elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(ARCH_ARCHIVE "v6.3.15_20190220_api_clientdatacollectdll_linux64.tar") - set(ARCH_ARCHIVE_DATACOLLECT "6.3.15_20190220_clientdll_windows.zip") + set(ARCH_ARCHIVE "v6.3.15_20190220_api_tradeapi_se_linux64.tar") + set(ARCH_ARCHIVE_DATACOLLECT "v6.3.15_20190220_api_clientdatacollectdll_linux64.tar") else() message(FATAL_ERROR "${TARGET_TRIPLET} is not a supported platform" ) endif() @@ -38,11 +38,11 @@ file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_M if(VCPKG_TARGET_IS_WINDOWS) file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") - file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/Debug/lib FILES_MATCHING PATTERN "*.lib") - file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/Debug/bin FILES_MATCHING PATTERN "*.dll") + file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") + file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") elseif(VCPKG_TARGET_IS_LINUX) file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.so") - file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/Debug/lib FILES_MATCHING PATTERN "*.so") + file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.so") endif() file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/share FILES_MATCHING PATTERN "*.xml") @@ -58,11 +58,11 @@ if("datacollect" IN_LIST FEATURES) if(VCPKG_TARGET_IS_WINDOWS) file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") - file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/Debug/lib FILES_MATCHING PATTERN "*.lib") - file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/Debug/bin FILES_MATCHING PATTERN "*.dll") + file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") + file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") elseif(VCPKG_TARGET_IS_LINUX) file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.so") - file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/Debug/lib FILES_MATCHING PATTERN "*.so") + file(INSTALL ${SOURCE_PATH_DATACOLLECT}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.so") endif() endif() From 80022e5296d45c15bc2637d79d6a104ec4df4e7a Mon Sep 17 00:00:00 2001 From: Avee Date: Wed, 23 Dec 2020 14:24:39 +0700 Subject: [PATCH 0347/1694] [x-plane] Update to 3.0.3 (#15244) --- ports/x-plane/CONTROL | 4 ---- ports/x-plane/portfile.cmake | 36 +++++++++++++++++++----------------- ports/x-plane/vcpkg.json | 7 +++++++ scripts/ci.baseline.txt | 4 ---- 4 files changed, 26 insertions(+), 25 deletions(-) delete mode 100644 ports/x-plane/CONTROL create mode 100644 ports/x-plane/vcpkg.json diff --git a/ports/x-plane/CONTROL b/ports/x-plane/CONTROL deleted file mode 100644 index de1217a60f4436..00000000000000 --- a/ports/x-plane/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: x-plane -Version: 3.0.1-1 -Description: The X-Plane Plugin SDK. -Supports: !x86 \ No newline at end of file diff --git a/ports/x-plane/portfile.cmake b/ports/x-plane/portfile.cmake index ccd3007e8e40ff..56ea2e77e82bad 100644 --- a/ports/x-plane/portfile.cmake +++ b/ports/x-plane/portfile.cmake @@ -1,11 +1,9 @@ -if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - message(FATAL_ERROR "the x-plane SDK cannot be built for the x86 architecture") -endif() +vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64" "wasm32") vcpkg_download_distfile(ARCHIVE - URLS http://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK301.zip - FILENAME XPSDK301.zip - SHA512 3044d606039be8230f35a5992d322d4c009b4056f8fb17e929a9f5c2204c084e2c83ddad10801b21727645ec957c8942b83938f81256ec3778dbe75df525e62a + URLS "http://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip" + FILENAME "XPSDK303.zip" + SHA512 23a1efc893fdb838ce90307ac2e1bf592b03880e9c7bf7aac51cf0d358816931b56a3d603e266f3c9041620190c689dc4d3b28b288bc39cf6e653db6f2125395 ) vcpkg_extract_source_archive_ex( @@ -13,25 +11,29 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} ) -file(MAKE_DIRECTORY - ${CURRENT_PACKAGES_DIR}/lib - ${CURRENT_PACKAGES_DIR}/debug/lib -) +# create lib dir +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) + file(MAKE_DIRECTORY + ${CURRENT_PACKAGES_DIR}/lib + ${CURRENT_PACKAGES_DIR}/debug/lib + ) +endif() +# copy headers & sources file(COPY ${SOURCE_PATH}/CHeaders/Widgets/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(COPY ${SOURCE_PATH}/CHeaders/Wrappers/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(COPY ${SOURCE_PATH}/CHeaders/XPLM/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +# copy prebuilt libs +if(VCPKG_TARGET_IS_WINDOWS) file(COPY ${SOURCE_PATH}/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) file(COPY ${SOURCE_PATH}/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) file(COPY ${SOURCE_PATH}/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) file(COPY ${SOURCE_PATH}/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) -elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - file(COPY ${SOURCE_PATH}/Libraries/Mac/XPLM.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) - file(COPY ${SOURCE_PATH}/Libraries/Mac/XPWidgets.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) - file(COPY ${SOURCE_PATH}/Libraries/Mac/XPLM.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) - file(COPY ${SOURCE_PATH}/Libraries/Mac/XPWidgets.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) +elseif (VCPKG_TARGET_IS_OSX) + file(COPY ${SOURCE_PATH}/Libraries/Mac/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(COPY ${SOURCE_PATH}/Libraries/Mac/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) endif() -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/x-plane/ RENAME copyright) +# Handle copyright +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/x-plane/vcpkg.json b/ports/x-plane/vcpkg.json new file mode 100644 index 00000000000000..4884ca8e8d0ceb --- /dev/null +++ b/ports/x-plane/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "x-plane", + "version-string": "3.0.3", + "description": "The X-Plane Plugin SDK", + "homepage": "https://developer.x-plane.com/sdk/", + "supports": "!(x86 | arm | wasm32)" +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 24c51949d081b7..d8c655e1b506cb 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1623,10 +1623,6 @@ xmsh:x64-uwp=skip xmsh:x64-windows-static=skip xmsh:x64-windows=skip xmsh:x86-windows=skip -x-plane:arm64-windows=fail -x-plane:arm-uwp=fail -x-plane:x64-linux=fail -x-plane:x86-windows=fail yajl:arm-uwp=fail yajl:x64-uwp=fail yara:arm-uwp=fail From 25749439afb2b414e28165e6e5fc0cb66bb7064e Mon Sep 17 00:00:00 2001 From: Pratik Chowdhury Date: Wed, 23 Dec 2020 12:55:03 +0530 Subject: [PATCH 0348/1694] [Hedley] Update to v14 (#15240) --- ports/hedley/CONTROL | 2 +- ports/hedley/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/hedley/CONTROL b/ports/hedley/CONTROL index 08b5e02b11c445..955646361aab7c 100644 --- a/ports/hedley/CONTROL +++ b/ports/hedley/CONTROL @@ -1,3 +1,3 @@ Source: hedley -Version: 2019-05-08-1 +Version: 14 Description: A C/C++ header to help move #ifdefs out of your code diff --git a/ports/hedley/portfile.cmake b/ports/hedley/portfile.cmake index b724a0beac63b1..97129e81b932b1 100644 --- a/ports/hedley/portfile.cmake +++ b/ports/hedley/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nemequ/hedley - REF 1b74d9bc892137b3f006d04ff905098b900116d0 - SHA512 8f3e4fc081fb33cc3a3d637eb09863e80fa94b5e46ecf6507aabe6a5b0648881a96c8cf2ef01b4146ecd3a14908ef87f3204960514af6c91d00c93bea18eda41 + REF 4a59eb6d8e3e73b6c60aed2c92a6590d26df93d8 + SHA512 64a4452170a37e05134d02eb75dad38c410ed21f96cab3c6100e8f64b13c4daf40b916e0b5fee731ef9e318fbd628ee692ad6681e4f258d5f86b3e037ed83f8d HEAD_REF master ) From 536880562b1428a8c0c33c3fcbe226d5774ee4ed Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 23 Dec 2020 15:25:14 +0800 Subject: [PATCH 0349/1694] [libpqxx] update to 7.3.0 (#15259) --- ports/libpqxx/CONTROL | 2 +- ports/libpqxx/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/libpqxx/CONTROL b/ports/libpqxx/CONTROL index b32a7c39b2269b..cc022b2ccb6602 100644 --- a/ports/libpqxx/CONTROL +++ b/ports/libpqxx/CONTROL @@ -1,5 +1,5 @@ Source: libpqxx -Version: 7.2.1 +Version: 7.3.0 Homepage: https://github.com/jtv/libpqxx Description: The official C++ client API for PostgreSQL Build-Depends: libpq[core] diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake index 8f18f039f7d4e3..c7353611940c8a 100644 --- a/ports/libpqxx/portfile.cmake +++ b/ports/libpqxx/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jtv/libpqxx - REF e63674fec320624e0bea32e5e5b7b5ff2c6c269d # 7.2.1 - SHA512 681ae839f6c6d4706ec59eab60516ce7c43abbfa0115a50ce2dc4c09b5107762ae71f00aa56a8b6019965c3138deaf3c42cb761e7fddd4d522169d92a11c0867 + REF 58d2a028d1600225ac3a478d6b3a06ba2f0c01f6 # 7.3.0 + SHA512 c0c121e89e8b6669cd049a25c8b647d7cb861868da4daa11fc68e6a3a9384c22b9bc16e09c998389bc769aae36e618097cc93ca9f90822d90f8c0d15871ec1b0 HEAD_REF master ) From b09a62d8e5069d3bb7448c022afd7bb301fb4c3d Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 24 Dec 2020 06:09:00 +0800 Subject: [PATCH 0350/1694] [libass] update to 0.15.0 (#15263) --- ports/libass/ConstantValues.patch | 65 +++++++++++-------------------- ports/libass/portfile.cmake | 4 +- ports/libass/vcpkg.json | 3 +- 3 files changed, 25 insertions(+), 47 deletions(-) diff --git a/ports/libass/ConstantValues.patch b/ports/libass/ConstantValues.patch index d357032d7429de..e666b846610c9d 100644 --- a/ports/libass/ConstantValues.patch +++ b/ports/libass/ConstantValues.patch @@ -1,43 +1,22 @@ ---- - libass/ass_outline.c | 4 ++-- - libass/ass_render.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libass/ass_outline.c b/libass/ass_outline.c -index 1b9afe9..527403e 100644 ---- a/libass/ass_outline.c -+++ b/libass/ass_outline.c -@@ -518,7 +518,7 @@ static bool draw_arc(StrokerState *str, ASS_Vector pt, - ASS_DVector normal0, ASS_DVector normal1, double c, int dir) - { - const int max_subdiv = 15; -- double mul[max_subdiv + 1]; -+ double mul[16]; - - ASS_DVector center; - bool small_angle = true; -@@ -554,7 +554,7 @@ static bool draw_arc(StrokerState *str, ASS_Vector pt, - static bool draw_circle(StrokerState *str, ASS_Vector pt, int dir) - { - const int max_subdiv = 15; -- double mul[max_subdiv + 1], c = 0; -+ double mul[16], c = 0; - - int pos = max_subdiv; - while (c < str->split_cos && pos) { -diff --git a/libass/ass_render.c b/libass/ass_render.c -index 69c4439..f6fa85c 100644 ---- a/libass/ass_render.c -+++ b/libass/ass_render.c -@@ -1235,7 +1235,7 @@ get_bitmap_glyph(ASS_Renderer *render_priv, GlyphInfo *info) - } - - const int n_outlines = 3; -- ASS_Outline outline[n_outlines]; -+ ASS_Outline outline[3]; - outline_copy(&outline[0], info->outline); - outline_copy(&outline[1], info->border[0]); - outline_copy(&outline[2], info->border[1]); --- -2.18.0.windows.1 - +diff --git a/libass/ass_outline.c b/libass/ass_outline.c +index ae5c06a..2173508 100644 +--- a/libass/ass_outline.c ++++ b/libass/ass_outline.c +@@ -613,7 +613,7 @@ static bool draw_arc(StrokerState *str, ASS_Vector pt, + ASS_DVector normal0, ASS_DVector normal1, double c, int dir) + { + enum { max_subdiv = 15 }; +- double mul[max_subdiv + 1]; ++ double mul[16]; + + ASS_DVector center; + bool small_angle = true; +@@ -649,7 +649,7 @@ static bool draw_arc(StrokerState *str, ASS_Vector pt, + static bool draw_circle(StrokerState *str, ASS_Vector pt, int dir) + { + enum { max_subdiv = 15 }; +- double mul[max_subdiv + 1], c = 0; ++ double mul[16], c = 0; + + int pos = max_subdiv; + while (c < str->split_cos && pos) { diff --git a/ports/libass/portfile.cmake b/ports/libass/portfile.cmake index f5ab6606c07ef4..63562f06fce867 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 98727c3b78f44cb3bbc955fcf5d977ebd911d5ca - SHA512 d466108180cea598b817f89aa21a1021ed2a763580d9aad51b054aa120186af48ab4264907e49ddcb38479a28d87d5431751a28afee9cb83ad7623f002d99c57 + REF d149636f502f5774ae1a8fb4c554b122674393b2 #v 0.15.0 + SHA512 d8b3b23e3cfa42b6f65a59a389a54a18a8470f015ca828e2a08afd9633510ebf58c74e630b086cd611629f79e68f23be47dd2f798e223330216e6b1f487afd7a HEAD_REF master PATCHES ConstantValues.patch ) diff --git a/ports/libass/vcpkg.json b/ports/libass/vcpkg.json index f3532dcfc0f8e6..2eab327b8a6fc7 100644 --- a/ports/libass/vcpkg.json +++ b/ports/libass/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libass", - "version-string": "0.14.0", - "port-version": 4, + "version-string": "0.15.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", "dependencies": [ From a7dfe151dae3fbaa33f94389ef9a7f1f0ec4f49c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Walenciak?= Date: Thu, 24 Dec 2020 02:05:36 +0100 Subject: [PATCH 0351/1694] [dlib] adding missing cudnn depedency for cuda feature (#15277) --- ports/dlib/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL index a01d89ec5cfe4a..c9b8f1f6834c3c 100644 --- a/ports/dlib/CONTROL +++ b/ports/dlib/CONTROL @@ -7,7 +7,7 @@ Description: Modern C++ toolkit containing machine learning algorithms and tools Default-Features: fftw3, sqlite3 Feature: cuda -Build-Depends: cuda +Build-Depends: cuda, cudnn Description: CUDA support for dlib Feature: fftw3 From 6f0938034eecf1af7baed017d1df399323478c46 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Thu, 24 Dec 2020 02:07:23 +0100 Subject: [PATCH 0352/1694] [wtl] Update wtl to 10.0.10320 (#15266) --- ports/wtl/CONTROL | 2 +- ports/wtl/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/wtl/CONTROL b/ports/wtl/CONTROL index db55ce52f709d0..f5c30a138c0d4f 100644 --- a/ports/wtl/CONTROL +++ b/ports/wtl/CONTROL @@ -1,4 +1,4 @@ Source: wtl -Version: 10.0.10077 +Version: 10.0.10320 Homepage: https://sourceforge.net/projects/wtl/ Description: Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components. diff --git a/ports/wtl/portfile.cmake b/ports/wtl/portfile.cmake index 0f8d189a867d4a..4c1bb2b77ac348 100644 --- a/ports/wtl/portfile.cmake +++ b/ports/wtl/portfile.cmake @@ -1,10 +1,10 @@ vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO wtl/WTL%2010 - REF WTL%2010.0.10077 - FILENAME "WTL10_1077..zip" + REF WTL%2010.0.10320%20Release + FILENAME "WTL10_10320_Release.zip" NO_REMOVE_ONE_LEVEL - SHA512 5a49283196caf5b2ad8a3fb3cfa5d09cd555d59d4d5871408bf6a5b850cf4546cc6ece4e0bf79d152a4d2589fae3749f0f3e73ab6a3a7bc0cb373efa1474b98b + SHA512 086a6cf6a49a4318a8c519136ba6019ded7aa7f2c1d85f78c30b21183654537b3428a400a64fcdacba3a7a10a9ef05137b6f2119f59594da300d55f9ebfb1309 ) file(INSTALL ${SOURCE_PATH}/Include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT} FILES_MATCHING PATTERN "*.h") From 0458c4b196dd49b471e1ce3a2e4c69ab0b967f59 Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Wed, 23 Dec 2020 17:08:28 -0800 Subject: [PATCH 0353/1694] [ompl] upgrade to v1.5.1 (#15276) --- ports/ompl/CONTROL | 6 +++--- ports/ompl/fix_dependency.patch | 8 ++++---- ports/ompl/portfile.cmake | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ports/ompl/CONTROL b/ports/ompl/CONTROL index b18ba538181eb6..e608b16d820bab 100644 --- a/ports/ompl/CONTROL +++ b/ports/ompl/CONTROL @@ -1,7 +1,7 @@ Source: ompl -Version: 1.5.0 -Port-Version: 1 -Homepage: https://bitbucket.org/ompl +Version: 1.5.1 +Port-Version: 0 +Homepage: https://ompl.kavrakilab.org/ Description: The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms Build-Depends: boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, boost-timer, eigen3 diff --git a/ports/ompl/fix_dependency.patch b/ports/ompl/fix_dependency.patch index 6ab6f7137fd036..4a19f81b84281e 100644 --- a/ports/ompl/fix_dependency.patch +++ b/ports/ompl/fix_dependency.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 24be873..3b916d7 100644 +index 4c7e6901..a433b7da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,7 +136,7 @@ find_package(Drawstuff QUIET) @@ -21,9 +21,9 @@ index 24be873..3b916d7 100644 # ROS installs fcl in /usr. In /usr/include/fcl/config.h it says octomap was # enabled. Octomap is installed in /opt/ros/${ROS_DISTRO}/include (most -@@ -199,7 +198,7 @@ set(OMPLAPP_LIBRARIES - ${Boost_FILESYSTEM_LIBRARY} - ${Boost_SYSTEM_LIBRARY} +@@ -195,7 +194,7 @@ set(OMPLAPP_MODULE_LIBRARIES + ${FCL_LIBRARIES}) + set(OMPLAPP_LIBRARIES ${OPENGL_LIBRARIES} - ${ASSIMP_LIBRARIES} + assimp::assimp diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake index fa2379bfa7d8a2..e15cb560d6c08f 100644 --- a/ports/ompl/portfile.cmake +++ b/ports/ompl/portfile.cmake @@ -1,21 +1,21 @@ vcpkg_buildpath_length_warning(37) -set(OMPL_VERSION 1.5.0) +set(OMPL_VERSION 1.5.1) set(FEATURE_PATCHES) if("app" IN_LIST FEATURES) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/ompl/omplapp/releases/download/1.5.0/omplapp-1.5.0-Source.tar.gz" + URLS "https://github.com/ompl/omplapp/releases/download/1.5.1/omplapp-1.5.1-Source.tar.gz" FILENAME "omplapp-${OMPL_VERSION}.tar.gz" - SHA512 ad221b67146915cb63be6731ca2fa7d827d85b7fd175d87ee64c799311dfe4878935881b1ae6447357fdd178f70c9aa01b178e857261a8d8769affa1e58ed72b + SHA512 83b1b09d6be776f7e15a748402f0c2f072459921de61a92731daf5171bd1f91a829fbeb6e10a489b92fba0297f6272e7bb6b8f07830c387bb29ccdbc7b3731f3 ) list(APPEND FEATURE_PATCHES fix_dependency.patch) else() vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/ompl/ompl/archive/1.5.0.tar.gz" + URLS "https://github.com/ompl/ompl/archive/1.5.1.tar.gz" FILENAME "ompl-${OMPL_VERSION}.tar.gz" - SHA512 a300682fa0af40768c93e44b819c677b6121812e4f968ad89b5ae4044f3171a7febca63fa5645f2ad0f99ec3dfb3b02fe8c7443c4e389bf19a4a4bc9c7a5d013 + SHA512 2f28d29f32f3bb03e67b29ce251e4786364847a25e3c4cf66d7663ed38dca4da71d4e03cf9ce647710d9524a3907c76c09795e77f041cb8822f695d28f5ca570 ) endif() From a100cd20e2ee9a34e5ae647e50ba6e4587a6b848 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Thu, 24 Dec 2020 08:12:03 +0700 Subject: [PATCH 0354/1694] [zziplib] Uses upstream CMakeLists.txt (#15215) --- ports/zziplib/CMakeLists.txt | 89 ------------------- ports/zziplib/CONTROL | 1 + .../always-find-unixcommands-on-unix.patch | 13 +++ ports/zziplib/fix-export-define.patch | 13 +++ .../install-dll-to-proper-folder.patch | 27 ++++++ ports/zziplib/no-release-postfix.patch | 24 +++++ ports/zziplib/portfile.cmake | 47 +++++++--- 7 files changed, 112 insertions(+), 102 deletions(-) delete mode 100644 ports/zziplib/CMakeLists.txt create mode 100644 ports/zziplib/always-find-unixcommands-on-unix.patch create mode 100644 ports/zziplib/fix-export-define.patch create mode 100644 ports/zziplib/install-dll-to-proper-folder.patch create mode 100644 ports/zziplib/no-release-postfix.patch diff --git a/ports/zziplib/CMakeLists.txt b/ports/zziplib/CMakeLists.txt deleted file mode 100644 index 634bc5edb85d69..00000000000000 --- a/ports/zziplib/CMakeLists.txt +++ /dev/null @@ -1,89 +0,0 @@ -cmake_minimum_required(VERSION 3.0) - -include(GNUInstallDirs) - -project(zziplib C) - -find_package(zlib) - -include_directories(${ZLIB_INCLUDE_DIRS}) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - -if(MSVC) - set(CMAKE_DEBUG_POSTFIX "d") - add_definitions(-D_CRT_SECURE_NO_DEPRECATE) - add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) -endif() - -if(UNIX) - # Find autotools output - set(ZZLIB_AUTOOLS_INCLUDE_DIRS) - file(GLOB CHILDREN RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*") - foreach(CHILD ${CHILDREN}) - string(REGEX MATCH "x86_64*" ZZLIB_AUTOOLS_OUTPUT_FOLDER "${CHILD}") - if (ZZLIB_AUTOOLS_OUTPUT_FOLDER) - set(ZZLIB_AUTOOLS_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/${CHILD}) - include_directories(${ZZLIB_AUTOOLS_INCLUDE_DIRS}) - include_directories(${ZZLIB_AUTOOLS_INCLUDE_DIRS}/zzip) - endif() - endforeach() -endif() - -configure_file("${CMAKE_CURRENT_LIST_DIR}/config.h.in" "${CMAKE_CURRENT_LIST_DIR}/zzip/config.h") -# List the header files -set(HEADERS zzip/__debug.h - zzip/__dirent.h - zzip/__fnmatch.h - zzip/__hints.h - zzip/__mmap.h - zzip/config.h - zzip/_msvc.h - zzip/autoconf.h - zzip/conf.h - zzip/fetch.h - zzip/file.h - zzip/format.h - zzip/fseeko.h - zzip/info.h - zzip/lib.h - zzip/memdisk.h - zzip/mmapped.h - zzip/plugin.h - zzip/stdint.h - zzip/types.h - zzip/write.h - zzip/zzip.h -) -if(UNIX) - file(GLOB OTHER_HEADERS ${ZZLIB_AUTOOLS_INCLUDE_DIRS}/zzip/*.h) - list(APPEND HEADERS ${OTHER_HEADERS}) -else() - list(APPEND HEADERS zzip/_msvc.h) -endif() - -# List the source files -set(SRCS zzip/dir.c - zzip/err.c - zzip/fetch.c - zzip/file.c - zzip/info.c - zzip/plugin.c - zzip/stat.c - zzip/zip.c -) - -add_library(zziplib ${SRCS} ${HEADERS}) - -if(BUILD_SHARED_LIBS) - target_compile_definitions(zziplib PRIVATE -DZZIPLIB_EXPORTS) -endif() - -target_link_libraries(zziplib ${ZLIB_LIBRARIES}) - -install(TARGETS zziplib - COMPONENT runtime - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib) - -install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip) diff --git a/ports/zziplib/CONTROL b/ports/zziplib/CONTROL index 84fde470d28aff..270b55eaaf80af 100644 --- a/ports/zziplib/CONTROL +++ b/ports/zziplib/CONTROL @@ -1,5 +1,6 @@ Source: zziplib Version: 0.13.71 +Port-Version: 1 Build-Depends: zlib Homepage: https://github.com/gdraheim/zziplib Description: library providing read access on ZIP-archives diff --git a/ports/zziplib/always-find-unixcommands-on-unix.patch b/ports/zziplib/always-find-unixcommands-on-unix.patch new file mode 100644 index 00000000000000..9d3a39ade7b975 --- /dev/null +++ b/ports/zziplib/always-find-unixcommands-on-unix.patch @@ -0,0 +1,13 @@ +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index 52555d4..de06eae 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -27,7 +27,7 @@ set(ZZIP_VERSION "${PROJECT_VERSION}") + set(ZZIP_PACKAGE_NAME "${PROJECT_NAME}lib") + set(ZZIP_PACKAGE_VERSION "${PROJECT_VERSION}") + +-if(ZZIPCOMPAT) ++if(UNIX) + find_package ( UnixCommands REQUIRED ) # bash cp mv rm gzip tar + endif() + diff --git a/ports/zziplib/fix-export-define.patch b/ports/zziplib/fix-export-define.patch new file mode 100644 index 00000000000000..b57a9a6988fcdc --- /dev/null +++ b/ports/zziplib/fix-export-define.patch @@ -0,0 +1,13 @@ +diff --git a/zzip/conf.h b/zzip/conf.h +index 27b834a..7f01456 100644 +--- a/zzip/conf.h ++++ b/zzip/conf.h +@@ -203,7 +203,7 @@ + # endif + + +-#if defined ZZIP_EXPORTS || defined ZZIPLIB_EXPORTS ++#if defined ZZIP_EXPORTS || defined ZZIPLIB_EXPORTS || defined libzzip_EXPORTS // CMake export defines + # undef ZZIP_DLL + #define ZZIP_DLL 1 + #endif diff --git a/ports/zziplib/install-dll-to-proper-folder.patch b/ports/zziplib/install-dll-to-proper-folder.patch new file mode 100644 index 00000000000000..4361fb983aa00a --- /dev/null +++ b/ports/zziplib/install-dll-to-proper-folder.patch @@ -0,0 +1,27 @@ +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index a9f6e3a..f3a758b 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -247,12 +247,14 @@ endif() + + install(FILES ${libzzip_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) + install(TARGETS libzzip ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + if(ZZIPFSEEKO) + install(FILES ${libzzipfseeko_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) + install(TARGETS libzzipfseeko ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() +@@ -260,6 +262,7 @@ endif() + if(ZZIPMMAPPED) + install(FILES ${libzzipmmapped_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) + install(TARGETS libzzipmmapped ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() diff --git a/ports/zziplib/no-release-postfix.patch b/ports/zziplib/no-release-postfix.patch new file mode 100644 index 00000000000000..f81c7451357bfe --- /dev/null +++ b/ports/zziplib/no-release-postfix.patch @@ -0,0 +1,24 @@ +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index a9f6e3a..407827b 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -180,16 +180,16 @@ target_link_libraries(libzzipmmapped ZLIB::ZLIB ) + target_include_directories (libzzipmmapped PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) + endif() + +-set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip" RELEASE_POSTFIX "-${RELNUM}") ++set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip") + SET_TARGET_PROPERTIES(libzzip PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM}) + + if(ZZIPFSEEKO) +-set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko" RELEASE_POSTFIX "-${RELNUM}") ++set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko") + SET_TARGET_PROPERTIES(libzzipfseeko PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM}) + endif() + + if(ZZIPMMAPPED) +-set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped" RELEASE_POSTFIX "-${RELNUM}") ++set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped") + SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM}) + endif() + diff --git a/ports/zziplib/portfile.cmake b/ports/zziplib/portfile.cmake index 8b956a55356e9d..cc1d4905475b2a 100644 --- a/ports/zziplib/portfile.cmake +++ b/ports/zziplib/portfile.cmake @@ -3,25 +3,47 @@ vcpkg_from_github( REPO gdraheim/zziplib REF 24a6c6de1956189bffcd8dffd2ef3197c6f3df29 # v0.13.71 SHA512 246ee1d93f3f8a6889e9ab362e04e6814813844f2cdea0a782910bf07ca55ecd6d8b1c456b4180935464cebf291e7849af27ac0ed5cc080de5fb158f9f3aeffb + PATCHES + install-dll-to-proper-folder.patch + no-release-postfix.patch + fix-export-define.patch + always-find-unixcommands-on-unix.patch ) -# Run configure -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - message(STATUS "Configuring zziplib") - vcpkg_execute_required_process( - COMMAND "./configure" --prefix=${CURRENT_INSTALLED_DIR} --with-zlib - WORKING_DIRECTORY "${SOURCE_PATH}" - LOGNAME "autotools-config-${TARGET_TRIPLET}" - ) +if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(MSVC_STATIC_RUNTIME ON) +else() + set(MSVC_STATIC_RUNTIME OFF) endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BUILD_STATIC_LIBS ON) +else() + set(BUILD_STATIC_LIBS OFF) +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + set(ZZIPLIBTOOL OFF) +endif() + +set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS") +set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE - OPTIONS -DZLIB_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DMSVC_STATIC_RUNTIME=${MSVC_STATIC_RUNTIME} + -DZZIPMMAPPED=OFF + -DZZIPFSEEKO=OFF + -DZZIPWRAP=OFF + -DZZIPSDL=OFF + -DZZIPBINS=OFF + -DZZIPTEST=OFF + -DZZIPDOCS=OFF + -DZZIPCOMPAT=OFF + -DZZIPLIBTOOL=${ZZIPLIBTOOL} ) vcpkg_install_cmake() @@ -29,5 +51,4 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/zziplib) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/zziplib/COPYING.LIB ${CURRENT_PACKAGES_DIR}/share/zziplib/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From d3ac5c6a575bd4f205dbf64ae0d82d9f537c62c2 Mon Sep 17 00:00:00 2001 From: yurybura Date: Thu, 24 Dec 2020 04:16:42 +0300 Subject: [PATCH 0355/1694] [boost] update to 1.75.0 (#15090) --- ports/boost-accumulators/CONTROL | 2 +- ports/boost-accumulators/portfile.cmake | 4 +- ports/boost-algorithm/CONTROL | 2 +- ports/boost-algorithm/portfile.cmake | 4 +- ports/boost-align/CONTROL | 2 +- ports/boost-align/portfile.cmake | 4 +- ports/boost-any/CONTROL | 2 +- ports/boost-any/portfile.cmake | 4 +- ports/boost-array/CONTROL | 2 +- ports/boost-array/portfile.cmake | 4 +- ports/boost-asio/CONTROL | 2 +- ports/boost-asio/portfile.cmake | 4 +- ports/boost-assert/CONTROL | 2 +- ports/boost-assert/portfile.cmake | 4 +- ports/boost-assign/CONTROL | 2 +- ports/boost-assign/portfile.cmake | 4 +- ports/boost-atomic/CONTROL | 4 +- ports/boost-atomic/portfile.cmake | 12 +- ports/boost-beast/CONTROL | 2 +- ports/boost-beast/portfile.cmake | 4 +- ports/boost-bimap/CONTROL | 2 +- ports/boost-bimap/portfile.cmake | 4 +- ports/boost-bind/CONTROL | 2 +- ports/boost-bind/portfile.cmake | 4 +- ports/boost-build/CONTROL | 2 +- ports/boost-build/portfile.cmake | 4 +- ports/boost-callable-traits/CONTROL | 2 +- ports/boost-callable-traits/portfile.cmake | 4 +- ports/boost-chrono/CONTROL | 2 +- ports/boost-chrono/portfile.cmake | 4 +- ports/boost-circular-buffer/CONTROL | 2 +- ports/boost-circular-buffer/portfile.cmake | 4 +- ports/boost-compatibility/CONTROL | 2 +- ports/boost-compatibility/portfile.cmake | 4 +- ports/boost-compute/CONTROL | 2 +- ports/boost-compute/portfile.cmake | 4 +- ports/boost-concept-check/CONTROL | 2 +- ports/boost-concept-check/portfile.cmake | 4 +- ports/boost-config/CONTROL | 2 +- ports/boost-config/portfile.cmake | 4 +- ports/boost-container-hash/CONTROL | 2 +- ports/boost-container-hash/portfile.cmake | 4 +- ports/boost-container/CONTROL | 2 +- ports/boost-container/portfile.cmake | 4 +- ports/boost-context/CONTROL | 2 +- ports/boost-context/portfile.cmake | 4 +- ports/boost-contract/CONTROL | 2 +- ports/boost-contract/portfile.cmake | 4 +- ports/boost-conversion/CONTROL | 2 +- ports/boost-conversion/portfile.cmake | 4 +- ports/boost-convert/CONTROL | 4 +- ports/boost-convert/portfile.cmake | 4 +- ports/boost-core/CONTROL | 2 +- ports/boost-core/portfile.cmake | 4 +- ports/boost-coroutine/CONTROL | 2 +- ports/boost-coroutine/portfile.cmake | 4 +- ports/boost-coroutine2/CONTROL | 2 +- ports/boost-coroutine2/portfile.cmake | 4 +- ports/boost-crc/CONTROL | 2 +- ports/boost-crc/portfile.cmake | 4 +- ports/boost-date-time/CONTROL | 2 +- ports/boost-date-time/portfile.cmake | 4 +- ports/boost-detail/CONTROL | 2 +- ports/boost-detail/portfile.cmake | 4 +- ports/boost-dll/CONTROL | 2 +- ports/boost-dll/portfile.cmake | 4 +- ports/boost-dynamic-bitset/CONTROL | 2 +- ports/boost-dynamic-bitset/portfile.cmake | 4 +- ports/boost-endian/CONTROL | 2 +- ports/boost-endian/portfile.cmake | 4 +- ports/boost-exception/CONTROL | 2 +- ports/boost-exception/portfile.cmake | 4 +- ports/boost-fiber/CONTROL | 2 +- ports/boost-fiber/portfile.cmake | 4 +- ports/boost-filesystem/CONTROL | 2 +- ports/boost-filesystem/portfile.cmake | 4 +- ports/boost-flyweight/CONTROL | 2 +- ports/boost-flyweight/portfile.cmake | 4 +- ports/boost-foreach/CONTROL | 2 +- ports/boost-foreach/portfile.cmake | 4 +- ports/boost-format/CONTROL | 2 +- ports/boost-format/portfile.cmake | 4 +- ports/boost-function-types/CONTROL | 2 +- ports/boost-function-types/portfile.cmake | 4 +- ports/boost-function/CONTROL | 2 +- ports/boost-function/portfile.cmake | 4 +- ports/boost-functional/CONTROL | 2 +- ports/boost-functional/portfile.cmake | 4 +- ports/boost-fusion/CONTROL | 2 +- ports/boost-fusion/portfile.cmake | 4 +- ports/boost-geometry/CONTROL | 4 +- ports/boost-geometry/portfile.cmake | 4 +- ports/boost-gil/CONTROL | 2 +- ports/boost-gil/portfile.cmake | 4 +- ports/boost-graph-parallel/CONTROL | 2 +- ports/boost-graph-parallel/portfile.cmake | 4 +- ports/boost-graph/CONTROL | 2 +- ports/boost-graph/portfile.cmake | 4 +- ports/boost-hana/CONTROL | 2 +- ports/boost-hana/portfile.cmake | 4 +- ...compilation-on-MSVC-in-node_disposer.patch | 38 ------ ports/boost-heap/CONTROL | 2 +- ports/boost-heap/portfile.cmake | 5 +- ports/boost-histogram/CONTROL | 2 +- ports/boost-histogram/portfile.cmake | 4 +- ports/boost-hof/CONTROL | 2 +- ports/boost-hof/portfile.cmake | 4 +- ports/boost-icl/CONTROL | 2 +- ports/boost-icl/portfile.cmake | 4 +- ports/boost-integer/CONTROL | 2 +- ports/boost-integer/portfile.cmake | 4 +- ports/boost-interprocess/CONTROL | 2 +- ports/boost-interprocess/portfile.cmake | 4 +- ports/boost-interval/CONTROL | 4 +- ports/boost-interval/portfile.cmake | 4 +- ports/boost-intrusive/CONTROL | 2 +- ports/boost-intrusive/portfile.cmake | 4 +- ports/boost-io/CONTROL | 2 +- ports/boost-io/portfile.cmake | 4 +- ...1-Fix-build-on-windows-with-libc-106.patch | 28 ---- ports/boost-iostreams/CONTROL | 2 +- ports/boost-iostreams/portfile.cmake | 8 +- ports/boost-iterator/CONTROL | 2 +- ports/boost-iterator/portfile.cmake | 4 +- ports/boost-json/CONTROL | 6 + ports/boost-json/portfile.cmake | 12 ++ ports/boost-lambda/CONTROL | 2 +- ports/boost-lambda/portfile.cmake | 4 +- ports/boost-leaf/CONTROL | 6 + ports/boost-leaf/portfile.cmake | 12 ++ ports/boost-lexical-cast/CONTROL | 2 +- ports/boost-lexical-cast/portfile.cmake | 4 +- ports/boost-local-function/CONTROL | 2 +- ports/boost-local-function/portfile.cmake | 4 +- ports/boost-locale/CONTROL | 3 +- ports/boost-locale/portfile.cmake | 4 +- ports/boost-lockfree/CONTROL | 2 +- ports/boost-lockfree/portfile.cmake | 4 +- ports/boost-log/CONTROL | 2 +- ports/boost-log/portfile.cmake | 12 +- ports/boost-logic/CONTROL | 2 +- ports/boost-logic/portfile.cmake | 4 +- ports/boost-math/CONTROL | 4 +- ports/boost-math/portfile.cmake | 4 +- ports/boost-metaparse/CONTROL | 2 +- ports/boost-metaparse/portfile.cmake | 4 +- ports/boost-modular-build-helper/CONTROL | 3 +- ports/boost-modular-build-helper/Jamroot.jam | 4 +- .../boost-modular-build.cmake | 2 +- ports/boost-move/CONTROL | 4 +- ports/boost-move/portfile.cmake | 4 +- ports/boost-mp11/CONTROL | 2 +- ports/boost-mp11/portfile.cmake | 4 +- ports/boost-mpi/CONTROL | 2 +- ports/boost-mpi/portfile.cmake | 4 +- ports/boost-mpl/CONTROL | 2 +- ports/boost-mpl/portfile.cmake | 4 +- ports/boost-msm/CONTROL | 4 +- ports/boost-msm/portfile.cmake | 4 +- ports/boost-multi-array/CONTROL | 2 +- ports/boost-multi-array/portfile.cmake | 4 +- ports/boost-multi-index/CONTROL | 2 +- ports/boost-multi-index/portfile.cmake | 4 +- ports/boost-multiprecision/CONTROL | 2 +- ports/boost-multiprecision/portfile.cmake | 4 +- ports/boost-nowide/CONTROL | 2 +- ports/boost-nowide/portfile.cmake | 14 +- ports/boost-numeric-conversion/CONTROL | 2 +- ports/boost-numeric-conversion/portfile.cmake | 4 +- ports/boost-odeint/CONTROL | 2 +- ports/boost-odeint/portfile.cmake | 4 +- ports/boost-optional/CONTROL | 2 +- ports/boost-optional/portfile.cmake | 4 +- ports/boost-outcome/CONTROL | 2 +- ports/boost-outcome/portfile.cmake | 4 +- ports/boost-parameter-python/CONTROL | 2 +- ports/boost-parameter-python/portfile.cmake | 4 +- ports/boost-parameter/CONTROL | 2 +- ports/boost-parameter/portfile.cmake | 4 +- ports/boost-pfr/CONTROL | 6 + ports/boost-pfr/portfile.cmake | 12 ++ ports/boost-phoenix/CONTROL | 2 +- ports/boost-phoenix/portfile.cmake | 4 +- ports/boost-poly-collection/CONTROL | 2 +- ports/boost-poly-collection/portfile.cmake | 4 +- ports/boost-polygon/CONTROL | 2 +- ports/boost-polygon/portfile.cmake | 4 +- ports/boost-pool/CONTROL | 2 +- ports/boost-pool/portfile.cmake | 4 +- ports/boost-predef/CONTROL | 2 +- ports/boost-predef/portfile.cmake | 4 +- ports/boost-preprocessor/CONTROL | 2 +- ports/boost-preprocessor/portfile.cmake | 4 +- ports/boost-process/CONTROL | 2 +- ports/boost-process/portfile.cmake | 4 +- ports/boost-program-options/CONTROL | 2 +- ports/boost-program-options/portfile.cmake | 4 +- ports/boost-property-map/CONTROL | 2 +- ports/boost-property-map/portfile.cmake | 4 +- ports/boost-property-tree/CONTROL | 2 +- ports/boost-property-tree/portfile.cmake | 4 +- ports/boost-proto/CONTROL | 2 +- ports/boost-proto/portfile.cmake | 4 +- ports/boost-ptr-container/CONTROL | 2 +- ports/boost-ptr-container/portfile.cmake | 4 +- ports/boost-python/CONTROL | 2 +- ports/boost-python/portfile.cmake | 4 +- ports/boost-qvm/CONTROL | 2 +- ports/boost-qvm/portfile.cmake | 4 +- ports/boost-random/CONTROL | 4 +- ports/boost-random/portfile.cmake | 4 +- ports/boost-range/CONTROL | 2 +- ports/boost-range/portfile.cmake | 4 +- ports/boost-ratio/CONTROL | 2 +- ports/boost-ratio/portfile.cmake | 4 +- ports/boost-rational/CONTROL | 2 +- ports/boost-rational/portfile.cmake | 4 +- ports/boost-regex/CONTROL | 2 +- ports/boost-regex/portfile.cmake | 4 +- ports/boost-safe-numerics/CONTROL | 2 +- ports/boost-safe-numerics/portfile.cmake | 4 +- ports/boost-scope-exit/CONTROL | 2 +- ports/boost-scope-exit/portfile.cmake | 4 +- ports/boost-serialization/CONTROL | 2 +- ports/boost-serialization/portfile.cmake | 4 +- ports/boost-signals/CONTROL | 6 - ports/boost-signals/portfile.cmake | 14 -- ports/boost-signals2/CONTROL | 2 +- ports/boost-signals2/portfile.cmake | 4 +- ports/boost-smart-ptr/CONTROL | 2 +- ports/boost-smart-ptr/portfile.cmake | 4 +- ports/boost-sort/CONTROL | 2 +- ports/boost-sort/portfile.cmake | 4 +- ports/boost-spirit/CONTROL | 2 +- ports/boost-spirit/portfile.cmake | 4 +- ports/boost-stacktrace/CONTROL | 2 +- ports/boost-stacktrace/portfile.cmake | 4 +- ports/boost-statechart/CONTROL | 2 +- ports/boost-statechart/portfile.cmake | 4 +- ports/boost-static-assert/CONTROL | 2 +- ports/boost-static-assert/portfile.cmake | 4 +- ports/boost-static-string/CONTROL | 2 +- ports/boost-static-string/portfile.cmake | 4 +- ports/boost-stl-interfaces/CONTROL | 2 +- ports/boost-stl-interfaces/portfile.cmake | 4 +- ports/boost-system/CONTROL | 2 +- ports/boost-system/portfile.cmake | 4 +- ports/boost-test/CONTROL | 2 +- ports/boost-test/portfile.cmake | 4 +- ports/boost-thread/CONTROL | 2 +- ports/boost-thread/portfile.cmake | 4 +- ports/boost-throw-exception/CONTROL | 2 +- ports/boost-throw-exception/portfile.cmake | 4 +- ports/boost-timer/CONTROL | 2 +- ports/boost-timer/portfile.cmake | 4 +- ports/boost-tokenizer/CONTROL | 2 +- ports/boost-tokenizer/portfile.cmake | 4 +- ports/boost-tti/CONTROL | 2 +- ports/boost-tti/portfile.cmake | 4 +- ports/boost-tuple/CONTROL | 2 +- ports/boost-tuple/portfile.cmake | 4 +- ports/boost-type-erasure/CONTROL | 2 +- ports/boost-type-erasure/portfile.cmake | 4 +- ports/boost-type-index/CONTROL | 2 +- ports/boost-type-index/portfile.cmake | 4 +- ports/boost-type-traits/CONTROL | 2 +- ports/boost-type-traits/portfile.cmake | 4 +- ports/boost-typeof/CONTROL | 2 +- ports/boost-typeof/portfile.cmake | 4 +- ports/boost-ublas/CONTROL | 2 +- ports/boost-ublas/portfile.cmake | 4 +- ports/boost-uninstall/CONTROL | 2 +- ports/boost-units/CONTROL | 2 +- ports/boost-units/portfile.cmake | 4 +- ports/boost-unordered/CONTROL | 2 +- ports/boost-unordered/portfile.cmake | 4 +- ports/boost-utility/CONTROL | 2 +- ports/boost-utility/portfile.cmake | 4 +- ports/boost-uuid/CONTROL | 2 +- ports/boost-uuid/portfile.cmake | 4 +- ports/boost-variant/CONTROL | 2 +- ports/boost-variant/portfile.cmake | 4 +- ports/boost-variant2/CONTROL | 2 +- ports/boost-variant2/portfile.cmake | 4 +- ports/boost-vmd/CONTROL | 2 +- ports/boost-vmd/portfile.cmake | 4 +- ports/boost-wave/CONTROL | 4 +- ports/boost-wave/portfile.cmake | 4 +- ports/boost-winapi/CONTROL | 2 +- ports/boost-winapi/portfile.cmake | 4 +- ports/boost-xpressive/CONTROL | 2 +- ports/boost-xpressive/portfile.cmake | 4 +- ports/boost-yap/CONTROL | 2 +- ports/boost-yap/portfile.cmake | 4 +- ports/boost/CONTROL | 4 +- ports/telnetpp/CONTROL | 4 +- ports/telnetpp/fix-build-error.patch | 120 ------------------ ports/telnetpp/fix-install-paths.patch | 48 +++++++ ports/telnetpp/github-215.patch | 47 ------- ports/telnetpp/portfile.cmake | 12 +- scripts/boost/generate-ports.ps1 | 9 +- scripts/boost/post-source-stubs/atomic.cmake | 8 ++ scripts/boost/post-source-stubs/log.cmake | 8 +- scripts/boost/post-source-stubs/nowide.cmake | 10 +- scripts/ci.baseline.txt | 2 + 305 files changed, 580 insertions(+), 733 deletions(-) delete mode 100644 ports/boost-heap/0002-Fix-compilation-on-MSVC-in-node_disposer.patch delete mode 100644 ports/boost-iostreams/0001-Fix-build-on-windows-with-libc-106.patch create mode 100644 ports/boost-json/CONTROL create mode 100644 ports/boost-json/portfile.cmake create mode 100644 ports/boost-leaf/CONTROL create mode 100644 ports/boost-leaf/portfile.cmake create mode 100644 ports/boost-pfr/CONTROL create mode 100644 ports/boost-pfr/portfile.cmake delete mode 100644 ports/boost-signals/CONTROL delete mode 100644 ports/boost-signals/portfile.cmake delete mode 100644 ports/telnetpp/fix-build-error.patch create mode 100644 ports/telnetpp/fix-install-paths.patch delete mode 100644 ports/telnetpp/github-215.patch create mode 100644 scripts/boost/post-source-stubs/atomic.cmake diff --git a/ports/boost-accumulators/CONTROL b/ports/boost-accumulators/CONTROL index 7daae9eeee7e63..a8133bfbbf3779 100644 --- a/ports/boost-accumulators/CONTROL +++ b/ports/boost-accumulators/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-accumulators -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-array, boost-assert, boost-circular-buffer, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-interval, boost-iterator, boost-mpl, boost-numeric-conversion, boost-odeint, boost-parameter, boost-preprocessor, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-typeof, boost-ublas, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/accumulators Description: Boost accumulators module diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake index e5c361ce33fad9..c16b8fbeef241d 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.74.0 - SHA512 7e3dc91e7c5915f310b7b309a993d425b6bbba98b1c3c45f6c582f2756d44e7f913f5f14d6e14f68c367609b51791f958b3c8008e43b9ed133d941ed8649196e + REF boost-1.75.0 + SHA512 1ac43f8a6df1d184261a022c37ffefe9db505e1cc3d4f17cf7ffdf42648d79ebc55653ed299089ff4cf56ccfb90ca565a71fef81735805ef435ac858cf65fae4 HEAD_REF master ) diff --git a/ports/boost-algorithm/CONTROL b/ports/boost-algorithm/CONTROL index 8f2ce3b972c07f..d655bfdeadb0ac 100644 --- a/ports/boost-algorithm/CONTROL +++ b/ports/boost-algorithm/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-algorithm -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-iterator, boost-mpl, boost-range, boost-regex, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/algorithm Description: Boost algorithm module diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake index 29892af8c74844..03817d4c82c101 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.74.0 - SHA512 5fd32673296135769c914e94e6c65d966c05ae7128a8d19a5a1b615f1a52418a84ad2263b86a16d44bcac5b38b5174c2ef38eb51841f8114b55501a3300f03ef + REF boost-1.75.0 + SHA512 6ae80682fcd31caf4dc593f60df6b0c6c26688e2d8aa39277077c29556ae7c4a314cd9037b4d36464ddd3ce28350aa6691e4343617220aae813f98f25611af1a HEAD_REF master ) diff --git a/ports/boost-align/CONTROL b/ports/boost-align/CONTROL index 69d35c4ffc1cbc..88f17f1a4c19f8 100644 --- a/ports/boost-align/CONTROL +++ b/ports/boost-align/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-align -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-core, boost-static-assert, boost-vcpkg-helpers Homepage: https://github.com/boostorg/align Description: Boost align module diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake index c732f88f0cf1ba..be2905a3d14312 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.74.0 - SHA512 3ce9c6e37089cc4dfcfa073d6330d2635eebd176a6186dde9ad0a199ed454ec2bf7185b0adc75a18d42f152fe88d32aa463c08d6c070e0346176cea534a7af5b + REF boost-1.75.0 + SHA512 51d138b368a565ecdd9484a333eb0e1a97a23606d3e195ac3a3aa6f64f9b028f1c2abdfa4b28bc49e11044f8f73692a5d86b5591e8ecaf7aa292a0892361a132 HEAD_REF master ) diff --git a/ports/boost-any/CONTROL b/ports/boost-any/CONTROL index fc3e6a08d5f77e..049889d02dec75 100644 --- a/ports/boost-any/CONTROL +++ b/ports/boost-any/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-any -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-core, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/any Description: Boost any module diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake index cdf0befa347bc2..60bda37d8a2c0e 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.74.0 - SHA512 6aa9fb5d579068909f3e6056484440a0d05459e0cc8cc740c6f8997c422451296759d3225305e07ead4d37fee7285519195c0d04bf68693944154701646972c4 + REF boost-1.75.0 + SHA512 426c4c1b47f86e1637514be45ad60ff2df40c91012c275819a2817ec0edd3fa6de107a16fbdc2cdd3d51d50fa76232f6bfc6b80a963e2fc60e94dd464a7994be HEAD_REF master ) diff --git a/ports/boost-array/CONTROL b/ports/boost-array/CONTROL index 4fcadee898e8c7..705073a66dd0ad 100644 --- a/ports/boost-array/CONTROL +++ b/ports/boost-array/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-array -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers Homepage: https://github.com/boostorg/array Description: Boost array module diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake index 5abc31b600e100..677ecd161c1b5e 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.74.0 - SHA512 1966dfaa2d9154ed8155f9ed5707b0d5ab901591339f11e7b54b750b9cb013a4b68f5b113d8a69c22fd4a05ded2774b77174d393dbeea3c494ec8b64b8d501d3 + REF boost-1.75.0 + SHA512 0ba02e3b084cb7c334d9709ea12d1408461d0ff0b32b35e69869d0cd81e30bd3ab06c2941fa16b51194d5961648d7283e15ebd0d8c8b843d7491a4470e72dd53 HEAD_REF master ) diff --git a/ports/boost-asio/CONTROL b/ports/boost-asio/CONTROL index dfcf9a53e7dd40..0ab98158acb7aa 100644 --- a/ports/boost-asio/CONTROL +++ b/ports/boost-asio/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-asio -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!arm&!uwp&!emscripten), boost-date-time, boost-detail, boost-function, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, openssl Homepage: https://github.com/boostorg/asio Description: Boost asio module diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index aed5015ac4f967..cbc976df0ab751 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.74.0 - SHA512 2ef452044c19b9b8f8701d2d0e6db3764c925f53217f4507c8d60174bf08339188b0f793251756c0dd045cd0170fd8c89092b90ed79c31772530eeceef7639c3 + REF boost-1.75.0 + SHA512 5f332644207f87af8ffbf93d9f1f72b7ca6dfa96d77a871308951c492ae27fac20bad2bfdf4e1de06585c1405d1875c4d4335786b3fc08aa0a76ef4de3626c27 HEAD_REF master PATCHES windows_alloca_header.patch ) diff --git a/ports/boost-assert/CONTROL b/ports/boost-assert/CONTROL index 581a70a3198ed4..1e8117463330f8 100644 --- a/ports/boost-assert/CONTROL +++ b/ports/boost-assert/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-assert -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-vcpkg-helpers Homepage: https://github.com/boostorg/assert Description: Boost assert module diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake index bb8ba42aa518c3..5ec9af67128c7d 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.74.0 - SHA512 e1a0fc699fedfe64c255c4b352b0ecba435f5c6e89724c5ae9bda8019b50849919566a605c1c3a181c9bd3717411f9f3305ee6a0482c9941e68175536655768c + REF boost-1.75.0 + SHA512 3a20f892b6f49d03e0d8488623e1cd3dff3eff708c77851007e50ad7e8bb2e80696a333da7dfa95cacc30e4ddc9f25dce061793670c9b8733df9227631501a08 HEAD_REF master ) diff --git a/ports/boost-assign/CONTROL b/ports/boost-assign/CONTROL index db31f6adbe279a..f21022ca0aaa40 100644 --- a/ports/boost-assign/CONTROL +++ b/ports/boost-assign/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-assign -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-array, boost-config, boost-detail, boost-move, boost-mpl, boost-preprocessor, boost-ptr-container, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/assign Description: Boost assign module diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake index 51bbe7c3dbeac0..790de67746939d 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.74.0 - SHA512 322db92e0ba9c4a92f5433d9ea4923eaa0fc76e4e88c9b45473f95018197007bfda8a84f80bde42648db2a2d33701d1ebe4b9e88e062f1639fbc5a4438c29c7b + REF boost-1.75.0 + SHA512 33c5adc9fe35b670ab9be1e68d61970e6c1ea0a870791fd446669cf501e665e615e72da5bb50a61e0e6bc6d7e695513d1bf73e91f845c5d1b47e694868da2baf HEAD_REF master ) diff --git a/ports/boost-atomic/CONTROL b/ports/boost-atomic/CONTROL index 28d5001cd1e288..8313f466031058 100644 --- a/ports/boost-atomic/CONTROL +++ b/ports/boost-atomic/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-atomic -Version: 1.74.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi +Version: 1.75.0 +Build-Depends: boost-align, boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/atomic Description: Boost atomic module diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index 88dd04b482d41b..a38e389fad9ce9 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -3,11 +3,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/atomic - REF boost-1.74.0 - SHA512 96e68016aac2f059a0fd8423a9c3f92c2fc7a10bad9f15e8c796076bacb4de3c7c322b6dc1013962548020af9bf0c8b59353c72732c05eb8d2cd6a02100a50de + REF boost-1.75.0 + SHA512 4045b4b9cd920854bd8a98298ba8662000bd045fe1322748c7ef0b96fdcb17ce8b55a16e3f10bc7344f37993d1c6df0720ddcc1b5b4255b54a5ca1fc29e253f1 HEAD_REF master ) +file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) +string(REPLACE + "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}/build/config") + include(${CURRENT_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-beast/CONTROL b/ports/boost-beast/CONTROL index 42bf41852fb06d..1a12b71f43666e 100644 --- a/ports/boost-beast/CONTROL +++ b/ports/boost-beast/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-beast -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-asio (!emscripten), boost-assert, boost-bind, boost-config, boost-container, boost-core, boost-endian, boost-intrusive, boost-logic, boost-mp11, boost-optional, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/beast Description: Boost beast module diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake index 17036d7144b49e..a99c6d6c1d1f09 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.74.0 - SHA512 d4112479adb1d2f2c9a6fcd8cddb70a05a404bc25b2127ffa1ab90b0498c5fd1f17965a8e1a741f162c205d28573864240248ca94fa6d9e201b98d90ad6e890e + REF boost-1.75.0 + SHA512 c153b550610834d27e07786d9ad651429d0dea9e47e57578fccd17e463722d413259a4cfbd039a4b30a06b2bd99bd519869ff94e1029e8f22ea1c7f5d9c5ec5f HEAD_REF master ) diff --git a/ports/boost-bimap/CONTROL b/ports/boost-bimap/CONTROL index 2401040b04f15d..db0fb09def835a 100644 --- a/ports/boost-bimap/CONTROL +++ b/ports/boost-bimap/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-bimap -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-concept-check, boost-config, boost-container-hash, boost-core, boost-functional, boost-iterator, boost-lambda, boost-mpl, boost-multi-index, boost-preprocessor, boost-property-map, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/bimap Description: Boost bimap module diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake index f99baafbd7c4fc..0ca4f115b51068 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.74.0 - SHA512 89b0ec177bf8e240b18551ae9e513733d0b11f0b76c665286619e0be2cae9ea560b0a23a5bc232f4604db1a430d94b1127eb285b12a3bb9349728a88af74168b + REF boost-1.75.0 + SHA512 fa8d6666554090b4d37795284e6c3c8e631c4c5e1288ca38da391ff13515d92ef7ba2407ae0b6f45df3bc1cbb736f774bbb58fe582c36514068281e3138d83ad HEAD_REF master ) diff --git a/ports/boost-bind/CONTROL b/ports/boost-bind/CONTROL index f31b60f55eed63..e56dc94fc95920 100644 --- a/ports/boost-bind/CONTROL +++ b/ports/boost-bind/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-bind -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers Homepage: https://github.com/boostorg/bind Description: Boost bind module diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake index f5b3c60eb75e84..1f3b06150772b8 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.74.0 - SHA512 e016d97b7343a7a493b83088df64df128db3ddfe262e38eddb2d184a1c96fb9a437fbdbfc830653e575a6a2bf3073fc57ec961a41aae313ec5e6901722595cbe + REF boost-1.75.0 + SHA512 6c3ef2f4be49222956ad9d8770413486f1f7b216c489bdd9793a859f15b38d15813e16b2554e77314f373ecdfafa6b88c4862c34f5f058752d17a9942b4adf9e HEAD_REF master ) diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL index f7c93ef277b654..324efe22d4493f 100644 --- a/ports/boost-build/CONTROL +++ b/ports/boost-build/CONTROL @@ -1,5 +1,5 @@ Source: boost-build -Version: 1.74.0 +Version: 1.75.0.beta1 Homepage: https://github.com/boostorg/build Description: Boost.Build Build-Depends: boost-uninstall \ No newline at end of file diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index e9da13f81951e5..def5c5cd06a5aa 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.74.0) +set(BOOST_VERSION 1.75.0.beta1) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/build REF boost-${BOOST_VERSION} - SHA512 09d946a93118f5a8c9bd0d46ef4d16e0edf150a7d9e6ca98be1f88357aeb6a8450f913a66a235e03d83850afb2986153258eb8330bf3e2776e4f1ad2fc731206 + SHA512 e5dd73ef41d341e2bce25677389502d22ca7f328e7fdbb91d95aac415f7b490008d75ff0a63f8e4bd9427215f863c161ec9573c29b663b727df4b60e25a3aac2 HEAD_REF master ) diff --git a/ports/boost-callable-traits/CONTROL b/ports/boost-callable-traits/CONTROL index f27896fc86d094..154f49dd41c65e 100644 --- a/ports/boost-callable-traits/CONTROL +++ b/ports/boost-callable-traits/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-callable-traits -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-vcpkg-helpers Homepage: https://github.com/boostorg/callable_traits Description: Boost callable_traits module diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake index 032732318ae932..cb9e910b9995f4 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.74.0 - SHA512 b186092b99663ef34a78c48a1d64ef24a0604f92731bacb4ec6ec03a6bd2ffd1c6d3935b4410fc27ec5a66a98ab97d05841d97521f7021d894c1ee5421e20b26 + REF boost-1.75.0 + SHA512 fbed9560bff606778f1ff30978a6a87bb03f55bef5160f3c40329aa06262e2232fcafeb4a56994c697141bdba3c24b9615b299309a8b3adeb50e4321773596ce HEAD_REF master ) diff --git a/ports/boost-chrono/CONTROL b/ports/boost-chrono/CONTROL index b73d4cac23e11b..85db73b6743c8b 100644 --- a/ports/boost-chrono/CONTROL +++ b/ports/boost-chrono/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-chrono -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-move, boost-mpl, boost-predef, boost-ratio, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/chrono Description: Boost chrono module diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake index cfe2aff23ba6e1..f0fa368ebab3d2 100644 --- a/ports/boost-chrono/portfile.cmake +++ b/ports/boost-chrono/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/chrono - REF boost-1.74.0 - SHA512 c87bc2f70a312397bbb3d1a0659f0510ce7aea27b59aa0197159fce2bcc13e72100b5c10352fb9194398d3dbf23e99da8f9dfebd4e900ab208d9e68e655a3323 + REF boost-1.75.0 + SHA512 97ce109ad99a9687d2528c7b15f56059dcbdfcb120646644a6707cb98f1a9407a70b9c8d295dc933375b923348e6a33817b596fd55d45a8c96e3f1ab9a335ac2 HEAD_REF master ) diff --git a/ports/boost-circular-buffer/CONTROL b/ports/boost-circular-buffer/CONTROL index 253e4a761ca943..e465a88e111f7d 100644 --- a/ports/boost-circular-buffer/CONTROL +++ b/ports/boost-circular-buffer/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-circular-buffer -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-move, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/circular_buffer Description: Boost circular_buffer module diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake index 6d1c0cc254cf38..4aff473d55b356 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.74.0 - SHA512 8f756c74fe1c15f3591cf40d8dd5c6aaeb2c46e581cd2fe08700b08562c1751975dcfc2793d7fa830a583a0528f7e4e07599c034af522469bb938578e63866fe + REF boost-1.75.0 + SHA512 08a51f1d6947802097245d2e97ab23be89447fbaa47ff9538f04ce9e1a3077b6bf0b7ec8be5e21d02eb24c6721f330ed485f57d2fd2e4759021eef508690d5f2 HEAD_REF master ) diff --git a/ports/boost-compatibility/CONTROL b/ports/boost-compatibility/CONTROL index f76b74f8277655..7db50a238e41d1 100644 --- a/ports/boost-compatibility/CONTROL +++ b/ports/boost-compatibility/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-compatibility -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-vcpkg-helpers Homepage: https://github.com/boostorg/compatibility Description: Boost compatibility module diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake index 5e9b619cd7a534..e51625ca932f81 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.74.0 - SHA512 fcaefec8235c0f588ea1498f88cbe02c9e64439f1ce512faa5817c0be8fcd5723f25628f4717c2f3dfb93bc43766d7d1a6196c358ea080c484fdc73cd112c171 + REF boost-1.75.0 + SHA512 9a7dfa28325cdc257d26de9203d64015453a3245c90de63895c7fd8a0ef24e3acea5203737d6ccf69ce51563010772ff7807137e2531f55a1fa7f63e4b2d0547 HEAD_REF master ) diff --git a/ports/boost-compute/CONTROL b/ports/boost-compute/CONTROL index 75aa5cce3c2602..3ba7fa65c29d27 100644 --- a/ports/boost-compute/CONTROL +++ b/ports/boost-compute/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-compute -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-algorithm, boost-array, boost-assert, boost-chrono, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-function-types, boost-fusion, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-preprocessor, boost-property-tree, boost-proto, boost-range, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tuple, boost-type-traits, boost-typeof, boost-utility, boost-uuid, boost-vcpkg-helpers Homepage: https://github.com/boostorg/compute Description: Boost compute module diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake index bd5d73778f0d01..e2a9b1624d441a 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.74.0 - SHA512 484fa370cc4dc98d40a6d0227d1313ff8097653390fde87928963b32bc30e43b0c81da542cc85bb17cfc6348e801d244fe177e6640f825b7899e5f0a6884ad46 + REF boost-1.75.0 + SHA512 740e351c466d133058b2730311194198f958504b6b0c20517e54ad7809d71d3fe11d35b7935d6bf49f191d4dea7a9f37be21fa4f8d363331588a32d73febc047 HEAD_REF master ) diff --git a/ports/boost-concept-check/CONTROL b/ports/boost-concept-check/CONTROL index b02db5c9260f36..3c2878cc47d44c 100644 --- a/ports/boost-concept-check/CONTROL +++ b/ports/boost-concept-check/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-concept-check -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/concept_check Description: Boost concept_check module diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index 9719f5de0d2049..6f87cfe2de4fe8 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.74.0 - SHA512 ee083482c4bc41effcd1dc342c22f4d733a90ec12425bbdf328c62cf0df4259b220c18df2463ad6ec9586eb90b80b4bcc30c467fdd92d44135b7d1b169b55bac + REF boost-1.75.0 + SHA512 823e3af47881c98f864c70686a3a2f6c9b7d5e6bf0ae61f2983f6c2ba26a70aaa888b683a74ef504ec7f5f479609731e35fad3518f1731954e01e7d67636e5d4 HEAD_REF master ) diff --git a/ports/boost-config/CONTROL b/ports/boost-config/CONTROL index f9ff2551893064..05872022387386 100644 --- a/ports/boost-config/CONTROL +++ b/ports/boost-config/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-config -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-compatibility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/config Description: Boost config module diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index cc8d18e7771d6c..10850a47bb2a21 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.74.0 - SHA512 2dfd49f4d20dfbad17304d577d64c7b6af04a3152591b415c4dd4926029e46bf1c45a6b894674a42cbfc9a1d2f85e4ed80c1210b78086a03c9ff2f0a72b5ec89 + REF boost-1.75.0 + SHA512 458cd2e2d1649b6cba86eb1b0be61259a36ca716ccc418d5501dbcc78f2884226ae5d2ddcb99a644df6c90ea1601a2f7d8a0484389ccd2148e18cee137165f23 HEAD_REF master ) diff --git a/ports/boost-container-hash/CONTROL b/ports/boost-container-hash/CONTROL index 31cd1ebf44c93f..974d546bd33a98 100644 --- a/ports/boost-container-hash/CONTROL +++ b/ports/boost-container-hash/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-container-hash -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/container_hash Description: Boost container_hash module diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake index c64d18aa8e4f3a..e35664e365cd47 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.74.0 - SHA512 00681c81ace607347a859cb1c6b070fae860a10900bd93d2cf743ff38e76143676adf32780f525666413dbdf97bae13d4dcd2ff3bc95e977969e8a50b7bb10cc + REF boost-1.75.0 + SHA512 4d1a8381e9b7554884597db4b1e365465845b1fd7e665ec5bc89c38f859fb4b62e024e77b2cd818f3bdf959476dedae0fc49fc43e28e4e9043e0386a366f9a43 HEAD_REF master ) diff --git a/ports/boost-container/CONTROL b/ports/boost-container/CONTROL index 5ce8a865551452..ad0bfc6eee61e4 100644 --- a/ports/boost-container/CONTROL +++ b/ports/boost-container/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-container -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-build, boost-config, boost-container-hash, boost-core, boost-integer, boost-intrusive, boost-modular-build-helper, boost-move, boost-static-assert, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/container Description: Boost container module diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake index 151ddb81930bc2..285ab0b176c691 100644 --- a/ports/boost-container/portfile.cmake +++ b/ports/boost-container/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container - REF boost-1.74.0 - SHA512 9bf2584da463245f33b78a6b21fc09c5ac9c6ea626d3cd1bda2aa49105d4a55bbda6d8ef030f3364c633edf7b360974b73ad2ab5ba5d8fdb684215ba374dc23a + REF boost-1.75.0 + SHA512 b49609fcf1195f8661b1603d8328bd6009d2667c85dce5a4b3309582976c5e73ae21bc64a58100a9a7ef8fa10bc18075bb0c06f0e56cc16c50cda8b31cea26dc HEAD_REF master ) diff --git a/ports/boost-context/CONTROL b/ports/boost-context/CONTROL index 75e8a7fa0068f5..d55f465adc54ff 100644 --- a/ports/boost-context/CONTROL +++ b/ports/boost-context/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-context -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-integer, boost-modular-build-helper, boost-pool, boost-predef, boost-smart-ptr, boost-thread, boost-vcpkg-helpers Homepage: https://github.com/boostorg/context Description: Boost context module diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index cc05aaaa0fd69c..dd4c347babd811 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/context - REF boost-1.74.0 - SHA512 23a4a7fa9c993f0d88ebc4fdad765c63ba96d66a07e553e3d304725c2c38d70d2083a65eec7940522f8b61f6deddea18081cd3aca5bcf080fbc448768b44a6ee + REF boost-1.75.0 + SHA512 e1ba126cf1c785c38e196c1eddc347b5b06badf980d3b83d7b1c41d77ca060fbe18b34758d5beadcb53d54e13ce76775fcea24963f1754fab4e482da099cfade HEAD_REF master PATCHES fix_exports_for_32bit_GNU_asm_for_windows.patch ) diff --git a/ports/boost-contract/CONTROL b/ports/boost-contract/CONTROL index deb9b2284e735a..1c6d642cc8bf11 100644 --- a/ports/boost-contract/CONTROL +++ b/ports/boost-contract/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-contract -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-any, boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-function-types, boost-modular-build-helper, boost-mpl, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-thread, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/contract Description: Boost contract module diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake index e203ffd0f66cbc..de3fddacfe1543 100644 --- a/ports/boost-contract/portfile.cmake +++ b/ports/boost-contract/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/contract - REF boost-1.74.0 - SHA512 5f6c5999e71dba1cc840391121e72d94d8b556e45a7e06f05cad3c6bf2d9be8109ea39586f07467703d5624f60ebc2fd193c69ec30bac94a8bc5a7a94d5a438a + REF boost-1.75.0 + SHA512 6dc5bad8e9d54c9a33f68da89956fbcf89af51bedbd4b8c539cff23d59e14ed93f521f88d247b66816ed8bc4d13634d2573ff52e3e05356906e1141490615966 HEAD_REF master ) diff --git a/ports/boost-conversion/CONTROL b/ports/boost-conversion/CONTROL index df2d1e565d63db..56f7f533b1f8a3 100644 --- a/ports/boost-conversion/CONTROL +++ b/ports/boost-conversion/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-conversion -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-core, boost-smart-ptr, boost-throw-exception, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/conversion Description: Boost conversion module diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake index 8a0f3621d54ae3..a085460733e659 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.74.0 - SHA512 a4ade9b73f204699cee883f45091f5f8fae593d8f5e21601a770a5e78d529321971a745a9d9c90d84fd3388e7fa0ebff2e58fd8a4ccd7b70dd222e2889b23ed1 + REF boost-1.75.0 + SHA512 0f9f1d7eb9a6b9cf69322aa5007c237cf4775a2778613b2f14da6be6158dad18dcf266ade7a9394a7ac9f85cc9e3b2d600f4a978f2139aa41cfee7f404a161ba HEAD_REF master ) diff --git a/ports/boost-convert/CONTROL b/ports/boost-convert/CONTROL index 8ce2e8bb01deb4..57069e9cdf9aee 100644 --- a/ports/boost-convert/CONTROL +++ b/ports/boost-convert/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-convert -Version: 1.74.0 -Build-Depends: boost-config, boost-core, boost-function-types, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-parameter, boost-range, boost-spirit, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.75.0 +Build-Depends: boost-config, boost-core, boost-function-types, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-parameter, boost-range, boost-spirit, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/convert Description: Boost convert module diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake index 2885a94abbeeff..a21f716390e184 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.74.0 - SHA512 91593fa05a3762f585b56eb970bc44c8a5becd894312c7b92472d63b78e69e7d920f4010085a268a34ca331ec095abd67a52a7b0e70fb071652c18e6f536d110 + REF boost-1.75.0 + SHA512 e977b0336ea5cc01d9597cd6b2a4ed814c8f84520837742fa40f671dfaa2f49df7f133464fc86819c837f32afcff15c66e399d9b77de020c245e223501399e7e HEAD_REF master ) diff --git a/ports/boost-core/CONTROL b/ports/boost-core/CONTROL index fafe3892a1d590..75057985d0d202 100644 --- a/ports/boost-core/CONTROL +++ b/ports/boost-core/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-core -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-vcpkg-helpers Homepage: https://github.com/boostorg/core Description: Boost core module diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake index 16fe559264d234..4b79ee17a0216a 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.74.0 - SHA512 1c49b667d12f3ac130d4fb36fda9d0dabae70abe06dc801f25164ce1b26b2597c2ec3ef5aa3e8fae745ca5b62df88c28509a212bc3b70e108f3316acc54bc247 + REF boost-1.75.0 + SHA512 316fb165037850b7c70d24d1c78ebd188613049d389cc2d59a1da4a3d130708ce945191e46a599452e9aa2bc224ac12fe23ad6f118e8335c474d4a202c6a8d6e HEAD_REF master ) diff --git a/ports/boost-coroutine/CONTROL b/ports/boost-coroutine/CONTROL index 4ac348b63eda96..07a8c000234b0c 100644 --- a/ports/boost-coroutine/CONTROL +++ b/ports/boost-coroutine/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-coroutine -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-build, boost-config, boost-context (!uwp&!emscripten), boost-core, boost-detail, boost-exception, boost-integer, boost-modular-build-helper, boost-move, boost-system, boost-thread, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/coroutine Description: Boost coroutine module diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake index 796768648c5cf7..1ab75e65d610b9 100644 --- a/ports/boost-coroutine/portfile.cmake +++ b/ports/boost-coroutine/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine - REF boost-1.74.0 - SHA512 60456fce7f6f75e397e25e7ebbba453a1bb93218000518e10a8a654ad4dd66f49a6f62e5ca4b67c0034d56a48fed422ef0684e651d7c247b47a5c2150f3b3f8b + REF boost-1.75.0 + SHA512 0fe4181896b4cca48c8aced4fba47974a06547e5d7477284b7e6564171ab61ae0f2564b720e164a27b5c7cebeae911f8741732f9516d2bdb04c8dd3aff835051 HEAD_REF master ) diff --git a/ports/boost-coroutine2/CONTROL b/ports/boost-coroutine2/CONTROL index 2d2d2b7ef8ec83..1229e6103911a1 100644 --- a/ports/boost-coroutine2/CONTROL +++ b/ports/boost-coroutine2/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-coroutine2 -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-context (!uwp&!emscripten), boost-detail, boost-vcpkg-helpers Homepage: https://github.com/boostorg/coroutine2 Description: Boost coroutine2 module diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake index 5c75be709696cc..ee3f3c7f5f97c0 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.74.0 - SHA512 276e79d7f3476899e91c4cb67670fb1e6aa582e74b12fae1c88f91ac8ec11d212f2672788814676042a1dd2ce50555ef7ed78024871275f9bd66747f4669267f + REF boost-1.75.0 + SHA512 76fb3edec0edc82b9aea20e8b3732a9848f5eab7851a3ff287d4b043c89a99ceb217b797630234131bb1c8163af799a48da25dbbb7ff9d276823186da41f3330 HEAD_REF master ) diff --git a/ports/boost-crc/CONTROL b/ports/boost-crc/CONTROL index d5d18f3b27846c..404b7f0a6a6169 100644 --- a/ports/boost-crc/CONTROL +++ b/ports/boost-crc/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-crc -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-array, boost-compatibility, boost-config, boost-integer, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/crc Description: Boost crc module diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake index a0ed847c07ebb0..9f37576607a901 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.74.0 - SHA512 4ab6284ed92614f76a32693acba6d40440b8717279434e7db41403e027c20d0684f4ff4aaf6929f35b1a0f624269f42e0a61d2f6bac7e39df25539e72d4d2abe + REF boost-1.75.0 + SHA512 500ee5b9b91d45dfb00486905e0953e88be5a64f7c1d256c1bd5af0497a1ff02f6c64c22b07a31c2331480bf1b3d6956ca79dabc2183110662b271b76a8541f8 HEAD_REF master ) diff --git a/ports/boost-date-time/CONTROL b/ports/boost-date-time/CONTROL index 8475d4bd795361..53ebef2a9f4147 100644 --- a/ports/boost-date-time/CONTROL +++ b/ports/boost-date-time/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-date-time -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-algorithm, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-numeric-conversion, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/date_time Description: Boost date_time module diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake index 94b40bebc1ae83..d57ca67e8d8a64 100644 --- a/ports/boost-date-time/portfile.cmake +++ b/ports/boost-date-time/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/date_time - REF boost-1.74.0 - SHA512 a265ac4e217d5a40a838829dc75542d5faa8ddc435dc816aec3c108b9fd90ca8272c03b65cc2541087fb95343c57eb11d259bd822798e8112f415bd10ecc97a5 + REF boost-1.75.0 + SHA512 9500e4db431c7a805d6a1acdd3c71c464aed2ad4c42fe6f86fea05f1144b4243fc5fab90c79e41d4723323f5efe747b48c2edceb43e101c00a5117a5c0f5ad09 HEAD_REF master ) diff --git a/ports/boost-detail/CONTROL b/ports/boost-detail/CONTROL index 62ea25cb13df11..6d8c709e5b1a67 100644 --- a/ports/boost-detail/CONTROL +++ b/ports/boost-detail/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-detail -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-compatibility, boost-config, boost-preprocessor, boost-vcpkg-helpers Homepage: https://github.com/boostorg/detail Description: Boost detail module diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake index a739eb87e370ed..8a832f186c23c3 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.74.0 - SHA512 bcab74797f4b9918fea6245bd389947e5a2e42c8718d862074ece0842e11d0848e93125306f91c74fcd85ef02c7af2b8c9b9c90472464b5765c011fe9c6d4084 + REF boost-1.75.0 + SHA512 69950608f8c1a923fdad229b479230c2e2e63bddb813b0621ae196afed2a79edf35676ef6e63f13b2fb85b39d5354139b96fdf0a67092d9850d4c2025880a91c HEAD_REF master ) diff --git a/ports/boost-dll/CONTROL b/ports/boost-dll/CONTROL index a23e863d8458d1..399c09a71c27ce 100644 --- a/ports/boost-dll/CONTROL +++ b/ports/boost-dll/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-dll -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-move, boost-predef, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-throw-exception, boost-type-index, boost-type-traits, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/dll Description: Boost dll module diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake index 94238e2ec91bfa..e4b63ea78e780b 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.74.0 - SHA512 44feb49f793061404f3863f0906488828c136b577b6d1446211df57f668d85c4ccac971e8c807afbe8a6837f482d3d5827ecc999abe2156e5149cb00aece4351 + REF boost-1.75.0 + SHA512 ae9490fb8fdcad0f350d2e3fa99eae4c72d890503b64f7bf1a2a2fad18babe27c18ddfc5fb0075a3d101ddbc6791df5bb0eaf295d6cc59ea9dcec11ab9fde11b HEAD_REF master ) diff --git a/ports/boost-dynamic-bitset/CONTROL b/ports/boost-dynamic-bitset/CONTROL index 9c7ab3c76aaa9d..0077c213180c29 100644 --- a/ports/boost-dynamic-bitset/CONTROL +++ b/ports/boost-dynamic-bitset/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-dynamic-bitset -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-core, boost-vcpkg-helpers Homepage: https://github.com/boostorg/dynamic_bitset Description: Boost dynamic_bitset module diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake index 9281610767e432..67146a1ef13877 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.74.0 - SHA512 5cc562d7310c7dfa88b3255db6c1b22af1e5a3d4861422d1eae05faf8dabd46c9a4387c9d92c18d66dcc13c869c6ba0e255c6cc59e4141d3c21203c15d61a1c1 + REF boost-1.75.0 + SHA512 6612007e0c344ef6ec9ff502922e43aba9422c6f80e50830be9f02817310df4424a6b8b15d70088491e1d6b0b4a5ede5c69150b1833afcbb72c70e04274e0050 HEAD_REF master ) diff --git a/ports/boost-endian/CONTROL b/ports/boost-endian/CONTROL index 43a9af4e1e2d1d..aefeece6151a28 100644 --- a/ports/boost-endian/CONTROL +++ b/ports/boost-endian/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-endian -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-core, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/endian Description: Boost endian module diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake index d9238acac4e896..7731ffa6aaa3e0 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.74.0 - SHA512 8efaaae603f2dc32f71cdb85a94b6ae0568bc5201886824a4f0ea23d6852d9c6c796f74062d9234a3225906005563ab6a41505b7f8f29527fe5d93df5cdbb4ca + REF boost-1.75.0 + SHA512 cd8ba3b22303424b848e2c985cd3e1da632ce299bff1e0fa7ff42539a077707cf50389505786c7418b6b6786c545728583baeaba8a65ead37c8c595457e64458 HEAD_REF master ) diff --git a/ports/boost-exception/CONTROL b/ports/boost-exception/CONTROL index e56767b4d505bc..f44d3ea9704994 100644 --- a/ports/boost-exception/CONTROL +++ b/ports/boost-exception/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-exception -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-modular-build-helper, boost-smart-ptr, boost-tuple, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/exception Description: Boost exception module diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake index 4bc2b7130eab3f..065d39969f5ca9 100644 --- a/ports/boost-exception/portfile.cmake +++ b/ports/boost-exception/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/exception - REF boost-1.74.0 - SHA512 f12824beba6f93e968afd07e61957f06231f91e291ab667c7cbcd942c2320267b051ec20612ce21dd75a17979cad07c45ab85c5d1b562e9a8f00752c951372d7 + REF boost-1.75.0 + SHA512 fe7c62f3970b7041ac94922105305696374fbee59f8cfe3a48035f6487e616f430a1a577bfad997e2be34dc50393b9301726ca27612689f9275b64633c3fab1e HEAD_REF master ) diff --git a/ports/boost-fiber/CONTROL b/ports/boost-fiber/CONTROL index cad5392eec2359..4b0fb7c036662d 100644 --- a/ports/boost-fiber/CONTROL +++ b/ports/boost-fiber/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-fiber -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-algorithm, boost-assert, boost-build, boost-config, boost-context (!uwp&!emscripten), boost-core, boost-detail, boost-filesystem (!uwp), boost-format, boost-intrusive, boost-modular-build-helper, boost-predef, boost-smart-ptr, boost-vcpkg-helpers Homepage: https://github.com/boostorg/fiber Description: Boost fiber module diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake index f78be9cb66f18b..bd518c8d211b0b 100644 --- a/ports/boost-fiber/portfile.cmake +++ b/ports/boost-fiber/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fiber - REF boost-1.74.0 - SHA512 ede0f770fcdd7f56b70b6a86de8d246b8abbcc9a0608b3d19c582a1240811d46320a5eb9c9416c83fc358dfd5b17855ab17f4e965af5c522b9b08c5a6df8675c + REF boost-1.75.0 + SHA512 8b6355aaf804bbf8c33d65e7cb8c5c0e26ca33af0f4da49369073b92ff2afe84c992adf204c1aeedb137daa7f544ed7b40550fca294ed2ba62c8a615b4e5f7da HEAD_REF master ) diff --git a/ports/boost-filesystem/CONTROL b/ports/boost-filesystem/CONTROL index 626ad74a557c89..898a3fc3ea46a8 100644 --- a/ports/boost-filesystem/CONTROL +++ b/ports/boost-filesystem/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-filesystem -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-predef, boost-smart-ptr, boost-system, boost-type-traits, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/filesystem Description: Boost filesystem module diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake index 30ae416c73d322..4efe36a6301eaf 100644 --- a/ports/boost-filesystem/portfile.cmake +++ b/ports/boost-filesystem/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/filesystem - REF boost-1.74.0 - SHA512 06d1e6306299910efaa93ba132f629f22059775d58355f1914f83c36d65e445f26e2566e982be677a8e358cd3e7e06a76432cee5b19c883760d9cc07b14e8ee0 + REF boost-1.75.0 + SHA512 e79008f39568eaa4763110e4c172b022220b0667d7f05c606daed92f6f5c3977f2478063b6b16db6517b3e33b2df8ec13f8f0ae134fb2020a93d64895170b08d HEAD_REF master ) diff --git a/ports/boost-flyweight/CONTROL b/ports/boost-flyweight/CONTROL index f54ae464a77e2e..49d8da34c12347 100644 --- a/ports/boost-flyweight/CONTROL +++ b/ports/boost-flyweight/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-flyweight -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-functional, boost-interprocess, boost-mpl, boost-multi-index, boost-parameter, boost-preprocessor, boost-serialization, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/flyweight Description: Boost flyweight module diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake index a84c5203eec59e..35e6593b59ae9e 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.74.0 - SHA512 66e0a8c8c7d0b2302c58d59e38506ef50d4562bf016b230332741e4ec781833e48c0945380a6028173b56fc542ba59b98edcde7f1c173129f3fdf7e8e54e9a33 + REF boost-1.75.0 + SHA512 ab39e5c10f2e2ef75caefd7fa56f2cae013a3d45554e3e66466bf985ef56c942a69a4b5da98de415258119b420a7514fe9b28d1e62f8822eaeacdf4d15e25451 HEAD_REF master ) diff --git a/ports/boost-foreach/CONTROL b/ports/boost-foreach/CONTROL index 7ea6007ef2f0a0..7615cdef26e9c4 100644 --- a/ports/boost-foreach/CONTROL +++ b/ports/boost-foreach/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-foreach -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-core, boost-detail, boost-iterator, boost-mpl, boost-range, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/foreach Description: Boost foreach module diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake index 4c3dc627b8b8e5..ffca9e681d803e 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.74.0 - SHA512 84987912eb07a85f34a9e10ef7711e8203f7b0cd86f3a9615470e17a51790d6e4b8e33e03c7743696ab50849d990606cebfd044be0eecd80ed41bf99dc4900bf + REF boost-1.75.0 + SHA512 6e88997825127ed0876c3d496b108b4bb7cdfba0e37705288868491150ed455a52624bec49653d9ffc547d98288e1395fd9b95c09a31d763618c76184c9d4853 HEAD_REF master ) diff --git a/ports/boost-format/CONTROL b/ports/boost-format/CONTROL index 9b18e6a641d02b..1c9bc42447d7d9 100644 --- a/ports/boost-format/CONTROL +++ b/ports/boost-format/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-format -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-optional, boost-smart-ptr, boost-throw-exception, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/format Description: Boost format module diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake index 4f2ab130c7957b..600a66bfa40ddc 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.74.0 - SHA512 87da307bdcacd1615d07d60ebd3061e4976b3af8b52c39dc35980aa55e726964560b48276fb7a6e4a4068d4f956b426275da02591846e5e9300fd158d3fa50aa + REF boost-1.75.0 + SHA512 618ad8b4d7b2982973b21b69e4c8d9c982b56d775756b52399aea3dbdece718e6e77a202e8ecaeec5597a5781227893acc2da837a224ce89f439579d8395b05a HEAD_REF master ) diff --git a/ports/boost-function-types/CONTROL b/ports/boost-function-types/CONTROL index 877bc5ecb1ee61..bfb7804a8d141e 100644 --- a/ports/boost-function-types/CONTROL +++ b/ports/boost-function-types/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-function-types -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-core, boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/function_types Description: Boost function_types module diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake index da59bd54c338c1..35c6b81318001b 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.74.0 - SHA512 684887b5e2f6dc957a0f157596ac1d964d956ce0b9fab1b75c334848e9b5b5b2e2ccc486cdace5bcc453eb203cb5645d8413d7f21cadb36401798fd8e8c610ee + REF boost-1.75.0 + SHA512 990e67e874a7bf135d1a4c3ef4654a2a5e4879e8d21445c1fee56c37be76477ade7401bd4106b8bac07de54e1cf14a5a9ec643ff647c170877e1153a878ba762 HEAD_REF master ) diff --git a/ports/boost-function/CONTROL b/ports/boost-function/CONTROL index 0d19ff3a57038a..7a53955e33855a 100644 --- a/ports/boost-function/CONTROL +++ b/ports/boost-function/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-function -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-integer, boost-preprocessor, boost-throw-exception, boost-type-index, boost-type-traits, boost-typeof, boost-vcpkg-helpers Homepage: https://github.com/boostorg/function Description: Boost function module diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake index 6aee9e2c4d4482..b73fdd694543e6 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.74.0 - SHA512 4e273ceaca3ae5982b248d0636920a814fa9c6ed15a8f0c33dbac4887beff481e828e828ae24800f36684ba1fdf11856893f9c4f82a447af346e32e159dc57ee + REF boost-1.75.0 + SHA512 5e7753aa8857a032d77abdbeded9633b00df5cf93f79dd3f53e957db00fbbe3b6ee5fe9a01c3fc9830c159f0dd62aac1fbf062909e832c5fa7dabed003003822 HEAD_REF master ) diff --git a/ports/boost-functional/CONTROL b/ports/boost-functional/CONTROL index 9049dd1f149a99..69ffcaf8466de6 100644 --- a/ports/boost-functional/CONTROL +++ b/ports/boost-functional/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-functional -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-core, boost-mpl, boost-preprocessor, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/functional Description: Boost functional module diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake index f3f8b4f5276350..54ba8db2b969a8 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.74.0 - SHA512 eb9e5ad7efcb3a8d745722d0a8bed6d2bfa4a45e5dca6cec0bcd785e012a7a5107b5069810b5cae0d54c790f2e1d089664263c8785cc84eb85d18a2e6f5d4bb7 + REF boost-1.75.0 + SHA512 f5f9b759b27c92b8b948c0043f83eaebef206e75430b85a4da27d2f643e15cf31c56ca06ad9b30b291d28fadcc93eabaa0b13277a3d14be0abe9eb5a07259393 HEAD_REF master ) diff --git a/ports/boost-fusion/CONTROL b/ports/boost-fusion/CONTROL index fdf484688dd041..f589908acd890f 100644 --- a/ports/boost-fusion/CONTROL +++ b/ports/boost-fusion/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-fusion -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-container-hash, boost-core, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-static-assert, boost-tuple, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/fusion Description: Boost fusion module diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake index f8cc3753f9aa61..7d11ff35d24dae 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.74.0 - SHA512 12ec0e15ba0e71fda681c811168ca525bad23ebb71d349d8d113382f28da060e13c03651725e57937a957b9a912d1bf3b00f0702562ad0f677c71b6aacee097e + REF boost-1.75.0 + SHA512 13c0dcd2b0c9466f240843c5edaef7e292c118f26e598595b9fe30d3ae5952c0617b3c7786e93cf1589e419444d87f1bb2fa5254878c89e422497d86fb25428d HEAD_REF master ) diff --git a/ports/boost-geometry/CONTROL b/ports/boost-geometry/CONTROL index bb11730e6fbf1d..d4c9dcc3df8db0 100644 --- a/ports/boost-geometry/CONTROL +++ b/ports/boost-geometry/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-geometry -Version: 1.74.0 -Build-Depends: boost-algorithm, boost-array, boost-assert, boost-concept-check, boost-config, boost-container, boost-core, boost-detail, boost-function-types, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-move, boost-mpl, boost-multiprecision, boost-numeric-conversion, boost-polygon, boost-qvm, boost-range, boost-rational, boost-serialization, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tokenizer, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers +Version: 1.75.0 +Build-Depends: boost-algorithm, boost-array, boost-assert, boost-concept-check, boost-config, boost-container, boost-core, boost-function-types, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-move, boost-mpl, boost-multiprecision, boost-numeric-conversion, boost-polygon, boost-qvm, boost-range, boost-rational, boost-serialization, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tokenizer, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers Homepage: https://github.com/boostorg/geometry Description: Boost geometry module diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake index f2bbc7a794bf67..1a34a81d04d3f2 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.74.0 - SHA512 5e99b833b3509e24e3e76ed32c394051c6fd3a2cbdf4fe6490c5f803cf944b56704df309aee6712da33edd398be1f62fbda7a7f84a693d1c1bda0cf8875a83b2 + REF boost-1.75.0 + SHA512 d5fb18363bb4a9e25079b36190b253e5134196ad8942e935c4be31a8495750343779115e83e9e6c787692ff22cf6c6b41f1263abcf49d2cbaf1e6e6328edff15 HEAD_REF master ) diff --git a/ports/boost-gil/CONTROL b/ports/boost-gil/CONTROL index 3f66f43feb708e..cb94f0c8558ee9 100644 --- a/ports/boost-gil/CONTROL +++ b/ports/boost-gil/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-gil -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-concept-check, boost-config, boost-core, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-mp11, boost-numeric-conversion, boost-preprocessor, boost-utility, boost-variant2, boost-vcpkg-helpers Homepage: https://github.com/boostorg/gil Description: Boost gil module diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake index fc37be834126c1..e2d12ee2ebe4dd 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.74.0 - SHA512 8ecccadfeaf7693d8feec6fa5b2a095025b80ac96ebc33181b6264149680e21b3203e6d25c511d18e4c4089f9556788df1f6c0f84abae250d2e1b1c4ce764e5f + REF boost-1.75.0 + SHA512 aff1ea0e3455ce18faf691b02481e8c591e5cf0918981d1a3cf95971ea93f31ed72a51efbf7b8557ab51d186d4a7fbed03dbf996c7f2e0be28c5d5fc67277048 HEAD_REF master ) diff --git a/ports/boost-graph-parallel/CONTROL b/ports/boost-graph-parallel/CONTROL index e3681bc348dc91..c48b2d852c547f 100644 --- a/ports/boost-graph-parallel/CONTROL +++ b/ports/boost-graph-parallel/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-graph-parallel -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-detail, boost-dynamic-bitset, boost-filesystem (!uwp), boost-foreach, boost-function, boost-graph, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-property-map, boost-random, boost-serialization, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers Homepage: https://github.com/boostorg/graph_parallel Description: Boost graph_parallel module diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake index fdf04461becb9d..ef24ef770a9259 100644 --- a/ports/boost-graph-parallel/portfile.cmake +++ b/ports/boost-graph-parallel/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph_parallel - REF boost-1.74.0 - SHA512 4a66e4ab4f09d47dc1b0a5607cf88b2afa9a0e673beab2c65f7f5d02675e6e146c6e8a4f93037f1a83469549250390202cfcda926a9cdf04fc1cca1701e4859a + REF boost-1.75.0 + SHA512 46d86b9d6822a0b762d9587d96da35cf784b21853d99e2ea4d6172c4b2a1382158037652f0a73d0545793edabdde5e21e6515c01991cb761a1a3fa304bfa742e HEAD_REF master ) diff --git a/ports/boost-graph/CONTROL b/ports/boost-graph/CONTROL index 0597af8d908f1f..b5d9a06fa499c7 100644 --- a/ports/boost-graph/CONTROL +++ b/ports/boost-graph/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-graph -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-algorithm, boost-any, boost-array, boost-assert, boost-bimap, boost-bind, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-multi-index, boost-optional, boost-parameter, boost-preprocessor, boost-property-map, boost-property-tree, boost-random, boost-range, boost-regex, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-test (!uwp), boost-throw-exception, boost-tti, boost-tuple, boost-type-traits, boost-typeof, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-xpressive Homepage: https://github.com/boostorg/graph Description: Boost graph module diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake index 24024486405125..26767b93f53814 100644 --- a/ports/boost-graph/portfile.cmake +++ b/ports/boost-graph/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph - REF boost-1.74.0 - SHA512 6a27f661f6b815337995e925e1910a5a31905b15f15b7afe90eb2b967168db4287ac9e4b41445b5dc64f4e2830c352afbaf045d2dc1f3b5851cabf290740901d + REF boost-1.75.0 + SHA512 163ddbd6e439bcb53632cd3ec1e670d128e69ec5347737a6e10c5b5af231ad7cc085d594f1bf55894f342a81a141ca4309582f660c74b0db3fe1f7aa78c208cf HEAD_REF master ) diff --git a/ports/boost-hana/CONTROL b/ports/boost-hana/CONTROL index f372c7c14be05e..6b4e48709a14fc 100644 --- a/ports/boost-hana/CONTROL +++ b/ports/boost-hana/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-hana -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers Homepage: https://github.com/boostorg/hana Description: Boost hana module diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index e66b7415d41a97..dfa8be6aa9cfd2 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.74.0 - SHA512 9571e0223a730efa2143e23b519f8807d21ccd90be485765b15692c086777b4b9bb3aea751632df3dbf332d70387559103c26e5bfadf1c60eaac35e5e6ef7929 + REF boost-1.75.0 + SHA512 6c5ea81f9f7bdb735035a8a49fd82768102d2586cc4a1ee65e83260b26e3a39244f8053266b4d41a3260d8922bca667609fe9f360d1fe09a7f778035b318fbe5 HEAD_REF master ) diff --git a/ports/boost-heap/0002-Fix-compilation-on-MSVC-in-node_disposer.patch b/ports/boost-heap/0002-Fix-compilation-on-MSVC-in-node_disposer.patch deleted file mode 100644 index d40dea3d8b0e99..00000000000000 --- a/ports/boost-heap/0002-Fix-compilation-on-MSVC-in-node_disposer.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ed015c3b21c10166321f7565e038b690ad8e04df Mon Sep 17 00:00:00 2001 -From: Glen Fernandes -Date: Mon, 17 Aug 2020 19:00:58 -0400 -Subject: [PATCH 2/3] Fix compilation on MSVC in node_disposer - ---- - include/boost/heap/detail/heap_node.hpp | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/include/boost/heap/detail/heap_node.hpp b/include/boost/heap/detail/heap_node.hpp -index 04ed7ae..755eac3 100644 ---- a/include/boost/heap/detail/heap_node.hpp -+++ b/include/boost/heap/detail/heap_node.hpp -@@ -83,6 +83,12 @@ std::size_t count_nodes(const Node * n) - return 1 + count_list_nodes(n->children); - } - -+template -+void destroy_node(Node& node) -+{ -+ node.~Node(); -+} -+ - - /* node cloner - * -@@ -142,7 +148,7 @@ struct node_disposer - { - node_pointer n = static_cast(base); - n->clear_subtree(alloc_); -- n->~Node(); -+ boost::heap::detail::destroy_node(*n); - alloc_.deallocate(n, 1); - } - --- -2.22.0.windows.1 - diff --git a/ports/boost-heap/CONTROL b/ports/boost-heap/CONTROL index 794dc13e0221eb..3396962ef145a6 100644 --- a/ports/boost-heap/CONTROL +++ b/ports/boost-heap/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-heap -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-core, boost-integer, boost-intrusive, boost-iterator, boost-parameter, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/heap Description: Boost heap module diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index 592d977fed6834..c20839543af52f 100644 --- a/ports/boost-heap/portfile.cmake +++ b/ports/boost-heap/portfile.cmake @@ -3,10 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/heap - REF boost-1.74.0 - SHA512 239d49d34c7d8300569b67fd979ac81cf5cefdd573787094b46b587384afc6881bd67bb9ffbc99da330b2ff45427a50782cc45c7b83c2a316936abed07bd4db3 + REF boost-1.75.0 + SHA512 1f8127aba16efce6694451dd04130cae92a88257937d87860fdbf9111405f458e8a162f3d541b00c5e4d0e3eba4cadc1c9fd2424eb03e52ce1302cd8ef1e0af5 HEAD_REF master - PATCHES 0002-Fix-compilation-on-MSVC-in-node_disposer.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-histogram/CONTROL b/ports/boost-histogram/CONTROL index 26a17ae3a4dca7..d6bbc0d4a1deca 100644 --- a/ports/boost-histogram/CONTROL +++ b/ports/boost-histogram/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-histogram -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-core, boost-mp11, boost-serialization, boost-throw-exception, boost-variant2, boost-vcpkg-helpers Homepage: https://github.com/boostorg/histogram Description: Boost histogram module diff --git a/ports/boost-histogram/portfile.cmake b/ports/boost-histogram/portfile.cmake index b1670c3eac0109..37d244bab68317 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.74.0 - SHA512 3b2ba71a4796cdf472c5786dbf7796846c71c4dda63b99adcc1f242014351777da24ad0e9c1dd9b30548d8f6ae1f667a0a22ed7093992b389af4bac7acdd1c71 + REF boost-1.75.0 + SHA512 de5299b1c3f05bbb052c0bca0537ed8b7cf4268741a263b1ed12c97dd7a94f52571d8b566c33c27d387f1409e26d5a70b2eaf92a346aa9226403930cba6c1bca HEAD_REF master ) diff --git a/ports/boost-hof/CONTROL b/ports/boost-hof/CONTROL index 07a3470a9ad6f3..a1a6562c7f8698 100644 --- a/ports/boost-hof/CONTROL +++ b/ports/boost-hof/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-hof -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-vcpkg-helpers Homepage: https://github.com/boostorg/hof Description: Boost hof module diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake index b2f3f21dcf61e7..c99bc95d300f46 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.74.0 - SHA512 f1e0d3af80786c7303aa834cc3360d061b7ca37b98352ba369f8c6f7db65644265c933f9fd2ad418d2b78a87288f456eb1dbdf339bae68ce916b80556ae07c14 + REF boost-1.75.0 + SHA512 85bc5fa2d479557f5265480d310a8a18885980bb1c516a99d73d445758ddc2132ae3cab7162652fd9091918fa2ac440703837f3c7b81466aa43dfd66898e549c HEAD_REF master ) diff --git a/ports/boost-icl/CONTROL b/ports/boost-icl/CONTROL index 530cc704a45830..b5fdbece998aaa 100644 --- a/ports/boost-icl/CONTROL +++ b/ports/boost-icl/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-icl -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-concept-check, boost-config, boost-container, boost-date-time, boost-detail, boost-iterator, boost-move, boost-mpl, boost-range, boost-rational, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/icl Description: Boost icl module diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake index 78f00bfcb6d22e..8f356be608d277 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.74.0 - SHA512 847f86b0f62a9daf0c5d4fae90639377e0997e0c9901858fc6e8e367bb73594e49bdb1705a264d805afbbe2b318cc0232bfe514fc71ae87162317d1c773ad253 + REF boost-1.75.0 + SHA512 6fb317621c19c0bd6ab7ca8cc9048c42e4d362496f32973d5c226a0d91ecb861af54d59d6396587e7241d184f04ca445657dd4f033665be2e31ac21e913e3e59 HEAD_REF master ) diff --git a/ports/boost-integer/CONTROL b/ports/boost-integer/CONTROL index 0b5f2a742b5691..2f1af80a78b7f4 100644 --- a/ports/boost-integer/CONTROL +++ b/ports/boost-integer/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-integer -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers Homepage: https://github.com/boostorg/integer Description: Boost integer module diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake index 16deb73c906e8c..d158c13790dc47 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.74.0 - SHA512 6dc812826d817a67c8d001cebc9e24ae721e8e70eff4847227db3a91ce4b52b51c43bad5e7ae296507218e14e232751837856336f5b5eb657e8a5f9430231e25 + REF boost-1.75.0 + SHA512 ed1b7749052c57e1535005d75ca2fe3707a0fa7bb7261b6ca0c2db12dfbe024aeda4aba2104209b5706f5b1c87bfb9b69115e1433e3f84456a70180e6fbebce5 HEAD_REF master ) diff --git a/ports/boost-interprocess/CONTROL b/ports/boost-interprocess/CONTROL index ae99b535c77d0c..8f62fe32544ee0 100644 --- a/ports/boost-interprocess/CONTROL +++ b/ports/boost-interprocess/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-interprocess -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-integer, boost-intrusive, boost-move, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/interprocess Description: Boost interprocess module diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake index 5f51e2618e4faf..2e682eb3181c26 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.74.0 - SHA512 96311610208f322275434f1a271a2782673e11f5dd133c6994d64397ac2099f4561711f08b12eeb3b25fb78e743a2d5bbbe4a331843e306ae1698bd327d959f3 + REF boost-1.75.0 + SHA512 02c01e16a3050e24b179290fbf72056599c22e766035121a44e72277cbc4535f2ba959bca7b5746f64a397b01bd78424dc05490217f7accd4f01f08d3ed0a837 HEAD_REF master ) diff --git a/ports/boost-interval/CONTROL b/ports/boost-interval/CONTROL index d840bf034fd99a..13a5d2eaba1611 100644 --- a/ports/boost-interval/CONTROL +++ b/ports/boost-interval/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-interval -Version: 1.74.0 -Build-Depends: boost-compatibility, boost-config, boost-logic, boost-vcpkg-helpers +Version: 1.75.0 +Build-Depends: boost-compatibility, boost-config, boost-detail, boost-logic, boost-vcpkg-helpers Homepage: https://github.com/boostorg/interval Description: Boost interval module diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake index e336ee1bdc47a3..95876e633fe73d 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.74.0 - SHA512 46795719ae8217cf140172420792b015dd5c09bfbaf54b22c06c2bdfbc467ea71cac9c3df096c8b67cdd3c51561cd5d9e5bb2772843b422922da2f0377f19348 + REF boost-1.75.0 + SHA512 25ba8052f562585ca1d98be93fe97facd0d485a70e230f0f7d95911a6ce92bd60d3d56844782e5136a89a51303fbf8d751897578ac4e9bc8c2672b84cac7cc3d HEAD_REF master ) diff --git a/ports/boost-intrusive/CONTROL b/ports/boost-intrusive/CONTROL index 6ec28a6b33bdf1..7f88fe04ab3e49 100644 --- a/ports/boost-intrusive/CONTROL +++ b/ports/boost-intrusive/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-intrusive -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-container-hash, boost-core, boost-integer, boost-move, boost-static-assert, boost-vcpkg-helpers Homepage: https://github.com/boostorg/intrusive Description: Boost intrusive module diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake index 36a0c3f5d432f3..c1fd05513b1d50 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.74.0 - SHA512 d089f07ee9fe84fb63a279138f954731f525cae1b5c7800f76d1c79ec11239d89743c7c8222d00e9cb7134b020b0c67730ed7bf67c1f111e8758e16bd2b5d20e + REF boost-1.75.0 + SHA512 4d211523102861cbfa01413dcdaff153bc51ce095e98f8a7cab061901f6dec79ba1cdc898df0e217cff1d1f3febbb9ee4c3188ef200d6161c883b3c6a928d08a HEAD_REF master ) diff --git a/ports/boost-io/CONTROL b/ports/boost-io/CONTROL index a2dd7887b2e50b..c0120d7c9baac0 100644 --- a/ports/boost-io/CONTROL +++ b/ports/boost-io/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-io -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-vcpkg-helpers Homepage: https://github.com/boostorg/io Description: Boost io module diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake index 41d325c231da4a..d72f41f29d7be9 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.74.0 - SHA512 c344ea5793d25fca5c3751e8f19a1281883ad813ec7703d5df20d1f6a9642d37f028301a1f0c63bfae2465ee9d3385c0ab1e30608d35efcd98ddc3034c431286 + REF boost-1.75.0 + SHA512 0c5efe91d1a83a7a42e035de0720e92d7f4ca9af692913845d9a5a5e3ba994c5b9664c87b60d5f6345c5dd395e8d0c2074827e37d8e76f75548d95f845c194d2 HEAD_REF master ) diff --git a/ports/boost-iostreams/0001-Fix-build-on-windows-with-libc-106.patch b/ports/boost-iostreams/0001-Fix-build-on-windows-with-libc-106.patch deleted file mode 100644 index 19ed68fc2d74e2..00000000000000 --- a/ports/boost-iostreams/0001-Fix-build-on-windows-with-libc-106.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e49b1832387f3d7e170fb2aa5b5022205ff50053 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= - -Date: Fri, 11 Sep 2020 00:26:15 +0200 -Subject: [PATCH] Fix build on windows with libc++ (#106) - -Proposed by @SquallATF in #67 ---- - include/boost/iostreams/detail/config/fpos.hpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/boost/iostreams/detail/config/fpos.hpp b/include/boost/iostreams/detail/config/fpos.hpp -index c5dc6cf..a583542 100644 ---- a/include/boost/iostreams/detail/config/fpos.hpp -+++ b/include/boost/iostreams/detail/config/fpos.hpp -@@ -26,7 +26,8 @@ - - # if (defined(_YVALS) || defined(_CPPLIB_VER)) && !defined(__SGI_STL_PORT) && \ - !defined(_STLPORT_VERSION) && !defined(__QNX__) && !defined(_VX_CPU) && !defined(__VXWORKS__) \ -- && !((defined(BOOST_MSVC) || defined(BOOST_CLANG)) && _MSVC_STL_VERSION >= 141) -+ && !((defined(BOOST_MSVC) || defined(BOOST_CLANG)) && _MSVC_STL_VERSION >= 141) \ -+ && !defined(_LIBCPP_VERSION) - /**/ - - #include --- -2.22.0.windows.1 - diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL index babcd6bd3e39df..c522ce01cde5aa 100644 --- a/ports/boost-iostreams/CONTROL +++ b/ports/boost-iostreams/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-iostreams -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, liblzma, zlib, zstd Homepage: https://github.com/boostorg/iostreams Description: Boost iostreams module diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index 6dcb9943813acb..97a8ec479fe95a 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -3,12 +3,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iostreams - REF boost-1.74.0 - SHA512 3d1899ed258dff8cc20c7b725159f3fd40550f8e47b450dc6009a49499e209c07ee71598803eff1f7daca30629a288af4b286f629dfbb72677dc5d23eb2c6efb + REF boost-1.75.0 + SHA512 683a3fba09c0732168d4f1c7cbe4f7e29fe9dce737ed5ee08a56000084c467a1816d67d46ec04c6ba8e18413a66ac6cad896e2364491b3fc18c20eb423ed645c HEAD_REF master - PATCHES - 0001-Fix-build-on-windows-with-libc-106.patch - Removeseekpos.patch + PATCHES Removeseekpos.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) diff --git a/ports/boost-iterator/CONTROL b/ports/boost-iterator/CONTROL index 767c8bc7b808e0..74d88d45f52083 100644 --- a/ports/boost-iterator/CONTROL +++ b/ports/boost-iterator/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-iterator -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-conversion, boost-core, boost-detail, boost-function-types, boost-fusion, boost-mpl, boost-optional, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/iterator Description: Boost iterator module diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake index c2e190f7fad221..241b8e4008480a 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.74.0 - SHA512 64748013d26e998d71dfe1a693759863debb834af50d6b623873dbb2e7bbe3c8c3321bb5dec04baccb9d732623034f57195525168e341166a93048a6ba800c42 + REF boost-1.75.0 + SHA512 28148a5980f31e8d6e553800387335c9cb9ace06533c54825337178488efe1726f8ceb333da80dff394685c64aaf4848598845555a7f16bbde0bd73cf5c80e9b HEAD_REF master ) diff --git a/ports/boost-json/CONTROL b/ports/boost-json/CONTROL new file mode 100644 index 00000000000000..21423c40b8216b --- /dev/null +++ b/ports/boost-json/CONTROL @@ -0,0 +1,6 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 +Source: boost-json +Version: 1.75.0 +Build-Depends: boost-align, boost-assert, boost-config, boost-container, boost-exception, boost-system, boost-throw-exception, boost-utility, boost-vcpkg-helpers +Homepage: https://github.com/boostorg/json +Description: Boost json module diff --git a/ports/boost-json/portfile.cmake b/ports/boost-json/portfile.cmake new file mode 100644 index 00000000000000..8a91cd6cadd924 --- /dev/null +++ b/ports/boost-json/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/json + REF boost-1.75.0 + SHA512 887a8758d247eb76b41526107e4006de7d18f107afc9692d95eb2ba7beb9cfa6d5f2e721523a8d4530aec38bd1f6eb0f6364aa05b5bf95f5428f4c9fa3d24b7c + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-lambda/CONTROL b/ports/boost-lambda/CONTROL index 3a6a5962c51c90..c566d0819514f5 100644 --- a/ports/boost-lambda/CONTROL +++ b/ports/boost-lambda/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-lambda -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-bind, boost-config, boost-detail, boost-mpl, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/lambda Description: Boost lambda module diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake index 584b135c5683da..c0b0b4e91dd13f 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.74.0 - SHA512 f0e0a7fb0f10ba03a375fac4493c1008e84512abad005fe2f06fdd36e50f21ac698262ca03d3bb5065e20ebfdac900cd03067b5b49ebf79f920515401ec7eda1 + REF boost-1.75.0 + SHA512 c459cb7d64fa1a8d5b755f2a1153dcea77fdcbeacf117db54e3288b8599998b58cb138a801c7c68c682296f72e28787027ce84ead424b6dda56b23c23ce71168 HEAD_REF master ) diff --git a/ports/boost-leaf/CONTROL b/ports/boost-leaf/CONTROL new file mode 100644 index 00000000000000..2e0d12ca0bab48 --- /dev/null +++ b/ports/boost-leaf/CONTROL @@ -0,0 +1,6 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 +Source: boost-leaf +Version: 1.75.0 +Build-Depends: boost-vcpkg-helpers +Homepage: https://github.com/boostorg/leaf +Description: Boost leaf module diff --git a/ports/boost-leaf/portfile.cmake b/ports/boost-leaf/portfile.cmake new file mode 100644 index 00000000000000..fd9db4cb9644fb --- /dev/null +++ b/ports/boost-leaf/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/leaf + REF boost-1.75.0 + SHA512 9570e3c7964e7e3999fe469a1ca71edec7bd5435865ca0230b232b94ba84bcc1d218773262855868b379483a902bf9bdda50ddcceec7c5d282be208a39c5f6d6 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-lexical-cast/CONTROL b/ports/boost-lexical-cast/CONTROL index e9537e2e98c067..3a921e776ee26f 100644 --- a/ports/boost-lexical-cast/CONTROL +++ b/ports/boost-lexical-cast/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-lexical-cast -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-integer, boost-numeric-conversion, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/lexical_cast Description: Boost lexical_cast module diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake index 6d7e839c12df4a..3af9340f7549b3 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.74.0 - SHA512 bbec1f47a10cd42f130e0b44f00480fb6437e54652b3a235850570978e0e0e975fb020a5539ced5280eadcd6f27eaa24843590f46e2ebe632449001a760e8206 + REF boost-1.75.0 + SHA512 6c1454cb9224dd5aba6d575fe266af3299433a1789253a4a15f4d8227fe82f7fd71e2754e9c83b4f70fb50293f5597b5e90c5b9eaee8f7d7b0d296d987236b02 HEAD_REF master ) diff --git a/ports/boost-local-function/CONTROL b/ports/boost-local-function/CONTROL index 638b9caeb01dce..f7117778567664 100644 --- a/ports/boost-local-function/CONTROL +++ b/ports/boost-local-function/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-local-function -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-mpl, boost-preprocessor, boost-scope-exit, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/local_function Description: Boost local_function module diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake index 5a283822f7cd0b..010a55479c6b38 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.74.0 - SHA512 afc8bfe197d92c62f963a9b767f34321cab49119ae51ddfa33df28d78fc4134bae0c830ecc7a1eb495a252fe058d7d796db1ba48eafa9eedcbf0d66457c0914f + REF boost-1.75.0 + SHA512 83807dfc36810a27194841eac25b70905572f6da656e75d5f04e5b4d4abec58710a34d17e69fb6588154950f1099702c8205c26c47770fe21f875a9bd7641fe6 HEAD_REF master ) diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL index 4c37a064f1dc12..35ecbe2fe1d3d2 100644 --- a/ports/boost-locale/CONTROL +++ b/ports/boost-locale/CONTROL @@ -1,7 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-locale -Version: 1.74.0 -Port-Version: 3 +Version: 1.75.0 Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows&!mingw) Homepage: https://github.com/boostorg/locale Description: Boost locale module diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index 445569a41f7ef4..28d4ed08e986bb 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/locale - REF boost-1.74.0 - SHA512 32bd61ee7e9565bf4b67615d02e38981c2e5fa4156a8c35697b9aec04990ed2e88663b63578f4a28bad3c52ef544cbeb5ec2667b31f2a1645313442cd5552f91 + REF boost-1.75.0 + SHA512 13bc48ef4ae0805abd5eecde90406486a00c350187343ae2cc7da9b7e94d15be952312c1c07c4faf4d62e13401c6e450c3c3d06649af01a690fc7200a20744ed HEAD_REF master PATCHES 0001-Fix-boost-ICU-support.patch diff --git a/ports/boost-lockfree/CONTROL b/ports/boost-lockfree/CONTROL index 702814aaaeb2f4..6a2736a25dcc29 100644 --- a/ports/boost-lockfree/CONTROL +++ b/ports/boost-lockfree/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-lockfree -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-align, boost-array, boost-assert, boost-atomic, boost-config, boost-core, boost-integer, boost-mpl, boost-parameter, boost-predef, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/lockfree Description: Boost lockfree module diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake index c3aeb98c95b560..f94ebccb16d716 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.74.0 - SHA512 0464308e9ffdba982218c0d8d1684517ce54db1fd34ba6a1fca82ce56eba3e486786726b28b25d18a0f0f97880ed07fb5f25a998691ad86f99ccf58a167dc5c5 + REF boost-1.75.0 + SHA512 e4b6db2595688f6a13e9adbfe647b692db3e45ab40b213565e675a5de39d4556d3eca9c6b626690737163d22b80c7447c7e9df40ac2c726173ffa820677c4f61 HEAD_REF master ) diff --git a/ports/boost-log/CONTROL b/ports/boost-log/CONTROL index 326620a7b3e6ee..1cf5fb0ae0c158 100644 --- a/ports/boost-log/CONTROL +++ b/ports/boost-log/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-log -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-align, boost-array, boost-asio (!emscripten), boost-assert, boost-atomic, boost-bind, boost-build, boost-compatibility, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-exception, boost-filesystem (!uwp), boost-function-types, boost-fusion, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iterator, boost-lexical-cast, boost-locale (!uwp), boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-parameter, boost-phoenix, boost-predef, boost-preprocessor, boost-property-tree, boost-proto, boost-random, boost-range, boost-regex, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-thread, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi, boost-xpressive Homepage: https://github.com/boostorg/log Description: Boost log module diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake index a4d9f952281333..9150caad1c7af3 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.74.0 - SHA512 dab350fa4dc8745916bdf2e2362d9a7e85fd19562a303d2089ea3516f7c69119da72ba661e1f17c304516177da458c6ddebc946218134cd9c132bd5cedbd2d8a + REF boost-1.75.0 + SHA512 4c500217aa8ba0fe88afdff5f901da2a8977f7825a37fcc0de4a46a723dbfc3be8a25a712e4e49cf2ae4a95432dc80d66b5e8860815f320b7cb90d66592dc6bf HEAD_REF master ) @@ -14,12 +14,12 @@ string(REPLACE " @select-arch-specific-sources" "#@sel file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") -file(READ ${SOURCE_PATH}/build/log-architecture.jam _contents) +file(READ ${SOURCE_PATH}/build/log-arch-config.jam _contents) string(REPLACE - "\nproject.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ] ;" - "\nproject.load [ path.join [ path.make $(here:D) ] config/checks/architecture ] ;" + "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-architecture.jam "${_contents}") +file(WRITE ${SOURCE_PATH}/build/log-arch-config.jam "${_contents}") include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-logic/CONTROL b/ports/boost-logic/CONTROL index adbd4f26e6a62d..3490f1d345da3a 100644 --- a/ports/boost-logic/CONTROL +++ b/ports/boost-logic/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-logic -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers Homepage: https://github.com/boostorg/logic Description: Boost logic module diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake index ce546c7b8a8433..5b286f404845fd 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.74.0 - SHA512 bc2077785ffef6eed64d3ac49cc9d6958907b5270b4d72f7ee499bf818a87bb72985f6606946415c527283a8a29f506dfc930afb6ae3561450f873473f8ae413 + REF boost-1.75.0 + SHA512 145654dc2397cf5740cd2cf161b0428d608a1ca02d7b53c6ebf363342bbf9d3db351913772820a853a599b8edff862d83ffc9324dbf3162ba4a913bfdd904ad8 HEAD_REF master ) diff --git a/ports/boost-math/CONTROL b/ports/boost-math/CONTROL index 7faf2a5ecf4cda..89f9ece60b196e 100644 --- a/ports/boost-math/CONTROL +++ b/ports/boost-math/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-math -Version: 1.74.0 -Build-Depends: boost-array, boost-assert, boost-atomic, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-modular-build-helper, boost-mp11, boost-mpl, boost-predef, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.75.0 +Build-Depends: boost-algorithm, boost-array, boost-assert, boost-atomic, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-modular-build-helper, boost-mp11, boost-mpl, boost-predef, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/math Description: Boost math module diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake index dbfb6d17139bd8..b256552411c962 100644 --- a/ports/boost-math/portfile.cmake +++ b/ports/boost-math/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/math - REF boost-1.74.0 - SHA512 19f0a9bb4ab213902d02007b797d162ef4ab4431b4bed8292d8c26ebbb314ec911e55d465b0bbefb7d3cbe5f335087c302ebc208ed6ea57f8a259e2e5f83d14d + REF boost-1.75.0 + SHA512 d0b31cc55d2c0788b7376bc8be877acb30b0f23a71f83aa6df27d47fc8887542924df9f33b1d69da2befdb4ab087d6905d126ee3a8ae98a91aba0ad3c70311ee HEAD_REF master ) diff --git a/ports/boost-metaparse/CONTROL b/ports/boost-metaparse/CONTROL index b7b40f4a2d4bcc..90b0e528a7404c 100644 --- a/ports/boost-metaparse/CONTROL +++ b/ports/boost-metaparse/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-metaparse -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-mpl, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/metaparse Description: Boost metaparse module diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake index 3505d37599e768..44721ab236ef7e 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.74.0 - SHA512 a2245ce6e6c3230b9f62f6bf2732ded0b3480bd5e02adf0500c509e1f5ea3b57646c40005a61d654e7faaa64747de2472f036de84f7b504b12c10533ae3013fd + REF boost-1.75.0 + SHA512 a998db95cf70e24183b7f850f2ae4b9cb7994ede7ddbdbe560c686a0fde3437657c4d40d5d29b07ed03bf1be5756edfce22ec121eb8694edfffe1247e780e2a6 HEAD_REF master ) diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index b43e12f795ff8b..ff13adf8319923 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,4 +1,3 @@ Source: boost-modular-build-helper -Version: 1.74.0 -Port-Version: 2 +Version: 1.75.0 Build-Depends: boost-uninstall \ No newline at end of file diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam index 1eae0d5c4ed07b..fc6af1355baec4 100644 --- a/ports/boost-modular-build-helper/Jamroot.jam +++ b/ports/boost-modular-build-helper/Jamroot.jam @@ -1,5 +1,5 @@ -constant BOOST_VERSION : 1.74.0 ; -constant BOOST_VERSION_ABI_TAG : 1_74 ; +constant BOOST_VERSION : 1.75.0 ; +constant BOOST_VERSION_ABI_TAG : 1_75 ; constant BOOST_JAMROOT_MODULE : $(__name__) ; import boostcpp ; diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 67ad37248792d3..adcd689518eca7 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -435,7 +435,7 @@ function(boost_modular_build) string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries - string(REPLACE "-1_74" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries + string(REPLACE "-1_75" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") # nothing to do elseif(EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) diff --git a/ports/boost-move/CONTROL b/ports/boost-move/CONTROL index 8553ea4dbfac57..6b61e94540300e 100644 --- a/ports/boost-move/CONTROL +++ b/ports/boost-move/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-move -Version: 1.74.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-static-assert, boost-vcpkg-helpers +Version: 1.75.0 +Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-static-assert, boost-utility, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/move Description: Boost move module diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake index b0a770e4762402..7a773d10c6b19e 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.74.0 - SHA512 f1ef4320b0a4f9618ff93a2fdb98aa52e5d4d9fcaafc031e16517d5f3ee2aea99736a20ac2b9289e390cc6ea26364f1d50fb51bf34f9574bbb360591677b35fe + REF boost-1.75.0 + SHA512 73cd70bb613cfbb2f6b2f15a2a2fd0d40411de7b8ea7639c18d40a80471bc084ee845037bf9175bb50dfeedc750289ccd126a6f2a147d2fb3cb86f3da49480c2 HEAD_REF master ) diff --git a/ports/boost-mp11/CONTROL b/ports/boost-mp11/CONTROL index 1050a1cc6bda4b..b26ffb8bd5e200 100644 --- a/ports/boost-mp11/CONTROL +++ b/ports/boost-mp11/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-mp11 -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-vcpkg-helpers Homepage: https://github.com/boostorg/mp11 Description: Boost mp11 module diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake index 139e102440c094..77f933c59182cf 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.74.0 - SHA512 7d78ce361c30cf79fb14c263ae99bb1bde680b5888ce71760e7d7b9b890321b5ad9c56b76e09b8692130c8a293dbe403b6fc4807c59a41b78988825da7280441 + REF boost-1.75.0 + SHA512 bacad2fe97d687e9bb49d0274cd97f6b9344bc6f00537b93a3075603b2b486deaf472fd819635eca435b814486c2dff13a8ca572ac216cb0452340fd08492b15 HEAD_REF master ) diff --git a/ports/boost-mpi/CONTROL b/ports/boost-mpi/CONTROL index 271e5cb93c9979..172903157e0ccb 100644 --- a/ports/boost-mpi/CONTROL +++ b/ports/boost-mpi/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-mpi -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-optional, boost-python (!uwp&!(arm&windows)&!emscripten), boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, mpi Homepage: https://github.com/boostorg/mpi Description: Boost mpi module diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake index 592fe1a763d9e1..49f8528b5384ab 100644 --- a/ports/boost-mpi/portfile.cmake +++ b/ports/boost-mpi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpi - REF boost-1.74.0 - SHA512 cb4879d3a04c331fded628af07b1275378f8bf1dcc397579e133cc215ad949a994731c897bb77bfab7cf8c84f7f2f154709935bd5b032b6fce4b216036c69415 + REF boost-1.75.0 + SHA512 0fc0721564c431a959bfe5d5c8c5b8b3c1d2eba32f14a3158746386806be0eaee8abedadce1b4bbb9a82a63764ff351d5b1e3c2be224ea49cd55ef4ebfa9ae5f HEAD_REF master ) diff --git a/ports/boost-mpl/CONTROL b/ports/boost-mpl/CONTROL index d136638247eba9..4afce80dcacf3e 100644 --- a/ports/boost-mpl/CONTROL +++ b/ports/boost-mpl/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-mpl -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/mpl Description: Boost mpl module diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake index 9a0d41fdbf6046..1c741009d92bc8 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.74.0 - SHA512 85e57db3d2c9d92259dbbf5ebebb21db356572902070e4ed95e01675d370cf69df70eb1bb45b8bf49e47001e32f4ee56f2e247576985d80ac1413ab48176a0a9 + REF boost-1.75.0 + SHA512 21326d25fd6b9e95ba066ac06585d4b1c643b5cf2d3e927db5f8d94bb804ab8bc6a85f500c793756187f96b0b7c4b06462a9a11d77e00822a213ae46004ee416 HEAD_REF master ) diff --git a/ports/boost-msm/CONTROL b/ports/boost-msm/CONTROL index a7f887510a0052..c4d89e51c6a127 100644 --- a/ports/boost-msm/CONTROL +++ b/ports/boost-msm/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-msm -Version: 1.74.0 -Build-Depends: boost-any, boost-assert, boost-bind, boost-circular-buffer, boost-config, boost-core, boost-detail, boost-function, boost-fusion, boost-mpl, boost-parameter, boost-phoenix, boost-preprocessor, boost-proto, boost-serialization, boost-tuple, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers +Version: 1.75.0 +Build-Depends: boost-any, boost-assert, boost-bind, boost-circular-buffer, boost-config, boost-core, boost-function, boost-fusion, boost-mpl, boost-parameter, boost-phoenix, boost-preprocessor, boost-proto, boost-serialization, boost-tuple, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/msm Description: Boost msm module diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake index f0bfe596ffc6a8..dc0a89607e4a43 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.74.0 - SHA512 af8fab00bdcde3f5b6fcf23352b92d683ac8e9864f9649d72f878ff746c25a8e650f52becddca68925306b88f42871b6f058b207b89cca1cfe3f6aeae671dcb8 + REF boost-1.75.0 + SHA512 e476c5c316c9e80d98f579f873150d2e1fbc9a80cc7f5cb0dd4f034ade5abfe0297c4b7d22dab96be07095cf9ba0c280420a489e0d94df2b5fdb98c42d6f51b8 HEAD_REF master ) diff --git a/ports/boost-multi-array/CONTROL b/ports/boost-multi-array/CONTROL index c9b81696e680d3..2797cb65798054 100644 --- a/ports/boost-multi-array/CONTROL +++ b/ports/boost-multi-array/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-multi-array -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-compatibility, boost-config, boost-vcpkg-helpers Homepage: https://github.com/boostorg/multi_array Description: Boost multi_array module diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake index 642082354a3ac0..01dc570cf9b4e7 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.74.0 - SHA512 92b6ae4bff1c77b92e1b068334f0726d2ee59d1f304ea937f9fb305264d9be32fff5f43faf525030a0ed2e0aba554f3f84c103bc6edfb277771d94c8ae02efc1 + REF boost-1.75.0 + SHA512 4455eb06192091522a17473bba1b14eb34626a74e3201e92a5a5c57e2dd56501079b4a48bb6e61d223a5c6b87e9d930c38d5ddda294e6ece326640ae23fdba23 HEAD_REF master ) diff --git a/ports/boost-multi-index/CONTROL b/ports/boost-multi-index/CONTROL index 8bd6dee7f56e77..8882dab96ae13b 100644 --- a/ports/boost-multi-index/CONTROL +++ b/ports/boost-multi-index/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-multi-index -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-bind, boost-compatibility, boost-config, boost-container-hash, boost-core, boost-detail, boost-foreach, boost-functional, boost-integer, boost-iterator, boost-move, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/multi_index Description: Boost multi_index module diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake index 3b153f5ae7089c..1295859041acc2 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.74.0 - SHA512 aff832e519a864439dac18cff42f339a8afa38075fbf1a7b0ada1233d95387087d1276fa03298b9d5bbd8ee7fc5decde639b12625489b2149020abd0767be1b0 + REF boost-1.75.0 + SHA512 162ee2d46ee899cf15f27e12248dbb02b34d22f38f63afb90abc8ac24aabd2ca58864acc56af0eded999baebac36452ca502e59fc985ce2146df24d5f9e43f01 HEAD_REF master ) diff --git a/ports/boost-multiprecision/CONTROL b/ports/boost-multiprecision/CONTROL index 1963b37e38f688..aefbaf13333acf 100644 --- a/ports/boost-multiprecision/CONTROL +++ b/ports/boost-multiprecision/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-multiprecision -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-array, boost-assert, boost-atomic, boost-config, boost-container-hash, boost-core, boost-functional, boost-integer, boost-lexical-cast, boost-mpl, boost-predef, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/multiprecision Description: Boost multiprecision module diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake index 37a8925960eb4b..618981a8b4e919 100644 --- a/ports/boost-multiprecision/portfile.cmake +++ b/ports/boost-multiprecision/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multiprecision - REF boost-1.74.0 - SHA512 a46308dc42fc8a015a8e6941cf7e4c1c6f4d7020e6577f0496612d1a5ad37462b255ba7463f1cfd3e4ef3761450ca6cf1847dd0921c989f45ac2750f477b019e + REF boost-1.75.0 + SHA512 e937cf51cb41178ffe6edd7359cf63a55b36931cf835e6a7528dbaad0a09fa5b3fdc52bd07fe9f7552770b83e06050f6927d176622033f806c84fd845f693d59 HEAD_REF master ) diff --git a/ports/boost-nowide/CONTROL b/ports/boost-nowide/CONTROL index ce6153b2892b71..399fa954e6683a 100644 --- a/ports/boost-nowide/CONTROL +++ b/ports/boost-nowide/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-nowide -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-build, boost-config, boost-filesystem (!uwp), boost-modular-build-helper, boost-vcpkg-helpers Homepage: https://github.com/boostorg/nowide Description: Boost nowide module diff --git a/ports/boost-nowide/portfile.cmake b/ports/boost-nowide/portfile.cmake index 4083f7afdcb897..6efc96b7177997 100644 --- a/ports/boost-nowide/portfile.cmake +++ b/ports/boost-nowide/portfile.cmake @@ -3,22 +3,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/nowide - REF boost-1.74.0 - SHA512 bee853b992635be4f5937bd6b0abd36c541e6483482e4e31b3be9fb63af8ba04e0afea10b2b9d392fbea714dcb27d105275650e4889ebb726d2603e28fad839b + REF boost-1.75.0 + SHA512 15f836928459477339e11780b7ead2aa7f1721ec5c443a5370e1d6dd732228185f9055cbad169982aa6dee3d5c9efdce3076d9228d12cebfbe40475490503128 HEAD_REF master ) file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) - string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}") - -string(REPLACE "check-target-builds cxx11_moveable_fstreams" "check-target-builds ../check_movable_fstreams.cpp" _contents "${_contents}") -string(REPLACE "check-target-builds lfs_support" "check-target-builds ../check_lfs_support.cpp" _contents "${_contents}") - +string(REPLACE "check-target-builds ../config//cxx11_moveable_fstreams" "check-target-builds ../check_movable_fstreams.cpp" _contents "${_contents}") +string(REPLACE "check-target-builds ../config//lfs_support" "check-target-builds ../check_lfs_support.cpp" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") - -file(COPY "${SOURCE_PATH}/test/check_lfs_support.cpp" "${SOURCE_PATH}/test/check_movable_fstreams.cpp" DESTINATION "${SOURCE_PATH}/build/config") +file(COPY "${SOURCE_PATH}/config/check_lfs_support.cpp" "${SOURCE_PATH}/config/check_movable_fstreams.cpp" DESTINATION "${SOURCE_PATH}/build/config") include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/boost-numeric-conversion/CONTROL b/ports/boost-numeric-conversion/CONTROL index 4ae32dff34688e..3b8b45715de829 100644 --- a/ports/boost-numeric-conversion/CONTROL +++ b/ports/boost-numeric-conversion/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-numeric-conversion -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers Homepage: https://github.com/boostorg/numeric_conversion Description: Boost numeric_conversion module diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake index 73d1221c9f8a4d..437ddfd2418872 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.74.0 - SHA512 aa8fc8141127e170b9bdccb79e1bc5dc388cc924f73c5cde5ca9c2ff0f37ad6b67aa324989c1cf592ff6be4edd4e2ec1833578401aae031bffb74edda7d01c61 + REF boost-1.75.0 + SHA512 bea107d1281a7ba8f988eee849872bc8c61f3585e1f61e2af06c988cb72213ff2162436a5e9e67e03df9d5e20a19343da76ad931894dbb0137c06e85a461ece1 HEAD_REF master ) diff --git a/ports/boost-odeint/CONTROL b/ports/boost-odeint/CONTROL index 9e11d759f2342e..88bda92a952343 100644 --- a/ports/boost-odeint/CONTROL +++ b/ports/boost-odeint/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-odeint -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-array, boost-assert, boost-bind, boost-compute, boost-config, boost-core, boost-function, boost-fusion, boost-iterator, boost-math, boost-mpl, boost-multi-array, boost-preprocessor, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-units, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/odeint Description: Boost odeint module diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake index 620d657ebe96e6..a354baf2c4409c 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.74.0 - SHA512 650156c1c177a3438964a35a160b89b84e598e771cd7e113f7165b979d36004e1ea28bbd74f70dab0033cd62caea178a75400ffd55b1ddf79b778b1dd08cfd57 + REF boost-1.75.0 + SHA512 972afd04ca564aa1ac8d803d36b07ccf8fac7f3931e7c916c7459435313de13d511508793364d67e0aa19a79ba91c50ce4dc774ae2702142afdcb4b08de192e9 HEAD_REF master ) diff --git a/ports/boost-optional/CONTROL b/ports/boost-optional/CONTROL index 1b4acb31eafd65..89672a24df4020 100644 --- a/ports/boost-optional/CONTROL +++ b/ports/boost-optional/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-optional -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-move, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/optional Description: Boost optional module diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake index dd49e1a3818cc5..829dcfecf499f6 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.74.0 - SHA512 571cba3c4be579c19bb1f46f2d40a026ad4c8cb03015e8900fd0f7342b32138fb4beec8beb281d823e9ac6b841f302db86a9ad62fbde377dc9672fefbdaa7b3c + REF boost-1.75.0 + SHA512 0ca750030089267e1fc2f5a91b85bdddb239ffb2dfa02457176c7bee2caa926457a70cf8bcaec78658668b36e70c9d927823d7cf960d5a37ce8d879cefb3029d HEAD_REF master ) diff --git a/ports/boost-outcome/CONTROL b/ports/boost-outcome/CONTROL index ada9df4e058904..656848684f2b9f 100644 --- a/ports/boost-outcome/CONTROL +++ b/ports/boost-outcome/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-outcome -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-throw-exception, boost-vcpkg-helpers Homepage: https://github.com/boostorg/outcome Description: Boost outcome module diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake index 3c3077eced609d..1a22d038ccc380 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.74.0 - SHA512 115ff98875bd95d85f90c25f45617f3491803b627d028eb8d5669e17fe0438817a21be915b1f5a5bd46ad902b00acf5801d54572dad46b8982febf20d82f1110 + REF boost-1.75.0 + SHA512 838c4a0a698cf3250891ef02184669d14e0891f366c52e646e76b25727be5d2fc0596a3ed95ac18f5d180ea35a1c24db3b8e8913277d62683908900d0394b9b1 HEAD_REF master ) diff --git a/ports/boost-parameter-python/CONTROL b/ports/boost-parameter-python/CONTROL index e8a3149b0f6fc0..4d5ec3a2539544 100644 --- a/ports/boost-parameter-python/CONTROL +++ b/ports/boost-parameter-python/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-parameter-python -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-mpl, boost-parameter, boost-preprocessor, boost-python (!uwp&!(arm&windows)&!emscripten), boost-vcpkg-helpers Homepage: https://github.com/boostorg/parameter_python Description: Boost parameter_python module diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake index 5cbb96924d891e..46b6a368974aac 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.74.0 - SHA512 a8661adbb4f89e41e1676574e15582135a5fdae3be303cee93c2ce55cc01a6fe18a8b5040c4328cae69e188195f94e0821e47f59a0ca0b3641b2cd58563ef5eb + REF boost-1.75.0 + SHA512 8a9591c51ea7f39b231293d0f731572cc014288c43f1cbaa5a3fd98d6eccb4359b6c8c064554efa438495b13866f475fde7dbfee255c7ee471bbfd4e94770ad9 HEAD_REF master ) diff --git a/ports/boost-parameter/CONTROL b/ports/boost-parameter/CONTROL index 5c58884b3cefe2..2df9f067e1157b 100644 --- a/ports/boost-parameter/CONTROL +++ b/ports/boost-parameter/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-parameter -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-core, boost-function, boost-fusion, boost-mp11, boost-mpl, boost-optional, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/parameter Description: Boost parameter module diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake index ff2f51ff5cf4c2..f4382824e0342f 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.74.0 - SHA512 251770908e4e167136fe6963c131be7da9589970e8c8dfbc96033e82b1a6f1d31bf810859c495d202dbfe19de817865a7c7988a9ca96f5df5f3a14d930c0df9e + REF boost-1.75.0 + SHA512 aebb583003b532566d6e8527a1f307b0baac0083d89e88ad63eb3aac7861832aad557a4412adaf56a962c721629056e2e56b8334964e0fafd3e23cdbf82f25c6 HEAD_REF master ) diff --git a/ports/boost-pfr/CONTROL b/ports/boost-pfr/CONTROL new file mode 100644 index 00000000000000..06a26ed4c3d6e2 --- /dev/null +++ b/ports/boost-pfr/CONTROL @@ -0,0 +1,6 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 +Source: boost-pfr +Version: 1.75.0 +Build-Depends: boost-vcpkg-helpers +Homepage: https://github.com/boostorg/pfr +Description: Boost pfr module diff --git a/ports/boost-pfr/portfile.cmake b/ports/boost-pfr/portfile.cmake new file mode 100644 index 00000000000000..abde62533232a6 --- /dev/null +++ b/ports/boost-pfr/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/pfr + REF boost-1.75.0 + SHA512 68f4c111451f8d9d695d083b713ffb6efaa6d81e5b83ffa8ee901cd43e1eb41abe75a80be03b039036d53625c5629daa12a999217d1ac8aebc5806d1916f6ace + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-phoenix/CONTROL b/ports/boost-phoenix/CONTROL index 43a3add46d6434..4417e058193830 100644 --- a/ports/boost-phoenix/CONTROL +++ b/ports/boost-phoenix/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-phoenix -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-fusion, boost-mpl, boost-predef, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/phoenix Description: Boost phoenix module diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake index 76f51053161e82..2f51ff7fbc1737 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.74.0 - SHA512 aecc39aab0b60980dc451fc234996ea75ec02615a85c004b0157d5b7ed3ab77e1d820f04427c5aaeffacebe0c3924ed56faab2599ee00fd60ae8bccab664f7fa + REF boost-1.75.0 + SHA512 e888960ee154d73f9eb5d5d97d681aa5a8bba7295ab2150d80a316ab6c8aaf66efb3187ac618d59ad21aa0459b29ce68dcd106d5f6242b7db2ec3d61c92fa107 HEAD_REF master ) diff --git a/ports/boost-poly-collection/CONTROL b/ports/boost-poly-collection/CONTROL index ad98b5c70193b0..17f71efb850451 100644 --- a/ports/boost-poly-collection/CONTROL +++ b/ports/boost-poly-collection/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-poly-collection -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-iterator, boost-mp11, boost-mpl, boost-type-erasure, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/poly_collection Description: Boost poly_collection module diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake index 00169163ece20c..7234d833b37c93 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.74.0 - SHA512 fc9bc50f30eb6f7e7e044a0760ad3deea587338f4e86a09707d5f68459f3d55a9865726f6aed804c26c78f03040c6107d355a5984d2738010e7e233f960fb00b + REF boost-1.75.0 + SHA512 b647e6256d566117dc35ec3452c849aadbcc06a71b70426d7b41e63e2e369e0c3373628f7a33e2b16eefd86efb128cd03ee7b49473f1d83da775ae2cd1043709 HEAD_REF master ) diff --git a/ports/boost-polygon/CONTROL b/ports/boost-polygon/CONTROL index 9516e2c03115ec..742d0ced5caa24 100644 --- a/ports/boost-polygon/CONTROL +++ b/ports/boost-polygon/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-polygon -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-integer, boost-vcpkg-helpers Homepage: https://github.com/boostorg/polygon Description: Boost polygon module diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake index 672784fcec215c..ed8e27acf084ae 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.74.0 - SHA512 dab8726d470ec7460988962bafffcbe881fa3953d34111b13a61e1ff4351c6f9dc2ee77d1eedd6331642060c5b16a9fb6655f3675698e904287297d9a7f8cb71 + REF boost-1.75.0 + SHA512 8c4241e1c392fb63b118c3e59a9207126627e02a4e3ecb5be1e7c73adfe156320d4d61ccf8274c6434447cdcdf2dfb960574437be8edb771ad143f7bfce14377 HEAD_REF master ) diff --git a/ports/boost-pool/CONTROL b/ports/boost-pool/CONTROL index 4b52837853d70c..dd8fd1d7d336a8 100644 --- a/ports/boost-pool/CONTROL +++ b/ports/boost-pool/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-pool -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/pool Description: Boost pool module diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake index bd2c49661a9897..de1145ad21886d 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.74.0 - SHA512 893fb1a56a42217d9480ed44786839510b8689f188708fc6c43b0888651cf0315e1100027bd11872805ac1f75fdad7ba736e966ccb8b069e9c8780e13bfbff82 + REF boost-1.75.0 + SHA512 6726fd14ae1aafdabe65529d081fcc2d66e61b622b4c4312bced797dc5484211d03e1c93f18ecb1fe995557291f079bdaef89049eea94e2f3dabe492e4d9b9e6 HEAD_REF master ) diff --git a/ports/boost-predef/CONTROL b/ports/boost-predef/CONTROL index 44e1074c02b37f..39fe4bfd262da7 100644 --- a/ports/boost-predef/CONTROL +++ b/ports/boost-predef/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-predef -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-vcpkg-helpers Homepage: https://github.com/boostorg/predef Description: Boost predef module diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake index 2bf83a7a05fdb2..2f58cb3ebfaf89 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.74.0 - SHA512 7d20103345c7d09b977f65b026fbafaba97e8a11acd021f7c7208ecf844dc6a404087b238afa155ed86264ff00a3278e67446af36565073072b722c9366d0533 + REF boost-1.75.0 + SHA512 ecac133772c24c0e2da6ebcb9a39fb9a14b23cdc14689421eca7c59513bc559f822b3ecff70643df4175379c05d435e8fa9300231dafac61f1d0857179b47c58 HEAD_REF master ) diff --git a/ports/boost-preprocessor/CONTROL b/ports/boost-preprocessor/CONTROL index 5caf6de22f7052..8c147b09e9bf17 100644 --- a/ports/boost-preprocessor/CONTROL +++ b/ports/boost-preprocessor/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-preprocessor -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-vcpkg-helpers Homepage: https://github.com/boostorg/preprocessor Description: Boost preprocessor module diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake index ab5b9acd957d5b..025a06b879e358 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.74.0 - SHA512 6e5acbce64d4c290a8b2c2f0c95bda16f985039a63e542074fe0549a9abe0a890f56433c69ddc276a833ed64c137521eb4843585c6568668b8e0dfddc9ab3c1f + REF boost-1.75.0 + SHA512 e76c3e6d810ca0c21d6f58ccf421cbba3078e3e300cb967b0e1b7ade1000d8c984fa1133d6e47b6b0d6c1a6507de4e5ef47934f0415c2acdc10442cf4bd052e5 HEAD_REF master ) diff --git a/ports/boost-process/CONTROL b/ports/boost-process/CONTROL index 952de81d6a7185..6135e047779c8d 100644 --- a/ports/boost-process/CONTROL +++ b/ports/boost-process/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-process -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-algorithm, boost-asio (!emscripten), boost-config, boost-core, boost-filesystem (!uwp), boost-fusion, boost-iterator, boost-move, boost-optional, boost-system, boost-tokenizer, boost-type-index, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/process Description: Boost process module diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index 78283981ddb255..f7bb992e6361a8 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/process - REF boost-1.74.0 - SHA512 27c9b4940f7a4318b65af10fa96b271faa09264f0ed4585c357d2bb971ecedf09a131fa6f12114e6f7b1e58da22d33ab3cb6392ddee95ce9754e063fc1bbca0e + REF boost-1.75.0 + SHA512 2cb372836c5341eef1399eed54a792a11a42e915837d12cb03049681160cc496e8e47cf9d8937caa860a50da52d1572c620cc082a9e2814277684ddd2bcacbe9 HEAD_REF master ) diff --git a/ports/boost-program-options/CONTROL b/ports/boost-program-options/CONTROL index e562e77ca7297f..0eec763fd16b62 100644 --- a/ports/boost-program-options/CONTROL +++ b/ports/boost-program-options/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-program-options -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-any, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/program_options Description: Boost program_options module diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake index 0252c4e5eda752..87f2f2b6ed0a5c 100644 --- a/ports/boost-program-options/portfile.cmake +++ b/ports/boost-program-options/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/program_options - REF boost-1.74.0 - SHA512 ba46b0e3c640355a0f84086d093379c7857d8491472a93e4b9730d95c7cd3bb1b77770ccc25e6bc0641ce4f7e3b7f632ef0a7685e34dd7844377664e4dd96547 + REF boost-1.75.0 + SHA512 62d0a56afc111783ba49928a6aeeee4d9ad1cba6b8e59933cb49b64594e5e845a17ba4627d45a392199e327e3c9d3694a4c5e4a5d8934f6c26e7a21d6859355b HEAD_REF master ) diff --git a/ports/boost-property-map/CONTROL b/ports/boost-property-map/CONTROL index dd2af6e77d721c..ea990ee34cbc86 100644 --- a/ports/boost-property-map/CONTROL +++ b/ports/boost-property-map/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-property-map -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-any, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-multi-index, boost-optional, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/property_map Description: Boost property_map module diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake index 821e75bdcb6deb..453830eae71382 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.74.0 - SHA512 41519d8a48529a585ee9612a4ffd9c81db905267523b8b95534fb3204e27f6c6673a6f6abb50cb748994782228caac30c55e3245465a0925827169c81bfb65de + REF boost-1.75.0 + SHA512 f7af2810712609b6c7911a2a209e2affab70cadc443bced3b660bff4dc53b280e1c77b2e86d21410b8e9120b0cb18365d9c888183df4b911d34abb00009f2fc7 HEAD_REF master ) diff --git a/ports/boost-property-tree/CONTROL b/ports/boost-property-tree/CONTROL index e060e128534632..df07d89601930f 100644 --- a/ports/boost-property-tree/CONTROL +++ b/ports/boost-property-tree/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-property-tree -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-any, boost-assert, boost-bind, boost-compatibility, boost-config, boost-core, boost-format, boost-iterator, boost-mpl, boost-multi-index, boost-optional, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/property_tree Description: Boost property_tree module diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake index eeb2588f705f89..c255361f000bed 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.74.0 - SHA512 1a29cf3e746e4f1f307b58bcc858ce0419a9c7a6198ec848bcda938e9ee15d02b49ddc2fbb53fa565b72057b63ce0045e520210639b1447542967e0cd6d60dfc + REF boost-1.75.0 + SHA512 387499ce979696e248a260471b8abdd6d41ea6e631ac30977dcb4c63c8f40b4c1f496b66aef28d5471fb82bb8e92e2a87b7369d0d547413d4affdc3b1bc094f5 HEAD_REF master ) diff --git a/ports/boost-proto/CONTROL b/ports/boost-proto/CONTROL index b1794f7d32e948..029ffa3c5f7187 100644 --- a/ports/boost-proto/CONTROL +++ b/ports/boost-proto/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-proto -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-core, boost-detail, boost-fusion, boost-mpl, boost-preprocessor, boost-range, boost-static-assert, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/proto Description: Boost proto module diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake index c2f5c0ca4fcce6..3621ef27af16b1 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.74.0 - SHA512 267831da92793eeec3630eb56609db604d36c2787b54efeafed6f6ee5ef84e8aff4a5d6699e77bddaf1ad8cac12110658cf3138fc374a51005ff44ed722c9b05 + REF boost-1.75.0 + SHA512 cccd53370972656d13c27fcc7c8726fc4d940bb4767e45d0a427337980ed2f7c7b1902a49e58502975dc2741ea4ab5c4809df44282812da3174d1d7541897a29 HEAD_REF master ) diff --git a/ports/boost-ptr-container/CONTROL b/ports/boost-ptr-container/CONTROL index 7f866ff9e777be..17e33d107371c6 100644 --- a/ports/boost-ptr-container/CONTROL +++ b/ports/boost-ptr-container/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-ptr-container -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-array, boost-assert, boost-circular-buffer, boost-config, boost-core, boost-iterator, boost-mpl, boost-range, boost-serialization, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/ptr_container Description: Boost ptr_container module diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake index 421f9715823d75..21f4855da3c42c 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.74.0 - SHA512 10b4adcdaecc25b10688be59a47f79dde7859b85a0afb706ef6e5c912e22c065523fa1e30c9d34b1ed071954ff471da1fabad4049f33c22650f891e849be8919 + REF boost-1.75.0 + SHA512 6c5a1739fa5cf15aa7732794cf030e30279f7d51dc8e4a978df512a8ce5dd2c2debccc6ec9076f6839f0147ff69c46ff05435b20ebc12f1a59e4ad6a1d0e9e1f HEAD_REF master ) diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL index af0039b1a0fd18..62ce076f486702 100644 --- a/ports/boost-python/CONTROL +++ b/ports/boost-python/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-python -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3 Homepage: https://github.com/boostorg/python Description: Boost python module diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index 3999d7d07decdd..92fa8d1844ea80 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/python - REF boost-1.74.0 - SHA512 e0bbd94f2605478966b559f0a18288f756b91957cd05f1ab151d1a5810185d58e6fa2f1baecda9b3f3e6f81c427735f15d3c6689cebd5c65ade3112a9a5baeaa + REF boost-1.75.0 + SHA512 aca87fde436e8dd98d64149c1ba85f2bef33a76fa9cfc650d23055aa3ce12e94ac39b72b0704e7fd6d0d4adc55c4ec93d841b37bac3297ceb04264ed9adfffab HEAD_REF master ) diff --git a/ports/boost-qvm/CONTROL b/ports/boost-qvm/CONTROL index 976bd630cb15f0..fbec4245aca12c 100644 --- a/ports/boost-qvm/CONTROL +++ b/ports/boost-qvm/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-qvm -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-exception, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/qvm Description: Boost qvm module diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake index e912783d78f905..3cf0c2e6ea2e86 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.74.0 - SHA512 cd94af7b31ce7a0d610f221dbb2fa2f9d1bc6f4622176bde1d890af7e220cd524ce1a5064a9f3f10bc248f4ce6dc4432900b732357ed0aaba18613460d2bee35 + REF boost-1.75.0 + SHA512 7bba9ea21bc86699a54d571c45bd994353ad3207ac7696a111c5e8f08e9de03b6344236b8ce11a19d10696a682fdbd8cc5c4bca84c2337f4f009b92c82e77c81 HEAD_REF master ) diff --git a/ports/boost-random/CONTROL b/ports/boost-random/CONTROL index a2ca50c6abffaa..b247bdbb98b063 100644 --- a/ports/boost-random/CONTROL +++ b/ports/boost-random/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-random -Version: 1.74.0 -Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-dynamic-bitset, boost-integer, boost-io, boost-math, boost-modular-build-helper, boost-mpl, boost-multiprecision, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.75.0 +Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-dynamic-bitset, boost-integer, boost-io, boost-math, boost-modular-build-helper, boost-multiprecision, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/random Description: Boost random module diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake index cc5e3f66957276..008da4e3d4c24a 100644 --- a/ports/boost-random/portfile.cmake +++ b/ports/boost-random/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/random - REF boost-1.74.0 - SHA512 d6d0bb669a799d0530802778d1723ba9a4d8a8243f7d2ab5f48abf444ce74b9a424ba0bfd56a8f0fdc814875e46ea183460a5e787e14e7b2cefbb417ab7ec443 + REF boost-1.75.0 + SHA512 b18c8b6d1c0a3ae551e81a1b4d2c213910f748f236358b54eafc25342a6fba4cf7a4eafec2bf972446ee8aed5a937c5fea00a46b6c678604a42f5449319d7c73 HEAD_REF master ) diff --git a/ports/boost-range/CONTROL b/ports/boost-range/CONTROL index d9ec39b03b9344..184fc70f8945c9 100644 --- a/ports/boost-range/CONTROL +++ b/ports/boost-range/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-range -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-array, boost-assert, boost-concept-check, boost-config, boost-container-hash, boost-conversion, boost-core, boost-detail, boost-integer, boost-iterator, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-regex, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/range Description: Boost range module diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake index 50fc98f9af834c..a4810e59c96658 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.74.0 - SHA512 6d74717f47954a502ff10d5c81e5f7aabf7b497e05755d5a555425c664ef74f5a779372aadb897401301dd5e5353125e59fecfa661e72bb9f079054ef0986db2 + REF boost-1.75.0 + SHA512 f722aadac7ad61bf7a773eb701c762b209e68c121948bb79bef5257539e1e7f62557430ef52f58e7758124f9e005426644a89702d40647f1b66be84fe4056e3c HEAD_REF master ) diff --git a/ports/boost-ratio/CONTROL b/ports/boost-ratio/CONTROL index 0cfebf969c7ef5..5a0f03b8131328 100644 --- a/ports/boost-ratio/CONTROL +++ b/ports/boost-ratio/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-ratio -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-core, boost-integer, boost-mpl, boost-rational, boost-static-assert, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/ratio Description: Boost ratio module diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake index 13b7e0a4a1f5c1..09d44f9df64753 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.74.0 - SHA512 64a86639b73f052e4fc8d5dcae627b81a23c3566102eec2677322637edd8e8a1fcaf5db383e667252465c5a746832741d4060c8c30abe3cf841132f7f08bcde4 + REF boost-1.75.0 + SHA512 f7e17ba770041af85a4a5c2dce36681de73bb5513b38d128c9d1d54a0a0b41ecd118f23beb2bebfb4bc67e0df37938249587ab10f0f31330564734542703e080 HEAD_REF master ) diff --git a/ports/boost-rational/CONTROL b/ports/boost-rational/CONTROL index 6d54d9f3e2395b..633c0ac2b306c1 100644 --- a/ports/boost-rational/CONTROL +++ b/ports/boost-rational/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-rational -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-integer, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/rational Description: Boost rational module diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake index 4091d81b05bc8f..02726eb14e4e7e 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.74.0 - SHA512 b1641e1ad4740210232c2d71f764be3e4d7066348c80d0153d89f998cef05a763b4dfd6934cdbe4a085f74e10f645f74544e51900e9dea1c4be5a72f3809fb0f + REF boost-1.75.0 + SHA512 72b499b5abc825a2bcd06dd2c1047004d77271c9134bbb9c30860e87c347d366f0189849fd0159c886de86b1dce050ea6b96be497bf05d83bd21c47a7e07b5b8 HEAD_REF master ) diff --git a/ports/boost-regex/CONTROL b/ports/boost-regex/CONTROL index 5fc4a86a27713e..a9d15c9262cc2e 100644 --- a/ports/boost-regex/CONTROL +++ b/ports/boost-regex/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-regex -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-predef, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/regex Description: Boost regex module diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake index 93823f7208b478..92be13446453f1 100644 --- a/ports/boost-regex/portfile.cmake +++ b/ports/boost-regex/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/regex - REF boost-1.74.0 - SHA512 4ec770c5e9152b2e1cf92b9be1e8b33a4d25409569f35062286a6b3de71b7b3b28916da09a0fddd2eda3da940e3746aabe893243f3e86f2becb606617d56c554 + REF boost-1.75.0 + SHA512 966cd68fc8190b92f0a23e7e1f08602b5ab50674c6fe4d93761de46f8758a6e1a2dfa7fef5e5f814f94a8acfca57e842b914f2f2013768e6a91e427fb2de4559 HEAD_REF master ) diff --git a/ports/boost-safe-numerics/CONTROL b/ports/boost-safe-numerics/CONTROL index 016088e0e9165d..fe8ee7f4f28286 100644 --- a/ports/boost-safe-numerics/CONTROL +++ b/ports/boost-safe-numerics/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-safe-numerics -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-concept-check, boost-config, boost-core, boost-integer, boost-logic, boost-mp11, boost-vcpkg-helpers Homepage: https://github.com/boostorg/safe_numerics Description: Boost safe_numerics module diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake index d0337ede8fef19..ab9552626aa763 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.74.0 - SHA512 c1b6a3ebcadab4880f3954bc54223c35c41ec6eac2dac53774b15028f74a75feb87facbbd4c89c0c2ec056825d2b77af6fcf8c7e113723a2e8dac1ac501cfffb + REF boost-1.75.0 + SHA512 47b576b702c01eb32c6211e5b23ce4495504c37b6f65318f43af21898200681f3ebf08ca5b1b0c54e763ce863e2f427e7e51eab019c3f941a34ddd60b739df23 HEAD_REF master ) diff --git a/ports/boost-scope-exit/CONTROL b/ports/boost-scope-exit/CONTROL index 483bd125c62377..f9192977cb4f15 100644 --- a/ports/boost-scope-exit/CONTROL +++ b/ports/boost-scope-exit/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-scope-exit -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-detail, boost-function, boost-preprocessor, boost-type-traits, boost-typeof, boost-vcpkg-helpers Homepage: https://github.com/boostorg/scope_exit Description: Boost scope_exit module diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake index e6ebbf60c040e2..589e9e1c876237 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.74.0 - SHA512 4266ea4b90e27b69204e11b277ef447ee452d4adb46a91202c4aca9a15ee6bc3b52780fead410d90a1e852442bc2ffff5b542fb481fde5cba1b3b31015749091 + REF boost-1.75.0 + SHA512 2b2887087a748374466fd518c9bfb092f3ff07d998cc8ff5e8230a1f1b8444b7b73d27fe7cbcd5fb2629dfc91035291776bdd514a5cbc5d85ebef22748ca09e5 HEAD_REF master ) diff --git a/ports/boost-serialization/CONTROL b/ports/boost-serialization/CONTROL index 0863c242fd010c..e96f5b5308e6f4 100644 --- a/ports/boost-serialization/CONTROL +++ b/ports/boost-serialization/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-serialization -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-array, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-spirit, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers Homepage: https://github.com/boostorg/serialization Description: Boost serialization module diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake index da56bf0f9dcb01..ef6fde24cbbe1b 100644 --- a/ports/boost-serialization/portfile.cmake +++ b/ports/boost-serialization/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/serialization - REF boost-1.74.0 - SHA512 1e458d77d28e2b00e2d241d4ab595f65a6893305410b6f47a8a690d5043ae3485739222456e5d5db49ad28d95af8efb6e7655b3d71d828f6aa5e18e74691ce4f + REF boost-1.75.0 + SHA512 0398ff271722509719fcdf54ff752df386dcc5f94364e7d0e695e52db3daa1b0ca26db8c20279525d149d26d640ec2bf8e56121064ededf536bacb039f71a197 HEAD_REF master ) diff --git a/ports/boost-signals/CONTROL b/ports/boost-signals/CONTROL deleted file mode 100644 index 3c69f3c0847f05..00000000000000 --- a/ports/boost-signals/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 -Source: boost-signals -Version: 1.68.0-1 -Build-Depends: boost-any, boost-build, boost-config, boost-core, boost-function, boost-iterator, boost-modular-build-helper, boost-optional, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/signals -Description: Boost signals module diff --git a/ports/boost-signals/portfile.cmake b/ports/boost-signals/portfile.cmake deleted file mode 100644 index 038d42dd7062ae..00000000000000 --- a/ports/boost-signals/portfile.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO boostorg/signals - REF boost-1.68.0 - SHA512 3d5a26de28050e03779a26f6af5f96bdab0023d6be3047be9652a660c607e7839b46b3abb257ec5b1791e2e4dc5cbcbefe433244ddc6140ee64ae531b2c0b01d - HEAD_REF master -) - -include(${CURRENT_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) -boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-signals2/CONTROL b/ports/boost-signals2/CONTROL index 45756359cb03fe..3467e1dd1ee354 100644 --- a/ports/boost-signals2/CONTROL +++ b/ports/boost-signals2/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-signals2 -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-iterator, boost-mpl, boost-optional, boost-parameter, boost-predef, boost-preprocessor, boost-smart-ptr, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers Homepage: https://github.com/boostorg/signals2 Description: Boost signals2 module diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake index 7d45fdebf771ea..ae3e6e1e48f370 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.74.0 - SHA512 e51a67fd19fa5beffa3b11a7636c2962032cc3aebd18be2594c6a0129fd2a866c1e88a3a04b17957fe440dd335a7d4e421f183eaaa0f5f90ae10d4c470af274e + REF boost-1.75.0 + SHA512 6ccacd7bc2d210ea36913f5dc8af5264633b79e89a81f8cd75ddbf7e62257577359509dcf83561f2254dfc55298ff509bbf96f7d9511e338621130ac08163f3c HEAD_REF master ) diff --git a/ports/boost-smart-ptr/CONTROL b/ports/boost-smart-ptr/CONTROL index adfc17d3bdb678..58ebabf9d31aa4 100644 --- a/ports/boost-smart-ptr/CONTROL +++ b/ports/boost-smart-ptr/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-smart-ptr -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-move, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/smart_ptr Description: Boost smart_ptr module diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake index b4a51a944bceb8..fb57f61fde7741 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.74.0 - SHA512 ee3af28130697d76ba6f93f7e4be4d8fe33c38e0107db7227c640cdffde239eb497d35ae9d04fc4a928f9f3d4752ea7971ee833df1b0495287d1860010c6fa04 + REF boost-1.75.0 + SHA512 0c8e41eec34e81e12cb7accfe2fe76454e2121e30c9a719922a27e2c173d9eb0210af5bf090ee107b0f8946e33893ce6a36d8faea31b17a71262df45099ec699 HEAD_REF master ) diff --git a/ports/boost-sort/CONTROL b/ports/boost-sort/CONTROL index a9fe86fb49ab56..89e7bfe3651040 100644 --- a/ports/boost-sort/CONTROL +++ b/ports/boost-sort/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-sort -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-integer, boost-range, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/sort Description: Boost sort module diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake index 9737c5212d6d8c..0f1516a8957dfe 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.74.0 - SHA512 d612a34a8cf2ef7f03de94afaf0fe1eabef8f1905f47fd6c7efe52ff62c5a66cb694a6a38893d7daeb373efeb4fa4bdf623697da85d22ef016f5fe5774a21791 + REF boost-1.75.0 + SHA512 e7b193f54de684e7f7dde9e1283cba1979b9f5337ea10a60c83d1aff3346c431d85674167a24cc11300b49005db6c4476650039a6f39a757bb46cbb8ceb82224 HEAD_REF master ) diff --git a/ports/boost-spirit/CONTROL b/ports/boost-spirit/CONTROL index d113d3f78fadf9..7dc32bdee6de92 100644 --- a/ports/boost-spirit/CONTROL +++ b/ports/boost-spirit/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-spirit -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-endian, boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iterator, boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-type-traits, boost-typeof, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers Homepage: https://github.com/boostorg/spirit Description: Boost spirit module diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake index cfac19be57a34c..3ff4e47fb5cb27 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.74.0 - SHA512 325a83433060f7d64500e8aa7789741577a4cfbe5851e6b422fcede6e2ad42a37d68f98d80883b2d189254be19fdeef8b08890037710d71443006641be93ed4d + REF boost-1.75.0 + SHA512 83d4cb3aad1e635e14640dace19d44db7886a0e25a30f9c5ff5384c5be8f6961231f947f4df0baf07f9bbda6893988ed9099700d596f99ff39ea22151e436912 HEAD_REF master ) diff --git a/ports/boost-stacktrace/CONTROL b/ports/boost-stacktrace/CONTROL index d02394f4283bea..eb6e2309e0f8b2 100644 --- a/ports/boost-stacktrace/CONTROL +++ b/ports/boost-stacktrace/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-stacktrace -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-array, boost-build, boost-config, boost-container-hash, boost-core, boost-modular-build-helper, boost-predef, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/stacktrace Description: Boost stacktrace module diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake index f86f55f960b07f..adfc21623d1b82 100644 --- a/ports/boost-stacktrace/portfile.cmake +++ b/ports/boost-stacktrace/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stacktrace - REF boost-1.74.0 - SHA512 17a48988c22204dfb0d99a195e6e7170312b552c8586d26d90a15e5bbe59ba3ae1b3796768f4578aa77d2579dffdfda87095fa74d84734df7152c2f3d8ef4e0e + REF boost-1.75.0 + SHA512 e5445ecbebf9a3099f95beaf7f9e77cec958f2f35c20261ec9d96d1f2100ec781fb7ed3553d189cab0a0568c6dff02bddeca1835795b1070ea1a080dd13db5e4 HEAD_REF master ) diff --git a/ports/boost-statechart/CONTROL b/ports/boost-statechart/CONTROL index 287fc06e20d5de..09b8a3c3511432 100644 --- a/ports/boost-statechart/CONTROL +++ b/ports/boost-statechart/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-statechart -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-bind, boost-config, boost-conversion, boost-core, boost-detail, boost-function, boost-mpl, boost-smart-ptr, boost-static-assert, boost-thread, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/statechart Description: Boost statechart module diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake index 54de3aa44549f6..9b80a27aa197d1 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.74.0 - SHA512 9bbba5c1a816c385f878ce144805c8fd662d88b4e18117785177b35003d2bc2cafb545a5c7f07ef0b479272f1fa2f18bd167dfdb5d8bd9197e723005d738848f + REF boost-1.75.0 + SHA512 7f7344f272c2172b5297ee2c83af44791843003da624ff24fc0b51c6adb5eec2ac55453e92e35a5174b019379e63a38eef9888710f51108bbb887f8f4ad63c81 HEAD_REF master ) diff --git a/ports/boost-static-assert/CONTROL b/ports/boost-static-assert/CONTROL index ed90a1771ad557..9ffab13571fd13 100644 --- a/ports/boost-static-assert/CONTROL +++ b/ports/boost-static-assert/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-static-assert -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-detail, boost-vcpkg-helpers Homepage: https://github.com/boostorg/static_assert Description: Boost static_assert module diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake index b4d04e3a501a7f..999f87e8673962 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.74.0 - SHA512 ed837f88964a9244378f67583a2392bdc493d34ba7910f01e354d9c7508eb5de563075718dd22dca8e5abe2037aa2de46a78ee591df514432f2fd3d64eb4ecc1 + REF boost-1.75.0 + SHA512 dbb17a379e745a888c6ddafbec14565cadd2270356bff5787096d7dc00bc4804bdf17b424891edb3b2df8db4e2bb79ce08c57b59b76ba185fa4c83f37195c610 HEAD_REF master ) diff --git a/ports/boost-static-string/CONTROL b/ports/boost-static-string/CONTROL index 9a1d5566c2b30e..f82fe744b2d426 100644 --- a/ports/boost-static-string/CONTROL +++ b/ports/boost-static-string/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-static-string -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-container-hash, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/static_string Description: Boost static_string module diff --git a/ports/boost-static-string/portfile.cmake b/ports/boost-static-string/portfile.cmake index 88d875d907b8bf..8468e38aabbf08 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.74.0 - SHA512 8ec0adf10ad5a9554adb8558a72a553366a7be53a2a67882dbb6fbd56503b52235975268e8830eb70fa9467ea5c961e97b1f0e595c7c121b5a4d2aedfccd47cc + REF boost-1.75.0 + SHA512 d3d0326250743783434c57d9c5c9f60c195978be862fa9bf377952385b06ce44f236f63c1423c5267b093ba28ac3aef74a4fd8e012bfb2f30620afc5e16cafbd HEAD_REF master ) diff --git a/ports/boost-stl-interfaces/CONTROL b/ports/boost-stl-interfaces/CONTROL index 62e41b70371686..03357ef2f91f49 100644 --- a/ports/boost-stl-interfaces/CONTROL +++ b/ports/boost-stl-interfaces/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-stl-interfaces -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-vcpkg-helpers Homepage: https://github.com/boostorg/stl_interfaces Description: Boost stl_interfaces module diff --git a/ports/boost-stl-interfaces/portfile.cmake b/ports/boost-stl-interfaces/portfile.cmake index a17264a900f45e..8ddeaa61ad531a 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.74.0 - SHA512 8d6b0f0fe0b16cc79d52dd899cf8973c8abeb9d1087110c3bade797021ff10420c2d0d959b9442bce7499f0f028d690ef5e5a70300607950d025df8e9ab637a4 + REF boost-1.75.0 + SHA512 9cf6d2fb8d7bd0730a383068847d711ba3e5b5b979f72448a1606a50c26ceb903ccebbec5bbf57e35388c720b9030278a3f385b29c78d4548d9c1f61fdb5a585 HEAD_REF master ) diff --git a/ports/boost-system/CONTROL b/ports/boost-system/CONTROL index 9aefa00e152fba..0e65363045cb4a 100644 --- a/ports/boost-system/CONTROL +++ b/ports/boost-system/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-system -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/system Description: Boost system module diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake index affc1b4493a19c..bf6f9ed981d2ed 100644 --- a/ports/boost-system/portfile.cmake +++ b/ports/boost-system/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/system - REF boost-1.74.0 - SHA512 681ad487a3b2ba0392ca1a86119e2be21c4c9f8b71e0a624d4939c92c00b94d1a491f14305176d3b8ea715568db084cbd1e3d3affe58d5c4b8177edb5945e785 + REF boost-1.75.0 + SHA512 8d079906e513605d9c372fc42dcc29e0e537ef690ecd2140040bd8c40619a218e61950d6a59074d11db910f6a68e8306633b5bc2b6190813fcd47c7aacbdb0ad HEAD_REF master ) diff --git a/ports/boost-test/CONTROL b/ports/boost-test/CONTROL index 4e3908cbbb41ff..ea7ded87add281 100644 --- a/ports/boost-test/CONTROL +++ b/ports/boost-test/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-test -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/test Description: Boost test module diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index b97f54725d9e1d..d9dcf4cf7d3101 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/test - REF boost-1.74.0 - SHA512 042a3a2101a1fd0353d2f2fcb7395db9e83abbd5c0fea19361c39da6d4f52b1a8eba3c324294df81f525e82b36df3911abf5b92da02a09d8a6806515fa3e4efe + REF boost-1.75.0 + SHA512 7ea116de82140b50113d7971e861d5ee7f2664c11ac79861f453066adf41d4581d3aadb7c484045050f88e7aca3b4d90a078f916dbb6c7f40a1ff9bf6a7c1d47 HEAD_REF master ) diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL index 242ae047d4309d..5e52007093db17 100644 --- a/ports/boost-thread/CONTROL +++ b/ports/boost-thread/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-thread -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/thread Description: Boost thread module diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index af45035a9c28e0..17c620ec47f34f 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/thread - REF boost-1.74.0 - SHA512 2b5c4ade98dfa0cefeb0571f931952b317c94ec5cc07d0539efc6e36976da0108f165802d2f732857485f0ec3d352707e8be4f335ce1a2cb692bdb3d8746176a + REF boost-1.75.0 + SHA512 b5fb6aed2ff3dd59f8b91c3e2758e27264f2bbb40636371f6b0aa130a6dad8b4dba93eeaa37ec960d56ea30fa28f9559a98349c9b7e40d08f6b7273a1aa49246 HEAD_REF master ) diff --git a/ports/boost-throw-exception/CONTROL b/ports/boost-throw-exception/CONTROL index f6416dbeff00e2..e377121d54a07a 100644 --- a/ports/boost-throw-exception/CONTROL +++ b/ports/boost-throw-exception/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-throw-exception -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-vcpkg-helpers Homepage: https://github.com/boostorg/throw_exception Description: Boost throw_exception module diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake index b0dd9d16821a6c..79e121bdd7aec2 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.74.0 - SHA512 d3da601753149549277799808b4bc78a6fb2bfc6df5e88d372cf07bfee87b600439dae6602feafd63aa5bb4de6041c8857e024a5c3cbf94c1b113a0f182216d8 + REF boost-1.75.0 + SHA512 b4bd96f9ef37f1345db8eb26715b1da43a9f7ea2b7eaf4618be2caf3e7e4e6904fa5a32e2b62fd032dd6ebb99d0bbd7e37efbd94edb31aeb3d49c68065f3be28 HEAD_REF master ) diff --git a/ports/boost-timer/CONTROL b/ports/boost-timer/CONTROL index bc3675b993a421..76b5d2344b1333 100644 --- a/ports/boost-timer/CONTROL +++ b/ports/boost-timer/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-timer -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-predef, boost-system, boost-throw-exception, boost-vcpkg-helpers Homepage: https://github.com/boostorg/timer Description: Boost timer module diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake index a14c723b61b3db..393e91ba5edae4 100644 --- a/ports/boost-timer/portfile.cmake +++ b/ports/boost-timer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/timer - REF boost-1.74.0 - SHA512 98776709e9ce58833ecbe2131a0723ef55e056a03e847b2aac304f101df279e2825452892ab9031d8fc57165775635349162b6254283181e25e51290464f9807 + REF boost-1.75.0 + SHA512 718b469ed561ea8897bee96c12aa90a2840ba9c4772e963ab35d53d0d161ad39e630ef954b393155f834309607d1cd4f7b63b537e4465b8e50ad303438e3ba30 HEAD_REF master ) diff --git a/ports/boost-tokenizer/CONTROL b/ports/boost-tokenizer/CONTROL index da83ee431dd21d..7f436c1aa3b886 100644 --- a/ports/boost-tokenizer/CONTROL +++ b/ports/boost-tokenizer/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-tokenizer -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/tokenizer Description: Boost tokenizer module diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake index b262ad3464b400..e655ef33352c0e 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.74.0 - SHA512 849ebf9cb46a438231de39503d1134323b3556878c43f7d192f5df97c3ad5eca7e96b90fdb87871544530bed3c9ab3a21c2dcd6e72a64ce74a48e96654201883 + REF boost-1.75.0 + SHA512 12b86b1295d1080192f3537a1a984c234a2351e7021829dea8af635680ed8007485bba1843452b1d7706dcf9fd2754967cd8db784b06ad9c9d626e8ae87f6f67 HEAD_REF master ) diff --git a/ports/boost-tti/CONTROL b/ports/boost-tti/CONTROL index 12617f73f40633..40aad5ea5ecd79 100644 --- a/ports/boost-tti/CONTROL +++ b/ports/boost-tti/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-tti -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/tti Description: Boost tti module diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake index ccef15caa70559..6fee186c3060f6 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.74.0 - SHA512 d6c807697a1a9ba2a2a53963f4ce4a08961af834f4e961cf6772ada6bc9be9dce725846548522d79dc68718c38b0e70c1e0d397b832b4d2b2fb10482599a3193 + REF boost-1.75.0 + SHA512 9cb18d992e5f149f9b35b3e97ea63b41752ed03cba8c23b68dfd5b9d55538a55d1aa13abe1d16a6bfd596a144c85947ad0609a64715dbc72a6cede7f3961be71 HEAD_REF master ) diff --git a/ports/boost-tuple/CONTROL b/ports/boost-tuple/CONTROL index e28415a0f12a7e..3c13674bebb81d 100644 --- a/ports/boost-tuple/CONTROL +++ b/ports/boost-tuple/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-tuple -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-core, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/tuple Description: Boost tuple module diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake index 184e176859e1ba..36e605055921f7 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.74.0 - SHA512 a3547b82801917a76612db31d4c33e06cfc3b4ce57bf3f9c7f6555de6c542f6fc7dc95ce39b49c109cfb75b1df21738782144735ad548b690605b50708863a17 + REF boost-1.75.0 + SHA512 6ccc5e0e1c115f2c2840a2780e4639b184665f9993d1e21b8524b7ca775fecb38a554c53bc01eeec8a2643e45172540f176dddc8af684a5dbd14b98c6ded8b6b HEAD_REF master ) diff --git a/ports/boost-type-erasure/CONTROL b/ports/boost-type-erasure/CONTROL index 15c8612c58c5ca..7f2bdf24f955ee 100644 --- a/ports/boost-type-erasure/CONTROL +++ b/ports/boost-type-erasure/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-type-erasure -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-fusion, boost-iterator, boost-modular-build-helper, boost-mp11, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-thread, boost-throw-exception, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers, boost-vmd Homepage: https://github.com/boostorg/type_erasure Description: Boost type_erasure module diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake index 3277da4e0fcfdf..77227e81f577c9 100644 --- a/ports/boost-type-erasure/portfile.cmake +++ b/ports/boost-type-erasure/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_erasure - REF boost-1.74.0 - SHA512 a8685ac4650048d1e2b6635b922c3432fb7b72541b03990ae6ef1b426487ce27b2fd4ec372582d141141232d788a236895f6a8d75e7a2f2ff676f1b1c0645e40 + REF boost-1.75.0 + SHA512 b25841b9ce94a5567c05fa465b0539bead832d8cc12beb66ee0739a8717641d422f7b894b06d8465cf1d1cf18ef914bf8f27a4a38da22b72d1b639eb2aa9c584 HEAD_REF master ) diff --git a/ports/boost-type-index/CONTROL b/ports/boost-type-index/CONTROL index 44d913ae125ae9..14ce61d3fa4df4 100644 --- a/ports/boost-type-index/CONTROL +++ b/ports/boost-type-index/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-type-index -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-container-hash, boost-core, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/type_index Description: Boost type_index module diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake index 571f4c98e663d0..bb59d8395be5cc 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.74.0 - SHA512 81e47c9b9d070ab987b988d8d572f1d80178adca6a22e6d1a435b412a098dc0d5f8a406c4e816ef1e36e62c467980fd0e1bceee9170e6058a5ec763deae591cd + REF boost-1.75.0 + SHA512 f76b38f82ea2ba8508715122c6b899034a57e206ac01a4560220df03c185885a6b50f56559f070ae873addccd8b05df2dc1f35dffeee36e8384e8de2f6f5e220 HEAD_REF master ) diff --git a/ports/boost-type-traits/CONTROL b/ports/boost-type-traits/CONTROL index 7d3a192b6cbf9c..d54f2588baedff 100644 --- a/ports/boost-type-traits/CONTROL +++ b/ports/boost-type-traits/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-type-traits -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-detail, boost-static-assert, boost-vcpkg-helpers Homepage: https://github.com/boostorg/type_traits Description: Boost type_traits module diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake index de4caf559c821e..a7dc81bec82e20 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.74.0 - SHA512 ac6e4482297f6f460912a211bdcdd273ca0ea907a598ebaa41ed9f060dc020691ce3ced05c684640deb2d4a7d96a5b5512aef5a44eb79f95e3616156d005f66b + REF boost-1.75.0 + SHA512 bf6dd23c9c2194a6507a0e513b1622e6444ce57d2da42079bea6acbe72d5ce5a510b5c223a0031cba7cd00b77bc51ebbd483296a9f598c80b82d1b8a658e94aa HEAD_REF master ) diff --git a/ports/boost-typeof/CONTROL b/ports/boost-typeof/CONTROL index 706cd46e14492f..2ebd24a3843e31 100644 --- a/ports/boost-typeof/CONTROL +++ b/ports/boost-typeof/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-typeof -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/typeof Description: Boost typeof module diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake index 3ad43602999a4d..5140a906a45250 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.74.0 - SHA512 91bc77c28b8c9a400596c9f4c1ac91f53f85aa6b4f8f694fc5fc144ee89c19dee1962a1419fb037af4da23b078eb084a19881c5358f27d853f2a90ae5eb884ac + REF boost-1.75.0 + SHA512 d0b2bf6c129054471c945b76d871e3e7281f115e8373d7a7d659a80e05fac50f64a3f2b0958c40d5570cc5815516d99327a4cb155b33fcde2b08d754a617c2cf HEAD_REF master ) diff --git a/ports/boost-ublas/CONTROL b/ports/boost-ublas/CONTROL index 5cfa577c06a83c..9d21f865f3fb79 100644 --- a/ports/boost-ublas/CONTROL +++ b/ports/boost-ublas/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-ublas -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-compute, boost-concept-check, boost-config, boost-core, boost-iterator, boost-mpl, boost-range, boost-serialization, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/ublas Description: Boost ublas module diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake index 5437fc444ce4d8..d322ded2a2c771 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.74.0 - SHA512 12fc78d5594979a02b58c6178e4af1c991ca0e97450059961c6b663f3fb19a298987e3c8c801748a77f8ee93b1b01f366159fe1f5504b3967ab6269ad30fe186 + REF boost-1.75.0 + SHA512 a6c20d97c92c7d2706aeeec71a2bf6672099ba17eb90e3bae9f0a01417b0e68fc2886d1867914aba2c975fcacbd243c5bcefdebdc4eb1b4947571a93c91881a5 HEAD_REF master ) diff --git a/ports/boost-uninstall/CONTROL b/ports/boost-uninstall/CONTROL index 16a2d59e712491..ee449a66a405c6 100644 --- a/ports/boost-uninstall/CONTROL +++ b/ports/boost-uninstall/CONTROL @@ -1,4 +1,4 @@ Source: boost-uninstall -Version: 1.74.0 +Version: 1.75.0 Homepage: https://boost.org Description: boost uninstall port \ No newline at end of file diff --git a/ports/boost-units/CONTROL b/ports/boost-units/CONTROL index c037bfbaea7259..2fc92c6d9340b8 100644 --- a/ports/boost-units/CONTROL +++ b/ports/boost-units/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-units -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-io, boost-lambda, boost-math, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/units Description: Boost units module diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake index 26198d9a5da4ba..bcfdcdf88897c2 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.74.0 - SHA512 f42db9dbd0c4a9ed9e4585b6a12b6864e0d5b82a965256cd9bcf099ac0616f1879f305c6b36decd7bc93a8019af7cb1612f488009ec3c9408c249ea76c1d6c1b + REF boost-1.75.0 + SHA512 6003fc27913be7f3d31e98fbb2493a487e0d1bf9ff93da318761dcefb93c19ab1754c9d6ad74a332ac0959fe827dba2771ac7b72170160d734ad89ca4252d152 HEAD_REF master ) diff --git a/ports/boost-unordered/CONTROL b/ports/boost-unordered/CONTROL index ab147a528289c3..1220a6af2332a0 100644 --- a/ports/boost-unordered/CONTROL +++ b/ports/boost-unordered/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-unordered -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container, boost-container-hash, boost-core, boost-detail, boost-functional, boost-move, boost-predef, boost-preprocessor, boost-smart-ptr, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/unordered Description: Boost unordered module diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake index 8ddacd79754a7d..d8d3e8d647faf8 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.74.0 - SHA512 590b34d2155e79b262670e7eedca31dca18bcdf9f34e93b2d970d1d138802d7a2411ac48f422e2aa0daf27254cd4e7c11a3b680be5300f3a9e847951883b7b9e + REF boost-1.75.0 + SHA512 57dc180b31e2132ef260971fddfbb51792660bbde24f7146825ddf66b0bc80725e089b756f7187d4367ca86a988e042880fffb8e19522438a927feec45705cab HEAD_REF master ) diff --git a/ports/boost-utility/CONTROL b/ports/boost-utility/CONTROL index 74c4f342da80a0..0d7f03b4e7d28b 100644 --- a/ports/boost-utility/CONTROL +++ b/ports/boost-utility/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-utility -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-io, boost-preprocessor, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/utility Description: Boost utility module diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake index d166642805eccc..cb854087df2ca6 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.74.0 - SHA512 9cd5abb7a99ece85d37e35c7ab0243302a69570d815e3de30516b607c9e0c8ca946a5b54230031faba8988e9076a65ce80515d82588d70cb56adfe7ebe7564b3 + REF boost-1.75.0 + SHA512 43c02e8e1ca9e81e6de660c677ea6af6a84a82de0be06a24db1277bb38150b15da0c5466adc7b8f1c527718ebcbd51945671b8362c790322ae9468e4381b1752 HEAD_REF master ) diff --git a/ports/boost-uuid/CONTROL b/ports/boost-uuid/CONTROL index 6a553b31bd1367..ce631c7e1751a4 100644 --- a/ports/boost-uuid/CONTROL +++ b/ports/boost-uuid/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-uuid -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container-hash, boost-conversion, boost-core, boost-integer, boost-io, boost-move, boost-numeric-conversion, boost-predef, boost-random, boost-serialization, boost-static-assert, boost-throw-exception, boost-tti, boost-type-traits, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/uuid Description: Boost uuid module diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake index fe90339f3e51fa..a7a38462db1de4 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.74.0 - SHA512 773e2571f617324592778591c64e7d6e2be93d1ca178aff8c8ffe0a4b89a24f05af2dee99fe7931624f33e8bfbfacf32869a184d2e81a3e7224a8adde67f2b64 + REF boost-1.75.0 + SHA512 f1df5e8a2a4e2bb5c9a4c6ee9876e55d060e75cfeb893163302bafb32048da43b3960fbae82f7da17c60005c236c6535fc802b49f2448a87464bea26debd4856 HEAD_REF master ) diff --git a/ports/boost-variant/CONTROL b/ports/boost-variant/CONTROL index d9dcb0acf5498b..89039e8ca420e1 100644 --- a/ports/boost-variant/CONTROL +++ b/ports/boost-variant/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-variant -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-move, boost-mpl, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/variant Description: Boost variant module diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake index 6bd5ded8a9c449..1bcac29c625c3c 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.74.0 - SHA512 f5af88c1b18467ffa1cff75ab7e6cdb6c94d7ef002de1ff5d3b6527e65977d18339705cc39ed875893e5cc15fcfe4731713218113d5446bd603e5f25f611f166 + REF boost-1.75.0 + SHA512 094bd5f932f621e265afcc6aad08c159ac83a061bb63c370480e2d243d41395378e565e7d2ff5c852cbd0fdaabec294373dadaab01fdc114a347555e1073696d HEAD_REF master ) diff --git a/ports/boost-variant2/CONTROL b/ports/boost-variant2/CONTROL index 76f6ff577d4330..9c12dd2b81da5f 100644 --- a/ports/boost-variant2/CONTROL +++ b/ports/boost-variant2/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-variant2 -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-detail, boost-integer, boost-mp11, boost-vcpkg-helpers Homepage: https://github.com/boostorg/variant2 Description: Boost variant2 module diff --git a/ports/boost-variant2/portfile.cmake b/ports/boost-variant2/portfile.cmake index 128809d8f4644e..809170e6d228fe 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.74.0 - SHA512 b4778f3645d9073543f7bc030deb02ab66e0b341c37ba80e4afd8289e5e6cf8022481bdfacd29c62401772ded95b5924b16fe541196d67fa5b1f72a50347a502 + REF boost-1.75.0 + SHA512 f1aee0b7729935f0ea41aaffeeea81c9eb3870dc3f4719be6f28a007ff5a83b49ca0abce55118d3a165bb477a87a11895ed346d357a2b4b8aba57a0da8067880 HEAD_REF master ) diff --git a/ports/boost-vmd/CONTROL b/ports/boost-vmd/CONTROL index 045bcba9f43044..e5ac72f200de26 100644 --- a/ports/boost-vmd/CONTROL +++ b/ports/boost-vmd/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-vmd -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-preprocessor, boost-vcpkg-helpers Homepage: https://github.com/boostorg/vmd Description: Boost vmd module diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake index bba7e7d065a16f..eb7f809b691f59 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.74.0 - SHA512 28b03beba2c124b623f4eafb9e9901d8114488be67202b923ecfffd9e5225a85cadb56029fca34a5f225fa17d2603b7633299a4d968f5e95dbfd8ff372ece137 + REF boost-1.75.0 + SHA512 863365347baa8980e5aa9aaa2b13293167af6479eb93c0d6860634468578499662bc0cec7dbc7abc9f3f07df82341e18ab20e0de0d88c34a08adf6f949aef6a9 HEAD_REF master ) diff --git a/ports/boost-wave/CONTROL b/ports/boost-wave/CONTROL index d8d683b9e9171d..9cc3184268403b 100644 --- a/ports/boost-wave/CONTROL +++ b/ports/boost-wave/CONTROL @@ -1,7 +1,7 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-wave -Version: 1.74.0 -Build-Depends: boost-assert, boost-build, boost-concept-check, boost-config, boost-core, boost-detail, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-multi-index, boost-pool, boost-preprocessor, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers +Version: 1.75.0 +Build-Depends: boost-assert, boost-build, boost-concept-check, boost-config, boost-core, boost-detail, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-multi-index, boost-optional, boost-pool, boost-preprocessor, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers Homepage: https://github.com/boostorg/wave Description: Boost wave module Supports: !uwp diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake index 325fd0ffc09de2..91659c6ae0749d 100644 --- a/ports/boost-wave/portfile.cmake +++ b/ports/boost-wave/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/wave - REF boost-1.74.0 - SHA512 466127b7532508eaa791d2f363ea71ee1e8e54354577bff7da8c3a8c5dae16b2bace3268d7753b87244d447b04054d78d0c4bba4b5e9a8841a70b6a3045e62c7 + REF boost-1.75.0 + SHA512 16d26051a92b6902e9729473802027ff6f9f301593fff7ab72c1d6ad09325e876d2acaef766bfc82befbe7e720f8d5b3036c6254a3d63181dca1625fdbfb4b2f HEAD_REF master ) diff --git a/ports/boost-winapi/CONTROL b/ports/boost-winapi/CONTROL index ba62e109a5e352..2497d0eed539a9 100644 --- a/ports/boost-winapi/CONTROL +++ b/ports/boost-winapi/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-winapi -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-config, boost-predef, boost-vcpkg-helpers Homepage: https://github.com/boostorg/winapi Description: Boost winapi module diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake index f43b5a74f951bb..64104479ce14ff 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.74.0 - SHA512 650b860d622f2e0949f97801367ba1d321bacbda306dc18b4f30d0ff7dff1f33a270479116d72a52d094962b9ee7fea2d5715cb594d63603939ba566a3901b5e + REF boost-1.75.0 + SHA512 ae1cc764c2190e42f5b409fda214e6653a0b46cdb6ee4272406f6e416bf0ee8f497d4edfab45ccb52412ef1645a0a30c418e6b72e7004b3ea5421fc09bce06ce HEAD_REF master ) diff --git a/ports/boost-xpressive/CONTROL b/ports/boost-xpressive/CONTROL index 5a01b5e6e5ad51..d0c8cf93dd302b 100644 --- a/ports/boost-xpressive/CONTROL +++ b/ports/boost-xpressive/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-xpressive -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-exception, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers Homepage: https://github.com/boostorg/xpressive Description: Boost xpressive module diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake index 83e6aeb012ea9f..043f7b9ae8440a 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.74.0 - SHA512 a32d73e0310246954d970274303ba7b39c298ada106e144e86c91ad06a7e044c1c3a5d3555083c49b85f928057d9e9d1381c68f926fe5c888c2de7648a621aca + REF boost-1.75.0 + SHA512 09b06dc00fc7a7d0ec30454195a6ba437c45b9b3deb770b80735e726fbf808d24035fc65b6ac924043c7ba62423590ec06f54db54daa913c5127713593d7c326 HEAD_REF master ) diff --git a/ports/boost-yap/CONTROL b/ports/boost-yap/CONTROL index 76143a5c8d654d..c1fcf50f703535 100644 --- a/ports/boost-yap/CONTROL +++ b/ports/boost-yap/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-yap -Version: 1.74.0 +Version: 1.75.0 Build-Depends: boost-hana, boost-preprocessor, boost-type-index, boost-vcpkg-helpers Homepage: https://github.com/boostorg/yap Description: Boost yap module diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake index ed02bb3c08c223..54cb5d7c239b8e 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.74.0 - SHA512 a67d818ea09cf0d8b2cd98594685d0ff26a0add263bdb022c6968d616e258047ef627952a4a2e0ff2126a258afea603fc4e861ef3f559433f351403e608832b3 + REF boost-1.75.0 + SHA512 3680933d091a4b89094be7d123d5813d5f7e882e4fa4d2e233623a950a0d37ec750f3697e50e9f49bfe66191ca032ab412ce40c2f25d5870f52338d7a35cafbf HEAD_REF master ) diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index dcc502b65cea01..e26a30796d2312 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,10 +1,10 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost -Version: 1.74.0 +Version: 1.75.0 Port-Version: Homepage: https://boost.org Description: Peer-reviewed portable C++ source libraries -Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio (!emscripten), boost-assert, boost-assign, boost-atomic, boost-beast (!emscripten), boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-context (!uwp&!emscripten), boost-contract, boost-conversion, boost-convert, boost-core, boost-coroutine (!arm&!uwp&!emscripten), boost-coroutine2 (!emscripten), boost-crc, boost-date-time, boost-detail, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (!osx&!uwp&!arm&!emscripten), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-function-types, boost-functional, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-histogram, boost-hof, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lambda, boost-lexical-cast, boost-local-function, boost-locale (!uwp), boost-lockfree, boost-log (!uwp&!emscripten), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multi-array, boost-multi-index, boost-multiprecision, boost-nowide, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-optional, boost-outcome, boost-parameter, boost-parameter-python (!emscripten), boost-phoenix, boost-poly-collection, boost-polygon, boost-pool, boost-predef, boost-preprocessor, boost-process (!emscripten), boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (!uwp&!(arm&windows)&!emscripten), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-scope-exit, boost-serialization, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-static-string, boost-stl-interfaces, boost-system, boost-test (!uwp), boost-thread, boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-type-erasure, boost-type-index, boost-type-traits, boost-typeof, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-variant2, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap +Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio (!emscripten), boost-assert, boost-assign, boost-atomic, boost-beast (!emscripten), boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-context (!uwp&!emscripten), boost-contract, boost-conversion, boost-convert, boost-core, boost-coroutine (!arm&!uwp&!emscripten), boost-coroutine2 (!emscripten), boost-crc, boost-date-time, boost-detail, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (!osx&!uwp&!arm&!emscripten), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-function-types, boost-functional, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-histogram, boost-hof, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-json, boost-lambda, boost-leaf, boost-lexical-cast, boost-local-function, boost-locale (!uwp), boost-lockfree, boost-log (!uwp&!emscripten), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multi-array, boost-multi-index, boost-multiprecision, boost-nowide, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-optional, boost-outcome, boost-parameter, boost-parameter-python (!emscripten), boost-pfr, boost-phoenix, boost-poly-collection, boost-polygon, boost-pool, boost-predef, boost-preprocessor, boost-process (!emscripten), boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (!uwp&!(arm&windows)&!emscripten), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-scope-exit, boost-serialization, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-static-string, boost-stl-interfaces, boost-system, boost-test (!uwp), boost-thread, boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-type-erasure, boost-type-index, boost-type-traits, boost-typeof, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-variant2, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap Feature: mpi Description: Build with MPI support diff --git a/ports/telnetpp/CONTROL b/ports/telnetpp/CONTROL index 3118d13bccb6a8..f768eb84d6cd07 100644 --- a/ports/telnetpp/CONTROL +++ b/ports/telnetpp/CONTROL @@ -1,8 +1,8 @@ Source: telnetpp -Version: 2.0-4 +Version: 2.1.2 Homepage: https://github.com/KazDragon/telnetpp Description: Telnet++ is an implementation of the Telnet Session Layer protocol using C++14 -Build-Depends: boost-container, boost-signals2, boost-variant, gsl-lite, boost-exception +Build-Depends: boost-range, boost-container, boost-signals2, boost-variant, gsl-lite, boost-exception Default-Features: zlib Supports: !uwp diff --git a/ports/telnetpp/fix-build-error.patch b/ports/telnetpp/fix-build-error.patch deleted file mode 100644 index d72ced01e75274..00000000000000 --- a/ports/telnetpp/fix-build-error.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 09b4f9b..6f72c41 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,8 +22,8 @@ message("Building Telnet++ with zlib: ${TELNETPP_WITH_ZLIB}") - message("Building Telnet++ with code coverage: ${TELNETPP_COVERAGE}") - message("Building Telnet++ with sanitizers: ${TELNETPP_SANITIZE}") - --include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) --conan_basic_setup(TARGETS NO_OUTPUT_DIRS) -+find_package(gsl-lite REQUIRED) -+find_package(Boost REQUIRED COMPONENTS container) - - # The required C++ Standard for Telnet++ is C++14. - set(CMAKE_CXX_STANDARD 14) -@@ -154,18 +154,24 @@ add_library(telnetpp - ${TELNETPP_PRIVATE_INCLUDE_FILES} - ) - -+if (BUILD_SHARED_LIBS) -+ add_definitions(-Dtelnetpp_EXPORTS) -+else() -+ add_definitions(-DTELNETPP_STATIC_DEFINE) -+endif() -+ - target_link_libraries(telnetpp - PUBLIC -- CONAN_PKG::gsl-lite -- CONAN_PKG::boost_container -- CONAN_PKG::boost_signals2 -- CONAN_PKG::boost_variant -+ gsl::gsl-lite -+ Boost::boost -+ Boost::container - ) - - if (TELNETPP_WITH_ZLIB) -+ find_package(ZLIB REQUIRED) - target_link_libraries(telnetpp - PRIVATE -- CONAN_PKG::zlib -+ ZLIB::ZLIB - ) - endif() - -@@ -179,8 +185,7 @@ set_target_properties(telnetpp - target_include_directories(telnetpp - PUBLIC - $ -- $ -- "${Boost_INCLUDE_DIRS}" -+ $ - ) - - generate_export_header(telnetpp -@@ -197,17 +202,19 @@ install( - telnetpp - EXPORT - telnetpp-config -+ RUNTIME DESTINATION -+ bin - ARCHIVE DESTINATION -- lib/telnetpp-${TELNETPP_VERSION} -+ lib - LIBRARY DESTINATION -- lib/telnetpp-${TELNETPP_VERSION} -+ lib - ) - - install( - DIRECTORY - include/ - DESTINATION -- include/telnetpp-${TELNETPP_VERSION} -+ include - ) - - export( -@@ -221,7 +228,7 @@ install( - EXPORT - telnetpp-config - DESTINATION -- lib/telnetpp-${TELNETPP_VERSION} -+ share/telnetpp - ) - - include(CMakePackageConfigHelpers) -@@ -236,7 +243,7 @@ install( - FILES - "${CMAKE_CURRENT_BINARY_DIR}/telnetpp-config-version.cmake" - DESTINATION -- lib/telnetpp-${TELNETPP_VERSION} -+ share/telnetpp - ) - - if (TELNETPP_WITH_TESTS) -diff --git a/include/telnetpp/core.hpp b/include/telnetpp/core.hpp -index 2362fac..8710d36 100644 ---- a/include/telnetpp/core.hpp -+++ b/include/telnetpp/core.hpp -@@ -1,7 +1,7 @@ - #pragma once - - #include "telnetpp/detail/export.hpp" --#include -+#include - #include - #include - -diff --git a/src/options/msdp/detail/decoder.cpp b/src/options/msdp/detail/decoder.cpp -index c0b7906..e725693 100644 ---- a/src/options/msdp/detail/decoder.cpp -+++ b/src/options/msdp/detail/decoder.cpp -@@ -1,5 +1,6 @@ - #include "telnetpp/options/msdp/detail/decoder.hpp" - #include "telnetpp/options/msdp/detail/protocol.hpp" -+#include - #include - #include - diff --git a/ports/telnetpp/fix-install-paths.patch b/ports/telnetpp/fix-install-paths.patch new file mode 100644 index 00000000000000..5e2bdd55022e2c --- /dev/null +++ b/ports/telnetpp/fix-install-paths.patch @@ -0,0 +1,48 @@ + CMakeLists.txt | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 09722a9..7bf9952 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -277,18 +277,18 @@ install( + EXPORT + telnetpp-config + ARCHIVE DESTINATION +- lib/telnetpp-${TELNETPP_VERSION} ++ lib + RUNTIME DESTINATION +- lib/telnetpp-${TELNETPP_VERSION} ++ bin + LIBRARY DESTINATION +- lib/telnetpp-${TELNETPP_VERSION} ++ lib + ) + + install( + DIRECTORY + include/ + DESTINATION +- include/telnetpp-${TELNETPP_VERSION} ++ include + ) + + export( +@@ -302,7 +302,7 @@ install( + EXPORT + telnetpp-config + DESTINATION +- lib/telnetpp-${TELNETPP_VERSION} ++ share/telnetpp + ) + + include(CMakePackageConfigHelpers) +@@ -317,7 +317,7 @@ install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/telnetpp-config-version.cmake" + DESTINATION +- lib/telnetpp-${TELNETPP_VERSION} ++ share/telnetpp + ) + + if (TELNETPP_WITH_TESTS) diff --git a/ports/telnetpp/github-215.patch b/ports/telnetpp/github-215.patch deleted file mode 100644 index 57461b9a7a6367..00000000000000 --- a/ports/telnetpp/github-215.patch +++ /dev/null @@ -1,47 +0,0 @@ - ---- - include/telnetpp/options/msdp/variable.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/telnetpp/options/msdp/variable.hpp b/include/telnetpp/options/msdp/variable.hpp -index 16dae0c..d74a6da 100644 ---- a/include/telnetpp/options/msdp/variable.hpp -+++ b/include/telnetpp/options/msdp/variable.hpp -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - - namespace telnetpp { namespace options { namespace msdp { - - - ---- - include/telnetpp/options/msdp/variable.hpp | 1 - - src/options/msdp/variable.cpp | 1 + - 2 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/telnetpp/options/msdp/variable.hpp b/include/telnetpp/options/msdp/variable.hpp -index d74a6da..16dae0c 100644 ---- a/include/telnetpp/options/msdp/variable.hpp -+++ b/include/telnetpp/options/msdp/variable.hpp -@@ -5,7 +5,6 @@ - #include - #include - #include --#include - - namespace telnetpp { namespace options { namespace msdp { - -diff --git a/src/options/msdp/variable.cpp b/src/options/msdp/variable.cpp -index dc779ea..82549e9 100644 ---- a/src/options/msdp/variable.cpp -+++ b/src/options/msdp/variable.cpp -@@ -1,5 +1,6 @@ - #include "telnetpp/options/msdp/variable.hpp" - #include "telnetpp/detail/lambda_visitor.hpp" -+#include - - namespace telnetpp { namespace options { namespace msdp { - diff --git a/ports/telnetpp/portfile.cmake b/ports/telnetpp/portfile.cmake index 26154cf33cdfa5..f4a196144ecd0c 100644 --- a/ports/telnetpp/portfile.cmake +++ b/ports/telnetpp/portfile.cmake @@ -1,16 +1,10 @@ -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) - message(FATAL_ERROR "${PORT} does not currently support UWP") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KazDragon/telnetpp - REF 8dc780579293153ad2ae9ad6943815c050d4c659 - SHA512 280a8e6c0392f5822b05968520d176d1510f00c12a2502f6039f4f1f78a558e61f825a231fb70b7de6fd21a18b24734eea3ba36a24b29f2a7e9856b1f4de5217 + REF f370ebd0c0dc6505708065ee5afdc59a6de54387 # v2.1.2 + MSVC patches + SHA512 c58cb9159a8fb6c4b089a0212a995f70f08b93877d98828aa263e9f065f42a932d98749b56741d9e711c0805dcc2dcf0607dc86b0553c4e34bd3fad99e0bf157 HEAD_REF master - PATCHES - fix-build-error.patch - github-215.patch + PATCHES fix-install-paths.patch ) set(USE_ZLIB OFF) diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index b6cbdc98d8e06d..afa7d64da8758e 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()] param ( $libraries = @(), - $version = "1.74.0", + $version = "1.75.0", $portsDir = $null ) @@ -25,7 +25,6 @@ else # Optionally clear this array when moving to a new boost version $port_versions = @{ #e.g. "asio" = 1; - "locale" = 3; } $per_port_data = @{ @@ -312,7 +311,7 @@ foreach ($library in $libraries) if ($_ -match "aligned_storage") { "type_traits" } elseif ($_ -match "noncopyable|ref|swap|get_pointer|checked_delete|visit_each") { "core" } elseif ($_ -eq "type") { "core" } - elseif ($_ -eq "concept") { "concept_check" } + elseif ($_ -match "concept|concept_archetype") { "concept_check" } elseif ($_ -match "unordered_") { "unordered" } elseif ($_ -match "cstdint|integer_fwd|integer_traits") { "integer" } elseif ($_ -match "call_traits|operators|current_function|cstdlib|next_prior|compressed_pair") { "utility" } @@ -332,7 +331,7 @@ foreach ($library in $libraries) elseif ($_ -match "polymorphic_cast|implicit_cast") { "conversion" } elseif ($_ -eq "nondet_random") { "random" } elseif ($_ -eq "memory_order") { "atomic" } - elseif ($_ -match "blank|blank_fwd|numeric_traits") { "detail" } + elseif ($_ -match "blank|blank_fwd|numeric_traits|fenv") { "detail" } elseif ($_ -match "is_placeholder|mem_fn") { "bind" } elseif ($_ -eq "exception_ptr") { "exception" } elseif ($_ -match "multi_index_container|multi_index_container_fwd") { "multi_index" } @@ -373,7 +372,7 @@ foreach ($library in $libraries) -and ` (($library -notmatch "throw_exception") -or ($_ -notmatch "^exception"))` -and ` - (($library -notmatch "iostreams") -or ($_ -notmatch "random"))` + (($library -notmatch "iostreams|math") -or ($_ -notmatch "random"))` -and ` (($library -notmatch "utility|concept_check") -or ($_ -notmatch "iterator")) } | % { $_ -replace "_","-" } | % { diff --git a/scripts/boost/post-source-stubs/atomic.cmake b/scripts/boost/post-source-stubs/atomic.cmake new file mode 100644 index 00000000000000..0715d20f709a46 --- /dev/null +++ b/scripts/boost/post-source-stubs/atomic.cmake @@ -0,0 +1,8 @@ +file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) +string(REPLACE + "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}/build/config") + diff --git a/scripts/boost/post-source-stubs/log.cmake b/scripts/boost/post-source-stubs/log.cmake index 78500ddc319c60..be17a0419c3ed1 100644 --- a/scripts/boost/post-source-stubs/log.cmake +++ b/scripts/boost/post-source-stubs/log.cmake @@ -4,10 +4,10 @@ string(REPLACE " @select-arch-specific-sources" "#@sel file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") -file(READ ${SOURCE_PATH}/build/log-architecture.jam _contents) +file(READ ${SOURCE_PATH}/build/log-arch-config.jam _contents) string(REPLACE - "\nproject.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ] ;" - "\nproject.load [ path.join [ path.make $(here:D) ] config/checks/architecture ] ;" + "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-architecture.jam "${_contents}") +file(WRITE ${SOURCE_PATH}/build/log-arch-config.jam "${_contents}") diff --git a/scripts/boost/post-source-stubs/nowide.cmake b/scripts/boost/post-source-stubs/nowide.cmake index 4005c3a80cec37..a523422597e271 100644 --- a/scripts/boost/post-source-stubs/nowide.cmake +++ b/scripts/boost/post-source-stubs/nowide.cmake @@ -1,11 +1,7 @@ file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) - string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}") - -string(REPLACE "check-target-builds cxx11_moveable_fstreams" "check-target-builds ../check_movable_fstreams.cpp" _contents "${_contents}") -string(REPLACE "check-target-builds lfs_support" "check-target-builds ../check_lfs_support.cpp" _contents "${_contents}") - +string(REPLACE "check-target-builds ../config//cxx11_moveable_fstreams" "check-target-builds ../check_movable_fstreams.cpp" _contents "${_contents}") +string(REPLACE "check-target-builds ../config//lfs_support" "check-target-builds ../check_lfs_support.cpp" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") - -file(COPY "${SOURCE_PATH}/test/check_lfs_support.cpp" "${SOURCE_PATH}/test/check_movable_fstreams.cpp" DESTINATION "${SOURCE_PATH}/build/config") +file(COPY "${SOURCE_PATH}/config/check_lfs_support.cpp" "${SOURCE_PATH}/config/check_movable_fstreams.cpp" DESTINATION "${SOURCE_PATH}/build/config") diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d8c655e1b506cb..3d16487a491cfd 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1450,6 +1450,8 @@ stormlib:arm-uwp=fail stormlib:x64-uwp=fail stxxl:arm-uwp=fail stxxl:x64-uwp=fail +symengine:arm64-windows=fail +symengine:arm-uwp=fail systemc:arm64-windows=fail systemc:arm-uwp=fail systemc:x64-uwp=fail From 40b5fc08d342fb04e3a01b7a0922291054d40cc6 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 23 Dec 2020 21:27:23 -0800 Subject: [PATCH 0356/1694] Update MacOS Software (#15258) --- .../osx/Get-InternalBaseBox.ps1 | 11 +++++- .../osx/Install-Prerequisites.ps1 | 2 +- scripts/azure-pipelines/osx/README.md | 37 ++++--------------- .../osx/Setup-VagrantMachines.ps1 | 25 ------------- .../osx/configuration/Vagrantfile | 27 ++++---------- .../osx/configuration/installables.json | 12 +++--- .../vagrant-configuration.schema.json | 16 +------- 7 files changed, 32 insertions(+), 98 deletions(-) diff --git a/scripts/azure-pipelines/osx/Get-InternalBaseBox.ps1 b/scripts/azure-pipelines/osx/Get-InternalBaseBox.ps1 index 2660ba9e11063d..5264d2ecb566c3 100755 --- a/scripts/azure-pipelines/osx/Get-InternalBaseBox.ps1 +++ b/scripts/azure-pipelines/osx/Get-InternalBaseBox.ps1 @@ -40,7 +40,15 @@ sshfs "fileshare@${FileshareMachine}:/Users/fileshare/share" $mountPoint if ($LASTEXITCODE -eq 1) { Write-Error 'sshfs returned 1. This means that the osxfuse kernel extension was not allowed to load. -Please open System Preferences > Security & Privacy > General, +You may need to force un/reinstall osxfuse and/or sshfs with + brew uninstall osxfuse + brew uninstall sshfs + brew install osxfuse + brew install sshfs +Then, rerun this script. + +If you''ve already done that, Please open +System Preferences > Security & Privacy > General, and allow the kernel extension to load. Then, rerun this script. @@ -58,4 +66,3 @@ if (-not [String]::IsNullOrEmpty($BoxVersion)) { } vagrant box add "$mountPoint/vcpkg-boxes/macos-ci.json" @versionArgs - diff --git a/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 b/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 index 54636757484f81..cb82f83b0d6227 100755 --- a/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 +++ b/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 @@ -60,7 +60,7 @@ $Installables.Brew | ForEach-Object { brew install $installable.Name } else { switch ($installable.Kind) { - 'cask' { brew cask install $installable.Name } + 'cask' { brew install --cask $installable.Name } default { Write-Error "Invalid kind: $_. Expected either empty, or 'cask'." } diff --git a/scripts/azure-pipelines/osx/README.md b/scripts/azure-pipelines/osx/README.md index 111b17f8662b61..ec88b09c753eb9 100644 --- a/scripts/azure-pipelines/osx/README.md +++ b/scripts/azure-pipelines/osx/README.md @@ -48,15 +48,17 @@ Next, install prerequisites and grab the current base box with: ```sh $ cd vcpkg/scripts/azure-pipelines/osx $ ./Install-Prerequisites.ps1 -Force -$ ./Get-InternalBaseBox.ps1 -FileshareMachine vcpkgmm-01.guest.corp.microsoft.com +$ ./Get-InternalBaseBox.ps1 -FileshareMachine vcpkgmm-01.guest.corp.microsoft.com -BoxVersion 2020-09-28 ``` -Getting the base box will fail due to missing kernel modules for sshfs and VirtualBox. Log in to the -machine, open System Preferences > Security & Privacy > General, and allow the kernel extensions for -VirtualBox and sshfs to load. Then, again: +... where -BoxVersion is the version you want to use. + +Getting the base box will fail due to missing kernel modules for osxfuse, sshfs, and/or VirtualBox. +Log in to the machine, open System Preferences > Security & Privacy > General, and allow the kernel +extensions for VirtualBox and sshfs to load. Then, again: ```sh -$ ./Get-InternalBaseBox.ps1 -FileshareMachine vcpkgmm-01.guest.corp.microsoft.com +$ ./Get-InternalBaseBox.ps1 -FileshareMachine vcpkgmm-01.guest.corp.microsoft.com -BoxVersion 2020-09-28 ``` Replace `XX` with the number of @@ -68,8 +70,7 @@ for the physical machine; i.e., vcpkgmm-04 would use 04. $ ./Setup-VagrantMachines.ps1 \ -MachineId XX \ -DevopsPat '' \ - -Date \ - -ArchivesMachine 'vcpkgmm-01.guest.corp.microsoft.com' + -Date $ cd ~/vagrant/vcpkg-eg-mac $ vagrant up ``` @@ -137,31 +138,9 @@ $ vagrant ssh -c 'sudo installer -pkg "/Volumes/setup-installer/Command Line Too $ vagrant ssh -c 'hdiutil detach /Volumes/setup-installer' $ vagrant ssh -c 'rm clt.dmg' $ vagrant ssh -c '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"' -$ vagrant ssh -c 'ssh-keygen -t rsa -b 4096 -c "Fileshare Key: " -N "" -f "~/.ssh/id_rsa"' -$ vagrant ssh -c 'cat ~/.ssh/id_rsa.pub' -$ vagrant ssh -c 'brew cask install osxfuse && brew install sshfs' $ vagrant reload ``` -After this, you should add the printed ssh public key to the archives share's `.ssh/authorized_keys` file. -Then, we also now need to make sure that osxfuse is set up correctly; -macOS requires the user to accept that this signed binary is "okay to be loaded" by the kernel. -We can get `sshfs` to try to start the `osxfuse` kernel module by attempting to start it: - -```sh -$ vagrant ssh -c 'mkdir testmnt && sshfs :/Users/fileshare/share testmnt' -``` - -Then, you'll need to open the VM in VirtualBox, go to System Preferences, -go to Security & Privacy, General, unlock the settings, -and allow system extensions from the osxfuse developer to run. - -Then, retry the above, and see if it works: - -```sh -$ vagrant ssh -c 'sshfs :/Users/fileshare/share testmnt' -``` - if that works, you can now package the box: ```sh diff --git a/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 b/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 index d29ef599b3d228..4e675660cb11b3 100755 --- a/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 +++ b/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 @@ -28,16 +28,6 @@ The agent pool to add the machine to. If -Date is passed, uses "PrOsx-$Date" as .PARAMETER DevopsUrl The URL of the ADO instance; defaults to vcpkg's, which is https://dev.azure.com/vcpkg. -.PARAMETER ArchivesMachine -The machine where the archives are located; a URN. - -.PARAMETER ArchivesPath -The path to where the archives are located on the machine. If -Date is passed, -uses "/Users/${ArchivesUsername}/share/archives/${Date}". - -.PARAMETER ArchivesUsername -The user to log in to on the archives machine. Defaults to 'fileshare'. - .PARAMETER BaseName The base name for the vagrant VM; the machine name is $BaseName-$MachineId. Defaults to 'vcpkg-eg-mac'. @@ -78,15 +68,6 @@ Param( [Parameter(Mandatory=$False)] [String]$DevopsUrl = 'https://dev.azure.com/vcpkg', - [Parameter(Mandatory=$True)] - [String]$ArchivesMachine, - - [Parameter(Mandatory=$True, ParameterSetName='DefineVersionAndAgentPool')] - [String]$ArchivesPath, - - [Parameter(Mandatory=$False)] - [String]$ArchivesUsername = 'archivesshare', - [Parameter()] [String]$BaseName = 'vcpkg-eg-mac', @@ -109,7 +90,6 @@ if (-not $IsMacOS) { if (-not [String]::IsNullOrEmpty($Date)) { $BoxVersion = $Date $AgentPool = "PrOsx-$Date" - $ArchivesPath = "/Users/${ArchivesUsername}/share/archives/${Date}" } if (Test-Path '~/vagrant/vcpkg-eg-mac') { @@ -139,11 +119,6 @@ $configuration = @{ box_name = $BoxName; box_version = $BoxVersion; disk_size = $DiskSize; - archives = @{ - username = $ArchivesUsername; - urn = $ArchivesMachine; - path = $ArchivesPath; - }; } ConvertTo-Json -InputObject $configuration -Depth 5 ` | Set-Content -Path '~/vagrant/vcpkg-eg-mac/vagrant-configuration.json' diff --git a/scripts/azure-pipelines/osx/configuration/Vagrantfile b/scripts/azure-pipelines/osx/configuration/Vagrantfile index c08703777b63be..f5ff39ff394af4 100644 --- a/scripts/azure-pipelines/osx/configuration/Vagrantfile +++ b/scripts/azure-pipelines/osx/configuration/Vagrantfile @@ -18,23 +18,22 @@ brew_formulas = [ 'autoconf', 'automake', 'bison', + 'gfortran', + 'gperf', 'libtool', + 'meson', 'mono', + 'nasm', 'pkg-config', 'yasm' ] brew_cask_formulas = [ - 'powershell', - 'gfortran' ] + 'powershell' ] -azure_agent_url = 'https://vstsagentpackage.azureedge.net/agent/2.171.1/vsts-agent-osx-x64-2.171.1.tar.gz' +azure_agent_url = 'https://vstsagentpackage.azureedge.net/agent/2.179.0/vsts-agent-osx-x64-2.179.0.tar.gz' devops_url = configuration['devops_url'] agent_pool = configuration['agent_pool'] pat = configuration['pat'] -archives = configuration['archives'] -archives_username = archives['username'] -archives_urn = archives['urn'] -archives_path = archives['path'] Vagrant.configure('2') do |config| # give them extra time to boot up @@ -92,19 +91,7 @@ Vagrant.configure('2') do |config| config.vm.provision 'shell', run: 'once', name: 'Install brew applications', - inline: "brew install #{brew_formulas.join(' ')} && brew cask install #{brew_cask_formulas.join(' ')}", - privileged: false - - config.vm.provision 'shell', - run: 'once', - name: 'Create archives mountpoint', - inline: 'mkdir ~/Data/archives', - privileged: false - - config.vm.provision "shell", - run: 'once', - name: 'Mount archives directory', - inline: "sshfs #{archives_username}@#{archives_urn}:#{archives_path} ~/Data/archives", + inline: "brew install #{brew_formulas.join(' ')} && brew install --cask #{brew_cask_formulas.join(' ')}", privileged: false config.vm.provision 'shell', diff --git a/scripts/azure-pipelines/osx/configuration/installables.json b/scripts/azure-pipelines/osx/configuration/installables.json index 28e24e6a3a4eef..7a7ba400c36d8c 100644 --- a/scripts/azure-pipelines/osx/configuration/installables.json +++ b/scripts/azure-pipelines/osx/configuration/installables.json @@ -5,15 +5,15 @@ { "Name": "VirtualBox", "TestCommand": "VBoxManage", - "DmgUrl": "https://download.virtualbox.org/virtualbox/6.1.10/VirtualBox-6.1.10-138449-OSX.dmg", - "Sha256": "EF0CA4924922514B6AD71469998821F2CF7C596B4B8B59736C3699759E0F1DF8", + "DmgUrl": "https://download.virtualbox.org/virtualbox/6.1.16/VirtualBox-6.1.16-140961-OSX.dmg", + "Sha256": "D7DF0F05D9A9E7CBA50EA01DA264AC20948B1C9C0E0CCCD2D628085C9F434D45", "InstallerPath": "VirtualBox.pkg" }, { "Name": "vagrant", "TestCommand": "vagrant", - "DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.dmg", - "Sha256": "529CDE2A78E6DF38EC906B65C70B36A087E2601EAB42E25856E35B20CCB027C0", + "DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.14/vagrant_2.2.14_x86_64.dmg", + "Sha256": "76B849B26E6D6187A7829212B05545D3B424E05F1BCD0F7163DA1E5117084FA6", "InstallerPath": "vagrant.pkg" } ], @@ -30,8 +30,8 @@ { "Name": "Extension Pack", "FullName": "Oracle VM VirtualBox Extension Pack", - "Url": "https://download.virtualbox.org/virtualbox/6.1.10/Oracle_VM_VirtualBox_Extension_Pack-6.1.10.vbox-extpack", - "Sha256": "03067F27F4DA07C5D0FDAFC56D27E3EA23A60682B333B2A1010FB74EF9A40C28" + "Url": "https://download.virtualbox.org/virtualbox/6.1.16/Oracle_VM_VirtualBox_Extension_Pack-6.1.16.vbox-extpack", + "Sha256": "9802482B77B95A954CB5111793DA10D009009A4E9A9C4EAA4BD1AE5DAFE9DB46" } ] } diff --git a/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json b/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json index 0b1ed2f32aa07a..3d6b619e8cda51 100644 --- a/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json +++ b/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json @@ -7,8 +7,7 @@ "pat", "base_name", "disk_size", - "machine_identifiers", - "archives" + "machine_identifiers" ], "properties": { @@ -32,19 +31,6 @@ }, "disk_size": { "type": "integer" - }, - "archives": { - "type": "object", - "required": [ - "username", - "urn", - "path" - ], - "properties": { - "username": { "type": "string" }, - "urn": { "type": "string" }, - "path": { "type": "string" } - } } } } From 1f16fd50a2fee3ba096b8fb40ae664e56ec980c8 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 25 Dec 2020 15:56:33 +0800 Subject: [PATCH 0357/1694] [minimp3] update to 2020-11-27 (#15295) --- ports/minimp3/CONTROL | 2 +- ports/minimp3/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/minimp3/CONTROL b/ports/minimp3/CONTROL index dda4558e657384..1d26ffdaa472b9 100644 --- a/ports/minimp3/CONTROL +++ b/ports/minimp3/CONTROL @@ -1,4 +1,4 @@ Source: minimp3 -Version: 2019-07-24-1 +Version: 2020-12-25 Homepage: https://github.com/lieff/minimp3 Description: Minimalistic, single-header library for decoding MP3. minimp3 is designed to be small, fast (with SSE and NEON support), and accurate (ISO conformant). \ No newline at end of file diff --git a/ports/minimp3/portfile.cmake b/ports/minimp3/portfile.cmake index 75320ef58adf01..08ef0703292522 100644 --- a/ports/minimp3/portfile.cmake +++ b/ports/minimp3/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lieff/minimp3 - REF 977514a6dfc4960d819a103f43b358e58ac6c28f #committed on Jul 24 - SHA512 9120cbd84a737e93d0c8d6d53a1b9b7af1fb4387b7b0756abbf9e0f41164a26a731e1e75ff6d02052c785357cdf8465ee92f04b6e9704f830086c3cf6808d2b8 + REF 95864e8e0d3b34402a49ae9af6c66f7e98c13c35 #committed on Nov 27 + SHA512 6e5364a83e882b54fd1eb5ba35ec7c7179b5b5c0ceb2c658615a2306ae0c28252ca8591ec6b515483c6ff0ed608db7eb73fba3d201a20ad4a85ce7b3a091a695 HEAD_REF master ) From 27a10c81088277966a2b323e24a20c9cc53dc011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 26 Dec 2020 12:45:14 -0800 Subject: [PATCH 0358/1694] [imgui] Fix find dependencies (#15063) --- ports/imgui/CMakeLists.txt | 241 ++++++++++++++++-------------- ports/imgui/CONTROL | 2 +- ports/imgui/imgui-config.cmake.in | 43 ++++++ ports/imgui/portfile.cmake | 1 + 4 files changed, 171 insertions(+), 116 deletions(-) create mode 100644 ports/imgui/imgui-config.cmake.in diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index e8d57c21cdae82..be8a9033f3bff8 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -6,135 +6,141 @@ set(CMAKE_DEBUG_POSTFIX d) add_library(${PROJECT_NAME} "") add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) target_include_directories( - ${PROJECT_NAME} - PUBLIC - $ - $ + ${PROJECT_NAME} + PUBLIC + $ + $ ) target_sources( - ${PROJECT_NAME} - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/imgui.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/imgui_demo.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/imgui_draw.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/imgui_widgets.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/misc/cpp/imgui_stdlib.cpp + ${PROJECT_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/imgui.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imgui_demo.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imgui_draw.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imgui_widgets.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/misc/cpp/imgui_stdlib.cpp ) if(IMGUI_USE_WCHAR32) - FILE(READ ${CMAKE_CURRENT_SOURCE_DIR}/imconfig.h IMCONFIG) - STRING(REGEX REPLACE "//#define IMGUI_USE_WCHAR32" "#define IMGUI_USE_WCHAR32" IMCONFIG "${IMCONFIG}") - FILE(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/imconfig.h "${IMCONFIG}") + FILE(READ ${CMAKE_CURRENT_SOURCE_DIR}/imconfig.h IMCONFIG) + STRING(REGEX REPLACE "//#define IMGUI_USE_WCHAR32" "#define IMGUI_USE_WCHAR32" IMCONFIG "${IMCONFIG}") + FILE(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/imconfig.h "${IMCONFIG}") endif() if(IMGUI_BUILD_ALLEGRO5_BINDING) - find_path(ALLEGRO5_INCLUDE_DIRS allegro5/allegro.h) - target_include_directories(${PROJECT_NAME} PRIVATE ${ALLEGRO5_INCLUDE_DIRS}) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_allegro5.cpp) + find_path(ALLEGRO5_INCLUDE_DIRS allegro5/allegro.h) + target_include_directories(${PROJECT_NAME} PRIVATE ${ALLEGRO5_INCLUDE_DIRS}) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_allegro5.cpp) endif() if(IMGUI_BUILD_DX9_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx9.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx9.cpp) endif() if(IMGUI_BUILD_DX10_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx10.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx10.cpp) endif() if(IMGUI_BUILD_DX11_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx11.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx11.cpp) endif() if(IMGUI_BUILD_DX12_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx12.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx12.cpp) endif() if(IMGUI_BUILD_GLFW_BINDING) - find_package(glfw3 REQUIRED) - get_target_property(GLFW3_INCLUDE_DIRS glfw INTERFACE_INCLUDE_DIRECTORIES) - target_include_directories(${PROJECT_NAME} PRIVATE ${GLFW3_INCLUDE_DIRS}) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_glfw.cpp) + find_package(glfw3 CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC glfw) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_glfw.cpp) endif() if(IMGUI_BUILD_GLUT_BINDING) - find_path(GLUT_INCLUDE_DIRS GL/freeglut.h) - target_include_directories(${PROJECT_NAME} PRIVATE ${GLUT_INCLUDE_DIRS}) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_glut.cpp) + find_package(GLUT REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC GLUT::GLUT) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_glut.cpp) endif() if(IMGUI_BUILD_METAL_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_metal.mm) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_metal.mm) endif() if(IMGUI_BUILD_OPENGL2_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl2.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl2.cpp) endif() if(IMGUI_BUILD_OPENGL3_GLEW_BINDING) - find_package(glew REQUIRED) - target_include_directories(${PROJECT_NAME} PRIVATE ${GLEW_INCLUDE_DIRS}) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.cpp) + find_package(GLEW REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC GLEW::GLEW) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.cpp) endif() if(IMGUI_BUILD_OPENGL3_GLAD_BINDING) - find_package(glad REQUIRED) - get_target_property(GLAD_INCLUDE_DIRS glad::glad INTERFACE_INCLUDE_DIRECTORIES) - target_include_directories(${PROJECT_NAME} PRIVATE ${GLAD_INCLUDE_DIRS}) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.cpp) + find_package(glad CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC glad::glad) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.cpp) endif() if(IMGUI_BUILD_OPENGL3_GL3W_BINDING) - find_package(gl3w REQUIRED) - get_target_property(GL3W_INCLUDE_DIRS unofficial::gl3w::gl3w INTERFACE_INCLUDE_DIRECTORIES) - target_include_directories(${PROJECT_NAME} PRIVATE ${GL3W_INCLUDE_DIRS}) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.cpp) + find_package(gl3w CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC unofficial::gl3w::gl3w) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.cpp) endif() if(IMGUI_BUILD_OPENGL3_GLBINDING_BINDING) - find_package(glbinding REQUIRED) - get_target_property(GLBINDING_INCLUDE_DIRS glbinding::glbinding INTERFACE_INCLUDE_DIRECTORIES) - target_include_directories(${PROJECT_NAME} PRIVATE ${GLBINDING_INCLUDE_DIRS}) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.cpp) + find_package(glbinding CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC glbinding::glbinding) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.cpp) endif() if(IMGUI_BUILD_OSX_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_osx.mm) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_osx.mm) endif() if(IMGUI_BUILD_SDL2_BINDING) - find_package(SDL2 CONFIG REQUIRED) - find_path(SDL2_INCLUDE_DIRS SDL2/SDL.h) - target_include_directories(${PROJECT_NAME} PRIVATE ${SDL2_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS}/SDL2) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_sdl.cpp) + find_package(SDL2 CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC SDL2::SDL2) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_sdl.cpp) endif() if(IMGUI_BUILD_VULKAN_BINDING) find_package(Vulkan REQUIRED) - get_target_property(VULKAN_INCLUDE_DIRS Vulkan::Vulkan INTERFACE_INCLUDE_DIRECTORIES) - target_include_directories(${PROJECT_NAME} PRIVATE ${VULKAN_INCLUDE_DIRS}) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_vulkan.cpp) + target_link_libraries(${PROJECT_NAME} PUBLIC Vulkan::Vulkan) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_vulkan.cpp) endif() if(IMGUI_BUILD_WIN32_BINDING) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_win32.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_win32.cpp) endif() if(IMGUI_FREETYPE) - find_package(Freetype REQUIRED) - target_include_directories(${PROJECT_NAME} PRIVATE ${FREETYPE_INCLUDE_DIRS}) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.cpp) + find_package(freetype CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC freetype) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.cpp) endif() +list(REMOVE_DUPLICATES BINDINGS_SOURCES) + install( - TARGETS ${PROJECT_NAME} - EXPORT ${PROJECT_NAME}_target - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin + TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}_target + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin ) +foreach(BINDING_TARGET ${BINDING_TARGETS}) + install( + TARGETS ${BINDING_TARGET} + EXPORT ${PROJECT_NAME}_target + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin + ) +endforeach() + if(NOT IMGUI_SKIP_HEADERS) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/imgui.h @@ -147,75 +153,80 @@ if(NOT IMGUI_SKIP_HEADERS) DESTINATION include ) - if(IMGUI_BUILD_ALLEGRO5_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_allegro5.h DESTINATION include) - endif() + if(IMGUI_BUILD_ALLEGRO5_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_allegro5.h DESTINATION include) + endif() - if(IMGUI_BUILD_DX9_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx9.h DESTINATION include) - endif() + if(IMGUI_BUILD_DX9_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx9.h DESTINATION include) + endif() - if(IMGUI_BUILD_DX10_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx10.h DESTINATION include) - endif() + if(IMGUI_BUILD_DX10_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx10.h DESTINATION include) + endif() - if(IMGUI_BUILD_DX11_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx11.h DESTINATION include) - endif() + if(IMGUI_BUILD_DX11_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx11.h DESTINATION include) + endif() - if(IMGUI_BUILD_DX12_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx12.h DESTINATION include) - endif() + if(IMGUI_BUILD_DX12_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_dx12.h DESTINATION include) + endif() - if(IMGUI_BUILD_GLFW_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_glfw.h DESTINATION include) - endif() + if(IMGUI_BUILD_GLFW_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_glfw.h DESTINATION include) + endif() - if(IMGUI_BUILD_GLUT_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_glut.h DESTINATION include) - endif() + if(IMGUI_BUILD_GLUT_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_glut.h DESTINATION include) + endif() - if(IMGUI_COPY_MARMALADE_BINDING) - file(GLOB MARMALADE_BINDING_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_marmalade.*) - install(FILES ${MARMALADE_BINDING_SRCS} DESTINATION include/bindings) - endif() + if(IMGUI_COPY_MARMALADE_BINDING) + file(GLOB MARMALADE_BINDING_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_marmalade.*) + install(FILES ${MARMALADE_BINDING_SRCS} DESTINATION include/bindings) + endif() - if(IMGUI_BUILD_METAL_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_metal.h DESTINATION include) - endif() + if(IMGUI_BUILD_METAL_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_metal.h DESTINATION include) + endif() - if(IMGUI_BUILD_OPENGL2_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl2.h DESTINATION include) - endif() + if(IMGUI_BUILD_OPENGL2_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl2.h DESTINATION include) + endif() - if(IMGUI_BUILD_OPENGL3_GLEW_BINDING OR IMGUI_BUILD_OPENGL3_GLAD_BINDING OR IMGUI_BUILD_OPENGL3_GL3W_BINDING OR IMGUI_BUILD_OPENGL3_GLBINDING_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.h DESTINATION include) - endif() + if(IMGUI_BUILD_OPENGL3_GLEW_BINDING OR IMGUI_BUILD_OPENGL3_GLAD_BINDING OR IMGUI_BUILD_OPENGL3_GL3W_BINDING OR IMGUI_BUILD_OPENGL3_GLBINDING_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_opengl3.h DESTINATION include) + endif() - if(IMGUI_BUILD_OSX_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_osx.h DESTINATION include) - endif() + if(IMGUI_BUILD_OSX_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_osx.h DESTINATION include) + endif() - if(IMGUI_BUILD_SDL2_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_sdl.h DESTINATION include) - endif() + if(IMGUI_BUILD_SDL2_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_sdl.h DESTINATION include) + endif() - if(IMGUI_BUILD_VULKAN_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_vulkan.h DESTINATION include) - endif() + if(IMGUI_BUILD_VULKAN_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_vulkan.h DESTINATION include) + endif() - if(IMGUI_BUILD_WIN32_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_win32.h DESTINATION include) - endif() + if(IMGUI_BUILD_WIN32_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_win32.h DESTINATION include) + endif() - if(IMGUI_FREETYPE) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.h DESTINATION include) - endif() + if(IMGUI_FREETYPE) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.h DESTINATION include) + endif() endif() +include(CMakePackageConfigHelpers) +configure_package_config_file(imgui-config.cmake.in imgui-config.cmake INSTALL_DESTINATION share/imgui) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/imgui-config.cmake DESTINATION share/imgui) + install( - EXPORT ${PROJECT_NAME}_target - NAMESPACE ${PROJECT_NAME}:: - FILE ${PROJECT_NAME}-config.cmake - DESTINATION share/${PROJECT_NAME} + EXPORT ${PROJECT_NAME}_target + NAMESPACE ${PROJECT_NAME}:: + FILE ${PROJECT_NAME}-targets.cmake + DESTINATION share/${PROJECT_NAME} ) diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL index 949951acd12362..5045a248354255 100644 --- a/ports/imgui/CONTROL +++ b/ports/imgui/CONTROL @@ -1,6 +1,6 @@ Source: imgui Version: 1.79 -Port-Version: 3 +Port-Version: 4 Homepage: https://github.com/ocornut/imgui Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies. diff --git a/ports/imgui/imgui-config.cmake.in b/ports/imgui/imgui-config.cmake.in new file mode 100644 index 00000000000000..7f34ec9c4150db --- /dev/null +++ b/ports/imgui/imgui-config.cmake.in @@ -0,0 +1,43 @@ +cmake_policy(SET CMP0012 NEW) + +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) + +if (@IMGUI_BUILD_GLFW_BINDING@) + find_dependency(glfw3 CONFIG) +endif() + +if (@IMGUI_BUILD_OPENGL3_GLEW_BINDING@) + find_dependency(GLEW) +endif() + +if (@IMGUI_BUILD_OPENGL3_GLAD_BINDING@) + find_dependency(glad CONFIG) +endif() + +if (@IMGUI_BUILD_OPENGL3_GL3W_BINDING@) + find_dependency(gl3w CONFIG) +endif() + +if (@IMGUI_BUILD_GLUT_BINDING@) + find_dependency(GLUT) +endif() + +if (@IMGUI_BUILD_OPENGL3_GLBINDING_BINDING@) + find_dependency(glbinding CONFIG) +endif() + +if (@IMGUI_BUILD_SDL2_BINDING@) + find_dependency(SDL2 CONFIG) +endif() + +if (@IMGUI_BUILD_VULKAN_BINDING@) + find_dependency(Vulkan) +endif() + +if (@IMGUI_FREETYPE@) + find_dependency(freetype CONFIG) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/imgui-targets.cmake") diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 2238ca888caa3e..30adffa1dca5c4 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -18,6 +18,7 @@ else() ) 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)) From ab4fd992ac94df9b637cc8be0178477b0451aa15 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Sun, 27 Dec 2020 13:19:16 +0700 Subject: [PATCH 0359/1694] [mingw] Remove executable extension on non-Windows hosts (#15282) --- scripts/toolchains/mingw.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/toolchains/mingw.cmake b/scripts/toolchains/mingw.cmake index 630a49623d634f..195e337f78c0f4 100644 --- a/scripts/toolchains/mingw.cmake +++ b/scripts/toolchains/mingw.cmake @@ -21,11 +21,11 @@ foreach(lang C CXX) set(CMAKE_${lang}_COMPILER_TARGET "${CMAKE_SYSTEM_PROCESSOR}-windows-gnu" CACHE STRING "") endforeach() -find_file(CMAKE_C_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc.exe") -find_file(CMAKE_CXX_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-g++.exe") -find_file(CMAKE_RC_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-windres.exe") +find_program(CMAKE_C_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc") +find_program(CMAKE_CXX_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-g++") +find_program(CMAKE_RC_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-windres") if(NOT CMAKE_RC_COMPILER) - find_file(CMAKE_RC_COMPILER "windres.exe") + find_program(CMAKE_RC_COMPILER "windres") endif() get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) From ef1dcf3dcfdccda6573400325ba1e57d8e35b53b Mon Sep 17 00:00:00 2001 From: ankurverma85 <31362771+ankurverma85@users.noreply.github.com> Date: Sat, 26 Dec 2020 23:22:21 -0700 Subject: [PATCH 0360/1694] [sdl1] x64-windows-static-md fixes (#15126) --- ports/sdl1/CONTROL | 2 +- .../{SDL_dynamic.vcxproj => SDL.vcxproj.in} | 24 +- ports/sdl1/SDL_static.vcxproj | 354 ------------------ ...ain_dynamic.vcxproj => SDLmain.vcxproj.in} | 18 +- ports/sdl1/SDLmain_static.vcxproj | 215 ----------- ports/sdl1/portfile.cmake | 17 +- 6 files changed, 35 insertions(+), 595 deletions(-) rename ports/sdl1/{SDL_dynamic.vcxproj => SDL.vcxproj.in} (95%) delete mode 100644 ports/sdl1/SDL_static.vcxproj rename ports/sdl1/{SDLmain_dynamic.vcxproj => SDLmain.vcxproj.in} (95%) delete mode 100644 ports/sdl1/SDLmain_static.vcxproj diff --git a/ports/sdl1/CONTROL b/ports/sdl1/CONTROL index 87bb7b2afb825f..2579556501c43e 100644 --- a/ports/sdl1/CONTROL +++ b/ports/sdl1/CONTROL @@ -1,5 +1,5 @@ Source: sdl1 Version: 1.2.15 -Port-Version: 12 +Port-Version: 13 Homepage: https://www.libsdl.org 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. diff --git a/ports/sdl1/SDL_dynamic.vcxproj b/ports/sdl1/SDL.vcxproj.in similarity index 95% rename from ports/sdl1/SDL_dynamic.vcxproj rename to ports/sdl1/SDL.vcxproj.in index f6c3873f21302d..f4b29a2c8d78e1 100644 --- a/ports/sdl1/SDL_dynamic.vcxproj +++ b/ports/sdl1/SDL.vcxproj.in @@ -32,32 +32,32 @@ - DynamicLibrary + @LIB_TYPE@ v141 false - DynamicLibrary + @LIB_TYPE@ v141 false - DynamicLibrary + @LIB_TYPE@ v141 false - DynamicLibrary + @LIB_TYPE@ v141 false - DynamicLibrary + @LIB_TYPE@ v141 false - DynamicLibrary + @LIB_TYPE@ v141 false @@ -134,7 +134,7 @@ Disabled $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) - MultiThreadedDLL + @CRT_TYPE_DBG@ false .\Debug/SDL.pch @@ -171,7 +171,7 @@ Disabled $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) - MultiThreadedDLL + @CRT_TYPE_DBG@ false .\Debug/SDL.pch @@ -207,7 +207,7 @@ Disabled $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) - MultiThreadedDLL + @CRT_TYPE_DBG@ false @@ -246,7 +246,7 @@ $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) true - MultiThreadedDLL + @CRT_TYPE_REL@ false true @@ -283,7 +283,7 @@ $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) true - MultiThreadedDLL + @CRT_TYPE_REL@ false true @@ -319,7 +319,7 @@ $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) true - MultiThreadedDLL + @CRT_TYPE_REL@ false true diff --git a/ports/sdl1/SDL_static.vcxproj b/ports/sdl1/SDL_static.vcxproj deleted file mode 100644 index dfe46bba3aa41b..00000000000000 --- a/ports/sdl1/SDL_static.vcxproj +++ /dev/null @@ -1,354 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} - SDL - - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>15.0.27924.0 - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/SDL.tlb - - - Disabled - $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) - MultiThreadedDebug - false - - .\Debug/SDL.pch - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Debug/SDL.dll - true - false - true - .\Debug/SDL.pdb - Windows - false - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/SDL.tlb - - - Disabled - $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) - MultiThreadedDebug - false - - .\Debug/SDL.pch - Level3 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Debug/SDL.dll - true - false - true - .\Debug/SDL.pdb - Windows - MachineX64 - false - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/SDL.tlb - - - OnlyExplicitInline - false - $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - - .\Release/SDL.pch - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Release/SDL.dll - true - false - .\Release/SDL.pdb - Windows - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/SDL.tlb - - - OnlyExplicitInline - false - $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - - .\Release/SDL.pch - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Release/SDL.dll - true - false - .\Release/SDL.pdb - Windows - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ports/sdl1/SDLmain_dynamic.vcxproj b/ports/sdl1/SDLmain.vcxproj.in similarity index 95% rename from ports/sdl1/SDLmain_dynamic.vcxproj rename to ports/sdl1/SDLmain.vcxproj.in index dd4c89a672c8bb..249b174401d678 100644 --- a/ports/sdl1/SDLmain_dynamic.vcxproj +++ b/ports/sdl1/SDLmain.vcxproj.in @@ -172,7 +172,7 @@ ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true - MultiThreadedDLL + @CRT_TYPE_REL@ true .\Release/SDLmain.pch @@ -189,7 +189,7 @@ ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true - MultiThreadedDLL + @CRT_TYPE_REL@ true .\Release/SDLmain.pch @@ -204,7 +204,7 @@ ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true - MultiThreadedDLL + @CRT_TYPE_REL@ true @@ -219,7 +219,7 @@ ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) true - MultiThreadedDLL + @CRT_TYPE_REL@ true .\Release_NOSTDIO/SDLmain.pch @@ -236,7 +236,7 @@ ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) true - MultiThreadedDLL + @CRT_TYPE_REL@ true .\Release_NOSTDIO/SDLmain.pch @@ -251,7 +251,7 @@ ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) true - MultiThreadedDLL + @CRT_TYPE_REL@ true @@ -265,7 +265,7 @@ Disabled ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL + @CRT_TYPE_DBG@ .\Debug/SDLmain.pch Level3 @@ -281,7 +281,7 @@ Disabled ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL + @CRT_TYPE_DBG@ .\Debug/SDLmain.pch Level3 @@ -295,7 +295,7 @@ Disabled ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL + @CRT_TYPE_DBG@ .\Debug/SDLmain.pch diff --git a/ports/sdl1/SDLmain_static.vcxproj b/ports/sdl1/SDLmain_static.vcxproj deleted file mode 100644 index 3f3b6ca0106b52..00000000000000 --- a/ports/sdl1/SDLmain_static.vcxproj +++ /dev/null @@ -1,215 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release_NoSTDIO - Win32 - - - Release_NoSTDIO - x64 - - - Release - Win32 - - - Release - x64 - - - - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} - - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>15.0.27924.0 - - - .\Release\ - .\Release\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - .\Release_NOSTDIO\ - .\Release_NOSTDIO\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - .\Debug\ - .\Debug\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - - .\Release/SDLmain.pch - Level3 - Default - - - - - X64 - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - - .\Release/SDLmain.pch - Level3 - Default - - - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) - true - MultiThreaded - true - - .\Release_NOSTDIO/SDLmain.pch - Level3 - Default - - - - - X64 - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) - true - MultiThreaded - true - - .\Release_NOSTDIO/SDLmain.pch - Level3 - Default - - - - - Disabled - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDebug - - .\Debug/SDLmain.pch - Level3 - OldStyle - Default - - - - - X64 - - - Disabled - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDebug - - .\Debug/SDLmain.pch - Level3 - OldStyle - Default - - - - - - - - - \ No newline at end of file diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake index 6dd7da6876d573..47f1b0730ec715 100644 --- a/ports/sdl1/portfile.cmake +++ b/ports/sdl1/portfile.cmake @@ -16,13 +16,22 @@ if (VCPKG_TARGET_IS_WINDOWS) file(COPY ${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln DESTINATION ${SOURCE_PATH}/VisualC/ ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - configure_file(${CMAKE_CURRENT_LIST_DIR}/SDL_static.vcxproj ${SOURCE_PATH}/VisualC/SDL/SDL.vcxproj COPYONLY) - configure_file(${CMAKE_CURRENT_LIST_DIR}/SDLmain_static.vcxproj ${SOURCE_PATH}/VisualC/SDLmain/SDLmain.vcxproj COPYONLY) + set(LIB_TYPE StaticLibrary) else() - configure_file(${CMAKE_CURRENT_LIST_DIR}/SDL_dynamic.vcxproj ${SOURCE_PATH}/VisualC/SDL/SDL.vcxproj COPYONLY) - configure_file(${CMAKE_CURRENT_LIST_DIR}/SDLmain_dynamic.vcxproj ${SOURCE_PATH}/VisualC/SDLmain/SDLmain.vcxproj COPYONLY) + set(LIB_TYPE DynamicLibrary) endif() + if (VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(CRT_TYPE_DBG MultiThreadedDebugDLL) + set(CRT_TYPE_REL MultiThreadedDLL) + else() + set(CRT_TYPE_DBG MultiThreadedDebug) + set(CRT_TYPE_REL MultiThreaded) + endif() + + configure_file(${CURRENT_PORT_DIR}/SDL.vcxproj.in ${SOURCE_PATH}/VisualC/SDL/SDL.vcxproj @ONLY) + configure_file(${CURRENT_PORT_DIR}/SDLmain.vcxproj.in ${SOURCE_PATH}/VisualC/SDLmain/SDLmain.vcxproj @ONLY) + # This text file gets copied as a library, and included as one in the package file(REMOVE_RECURSE ${SOURCE_PATH}/src/hermes/COPYING.LIB) From d82fe906e13a46796c1bff2d30bad03ec6a6f05b Mon Sep 17 00:00:00 2001 From: Ronald <3665590+playgithub@users.noreply.github.com> Date: Sun, 27 Dec 2020 14:39:06 +0800 Subject: [PATCH 0361/1694] [libjpeg-turbo] fix incompatibility for c11 and c17 (#15234) --- ports/libjpeg-turbo/CONTROL | 2 +- .../fix-incompatibility-for-c11-c17.patch | 13 +++++++++++++ ports/libjpeg-turbo/portfile.cmake | 10 +++------- 3 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 ports/libjpeg-turbo/fix-incompatibility-for-c11-c17.patch diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index f8a66e50cc6206..8dd51db8a691d9 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,6 +1,6 @@ Source: libjpeg-turbo Version: 2.0.5 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/libjpeg-turbo/libjpeg-turbo 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. diff --git a/ports/libjpeg-turbo/fix-incompatibility-for-c11-c17.patch b/ports/libjpeg-turbo/fix-incompatibility-for-c11-c17.patch new file mode 100644 index 00000000000000..c0aaf585b216cd --- /dev/null +++ b/ports/libjpeg-turbo/fix-incompatibility-for-c11-c17.patch @@ -0,0 +1,13 @@ +diff --git a/tjutil.h b/tjutil.h +index f72840c..a3ae19f 100644 +--- a/tjutil.h ++++ b/tjutil.h +@@ -30,7 +30,7 @@ + #ifndef __MINGW32__ + #include + #define snprintf(str, n, format, ...) \ +- _snprintf_s(str, n, _TRUNCATE, format, __VA_ARGS__) ++ _snprintf_s(str, n, _TRUNCATE, format, ## __VA_ARGS__) + #endif + #define strcasecmp stricmp + #define strncasecmp strnicmp diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index f4a55e0783c018..b135c5aeaaa64f 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -6,9 +6,9 @@ vcpkg_from_github( HEAD_REF master PATCHES add-options-for-exes-docs-headers.patch - #workaround for vcpkg bug see #5697 on github for more information workaround_cmake_system_processor.patch + fix-incompatibility-for-c11-c17.patch ) 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")) @@ -68,11 +68,6 @@ else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() endif() -file(INSTALL - ${SOURCE_PATH}/LICENSE.md - 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}/share/man) @@ -80,5 +75,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jpeg) -vcpkg_copy_pdbs() +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_copy_pdbs() From 0157ecd8669a0267b01ab0fa9dee8c25f04b8c7a Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Sat, 26 Dec 2020 22:43:46 -0800 Subject: [PATCH 0362/1694] [boost-di] Update to 1.2.0 (#15286) * [boost-di] Update to 1.2.0 * Update the Repo --- ports/boost-di/CONTROL | 4 ++-- ports/boost-di/portfile.cmake | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ports/boost-di/CONTROL b/ports/boost-di/CONTROL index da0873af8e7fd9..938e28bac9b198 100644 --- a/ports/boost-di/CONTROL +++ b/ports/boost-di/CONTROL @@ -1,4 +1,4 @@ Source: boost-di -Version: 1.1.0-1 -Homepage: https://github.com/boost-experimental/di +Version: 1.2.0 +Homepage: https://github.com/boost-ext/di Description: C++14 Dependency Injection Library. diff --git a/ports/boost-di/portfile.cmake b/ports/boost-di/portfile.cmake index f6d899a60e359a..936eefcee7a381 100644 --- a/ports/boost-di/portfile.cmake +++ b/ports/boost-di/portfile.cmake @@ -1,17 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO boost-experimental/di - REF v1.1.0 - SHA512 69f7b0567cffea9bf983aedd7eabd1a07ae20249cd56a13de98eaa0cc835cbe3b76e790da68489536dd07edeb99271a69111f4d0c6b0aa3721ce9f5ead848fe0 - HEAD_REF master + REPO boost-ext/di + REF 6078f073feb8560127fbf0308b3794a551146252 # v1.2.0 + SHA512 d7876b10b0365a92095ee7edefdc9cb9a0e237baf2bad124a927f22ed6ec30e18802b20517bc032184f39b7b4d71f44e965bdcea074646871d0194bd4e851d43 + HEAD_REF cpp14 ) file(INSTALL ${SOURCE_PATH}/include/boost - DESTINATION ${CURRENT_PACKAGES_DIR}/include) + DESTINATION ${CURRENT_PACKAGES_DIR}/include) vcpkg_download_distfile(LICENSE - URLS http://www.boost.org/LICENSE_1_0.txt - FILENAME "boost-di-copyright" - SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 + URLS http://www.boost.org/LICENSE_1_0.txt + FILENAME "boost-di-copyright" + SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 ) -file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-di/copyright) +file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From e9af20c4f0b13ef71d620c28ba68dac9d7f18306 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Sat, 26 Dec 2020 22:48:07 -0800 Subject: [PATCH 0363/1694] Port for Microsoft GitHub DirectX-Headers (#15222) --- ports/directx-headers/CONTROL | 5 +++++ ports/directx-headers/portfile.cmake | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 ports/directx-headers/CONTROL create mode 100644 ports/directx-headers/portfile.cmake diff --git a/ports/directx-headers/CONTROL b/ports/directx-headers/CONTROL new file mode 100644 index 00000000000000..ab4b573bb97dc0 --- /dev/null +++ b/ports/directx-headers/CONTROL @@ -0,0 +1,5 @@ +Source: directx-headers +Version: 1.0 +Homepage: https://devblogs.microsoft.com/directx/ +Description: Official DirectX headers +Supports: windows|linux diff --git a/ports/directx-headers/portfile.cmake b/ports/directx-headers/portfile.cmake new file mode 100644 index 00000000000000..dbb51700029b8d --- /dev/null +++ b/ports/directx-headers/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_fail_port_install(ON_TARGET "OSX") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/DirectX-Headers + REF v1.0 + SHA512 73e35142ff460aa6114a9fa298ce409d4b1cb34fb7bbb1ca55687cf7aca05197c48a02ae8c81bcb36b39b1a3f75d8ecbe503a752df70f4b0980fc026a92df84b + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DBUILD_TEST=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/directx-headers/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 8a3236bd341e533ac474f3e8eb72ba5716547466 Mon Sep 17 00:00:00 2001 From: eao197 Date: Mon, 28 Dec 2020 22:25:57 +0300 Subject: [PATCH 0364/1694] RESTinio updated to v.0.6.13. (#15338) --- ports/restinio/portfile.cmake | 4 ++-- ports/restinio/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake index 9e40fbf9d9a5e0..417b77698b4004 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 38fe6b0fe8a624bed5c6d0c9a600d0abb2db62a3 # v.0.6.12 - SHA512 34e0eed7560a05725158cf47ca77e69746c6134f6e1579de30b7130d0010a92dea429755021ef52745d14a0358b12b205ddaec698c0b8e1a75b853d6a303537b + REF 0052518f5692f8f051031e06d933b726191be97e # v.0.6.13 + SHA512 e7474aa1cef4145fe2f02c52cf80fdaf6724da45a4f3d0f1f56fc188ac50ff29a3ac72ea0e4402dc7ad378d0b2acfcea30cf8a57d218c3f5eb55d3f0d83dad29 ) vcpkg_configure_cmake( diff --git a/ports/restinio/vcpkg.json b/ports/restinio/vcpkg.json index a7f75e4f739a68..7aace791bfa282 100644 --- a/ports/restinio/vcpkg.json +++ b/ports/restinio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "restinio", - "version-string": "0.6.12", + "version-string": "0.6.13", "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", From c7972e17fd00733bc2c3bf29a03970922159f7aa Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Mon, 28 Dec 2020 11:26:40 -0800 Subject: [PATCH 0365/1694] [gmp/nettle] Update to latest release revision (#15236) --- ports/gmp/portfile.cmake | 33 +- ports/gmp/prefix.patch | 38 -- ports/gmp/runtime.patch | 168 +++++-- ports/gmp/vcpkg.json | 4 +- ports/gmp/vs.build.patch | 175 ++++---- ports/nettle/CONTROL | 3 +- ports/nettle/fix-InstallLibPath.patch | 4 +- ports/nettle/gmp.patch | 302 +++++-------- ports/nettle/name.dir.patch | 606 +++++++++----------------- ports/nettle/portfile.cmake | 59 ++- ports/nettle/runtime.hogweed.patch | 84 ---- ports/nettle/runtime.nettle.patch | 84 ---- ports/nettle/runtime.patch | 168 +++++++ scripts/ci.baseline.txt | 2 - 14 files changed, 773 insertions(+), 957 deletions(-) delete mode 100644 ports/gmp/prefix.patch delete mode 100644 ports/nettle/runtime.hogweed.patch delete mode 100644 ports/nettle/runtime.nettle.patch create mode 100644 ports/nettle/runtime.patch diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index e566c45a6711cb..d78d4cc302809c 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -6,13 +6,12 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ShiftMediaProject/gmp - REF e140dfc8668e96d7e56cbd46467945adcc6b3cc4 #v6.2.0 - SHA512 3b646c142447946bb4556db01214ff130da917bc149946b8cf086f3b01e1cc3d664b941a30a42608799c14461b2f29e4b894b72915d723bd736513c8914729b7 + REF 0018c44e8dfcc3b64b43e0aea4b3f419f0b65fd0 #v6.2.1-2 + SHA512 2405e2536ca9fe0b890f44f54c936ac0e4b5a9ebe6a19e1c48a9c21b7211d2a1b45865852e3c65a98a6735216a4e27bea75c0fd6e52efeed4baecd95da9895a5 HEAD_REF master PATCHES vs.build.patch runtime.patch - prefix.patch ) include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake) @@ -33,7 +32,13 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() #Setup YASM integration - set(_file "${SOURCE_PATH}/SMP/libgmp.vcxproj") + set(_porjectfile) + if(VCPKG_TARGET_IS_UWP) + set(_porjectfile "${SOURCE_PATH}/SMP/libgmp_winrt.vcxproj") + else() + set(_porjectfile "${SOURCE_PATH}/SMP/libgmp.vcxproj") + endif() + set(_file "${_porjectfile}") file(READ "${_file}" _contents) string(REPLACE [[]] "" @@ -42,13 +47,6 @@ if(VCPKG_TARGET_IS_WINDOWS) "" _contents "${_contents}") string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already replaced by another triplet - if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - STRING(REPLACE ">MultiThreadedDebugDLL<" ">MultiThreadedDebug<" _contents "${_contents}") - STRING(REPLACE ">MultiThreadedDLL<" ">MultiThreaded<" _contents "${_contents}") - else() - STRING(REPLACE ">MultiThreadedDebug<" ">MultiThreadedDebugDLL<" _contents "${_contents}") - STRING(REPLACE ">MultiThreaded<" ">MultiThreadedDLL<" _contents "${_contents}") - endif() file(WRITE "${_file}" "${_contents}") vcpkg_install_msbuild( @@ -65,7 +63,7 @@ if(VCPKG_TARGET_IS_WINDOWS) ) get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/include" "${CURRENT_PACKAGES_DIR}/include") - set(PACKAGE_VERSION 6.2.0) + set(PACKAGE_VERSION 6.2.1) set(PACKAGE_NAME gmp) set(prefix "${CURRENT_INSTALLED_DIR}") set(exec_prefix "\${prefix}") @@ -85,20 +83,20 @@ if(VCPKG_TARGET_IS_WINDOWS) else() vcpkg_download_distfile( ARCHIVE - URLS https://gmplib.org/download/gmp/gmp-6.2.0.tar.xz - FILENAME gmp-6.2.0.tar.xz - SHA512 a066f0456f0314a1359f553c49fc2587e484ff8ac390ff88537266a146ea373f97a1c0ba24608bf6756f4eab11c9056f103c8deb99e5b57741b4f7f0ec44b90c) + URLS https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz + FILENAME gmp-6.2.1.tar.xz + SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 + ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - REF gmp-6.2.0 + REF gmp-6.2.1 ) vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG - OPTIONS ${OPTIONS} ) vcpkg_install_make() @@ -106,6 +104,5 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) endif() diff --git a/ports/gmp/prefix.patch b/ports/gmp/prefix.patch deleted file mode 100644 index 611c73763f4cb0..00000000000000 --- a/ports/gmp/prefix.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/SMP/libgmp.vcxproj b/SMP/libgmp.vcxproj -index 2c5b8cdc6..157215394 100644 ---- a/SMP/libgmp.vcxproj -+++ b/SMP/libgmp.vcxproj -@@ -1574,14 +1574,14 @@ - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libgmpd -+ gmpd - $(ProjectDir)..\msvc\ - Clean - MSB8012 - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libgmpd -+ gmpd - $(ProjectDir)..\msvc\ - Clean - MSB8012 -@@ -1630,14 +1630,14 @@ - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libgmp -+ gmp - $(ProjectDir)..\msvc\ - Clean - MSB8012 - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libgmp -+ gmp - $(ProjectDir)..\msvc\ - Clean - MSB8012 diff --git a/ports/gmp/runtime.patch b/ports/gmp/runtime.patch index b2f15d26052d3b..f219e3dc740043 100644 --- a/ports/gmp/runtime.patch +++ b/ports/gmp/runtime.patch @@ -1,68 +1,180 @@ -diff --git a/SMP/libgmp.vcxproj b/SMP/libgmp.vcxproj -index 3c774be11..e8919240b 100644 ---- a/SMP/libgmp.vcxproj -+++ b/SMP/libgmp.vcxproj -@@ -1846,6 +1846,7 @@ del /f /q $(OutDir)\licenses\gmp.txt +diff --git a/SMP/smp.props b/SMP/smp.props +index fc70bd8..d515523 100644 +--- a/SMP/smp.props ++++ b/SMP/smp.props +@@ -86,7 +86,7 @@ + + + +- lib$(RootNamespace)d ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -94,7 +94,7 @@ + MSB8012 + + +- lib$(RootNamespace)d ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -118,7 +118,7 @@ + MSB8012 + + +- lib$(RootNamespace) ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -126,7 +126,7 @@ + MSB8012 + + +- lib$(RootNamespace) ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -159,6 +159,7 @@ + $(OutDir)\lib\x86\$(TargetName).pdb false 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings) + MultiThreadedDebug - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -1929,6 +1930,7 @@ del /f /q $(OutDir)\licenses\gmp.txt + $(OutDir)\lib\x86\$(TargetName)$(TargetExt) +@@ -177,6 +178,7 @@ + $(OutDir)\lib\x64\$(TargetName).pdb + false 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings) - false + MultiThreadedDebug $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -2190,6 +2192,7 @@ del /f /q $(OutDir)\licenses\gmp.txt +@@ -196,6 +198,7 @@ + $(IntDir)$(TargetName).pdb false 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings) + MultiThreadedDebugDLL - $(OutDir)\bin\x64\$(TargetName)$(TargetExt) -@@ -2278,6 +2281,7 @@ del /f /q $(OutDir)\licenses\gmp.txt + $(OutDir)\bin\x86\$(TargetName)$(TargetExt) +@@ -219,6 +222,7 @@ + $(IntDir)$(TargetName).pdb + false 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings) - false + MultiThreadedDebugDLL $(OutDir)\bin\x64\$(TargetName)$(TargetExt) -@@ -2549,6 +2553,7 @@ del /f /q $(OutDir)\licenses\gmp.txt - $(OutDir)\lib\x64\$(TargetName).pdb +@@ -248,6 +252,7 @@ + SingleFile + $(OutDir)\lib\x86\$(TargetName).pdb 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings) + MultiThreaded - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -2638,6 +2643,7 @@ del /f /q $(OutDir)\licenses\gmp.txt + $(OutDir)\lib\x86\$(TargetName)$(TargetExt) +@@ -273,6 +278,7 @@ + SingleFile + $(OutDir)\lib\x64\$(TargetName).pdb 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings) - false + MultiThreaded $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -2916,6 +2922,7 @@ del /f /q $(OutDir)\licenses\gmp.txt +@@ -297,6 +303,7 @@ + $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) $(IntDir)$(TargetName).pdb 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings) + MultiThreadedDLL true -@@ -3011,6 +3018,7 @@ del /f /q $(OutDir)\licenses\gmp.txt +@@ -328,6 +335,7 @@ + $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(IntDir)$(TargetName).pdb 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings) - false + MultiThreadedDLL true +diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props +index cb5f090..19b2b8d 100644 +--- a/SMP/smp_winrt.props ++++ b/SMP/smp_winrt.props +@@ -97,7 +97,7 @@ + + + +- lib$(RootNamespace)d_winrt ++ l$(RootNamespace)d + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -105,7 +105,7 @@ + MSB8012 + + +- lib$(RootNamespace)d_winrt ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -113,7 +113,7 @@ + MSB8012 + + +- $(RootNamespace)d_winrt ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -121,7 +121,7 @@ + MSB8012 + + +- $(RootNamespace)d_winrt ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -129,7 +129,7 @@ + MSB8012 + + +- lib$(RootNamespace)_winrt ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -137,7 +137,7 @@ + MSB8012 + + +- lib$(RootNamespace)_winrt ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -145,7 +145,7 @@ + MSB8012 + + +- $(RootNamespace)_winrt ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -153,7 +153,7 @@ + MSB8012 + + +- $(RootNamespace)_winrt ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index a0c93f2ab16d64..19f916179d0419 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,9 +1,9 @@ { "name": "gmp", - "version-string": "6.2.0", - "port-version": 5, + "version-string": "6.2.1-2", "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", + "supports": "windows & !(arm | arm64)", "dependencies": [ { "name": "vs-yasm", diff --git a/ports/gmp/vs.build.patch b/ports/gmp/vs.build.patch index 69aba99398f9d9..4c04d0c1659645 100644 --- a/ports/gmp/vs.build.patch +++ b/ports/gmp/vs.build.patch @@ -1,151 +1,158 @@ -diff --git a/SMP/libgmp.vcxproj b/SMP/libgmp.vcxproj -index b4e06ae42..442d82c51 100644 ---- a/SMP/libgmp.vcxproj -+++ b/SMP/libgmp.vcxproj -@@ -1559,114 +1559,114 @@ - +diff --git a/SMP/smp.props b/SMP/smp.props +index e2ed214..fc70bd8 100644 +--- a/SMP/smp.props ++++ b/SMP/smp.props +@@ -87,7 +87,7 @@ + lib$(RootNamespace)d - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libgmpd -+ gmpd + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -95,7 +95,7 @@ - + + lib$(RootNamespace)d - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libgmpd_winrt -+ gmpd + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -103,7 +103,7 @@ - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libgmpd + + $(RootNamespace)d - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -111,7 +111,7 @@ - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libgmpd_winrt + + $(RootNamespace)d - $(ProjectDir)..\..\..\msvc\ -+ libgmpd + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -119,7 +119,7 @@ - + + lib$(RootNamespace) - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - gmpd + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -127,7 +127,7 @@ - + + lib$(RootNamespace) - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- gmpd_winrt -+ gmpd + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -135,7 +135,7 @@ - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - gmpd + + $(RootNamespace) - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -143,7 +143,7 @@ - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- gmpd_winrt + + $(RootNamespace) - $(ProjectDir)..\..\..\msvc\ -+ gmpd + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 - - +diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props +index 9b453a5..cb5f090 100644 +--- a/SMP/smp_winrt.props ++++ b/SMP/smp_winrt.props +@@ -98,7 +98,7 @@ + + + lib$(RootNamespace)d_winrt - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libgmp -+ gmp + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -106,7 +106,7 @@ - + + lib$(RootNamespace)d_winrt - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libgmp_winrt -+ gmp + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -114,7 +114,7 @@ - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libgmp + + $(RootNamespace)d_winrt - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -122,7 +122,7 @@ - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libgmp_winrt + + $(RootNamespace)d_winrt - $(ProjectDir)..\..\..\msvc\ -+ libgmp + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -130,7 +130,7 @@ - + + lib$(RootNamespace)_winrt - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - gmp + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -138,7 +138,7 @@ - + + lib$(RootNamespace)_winrt - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- gmp_winrt -+ gmp + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -146,7 +146,7 @@ - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - gmp + + $(RootNamespace)_winrt - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -154,7 +154,7 @@ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- gmp_winrt + $(RootNamespace)_winrt - $(ProjectDir)..\..\..\msvc\ -+ gmp + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 - diff --git a/gmp.pc.in b/gmp.pc.in -index bf1c799ad..d0c81be91 100644 ---- a/gmp.pc.in +index bf1c799..d0c81be 100644 +--- a/gmp.pc.in +++ b/gmp.pc.in @@ -8,4 +8,4 @@ Description: GNU Multiple Precision Arithmetic Library URL: https://gmplib.org @@ -154,8 +161,8 @@ index bf1c799ad..d0c81be91 100644 -Libs: -L${libdir} -lgmp +Libs: -L${libdir} @LIBS@ diff --git a/gmpxx.pc.in b/gmpxx.pc.in -index 181cc70c6..2b697ceab 100644 ---- a/gmpxx.pc.in +index 181cc70..2b697ce 100644 +--- a/gmpxx.pc.in +++ b/gmpxx.pc.in @@ -9,4 +9,4 @@ URL: https://gmplib.org Version: @PACKAGE_VERSION@ diff --git a/ports/nettle/CONTROL b/ports/nettle/CONTROL index e8cffedd7d0b91..1fe47b5a21960b 100644 --- a/ports/nettle/CONTROL +++ b/ports/nettle/CONTROL @@ -1,6 +1,5 @@ Source: nettle -Version: 3.5.1 -Port-Version: 5 +Version: 3.6 Homepage: https://git.lysator.liu.se/nettle/nettle Description: Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space. Build-Depends: gmp, vs-yasm (windows), yasm-tool-helper (windows) diff --git a/ports/nettle/fix-InstallLibPath.patch b/ports/nettle/fix-InstallLibPath.patch index 363cda9ba2ef1b..d42a280679d4b2 100644 --- a/ports/nettle/fix-InstallLibPath.patch +++ b/ports/nettle/fix-InstallLibPath.patch @@ -1,8 +1,8 @@ diff --git a/configure.ac b/configure.ac -index 3547cae..e13a5bf 100644 +index 90ea1ea..58cfe88 100644 --- a/configure.ac +++ b/configure.ac -@@ -366,25 +366,25 @@ if test "x$ABI" != xstandard ; then +@@ -354,25 +354,25 @@ if test "x$ABI" != xstandard ; then else # The dash builtin pwd tries to be "helpful" and remember # symlink names. Use -P option, and hope it's portable enough. diff --git a/ports/nettle/gmp.patch b/ports/nettle/gmp.patch index b732e0360def8e..c54298a28c5288 100644 --- a/ports/nettle/gmp.patch +++ b/ports/nettle/gmp.patch @@ -1,8 +1,8 @@ diff --git a/SMP/config.h b/SMP/config.h -index 5e59a1daa..c5a658954 100644 ---- a/SMP/config.h +index e4de0f1..ba41eb4 100644 +--- a/SMP/config.h +++ b/SMP/config.h -@@ -101,7 +101,7 @@ +@@ -102,7 +102,7 @@ #define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the header file. */ @@ -11,263 +11,195 @@ index 5e59a1daa..c5a658954 100644 /* Define to 1 if you have the header file. */ /* #undef HAVE_VALGRIND_MEMCHECK_H */ -diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj -index cdf309639..9d37146a4 100644 ---- a/SMP/libhogweed.vcxproj -+++ b/SMP/libhogweed.vcxproj -@@ -1325,7 +1325,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - true - 5.1 -- nettled.lib;gmpd.lib;%(AdditionalDependencies) -+ nettled.lib;gmpd.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -1457,7 +1457,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 10.0 - 8.1 +diff --git a/SMP/libhogweed_winrt.vcxproj b/SMP/libhogweed_winrt.vcxproj +index 476f7a7..308bd0b 100644 +--- a/SMP/libhogweed_winrt.vcxproj ++++ b/SMP/libhogweed_winrt.vcxproj +@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def - nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies) -+ nettled.lib;gmpd.lib;%(AdditionalDependencies) - $(OutDir)\lib\x86\$(RootNamespace).winmd - /IGNORE:4006,4221,4078 %(AdditionalOptions) - -@@ -1585,7 +1585,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) - true - 6.1 -- nettled.lib;gmpd.lib;%(AdditionalDependencies) -+ nettled.lib;gmpd.lib;%(AdditionalDependencies) ++ nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) -@@ -1715,7 +1715,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 10.0 - 8.1 +@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def - nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies) -+ nettled.lib;gmpd.lib;%(AdditionalDependencies) - $(OutDir)\lib\x64\$(RootNamespace).winmd - /IGNORE:4006,4221,4078 %(AdditionalOptions) - -@@ -2368,7 +2368,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - true - 5.1 -- nettle.lib;gmp.lib;%(AdditionalDependencies) -+ nettle.lib;gmp.lib;%(AdditionalDependencies) ++ nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) -@@ -2641,7 +2641,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 10.0 - 8.1 +@@ -705,7 +705,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def - nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies) -+ nettle.lib;gmp.lib;%(AdditionalDependencies) - $(OutDir)\lib\x86\$(RootNamespace).winmd - /IGNORE:4006,4221,4078 %(AdditionalOptions) - -@@ -2915,7 +2915,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) - true - 6.1 -- nettle.lib;gmp.lib;%(AdditionalDependencies) -+ nettle.lib;gmp.lib;%(AdditionalDependencies) ++ nettle_winrt.lib;gmp.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) -@@ -3186,7 +3186,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 10.0 - 8.1 +@@ -935,7 +935,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def - nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies) -+ nettle.lib;gmp.lib;%(AdditionalDependencies) - $(OutDir)\lib\x64\$(RootNamespace).winmd ++ nettle_winrt.lib;gmp.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) + diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj -index 9ea0d8ea7..56583e10f 100644 ---- a/SMP/libnettle.vcxproj +index 088cb85..cc2cbeb 100644 +--- a/SMP/libnettle.vcxproj +++ b/SMP/libnettle.vcxproj -@@ -968,7 +968,7 @@ - MachineX86 - Windows - $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) +@@ -18,7 +18,7 @@ + 4244;4146;4267;4098;%(DisableSpecificWarnings) + + - libgmpd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) mkdir "$(OutDir)"\include -@@ -1091,7 +1091,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - MachineX86 - Windows - $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) -- libgmpd_winrt.lib;%(AdditionalDependencies) +@@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + 4244;4146;4267;4098;%(DisableSpecificWarnings) + + +- libgmpd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) mkdir "$(OutDir)"\include -@@ -1212,7 +1212,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - MachineX64 - Windows - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) -- libgmpd.lib;%(AdditionalDependencies) +@@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + 4244;4146;4267;4098;%(DisableSpecificWarnings) + + +- libgmp.lib;%(AdditionalDependencies) + %(AdditionalDependencies) mkdir "$(OutDir)"\include -@@ -1335,7 +1335,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - MachineX64 - Windows - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) -- libgmpd_winrt.lib;%(AdditionalDependencies) +@@ -586,7 +586,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + 4244;4146;4267;4098;%(DisableSpecificWarnings) + + +- libgmp.lib;%(AdditionalDependencies) + %(AdditionalDependencies) mkdir "$(OutDir)"\include -@@ -1463,7 +1463,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 5.1 - $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) -- gmpd.lib;%(AdditionalDependencies) -+ gmpd.lib;%(AdditionalDependencies) +@@ -815,7 +815,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libnettle.def +- libgmp.lib;%(AdditionalDependencies) ++ gmp.lib;%(AdditionalDependencies) mkdir "$(OutDir)"\include -@@ -1595,7 +1595,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 8.1 - $(OutDir)\lib\x86\$(RootNamespace).winmd - $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) -- gmpd_winrt.lib;%(AdditionalDependencies) -+ gmpd.lib;%(AdditionalDependencies) +@@ -1043,7 +1043,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libnettle.def +- libgmp.lib;%(AdditionalDependencies) ++ gmp.lib;%(AdditionalDependencies) mkdir "$(OutDir)"\include -@@ -1721,7 +1721,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 6.1 - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) -- gmpd.lib;%(AdditionalDependencies) -+ gmpd.lib;%(AdditionalDependencies) - +diff --git a/SMP/libnettle_winrt.vcxproj b/SMP/libnettle_winrt.vcxproj +index cb650ab..188f67a 100644 +--- a/SMP/libnettle_winrt.vcxproj ++++ b/SMP/libnettle_winrt.vcxproj +@@ -18,7 +18,7 @@ + 4244;4146;4267;4098;%(DisableSpecificWarnings) + + +- libgmpd_winrt.lib;%(AdditionalDependencies) ++ %(AdditionalDependencies) + + + mkdir "$(OutDir)"\include +@@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + 4244;4146;4267;4098;%(DisableSpecificWarnings) + + +- libgmpd_winrt.lib;%(AdditionalDependencies) ++ %(AdditionalDependencies) + mkdir "$(OutDir)"\include -@@ -1851,7 +1851,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 8.1 - $(OutDir)\lib\x64\$(RootNamespace).winmd - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) +@@ -245,7 +245,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libnettle.def - gmpd_winrt.lib;%(AdditionalDependencies) + gmpd.lib;%(AdditionalDependencies) mkdir "$(OutDir)"\include -@@ -1979,7 +1979,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - MachineX86 - Windows - $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) -- libgmp.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - +@@ -359,7 +359,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libnettle.def +- gmpd_winrt.lib;%(AdditionalDependencies) ++ gmpd.lib;%(AdditionalDependencies) + mkdir "$(OutDir)"\include -@@ -2108,7 +2108,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - MachineX86 - Windows - $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) +@@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + 4244;4146;4267;4098;%(DisableSpecificWarnings) + + - libgmp_winrt.lib;%(AdditionalDependencies) + %(AdditionalDependencies) mkdir "$(OutDir)"\include -@@ -2235,7 +2235,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - MachineX64 - Windows - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) -- libgmp.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -2364,7 +2364,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - MachineX64 - Windows - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) +@@ -585,7 +585,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + 4244;4146;4267;4098;%(DisableSpecificWarnings) + + - libgmp_winrt.lib;%(AdditionalDependencies) + %(AdditionalDependencies) mkdir "$(OutDir)"\include -@@ -2498,7 +2498,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 5.1 - $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) -- gmp.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -2632,7 +2632,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 5.1 - $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) -- libgmp.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -2770,7 +2770,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 8.1 - $(OutDir)\lib\x86\$(RootNamespace).winmd - $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) +@@ -699,7 +699,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libnettle.def - gmp_winrt.lib;%(AdditionalDependencies) + gmp.lib;%(AdditionalDependencies) mkdir "$(OutDir)"\include -@@ -2908,7 +2908,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 8.1 - $(OutDir)\lib\x86\$(RootNamespace).winmd - $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) +@@ -813,7 +813,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libnettle.def - libgmp_winrt.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -3041,7 +3041,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 6.1 - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) -- gmp.lib;%(AdditionalDependencies) + gmp.lib;%(AdditionalDependencies) mkdir "$(OutDir)"\include -@@ -3174,7 +3174,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 6.1 - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) -- libgmp.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -3311,7 +3311,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 8.1 - $(OutDir)\lib\x64\$(RootNamespace).winmd - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) +@@ -927,7 +927,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libnettle.def - gmp_winrt.lib;%(AdditionalDependencies) + gmp.lib;%(AdditionalDependencies) mkdir "$(OutDir)"\include -@@ -3448,7 +3448,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 8.1 - $(OutDir)\lib\x64\$(RootNamespace).winmd - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) +@@ -1041,7 +1041,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libnettle.def - libgmp_winrt.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) ++ gmp.lib;%(AdditionalDependencies) mkdir "$(OutDir)"\include diff --git a/ports/nettle/name.dir.patch b/ports/nettle/name.dir.patch index 753aaff5af7314..834a0440978740 100644 --- a/ports/nettle/name.dir.patch +++ b/ports/nettle/name.dir.patch @@ -1,548 +1,362 @@ diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj -index 9f741e240..5bb05b359 100644 ---- a/SMP/libhogweed.vcxproj +index 976d9fc..5fd42ba 100644 +--- a/SMP/libhogweed.vcxproj +++ b/SMP/libhogweed.vcxproj -@@ -670,142 +670,142 @@ - - - -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libhogweedd -+ hogweedd - Clean - MSB8012 - - -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libhogweedd_winrt -+ hogweedd - Clean - MSB8012 - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libhogweedd -- $(ProjectDir)..\..\..\msvc\ -+ hogweedd -+ $(ProjectDir)..\msvc\ - Clean - MSB8012 - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libhogweedd_winrt -- $(ProjectDir)..\..\..\msvc\ -+ hogweedd -+ $(ProjectDir)..\msvc\ - Clean - MSB8012 - - -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - hogweedd - Clean - MSB8012 - - -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- hogweedd_winrt -+ hogweedd - Clean - MSB8012 - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - hogweedd -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - Clean - MSB8012 - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- hogweedd_winrt -- $(ProjectDir)..\..\..\msvc\ -+ hogweedd -+ $(ProjectDir)..\msvc\ - Clean - MSB8012 - - -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libhogweed -+ hogweed - Clean - MSB8012 - - -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libhogweed_winrt -+ hogweed - Clean - MSB8012 - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libhogweed -- $(ProjectDir)..\..\..\msvc\ -+ hogweed -+ $(ProjectDir)..\msvc\ - Clean - MSB8012 - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libhogweed_winrt -- $(ProjectDir)..\..\..\msvc\ -+ hogweed -+ $(ProjectDir)..\msvc\ - Clean - MSB8012 - - -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - hogweed - Clean - MSB8012 - - -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - hogweed - Clean - MSB8012 - - -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- hogweed_winrt -+ hogweed - Clean - MSB8012 - - -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- hogweed_winrt -+ hogweed - Clean - MSB8012 - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - hogweed -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - Clean - MSB8012 - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - hogweed -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - Clean - MSB8012 - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- hogweed_winrt -- $(ProjectDir)..\..\..\msvc\ -+ hogweed -+ $(ProjectDir)..\msvc\ - Clean - MSB8012 - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- hogweed_winrt -- $(ProjectDir)..\..\..\msvc\ -+ hogweed -+ $(ProjectDir)..\msvc\ - Clean - MSB8012 - -@@ -826,7 +826,7 @@ - MachineX86 - Windows - $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) +@@ -18,7 +18,7 @@ + 4146;4267;4028;4244;%(DisableSpecificWarnings) + + - libnettled.lib;%(AdditionalDependencies) + nettled.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) -@@ -950,7 +950,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - MachineX86 - Windows - $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) -- libnettled_winrt.lib;%(AdditionalDependencies) -+ nettled.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -1072,7 +1072,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - MachineX64 - Windows - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) +@@ -132,7 +132,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + 4146;4267;4028;4244;%(DisableSpecificWarnings) + + - libnettled.lib;%(AdditionalDependencies) + nettled.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) -@@ -1196,7 +1196,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - MachineX64 - Windows - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) -- libnettled_winrt.lib;%(AdditionalDependencies) -+ nettled.lib;%(AdditionalDependencies) +@@ -476,7 +476,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + 4146;4267;4028;4244;%(DisableSpecificWarnings) + + +- libnettle.lib;%(AdditionalDependencies) ++ nettle.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) -@@ -1325,7 +1325,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - true - 5.1 -- nettled.lib;gmpd.lib;%(AdditionalDependencies) -+ nettled.lib;gmpd.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -1457,7 +1457,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 10.0 - 8.1 -- nettled.lib;gmpd.lib;%(AdditionalDependencies) -+ nettled.lib;gmpd.lib;%(AdditionalDependencies) - $(OutDir)\lib\x86\$(RootNamespace).winmd - /IGNORE:4006,4221,4078 %(AdditionalOptions) - -@@ -1585,7 +1585,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) - true - 6.1 -- nettled.lib;gmpd.lib;%(AdditionalDependencies) -+ nettled.lib;gmpd.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -1715,7 +1715,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 10.0 - 8.1 -- nettled.lib;gmpd.lib;%(AdditionalDependencies) -+ nettled.lib;gmpd.lib;%(AdditionalDependencies) - $(OutDir)\lib\x64\$(RootNamespace).winmd - /IGNORE:4006,4221,4078 %(AdditionalOptions) - -@@ -1845,7 +1845,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - MachineX86 - Windows - $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) +@@ -590,7 +590,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + 4146;4267;4028;4244;%(DisableSpecificWarnings) + + - libnettle.lib;%(AdditionalDependencies) + nettle.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) -@@ -1975,7 +1975,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - MachineX86 - Windows - $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) -- libnettle_winrt.lib;%(AdditionalDependencies) +@@ -820,7 +820,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def +- libnettle.lib;%(AdditionalDependencies) + nettle.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) - + -@@ -2103,7 +2103,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - MachineX64 - Windows - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) +@@ -1050,7 +1050,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def - libnettle.lib;%(AdditionalDependencies) + nettle.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) + + +diff --git a/SMP/libhogweed_winrt.vcxproj b/SMP/libhogweed_winrt.vcxproj +index 308bd0b..a436c69 100644 +--- a/SMP/libhogweed_winrt.vcxproj ++++ b/SMP/libhogweed_winrt.vcxproj +@@ -18,7 +18,7 @@ + 4146;4267;4028;4244;%(DisableSpecificWarnings) + + +- libnettled_winrt.lib;%(AdditionalDependencies) ++ nettled.lib;%(AdditionalDependencies) + /IGNORE:4006,4221,4078 %(AdditionalOptions) -@@ -2233,7 +2233,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - MachineX64 - Windows - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) -- libnettle_winrt.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) +@@ -132,7 +132,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + 4146;4267;4028;4244;%(DisableSpecificWarnings) + + +- libnettled_winrt.lib;%(AdditionalDependencies) ++ nettled.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) -@@ -2368,7 +2368,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - true - 5.1 -- nettle.lib;gmp.lib;%(AdditionalDependencies) -+ nettle.lib;gmp.lib;%(AdditionalDependencies) +@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def +- nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies) ++ nettled.lib;gmpd.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) -@@ -2503,7 +2503,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - true - 5.1 -- libnettle.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) +@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def +- nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies) ++ nettled.lib;gmpd.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) -@@ -2641,7 +2641,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 10.0 - 8.1 -- nettle.lib;gmp.lib;%(AdditionalDependencies) -+ nettle.lib;gmp.lib;%(AdditionalDependencies) - $(OutDir)\lib\x86\$(RootNamespace).winmd +@@ -476,7 +476,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + 4146;4267;4028;4244;%(DisableSpecificWarnings) + + +- libnettle_winrt.lib;%(AdditionalDependencies) ++ nettle.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) - -@@ -2780,7 +2780,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 10.0 - 8.1 + + +@@ -590,7 +590,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + 4146;4267;4028;4244;%(DisableSpecificWarnings) + + - libnettle_winrt.lib;%(AdditionalDependencies) + nettle.lib;%(AdditionalDependencies) - $(OutDir)\lib\x86\$(RootNamespace).winmd /IGNORE:4006,4221,4078 %(AdditionalOptions) - -@@ -2915,7 +2915,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) - true - 6.1 -- nettle.lib;gmp.lib;%(AdditionalDependencies) + + +@@ -705,7 +705,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def +- nettle_winrt.lib;gmp.lib;%(AdditionalDependencies) + nettle.lib;gmp.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) -@@ -3049,7 +3049,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) - true - 6.1 -- libnettle.lib;%(AdditionalDependencies) +@@ -820,7 +820,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def +- libnettle_winrt.lib;%(AdditionalDependencies) + nettle.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) -@@ -3186,7 +3186,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 10.0 - 8.1 -- nettle.lib;gmp.lib;%(AdditionalDependencies) +@@ -935,7 +935,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def +- nettle_winrt.lib;gmp.lib;%(AdditionalDependencies) + nettle.lib;gmp.lib;%(AdditionalDependencies) - $(OutDir)\lib\x64\$(RootNamespace).winmd /IGNORE:4006,4221,4078 %(AdditionalOptions) -@@ -3324,7 +3324,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - true - 10.0 - 8.1 + +@@ -1050,7 +1050,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def - libnettle_winrt.lib;%(AdditionalDependencies) + nettle.lib;%(AdditionalDependencies) - $(OutDir)\lib\x64\$(RootNamespace).winmd /IGNORE:4006,4221,4078 %(AdditionalOptions) -diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj -index 56583e10f..665e8ef4e 100644 ---- a/SMP/libnettle.vcxproj -+++ b/SMP/libnettle.vcxproj -@@ -812,142 +812,142 @@ + +diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props +index 487099d..1eade47 100644 +--- a/SMP/smp_deps.props ++++ b/SMP/smp_deps.props +@@ -104,16 +104,16 @@ +- lib$(RootNamespace)d - $(ProjectDir)..\..\..\msvc\ ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libnettled -+ nettled + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean MSB8012 - + +- lib$(RootNamespace)d - $(ProjectDir)..\..\..\msvc\ ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libnettled_winrt -+ nettled + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -121,7 +121,7 @@ - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libnettled + + $(RootNamespace)d - $(ProjectDir)..\..\..\msvc\ -+ nettled + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -129,23 +129,23 @@ - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libnettled_winrt + + $(RootNamespace)d - $(ProjectDir)..\..\..\msvc\ -+ nettled + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean MSB8012 - + +- lib$(RootNamespace) - $(ProjectDir)..\..\..\msvc\ ++ $(RootNamespace) + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - nettled + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean MSB8012 - + +- lib$(RootNamespace) - $(ProjectDir)..\..\..\msvc\ ++ $(RootNamespace) + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- nettled_winrt -+ nettled + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -153,7 +153,7 @@ - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - nettled + + $(RootNamespace) - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -161,7 +161,7 @@ - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- nettled_winrt + + $(RootNamespace) - $(ProjectDir)..\..\..\msvc\ -+ nettled + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -169,7 +169,7 @@ - + + $(RootNamespace) - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libnettle -+ nettle + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 +@@ -177,7 +177,7 @@ - + + $(RootNamespace) - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libnettle_winrt -+ nettle + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 - - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libnettle +diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props +index d44408a..b44482c 100644 +--- a/SMP/smp_winrt_deps.props ++++ b/SMP/smp_winrt_deps.props +@@ -115,80 +115,80 @@ + + + +- lib$(RootNamespace)d_winrt - $(ProjectDir)..\..\..\msvc\ -+ nettle ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean MSB8012 - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- libnettle_winrt + +- lib$(RootNamespace)d_winrt - $(ProjectDir)..\..\..\msvc\ -+ nettle ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean MSB8012 - + +- $(RootNamespace)d_winrt - $(ProjectDir)..\..\..\msvc\ ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - nettle + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean MSB8012 - + +- $(RootNamespace)d_winrt - $(ProjectDir)..\..\..\msvc\ ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - nettle + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean MSB8012 - + +- lib$(RootNamespace)_winrt - $(ProjectDir)..\..\..\msvc\ ++ $(RootNamespace) + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- nettle_winrt -+ nettle + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean MSB8012 - + +- lib$(RootNamespace)_winrt - $(ProjectDir)..\..\..\msvc\ ++ $(RootNamespace) + $(ProjectDir)..\msvc\ - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- nettle_winrt -+ nettle + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean MSB8012 - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - nettle + +- $(RootNamespace)_winrt - $(ProjectDir)..\..\..\msvc\ ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean MSB8012 - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - nettle + +- $(RootNamespace)_winrt - $(ProjectDir)..\..\..\msvc\ ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean MSB8012 - - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- nettle_winrt + +- $(RootNamespace)_winrt - $(ProjectDir)..\..\..\msvc\ -+ nettle ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean MSB8012 - $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ -- nettle_winrt +- $(RootNamespace)_winrt - $(ProjectDir)..\..\..\msvc\ -+ nettle ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated Clean - MSB8012 - diff --git a/hogweed.pc.in b/hogweed.pc.in -index 97fb9d46a..ce977c02e 100644 ---- a/hogweed.pc.in +index 97fb9d4..ce977c0 100644 +--- a/hogweed.pc.in +++ b/hogweed.pc.in @@ -13,7 +13,7 @@ URL: http://www.lysator.liu.se/~nisse/nettle Version: @PACKAGE_VERSION@ @@ -554,8 +368,8 @@ index 97fb9d46a..ce977c02e 100644 Cflags: -I${includedir} diff --git a/nettle.pc.in b/nettle.pc.in -index eb0020caa..6e3ed1e4f 100644 ---- a/nettle.pc.in +index eb0020c..6e3ed1e 100644 +--- a/nettle.pc.in +++ b/nettle.pc.in @@ -7,5 +7,6 @@ Name: Nettle Description: Nettle low-level cryptographic library (symmetric algorithms) diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake index 616d9af2888326..2f7503eb5246da 100644 --- a/ports/nettle/portfile.cmake +++ b/ports/nettle/portfile.cmake @@ -2,13 +2,13 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ShiftMediaProject/nettle - REF 1d0a6e64e01458fdf37eaf5d90975deb52c3da41 #v3.5.1 - SHA512 6124fbd223e6519d88290c3f4e3b8cc399e038c9c77cfec38e6ab17b075846e662fd0360d62c132c882536489c8a865795f64059e2d2b21467f65d90320e5c39 + REF bf483378326c67d634977287dd576279734b7acc #v3.6 + SHA512 ba125a27c81a800be8bc8d1b0d4f3125587330ef64d8a605b4d3ae211fb675c5ef89e9bf4bcf63b07d0f004c6c5ff851630690cdd1eda6b5b8a526d84edffe73 HEAD_REF master - PATCHES gmp.patch - name.dir.patch - runtime.nettle.patch - runtime.hogweed.patch + PATCHES + gmp.patch + name.dir.patch + runtime.patch ) include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake) @@ -29,40 +29,35 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() #Setup YASM integration - set(_file "${SOURCE_PATH}/SMP/libnettle.vcxproj") - file(READ "${_file}" _contents) + set(_nettleproject) + set(_hogweedproject) + if(VCPKG_TARGET_IS_UWP) + set(_nettleproject "${SOURCE_PATH}/SMP/libnettle_winrt.vcxproj") + set(_hogweedproject "${SOURCE_PATH}/SMP/libhogweed_winrt.vcxproj") + else() + set(_nettleproject "${SOURCE_PATH}/SMP/libnettle.vcxproj") + set(_hogweedproject "${SOURCE_PATH}/SMP/libhogweed.vcxproj") + endif() + + file(READ "${_nettleproject}" _contents) string(REPLACE [[]] "" _contents "${_contents}") string(REPLACE [[]] "" _contents "${_contents}") - string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already replaced by another triplet - if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - STRING(REPLACE ">MultiThreadedDebugDLL<" ">MultiThreadedDebug<" _contents "${_contents}") - STRING(REPLACE ">MultiThreadedDLL<" ">MultiThreaded<" _contents "${_contents}") - else() - STRING(REPLACE ">MultiThreadedDebug<" ">MultiThreadedDebugDLL<" _contents "${_contents}") - STRING(REPLACE ">MultiThreaded<" ">MultiThreadedDLL<" _contents "${_contents}") - endif() - file(WRITE "${_file}" "${_contents}") - set(_file "${SOURCE_PATH}/SMP/libhogweed.vcxproj") - file(READ "${_file}" _contents) + string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already + file(WRITE "${_nettleproject}" "${_contents}") + + file(READ "${_hogweedproject}" _contents) string(REPLACE [[]] "" _contents "${_contents}") string(REPLACE [[]] "" _contents "${_contents}") - string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already replaced by another triplet - if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - STRING(REPLACE ">MultiThreadedDebugDLL<" ">MultiThreadedDebug<" _contents "${_contents}") - STRING(REPLACE ">MultiThreadedDLL<" ">MultiThreaded<" _contents "${_contents}") - else() - STRING(REPLACE ">MultiThreadedDebug<" ">MultiThreadedDebugDLL<" _contents "${_contents}") - STRING(REPLACE ">MultiThreaded<" ">MultiThreadedDLL<" _contents "${_contents}") - endif() - file(WRITE "${_file}" "${_contents}") + string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already + file(WRITE "${_hogweedproject}" "${_contents}") vcpkg_install_msbuild( USE_VCPKG_INTEGRATION @@ -79,7 +74,7 @@ if(VCPKG_TARGET_IS_WINDOWS) get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/include" "${CURRENT_PACKAGES_DIR}/include") - set(PACKAGE_VERSION 3.5.1) + set(PACKAGE_VERSION 3.6) set(prefix "${CURRENT_INSTALLED_DIR}") set(exec_prefix "\${prefix}") set(libdir "\${prefix}/lib") @@ -104,9 +99,9 @@ else() GITLAB_URL https://git.lysator.liu.se/ OUT_SOURCE_PATH SOURCE_PATH REPO nettle/nettle - REF ee5d62898cf070f08beedc410a8d7c418588bd95 #v3.5.1 - SHA512 881912548f4abb21460f44334de11439749c8a055830849a8beb4332071d11d9196d9eecaeba5bf822819d242356083fba91eb8719a64f90e41766826e6d75e1 - HEAD_REF master # branch name + REF 9e2bea82b9fb606bffd2d3f648e05248e146e54f #v3.6 + SHA512 008089eba2ef197a0ec6a266baac485e72051e646d19861f3fb605915a591bc2dd38edcb4ea7eaad958ea5d56f7744d42c25b691b49921a1285edd22f9c90b7f + HEAD_REF master PATCHES fix-InstallLibPath.patch ) diff --git a/ports/nettle/runtime.hogweed.patch b/ports/nettle/runtime.hogweed.patch deleted file mode 100644 index a096b77b7b6d19..00000000000000 --- a/ports/nettle/runtime.hogweed.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj -index 3f400af81..e5758ea27 100644 ---- a/SMP/libhogweed.vcxproj -+++ b/SMP/libhogweed.vcxproj -@@ -1066,6 +1066,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - false - 4113;%(TreatSpecificWarningsAsErrors) - 4146;4267;4028;4244;%(DisableSpecificWarnings) -+ MultiThreadedDebug - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -1190,6 +1191,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - false - 4113;%(TreatSpecificWarningsAsErrors) - 4146;4267;4028;4244;%(DisableSpecificWarnings) -+ MultiThreadedDebug - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -1574,6 +1576,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - false - 4113;%(TreatSpecificWarningsAsErrors) - 4146;4267;4028;4244;%(DisableSpecificWarnings) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x64\$(TargetName)$(TargetExt) -@@ -1703,6 +1706,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - false - 4113;%(TreatSpecificWarningsAsErrors) - 4146;4267;4028;4244;%(DisableSpecificWarnings) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x64\$(TargetName)$(TargetExt) -@@ -2097,6 +2101,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - $(OutDir)\lib\x64\$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) - 4146;4267;4028;4244;%(DisableSpecificWarnings) -+ MultiThreaded - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -2227,6 +2232,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - false - 4113;%(TreatSpecificWarningsAsErrors) - 4146;4267;4028;4244;%(DisableSpecificWarnings) -+ MultiThreaded - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -2902,6 +2908,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) - 4146;4267;4028;4244;%(DisableSpecificWarnings) -+ MultiThreadedDLL - - - true -@@ -3036,6 +3043,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) - 4146;4267;4028;4244;%(DisableSpecificWarnings) -+ MultiThreadedDLL - - - true -@@ -3172,6 +3180,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - false - 4113;%(TreatSpecificWarningsAsErrors) - 4146;4267;4028;4244;%(DisableSpecificWarnings) -+ MultiThreadedDLL - - - true -@@ -3310,6 +3319,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - false - 4113;%(TreatSpecificWarningsAsErrors) - 4146;4267;4028;4244;%(DisableSpecificWarnings) -+ MultiThreadedDLL - - - true diff --git a/ports/nettle/runtime.nettle.patch b/ports/nettle/runtime.nettle.patch deleted file mode 100644 index 33d147ededee2e..00000000000000 --- a/ports/nettle/runtime.nettle.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj -index 54f686af6..05b903ab9 100644 ---- a/SMP/libnettle.vcxproj -+++ b/SMP/libnettle.vcxproj -@@ -1206,6 +1206,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - false - 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4267;4098;%(DisableSpecificWarnings) -+ MultiThreadedDebug - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -1329,6 +1330,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - false - 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4267;4098;%(DisableSpecificWarnings) -+ MultiThreadedDebug - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -1710,6 +1712,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - false - 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4267;4098;%(DisableSpecificWarnings) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x64\$(TargetName)$(TargetExt) -@@ -1838,6 +1841,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - false - 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4267;4098;%(DisableSpecificWarnings) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x64\$(TargetName)$(TargetExt) -@@ -2229,6 +2233,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - $(OutDir)\lib\x64\$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4267;4098;%(DisableSpecificWarnings) -+ MultiThreaded - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -2358,6 +2363,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - false - 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4267;4098;%(DisableSpecificWarnings) -+ MultiThreaded - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -3028,6 +3034,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4267;4098;%(DisableSpecificWarnings) -+ MultiThreadedDLL - - - true -@@ -3161,6 +3168,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4267;4098;%(DisableSpecificWarnings) -+ MultiThreaded - - - true -@@ -3296,6 +3304,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - false - 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4267;4098;%(DisableSpecificWarnings) -+ MultiThreadedDLL - - - true -@@ -3433,6 +3442,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - false - 4113;%(TreatSpecificWarningsAsErrors) - 4244;4146;4267;4098;%(DisableSpecificWarnings) -+ MultiThreaded - - - true diff --git a/ports/nettle/runtime.patch b/ports/nettle/runtime.patch new file mode 100644 index 00000000000000..3c232d882a7e06 --- /dev/null +++ b/ports/nettle/runtime.patch @@ -0,0 +1,168 @@ +diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props +index 1eade47..ab279f4 100644 +--- a/SMP/smp_deps.props ++++ b/SMP/smp_deps.props +@@ -193,6 +193,7 @@ + $(OutDir)\lib\x86\$(TargetName).pdb + false + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDebug + + + $(OutDir)\lib\x86\$(TargetName)$(TargetExt) +@@ -211,6 +212,7 @@ + $(OutDir)\lib\x64\$(TargetName).pdb + false + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDebug + + + $(OutDir)\lib\x64\$(TargetName)$(TargetExt) +@@ -230,6 +232,7 @@ + $(IntDir)$(TargetName).pdb + false + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDebugDLL + + + $(OutDir)\bin\x86\$(TargetName)$(TargetExt) +@@ -253,6 +256,7 @@ + $(IntDir)$(TargetName).pdb + false + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDebugDLL + + + $(OutDir)\bin\x64\$(TargetName)$(TargetExt) +@@ -282,6 +286,7 @@ + SingleFile + $(OutDir)\lib\x86\$(TargetName).pdb + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreaded + + + $(OutDir)\lib\x86\$(TargetName)$(TargetExt) +@@ -307,6 +312,7 @@ + SingleFile + $(OutDir)\lib\x64\$(TargetName).pdb + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreaded + + + $(OutDir)\lib\x64\$(TargetName)$(TargetExt) +@@ -331,6 +337,7 @@ + $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(IntDir)$(TargetName).pdb + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDLL + + + true +@@ -362,6 +369,7 @@ + $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(IntDir)$(TargetName).pdb + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDLL + + + true +@@ -392,6 +400,7 @@ + $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(IntDir)$(TargetName).pdb + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDLL + + + true +@@ -423,6 +432,7 @@ + $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(IntDir)$(TargetName).pdb + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDLL + + + true +diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props +index b44482c..35ae231 100644 +--- a/SMP/smp_winrt_deps.props ++++ b/SMP/smp_winrt_deps.props +@@ -206,6 +206,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDebug + + + $(OutDir)\lib\x86\$(TargetName)$(TargetExt) +@@ -226,6 +227,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDebug + + + $(OutDir)\lib\x64\$(TargetName)$(TargetExt) +@@ -247,6 +249,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDebugDLL + + + $(OutDir)\bin\x86\$(TargetName)$(TargetExt) +@@ -274,6 +277,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDebugDLL + + + $(OutDir)\bin\x64\$(TargetName)$(TargetExt) +@@ -307,6 +311,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreaded + + + $(OutDir)\lib\x86\$(TargetName)$(TargetExt) +@@ -335,6 +340,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreaded + + + $(OutDir)\lib\x64\$(TargetName)$(TargetExt) +@@ -361,6 +367,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDLL + + + true +@@ -396,6 +403,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDLL + + + true +@@ -430,6 +438,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDLL + + + true +@@ -465,6 +474,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ MultiThreadedDLL + + + true diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3d16487a491cfd..aee28699552eab 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -402,8 +402,6 @@ gmmlib:x64-uwp=fail gmmlib:x64-windows=fail gmmlib:x64-windows-static=fail gmmlib:x86-windows=fail -# VS 2019 16.7 broke gmp UWP https://github.com/microsoft/vcpkg/issues/13172 -gmp:x64-uwp=fail google-cloud-cpp:arm64-windows=fail google-cloud-cpp:arm-uwp=fail google-cloud-cpp:x64-uwp=fail From c3cab608a00f4d094c1b287d86789c7874a30896 Mon Sep 17 00:00:00 2001 From: Igor Kostenko Date: Mon, 28 Dec 2020 20:18:43 +0000 Subject: [PATCH 0366/1694] [libsodium] use x64 specific gcc options only on x64 platform (#15269) --- ports/libsodium/CMakeLists.txt | 618 +++++++++++++++++---------------- ports/libsodium/CONTROL | 3 +- 2 files changed, 312 insertions(+), 309 deletions(-) diff --git a/ports/libsodium/CMakeLists.txt b/ports/libsodium/CMakeLists.txt index 474eb7e3dacb0a..9c074a2b1a5c7a 100644 --- a/ports/libsodium/CMakeLists.txt +++ b/ports/libsodium/CMakeLists.txt @@ -208,130 +208,111 @@ else () sodium_check_func(posix_memalign HAVE_POSIX_MEMALIGN) sodium_check_func(getpid HAVE_GETPID) - check_c_source_runs( - " - #pragma GCC target(\"mmx\") - #include - int main(void) - { - __m64 x = _mm_setzero_si64(); - } - " - HAVE_MMINTRIN_H - ) - - if (HAVE_MMINTRIN_H) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_MMINTRIN_H=1) - target_compile_options(${PROJECT_NAME} PRIVATE -mmmx) - endif () - - check_c_source_runs( - " - #pragma GCC target(\"sse2\") - #ifndef __SSE2__ - # define __SSE2__ - #endif - - #include - int main(void) { - __m128d x = _mm_setzero_pd(); - __m128i z = _mm_srli_epi64(_mm_setzero_si128(), 26); - } - " - HAVE_EMMINTRIN_H - ) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + check_c_source_runs( + " + #pragma GCC target(\"mmx\") + #include + int main(void) + { + __m64 x = _mm_setzero_si64(); + } + " + HAVE_MMINTRIN_H + ) - if (HAVE_EMMINTRIN_H) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_EMMINTRIN_H=1) - target_compile_options(${PROJECT_NAME} PRIVATE -msse2) - endif () + if (HAVE_MMINTRIN_H) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_MMINTRIN_H=1) + target_compile_options(${PROJECT_NAME} PRIVATE -mmmx) + endif () - check_c_source_runs( - " - #pragma GCC target(\"sse3\") - #include - int main(void) { - __m128 x = _mm_addsub_ps(_mm_cvtpd_ps(_mm_setzero_pd()), _mm_cvtpd_ps(_mm_setzero_pd())); - } - " - HAVE_PMMINTRIN_H - ) + check_c_source_runs( + " + #pragma GCC target(\"sse2\") + #ifndef __SSE2__ + # define __SSE2__ + #endif + + #include + int main(void) { + __m128d x = _mm_setzero_pd(); + __m128i z = _mm_srli_epi64(_mm_setzero_si128(), 26); + } + " + HAVE_EMMINTRIN_H + ) - if (HAVE_PMMINTRIN_H) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_PMMINTRIN_H=1) - target_compile_options(${PROJECT_NAME} PRIVATE -msse3) - endif () + if (HAVE_EMMINTRIN_H) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_EMMINTRIN_H=1) + target_compile_options(${PROJECT_NAME} PRIVATE -msse2) + endif () - check_c_source_runs( - " - #pragma GCC target(\"ssse3\") - #include - int main(void) { - __m64 x = _mm_abs_pi32(_m_from_int(0)); - } - " - HAVE_TMMINTRIN_H - ) + check_c_source_runs( + " + #pragma GCC target(\"sse3\") + #include + int main(void) { + __m128 x = _mm_addsub_ps(_mm_cvtpd_ps(_mm_setzero_pd()), _mm_cvtpd_ps(_mm_setzero_pd())); + } + " + HAVE_PMMINTRIN_H + ) - if (HAVE_TMMINTRIN_H) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_TMMINTRIN_H=1) - target_compile_options(${PROJECT_NAME} PRIVATE -mssse3) - endif () + if (HAVE_PMMINTRIN_H) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_PMMINTRIN_H=1) + target_compile_options(${PROJECT_NAME} PRIVATE -msse3) + endif () - check_c_source_runs( - " - #pragma GCC target(\"sse4.1\") - #include - int main(void) { - __m128i x = _mm_minpos_epu16(_mm_setzero_si128()); - } - " - HAVE_SMMINTRIN_H - ) + check_c_source_runs( + " + #pragma GCC target(\"ssse3\") + #include + int main(void) { + __m64 x = _mm_abs_pi32(_m_from_int(0)); + } + " + HAVE_TMMINTRIN_H + ) - if (HAVE_SMMINTRIN_H) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_SMMINTRIN_H=1) - target_compile_options(${PROJECT_NAME} PRIVATE -msse4.1) - endif () + if (HAVE_TMMINTRIN_H) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_TMMINTRIN_H=1) + target_compile_options(${PROJECT_NAME} PRIVATE -mssse3) + endif () - check_c_source_runs( - " - #ifdef __native_client__ - # error NativeClient detected - Avoiding AVX opcodes - #endif - #pragma GCC target(\"avx\") - #include - int main(void) { - _mm256_zeroall(); - } - " - HAVE_AVXINTRIN_H - ) + check_c_source_runs( + " + #pragma GCC target(\"sse4.1\") + #include + int main(void) { + __m128i x = _mm_minpos_epu16(_mm_setzero_si128()); + } + " + HAVE_SMMINTRIN_H + ) - if (HAVE_AVXINTRIN_H) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AVXINTRIN_H=1) - target_compile_options(${PROJECT_NAME} PRIVATE -mavx) - endif () + if (HAVE_SMMINTRIN_H) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_SMMINTRIN_H=1) + target_compile_options(${PROJECT_NAME} PRIVATE -msse4.1) + endif () - check_c_source_runs( - " - #ifdef __native_client__ - # error NativeClient detected - Avoiding AVX2 opcodes - #endif - #pragma GCC target(\"avx2\") - #include - int main(void) { - __m256 x = _mm256_set1_ps(3.14); - __m256 y = _mm256_permutevar8x32_ps(x, _mm256_set1_epi32(42)); - return _mm256_movemask_ps(_mm256_cmp_ps(x, y, _CMP_NEQ_OQ)); - } - " - HAVE_AVX2INTRIN_H - ) + check_c_source_runs( + " + #ifdef __native_client__ + # error NativeClient detected - Avoiding AVX opcodes + #endif + #pragma GCC target(\"avx\") + #include + int main(void) { + _mm256_zeroall(); + } + " + HAVE_AVXINTRIN_H + ) - if (HAVE_AVX2INTRIN_H) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AVX2INTRIN_H=1) - target_compile_options(${PROJECT_NAME} PRIVATE -mavx2) + if (HAVE_AVXINTRIN_H) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AVXINTRIN_H=1) + target_compile_options(${PROJECT_NAME} PRIVATE -mavx) + endif () check_c_source_runs( " @@ -341,229 +322,250 @@ else () #pragma GCC target(\"avx2\") #include int main(void) { - __m256i y = _mm256_broadcastsi128_si256(_mm_setzero_si128()); + __m256 x = _mm256_set1_ps(3.14); + __m256 y = _mm256_permutevar8x32_ps(x, _mm256_set1_epi32(42)); + return _mm256_movemask_ps(_mm256_cmp_ps(x, y, _CMP_NEQ_OQ)); } " - _mm256_broadcastsi128_si256_DEFINED + HAVE_AVX2INTRIN_H ) - if (NOT _mm256_broadcastsi128_si256_DEFINED) - target_compile_definitions(${PROJECT_NAME} - PRIVATE - _mm256_broadcastsi128_si256=_mm_broadcastsi128_si256 + if (HAVE_AVX2INTRIN_H) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AVX2INTRIN_H=1) + target_compile_options(${PROJECT_NAME} PRIVATE -mavx2) + + check_c_source_runs( + " + #ifdef __native_client__ + # error NativeClient detected - Avoiding AVX2 opcodes + #endif + #pragma GCC target(\"avx2\") + #include + int main(void) { + __m256i y = _mm256_broadcastsi128_si256(_mm_setzero_si128()); + } + " + _mm256_broadcastsi128_si256_DEFINED ) + + if (NOT _mm256_broadcastsi128_si256_DEFINED) + target_compile_definitions(${PROJECT_NAME} + PRIVATE + _mm256_broadcastsi128_si256=_mm_broadcastsi128_si256 + ) + endif () endif () - endif () - check_c_source_runs( - " - #ifdef __native_client__ - # error NativeClient detected - Avoiding AVX512F opcodes - #endif - #pragma GCC target(\"avx512f\") - #include - - #ifndef __AVX512F__ - # error No AVX512 support - #elif defined(__clang__) - # if __clang_major__ < 4 - # error Compiler AVX512 support may be broken - # endif - #elif defined(__GNUC__) - # if __GNUC__ < 6 - # error Compiler AVX512 support may be broken - # endif - #endif - - int main(void) { - __m512i x = _mm512_setzero_epi32(); - __m512i y = _mm512_permutexvar_epi64(_mm512_setr_epi64(0, 1, 4, 5, 2, 3, 6, 7), x); - } - " - HAVE_AVX512FINTRIN_H - ) + check_c_source_runs( + " + #ifdef __native_client__ + # error NativeClient detected - Avoiding AVX512F opcodes + #endif + #pragma GCC target(\"avx512f\") + #include + + #ifndef __AVX512F__ + # error No AVX512 support + #elif defined(__clang__) + # if __clang_major__ < 4 + # error Compiler AVX512 support may be broken + # endif + #elif defined(__GNUC__) + # if __GNUC__ < 6 + # error Compiler AVX512 support may be broken + # endif + #endif + + int main(void) { + __m512i x = _mm512_setzero_epi32(); + __m512i y = _mm512_permutexvar_epi64(_mm512_setr_epi64(0, 1, 4, 5, 2, 3, 6, 7), x); + } + " + HAVE_AVX512FINTRIN_H + ) - if (HAVE_AVX512FINTRIN_H) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AVX512FINTRIN_H=1) - target_compile_options(${PROJECT_NAME} PRIVATE -mavx512f) - else () - target_compile_options(${PROJECT_NAME} PRIVATE -mno-avx512f) - endif () + if (HAVE_AVX512FINTRIN_H) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AVX512FINTRIN_H=1) + target_compile_options(${PROJECT_NAME} PRIVATE -mavx512f) + else () + target_compile_options(${PROJECT_NAME} PRIVATE -mno-avx512f) + endif () - check_c_source_runs( - " - #ifdef __native_client__ - # error NativeClient detected - Avoiding AESNI opcodes - #endif - #pragma GCC target(\"aes\") - #pragma GCC target(\"pclmul\") - #include + check_c_source_runs( + " + #ifdef __native_client__ + # error NativeClient detected - Avoiding AESNI opcodes + #endif + #pragma GCC target(\"aes\") + #pragma GCC target(\"pclmul\") + #include - int main(void) { - __m128i x = _mm_aesimc_si128(_mm_setzero_si128()); - __m128i y = _mm_clmulepi64_si128(_mm_setzero_si128(), _mm_setzero_si128(), 0); - } - " - HAVE_WMMINTRIN_H - ) + int main(void) { + __m128i x = _mm_aesimc_si128(_mm_setzero_si128()); + __m128i y = _mm_clmulepi64_si128(_mm_setzero_si128(), _mm_setzero_si128(), 0); + } + " + HAVE_WMMINTRIN_H + ) - if (HAVE_WMMINTRIN_H) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_WMMINTRIN_H=1) - target_compile_options(${PROJECT_NAME} PRIVATE -maes -mpclmul) - endif () + if (HAVE_WMMINTRIN_H) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_WMMINTRIN_H=1) + target_compile_options(${PROJECT_NAME} PRIVATE -maes -mpclmul) + endif () - check_c_source_runs( - " - #ifdef __native_client__ - # error NativeClient detected - Avoiding RDRAND opcodes - #endif - #pragma GCC target(\"rdrnd\") - #include + check_c_source_runs( + " + #ifdef __native_client__ + # error NativeClient detected - Avoiding RDRAND opcodes + #endif + #pragma GCC target(\"rdrnd\") + #include - int main(void) { - unsigned long long x; - _rdrand64_step(&x); - } - " - HAVE_RDRAND - ) + int main(void) { + unsigned long long x; + _rdrand64_step(&x); + } + " + HAVE_RDRAND + ) - if (HAVE_RDRAND) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_RDRAND=1) - target_compile_options(${PROJECT_NAME} PRIVATE -mrdrnd) - endif () + if (HAVE_RDRAND) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_RDRAND=1) + target_compile_options(${PROJECT_NAME} PRIVATE -mrdrnd) + endif () - check_c_source_runs( - " - #include + check_c_source_runs( + " + #include - int main(void) { - (void) _xgetbv(0); - } - " - HAVE__XGETBV - ) + int main(void) { + (void) _xgetbv(0); + } + " + HAVE__XGETBV + ) - if (HAVE__XGETBV) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE__XGETBV=1) - endif () + if (HAVE__XGETBV) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE__XGETBV=1) + endif () - check_c_source_runs( - " - int main(void) { - int a = 42; - int *pnt = &a; - __asm__ __volatile__ (\"\" : : \"r\"(pnt) : \"memory\"); - } - " - HAVE_INLINE_ASM - ) + check_c_source_runs( + " + int main(void) { + int a = 42; + int *pnt = &a; + __asm__ __volatile__ (\"\" : : \"r\"(pnt) : \"memory\"); + } + " + HAVE_INLINE_ASM + ) - if (HAVE_INLINE_ASM) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_INLINE_ASM=1) - endif () + if (HAVE_INLINE_ASM) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_INLINE_ASM=1) + endif () - check_c_source_runs( - " - int main(void) { - #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__) - # if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64) - # error Windows x86_64 calling conventions are not supported yet - # endif - /* neat */ - #else - # error !x86_64 - #endif - unsigned char i = 0, o = 0, t; - __asm__ __volatile__ (\"pxor %%xmm12, %%xmm6 \n\" - \"movb (%[i]), %[t] \n\" - \"addb %[t], (%[o]) \n\" - : [t] \"=&r\"(t) - : [o] \"D\"(&o), [i] \"S\"(&i) - : \"memory\", \"flags\", \"cc\"); - } - " - HAVE_AMD64_ASM - ) + check_c_source_runs( + " + int main(void) { + #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__) + # if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64) + # error Windows x86_64 calling conventions are not supported yet + # endif + /* neat */ + #else + # error !x86_64 + #endif + unsigned char i = 0, o = 0, t; + __asm__ __volatile__ (\"pxor %%xmm12, %%xmm6 \n\" + \"movb (%[i]), %[t] \n\" + \"addb %[t], (%[o]) \n\" + : [t] \"=&r\"(t) + : [o] \"D\"(&o), [i] \"S\"(&i) + : \"memory\", \"flags\", \"cc\"); + } + " + HAVE_AMD64_ASM + ) - if (HAVE_AMD64_ASM) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AMD64_ASM=1) - endif () + if (HAVE_AMD64_ASM) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AMD64_ASM=1) + endif () - check_c_source_runs( - " - int main(void) { - #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__) - # if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64) - # error Windows x86_64 calling conventions are not supported yet - # endif - /* neat */ - #else - # error !x86_64 - #endif - __asm__ __volatile__ (\"vpunpcklqdq %xmm0,%xmm13,%xmm0\"); - } - " - HAVE_AVX_ASM - ) + check_c_source_runs( + " + int main(void) { + #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__) + # if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64) + # error Windows x86_64 calling conventions are not supported yet + # endif + /* neat */ + #else + # error !x86_64 + #endif + __asm__ __volatile__ (\"vpunpcklqdq %xmm0,%xmm13,%xmm0\"); + } + " + HAVE_AVX_ASM + ) - if (HAVE_AVX_ASM) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AVX_ASM=1) - endif () + if (HAVE_AVX_ASM) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AVX_ASM=1) + endif () - check_c_source_runs( - " - #if !defined(__clang__) && !defined(__GNUC__) && !defined(__SIZEOF_INT128__) - # error mode(TI) is a gcc extension, and __int128 is not available - #endif - #if defined(__clang__) && !defined(__x86_64__) && !defined(__aarch64__) - # error clang does not properly handle the 128-bit type on 32-bit systems - #endif - #ifndef NATIVE_LITTLE_ENDIAN - # error libsodium currently expects a little endian CPU for the 128-bit type - #endif - #ifdef __EMSCRIPTEN__ - # error emscripten currently doesn't support some operations on integers larger than 64 bits - #endif - #include - #include - #if defined(__SIZEOF_INT128__) - typedef unsigned __int128 uint128_t; - #else - typedef unsigned uint128_t __attribute__((mode(TI))); - #endif - void fcontract(uint128_t *t) { - *t += 0x8000000000000 - 1; - *t *= *t; - *t >>= 84; - } + check_c_source_runs( + " + #if !defined(__clang__) && !defined(__GNUC__) && !defined(__SIZEOF_INT128__) + # error mode(TI) is a gcc extension, and __int128 is not available + #endif + #if defined(__clang__) && !defined(__x86_64__) && !defined(__aarch64__) + # error clang does not properly handle the 128-bit type on 32-bit systems + #endif + #ifndef NATIVE_LITTLE_ENDIAN + # error libsodium currently expects a little endian CPU for the 128-bit type + #endif + #ifdef __EMSCRIPTEN__ + # error emscripten currently doesn't support some operations on integers larger than 64 bits + #endif + #include + #include + #if defined(__SIZEOF_INT128__) + typedef unsigned __int128 uint128_t; + #else + typedef unsigned uint128_t __attribute__((mode(TI))); + #endif + void fcontract(uint128_t *t) { + *t += 0x8000000000000 - 1; + *t *= *t; + *t >>= 84; + } - int main(void) { - (void) fcontract; - } - " - HAVE_TI_MODE - ) + int main(void) { + (void) fcontract; + } + " + HAVE_TI_MODE + ) - if (HAVE_TI_MODE) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_TI_MODE=1) - endif () + if (HAVE_TI_MODE) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_TI_MODE=1) + endif () - check_c_source_runs( - " - int main(void) { - unsigned int cpu_info[4]; - __asm__ __volatile__ (\"xchgl %%ebx, %k1; cpuid; xchgl %%ebx, %k1\" : - \"=a\" (cpu_info[0]), \"=&r\" (cpu_info[1]), - \"=c\" (cpu_info[2]), \"=d\" (cpu_info[3]) : - \"0\" (0U), \"2\" (0U)); - } - " - HAVE_CPUID - ) + check_c_source_runs( + " + int main(void) { + unsigned int cpu_info[4]; + __asm__ __volatile__ (\"xchgl %%ebx, %k1; cpuid; xchgl %%ebx, %k1\" : + \"=a\" (cpu_info[0]), \"=&r\" (cpu_info[1]), + \"=c\" (cpu_info[2]), \"=d\" (cpu_info[3]) : + \"0\" (0U), \"2\" (0U)); + } + " + HAVE_CPUID + ) - if (HAVE_CPUID) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_CPUID=1) + if (HAVE_CPUID) + target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_CPUID=1) + endif () endif () check_c_source_runs( diff --git a/ports/libsodium/CONTROL b/ports/libsodium/CONTROL index 4ae58fabbcc3c5..813f4dcb1bfb56 100644 --- a/ports/libsodium/CONTROL +++ b/ports/libsodium/CONTROL @@ -1,4 +1,5 @@ Source: libsodium -Version: 1.0.18-2 +Version: 1.0.18 +Port-Version: 3 Description: A modern and easy-to-use crypto library Homepage: https://github.com/jedisct1/libsodium From 5caa5ca7f70dbda5704a4a146dbeaacea23e647d Mon Sep 17 00:00:00 2001 From: Kevin Lalumiere Date: Mon, 28 Dec 2020 15:23:45 -0500 Subject: [PATCH 0367/1694] Allow B2_OPTIONS_[DBG|REL] in BOOST_CMAKE_FRAGMENT (#15274) --- ports/boost-modular-build-helper/CONTROL | 1 + ports/boost-modular-build-helper/boost-modular-build.cmake | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index ff13adf8319923..731ee7f634e2d8 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,3 +1,4 @@ Source: boost-modular-build-helper Version: 1.75.0 +Port-Version: 1 Build-Depends: boost-uninstall \ No newline at end of file diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index adcd689518eca7..5bb07ba4626c37 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -213,7 +213,7 @@ function(boost_modular_build) else() list(APPEND B2_OPTIONS threadapi=pthread) endif() - set(B2_OPTIONS_DBG + list(APPEND B2_OPTIONS_DBG -sZLIB_BINARY=zlibd "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib" -sBZIP2_BINARY=bz2d @@ -224,7 +224,7 @@ function(boost_modular_build) "-sZSTD_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib" ) - set(B2_OPTIONS_REL + list(APPEND B2_OPTIONS_REL -sZLIB_BINARY=zlib "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/lib" -sBZIP2_BINARY=bz2 From 57561a8e28c6fea1190c4b8c0cd39f6d0e316886 Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Mon, 28 Dec 2020 14:25:50 -0600 Subject: [PATCH 0368/1694] [gloo] New Port (#15219) --- ports/gloo/portfile.cmake | 32 ++++++++++++++++++++++++++++++++ ports/gloo/vcpkg.json | 28 ++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 ports/gloo/portfile.cmake create mode 100644 ports/gloo/vcpkg.json diff --git a/ports/gloo/portfile.cmake b/ports/gloo/portfile.cmake new file mode 100644 index 00000000000000..cc168af4a3ce59 --- /dev/null +++ b/ports/gloo/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebookincubator/gloo + REF 1da21174054eaabbbd189b7f657ea24842d821e2 + SHA512 ebd8369e413aee739a3928f8e6738c15708f009e0cd5a3763b8cadbe6f6d0a9d758585a7a2b0f7dd6d39a12882ff2f9497ab2d4edcebd4eb2a7237ab857f317e + HEAD_REF master + ) + +# Determine which backend to build via specified feature +vcpkg_check_features( + OUT_FEATURE_OPTIONS GLOO_FEATURE_OPTIONS + FEATURES + mpi USE_MPI + redis USE_REDIS + ) + +if ("cuda" IN_LIST FEATURES) + list(APPEND GLOO_FEATURE_OPTIONS "-DUSE_CUDA=1" "-DUSE_NCCL=1") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${GLOO_FEATURE_OPTIONS} + ) +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/Gloo) +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) diff --git a/ports/gloo/vcpkg.json b/ports/gloo/vcpkg.json new file mode 100644 index 00000000000000..15c4593c1d3c43 --- /dev/null +++ b/ports/gloo/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "gloo", + "version-string": "20201203", + "description": "Collective communications library with various primitives for multi-machine training.", + "homepage": "https://github.com/facebookincubator/gloo", + "supports": "x64 & linux", + "features": { + "cuda": { + "description": "for CUDA aware algorithms", + "dependencies": [ + "cuda", + "nccl" + ] + }, + "mpi": { + "description": "for coordinating machine rendezvous through MPI", + "dependencies": [ + "openmpi" + ] + }, + "redis": { + "description": "for coordinating machine rendezvous through Redis", + "dependencies": [ + "hiredis" + ] + } + } +} From e9068e0fd43cfa398424330cf7471a96d2196625 Mon Sep 17 00:00:00 2001 From: HrOokami <4591995+faserg1@users.noreply.github.com> Date: Mon, 28 Dec 2020 23:32:51 +0300 Subject: [PATCH 0369/1694] [GLIBMM] Installing .pc file (#14988) --- ports/atkmm/CONTROL | 4 +- ports/atkmm/portfile.cmake | 76 +++++++++++++++++++--------------- ports/glib/CMakeLists.txt | 2 + ports/glib/CONTROL | 2 +- ports/glibmm/CMakeLists.txt | 30 +++++++++++++- ports/glibmm/CONTROL | 2 +- ports/glibmm/portfile.cmake | 2 + ports/libsigcpp/CMakeLists.txt | 9 ++++ ports/libsigcpp/CONTROL | 1 + ports/libsigcpp/portfile.cmake | 1 + ports/libxmlpp/CMakeLists.txt | 2 +- ports/libxmlpp/CONTROL | 2 +- 12 files changed, 92 insertions(+), 41 deletions(-) diff --git a/ports/atkmm/CONTROL b/ports/atkmm/CONTROL index 8192383d888094..be3787e177b4eb 100644 --- a/ports/atkmm/CONTROL +++ b/ports/atkmm/CONTROL @@ -1,7 +1,7 @@ Source: atkmm Version: 2.24.2 -Port-Version: 3 +Port-Version: 4 Homepage: https://www.gtkmm.org 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. Build-Depends: glib, gettext, atk, glibmm -Supports: !(linux | osx) +Supports: !(osx) diff --git a/ports/atkmm/portfile.cmake b/ports/atkmm/portfile.cmake index 9795881ece1a6e..91e82a2dfa34b2 100644 --- a/ports/atkmm/portfile.cmake +++ b/ports/atkmm/portfile.cmake @@ -1,6 +1,6 @@ -vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") - -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() vcpkg_download_distfile(ARCHIVE URLS "http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.24/atkmm-2.24.2.tar.xz" @@ -16,36 +16,44 @@ vcpkg_extract_source_archive_ex( fix_charset.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013) - -set(VS_PLATFORM ${VCPKG_TARGET_ARCHITECTURE}) -if(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86) - set(VS_PLATFORM "Win32") -endif(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86) -vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/MSVC_Net2013/atkmm.sln - TARGET atkmm - PLATFORM ${VS_PLATFORM} - USE_VCPKG_INTEGRATION -) - -# Handle headers -file(COPY ${SOURCE_PATH}/MSVC_Net2013/atkmm/atkmmconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/atk/atkmm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/atk/atkmm - DESTINATION ${CURRENT_PACKAGES_DIR}/include - FILES_MATCHING PATTERN *.h) - -# Handle libraries -file(COPY ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(COPY ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(COPY ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) -file(COPY ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - -vcpkg_copy_pdbs() +if (VCPKG_TARGET_IS_WINDOWS) + file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013) + + set(VS_PLATFORM ${VCPKG_TARGET_ARCHITECTURE}) + if(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86) + set(VS_PLATFORM "Win32") + endif(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86) + vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/MSVC_Net2013/atkmm.sln + TARGET atkmm + PLATFORM ${VS_PLATFORM} + USE_VCPKG_INTEGRATION + ) + + # Handle headers + file(COPY ${SOURCE_PATH}/MSVC_Net2013/atkmm/atkmmconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(COPY ${SOURCE_PATH}/atk/atkmm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(COPY ${SOURCE_PATH}/atk/atkmm + DESTINATION ${CURRENT_PACKAGES_DIR}/include + FILES_MATCHING PATTERN *.h) + + # Handle libraries + file(COPY ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + + vcpkg_copy_pdbs() +else() + set(ENV{CONFIG_SHELL} bash) + vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH} OPTIONS ${ATKMM_OPTIONS}) + + vcpkg_install_make() +endif() 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/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index cc24a2f63ae00b..144f1177655bf5 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -361,6 +361,8 @@ set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(libdir ${CMAKE_INSTALL_PREFIX}/lib) set(includedir ${CMAKE_INSTALL_PREFIX}/include) +set(PCRE_REQUIRES libpcre) +set(LIBFFI_LIBS "-lffi") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/glib-2.0.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/glib-2.0.pc" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gobject-2.0.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/gobject-2.0.pc" @ONLY) diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index 8d74d5613b3244..a842f65e89fece 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -1,6 +1,6 @@ Source: glib Version: 2.52.3 -Port-Version: 23 +Port-Version: 24 Homepage: https://developer.gnome.org/glib/ Description: Portable, general-purpose utility library. Build-Depends: zlib, pcre, libffi, gettext, libiconv diff --git a/ports/glibmm/CMakeLists.txt b/ports/glibmm/CMakeLists.txt index 15f7bff129075c..3e34075d9dfe70 100644 --- a/ports/glibmm/CMakeLists.txt +++ b/ports/glibmm/CMakeLists.txt @@ -3,6 +3,10 @@ project(glibmm) set(CMAKE_CXX_STANDARD 17) +set(GLIBMM_DLL_SUFFIX 2) +set(GLIBMM_LIB_SUFFIX 2.0) +set(GLIBMM_EXTRA_LIB_SUFFIX 2.4) + find_path(GLIB_INCLUDE_DIR NAMES glib.h) find_library(GLIB_LIBRARY NAMES glib-2.0) find_library(GIO_LIBRARY NAMES gio-2.0) @@ -82,6 +86,25 @@ file(GLOB GLIBMM_SOURCES glib/glibmm/*.cc) add_library(glibmm ${GLIBMM_SOURCES}) target_compile_definitions(glibmm PRIVATE -DGLIBMM_BUILD) target_include_directories(glibmm PUBLIC glib ${CMAKE_BINARY_DIR}/config/glib) +set_target_properties(glibmm PROPERTIES OUTPUT_NAME glibmm-${GLIBMM_DLL_SUFFIX} ARCHIVE_OUTPUT_NAME glibmm-${GLIBMM_LIB_SUFFIX}) + +set(GLIBMM_EXTRA_SOURCES tools/extra_defs_gen/generate_extra_defs.cc) +add_library(glibmm_generate_extra_defs ${GLIBMM_EXTRA_SOURCES}) +target_include_directories(glibmm_generate_extra_defs PUBLIC glib ${CMAKE_BINARY_DIR}/config/glib) +set_target_properties(glibmm_generate_extra_defs PROPERTIES + OUTPUT_NAME glibmm_generate_extra_defs-${GLIBMM_EXTRA_LIB_SUFFIX} + ARCHIVE_OUTPUT_NAME glibmm_generate_extra_defs-${GLIBMM_EXTRA_LIB_SUFFIX}) + +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${CMAKE_INSTALL_PREFIX}) +set(libdir ${CMAKE_INSTALL_PREFIX}/lib) +set(includedir ${CMAKE_INSTALL_PREFIX}/include) +set(GLIBMM_API_VERSION 2.0) +set(GLIBMM_MODULE_NAME glibmm) +set(PACKAGE_VERSION 2.52.1) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/glib/glibmm.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/glibmm.pc" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glibmm.pc" DESTINATION lib/pkgconfig) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glibmm.pc" DESTINATION lib/pkgconfig RENAME glibmm-2.4.pc) file(GLOB GIOMM_SOURCES gio/giomm/*.cc) if(WIN32) @@ -93,7 +116,7 @@ target_link_libraries(giomm PUBLIC glibmm) target_include_directories(giomm PUBLIC gio ${CMAKE_BINARY_DIR}/config/gio) install( - TARGETS glibmm giomm + TARGETS glibmm giomm glibmm_generate_extra_defs RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib @@ -113,6 +136,11 @@ if(NOT DISABLE_INSTALL_HEADERS) DESTINATION include FILES_MATCHING PATTERN *.h ) + install( + DIRECTORY tools/extra_defs_gen/ + DESTINATION include/glibmm_generate_extra_defs/ + FILES_MATCHING PATTERN *.h + ) endif() if(NOT DISABLE_EXAMPLES) diff --git a/ports/glibmm/CONTROL b/ports/glibmm/CONTROL index 59836db6f55517..3b2338943760f6 100644 --- a/ports/glibmm/CONTROL +++ b/ports/glibmm/CONTROL @@ -1,6 +1,6 @@ Source: glibmm Version: 2.52.1 -Port-Version: 12 +Port-Version: 13 Description: This is glibmm, a C++ API for parts of glib that are useful for C++. Homepage: https://www.gtkmm.org. Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake index 87551d23a77f80..f2ec0a935fc3df 100644 --- a/ports/glibmm/portfile.cmake +++ b/ports/glibmm/portfile.cmake @@ -31,6 +31,8 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + # Handle copyright and readme file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME readme.txt) \ No newline at end of file diff --git a/ports/libsigcpp/CMakeLists.txt b/ports/libsigcpp/CMakeLists.txt index 9c43b1a1bccd30..e5a1dbee0d6eba 100644 --- a/ports/libsigcpp/CMakeLists.txt +++ b/ports/libsigcpp/CMakeLists.txt @@ -57,3 +57,12 @@ if(NOT SIGCPP_SKIP_HEADERS) install(FILES sigc++/functors/slot.h DESTINATION include/sigc++/functors) install(FILES sigc++/functors/slot_base.h DESTINATION include/sigc++/functors) endif() + +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${CMAKE_INSTALL_PREFIX}) +set(libdir ${CMAKE_INSTALL_PREFIX}/lib) +set(includedir ${CMAKE_INSTALL_PREFIX}/include) +set(SIGCXX_API_VERSION "2.0") +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sigc++.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/sigc++.pc" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sigc++.pc" DESTINATION lib/pkgconfig) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sigc++.pc" DESTINATION lib/pkgconfig RENAME sigc++-2.0.pc) diff --git a/ports/libsigcpp/CONTROL b/ports/libsigcpp/CONTROL index 617328c7b9da04..8febf8011ad85e 100644 --- a/ports/libsigcpp/CONTROL +++ b/ports/libsigcpp/CONTROL @@ -1,3 +1,4 @@ Source: libsigcpp Version: 2.10-3 +Port-Version: 1 Description: Typesafe callback framework for C++ diff --git a/ports/libsigcpp/portfile.cmake b/ports/libsigcpp/portfile.cmake index e7214e0baf9ec5..74f26c32e6e593 100644 --- a/ports/libsigcpp/portfile.cmake +++ b/ports/libsigcpp/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(READ ${CURRENT_PACKAGES_DIR}/include/sigc++config.h SIGCPPCONFIG_H) diff --git a/ports/libxmlpp/CMakeLists.txt b/ports/libxmlpp/CMakeLists.txt index 0ff2f23fe77b99..2a36ed7ba3782a 100644 --- a/ports/libxmlpp/CMakeLists.txt +++ b/ports/libxmlpp/CMakeLists.txt @@ -4,7 +4,7 @@ project(libxmlpp) set(CMAKE_CXX_STANDARD 17) find_path(GLIBMM_INCLUDE_DIR NAMES glibmm.h) -find_library(GLIBMM_LIBRARY NAMES glibmm) +find_library(GLIBMM_LIBRARY NAMES glibmm glibmm-2.0) find_library(GIOMM_LIBRARY NAMES giomm) find_library(GLIB_LIBRARY NAMES glib glib-2.0) find_library(GIO_LIBRARY NAMES gio gio-2.0) diff --git a/ports/libxmlpp/CONTROL b/ports/libxmlpp/CONTROL index b737bde3c9ecfa..0c76b120cffe59 100644 --- a/ports/libxmlpp/CONTROL +++ b/ports/libxmlpp/CONTROL @@ -1,5 +1,5 @@ Source: libxmlpp Version: 2.40.1 -Port-Version: 6 +Port-Version: 7 Description: a C++ wrapper for the libxml XML parser library. Build-Depends: libxml2, glibmm From 830772c631eb3545e332a729ea998ff1f55fce67 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Tue, 29 Dec 2020 05:37:54 +0900 Subject: [PATCH 0370/1694] [ijg-libjpeg] add new port (#14583) --- ports/ijg-libjpeg/CMakeLists.txt | 63 ++++++++++++++++++++++++++++++++ ports/ijg-libjpeg/portfile.cmake | 51 ++++++++++++++++++++++++++ ports/ijg-libjpeg/vcpkg.json | 7 ++++ scripts/ci.baseline.txt | 9 +++++ 4 files changed, 130 insertions(+) create mode 100644 ports/ijg-libjpeg/CMakeLists.txt create mode 100644 ports/ijg-libjpeg/portfile.cmake create mode 100644 ports/ijg-libjpeg/vcpkg.json diff --git a/ports/ijg-libjpeg/CMakeLists.txt b/ports/ijg-libjpeg/CMakeLists.txt new file mode 100644 index 00000000000000..e1a9dcf5cac521 --- /dev/null +++ b/ports/ijg-libjpeg/CMakeLists.txt @@ -0,0 +1,63 @@ +cmake_minimum_required(VERSION 3.13) +project(libjpeg LANGUAGES C) + +option(BUILD_EXECUTABLES OFF) + +# +# jconfig.h is a public header, so it must be genrated. Please reference the install.txt in jpegsr9d.zip +# +# jconfig.txt should contain #cmakedefine which is modified by porfile.cmake of ijg-libjpeg port in VcPkg +# By doing this we can skip 'configure' step. Visit https://github.com/LuaDist/libjpeg +# +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) + +list(APPEND PUBLIC_HEADERS jpeglib.h jerror.h jmorecfg.h jconfig.h) + +add_library(jpeg + ${PUBLIC_HEADERS} jinclude.h jpegint.h jversion.h + transupp.h jidctflt.c jidctfst.c jidctint.c jquant1.c jquant2.c jutils.c jmemnobs.c jaricom.c jerror.c jdatadst.c jdatasrc.c + jmemsys.h + jmemmgr.c + cdjpeg.h cderror.h + jcmaster.c jcmarker.c jcmainct.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c jcsample.c jctrans.c jcinit.c jcomapi.c jcparam.c jcprepct.c + jdmaster.c jdmarker.c jdmainct.c jdapimin.c jdapistd.c jdarith.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdsample.c jdtrans.c jdinput.c jdmerge.c jdpostct.c + jdct.h + jfdctflt.c jfdctfst.c jfdctint.c +) + +if(WIN32) + target_compile_definitions(jpeg + PRIVATE + _CRT_SECURE_NO_WARNINGS + ) +endif() + +install(FILES ${PUBLIC_HEADERS} + DESTINATION ${CMAKE_INSTALL_PREFIX}/include +) +install(TARGETS jpeg + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib +) + +if(BUILD_EXECUTABLES) + add_executable(cjpeg cdjpeg.c cjpeg.c rdbmp.c rdgif.c rdppm.c rdrle.c rdtarga.c rdswitch.c) + target_link_libraries(cjpeg PRIVATE jpeg) + + add_executable(djpeg cdjpeg.c djpeg.c wrbmp.c wrgif.c wrppm.c wrrle.c wrtarga.c rdcolmap.c) + target_link_libraries(djpeg PRIVATE jpeg) + + add_executable(jpegtran jpegtran.c cdjpeg.c rdswitch.c transupp.c) + target_link_libraries(jpegtran PRIVATE jpeg) + + add_executable(rdjpgcom rdjpgcom.c) + add_executable(wrjpgcom wrjpgcom.c) + + install(TARGETS cjpeg djpeg jpegtran rdjpgcom wrjpgcom + DESTINATION ${CMAKE_INSTALL_PREFIX}/tools + ) +endif() diff --git a/ports/ijg-libjpeg/portfile.cmake b/ports/ijg-libjpeg/portfile.cmake new file mode 100644 index 00000000000000..5c0055440e4aff --- /dev/null +++ b/ports/ijg-libjpeg/portfile.cmake @@ -0,0 +1,51 @@ +if(EXISTS ${CURRENT_INSTALLED_DIR}/share/libturbo-jpeg/copyright) + message(FATAL_ERROR "'${PORT}' conflicts with 'libturbo-jpeg'. Please remove libturbo-jpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() +if(EXISTS ${CURRENT_INSTALLED_DIR}/share/mozjpeg/copyright) + message(FATAL_ERROR "'${PORT}' conflicts with 'mozjpeg'. Please remove mozjpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "http://www.ijg.org/files/jpegsr9d.zip" + FILENAME "jpegsr9d.zip" + SHA512 441a783c945fd549693dbe3932d8d35e1ea00d8464870646760ed84a636facb4d7afe0ca3ab988e7281a71e41c2e96be618b8c6a898f116517e639720bba82a3 +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +# 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 + "#define HAVE_STDDEF_H" + "#cmakedefine HAVE_STDDEF_H" +) +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}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_EXECUTABLES=OFF # supports [tools] feature to enable this option? +) +vcpkg_install_cmake() +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) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + 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) diff --git a/ports/ijg-libjpeg/vcpkg.json b/ports/ijg-libjpeg/vcpkg.json new file mode 100644 index 00000000000000..cf39b27f2359fd --- /dev/null +++ b/ports/ijg-libjpeg/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ijg-libjpeg", + "version-string": "9d", + "description": "Independent JPEG Group's JPEG software", + "homepage": "http://www.ijg.org/", + "supports": "!emscripten & !wasm32" +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index aee28699552eab..9e57d1be0c9c4e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -458,6 +458,15 @@ ignition-msgs5:arm64-windows=fail ignition-msgs5:arm-uwp=fail ignition-msgs5:x64-uwp=fail ignition-msgs5:x64-osx=skip +# Conflicts with libjpeg-turbo, mozjpeg +ijg-libjpeg:arm64-windows = skip +ijg-libjpeg:arm-uwp = skip +ijg-libjpeg:x64-linux = skip +ijg-libjpeg:x64-osx = skip +ijg-libjpeg:x64-uwp = skip +ijg-libjpeg:x64-windows = skip +ijg-libjpeg:x64-windows-static = skip +ijg-libjpeg:x86-windows = skip intel-ipsec:arm64-windows=fail intel-ipsec:arm-uwp=fail intel-ipsec:x64-osx=fail From 4c645b2a23bd4aeb41dafe15281c20f1134bc7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 28 Dec 2020 13:19:50 -0800 Subject: [PATCH 0371/1694] [protobuf] Fix the default proto file path (#15246) --- ports/protobuf/CONTROL | 1 + .../fix-default-proto-file-path.patch | 20 +++++++++++++++++++ ports/protobuf/portfile.cmake | 1 + 3 files changed, 22 insertions(+) create mode 100644 ports/protobuf/fix-default-proto-file-path.patch diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index 7d67ac742ac82d..967503724c472e 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,5 +1,6 @@ Source: protobuf Version: 3.14.0 +Port-Version: 1 Homepage: https://github.com/protocolbuffers/protobuf Description: Protocol Buffers - Google's data interchange format diff --git a/ports/protobuf/fix-default-proto-file-path.patch b/ports/protobuf/fix-default-proto-file-path.patch new file mode 100644 index 00000000000000..a5af918b32786c --- /dev/null +++ b/ports/protobuf/fix-default-proto-file-path.patch @@ -0,0 +1,20 @@ +diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc +index f192ae6..22900ed 100644 +--- a/src/google/protobuf/compiler/command_line_interface.cc ++++ b/src/google/protobuf/compiler/command_line_interface.cc +@@ -260,11 +260,15 @@ void AddDefaultProtoPaths( + return; + } + // Check if the upper level directory has an "include" subdirectory. ++ // change "'$/bin' is next to 'include'" assumption to "'$/bin/tools' is next to 'include'" ++ for (int i = 0; i < 2; i++) ++ { + pos = path.find_last_of("/\\"); + if (pos == std::string::npos || pos == 0) { + return; + } + path = path.substr(0, pos); ++ } + if (IsInstalledProtoPath(path + "/include")) { + paths->push_back( + std::pair("", path + "/include")); diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index d364878db02ddb..a79a34ef8ecd8e 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-static-build.patch + fix-default-proto-file-path.patch ) if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86") From bbcad29f14a8dde55bd47583d5aae2c636c45db0 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Mon, 28 Dec 2020 17:28:44 -0800 Subject: [PATCH 0372/1694] [boost-modular-build-helper] Fix repeat building issue on linux and osx (#15265) --- .../boost-modular-build.cmake | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 5bb07ba4626c37..48452422b79511 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -116,7 +116,7 @@ function(boost_modular_build) set(VARIANT ${BUILD_TYPE}) set(BUILD_LIB_PATH ${BUILD_LIB_PATH}) configure_file(${_bm_DIR}/Jamroot.jam ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY) - + set(configure_option) if(DEFINED _bm_BOOST_CMAKE_FRAGMENT) list(APPEND configure_option "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}") @@ -135,13 +135,23 @@ function(boost_modular_build) ) vcpkg_install_cmake() endfunction() - + if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(build_flag 0) + if(NOT DEFINED VCPKG_BUILD_TYPE) + set(build_flag 1) + set(VCPKG_BUILD_TYPE "release") + endif() + + if(VCPKG_BUILD_TYPE STREQUAL "release") unix_build(${BOOST_LIB_RELEASE_SUFFIX} "release" "lib/") endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(build_flag) + set(VCPKG_BUILD_TYPE "debug") + endif() + + if(VCPKG_BUILD_TYPE STREQUAL "debug") unix_build(${BOOST_LIB_DEBUG_SUFFIX} "debug" "debug/lib/") endif() From d5d6657b9cf143e272ed6c250e7d9a90234190cc Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 28 Dec 2020 17:28:53 -0800 Subject: [PATCH 0373/1694] Updated directxtk et al for cmake package support (#15210) --- ports/directxmath/CONTROL | 4 + ports/directxmath/portfile.cmake | 32 ++++++++ ports/directxmesh/CONTROL | 4 +- ports/directxmesh/portfile.cmake | 50 +++++++----- ports/directxtex/CONTROL | 4 +- ports/directxtex/enable_openexr_support.patch | 78 ------------------- ports/directxtex/portfile.cmake | 64 ++++++++++----- ports/directxtk/CONTROL | 4 +- ports/directxtk/portfile.cmake | 63 ++++++++++----- ports/directxtk12/CONTROL | 4 +- ports/directxtk12/portfile.cmake | 37 ++++++--- ports/uvatlas/CONTROL | 3 +- ports/uvatlas/portfile.cmake | 74 ++++++++---------- scripts/ci.baseline.txt | 17 ---- 14 files changed, 227 insertions(+), 211 deletions(-) create mode 100644 ports/directxmath/CONTROL create mode 100644 ports/directxmath/portfile.cmake diff --git a/ports/directxmath/CONTROL b/ports/directxmath/CONTROL new file mode 100644 index 00000000000000..0c6bcc956e2cbc --- /dev/null +++ b/ports/directxmath/CONTROL @@ -0,0 +1,4 @@ +Source: directxmath +Version: 3.1.6 +Homepage: https://walbourn.github.io/introducing-directxmath/ +Description: DirectXMath SIMD C++ math library diff --git a/ports/directxmath/portfile.cmake b/ports/directxmath/portfile.cmake new file mode 100644 index 00000000000000..96a722e0fc9892 --- /dev/null +++ b/ports/directxmath/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/DirectXMath + REF dec2020 + SHA512 73c073f6ef5f2dd867c3f934d471258c001fb85a99b897ef25ac26595c31157e00118143f5fdaa3f25512a2a46ebbe464efd1d697a999137bc4cffc9c29fec8c + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_download_distfile( + SAL_HEADER + URLS "https://raw.githubusercontent.com/dotnet/corert/master/src/Native/inc/unix/sal.h" + FILENAME "sal.h" + SHA512 1643571673195d9eb892d2f2ac76eac7113ef7aa0ca116d79f3e4d3dc9df8a31600a9668b7e7678dfbe5a76906f9e0734ef8d6db0903ccc68fc742dd8238d8b0 + ) + + file(INSTALL + ${DOWNLOADS}/sal.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include/) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL index 42c70287d6b97f..75008c7efefecb 100644 --- a/ports/directxmesh/CONTROL +++ b/ports/directxmesh/CONTROL @@ -1,8 +1,8 @@ Source: directxmesh -Version: nov2020 +Version: nov2020b Homepage: https://walbourn.github.io/directxmesh Description: DirectXMesh geometry processing library -Build-Depends: directxmesh[core,dx12](arm64|uwp) +Supports: windows Feature: dx12 Description: Build with DirectX12 support for Windows 10 diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index b9c3227b03728d..d4540454dd612f 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -1,11 +1,14 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF nov2020 - SHA512 07bf8acba1f15f1b74d864ac624c7e0bfbdf5927c3e66f94ef78ab447e757daa01351ca8e1c8e8652dbb7008cee13c30247922af2d1712e61bc50bdb55cedf42 + REF nov2020b + SHA512 a3520d916324e16004ec0052c6d4c628be2ea62583d0169b663f67ce03ef84c3ba8ea01c239c75dc89a359de6748039dc11e405ba4b0c4f33ee0225e4e248415 HEAD_REF master + FILE_DISAMBIGUATOR 2 ) vcpkg_check_features( @@ -14,30 +17,41 @@ vcpkg_check_features( dx12 BUILD_DX12 ) +if(VCPKG_TARGET_IS_UWP) + set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF) +else() + set(EXTRA_OPTIONS -DBUILD_TOOLS=ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} + OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} ) -if(NOT VCPKG_TARGET_IS_UWP AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - vcpkg_build_cmake() -else() - vcpkg_build_cmake(TARGET DirectXMesh) -endif() +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -file(INSTALL ${SOURCE_PATH}/DirectXMesh/DirectXMesh.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/DirectXMesh/DirectXMesh.inl DESTINATION ${CURRENT_PACKAGES_DIR}/include) - -file(GLOB_RECURSE DEBUG_LIB ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/CMake/*.lib) -file(GLOB_RECURSE RELEASE_LIB ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake/*.lib) -file(INSTALL ${DEBUG_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(INSTALL ${RELEASE_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -if(NOT VCPKG_TARGET_IS_UWP AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") +if(NOT VCPKG_TARGET_IS_UWP) vcpkg_copy_tools( - TOOL_NAMES Meshconvert + TOOL_NAMES meshconvert SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake ) + +elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) + vcpkg_download_distfile(meshconvert + URLS "https://github.com/Microsoft/DirectXMesh/releases/download/nov2020/meshconvert.exe" + FILENAME "meshconvert.exe" + SHA512 189552c74dc634f673a0d15851d7bb7c42c860023b1488086a9904323fc45207244c159c8848a211afafe258825f5051ee6fd85080da3f7f4afdf910764ca8ec + ) + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/") + + file(INSTALL + ${DOWNLOADS}/meshconvert.exe + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/) endif() +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/directxtex/CONTROL b/ports/directxtex/CONTROL index 06ec4ac5a53a96..a130f4d2f77014 100644 --- a/ports/directxtex/CONTROL +++ b/ports/directxtex/CONTROL @@ -1,8 +1,8 @@ Source: directxtex -Version: nov2020 +Version: nov2020b Homepage: https://walbourn.github.io/directxtex Description: DirectXTex texture processing library -Build-Depends: directxtex[core,dx12](arm64|uwp) +Supports: windows Feature: dx12 Description: Build with DirectX12 support for Windows 10 diff --git a/ports/directxtex/enable_openexr_support.patch b/ports/directxtex/enable_openexr_support.patch index c5ec406a3752fa..36d3c72c49e8c8 100644 --- a/ports/directxtex/enable_openexr_support.patch +++ b/ports/directxtex/enable_openexr_support.patch @@ -1,81 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 53b41a3..84867f3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,6 +20,9 @@ option(BC_USE_OPENMP "Build with OpenMP support" ON) - - option(ENABLE_CODE_ANALYSIS "Use Static Code Analysis on build" OFF) - -+# Includes the functions for loading/saving OpenEXR files at runtime -+option(ENABLE_OPENEXR_SUPPORT "Build with OpenEXR support" OFF) -+ - set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) -@@ -67,6 +70,12 @@ endif() - if(BUILD_DX12) - set(LIBRARY_SOURCES ${LIBRARY_SOURCES} DirectXTex/DirectXTexD3D12.cpp) - endif() -+if(ENABLE_OPENEXR_SUPPORT) -+ set(LIBRARY_SOURCES -+ ${LIBRARY_SOURCES} -+ DirectXTex/DirectXTexEXR.h -+ DirectXTex/DirectXTexEXR.cpp) -+endif() - - add_library(${PROJECT_NAME} STATIC ${LIBRARY_SOURCES} DirectXTex/Shaders/Compiled/BC6HEncode_EncodeBlockCS.inc) - -@@ -82,6 +91,10 @@ add_custom_command( - source_group(${PROJECT_NAME} REGULAR_EXPRESSION DirectXTex/*.*) - - target_include_directories(${PROJECT_NAME} PUBLIC DirectXTex) -+if(ENABLE_OPENEXR_SUPPORT) -+ find_package(openexr REQUIRED) -+ target_include_directories(${PROJECT_NAME} PRIVATE ${OPENEXR_INCLUDE_DIRS}/OpenEXR) -+endif() - - if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16") - target_precompile_headers(${PROJECT_NAME} PRIVATE DirectXTex/DirectXTexP.h) -@@ -116,6 +129,13 @@ add_executable(texdiag Texdiag/texdiag.cpp) - target_link_libraries(texdiag ${PROJECT_NAME} version.lib) - source_group(texdiag REGULAR_EXPRESSION Texdiag/*.*) - -+if(ENABLE_OPENEXR_SUPPORT) -+ target_link_libraries(${PROJECT_NAME} ${OPENEXR_ILMIMF_LIBRARY}) -+ target_link_libraries(texassemble ${OPENEXR_ILMIMF_LIBRARY}) -+ target_link_libraries(texconv ${OPENEXR_ILMIMF_LIBRARY}) -+ target_link_libraries(texdiag ${OPENEXR_ILMIMF_LIBRARY}) -+endif() -+ - if(MSVC) - target_compile_options(${PROJECT_NAME} PRIVATE /fp:fast) - target_compile_options(texassemble PRIVATE /fp:fast) -@@ -140,6 +160,12 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) - target_compile_options(texassemble PRIVATE ${WarningsEXE}) - target_compile_options(texconv PRIVATE ${WarningsEXE} "-Wno-global-constructors") - target_compile_options(texdiag PRIVATE ${WarningsEXE} "-Wno-double-promotion") -+ -+ if(ENABLE_OPENEXR_SUPPORT) -+ target_compile_options(texassemble PRIVATE -DUSE_OPENEXR) -+ target_compile_options(texconv PRIVATE -DUSE_OPENEXR) -+ target_compile_options(texdiag PRIVATE -DUSE_OPENEXR) -+ endif() - endif() - if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" ) - target_compile_options(${PROJECT_NAME} PRIVATE /permissive- /JMC- /Zc:__cplusplus) -@@ -167,6 +193,12 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" ) - target_compile_options(texconv PRIVATE /openmp /Zc:twoPhase-) - endif() - -+ if(ENABLE_OPENEXR_SUPPORT) -+ target_compile_options(texassemble PRIVATE /D "USE_OPENEXR") -+ target_compile_options(texconv PRIVATE /D "USE_OPENEXR") -+ target_compile_options(texdiag PRIVATE /D "USE_OPENEXR") -+ endif() -+ - set(WarningsEXE "/wd4061" "/wd4062" "/wd4365" "/wd4668" "/wd4710" "/wd4820" "/wd5039" "/wd5045" "/wd5219") - target_compile_options(texassemble PRIVATE ${WarningsEXE}) - target_compile_options(texconv PRIVATE ${WarningsEXE}) diff --git a/DirectXTex/DirectXTexEXR.cpp b/DirectXTex/DirectXTexEXR.cpp index 0cfd4db..7a6e70c 100644 --- a/DirectXTex/DirectXTexEXR.cpp diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index b8871ea31160cc..9b1b5cde039bad 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -1,11 +1,14 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF nov2020 - SHA512 a3f4abc2729c6e98b8cd29ff1d410410bced2eaa2dc62563f18344dbb33f30d7ce32c11cafe85f91786e80610d8a2030dab48919f5bf9ccf92ceba2c5ed4db13 + REF nov2020b + SHA512 b32f063f838c150f0ce81f4807bb88090d9695ee9857ec198b22a06c758e905008a3e3c3a1370f89ce5ec4d7e3c66f896a915968312776e8e5ada7e53e346475 HEAD_REF master + FILE_DISAMBIGUATOR 2 ) if("openexr" IN_LIST FEATURES) @@ -35,36 +38,59 @@ vcpkg_check_features( openexr ENABLE_OPENEXR_SUPPORT ) +if(VCPKG_TARGET_IS_UWP) + set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF) +else() + set(EXTRA_OPTIONS -DBUILD_TOOLS=ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} + ${EXTRA_OPTIONS} -DBC_USE_OPENMP=ON -DBUILD_DX11=ON ) -if(NOT VCPKG_TARGET_IS_UWP AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - vcpkg_build_cmake() -else() - vcpkg_build_cmake(TARGET DirectXTex) -endif() +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -file(INSTALL ${SOURCE_PATH}/DirectXTex/DirectXTex.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/DirectXTex/DirectXTex.inl DESTINATION ${CURRENT_PACKAGES_DIR}/include) -if("openexr" IN_LIST FEATURES) - file(INSTALL ${SOURCE_PATH}/DirectXTex/DirectXTexEXR.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -endif() - -file(GLOB_RECURSE DEBUG_LIB ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/CMake/*.lib) -file(GLOB_RECURSE RELEASE_LIB ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake/*.lib) -file(INSTALL ${DEBUG_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(INSTALL ${RELEASE_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -if(NOT VCPKG_TARGET_IS_UWP AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") +if(NOT VCPKG_TARGET_IS_UWP) vcpkg_copy_tools( TOOL_NAMES texassemble texconv texdiag SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake ) + +elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) + vcpkg_download_distfile(texassemble + URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2020/texassemble.exe" + FILENAME "texassemble.exe" + SHA512 8094a4ef4a00df3d2cb4a18a1c84664f4a8bf018328751f19feef1691d1a3d9380556039b1a771728e55d94113baa0f69998f63c96a3b4a6f6c3ba9e53a29a64 + ) + + vcpkg_download_distfile(texconv + URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2020/texconv.exe" + FILENAME "texconv.exe" + SHA512 91555fae9fadb942e8f3bc7052888fe515b1a0efb17f5eb53ef437e06c2e50baaef6a0552c93f218b028133baf65ba6e3393042a47b210baa9692ed6f8bbed2b + ) + + vcpkg_download_distfile(texdiag + URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2020/texdiag.exe" + FILENAME "texdiag.exe" + SHA512 7ba66004228ea1830fbfe5c40f4ee6cf1023f8256136a565c28e584a71115dd2d38e5f79f862de39ee54f8b34d7d8848c656082800f2a59f5b4833aee678d4b8 + ) + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/") + + file(INSTALL + ${DOWNLOADS}/texassemble.exe + ${DOWNLOADS}/texconv.exe + ${DOWNLOADS}/texdiag.exe + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtex/) endif() +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/directxtk/CONTROL b/ports/directxtk/CONTROL index 42068aa10f3561..988163b5e30562 100644 --- a/ports/directxtk/CONTROL +++ b/ports/directxtk/CONTROL @@ -1,8 +1,8 @@ Source: directxtk -Version: nov2020 +Version: nov2020b Homepage: https://walbourn.github.io/directxtk Description: A collection of helper classes for writing DirectX 11.x code in C++. -Build-Depends: directxtk[core,xaudio2-9](arm64|uwp) +Supports: windows Feature: xaudio2-9 Description: Build with XAudio 2.9 support for Windows 10 diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index f10da7b842cf61..9cf412c30bdfdb 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -1,11 +1,14 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF nov2020 - SHA512 9d10a851f37deb428c16166cdecf38ffba28a4ab836f9753f071bccc570fcb22ce98271c6bbad9fa1380dddd1fa6602156a7aa1607d347139bda1860fc2210ce + REF nov2020b + SHA512 25c8404a949988bcb468383bffa9510dfcc4fa5498f10319816024448987bbddbecef4a29c44d414d5696b0ec58704fd10071b674fc24ec5844fc5bf0f58097e HEAD_REF master + FILE_DISAMBIGUATOR 2 ) vcpkg_check_features( @@ -15,34 +18,54 @@ vcpkg_check_features( xaudio2-8 BUILD_XAUDIO_WIN8 ) +if(VCPKG_TARGET_IS_UWP) + set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF) +else() + set(EXTRA_OPTIONS -DBUILD_TOOLS=ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} + OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} ) -if(NOT VCPKG_TARGET_IS_UWP) - vcpkg_build_cmake() -else() - vcpkg_build_cmake(TARGET DirectXTK) -endif() - -file(INSTALL ${SOURCE_PATH}/Inc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/DirectXTK) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -file(GLOB_RECURSE DEBUG_LIB ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/CMake/*.lib) -file(GLOB_RECURSE RELEASE_LIB ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake/*.lib) -file(INSTALL ${DEBUG_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(INSTALL ${RELEASE_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) if(NOT VCPKG_TARGET_IS_UWP) vcpkg_copy_tools( TOOL_NAMES XWBTool SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake ) - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH MakeSpriteFont/MakeSpriteFont.csproj - PLATFORM AnyCPU - ) + + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH MakeSpriteFont/MakeSpriteFont.csproj + PLATFORM AnyCPU + ) + +elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) + vcpkg_download_distfile(makespritefont + URLS "https://github.com/Microsoft/DirectXTK/releases/download/nov2020/MakeSpriteFont.exe" + FILENAME "makespritefont.exe" + SHA512 d576eecd9763d238e12ba8d865917738a4bc8cbf632943e5c11b9426ecdfeaa9e8522076f1bb7122d41e69158fc7ca0939f2d90f9986470639966b3f849d236a + ) + + vcpkg_download_distfile(xwbtool + URLS "https://github.com/Microsoft/DirectXTK/releases/download/nov2020/XWBTool.exe" + FILENAME "xwbtool.exe" + SHA512 6ac8fc12fcea0f808aac1367907dbbb0c5669c8c654fc21f38b4e1ce951710ade1851515dba074e9254579b018545c3cdb2b6cf57366dfba0196603510bf51cd + ) + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") + + file(INSTALL + ${DOWNLOADS}/makespritefont.exe + ${DOWNLOADS}/xwbtool.exe + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk/) endif() +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/directxtk12/CONTROL b/ports/directxtk12/CONTROL index 4551b56c5f411f..7f0a0842dbf851 100644 --- a/ports/directxtk12/CONTROL +++ b/ports/directxtk12/CONTROL @@ -1,4 +1,6 @@ Source: directxtk12 -Version: nov2020 +Version: nov2020b Homepage: https://walbourn.github.io/directx-tool-kit-for-directx-12 Description: A collection of helper classes for writing DirectX 12 code in C++. +Supports: windows + diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 825cdae2a59458..a02a284e32d059 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -1,10 +1,12 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF nov2020 - SHA512 fd49bd8f124ac5c9808f8da09a955599234712b74525fd27739135f9044883b65f4c570048a9fe335f6aa82c8d49de1e6c0e81c904696ade3cd63b1982cf4d68 + REF nov2020b + SHA512 3a47209f109f993e4ca779bca9c9417c3f11a0472b3c91f52beb46a388edc5487d4e2cd472371ef6ffc4d3e54782d12e884befe8537fa68190c1556d6e36fbab HEAD_REF master ) @@ -14,13 +16,30 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_XAUDIO_WIN10=ON ) -vcpkg_build_cmake() +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + +if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) + vcpkg_download_distfile(makespritefont + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/nov2020/MakeSpriteFont.exe" + FILENAME "makespritefont.exe" + SHA512 d576eecd9763d238e12ba8d865917738a4bc8cbf632943e5c11b9426ecdfeaa9e8522076f1bb7122d41e69158fc7ca0939f2d90f9986470639966b3f849d236a + ) + + vcpkg_download_distfile(xwbtool + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/nov2020/XWBTool.exe" + FILENAME "xwbtool.exe" + SHA512 6ac8fc12fcea0f808aac1367907dbbb0c5669c8c654fc21f38b4e1ce951710ade1851515dba074e9254579b018545c3cdb2b6cf57366dfba0196603510bf51cd + ) + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") -file(INSTALL ${SOURCE_PATH}/Inc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/DirectXTK12) + file(INSTALL + ${DOWNLOADS}/makespritefont.exe + ${DOWNLOADS}/xwbtool.exe + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk12/) +endif() -file(GLOB_RECURSE DEBUG_LIB ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/CMake/*.lib) -file(GLOB_RECURSE RELEASE_LIB ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake/*.lib) -file(INSTALL ${DEBUG_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(INSTALL ${RELEASE_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +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/uvatlas/CONTROL b/ports/uvatlas/CONTROL index 3e7faa92069ab4..9ebfccb6eac1f2 100644 --- a/ports/uvatlas/CONTROL +++ b/ports/uvatlas/CONTROL @@ -1,5 +1,6 @@ Source: uvatlas -Version: aug2020 +Version: dec2020b Homepage: https://github.com/Microsoft/UVAtlas Description: UVAtlas isochart texture atlas +Build-Depends: directxmesh(!uwp), directxtex(!uwp) Supports: windows \ No newline at end of file diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index 28367c08093bd5..9982641ceaa194 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -1,61 +1,51 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF 60e2f2d5175f3a9fa6987516c4b44a4f0de3e1fa # aug2020 - SHA512 6ff99148d8d26345d3e935840d43536558a8174346492d794a4583f50b89a0648bfba3c5a9a433d803fcfd6092716b2f482ff5d1bad896fc4933971dc8107d6d + REF dec2020b + SHA512 4a81f5e45d906a897a73af940e63f684e416e7b851c4c439fb2dc7fe761838f7a84ccd5088bc94460cdb5d5fd9f5105c719a81e65a381bbdd2fad3465cdf3d46 HEAD_REF master + FILE_DISAMBIGUATOR 2 ) -if(VCPKG_PLATFORM_TOOLSET MATCHES "v142") - set(SOLUTION_TYPE 2019) - set(OCILIB_ARCH_X86 x86) - set(OCILIB_ARCH_X64 x64) +if(VCPKG_TARGET_IS_UWP) + set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF) else() - set(SOLUTION_TYPE 2017) - set(OCILIB_ARCH_X86 x86) - set(OCILIB_ARCH_X64 x64) + set(EXTRA_OPTIONS -DBUILD_TOOLS=ON) endif() -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(PLATFORM ${OCILIB_ARCH_X86}) - SET(BUILD_ARCH "Win32") -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(PLATFORM ${OCILIB_ARCH_X64}) - SET(BUILD_ARCH ${OCILIB_ARCH_X64}) -else() - set(PLATFORM ${TRIPLET_SYSTEM_ARCH}) -endif() - -vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/UVAtlas_Windows10_${SOLUTION_TYPE}.sln - PLATFORM ${PLATFORM} +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} ) -file(INSTALL - ${SOURCE_PATH}/UVAtlas/inc/ - DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL - ${SOURCE_PATH}/UVAtlas/Bin/Windows10_${SOLUTION_TYPE}/${BUILD_ARCH}/Release/UVAtlas.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL - ${SOURCE_PATH}/UVAtlas/Bin/Windows10_${SOLUTION_TYPE}/${BUILD_ARCH}/Debug/UVAtlas.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - -vcpkg_download_distfile(uvatlastool - URLS "https://github.com/Microsoft/UVAtlas/releases/download/sept2016/uvatlastool.exe" +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + +if(NOT VCPKG_TARGET_IS_UWP) + vcpkg_copy_tools( + TOOL_NAMES uvatlastool + SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake + ) + +elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) + vcpkg_download_distfile(uvatlastool + URLS "https://github.com/Microsoft/UVAtlas/releases/download/dec2020/uvatlastool.exe" FILENAME "uvatlastool.exe" - SHA512 2583ba8179d0a58fb85d871368b17571e36242436b5a5dbaf6f99ec2f2ee09f4e11e8f922b29563da3cb3b5bacdb771036c84d5b94f405c7988bfe5f2881c3df -) + SHA512 f3388e590bb45281a089d6d38ff603e99f2ff9124ec1e6caebae2663e4ab8ccaf06f5cce671f78ed9a1f882c6d2e2b1188212ef0219f96b46872faa20cc649fd + ) -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/") + + file(INSTALL + ${DOWNLOADS}/uvatlastool.exe + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/) +endif() -file(INSTALL - ${DOWNLOADS}/uvatlastool.exe - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9e57d1be0c9c4e..61caf3bfa2fcb1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -194,18 +194,6 @@ devicenameresolver:x64-windows-static=fail dimcli:arm-uwp=fail dimcli:x64-osx=fail dimcli:x64-uwp=fail -directxmesh:x64-linux=fail -directxmesh:x64-osx=fail -directxmesh:x64-windows-static=fail -directxtex:x64-linux=fail -directxtex:x64-osx=fail -directxtex:x64-windows-static=fail -directxtk:x64-linux=fail -directxtk:x64-osx=fail -directxtk:x64-windows-static=fail -directxtk12:x64-linux=fail -directxtk12:x64-osx=fail -directxtk12:x64-windows-static=fail discord-game-sdk:x64-windows-static=fail discord-rpc:arm-uwp=fail discord-rpc:x64-uwp=fail @@ -1549,11 +1537,6 @@ urdfdom:x64-windows-static=fail usd:x86-windows=fail uthenticode:arm-uwp=fail uthenticode:x64-uwp=fail -uvatlas:arm64-windows=fail -uvatlas:arm-uwp=fail -uvatlas:x64-linux=fail -uvatlas:x64-osx=fail -uvatlas:x64-windows-static=fail v8:arm64-windows=fail v8:arm-uwp=fail v8:x64-osx=fail From c82ef43326fc635804ebfe7498c10ed866221db1 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 28 Dec 2020 17:51:22 -0800 Subject: [PATCH 0374/1694] Add testing with VS2015 and VS2017 compilers. (#15257) * Add testing with VS2015 and VS2017 compilers. * Apply Nicole CRs. --- scripts/azure-pipelines/windows/azure-pipelines.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index b9bf49e227a680..f680ac2056d000 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -26,7 +26,7 @@ jobs: - script: .\bootstrap-vcpkg.bat displayName: 'Build vcpkg' - task: CmdLine@2 - displayName: "Build vcpkg with CMake and Run Tests" + displayName: "Build vcpkg with CMake, with older VS, and Run Tests" condition: eq('${{ parameters.triplet }}', 'x86-windows') inputs: script: | @@ -39,6 +39,10 @@ jobs: cmake.exe -G Ninja -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON -DVCPKG_DEVELOPMENT_WARNINGS=ON -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=ON -B build.x86.debug -S toolsrc ninja.exe -C build.x86.debug build.x86.debug\vcpkg-test.exe + cmake -G "Visual Studio 16 2019" -A Win32 -T v140 -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=OFF -B build.x86.vs2015 -S toolsrc + cmake --build build.x86.vs2015 + cmake -G "Visual Studio 16 2019" -A Win32 -T v141 -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=OFF -B build.x86.vs2017 -S toolsrc + cmake --build build.x86.vs2017 failOnStderr: true - task: PowerShell@2 displayName: 'Run vcpkg end-to-end tests' From 1999c921fa2f889385c8d1b5343ff8ef15c8cdb7 Mon Sep 17 00:00:00 2001 From: dweckmann Date: Tue, 29 Dec 2020 04:35:08 +0100 Subject: [PATCH 0375/1694] [cppunit] add linux support and bump version to 1.15.1 (#15018) --- docs/examples/packaging-github-repos.md | 1 - docs/examples/packaging-zipfiles.md | 1 - docs/maintainers/vcpkg_build_msbuild.md | 1 - ports/cppunit/0001-static-crt-linkage.patch | 40 ------- ports/cppunit/CMakeLists.txt | 51 +++++++++ ports/cppunit/CONTROL | 3 - ports/cppunit/CppUnitConfig.cmake | 83 ++++++++++++++ ports/cppunit/portfile.cmake | 121 +++++++++++--------- ports/cppunit/vcpkg.json | 7 ++ scripts/ci.baseline.txt | 5 - scripts/cmake/vcpkg_build_msbuild.cmake | 1 - 11 files changed, 206 insertions(+), 108 deletions(-) delete mode 100644 ports/cppunit/0001-static-crt-linkage.patch create mode 100644 ports/cppunit/CMakeLists.txt delete mode 100644 ports/cppunit/CONTROL create mode 100644 ports/cppunit/CppUnitConfig.cmake create mode 100644 ports/cppunit/vcpkg.json diff --git a/docs/examples/packaging-github-repos.md b/docs/examples/packaging-github-repos.md index 287354ff27aaef..4d9f7e11a67b49 100644 --- a/docs/examples/packaging-github-repos.md +++ b/docs/examples/packaging-github-repos.md @@ -51,7 +51,6 @@ In the `ports/` directory are many libraries that can be used as examples, inclu - rapidjson - range-v3 - MSBuild-based - - cppunit - mpg123 - Non-CMake, custom buildsystem - openssl diff --git a/docs/examples/packaging-zipfiles.md b/docs/examples/packaging-zipfiles.md index 9ece22d93289d2..334316403d3dfc 100644 --- a/docs/examples/packaging-zipfiles.md +++ b/docs/examples/packaging-zipfiles.md @@ -70,7 +70,6 @@ In the `ports/` directory are many libraries that can be used as examples, inclu - rapidjson - range-v3 - MSBuild-based - - cppunit - mpg123 - Non-CMake, custom buildsystem - openssl diff --git a/docs/maintainers/vcpkg_build_msbuild.md b/docs/maintainers/vcpkg_build_msbuild.md index 9f458f3527614f..47fb6855d8ac86 100644 --- a/docs/maintainers/vcpkg_build_msbuild.md +++ b/docs/maintainers/vcpkg_build_msbuild.md @@ -59,7 +59,6 @@ Additional options passed to msbuild for Debug builds. These are in addition to ## Examples * [chakracore](https://github.com/Microsoft/vcpkg/blob/master/ports/chakracore/portfile.cmake) -* [cppunit](https://github.com/Microsoft/vcpkg/blob/master/ports/cppunit/portfile.cmake) ## Source [scripts/cmake/vcpkg_build_msbuild.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_build_msbuild.cmake) diff --git a/ports/cppunit/0001-static-crt-linkage.patch b/ports/cppunit/0001-static-crt-linkage.patch deleted file mode 100644 index f058c32f9383bc..00000000000000 --- a/ports/cppunit/0001-static-crt-linkage.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/cppunit/cppunit.vcxproj b/src/cppunit/cppunit.vcxproj -index 0367d20..f799518 100644 ---- a/src/cppunit/cppunit.vcxproj -+++ b/src/cppunit/cppunit.vcxproj -@@ -84,7 +84,7 @@ - - - -- MultiThreadedDLL -+ MultiThreaded - OnlyExplicitInline - true - true -@@ -119,7 +119,7 @@ - - - -- MultiThreadedDLL -+ MultiThreaded - OnlyExplicitInline - true - true -@@ -154,7 +154,7 @@ - - - -- MultiThreadedDebugDLL -+ MultiThreadedDebug - Default - false - Disabled -@@ -189,7 +189,7 @@ - - - -- MultiThreadedDebugDLL -+ MultiThreadedDebug - Default - false - Disabled diff --git a/ports/cppunit/CMakeLists.txt b/ports/cppunit/CMakeLists.txt new file mode 100644 index 00000000000000..68b684db8bab83 --- /dev/null +++ b/ports/cppunit/CMakeLists.txt @@ -0,0 +1,51 @@ +project(cppunit) +cmake_minimum_required(VERSION 2.8.12) + +set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" + CACHE PATH "Installation directory for executables" +) +set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" + CACHE PATH "Installation directory for libraries" +) +set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" + CACHE PATH "Installation directory for headers" +) + +file(GLOB CPPUNIT_SRC RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/src/cppunit/*.cpp") +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) + +set(DLLPLUGINTESTER_SRC + ${CMAKE_CURRENT_SOURCE_DIR}/src/DllPlugInTester/CommandLineParser.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/DllPlugInTester/DllPlugInTester.cpp +) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/DllPlugInTester) + +if(WIN32) + set(CMAKE_DEBUG_POSTFIX d) +endif() + +if(BUILD_SHARED_LIBS) + add_library(cppunit SHARED ${CPPUNIT_SRC}) + add_definitions(-DCPPUNIT_BUILD_DLL) +else() + add_library(cppunit STATIC ${CPPUNIT_SRC}) +endif() + +add_executable(DllPlugInTester ${DLLPLUGINTESTER_SRC}) +target_link_libraries(DllPlugInTester cppunit) + +install(TARGETS cppunit + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" +) + +install(TARGETS DllPlugInTester + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" +) + +install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/cppunit" + DESTINATION "${INSTALL_INC_DIR}" +) diff --git a/ports/cppunit/CONTROL b/ports/cppunit/CONTROL deleted file mode 100644 index 9c3dee7b61f8af..00000000000000 --- a/ports/cppunit/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: cppunit -Version: 1.14.0-1 -Description: CppUnit is the C++ port of the famous JUnit framework for unit testing. Test output is in XML for automatic testing and GUI based for supervised tests. \ No newline at end of file diff --git a/ports/cppunit/CppUnitConfig.cmake b/ports/cppunit/CppUnitConfig.cmake new file mode 100644 index 00000000000000..b3e6146d1bb00e --- /dev/null +++ b/ports/cppunit/CppUnitConfig.cmake @@ -0,0 +1,83 @@ + +include(SelectLibraryConfigurations) + +find_path(CppUnit_INCLUDE_DIR TestCase.h PATH_SUFFIXES cppunit) +find_library(CppUnit_LIBRARY_RELEASE NAMES cppunit PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib" NO_DEFAULT_PATH) +find_library(CppUnit_LIBRARY_DEBUG NAMES cppunitd cppunit PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib" NO_DEFAULT_PATH) +select_library_configurations(CppUnit) + +if(NOT CppUnit_LIBRARY) + set(CppUnit_FOUND FALSE) + set(CPPUNIT_FOUND FALSE) + return() +endif() + +if(WIN32) + find_file(CppUnit_LIBRARY_RELEASE_DLL NAMES cppunit.dll PATHS "${CMAKE_CURRENT_LIST_DIR}/../../bin" NO_DEFAULT_PATH) + find_file(CppUnit_LIBRARY_DEBUG_DLL NAMES cppunitd.dll PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/bin" NO_DEFAULT_PATH) +endif() + +# Manage Release Windows shared +if(EXISTS "${CppUnit_LIBRARY_RELEASE_DLL}") + add_library(CppUnit SHARED IMPORTED) + set_target_properties(CppUnit PROPERTIES + IMPORTED_CONFIGURATIONS Release + IMPORTED_LOCATION_RELEASE "${CppUnit_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB_RELEASE "${CppUnit_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}" + ) +endif() + +# Manage Debug Windows shared +if(EXISTS "${CppUnit_LIBRARY_DEBUG_DLL}") + if(EXISTS "${CppUnit_LIBRARY_RELEASE_DLL}") + set_target_properties(CppUnit PROPERTIES + IMPORTED_CONFIGURATIONS "Release;Debug" + IMPORTED_LOCATION_RELEASE "${CppUnit_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB_RELEASE "${CppUnit_LIBRARY_RELEASE}" + IMPORTED_LOCATION_DEBUG "${CppUnit_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${CppUnit_LIBRARY_DEBUG}" + INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}" + ) + else() + add_library(CppUnit SHARED IMPORTED) + set_target_properties(CppUnit PROPERTIES + IMPORTED_CONFIGURATIONS Debug + IMPORTED_LOCATION_DEBUG "${CppUnit_LIBRARY_DEBUG_DLL" + IMPORTED_IMPLIB_DEBUG "${CppUnit_LIBRARY_DEBUG}" + INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}" + ) + endif() +endif() + +# Manage Release Windows static and Linux shared/static +if((NOT EXISTS "${CppUnit_LIBRARY_RELEASE_DLL}") AND (EXISTS "${CppUnit_LIBRARY_RELEASE}")) + add_library(CppUnit UNKNOWN IMPORTED) + set_target_properties(CppUnit PROPERTIES + IMPORTED_CONFIGURATIONS Release + IMPORTED_LOCATION_RELEASE "${CppUnit_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}" + ) +endif() + +# Manage Debug Windows static and Linux shared/static +if((NOT EXISTS "${CppUnit_LIBRARY_DEBUG_DLL}") AND (EXISTS "${CppUnit_LIBRARY_DEBUG}")) + if(EXISTS "${CppUnit_LIBRARY_RELEASE}") + set_target_properties(CppUnit PROPERTIES + IMPORTED_CONFIGURATIONS "Release;Debug" + IMPORTED_LOCATION_RELEASE "${CppUnit_LIBRARY_RELEASE}" + IMPORTED_LOCATION_DEBUG "${CppUnit_LIBRARY_DEBUG}" + INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}" + ) + else() + add_library(CppUnit UNKNOWN IMPORTED) + set_target_properties(CppUnit PROPERTIES + IMPORTED_CONFIGURATIONS Debug + IMPORTED_LOCATION_DEBUG "${CppUnit_LIBRARY_DEBUG}" + INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}" + ) + endif() +endif() + +set(CppUnit_FOUND TRUE) +set(CPPUNIT_FOUND TRUE) \ No newline at end of file diff --git a/ports/cppunit/portfile.cmake b/ports/cppunit/portfile.cmake index ab41ffcaf29e7c..85beec6928dab5 100644 --- a/ports/cppunit/portfile.cmake +++ b/ports/cppunit/portfile.cmake @@ -1,56 +1,65 @@ -if(NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "\n${PORT} does not support your system, only Windows for now. Please open a ticket issue on github.com/microsoft/vcpkg if necessary\n") -endif() - -set(VERSION 1.14.0) -if (VCPKG_CRT_LINKAGE STREQUAL static) - set(STATIC_PATCH "0001-static-crt-linkage.patch") -endif() - -vcpkg_download_distfile(ARCHIVE - URLS "http://dev-www.libreoffice.org/src/cppunit-${VERSION}.tar.gz" - FILENAME "cppunit-${VERSION}.tar.gz" - SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e -) - -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES - ${STATIC_PATCH} -) - -if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") - set(BUILD_ARCH "Win32") - set(OUTPUT_DIR "Win32") -elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64") - set(BUILD_ARCH "x64") -else() - message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() - -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/src/cppunit/cppunit_dll.vcxproj - PLATFORM ${BUILD_ARCH}) -elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/src/cppunit/cppunit.vcxproj - PLATFORM ${BUILD_ARCH}) -endif() - -file(COPY ${SOURCE_PATH}/include/cppunit DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(COPY ${SOURCE_PATH}/lib/cppunitd_dll.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(COPY ${SOURCE_PATH}/lib/cppunitd_dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY ${SOURCE_PATH}/lib/cppunit_dll.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(COPY ${SOURCE_PATH}/lib/cppunit_dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(COPY ${SOURCE_PATH}/lib/cppunitd.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY ${SOURCE_PATH}/lib/cppunit.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -endif() - -vcpkg_copy_pdbs() - -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppunit RENAME copyright) +# UWP is not supported +vcpkg_fail_port_install(ON_TARGET "uwp") + +vcpkg_download_distfile(ARCHIVE + URLS "http://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz" + FILENAME "cppunit-1.15.1.tar.gz" + SHA512 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +if(VCPKG_TARGET_IS_WINDOWS) + # Use a simple CMakeLists.txt to build CppUnit on windows + file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + ) + + vcpkg_install_cmake() + + # Move EXE to 'tools' + vcpkg_copy_tools(TOOL_NAMES DllPlugInTester AUTO_CLEAN) +else() + # Use a configure on unix. It should be doable to use the cmake, but may require some patching + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(LINKAGE_DYNAMIC yes) + set(LINKAGE_STATIC no) + else() + set(LINKAGE_DYNAMIC no) + set(LINKAGE_STATIC yes) + endif() + + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + "--enable-shared=${LINKAGE_DYNAMIC}" + "--enable-static=${LINKAGE_STATIC}" + "--prefix=${CURRENT_INSTALLED_DIR}" + "--disable-doxygen" + OPTIONS_DEBUG + "--enable-debug" + ) + + vcpkg_install_make() +endif() + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Install CppUnitConfig.cmake +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/CppUnitConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +# Cleanup +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) \ No newline at end of file diff --git a/ports/cppunit/vcpkg.json b/ports/cppunit/vcpkg.json new file mode 100644 index 00000000000000..3dbcc9ccfa1147 --- /dev/null +++ b/ports/cppunit/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cppunit", + "version-string": "1.15.1", + "description": "Unit testing framework module for the C++ programming language", + "homepage": "https://www.freedesktop.org/wiki/Software/cppunit", + "supports": "!uwp" +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 61caf3bfa2fcb1..f8f070c7214d51 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -148,11 +148,6 @@ cpp-netlib:x64-uwp=fail cppcoro:x64-linux=fail cppcoro:arm-uwp=fail cppcoro:x64-uwp=fail -cppunit:arm64-windows=fail -cppunit:arm-uwp=fail -cppunit:x64-linux=fail -cppunit:x64-osx=fail -cppunit:x64-uwp=fail cpuinfo:arm64-windows=fail crashpad:arm64-windows=fail crashpad:arm-uwp=fail diff --git a/scripts/cmake/vcpkg_build_msbuild.cmake b/scripts/cmake/vcpkg_build_msbuild.cmake index a682c6a17869ba..a19f73dce269e6 100644 --- a/scripts/cmake/vcpkg_build_msbuild.cmake +++ b/scripts/cmake/vcpkg_build_msbuild.cmake @@ -60,7 +60,6 @@ Additional options passed to msbuild for Debug builds. These are in addition to ## Examples * [chakracore](https://github.com/Microsoft/vcpkg/blob/master/ports/chakracore/portfile.cmake) -* [cppunit](https://github.com/Microsoft/vcpkg/blob/master/ports/cppunit/portfile.cmake) #]===] function(vcpkg_build_msbuild) From 679f0d8b0e45444cbd39b66ef809f5594a9deb1c Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 28 Dec 2020 19:35:21 -0800 Subject: [PATCH 0376/1694] [vcpkg] Fix pwsh version detection for old versions to download a fresh copy. (#15355) --- toolsrc/src/vcpkg/tools.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index 0b82e7780656aa..54b73c93f72806 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -525,8 +525,8 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50 auto output = std::move(rc.output); if (!Strings::starts_with(output, "PowerShell ")) { - Checks::exit_with_message( - VCPKG_LINE_INFO, "Unexpected format of powershell-core version string: %s", output); + return {Strings::concat("Unexpected format of powershell-core version string: ", output), + expected_right_tag}; } output.erase(0, 11); From 278645ac8d9092fdca2b3c3e585347bdcb1e5c9d Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 28 Dec 2020 21:20:30 -0800 Subject: [PATCH 0377/1694] Build results from 2020-12-27 (#15353) * [capnproto] Remove from baseline. PASSING, REMOVE FROM FAIL LIST: capnproto:x64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: capnproto:x64-windows-static (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: capnproto:x86-windows (.\scripts\ci.baseline.txt) These were fixed by the update to VS2019 version 16.8. Other capnproto skips moved into "supports" because: capnp.lib(serialize-packed.c++.obj) : error LNK2019: unresolved external symbol __popcnt referenced in function "int __cdecl kj::popCount(unsigned int)" (?popCount@kj@@YAHI@Z) i.e. the port wants popcnt to exist and it doesn't, so this isn't an artifact of our CI. * Remove "passing: remove from fail list" entries. * [atk, atkmm, gdk-pixbuf, glibmm, gtkmm, libsigcpp, libxmlpp, pangomm] Acquire using HTTPS. * [chardir] Update osx download. * [leaf] Remove leaf in favor of boost-leaf. ``` Starting package 759/1414: leaf:x86-windows Building package leaf[core]:x86-windows... -- Downloading https://github.com/zajo/leaf/archive/0.2.2.tar.gz... -- Extracting source D:/downloads/zajo-leaf-0.2.2.tar.gz -- Using source at D:/buildtrees/leaf/src/0.2.2-26417cde9d.clean -- Configuring x86-windows -- Building x86-windows-dbg -- Building x86-windows-rel -- Installing: D:/packages/leaf_x86-windows/share/leaf/copyright -- Performing post-build validation -- Performing post-build validation done Uploaded binaries to 1 HTTP remotes. Building package leaf[core]:x86-windows... done Installing package leaf[core]:x86-windows... The following files are already installed in D:/installed/x86-windows and are in conflict with leaf:x86-windows Installed by boost-leaf:x86-windows include/boost/leaf/capture.hpp include/boost/leaf/common.hpp include/boost/leaf/context.hpp include/boost/leaf/detail/all.hpp include/boost/leaf/detail/demangle.hpp include/boost/leaf/detail/function_traits.hpp include/boost/leaf/detail/mp11.hpp include/boost/leaf/detail/optional.hpp include/boost/leaf/detail/print.hpp include/boost/leaf/error.hpp include/boost/leaf/exception.hpp include/boost/leaf/result.hpp Elapsed time for package leaf:x86-windows: 2.931 s ``` Caused by the update to Boost 1.75.0. Because this port is touching include/boost, I'm interpreting that as "the author intends users to use it as a Boost library", and have deleted this port in favor of the Boost version. * [magic-get] Remove magic-get in favor of boost-pfr. * Update ports/chartdir/portfile.cmake Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Restore versions. * format-manifest Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> --- ports/atk/CONTROL | 4 ++-- ports/atk/portfile.cmake | 2 +- ports/atkmm/CONTROL | 2 +- ports/atkmm/portfile.cmake | 12 ++++++------ ports/capnproto/CONTROL | 3 ++- ports/capnproto/portfile.cmake | 5 ++++- ports/chartdir/CONTROL | 3 ++- ports/chartdir/portfile.cmake | 10 +++++----- ports/gdk-pixbuf/CONTROL | 2 +- ports/gdk-pixbuf/portfile.cmake | 2 +- ports/glibmm/CONTROL | 2 +- ports/glibmm/portfile.cmake | 4 ++-- ports/gtkmm/CONTROL | 2 +- ports/gtkmm/portfile.cmake | 2 +- ports/leaf/CONTROL | 3 --- ports/leaf/portfile.cmake | 20 +------------------- ports/leaf/vcpkg.json | 9 +++++++++ ports/libsigcpp/CONTROL | 2 +- ports/libsigcpp/portfile.cmake | 2 +- ports/libxmlpp/CONTROL | 2 +- ports/libxmlpp/portfile.cmake | 2 +- ports/magic-get/CONTROL | 4 ---- ports/magic-get/portfile.cmake | 20 +------------------- ports/magic-get/vcpkg.json | 10 ++++++++++ ports/pangomm/CONTROL | 3 ++- ports/pangomm/portfile.cmake | 2 +- scripts/ci.baseline.txt | 12 ------------ 27 files changed, 58 insertions(+), 88 deletions(-) delete mode 100644 ports/leaf/CONTROL create mode 100644 ports/leaf/vcpkg.json delete mode 100644 ports/magic-get/CONTROL create mode 100644 ports/magic-get/vcpkg.json diff --git a/ports/atk/CONTROL b/ports/atk/CONTROL index 686e7fe6e5afcd..d91c0272aebf47 100644 --- a/ports/atk/CONTROL +++ b/ports/atk/CONTROL @@ -1,7 +1,7 @@ Source: atk Version: 2.24.0-5 -Port-Version: 1 +Port-Version: 2 Homepage: https://developer.gnome.org/atk/ Description: GNOME Accessibility Toolkit Build-Depends: glib, gettext -Supports: !(osx|arm) \ No newline at end of file +Supports: !(osx|arm) diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index 916b5095bca53d..51cf824af5a285 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) set(ATK_VERSION 2.24.0) vcpkg_download_distfile(ARCHIVE - URLS "http://ftp.gnome.org/pub/GNOME/sources/atk/2.24/atk-${ATK_VERSION}.tar.xz" + URLS "https://ftp.gnome.org/pub/GNOME/sources/atk/2.24/atk-${ATK_VERSION}.tar.xz" FILENAME "atk-${ATK_VERSION}.tar.xz" SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962 ) diff --git a/ports/atkmm/CONTROL b/ports/atkmm/CONTROL index be3787e177b4eb..6d7674c44d867e 100644 --- a/ports/atkmm/CONTROL +++ b/ports/atkmm/CONTROL @@ -1,6 +1,6 @@ Source: atkmm Version: 2.24.2 -Port-Version: 4 +Port-Version: 5 Homepage: https://www.gtkmm.org 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. Build-Depends: glib, gettext, atk, glibmm diff --git a/ports/atkmm/portfile.cmake b/ports/atkmm/portfile.cmake index 91e82a2dfa34b2..279ba7e25e5ec3 100644 --- a/ports/atkmm/portfile.cmake +++ b/ports/atkmm/portfile.cmake @@ -3,7 +3,7 @@ if (VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_download_distfile(ARCHIVE - URLS "http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.24/atkmm-2.24.2.tar.xz" + URLS "https://ftp.gnome.org/pub/GNOME/sources/atkmm/2.24/atkmm-2.24.2.tar.xz" FILENAME "atkmm-2.24.2.tar.xz" SHA512 427714cdf3b10e3f9bc36df09c4b05608d295f5895fb1e079b9bd84afdf7bf1cfdec6794ced7f1e35bd430b76f87792df4ee63c515071a2ea6e3e51e672cdbe2 ) @@ -18,7 +18,7 @@ vcpkg_extract_source_archive_ex( if (VCPKG_TARGET_IS_WINDOWS) file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013) - + set(VS_PLATFORM ${VCPKG_TARGET_ARCHITECTURE}) if(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86) set(VS_PLATFORM "Win32") @@ -29,14 +29,14 @@ if (VCPKG_TARGET_IS_WINDOWS) PLATFORM ${VS_PLATFORM} USE_VCPKG_INTEGRATION ) - + # Handle headers file(COPY ${SOURCE_PATH}/MSVC_Net2013/atkmm/atkmmconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(COPY ${SOURCE_PATH}/atk/atkmm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(COPY ${SOURCE_PATH}/atk/atkmm DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) - + # Handle libraries file(COPY ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) @@ -46,12 +46,12 @@ if (VCPKG_TARGET_IS_WINDOWS) DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) file(COPY ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - + vcpkg_copy_pdbs() else() set(ENV{CONFIG_SHELL} bash) vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH} OPTIONS ${ATKMM_OPTIONS}) - + vcpkg_install_make() endif() diff --git a/ports/capnproto/CONTROL b/ports/capnproto/CONTROL index 73ac1b2b4a0730..506fb73515d331 100644 --- a/ports/capnproto/CONTROL +++ b/ports/capnproto/CONTROL @@ -1,6 +1,7 @@ Source: capnproto Version: 0.8.0 +Port-Version: 1 Description: Data interchange format and capability-based RPC system Homepage: https://capnproto.org/ Build-Depends: zlib -Supports: !uwp \ No newline at end of file +Supports: !uwp&!((arm|arm64)&windows) diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake index c5cf6efb57b716..2a3aecc137de6f 100644 --- a/ports/capnproto/portfile.cmake +++ b/ports/capnproto/portfile.cmake @@ -1,4 +1,7 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") +vcpkg_fail_port_install(ON_TARGET UWP) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_fail_port_install(ON_ARCH arm arm64) +endif() vcpkg_check_linkage(ONLY_STATIC_LIBRARY) diff --git a/ports/chartdir/CONTROL b/ports/chartdir/CONTROL index 75ed7d6a8c0d07..d373e3862896cb 100644 --- a/ports/chartdir/CONTROL +++ b/ports/chartdir/CONTROL @@ -1,4 +1,5 @@ Source: chartdir -Version: 6.3.1-1 +Version: 6.3.1 +Port-Version: 2 Homepage: https://www.advsofteng.com/ Description: ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications. diff --git a/ports/chartdir/portfile.cmake b/ports/chartdir/portfile.cmake index 284af568878c9e..8234e928693de4 100644 --- a/ports/chartdir/portfile.cmake +++ b/ports/chartdir/portfile.cmake @@ -28,15 +28,15 @@ elseif(VCPKG_TARGET_IS_WINDOWS) file(COPY "${LIBDIR}/chartdir60.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(COPY "${LIBDIR}/chartdir60.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) file(COPY "${LIBDIR}/chartdir60.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - + set(CHARTDIR_LIB "chartdir60.lib") elseif(VCPKG_TARGET_IS_OSX) vcpkg_download_distfile(ARCHIVE_FILE URLS "https://www.advsofteng.net/chartdir_cpp_mac.tar.gz" - FILENAME "chartdir_cpp_mac-6.3.1.tar.gz" - SHA512 d7364b42ed7c5dd2f89ed8692ed0df1ec952216ba24f8afa8e039641f3296f23c9ff6391e3e0dcd3bfdb9e6898c21a8281aa2803fbee33c7197c1df271a0edf7 + FILENAME "chartdir_cpp_mac-6.3.1.51483c1975.tar.gz" + SHA512 51483c197518203a24f652a4bfd9af1f933f8c59f3d7286e13c612cf09c5b850b4d1e9daa506379218797b5bb79bbc571b9e90b0fbb0f3ef4a3f455dd0de3848 ) vcpkg_extract_source_archive_ex( @@ -47,7 +47,7 @@ elseif(VCPKG_TARGET_IS_OSX) file(COPY "${SOURCE_PATH}/lib/libchartdir.6.dylib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(COPY "${SOURCE_PATH}/lib/libchartdir.6.dylib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - + set(CHARTDIR_LIB "libchartdir.6.dylib") elseif(VCPKG_TARGET_IS_LINUX) @@ -78,7 +78,7 @@ elseif(VCPKG_TARGET_IS_LINUX) file(COPY "${SOURCE_PATH}/lib/libchartdir.so.6.0.3" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(COPY "${SOURCE_PATH}/lib/libchartdir.so.6.0.3" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - + set(CHARTDIR_LIB "libchartdir.so.6.0.3") file(COPY ${SOURCE_PATH}/lib/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/share/chartdir) diff --git a/ports/gdk-pixbuf/CONTROL b/ports/gdk-pixbuf/CONTROL index c283d8e6e83942..1e08aeebe74fbd 100644 --- a/ports/gdk-pixbuf/CONTROL +++ b/ports/gdk-pixbuf/CONTROL @@ -1,6 +1,6 @@ Source: gdk-pixbuf Version: 2.36.9-5 -Port-Version: 6 +Port-Version: 7 Homepage: https://developer.gnome.org/gdk-pixbuf/ Description: Image loading library. Build-Depends: gettext, zlib, libpng, glib diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index 095dab5906a6f0..b9b82df4fc9ff1 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -4,7 +4,7 @@ set(GDK_PIXBUF_VERSION 2.36) set(GDK_PIXBUF_PATCH 9) vcpkg_download_distfile(ARCHIVE - URLS "http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/${GDK_PIXBUF_VERSION}/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz" + 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 ab8f2cda4490012936b094a1321e64b85e1fa1f8d070fae135a514f87f695201b845f4192e4a02954e2767d44314c0a95d727118853528182952d15890130261 ) diff --git a/ports/glibmm/CONTROL b/ports/glibmm/CONTROL index 3b2338943760f6..9fe1d1b2cb3b73 100644 --- a/ports/glibmm/CONTROL +++ b/ports/glibmm/CONTROL @@ -1,6 +1,6 @@ Source: glibmm Version: 2.52.1 -Port-Version: 13 +Port-Version: 14 Description: This is glibmm, a C++ API for parts of glib that are useful for C++. Homepage: https://www.gtkmm.org. Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake index f2ec0a935fc3df..c3bf9c9db006be 100644 --- a/ports/glibmm/portfile.cmake +++ b/ports/glibmm/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_download_distfile(ARCHIVE - URLS "http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.52/glibmm-2.52.1.tar.xz" + URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.52/glibmm-2.52.1.tar.xz" FILENAME "glibmm-2.52.1.tar.xz" SHA512 702158762cb28972b315ab98dc00a62e532bda08b6e76dc2a2556e8cb381c2021290891887a4af2fbff5a62bab4d50581be73037dc8e0dc47d5febd6cbeb7bda ) @@ -35,4 +35,4 @@ vcpkg_fixup_pkgconfig() # Handle copyright and readme file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME readme.txt) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME readme.txt) diff --git a/ports/gtkmm/CONTROL b/ports/gtkmm/CONTROL index 71a648f1578a12..42ff1167b90b98 100644 --- a/ports/gtkmm/CONTROL +++ b/ports/gtkmm/CONTROL @@ -1,6 +1,6 @@ Source: gtkmm Version: 3.22.2 -Port-Version: 4 +Port-Version: 5 Homepage: https://www.gtkmm.org/ Description: gtkmm is the official C++ interface for the popular GUI library GTK+. Build-Depends: glib, atk, gtk, gdk-pixbuf, pango, cairo, libepoxy, gettext, glibmm, atkmm, cairomm, pangomm diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake index 4593ebcae44e95..96add947bab078 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -5,7 +5,7 @@ endif() vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.22/gtkmm-3.22.2.tar.xz" + URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.22/gtkmm-3.22.2.tar.xz" FILENAME "gtkmm-3.22.2.tar.xz" SHA512 6e96b543e459481145ee0f56f31a7ad2466bd8ccdd2abf3205998aecede73d235149ca6e5ba6e8d20a4fd5345e310870d81ac2a716d4f78d1460ed685badbdc2 ) diff --git a/ports/leaf/CONTROL b/ports/leaf/CONTROL deleted file mode 100644 index e7a7c948083d93..00000000000000 --- a/ports/leaf/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: leaf -Version: 0.2.2 -Description: Lightweight error augmentation framework \ No newline at end of file diff --git a/ports/leaf/portfile.cmake b/ports/leaf/portfile.cmake index cb87093ea0dae7..9aefc82414d125 100644 --- a/ports/leaf/portfile.cmake +++ b/ports/leaf/portfile.cmake @@ -1,19 +1 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO zajo/leaf - REF 0.2.2 - SHA512 200a78e33fa919fbf996cfa5715f166e194b87776de79dec4c23d7a60b1f1e1c9db699f3d94d17b52c655e802ea63e1e6539538b180ecaafbfcf106b280b5c1f - HEAD_REF master -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) - -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/leaf RENAME copyright) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/leaf/vcpkg.json b/ports/leaf/vcpkg.json new file mode 100644 index 00000000000000..88c24fca5ac3f8 --- /dev/null +++ b/ports/leaf/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "leaf", + "version-string": "0.2.2", + "port-version": 1, + "description": "Deprecated boost-leaf port.", + "dependencies": [ + "boost-leaf" + ] +} diff --git a/ports/libsigcpp/CONTROL b/ports/libsigcpp/CONTROL index 8febf8011ad85e..82b48ec5706a06 100644 --- a/ports/libsigcpp/CONTROL +++ b/ports/libsigcpp/CONTROL @@ -1,4 +1,4 @@ Source: libsigcpp Version: 2.10-3 -Port-Version: 1 +Port-Version: 2 Description: Typesafe callback framework for C++ diff --git a/ports/libsigcpp/portfile.cmake b/ports/libsigcpp/portfile.cmake index 74f26c32e6e593..a8b70d0533dd3e 100644 --- a/ports/libsigcpp/portfile.cmake +++ b/ports/libsigcpp/portfile.cmake @@ -1,6 +1,6 @@ vcpkg_download_distfile(ARCHIVE - URLS "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz" + URLS "https://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz" FILENAME "libsigc++-2.10.0.tar.xz" SHA512 5b96df21d6bd6ba41520c7219e77695a86aabc60b7259262c7a9f4b8475ce0e2fd8dc37bcf7c17e24e818ff28c262d682b964c83e215b51bdbe000f3f58794ae ) diff --git a/ports/libxmlpp/CONTROL b/ports/libxmlpp/CONTROL index 0c76b120cffe59..65ac0b963bc894 100644 --- a/ports/libxmlpp/CONTROL +++ b/ports/libxmlpp/CONTROL @@ -1,5 +1,5 @@ Source: libxmlpp Version: 2.40.1 -Port-Version: 7 +Port-Version: 8 Description: a C++ wrapper for the libxml XML parser library. Build-Depends: libxml2, glibmm diff --git a/ports/libxmlpp/portfile.cmake b/ports/libxmlpp/portfile.cmake index da2448a98517cd..ae65892008784e 100644 --- a/ports/libxmlpp/portfile.cmake +++ b/ports/libxmlpp/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(LIBXMLPP_VERSION 2.40.1) vcpkg_download_distfile(ARCHIVE - URLS "http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.40/libxml++-${LIBXMLPP_VERSION}.tar.xz" + URLS "https://ftp.gnome.org/pub/GNOME/sources/libxml++/2.40/libxml++-${LIBXMLPP_VERSION}.tar.xz" FILENAME "libxml++-${LIBXMLPP_VERSION}.tar.xz" SHA512 a4ec2e8182d981c57bdcb8f0a203a3161f8c735ceb59fd212408b7a539d1dc826adf6717bed8f4d544ab08afd9c2fc861efe518e24bbd3a1c4b158e2ca48183a ) diff --git a/ports/magic-get/CONTROL b/ports/magic-get/CONTROL deleted file mode 100644 index c614761f5e4a66..00000000000000 --- a/ports/magic-get/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: magic-get -Version: 2019-09-02-1 -Homepage: https://github.com/apolukhin/magic_get -Description: This C++14 library is meant for accessing structure elements by index and providing other std::tuple like methods for user defined types without any macro or boilerplate code. diff --git a/ports/magic-get/portfile.cmake b/ports/magic-get/portfile.cmake index 1546bbe992dde5..065116c276adcf 100644 --- a/ports/magic-get/portfile.cmake +++ b/ports/magic-get/portfile.cmake @@ -1,19 +1 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO apolukhin/magic_get - REF abb467c0e22a83bf75a46a9e6610370fabfc39af #Branch develop, Commits on Sep 2, 2019 - SHA512 1feb5d105d13a20aec8ab2c748dbd79ecc5d2267c8c0ee7db93a3d0c6b7186ea0c475fdc14712e78502ea839788f6dfb0b359e3fedbec59d331dafe137326fa4 - HEAD_REF develop -) - -vcpkg_download_distfile(OCV_DOWNLOAD - URLS "https://www.boost.org/LICENSE_1_0.txt" - FILENAME "boost_license_1_0.txt" - SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 -) - -file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}) - -# Handle copyright -# On Homepage README.md, License Distributed under the Boost Software License, Version 1.0. https://www.boost.org/LICENSE_1_0.txt -file(INSTALL ${OCV_DOWNLOAD} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/magic-get/vcpkg.json b/ports/magic-get/vcpkg.json new file mode 100644 index 00000000000000..bb803ad76345cb --- /dev/null +++ b/ports/magic-get/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "magic-get", + "version-string": "2019-09-02", + "port-version": 2, + "description": "Deprecated boost-pfr port.", + "homepage": "https://github.com/apolukhin/magic_get", + "dependencies": [ + "boost-pfr" + ] +} diff --git a/ports/pangomm/CONTROL b/ports/pangomm/CONTROL index 46f41db7f0d3bf..a373ba7ed268f7 100644 --- a/ports/pangomm/CONTROL +++ b/ports/pangomm/CONTROL @@ -1,5 +1,6 @@ Source: pangomm -Version: 2.40.1-3 +Version: 2.40.1 +Port-Version: 4 Homepage: https://ftp.gnome.org/pub/GNOME/sources/pangomm Description: pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class. Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz, pango, cairomm, glibmm diff --git a/ports/pangomm/portfile.cmake b/ports/pangomm/portfile.cmake index 1e2cefa6197b00..956a240461c2b5 100644 --- a/ports/pangomm/portfile.cmake +++ b/ports/pangomm/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64") vcpkg_download_distfile(ARCHIVE - URLS "http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.40/pangomm-2.40.1.tar.xz" + URLS "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.40/pangomm-2.40.1.tar.xz" FILENAME "pangomm-2.40.1.tar.xz" SHA512 bed19800b76e69cc51abeb5997bdc2f687f261ebcbe36aeee51f1fbf5010a46f4b9469033c34a912502001d9985135fd5c7f7574d3de8ba33cc5832520c6aa6f ) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f8f070c7214d51..e9ccb25d7bd308 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -58,14 +58,6 @@ caf:x64-uwp=fail caffe2:x86-windows=fail caffe2:arm64-windows=fail cairomm:x64-linux=fail -# capnproto currently triggers an ICE -capnproto:x86-windows=fail -capnproto:x64-windows=fail -capnproto:x64-windows-static=fail -# capnproto doesn't support arm, arm64, or UWP -capnproto:arm64-windows=fail -capnproto:arm-uwp=fail -capnproto:x64-uwp=fail c-ares:arm-uwp=fail c-ares:x64-uwp=fail cartographer:x64-osx=fail @@ -540,7 +532,6 @@ libdshowcapture:arm-uwp=fail libdshowcapture:x64-linux=fail libdshowcapture:x64-osx=fail libdshowcapture:x64-uwp=fail -libepoxy:arm64-windows=fail libepoxy:arm-uwp=fail libepoxy:x64-uwp=fail libepoxy:x64-windows-static=fail @@ -696,8 +687,6 @@ libressl:x64-uwp = skip libressl:x64-windows = skip libressl:x64-windows-static = skip libressl:x86-windows = skip -libsamplerate:arm64-windows=fail -libsamplerate:arm-uwp=fail libsamplerate:x64-osx=fail libsoundio:arm64-windows=fail libsoundio:arm-uwp=fail @@ -947,7 +936,6 @@ nana:x64-uwp=fail nanodbc:arm-uwp=fail nanodbc:x64-uwp=fail nanodbc:x64-linux=skip -nanogui:arm64-windows=fail nanorange:arm64-windows=fail nanorange:arm-uwp=fail nanorange:x64-linux=fail From 6a58702c82e1495159c6c402075ad6ee69380450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 28 Dec 2020 21:21:03 -0800 Subject: [PATCH 0378/1694] [cmake] update to 3.19.2 (#14716) * [cmake] update to 3.19.0 * update vmss * [cmake] update to 3.19.1 * [solid3] Fix configure error, fix static definition * [flann] Add feature hdf5 and fix it * [highfive] Fix dependency hdf5 * [simage] Fix configure error * [aws-c-common] Fix configure error * [cmake] Update to 3.19.2 * Revert changes about cmake bug * [VMSS] Update cmake path on Windows * [cmake] Update cmake hash * [minc] Fix dependency hdf5 * [cmake] Update cmake package name and path on MacOS Co-authored-by: Billy Robert O'Neal III --- ports/flann/CONTROL | 7 ++- ports/flann/fix-dependency-hdf5.patch | 53 +++++++++++++++++++ ports/flann/portfile.cmake | 13 +++-- ports/highfive/CONTROL | 1 + ports/highfive/fix-dependency-hdf5.patch | 19 +++++++ ports/highfive/portfile.cmake | 1 + ports/minc/CONTROL | 1 + ports/minc/fix-dependency-hdf5.patch | 31 +++++++++++ ports/minc/portfile.cmake | 6 ++- .../windows/azure-pipelines.yml | 2 +- scripts/vcpkgTools.xml | 30 +++++------ 11 files changed, 141 insertions(+), 23 deletions(-) create mode 100644 ports/flann/fix-dependency-hdf5.patch create mode 100644 ports/highfive/fix-dependency-hdf5.patch create mode 100644 ports/minc/fix-dependency-hdf5.patch diff --git a/ports/flann/CONTROL b/ports/flann/CONTROL index b1aa872355f55e..b9bc7d1b3f13b5 100644 --- a/ports/flann/CONTROL +++ b/ports/flann/CONTROL @@ -1,5 +1,10 @@ Source: flann -Version: 2019-04-07-1 +Version: 2019-04-07 +Port-Version: 1 Homepage: https://github.com/mariusmuja/flann Build-Depends: lz4 Description: Fast Library for Approximate Nearest Neighbors + +Feature: hdf5 +Build-Depends: hdf5 +Description: Build with hdf5 \ No newline at end of file diff --git a/ports/flann/fix-dependency-hdf5.patch b/ports/flann/fix-dependency-hdf5.patch new file mode 100644 index 00000000000000..39df0a31302a63 --- /dev/null +++ b/ports/flann/fix-dependency-hdf5.patch @@ -0,0 +1,53 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ff331a..155cabe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,11 +75,17 @@ if (NOT PYTHON_EXECUTABLE) + endif() + endif() + ++if (WITH_HDF5) + find_hdf5() +-if (NOT HDF5_FOUND) +- message(WARNING "hdf5 library not found, some tests will not be run") ++if (NOT hdf5_FOUND) ++ message(ERROR "hdf5 library not found") + else() +- include_directories(${HDF5_INCLUDE_DIR}) ++ if (TARGET hdf5::hdf5-shared) ++ link_libraries(hdf5::hdf5-shared) ++ elseif (TARGET hdf5::hdf5-static) ++ link_libraries(hdf5::hdf5-static) ++ endif() ++endif() + endif() + + if (USE_MPI OR HDF5_IS_PARALLEL) +diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake +index 8aef8e0..747414f 100644 +--- a/cmake/flann_utils.cmake ++++ b/cmake/flann_utils.cmake +@@ -21,21 +21,8 @@ endmacro(DISSECT_VERSION) + + # workaround a FindHDF5 bug + macro(find_hdf5) +- find_package(HDF5) +- +- set( HDF5_IS_PARALLEL FALSE ) +- foreach( _dir ${HDF5_INCLUDE_DIRS} ) +- if( EXISTS "${_dir}/H5pubconf.h" ) +- file( STRINGS "${_dir}/H5pubconf.h" +- HDF5_HAVE_PARALLEL_DEFINE +- REGEX "HAVE_PARALLEL 1" ) +- if( HDF5_HAVE_PARALLEL_DEFINE ) +- set( HDF5_IS_PARALLEL TRUE ) +- endif() +- endif() +- endforeach() +- set( HDF5_IS_PARALLEL ${HDF5_IS_PARALLEL} CACHE BOOL +- "HDF5 library compiled with parallel IO support" ) ++ find_package(hdf5 CONFIG) ++ set(HDF5_IS_PARALLEL ${HDF5_ENABLE_PARALLEL}) + mark_as_advanced( HDF5_IS_PARALLEL ) + endmacro(find_hdf5) + diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index 45682e9d778fd3..7bbb9a92a03e0b 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -8,14 +8,20 @@ vcpkg_from_github( REF 1d04523268c388dabf1c0865d69e1b638c8c7d9d SHA512 61e322222c2daa0b9677095e5ca231cba7c305ce754ad8e659eee350111c1e04351181c3af04e45ab6e5c9edea49c7b9ec6499bb0dbc080b87af36eb11c6ef7c HEAD_REF master - PATCHES fix-build-error.patch + PATCHES + fix-build-error.patch + fix-dependency-hdf5.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + hdf5 WITH_HDF5 ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA DISABLE_PARALLEL_CONFIGURE - OPTIONS + OPTIONS ${FEATURE_OPTIONS} -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_DOC=OFF @@ -31,5 +37,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/flann/COPYING ${CURRENT_PACKAGES_DIR}/share/flann/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann RENAME copyright) diff --git a/ports/highfive/CONTROL b/ports/highfive/CONTROL index 22fd1209ee4556..36481faa2e940f 100644 --- a/ports/highfive/CONTROL +++ b/ports/highfive/CONTROL @@ -1,5 +1,6 @@ Source: highfive Version: 2.2.2 +Port-Version: 1 Homepage: https://github.com/BlueBrain/HighFive Description: HighFive is a modern C++/C++11 friendly interface for libhdf5 Build-Depends: hdf5 diff --git a/ports/highfive/fix-dependency-hdf5.patch b/ports/highfive/fix-dependency-hdf5.patch new file mode 100644 index 00000000000000..e85a6fd942c879 --- /dev/null +++ b/ports/highfive/fix-dependency-hdf5.patch @@ -0,0 +1,19 @@ +diff --git a/CMake/HighFiveTargetDeps.cmake b/CMake/HighFiveTargetDeps.cmake +index f76e1d3..06ac647 100644 +--- a/CMake/HighFiveTargetDeps.cmake ++++ b/CMake/HighFiveTargetDeps.cmake +@@ -8,7 +8,13 @@ add_library(libdeps INTERFACE) + if(NOT DEFINED HDF5_C_LIBRARIES) + set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE TRUE) # Consistency + set(HDF5_PREFER_PARALLEL ${HIGHFIVE_PARALLEL_HDF5}) +- find_package(HDF5 REQUIRED) ++ find_package(hdf5 CONFIG REQUIRED) ++ set(HIGHFIVE_PARALLEL_HDF5 ${HDF5_ENABLE_PARALLEL}) ++ if (TARGET hdf5::hdf5-shared) ++ set(HDF5_C_LIBRARIES hdf5::hdf5-shared) ++ elseif (TARGET hdf5::hdf5-static) ++ set(HDF5_C_LIBRARIES hdf5::hdf5-static) ++ endif() + endif() + + if(HIGHFIVE_PARALLEL_HDF5 AND NOT HDF5_IS_PARALLEL) diff --git a/ports/highfive/portfile.cmake b/ports/highfive/portfile.cmake index 6c73deff54dfb0..092a461bd4def1 100644 --- a/ports/highfive/portfile.cmake +++ b/ports/highfive/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF v2.2.2 SHA512 7e562951b18425f1bfc96c30d0e47b6d218830417a732856a27943cd7ee6feab54d833b94aa303c40ca5038ac1aaf0eadd8c61800ffe82b6da46a465b21b1fc4 HEAD_REF master + PATCHES fix-dependency-hdf5.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/minc/CONTROL b/ports/minc/CONTROL index 6cd1d54997367d..c31621bcd68b16 100644 --- a/ports/minc/CONTROL +++ b/ports/minc/CONTROL @@ -1,5 +1,6 @@ Source: minc Version: 2.4.03 +Port-Version: 1 Description: MINC - Medical Image NetCDF or MINC isn't netCDF Homepage: https://github.com/BIC-MNI/libminc Build-Depends: nifticlib, hdf5[core], zlib diff --git a/ports/minc/fix-dependency-hdf5.patch b/ports/minc/fix-dependency-hdf5.patch new file mode 100644 index 00000000000000..40943411c5eda9 --- /dev/null +++ b/ports/minc/fix-dependency-hdf5.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a6830b4..da3d635 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,12 @@ IF(NOT LIBMINC_EXTERNALLY_CONFIGURED) + # external packages + FIND_PACKAGE(ZLIB REQUIRED) + SET(HDF5_NO_FIND_PACKAGE_CONFIG_FILE ON) +- FIND_PACKAGE(HDF5 REQUIRED COMPONENTS C ) ++ FIND_PACKAGE(hdf5 CONFIG REQUIRED) ++ if (TARGET hdf5::hdf5-shared) ++ SET(HDF5_LIBRARIES hdf5::hdf5-shared) ++ elseif (TARGET hdf5::hdf5-static) ++ SET(HDF5_LIBRARIES hdf5::hdf5-static) ++ endif() + + IF (LIBMINC_USE_SYSTEM_NIFTI) + FIND_PACKAGE(NIFTI) +@@ -515,12 +520,8 @@ IF(SUPERBUILD_STAGING_PREFIX) + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" LIBMINC_LIBRARIES_CONFIG "${LIBMINC_LIBRARIES_CONFIG}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" EZMINC_LIBRARIES "${EZMINC_LIBRARIES}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NETCDF_INCLUDE_DIR "${NETCDF_INCLUDE_DIR}") +- STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIR}") +- STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_INCLUDE_DIRS "${HDF5_INCLUDE_DIRS}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NIFTI_INCLUDE_DIR "${NIFTI_INCLUDE_DIR}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NETCDF_LIBRARY "${NETCDF_LIBRARY}") +- STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_LIBRARY "${HDF5_LIBRARY}") +- STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_LIBRARIES "${HDF5_LIBRARIES}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NIFTI_LIBRARY "${NIFTI_LIBRARY}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" ZNZ_LIBRARY "${ZNZ_LIBRARY}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" ZLIB_LIBRARY "${ZLIB_LIBRARY}") diff --git a/ports/minc/portfile.cmake b/ports/minc/portfile.cmake index 4b9ff63b149d80..6fbec96273aaf0 100644 --- a/ports/minc/portfile.cmake +++ b/ports/minc/portfile.cmake @@ -4,8 +4,10 @@ vcpkg_from_github( REF e75a936c12a305b596d743c26a5437196ebce2a4 SHA512 744f879ac8f0594c310d1c1b7fe67543c5feeb3e5a0979035918dbb2bf1d0973fbd389e5357a75631e618cc614b648c21179f7467576bd68e3522e63f21451b0 HEAD_REF master - PATCHES build.patch - config.patch + PATCHES + build.patch + config.patch + fix-dependency-hdf5.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index f680ac2056d000..c78c3d9ee8d0c2 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -33,7 +33,7 @@ jobs: :: TRANSITION, get these tools on the VMs next time we roll them .\vcpkg.exe fetch cmake .\vcpkg.exe fetch ninja - set PATH=${{ variables.VCPKG_DOWNLOADS }}\tools\cmake-3.18.4-windows\cmake-3.18.4-win32-x86\bin;${{ variables.VCPKG_DOWNLOADS }}\tools\ninja-1.10.1-windows;%PATH% + set PATH=${{ variables.VCPKG_DOWNLOADS }}\tools\cmake-3.19.2-windows\cmake-3.19.2-win32-x86\bin;${{ variables.VCPKG_DOWNLOADS }}\tools\ninja-1.10.1-windows;%PATH% call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=x86 rmdir /s /q build.x86.debug > nul 2> nul cmake.exe -G Ninja -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON -DVCPKG_DEVELOPMENT_WARNINGS=ON -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=ON -B build.x86.debug -S toolsrc diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 4e20684aecb75a..0ef21fd4d7cef5 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -8,25 +8,25 @@ python-3.8.3-embed-win32.zip - 3.18.4 - cmake-3.18.4-win32-x86\bin\cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4-win32-x86.zip - 77ab5b4720c5212cf477100588a20002f7f99a609ad5d5ffef4c163345d366ce9be98280c4f02ecb583d070668a8eb8a2b0baabd266f10c53589aac250f67f28 - cmake-3.18.4-win32-x86.zip + 3.19.2 + cmake-3.19.2-win32-x86\bin\cmake.exe + https://github.com/Kitware/CMake/releases/download/v3.19.2/cmake-3.19.2-win32-x86.zip + 1ed3706d8dd5c5244ceb4c22443f006fcb9ffa76cb6d9ebdbbb8f11a50deb3f92a9a4080ff3fd125f79c0143f553ea0c02a6a2d27521438705c2fea4dd97d239 + cmake-3.19.2-win32-x86.zip - 3.18.4 - cmake-3.18.4-Darwin-x86_64/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4-Darwin-x86_64.tar.gz - 76efc2fc3562ae4087cb9f169dff5b18253402ec4afdfcf8b818f724efaab2c4aacb1baa5fe77db268413964b4272c91eed789991951ea11eeb67332be5a4c5b - cmake-3.18.4-Darwin-x86_64.tar.gz + 3.19.2 + cmake-3.19.2-macos-universal/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.19.2/cmake-3.19.2-macos-universal.tar.gz + 031196439a26d6ff2a1f42830ca26b5159752dc2c2c889a4e304327c858157b68088905b10727090918c3605fe7fe429aa19d46e68ed30c17d4d89b3d209aae8 + cmake-3.19.2-macos-universal.tar.gz - 3.18.4 - cmake-3.18.4-Linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4-Linux-x86_64.tar.gz - 8be5c00dfb00597daae448060fcc612c5e5f0ff9483eb6786cd1c4123cadf15bf2bec1c7892c59792947188889d5a07a9df34190366636c9b8cea4bb1bc7454f - cmake-3.18.4-Linux-x86_64.tar.gz + 3.19.2 + cmake-3.19.2-Linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.19.2/cmake-3.19.2-Linux-x86_64.tar.gz + 67ea7ee428e6c93039646d6d0cbe84c0be337a2b878487635fee71ec2c8992a9078a660e6b793ef11ce13530def44a16b716af96e10a97675d014a26caa0aed4 + cmake-3.19.2-Linux-x86_64.tar.gz 3.12.4 From d24cdc251db9796f8fe508ee8423d0fa3eac8e78 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Tue, 29 Dec 2020 23:43:54 +0000 Subject: [PATCH 0379/1694] [libvpx] switch from yasm to nasm (#14545) * [libvpx] switch from yasm to nasm * [vcpkg] install nasm on azure for osx * Revert "[vcpkg] install nasm on azure for osx" This reverts commit f65ad1bdadb7b7b3a3b056186665f102b4f9aded. * [VMSS] Install nasm on OSX * [libvpx] bump port version * [libvpx] Add --as=nasm for non-MSVC triplets * [libvpx] Fix nasm debug format flag * Back out nasm change applied in https://github.com/microsoft/vcpkg/pull/15258 Co-authored-by: JackBoosY Co-authored-by: Long Nguyen Co-authored-by: Billy Robert O'Neal III --- ports/libvpx/0001-vcxproj-nasm.patch | 22 +++++++++++++++++++ .../0002-Fix-nasm-debug-format-flag.patch | 21 ++++++++++++++++++ ports/libvpx/CONTROL | 3 +-- ports/libvpx/portfile.cmake | 11 ++++++++-- 4 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 ports/libvpx/0001-vcxproj-nasm.patch create mode 100644 ports/libvpx/0002-Fix-nasm-debug-format-flag.patch diff --git a/ports/libvpx/0001-vcxproj-nasm.patch b/ports/libvpx/0001-vcxproj-nasm.patch new file mode 100644 index 00000000000000..eb6333c81a0aea --- /dev/null +++ b/ports/libvpx/0001-vcxproj-nasm.patch @@ -0,0 +1,22 @@ +diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh +index bb1c31d23..b634b0609 100755 +--- a/build/make/gen_msvs_vcxproj.sh ++++ b/build/make/gen_msvs_vcxproj.sh +@@ -247,13 +247,13 @@ libs=${libs// /;} + case "$target" in + x86_64*) + platforms[0]="x64" +- asm_Debug_cmdline="yasm -Xvc -g cv8 -f win64 ${yasmincs} "%(FullPath)"" +- asm_Release_cmdline="yasm -Xvc -f win64 ${yasmincs} "%(FullPath)"" ++ asm_Debug_cmdline="nasm -Xvc -gcv8 -f win64 ${yasmincs} "%(FullPath)"" ++ asm_Release_cmdline="nasm -Xvc -f win64 ${yasmincs} "%(FullPath)"" + ;; + x86*) + platforms[0]="Win32" +- asm_Debug_cmdline="yasm -Xvc -g cv8 -f win32 ${yasmincs} "%(FullPath)"" +- asm_Release_cmdline="yasm -Xvc -f win32 ${yasmincs} "%(FullPath)"" ++ asm_Debug_cmdline="nasm -Xvc -gcv8 -f win32 ${yasmincs} "%(FullPath)"" ++ asm_Release_cmdline="nasm -Xvc -f win32 ${yasmincs} "%(FullPath)"" + ;; + arm64*) + platforms[0]="ARM64" diff --git a/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch b/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch new file mode 100644 index 00000000000000..92f1bbac510bda --- /dev/null +++ b/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch @@ -0,0 +1,21 @@ +diff --git a/build/make/configure.sh b/build/make/configure.sh +index 206b54f..49cd13e 100644 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -1361,12 +1361,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/CONTROL b/ports/libvpx/CONTROL index 1b171c91ad776b..484cd3bbeaa45d 100644 --- a/ports/libvpx/CONTROL +++ b/ports/libvpx/CONTROL @@ -1,7 +1,6 @@ Source: libvpx Version: 1.9.0 -Port-Version: 4 +Port-Version: 5 Homepage: https://github.com/webmproject/libvpx Description: The reference software implementation for the video coding formats VP8 and VP9. Supports: !(uwp&arm) -Build-Depends: yasm-tool-helper diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index fb6a161edbfbb4..706b68b946c977 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -8,6 +8,9 @@ vcpkg_from_github( REF v${LIBVPX_VERSION} SHA512 8d544552b35000ea5712aec220b78bb5f7dc210704b2f609365214cb95a4f5a0e343b362723d829cb4a9ac203b10d5443700ba84b28fd6b2fefbabb40663e298 HEAD_REF master + PATCHES + 0001-vcxproj-nasm.patch + 0002-Fix-nasm-debug-format-flag.patch ) vcpkg_find_acquire_program(PERL) @@ -23,8 +26,9 @@ else() set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}") endif() -include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake) -yasm_tool_helper(PREPEND_TO_PATH OUT_VAR ENV{AS}) +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) +vcpkg_add_to_path(${NASM_EXE_PATH}) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -64,6 +68,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) --disable-examples --disable-tools --disable-docs + --as=nasm WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}" LOGNAME configure-${TARGET_TRIPLET}) @@ -164,6 +169,7 @@ else() --target=${LIBVPX_TARGET} ${OPTIONS} ${OPTIONS_RELEASE} + --as=nasm WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" LOGNAME configure-${TARGET_TRIPLET}-rel) @@ -196,6 +202,7 @@ else() --target=${LIBVPX_TARGET} ${OPTIONS} ${OPTIONS_DEBUG} + --as=nasm WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" LOGNAME configure-${TARGET_TRIPLET}-dbg) From 4866e64355a2b39eb92680abb3b3dc48c45a25a0 Mon Sep 17 00:00:00 2001 From: Markus87 Date: Wed, 30 Dec 2020 00:57:56 +0100 Subject: [PATCH 0380/1694] Fixed port of quirc - patch did no longer apply / modified to fix build (#15252) * Fixed port of quirc - patch did no longer apply / modified to fix build * Updated quirc to the latest version + removed obsolete patch-for-msvc.patch * update baseline * [quirc] Fix license file name Co-authored-by: Billy Robert O'Neal III Co-authored-by: JackBoosY --- ports/quirc/CONTROL | 3 ++- ports/quirc/patch-for-msvc.patch | 36 -------------------------------- ports/quirc/portfile.cmake | 11 ++++------ scripts/ci.baseline.txt | 8 ------- 4 files changed, 6 insertions(+), 52 deletions(-) delete mode 100644 ports/quirc/patch-for-msvc.patch diff --git a/ports/quirc/CONTROL b/ports/quirc/CONTROL index 811e6f70e656fe..c5c23343f2f00f 100644 --- a/ports/quirc/CONTROL +++ b/ports/quirc/CONTROL @@ -1,3 +1,4 @@ Source: quirc -Version: 1.1 +Version: 1.1 +Port-Version: 1 Description: quirc is one of the C library available for scanning QR Codes diff --git a/ports/quirc/patch-for-msvc.patch b/ports/quirc/patch-for-msvc.patch deleted file mode 100644 index c755d04a7c37db..00000000000000 --- a/ports/quirc/patch-for-msvc.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1c1ceecb70ad76751f0b573937380525d7643a87 Mon Sep 17 00:00:00 2001 -From: reyzal -Date: Sun, 4 Mar 2018 12:09:34 +0800 -Subject: [PATCH] for msvc - ---- - lib/identify.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/lib/identify.c b/lib/identify.c -index bf7bd94..cd16b0a 100644 ---- a/lib/identify.c -+++ b/lib/identify.c -@@ -196,9 +196,9 @@ static void threshold(struct quirc *q) - threshold_s = THRESHOLD_S_MIN; - - for (y = 0; y < q->h; y++) { -- int row_average[q->w]; -+ int *row_average = malloc(q->w * sizeof(int)); - -- memset(row_average, 0, sizeof(row_average)); -+ memset(row_average, 0, q->w * sizeof(int)); - - for (x = 0; x < q->w; x++) { - int w, u; -@@ -229,6 +229,7 @@ static void threshold(struct quirc *q) - } - - row += q->w; -+ free(row_average); - } - } - --- -2.7.3.windows.1 - diff --git a/ports/quirc/portfile.cmake b/ports/quirc/portfile.cmake index 4da14ec199538e..bfb0dc77fb1275 100644 --- a/ports/quirc/portfile.cmake +++ b/ports/quirc/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dlbeer/quirc - REF 2e8c4ce7bc45fbe137e50e338c297e265777e7dd # v1.1 - SHA512 83eeab7c70c93477f9a7a2d3114e080ce831d27e035bb47c3fc114d5ede8852599c37af591af348dde1a870f65f8a860284e4a3e1e05585cb7948556b464f59c + REF 7e7ab596e4d0988faf1c12ae89c354b114181c40 + SHA512 d10a783a33ffcc168a287b03250c5ac00b942ec724da641b13fe2ef3f456453b143146422b7e18129a75ce00f13d2d9e3097ac4620134d832de8be4adbbc61c2 HEAD_REF master - PATCHES - patch-for-msvc.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -18,10 +16,9 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() + vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -# Handle copyright -file(COPY ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/quirc) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/quirc/license ${CURRENT_PACKAGES_DIR}/share/quirc/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/quirc/copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e9ccb25d7bd308..1e314462611506 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1231,14 +1231,6 @@ quickfix:x64-uwp=fail quickfix:x64-windows-static=fail quickfix:x64-windows=fail quickfix:x86-windows=fail -quirc:arm64-windows = skip -quirc:arm-uwp = skip -quirc:x64-linux = skip -quirc:x64-osx = skip -quirc:x64-uwp = skip -quirc:x64-windows = skip -quirc:x64-windows-static = skip -quirc:x86-windows = skip qwt:x64-osx=fail rabit:x64-osx=fail ragel:arm-uwp=fail From e359a43ceeb002ee3e76f6a4e8e12e0a4432c577 Mon Sep 17 00:00:00 2001 From: Vladimir Zryachih Date: Wed, 30 Dec 2020 04:59:03 +0500 Subject: [PATCH 0381/1694] fix librsync port for static linkage (#15281) Co-authored-by: Vladimir Zryachih --- ports/librsync/CONTROL | 1 + ports/librsync/portfile.cmake | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/ports/librsync/CONTROL b/ports/librsync/CONTROL index 2b16c9f75a14b7..bb1bb15f24b474 100644 --- a/ports/librsync/CONTROL +++ b/ports/librsync/CONTROL @@ -1,5 +1,6 @@ Source: librsync Version: 2020-09-16 +Port-Version: 1 Description: librsync is a library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications. Homepage: http://librsync.sourcefrog.net/ Supports: !uwp diff --git a/ports/librsync/portfile.cmake b/ports/librsync/portfile.cmake index f3b865c4f16487..a701f76ca96b95 100644 --- a/ports/librsync/portfile.cmake +++ b/ports/librsync/portfile.cmake @@ -33,6 +33,13 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/rsync.dll) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/rsync.dll ${CURRENT_PACKAGES_DIR}/debug/bin/rsync.dll) endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/librsync_export.h + "# ifdef LIBRSYNC_STATIC_DEFINE" + "# if 1 /* LIBRSYNC_STATIC_DEFINE */" + ) +endif() + file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright From 58eef0d2b699cc24b24be2aa65f306f5f0472195 Mon Sep 17 00:00:00 2001 From: Andrei Lebedev Date: Wed, 30 Dec 2020 01:00:55 +0100 Subject: [PATCH 0382/1694] [tbb] arm64-osx support (#15306) Signed-off-by: Andrei Lebedev --- ports/tbb/CMakeLists.txt | 3 +++ ports/tbb/CONTROL | 4 ++-- ports/tbb/portfile.cmake | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ports/tbb/CMakeLists.txt b/ports/tbb/CMakeLists.txt index 3094a4102dde08..ae53c40f2a6251 100644 --- a/ports/tbb/CMakeLists.txt +++ b/ports/tbb/CMakeLists.txt @@ -9,6 +9,9 @@ if(NOT BUILD_SHARED_LIBS) endif() if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(FORWARD_SDK_ROOT "SDKROOT=${CMAKE_OSX_SYSROOT}") + if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64") + set(arch "arch=arm64") + endif() endif() if(CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index 5eb978f3ac5712..611e074b7a15b4 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,6 +1,6 @@ Source: tbb Version: 2020_U3 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/01org/tbb Description: Intel's Threading Building Blocks. -Supports: !(uwp|arm|arm64) | linux +Supports: !(uwp|arm|arm64) | linux | osx diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 5950bd7102905d..0bea15bf0bf22f 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -1,4 +1,4 @@ -if (NOT VCPKG_TARGET_IS_LINUX) +if (NOT VCPKG_TARGET_IS_LINUX AND NOT VCPKG_TARGET_IS_OSX) vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") endif() From a8f1e0e45fca45068c786b9ba14de20a3f74dfe9 Mon Sep 17 00:00:00 2001 From: Andrei Lebedev Date: Wed, 30 Dec 2020 01:01:30 +0100 Subject: [PATCH 0383/1694] [grpc] Build codegen on arm64-osx (#15307) Signed-off-by: Andrei Lebedev --- ports/grpc/CONTROL | 4 ++-- ports/grpc/portfile.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index f5954763e7c451..208332e5322048 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,9 +1,9 @@ Source: grpc Version: 1.33.1 -Port-Version: 1 +Port-Version: 2 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp), upb, abseil, re2 Homepage: https://github.com/grpc/grpc Description: An RPC library and framework Feature: absl-sync -Description: Use abseil synchronization module \ No newline at end of file +Description: Use abseil synchronization module diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 8253fe3e67b1ba..648b41b61aa46a 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -21,7 +21,7 @@ vcpkg_from_github( 00012-fix-use-cxx17.patch ) -if((NOT VCPKG_TARGET_IS_LINUX) AND (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) +if((NOT VCPKG_TARGET_IS_LINUX AND NOT VCPKG_TARGET_IS_OSX) AND (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) set(gRPC_BUILD_CODEGEN OFF) else() set(gRPC_BUILD_CODEGEN ON) From 67dec0fd1c02afc125e3379f08e7c2227fa8a8ba Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Tue, 29 Dec 2020 16:03:37 -0800 Subject: [PATCH 0384/1694] [bcg729] New port (#15322) * [bcg729] New port Bcg729 is a G.729 Annex A&B codec. Closes #14835. * Update ports/bcg729/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/bcg729/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [bcg729] Allow *-uwp in ci.baseline.txt. * Update ports/bcg729/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Use a manifest rather than CONTROL; portfile.cmake nitpicks. Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/bcg729/portfile.cmake | 25 +++++++++++++++++++++++++ ports/bcg729/vcpkg.json | 6 ++++++ 2 files changed, 31 insertions(+) create mode 100644 ports/bcg729/portfile.cmake create mode 100644 ports/bcg729/vcpkg.json diff --git a/ports/bcg729/portfile.cmake b/ports/bcg729/portfile.cmake new file mode 100644 index 00000000000000..4a6f5c6f63ad70 --- /dev/null +++ b/ports/bcg729/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO BelledonneCommunications/bcg729 + REF 1.1.1 + SHA512 e8cc4b7486a9a29fb729ab9fd9e3c4a2155573f38cec16f5a53db3b416fc1119ea5f5a61243a8d37cb0b64580c5df1b632ff165dc7ff47421fa567dafffaacd8 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + -DENABLE_STATIC=${ENABLE_STATIC} + -DENABLE_SHARED=${ENABLE_SHARED} +) + +vcpkg_install_cmake() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/bcg729/vcpkg.json b/ports/bcg729/vcpkg.json new file mode 100644 index 00000000000000..5896ad827eb48c --- /dev/null +++ b/ports/bcg729/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "bcg729", + "version-string": "1.1.1", + "description": "Bcg729 is an open source implementation of the ITU G.729 Annex A and B codec.", + "homepage": "https://github.com/BelledonneCommunications/bcg729" +} From 743798543652a296044e196355ad0d0d4ecc6983 Mon Sep 17 00:00:00 2001 From: Kevin Lu <6320810+kevinlul@users.noreply.github.com> Date: Tue, 29 Dec 2020 19:05:56 -0500 Subject: [PATCH 0385/1694] [freetype] Update to 2.10.4 (#15334) * bump version sha * update patches * [vtk] upstream patch for freetype 2.10.4 https://discourse.vtk.org/t/building-opencascade-7-5-0-with-vtk-9-0-1 --- ports/freetype/CONTROL | 3 +-- ports/freetype/fix-exports.patch | 11 +++++++--- ports/freetype/pkgconfig.patch | 36 ++++++++++++++++---------------- ports/freetype/portfile.cmake | 4 ++-- ports/vtk/CONTROL | 2 +- ports/vtk/fix-freetype.patch | 26 +++++++++++++++++++++++ ports/vtk/portfile.cmake | 1 + 7 files changed, 57 insertions(+), 26 deletions(-) create mode 100644 ports/vtk/fix-freetype.patch diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL index c005318a2447c9..efb570b7b8afb9 100644 --- a/ports/freetype/CONTROL +++ b/ports/freetype/CONTROL @@ -1,6 +1,5 @@ Source: freetype -Version: 2.10.2 -Port-Version: 7 +Version: 2.10.4 Homepage: https://www.freetype.org/ Description: A library to render fonts. Default-Features: zlib, bzip2, png, brotli diff --git a/ports/freetype/fix-exports.patch b/ports/freetype/fix-exports.patch index 9cad1dc3782623..3574588274798f 100644 --- a/ports/freetype/fix-exports.patch +++ b/ports/freetype/fix-exports.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 04ce73a..ee3cc05 100644 +index 2314c79..994c602 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -454,7 +454,7 @@ endif () +@@ -446,7 +446,7 @@ endif () set(PKG_CONFIG_REQUIRED_PRIVATE "") if (ZLIB_FOUND) @@ -11,12 +11,17 @@ index 04ce73a..ee3cc05 100644 target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS}) list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "zlib") endif () -@@ -562,8 +562,21 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) +@@ -560,12 +560,26 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) install( EXPORT freetype-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype - FILE freetype-config.cmake COMPONENT headers) + install( + FILES ${PROJECT_BINARY_DIR}/freetype-config-version.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype + COMPONENT headers) ++ + + if(ZLIB_FOUND) + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake" diff --git a/ports/freetype/pkgconfig.patch b/ports/freetype/pkgconfig.patch index 615434a34bbc6e..cf8da2c3f76d34 100644 --- a/ports/freetype/pkgconfig.patch +++ b/ports/freetype/pkgconfig.patch @@ -1,20 +1,20 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 65839ac58..54f2ce8ec 100644 ---- a/CMakeLists.txt +index 61b174e..2314c79 100644 +--- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -517,7 +517,6 @@ endif () - - if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - # Generate the pkg-config file -- if (UNIX) - file(READ "${PROJECT_SOURCE_DIR}/builds/unix/freetype2.in" FREETYPE2_PC_IN) - - string(REPLACE ";" ", " PKG_CONFIG_REQUIRED_PRIVATE "${PKG_CONFIG_REQUIRED_PRIVATE}") -@@ -551,7 +550,6 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - FILES ${PROJECT_BINARY_DIR}/freetype2.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - COMPONENT pkgconfig) -- endif () - - install( - TARGETS freetype +@@ -509,7 +509,6 @@ endif () + + if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) + # Generate the pkg-config file +- if (UNIX) + file(READ "${PROJECT_SOURCE_DIR}/builds/unix/freetype2.in" FREETYPE2_PC_IN) + + string(REPLACE ";" ", " PKG_CONFIG_REQUIRED_PRIVATE "${PKG_CONFIG_REQUIRED_PRIVATE}") +@@ -543,7 +542,6 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) + FILES ${PROJECT_BINARY_DIR}/freetype2.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + COMPONENT pkgconfig) +- endif () + + include(CMakePackageConfigHelpers) + write_basic_package_version_file( diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 98cb13b9847a72..76e5d891ec7a19 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -1,11 +1,11 @@ -set(FT_VERSION 2.10.2) +set(FT_VERSION 2.10.4) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO freetype/freetype2 REF ${FT_VERSION} FILENAME freetype-${FT_VERSION}.tar.xz - SHA512 cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa + SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f PATCHES 0001-Fix-install-command.patch 0003-Fix-UWP.patch diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index edbe3cc93a6f08..feceb9d014b41b 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,6 +1,6 @@ Source: vtk Version: 9.0.1 -Port-Version: 2 +Port-Version: 3 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5[core], libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg, pegtl-2 diff --git a/ports/vtk/fix-freetype.patch b/ports/vtk/fix-freetype.patch new file mode 100644 index 00000000000000..aaaf35174d420b --- /dev/null +++ b/ports/vtk/fix-freetype.patch @@ -0,0 +1,26 @@ +diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx +index c54289dc..e6d9b14f 100644 +--- a/Rendering/FreeType/vtkFreeTypeTools.cxx ++++ b/Rendering/FreeType/vtkFreeTypeTools.cxx +@@ -378,7 +378,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache() + } + + //---------------------------------------------------------------------------- +-FT_CALLBACK_DEF(FT_Error) ++FT_Error + vtkFreeTypeToolsFaceRequester( + FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) + { +diff --git a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx +index 5c1908cf..41ed97e7 100644 +--- a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx ++++ b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx +@@ -29,7 +29,7 @@ vtkStandardNewMacro(vtkFontConfigFreeTypeTools); + namespace + { + // The FreeType face requester callback: +-FT_CALLBACK_DEF(FT_Error) ++static FT_Error + vtkFontConfigFreeTypeToolsFaceRequester( + FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) + { diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index c3ebfbe6e82648..cd403bcb649b1b 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -129,6 +129,7 @@ vcpkg_from_github( module-name-mangling.patch # Last patch TODO: Patch out internal loguru FindExpat.patch # The find_library calls are taken care of by vcpkg-cmake-wrapper.cmake of expat + fix-freetype.patch # Should be fixed next version, !7367 + !7434 ) # ============================================================================= From 9bcd0888d647684224edeecf79aac2aa578acfe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 29 Dec 2020 16:07:42 -0800 Subject: [PATCH 0386/1694] [mdnsresponder] Change compile flag /Zi to /Z7 (#15340) --- ports/mdnsresponder/CONTROL | 3 ++- ports/mdnsresponder/portfile.cmake | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/mdnsresponder/CONTROL b/ports/mdnsresponder/CONTROL index 9f97716e8ae4ab..a281e83bf4c2d0 100644 --- a/ports/mdnsresponder/CONTROL +++ b/ports/mdnsresponder/CONTROL @@ -1,5 +1,6 @@ Source: mdnsresponder -Version: 765.30.11-2 +Version: 765.30.11 +Port-Version: 3 Description: The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative. Homepage: https://developer.apple.com/bonjour/ Supports: !arm \ No newline at end of file diff --git a/ports/mdnsresponder/portfile.cmake b/ports/mdnsresponder/portfile.cmake index e293294423e5e1..337cf0bdc24b91 100644 --- a/ports/mdnsresponder/portfile.cmake +++ b/ports/mdnsresponder/portfile.cmake @@ -49,6 +49,11 @@ function(FIX_VCXPROJ VCXPROJ_PATH) "StaticLibrary" ORIG "${ORIG}") endif() + + string(REPLACE + "ProgramDatabase" + "OldStyle" + ORIG "${ORIG}") file(WRITE ${VCXPROJ_PATH} "${ORIG}") endfunction() From 05cfe0d4a661b24bd573498ba157bb303055e710 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 30 Dec 2020 08:08:11 +0800 Subject: [PATCH 0387/1694] Raylib update to 3.5.0 (#15342) --- ports/raylib/CONTROL | 3 +-- ports/raylib/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/raylib/CONTROL b/ports/raylib/CONTROL index 7308a4e43f8a95..d617a9189e44ef 100644 --- a/ports/raylib/CONTROL +++ b/ports/raylib/CONTROL @@ -1,6 +1,5 @@ Source: raylib -Version: 3.0.0 -Port-Version: 3 +Version: 3.5.0 Description: A simple and easy-to-use library to enjoy videogames programming Homepage: https://github.com/raysan5/raylib Supports: !(arm|uwp) diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index ba63fff8484560..a3af4172eb52d5 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -16,8 +16,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO raysan5/raylib - REF 7ef114d1da2c34a70bba5442497103441647d8f3 # 3.0.0 - SHA512 e15df6f0f95d9580d6211459815f174496b1385c9797a682d372a03b1175c9eb38e51b3b27077346d5e1a2d6ee2d5c636e03e8fd3ca9a73a7fa2a67afd255bd2 + REF e25e380e80a117f2404d65b37700fb620dc1f990 # 3.5.0 + SHA512 67a2cf4f7a4be88e958f8d6c68f270b1500fde8752b32d401fa80026d2d81dbdd9f57ea754f10095858ae0deab93383d675ad3a1b45f2051a4cc1d02db64dc01 HEAD_REF master ) From 6f5fc1890ad2d65509be14ea78f5a55acccb18f6 Mon Sep 17 00:00:00 2001 From: Amir Alperin Date: Wed, 30 Dec 2020 02:08:37 +0200 Subject: [PATCH 0388/1694] bump version (#15344) --- ports/cpp-httplib/CONTROL | 2 +- ports/cpp-httplib/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cpp-httplib/CONTROL b/ports/cpp-httplib/CONTROL index 2cb8014e9b68e4..a080407158c14e 100644 --- a/ports/cpp-httplib/CONTROL +++ b/ports/cpp-httplib/CONTROL @@ -1,4 +1,4 @@ Source: cpp-httplib -Version: 0.7.15 +Version: 0.7.18 Homepage: https://github.com/yhirose/cpp-httplib Description: A single file C++11 header-only HTTP/HTTPS server and client library diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake index 721cbf73fbba65..0aff5485e21d22 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 e1133a2dcb3436ac36c75452a569b609cdb58a0b # v0.7.15 - SHA512 b0ead7fa561f26ebbe407b57b5f96c5ccc76689af28aeb734bd035b373fd63dca0909ea36ef016e426cb068e8712ae361654480695688a5b3979fb0864cec82d + REF 40db42108f4303057a0494710ab06c796bb60448 # v0.7.18 + SHA512 54f5d7b4f8b9824977ceed4681db5af4421c26d6f07d6085428e4fa17007c2c1cde4c32615bc4100ce8fd9fb449ab420e94f057be4db7140479578654d1e6941 HEAD_REF master ) From 7a7ec1913bbbb585dd9e236395f5fa1fc905bfc5 Mon Sep 17 00:00:00 2001 From: Kevin Lalumiere Date: Tue, 29 Dec 2020 19:09:35 -0500 Subject: [PATCH 0389/1694] Adds `python-debugging=on` to `B2_OPTIONS_DBG` (#15352) ... when BOOST_DEBUG_PYTHON is inside the VCPKG_CXX_FLAGS_DEBUG, i.e. fixes 15350 --- ports/boost-python/CONTROL | 1 + ports/boost-python/b2-options.cmake | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL index 62ce076f486702..1aa018b7a53f5e 100644 --- a/ports/boost-python/CONTROL +++ b/ports/boost-python/CONTROL @@ -1,6 +1,7 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-python Version: 1.75.0 +Port-Version: 1 Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3 Homepage: https://github.com/boostorg/python Description: Boost python module diff --git a/ports/boost-python/b2-options.cmake b/ports/boost-python/b2-options.cmake index 5cc0a8da01be14..3713424ed64706 100644 --- a/ports/boost-python/b2-options.cmake +++ b/ports/boost-python/b2-options.cmake @@ -21,3 +21,8 @@ string(REPLACE ";" "," BUILD_PYTHON_VERSIONS "${BUILD_PYTHON_VERSIONS}") list(APPEND B2_OPTIONS python=${BUILD_PYTHON_VERSIONS} ) +if(VCPKG_CXX_FLAGS_DEBUG MATCHES "BOOST_DEBUG_PYTHON") + list(APPEND B2_OPTIONS_DBG + python-debugging=on + ) +endif() From 1d4d95de21e457aa330aaf903ff9f73ad1861cc5 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 29 Dec 2020 16:34:43 -0800 Subject: [PATCH 0390/1694] [antlr4,python3] Resolve cross port conflicts (#15378) * [python3] Add vcpkg's include directories to the end rather than to the beginning. This is safe because vcpkg never hydrates python3's $(PySrcDir)\externals directory, so it wasn't using vendored dependencies at all. * [antlr4] Install antlr headers in antlr4-runtime rather than the root to avoid stomping on common name token.h. This is consistent with the ubuntu packages. --- ports/antlr4/CONTROL | 3 ++- ports/antlr4/portfile.cmake | 6 ------ ports/python3/python_vcpkg.props.in | 2 +- ports/python3/vcpkg.json | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL index 31614905afce55..e483545287b2ea 100644 --- a/ports/antlr4/CONTROL +++ b/ports/antlr4/CONTROL @@ -1,6 +1,7 @@ Source: antlr4 Version: 4.8 +Port-Version: 1 Homepage: https://www.antlr.org Description: ANother Tool for Language Recognition Build-Depends: libuuid (!uwp&!windows&!osx) -Supports: !uwp \ No newline at end of file +Supports: !uwp diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index 5160648f3f88e1..6ceaa3af9b711b 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -78,12 +78,6 @@ else() endif() endif() -file(GLOB HDRS LIST_DIRECTORIES true ${CURRENT_PACKAGES_DIR}/include/antlr4-runtime/*) -file(COPY ${HDRS} DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/antlr4-runtime) - vcpkg_copy_pdbs() file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -message(STATUS "Installing done") \ No newline at end of file diff --git a/ports/python3/python_vcpkg.props.in b/ports/python3/python_vcpkg.props.in index efad43bbd20bfa..c786e5fa064721 100644 --- a/ports/python3/python_vcpkg.props.in +++ b/ports/python3/python_vcpkg.props.in @@ -6,7 +6,7 @@ _Py_HAVE_ZLIB;%(PreprocessorDefinitions) XML_STATIC;%(PreprocessorDefinitions) - ${CURRENT_INSTALLED_DIR}/include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories);${CURRENT_INSTALLED_DIR}/include MultiThreadedDebug diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 5907ab9b90012b..b8aa2ac3c1ed55 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version-string": "3.9.0", - "port-version": 1, + "port-version": 2, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", From 22dc12d5bc2d6ea147c5a98258db5c6e78e5250b Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Wed, 30 Dec 2020 06:26:27 +0300 Subject: [PATCH 0391/1694] [sail] Enable static builds and more platforms (#15140) --- ports/sail/portfile.cmake | 22 +++++++++++++--------- ports/sail/usage | 3 --- ports/sail/usage.unix | 16 ++++++++++++++++ ports/sail/vcpkg.json | 4 ++-- 4 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 ports/sail/usage.unix diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index a5d5633ee3646b..e2ea7f15eb8ef3 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -1,18 +1,21 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" "OSX" "Linux") +vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO smoked-herring/sail - REF v0.9.0-pre10 - SHA512 d38a3c7d33495c84d7ada91a4131d32ce61f3fdf32a7e0631b28e7d8492fa4cb672eea09ef8cf0272dabd57f640b090749e3ecd863be577af2b98763873dc57d + REF a7b8cdb + SHA512 402b0e05ce99b5abeebf695a132121cc59789834d5a296ffada34fa3090c16ffc2266e98393e10136e31480b2378b966a8a48a153240f43b0196d986316aa9df HEAD_REF master ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SAIL_STATIC) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DSAIL_VCPKG_PORT=ON + -DSAIL_STATIC=${SAIL_STATIC} + -DSAIL_COMBINE_CODECS=ON -DSAIL_BUILD_EXAMPLES=OFF -DSAIL_BUILD_TESTS=OFF ) @@ -25,10 +28,6 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -# Move codecs -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/sail ${CURRENT_PACKAGES_DIR}/bin/sail) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sail ${CURRENT_PACKAGES_DIR}/debug/bin/sail) - # Move cmake configs vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sail) @@ -36,7 +35,12 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sail) vcpkg_fixup_pkgconfig() # Handle usage -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +if (UNIX AND NOT APPLE) + file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage.unix DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage.unix ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage) +else() + file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +endif() # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/sail/usage b/ports/sail/usage index d117e68bc6b34d..672b735e986702 100644 --- a/ports/sail/usage +++ b/ports/sail/usage @@ -9,6 +9,3 @@ C++ bindings: find_package(Sail CONFIG REQUIRED) target_link_libraries(main PRIVATE SAIL::sail-c++) - -For dynamic builds, please also copy SAIL codecs (bin/sail) and their dependencies -into the application directory. diff --git a/ports/sail/usage.unix b/ports/sail/usage.unix new file mode 100644 index 00000000000000..6f06da874fbbb1 --- /dev/null +++ b/ports/sail/usage.unix @@ -0,0 +1,16 @@ +The package sail provides CMake targets: + +C libraries: + + find_package(Sail CONFIG REQUIRED) + target_link_libraries(main PRIVATE SAIL::sail) + +C++ bindings: + + find_package(Sail CONFIG REQUIRED) + target_link_libraries(main PRIVATE SAIL::sail-c++) + +Note for static builds on Unix-like platforms: the client application +must be built with -rdynamic or an equivalent to enable dlopen and dlsym +on the same binary. If you use CMake, this could be achieved by setting +CMAKE_ENABLE_EXPORTS to ON. diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index 01e6c6408253c4..72ad2a0ef45ef9 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,9 +1,9 @@ { "name": "sail", - "version-string": "0.9.0-pre10", + "version-string": "0.9.0-pre11", "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/smoked-herring/sail", - "supports": "windows & !static & !uwp", + "supports": "!uwp", "dependencies": [ "giflib", "libjpeg-turbo", From 9852659ca493c693c4bb458dcfe4d55779f48923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Wed, 30 Dec 2020 19:38:48 +0100 Subject: [PATCH 0392/1694] [monkeys-audio] Update to 5.70 (#15359) Released MAC_SDK files are currently only provided for download for a short period of time and replaced frequently by newer versions. See: https://monkeysaudio.com/files/ - Update patches: fix-project-config.patch remove-certificate-step.patch - Add alternative download URL from Internet Archive --- ports/monkeys-audio/CONTROL | 2 +- ports/monkeys-audio/fix-project-config.patch | 32 ++++++------- ports/monkeys-audio/portfile.cmake | 15 +++--- .../remove-certificate-step.patch | 48 +++++++++---------- 4 files changed, 48 insertions(+), 49 deletions(-) diff --git a/ports/monkeys-audio/CONTROL b/ports/monkeys-audio/CONTROL index 6a9b6a2a3c9740..833aad90b587c7 100644 --- a/ports/monkeys-audio/CONTROL +++ b/ports/monkeys-audio/CONTROL @@ -1,5 +1,5 @@ Source: monkeys-audio -Version: 5.65 +Version: 5.70 Homepage: https://monkeysaudio.com Description: Monkey's Audio is an excellent audio compression tool which has multiple advantages over traditional methods. Audio files compressed with it end with .ape extension. diff --git a/ports/monkeys-audio/fix-project-config.patch b/ports/monkeys-audio/fix-project-config.patch index 08351e178b9af5..549f9bd6429032 100644 --- a/ports/monkeys-audio/fix-project-config.patch +++ b/ports/monkeys-audio/fix-project-config.patch @@ -1,16 +1,16 @@ -diff --git a/Source/Projects/VS2019/MACDll/MACDll.vcxproj b/Source/Projects/VS2019/MACDll/MACDll.vcxproj -index 4e84b52..79882b0 100644 ---- a/Source/Projects/VS2019/MACDll/MACDll.vcxproj -+++ b/Source/Projects/VS2019/MACDll/MACDll.vcxproj -@@ -75,10 +75,9 @@ - <_ProjectFileVersion>11.0.50727.1 - - -- C:\Applications\Winamp\plugins\ -+ $(Configuration)\ - $(Configuration)\ - true -- in_ape.dll - - - $(Configuration)\ +--- a/Source/Projects/VS2019/MACDll/MACDll.vcxproj 2020-12-23 21:42:15.830541000 +0100 ++++ b/Source/Projects/VS2019/MACDll/MACDll.vcxproj 2020-12-29 06:07:36.101967600 +0100 +@@ -74,11 +74,9 @@ + <_ProjectFileVersion>11.0.50727.1 + + +- C:\Applications\Cool Edit Pro\ ++ $(Configuration)\ + $(Configuration)\ +- true +- APE +- .flt ++ false + + + $(Configuration)\ diff --git a/ports/monkeys-audio/portfile.cmake b/ports/monkeys-audio/portfile.cmake index 338310604b45fd..40c2bccdecb300 100644 --- a/ports/monkeys-audio/portfile.cmake +++ b/ports/monkeys-audio/portfile.cmake @@ -2,21 +2,22 @@ vcpkg_fail_port_install(ON_TARGET "UWP" "OSX" "Linux") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) -set(MA_VERSION 565d) +set(MA_VERSION 570) vcpkg_download_distfile(ARCHIVE URLS "https://monkeysaudio.com/files/MAC_SDK_${MA_VERSION}.zip" + "https://web.archive.org/web/20201229182615if_/https://monkeysaudio.com/files/MAC_SDK_570.zip" FILENAME "MAC_SDK_${MA_VERSION}.zip" - SHA512 785273b4fe19dad284b2c51fb648b2cbae66af069fac75745909862e084e8bfe175703b0997b20cd15a54985e8d707810d8cdcc849692767e71ace924ddfd951 + SHA512 d3b5a10574dde1ea90578959378b87f8a8c94b3cc7198bc51b86f7128d66117d706c191d56a699dce0c2a53b7722e0893cb614f96f9ad725a266a871da587fd4 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} NO_REMOVE_ONE_LEVEL - PATCHES - fix-project-config.patch - remove-certificate-step.patch + PATCHES + fix-project-config.patch + remove-certificate-step.patch ) file(REMOVE_RECURSE @@ -52,10 +53,10 @@ if ("tools" IN_LIST FEATURES) PROJECT_SUBPATH Source/Projects/VS2019/Console/Console.vcxproj PLATFORM ${PLATFORM} ) - + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/Console.lib ${CURRENT_PACKAGES_DIR}/debug/lib/Console.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/tools/monkeys-audio/Console.exe ${CURRENT_PACKAGES_DIR}/tools/monkeys-audio/mac.exe) - + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() diff --git a/ports/monkeys-audio/remove-certificate-step.patch b/ports/monkeys-audio/remove-certificate-step.patch index d06f5161b51844..16fb24d2a7e694 100644 --- a/ports/monkeys-audio/remove-certificate-step.patch +++ b/ports/monkeys-audio/remove-certificate-step.patch @@ -1,26 +1,24 @@ -diff --git a/Source/Projects/VS2019/Console/Console.vcxproj b/Source/Projects/VS2019/Console/Console.vcxproj -index 164608f..feeb163 100644 ---- a/Source/Projects/VS2019/Console/Console.vcxproj -+++ b/Source/Projects/VS2019/Console/Console.vcxproj +--- a/Source/Projects/VS2019/Console/Console.vcxproj 2020-12-23 21:42:15.672211100 +0100 ++++ b/Source/Projects/VS2019/Console/Console.vcxproj 2020-12-29 05:29:53.916306700 +0100 @@ -180,10 +180,6 @@ - - MachineX86 - -- -- C:\MAC\Current\Source\Certificate\signtool.exe sign /t http://timestamp.digicert.com /f C:\MAC\Current\Source\Certificate\MAC2.crt /v "$(TargetPath)" --C:\MAC\Current\Source\Certificate\signtool.exe sign /f C:\MAC\Current\Source\Certificate\MAC2.crt /tr http://timestamp.comodoca.com /td sha256 /fd sha256 /a /as "$(TargetPath)" -- - - - -@@ -273,10 +269,6 @@ C:\MAC\Current\Source\Certificate\signtool.exe sign /f C:\MAC\Current\Source\Cer - - MachineX64 - -- -- C:\MAC\Current\Source\Certificate\signtool.exe sign /t http://timestamp.digicert.com /f C:\MAC\Current\Source\Certificate\MAC2.crt /v "$(TargetPath)" --C:\MAC\Current\Source\Certificate\signtool.exe sign /f C:\MAC\Current\Source\Certificate\MAC2.crt /tr http://timestamp.comodoca.com /td sha256 /fd sha256 /a /as "$(TargetPath)" -- - - - + + MachineX86 + +- +- C:\MAC\Current\Source\Certificate\signtool.exe sign /t http://timestamp.digicert.com /f C:\MAC\Current\Source\Certificate\MAC3.pfx /p password /v "$(TargetPath)" +-C:\MAC\Current\Source\Certificate\signtool.exe sign /f C:\MAC\Current\Source\Certificate\MAC3.pfx /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /fd sha256 /a /as /p password "$(TargetPath)" +- + + + +@@ -273,10 +269,6 @@ + + MachineX64 + +- +- C:\MAC\Current\Source\Certificate\signtool.exe sign /t http://timestamp.digicert.com /f C:\MAC\Current\Source\Certificate\MAC3.pfx /p password /v "$(TargetPath)" +-C:\MAC\Current\Source\Certificate\signtool.exe sign /f C:\MAC\Current\Source\Certificate\MAC3.pfx /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /fd sha256 /a /as /p password "$(TargetPath)" +- + + + From 789f56648c67ac4dcd96a6f1d099fb8ccca941b5 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 30 Dec 2020 10:39:50 -0800 Subject: [PATCH 0393/1694] [glib] Fix pkgconfig files (#15360) * [glib] Fix pkgconfig files * Use GLIB_VERSION instead --- ports/glib/CMakeLists.txt | 1 + ports/glib/CONTROL | 2 +- ports/glib/fix_pkgconfig.patch | 30 ++++++++++++++++++++++++++++++ ports/glib/portfile.cmake | 1 + 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 ports/glib/fix_pkgconfig.patch diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index 144f1177655bf5..b0ee220aafc776 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -357,6 +357,7 @@ message(STATUS " " ${CHARSET_LIBRARY}) message(STATUS " " ${FFI_LIBRARY}) message(STATUS " " ${Intl_LIBRARIES}) +set(VERSION ${GLIB_VERSION}) set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(libdir ${CMAKE_INSTALL_PREFIX}/lib) diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index a842f65e89fece..48501faaa5b8c4 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -1,6 +1,6 @@ Source: glib Version: 2.52.3 -Port-Version: 24 +Port-Version: 25 Homepage: https://developer.gnome.org/glib/ Description: Portable, general-purpose utility library. Build-Depends: zlib, pcre, libffi, gettext, libiconv diff --git a/ports/glib/fix_pkgconfig.patch b/ports/glib/fix_pkgconfig.patch new file mode 100644 index 00000000000000..e429120f23323f --- /dev/null +++ b/ports/glib/fix_pkgconfig.patch @@ -0,0 +1,30 @@ +diff --git a/gio-unix-2.0.pc.in b/gio-unix-2.0.pc.in +index fba58e2..2d015f6 100644 +--- a/gio-unix-2.0.pc.in ++++ b/gio-unix-2.0.pc.in +@@ -8,4 +8,4 @@ Description: unix specific headers for glib I/O library + Version: @VERSION@ + Requires: gobject-2.0,gio-2.0 + Libs: -L${libdir} -lgio-2.0 +-Cflags: -I${includedir}/gio-unix-2.0/ ++Cflags: -I${includedir}/gio +diff --git a/gio-windows-2.0.pc.in b/gio-windows-2.0.pc.in +index 77eecdf..25bb0ae 100644 +--- a/gio-windows-2.0.pc.in ++++ b/gio-windows-2.0.pc.in +@@ -8,4 +8,4 @@ Description: Windows specific headers for glib I/O library + Version: @VERSION@ + Requires: gobject-2.0,gmodule-no-export-2.0,gio-2.0 + Libs: -L${libdir} -lgio-2.0 +-Cflags: -I${includedir}/gio-win32-2.0/ ++Cflags: -I${includedir}/gio +diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in +index 275fc01..1bfd74a 100644 +--- a/glib-2.0.pc.in ++++ b/glib-2.0.pc.in +@@ -13,4 +13,4 @@ Version: @VERSION@ + Requires.private: @PCRE_REQUIRES@ + Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ + Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@ @CARBON_LIBS@ @COCOA_LIBS@ +-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ ++Cflags: -I${includedir}/glib @GLIB_EXTRA_CFLAGS@ diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index dac83ab904c4f5..099886a3c53e52 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_extract_source_archive_ex( use-libiconv-on-windows.patch arm64-defines.patch fix-arm-builds.patch + fix_pkgconfig.patch ) configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) From afa96bece8feb758eb28a640088eb34cee8e7fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 30 Dec 2020 10:40:30 -0800 Subject: [PATCH 0394/1694] [libpq] Change compile flag /Zi to /Z7 when building Windows (#15361) * [libpq] Change compile flag /Zi to /Z7 when building Windows * [libpq] Fix installation about pdbs --- ports/libpq/CONTROL | 2 +- .../patches/windows/fix-compile-flag-Zi.patch | 33 +++++++++++++++++++ ports/libpq/portfile.cmake | 1 + 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 ports/libpq/patches/windows/fix-compile-flag-Zi.patch diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL index 9087debeedbc17..fa6ea6d91c1140 100644 --- a/ports/libpq/CONTROL +++ b/ports/libpq/CONTROL @@ -1,6 +1,6 @@ Source: libpq Version: 12.2 -Port-Version: 9 +Port-Version: 10 Build-Depends: libpq[core,bonjour] (osx) Supports: !uwp Homepage: https://www.postgresql.org/ diff --git a/ports/libpq/patches/windows/fix-compile-flag-Zi.patch b/ports/libpq/patches/windows/fix-compile-flag-Zi.patch new file mode 100644 index 00000000000000..04d86811e954ae --- /dev/null +++ b/ports/libpq/patches/windows/fix-compile-flag-Zi.patch @@ -0,0 +1,33 @@ +diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm +index b93992f..2397511 100644 +--- a/src/tools/msvc/MSBuildProject.pm ++++ b/src/tools/msvc/MSBuildProject.pm +@@ -333,7 +333,7 @@ sub WriteItemDefinitionGroup + false + Level3 + true +- ProgramDatabase ++ OldStyle + Default + + +diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm +index e0c9a88..98f9e67 100644 +--- a/src/tools/msvc/Install.pm ++++ b/src/tools/msvc/Install.pm +@@ -341,9 +341,12 @@ sub CopySolutionOutput + || croak "Could not copy $pf.$ext\n"; + } + } +- lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") +- || croak "Could not copy $pf.pdb\n"; +- print "."; ++ if ($1 eq 'DynamicLibrary') ++ { ++ lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") ++ || croak "Could not copy $pf.pdb\n"; ++ print "."; ++ } + } + print "\n"; + return; diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 442fa199b63cbb..91f6e36435c69b 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -42,6 +42,7 @@ set(PATCHES patches/windows/MSBuildProject_fix_gendef_perl.patch patches/windows/msgfmt.patch patches/windows/python_lib.patch + patches/windows/fix-compile-flag-Zi.patch patches/linux/configure.patch) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) From 50418454cb41779152a03f264d82c76457cb2fc2 Mon Sep 17 00:00:00 2001 From: Mark Gillard Date: Wed, 30 Dec 2020 20:40:49 +0200 Subject: [PATCH 0395/1694] update toml++ to v2.3.0 (#15365) --- ports/tomlplusplus/CONTROL | 2 +- ports/tomlplusplus/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/tomlplusplus/CONTROL b/ports/tomlplusplus/CONTROL index 2883f49ee2da14..b196607e6f00e5 100644 --- a/ports/tomlplusplus/CONTROL +++ b/ports/tomlplusplus/CONTROL @@ -1,5 +1,5 @@ Source: tomlplusplus -Version: 2.2.0 +Version: 2.3.0 Homepage: https://marzer.github.io/tomlplusplus/ Description: Header-only TOML config file parser and serializer for modern C++. Supports: !(arm|uwp|linux|osx) diff --git a/ports/tomlplusplus/portfile.cmake b/ports/tomlplusplus/portfile.cmake index 9517079a80ece6..974bc99a06526f 100644 --- a/ports/tomlplusplus/portfile.cmake +++ b/ports/tomlplusplus/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "linux" "osx" "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO marzer/tomlplusplus - REF v2.2.0 - SHA512 e309c10d89d23e379520ed338101ad3d1b48b6184b1475cf9190bace7bd0c0bdcd738ba7dcc66e47183b925c06408ceba5591e8e7fcd419bf7ea6485a07f0679 + REF v2.3.0 + SHA512 3a6328f71953baca25cb29bb493605e964496d1bc39961679cd97f72feecad63a21d6ebd9fe51b6e1b9b185a35581cb3fb199f6b0cc643b5b782bdd85249b79e HEAD_REF master ) From bfefea2e7a8f6ea4a63a8577560d1c7c21204ac4 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 31 Dec 2020 02:41:49 +0800 Subject: [PATCH 0396/1694] [LLGL] installs header files in the wrong directory (#15366) --- ports/llgl/CONTROL | 1 + ports/llgl/fix-install-error.patch | 2 +- ports/llgl/portfile.cmake | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/llgl/CONTROL b/ports/llgl/CONTROL index fcba2d2d424510..48341f27dc427d 100644 --- a/ports/llgl/CONTROL +++ b/ports/llgl/CONTROL @@ -1,5 +1,6 @@ Source: llgl Version: 2019-08-15 +Port-Version: 1 Homepage: https://github.com/LukasBanana/LLGL Description: Low Level Graphics Library (LLGL) is a thin abstraction layer for the modern graphics APIs OpenGL, Direct3D, Vulkan, and Metal. Supports: !uwp diff --git a/ports/llgl/fix-install-error.patch b/ports/llgl/fix-install-error.patch index 30b9c3040559dc..872d01bfc0a9bb 100644 --- a/ports/llgl/fix-install-error.patch +++ b/ports/llgl/fix-install-error.patch @@ -39,6 +39,6 @@ index f440884..d1b0c2f 100644 + ARCHIVE DESTINATION lib +) +# Install headers -+install(DIRECTORY ${PROJECT_INCLUDE_DIR} DESTINATION include) ++install(DIRECTORY ${PROJECT_INCLUDE_DIR} DESTINATION .) + diff --git a/ports/llgl/portfile.cmake b/ports/llgl/portfile.cmake index ddafdc9de63fbd..6ee4bed6b91522 100644 --- a/ports/llgl/portfile.cmake +++ b/ports/llgl/portfile.cmake @@ -35,5 +35,4 @@ endif() vcpkg_copy_pdbs() # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file From f263fda20f23e859b5507957cba7547c04683680 Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Wed, 30 Dec 2020 12:42:50 -0600 Subject: [PATCH 0397/1694] [flashlight-cuda] Update port (#15379) --- ports/flashlight-cuda/portfile.cmake | 33 ++++++++++++++++++---------- ports/flashlight-cuda/vcpkg.json | 29 ++++++++++++++---------- 2 files changed, 39 insertions(+), 23 deletions(-) diff --git a/ports/flashlight-cuda/portfile.cmake b/ports/flashlight-cuda/portfile.cmake index 080e7f5e318952..1904394302d854 100644 --- a/ports/flashlight-cuda/portfile.cmake +++ b/ports/flashlight-cuda/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookresearch/flashlight - REF 94486a1108fd0511a05523bfa1cf734bc14022f7 - SHA512 73a7547a26020be21d26393c2758cc235b452a0fb5d8537777bdbcc556f71846e07eca649167902dd7d0743cb7d10738b4e38cd7fe69b51b6122f3241e2edd84 + REF 0948e97dbff23d474500a5f55bcf59d3b3589cf4 + SHA512 89c2efdebc6688a38f9fc3ebb8442c8fe2ad3d51c0e60c5dd8e7ca283715e07f48083543f09eed0db9929d86b765a898d9b3960a9b6f9844b20260f94cf71fdf HEAD_REF master ) @@ -14,23 +14,24 @@ set(FL_DEFAULT_VCPKG_CMAKE_FLAGS -DFL_BACKEND=CUDA # this port is CUDA-backend only -DFL_BUILD_STANDALONE=OFF -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT} # for CMake configs/targets - ) +) -# Determine which backend to build via specified feature +# Determine which components to build via specified feature vcpkg_check_features( - OUT_FEATURE_OPTIONS FL_BACKEND_FEATURE_OPTIONS + OUT_FEATURE_OPTIONS FL_FEATURE_OPTIONS FEATURES lib FL_BUILD_LIBRARIES fl FL_BUILD_CORE asr FL_BUILD_APP_ASR - imgclass FL_BUILD_APP_IMG_CLASS + imgclass FL_BUILD_APP_IMGCLASS + lm FL_BUILD_APP_LM ) # Build and install vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} ${FL_BACKEND_FEATURE_OPTIONS} + OPTIONS ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} ${FL_FEATURE_OPTIONS} ) vcpkg_install_cmake() @@ -40,16 +41,24 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Binaries/tools set(FLASHLIGHT_TOOLS "") if ("imgclass" IN_LIST FEATURES) - list(APPEND FLASHLIGHT_TOOLS fl_imageNetResnet34) + list(APPEND FLASHLIGHT_TOOLS fl_img_imagenet_resnet34) endif() if ("asr" IN_LIST FEATURES) - list(APPEND FLASHLIGHT_TOOLS fl_asr_train fl_asr_test fl_asr_decode) + list(APPEND FLASHLIGHT_TOOLS + fl_asr_train + fl_asr_test + fl_asr_decode + fl_asr_align + fl_asr_voice_activity_detection_ctc + ) +endif() +if ("lm" IN_LIST FEATURES) + list(APPEND FLASHLIGHT_TOOLS fl_lm_train fl_lm_dictionary_builder) endif() list(LENGTH FLASHLIGHT_TOOLS NUM_TOOLS) if (NUM_TOOLS GREATER 0) vcpkg_copy_tools(TOOL_NAMES ${FLASHLIGHT_TOOLS} AUTO_CLEAN) endif() -# Copyright and license -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/flashlight-cuda RENAME copyright) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/flashlight-cuda RENAME license) +# Copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/flashlight-cuda/vcpkg.json b/ports/flashlight-cuda/vcpkg.json index 2526e88bdbc02e..b4e10e3c492eef 100644 --- a/ports/flashlight-cuda/vcpkg.json +++ b/ports/flashlight-cuda/vcpkg.json @@ -2,6 +2,7 @@ "name": "flashlight-cuda", "version-string": "20201201", "description": "A C++ standalone library for machine learning. CUDA backend.", + "homepage": "https://github.com/facebookresearch/flashlight", "supports": "!(windows | osx)", "default-features": [ "fl" @@ -12,9 +13,9 @@ "dependencies": [ { "name": "flashlight-cuda", - "default-features": false, "features": [ - "fl" + "fl", + "lib" ] }, "gflags", @@ -34,13 +35,6 @@ "cereal", "cuda", "cudnn", - { - "name": "flashlight-cuda", - "default-features": false, - "features": [ - "lib" - ] - }, "nccl", "openmpi", "stb" @@ -51,9 +45,9 @@ "dependencies": [ { "name": "flashlight-cuda", - "default-features": false, "features": [ - "fl" + "fl", + "lib" ] }, "gflags" @@ -67,6 +61,19 @@ "intel-mkl", "kenlm" ] + }, + "lm": { + "description": "flashlight lm app", + "dependencies": [ + { + "name": "flashlight-cuda", + "features": [ + "fl", + "lib" + ] + }, + "gflags" + ] } } } From 02e354ad3523ff51f4e3bd79fa026fe85d88001b Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 31 Dec 2020 02:43:06 +0800 Subject: [PATCH 0398/1694] [simde] update to 0.7.0 (#15387) --- ports/simde/CONTROL | 3 ++- ports/simde/portfile.cmake | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/simde/CONTROL b/ports/simde/CONTROL index 7f70f49113d272..1dfab7962a870f 100644 --- a/ports/simde/CONTROL +++ b/ports/simde/CONTROL @@ -1,3 +1,4 @@ Source: simde -Version: 2019-06-05 +Version: 0.7.0 +Homepage: https://github.com/simd-everywhere/simde Description: Implementations of SIMD instruction sets for systems which don't natively support them diff --git a/ports/simde/portfile.cmake b/ports/simde/portfile.cmake index bfc787cc3e49ef..67c87d79faaea2 100644 --- a/ports/simde/portfile.cmake +++ b/ports/simde/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nemequ/simde - REF 6e3ba90605361069cf3422c44242c79171b87275 - SHA512 d62ff40882c2b3a17c900104b36ae77137cbb77917d409cba1c0693fdcf317a38ff3184deaaecca0ef31d88393bebf0102a8ab57a23ad5d0cee2d3e5fe799f6a + REF f68981de04072012dcc888716dedae2a345d0e45 #v0.7.0 + SHA512 63a00e8a3e0adbd3192f7416f4c163b8b671943042e4f64a91e6865d434a0d5949e97bca1e40d854b9868911ff8d93ac845ac25baa763554447d6be7cdfb084e HEAD_REF master ) From d7b5b4430a8a4cabbdac0d4ba7784007457e89cb Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 30 Dec 2020 12:12:17 -0800 Subject: [PATCH 0399/1694] [vcpkg] Teach `vcpkg install` `--no-build-missing` (#15139) * [vcpkg] Teach `vcpkg install` `--no-build-missing` This switch causes failure to restore from cache to abort the build instead of performing a just-in-time build. This is useful in complex CI systems where the build was expected to have been performed previously, such as via another pipeline. * [vcpkg] Rename flag to require binary caching --- .../end-to-end-tests-dir/build-missing.ps1 | 18 ++++++++++++++++++ toolsrc/include/vcpkg/build.h | 10 ++++++++++ toolsrc/src/vcpkg/build.cpp | 6 ++++++ toolsrc/src/vcpkg/dependencies.cpp | 2 +- toolsrc/src/vcpkg/install.cpp | 11 ++++++++--- 5 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/build-missing.ps1 diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/build-missing.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/build-missing.ps1 new file mode 100644 index 00000000000000..5f318e6af9cb96 --- /dev/null +++ b/scripts/azure-pipelines/end-to-end-tests-dir/build-missing.ps1 @@ -0,0 +1,18 @@ +. $PSScriptRoot/../end-to-end-tests-prelude.ps1 + +$CurrentTest = "Build Missing tests" + +Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--only-binarycaching","--x-binarysource=clear;files,$ArchiveRoot,read")) +Throw-IfNotFailed +Require-FileNotExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" + +# Create the rapidjson archive +Remove-Item -Recurse -Force $installRoot +Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson","--x-binarysource=clear;files,$ArchiveRoot,write")) +Throw-IfFailed +Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" + +Remove-Item -Recurse -Force $installRoot +Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--only-binarycaching","--x-binarysource=clear;files,$ArchiveRoot,read")) +Throw-IfFailed +Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index 88a12e5c168ec2..bd5188b9fbd18e 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -42,6 +42,7 @@ namespace vcpkg::Build FILE_CONFLICTS, CASCADED_DUE_TO_MISSING_DEPENDENCIES, EXCLUDED, + CACHE_MISSING, DOWNLOADED }; @@ -141,8 +142,15 @@ namespace vcpkg::Build PROHIBIT }; + enum class BuildMissing + { + NO = 0, + YES + }; + struct BuildPackageOptions { + BuildMissing build_missing; UseHeadVersion use_head_version; AllowDownloads allow_downloads; OnlyDownloads only_downloads; @@ -156,6 +164,7 @@ namespace vcpkg::Build }; static constexpr BuildPackageOptions default_build_package_options{ + Build::BuildMissing::YES, Build::UseHeadVersion::NO, Build::AllowDownloads::YES, Build::OnlyDownloads::NO, @@ -169,6 +178,7 @@ namespace vcpkg::Build }; static constexpr BuildPackageOptions backcompat_prohibiting_package_options{ + Build::BuildMissing::YES, Build::UseHeadVersion::NO, Build::AllowDownloads::YES, Build::OnlyDownloads::NO, diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index b01162b4f3815c..eb2a338b26f6be 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -1164,6 +1164,10 @@ namespace vcpkg::Build // missing package, proceed to build. } } + if (action.build_options.build_missing == BuildMissing::NO) + { + return BuildResult::CACHE_MISSING; + } ExtendedBuildResult result = do_build_package_and_clean_buildtrees(args, paths, action); @@ -1190,6 +1194,7 @@ namespace vcpkg::Build static const std::string POST_BUILD_CHECKS_FAILED_STRING = "POST_BUILD_CHECKS_FAILED"; static const std::string CASCADED_DUE_TO_MISSING_DEPENDENCIES_STRING = "CASCADED_DUE_TO_MISSING_DEPENDENCIES"; static const std::string EXCLUDED_STRING = "EXCLUDED"; + static const std::string CACHE_MISSING_STRING = "CACHE_MISSING"; static const std::string DOWNLOADED_STRING = "DOWNLOADED"; switch (build_result) @@ -1201,6 +1206,7 @@ namespace vcpkg::Build case BuildResult::FILE_CONFLICTS: return FILE_CONFLICTS_STRING; case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES: return CASCADED_DUE_TO_MISSING_DEPENDENCIES_STRING; case BuildResult::EXCLUDED: return EXCLUDED_STRING; + case BuildResult::CACHE_MISSING: return CACHE_MISSING_STRING; case BuildResult::DOWNLOADED: return DOWNLOADED_STRING; default: Checks::unreachable(VCPKG_LINE_INFO); } diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index e7768f2bfd4dbd..e811efd2fc648f 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -356,7 +356,7 @@ namespace vcpkg::Dependencies std::string to_output_string(RequestType request_type, const CStringView s) { - return to_output_string(request_type, s, {Build::UseHeadVersion::NO}, {}, {}, {}); + return to_output_string(request_type, s, {}, {}, {}, {}); } InstallPlanAction::InstallPlanAction() noexcept diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index 50f07c7326918e..cac0e0e694cb84 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -511,6 +511,7 @@ namespace vcpkg::Install static constexpr StringLiteral OPTION_DRY_RUN = "dry-run"; static constexpr StringLiteral OPTION_USE_HEAD_VERSION = "head"; static constexpr StringLiteral OPTION_NO_DOWNLOADS = "no-downloads"; + static constexpr StringLiteral OPTION_ONLY_BINARYCACHING = "only-binarycaching"; static constexpr StringLiteral OPTION_ONLY_DOWNLOADS = "only-downloads"; static constexpr StringLiteral OPTION_RECURSE = "recurse"; static constexpr StringLiteral OPTION_KEEP_GOING = "keep-going"; @@ -523,11 +524,12 @@ namespace vcpkg::Install static constexpr StringLiteral OPTION_MANIFEST_FEATURE = "x-feature"; static constexpr StringLiteral OPTION_PROHIBIT_BACKCOMPAT_FEATURES = "x-prohibit-backcompat-features"; - static constexpr std::array INSTALL_SWITCHES = {{ + static constexpr std::array INSTALL_SWITCHES = {{ {OPTION_DRY_RUN, "Do not actually build or install"}, {OPTION_USE_HEAD_VERSION, "Install the libraries on the command line using the latest upstream sources"}, {OPTION_NO_DOWNLOADS, "Do not download new sources"}, {OPTION_ONLY_DOWNLOADS, "Download sources but don't build packages"}, + {OPTION_ONLY_BINARYCACHING, "Fail if cached binaries are not available"}, {OPTION_RECURSE, "Allow removal of packages as part of installation"}, {OPTION_KEEP_GOING, "Continue installing packages on failure"}, {OPTION_EDITABLE, "Disable source re-extraction and binary caching for libraries on the command line"}, @@ -537,12 +539,12 @@ namespace vcpkg::Install {OPTION_PROHIBIT_BACKCOMPAT_FEATURES, "(experimental) Fail install if a package attempts to use a deprecated feature"}, }}; - - static constexpr std::array MANIFEST_INSTALL_SWITCHES = {{ + static constexpr std::array MANIFEST_INSTALL_SWITCHES = {{ {OPTION_DRY_RUN, "Do not actually build or install"}, {OPTION_USE_HEAD_VERSION, "Install the libraries on the command line using the latest upstream sources"}, {OPTION_NO_DOWNLOADS, "Do not download new sources"}, {OPTION_ONLY_DOWNLOADS, "Download sources but don't build packages"}, + {OPTION_ONLY_BINARYCACHING, "Fail if cached binaries are not available"}, {OPTION_RECURSE, "Allow removal of packages as part of installation"}, {OPTION_KEEP_GOING, "Continue installing packages on failure"}, {OPTION_EDITABLE, "Disable source re-extraction and binary caching for libraries on the command line"}, @@ -765,6 +767,7 @@ namespace vcpkg::Install const bool use_head_version = Util::Sets::contains(options.switches, (OPTION_USE_HEAD_VERSION)); const bool no_downloads = Util::Sets::contains(options.switches, (OPTION_NO_DOWNLOADS)); const bool only_downloads = Util::Sets::contains(options.switches, (OPTION_ONLY_DOWNLOADS)); + const bool no_build_missing = Util::Sets::contains(options.switches, OPTION_ONLY_BINARYCACHING); const bool is_recursive = Util::Sets::contains(options.switches, (OPTION_RECURSE)); const bool is_editable = Util::Sets::contains(options.switches, (OPTION_EDITABLE)) || !args.cmake_args.empty(); const bool use_aria2 = Util::Sets::contains(options.switches, (OPTION_USE_ARIA2)); @@ -780,6 +783,7 @@ namespace vcpkg::Install if (use_aria2) download_tool = Build::DownloadTool::ARIA2; const Build::BuildPackageOptions install_plan_options = { + Util::Enum::to_enum(!no_build_missing), Util::Enum::to_enum(use_head_version), Util::Enum::to_enum(!no_downloads), Util::Enum::to_enum(only_downloads), @@ -1070,6 +1074,7 @@ namespace vcpkg::Install case BuildResult::POST_BUILD_CHECKS_FAILED: case BuildResult::FILE_CONFLICTS: case BuildResult::BUILD_FAILED: + case BuildResult::CACHE_MISSING: result_string = "Fail"; message_block = Strings::format("", to_string(code)); From c96d6138f1a060b46327c48957c4cb54992a36cc Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 30 Dec 2020 12:55:04 -0800 Subject: [PATCH 0400/1694] Use vcpkg_from_github in soqt. (#15384) --- ports/soqt/CONTROL | 3 +- ports/soqt/portfile.cmake | 60 +++++++++++---------------------------- 2 files changed, 19 insertions(+), 44 deletions(-) diff --git a/ports/soqt/CONTROL b/ports/soqt/CONTROL index 2fbde418b0757a..4e63de49d2df10 100644 --- a/ports/soqt/CONTROL +++ b/ports/soqt/CONTROL @@ -1,5 +1,6 @@ Source: soqt -Version: 1.6.0-1 +Version: 1.6.0 +Port-Version: 2 Description: A Qt Gui-toolkit binding for Coin Build-Depends: coin, qt5-base[core] Homepage: https://github.com/coin3d/soqt diff --git a/ports/soqt/portfile.cmake b/ports/soqt/portfile.cmake index 8340753f9aace0..73176be95d418c 100644 --- a/ports/soqt/portfile.cmake +++ b/ports/soqt/portfile.cmake @@ -11,54 +11,28 @@ vcpkg_from_github( disable-test-code.patch ) -if(VCPKG_HEAD_VERSION) - vcpkg_download_distfile( - SOANYDATA_ARCHIVE - URLS "https://github.com/coin3d/soanydata/archive/master.tar.gz" - FILENAME "Coin3D-soanydata-master.tar.gz" - SKIP_SHA512 - ) -else() - vcpkg_download_distfile( - SOANYDATA_ARCHIVE - URLS "https://github.com/coin3d/soanydata/archive/3ff6e9203fbb0cc08a2bdf209212b7ef4d78a1f2.tar.gz" - FILENAME "Coin3D-soanydata-3ff6e9203fbb0cc08a2bdf209212b7ef4d78a1f2.tar.gz" - SHA512 9e176feda43a12ccdf8756f7329517936357499771a7d0a58357d343bdea125c34f8734ff1cd16cda3eeee58090dc1680999849c50132c30940a23d3f81a5c66 - ) -endif() - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOANYDATA_SOURCE_PATH - ARCHIVE ${SOANYDATA_ARCHIVE} + REPO coin3d/soanydata + REF 3ff6e9203fbb0cc08a2bdf209212b7ef4d78a1f2 + SHA512 9e176feda43a12ccdf8756f7329517936357499771a7d0a58357d343bdea125c34f8734ff1cd16cda3eeee58090dc1680999849c50132c30940a23d3f81a5c66 + HEAD_REF master ) -if(NOT EXISTS ${SOURCE_PATH}/data) - file(RENAME ${SOANYDATA_SOURCE_PATH} ${SOURCE_PATH}/data) +if(NOT EXISTS "${SOURCE_PATH}/data") + file(RENAME "${SOANYDATA_SOURCE_PATH}" "${SOURCE_PATH}/data") endif() -if(VCPKG_HEAD_VERSION) - vcpkg_download_distfile( - SOGUI_ARCHIVE - URLS "https://github.com/coin3d/sogui/archive/master.tar.gz" - FILENAME "Coin3D-sogui-master.tar.gz" - SKIP_SHA512 - ) -else() - vcpkg_download_distfile( - SOGUI_ARCHIVE - URLS "https://github.com/coin3d/sogui/archive/fb79af47cff89f0f3657501601a7ea5c11968b17.tar.gz" - FILENAME "Coin3D-sogui-fb79af47cff89f0f3657501601a7ea5c11968b17.tar.gz" - SHA512 bcf4d2e04c3b6ac87a6425d90c6077ec655732bcc0f99bf181ff2dfce8d356509f52d71b884660fafddc135551ee8fbb139e02b6706d2a01be006193918d232b - ) -endif() - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOGUI_SOURCE_PATH - ARCHIVE ${SOGUI_ARCHIVE} + REPO coin3d/sogui + REF fb79af47cff89f0f3657501601a7ea5c11968b17 + SHA512 bcf4d2e04c3b6ac87a6425d90c6077ec655732bcc0f99bf181ff2dfce8d356509f52d71b884660fafddc135551ee8fbb139e02b6706d2a01be006193918d232b + HEAD_REF master ) if(NOT EXISTS ${SOURCE_PATH}/src/Inventor/Qt/common) - file(RENAME ${SOGUI_SOURCE_PATH} ${SOURCE_PATH}/src/Inventor/Qt/common) + file(RENAME "${SOGUI_SOURCE_PATH}" "${SOURCE_PATH}/src/Inventor/Qt/common") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -79,11 +53,11 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SoQt-1.6.0) -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) 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") From 9f1000d519166d30b8f39e68205a2a2634439215 Mon Sep 17 00:00:00 2001 From: Ludek Vodicka Date: Thu, 31 Dec 2020 05:13:41 +0100 Subject: [PATCH 0401/1694] [IXWebsocket ] Upgraded to 11.0.4 version (#15394) * Upgrade IXWebsocket to 11.0.4 * Formatting update * Update ports/ixwebsocket/portfile.cmake Co-authored-by: Victor Romero * Static library check, fixup targets Co-authored-by: Victor Romero --- ports/ixwebsocket/CONTROL | 2 +- ports/ixwebsocket/portfile.cmake | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ports/ixwebsocket/CONTROL b/ports/ixwebsocket/CONTROL index dac666e368464d..f2fbd3dba4ec82 100644 --- a/ports/ixwebsocket/CONTROL +++ b/ports/ixwebsocket/CONTROL @@ -1,5 +1,5 @@ Source: ixwebsocket -Version: 9.6.2 +Version: 11.0.4 Build-Depends: zlib Homepage: https://github.com/machinezone/IXWebSocket Description: Lightweight WebSocket Client and Server + HTTP Client and Server diff --git a/ports/ixwebsocket/portfile.cmake b/ports/ixwebsocket/portfile.cmake index 23aa61cef4f01e..71a8faf9b64d80 100644 --- a/ports/ixwebsocket/portfile.cmake +++ b/ports/ixwebsocket/portfile.cmake @@ -1,8 +1,10 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO machinezone/IXWebSocket - REF v9.6.2 - SHA512 22a97f0c74d5789fd265627bbadfce02116a41fca888d684b756cbb1c070d626517855e265c484870d02db7084b6c1107d500acc1c13e327ede0c23228a54f7b + REF v11.0.4 + SHA512 fb24a628600cf28acdcaed5d2268f6a6e36baa1cc31f54287d91fb979fe375b20931fa9346153eaaf5a5d17fc6d87f06ca03ce12e401b83095c16919d35454ce ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -25,6 +27,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ixwebsocket TARGET_PATH share/${port}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) From 86a028a8f2ff2c87aebec90e22a5ef3eca1db0dd Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 30 Dec 2020 20:50:53 -0800 Subject: [PATCH 0402/1694] Update cpprestsdk to 2.10.17. (#15401) --- ports/cpprestsdk/CONTROL | 26 ------- ports/cpprestsdk/portfile.cmake | 4 +- ports/cpprestsdk/vcpkg.json | 122 ++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 28 deletions(-) delete mode 100644 ports/cpprestsdk/CONTROL create mode 100644 ports/cpprestsdk/vcpkg.json diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL deleted file mode 100644 index 30f24ed6b641eb..00000000000000 --- a/ports/cpprestsdk/CONTROL +++ /dev/null @@ -1,26 +0,0 @@ -Source: cpprestsdk -Version: 2.10.16-3 -Build-Depends: openssl (!uwp&!windows), boost-system (!uwp&!windows), - boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), - boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows), - boost-asio (!uwp&!windows) -Homepage: https://github.com/Microsoft/cpprestsdk -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. -Default-Features: default-features - -Feature: default-features -Build-Depends: cpprestsdk[brotli] (windows), cpprestsdk[core,compression] -Description: Features installed by default - -Feature: compression -Build-Depends: zlib -Description: HTTP Compression support - -Feature: websockets -Build-Depends: cpprestsdk[core,compression], websocketpp (!uwp), openssl (!uwp), boost-system (!uwp), boost-date-time (!uwp), boost-regex (!uwp) -Description: Websockets support - -Feature: brotli -Build-Depends: cpprestsdk[core,compression], brotli -Description: Brotli compression support diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index a9f1ce3f29f510..b708f0af3fac39 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cpprestsdk - REF v2.10.16 - SHA512 d850b26051439dd10edcecd006075c64c61c565193cd76870af175bd343a72ecc59485deb0f907807071a57dd256b67139ad5d016f19cb38f7142357f430be1c + REF 41e7d0074b6cb5b22c89f835b4531d848ab66987 + SHA512 29ad2cf9884cd9df9b4c92b89a852d207c5e210af59e773333e122aa58a4981b52b1e6186c121430295bd4eb0ca1abc002e29177a6753cd62dcd8937a3244e0c HEAD_REF master PATCHES fix-find-openssl.patch ) diff --git a/ports/cpprestsdk/vcpkg.json b/ports/cpprestsdk/vcpkg.json new file mode 100644 index 00000000000000..c01b756d60eb18 --- /dev/null +++ b/ports/cpprestsdk/vcpkg.json @@ -0,0 +1,122 @@ +{ + "name": "cpprestsdk", + "version-string": "2.10.17", + "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." + ], + "homepage": "https://github.com/Microsoft/cpprestsdk", + "dependencies": [ + { + "name": "boost-asio", + "platform": "!uwp & !windows" + }, + { + "name": "boost-chrono", + "platform": "!uwp & !windows" + }, + { + "name": "boost-date-time", + "platform": "!uwp & !windows" + }, + { + "name": "boost-filesystem", + "platform": "!uwp & !windows" + }, + { + "name": "boost-random", + "platform": "!uwp & !windows" + }, + { + "name": "boost-regex", + "platform": "!uwp & !windows" + }, + { + "name": "boost-system", + "platform": "!uwp & !windows" + }, + { + "name": "boost-thread", + "platform": "!uwp & !windows" + }, + { + "name": "openssl", + "platform": "!uwp & !windows" + } + ], + "default-features": [ + "default-features" + ], + "features": { + "brotli": { + "description": "Brotli compression support", + "dependencies": [ + "brotli", + { + "name": "cpprestsdk", + "default-features": false, + "features": [ + "compression" + ] + } + ] + }, + "compression": { + "description": "HTTP Compression support", + "dependencies": [ + "zlib" + ] + }, + "default-features": { + "description": "Features installed by default", + "dependencies": [ + { + "name": "cpprestsdk", + "default-features": false, + "features": [ + "compression" + ] + }, + { + "name": "cpprestsdk", + "features": [ + "brotli" + ], + "platform": "windows" + } + ] + }, + "websockets": { + "description": "Websockets support", + "dependencies": [ + { + "name": "boost-date-time", + "platform": "!uwp" + }, + { + "name": "boost-regex", + "platform": "!uwp" + }, + { + "name": "boost-system", + "platform": "!uwp" + }, + { + "name": "cpprestsdk", + "default-features": false, + "features": [ + "compression" + ] + }, + { + "name": "openssl", + "platform": "!uwp" + }, + { + "name": "websocketpp", + "platform": "!uwp" + } + ] + } + } +} From b02149c76f1b070e8863d1e30a1f7ad81dcb71b6 Mon Sep 17 00:00:00 2001 From: Eli Arzhannikov Date: Thu, 31 Dec 2020 07:34:51 +0100 Subject: [PATCH 0403/1694] [boost-modular-builder] let fallback to default tool path (#15254) Co-authored-by: Ilya Arzhannikov Co-authored-by: Billy Robert O'Neal III --- ports/boost-modular-build-helper/CONTROL | 4 ++-- ports/boost-modular-build-helper/boost-modular-build.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index 731ee7f634e2d8..d59e7580a82009 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,4 +1,4 @@ Source: boost-modular-build-helper Version: 1.75.0 -Port-Version: 1 -Build-Depends: boost-uninstall \ No newline at end of file +Port-Version: 2 +Build-Depends: boost-uninstall diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 48452422b79511..481dfd5108670c 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -27,7 +27,7 @@ function(boost_modular_build) set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../arm-linux/tools/boost-build") elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") get_filename_component(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x86-windows/tools/boost-build" ABSOLUTE) - elseif(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "s390x") + elseif(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "s390x" AND CMAKE_HOST_WIN32) get_filename_component(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x86-windows/tools/boost-build" ABSOLUTE) else() set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/tools/boost-build") From 17876b96c189eb45dd5d2c12732dc815b2cbfee8 Mon Sep 17 00:00:00 2001 From: Stephen Just Date: Wed, 30 Dec 2020 22:36:19 -0800 Subject: [PATCH 0404/1694] [arcus] New port (#15305) * [arcus] New port Arcus is used by CuraEngine as a library for writing to sockets. Adding this port helps with CuraEngine's build as well as any other projects that depend on Arcus. * review comments * Remove reference to python3 in description since its disabled --- ports/arcus/CONTROL | 6 ++++++ ports/arcus/portfile.cmake | 30 ++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 ports/arcus/CONTROL create mode 100644 ports/arcus/portfile.cmake diff --git a/ports/arcus/CONTROL b/ports/arcus/CONTROL new file mode 100644 index 00000000000000..297d3b05557468 --- /dev/null +++ b/ports/arcus/CONTROL @@ -0,0 +1,6 @@ +Source: arcus +Version: 4.8.0 +Homepage: https://github.com/Ultimaker/libArcus +Description: This library contains C++ bindings for creating a socket in a thread and using this socket to send and receive messages based on the Protocol Buffers library. +Supports: !uwp +Build-Depends: protobuf diff --git a/ports/arcus/portfile.cmake b/ports/arcus/portfile.cmake new file mode 100644 index 00000000000000..a149c16964cca4 --- /dev/null +++ b/ports/arcus/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_fail_port_install(ON_TARGET "UWP") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Ultimaker/libArcus + REF 4.8.0 + SHA512 44db9b48ab6be08c30f2121d68197a7347eaf3ee255649969a773afbe45ec2433e2cc082aa72f6d40dad7ea28345da858471fff9a129365a4e848df8c8c07689 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_PYTHON=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_STATIC=${ENABLE_STATIC} +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Arcus TARGET_PATH share/arcus) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/arcus/copyright" COPYONLY) \ No newline at end of file From 83694d963df64a8cdc6c32783dbf071dcbb7af80 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 30 Dec 2020 22:37:04 -0800 Subject: [PATCH 0405/1694] [libilbc] New port (#15331) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [libilbc] New port libilbc is an Internet Low Bit Rate Codec (iLBC) / RFC 3951 codec. Closes #14836. * Update ports/libilbc/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/libilbc/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [libilbc] Use vcpkg_copy_tools, update arm-uwp. * [libilbc] More packaging cleanups. Add vcpkg_fixup_pkgconfig after vcpkg_install_cmake. Install docs into $PREFIX/share/libilbc. Remove ilbc_test after a dynamic build and the bin and debug/bin dirs after a static build. Fixup include/ilbc_export.h for static builds. Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/libilbc/CONTROL | 5 ++++ ports/libilbc/do-not-build-ilbc_test.patch | 13 +++++++++ ports/libilbc/portfile.cmake | 33 ++++++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 ports/libilbc/CONTROL create mode 100644 ports/libilbc/do-not-build-ilbc_test.patch create mode 100644 ports/libilbc/portfile.cmake diff --git a/ports/libilbc/CONTROL b/ports/libilbc/CONTROL new file mode 100644 index 00000000000000..15503b658638ac --- /dev/null +++ b/ports/libilbc/CONTROL @@ -0,0 +1,5 @@ +Source: libilbc +Version: 3.0.3 +Description: Open source implementation of the Internet Low Bit Rate Codec (iLBC) / RFC 3951 codec from the WebRTC project. +Homepage: https://github.com/TimothyGu/libilbc +Supports: !(arm&uwp) \ No newline at end of file diff --git a/ports/libilbc/do-not-build-ilbc_test.patch b/ports/libilbc/do-not-build-ilbc_test.patch new file mode 100644 index 00000000000000..3d67ecbb07ad9a --- /dev/null +++ b/ports/libilbc/do-not-build-ilbc_test.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 671ded64d1..1d01f737c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -332,7 +332,7 @@ install(FILES ilbc.h ${CMAKE_CURRENT_BINARY_DIR}/ilbc_export.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES CONTRIBUTING.md NEWS.md README.md + DESTINATION ${CMAKE_INSTALL_DOCDIR}) +-install(TARGETS ilbc ilbc_test ++install(TARGETS ilbc + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/ports/libilbc/portfile.cmake b/ports/libilbc/portfile.cmake new file mode 100644 index 00000000000000..c833ebd6ff5e89 --- /dev/null +++ b/ports/libilbc/portfile.cmake @@ -0,0 +1,33 @@ +set(ILBC_VERSION 3.0.3) +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/TimothyGu/libilbc/releases/download/v${ILBC_VERSION}/libilbc-${ILBC_VERSION}.zip" + FILENAME "libilbc-${ILBC_VERSION}.zip" + SHA512 a5755db093529f6a3fd8fd47da63b57cffff1d3babef443d92f7c5a250ce8d1585adfba525c4037b142d9f00f1675a5054c172bf936be280dfcc22ed553c94c6 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${ILBC_VERSION} + PATCHES do-not-build-ilbc_test.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCMAKE_INSTALL_DOCDIR=share/${PORT} +) + +vcpkg_install_cmake() + +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/ilbc_export.h "#ifdef ILBC_STATIC_DEFINE" "#if 1") +endif() + +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) From 88f97e89d10c34444398aef208d545e11afeac53 Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Thu, 31 Dec 2020 00:38:55 -0600 Subject: [PATCH 0406/1694] [onednn] Fix share path infix to match find_package() name (#15372) * [onednn] Fix share path infix to match find_package() name * Add port-version * Install failure message --- ports/onednn/portfile.cmake | 6 +++++- ports/onednn/vcpkg.json | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/onednn/portfile.cmake b/ports/onednn/portfile.cmake index 4a9600ac7fd2ae..c2179d5ffe13e2 100644 --- a/ports/onednn/portfile.cmake +++ b/ports/onednn/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "uwp") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/oneDNN @@ -17,7 +19,9 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +# The port name and the find_package() name are different (onednn versus dnnl) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/dnnl TARGET_PATH share/dnnl) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/onednn/vcpkg.json b/ports/onednn/vcpkg.json index 7ceebd191b0225..86f7989f486f1a 100644 --- a/ports/onednn/vcpkg.json +++ b/ports/onednn/vcpkg.json @@ -1,6 +1,7 @@ { "name": "onednn", "version-string": "2.0", + "port-version": 1, "description": "oneAPI Deep Neural Network Library (oneDNN)", "supports": "x64 & !uwp" } From cfdb1b44e9f665c540014d6d3d82cf0e6120a229 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 30 Dec 2020 22:40:47 -0800 Subject: [PATCH 0407/1694] [directxmath] port updated for cmake improvements (#15383) * directxmath port updated for cmake improvements * Rev control version * update CONTROL for version --- ports/directxmath/CONTROL | 2 +- ports/directxmath/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/directxmath/CONTROL b/ports/directxmath/CONTROL index 0c6bcc956e2cbc..6471db4e887be1 100644 --- a/ports/directxmath/CONTROL +++ b/ports/directxmath/CONTROL @@ -1,4 +1,4 @@ Source: directxmath -Version: 3.1.6 +Version: dec2020b Homepage: https://walbourn.github.io/introducing-directxmath/ Description: DirectXMath SIMD C++ math library diff --git a/ports/directxmath/portfile.cmake b/ports/directxmath/portfile.cmake index 96a722e0fc9892..872f7d93312df0 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 dec2020 - SHA512 73c073f6ef5f2dd867c3f934d471258c001fb85a99b897ef25ac26595c31157e00118143f5fdaa3f25512a2a46ebbe464efd1d697a999137bc4cffc9c29fec8c + REF dec2020b + SHA512 59f2e7024b145e09ec40639627344175e77db0527888dce07a6e5785cb240ed163c8d5b063222226ddd1af8128de1d842ff15a1f6e9f5e1e1a14dfd2da1a270b HEAD_REF master ) @@ -24,7 +24,7 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) file(INSTALL ${DOWNLOADS}/sal.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include/) + DESTINATION ${CURRENT_PACKAGES_DIR}/include/DirectXMath) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") From f910f082ecb0690976fd1dc7557f266a3fc156c6 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 30 Dec 2020 22:41:25 -0800 Subject: [PATCH 0408/1694] [boost-build] Fix cflags and c++flags for msvc (#15385) --- ports/boost-build/CONTROL | 1 + ports/boost-build/fix_options.patch | 236 ++++++++++++++++++++++++++++ ports/boost-build/portfile.cmake | 2 + 3 files changed, 239 insertions(+) create mode 100644 ports/boost-build/fix_options.patch diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL index 324efe22d4493f..373f9f7e2736a3 100644 --- a/ports/boost-build/CONTROL +++ b/ports/boost-build/CONTROL @@ -1,5 +1,6 @@ Source: boost-build Version: 1.75.0.beta1 +Port-Version: 1 Homepage: https://github.com/boostorg/build Description: Boost.Build Build-Depends: boost-uninstall \ No newline at end of file diff --git a/ports/boost-build/fix_options.patch b/ports/boost-build/fix_options.patch new file mode 100644 index 00000000000000..b63641b9e5b162 --- /dev/null +++ b/ports/boost-build/fix_options.patch @@ -0,0 +1,236 @@ +diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam +index bf07a93..cf04eba 100644 +--- a/src/tools/msvc.jam ++++ b/src/tools/msvc.jam +@@ -450,19 +450,19 @@ rule configure-version-specific ( toolset : version : conditions ) + # version 7.* explicitly or if we auto-detected the version ourselves. + if ! [ MATCH ^(6\\.) : $(version) ] + { +- toolset.flags $(toolset).compile CFLAGS $(conditions) : "/Zc:forScope" "/Zc:wchar_t" ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions) : "/Zc:forScope" "/Zc:wchar_t" ; + toolset.flags $(toolset).compile.c++ C++FLAGS $(conditions) : /wd4675 ; + + # Explicitly disable the 'function is deprecated' warning. Some msvc + # versions have a bug, causing them to emit the deprecation warning even + # with /W0. +- toolset.flags $(toolset).compile CFLAGS $(conditions)/off : /wd4996 ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/off : /wd4996 ; + + if [ MATCH "^([78]\\.)" : $(version) ] + { + # 64-bit compatibility warning deprecated since 9.0, see + # http://msdn.microsoft.com/en-us/library/yt4xw8fh.aspx +- toolset.flags $(toolset).compile CFLAGS $(conditions)/all : /Wp64 ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/all : /Wp64 ; + } + } + +@@ -471,17 +471,17 @@ rule configure-version-specific ( toolset : version : conditions ) + # variables and functions that have internal linkage + if ! [ version.version-less [ SPLIT_BY_CHARACTERS [ MATCH "^([0123456789.]+)" : $(version) ] : . ] : 12 ] + { +- toolset.flags $(toolset).compile CFLAGS $(conditions) : "/Zc:inline" ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions) : "/Zc:inline" ; + + # /Gy analog for variables: https://devblogs.microsoft.com/cppblog/introducing-gw-compiler-switch/ +- toolset.flags $(toolset).compile CFLAGS $(conditions)/speed $(conditions)/space : /Gw ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/speed $(conditions)/space : /Gw ; + } + + # 14.0 introduced /Zc:throwingNew opt-in flag that disables a workaround + # for not throwing operator new in VC up to 6.0 + if ! [ version.version-less [ SPLIT_BY_CHARACTERS [ MATCH "^([0123456789.]+)" : $(version) ] : . ] : 14 ] + { +- toolset.flags $(toolset).compile CFLAGS $(conditions) : "/Zc:throwingNew" ; ++ toolset.flags $(toolset).compile C++FLAGS $(conditions) : "/Zc:throwingNew" ; + } + + # +@@ -491,34 +491,34 @@ rule configure-version-specific ( toolset : version : conditions ) + if [ MATCH "^([67])" : $(version) ] + { + # 8.0 deprecates some of the options. +- toolset.flags $(toolset).compile CFLAGS $(conditions)/speed $(conditions)/space : /Ogiy /Gs ; +- toolset.flags $(toolset).compile CFLAGS $(conditions)/speed : /Ot ; +- toolset.flags $(toolset).compile CFLAGS $(conditions)/space : /Os ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/speed $(conditions)/space : /Ogiy /Gs ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/speed : /Ot ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/space : /Os ; + +- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/ : /GB ; +- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/i486 : /G4 ; +- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/$(.cpu-type-g5) : /G5 ; +- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/$(.cpu-type-g6) : /G6 ; +- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/$(.cpu-type-g7) : /G7 ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-i386)/ : /GB ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-i386)/i486 : /G4 ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-i386)/$(.cpu-type-g5) : /G5 ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-i386)/$(.cpu-type-g6) : /G6 ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-i386)/$(.cpu-type-g7) : /G7 ; + + # Improve floating-point accuracy. Otherwise, some of C++ Boost's "math" + # tests will fail. +- toolset.flags $(toolset).compile CFLAGS $(conditions) : /Op ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions) : /Op ; + + # 7.1 and below have single-threaded static RTL. +- toolset.flags $(toolset).compile CFLAGS $(conditions)/off/static/single : /ML ; +- toolset.flags $(toolset).compile CFLAGS $(conditions)/on/static/single : /MLd ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/off/static/single : /ML ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/on/static/single : /MLd ; + } + else + { + # 8.0 and above adds some more options. +- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-amd64)/ : "/favor:blend" ; +- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-amd64)/$(.cpu-type-em64t) : "/favor:EM64T" ; +- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-amd64)/$(.cpu-type-amd64) : "/favor:AMD64" ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-amd64)/ : "/favor:blend" ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-amd64)/$(.cpu-type-em64t) : "/favor:EM64T" ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-amd64)/$(.cpu-type-amd64) : "/favor:AMD64" ; + + # 8.0 and above only has multi-threaded static RTL. +- toolset.flags $(toolset).compile CFLAGS $(conditions)/off/static/single : /MT ; +- toolset.flags $(toolset).compile CFLAGS $(conditions)/on/static/single : /MTd ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/off/static/single : /MT ; ++ toolset.flags $(toolset).compile OPTIONS $(conditions)/on/static/single : /MTd ; + + # Specify target machine type so the linker will not need to guess. + toolset.flags $(toolset).link LINKFLAGS $(conditions)/$(.cpu-arch-amd64) : "/MACHINE:X64" ; +@@ -614,7 +614,7 @@ rule compile.c ( targets + : sources * : properties * ) + { + set-setup-command $(targets) : $(properties) ; + C++FLAGS on $(targets[1]) = ; +- get-rspline $(targets) : -TC ; ++ get-rspline $(targets) : -TC CFLAGS ; + compile-c-c++ $(<) : $(>) [ on $(<) return $(PCH_FILE) ] [ on $(<) return $(PCH_HEADER) ] ; + } + +@@ -623,7 +623,7 @@ rule compile.c.preprocess ( targets + : sources * : properties * ) + { + set-setup-command $(targets) : $(properties) ; + C++FLAGS on $(targets[1]) = ; +- get-rspline $(targets) : -TC ; ++ get-rspline $(targets) : -TC CFLAGS ; + preprocess-c-c++ $(<) : $(>) [ on $(<) return $(PCH_FILE) ] [ on $(<) return $(PCH_HEADER) ] ; + } + +@@ -632,8 +632,8 @@ rule compile.c.pch ( targets + : sources * : properties * ) + { + set-setup-command $(targets) : $(properties) ; + C++FLAGS on $(targets[1]) = ; +- get-rspline $(targets[1]) : -TC ; +- get-rspline $(targets[2]) : -TC ; ++ get-rspline $(targets[1]) : -TC CFLAGS ; ++ get-rspline $(targets[2]) : -TC CFLAGS ; + local pch-source = [ on $(<) return $(PCH_SOURCE) ] ; + if $(pch-source) + { +@@ -716,14 +716,14 @@ actions compile-c-c++-pch-s + rule compile.c++ ( targets + : sources * : properties * ) + { + set-setup-command $(targets) : $(properties) ; +- get-rspline $(targets) : -TP ; ++ get-rspline $(targets) : -TP C++FLAGS ; + compile-c-c++ $(<) : $(>) [ on $(<) return $(PCH_FILE) ] [ on $(<) return $(PCH_HEADER) ] ; + } + + rule compile.c++.preprocess ( targets + : sources * : properties * ) + { + set-setup-command $(targets) : $(properties) ; +- get-rspline $(targets) : -TP ; ++ get-rspline $(targets) : -TP C++FLAGS ; + preprocess-c-c++ $(<) : $(>) [ on $(<) return $(PCH_FILE) ] [ on $(<) return $(PCH_HEADER) ] ; + } + +@@ -731,8 +731,8 @@ rule compile.c++.preprocess ( targets + : sources * : properties * ) + rule compile.c++.pch ( targets + : sources * : properties * ) + { + set-setup-command $(targets) : $(properties) ; +- get-rspline $(targets[1]) : -TP ; +- get-rspline $(targets[2]) : -TP ; ++ get-rspline $(targets[1]) : -TP C++FLAGS ; ++ get-rspline $(targets[2]) : -TP C++FLAGS ; + local pch-source = [ on $(<) return $(PCH_SOURCE) ] ; + if $(pch-source) + { +@@ -1691,10 +1691,10 @@ local rule default-path ( version ) + + + +-rule get-rspline ( target : lang-opt ) ++rule get-rspline ( target : lang-opt lang-flags ) + { + CC_RSPLINE on $(target) = [ on $(target) return $(lang-opt) -U$(UNDEFS) +- $(CFLAGS) $(C++FLAGS) $(OPTIONS) -c $(.nl)-D$(DEFINES) ++ $($(lang-flags)) $(OPTIONS) -c $(.nl)-D$(DEFINES) + $(.nl)\"-I$(INCLUDES:W)\" $(.nl)\"-FI$(FORCE_INCLUDES:W)\" ] ; + } + +@@ -1830,25 +1830,25 @@ local rule register-toolset-really ( ) + # Declare flags for compilation. + # + +- toolset.flags msvc.compile CFLAGS speed : /O2 ; +- toolset.flags msvc.compile CFLAGS space : /O1 ; ++ toolset.flags msvc.compile OPTIONS speed : /O2 ; ++ toolset.flags msvc.compile OPTIONS space : /O1 ; + +- toolset.flags msvc.compile CFLAGS $(.cpu-arch-ia64)/$(.cpu-type-itanium) : /G1 ; +- toolset.flags msvc.compile CFLAGS $(.cpu-arch-ia64)/$(.cpu-type-itanium2) : /G2 ; ++ toolset.flags msvc.compile OPTIONS $(.cpu-arch-ia64)/$(.cpu-type-itanium) : /G1 ; ++ toolset.flags msvc.compile OPTIONS $(.cpu-arch-ia64)/$(.cpu-type-itanium2) : /G2 ; + +- toolset.flags msvc.compile CFLAGS on/object : /Z7 ; +- toolset.flags msvc.compile CFLAGS on/database : /Zi ; +- toolset.flags msvc.compile CFLAGS off : /Od ; +- toolset.flags msvc.compile CFLAGS off : /Ob0 ; +- toolset.flags msvc.compile CFLAGS on : /Ob1 ; +- toolset.flags msvc.compile CFLAGS full : /Ob2 ; ++ toolset.flags msvc.compile OPTIONS on/object : /Z7 ; ++ toolset.flags msvc.compile OPTIONS on/database : /Zi ; ++ toolset.flags msvc.compile OPTIONS off : /Od ; ++ toolset.flags msvc.compile OPTIONS off : /Ob0 ; ++ toolset.flags msvc.compile OPTIONS on : /Ob1 ; ++ toolset.flags msvc.compile OPTIONS full : /Ob2 ; + +- toolset.flags msvc.compile CFLAGS on : /W3 ; +- toolset.flags msvc.compile CFLAGS off : /W0 ; +- toolset.flags msvc.compile CFLAGS all : /W4 ; +- toolset.flags msvc.compile CFLAGS extra : /W4 ; +- toolset.flags msvc.compile CFLAGS pedantic : /W4 ; +- toolset.flags msvc.compile CFLAGS on : /WX ; ++ toolset.flags msvc.compile OPTIONS on : /W3 ; ++ toolset.flags msvc.compile OPTIONS off : /W0 ; ++ toolset.flags msvc.compile OPTIONS all : /W4 ; ++ toolset.flags msvc.compile OPTIONS extra : /W4 ; ++ toolset.flags msvc.compile OPTIONS pedantic : /W4 ; ++ toolset.flags msvc.compile OPTIONS on : /WX ; + + toolset.flags msvc.compile C++FLAGS on/off/off : /EHs ; + toolset.flags msvc.compile C++FLAGS on/off/on : /EHsc ; +@@ -1862,16 +1862,16 @@ local rule register-toolset-really ( ) + # By default 8.0 enables rtti support while prior versions disabled it. We + # simply enable or disable it explicitly so we do not have to depend on this + # default behaviour. +- toolset.flags msvc.compile CFLAGS on : /GR ; +- toolset.flags msvc.compile CFLAGS off : /GR- ; +- toolset.flags msvc.compile CFLAGS off/shared : /MD ; +- toolset.flags msvc.compile CFLAGS on/shared : /MDd ; ++ toolset.flags msvc.compile C++FLAGS on : /GR ; ++ toolset.flags msvc.compile C++FLAGS off : /GR- ; ++ toolset.flags msvc.compile OPTIONS off/shared : /MD ; ++ toolset.flags msvc.compile OPTIONS on/shared : /MDd ; + +- toolset.flags msvc.compile CFLAGS off/static/multi : /MT ; +- toolset.flags msvc.compile CFLAGS on/static/multi : /MTd ; ++ toolset.flags msvc.compile OPTIONS off/static/multi : /MT ; ++ toolset.flags msvc.compile OPTIONS on/static/multi : /MTd ; + +- toolset.flags msvc.compile OPTIONS : ; +- toolset.flags msvc.compile.c++ OPTIONS : ; ++ toolset.flags msvc.compile CFLAGS : ; ++ toolset.flags msvc.compile.c++ C++FLAGS : ; + + toolset.flags msvc.compile PDB_CFLAG on/database : /Fd ; + diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index def5c5cd06a5aa..791e15a1cdd0f4 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -12,6 +12,8 @@ vcpkg_from_github( REF boost-${BOOST_VERSION} SHA512 e5dd73ef41d341e2bce25677389502d22ca7f328e7fdbb91d95aac415f7b490008d75ff0a63f8e4bd9427215f863c161ec9573c29b663b727df4b60e25a3aac2 HEAD_REF master + PATCHES + fix_options.patch ) vcpkg_download_distfile(ARCHIVE From 9c29ff0d54fe635e8a1de661b004d72efa61caca Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 31 Dec 2020 14:41:54 +0800 Subject: [PATCH 0409/1694] [exiv2] Add pkgconfig to fix the path (#15389) --- ports/exiv2/CONTROL | 2 +- ports/exiv2/portfile.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL index c9f5ecca4b36e8..17141299b0a151 100644 --- a/ports/exiv2/CONTROL +++ b/ports/exiv2/CONTROL @@ -1,6 +1,6 @@ Source: exiv2 Version: 0.27.3 -Port-Version: 3 +Port-Version: 4 Build-Depends: zlib, libiconv, gettext Description: Image metadata library and tools Homepage: https://www.exiv2.org diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index 262be9d358d286..01fa8c6ae67110 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -31,6 +31,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/exiv2) +vcpkg_fixup_pkgconfig() configure_file( ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake From 0130f349389f19766460b382b984077f410108d1 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Thu, 31 Dec 2020 11:05:11 -0800 Subject: [PATCH 0410/1694] [wangle] Fix dependency issue (#15400) --- ports/wangle/CONTROL | 1 + ports/wangle/build.patch | 12 ------- ports/wangle/fix-config-cmake.patch | 41 +++++++++++---------- ports/wangle/fix_dependency.patch | 56 +++++++++++++++++++++++++++++ ports/wangle/portfile.cmake | 6 ++-- 5 files changed, 81 insertions(+), 35 deletions(-) delete mode 100644 ports/wangle/build.patch create mode 100644 ports/wangle/fix_dependency.patch diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL index a347c0782e31a2..2e7e17686eaa5c 100644 --- a/ports/wangle/CONTROL +++ b/ports/wangle/CONTROL @@ -1,5 +1,6 @@ Source: wangle Version: 2020.10.19.00 +Port-Version: 1 Homepage: https://github.com/facebook/wangle Build-Depends: fizz, folly, openssl, glog, libevent, double-conversion, boost-system, boost-thread, boost-filesystem, boost-regex, boost-context Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way. diff --git a/ports/wangle/build.patch b/ports/wangle/build.patch deleted file mode 100644 index 13b85b037843b8..00000000000000 --- a/ports/wangle/build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt -index 15dc8b6..ed8c79b 100644 ---- a/wangle/CMakeLists.txt -+++ b/wangle/CMakeLists.txt -@@ -123,6 +123,7 @@ target_include_directories( - PUBLIC - $ - $ -+ PRIVATE - ${FIZZ_INCLUDE_DIR} - ${FOLLY_INCLUDE_DIR} - ${Boost_INCLUDE_DIR} diff --git a/ports/wangle/fix-config-cmake.patch b/ports/wangle/fix-config-cmake.patch index 66857478a9820b..1d5949ceada07e 100644 --- a/ports/wangle/fix-config-cmake.patch +++ b/ports/wangle/fix-config-cmake.patch @@ -1,19 +1,22 @@ -diff --git a/wangle/cmake/wangle-config.cmake.in b/wangle/cmake/wangle-config.cmake.in -index e50af54..a16cdbb 100644 ---- a/wangle/cmake/wangle-config.cmake.in -+++ b/wangle/cmake/wangle-config.cmake.in -@@ -12,7 +12,13 @@ - @PACKAGE_INIT@ - - set_and_check(WANGLE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") --set_and_check(WANGLE_CMAKE_DIR "@PACKAGE_CMAKE_INSTALL_DIR@") -+set_and_check(WANGLE_CMAKE_DIR "${PACKAGE_PREFIX_DIR}/share/wangle") -+ -+find_package(folly CONFIG REQUIRED) -+find_package(fizz CONFIG REQUIRED) -+find_package(glog REQUIRED) -+find_package(Threads REQUIRED) -+find_package(Libevent CONFIG REQUIRED) - - if (NOT TARGET wangle::wangle) - include("${WANGLE_CMAKE_DIR}/wangle-targets.cmake") +diff --git a/wangle/cmake/wangle-config.cmake.in b/wangle/cmake/wangle-config.cmake.in +index e50af54..e0fd0dc 100644 +--- a/wangle/cmake/wangle-config.cmake.in ++++ b/wangle/cmake/wangle-config.cmake.in +@@ -12,7 +12,16 @@ + @PACKAGE_INIT@ + + set_and_check(WANGLE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") +-set_and_check(WANGLE_CMAKE_DIR "@PACKAGE_CMAKE_INSTALL_DIR@") ++set_and_check(WANGLE_CMAKE_DIR "${PACKAGE_PREFIX_DIR}/share/wangle") ++ ++include(CMakeFindDependencyMacro) ++find_dependency(folly REQUIRED) ++find_dependency(fizz REQUIRED) ++find_dependency(glog REQUIRED) ++find_dependency(Threads REQUIRED) ++find_dependency(Libevent REQUIRED) ++find_dependency(OpenSSL REQUIRED) ++find_dependency(double-conversion REQUIRED) + + if (NOT TARGET wangle::wangle) + include("${WANGLE_CMAKE_DIR}/wangle-targets.cmake") diff --git a/ports/wangle/fix_dependency.patch b/ports/wangle/fix_dependency.patch new file mode 100644 index 00000000000000..6b80a68f8d993c --- /dev/null +++ b/ports/wangle/fix_dependency.patch @@ -0,0 +1,56 @@ +diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt +index 8df7c76..f605f25 100644 +--- a/wangle/CMakeLists.txt ++++ b/wangle/CMakeLists.txt +@@ -62,7 +62,7 @@ find_package(folly CONFIG REQUIRED) + find_package(fizz CONFIG REQUIRED) + find_package(fmt CONFIG REQUIRED) + find_package(OpenSSL REQUIRED) +-find_package(Glog REQUIRED) ++find_package(glog CONFIG REQUIRED) + find_package(gflags CONFIG QUIET) + if (gflags_FOUND) + message(STATUS "Found gflags from package config") +@@ -70,8 +70,8 @@ if (gflags_FOUND) + else() + find_package(Gflags REQUIRED) + endif() +-find_package(LibEvent MODULE REQUIRED) +-find_package(DoubleConversion REQUIRED) ++find_package(Libevent CONFIG REQUIRED) ++find_package(double-conversion CONFIG REQUIRED) + find_package(Threads REQUIRED) + if (UNIX AND NOT APPLE) + find_package(Librt) +@@ -153,24 +153,23 @@ target_include_directories( + PUBLIC + $ + $ ++ PRIVATE + ${FIZZ_INCLUDE_DIR} + ${FOLLY_INCLUDE_DIR} + ${Boost_INCLUDE_DIR} +- ${OPENSSL_INCLUDE_DIR} +- ${GLOG_INCLUDE_DIRS} + ${GFLAGS_INCLUDE_DIRS} +- ${LIBEVENT_INCLUDE_DIR} +- ${DOUBLE_CONVERSION_INCLUDE_DIRS} + ) + target_link_libraries(wangle PUBLIC + ${FOLLY_LIBRARIES} + ${FIZZ_LIBRARIES} + ${Boost_LIBRARIES} +- ${OPENSSL_LIBRARIES} +- ${GLOG_LIBRARIES} ++ OpenSSL::SSL ++ OpenSSL::Crypto ++ glog::glog + ${GFLAGS_LIBRARIES} +- ${LIBEVENT_LIB} +- ${DOUBLE_CONVERSION_LIBRARIES} ++ libevent::core ++ libevent::extra ++ double-conversion::double-conversion + ${CMAKE_DL_LIBS} + ${LIBRT_LIBRARIES} + Threads::Threads) diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 9082aa04182813..f63ae8781eb46b 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -7,10 +7,9 @@ vcpkg_from_github( SHA512 1c21199225ebfe9a95391c2bb607412ebadc7aac326373e30dc9d49223a2437b382b4c3160fb2147a505bc2182f03f651c95f7c67f916e336ac81af76884f5fa HEAD_REF master PATCHES - build.patch fix-config-cmake.patch + fix_dependency.patch ) -# message(FATAL_ERROR "patch") vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}/wangle" @@ -39,6 +38,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/wangle/deprecated/rx/test ) - -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) From af575b88073b3ccdb27999ee55d41831b46d95bb Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 1 Jan 2021 03:05:46 +0800 Subject: [PATCH 0411/1694] [graphicsmagick] Add delegates.mgk (#15245) Co-authored-by: Billy Robert O'Neal III --- ports/graphicsmagick/CONTROL | 3 ++- ports/graphicsmagick/portfile.cmake | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/graphicsmagick/CONTROL b/ports/graphicsmagick/CONTROL index 01040319a7edd5..158710f4573e03 100644 --- a/ports/graphicsmagick/CONTROL +++ b/ports/graphicsmagick/CONTROL @@ -1,5 +1,6 @@ Source: graphicsmagick -Version: 1.3.35-2 +Version: 1.3.35 +Port-Version: 3 Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff Homepage: https://sourceforge.net/projects/graphicsmagick/ Description: Image processing library diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake index c17215ea735cec..ff4beac889269f 100644 --- a/ports/graphicsmagick/portfile.cmake +++ b/ports/graphicsmagick/portfile.cmake @@ -43,4 +43,5 @@ file(READ ${SOURCE_PATH}/config/type-windows.mgk.in TYPE_MGK) string(REPLACE "@windows_font_dir@" "$ENV{SYSTEMROOT}/Fonts/" TYPE_MGK "${TYPE_MGK}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config/type.mgk "${TYPE_MGK}") +configure_file(${SOURCE_PATH}/config/delegates.mgk.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/config/delegates.mgk @ONLY) vcpkg_copy_pdbs() From 54a7b13222937e0c37a05f81f3a61ed5bf76f22d Mon Sep 17 00:00:00 2001 From: Ronald <3665590+playgithub@users.noreply.github.com> Date: Tue, 5 Jan 2021 04:27:23 +0800 Subject: [PATCH 0412/1694] [poppler] Add new port (#15158) * port "poppler", it works, but needs a lot refinement. * add poppler-cpp17 * add popper and poppper[cpp17] * Use Options in vcpkg_configure_cmake instead of patches * remove feature cpp17 * remove port-version for a new port * add dependency fontconfig * try to solve problems on linux * zlib2 and png are default feature, let it be * linux is not supported for misc problems * remove test subdirectory for it to work in linux * remove test subdirectory for it to work in linux * fix patch files * format manifest file using vcpkg foramt-manifest * less dependencies * fix dependencies * fix dependencies * fix dependencies * fix dependencies * fix dependencies * fix dependencies * fix dependencies * test dependencies devil * test fix dependencies * remove redundant fontconfig * make zlib as an optional feature * test zlib as a feature * test fontconfig * apply vcpkg format-manifest Co-authored-by: abc --- .../0001-remove-CMAKE_CXX_STANDARD.patch | 24 +++++++++++++ .../0002-remove-test-subdirectory.patch | 24 +++++++++++++ ports/poppler/portfile.cmake | 36 +++++++++++++++++++ ports/poppler/vcpkg.json | 31 ++++++++++++++++ 4 files changed, 115 insertions(+) create mode 100644 ports/poppler/0001-remove-CMAKE_CXX_STANDARD.patch create mode 100644 ports/poppler/0002-remove-test-subdirectory.patch create mode 100644 ports/poppler/portfile.cmake create mode 100644 ports/poppler/vcpkg.json diff --git a/ports/poppler/0001-remove-CMAKE_CXX_STANDARD.patch b/ports/poppler/0001-remove-CMAKE_CXX_STANDARD.patch new file mode 100644 index 00000000000000..8e47286c4021d9 --- /dev/null +++ b/ports/poppler/0001-remove-CMAKE_CXX_STANDARD.patch @@ -0,0 +1,24 @@ +From 36fb9e11ab5b15fc003d77e7876e37339c37a55d Mon Sep 17 00:00:00 2001 +From: abc +Date: Wed, 16 Dec 2020 22:43:36 +0800 +Subject: [PATCH 1/2] remove CMAKE_CXX_STANDARD + +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1573249a..ec66b515 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,7 +41,6 @@ string(REGEX REPLACE "^0?(.+)$" "\\1" POPPLER_MINOR_VERSION "${POPPLER_MINOR_VER + set(POPPLER_MICRO_VERSION "1") + set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION_STRING}.${POPPLER_MICRO_VERSION}") + +-set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_EXTENSIONS OFF) + set(CMAKE_LINK_DEPENDS_NO_SHARED TRUE) + +-- +2.29.2.windows.2 + diff --git a/ports/poppler/0002-remove-test-subdirectory.patch b/ports/poppler/0002-remove-test-subdirectory.patch new file mode 100644 index 00000000000000..80dd5b53fcbdcd --- /dev/null +++ b/ports/poppler/0002-remove-test-subdirectory.patch @@ -0,0 +1,24 @@ +From aa0fa5f737b8ea3d2dfb396243be79af49274b6e Mon Sep 17 00:00:00 2001 +From: abc +Date: Fri, 18 Dec 2020 14:32:31 +0800 +Subject: [PATCH 2/2] remove test subdirectory + +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ec66b515..cce875a0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -749,7 +749,6 @@ endif() + if(ENABLE_GLIB) + add_subdirectory(glib) + endif() +-add_subdirectory(test) + if(ENABLE_QT5) + add_subdirectory(qt5) + endif() +-- +2.29.2.windows.2 + diff --git a/ports/poppler/portfile.cmake b/ports/poppler/portfile.cmake new file mode 100644 index 00000000000000..2b1e453e8a741a --- /dev/null +++ b/ports/poppler/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO freedesktop/poppler + REF poppler-20.12.1 + SHA512 f692682689c0b0fcc3953a1cc157b6e1d2ce3ccab185189d6dc0807f1dd3ea2d1a9773d0b805079a30b3c8a3b0cf3ee83239ed48d7b08dc7762eba29c2033674 + HEAD_REF master + PATCHES + 0001-remove-CMAKE_CXX_STANDARD.patch + 0002-remove-test-subdirectory.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + zlib ENABLE_ZLIB +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_GTK_TESTS=OFF + -DBUILD_QT5_TESTS=OFF + -DBUILD_QT6_TESTS=OFF + -DBUILD_CPP_TESTS=OFF + -DENABLE_UTILS=OFF + -DENABLE_GLIB=OFF + -DENABLE_GLOBJECT_INTROSPECTION=OFF + -DENABLE_QT5=OFF + -DENABLE_QT6=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json new file mode 100644 index 00000000000000..ad12769e0b90bc --- /dev/null +++ b/ports/poppler/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "poppler", + "version-string": "20.12.1", + "description": "a PDF rendering library", + "homepage": "https://poppler.freedesktop.org/", + "dependencies": [ + { + "name": "cairo", + "platform": "osx" + }, + { + "name": "devil", + "platform": "(windows | linux) & !arm" + }, + "fontconfig", + "freetype", + "libiconv", + "openjpeg" + ], + "default-features": [ + "zlib" + ], + "features": { + "zlib": { + "description": "zlib for poppler", + "dependencies": [ + "zlib" + ] + } + } +} From 299bfc4888833107841109b2642242c7a875b658 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 5 Jan 2021 20:57:23 +0100 Subject: [PATCH 0413/1694] =?UTF-8?q?[ignition-common3]=20Add=20new=20port?= =?UTF-8?q?=20=F0=9F=A4=96=20(#11273)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [ignition-common3] Add new port * Update ports/ignition-common3/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/ignition-common3/CONTROL | 5 +++++ ports/ignition-common3/portfile.cmake | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 ports/ignition-common3/CONTROL create mode 100644 ports/ignition-common3/portfile.cmake diff --git a/ports/ignition-common3/CONTROL b/ports/ignition-common3/CONTROL new file mode 100644 index 00000000000000..8bca013a1bee06 --- /dev/null +++ b/ports/ignition-common3/CONTROL @@ -0,0 +1,5 @@ +Source: ignition-common3 +Version: 3.9.0 +Build-Depends: dlfcn-win32 (windows|uwp), ffmpeg, freeimage, gts, ignition-cmake2, ignition-math6, ignition-modularscripts, libuuid (!windows&!uwp), tinyxml2 +Homepage: https://ignitionrobotics.org/libs/common +Description: Common libraries for robotics applications diff --git a/ports/ignition-common3/portfile.cmake b/ports/ignition-common3/portfile.cmake new file mode 100644 index 00000000000000..93059ae239de58 --- /dev/null +++ b/ports/ignition-common3/portfile.cmake @@ -0,0 +1,12 @@ +include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) + +ignition_modular_library(NAME common + VERSION "3.9.0" + SHA512 8d052850cbb125e334494c9ad9b234c371fe310327dba997515651f29479d747dffa55b0aa822f2a78e6317a4df2d41389c7a07165cdc08894fdfb116e4d9756) + +# 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") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() From 5029a43cb8b75dabc6c4477555a681149795240f Mon Sep 17 00:00:00 2001 From: General Jack O'Neill Date: Tue, 5 Jan 2021 15:05:15 -0500 Subject: [PATCH 0414/1694] [geotrans] update to version 3.8 (on-hold waiting for CI/VM port 21 for ftp to be opened or alternate host site) (#14412) * Update port geotrans to version 3.8 1. Added new files to CMakeLists.txt required by version 3.8 2. Remove old style CONTROL file used by vcpkg 3. Updated portfile.cmake for version 3.8 4. Add new style vcpkg.json file used by vcpkg * Add skip to CI baseline. Add slow warning messages to portfile * Refine warning message about long download times --- ports/geotrans/CMakeLists.txt | 110 ++++++++++++++++++---------------- ports/geotrans/CONTROL | 4 -- ports/geotrans/portfile.cmake | 11 ++-- ports/geotrans/vcpkg.json | 7 +++ scripts/ci.baseline.txt | 6 ++ 5 files changed, 77 insertions(+), 61 deletions(-) delete mode 100644 ports/geotrans/CONTROL create mode 100644 ports/geotrans/vcpkg.json diff --git a/ports/geotrans/CMakeLists.txt b/ports/geotrans/CMakeLists.txt index f733f8c8a00091..f2deeda14050df 100644 --- a/ports/geotrans/CMakeLists.txt +++ b/ports/geotrans/CMakeLists.txt @@ -3,96 +3,102 @@ project(geotrans CXX) file(GLOB_RECURSE DTCC_CPP CCS/src/dtcc/*.cpp) include_directories( +CCS/src/CoordinateConversion CCS/src/dtcc -CCS/src/dtcc/Enumerations -CCS/src/dtcc/Exception CCS/src/dtcc/CoordinateSystemParameters CCS/src/dtcc/CoordinateSystems CCS/src/dtcc/CoordinateSystems/albers -CCS/src/dtcc/CoordinateSystems/bonne -CCS/src/dtcc/CoordinateSystems/datum -CCS/src/dtcc/CoordinateSystems/ellipse -CCS/src/dtcc/CoordinateSystems/geocent -CCS/src/dtcc/CoordinateSystems/grinten -CCS/src/dtcc/CoordinateSystems/mercator -CCS/src/dtcc/CoordinateSystems/misc -CCS/src/dtcc/CoordinateSystems/nzmg -CCS/src/dtcc/CoordinateSystems/polarst -CCS/src/dtcc/CoordinateSystems/stereogr -CCS/src/dtcc/CoordinateSystems/trcyleqa -CCS/src/dtcc/CoordinateSystems/utm CCS/src/dtcc/CoordinateSystems/azeq -CCS/src/dtcc/CoordinateSystems/cassini -CCS/src/dtcc/CoordinateSystems/eckert4 -CCS/src/dtcc/CoordinateSystems/eqdcyl -CCS/src/dtcc/CoordinateSystems/georef -CCS/src/dtcc/CoordinateSystems/lambert -CCS/src/dtcc/CoordinateSystems/mgrs -CCS/src/dtcc/CoordinateSystems/mollweid -CCS/src/dtcc/CoordinateSystems/omerc -CCS/src/dtcc/CoordinateSystems/polycon -CCS/src/dtcc/CoordinateSystems/threads -CCS/src/dtcc/CoordinateSystems/ups -CCS/src/dtcc/CoordinateSystems/webmerc CCS/src/dtcc/CoordinateSystems/bng +CCS/src/dtcc/CoordinateSystems/bonne +CCS/src/dtcc/CoordinateSystems/cassini CCS/src/dtcc/CoordinateSystems/cyleqa +CCS/src/dtcc/CoordinateSystems/datum +CCS/src/dtcc/CoordinateSystems/eckert4 CCS/src/dtcc/CoordinateSystems/eckert6 +CCS/src/dtcc/CoordinateSystems/ellipse +CCS/src/dtcc/CoordinateSystems/eqdcyl CCS/src/dtcc/CoordinateSystems/gars +CCS/src/dtcc/CoordinateSystems/geocent +CCS/src/dtcc/CoordinateSystems/georef CCS/src/dtcc/CoordinateSystems/gnomonic +CCS/src/dtcc/CoordinateSystems/grinten +CCS/src/dtcc/CoordinateSystems/lambert CCS/src/dtcc/CoordinateSystems/loccart +CCS/src/dtcc/CoordinateSystems/locspher +CCS/src/dtcc/CoordinateSystems/mercator +CCS/src/dtcc/CoordinateSystems/mgrs CCS/src/dtcc/CoordinateSystems/miller +CCS/src/dtcc/CoordinateSystems/misc +CCS/src/dtcc/CoordinateSystems/mollweid CCS/src/dtcc/CoordinateSystems/neys +CCS/src/dtcc/CoordinateSystems/nzmg +CCS/src/dtcc/CoordinateSystems/omerc CCS/src/dtcc/CoordinateSystems/orthogr +CCS/src/dtcc/CoordinateSystems/polarst +CCS/src/dtcc/CoordinateSystems/polycon CCS/src/dtcc/CoordinateSystems/sinusoid +CCS/src/dtcc/CoordinateSystems/spherical +CCS/src/dtcc/CoordinateSystems/stereogr +CCS/src/dtcc/CoordinateSystems/threads CCS/src/dtcc/CoordinateSystems/tranmerc +CCS/src/dtcc/CoordinateSystems/trcyleqa +CCS/src/dtcc/CoordinateSystems/ups CCS/src/dtcc/CoordinateSystems/usng +CCS/src/dtcc/CoordinateSystems/utm +CCS/src/dtcc/CoordinateSystems/webmerc CCS/src/dtcc/CoordinateTuples +CCS/src/dtcc/Enumerations +CCS/src/dtcc/Exception ) set(DTCC_INCLUDES +include/CoordinateConversion include/dtcc/ -include/dtcc/Enumerations -include/dtcc/Exception include/dtcc/CoordinateSystemParameters include/dtcc/CoordinateSystems include/dtcc/CoordinateSystems/albers -include/dtcc/CoordinateSystems/bonne -include/dtcc/CoordinateSystems/datum -include/dtcc/CoordinateSystems/ellipse -include/dtcc/CoordinateSystems/geocent -include/dtcc/CoordinateSystems/grinten -include/dtcc/CoordinateSystems/mercator -include/dtcc/CoordinateSystems/misc -include/dtcc/CoordinateSystems/nzmg -include/dtcc/CoordinateSystems/polarst -include/dtcc/CoordinateSystems/stereogr -include/dtcc/CoordinateSystems/trcyleqa -include/dtcc/CoordinateSystems/utm include/dtcc/CoordinateSystems/azeq -include/dtcc/CoordinateSystems/cassini -include/dtcc/CoordinateSystems/eckert4 -include/dtcc/CoordinateSystems/eqdcyl -include/dtcc/CoordinateSystems/georef -include/dtcc/CoordinateSystems/lambert -include/dtcc/CoordinateSystems/mgrs -include/dtcc/CoordinateSystems/mollweid -include/dtcc/CoordinateSystems/omerc -include/dtcc/CoordinateSystems/polycon -include/dtcc/CoordinateSystems/threads -include/dtcc/CoordinateSystems/ups -include/dtcc/CoordinateSystems/webmerc include/dtcc/CoordinateSystems/bng +include/dtcc/CoordinateSystems/bonne +include/dtcc/CoordinateSystems/cassini include/dtcc/CoordinateSystems/cyleqa +include/dtcc/CoordinateSystems/datum +include/dtcc/CoordinateSystems/eckert4 include/dtcc/CoordinateSystems/eckert6 +include/dtcc/CoordinateSystems/ellipse +include/dtcc/CoordinateSystems/eqdcyl include/dtcc/CoordinateSystems/gars +include/dtcc/CoordinateSystems/geocent +include/dtcc/CoordinateSystems/georef include/dtcc/CoordinateSystems/gnomonic +include/dtcc/CoordinateSystems/grinten +include/dtcc/CoordinateSystems/lambert include/dtcc/CoordinateSystems/loccart +include/dtcc/CoordinateSystems/locspher +include/dtcc/CoordinateSystems/mercator +include/dtcc/CoordinateSystems/mgrs include/dtcc/CoordinateSystems/miller +include/dtcc/CoordinateSystems/misc +include/dtcc/CoordinateSystems/mollweid include/dtcc/CoordinateSystems/neys +include/dtcc/CoordinateSystems/nzmg +include/dtcc/CoordinateSystems/omerc include/dtcc/CoordinateSystems/orthogr +include/dtcc/CoordinateSystems/polarst +include/dtcc/CoordinateSystems/polycon include/dtcc/CoordinateSystems/sinusoid +include/dtcc/CoordinateSystems/spherical +include/dtcc/CoordinateSystems/stereogr +include/dtcc/CoordinateSystems/threads include/dtcc/CoordinateSystems/tranmerc +include/dtcc/CoordinateSystems/trcyleqa +include/dtcc/CoordinateSystems/ups include/dtcc/CoordinateSystems/usng +include/dtcc/CoordinateSystems/utm +include/dtcc/CoordinateSystems/webmerc include/dtcc/CoordinateTuples +include/dtcc/Enumerations +include/dtcc/Exception ) if(WIN32) diff --git a/ports/geotrans/CONTROL b/ports/geotrans/CONTROL deleted file mode 100644 index 72885e4fb7ce84..00000000000000 --- a/ports/geotrans/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: geotrans -Version: 3.7 -Homepage: https://earth-info.nga.mil/GandG/update/index.php?action=home -Description: GEOTRANS is an application that allows you to convert geographic coordinates among a wide variety of coordinate systems, map projections, grids, and datums. GEOTRANS runs in Microsoft Windows and LINUX environments. diff --git a/ports/geotrans/portfile.cmake b/ports/geotrans/portfile.cmake index 39844c315253b4..930452baa4f2a7 100644 --- a/ports/geotrans/portfile.cmake +++ b/ports/geotrans/portfile.cmake @@ -1,11 +1,14 @@ set(VCPKG_LIBRARY_LINKAGE "dynamic") +message(WARNING "Download ${PORT} may take a several hours to complete!") +message(WARNING "Port ${PORT} source resides NGA US Government military ftp server with an extremely slow connection.") + # We specify the Linux URL, but the only difference between the Windows/Linux packages are the included libraries # which we re-build anyway. There is no source only package provided or it would be preferred (and smaller). vcpkg_download_distfile(ARCHIVE - URLS "http://earth-info.nga.mil/GandG/geotrans/geotrans3.7/linux_dev.tgz" - FILENAME "geotrans-3.7.tgz" - SHA512 20bdc870026e95154f1d7f9560cbfa2c0b2dc39042aa544f093b502a0609121cb47df5729248e0d79ccf8f9908bf01bbcea8e777ae4f45e25472b7ce2bcb9742 + URLS "ftp://ftp.nga.mil/pub2/gandg/website/wgs84/apps/geotrans/current-version/sw/master_version/master.tgz" + FILENAME "geotrans-3.8-master.tgz" + SHA512 359704ee9700762111006d126872feab9f644af0cebd433a657473347ea48f4eb172681f5f564fbca171bbf58fe0e8fb0829597403958770b7d22ad380afeac3 ) vcpkg_extract_source_archive_ex( @@ -15,7 +18,6 @@ vcpkg_extract_source_archive_ex( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -31,7 +33,6 @@ configure_file( configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT} @ONLY) - # Handle copyright file(INSTALL ${SOURCE_PATH}/GEOTRANS3/docs/MSP_Geotrans_Terms_Of_Use.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/geotrans/vcpkg.json b/ports/geotrans/vcpkg.json new file mode 100644 index 00000000000000..788e2307309403 --- /dev/null +++ b/ports/geotrans/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "geotrans", + "version-string": "3.8", + "description": "GEOTRANS is an application that allows you to convert geographic coordinates among a wide variety of coordinate systems, map projections, grids, and datums. GEOTRANS runs in Microsoft Windows and LINUX environments.", + "homepage": "https://earth-info.nga.mil/GandG/update/index.php?action=home", + "supports": "(((x86 | x64) & windows & !static) | ((x86 | x64) & linux)) & !uwp & !arm & !arm64 & !osx & !android" +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1e314462611506..875032eb1f0aca 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -341,6 +341,12 @@ gdcm:arm64-windows=fail gdcm:x64-linux = skip geos:arm-uwp=fail geos:x64-uwp=fail + +# Port geotrans source ftp://ftp.nga.mil server +# extremely slow may take several hours to download +geotrans:x64-linux = skip +geotrans:x64-windows = skip +geotrans:x86-windows = skip getopt:arm-uwp=fail getopt:x64-uwp=fail getopt-win32:arm64-windows=fail From e81145f01ca9fb4c9f975e2cbd884b219d96be60 Mon Sep 17 00:00:00 2001 From: dweckmann Date: Tue, 5 Jan 2021 21:07:14 +0100 Subject: [PATCH 0415/1694] [ogre] make zziplib, freeimage, assimp, freetype and strict resource manager, optional features (#15194) --- ports/ogre/portfile.cmake | 15 ++++++++--- ports/ogre/vcpkg.json | 52 ++++++++++++++++++++++++++++++--------- 2 files changed, 52 insertions(+), 15 deletions(-) diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 76de8a4834a4d2..c14da2fac93b22 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -30,12 +30,19 @@ endif() # Configure features vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 - java OGRE_BUILD_COMPONENT_JAVA - python OGRE_BUILD_COMPONENT_PYTHON - csharp OGRE_BUILD_COMPONENT_CSHARP + d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 + java OGRE_BUILD_COMPONENT_JAVA + python OGRE_BUILD_COMPONENT_PYTHON + csharp OGRE_BUILD_COMPONENT_CSHARP + overlay OGRE_BUILD_COMPONENT_OVERLAY + zziplib OGRE_CONFIG_ENABLE_ZIP + strict OGRE_RESOURCEMANAGER_STRICT ) +# OGRE_RESOURCEMANAGER_STRICT need to be 0 for OFF and 1 for ON, because it is used 'as is' in sources +string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=ON" "OGRE_RESOURCEMANAGER_STRICT=1" FEATURE_OPTIONS "${FEATURE_OPTIONS}") +string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=OFF" "OGRE_RESOURCEMANAGER_STRICT=0" FEATURE_OPTIONS "${FEATURE_OPTIONS}") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index 88d46d93798456..a92d9ea9b673cb 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,39 +1,69 @@ { "name": "ogre", "version-string": "1.12.9", - "port-version": 3, + "port-version": 4, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "dependencies": [ - "assimp", - "freeimage", - "freetype", - { - "name": "imgui", - "features": [ - "freetype" - ] - }, "pugixml", "sdl2", - "zlib", + "zlib" + ], + "default-features": [ + "assimp", + "freeimage", + "overlay", + "strict", "zziplib" ], "features": { + "assimp": { + "description": "Use assimp", + "dependencies": [ + "assimp" + ] + }, "csharp": { "description": "Build csharp bindings" }, "d3d9": { "description": "Build Direct3D9 RenderSystem" }, + "freeimage": { + "description": "Build with FreeImage support", + "dependencies": [ + "freeimage" + ] + }, "java": { "description": "Build Java (JNI) bindings" }, + "overlay": { + "description": "Build overlay component", + "dependencies": [ + "freetype", + { + "name": "imgui", + "features": [ + "freetype" + ] + } + ] + }, "python": { "description": "Build Python bindings", "dependencies": [ "python3" ] + }, + "strict": { + "description": "Force Ogre resource manager to be strict with group names and resource names" + }, + "zziplib": { + "description": "Build with zziplib support (GPL)", + "dependencies": [ + "zziplib" + ] } } } From 36b44fd9f6bc6c66259923575692c88f825696d8 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 6 Jan 2021 04:10:06 +0800 Subject: [PATCH 0416/1694] [darknet] yolo v4 weights's hash need to update (#15296) * [darknet] yolo v4 weights's hash need to update * Add vcpkg_check_feature * Modify FEATURE_OPTIONS --- ports/darknet/CONTROL | 2 +- ports/darknet/portfile.cmake | 55 +++++++++--------------------------- 2 files changed, 14 insertions(+), 43 deletions(-) diff --git a/ports/darknet/CONTROL b/ports/darknet/CONTROL index 25617ab14163b5..b41b9737d2571b 100644 --- a/ports/darknet/CONTROL +++ b/ports/darknet/CONTROL @@ -1,6 +1,6 @@ Source: darknet Version: 2020-08-30 -Port-Version: 1 +Port-Version: 2 Description: Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities. Build-Depends: pthreads, stb diff --git a/ports/darknet/portfile.cmake b/ports/darknet/portfile.cmake index 54f204f84ff0f5..d786e196eab045 100644 --- a/ports/darknet/portfile.cmake +++ b/ports/darknet/portfile.cmake @@ -8,42 +8,16 @@ vcpkg_from_github( 0001-rename-_castu32_f32-to-gemm_castu32_f32.patch ) -# enable CUDA inside DARKNET -set(ENABLE_CUDA OFF) -if("cuda" IN_LIST FEATURES) - set(ENABLE_CUDA ON) -endif() - -set(ENABLE_OPENCV OFF) -# enable OPENCV (basic version) inside DARKNET -if("opencv-base" IN_LIST FEATURES) - set(ENABLE_OPENCV ON) -endif() -if("opencv2-base" IN_LIST FEATURES) - set(ENABLE_OPENCV ON) -endif() -if("opencv3-base" IN_LIST FEATURES) - set(ENABLE_OPENCV ON) -endif() - -# enable OPENCV (with its own CUDA feature enabled) inside DARKNET -# (note: this does not mean that DARKNET itself will have CUDA support since by design it is independent, to have it you must require both opencv-cuda and cuda features!) -# DARKNET will be automatically able to distinguish an OpenCV that is built with or without CUDA support. -if("opencv-cuda" IN_LIST FEATURES) - set(ENABLE_OPENCV ON) -endif() -if("opencv2-cuda" IN_LIST FEATURES) - set(ENABLE_OPENCV ON) -endif() -if("opencv3-cuda" IN_LIST FEATURES) - set(ENABLE_OPENCV ON) -endif() - -# enable CUDNN inside DARKNET (which depends on the "cuda" feature by design) -set(ENABLE_CUDNN OFF) -if("cudnn" IN_LIST FEATURES) - set(ENABLE_CUDNN ON) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + cuda ENABLE_CUDA + opencv-base ENABLE_OPENCV + opencv2-base ENABLE_OPENCV + opencv3-base ENABLE_OPENCV + opencv-cuda ENABLE_OPENCV + opencv2-cuda ENABLE_OPENCV + opencv3-cuda ENABLE_OPENCV + cudnn ENABLE_CUDNN +) if ("cuda" IN_LIST FEATURES) if (NOT VCPKG_CMAKE_SYSTEM_NAME AND NOT ENV{CUDACXX}) @@ -56,7 +30,7 @@ if("weights" IN_LIST FEATURES) vcpkg_download_distfile(YOLOV4-TINY_WEIGHTS URLS "https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v4_pre/yolov4-tiny.weights" FILENAME "darknet-cache/yolov4-tiny.weights" - SHA512 804ca2ab8e3699d31c95bf773d22f901f186703487c7945f30dc2dbb808094793362cb6f5da5cd0b4b83f820c8565a3cba22fafa069ee6ca2a925677137d95f4 + SHA512 7d4d9fe150f9fe3ea7d2310f1445fe983b31fbf06d301c70ecfe00e8559e6f1bf940198c2dd55db772238f23ea0092fb6553558e5414f3ee173b8b28e53c5b54 ) vcpkg_download_distfile(YOLOV4_WEIGHTS URLS "https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v3_optimal/yolov4.weights" @@ -99,7 +73,7 @@ if("weights-train" IN_LIST FEATURES) vcpkg_download_distfile(YOLOV4-TINY-CONV-29 URLS "https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v4_pre/yolov4-tiny.conv.29" FILENAME "darknet-cache/yolov4-tiny.conv.29" - SHA512 318e47f4bdf43b7f4eff8f3669bc9ba66cd7bd8ffb31df5bc1978682c85fec8e63a8349958022fd933cc676cbf5241953f2181bf4d1789f7cf9d371e012e3e49 + SHA512 d145deb80aea3d422752e784323d89919281ed7a37d15f939f5b680ff62e502072a30e074c34a09026669126d360c7d6817ea1afa53cfa53c56bd1e16333a602 ) vcpkg_download_distfile(YOLOV4-CONV-137 URLS "https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v3_optimal/yolov4.conv.137" @@ -128,12 +102,9 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE PREFER_NINJA - OPTIONS + OPTIONS ${FEATURE_OPTIONS} -DINSTALL_BIN_DIR:STRING=bin -DINSTALL_LIB_DIR:STRING=lib - -DENABLE_CUDA=${ENABLE_CUDA} - -DENABLE_CUDNN=${ENABLE_CUDNN} - -DENABLE_OPENCV=${ENABLE_OPENCV} ) vcpkg_install_cmake() From 5db49eb4152c0e36c9bc8297978695c2c915200e Mon Sep 17 00:00:00 2001 From: Hendiadyoin1 <37629766+Hendiadyoin1@users.noreply.github.com> Date: Tue, 5 Jan 2021 21:11:22 +0100 Subject: [PATCH 0417/1694] fix licensingfile of kf5archive (#15314) * fix licensingfile of kf5archive * selected specific licencefile * bumped port-version to 1 --- ports/kf5archive/CONTROL | 3 ++- ports/kf5archive/portfile.cmake | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/kf5archive/CONTROL b/ports/kf5archive/CONTROL index 4e4493cd1313c8..d94ba138351d5c 100644 --- a/ports/kf5archive/CONTROL +++ b/ports/kf5archive/CONTROL @@ -1,5 +1,6 @@ Source: kf5archive -Version: 5.74.0 +Version: 5.74.0 +Port-Version: 1 Homepage: https://api.kde.org/frameworks/karchive/html/index.html Description: File compression Build-Depends: ecm, qt5-base[core], zlib, bzip2 diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index ce02da024b96d1..537f1bb4fb2b9b 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/karchive - REF 6e1f95972f25f1d3a94dd181f44ee0846e042ef9 # v5.74.0 + REF 6e1f95972f25f1d3a94dd181f44ee0846e042ef9 # v5.74.0 SHA512 333a5e310c1b482379a3092bb3ac0e31963917090edd3afba6f26e40f63abe327dfdff70800e635667fe3333538e5fc911ab06d7287c17d2062a4618c191f308 HEAD_REF master ) @@ -24,4 +24,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSES/LGPL-3.0-only.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 87a1b26245f26d863650b19f4b6f4e6adedc8ee1 Mon Sep 17 00:00:00 2001 From: Gilad Bauman Date: Tue, 5 Jan 2021 22:12:52 +0200 Subject: [PATCH 0418/1694] Fix for FreeImage incorrect image format enum after disabling vendor plugins (#15393) --- ports/freeimage/CONTROL | 2 +- ports/freeimage/portfile.cmake | 1 + .../freeimage/update_format_enum_values.patch | 33 +++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 ports/freeimage/update_format_enum_values.patch diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL index 87435994ca043d..da87824649b3a6 100644 --- a/ports/freeimage/CONTROL +++ b/ports/freeimage/CONTROL @@ -1,6 +1,6 @@ Source: freeimage Version: 3.18.0 -Port-Version: 17 +Port-Version: 18 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp (!uwp), libraw, jxrlib, openexr Homepage: https://sourceforge.net/projects/freeimage/ Description: Support library for graphics image formats diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake index ce1b86821cc544..26253c71560e58 100644 --- a/ports/freeimage/portfile.cmake +++ b/ports/freeimage/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_sourceforge( fix-function-overload.patch use-typedef-as-already-declared.patch use-functions-to-override-libtiff-warning-error-handlers.patch + update_format_enum_values.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/freeimage/update_format_enum_values.patch b/ports/freeimage/update_format_enum_values.patch new file mode 100644 index 00000000000000..01a0a6b9f57ca6 --- /dev/null +++ b/ports/freeimage/update_format_enum_values.patch @@ -0,0 +1,33 @@ +diff --git a/Source/FreeImage.h b/Source/FreeImage.h +index 59de277..224877f 100644 +--- a/Source/FreeImage.h ++++ b/Source/FreeImage.h +@@ -420,15 +420,19 @@ FI_ENUM(FREE_IMAGE_FORMAT) { + #if 0 + FIF_FAXG3 = 27, + #endif +- FIF_SGI = 28, +- FIF_EXR = 29, +- FIF_J2K = 30, +- FIF_JP2 = 31, +- FIF_PFM = 32, +- FIF_PICT = 33, +- FIF_RAW = 34, +- FIF_WEBP = 35, +- FIF_JXR = 36 ++/* vcpkg: removal of G3 fax format messes up the format enum numbering due to FreeImage ++ relying on the list of plugins as created in AddNode(). Enum values have been ++ corrected to compensate. This is similar to the reported bug: ++ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=841089 */ ++ FIF_SGI = 27, ++ FIF_EXR = 28, ++ FIF_J2K = 29, ++ FIF_JP2 = 30, ++ FIF_PFM = 31, ++ FIF_PICT = 32, ++ FIF_RAW = 33, ++ FIF_WEBP = 34, ++ FIF_JXR = 35 + }; + + /** Image type used in FreeImage. From 403607ee4ef3bcf81dba11c90a1ea2248b1519e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 5 Jan 2021 21:33:13 +0100 Subject: [PATCH 0419/1694] [sdl2] Update to 2.0.14 (#15398) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [sdl2] Update to 2.0.14 * Revert "[sdl2] Update to 2.0.14" This reverts commit b8e82e0dacb3877febd1f32e9b92c90fd8c0db19. * [sdl2] Update to 2.0.14 * [sdl2] Fix manifest formatting * [sdl2] Change the shared library preprocessor symbol name to DLL_EXPORT for compatibility with SDL 2.0.14 Co-authored-by: Rémy Tassoux --- ports/sdl2-image/CMakeLists.txt | 2 +- ports/sdl2-mixer/CMakeLists.txt | 2 +- ports/sdl2-net/CMakeLists.txt | 2 +- ports/sdl2-ttf/CMakeLists.txt | 2 +- ...creation-of-pkg-cfg-file-on-windows.patch} | 21 +-- ...tch => 0002-sdl2-skip-ibus-on-linux.patch} | 11 +- ports/sdl2/0003-sdl2-fix-uwp-build.patch | 25 +++ ports/sdl2/0008-fix-macos-metal-test.patch | 11 -- ports/sdl2/disable-hidapi-for-uwp.patch | 11 -- ...able-wcslcpy-and-wcslcat-for-windows.patch | 12 -- ports/sdl2/enable-winrt-cmake.patch | 175 ------------------ .../export-symbols-only-in-shared-build.patch | 24 --- .../fix-EventToken-header-reference.patch | 17 -- ports/sdl2/fix-space-in-path.patch | 24 --- .../no-propagate-shared-link-options.patch | 13 -- ports/sdl2/portfile.cmake | 19 +- ports/sdl2/vcpkg.json | 3 +- ports/smpeg2/CMakeLists.txt | 2 +- 18 files changed, 49 insertions(+), 327 deletions(-) rename ports/sdl2/{0006-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch => 0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch} (62%) rename ports/sdl2/{0007-sdl2-skip-ibus-on-linux.patch => 0002-sdl2-skip-ibus-on-linux.patch} (56%) create mode 100644 ports/sdl2/0003-sdl2-fix-uwp-build.patch delete mode 100644 ports/sdl2/0008-fix-macos-metal-test.patch delete mode 100644 ports/sdl2/disable-hidapi-for-uwp.patch delete mode 100644 ports/sdl2/disable-wcslcpy-and-wcslcat-for-windows.patch delete mode 100644 ports/sdl2/enable-winrt-cmake.patch delete mode 100644 ports/sdl2/export-symbols-only-in-shared-build.patch delete mode 100644 ports/sdl2/fix-EventToken-header-reference.patch delete mode 100644 ports/sdl2/fix-space-in-path.patch delete mode 100644 ports/sdl2/no-propagate-shared-link-options.patch diff --git a/ports/sdl2-image/CMakeLists.txt b/ports/sdl2-image/CMakeLists.txt index 48afeb538bb47a..689f0fcd74503a 100644 --- a/ports/sdl2-image/CMakeLists.txt +++ b/ports/sdl2-image/CMakeLists.txt @@ -57,7 +57,7 @@ if (APPLE) ) endif() -set_target_properties(SDL2_image PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS) +set_target_properties(SDL2_image PROPERTIES DEFINE_SYMBOL DLL_EXPORT) foreach(FORMAT ${SUPPORTED_FORMATS}) add_definitions(-DLOAD_${FORMAT}) diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt index cc9816d0b781a2..f7e8a8590e6b5f 100644 --- a/ports/sdl2-mixer/CMakeLists.txt +++ b/ports/sdl2-mixer/CMakeLists.txt @@ -103,7 +103,7 @@ if((WIN32 OR APPLE) AND SDL_MIXER_ENABLE_NATIVEMIDI) endif() endif() -set_target_properties(SDL2_mixer PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS) +set_target_properties(SDL2_mixer PROPERTIES DEFINE_SYMBOL DLL_EXPORT) target_compile_definitions(SDL2_mixer PRIVATE ${SDL_MIXER_DEFINES} ${SDL_MIXER_LOAD_DEFINES}) target_include_directories(SDL2_mixer PRIVATE ${SDL_MIXER_INCLUDES} ./native_midi) diff --git a/ports/sdl2-net/CMakeLists.txt b/ports/sdl2-net/CMakeLists.txt index 0530936434b54b..87c77929c9b57d 100644 --- a/ports/sdl2-net/CMakeLists.txt +++ b/ports/sdl2-net/CMakeLists.txt @@ -10,7 +10,7 @@ find_package(SDL2 CONFIG REQUIRED) add_library(SDL2_net SDLnet.c SDLnetselect.c SDLnetTCP.c SDLnetUDP.c version.rc) -set_target_properties(SDL2_net PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS) +set_target_properties(SDL2_net PROPERTIES DEFINE_SYMBOL DLL_EXPORT) target_compile_definitions(SDL2_net PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS) target_include_directories(SDL2_net PRIVATE ${SDL_INCLUDE_DIR}/SDL2) diff --git a/ports/sdl2-ttf/CMakeLists.txt b/ports/sdl2-ttf/CMakeLists.txt index 8d34a413a25ca5..1ac20ec1f2c92c 100644 --- a/ports/sdl2-ttf/CMakeLists.txt +++ b/ports/sdl2-ttf/CMakeLists.txt @@ -7,7 +7,7 @@ find_package(Freetype REQUIRED) add_library(SDL2_ttf SDL_ttf.c version.rc) -set_target_properties(SDL2_ttf PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS) +set_target_properties(SDL2_ttf PROPERTIES DEFINE_SYMBOL DLL_EXPORT) target_include_directories(SDL2_ttf PRIVATE ${SDL_INCLUDE_DIR}/SDL2 ${FREETYPE_INCLUDE_DIRS}) target_link_libraries(SDL2_ttf SDL2::SDL2 ${FREETYPE_LIBRARIES}) diff --git a/ports/sdl2/0006-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch b/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch similarity index 62% rename from ports/sdl2/0006-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch rename to ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch index 064885b08cded4..5aaf4db3307d63 100644 --- a/ports/sdl2/0006-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,20 +1,14 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7dfd35389..7944f401b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1916,9 +1916,10 @@ listtostr(EXTRA_CFLAGS _EXTRA_CFLAGS) - set(EXTRA_CFLAGS ${_EXTRA_CFLAGS}) - - # Compat helpers for the configuration files +@@ -2086,7 +2086,6 @@ + execute_process(COMMAND sh ${SDL2_SOURCE_DIR}/build-scripts/updaterev.sh + WORKING_DIRECTORY ${SDL2_BINARY_DIR}) + endif() -if(NOT WINDOWS OR CYGWIN) - # TODO: we need a Windows script, too -+ if(NOT WINDOWS OR CYGWIN) - execute_process(COMMAND sh ${SDL2_SOURCE_DIR}/build-scripts/updaterev.sh) -+ endif() - set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}") -@@ -1960,7 +1961,6 @@ if(NOT WINDOWS OR CYGWIN) + set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}") +@@ -2129,7 +2129,6 @@ "${SDL2_BINARY_DIR}/sdl2-config" @ONLY) configure_file("${SDL2_SOURCE_DIR}/SDL2.spec.in" "${SDL2_BINARY_DIR}/SDL2.spec" @ONLY) @@ -22,7 +16,7 @@ index 7dfd35389..7944f401b 100644 ##### Info output ##### message(STATUS "") -@@ -2198,6 +2198,7 @@ if(NOT (WINDOWS OR CYGWIN)) +@@ -2376,6 +2376,7 @@ # TODO: what about the .spec file? Is it only needed for RPM creation? install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/aclocal") endif() @@ -30,4 +24,3 @@ index 7dfd35389..7944f401b 100644 ##### Uninstall target ##### - diff --git a/ports/sdl2/0007-sdl2-skip-ibus-on-linux.patch b/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch similarity index 56% rename from ports/sdl2/0007-sdl2-skip-ibus-on-linux.patch rename to ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch index 8baa73c0f9924c..5dd4ad83cb4353 100644 --- a/ports/sdl2/0007-sdl2-skip-ibus-on-linux.patch +++ b/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch @@ -1,7 +1,7 @@ --- CMakeLists.orig.txt 2020-10-28 09:08:51.925900284 +0100 +++ CMakeLists.txt 2020-10-28 09:09:10.034165780 +0100 -@@ -1197,13 +1197,6 @@ - list(APPEND EXTRA_LIBS ${DBUS_LIBRARIES}) +@@ -1240,12 +1240,6 @@ + set(HAVE_FCITX TRUE) endif() - pkg_search_module(IBUS ibus-1.0 ibus) @@ -9,8 +9,7 @@ - set(HAVE_IBUS_IBUS_H TRUE) - include_directories(${IBUS_INCLUDE_DIRS}) - list(APPEND EXTRA_LIBS ${IBUS_LIBRARIES}) -- add_definitions(-DSDL_USE_IME) - endif() - if(HAVE_LIBUNWIND_H) - # We've already found the header, so REQUIRE the lib to be present - pkg_search_module(UNWIND REQUIRED libunwind) + + if (HAVE_IBUS_IBUS_H OR HAVE_FCITX) + set(SDL_USE_IME TRUE) diff --git a/ports/sdl2/0003-sdl2-fix-uwp-build.patch b/ports/sdl2/0003-sdl2-fix-uwp-build.patch new file mode 100644 index 00000000000000..5175343ce04833 --- /dev/null +++ b/ports/sdl2/0003-sdl2-fix-uwp-build.patch @@ -0,0 +1,25 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1395,8 +1395,13 @@ + endif() + endif() + ++ if(WINDOWS_STORE) ++ file(GLOB WINRT_MISC_SOURCES ${SDL2_SOURCE_DIR}/src/misc/winrt/*.cpp) ++ set(SOURCE_FILES ${SOURCE_FILES} ${WINRT_MISC_SOURCES}) ++ else() + file(GLOB MISC_SOURCES ${SDL2_SOURCE_DIR}/src/misc/windows/*.c) + set(SOURCE_FILES ${SOURCE_FILES} ${MISC_SOURCES}) ++ endif() + set(HAVE_SDL_MISC TRUE) + + # Check for DirectX +@@ -1522,7 +1522,7 @@ + set(HAVE_SDL_THREADS TRUE) + endif() + +- if(SDL_SENSOR AND HAVE_SENSORSAPI_H) ++ if(SDL_SENSOR AND HAVE_SENSORSAPI_H AND NOT WINDOWS_STORE) + set(SDL_SENSOR_WINDOWS 1) + set(HAVE_SDL_SENSORS TRUE) + file(GLOB WINDOWS_SENSOR_SOURCES ${SDL2_SOURCE_DIR}/src/sensor/windows/*.c) diff --git a/ports/sdl2/0008-fix-macos-metal-test.patch b/ports/sdl2/0008-fix-macos-metal-test.patch deleted file mode 100644 index a1d7811013d658..00000000000000 --- a/ports/sdl2/0008-fix-macos-metal-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2020-11-05 16:48:40.000000000 -0800 -+++ CMakeLists.txt 2020-11-05 16:49:02.000000000 -0800 -@@ -1701,7 +1701,7 @@ - - if(VIDEO_VULKAN OR VIDEO_METAL OR RENDER_METAL) - set(ORIG_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) -- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -x objective-c") -+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -ObjC") - check_c_source_compiles(" - #include - #import diff --git a/ports/sdl2/disable-hidapi-for-uwp.patch b/ports/sdl2/disable-hidapi-for-uwp.patch deleted file mode 100644 index 9a1b500b47be56..00000000000000 --- a/ports/sdl2/disable-hidapi-for-uwp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -173,7 +173,7 @@ - # so we'll just use libusb when it's available. libusb does not support iOS, - # so we default to yes on iOS. - # TODO: Windows can support libusb, the hid.c file just depends on Unix APIs --if(WINDOWS OR IOS OR TVOS OR ANDROID) -+if((WINDOWS AND NOT WINDOWS_STORE) OR IOS OR TVOS OR ANDROID) - set(HIDAPI_SKIP_LIBUSB TRUE) - else() - set(HIDAPI_SKIP_LIBUSB FALSE) diff --git a/ports/sdl2/disable-wcslcpy-and-wcslcat-for-windows.patch b/ports/sdl2/disable-wcslcpy-and-wcslcat-for-windows.patch deleted file mode 100644 index 894b24d0d942e9..00000000000000 --- a/ports/sdl2/disable-wcslcpy-and-wcslcat-for-windows.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -772,7 +772,7 @@ - set(HAVE_SIGNAL_H 1) - foreach(_FN - malloc calloc realloc free qsort abs memset memcpy memmove memcmp -- wcslen wcslcpy wcslcat wcsdup wcsstr wcscmp wcsncmp -+ wcslen wcsdup wcsstr wcscmp wcsncmp - strlen _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa - _ultoa strtol strtoul strtoll strtod atoi atof strcmp strncmp - _stricmp _strnicmp strtok_s sscanf diff --git a/ports/sdl2/enable-winrt-cmake.patch b/ports/sdl2/enable-winrt-cmake.patch deleted file mode 100644 index 0e570847b1a868..00000000000000 --- a/ports/sdl2/enable-winrt-cmake.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0128c7a..bd534e4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,18 @@ - cmake_minimum_required(VERSION 2.8.11) - project(SDL2 C CXX) - -+if(WINDOWS_STORE) -+ enable_language(CXX) -+ cmake_minimum_required(VERSION 3.11) -+ add_definitions(-DSDL_BUILDING_WINRT=1 -ZW) -+ link_libraries( -+ -nodefaultlib:vccorlib$<$:d> -+ -nodefaultlib:msvcrt$<$:d> -+ vccorlib$<$:d>.lib -+ msvcrt$<$:d>.lib -+ ) -+endif() -+ - # !!! FIXME: this should probably do "MACOSX_RPATH ON" as a target property - # !!! FIXME: for the SDL2 shared library (so you get an - # !!! FIXME: install_name ("soname") of "@rpath/libSDL-whatever.dylib" -@@ -1297,6 +1309,11 @@ - file(GLOB CORE_SOURCES ${SDL2_SOURCE_DIR}/src/core/windows/*.c) - set(SOURCE_FILES ${SOURCE_FILES} ${CORE_SOURCES}) - -+ if(WINDOWS_STORE) -+ file(GLOB WINRT_SOURCE_FILES ${SDL2_SOURCE_DIR}/src/core/winrt/*.c ${SDL2_SOURCE_DIR}/src/core/winrt/*.cpp) -+ list(APPEND SOURCE_FILES ${WINRT_SOURCE_FILES}) -+ endif() -+ - if(MSVC) - # Prevent codegen that would use the VC runtime libraries. - set_property(DIRECTORY . APPEND PROPERTY COMPILE_OPTIONS "/GS-") -@@ -1342,6 +1359,9 @@ - check_include_file(ddraw.h HAVE_DDRAW_H) - check_include_file(dsound.h HAVE_DSOUND_H) - check_include_file(dinput.h HAVE_DINPUT_H) -+ if(WINDOWS_STORE OR VCPKG_TARGET_TRIPLET MATCHES "arm-windows") -+ set(HAVE_DINPUT_H 0) -+ endif() - check_include_file(dxgi.h HAVE_DXGI_H) - if(HAVE_D3D_H OR HAVE_D3D11_H OR HAVE_DDRAW_H OR HAVE_DSOUND_H OR HAVE_DINPUT_H) - set(HAVE_DIRECTX TRUE) -@@ -1359,18 +1379,20 @@ - check_include_file(audioclient.h HAVE_AUDIOCLIENT_H) - - if(SDL_AUDIO) -+ if(NOT WINDOWS_STORE) - set(SDL_AUDIO_DRIVER_WINMM 1) - file(GLOB WINMM_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/winmm/*.c) - set(SOURCE_FILES ${SOURCE_FILES} ${WINMM_AUDIO_SOURCES}) -+ endif() - set(HAVE_SDL_AUDIO TRUE) - -- if(HAVE_DSOUND_H) -+ if(HAVE_DSOUND_H AND NOT WINDOWS_STORE) - set(SDL_AUDIO_DRIVER_DSOUND 1) - file(GLOB DSOUND_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/directsound/*.c) - set(SOURCE_FILES ${SOURCE_FILES} ${DSOUND_AUDIO_SOURCES}) - endif() - -- if(WASAPI AND HAVE_AUDIOCLIENT_H AND HAVE_MMDEVICEAPI_H) -+ if(WASAPI AND HAVE_AUDIOCLIENT_H AND HAVE_MMDEVICEAPI_H AND NOT WINDOWS_STORE) - set(SDL_AUDIO_DRIVER_WASAPI 1) - file(GLOB WASAPI_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/wasapi/*.c) - set(SOURCE_FILES ${SOURCE_FILES} ${WASAPI_AUDIO_SOURCES}) -@@ -1382,11 +1404,20 @@ - if(NOT SDL_LOADSO) - message_error("SDL_VIDEO requires SDL_LOADSO, which is not enabled") - endif() -+ if(WINDOWS_STORE) -+ set(SDL_VIDEO_DRIVER_WINRT 1) -+ file(GLOB WIN_VIDEO_SOURCES -+ ${SDL2_SOURCE_DIR}/src/video/winrt/*.c -+ ${SDL2_SOURCE_DIR}/src/video/winrt/*.cpp -+ ${SDL2_SOURCE_DIR}/src/render/direct3d11/*.cpp -+ ) -+ else() - set(SDL_VIDEO_DRIVER_WINDOWS 1) - file(GLOB WIN_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/windows/*.c) -+ endif() - set(SOURCE_FILES ${SOURCE_FILES} ${WIN_VIDEO_SOURCES}) - -- if(RENDER_D3D AND HAVE_D3D_H) -+ if(RENDER_D3D AND HAVE_D3D_H AND NOT WINDOWS_STORE) - set(SDL_VIDEO_RENDER_D3D 1) - set(HAVE_RENDER_D3D TRUE) - endif() -@@ -1409,20 +1440,31 @@ - endif() - - if(SDL_POWER) -+ if(WINDOWS_STORE) -+ set(SDL_POWER_WINRT 1) -+ set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/power/winrt/SDL_syspower.cpp) -+ else() - set(SDL_POWER_WINDOWS 1) - set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/power/windows/SDL_syspower.c) -+ endif() - set(HAVE_SDL_POWER TRUE) - endif() - - if(SDL_FILESYSTEM) - set(SDL_FILESYSTEM_WINDOWS 1) -+ if(WINDOWS_STORE) -+ file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/winrt/*.cpp) -+ else() - file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/windows/*.c) -+ endif() - set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES}) - set(HAVE_SDL_FILESYSTEM TRUE) - endif() - - # Libraries for Win32 native and MinGW -+ if(NOT WINDOWS_STORE) - list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid advapi32 setupapi shell32) -+ endif() - - # TODO: in configure.ac the check for timers is set on - # cygwin | mingw32* - does this include mingw32CE? -@@ -1444,7 +1486,7 @@ - set(SOURCE_FILES ${SOURCE_FILES} ${CORE_SOURCES}) - - if(SDL_VIDEO) -- if(VIDEO_OPENGL) -+ if(VIDEO_OPENGL AND NOT WINDOWS_STORE) - set(SDL_VIDEO_OPENGL 1) - set(SDL_VIDEO_OPENGL_WGL 1) - set(SDL_VIDEO_RENDER_OGL 1) -@@ -2027,12 +2069,14 @@ - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") - - # Always build SDLmain -+if(NOT WINDOWS_STORE) - add_library(SDL2main STATIC ${SDLMAIN_SOURCES}) - target_include_directories(SDL2main PUBLIC "$" $ $) - set(_INSTALL_LIBS "SDL2main") - if (NOT ANDROID) - set_target_properties(SDL2main PROPERTIES DEBUG_POSTFIX "${SDL_CMAKE_DEBUG_POSTFIX}") - endif() -+endif() - - if (ANDROID AND HAVE_HIDAPI) - set(_INSTALL_LIBS ${_INSTALL_LIBS} "hidapi") -diff --git a/include/SDL_config.h.cmake b/include/SDL_config.h.cmake -index 48dd2d4..0c4fa28 100644 ---- a/include/SDL_config.h.cmake -+++ b/include/SDL_config.h.cmake -@@ -335,6 +326,7 @@ - #cmakedefine SDL_VIDEO_DRIVER_DUMMY @SDL_VIDEO_DRIVER_DUMMY@ - #cmakedefine SDL_VIDEO_DRIVER_OFFSCREEN @SDL_VIDEO_DRIVER_OFFSCREEN@ - #cmakedefine SDL_VIDEO_DRIVER_WINDOWS @SDL_VIDEO_DRIVER_WINDOWS@ -+#cmakedefine SDL_VIDEO_DRIVER_WINRT @SDL_VIDEO_DRIVER_WINRT@ - #cmakedefine SDL_VIDEO_DRIVER_WAYLAND @SDL_VIDEO_DRIVER_WAYLAND@ - #cmakedefine SDL_VIDEO_DRIVER_RPI @SDL_VIDEO_DRIVER_RPI@ - #cmakedefine SDL_VIDEO_DRIVER_VIVANTE @SDL_VIDEO_DRIVER_VIVANTE@ -@@ -403,6 +404,7 @@ - #cmakedefine SDL_POWER_ANDROID @SDL_POWER_ANDROID@ - #cmakedefine SDL_POWER_LINUX @SDL_POWER_LINUX@ - #cmakedefine SDL_POWER_WINDOWS @SDL_POWER_WINDOWS@ -+#cmakedefine SDL_POWER_WINRT @SDL_POWER_WINRT@ - #cmakedefine SDL_POWER_MACOSX @SDL_POWER_MACOSX@ - #cmakedefine SDL_POWER_UIKIT @SDL_POWER_UIKIT@ - #cmakedefine SDL_POWER_HAIKU @SDL_POWER_HAIKU@ -@@ -428,7 +430,7 @@ - #cmakedefine SDL_IPHONE_KEYBOARD @SDL_IPHONE_KEYBOARD@ - #cmakedefine SDL_IPHONE_LAUNCHSCREEN @SDL_IPHONE_LAUNCHSCREEN@ - --#if !defined(__WIN32__) -+#if !defined(__WIN32__) && !defined(__WINRT__) - # if !defined(_STDINT_H_) && !defined(_STDINT_H) && !defined(HAVE_STDINT_H) && !defined(_HAVE_STDINT_H) - typedef unsigned int size_t; - typedef signed char int8_t; diff --git a/ports/sdl2/export-symbols-only-in-shared-build.patch b/ports/sdl2/export-symbols-only-in-shared-build.patch deleted file mode 100644 index 7e6d503e2317d0..00000000000000 --- a/ports/sdl2/export-symbols-only-in-shared-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -# HG changeset patch -# User Mikhail Paulyshka -# Date 1506252750 -10800 -# Sun Sep 24 14:32:30 2017 +0300 -# Branch SDL2-WIN-SYMBOLS_LEACKAGE -# Node ID 46ec9baae30cd4e0c584de125cae4a3cce2864ad -# Parent 8df7a59b55283aa09889522369a2b32674c048de -win32: fix symbols leakage for static libraries - -diff -r 8df7a59b5528 -r 46ec9baae30c include/begin_code.h ---- a/include/begin_code.h Fri Sep 22 11:25:52 2017 -0700 -+++ b/include/begin_code.h Sun Sep 24 14:32:30 2017 +0300 -@@ -58,8 +58,10 @@ - # else - # define DECLSPEC __declspec(dllimport) - # endif -+# elif defined(_DLL) -+# define DECLSPEC __declspec(dllexport) - # else --# define DECLSPEC __declspec(dllexport) -+# define DECLSPEC - # endif - # elif defined(__OS2__) - # ifdef BUILD_SDL diff --git a/ports/sdl2/fix-EventToken-header-reference.patch b/ports/sdl2/fix-EventToken-header-reference.patch deleted file mode 100644 index 5e34dc2f2e8b4e..00000000000000 --- a/ports/sdl2/fix-EventToken-header-reference.patch +++ /dev/null @@ -1,17 +0,0 @@ - -diff -r 398b67c0a7d3 -r 7c2f418f701b src/video/winrt/SDL_winrtgamebar.cpp ---- a/src/video/winrt/SDL_winrtgamebar.cpp Wed Jun 10 09:36:10 2020 -0700 -+++ b/src/video/winrt/SDL_winrtgamebar.cpp Wed Jun 10 09:38:43 2020 -0700 -@@ -25,7 +25,7 @@ - /* Windows includes */ - #include - #include --#include -+#include - - - /* SDL includes */ - - - - diff --git a/ports/sdl2/fix-space-in-path.patch b/ports/sdl2/fix-space-in-path.patch deleted file mode 100644 index 499161d9a48f15..00000000000000 --- a/ports/sdl2/fix-space-in-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2019-07-23 21:41:00.000000000 +0200 -+++ b/CMakeLists.txt 2019-10-27 20:26:38.000000000 +0100 -@@ -278,7 +278,7 @@ - # General includes - include_directories(${SDL2_BINARY_DIR}/include ${SDL2_SOURCE_DIR}/include) - if(USE_GCC OR USE_CLANG) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -idirafter ${SDL2_SOURCE_DIR}/src/video/khronos") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -idirafter \"${SDL2_SOURCE_DIR}/src/video/khronos\"") - else() - include_directories(${SDL2_SOURCE_DIR}/src/video/khronos) - endif() -diff -ur a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake ---- a/cmake/sdlchecks.cmake 2019-07-23 21:41:00.000000000 +0200 -+++ b/cmake/sdlchecks.cmake 2019-10-27 20:27:10.000000000 +0100 -@@ -1088,7 +1088,7 @@ - set(HAVE_SDL_JOYSTICK TRUE) - file(GLOB HIDAPI_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/hidapi/*.c) - set(SOURCE_FILES ${SOURCE_FILES} ${HIDAPI_SOURCES}) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBUSB_CFLAGS} -I${SDL2_SOURCE_DIR}/src/hidapi/hidapi") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBUSB_CFLAGS} \"-I${SDL2_SOURCE_DIR}/src/hidapi/hidapi\"") - if(NOT HIDAPI_SKIP_LIBUSB) - if(HIDAPI_ONLY_LIBUSB) - set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/hidapi/libusb/hid.c) diff --git a/ports/sdl2/no-propagate-shared-link-options.patch b/ports/sdl2/no-propagate-shared-link-options.patch deleted file mode 100644 index 5a26ad3c58f673..00000000000000 --- a/ports/sdl2/no-propagate-shared-link-options.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7dfd35389..648218cc5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2062,7 +2062,7 @@ if(SDL_SHARED) - set_target_properties(SDL2 PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB") - endif() - set(_INSTALL_LIBS "SDL2" ${_INSTALL_LIBS}) -- target_link_libraries(SDL2 ${EXTRA_LIBS} ${EXTRA_LDFLAGS}) -+ target_link_libraries(SDL2 PRIVATE ${EXTRA_LIBS} ${EXTRA_LDFLAGS}) - target_include_directories(SDL2 PUBLIC "$" $ $) - if (NOT ANDROID) - set_target_properties(SDL2 PROPERTIES DEBUG_POSTFIX "${SDL_CMAKE_DEBUG_POSTFIX}") diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 837ef4f7067a78..755160e8b462cb 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -1,24 +1,17 @@ -set(SDL2_VERSION 2.0.12) +set(SDL2_VERSION 2.0.14) vcpkg_download_distfile(ARCHIVE - URLS "https://www.libsdl.org/release/SDL2-2.0.12.tar.gz" + URLS "https://www.libsdl.org/release/SDL2-${SDL2_VERSION}.tar.gz" FILENAME "SDL2-${SDL2_VERSION}.tar.gz" - SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317 + SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES - export-symbols-only-in-shared-build.patch - enable-winrt-cmake.patch - disable-hidapi-for-uwp.patch - fix-space-in-path.patch - disable-wcslcpy-and-wcslcat-for-windows.patch - fix-EventToken-header-reference.patch - 0006-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch - 0007-sdl2-skip-ibus-on-linux.patch - 0008-fix-macos-metal-test.patch - no-propagate-shared-link-options.patch + 0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch + 0002-sdl2-skip-ibus-on-linux.patch + 0003-sdl2-fix-uwp-build.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 5445b69d7a46b7..55562888b1ea4f 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sdl2", - "version-string": "2.0.12", - "port-version": 8, + "version-string": "2.0.14", "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", "features": { diff --git a/ports/smpeg2/CMakeLists.txt b/ports/smpeg2/CMakeLists.txt index b0e284b05e2a07..5515c698f20b2f 100644 --- a/ports/smpeg2/CMakeLists.txt +++ b/ports/smpeg2/CMakeLists.txt @@ -45,7 +45,7 @@ add_library(smpeg2 MPEGsystem.cpp smpeg.cpp) -set_target_properties(smpeg2 PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS) +set_target_properties(smpeg2 PROPERTIES DEFINE_SYMBOL DLL_EXPORT) if(BUILD_SHARED_LIBS) target_link_libraries(smpeg2 SDL2::SDL2) else() From b3b2af805aa102c58ab6f17a6470db717515ef9f Mon Sep 17 00:00:00 2001 From: Nicholas Hayes <0xC0000054@users.noreply.github.com> Date: Tue, 5 Jan 2021 13:34:04 -0700 Subject: [PATCH 0420/1694] [libheif] Update to version 1.10.0 (#15416) --- ports/libheif/CONTROL | 2 +- ports/libheif/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/libheif/CONTROL b/ports/libheif/CONTROL index b5f372def26984..009d94c72f296b 100644 --- a/ports/libheif/CONTROL +++ b/ports/libheif/CONTROL @@ -1,5 +1,5 @@ Source: libheif -Version: 1.9.1 +Version: 1.10.0 Homepage: http://www.libheif.org/ Description: Open h.265 video codec implementation. Build-Depends: x265, libde265 diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 4c77d6781f8d26..599eeccc6e5b1c 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif - REF 2e218ef40440e258b5da1e513f72c7f3b1611c7c #v1.9.1 - SHA512 78fc62813f088133dfc12799d8e1989580630e80865e33e43450ae4bba0d9ef03fe250dcc734f7905ea1d02dcb7ae77a9b461b25da27fcb2ef98562c69ab0b87 + REF 667eeabb553ce73094eb29faea3f31fb8610fec2 #v1.10.0 + SHA512 937290310ec6dda8840262d4bad5e3628033fa2caa6e9cc4a0df7a372cacf38c9b55cf29d2cb7ea2183641e263298fc2e87167c1b0f04f8697023f123d78aa9d HEAD_REF master ) From ae9fedb8346072b6435499de5aa77b9157973837 Mon Sep 17 00:00:00 2001 From: Takahiro Ueda Date: Wed, 6 Jan 2021 05:37:19 +0900 Subject: [PATCH 0421/1694] [docs] fix "CMake script" -> "makefile" for vcpkg_(n)build_make (#15419) --- docs/maintainers/vcpkg_build_make.md | 2 +- docs/maintainers/vcpkg_build_nmake.md | 2 +- scripts/cmake/vcpkg_build_make.cmake | 2 +- scripts/cmake/vcpkg_build_nmake.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 scripts/cmake/vcpkg_build_make.cmake mode change 100644 => 100755 scripts/cmake/vcpkg_build_nmake.cmake diff --git a/docs/maintainers/vcpkg_build_make.md b/docs/maintainers/vcpkg_build_make.md index 892448b40843c8..fe96304e2bdc07 100644 --- a/docs/maintainers/vcpkg_build_make.md +++ b/docs/maintainers/vcpkg_build_make.md @@ -38,7 +38,7 @@ Additional subdir to invoke make in. Useful if only parts of a port should be bu ## Notes: This command should be preceeded by a call to [`vcpkg_configure_make()`](vcpkg_configure_make.md). -You can use the alias [`vcpkg_install_make()`](vcpkg_install_make.md) function if your CMake script supports the +You can use the alias [`vcpkg_install_make()`](vcpkg_install_make.md) function if your makefile supports the "install" target ## Examples diff --git a/docs/maintainers/vcpkg_build_nmake.md b/docs/maintainers/vcpkg_build_nmake.md index 337269eeb8a027..a68ae91d8ff237 100644 --- a/docs/maintainers/vcpkg_build_nmake.md +++ b/docs/maintainers/vcpkg_build_nmake.md @@ -64,7 +64,7 @@ Adds the appropriate Release and Debug `bin\` directories to the path during the ## Notes: This command should be preceeded by a call to [`vcpkg_configure_nmake()`](vcpkg_configure_nmake.md). -You can use the alias [`vcpkg_install_nmake()`](vcpkg_install_nmake.md) function if your CMake script supports the +You can use the alias [`vcpkg_install_nmake()`](vcpkg_install_nmake.md) function if your makefile supports the "install" target ## Examples diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake old mode 100644 new mode 100755 index 451bd6aa133e35..a8b4a56943e419 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -39,7 +39,7 @@ Additional subdir to invoke make in. Useful if only parts of a port should be bu ## Notes: This command should be preceeded by a call to [`vcpkg_configure_make()`](vcpkg_configure_make.md). -You can use the alias [`vcpkg_install_make()`](vcpkg_install_make.md) function if your CMake script supports the +You can use the alias [`vcpkg_install_make()`](vcpkg_install_make.md) function if your makefile supports the "install" target ## Examples diff --git a/scripts/cmake/vcpkg_build_nmake.cmake b/scripts/cmake/vcpkg_build_nmake.cmake old mode 100644 new mode 100755 index 583ea6df21f008..40650666677170 --- a/scripts/cmake/vcpkg_build_nmake.cmake +++ b/scripts/cmake/vcpkg_build_nmake.cmake @@ -65,7 +65,7 @@ Adds the appropriate Release and Debug `bin\` directories to the path during the ## Notes: This command should be preceeded by a call to [`vcpkg_configure_nmake()`](vcpkg_configure_nmake.md). -You can use the alias [`vcpkg_install_nmake()`](vcpkg_install_nmake.md) function if your CMake script supports the +You can use the alias [`vcpkg_install_nmake()`](vcpkg_install_nmake.md) function if your makefile supports the "install" target ## Examples From a897d2311f7e2da0263a8ec4c19e1de4bb8b8831 Mon Sep 17 00:00:00 2001 From: Dimitrij Mijoski Date: Tue, 5 Jan 2021 21:39:10 +0100 Subject: [PATCH 0422/1694] [nuspell] update to version 4.2.0 (#15425) --- ports/nuspell/CONTROL | 2 +- ports/nuspell/cmake-disable-cli-and-docs.patch | 16 ++++------------ ports/nuspell/portfile.cmake | 4 ++-- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/ports/nuspell/CONTROL b/ports/nuspell/CONTROL index 919a5c89eff3b2..cb81a16bf2e9a6 100644 --- a/ports/nuspell/CONTROL +++ b/ports/nuspell/CONTROL @@ -1,5 +1,5 @@ Source: nuspell -Version: 4.0.1 +Version: 4.2.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. diff --git a/ports/nuspell/cmake-disable-cli-and-docs.patch b/ports/nuspell/cmake-disable-cli-and-docs.patch index 77d5ff07647dd0..4495ae040cd346 100644 --- a/ports/nuspell/cmake-disable-cli-and-docs.patch +++ b/ports/nuspell/cmake-disable-cli-and-docs.patch @@ -1,16 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 835ebfb..82fa335 100644 +index a98ed58..3756bae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -8,7 +8,6 @@ include(GNUInstallDirs) - include(CMakePackageConfigHelpers) - - find_package(ICU REQUIRED COMPONENTS uc data) --find_package(Boost 1.48.0 REQUIRED COMPONENTS locale) - - get_directory_property(subproject PARENT_DIRECTORY) - -@@ -20,8 +19,6 @@ if (subproject) +@@ -19,8 +19,6 @@ if (subproject) return() endif() @@ -20,7 +12,7 @@ index 835ebfb..82fa335 100644 set(Catch2_FOUND Catch2-NOTFOUND PARENT_SCOPE) set(catch_cmake_lists ${PROJECT_SOURCE_DIR}/external/Catch2/CMakeLists.txt) diff --git a/src/nuspell/CMakeLists.txt b/src/nuspell/CMakeLists.txt -index a8d215f..78553c5 100644 +index 9535686..78553c5 100644 --- a/src/nuspell/CMakeLists.txt +++ b/src/nuspell/CMakeLists.txt @@ -27,22 +27,6 @@ target_include_directories(nuspell @@ -33,7 +25,7 @@ index a8d215f..78553c5 100644 - RUNTIME_OUTPUT_NAME nuspell) -target_compile_definitions(nuspell-bin PRIVATE - PROJECT_VERSION=\"${PROJECT_VERSION}\") --target_link_libraries(nuspell-bin nuspell Boost::locale) +-target_link_libraries(nuspell-bin nuspell) -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 bac0aef7ae4cff..6b2da7cadd2eb4 100644 --- a/ports/nuspell/portfile.cmake +++ b/ports/nuspell/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nuspell/nuspell - REF v4.0.1 - SHA512 122616fd24c2de35000ba12d680d3617e7fe97881d33febbcb106ce70d3bac356a00d90680a1bc8ee631ed532ace0f4b4f9fce4760a25b0f7fc1d60553e74528 + REF v4.2.0 + SHA512 ae9157e9753868c002ed69a765fb705d29d993f3940e11efbc2699778a8b1abee2eb7daa0ff51187b899d6935a215a24662e5b52ec1ef5c644e90a0245f7583d HEAD_REF master PATCHES cmake-disable-cli-and-docs.patch # This patch disables building the CLI tool and leaves only the library. From d2da9157b0d85b4a00aec35a17b6b75d5bf89966 Mon Sep 17 00:00:00 2001 From: Schwarzer Date: Wed, 6 Jan 2021 04:39:57 +0800 Subject: [PATCH 0423/1694] Update vcpkg_download_distfile.cmake (#15435) Provide proxy setting instruction for more compatibility. --- scripts/cmake/vcpkg_download_distfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake index 8f250c67e1d1b2..11bbac3b46b63b 100644 --- a/scripts/cmake/vcpkg_download_distfile.cmake +++ b/scripts/cmake/vcpkg_download_distfile.cmake @@ -186,6 +186,10 @@ function(vcpkg_download_distfile VAR) " Failed to download file.\n" " If you use a proxy, please set the HTTPS_PROXY and HTTP_PROXY environment\n" " variables to \"https://user:password@your-proxy-ip-address:port/\".\n" + " \n" + " If error with status 4 (Issue #15434),\n" + " try setting \"http://user:password@your-proxy-ip-address:port/\".\n" + " \n" " Otherwise, please submit an issue at https://github.com/Microsoft/vcpkg/issues\n") else() test_hash("${download_file_path_part}" "downloaded file" "The file may have been corrupted in transit. This can be caused by proxies. If you use a proxy, please set the HTTPS_PROXY and HTTP_PROXY environment variables to \"https://user:password@your-proxy-ip-address:port/\".\n") From 2fee7554a522e9df5bd3f16e1710b1b15643dcc0 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 6 Jan 2021 04:40:30 +0800 Subject: [PATCH 0424/1694] simdjson update to v0.7.1 (#15436) --- ports/simdjson/portfile.cmake | 4 ++-- ports/simdjson/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index 6770577165376c..5c92f92877a4d2 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 5d355f1a8b584519ed39256c3be949ef7f8b0dbd # v0.5.0 + REF 17b03de3cd289937659c2dd4a9af0873c6fd483d # v0.7.1 HEAD_REF master - SHA512 ad92e4bafa596baf878c0c4945828b00cdb431e719dd6aaa1752dcb4b12c9ce13061105a7ca206b160865b3d1c724d675cd3c347691c81972d64804846dfa2a9 + SHA512 72418ee674a4e5fde47fb3beb90a7f78a32ba39f5999cc741a359e4a4d3318cff813d799dc02539739be86c141cc0934582c76a9848188416b7bcecbfb120ce2 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC) diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index 34f749a62cd06c..d889b5f6bf3920 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdjson", - "version-string": "0.5.0", + "version-string": "0.7.1", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0" From 73a8f08a3d5d1e11191fc6b22328e600318182c4 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 5 Jan 2021 12:42:29 -0800 Subject: [PATCH 0425/1694] [hidapi] Support static build (#15437) * [hidapi] Support static build * Update portfile.cmake --- ports/hidapi/CONTROL | 4 --- ports/hidapi/portfile.cmake | 50 ++++++++++++++++++++++++++----------- ports/hidapi/vcpkg.json | 8 ++++++ 3 files changed, 44 insertions(+), 18 deletions(-) delete mode 100644 ports/hidapi/CONTROL create mode 100644 ports/hidapi/vcpkg.json diff --git a/ports/hidapi/CONTROL b/ports/hidapi/CONTROL deleted file mode 100644 index 80f18b4935f8cf..00000000000000 --- a/ports/hidapi/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: hidapi -Version: 2019-08-30 -Description: A Simple library for communicating with USB and Bluetooth HID devices on Linux, Mac and Windows. -Homepage: https://github.com/libusb/hidapi diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake index ec7abb495ecb0f..ea2cd092bf442a 100644 --- a/ports/hidapi/portfile.cmake +++ b/ports/hidapi/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "linux" "osx" "uwp") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libusb/hidapi @@ -7,26 +9,46 @@ vcpkg_from_github( ) if(VCPKG_TARGET_IS_WINDOWS) - if(TRIPLET_SYSTEM_ARCH MATCHES "arm") - message(FATAL_ERROR "ARM builds are currently not supported!") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) - message(FATAL_ERROR "UWP builds are currently not supported!") + file(READ "${SOURCE_PATH}/windows/hidapi.vcxproj" _contents) + if(${VCPKG_CRT_LINKAGE} STREQUAL "dynamic") + string(REGEX REPLACE + "MultiThreadedDebug" + "MultiThreadedDebugDLL" + _contents "${_contents}") + string(REGEX REPLACE + "MultiThreaded" + "MultiThreadedDLL" + _contents "${_contents}") + else() + string(REGEX REPLACE + "MultiThreadedDebugDLL" + "MultiThreadedDebug" + _contents "${_contents}") + string(REGEX REPLACE + "MultiThreadedDLL" + "MultiThreaded" + _contents "${_contents}") + endif() + + if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic") + string(REPLACE + "StaticLibrary" + "DynamicLibrary" + _contents "${_contents}") + else() + string(REPLACE + "DynamicLibrary" + "StaticLibrary" + _contents "${_contents}") endif() + file(WRITE "${SOURCE_PATH}/windows/hidapi.vcxproj" "${_contents}") vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH windows/hidapi.sln + PROJECT_SUBPATH windows/hidapi.vcxproj INCLUDES_SUBPATH hidapi ALLOW_ROOT_INCLUDES LICENSE_SUBPATH LICENSE-bsd.txt # use BSD license ) - file(COPY - ${CMAKE_CURRENT_LIST_DIR}/hidapi-config.cmake - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - - if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) - endif() -else() - message(FATAL_ERROR "Non-Windows builds are currently not supported!") + file(COPY ${CMAKE_CURRENT_LIST_DIR}/hidapi-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) endif() diff --git a/ports/hidapi/vcpkg.json b/ports/hidapi/vcpkg.json new file mode 100644 index 00000000000000..f73f97f2ead62f --- /dev/null +++ b/ports/hidapi/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "hidapi", + "version-string": "2019-08-30", + "port-version": 1, + "description": "A Simple library for communicating with USB and Bluetooth HID devices on Linux, Mac and Windows.", + "homepage": "https://github.com/libusb/hidapi", + "supports": "windows & !(arm | arm64 | uwp)" +} From 9fc780eda5bf675820e1937d8b28d8293af93fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 5 Jan 2021 12:44:06 -0800 Subject: [PATCH 0426/1694] [wil] Use internal CMakeLists (#15438) * [wil] Use internal CMakeLists * [wil] Fix install headers on Linux --- ports/wil/CONTROL | 4 +++- ports/wil/fix-install-headers.patch | 12 ++++++++++++ ports/wil/portfile.cmake | 18 ++++++++++++++++-- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 ports/wil/fix-install-headers.patch diff --git a/ports/wil/CONTROL b/ports/wil/CONTROL index 00b29b2e6af113..7d0e94202ae340 100644 --- a/ports/wil/CONTROL +++ b/ports/wil/CONTROL @@ -1,3 +1,5 @@ Source: wil Version: 2020-05-19 -Description: The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns. \ No newline at end of file +Port-Version: 1 +Homepage: https://github.com/microsoft/wil +Description: The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns. diff --git a/ports/wil/fix-install-headers.patch b/ports/wil/fix-install-headers.patch new file mode 100644 index 00000000000000..ae0e3aef39a13b --- /dev/null +++ b/ports/wil/fix-install-headers.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 97a6737..4ae28fb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,4 +48,4 @@ install(EXPORT ${PROJECT_NAME}_targets + ) + + # Install the headers at a standard cmake location. +-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") +\ No newline at end of file ++install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/wil" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") +\ No newline at end of file diff --git a/ports/wil/portfile.cmake b/ports/wil/portfile.cmake index 6e18ba11052219..d5fb8e7e043178 100644 --- a/ports/wil/portfile.cmake +++ b/ports/wil/portfile.cmake @@ -5,7 +5,21 @@ vcpkg_from_github( REF 3c00e7f1d8cf9930bbb8e5be3ef0df65c84e8928 SHA512 c9c3b4a41f7523a6da6378def4a6b868e9f66438998d04ae8489b9784db91664af7af3ab6ef73c104b9ac100c0dc5ae6a13e9cb9f679ba428a4abc07b32a7dce HEAD_REF master + PATCHES fix-install-headers.patch ) -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wil RENAME copyright) \ No newline at end of file +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DWIL_BUILD_TESTS=OFF + -DWIL_BUILD_PACKAGING=ON +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/WIL) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wil" RENAME copyright) \ No newline at end of file From 288d338bec00df28e57c54550eb9c33e72a7f5ee Mon Sep 17 00:00:00 2001 From: dweckmann Date: Tue, 5 Jan 2021 21:44:44 +0100 Subject: [PATCH 0427/1694] [opencl] Fix dynamic build on linux (#15445) --- ports/opencl/CONTROL | 2 +- ports/opencl/portfile.cmake | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/opencl/CONTROL b/ports/opencl/CONTROL index edbe7c80c6da5a..8b4f7a2d1c24e6 100644 --- a/ports/opencl/CONTROL +++ b/ports/opencl/CONTROL @@ -1,5 +1,5 @@ Source: opencl Version: 2.2 -Port-Version: 5 +Port-Version: 6 Homepage: https://github.com/KhronosGroup/OpenCL-Headers Description: C/C++ headers and ICD loader (Installable Client Driver) for OpenCL diff --git a/ports/opencl/portfile.cmake b/ports/opencl/portfile.cmake index b0f09f4f92b2a7..ad9c5c59937e5e 100644 --- a/ports/opencl/portfile.cmake +++ b/ports/opencl/portfile.cmake @@ -79,14 +79,14 @@ else() endif() elseif(VCPKG_TARGET_IS_LINUX) if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1.2" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1.2" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) endif() if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1.2" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1.2" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) endif() elseif(VCPKG_TARGET_IS_OSX) if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") From 01f391a26918b61dbe1ce47cc9e0d691096414f7 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Tue, 5 Jan 2021 16:39:53 -0500 Subject: [PATCH 0428/1694] [python3] Add vcpkg-cmake-wrapper. (#15221) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [python3] Add vcpkg-cmake-wrapper.cmake. This is still a WIP... For now, we only remove registry detection on Windows. * [python3] Fix Windows static embedding linkage. * [python3] Fix Linux static library embedding. * [python3] Fix linkage on macOS. * [python3] Only link extra libs when static. * [python3] Bump port version for vcpkg-cmake-wrapper. * [itk] Remove obsolete Python artifact specification. * [pybind11] Remove obsolete Python artifact specification. * [python3] Mark `find_package()` calls as REQUIRED. Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [python3] Bump port version after #15378. * [python3] Be more selective about when to unleash the nukes. * [python3] Add usage message. * [python3] Don't swallow `vcpkg_find_acquire_program`'s Python3. * [python3] Don't forcibly change the registry find state. * [python3] fix copypasta error * [python3] Fix config error with the opensubdiv port. Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/itk/portfile.cmake | 16 ---- ports/itk/vcpkg.json | 2 +- ports/pybind11/CONTROL | 2 +- ports/pybind11/portfile.cmake | 9 +- ports/python3/portfile.cmake | 16 ++++ ports/python3/usage | 4 + ports/python3/vcpkg-cmake-wrapper.cmake | 120 ++++++++++++++++++++++++ ports/python3/vcpkg.json | 10 +- 8 files changed, 153 insertions(+), 26 deletions(-) create mode 100644 ports/python3/usage create mode 100644 ports/python3/vcpkg-cmake-wrapper.cmake diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index c89c65aa59ec5a..8961379a5a66cc 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -108,22 +108,6 @@ if("python" IN_LIST FEATURES) "-DSWIG_EXECUTABLE=${SWIG}" "-DSWIG_DIR=${SWIG_DIR}" ) - # Due to ITKs internal shenanigans with the variables ...... - if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND ADDITIONAL_OPTIONS "-DPython3_LIBRARY_RELEASE:PATH=${CURRENT_INSTALLED_DIR}/lib/python39.lib" - "-DPython3_LIBRARY_DEBUG:PATH=${CURRENT_INSTALLED_DIR}/debug/lib/python39_d.lib" - "-DPython3_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include/python3.9") - list(APPEND OPTIONS_DEBUG "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/python39_d.lib") - list(APPEND OPTIONS_RELEASE "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/python39.lib") - elseif(VCPKG_TARGET_IS_LINUX) - list(APPEND ADDITIONAL_OPTIONS "-DPython3_LIBRARY_RELEASE:PATH=${CURRENT_INSTALLED_DIR}/lib/libpython39m.a" - "-DPython3_LIBRARY_DEBUG:PATH=${CURRENT_INSTALLED_DIR}/debug/lib/libpython39md.a" - "-DPython3_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include/python3.9m") - list(APPEND OPTIONS_DEBUG "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/libpython39md.a") - list(APPEND OPTIONS_RELEASE "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/libpython39m.a") - elseif(VCPKG_TARGET_IS_OSX) - #Need Python3 information on OSX within VCPKG - endif() #ITK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages within vcpkg endif() diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json index 24de005c6794f1..394b45afba00f2 100644 --- a/ports/itk/vcpkg.json +++ b/ports/itk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "itk", "version-string": "5.1.0", - "port-version": 4, + "port-version": 5, "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.", "homepage": "https://github.com/InsightSoftwareConsortium/ITK", "dependencies": [ diff --git a/ports/pybind11/CONTROL b/ports/pybind11/CONTROL index be711e1b1be0d2..8b14c31ec0123b 100644 --- a/ports/pybind11/CONTROL +++ b/ports/pybind11/CONTROL @@ -1,6 +1,6 @@ Source: pybind11 Version: 2.6.0 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/pybind/pybind11 Description: pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code. Build-Depends: python3 (windows) diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 458c2a669a9882..e227e0971f79c3 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -7,23 +7,18 @@ vcpkg_from_github( ) vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYPATH ${PYTHON3} PATH) -vcpkg_add_to_path("${PYPATH}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DPYBIND11_TEST=OFF - -DPYTHONLIBS_FOUND=ON - -DPYTHON_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include - -DPYTHON_MODULE_EXTENSION=.dll + -DPYBIND11_FINDPYTHON=ON + -DPython3_EXECUTABLE=${PYTHON3} OPTIONS_RELEASE -DPYTHON_IS_DEBUG=OFF - -DPYTHON_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/python39.lib OPTIONS_DEBUG -DPYTHON_IS_DEBUG=ON - -DPYTHON_LIBRARIES=${CURRENT_INSTALLED_DIR}/debug/lib/python39_d.lib ) vcpkg_install_cmake() diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 711b317e02c448..72b4ee3bd8e6c1 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -179,3 +179,19 @@ else() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +function(_generate_finder) + cmake_parse_arguments(PythonFinder "NO_OVERRIDE" "DIRECTORY;PREFIX" "" ${ARGN}) + configure_file( + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CURRENT_PACKAGES_DIR}/share/${PythonFinder_DIRECTORY}/vcpkg-cmake-wrapper.cmake" + @ONLY + ) +endfunction() + +message(STATUS "Installing cmake wrappers") +_generate_finder(DIRECTORY "python" PREFIX "Python") +_generate_finder(DIRECTORY "python3" PREFIX "Python3") +_generate_finder(DIRECTORY "pythoninterp" PREFIX "PYTHON" NO_OVERRIDE) diff --git a/ports/python3/usage b/ports/python3/usage new file mode 100644 index 00000000000000..e177b11f63bd7d --- /dev/null +++ b/ports/python3/usage @@ -0,0 +1,4 @@ +The package python3 is compatible with built-in CMake targets: + + find_package(Python3 COMPONENTS Development REQUIRED) + target_link_libraries(main PRIVATE Python3::Python) diff --git a/ports/python3/vcpkg-cmake-wrapper.cmake b/ports/python3/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..83c3fbd1cfec33 --- /dev/null +++ b/ports/python3/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,120 @@ +# For very old ports whose upstream do not properly set the minimum CMake version. +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0057 NEW) + +# This prevents the port's python.exe from overriding the Python fetched by +# vcpkg_find_acquire_program(PYTHON3) and prevents the vcpkg toolchain from +# stomping on FindPython's default functionality. +list(REMOVE_ITEM CMAKE_PROGRAM_PATH "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/python3") +if(@PythonFinder_NO_OVERRIDE@) + _find_package(${ARGS}) + return() +endif() + +# CMake's FindPython's separation of concerns is very muddy. We only want to force vcpkg's Python +# if the consumer is using the development component. What we don't want to do is break detection +# of the system Python, which may have certain packages the user expects. But - if the user is +# embedding Python or using both the development and interpreter components, then we need the +# interpreter matching vcpkg's Python libraries. Note that the "Development" component implies +# both "Development.Module" and "Development.Embed" +if("Development" IN_LIST ARGS OR "Development.Embed" IN_LIST ARGS) + set(_PythonFinder_WantInterp TRUE) + set(_PythonFinder_WantLibs TRUE) +elseif("Development.Module" IN_LIST ARGS) + if("Interpreter" IN_LIST ARGS) + set(_PythonFinder_WantInterp TRUE) + endif() + set(_PythonFinder_WantLibs TRUE) +endif() + +if(_PythonFinder_WantLibs) + find_path( + @PythonFinder_PREFIX@_INCLUDE_DIR + NAMES "Python.h" + PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" + PATH_SUFFIXES "python@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@" + NO_DEFAULT_PATH + ) + + # Don't set the public facing hint or the finder will be unable to detect the debug library. + # Internally, it uses the same value with an underscore prepended. + find_library( + _@PythonFinder_PREFIX@_LIBRARY_RELEASE + NAMES + "python@PYTHON_VERSION_MAJOR@@PYTHON_VERSION_MINOR@" + "python@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@" + PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" + NO_DEFAULT_PATH + ) + find_library( + _@PythonFinder_PREFIX@_LIBRARY_DEBUG + NAMES + "python@PYTHON_VERSION_MAJOR@@PYTHON_VERSION_MINOR@_d" + "python@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@d" + PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" + NO_DEFAULT_PATH + ) + + if(_PythonFinder_WantInterp) + find_program( + @PythonFinder_PREFIX@_EXECUTABLE + NAMES "python" "python@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@" + PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/python3" + NO_DEFAULT_PATH + ) + endif() + + _find_package(${ARGS}) + + if(@VCPKG_LIBRARY_LINKAGE@ STREQUAL static) + include(CMakeFindDependencyMacro) + + # Python for Windows embeds the zlib module into the core, so we have to link against it. + # This is a separate extension module on Unix-like platforms. + if(WIN32) + find_dependency(ZLIB) + if(TARGET @PythonFinder_PREFIX@::Python) + set_property(TARGET @PythonFinder_PREFIX@::Python APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) + endif() + if(TARGET @PythonFinder_PREFIX@::Module) + set_property(TARGET @PythonFinder_PREFIX@::Module APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) + endif() + if(DEFINED @PythonFinder_PREFIX@_LIBRARIES) + list(APPEND @PythonFinder_PREFIX@_LIBRARIES ${ZLIB_LIBRARIES}) + endif() + endif() + + if(APPLE) + find_dependency(Iconv) + find_dependency(Intl) + if(TARGET @PythonFinder_PREFIX@::Python) + get_target_property(_PYTHON_INTERFACE_LIBS @PythonFinder_PREFIX@::Python INTERFACE_LINK_LIBRARIES) + list(REMOVE_ITEM _PYTHON_INTERFACE_LIBS "-liconv" "-lintl") + list(APPEND _PYTHON_INTERFACE_LIBS + Iconv::Iconv + "$,${Intl_LIBRARY_DEBUG},${Intl_LIBRARY_RELEASE}>" + ) + set_property(TARGET @PythonFinder_PREFIX@::Python PROPERTY INTERFACE_LINK_LIBRARIES ${_PYTHON_INTERFACE_LIBS}) + unset(_PYTHON_INTERFACE_LIBS) + endif() + if(TARGET @PythonFinder_PREFIX@::Module) + get_target_property(_PYTHON_INTERFACE_LIBS @PythonFinder_PREFIX@::Module INTERFACE_LINK_LIBRARIES) + list(REMOVE_ITEM _PYTHON_INTERFACE_LIBS "-liconv" "-lintl") + list(APPEND _PYTHON_INTERFACE_LIBS + Iconv::Iconv + "$,${Intl_LIBRARY_DEBUG},${Intl_LIBRARY_RELEASE}>" + ) + set_property(TARGET @PythonFinder_PREFIX@::Module PROPERTY INTERFACE_LINK_LIBRARIES ${_PYTHON_INTERFACE_LIBS}) + unset(_PYTHON_INTERFACE_LIBS) + endif() + if(DEFINED @PythonFinder_PREFIX@_LIBRARIES) + list(APPEND @PythonFinder_PREFIX@_LIBRARIES "-framework CoreFoundation" ${Iconv_LIBRARIES} ${Intl_LIBRARIES}) + endif() + endif() + endif() +else() + _find_package(${ARGS}) +endif() + +unset(_PythonFinder_WantInterp) +unset(_PythonFinder_WantLibs) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index b8aa2ac3c1ed55..d89136da3bdb68 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version-string": "3.9.0", - "port-version": 2, + "port-version": 3, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", @@ -11,10 +11,18 @@ "platform": "!(windows & static)" }, "expat", + { + "name": "gettext", + "platform": "osx" + }, { "name": "libffi", "platform": "!(windows & static)" }, + { + "name": "libiconv", + "platform": "osx" + }, { "name": "liblzma", "platform": "!(windows & static)" From ca83c54df85016fa207e1df6975bd054517bc245 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Tue, 5 Jan 2021 14:36:46 -0800 Subject: [PATCH 0429/1694] [vcpkg] Improve versioning files generators (#15172) * Remove port version splitting from x-history * Parallelize versions file generator * Use cpu_count()/2 to avoid crashes * Use generatePortVersionsDb.py output to generate baseline * Update scripts/generateBaseline.py Co-authored-by: Adam Johnson * rename generateBaseline function * Update toolsrc/src/vcpkg/commands.porthistory.cpp Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Remove unused code Co-authored-by: Adam Johnson Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> --- scripts/generateBaseline.py | 103 +++++++++++++-------- scripts/generatePortVersionsDb.py | 103 ++++++++------------- toolsrc/src/vcpkg/commands.porthistory.cpp | 97 ++++++++----------- 3 files changed, 140 insertions(+), 163 deletions(-) diff --git a/scripts/generateBaseline.py b/scripts/generateBaseline.py index 45c424a7df362d..55bea6ba218011 100644 --- a/scripts/generateBaseline.py +++ b/scripts/generateBaseline.py @@ -1,50 +1,71 @@ import os -import json -import subprocess import sys +import json +import time + +from pathlib import Path + SCRIPT_DIRECTORY = os.path.dirname(os.path.abspath(__file__)) +PORTS_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../ports') +VERSIONS_DB_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../port_versions') + +def generate_baseline(): + start_time = time.time() -def generate_baseline(ports_path, output_filepath): + # Assume each directory in ${VCPKG_ROOT}/ports is a different port port_names = [item for item in os.listdir( - ports_path) if os.path.isdir(os.path.join(ports_path, item))] + PORTS_DIRECTORY) if os.path.isdir(os.path.join(PORTS_DIRECTORY, item))] port_names.sort() - total = len(port_names) - baseline_versions = {} - for counter, port_name in enumerate(port_names): - vcpkg_exe = os.path.join(SCRIPT_DIRECTORY, '../vcpkg') - print(f'[{counter + 1}/{total}] Getting package info for {port_name}') - output = subprocess.run( - [vcpkg_exe, 'x-package-info', '--x-json', port_name], - capture_output=True, - encoding='utf-8') - - if output.returncode == 0: - package_info = json.loads(output.stdout) - port_info = package_info['results'][port_name] - - version = {} - for scheme in ['version-string', 'version-semver', 'version-date', 'version']: - if scheme in port_info: - version[scheme] = package_info['results'][port_name][scheme] - break - version['port-version'] = 0 - if 'port-version' in port_info: - version['port-version'] = port_info['port-version'] - baseline_versions[port_name] = version - else: - print(f'x-package-info --x-json {port_name} failed: ', output.stdout.strip(), file=sys.stderr) - - output = {} - output['default'] = baseline_versions - - with open(output_filepath, 'r') as output_file: - json.dump(baseline_versions, output_file) - sys.exit(0) - - -if __name__ == '__main__': - generate_baseline( - ports_path=f'{SCRIPT_DIRECTORY}/../ports', output_filepath='baseline.json') + baseline_entries = {} + total_count = len(port_names) + for i, port_name in enumerate(port_names, 1): + port_file_path = os.path.join( + VERSIONS_DB_DIRECTORY, f'{port_name[0]}-', f'{port_name}.json') + + if not os.path.exists(port_file_path): + print( + f'Error: No version file for {port_name}.\n', file=sys.stderr) + continue + sys.stderr.write( + f'\rProcessed {i}/{total_count} ({i/total_count:.2%})') + with open(port_file_path, 'r') as db_file: + try: + versions_object = json.load(db_file) + if versions_object['versions']: + last_version = versions_object['versions'][0] + version_obj = {} + if 'version' in last_version: + version_obj['version'] = last_version['version'] + elif 'version-date' in last_version: + version_obj['version-date'] = last_version['version-date'] + elif 'version-semver' in last_version: + version_obj['version-semver'] - last_version['version-semver'] + else: + version_obj['version-string'] = last_version['version-string'] + version_obj['port-version'] = last_version['port-version'] + baseline_entries[port_name] = version_obj + except json.JSONDecodeError as e: + print(f'Error: Decoding {port_file_path}\n{e}\n') + baseline_object = {} + baseline_object['default'] = baseline_entries + + os.makedirs(VERSIONS_DB_DIRECTORY, exist_ok=True) + baseline_path = os.path.join(VERSIONS_DB_DIRECTORY, 'baseline.json') + with open(baseline_path, 'w') as baseline_file: + json.dump(baseline_object, baseline_file) + + elapsed_time = time.time() - start_time + print(f'\nElapsed time: {elapsed_time:.2f} seconds') + + +def main(): + if not os.path.exists(VERSIONS_DB_DIRECTORY): + print(f'Version DB files must exist before generating a baseline.\nRun: `python generatePortVersionsDB`\n') + generate_baseline() + + +if __name__ == "__main__": + main() diff --git a/scripts/generatePortVersionsDb.py b/scripts/generatePortVersionsDb.py index e3c338c64ebcdc..3b7de69421c428 100644 --- a/scripts/generatePortVersionsDb.py +++ b/scripts/generatePortVersionsDb.py @@ -1,17 +1,19 @@ import os -import os.path import sys import subprocess import json import time import shutil -from subprocess import CalledProcessError -from json.decoder import JSONDecodeError +import multiprocessing + from pathlib import Path +MAX_PROCESSES = multiprocessing.cpu_count() SCRIPT_DIRECTORY = os.path.dirname(os.path.abspath(__file__)) +PORTS_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../ports') +VERSIONS_DB_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../port_versions') def get_current_git_ref(): @@ -24,91 +26,62 @@ def get_current_git_ref(): return None -def generate_port_versions_db(ports_path, db_path, revision): +def generate_port_versions_file(port_name): + containing_dir = os.path.join(VERSIONS_DB_DIRECTORY, f'{port_name[0]}-') + os.makedirs(containing_dir, exist_ok=True) + + output_file_path = os.path.join(containing_dir, f'{port_name}.json') + if not os.path.exists(output_file_path): + env = os.environ.copy() + env['GIT_OPTIONAL_LOCKS'] = '0' + output = subprocess.run( + [os.path.join(SCRIPT_DIRECTORY, '../vcpkg.exe'), + 'x-history', port_name, '--x-json', f'--output={output_file_path}'], + capture_output=True, encoding='utf-8', env=env) + if output.returncode != 0: + print(f'x-history {port_name} failed: ', + output.stdout.strip(), file=sys.stderr) + + +def generate_port_versions_db(revision): start_time = time.time() # Assume each directory in ${VCPKG_ROOT}/ports is a different port port_names = [item for item in os.listdir( - ports_path) if os.path.isdir(os.path.join(ports_path, item))] - port_names.sort() + PORTS_DIRECTORY) if os.path.isdir(os.path.join(PORTS_DIRECTORY, item))] total_count = len(port_names) - # Dictionary to collect the latest version of each port as baseline - baseline_objects = {} - baseline_objects['default'] = {} - - for counter, port_name in enumerate(port_names): - containing_dir = os.path.join(db_path, f'{port_name[0]}-') - os.makedirs(containing_dir, exist_ok=True) - - output_filepath = os.path.join(containing_dir, f'{port_name}.json') - if not os.path.exists(output_filepath): - output = subprocess.run( - [os.path.join(SCRIPT_DIRECTORY, '../vcpkg'), - 'x-history', port_name, '--x-json'], - capture_output=True, encoding='utf-8') - - if output.returncode == 0: - try: - versions_object = json.loads(output.stdout) - - # Put latest version in baseline dictionary - latest_version = versions_object["versions"][0] - baseline_objects['default'][port_name] = { - "version-string": latest_version["version-string"], - "port-version": latest_version["port-version"] - } - with open(output_filepath, 'w') as output_file: - json.dump(versions_object, output_file) - except JSONDecodeError: - print( - f'Malformed JSON from vcpkg x-history {port_name}: ', output.stdout.strip(), file=sys.stderr) - else: - print(f'x-history {port_name} failed: ', - output.stdout.strip(), file=sys.stderr) - - # This should be replaced by a progress bar - if counter > 0 and counter % 100 == 0: - elapsed_time = time.time() - start_time - print( - f'Processed {counter} out of {total_count}. Elapsed time: {elapsed_time:.2f} seconds') - - # Generate baseline.json - baseline_file_path = os.path.join(db_path, 'baseline.json') - with open(baseline_file_path, 'w') as baseline_output_file: - json.dump(baseline_objects, baseline_output_file) + concurrency = MAX_PROCESSES / 2 + print(f'Running {concurrency:.0f} parallel processes') + process_pool = multiprocessing.Pool(MAX_PROCESSES) + for i, _ in enumerate(process_pool.imap_unordered(generate_port_versions_file, port_names), 1): + sys.stderr.write( + f'\rProcessed: {i}/{total_count} ({(i / total_count):.2%})') + process_pool.close() + process_pool.join() # Generate timestamp - rev_file = os.path.join(db_path, revision) + rev_file = os.path.join(VERSIONS_DB_DIRECTORY, revision) Path(rev_file).touch() elapsed_time = time.time() - start_time print( - f'Processed {total_count} total ports. Elapsed time: {elapsed_time:.2f} seconds') + f'\nElapsed time: {elapsed_time:.2f} seconds') -def main(ports_path, db_path): +def main(): revision = get_current_git_ref() if not revision: print('Couldn\'t fetch current Git revision', file=sys.stderr) sys.exit(1) - rev_file = os.path.join(db_path, revision) + rev_file = os.path.join(VERSIONS_DB_DIRECTORY, revision) if os.path.exists(rev_file): print(f'Database files already exist for commit {revision}') sys.exit(0) - if (os.path.exists(db_path)): - try: - shutil.rmtree(db_path) - except OSError as e: - print(f'Could not delete folder: {db_path}.\nError: {e.strerror}') - - generate_port_versions_db(ports_path=ports_path, - db_path=db_path, - revision=revision) + generate_port_versions_db(revision) if __name__ == "__main__": - main(ports_path=os.path.join(SCRIPT_DIRECTORY, '../ports'), - db_path=os.path.join(SCRIPT_DIRECTORY, '../port_versions')) + main() diff --git a/toolsrc/src/vcpkg/commands.porthistory.cpp b/toolsrc/src/vcpkg/commands.porthistory.cpp index 7efb36bd18f078..92d782c36bceb1 100644 --- a/toolsrc/src/vcpkg/commands.porthistory.cpp +++ b/toolsrc/src/vcpkg/commands.porthistory.cpp @@ -58,44 +58,6 @@ namespace vcpkg::Commands::PortHistory return std::regex_match(version_string, re); } - std::pair clean_version_string(const std::string& version_string, - int port_version, - bool from_manifest) - { - // Manifest files and ports that use the `Port-Version` field are assumed to have a clean version string - // already. - if (from_manifest || port_version > 0) - { - return std::make_pair(version_string, port_version); - } - - std::string clean_version = version_string; - int clean_port_version = 0; - - const auto index = version_string.find_last_of('-'); - if (index != std::string::npos) - { - // Very lazy check to keep date versions untouched - if (!is_date(version_string)) - { - auto maybe_port_version = version_string.substr(index + 1); - clean_version.resize(index); - - try - { - clean_port_version = std::stoi(maybe_port_version); - } - catch (std::exception&) - { - // If not convertible to int consider last fragment as part of version string - clean_version = version_string; - } - } - } - - return std::make_pair(clean_version, clean_port_version); - } - vcpkg::Optional get_version_from_text(const std::string& text, const std::string& git_tree, const std::string& commit_id, @@ -108,20 +70,17 @@ namespace vcpkg::Commands::PortHistory { if (const auto& scf = maybe_scf->get()) { - // TODO: Get clean version name and port version - const auto version_string = scf->core_paragraph->version; - const auto clean_version = - clean_version_string(version_string, scf->core_paragraph->port_version, is_manifest); - - // SCF to HistoryVersion + auto version = scf->core_paragraph->version; + auto port_version = scf->core_paragraph->port_version; return HistoryVersion{ port_name, git_tree, commit_id, commit_date, - Strings::concat(clean_version.first, "#", std::to_string(clean_version.second)), - clean_version.first, - clean_version.second}; + Strings::concat(version, "#", port_version), + version, + port_version, + }; } } @@ -197,29 +156,37 @@ namespace vcpkg::Commands::PortHistory ret.emplace_back(version); } } - // NOTE: Uncomment this code if you're looking for edge cases to patch in the generation. - // Otherwise, x-history simply skips "bad" versions, which is OK behavior. - // else - //{ - // Checks::exit_with_message(VCPKG_LINE_INFO, "Failed to get version from %s:%s", - // commit_date_pair.first, port_name); - //} } return ret; } } + static constexpr StringLiteral OPTION_OUTPUT_FILE = "output"; + + static const CommandSetting HISTORY_SETTINGS[] = { + {OPTION_OUTPUT_FILE, "Write output to a file"}, + }; + const CommandStructure COMMAND_STRUCTURE = { create_example_string("history "), 1, 1, - {}, + {{}, {HISTORY_SETTINGS}, {}}, nullptr, }; + static Optional maybe_lookup(std::unordered_map const& m, + std::string const& key) + { + const auto it = m.find(key); + if (it != m.end()) return it->second; + return nullopt; + } + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE); + const ParsedArguments parsed_args = args.parse_arguments(COMMAND_STRUCTURE); + auto maybe_output_file = maybe_lookup(parsed_args.settings, OPTION_OUTPUT_FILE); std::string port_name = args.command_arguments.at(0); std::vector versions = read_versions_from_log(paths, port_name); @@ -241,10 +208,26 @@ namespace vcpkg::Commands::PortHistory root.insert("versions", versions_json); auto json_string = Json::stringify(root, vcpkg::Json::JsonStyle::with_spaces(2)); - System::printf("%s\n", json_string); + + if (maybe_output_file.has_value()) + { + auto output_file_path = fs::u8path(maybe_output_file.value_or_exit(VCPKG_LINE_INFO)); + auto& fs = paths.get_filesystem(); + fs.write_contents(output_file_path, json_string, VCPKG_LINE_INFO); + } + else + { + System::printf("%s\n", json_string); + } } else { + if (maybe_output_file.has_value()) + { + System::printf( + System::Color::warning, "Warning: Option `--$s` requires `--x-json` switch.", OPTION_OUTPUT_FILE); + } + System::print2(" version date vcpkg commit\n"); for (auto&& version : versions) { From 5372d3f12518ac732dca839c11ab9e832e57b967 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Tue, 5 Jan 2021 14:37:04 -0800 Subject: [PATCH 0430/1694] [vcpkg] Improve docs for binarycaching (#15396) --- docs/users/binarycaching.md | 28 ++++++++++++++++++++++++++++ docs/users/config-environment.md | 16 ++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/docs/users/binarycaching.md b/docs/users/binarycaching.md index 9df885f4c3bdb1..ed051b71636b30 100644 --- a/docs/users/binarycaching.md +++ b/docs/users/binarycaching.md @@ -84,6 +84,34 @@ More information about Azure DevOps Artifacts' NuGet support is available in the [devops-nuget]: https://docs.microsoft.com/en-us/azure/devops/artifacts/get-started-nuget?view=azure-devops +### Azure Blob Storage (experimental) + +> Note: This is an experimental feature and may change or be removed at any time + +Vcpkg supports interfacing with Azure Blob Storage via the `x-azblob` source type. + +``` +x-azblob,,[,] +``` + +First, you need to create an Azure Storage Account as well as a container ([Quick Start Documentation](https://docs.microsoft.com/en-us/azure/storage/blobs/storage-quickstart-blobs-portal)]. + +Next, you will need to create a Shared Access Signature, which can be done from the storage account under Settings -> Shared access signature. This SAS will need: +- Allowed services: Blob +- Allowed resource types: Object +- Allowed permissions: Read, Create (if using `write` or `readwrite`) + +The blob endpoint plus the container must be passed as the `` and the generated SAS without the `?` prefix must be passed as the ``. + +Example: +``` +x-azblob,https://.blob.core.windows.net/,sv=2019-12-12&ss=b&srt=o&sp=rcx&se=2020-12-31T06:20:36Z&st=2020-12-30T22:20:36Z&spr=https&sig=abcd,readwrite +``` + +Vcpkg will attempt to avoid revealing the SAS during normal operations, however: +1. It will be printed in full if `--debug` is passed +2. It will be passed as a command line parameter to subprocesses, such as `curl.exe` + ## Configuration Binary caching is configured via a combination of defaults, the environment variable `VCPKG_BINARY_SOURCES` (set to `;;...`), and the command line option `--binarysource=`. Source options are evaluated in order of defaults, then environment, then command line. Binary caching can be completely disabled by passing `--binarysource=clear` as the last command line option. diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md index 9b32816cb793d4..813d2f4de886bc 100644 --- a/docs/users/config-environment.md +++ b/docs/users/config-environment.md @@ -62,3 +62,19 @@ This environment variable can be set to a list of environment variables, separat the build environment. Example: `FOO_SDK_DIR;BAR_SDK_DIR` + +#### VCPKG_MAX_CONCURRENCY + +This environment variables limits the amount of concurrency requested by underlying buildsystems. If unspecified, this defaults to logical cores + 1. + +#### VCPKG_DEFAULT_BINARY_CACHE + +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. + +#### VCPKG_NUGET_REPOSITORY + +This environment variable changes the metadata of produced NuGet packages. See [Binary Caching](binarycaching.md#Configuration) for more details. From 1585a6ac333eea9940a682ca5fd272117b76c04c Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 6 Jan 2021 23:30:36 -0500 Subject: [PATCH 0431/1694] [vcpkg baseline][cppcms] Fix issue with detecting Python 2. (#15473) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [cppcms] Fix issue with detecting Python 2. * Update ports/cppcms/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/cppcms/CONTROL | 3 ++- ports/cppcms/portfile.cmake | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ports/cppcms/CONTROL b/ports/cppcms/CONTROL index 2acc51fdf590ce..2d4f6309544468 100644 --- a/ports/cppcms/CONTROL +++ b/ports/cppcms/CONTROL @@ -1,5 +1,6 @@ Source: cppcms -Version: 1.2.1-1 +Version: 1.2.1 +Port-Version: 2 Homepage: https://github.com/artyom-beilis/cppcms Description: CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development Build-Depends: icu, pcre, openssl, zlib diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index 383022fab97eaa..d25c1b18ef6328 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -10,12 +10,13 @@ vcpkg_from_github( ) vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON2_DIR ${PYTHON2} DIRECTORY) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DCMAKE_PROGRAM_PATH=${PYTHON2_DIR} -DUSE_WINDOWS6_API=ON + OPTIONS + -DPYTHON=${PYTHON2} # Switch to python3 on the next update + -DUSE_WINDOWS6_API=ON ) vcpkg_install_cmake() From 0846d32c7266797f34a733f62c0f4946dfef5e15 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 7 Jan 2021 12:51:46 -0800 Subject: [PATCH 0432/1694] [vcpkg] Restore embedded git hash behind an option. (#15472) --- scripts/bootstrap.ps1 | 2 +- toolsrc/CMakeLists.txt | 29 +++++++++++++++++++++++- toolsrc/include/vcpkg/commands.version.h | 2 +- toolsrc/src/vcpkg/commands.version.cpp | 20 ++++++++-------- 4 files changed, 39 insertions(+), 14 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 5e750df38aeb2d..67a4bbbef6389e 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -369,7 +369,7 @@ else } $arguments = ( -"`"/p:VCPKG_VERSION=-nohash`"", +"`"/p:VCPKG_VERSION=-unknownhash`"", "`"/p:DISABLE_METRICS=$disableMetricsValue`"", "/p:Configuration=Release", "/p:Platform=$platform", diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt index 89c3b3b60a7504..529d797060065e 100644 --- a/toolsrc/CMakeLists.txt +++ b/toolsrc/CMakeLists.txt @@ -15,6 +15,7 @@ option(VCPKG_ALLOW_APPLE_CLANG "Option for allowing apple clang, even versions t option(VCPKG_DEVELOPMENT_WARNINGS "Option for turning on all warnings" ON) option(VCPKG_WARNINGS_AS_ERRORS "Set warnings to be errors" ${VCPKG_DEVELOPMENT_WARNINGS}) option(VCPKG_BUILD_FUZZING "Option for enabling vcpkg-fuzz support" OFF) +option(VCPKG_EMBED_GIT_SHA "Option for to fill in the Git SHA version; off by default to avoid privacy concerns out of official builds" OFF) CMAKE_DEPENDENT_OPTION(VCPKG_BUILD_BENCHMARKING "Option for enabling benchmarking" OFF "BUILD_TESTING" OFF) @@ -51,6 +52,31 @@ vcpkg_detect_compiler() vcpkg_detect_standard_library() vcpkg_detect_std_filesystem() +if (VCPKG_EMBED_GIT_SHA) + find_package(Git REQUIRED) + execute_process( + COMMAND "${GIT_EXECUTABLE}" status --porcelain=v1 + WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} + OUTPUT_VARIABLE VCPKG_GIT_STATUS + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + if (VCPKG_GIT_STATUS STREQUAL "") + execute_process( + COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD + WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} + OUTPUT_VARIABLE VCPKG_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + else() + message(WARNING "Skipping embedding SHA due to local changes.") + endif() +endif() + +if (VCPKG_VERSION STREQUAL "") + set(VCPKG_VERSION "nohash") +endif() + set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD 17) @@ -84,7 +110,8 @@ target_include_directories(vcpkglib PUBLIC include) vcpkg_target_add_warning_options(vcpkglib) target_compile_definitions(vcpkglib PUBLIC - VCPKG_USE_STD_FILESYSTEM=$) + VCPKG_USE_STD_FILESYSTEM=$ + VCPKG_VERSION=${VCPKG_VERSION}) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) diff --git a/toolsrc/include/vcpkg/commands.version.h b/toolsrc/include/vcpkg/commands.version.h index 0f1717c7462dd0..4b05881ba7db05 100644 --- a/toolsrc/include/vcpkg/commands.version.h +++ b/toolsrc/include/vcpkg/commands.version.h @@ -5,7 +5,7 @@ namespace vcpkg::Commands::Version { const char* base_version(); - const std::string& version(); + const char* version(); void warn_if_vcpkg_version_mismatch(const VcpkgPaths& paths); void perform_and_exit(const VcpkgCmdArguments& args, Files::Filesystem& fs); diff --git a/toolsrc/src/vcpkg/commands.version.cpp b/toolsrc/src/vcpkg/commands.version.cpp index c7e33ee6506b53..e9ce4286d53fa2 100644 --- a/toolsrc/src/vcpkg/commands.version.cpp +++ b/toolsrc/src/vcpkg/commands.version.cpp @@ -9,12 +9,12 @@ #define STRINGIFY(...) #__VA_ARGS__ #define MACRO_TO_STRING(X) STRINGIFY(X) -#if defined(VCPKG_VERSION) -#define VCPKG_VERSION_AS_STRING MACRO_TO_STRING(VCPKG_VERSION) -#else -#define VCPKG_VERSION_AS_STRING "-unknownhash" +#if !defined(VCPKG_VERSION) +#error VCPKG_VERSION must be defined #endif +#define VCPKG_VERSION_AS_STRING MACRO_TO_STRING(VCPKG_VERSION) + namespace vcpkg::Commands::Version { const char* base_version() @@ -24,17 +24,15 @@ namespace vcpkg::Commands::Version ; } - const std::string& version() + const char* version() { - static const std::string S_VERSION = + return #include "../VERSION.txt" - - +std::string(VCPKG_VERSION_AS_STRING) + "-" VCPKG_VERSION_AS_STRING #ifndef NDEBUG - + std::string("-debug") + "-debug" #endif ; - return S_VERSION; } static int scan3(const char* input, const char* pattern, int* a, int* b, int* c) @@ -55,7 +53,7 @@ namespace vcpkg::Commands::Version const auto num1 = scan3(version_contents->c_str(), "\"%d.%d.%d\"", &maj1, &min1, &rev1); int maj2, min2, rev2; - const auto num2 = scan3(Version::version().c_str(), "%d.%d.%d-", &maj2, &min2, &rev2); + const auto num2 = scan3(Version::version(), "%d.%d.%d-", &maj2, &min2, &rev2); if (num1 == 3 && num2 == 3) { From f1000bf7be7e1aab0b7da9284f4d17d32fd96b6a Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Thu, 7 Jan 2021 17:44:45 -0800 Subject: [PATCH 0433/1694] [vcpkg] Add support for --overlay-ports to versioning (#15013) Co-authored-by: Robert Schumacher --- toolsrc/include/vcpkg/dependencies.h | 1 + toolsrc/include/vcpkg/fwd/portfileprovider.h | 1 + toolsrc/include/vcpkg/portfileprovider.h | 12 +- toolsrc/src/vcpkg-test/dependencies.cpp | 705 +++++++++++-------- toolsrc/src/vcpkg/dependencies.cpp | 49 +- toolsrc/src/vcpkg/install.cpp | 2 + toolsrc/src/vcpkg/portfileprovider.cpp | 50 ++ 7 files changed, 534 insertions(+), 286 deletions(-) diff --git a/toolsrc/include/vcpkg/dependencies.h b/toolsrc/include/vcpkg/dependencies.h index f4e061b03e9459..4736bc02c96e9d 100644 --- a/toolsrc/include/vcpkg/dependencies.h +++ b/toolsrc/include/vcpkg/dependencies.h @@ -178,6 +178,7 @@ namespace vcpkg::Dependencies /// Status of installed packages in the current environment. ExpectedS create_versioned_install_plan(const PortFileProvider::IVersionedPortfileProvider& vprovider, const PortFileProvider::IBaselineProvider& bprovider, + const PortFileProvider::IOverlayProvider& oprovider, const CMakeVars::CMakeVarProvider& var_provider, const std::vector& deps, const std::vector& overrides, diff --git a/toolsrc/include/vcpkg/fwd/portfileprovider.h b/toolsrc/include/vcpkg/fwd/portfileprovider.h index dc381eb92af81e..a75cfc13726a13 100644 --- a/toolsrc/include/vcpkg/fwd/portfileprovider.h +++ b/toolsrc/include/vcpkg/fwd/portfileprovider.h @@ -6,4 +6,5 @@ namespace vcpkg::PortFileProvider struct PathsPortFileProvider; struct IVersionedPortfileProvider; struct IBaselineProvider; + struct IOverlayProvider; } diff --git a/toolsrc/include/vcpkg/portfileprovider.h b/toolsrc/include/vcpkg/portfileprovider.h index fde28b0dfe4504..d297af73994a7d 100644 --- a/toolsrc/include/vcpkg/portfileprovider.h +++ b/toolsrc/include/vcpkg/portfileprovider.h @@ -55,6 +55,14 @@ namespace vcpkg::PortFileProvider virtual ~IBaselineProvider() = default; }; - std::unique_ptr make_baseline_provider(const VcpkgPaths&); - std::unique_ptr make_versioned_portfile_provider(const VcpkgPaths&); + struct IOverlayProvider + { + virtual ~IOverlayProvider() = default; + virtual Optional get_control_file(StringView port_name) const = 0; + }; + + std::unique_ptr make_baseline_provider(const vcpkg::VcpkgPaths& paths); + std::unique_ptr make_versioned_portfile_provider(const vcpkg::VcpkgPaths& paths); + std::unique_ptr make_overlay_provider(const vcpkg::VcpkgPaths& paths, + View overlay_ports); } diff --git a/toolsrc/src/vcpkg-test/dependencies.cpp b/toolsrc/src/vcpkg-test/dependencies.cpp index 07f9d0852c48f0..2831ea5a1abb2c 100644 --- a/toolsrc/src/vcpkg-test/dependencies.cpp +++ b/toolsrc/src/vcpkg-test/dependencies.cpp @@ -160,6 +160,54 @@ static const PackageSpec& toplevel_spec() return ret; } +struct MockOverlayProvider : PortFileProvider::IOverlayProvider, Util::ResourceBase +{ + virtual Optional get_control_file(StringView name) const override + { + auto it = mappings.find(name); + if (it != mappings.end()) + return it->second; + else + return nullopt; + } + + SourceControlFileLocation& emplace(const std::string& name, + Versions::Version&& version, + Versions::Scheme scheme = Versions::Scheme::String) + { + auto it = mappings.find(name); + if (it == mappings.end()) + { + auto scf = std::make_unique(); + auto core = std::make_unique(); + core->name = name; + core->version = version.text(); + core->port_version = version.port_version(); + core->version_scheme = scheme; + scf->core_paragraph = std::move(core); + it = mappings.emplace(name, SourceControlFileLocation{std::move(scf), fs::u8path(name)}).first; + } + return it->second; + } + +private: + std::map> mappings; +}; + +static const MockOverlayProvider s_empty_mock_overlay; + +ExpectedS create_versioned_install_plan( + const PortFileProvider::IVersionedPortfileProvider& provider, + const PortFileProvider::IBaselineProvider& bprovider, + const CMakeVars::CMakeVarProvider& var_provider, + const std::vector& deps, + const std::vector& overrides, + const PackageSpec& toplevel) +{ + return Dependencies::create_versioned_install_plan( + provider, bprovider, s_empty_mock_overlay, var_provider, deps, overrides, toplevel); +} + TEST_CASE ("basic version install single", "[versionplan]") { MockBaselineProvider bp; @@ -170,8 +218,7 @@ TEST_CASE ("basic version install single", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = - unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec())); + auto install_plan = unwrap(create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec())); REQUIRE(install_plan.size() == 1); REQUIRE(install_plan.install_actions.at(0).spec.name() == "a"); @@ -193,7 +240,7 @@ TEST_CASE ("basic version install detect cycle", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec()); + auto install_plan = create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec()); REQUIRE(!install_plan.has_value()); } @@ -212,8 +259,7 @@ TEST_CASE ("basic version install scheme", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = - unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec())); + auto install_plan = unwrap(create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec())); CHECK(install_plan.size() == 2); @@ -248,8 +294,7 @@ TEST_CASE ("basic version install scheme diamond", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = - unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec())); + auto install_plan = unwrap(create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec())); CHECK(install_plan.size() == 4); @@ -269,7 +314,7 @@ TEST_CASE ("basic version install scheme baseline missing", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec()); + auto install_plan = create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec()); REQUIRE(!install_plan.has_value()); } @@ -286,14 +331,14 @@ TEST_CASE ("basic version install scheme baseline missing success", "[versionpla MockCMakeVarProvider var_provider; auto install_plan = - unwrap(Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Exact, "2"}}, - }, - {}, - toplevel_spec())); + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Exact, "2"}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "a", {"2", 0}); @@ -311,8 +356,7 @@ TEST_CASE ("basic version install scheme baseline", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = - unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec())); + auto install_plan = unwrap(create_versioned_install_plan(vp, bp, var_provider, {{"a"}}, {}, toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "a", {"2", 0}); @@ -330,7 +374,7 @@ TEST_CASE ("version string baseline agree", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = Dependencies::create_versioned_install_plan( + auto install_plan = create_versioned_install_plan( vp, bp, var_provider, {Dependency{"a", {}, {}, {Constraint::Type::Exact, "2"}}}, {}, toplevel_spec()); REQUIRE(install_plan.has_value()); @@ -348,15 +392,14 @@ TEST_CASE ("version install scheme baseline conflict", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = - Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Exact, "3"}}, - }, - {}, - toplevel_spec()); + auto install_plan = create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Exact, "3"}}, + }, + {}, + toplevel_spec()); REQUIRE(!install_plan.has_value()); } @@ -373,15 +416,15 @@ TEST_CASE ("version install string port version", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = unwrap( - Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 1}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 1}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "a", {"2", 1}); @@ -399,15 +442,15 @@ TEST_CASE ("version install string port version 2", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = unwrap( - Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 0}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 0}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "a", {"2", 1}); @@ -430,15 +473,15 @@ TEST_CASE ("version install transitive string", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = unwrap( - Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 1}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 1}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 2); check_name_and_version(install_plan.install_actions[0], "b", {"2", 0}); @@ -456,15 +499,15 @@ TEST_CASE ("version install simple relaxed", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = unwrap( - Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3", 0}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3", 0}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "a", {"3", 0}); @@ -486,15 +529,15 @@ TEST_CASE ("version install transitive relaxed", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = unwrap( - Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3", 0}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3", 0}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 2); check_name_and_version(install_plan.install_actions[0], "b", {"3", 0}); @@ -522,16 +565,16 @@ TEST_CASE ("version install diamond relaxed", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = unwrap( - Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3", 0}}, - Dependency{"b", {}, {}, {Constraint::Type::Minimum, "2", 1}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3", 0}}, + Dependency{"b", {}, {}, {Constraint::Type::Minimum, "2", 1}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 3); check_name_and_version(install_plan.install_actions[0], "c", {"9", 2}); @@ -739,15 +782,15 @@ TEST_CASE ("version install simple semver", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = unwrap(Dependencies::create_versioned_install_plan( - vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3.0.0", 0}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3.0.0", 0}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "a", {"3.0.0", 0}); @@ -769,15 +812,15 @@ TEST_CASE ("version install transitive semver", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = unwrap(Dependencies::create_versioned_install_plan( - vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3.0.0", 0}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3.0.0", 0}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 2); check_name_and_version(install_plan.install_actions[0], "b", {"3.0.0", 0}); @@ -805,16 +848,16 @@ TEST_CASE ("version install diamond semver", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = unwrap(Dependencies::create_versioned_install_plan( - vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3.0.0", 0}}, - Dependency{"b", {}, {}, {Constraint::Type::Minimum, "2.0.0", 1}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3.0.0", 0}}, + Dependency{"b", {}, {}, {Constraint::Type::Minimum, "2.0.0", 1}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 3); check_name_and_version(install_plan.install_actions[0], "c", {"9.0.0", 2}); @@ -833,15 +876,15 @@ TEST_CASE ("version install simple date", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = unwrap(Dependencies::create_versioned_install_plan( - vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2020-03-01", 0}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2020-03-01", 0}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "a", {"2020-03-01", 0}); @@ -863,15 +906,15 @@ TEST_CASE ("version install transitive date", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = unwrap(Dependencies::create_versioned_install_plan( - vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2020-01-01.3", 0}}, - }, - {}, - toplevel_spec())); + auto install_plan = unwrap( + create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2020-01-01.3", 0}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 2); check_name_and_version(install_plan.install_actions[0], "b", {"2020-01-01.3", 0}); @@ -899,16 +942,16 @@ TEST_CASE ("version install diamond date", "[versionplan]") MockCMakeVarProvider var_provider; - auto install_plan = unwrap(Dependencies::create_versioned_install_plan( - vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2020-01-03", 0}}, - Dependency{"b", {}, {}, {Constraint::Type::Minimum, "2020-01-02", 1}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2020-01-03", 0}}, + Dependency{"b", {}, {}, {Constraint::Type::Minimum, "2020-01-02", 1}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 3); check_name_and_version(install_plan.install_actions[0], "c", {"2020-01-09", 2}); @@ -930,13 +973,13 @@ TEST_CASE ("version install scheme failure", "[versionplan]") MockBaselineProvider bp; bp.v["a"] = {"1.0.0", 0}; - auto install_plan = Dependencies::create_versioned_install_plan( - vp, - bp, - var_provider, - {Dependency{"a", {}, {}, {Constraint::Type::Minimum, "1.0.1", 0}}}, - {}, - toplevel_spec()); + auto install_plan = + create_versioned_install_plan(vp, + bp, + var_provider, + {Dependency{"a", {}, {}, {Constraint::Type::Minimum, "1.0.1", 0}}}, + {}, + toplevel_spec()); REQUIRE(!install_plan.error().empty()); CHECK(install_plan.error() == "Version conflict on a@1.0.1: baseline required 1.0.0"); @@ -946,13 +989,13 @@ TEST_CASE ("version install scheme failure", "[versionplan]") MockBaselineProvider bp; bp.v["a"] = {"1.0.2", 0}; - auto install_plan = Dependencies::create_versioned_install_plan( - vp, - bp, - var_provider, - {Dependency{"a", {}, {}, {Constraint::Type::Minimum, "1.0.1", 0}}}, - {}, - toplevel_spec()); + auto install_plan = + create_versioned_install_plan(vp, + bp, + var_provider, + {Dependency{"a", {}, {}, {Constraint::Type::Minimum, "1.0.1", 0}}}, + {}, + toplevel_spec()); REQUIRE(!install_plan.error().empty()); CHECK(install_plan.error() == "Version conflict on a@1.0.1: baseline required 1.0.2"); @@ -978,15 +1021,15 @@ TEST_CASE ("version install scheme change in port version", "[versionplan]") MockBaselineProvider bp; bp.v["a"] = {"2", 0}; - auto install_plan = unwrap( - Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 1}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 1}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 2); check_name_and_version(install_plan.install_actions[0], "b", {"1", 1}); @@ -997,15 +1040,15 @@ TEST_CASE ("version install scheme change in port version", "[versionplan]") MockBaselineProvider bp; bp.v["a"] = {"2", 1}; - auto install_plan = unwrap( - Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 0}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 0}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 2); check_name_and_version(install_plan.install_actions[0], "b", {"1", 1}); @@ -1027,14 +1070,14 @@ TEST_CASE ("version install simple feature", "[versionplan]") MockBaselineProvider bp; bp.v["a"] = {"1", 0}; - auto install_plan = unwrap(Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"a", {"x"}}, - }, - {}, - toplevel_spec())); + auto install_plan = unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {"x"}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}, {"x"}); @@ -1044,15 +1087,15 @@ TEST_CASE ("version install simple feature", "[versionplan]") { MockBaselineProvider bp; - auto install_plan = unwrap(Dependencies::create_versioned_install_plan( - vp, - bp, - var_provider, - { - Dependency{"a", {"x"}, {}, {Constraint::Type::Minimum, "1", 0}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {"x"}, {}, {Constraint::Type::Minimum, "1", 0}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}, {"x"}); @@ -1083,14 +1126,14 @@ TEST_CASE ("version install transitive features", "[versionplan]") bp.v["a"] = {"1", 0}; bp.v["b"] = {"1", 0}; - auto install_plan = unwrap(Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"a", {"x"}}, - }, - {}, - toplevel_spec())); + auto install_plan = unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {"x"}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 2); check_name_and_version(install_plan.install_actions[0], "b", {"1", 0}, {"y"}); @@ -1123,14 +1166,14 @@ TEST_CASE ("version install transitive feature versioned", "[versionplan]") bp.v["a"] = {"1", 0}; bp.v["c"] = {"1", 0}; - auto install_plan = unwrap(Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"a", {"x"}}, - }, - {}, - toplevel_spec())); + auto install_plan = unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"a", {"x"}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 3); check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}); @@ -1161,15 +1204,15 @@ TEST_CASE ("version install constraint-reduction", "[versionplan]") bp.v["b"] = {"2", 0}; bp.v["c"] = {"1", 0}; - auto install_plan = unwrap( - Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"b", {}, {}, {Constraint::Type::Minimum, "1"}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"b", {}, {}, {Constraint::Type::Minimum, "1"}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 2); check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}); @@ -1195,15 +1238,15 @@ TEST_CASE ("version install constraint-reduction", "[versionplan]") bp.v["b"] = {"1", 0}; bp.v["c"] = {"1", 0}; - auto install_plan = unwrap( - Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - { - Dependency{"b", {}, {}, {Constraint::Type::Minimum, "2"}}, - }, - {}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + { + Dependency{"b", {}, {}, {Constraint::Type::Minimum, "2"}}, + }, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 2); check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}); @@ -1228,13 +1271,13 @@ TEST_CASE ("version install overrides", "[versionplan]") SECTION ("string") { - auto install_plan = unwrap( - Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - {Dependency{"c"}}, - {DependencyOverride{"b", "1"}, DependencyOverride{"c", "1"}}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + {Dependency{"c"}}, + {DependencyOverride{"b", "1"}, DependencyOverride{"c", "1"}}, + toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}); @@ -1242,13 +1285,13 @@ TEST_CASE ("version install overrides", "[versionplan]") SECTION ("relaxed") { - auto install_plan = unwrap( - Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - {Dependency{"b"}}, - {DependencyOverride{"b", "1"}, DependencyOverride{"c", "1"}}, - toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + {Dependency{"b"}}, + {DependencyOverride{"b", "1"}, DependencyOverride{"c", "1"}}, + toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "b", {"1", 0}); @@ -1272,12 +1315,12 @@ TEST_CASE ("version install transitive overrides", "[versionplan]") bp.v["c"] = {"2", 1}; auto install_plan = - unwrap(Dependencies::create_versioned_install_plan(vp, - bp, - var_provider, - {Dependency{"b"}}, - {DependencyOverride{"b", "1"}, DependencyOverride{"c", "1"}}, - toplevel_spec())); + unwrap(create_versioned_install_plan(vp, + bp, + var_provider, + {Dependency{"b"}}, + {DependencyOverride{"b", "1"}, DependencyOverride{"c", "1"}}, + toplevel_spec())); REQUIRE(install_plan.size() == 2); check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}); @@ -1298,8 +1341,8 @@ TEST_CASE ("version install default features", "[versionplan]") MockBaselineProvider bp; bp.v["a"] = {"1", 0}; - auto install_plan = unwrap( - Dependencies::create_versioned_install_plan(vp, bp, var_provider, {Dependency{"a"}}, {}, toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, bp, var_provider, {Dependency{"a"}}, {}, toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}, {"x"}); @@ -1319,8 +1362,8 @@ TEST_CASE ("version dont install default features", "[versionplan]") MockBaselineProvider bp; bp.v["a"] = {"1", 0}; - auto install_plan = unwrap(Dependencies::create_versioned_install_plan( - vp, bp, var_provider, {Dependency{"a", {"core"}}}, {}, toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, bp, var_provider, {Dependency{"a", {"core"}}}, {}, toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}); @@ -1344,8 +1387,8 @@ TEST_CASE ("version install transitive default features", "[versionplan]") bp.v["a"] = {"1", 0}; bp.v["b"] = {"1", 0}; - auto install_plan = unwrap( - Dependencies::create_versioned_install_plan(vp, bp, var_provider, {Dependency{"b"}}, {}, toplevel_spec())); + auto install_plan = + unwrap(create_versioned_install_plan(vp, bp, var_provider, {Dependency{"b"}}, {}, toplevel_spec())); REQUIRE(install_plan.size() == 2); check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}, {"x"}); @@ -1373,13 +1416,13 @@ TEST_CASE ("version install qualified dependencies", "[versionplan]") MockCMakeVarProvider var_provider; var_provider.dep_info_vars[toplevel_spec()] = {{"VCPKG_CMAKE_SYSTEM_NAME", "Windows"}}; - auto install_plan = unwrap(Dependencies::create_versioned_install_plan( - vp, - bp, - var_provider, - {{"b", {}, parse_platform("!linux")}, {"c", {}, parse_platform("linux")}}, - {}, - toplevel_spec())); + auto install_plan = unwrap( + create_versioned_install_plan(vp, + bp, + var_provider, + {{"b", {}, parse_platform("!linux")}, {"c", {}, parse_platform("linux")}}, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "b", {"1", 0}); @@ -1390,13 +1433,13 @@ TEST_CASE ("version install qualified dependencies", "[versionplan]") MockCMakeVarProvider var_provider; var_provider.dep_info_vars[toplevel_spec()] = {{"VCPKG_CMAKE_SYSTEM_NAME", "Linux"}}; - auto install_plan = unwrap(Dependencies::create_versioned_install_plan( - vp, - bp, - var_provider, - {{"b", {}, parse_platform("!linux")}, {"c", {}, parse_platform("linux")}}, - {}, - toplevel_spec())); + auto install_plan = unwrap( + create_versioned_install_plan(vp, + bp, + var_provider, + {{"b", {}, parse_platform("!linux")}, {"c", {}, parse_platform("linux")}}, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}); @@ -1420,13 +1463,13 @@ TEST_CASE ("version install qualified default suppression", "[versionplan]") bp.v["a"] = {"1", 0}; bp.v["b"] = {"1", 0}; - auto install_plan = unwrap(Dependencies::create_versioned_install_plan( - vp, - bp, - var_provider, - {{"b", {}, parse_platform("!linux")}, {"a", {"core"}, parse_platform("linux")}}, - {}, - toplevel_spec())); + auto install_plan = unwrap( + create_versioned_install_plan(vp, + bp, + var_provider, + {{"b", {}, parse_platform("!linux")}, {"a", {"core"}, parse_platform("linux")}}, + {}, + toplevel_spec())); REQUIRE(install_plan.size() == 2); check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}, {"x"}); @@ -1451,8 +1494,7 @@ TEST_CASE ("version install qualified transitive", "[versionplan]") bp.v["b"] = {"1", 0}; bp.v["c"] = {"1", 0}; - auto install_plan = - unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"b"}}, {}, toplevel_spec())); + auto install_plan = unwrap(create_versioned_install_plan(vp, bp, var_provider, {{"b"}}, {}, toplevel_spec())); REQUIRE(install_plan.size() == 2); check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}); @@ -1479,8 +1521,7 @@ TEST_CASE ("version install different vars", "[versionplan]") bp.v["b"] = {"1", 0}; bp.v["c"] = {"1", 0}; - auto install_plan = - unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"b"}}, {}, toplevel_spec())); + auto install_plan = unwrap(create_versioned_install_plan(vp, bp, var_provider, {{"b"}}, {}, toplevel_spec())); REQUIRE(install_plan.size() == 3); check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}); @@ -1518,8 +1559,7 @@ TEST_CASE ("version install qualified features", "[versionplan]") bp.v["c"] = {"1", 0}; bp.v["d"] = {"1", 0}; - auto install_plan = - unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"b"}}, {}, toplevel_spec())); + auto install_plan = unwrap(create_versioned_install_plan(vp, bp, var_provider, {{"b"}}, {}, toplevel_spec())); REQUIRE(install_plan.size() == 3); check_name_and_version(install_plan.install_actions[0], "c", {"1", 0}, {"z"}); @@ -1542,8 +1582,121 @@ TEST_CASE ("version install self features", "[versionplan]") MockCMakeVarProvider var_provider; auto install_plan = - unwrap(Dependencies::create_versioned_install_plan(vp, bp, var_provider, {{"a", {"x"}}}, {}, toplevel_spec())); + unwrap(create_versioned_install_plan(vp, bp, var_provider, {{"a", {"x"}}}, {}, toplevel_spec())); REQUIRE(install_plan.size() == 1); check_name_and_version(install_plan.install_actions[0], "a", {"1", 0}, {"x", "y"}); } + +TEST_CASE ("version overlay ports", "[versionplan]") +{ + MockBaselineProvider bp; + bp.v["a"] = {"1", 0}; + bp.v["b"] = {"1", 0}; + bp.v["c"] = {"1", 0}; + + MockVersionedPortfileProvider vp; + vp.emplace("a", {"1", 0}); + vp.emplace("a", {"1", 1}); + vp.emplace("a", {"2", 0}); + vp.emplace("b", {"1", 0}).source_control_file->core_paragraph->dependencies.emplace_back(Dependency{"a"}); + vp.emplace("c", {"1", 0}) + .source_control_file->core_paragraph->dependencies.emplace_back( + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "1", 1}}); + + MockCMakeVarProvider var_provider; + + MockOverlayProvider oprovider; + oprovider.emplace("a", {"overlay", 0}); + + SECTION ("no baseline") + { + const MockBaselineProvider empty_bp; + + auto install_plan = unwrap(Dependencies::create_versioned_install_plan( + vp, empty_bp, oprovider, var_provider, {{"a"}}, {}, toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"overlay", 0}); + } + + SECTION ("transitive") + { + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, bp, oprovider, var_provider, {{"b"}}, {}, toplevel_spec())); + + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "a", {"overlay", 0}); + check_name_and_version(install_plan.install_actions[1], "b", {"1", 0}); + } + + SECTION ("transitive constraint") + { + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, bp, oprovider, var_provider, {{"c"}}, {}, toplevel_spec())); + + REQUIRE(install_plan.size() == 2); + check_name_and_version(install_plan.install_actions[0], "a", {"overlay", 0}); + check_name_and_version(install_plan.install_actions[1], "c", {"1", 0}); + } + + SECTION ("none") + { + auto install_plan = unwrap( + Dependencies::create_versioned_install_plan(vp, bp, oprovider, var_provider, {{"a"}}, {}, toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"overlay", 0}); + } + SECTION ("constraint") + { + auto install_plan = unwrap(Dependencies::create_versioned_install_plan( + vp, + bp, + oprovider, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "1", 1}}, + }, + {}, + toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"overlay", 0}); + } + SECTION ("constraint+override") + { + auto install_plan = unwrap(Dependencies::create_versioned_install_plan( + vp, + bp, + oprovider, + var_provider, + { + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "1", 1}}, + }, + { + DependencyOverride{"a", {"2", 0}}, + }, + toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"overlay", 0}); + } + SECTION ("override") + { + auto install_plan = unwrap(Dependencies::create_versioned_install_plan(vp, + bp, + oprovider, + var_provider, + { + Dependency{"a"}, + }, + { + DependencyOverride{"a", {"2", 0}}, + }, + toplevel_spec())); + + REQUIRE(install_plan.size() == 1); + check_name_and_version(install_plan.install_actions[0], "a", {"overlay", 0}); + } +} diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index e811efd2fc648f..d71fb387f45ea4 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -1173,8 +1173,12 @@ namespace vcpkg::Dependencies public: VersionedPackageGraph(const IVersionedPortfileProvider& ver_provider, const IBaselineProvider& base_provider, + const PortFileProvider::IOverlayProvider& oprovider, const CMakeVars::CMakeVarProvider& var_provider) - : m_ver_provider(ver_provider), m_base_provider(base_provider), m_var_provider(var_provider) + : m_ver_provider(ver_provider) + , m_base_provider(base_provider) + , m_o_provider(oprovider) + , m_var_provider(var_provider) { } @@ -1187,6 +1191,7 @@ namespace vcpkg::Dependencies private: const IVersionedPortfileProvider& m_ver_provider; const IBaselineProvider& m_base_provider; + const PortFileProvider::IOverlayProvider& m_o_provider; const CMakeVars::CMakeVarProvider& m_var_provider; struct DepSpec @@ -1465,12 +1470,27 @@ namespace vcpkg::Dependencies const Versions::Version& version, const std::string& origin) { - auto over_it = m_overrides.find(ref.first.name()); - if (over_it != m_overrides.end() && over_it->second != version) + ExpectedS maybe_scfl; + + auto maybe_overlay = m_o_provider.get_control_file(ref.first.name()); + if (auto p_overlay = maybe_overlay.get()) { - return add_constraint(ref, over_it->second, origin); + auto overlay_version = to_version(*p_overlay->source_control_file); + if (version != overlay_version) + { + return add_constraint(ref, overlay_version, origin); + } + maybe_scfl = *p_overlay; + } + else + { + auto over_it = m_overrides.find(ref.first.name()); + if (over_it != m_overrides.end() && over_it->second != version) + { + return add_constraint(ref, over_it->second, origin); + } + maybe_scfl = m_ver_provider.get_control_file({ref.first.name(), version}); } - auto maybe_scfl = m_ver_provider.get_control_file({ref.first.name(), version}); if (auto p_scfl = maybe_scfl.get()) { @@ -1599,6 +1619,15 @@ namespace vcpkg::Dependencies auto& node = emplace_package(spec); + auto maybe_overlay = m_o_provider.get_control_file(dep.name); + if (auto p_overlay = maybe_overlay.get()) + { + auto ver = to_version(*p_overlay->source_control_file); + m_roots.push_back(DepSpec{spec, ver, dep.features}); + add_constraint(node, ver, toplevel.name()); + continue; + } + auto over_it = m_overrides.find(dep.name); if (over_it != m_overrides.end()) { @@ -1690,10 +1719,13 @@ namespace vcpkg::Dependencies auto push = [&emitted, this, &stack](const PackageSpec& spec, const Versions::Version& new_ver) -> Optional { auto&& node = m_graph[spec]; + auto overlay = m_o_provider.get_control_file(spec.name()); auto over_it = m_overrides.find(spec.name()); VersionedPackageGraph::VersionSchemeInfo* p_vnode; - if (over_it != m_overrides.end()) + if (auto p_overlay = overlay.get()) + p_vnode = node.get_node(to_version(*p_overlay->source_control_file)); + else if (over_it != m_overrides.end()) p_vnode = node.get_node(over_it->second); else p_vnode = node.get_node(new_ver); @@ -1704,7 +1736,7 @@ namespace vcpkg::Dependencies if (p.second) { // Newly inserted - if (over_it == m_overrides.end()) + if (!overlay && over_it == m_overrides.end()) { // Not overridden -- Compare against baseline if (auto baseline = m_base_provider.get_baseline_version(spec.name())) @@ -1818,12 +1850,13 @@ namespace vcpkg::Dependencies ExpectedS create_versioned_install_plan(const PortFileProvider::IVersionedPortfileProvider& provider, const PortFileProvider::IBaselineProvider& bprovider, + const PortFileProvider::IOverlayProvider& oprovider, const CMakeVars::CMakeVarProvider& var_provider, const std::vector& deps, const std::vector& overrides, const PackageSpec& toplevel) { - VersionedPackageGraph vpg(provider, bprovider, var_provider); + VersionedPackageGraph vpg(provider, bprovider, oprovider, var_provider); for (auto&& o : overrides) vpg.add_override(o.name, {o.version, o.port_version}); vpg.add_roots(deps, toplevel); diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index cac0e0e694cb84..51c7b8289fed93 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -853,10 +853,12 @@ namespace vcpkg::Install paths.get_configuration().registry_set.experimental_set_builtin_registry_baseline( p_baseline->string()); } + auto oprovider = PortFileProvider::make_overlay_provider(paths, args.overlay_ports); auto install_plan = Dependencies::create_versioned_install_plan(*verprovider, *baseprovider, + *oprovider, var_provider, manifest_scf.core_paragraph->dependencies, manifest_scf.core_paragraph->overrides, diff --git a/toolsrc/src/vcpkg/portfileprovider.cpp b/toolsrc/src/vcpkg/portfileprovider.cpp index c956dfe9b06506..05c5109c440d8a 100644 --- a/toolsrc/src/vcpkg/portfileprovider.cpp +++ b/toolsrc/src/vcpkg/portfileprovider.cpp @@ -402,6 +402,50 @@ namespace vcpkg::PortFileProvider mutable std::unordered_map m_control_cache; mutable std::map, std::less<>> m_entry_cache; }; + + struct OverlayProviderImpl : IOverlayProvider, Util::ResourceBase + { + OverlayProviderImpl(const VcpkgPaths& paths, View overlay_ports) + : paths(paths), m_overlay_ports(Util::fmap(overlay_ports, [&paths](const std::string& s) -> fs::path { + return Files::combine(paths.original_cwd, fs::u8path(s)); + })) + { + } + + virtual Optional get_control_file(StringView port_name) const override + { + auto it = m_overlay_cache.find(port_name); + if (it == m_overlay_cache.end()) + { + auto s_port_name = port_name.to_string(); + auto maybe_overlay = try_load_overlay_port(paths.get_filesystem(), m_overlay_ports, s_port_name); + Optional v; + if (maybe_overlay) + { + auto maybe_scf = Paragraphs::try_load_port(paths.get_filesystem(), maybe_overlay->path); + if (auto scf = maybe_scf.get()) + { + v = SourceControlFileLocation{std::move(*scf), maybe_overlay->path}; + } + else + { + print_error_message(maybe_scf.error()); + Checks::exit_with_message(VCPKG_LINE_INFO, + "Error: Failed to load port %s from %s", + port_name, + fs::u8string(maybe_overlay->path)); + } + } + it = m_overlay_cache.emplace(std::move(s_port_name), std::move(v)).first; + } + return it->second; + } + + private: + const VcpkgPaths& paths; + const std::vector m_overlay_ports; + mutable std::map, std::less<>> m_overlay_cache; + }; } std::unique_ptr make_baseline_provider(const vcpkg::VcpkgPaths& paths) @@ -413,4 +457,10 @@ namespace vcpkg::PortFileProvider { return std::make_unique(paths); } + + std::unique_ptr make_overlay_provider(const vcpkg::VcpkgPaths& paths, + View overlay_ports) + { + return std::make_unique(paths, std::move(overlay_ports)); + } } From 8f1aba7b1bd3e5144b7810191b2ed4331be3e90d Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 7 Jan 2021 18:04:11 -0800 Subject: [PATCH 0434/1694] [vcpkg] Add commands to maintain and verify versions db integrity (#14999) * [vcpkg] Add x-ci-verify-versions command * Code cleanup * Remove port version splitting from x-history * Fix wrong message on success * Parallelize versions file generator * Use cpu_count()/2 to avoid crashes * Check db SHA against local SHA * Check baseline version with x-ci-verify-versions and make baseline generator much faster * Implement x-add-version to update version db files * Better checks for x-add-info and make x-ci-verify-versions silent on success * Use find() instead of [] on maps * Create version file if does not exist * Allow redirection of ports/ and port_versions/ * add test ports * WIP end-to-end tests * Change pats in e2e tests * Fix e2e args * e2e once more * Pass ersions feature flag to e2e * Exit with code 1 if there are errors * Files to test for failure cases * Update test files * Add test for x-add-version * fix redirected ports in last test * Add CI check (use dummy data) * Add feature-flags=versions * Ignore subdirectories inside ports * Add --verify-git-trees switch * [vcpkg] Fix build breaks * [x-ci-verify-versions] PR comments * [x-add-version] PR comments * Fix merge conflicts * Modify tests and pipeline * Baselines should only have version-string * Refactor x-add-version * [vcpkg] Fix help message * [vcpkg] Fix minor warnings * `x-add-version --all` doesn't stop on first failure and reduced default verbosity * [vcpkg] Fix default-baseline * Load file instead of using paths provider * Format * Remove ci test * Add fish port for testing * Update version files * Update fish port to cause SHA discrepancy * Test for discrepancy between local SHA and declared SHA * Missing = operator * Check for error message since x-add-version exits with code 0 * Make x-add-version fail with non-zero exit code if not run with --all Co-authored-by: Robert Schumacher Co-authored-by: Robert Schumacher --- .../end-to-end-tests-dir/versions.ps1 | 75 ++++ .../default-baseline-1/vcpkg.json | 8 + .../port_versions/z-/zlib.json | 14 + .../default-baseline-2/vcpkg.json | 8 + .../version-files/port_versions/baseline.json | 20 + .../version-files/port_versions/c-/cat.json | 9 + .../version-files/port_versions/d-/dog.json | 9 + .../version-files/port_versions/d-/duck.json | 9 + .../version-files/port_versions/m-/mouse.json | 9 + .../port_versions_incomplete/baseline.json | 20 + .../port_versions_incomplete/c-/cat.json | 9 + .../port_versions_incomplete/d-/dog.json | 9 + .../port_versions_incomplete/f-/fish.json | 9 + .../port_versions_incomplete/m-/mouse.json | 9 + .../version-files/ports/cat/portfile.cmake | 1 + .../version-files/ports/cat/vcpkg.json | 4 + .../version-files/ports/dog/portfile.cmake | 1 + .../version-files/ports/dog/vcpkg.json | 4 + .../version-files/ports/duck/portfile.cmake | 1 + .../version-files/ports/duck/vcpkg.json | 4 + .../version-files/ports/mouse/portfile.cmake | 1 + .../version-files/ports/mouse/vcpkg.json | 4 + .../ports_incomplete/cat/portfile.cmake | 1 + .../ports_incomplete/cat/vcpkg.json | 4 + .../ports_incomplete/dog/portfile.cmake | 1 + .../ports_incomplete/dog/vcpkg.json | 5 + .../ports_incomplete/duck/portfile.cmake | 1 + .../ports_incomplete/duck/vcpkg.json | 4 + .../ports_incomplete/ferret/portfile.cmake | 1 + .../ports_incomplete/ferret/vcpkg.json | 4 + .../ports_incomplete/fish/portfile.cmake | 1 + .../ports_incomplete/fish/vcpkg.json | 5 + .../ports_incomplete/mouse/portfile.cmake | 1 + .../ports_incomplete/mouse/vcpkg.json | 4 + toolsrc/include/vcpkg/commands.add-version.h | 13 + .../include/vcpkg/commands.civerifyversions.h | 13 + toolsrc/include/vcpkg/registries.h | 7 + toolsrc/include/vcpkg/vcpkgpaths.h | 2 + toolsrc/src/vcpkg-test/arguments.cpp | 4 + toolsrc/src/vcpkg-test/commands.cpp | 2 + toolsrc/src/vcpkg/commands.add-version.cpp | 383 ++++++++++++++++++ .../src/vcpkg/commands.civerifyversions.cpp | 328 +++++++++++++++ toolsrc/src/vcpkg/commands.cpp | 6 + toolsrc/src/vcpkg/commands.porthistory.cpp | 6 - toolsrc/src/vcpkg/portfileprovider.cpp | 8 +- toolsrc/src/vcpkg/registries.cpp | 86 ++-- toolsrc/src/vcpkg/vcpkgcmdarguments.cpp | 5 + toolsrc/src/vcpkg/vcpkgpaths.cpp | 47 ++- toolsrc/windows-bootstrap/vcpkg.vcxproj | 4 + 49 files changed, 1146 insertions(+), 37 deletions(-) create mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 create mode 100644 scripts/testing/version-files/default-baseline-1/vcpkg.json create mode 100644 scripts/testing/version-files/default-baseline-2/port_versions/z-/zlib.json create mode 100644 scripts/testing/version-files/default-baseline-2/vcpkg.json create mode 100644 scripts/testing/version-files/port_versions/baseline.json create mode 100644 scripts/testing/version-files/port_versions/c-/cat.json create mode 100644 scripts/testing/version-files/port_versions/d-/dog.json create mode 100644 scripts/testing/version-files/port_versions/d-/duck.json create mode 100644 scripts/testing/version-files/port_versions/m-/mouse.json create mode 100644 scripts/testing/version-files/port_versions_incomplete/baseline.json create mode 100644 scripts/testing/version-files/port_versions_incomplete/c-/cat.json create mode 100644 scripts/testing/version-files/port_versions_incomplete/d-/dog.json create mode 100644 scripts/testing/version-files/port_versions_incomplete/f-/fish.json create mode 100644 scripts/testing/version-files/port_versions_incomplete/m-/mouse.json create mode 100644 scripts/testing/version-files/ports/cat/portfile.cmake create mode 100644 scripts/testing/version-files/ports/cat/vcpkg.json create mode 100644 scripts/testing/version-files/ports/dog/portfile.cmake create mode 100644 scripts/testing/version-files/ports/dog/vcpkg.json create mode 100644 scripts/testing/version-files/ports/duck/portfile.cmake create mode 100644 scripts/testing/version-files/ports/duck/vcpkg.json create mode 100644 scripts/testing/version-files/ports/mouse/portfile.cmake create mode 100644 scripts/testing/version-files/ports/mouse/vcpkg.json create mode 100644 scripts/testing/version-files/ports_incomplete/cat/portfile.cmake create mode 100644 scripts/testing/version-files/ports_incomplete/cat/vcpkg.json create mode 100644 scripts/testing/version-files/ports_incomplete/dog/portfile.cmake create mode 100644 scripts/testing/version-files/ports_incomplete/dog/vcpkg.json create mode 100644 scripts/testing/version-files/ports_incomplete/duck/portfile.cmake create mode 100644 scripts/testing/version-files/ports_incomplete/duck/vcpkg.json create mode 100644 scripts/testing/version-files/ports_incomplete/ferret/portfile.cmake create mode 100644 scripts/testing/version-files/ports_incomplete/ferret/vcpkg.json create mode 100644 scripts/testing/version-files/ports_incomplete/fish/portfile.cmake create mode 100644 scripts/testing/version-files/ports_incomplete/fish/vcpkg.json create mode 100644 scripts/testing/version-files/ports_incomplete/mouse/portfile.cmake create mode 100644 scripts/testing/version-files/ports_incomplete/mouse/vcpkg.json create mode 100644 toolsrc/include/vcpkg/commands.add-version.h create mode 100644 toolsrc/include/vcpkg/commands.civerifyversions.h create mode 100644 toolsrc/src/vcpkg/commands.add-version.cpp create mode 100644 toolsrc/src/vcpkg/commands.civerifyversions.cpp diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 new file mode 100644 index 00000000000000..5d61b2101d6c73 --- /dev/null +++ b/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 @@ -0,0 +1,75 @@ +. $PSScriptRoot/../end-to-end-tests-prelude.ps1 + +# Test verify versions +mkdir $VersionFilesRoot +Copy-Item -Recurse "scripts/testing/version-files/port_versions_incomplete" $VersionFilesRoot +$portsRedirectArgsOK = @( + "--feature-flags=versions", + "--x-builtin-ports-root=scripts/testing/version-files/ports", + "--x-builtin-port-versions-dir=scripts/testing/version-files/port_versions" +) +$portsRedirectArgsIncomplete = @( + "--feature-flags=versions", + "--x-builtin-ports-root=scripts/testing/version-files/ports_incomplete", + "--x-builtin-port-versions-dir=$VersionFilesRoot/port_versions_incomplete" +) +$CurrentTest = "x-verify-ci-versions (All files OK)" +Write-Host $CurrentTest +./vcpkg $portsRedirectArgsOK x-ci-verify-versions --verbose +Throw-IfFailed + +$CurrentTest = "x-verify-ci-versions (Incomplete)" +./vcpkg $portsRedirectArgsIncomplete x-ci-verify-versions --verbose +Throw-IfNotFailed + +$CurrentTest = "x-add-version cat" +# Do not fail if there's nothing to update +./vcpkg $portsRedirectArgsIncomplete x-add-version cat +Throw-IfFailed + +$CurrentTest = "x-add-version dog" +# Local version is not in baseline and versions file +./vcpkg $portsRedirectArgsIncomplete x-add-version dog +Throw-IfFailed + +$CurrentTest = "x-add-version duck" +# Missing versions file +./vcpkg $portsRedirectArgsIncomplete x-add-version duck +Throw-IfFailed + +$CurrentTest = "x-add-version ferret" +# Missing versions file and missing baseline entry +./vcpkg $portsRedirectArgsIncomplete x-add-version ferret +Throw-IfFailed + +$CurrentTest = "x-add-version fish (must fail)" +# Discrepancy between local SHA and SHA in fish.json. Requires --overwrite-version. +$out = ./vcpkg $portsRedirectArgsIncomplete x-add-version fish +Throw-IfNotFailed +$CurrentTest = "x-add-version fish --overwrite-version" +./vcpkg $portsRedirectArgsIncomplete x-add-version fish --overwrite-version +Throw-IfFailed + +$CurrentTest = "x-add-version mouse" +# Missing baseline entry +./vcpkg $portsRedirectArgsIncomplete x-add-version mouse +Throw-IfFailed +# Validate changes +./vcpkg $portsRedirectArgsIncomplete x-ci-verify-versions --verbose +Throw-IfFailed + +$CurrentTest = "default baseline" +$out = ./vcpkg $commonArgs "--feature-flags=versions" install --x-manifest-root=scripts/testing/version-files/default-baseline-1 +Throw-IfNotFailed +# if ($out -notmatch "Error: while checking out baseline" -or $out -notmatch " does not exist in ") +# { +# $out +# throw "Expected to fail due to missing baseline" +# } + +git fetch https://github.com/vicroms/test-registries +$CurrentTest = "default baseline" +./vcpkg $commonArgs "--feature-flags=versions" install ` + "--x-manifest-root=scripts/testing/version-files/default-baseline-2" ` + "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions" +Throw-IfFailed diff --git a/scripts/testing/version-files/default-baseline-1/vcpkg.json b/scripts/testing/version-files/default-baseline-1/vcpkg.json new file mode 100644 index 00000000000000..f6d902393d3271 --- /dev/null +++ b/scripts/testing/version-files/default-baseline-1/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "default-baseline-test", + "version-string": "0", + "$x-default-baseline": "fca18ba3572f8aebe3b8158c359db62a7e26134e", + "dependencies": [ + "zlib" + ] +} \ No newline at end of file diff --git a/scripts/testing/version-files/default-baseline-2/port_versions/z-/zlib.json b/scripts/testing/version-files/default-baseline-2/port_versions/z-/zlib.json new file mode 100644 index 00000000000000..f5ee7cb9dc66d6 --- /dev/null +++ b/scripts/testing/version-files/default-baseline-2/port_versions/z-/zlib.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "7bb2b2f3783303a4dd41163553fe4cc103dc9262", + "version-string": "1.2.11", + "port-version": 9 + }, + { + "git-tree": "4927735fa9baca564ebddf6e6880de344b20d7a8", + "version-string": "1.2.11", + "port-version": 8 + } + ] +} \ No newline at end of file diff --git a/scripts/testing/version-files/default-baseline-2/vcpkg.json b/scripts/testing/version-files/default-baseline-2/vcpkg.json new file mode 100644 index 00000000000000..1e41002ff99bf5 --- /dev/null +++ b/scripts/testing/version-files/default-baseline-2/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "default-baseline-test", + "version-string": "0", + "$x-default-baseline": "cbd5a68012471f820b7cf28d618199b4a4d89c58", + "dependencies": [ + "zlib" + ] +} \ No newline at end of file diff --git a/scripts/testing/version-files/port_versions/baseline.json b/scripts/testing/version-files/port_versions/baseline.json new file mode 100644 index 00000000000000..bfe49f98465648 --- /dev/null +++ b/scripts/testing/version-files/port_versions/baseline.json @@ -0,0 +1,20 @@ +{ + "default": { + "cat": { + "version-string": "1.0", + "port-version": 0 + }, + "dog": { + "version-string": "2001-01-01", + "port-version": 0 + }, + "duck": { + "version-string": "mallard", + "port-version": 0 + }, + "mouse": { + "version-string": "1.0.0", + "port-version": 0 + } + } +} diff --git a/scripts/testing/version-files/port_versions/c-/cat.json b/scripts/testing/version-files/port_versions/c-/cat.json new file mode 100644 index 00000000000000..e39cd6d4e8cb48 --- /dev/null +++ b/scripts/testing/version-files/port_versions/c-/cat.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5dd257451526d5b9e560f5f35d7029ba40d88587", + "version": "1.0", + "port-version": 0 + } + ] +} diff --git a/scripts/testing/version-files/port_versions/d-/dog.json b/scripts/testing/version-files/port_versions/d-/dog.json new file mode 100644 index 00000000000000..49c086c389f7a2 --- /dev/null +++ b/scripts/testing/version-files/port_versions/d-/dog.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e170a2ed0da7ba5d434c4a0a98ffd7a3159e3200", + "version-date": "2001-01-01", + "port-version": 0 + } + ] +} diff --git a/scripts/testing/version-files/port_versions/d-/duck.json b/scripts/testing/version-files/port_versions/d-/duck.json new file mode 100644 index 00000000000000..4f4b209e22a33c --- /dev/null +++ b/scripts/testing/version-files/port_versions/d-/duck.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0a52a9d722c75b3bfe47d5f5db6c9eb1a64af156", + "version-string": "mallard", + "port-version": 0 + } + ] +} diff --git a/scripts/testing/version-files/port_versions/m-/mouse.json b/scripts/testing/version-files/port_versions/m-/mouse.json new file mode 100644 index 00000000000000..139c8450fac4a1 --- /dev/null +++ b/scripts/testing/version-files/port_versions/m-/mouse.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "55ed624191e0a1905bd97af29fdf6a1d7f4e6d7c", + "version-semver": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/scripts/testing/version-files/port_versions_incomplete/baseline.json b/scripts/testing/version-files/port_versions_incomplete/baseline.json new file mode 100644 index 00000000000000..aadd634fc9e022 --- /dev/null +++ b/scripts/testing/version-files/port_versions_incomplete/baseline.json @@ -0,0 +1,20 @@ +{ + "default": { + "cat": { + "version-string": "1.0", + "port-version": 0 + }, + "dog": { + "version-string": "2001-01-01", + "port-version": 0 + }, + "duck": { + "version-string": "mallard", + "port-version": 0 + }, + "fish": { + "version-string": "1.0.0", + "port-version": 0 + } + } +} diff --git a/scripts/testing/version-files/port_versions_incomplete/c-/cat.json b/scripts/testing/version-files/port_versions_incomplete/c-/cat.json new file mode 100644 index 00000000000000..e39cd6d4e8cb48 --- /dev/null +++ b/scripts/testing/version-files/port_versions_incomplete/c-/cat.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5dd257451526d5b9e560f5f35d7029ba40d88587", + "version": "1.0", + "port-version": 0 + } + ] +} diff --git a/scripts/testing/version-files/port_versions_incomplete/d-/dog.json b/scripts/testing/version-files/port_versions_incomplete/d-/dog.json new file mode 100644 index 00000000000000..49c086c389f7a2 --- /dev/null +++ b/scripts/testing/version-files/port_versions_incomplete/d-/dog.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e170a2ed0da7ba5d434c4a0a98ffd7a3159e3200", + "version-date": "2001-01-01", + "port-version": 0 + } + ] +} diff --git a/scripts/testing/version-files/port_versions_incomplete/f-/fish.json b/scripts/testing/version-files/port_versions_incomplete/f-/fish.json new file mode 100644 index 00000000000000..dc457aabde6440 --- /dev/null +++ b/scripts/testing/version-files/port_versions_incomplete/f-/fish.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cf3be634f203c1b4152b65ec7700d5695a1fca5c", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} \ No newline at end of file diff --git a/scripts/testing/version-files/port_versions_incomplete/m-/mouse.json b/scripts/testing/version-files/port_versions_incomplete/m-/mouse.json new file mode 100644 index 00000000000000..139c8450fac4a1 --- /dev/null +++ b/scripts/testing/version-files/port_versions_incomplete/m-/mouse.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "55ed624191e0a1905bd97af29fdf6a1d7f4e6d7c", + "version-semver": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/scripts/testing/version-files/ports/cat/portfile.cmake b/scripts/testing/version-files/ports/cat/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/testing/version-files/ports/cat/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports/cat/vcpkg.json b/scripts/testing/version-files/ports/cat/vcpkg.json new file mode 100644 index 00000000000000..b87e4a2dac957d --- /dev/null +++ b/scripts/testing/version-files/ports/cat/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "cat", + "version": "1.0" +} \ No newline at end of file diff --git a/scripts/testing/version-files/ports/dog/portfile.cmake b/scripts/testing/version-files/ports/dog/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/testing/version-files/ports/dog/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports/dog/vcpkg.json b/scripts/testing/version-files/ports/dog/vcpkg.json new file mode 100644 index 00000000000000..028447b3e3aec4 --- /dev/null +++ b/scripts/testing/version-files/ports/dog/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "dog", + "version-date": "2001-01-01" +} \ No newline at end of file diff --git a/scripts/testing/version-files/ports/duck/portfile.cmake b/scripts/testing/version-files/ports/duck/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/testing/version-files/ports/duck/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports/duck/vcpkg.json b/scripts/testing/version-files/ports/duck/vcpkg.json new file mode 100644 index 00000000000000..d780d01bfc83ef --- /dev/null +++ b/scripts/testing/version-files/ports/duck/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "duck", + "version-string": "mallard" +} \ No newline at end of file diff --git a/scripts/testing/version-files/ports/mouse/portfile.cmake b/scripts/testing/version-files/ports/mouse/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/testing/version-files/ports/mouse/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports/mouse/vcpkg.json b/scripts/testing/version-files/ports/mouse/vcpkg.json new file mode 100644 index 00000000000000..fd6cab451f0cf1 --- /dev/null +++ b/scripts/testing/version-files/ports/mouse/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "mouse", + "version-semver": "1.0.0" +} \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/cat/portfile.cmake b/scripts/testing/version-files/ports_incomplete/cat/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/testing/version-files/ports_incomplete/cat/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/cat/vcpkg.json b/scripts/testing/version-files/ports_incomplete/cat/vcpkg.json new file mode 100644 index 00000000000000..b87e4a2dac957d --- /dev/null +++ b/scripts/testing/version-files/ports_incomplete/cat/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "cat", + "version": "1.0" +} \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/dog/portfile.cmake b/scripts/testing/version-files/ports_incomplete/dog/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/testing/version-files/ports_incomplete/dog/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/dog/vcpkg.json b/scripts/testing/version-files/ports_incomplete/dog/vcpkg.json new file mode 100644 index 00000000000000..65465b9408ef43 --- /dev/null +++ b/scripts/testing/version-files/ports_incomplete/dog/vcpkg.json @@ -0,0 +1,5 @@ +{ + "name": "dog", + "version-date": "2001-01-01", + "port-version": 1 +} \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/duck/portfile.cmake b/scripts/testing/version-files/ports_incomplete/duck/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/testing/version-files/ports_incomplete/duck/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/duck/vcpkg.json b/scripts/testing/version-files/ports_incomplete/duck/vcpkg.json new file mode 100644 index 00000000000000..d780d01bfc83ef --- /dev/null +++ b/scripts/testing/version-files/ports_incomplete/duck/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "duck", + "version-string": "mallard" +} \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/ferret/portfile.cmake b/scripts/testing/version-files/ports_incomplete/ferret/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/testing/version-files/ports_incomplete/ferret/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/ferret/vcpkg.json b/scripts/testing/version-files/ports_incomplete/ferret/vcpkg.json new file mode 100644 index 00000000000000..1b4b5c2c1b5c98 --- /dev/null +++ b/scripts/testing/version-files/ports_incomplete/ferret/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "ferret", + "version": "1" +} \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/fish/portfile.cmake b/scripts/testing/version-files/ports_incomplete/fish/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/testing/version-files/ports_incomplete/fish/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/fish/vcpkg.json b/scripts/testing/version-files/ports_incomplete/fish/vcpkg.json new file mode 100644 index 00000000000000..f67c10a5a0cc50 --- /dev/null +++ b/scripts/testing/version-files/ports_incomplete/fish/vcpkg.json @@ -0,0 +1,5 @@ +{ + "name": "fish", + "version-string": "1.0.0", + "description": "This description causes an intentional discrepancy between the local SHA and the SHA in fish.json for version 1.0.0" +} \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/mouse/portfile.cmake b/scripts/testing/version-files/ports_incomplete/mouse/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/testing/version-files/ports_incomplete/mouse/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/mouse/vcpkg.json b/scripts/testing/version-files/ports_incomplete/mouse/vcpkg.json new file mode 100644 index 00000000000000..fd6cab451f0cf1 --- /dev/null +++ b/scripts/testing/version-files/ports_incomplete/mouse/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "mouse", + "version-semver": "1.0.0" +} \ No newline at end of file diff --git a/toolsrc/include/vcpkg/commands.add-version.h b/toolsrc/include/vcpkg/commands.add-version.h new file mode 100644 index 00000000000000..8b9e0336e9521f --- /dev/null +++ b/toolsrc/include/vcpkg/commands.add-version.h @@ -0,0 +1,13 @@ +#pragma once + +#include + +namespace vcpkg::Commands::AddVersion +{ + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths); + + struct AddVersionCommand : PathsCommand + { + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) const override; + }; +} \ No newline at end of file diff --git a/toolsrc/include/vcpkg/commands.civerifyversions.h b/toolsrc/include/vcpkg/commands.civerifyversions.h new file mode 100644 index 00000000000000..17d8f56139ba40 --- /dev/null +++ b/toolsrc/include/vcpkg/commands.civerifyversions.h @@ -0,0 +1,13 @@ +#pragma once + +#include + +namespace vcpkg::Commands::CIVerifyVersions +{ + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths); + + struct CIVerifyVersionsCommand : PathsCommand + { + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) const override; + }; +} \ No newline at end of file diff --git a/toolsrc/include/vcpkg/registries.h b/toolsrc/include/vcpkg/registries.h index 006bc789d17c97..c36c0179dc6ad4 100644 --- a/toolsrc/include/vcpkg/registries.h +++ b/toolsrc/include/vcpkg/registries.h @@ -9,8 +9,10 @@ #include #include +#include #include +#include #include #include #include @@ -103,4 +105,9 @@ namespace vcpkg std::unique_ptr>> get_registry_array_deserializer( const fs::path& configuration_directory); + + ExpectedS>> get_builtin_versions(const VcpkgPaths& paths, + StringView port_name); + + ExpectedS>> get_builtin_baseline(const VcpkgPaths& paths); } diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index 1f562c151773f1..a175d51e219c1b 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -122,6 +122,8 @@ namespace vcpkg fs::path git_checkout_port(Files::Filesystem& filesystem, StringView port_name, StringView git_tree) const; ExpectedS git_show(const std::string& treeish, const fs::path& dot_git_dir) const; + ExpectedS>> git_get_local_port_treeish_map() const; + Optional get_manifest() const; Optional get_manifest_path() const; const Configuration& get_configuration() const; diff --git a/toolsrc/src/vcpkg-test/arguments.cpp b/toolsrc/src/vcpkg-test/arguments.cpp index f5cbf7b15eacba..27fa74b8df1e3c 100644 --- a/toolsrc/src/vcpkg-test/arguments.cpp +++ b/toolsrc/src/vcpkg-test/arguments.cpp @@ -15,6 +15,7 @@ TEST_CASE ("VcpkgCmdArguments from lowercase argument sequence", "[arguments]") "C:\\vcpkg", "--x-scripts-root=C:\\scripts", "--x-builtin-ports-root=C:\\ports", + "--x-builtin-port-versions-dir=C:\\port_versions", "--debug", "--sendmetrics", "--printmetrics", @@ -27,6 +28,7 @@ TEST_CASE ("VcpkgCmdArguments from lowercase argument sequence", "[arguments]") REQUIRE(*v.vcpkg_root_dir == "C:\\vcpkg"); REQUIRE(*v.scripts_root_dir == "C:\\scripts"); REQUIRE(*v.builtin_ports_root_dir == "C:\\ports"); + REQUIRE(*v.builtin_port_versions_dir == "C:\\port_versions"); REQUIRE(v.debug); REQUIRE(*v.debug.get()); REQUIRE(v.send_metrics); @@ -49,6 +51,7 @@ TEST_CASE ("VcpkgCmdArguments from uppercase argument sequence", "[arguments]") "C:\\vcpkg", "--X-SCRIPTS-ROOT=C:\\scripts", "--X-BUILTIN-PORTS-ROOT=C:\\ports", + "--X-BUILTIN-PORT-VERSIONS-DIR=C:\\port_versions", "--DEBUG", "--SENDMETRICS", "--PRINTMETRICS", @@ -61,6 +64,7 @@ TEST_CASE ("VcpkgCmdArguments from uppercase argument sequence", "[arguments]") REQUIRE(*v.vcpkg_root_dir == "C:\\vcpkg"); REQUIRE(*v.scripts_root_dir == "C:\\scripts"); REQUIRE(*v.builtin_ports_root_dir == "C:\\ports"); + REQUIRE(*v.builtin_port_versions_dir == "C:\\port_versions"); REQUIRE(v.debug); REQUIRE(*v.debug.get()); REQUIRE(v.send_metrics); diff --git a/toolsrc/src/vcpkg-test/commands.cpp b/toolsrc/src/vcpkg-test/commands.cpp index 38346291ce3a35..e417505ad1cef8 100644 --- a/toolsrc/src/vcpkg-test/commands.cpp +++ b/toolsrc/src/vcpkg-test/commands.cpp @@ -60,6 +60,8 @@ TEST_CASE ("get_available_paths_commands works", "[commands]") "x-history", "x-package-info", "x-vsinstances", + "x-ci-verify-versions", + "x-add-version", }); } diff --git a/toolsrc/src/vcpkg/commands.add-version.cpp b/toolsrc/src/vcpkg/commands.add-version.cpp new file mode 100644 index 00000000000000..c650fa9dd2a105 --- /dev/null +++ b/toolsrc/src/vcpkg/commands.add-version.cpp @@ -0,0 +1,383 @@ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace vcpkg; + +namespace +{ + using VersionGitTree = std::pair; + + void insert_version_to_json_object(Json::Object& obj, const VersionT& version) + { + obj.insert("version-string", Json::Value::string(version.text())); + obj.insert("port-version", Json::Value::integer(version.port_version())); + } + + static Json::Object serialize_baseline(const std::map>& baseline) + { + Json::Object port_entries_obj; + for (auto&& kv_pair : baseline) + { + Json::Object baseline_version_obj; + insert_version_to_json_object(baseline_version_obj, kv_pair.second); + port_entries_obj.insert(kv_pair.first, baseline_version_obj); + } + + Json::Object baseline_obj; + baseline_obj.insert("default", port_entries_obj); + return baseline_obj; + } + + static Json::Object serialize_versions(const std::vector& versions) + { + Json::Array versions_array; + for (auto&& version : versions) + { + Json::Object version_obj; + version_obj.insert("git-tree", Json::Value::string(version.second)); + insert_version_to_json_object(version_obj, version.first); + versions_array.push_back(std::move(version_obj)); + } + + Json::Object output_object; + output_object.insert("versions", versions_array); + return output_object; + } + + static void write_baseline_file(Files::Filesystem& fs, + const std::map>& baseline_map, + const fs::path& output_path) + { + auto backup_path = fs::u8path(Strings::concat(fs::u8string(output_path), ".backup")); + if (fs.exists(output_path)) + { + fs.rename(output_path, backup_path, VCPKG_LINE_INFO); + fs.remove(output_path, VCPKG_LINE_INFO); + } + + std::error_code ec; + fs.write_contents(output_path, Json::stringify(serialize_baseline(baseline_map), {}), ec); + if (ec) + { + System::printf( + System::Color::error, "Error: Couldn't write baseline file to %s.", fs::u8string(output_path)); + if (fs.exists(backup_path)) + { + fs.rename(backup_path, output_path, VCPKG_LINE_INFO); + } + Checks::exit_fail(VCPKG_LINE_INFO); + } + if (fs.exists(backup_path)) + { + fs.remove(backup_path, VCPKG_LINE_INFO); + } + } + + static void write_versions_file(Files::Filesystem& fs, + const std::vector& versions, + const fs::path& output_path) + { + auto backup_path = fs::u8path(Strings::concat(fs::u8string(output_path), ".backup")); + if (fs.exists(output_path)) + { + fs.rename(output_path, backup_path, VCPKG_LINE_INFO); + fs.remove(output_path, VCPKG_LINE_INFO); + } + + std::error_code ec; + fs.create_directories(output_path.parent_path(), VCPKG_LINE_INFO); + fs.write_contents(output_path, Json::stringify(serialize_versions(versions), {}), ec); + if (ec) + { + System::printf( + System::Color::error, "Error: Couldn't write versions file to %s.", fs::u8string(output_path)); + if (fs.exists(backup_path)) + { + fs.rename(backup_path, output_path, VCPKG_LINE_INFO); + } + Checks::exit_fail(VCPKG_LINE_INFO); + } + if (fs.exists(backup_path)) + { + fs.remove(backup_path, VCPKG_LINE_INFO); + } + } + + static void update_baseline_version(const VcpkgPaths& paths, + const std::string& port_name, + const VersionT& version, + const fs::path& baseline_path, + bool print_success) + { + bool is_new_file = false; + auto& fs = paths.get_filesystem(); + auto baseline_map = [&]() -> std::map> { + if (!fs.exists(VCPKG_LINE_INFO, baseline_path)) + { + is_new_file = true; + std::map> ret; + return ret; + } + auto maybe_baseline_map = vcpkg::get_builtin_baseline(paths); + return maybe_baseline_map.value_or_exit(VCPKG_LINE_INFO); + }(); + + auto it = baseline_map.find(port_name); + if (it != baseline_map.end()) + { + auto& baseline_version = it->second; + if (baseline_version == version) + { + if (print_success) + { + System::printf(System::Color::success, + "Version `%s` is already in `%s`\n", + version, + fs::u8string(baseline_path)); + } + return; + } + baseline_version = version; + } + else + { + baseline_map.emplace(port_name, version); + } + + write_baseline_file(fs, baseline_map, baseline_path); + if (print_success) + { + System::printf(System::Color::success, + "Added version `%s` to `%s`%s.\n", + version.to_string(), + fs::u8string(baseline_path), + is_new_file ? " (new file)" : ""); + } + return; + } + + static void update_version_db_file(const VcpkgPaths& paths, + const std::string& port_name, + const VersionT& version, + const std::string& git_tree, + const fs::path& version_db_file_path, + bool overwrite_version, + bool print_success, + bool keep_going) + { + auto& fs = paths.get_filesystem(); + if (!fs.exists(VCPKG_LINE_INFO, version_db_file_path)) + { + std::vector new_entry{{version, git_tree}}; + write_versions_file(fs, new_entry, version_db_file_path); + if (print_success) + { + System::printf(System::Color::success, + "Added version `%s` to `%s` (new file).\n", + version.to_string(), + fs::u8string(version_db_file_path)); + } + return; + } + + auto maybe_versions = get_builtin_versions(paths, port_name); + if (auto versions = maybe_versions.get()) + { + const auto& versions_end = versions->end(); + + auto found_same_sha = std::find_if( + versions->begin(), versions_end, [&](auto&& entry) -> bool { return entry.second == git_tree; }); + if (found_same_sha != versions_end) + { + if (found_same_sha->first == version) + { + if (print_success) + { + System::printf(System::Color::success, + "Version `%s` is already in `%s`\n", + version.to_string(), + fs::u8string(version_db_file_path)); + } + return; + } + System::printf(System::Color::warning, + "Warning: Local port files SHA is the same as version `%s` in `%s`.\n" + "-- SHA: %s\n" + "-- Did you remember to commit your changes?\n" + "***No files were updated.***\n", + found_same_sha->first.to_string(), + fs::u8string(version_db_file_path), + git_tree); + if (keep_going) return; + Checks::exit_fail(VCPKG_LINE_INFO); + } + + auto it = std::find_if( + versions->begin(), versions_end, [&](auto&& entry) -> bool { return entry.first == version; }); + + if (it != versions_end) + { + if (!overwrite_version) + { + System::printf(System::Color::error, + "Error: Local changes detected for %s but no changes to version or port version.\n" + "-- Version: %s\n" + "-- Old SHA: %s\n" + "-- New SHA: %s\n" + "-- Did you remember to update the version or port version?\n" + "-- Pass `--overwrite-version` to bypass this check.\n" + "***No files were updated.***\n", + port_name, + version.to_string(), + it->second, + git_tree); + if (keep_going) return; + Checks::exit_fail(VCPKG_LINE_INFO); + } + + it->first = version; + it->second = git_tree; + } + else + { + versions->insert(versions->begin(), std::make_pair(version, git_tree)); + } + + write_versions_file(fs, *versions, version_db_file_path); + if (print_success) + { + System::printf(System::Color::success, + "Added version `%s` to `%s`.\n", + version.to_string(), + fs::u8string(version_db_file_path)); + } + return; + } + + System::printf(System::Color::error, + "Error: Unable to parse versions file %s.\n%s\n", + fs::u8string(version_db_file_path), + maybe_versions.error()); + Checks::exit_fail(VCPKG_LINE_INFO); + } +} + +namespace vcpkg::Commands::AddVersion +{ + static constexpr StringLiteral OPTION_ALL = "all"; + static constexpr StringLiteral OPTION_OVERWRITE_VERSION = "overwrite-version"; + static constexpr StringLiteral OPTION_VERBOSE = "verbose"; + + const CommandSwitch COMMAND_SWITCHES[] = { + {OPTION_ALL, "Process versions for all ports."}, + {OPTION_OVERWRITE_VERSION, "Overwrite `git-tree` of an existing version."}, + {OPTION_VERBOSE, "Print success messages instead of just errors."}, + }; + + const CommandStructure COMMAND_STRUCTURE{ + create_example_string(R"###(x-add-version )###"), + 0, + 1, + {{COMMAND_SWITCHES}, {}, {}}, + nullptr, + }; + + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) + { + auto parsed_args = args.parse_arguments(COMMAND_STRUCTURE); + const bool add_all = Util::Sets::contains(parsed_args.switches, OPTION_ALL); + const bool overwrite_version = Util::Sets::contains(parsed_args.switches, OPTION_OVERWRITE_VERSION); + const bool verbose = Util::Sets::contains(parsed_args.switches, OPTION_VERBOSE); + + auto& fs = paths.get_filesystem(); + auto baseline_path = paths.builtin_port_versions / fs::u8path("baseline.json"); + if (!fs.exists(VCPKG_LINE_INFO, baseline_path)) + { + System::printf( + System::Color::error, "Error: Couldn't find required file `%s`\n.", fs::u8string(baseline_path)); + Checks::exit_fail(VCPKG_LINE_INFO); + } + + std::vector port_names; + if (!args.command_arguments.empty()) + { + if (add_all) + { + System::printf(System::Color::warning, + "Warning: Ignoring option `--%s` since a port name argument was provided.\n", + OPTION_ALL); + } + port_names.emplace_back(args.command_arguments[0]); + } + else + { + if (!add_all) + { + System::printf(System::Color::error, + "Error: Use option `--%s` to update version files for all ports at once.\n", + OPTION_ALL); + Checks::exit_fail(VCPKG_LINE_INFO); + } + + for (auto&& port_dir : fs::directory_iterator(paths.builtin_ports_directory())) + { + port_names.emplace_back(fs::u8string(port_dir.path().stem())); + } + } + + // Get tree-ish from local repository state. + auto maybe_git_tree_map = paths.git_get_local_port_treeish_map(); + auto git_tree_map = maybe_git_tree_map.value_or_exit(VCPKG_LINE_INFO); + + for (auto&& port_name : port_names) + { + // Get version information of the local port + auto maybe_scf = Paragraphs::try_load_port(fs, paths.builtin_ports_directory() / fs::u8path(port_name)); + if (!maybe_scf.has_value()) + { + if (add_all) continue; + System::printf(System::Color::error, "Error: Couldn't load port `%s`.", port_name); + Checks::exit_fail(VCPKG_LINE_INFO); + } + + const auto& scf = maybe_scf.value_or_exit(VCPKG_LINE_INFO); + const auto& versiont = scf->to_versiont(); + + auto git_tree_it = git_tree_map.find(port_name); + if (git_tree_it == git_tree_map.end()) + { + System::printf(System::Color::warning, + "Warning: No local Git SHA was found for port `%s`.\n" + "-- Did you remember to commit your changes?\n" + "***No files were updated.***\n", + port_name); + if (add_all) continue; + Checks::exit_fail(VCPKG_LINE_INFO); + } + const auto& git_tree = git_tree_it->second; + + auto port_versions_path = + paths.builtin_port_versions / Strings::concat(port_name[0], '-') / Strings::concat(port_name, ".json"); + update_version_db_file( + paths, port_name, versiont, git_tree, port_versions_path, overwrite_version, verbose, add_all); + update_baseline_version(paths, port_name, versiont, baseline_path, verbose); + } + Checks::exit_success(VCPKG_LINE_INFO); + } + + void AddVersionCommand::perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) const + { + AddVersion::perform_and_exit(args, paths); + } +} \ No newline at end of file diff --git a/toolsrc/src/vcpkg/commands.civerifyversions.cpp b/toolsrc/src/vcpkg/commands.civerifyversions.cpp new file mode 100644 index 00000000000000..a0de254c532ee4 --- /dev/null +++ b/toolsrc/src/vcpkg/commands.civerifyversions.cpp @@ -0,0 +1,328 @@ +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +namespace +{ + using namespace vcpkg; + +} + +namespace vcpkg::Commands::CIVerifyVersions +{ + static constexpr StringLiteral OPTION_EXCLUDE = "exclude"; + static constexpr StringLiteral OPTION_VERBOSE = "verbose"; + static constexpr StringLiteral OPTION_VERIFY_GIT_TREES = "verify-git-trees"; + + static constexpr CommandSwitch VERIFY_VERSIONS_SWITCHES[]{ + {OPTION_VERBOSE, "Print result for each port instead of just errors."}, + {OPTION_VERIFY_GIT_TREES, "Verify that each git tree object matches its declared version (this is very slow)"}, + }; + + static constexpr CommandSetting VERIFY_VERSIONS_SETTINGS[] = { + {OPTION_EXCLUDE, "Comma-separated list of ports to skip"}, + }; + + const CommandStructure COMMAND_STRUCTURE{ + create_example_string(R"###(x-ci-verify-versions)###"), + 0, + SIZE_MAX, + {{VERIFY_VERSIONS_SWITCHES}, {VERIFY_VERSIONS_SETTINGS}, {}}, + nullptr, + }; + + static ExpectedS verify_version_in_db(const VcpkgPaths& paths, + const std::map> baseline, + const std::string& port_name, + const fs::path& port_path, + const fs::path& versions_file_path, + const std::string& local_git_tree, + bool verify_git_trees) + { + auto maybe_versions = vcpkg::get_builtin_versions(paths, port_name); + if (!maybe_versions.has_value()) + { + return { + Strings::format( + "Error: Cannot parse `%s`.\n\t%s", fs::u8string(versions_file_path), maybe_versions.error()), + expected_right_tag, + }; + } + + const auto& versions = maybe_versions.value_or_exit(VCPKG_LINE_INFO); + if (versions.empty()) + { + return { + Strings::format("Error: File `%s` contains no versions.", fs::u8string(versions_file_path)), + expected_right_tag, + }; + } + + if (verify_git_trees) + { + for (auto&& version_entry : versions) + { + bool version_ok = false; + for (const std::string& control_file : {"CONTROL", "vcpkg.json"}) + { + auto treeish = Strings::concat(version_entry.second, ':', control_file); + auto maybe_file = paths.git_show(Strings::concat(treeish), paths.root / fs::u8path(".git")); + if (!maybe_file.has_value()) continue; + + const auto& file = maybe_file.value_or_exit(VCPKG_LINE_INFO); + auto maybe_scf = Paragraphs::try_load_port_text(file, treeish, control_file == "vcpkg.json"); + if (!maybe_scf.has_value()) + { + return { + Strings::format("Error: Unable to parse `%s` used in version `%s`.\n%s\n", + treeish, + version_entry.first.to_string(), + maybe_scf.error()->error), + expected_right_tag, + }; + } + + const auto& scf = maybe_scf.value_or_exit(VCPKG_LINE_INFO); + auto&& git_tree_version = scf.get()->to_versiont(); + if (version_entry.first != git_tree_version) + { + return { + Strings::format("Error: Version in git-tree `%s` does not match version in file " + "`%s`.\n\tgit-tree version: %s\n\t file version: %s\n", + version_entry.second, + fs::u8string(versions_file_path), + git_tree_version.to_string(), + version_entry.first.to_string()), + expected_right_tag, + }; + } + version_ok = true; + break; + } + + if (!version_ok) + { + return { + Strings::format("Error: The git-tree `%s` for version `%s` in `%s` does not contain a " + "CONTROL file or vcpkg.json file.", + version_entry.second, + version_entry.first, + fs::u8string(versions_file_path)), + expected_right_tag, + }; + } + } + } + + const auto& top_entry = versions.front(); + + auto maybe_scf = Paragraphs::try_load_port(paths.get_filesystem(), port_path); + if (!maybe_scf.has_value()) + { + return { + Strings::format("Error: Cannot load port `%s`.\n\t%s", port_name, maybe_scf.error()->error), + expected_right_tag, + }; + } + + const auto found_version = maybe_scf.value_or_exit(VCPKG_LINE_INFO)->to_versiont(); + if (top_entry.first != found_version) + { + auto versions_end = versions.end(); + auto it = std::find_if( + versions.begin(), versions_end, [&](auto&& entry) { return entry.first == found_version; }); + if (it != versions_end) + { + return { + Strings::format("Error: Version `%s` found but is not the top entry in `%s`.", + found_version, + fs::u8string(versions_file_path)), + expected_right_tag, + }; + } + else + { + return { + Strings::format( + "Error: Version `%s` not found in `%s`.", found_version, fs::u8string(versions_file_path)), + expected_right_tag, + }; + } + } + + if (local_git_tree != top_entry.second) + { + return { + Strings::format("Error: Git tree-ish object for version `%s` in `%s` does not match local port files.\n" + "\tLocal SHA: %s\n" + "\t File SHA: %s", + found_version, + fs::u8string(versions_file_path), + local_git_tree, + top_entry.second), + expected_right_tag, + }; + } + + auto maybe_baseline = baseline.find(port_name); + if (maybe_baseline == baseline.end()) + { + return { + Strings::format("Error: Couldn't find baseline version for port `%s`.", port_name), + expected_right_tag, + }; + } + + auto&& baseline_version = maybe_baseline->second; + if (baseline_version != top_entry.first) + { + return { + Strings::format("Error: The baseline version for port `%s` doesn't match the latest version.\n" + "\tBaseline version: %s\n" + "\t Latest version: %s (%s)", + port_name, + baseline_version, + top_entry.first, + fs::u8string(versions_file_path)), + expected_right_tag, + }; + } + + if (local_git_tree != top_entry.second) + { + return { + Strings::format("Error: Git tree-ish object for version `%s` in `%s` does not match local port files.\n" + "\tLocal SHA: %s\n" + "\t File SHA: %s", + found_version, + fs::u8string(versions_file_path), + local_git_tree, + top_entry.second), + expected_right_tag, + }; + } + + return { + Strings::format("OK: %s\t%s -> %s\n", top_entry.second, port_name, top_entry.first), + expected_left_tag, + }; + } + + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) + { + auto parsed_args = args.parse_arguments(COMMAND_STRUCTURE); + + bool verbose = Util::Sets::contains(parsed_args.switches, OPTION_VERBOSE); + bool verify_git_trees = Util::Sets::contains(parsed_args.switches, OPTION_VERIFY_GIT_TREES); + + std::set exclusion_set; + auto settings = parsed_args.settings; + auto it_exclusions = settings.find(OPTION_EXCLUDE); + if (it_exclusions != settings.end()) + { + auto exclusions = Strings::split(it_exclusions->second, ','); + exclusion_set.insert(exclusions.begin(), exclusions.end()); + } + + auto maybe_port_git_tree_map = paths.git_get_local_port_treeish_map(); + Checks::check_exit(VCPKG_LINE_INFO, + maybe_port_git_tree_map.has_value(), + "Error: Failed to obtain git treeish objects for local ports.\n%s", + maybe_port_git_tree_map.error()); + auto port_git_tree_map = maybe_port_git_tree_map.value_or_exit(VCPKG_LINE_INFO); + + // Baseline is required. + auto baseline = get_builtin_baseline(paths).value_or_exit(VCPKG_LINE_INFO); + auto& fs = paths.get_filesystem(); + std::set errors; + for (const auto& dir : fs::directory_iterator(paths.builtin_ports_directory())) + { + const auto& port_path = dir.path(); + + auto&& port_name = fs::u8string(port_path.stem()); + if (Util::Sets::contains(exclusion_set, port_name)) + { + if (verbose) System::printf("SKIP: %s\n", port_name); + continue; + } + auto git_tree_it = port_git_tree_map.find(port_name); + if (git_tree_it == port_git_tree_map.end()) + { + System::printf(System::Color::error, "FAIL: %s\n", port_name); + errors.emplace(Strings::format("Error: Missing local git tree object for port `%s`.", port_name)); + continue; + } + auto git_tree = git_tree_it->second; + + auto control_path = port_path / fs::u8path("CONTROL"); + auto manifest_path = port_path / fs::u8path("vcpkg.json"); + auto manifest_exists = fs.exists(manifest_path); + auto control_exists = fs.exists(control_path); + + if (manifest_exists && control_exists) + { + System::printf(System::Color::error, "FAIL: %s\n", port_name); + errors.emplace( + Strings::format("Error: Both a manifest file and a CONTROL file exist in port directory: %s", + fs::u8string(port_path))); + continue; + } + + if (!manifest_exists && !control_exists) + { + System::printf(System::Color::error, "FAIL: %s\n", port_name); + errors.emplace(Strings::format("Error: No manifest file or CONTROL file exist in port directory: %s", + fs::u8string(port_path))); + continue; + } + + auto versions_file_path = + paths.builtin_port_versions / Strings::concat(port_name[0], '-') / Strings::concat(port_name, ".json"); + if (!fs.exists(versions_file_path)) + { + System::printf(System::Color::error, "FAIL: %s\n", port_name); + errors.emplace(Strings::format("Error: Missing versions file for `%s`. Expected at `%s`.", + port_name, + fs::u8string(versions_file_path))); + continue; + } + + auto maybe_ok = verify_version_in_db( + paths, baseline, port_name, port_path, versions_file_path, git_tree, verify_git_trees); + + if (!maybe_ok.has_value()) + { + System::printf(System::Color::error, "FAIL: %s\n", port_name); + errors.emplace(maybe_ok.error()); + continue; + } + + if (verbose) System::printf("%s", maybe_ok.value_or_exit(VCPKG_LINE_INFO)); + } + + if (!errors.empty()) + { + System::print2(System::Color::error, "Found the following errors:\n"); + for (auto&& error : errors) + { + System::printf(System::Color::error, "%s\n", error); + } + Checks::exit_fail(VCPKG_LINE_INFO); + } + Checks::exit_success(VCPKG_LINE_INFO); + } + + void CIVerifyVersionsCommand::perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) const + { + CIVerifyVersions::perform_and_exit(args, paths); + } +} \ No newline at end of file diff --git a/toolsrc/src/vcpkg/commands.cpp b/toolsrc/src/vcpkg/commands.cpp index 6e87c17748d7df..19b5bdcde98003 100644 --- a/toolsrc/src/vcpkg/commands.cpp +++ b/toolsrc/src/vcpkg/commands.cpp @@ -1,11 +1,13 @@ #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -73,6 +75,8 @@ namespace vcpkg::Commands static const PortHistory::PortHistoryCommand porthistory{}; static const X_VSInstances::VSInstancesCommand vsinstances{}; static const FormatManifest::FormatManifestCommand format_manifest{}; + static const CIVerifyVersions::CIVerifyVersionsCommand ci_verify_versions{}; + static const AddVersion::AddVersionCommand add_version{}; static std::vector> t = { {"/?", &help}, @@ -94,6 +98,8 @@ namespace vcpkg::Commands {"x-history", &porthistory}, {"x-vsinstances", &vsinstances}, {"format-manifest", &format_manifest}, + {"x-ci-verify-versions", &ci_verify_versions}, + {"x-add-version", &add_version}, }; return t; } diff --git a/toolsrc/src/vcpkg/commands.porthistory.cpp b/toolsrc/src/vcpkg/commands.porthistory.cpp index 92d782c36bceb1..894b46b6ebc00c 100644 --- a/toolsrc/src/vcpkg/commands.porthistory.cpp +++ b/toolsrc/src/vcpkg/commands.porthistory.cpp @@ -52,12 +52,6 @@ namespace vcpkg::Commands::PortHistory return run_git_command_inner(paths, dot_git_dir, work_dir, cmd); } - bool is_date(const std::string& version_string) - { - std::regex re("^([0-9]{4,}[-][0-9]{2}[-][0-9]{2})$"); - return std::regex_match(version_string, re); - } - vcpkg::Optional get_version_from_text(const std::string& text, const std::string& git_tree, const std::string& commit_id, diff --git a/toolsrc/src/vcpkg/portfileprovider.cpp b/toolsrc/src/vcpkg/portfileprovider.cpp index 05c5109c440d8a..f455c8233edf6c 100644 --- a/toolsrc/src/vcpkg/portfileprovider.cpp +++ b/toolsrc/src/vcpkg/portfileprovider.cpp @@ -210,7 +210,13 @@ namespace vcpkg::PortFileProvider if (port) { - auto port_path = port->get_path_to_version(paths, port_version).value_or_exit(VCPKG_LINE_INFO); + auto maybe_port_path = port->get_path_to_version(paths, port_version); + if (!maybe_port_path.has_value()) + { + return std::move(maybe_port_path.error()); + } + auto port_path = std::move(maybe_port_path).value_or_exit(VCPKG_LINE_INFO); + auto maybe_scfl = Paragraphs::try_load_port(fs, port_path); if (auto p = maybe_scfl.get()) { diff --git a/toolsrc/src/vcpkg/registries.cpp b/toolsrc/src/vcpkg/registries.cpp index 22ac26fd9dbb63..31f3078deb13f6 100644 --- a/toolsrc/src/vcpkg/registries.cpp +++ b/toolsrc/src/vcpkg/registries.cpp @@ -195,7 +195,8 @@ namespace std::unique_ptr BuiltinRegistry::get_port_entry(const VcpkgPaths& paths, StringView port_name) const { auto versions_path = paths.builtin_port_versions / relative_path_to_versions(port_name); - if (paths.get_feature_flags().registries && paths.get_filesystem().exists(versions_path)) + if ((paths.get_feature_flags().registries || paths.get_feature_flags().versions) && + paths.get_filesystem().exists(versions_path)) { auto maybe_version_entries = load_versions_file(paths.get_filesystem(), VersionDbType::Git, paths.builtin_port_versions, port_name); @@ -244,15 +245,16 @@ namespace return nullptr; } - Baseline parse_builtin_baseline(const VcpkgPaths& paths, StringView baseline_identifier) + ExpectedS try_parse_builtin_baseline(const VcpkgPaths& paths, StringView baseline_identifier) { auto path_to_baseline = paths.builtin_port_versions / fs::u8path("baseline.json"); auto res_baseline = load_baseline_versions(paths, path_to_baseline, baseline_identifier); if (!res_baseline.has_value()) { - Checks::exit_with_message(VCPKG_LINE_INFO, res_baseline.error()); + return res_baseline.error(); } + auto opt_baseline = res_baseline.get(); if (auto p = opt_baseline->get()) { @@ -261,31 +263,29 @@ namespace if (baseline_identifier.size() == 0) { - return {}; + return {{}, expected_left_tag}; } if (baseline_identifier == "default") { - Checks::exit_with_message(VCPKG_LINE_INFO, - "Couldn't find explicitly specified baseline `\"default\"` in the baseline file.", - baseline_identifier); + return Strings::format("Couldn't find explicitly specified baseline `\"default\"` in the baseline file.", + baseline_identifier); } // attempt to check out the baseline: auto maybe_path = get_git_baseline_json_path(paths, baseline_identifier); if (!maybe_path.has_value()) { - Checks::exit_with_message(VCPKG_LINE_INFO, - "Couldn't find explicitly specified baseline `\"%s\"` in the baseline file, " - "and there was no baseline at that commit or the commit didn't exist.\n%s", - baseline_identifier, - maybe_path.error()); + return Strings::format("Couldn't find explicitly specified baseline `\"%s\"` in the baseline file, " + "and there was no baseline at that commit or the commit didn't exist.\n%s", + baseline_identifier, + maybe_path.error()); } res_baseline = load_baseline_versions(paths, *maybe_path.get()); if (!res_baseline.has_value()) { - Checks::exit_with_message(VCPKG_LINE_INFO, res_baseline.error()); + return res_baseline.error(); } opt_baseline = res_baseline.get(); if (auto p = opt_baseline->get()) @@ -293,14 +293,19 @@ namespace return std::move(*p); } - Checks::exit_with_message(VCPKG_LINE_INFO, - "Couldn't find explicitly specified baseline `\"%s\"` in the baseline " - "file, and the `\"default\"` baseline does not exist at that commit.", - baseline_identifier); + return Strings::format("Couldn't find explicitly specified baseline `\"%s\"` in the baseline " + "file, and the `\"default\"` baseline does not exist at that commit.", + baseline_identifier); + } + + Baseline parse_builtin_baseline(const VcpkgPaths& paths, StringView baseline_identifier) + { + auto maybe_baseline = try_parse_builtin_baseline(paths, baseline_identifier); + return maybe_baseline.value_or_exit(VCPKG_LINE_INFO); } Optional BuiltinRegistry::get_baseline_version(const VcpkgPaths& paths, StringView port_name) const { - if (paths.get_feature_flags().registries) + if (!m_baseline_identifier.empty()) { const auto& baseline = m_baseline.get( [this, &paths]() -> Baseline { return parse_builtin_baseline(paths, m_baseline_identifier); }); @@ -311,22 +316,25 @@ namespace return it->second; } } - - // fall back to using the ports directory version - auto maybe_scf = - Paragraphs::try_load_port(paths.get_filesystem(), paths.builtin_ports_directory() / fs::u8path(port_name)); - if (auto pscf = maybe_scf.get()) + else { - auto& scf = *pscf; - return scf->to_versiont(); + // fall back to using the ports directory version + auto maybe_scf = Paragraphs::try_load_port(paths.get_filesystem(), + paths.builtin_ports_directory() / fs::u8path(port_name)); + if (auto pscf = maybe_scf.get()) + { + auto& scf = *pscf; + return scf->to_versiont(); + } + Debug::print("Failed to load port `", port_name, "` from the ports tree: ", maybe_scf.error()->error, "\n"); } - Debug::print("Failed to load port `", port_name, "` from the ports tree: ", maybe_scf.error()->error, "\n"); return nullopt; } void BuiltinRegistry::get_all_port_names(std::vector& out, const VcpkgPaths& paths) const { - if (paths.get_feature_flags().registries && paths.get_filesystem().exists(paths.builtin_port_versions)) + if ((paths.get_feature_flags().registries || paths.get_feature_flags().versions) && + paths.get_filesystem().exists(paths.builtin_port_versions)) { load_all_port_names_from_port_versions(out, paths, paths.builtin_port_versions); } @@ -436,8 +444,9 @@ namespace auto& name = scfl->source_control_file->core_paragraph->name; return Strings::format( "Error: no version entry for %s at version %s.\n" - "We are currently using the version in the ports tree, since no %s.json was found in port_versions.", + "We are currently using the version in the ports tree (%s), since no %s.json was found in /port_versions.", name, + version.to_string(), scfl->to_versiont().to_string(), name); } @@ -925,7 +934,7 @@ namespace vcpkg System::print2(System::Color::warning, "Warning: when using the registries feature, one should not use `\"$x-default-baseline\"` " "to set the baseline.\n", - " Instead, use the \"baseline\" field of the registry."); + " Instead, use the \"baseline\" field of the registry.\n"); } for (auto& reg : registries_) @@ -954,4 +963,23 @@ namespace vcpkg // default_registry_ is not a BuiltinRegistry return true; } + + ExpectedS>> get_builtin_versions(const VcpkgPaths& paths, + StringView port_name) + { + auto maybe_versions = + load_versions_file(paths.get_filesystem(), VersionDbType::Git, paths.builtin_port_versions, port_name); + if (auto pversions = maybe_versions.get()) + { + return Util::fmap( + *pversions, [](auto&& entry) -> auto { return std::make_pair(entry.version, entry.git_tree); }); + } + + return maybe_versions.error(); + } + + ExpectedS>> get_builtin_baseline(const VcpkgPaths& paths) + { + return try_parse_builtin_baseline(paths, "default"); + } } diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp index 0310a01ae3c6e2..648b2065cfb65a 100644 --- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp +++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp @@ -628,6 +628,10 @@ namespace vcpkg table.format(opt(INSTALL_ROOT_DIR_ARG, "=", ""), "(Experimental) Specify the install root directory"); table.format(opt(PACKAGES_ROOT_DIR_ARG, "=", ""), "(Experimental) Specify the packages root directory"); table.format(opt(SCRIPTS_ROOT_DIR_ARG, "=", ""), "(Experimental) Specify the scripts root directory"); + table.format(opt(BUILTIN_PORTS_ROOT_DIR_ARG, "=", ""), + "(Experimental) Specify the packages root directory"); + table.format(opt(BUILTIN_PORT_VERSIONS_DIR_ARG, "=", ""), + "(Experimental) Specify the versions root directory"); table.format(opt(JSON_SWITCH, "", ""), "(Experimental) Request JSON output"); } @@ -916,6 +920,7 @@ namespace vcpkg constexpr StringLiteral VcpkgCmdArguments::PACKAGES_ROOT_DIR_ARG; constexpr StringLiteral VcpkgCmdArguments::SCRIPTS_ROOT_DIR_ARG; constexpr StringLiteral VcpkgCmdArguments::BUILTIN_PORTS_ROOT_DIR_ARG; + constexpr StringLiteral VcpkgCmdArguments::BUILTIN_PORT_VERSIONS_DIR_ARG; constexpr StringLiteral VcpkgCmdArguments::DEFAULT_VISUAL_STUDIO_PATH_ENV; diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index a4125876171772..27b7cfe0281db3 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -367,7 +367,6 @@ If you wish to silence this error and use classic mode, you can: vcpkg_dir_info = vcpkg_dir / fs::u8path("info"); vcpkg_dir_updates = vcpkg_dir / fs::u8path("updates"); - // Versioning paths const auto versioning_tmp = buildtrees / fs::u8path("versioning_tmp"); const auto versioning_output = buildtrees / fs::u8path("versioning"); @@ -564,6 +563,52 @@ If you wish to silence this error and use classic mode, you can: } } + ExpectedS>> VcpkgPaths::git_get_local_port_treeish_map() const + { + const auto local_repo = this->root / fs::u8path(".git"); + const auto path_with_separator = + Strings::concat(fs::u8string(this->builtin_ports_directory()), Files::preferred_separator); + const auto git_cmd = git_cmd_builder(*this, local_repo, this->root) + .string_arg("ls-tree") + .string_arg("-d") + .string_arg("HEAD") + .string_arg("--") + .path_arg(path_with_separator) + .extract(); + + auto output = System::cmd_execute_and_capture_output(git_cmd); + if (output.exit_code != 0) + return Strings::format("Error: Couldn't get local treeish objects for ports.\n%s", output.output); + + std::map> ret; + auto lines = Strings::split(output.output, '\n'); + // The first line of the output is always the parent directory itself. + for (auto line : lines) + { + // The default output comes in the format: + // SP SP TAB + auto split_line = Strings::split(line, '\t'); + if (split_line.size() != 2) + return Strings::format( + "Error: Unexpected output from command `%s`. Couldn't split by `\\t`.\n%s", git_cmd, line); + + auto file_info_section = Strings::split(split_line[0], ' '); + if (file_info_section.size() != 3) + return Strings::format( + "Error: Unexepcted output from command `%s`. Couldn't split by ` `.\n%s", git_cmd, line); + + const auto index = split_line[1].find_last_of('/'); + if (index == std::string::npos) + { + return Strings::format( + "Error: Unexpected output from command `%s`. Couldn't split by `/`.\n%s", git_cmd, line); + } + + ret.emplace(split_line[1].substr(index + 1), file_info_section.back()); + } + return ret; + } + void VcpkgPaths::git_checkout_object(const VcpkgPaths& paths, StringView git_object, const fs::path& local_repo, diff --git a/toolsrc/windows-bootstrap/vcpkg.vcxproj b/toolsrc/windows-bootstrap/vcpkg.vcxproj index b11d5540c751ec..9f035bb375b2fc 100644 --- a/toolsrc/windows-bootstrap/vcpkg.vcxproj +++ b/toolsrc/windows-bootstrap/vcpkg.vcxproj @@ -213,11 +213,13 @@ + + @@ -303,11 +305,13 @@ + + From 176e6e87e4c7d8187e0d93a1743d1aa4821216cc Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Fri, 8 Jan 2021 10:46:54 -0800 Subject: [PATCH 0435/1694] [vcpkg] Fix build for mingw (#15504) * fix build * stop the templateness none of the major three implementations have string::const_iterator = char const* --- toolsrc/include/vcpkg/base/files.h | 13 ++----------- toolsrc/src/vcpkg/base/files.cpp | 5 +++++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h index 69ec41fe311d1f..e1628eaf0bbc16 100644 --- a/toolsrc/include/vcpkg/base/files.h +++ b/toolsrc/include/vcpkg/base/files.h @@ -48,20 +48,11 @@ namespace fs inline path u8path(std::initializer_list il) { return u8path(vcpkg::StringView{il.begin(), il.end()}); } inline path u8path(const char* s) { return u8path(vcpkg::StringView{s, s + ::strlen(s)}); } -#if defined(_MSC_VER) inline path u8path(std::string::const_iterator first, std::string::const_iterator last) { - if (first == last) - { - return path{}; - } - else - { - auto firstp = &*first; - return u8path(vcpkg::StringView{firstp, firstp + (last - first)}); - } + auto firstp = &*first; + return u8path(vcpkg::StringView{firstp, firstp + (last - first)}); } -#endif std::string u8string(const path& p); std::string generic_u8string(const path& p); diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp index ce68741d5eeaed..afd30bf850ab6a 100644 --- a/toolsrc/src/vcpkg/base/files.cpp +++ b/toolsrc/src/vcpkg/base/files.cpp @@ -104,6 +104,11 @@ namespace fs::path fs::u8path(vcpkg::StringView s) { + if (s.size() == 0) + { + return fs::path(); + } + #if defined(_WIN32) return fs::path(vcpkg::Strings::to_utf16(s)); #else From d24ace44ac3c0a57799d079687ef92eded15505c Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 8 Jan 2021 14:07:00 -0500 Subject: [PATCH 0436/1694] [vcpkg baseline][poppler] Fix issue with using libcurl. (#15491) * [poppler] Fix issue with using libcurl. * [curl] Ensure CMake policy is set for the libcurl config file. Otherwise, ports using old (eg pre-2.8) CMake minimums might fail when they import the package. * [poppler] Add curl feature to test curl vcpkg-cmake-wrapper. --- ports/curl/CONTROL | 2 +- ports/curl/vcpkg-cmake-wrapper.cmake | 2 ++ ports/poppler/portfile.cmake | 2 ++ ports/poppler/vcpkg.json | 7 +++++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 82698dca916072..6253ca7e919bb1 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Port-Version: 1 +Port-Version: 2 Version: 7.74.0 Build-Depends: zlib Homepage: https://github.com/curl/curl diff --git a/ports/curl/vcpkg-cmake-wrapper.cmake b/ports/curl/vcpkg-cmake-wrapper.cmake index c7fbdba913b458..955d9353aca299 100644 --- a/ports/curl/vcpkg-cmake-wrapper.cmake +++ b/ports/curl/vcpkg-cmake-wrapper.cmake @@ -2,6 +2,8 @@ list(REMOVE_ITEM ARGS "NO_MODULE") list(REMOVE_ITEM ARGS "CONFIG") list(REMOVE_ITEM ARGS "MODULE") +cmake_policy(SET CMP0012 NEW) + _find_package(${ARGS} CONFIG) if(TARGET CURL::libcurl) diff --git a/ports/poppler/portfile.cmake b/ports/poppler/portfile.cmake index 2b1e453e8a741a..89345f0a031948 100644 --- a/ports/poppler/portfile.cmake +++ b/ports/poppler/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + curl ENABLE_CURL zlib ENABLE_ZLIB ) @@ -21,6 +22,7 @@ vcpkg_configure_cmake( -DBUILD_QT5_TESTS=OFF -DBUILD_QT6_TESTS=OFF -DBUILD_CPP_TESTS=OFF + -DENABLE_LIBCURL=${ENABLE_CURL} -DENABLE_UTILS=OFF -DENABLE_GLIB=OFF -DENABLE_GLOBJECT_INTROSPECTION=OFF diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json index ad12769e0b90bc..71cb470c5c6910 100644 --- a/ports/poppler/vcpkg.json +++ b/ports/poppler/vcpkg.json @@ -1,6 +1,7 @@ { "name": "poppler", "version-string": "20.12.1", + "port-version": 1, "description": "a PDF rendering library", "homepage": "https://poppler.freedesktop.org/", "dependencies": [ @@ -21,6 +22,12 @@ "zlib" ], "features": { + "curl": { + "description": "curl for poppler", + "dependencies": [ + "curl" + ] + }, "zlib": { "description": "zlib for poppler", "dependencies": [ From cb3941c35c9f5e8a394e9e78af3a54b41a4d984e Mon Sep 17 00:00:00 2001 From: Gyusun Yeom Date: Sat, 9 Jan 2021 04:48:55 +0900 Subject: [PATCH 0437/1694] [openssl] install pkgconfig file (#15191) Co-authored-by: JackBoosY --- ports/openssl/CONTROL | 2 +- ports/openssl/unix/CMakeLists.txt | 8 +++++++- ports/openssl/unix/portfile.cmake | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL index bda3d35af7f287..ae561f5674f801 100644 --- a/ports/openssl/CONTROL +++ b/ports/openssl/CONTROL @@ -1,5 +1,5 @@ Source: openssl Version: 1.1.1h -Port-Version: 4 +Port-Version: 5 Homepage: https://www.openssl.org 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. diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index 977017f8d55322..356044a34d4b4b 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -119,6 +119,7 @@ endif() foreach(lib ssl crypto) foreach(ext ${LIB_EXTS}) list(APPEND INSTALL_LIBS "${BUILDDIR}/lib${lib}.${ext}") + list(APPEND INSTALL_PKG_CONFIGS "${BUILDDIR}/lib${lib}.pc") endforeach() foreach(ext ${BIN_EXTS}) # This might be wrong for targets which don't follow this naming scheme, but I'm not aware of any @@ -207,4 +208,9 @@ install( install( FILES ${INSTALL_BINS} DESTINATION bin -) \ No newline at end of file +) +install( + FILES ${INSTALL_PKG_CONFIGS} + DESTINATION lib/pkgconfig +) + diff --git a/ports/openssl/unix/portfile.cmake b/ports/openssl/unix/portfile.cmake index 00f503f9594df9..350cf4041fcb37 100644 --- a/ports/openssl/unix/portfile.cmake +++ b/ports/openssl/unix/portfile.cmake @@ -31,6 +31,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() file(GLOB HEADERS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/include/openssl/*.h) set(RESOLVED_HEADERS) From 39ce24ce1a77cddfbde92c65333d8be2543b25f9 Mon Sep 17 00:00:00 2001 From: ankurverma85 <31362771+ankurverma85@users.noreply.github.com> Date: Fri, 8 Jan 2021 11:55:31 -0800 Subject: [PATCH 0438/1694] [vcpkg] Add x64-windows-static-md to pipeline (#15411) * Add x64-windows-static-md to pipeline * Update azure-pipelines.yml * Update test-modified-ports.ps1 * Replicate skip/fail from x64-windows-static * Add failures to ci.baseline * Update ci.baseline.txt * Update ci.baseline.txt * Update ci.baseline.txt * Update ci.baseline.txt Co-authored-by: ankurv --- scripts/azure-pipelines/azure-pipelines.yml | 6 + .../azure-pipelines/test-modified-ports.ps1 | 4 +- scripts/ci.baseline.txt | 171 ++++++++++++++++++ 3 files changed, 179 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 762c161ec008c3..7fce6a5c19e115 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -70,6 +70,12 @@ stages: jobName: x64_windows_static poolName: $(windows-pool) + - template: windows/azure-pipelines.yml + parameters: + triplet: x64-windows-static-md + jobName: x64_windows_static_md + poolName: $(windows-pool) + - template: windows/azure-pipelines.yml parameters: triplet: x64-uwp diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 546545579e4a24..9ca814cca92366 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -50,7 +50,7 @@ Param( $BuildReason = $null ) -if (-Not (Test-Path "triplets/$Triplet.cmake")) { +if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/community/$Triplet.cmake"))) { Write-Error "Incorrect triplet '$Triplet', please supply a valid triplet." throw } @@ -140,7 +140,7 @@ $skipList = . "$PSScriptRoot/generate-skip-list.ps1" ` # Install them so the CI succeeds: if ($Triplet -in @('x64-uwp', 'arm64-windows', 'arm-uwp')) { .\vcpkg.exe install protobuf:x86-windows boost-build:x86-windows sqlite3:x86-windows yasm-tool:x86-windows ampl-mp:x86-windows @commonArgs -} elseif ($Triplet -in @('x64-windows', 'x64-windows-static')) { +} elseif ($Triplet -in @('x64-windows', 'x64-windows-static', 'x64-windows-static-md')) { .\vcpkg.exe install yasm-tool:x86-windows @commonArgs } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 875032eb1f0aca..5e0a90ea6bedca 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -23,6 +23,7 @@ ## x64-uwp ## x64-windows ## x64-windows-static +## x64-windows-static-md ## x86-windows ## @@ -70,6 +71,7 @@ catch-classic:x64-osx = skip catch-classic:x64-uwp = skip 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 @@ -87,11 +89,13 @@ charls:x64-osx=skip charls:x64-uwp=skip charls:x64-windows=skip charls:x64-windows-static=skip +charls:x64-windows-static-md=skip charls:x86-windows=skip chartdir:arm64-windows=fail chartdir:arm-uwp=fail chartdir:x64-uwp=fail chartdir:x64-windows-static=fail +chartdir:x64-windows-static-md=fail chmlib:arm-uwp=fail chmlib:x64-uwp=fail # Chromium Base requires a recent version of Clang to be installed. @@ -102,9 +106,11 @@ civetweb:x64-uwp = skip clblas:arm64-windows=fail clblast:x64-linux=fail clblast:x64-windows-static=fail +clblast:x64-windows-static-md=fail clockutils:x64-linux=fail clockutils:x64-osx=fail cmark:x64-windows-static=fail +cmark:x64-windows-static-md=fail cmcstl2:arm64-windows = skip cmcstl2:arm-uwp = skip cmcstl2:x64-linux = skip @@ -112,11 +118,13 @@ cmcstl2:x64-osx = skip cmcstl2:x64-uwp = skip cmcstl2:x64-windows = skip cmcstl2:x64-windows-static = skip +cmcstl2:x64-windows-static-md=skip cmcstl2:x86-windows = skip coin:arm64-windows=fail coin:arm-uwp=fail coin:x64-uwp=fail collada-dom:x64-windows-static=fail +collada-dom:x64-windows-static-md=fail constexpr-contracts:x64-linux=fail coolprop:arm-uwp=fail coolprop:x64-linux=fail @@ -130,6 +138,7 @@ corrade:x64-uwp=fail cppcms:x64-linux=fail cppcms:x64-osx=fail cppcms:x64-windows-static=fail +cppcms:x64-windows-static-md=fail cppfs:arm-uwp=fail cppfs:x64-uwp=fail cppmicroservices:arm64-windows=fail @@ -158,6 +167,7 @@ cudnn:arm64-windows=fail cudnn:arm-uwp=fail cudnn:x64-uwp=fail cudnn:x64-windows-static=fail +cudnn:x64-windows-static-md=fail cudnn:x86-windows=fail # Since pipeline cannot automatically install dbghelp dependency, skip this detection dbghelp:arm-uwp=skip @@ -166,6 +176,7 @@ dbghelp:x64-linux=fail dbghelp:x64-osx=fail dbghelp:x64-uwp=skip dbghelp:x64-windows-static=skip +dbghelp:x64-windows-static-md=skip dbghelp:x64-windows=skip dbghelp:x86-windows=skip dcmtk:arm-uwp=fail @@ -178,10 +189,12 @@ devicenameresolver:x64-linux=fail devicenameresolver:x64-osx=fail devicenameresolver:x64-uwp=fail devicenameresolver:x64-windows-static=fail +devicenameresolver:x64-windows-static-md=fail dimcli:arm-uwp=fail dimcli:x64-osx=fail dimcli:x64-uwp=fail 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 dlfcn-win32:arm-uwp=fail @@ -196,6 +209,7 @@ dpdk:x64-linux=fail dpdk:x64-osx=fail dpdk:x64-uwp=fail dpdk:x64-windows-static=fail +dpdk:x64-windows-static-md=fail dpdk:x64-windows=fail dpdk:x86-windows=fail duckx:arm64-windows = skip @@ -205,6 +219,7 @@ 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 duilib:arm-uwp=fail duilib:x64-linux=fail @@ -220,6 +235,7 @@ dxut:arm-uwp=fail dxut:x64-linux=fail dxut:x64-osx=fail dxut:x64-windows-static=fail +dxut:x64-windows-static-md=fail eastl:arm-uwp=fail easyhook:arm64-windows=fail easyhook:arm-uwp=fail @@ -227,6 +243,7 @@ easyhook:x64-linux=fail easyhook:x64-osx=fail easyhook:x64-uwp=fail easyhook:x64-windows-static=fail +easyhook:x64-windows-static-md=fail easyloggingpp:arm-uwp=fail easyloggingpp:x64-uwp=fail eathread:arm64-windows=fail @@ -242,6 +259,7 @@ ecm:x64-osx = skip ecm:x64-uwp = skip ecm:x64-windows = skip ecm:x64-windows-static = skip +ecm:x64-windows-static-md=skip ecm:x86-windows = skip ecsutil:arm64-windows=fail ecsutil:arm-uwp=fail @@ -253,9 +271,11 @@ elfutils:x64-osx=fail embree2:x64-linux=fail embree2:x64-osx=fail embree2:x64-windows-static=fail +embree2:x64-windows-static-md=fail enet:arm-uwp=fail enet:x64-uwp=fail epsilon:x64-windows-static=fail +epsilon:x64-windows-static-md=fail epsilon:arm-uwp=fail epsilon:x64-linux=fail epsilon:x64-osx=fail @@ -267,16 +287,19 @@ fann:x64-linux=fail fann:x64-osx=fail fann:x64-uwp=fail fann:x64-windows-static=fail +fann:x64-windows-static-md=fail farmhash:arm64-windows=fail farmhash:arm-uwp=fail farmhash:x64-uwp=fail farmhash:x64-windows=fail farmhash:x64-windows-static=fail +farmhash:x64-windows-static-md=fail farmhash:x86-windows=fail fastrtps:arm-uwp=fail fastrtps:x64-linux=fail fastrtps:x64-uwp=fail fastrtps:x64-windows-static=fail +fastrtps:x64-windows-static-md=fail fdk-aac:arm64-windows=fail fdk-aac:arm-uwp=fail fdk-aac:x64-uwp=fail @@ -297,6 +320,7 @@ fluidlite:x64-linux=skip fluidlite:x64-osx=skip fluidlite:x64-uwp=skip fluidlite:x64-windows-static=skip +fluidlite:x64-windows-static-md=skip fluidlite:x64-windows=skip fluidlite:x86-windows=skip fmem:arm-uwp=fail @@ -337,6 +361,7 @@ gainput:x64-uwp=fail gasol:arm64-windows=fail gasol:arm-uwp=fail gasol:x64-uwp=fail +gdal:x64-windows-static-md=fail gdcm:arm64-windows=fail gdcm:x64-linux = skip geos:arm-uwp=fail @@ -355,6 +380,7 @@ getopt-win32:x64-linux=fail getopt-win32:x64-osx=fail getopt-win32:x64-uwp=fail getopt-win32:x64-windows-static=fail +getopt-win32:x64-windows-static-md=fail gflags:arm-uwp=fail gflags:x64-uwp=fail @@ -366,6 +392,7 @@ gherkin-c:x64-osx=fail gherkin-c:x64-uwp = skip gherkin-c:x64-windows = skip gherkin-c:x64-windows-static = skip +gherkin-c:x64-windows-static-md=skip gherkin-c:x86-windows = skip gl3w:arm64-windows=fail gl3w:arm-uwp=fail @@ -375,6 +402,7 @@ glfw3:arm-uwp=fail glfw3:x64-uwp=fail glib:x64-uwp=fail glib:x64-windows-static=fail +glib:x64-windows-static-md=fail glib:x64-osx=fail gmmlib:arm64-windows=fail gmmlib:arm-uwp=fail @@ -382,6 +410,7 @@ gmmlib:x64-osx=fail gmmlib:x64-uwp=fail gmmlib:x64-windows=fail gmmlib:x64-windows-static=fail +gmmlib:x64-windows-static-md=fail gmmlib:x86-windows=fail google-cloud-cpp:arm64-windows=fail google-cloud-cpp:arm-uwp=fail @@ -407,12 +436,14 @@ h3:arm64-windows=fail h3:arm-uwp=fail h3:x64-uwp=fail halide:x64-windows-static=fail +halide:x64-windows-static-md=fail hdf5:arm64-windows=fail hdf5:arm-uwp=fail hdf5:x64-uwp=fail healpix:x86-windows=fail healpix:x64-windows=fail healpix:x64-windows-static=fail +healpix:x64-windows-static-md=fail healpix:x64-uwp=fail healpix:arm64-windows=fail healpix:arm-uwp=fail @@ -425,8 +456,10 @@ hidapi:x64-uwp=fail hiredis:arm-uwp=fail hiredis:x64-uwp=fail hpx:x64-windows-static=fail +hpx:x64-windows-static-md=fail hpx:x64-linux=fail libhsplasma:x64-windows-static=fail +libhsplasma:x64-windows-static-md=fail icu:arm-uwp=fail icu:x64-uwp=fail idevicerestore:x64-linux=fail @@ -454,6 +487,7 @@ intel-ipsec:x64-osx=fail intel-ipsec:x64-uwp=fail intel-ipsec:x64-windows=fail intel-ipsec:x64-windows-static=fail +intel-ipsec:x64-windows-static-md=fail intel-ipsec:x86-windows=fail intel-mkl:arm64-windows=fail intel-mkl:arm-uwp=fail @@ -462,6 +496,7 @@ intel-mkl:x64-osx=fail intel-mkl:x64-uwp=fail 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-linux=fail @@ -476,6 +511,7 @@ isal:x64-osx=fail isal:x64-uwp=fail isal:x64-windows=fail isal:x64-windows-static=fail +isal:x64-windows-static-md=fail isal:x86-windows=fail jaeger-client-cpp:arm64-windows=fail jbig2dec:arm-uwp=fail @@ -486,6 +522,7 @@ jemalloc:x64-linux=fail jemalloc:x64-osx=fail jemalloc:x64-uwp=fail jemalloc:x64-windows-static=fail +jemalloc:x64-windows-static-md=fail jinja2cpplight:arm-uwp=fail jinja2cpplight:x64-uwp=fail keystone:arm-uwp=fail @@ -516,6 +553,7 @@ libbf:arm-uwp=fail libbf:x64-uwp=fail 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 @@ -541,11 +579,13 @@ libdshowcapture:x64-uwp=fail libepoxy:arm-uwp=fail libepoxy:x64-uwp=fail libepoxy:x64-windows-static=fail +libepoxy:x64-windows-static-md=fail libevent:arm-uwp=fail libevent:x64-uwp=fail libevhtp:x86-windows=fail libevhtp:x64-windows=fail libevhtp:x64-windows-static=fail +libevhtp:x64-windows-static-md=fail libevhtp:x64-uwp=fail libevhtp:arm64-windows=fail libevhtp:arm-uwp=fail @@ -556,6 +596,7 @@ libfabric:x64-linux=fail libfabric:x64-osx=fail libfabric:x64-uwp=fail libfabric:x64-windows-static=fail +libfabric:x64-windows-static-md=fail libfreenect2:arm64-windows=fail libfreenect2:x64-linux=fail libfreenect2:x64-osx=fail @@ -571,12 +612,14 @@ libgpod:arm-uwp=fail libgpod:x64-uwp=fail libgpod:x64-windows=fail libgpod:x64-windows-static=fail +libgpod:x64-windows-static-md=fail libgpod:x86-windows=fail libhdfs3:arm64-windows=fail libhdfs3:arm-uwp=fail libhdfs3:x64-uwp=fail libhdfs3:x64-windows=fail libhdfs3:x64-windows-static=fail +libhdfs3:x64-windows-static-md=fail libhdfs3:x86-windows=fail libhdfs3:x64-linux=fail libhydrogen:arm64-windows=fail @@ -601,6 +644,7 @@ libmad:x64-uwp=fail libmagic:x86-windows=fail libmagic:x64-windows=fail libmagic:x64-windows-static=fail +libmagic:x64-windows-static-md=fail libmagic:x64-uwp=fail libmagic:arm64-windows=fail libmagic:arm-uwp=fail @@ -611,6 +655,7 @@ libmariadb:x64-osx = skip libmariadb:x64-uwp = skip libmariadb:x64-windows = skip libmariadb:x64-windows-static = skip +libmariadb:x64-windows-static-md=skip libmariadb:x86-windows = skip # libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc) libmesh:arm64-windows=skip @@ -618,12 +663,14 @@ libmesh:arm-uwp=skip libmesh:x64-uwp=skip libmesh:x64-windows=skip libmesh:x64-windows-static=skip +libmesh:x64-windows-static-md=skip libmesh:x86-windows=skip libmesh:x64-osx=skip libmesh:x64-linux=skip libmodman:arm-uwp=fail libmodman:x64-uwp=fail libmodman:x64-windows-static=fail +libmodman:x64-windows-static-md=fail libmodplug:arm-uwp=fail libmodplug:x64-uwp=fail libmpeg2:arm-uwp=fail @@ -643,18 +690,22 @@ libosip2:arm-uwp=fail libosip2:x64-uwp=fail libosip2:x64-windows=fail libosip2:x64-windows-static=fail +libosip2:x64-windows-static-md=fail libosip2:x86-windows=fail libpcap:arm64-windows=fail libpcap:arm-uwp=fail libpcap:x64-osx=fail libpcap:x64-uwp=fail libpcap:x64-windows-static=fail +libpcap:x64-windows-static-md=fail libpff:arm-uwp=fail libpff:x64-linux=fail libpff:x64-osx=fail libpff:x64-uwp=fail libpff:x64-windows-static=fail +libpff:x64-windows-static-md=fail libplist:x64-windows-static=fail +libplist:x64-windows-static-md=fail libpng-apng:arm64-windows = skip libpng-apng:arm-uwp = skip libpng-apng:x64-linux = skip @@ -662,6 +713,7 @@ libpng-apng:x64-osx = skip libpng-apng:x64-uwp = skip 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 @@ -669,6 +721,7 @@ libpq:x64-uwp=fail libqcow:arm-uwp=skip libqcow:x64-uwp=skip libqcow:x64-windows-static=skip +libqcow:x64-windows-static-md=skip libqcow:x64-osx=skip libqcow:x64-windows=skip libqcow:x64-linux=skip @@ -684,6 +737,7 @@ boringssl:x64-osx = skip boringssl:x64-uwp = skip boringssl:x64-windows = skip boringssl:x64-windows-static = skip +boringssl:x64-windows-static-md=skip boringssl:x86-windows = skip libressl:arm64-windows = skip libressl:arm-uwp = skip @@ -692,6 +746,7 @@ libressl:x64-osx = skip libressl:x64-uwp = skip libressl:x64-windows = skip libressl:x64-windows-static = skip +libressl:x64-windows-static-md=skip libressl:x86-windows = skip libsamplerate:x64-osx=fail libsoundio:arm64-windows=fail @@ -717,6 +772,7 @@ libudns:arm-uwp=fail libudns:x64-uwp=fail libudns:x64-windows=fail libudns:x64-windows-static=fail +libudns:x64-windows-static-md=fail libudns:x86-windows=fail libudns:x64-osx=fail libui:arm-uwp=fail @@ -741,6 +797,7 @@ libuuid:x64-osx = skip libuuid:x64-uwp=fail libuuid:x64-windows=fail libuuid:x64-windows-static=fail +libuuid:x64-windows-static-md=fail libuuid:x86-windows=fail libuv:arm-uwp=fail libuv:x64-uwp=fail @@ -750,12 +807,14 @@ libvmdk:x64-uwp=fail libvmdk:x86-windows=skip libvmdk:x64-windows=skip libvmdk:x64-windows-static=skip +libvmdk:x64-windows-static-md=skip libvmdk:arm64=skip libvmdk:x64-linux=skip libvmdk:x64-osx=skip libwandio:x86-windows=fail libwandio:x64-windows=fail libwandio:x64-windows-static=fail +libwandio:x64-windows-static-md=fail libwandio:x64-uwp=fail libwandio:arm64-windows=fail libwandio:arm-uwp=fail @@ -777,6 +836,7 @@ live555:x64-osx=fail live555:x64-uwp=fail live555:x64-windows=fail live555:x64-windows-static=fail +live555:x64-windows-static-md=fail live555:x86-windows=fail llgl:arm-uwp=fail llgl:x64-uwp=fail @@ -798,12 +858,14 @@ 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 luasocket:x64-linux=fail luasocket:x64-osx=fail lzfse:arm-uwp=fail magnum:arm64-windows=skip marble:x64-windows-static=fail +marble:x64-windows-static-md=fail marble:arm64-windows=fail marble:arm-uwp=fail marble:x64-linux=fail @@ -826,6 +888,7 @@ mecab:x64-linux = skip mecab:x64-uwp = skip mecab:x64-windows = skip mecab:x64-windows-static = skip +mecab:x64-windows-static-md=skip mecab:x86-windows = skip memorymodule:arm-uwp=fail memorymodule:x64-linux=fail @@ -848,6 +911,7 @@ mhook:x64-osx=fail mhook:x64-uwp=fail milerius-sfml-imgui:x64-osx=fail milerius-sfml-imgui:x64-windows-static=fail +milerius-sfml-imgui:x64-windows-static-md=fail minhook:arm64-windows=fail minhook:arm-uwp=fail minhook:x64-linux=fail @@ -869,6 +933,7 @@ microsoft-signalr:x64-osx=skip microsoft-signalr:x64-uwp=skip microsoft-signalr:x64-windows=skip microsoft-signalr:x64-windows-static=skip +microsoft-signalr:x64-windows-static-md=skip microsoft-signalr:x86-windows=skip mman:x64-linux=fail mman:x64-osx=fail @@ -882,6 +947,7 @@ mmloader:x86-windows=fail # mmx installs many problematic headers, such as `json.h` and `sched.h` mmx:x64-windows=skip mmx:x64-windows-static=skip +mmx:x64-windows-static-md=skip mmx:x86-windows=skip mmx:x64-linux=skip mmx:x64-osx=skip @@ -898,9 +964,11 @@ monkeys-audio:x64-linux=fail monkeys-audio:x64-osx=fail monkeys-audio:x64-uwp=fail monkeys-audio:x64-windows-static=fail +monkeys-audio:x64-windows-static-md=fail moos-core:arm-uwp=fail moos-core:x64-uwp=fail moos-core:x64-windows-static=fail +moos-core:x64-windows-static-md=fail moos-essential:arm64-windows=fail moos-essential:x64-windows=fail moos-essential:x86-windows=fail @@ -912,18 +980,21 @@ mozjpeg:x64-osx = skip mozjpeg:x64-uwp = skip mozjpeg:x64-windows = skip mozjpeg:x64-windows-static = skip +mozjpeg:x64-windows-static-md=skip mozjpeg:x86-windows = skip # mpir conflicts with gmp # see https://github.com/microsoft/vcpkg/issues/11756 mpir:x86-windows=skip mpir:x64-windows=skip mpir:x64-windows-static=skip +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 +msix:x64-windows-static-md=fail msmpi:arm64-windows=fail msmpi:arm-uwp=fail msmpi:x64-linux=fail @@ -949,6 +1020,7 @@ nanorange:x64-osx=fail nanorange:x64-uwp=fail nanorange:x64-windows=fail nanorange:x64-windows-static=fail +nanorange:x64-windows-static-md=fail nanorange:x86-windows=fail nanovg:arm-uwp=fail nanovg:x64-uwp=fail @@ -957,8 +1029,10 @@ nativefiledialog:x64-uwp=fail nethost:x64-uwp=fail nethost:arm-uwp=fail nettle:x64-windows-static=skip +nettle:x64-windows-static-md=skip nettle:x64-windows=skip ngspice:x64-windows-static=fail +ngspice:x64-windows-static-md=fail nng:arm-uwp=fail nng:x64-uwp=fail nrf-ble-driver:arm-uwp=fail @@ -969,6 +1043,7 @@ numactl:x64-osx=fail numactl:x64-uwp=fail numactl:x64-windows=fail numactl:x64-windows-static=fail +numactl:x64-windows-static-md=fail numactl:x86-windows=fail nvtt:arm64-windows=fail nvtt:arm-uwp=fail @@ -977,6 +1052,7 @@ ocilib:arm-uwp=fail ocilib:arm64-windows=fail ocilib:x64-uwp=fail ocilib:x64-windows-static=fail +ocilib:x64-windows-static-md=fail octomap:arm-uwp=fail octomap:x64-uwp=fail ode:arm64-windows=fail @@ -991,6 +1067,7 @@ ogdf:x64-osx=fail ogdf:x64-uwp = skip ogdf:x64-windows = skip ogdf:x64-windows-static = skip +ogdf:x64-windows-static-md=skip ogdf:x86-windows = skip ogre:x64-osx=fail # Conflicts with ogre @@ -1001,6 +1078,7 @@ ogre-next:x64-linux = skip ogre-next:x64-uwp = skip ogre-next:x64-windows = skip ogre-next:x64-windows-static = skip +ogre-next:x64-windows-static-md=skip ogre-next:x86-windows = skip ois:arm64-windows=fail ois:arm-uwp=fail @@ -1030,6 +1108,7 @@ opencc:x64-uwp=fail opencensus-cpp:arm64-windows=fail opencensus-cpp:x64-windows=fail opencensus-cpp:x64-windows-static=fail +opencensus-cpp:x64-windows-static-md=fail opencensus-cpp:x86-windows=fail opencensus-cpp:x64-uwp=fail opencl:arm-uwp=fail @@ -1042,6 +1121,7 @@ opencv2:x64-osx = skip opencv2:x64-uwp = skip opencv2:x64-windows = skip opencv2:x64-windows-static = skip +opencv2:x64-windows-static-md=skip opencv2:x86-windows = skip opencv3:arm64-windows = skip opencv3:arm-uwp = skip @@ -1050,6 +1130,7 @@ opencv3:x64-osx = skip opencv3:x64-uwp = skip opencv3:x64-windows = skip opencv3:x64-windows-static = skip +opencv3:x64-windows-static-md=skip opencv3:x86-windows = skip opendnp3:x64-uwp=fail opendnp3:arm-uwp=fail @@ -1066,21 +1147,25 @@ openmpi:arm-uwp=fail openmpi:x64-uwp=fail openmpi:x64-windows=fail openmpi:x64-windows-static=fail +openmpi:x64-windows-static-md=fail openmpi:x86-windows=fail openni2:x64-uwp=fail openni2:x64-windows-static=fail +openni2:x64-windows-static-md=fail openscap:x64-linux=fail openssl-unix:arm64-windows=fail openssl-unix:arm-uwp=fail openssl-unix:x64-uwp=fail openssl-unix:x64-windows=fail openssl-unix:x64-windows-static=fail +openssl-unix:x64-windows-static-md=fail openssl-unix:x86-windows=fail openssl-uwp:arm64-windows=fail openssl-uwp:x64-linux=fail openssl-uwp:x64-osx=fail openssl-uwp:x64-windows=fail openssl-uwp:x64-windows-static=fail +openssl-uwp:x64-windows-static-md=fail openssl-uwp:x86-windows=fail opentracing:arm-uwp=fail opentracing:x64-uwp=fail @@ -1090,6 +1175,7 @@ openvr:arm-uwp=fail openvr:x64-osx=fail openvr:x64-uwp=fail openvr:x64-windows-static=fail +openvr:x64-windows-static-md=fail openxr-loader:arm64-windows=fail openxr-loader:arm-uwp=fail openxr-loader:x64-osx=fail @@ -1101,6 +1187,7 @@ optional-bare:x64-osx = skip optional-bare:x64-uwp = skip optional-bare:x64-windows = skip optional-bare:x64-windows-static = skip +optional-bare:x64-windows-static-md=skip optional-bare:x86-windows = skip opusfile:arm-uwp=fail opusfile:x64-uwp=fail @@ -1109,6 +1196,7 @@ orocos-kdl:x64-uwp=fail osgearth:x64-linux=fail osgearth:x64-osx=fail osgearth:x64-windows-static=fail +osgearth:x64-windows-static-md=fail osgearth:x64-windows=fail osgearth:x86-windows=fail paho-mqtt:arm-uwp=fail @@ -1120,16 +1208,19 @@ parmetis:x64-osx=fail pdal:x64-linux=fail pdal:x64-osx=fail pdal-c:x64-windows-static=fail +pdal-c:x64-windows-static-md=fail pdcurses:arm-uwp=fail pdcurses:x64-linux=fail pdcurses:x64-osx=fail pdcurses:x64-uwp=fail pdcurses:x64-windows-static=fail +pdcurses:x64-windows-static-md=fail pfring:arm64-windows=fail pfring:arm-uwp=fail pfring:x64-uwp=fail pfring:x64-windows=fail pfring:x64-windows-static=fail +pfring:x64-windows-static-md=fail pfring:x86-windows=fail pfring:x64-osx=fail # pfring on Linux currently fails because its build scripts enable warnings as @@ -1144,10 +1235,12 @@ pistache:x64-osx=fail pistache:x64-uwp=fail pistache:x64-windows=fail pistache:x64-windows-static=fail +pistache:x64-windows-static-md=fail pistache:x86-windows=fail pixel:x64-uwp=fail pixel:x64-windows=fail pixel:x64-windows-static=fail +pixel:x64-windows-static-md=fail pixel:x86-windows=fail platform-folders:arm-uwp=fail platform-folders:x64-uwp=fail @@ -1165,6 +1258,7 @@ pmdk:x64-linux=fail pmdk:x64-osx=fail pmdk:x64-uwp=fail pmdk:x64-windows-static=fail +pmdk:x64-windows-static-md=fail pmdk:x86-windows=fail pngwriter:arm-uwp=fail pngwriter:x64-uwp=fail @@ -1177,6 +1271,7 @@ proj4:x64-uwp=fail protobuf-c:x86-windows=fail protobuf-c:x64-windows=fail protobuf-c:x64-windows-static=fail +protobuf-c:x64-windows-static-md=fail protobuf-c:x64-uwp=fail protobuf-c:arm64-windows=fail protobuf-c:arm-uwp=fail @@ -1193,6 +1288,7 @@ qhull:arm-uwp=fail qpid-proton:arm-uwp=fail qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail +qpid-proton:x64-windows-static-md=fail qt5-activeqt:x64-linux=fail qt5-activeqt:x64-osx=fail # Skip deprecated Qt module @@ -1201,10 +1297,12 @@ qt5-canvas3d:x64-linux=skip qt5-canvas3d:x64-osx=skip qt5-canvas3d:x64-windows=skip qt5-canvas3d:x64-windows-static=skip +qt5-canvas3d:x64-windows-static-md=skip qt5-canvas3d:x86-windows=skip qt5-macextras:x64-linux=fail qt5-macextras:x64-windows=fail qt5-macextras:x64-windows-static=fail +qt5-macextras:x64-windows-static-md=fail qt5-macextras:x86-windows=fail # Missing system libraries qt5-wayland:x64-osx=fail @@ -1212,6 +1310,7 @@ qt5-wayland:x64-osx=fail qt5-wayland:x86-windows=fail qt5-wayland:x64-windows=fail qt5-wayland:x64-windows-static=fail +qt5-wayland:x64-windows-static-md=fail qt5-winextras:x64-linux=fail qt5-winextras:x64-osx=fail # Missing prerequisites for CI success @@ -1225,16 +1324,19 @@ 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 # Missing system libraries qt5-x11extras:x64-osx=fail # Missing libraries qt5-x11extras:x86-windows=fail qt5-x11extras:x64-windows=fail qt5-x11extras:x64-windows-static=fail +qt5-x11extras:x64-windows-static-md=fail quickfix:arm-uwp=fail quickfix:arm64-windows=fail quickfix:x64-uwp=fail quickfix:x64-windows-static=fail +quickfix:x64-windows-static-md=fail quickfix:x64-windows=fail quickfix:x86-windows=fail qwt:x64-osx=fail @@ -1248,6 +1350,7 @@ range-v3-vs2015:x64-osx = skip range-v3-vs2015:x64-uwp = skip range-v3-vs2015:x64-windows = skip range-v3-vs2015:x64-windows-static = skip +range-v3-vs2015:x64-windows-static-md=skip range-v3-vs2015:x86-windows = skip rapidstring:arm64-windows=fail rapidstring:arm-uwp=fail @@ -1255,6 +1358,7 @@ rapidstring:x64-linux=fail rapidstring:x64-uwp=fail rapidstring:x64-windows=fail rapidstring:x64-windows-static=fail +rapidstring:x64-windows-static-md=fail rapidstring:x86-windows=fail raylib:arm64-windows=fail raylib:arm-uwp=fail @@ -1278,6 +1382,7 @@ restbed:x64-uwp=fail rest-rpc:x86-windows=skip rest-rpc:x64-windows=skip rest-rpc:x64-windows-static=skip +rest-rpc:x64-windows-static-md=skip rest-rpc:x64-uwp=skip rest-rpc:arm-uwp=skip rest-rpc:arm64-windows=skip @@ -1291,6 +1396,7 @@ rpclib:arm-uwp=fail rpclib:x64-uwp=fail 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 @@ -1306,12 +1412,14 @@ ryml:x64-osx=fail ryu:arm-uwp=fail ryu:x64-uwp=fail ryu:x64-windows-static=fail +ryu:x64-windows-static-md=fail ryu:x86-windows=fail ryu::arm64-windows=fail sciter:arm64-windows=fail sciter:arm-uwp=fail sciter:x64-uwp=fail sciter:x64-windows-static=fail +sciter:x64-windows-static-md=fail scnlib:arm-uwp=fail scnlib:x64-uwp=fail scylla-wrapper:arm-uwp=fail @@ -1319,6 +1427,7 @@ scylla-wrapper:x64-linux=fail scylla-wrapper:x64-osx=fail scylla-wrapper:x64-uwp=fail scylla-wrapper:x64-windows-static=fail +scylla-wrapper:x64-windows-static-md=fail sdformat6:arm64-windows=fail sdformat6:arm-uwp=fail sdformat6:x64-uwp=fail @@ -1349,6 +1458,7 @@ 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 shiva-sfml:x64-osx=fail shiva-sfml:x86-windows=fail @@ -1359,6 +1469,7 @@ shogun:x64-osx = skip shogun:x64-uwp = skip shogun:x64-windows = skip shogun:x64-windows-static = skip +shogun:x64-windows-static-md=skip shogun:x86-windows = skip signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail @@ -1385,6 +1496,7 @@ soil:arm64-windows=skip soil:x64-windows=skip soil:x86-windows=skip soil:x64-windows-static=skip +soil:x64-windows-static-md=skip soil:x64-linux=skip soil:x64-osx=skip soil2:arm-uwp=fail @@ -1395,6 +1507,7 @@ soqt:x64-uwp=fail soundtouch:arm-uwp=fail soundtouch:x64-uwp=fail soundtouch:x64-windows-static=fail +soundtouch:x64-windows-static-md=fail spaceland:arm64-windows=fail spaceland:arm-uwp=fail spaceland:x64-uwp=fail @@ -1405,6 +1518,7 @@ spdk-dpdk:x64-osx=fail spdk-dpdk:x64-uwp=fail spdk-dpdk:x64-windows=fail spdk-dpdk:x64-windows-static=fail +spdk-dpdk:x64-windows-static-md=fail spdk-dpdk:x86-windows=fail spdk-ipsec:arm64-windows=fail spdk-ipsec:arm-uwp=fail @@ -1412,6 +1526,7 @@ spdk-ipsec:x64-osx=fail spdk-ipsec:x64-uwp=fail spdk-ipsec:x64-windows=fail spdk-ipsec:x64-windows-static=fail +spdk-ipsec:x64-windows-static-md=fail spdk-ipsec:x86-windows=fail spdk-isal:arm64-windows=fail spdk-isal:arm-uwp=fail @@ -1419,6 +1534,7 @@ spdk-isal:x64-osx=fail spdk-isal:x64-uwp=fail spdk-isal:x64-windows=fail spdk-isal:x64-windows-static=fail +spdk-isal:x64-windows-static-md=fail spdk-isal:x86-windows=fail spirv-tools:arm-uwp=fail spirv-tools:x64-uwp=fail @@ -1445,11 +1561,13 @@ telnetpp:arm-uwp=fail telnetpp:x64-uwp=fail tesseract:x64-windows=fail tesseract:x64-windows-static=fail +tesseract:x64-windows-static-md=fail tesseract:x86-windows=fail tesseract:arm64-windows=fail tfhe:x86-windows=fail tfhe:x64-windows=fail tfhe:x64-windows-static=fail +tfhe:x64-windows-static-md=fail tfhe:x64-uwp=fail tfhe:arm64-windows=fail tfhe:arm-uwp=fail @@ -1458,6 +1576,7 @@ theia:arm-uwp = skip theia:x64-uwp = skip theia:x64-windows = skip theia:x64-windows-static = skip +theia:x64-windows-static-md=skip theia:x86-windows = skip thor:x64-linux=fail thor:x64-osx=fail @@ -1478,19 +1597,23 @@ tmxparser:arm-uwp=fail tmxparser:x64-uwp=fail tmxparser:x64-windows=fail tmxparser:x64-windows-static=fail +tmxparser:x64-windows-static-md=fail tmxparser:x86-windows=fail torch-th:arm64-windows=fail torch-th:arm-uwp=fail torch-th:x64-uwp=fail torch-th:x64-windows-static=fail +torch-th:x64-windows-static-md=fail tre:x64-osx=fail treehopper:x64-windows-static=fail +treehopper:x64-windows-static-md=fail treehopper:x64-linux=fail turbobase64:arm64-windows=fail turbobase64:arm-uwp=fail turbobase64:x64-uwp=fail turbobase64:x64-windows=fail turbobase64:x64-windows-static=fail +turbobase64:x64-windows-static-md=fail turbobase64:x86-windows=fail unicorn:arm64-windows=fail unicorn:arm-uwp=fail @@ -1507,6 +1630,7 @@ 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 unrar:arm64-windows=fail unrar:arm-uwp=fail @@ -1514,7 +1638,9 @@ unrar:x64-linux=fail unrar:x64-osx=fail unrar:x64-uwp=fail unrar:x64-windows-static=fail +unrar:x64-windows-static-md=fail urdfdom:x64-windows-static=fail +urdfdom:x64-windows-static-md=fail usd:x86-windows=fail uthenticode:arm-uwp=fail uthenticode:x64-uwp=fail @@ -1532,6 +1658,7 @@ vulkan:x64-osx=fail vulkan:x64-uwp=fail vulkan:x64-windows=fail vulkan:x64-windows-static=fail +vulkan:x64-windows-static-md=fail vulkan:x86-windows=fail # Conflicts with latest openjpeg port (vxl ships with an old version of openjpeg) # conflicts with qt5-location @@ -1542,6 +1669,7 @@ vxl:x64-osx = skip vxl:x64-uwp = skip vxl:x64-windows = skip vxl:x64-windows-static = skip +vxl:x64-windows-static-md=skip vxl:x86-windows = skip wampcc:arm64-windows=fail wildmidi:x64-osx=fail @@ -1554,6 +1682,7 @@ winpcap:x64-osx=fail winpcap:x64-uwp = skip winpcap:x64-windows = skip winpcap:x64-windows-static = skip +winpcap:x64-windows-static-md=skip winpcap:x86-windows = skip winreg:x64-linux=fail winreg:x64-osx=fail @@ -1566,6 +1695,7 @@ wintoast:x64-uwp=fail woff2:x64-linux=fail woff2:x64-osx=fail woff2:x64-windows-static=fail +woff2:x64-windows-static-md=fail wpilib:arm64-windows=fail wpilib:x64-osx=fail wxchartdir:x64-osx=fail @@ -1578,6 +1708,7 @@ x265:arm64-windows=fail x265:arm-uwp=fail x265:x64-uwp=fail xalan-c:x64-windows-static=fail +xalan-c:x64-windows-static-md=fail xalan-c:arm64-windows=fail xbyak:arm64-windows=fail xbyak:arm-uwp=fail @@ -1594,6 +1725,7 @@ xmsh:x64-linux=skip xmsh:x64-osx=skip xmsh:x64-uwp=skip xmsh:x64-windows-static=skip +xmsh:x64-windows-static-md=skip xmsh:x64-windows=skip xmsh:x86-windows=skip yajl:arm-uwp=fail @@ -1617,6 +1749,7 @@ zeromq:x64-uwp=fail zkpp:x86-windows=fail zkpp:x64-windows=fail zkpp:x64-windows-static=fail +zkpp:x64-windows-static-md=fail zkpp:arm64-windows=fail zkpp:x64-uwp=fail zkpp:arm-uwp=fail @@ -1633,6 +1766,7 @@ 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 protozero:arm-uwp=fail protozero:x64-uwp=fail @@ -1641,8 +1775,45 @@ protozero:x64-uwp=fail clapack:x64-linux=skip clapack:x64-osx=skip clapack:x64-windows-static=skip +clapack:x64-windows-static-md=skip clapack:x64-windows=skip clapack:x86-windows=skip clapack:x64-uwp=skip lapack-reference:arm64-windows=skip lapack-reference:arm-uwp=skip + + +# failures for x64-windows-static-md +ace:x64-windows-static-md=fail +activemq-cpp:x64-windows-static-md=fail +akali:x64-windows-static-md=fail +chromium-base:x64-windows-static-md=fail +clockutils:x64-windows-static-md=fail +fastcgi:x64-windows-static-md=fail +gmp:x64-windows-static-md=fail +graphqlparser:x64-windows-static-md=fail +ijg-libjpeg:x64-windows-static-md=fail +keystone:x64-windows-static-md=fail +libcerf:x64-windows-static-md=fail +libgo:x64-windows-static-md=fail +libmicrohttpd:x64-windows-static-md=fail +libspatialite:x64-windows-static-md=fail +linenoise-ng:x64-windows-static-md=fail +mmloader:x64-windows-static-md=fail +mpg123:x64-windows-static-md=fail +netcdf-cxx4:x64-windows-static-md=fail +open62541:x64-windows-static-md=fail +pngpp:x64-windows-static-md=fail +portmidi:x64-windows-static-md=fail +pthreads:x64-windows-static-md=fail +qt5-tools:x64-windows-static-md=fail +quantlib:x64-windows-static-md=fail +readosm:x64-windows-static-md=fail +sentencepiece:x64-windows-static-md=fail +spirv-tools:x64-windows-static-md=fail +symengine:x64-windows-static-md=fail +teemo:x64-windows-static-md=fail +unicorn:x64-windows-static-md=fail +v8:x64-windows-static-md=fail +yato:x64-windows-static-md=fail +zyre:x64-windows-static-md=fail From 0536c5c7e3766210a83af355f220160b923ae5f4 Mon Sep 17 00:00:00 2001 From: Justin Arruda Date: Fri, 8 Jan 2021 14:57:48 -0500 Subject: [PATCH 0439/1694] [tmx] Update tmx port to 1.1.0 (#15421) * [tmx] Update tmx port to 1.1.0 * Update control file version and copyright file. * Remove port-version field from CONTROL. --- ports/tmx/CONTROL | 3 +-- ports/tmx/fix-build-error.patch | 26 -------------------------- ports/tmx/portfile.cmake | 7 +++---- 3 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 ports/tmx/fix-build-error.patch diff --git a/ports/tmx/CONTROL b/ports/tmx/CONTROL index 970b433dc878ed..1f933b6f5065d0 100644 --- a/ports/tmx/CONTROL +++ b/ports/tmx/CONTROL @@ -1,5 +1,4 @@ Source: tmx -Version: 1.0.0 -Port-Version: 2 +Version: 1.1.0 Description: A portable C library to load tiled maps in your games. Build-Depends: zlib, libxml2 diff --git a/ports/tmx/fix-build-error.patch b/ports/tmx/fix-build-error.patch deleted file mode 100644 index 654fb4dba1ca87..00000000000000 --- a/ports/tmx/fix-build-error.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b29edce..48d0553 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -66,8 +66,9 @@ write_basic_package_version_file("tmxConfigVersion.cmake" COMPATIBILITY SameMajo - # Build - #-----------# - --list(APPEND targets tmx) -+set(targets tmx) - -+if (NOT BUILD_SHARED_LIBS) - add_library(tmx STATIC ${SOURCES}) - set_target_properties(tmx PROPERTIES VERSION ${BUILD_VERSION}) - -@@ -75,8 +76,8 @@ set_property(TARGET tmx - APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES - $) - --if(BUILD_SHARED_LIBS) -- list(APPEND targets tmx_shared) -+else() -+ set(targets tmx_shared) - - add_library(tmx_shared SHARED ${SOURCES}) - target_link_libraries(tmx_shared PRIVATE ${libs}) diff --git a/ports/tmx/portfile.cmake b/ports/tmx/portfile.cmake index c2231f4948277c..4a3801b8a0f798 100644 --- a/ports/tmx/portfile.cmake +++ b/ports/tmx/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO baylej/tmx - REF tmx_1.0.0 + REF tmx_1.1.0 HEAD_REF master - SHA512 d045c45efd03f91a81dae471cb9ddc80d222b3ac52e13b729deeaf3e07d0a03b8e0956b30336ef410c72ddbbf33bea6811da5454b88d44b1db75683ef2a9383a - PATCHES fix-build-error.patch + SHA512 4f57cea30cf01518812cb7279e4d09fd3524e02a29950c2a40aed07ed0f5bd44601517d8a6216a3ca878e1d6bfa15651e92b9e8024e0325baae1dadc7a79acd1 ) vcpkg_configure_cmake( @@ -25,4 +24,4 @@ file(REMOVE_RECURSE ) # Handle copyright -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/tmx/copyright COPYONLY) +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) From 75627141aa59f458ebd94bfc83af7949f977b8f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Fri, 8 Jan 2021 20:58:43 +0100 Subject: [PATCH 0440/1694] [quill] Update to v1.6.1 (#15467) https://github.com/odygrd/quill/releases/tag/v1.6.1 --- ports/quill/CONTROL | 2 +- ports/quill/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/quill/CONTROL b/ports/quill/CONTROL index 30f3ccddf8b0b6..5cc25ff731f35c 100644 --- a/ports/quill/CONTROL +++ b/ports/quill/CONTROL @@ -1,5 +1,5 @@ Source: quill -Version: 1.6.0 +Version: 1.6.1 Homepage: https://github.com/odygrd/quill/ Description: C++14 Asynchronous Low Latency Logging Library Supports: !(arm|uwp|android) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 91c197b81d90cb..b35661684d3758 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill - REF a893abd49188c5567340ae38fd14ecbac02286f7 # v1.6.0 - SHA512 35b20c12b441e96af17cc373004c040dc8b8b43263d12924d60ea8068ccb4e2eaa4cd8e5a4099cc5d46f6f8f1651252d1f041287c76579dca87b6a1c6a729612 + REF v1.6.1 + SHA512 108a93108b0e8fa99a9d76ec4bcadd3ad477d871f274ad832fc0d15538c632a787b83b8a8134f750b613eb08a2742aebf3e79726ac430a7e1dd16c42a62f57f3 HEAD_REF master ) From 742759b6bca568f516277c5dc05295039dbc3085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Kranjc?= Date: Fri, 8 Jan 2021 21:01:00 +0100 Subject: [PATCH 0441/1694] [type-safe] New port. (#15468) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [type-safe] New port. [debug-assert] Added as it is a dependency. * [type-safe] Formatting fix. * [debug-assert] Add homepage to vcpkg.json Co-authored-by: Blaž Kranjc --- ports/debug-assert/portfile.cmake | 24 ++++++++++++++++++++++++ ports/debug-assert/vcpkg.json | 6 ++++++ ports/type-safe/disable_tests.patch | 12 ++++++++++++ ports/type-safe/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/type-safe/vcpkg.json | 9 +++++++++ 5 files changed, 77 insertions(+) create mode 100644 ports/debug-assert/portfile.cmake create mode 100644 ports/debug-assert/vcpkg.json create mode 100644 ports/type-safe/disable_tests.patch create mode 100644 ports/type-safe/portfile.cmake create mode 100644 ports/type-safe/vcpkg.json diff --git a/ports/debug-assert/portfile.cmake b/ports/debug-assert/portfile.cmake new file mode 100644 index 00000000000000..41f9385fff7018 --- /dev/null +++ b/ports/debug-assert/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO foonathan/debug_assert + REF 0144b6532ec80349780ffac3cf85a92d87eb7b1b + SHA512 16cf38406d5f71585b763ff8af59b09c7b8b05372b07714cdc82f6f27292597c0b6d9025f823515744f8235b326b95e1d630af34db4a0e15d4ded79364290630 + HEAD_REF v1.3.3 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DDEBUG_ASSERT_INSTALL=ON +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/debug_assert TARGET_PATH share/debug_assert) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/debug-assert/vcpkg.json b/ports/debug-assert/vcpkg.json new file mode 100644 index 00000000000000..413b23d303d7c8 --- /dev/null +++ b/ports/debug-assert/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "debug-assert", + "version-string": "1.3.3", + "description": "Provides flexible DEBUG_ASSERT() macro.", + "homepage": "https://github.com/foonathan/debug_assert" +} diff --git a/ports/type-safe/disable_tests.patch b/ports/type-safe/disable_tests.patch new file mode 100644 index 00000000000000..f18d2ebbfaa2a1 --- /dev/null +++ b/ports/type-safe/disable_tests.patch @@ -0,0 +1,12 @@ +diff -ur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -136,7 +136,7 @@ + # other subdirectories + # only add if not inside add_subdirectory() + option(TYPE_SAFE_BUILD_TEST_EXAMPLE "build test and example" OFF) +-if(${TYPE_SAFE_BUILD_TEST_EXAMPLE} OR (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)) ++if(${TYPE_SAFE_BUILD_TEST_EXAMPLE}) + enable_testing() + add_subdirectory(example/) + add_subdirectory(test/) diff --git a/ports/type-safe/portfile.cmake b/ports/type-safe/portfile.cmake new file mode 100644 index 00000000000000..8930f3f9247288 --- /dev/null +++ b/ports/type-safe/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO foonathan/type_safe + REF da1d15abc612afbdc81d70c817b49ba1752177de + SHA512 5b344af89378e34f05d96bff2de61615bc16e21601d9fe9d0886c71db211bd3b42afb2467dd2eb7f3d11176dc9adc2d71c6dc0b60722e12aaf8c1d79ea869289 + HEAD_REF v0.2.1 + PATCHES + disable_tests.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DTYPE_SAFE_BUILD_TEST_EXAMPLE=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/type_safe TARGET_PATH share/type_safe) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/type-safe/vcpkg.json b/ports/type-safe/vcpkg.json new file mode 100644 index 00000000000000..3b16d3c7b101eb --- /dev/null +++ b/ports/type-safe/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "type-safe", + "version-string": "0.2.1", + "description": "Zero overhead abstractions that use the C++ type system to prevent bugs.", + "homepage": "https://github.com/foonathan/type_safe", + "dependencies": [ + "debug-assert" + ] +} From 68b4a038eb8a04559e2ee4388a93a7ae253b61db Mon Sep 17 00:00:00 2001 From: General Jack O'Neill Date: Fri, 8 Jan 2021 15:03:08 -0500 Subject: [PATCH 0442/1694] [libzippp] fix find lzma (#15486) * Adds patch to fix find lzma after changes to use upstream CMakeLists.txt * Reference Issue: [libzippp] x64-windows build failure after liblzma use upstream CMakeLists.txt + Add pkgconfig. (#14615) #14679 https://github.com/microsoft/vcpkg/issues/14679 * Reference Commit: PR [liblzma] use upstream CMakeLists.txt + Add pkgconfig. (#14615) https://github.com/microsoft/vcpkg/commit/eb895b95aac6fd7485373702f29f508c42a180a0 --- ports/libzippp/CONTROL | 2 +- ports/libzippp/fix-find-lzma.patch | 13 +++++++++++++ ports/libzippp/portfile.cmake | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 ports/libzippp/fix-find-lzma.patch diff --git a/ports/libzippp/CONTROL b/ports/libzippp/CONTROL index e543537a0d1636..42aec5142c66f5 100644 --- a/ports/libzippp/CONTROL +++ b/ports/libzippp/CONTROL @@ -1,6 +1,6 @@ Source: libzippp Version: 4.0-1.7.3 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/ctabin/libzippp Description: Simple basic C++ wrapper around the libzip library. It is meant to be a portable and easy-to-use library for ZIP handling Build-Depends: zlib, libzip[core,bzip2] diff --git a/ports/libzippp/fix-find-lzma.patch b/ports/libzippp/fix-find-lzma.patch new file mode 100644 index 00000000000000..bc52cbd8fb583f --- /dev/null +++ b/ports/libzippp/fix-find-lzma.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindLIBZIP.cmake b/cmake/FindLIBZIP.cmake +index c51c09a..a32bb13 100644 +--- a/cmake/FindLIBZIP.cmake ++++ b/cmake/FindLIBZIP.cmake +@@ -50,7 +50,7 @@ if (LIBZIP_FOUND) + set_property(TARGET libzip::zip APPEND PROPERTY INTERFACE_LINK_LIBRARIES Nettle::Nettle) + endif() + if(_have_extra_libs MATCHES "-llzma") +- find_package(LibLZMA::LibLZMA REQUIRED) ++ find_package(LibLZMA REQUIRED) + set_property(TARGET libzip::zip APPEND PROPERTY INTERFACE_LINK_LIBRARIES LibLZMA::LibLZMA) + endif() + if(_have_extra_libs MATCHES "-lz") diff --git a/ports/libzippp/portfile.cmake b/ports/libzippp/portfile.cmake index e3f040b9968da9..85a1bb3681d1b6 100644 --- a/ports/libzippp/portfile.cmake +++ b/ports/libzippp/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF 791bdc43eb18b87e3bdfa087493e3e32217e672c #v4.0-1.7.3 with CXX std version c++11 SHA512 c6a90ecec21bb2d9e3af681c35d7eec0bee7b356fc1438004dc84be32ee7b94d047c35817d46b222237d54699ea54afa4fd3ae5deeba40dfce4fd2035a38b0e5 HEAD_REF libzippp-v4.0-1.7.3 + PATCHES fix-find-lzma.patch ) vcpkg_check_features( @@ -22,6 +23,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_copy_pdbs() if(VCPKG_TARGET_IS_WINDOWS) vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake/libzippp") From 4ce473341a6ca935aa53ee378fe57706d8d0bd77 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 8 Jan 2021 15:03:37 -0500 Subject: [PATCH 0443/1694] [pybind11] Use vcpkg Python3. (#15507) --- ports/pybind11/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/pybind11/CONTROL b/ports/pybind11/CONTROL index 8b14c31ec0123b..bd62b362da58a6 100644 --- a/ports/pybind11/CONTROL +++ b/ports/pybind11/CONTROL @@ -1,6 +1,6 @@ Source: pybind11 Version: 2.6.0 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/pybind/pybind11 Description: pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code. -Build-Depends: python3 (windows) +Build-Depends: python3 From 737ed6eaecffab1803b537d74fed3148f82b9e00 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 8 Jan 2021 15:03:56 -0500 Subject: [PATCH 0444/1694] [google-cloud-cpp] update to latest release (v1.22.0) (#15510) --- ports/google-cloud-cpp/CONTROL | 2 +- ports/google-cloud-cpp/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index bc8df7224988dc..c5a8ee3192c7be 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,5 +1,5 @@ Source: google-cloud-cpp -Version: 1.21.0 +Version: 1.22.0 Build-Depends: abseil, grpc, curl[ssl], crc32c, nlohmann-json Description: C++ Client Libraries for Google Cloud Platform APIs. Homepage: https://github.com/googleapis/google-cloud-cpp diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 5dbf51f5ce2564..344b39d5ee4d21 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.21.0 - SHA512 a7988156cef199934ad471eb79724c59eb5a2ff941d71887257c5e95a39d1c78ee9e4295a6e42585a3ce11a4cd9d10af64fbf423560936b8546b26c772e6fa2c + REF v1.22.0 + SHA512 bf5554009d4dddef8782fa7a6ea9790e47169c1558dda4b2bd3caf83efe25c7b04d5d6b7b4dbbc3540790b243b7c9496ebc79f07e21a310c83e952c3596f0536 HEAD_REF master ) From d60abc094cb40a0b3466eb4c15b571b9e46c9df7 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Sun, 10 Jan 2021 14:31:30 -0800 Subject: [PATCH 0445/1694] [vcpkg] Fix unrecognized identifier errors in prbuild and cibuild. (#15354) --- ports/tensorflow-cc/CONTROL | 6 ---- ports/tensorflow-cc/portfile.cmake | 8 +++--- ports/tensorflow-cc/vcpkg.json | 11 ++++++++ ports/tensorflow-common/CONTROL | 6 ---- ports/tensorflow-common/LICENSE.txt | 23 +++++++++++++++ ports/tensorflow-common/portfile.cmake | 28 ++++++++++++++++++- .../tensorflow-common/tensorflow-common.cmake | 12 ++++---- ports/tensorflow-common/vcpkg.json | 7 +++++ ports/tensorflow/CONTROL | 6 ---- ports/tensorflow/portfile.cmake | 26 ++++++++--------- ports/tensorflow/vcpkg.json | 11 ++++++++ toolsrc/src/vcpkg/platform-expression.cpp | 3 ++ 12 files changed, 105 insertions(+), 42 deletions(-) delete mode 100644 ports/tensorflow-cc/CONTROL create mode 100644 ports/tensorflow-cc/vcpkg.json delete mode 100644 ports/tensorflow-common/CONTROL create mode 100644 ports/tensorflow-common/LICENSE.txt create mode 100644 ports/tensorflow-common/vcpkg.json delete mode 100644 ports/tensorflow/CONTROL create mode 100644 ports/tensorflow/vcpkg.json diff --git a/ports/tensorflow-cc/CONTROL b/ports/tensorflow-cc/CONTROL deleted file mode 100644 index 392ce10136d039..00000000000000 --- a/ports/tensorflow-cc/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: tensorflow-cc -Version: 2.3.1 -Port-Version: 1 -Homepage: https://github.com/tensorflow/tensorflow -Description: Library for computation using data flow graphs for scalable machine learning (C++ API version) -Supports: !(x86|arm|uwp) diff --git a/ports/tensorflow-cc/portfile.cmake b/ports/tensorflow-cc/portfile.cmake index 783fe8b70e459b..bf77e7148f57ee 100644 --- a/ports/tensorflow-cc/portfile.cmake +++ b/ports/tensorflow-cc/portfile.cmake @@ -2,9 +2,9 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "UWP") set(TF_LIB_SUFFIX "_cc") set(TF_PORT_SUFFIX "-cc") -set(TF_INCLUDE_DIRS "${INSTALL_PREFIX}/${TARGET_TRIPLET}/include/tensorflow-external - ${INSTALL_PREFIX}/${TARGET_TRIPLET}/include/tensorflow-external/src") -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../tensorflow-common") +set(TF_INCLUDE_DIRS "${CURRENT_INSTALLED_DIR}/include/tensorflow-external + ${CURRENT_INSTALLED_DIR}/include/tensorflow-external/src") +list(APPEND CMAKE_MODULE_PATH "${CURRENT_INSTALLED_DIR}/share/tensorflow-common") include(tensorflow-common) -file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow-external) +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow-external") diff --git a/ports/tensorflow-cc/vcpkg.json b/ports/tensorflow-cc/vcpkg.json new file mode 100644 index 00000000000000..5297a3b0731d7f --- /dev/null +++ b/ports/tensorflow-cc/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "tensorflow-cc", + "version-string": "2.3.1", + "port-version": 2, + "description": "Library for computation using data flow graphs for scalable machine learning (C++ API version)", + "homepage": "https://github.com/tensorflow/tensorflow", + "supports": "!(x86 | arm | uwp)", + "dependencies": [ + "tensorflow-common" + ] +} diff --git a/ports/tensorflow-common/CONTROL b/ports/tensorflow-common/CONTROL deleted file mode 100644 index a5f0364afd17eb..00000000000000 --- a/ports/tensorflow-common/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: tensorflow-common -Version: 2.3.1 -Port-Version: 0 -Homepage: https://github.com/tensorflow/tensorflow -Description: This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own. -Supports: false diff --git a/ports/tensorflow-common/LICENSE.txt b/ports/tensorflow-common/LICENSE.txt new file mode 100644 index 00000000000000..2e4eac8264fa4c --- /dev/null +++ b/ports/tensorflow-common/LICENSE.txt @@ -0,0 +1,23 @@ +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/tensorflow-common/portfile.cmake b/ports/tensorflow-common/portfile.cmake index 4d51544d829d29..5902d050214116 100644 --- a/ports/tensorflow-common/portfile.cmake +++ b/ports/tensorflow-common/portfile.cmake @@ -1 +1,27 @@ -message(FATAL_ERROR "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.") +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +set(TENSORFLOW_FILES + "${CMAKE_CURRENT_LIST_DIR}/change-macros-for-static-lib.patch" + "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_linux.py" + "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_windows.py" + "${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch" + "${CMAKE_CURRENT_LIST_DIR}/fix-dbg-build-errors.patch" + "${CMAKE_CURRENT_LIST_DIR}/fix-linux-build.patch" + "${CMAKE_CURRENT_LIST_DIR}/fix-more-build-errors.patch" + "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_linux.py" + "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_macos.py" + "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_windows.py" + "${CMAKE_CURRENT_LIST_DIR}/README-linux" + "${CMAKE_CURRENT_LIST_DIR}/README-macos" + "${CMAKE_CURRENT_LIST_DIR}/README-windows" + "${CMAKE_CURRENT_LIST_DIR}/tensorflow-common.cmake" + "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-shared.cmake.in" + "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-static.cmake.in" + "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-dll.cmake.in" + "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-lib.cmake.in" + ) + +file(COPY ${TENSORFLOW_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# Use vcpkg's license +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake index 1f9a7203c59f20..dd601ba9bd887c 100644 --- a/ports/tensorflow-common/tensorflow-common.cmake +++ b/ports/tensorflow-common/tensorflow-common.cmake @@ -110,14 +110,14 @@ else() endif() foreach(BUILD_TYPE dbg rel) - # prefer repeated source extraction here for each build type over extracting once above the loop and copying because users reported issues with copying symlinks + # prefer repeated source extraction here for each build type over extracting once above the loop and copying because users reported issues with copying symlinks set(STATIC_ONLY_PATCHES) set(LINUX_ONLY_PATCHES) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(STATIC_ONLY_PATCHES ../tensorflow-common/change-macros-for-static-lib.patch) # there is no static build option - change macros via patch and link library manually at the end + set(STATIC_ONLY_PATCHES "${CMAKE_CURRENT_LIST_DIR}/change-macros-for-static-lib.patch") # there is no static build option - change macros via patch and link library manually at the end endif() if(VCPKG_TARGET_IS_LINUX) - set(LINUX_ONLY_PATCHES ../tensorflow-common/fix-linux-build.patch) + set(LINUX_ONLY_PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-linux-build.patch") endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -126,9 +126,9 @@ foreach(BUILD_TYPE dbg rel) SHA512 e497ef4564f50abf9f918be4522cf702f4cf945cb1ebf83af1386ac4ddc7373b3ba70c7f803f8ca06faf2c6b5396e60b1e0e9b97bfbd667e733b08b6e6d70ef0 HEAD_REF master PATCHES - ../tensorflow-common/fix-build-error.patch # Fix namespace error - ../tensorflow-common/fix-dbg-build-errors.patch # Fix no return statement - ../tensorflow-common/fix-more-build-errors.patch # Fix no return statement + "${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch" # Fix namespace error + "${CMAKE_CURRENT_LIST_DIR}/fix-dbg-build-errors.patch" # Fix no return statement + "${CMAKE_CURRENT_LIST_DIR}/fix-more-build-errors.patch" # Fix no return statement ${STATIC_ONLY_PATCHES} ${LINUX_ONLY_PATCHES} ) diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json new file mode 100644 index 00000000000000..5d6009d2fe2e99 --- /dev/null +++ b/ports/tensorflow-common/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tensorflow-common", + "version-string": "2.3.1", + "port-version": 1, + "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.", + "homepage": "https://github.com/tensorflow/tensorflow" +} diff --git a/ports/tensorflow/CONTROL b/ports/tensorflow/CONTROL deleted file mode 100644 index 0f775ae8d9d46a..00000000000000 --- a/ports/tensorflow/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: tensorflow -Version: 2.3.1 -Port-Version: 0 -Homepage: https://github.com/tensorflow/tensorflow -Description: Library for computation using data flow graphs for scalable machine learning (C API version) -Supports: !(x86|arm|uwp) diff --git a/ports/tensorflow/portfile.cmake b/ports/tensorflow/portfile.cmake index f3a43d24c2c370..0bd5ce3544dff4 100644 --- a/ports/tensorflow/portfile.cmake +++ b/ports/tensorflow/portfile.cmake @@ -2,18 +2,18 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "uwp") set(TF_LIB_SUFFIX "") set(TF_PORT_SUFFIX "") -set(TF_INCLUDE_DIRS "${INSTALL_PREFIX}/${TARGET_TRIPLET}/include") -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../tensorflow-common") +set(TF_INCLUDE_DIRS "${CURRENT_INSTALLED_DIR}/include") +list(APPEND CMAKE_MODULE_PATH "${CURRENT_INSTALLED_DIR}/share/tensorflow-common") include(tensorflow-common) -file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/c_api.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) -file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/c_api_experimental.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) -file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tensor_interface.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) -file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_attrtype.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) -file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_datatype.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) -file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_file_statistics.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) -file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_status.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) -file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_tensor.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c) -file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/c_api.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager) -file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/c_api_experimental.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager) -file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/dlpack.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager) +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/c_api.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/c_api_experimental.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tensor_interface.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_attrtype.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_datatype.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_file_statistics.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_status.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_tensor.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/c_api.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/c_api_experimental.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/dlpack.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager") diff --git a/ports/tensorflow/vcpkg.json b/ports/tensorflow/vcpkg.json new file mode 100644 index 00000000000000..2c3f6d4bf98ca3 --- /dev/null +++ b/ports/tensorflow/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "tensorflow", + "version-string": "2.3.1", + "port-version": 1, + "description": "Library for computation using data flow graphs for scalable machine learning (C API version)", + "homepage": "https://github.com/tensorflow/tensorflow", + "supports": "!(x86 | arm | uwp)", + "dependencies": [ + "tensorflow-common" + ] +} diff --git a/toolsrc/src/vcpkg/platform-expression.cpp b/toolsrc/src/vcpkg/platform-expression.cpp index b87ca4ce91bd5b..78627eb9c0416f 100644 --- a/toolsrc/src/vcpkg/platform-expression.cpp +++ b/toolsrc/src/vcpkg/platform-expression.cpp @@ -29,6 +29,7 @@ namespace vcpkg::PlatformExpression uwp, android, emscripten, + ios, static_link, }; @@ -48,6 +49,7 @@ namespace vcpkg::PlatformExpression {"uwp", Identifier::uwp}, {"android", Identifier::android}, {"emscripten", Identifier::emscripten}, + {"ios", Identifier::ios}, {"static", Identifier::static_link}, }; @@ -392,6 +394,7 @@ namespace vcpkg::PlatformExpression case Identifier::android: return true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "Android"); case Identifier::emscripten: return true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "Emscripten"); + case Identifier::ios: return true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "iOS"); case Identifier::wasm32: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "wasm32"); case Identifier::static_link: return true_if_exists_and_equal("VCPKG_LIBRARY_LINKAGE", "static"); From 5703e9b6b86482ecef22ef046d1c56a894f39855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Guzm=C3=A1n?= Date: Mon, 11 Jan 2021 01:54:08 -0600 Subject: [PATCH 0446/1694] [vcpkg/docs] Add Missing Links in Spanish Readme (#15543) add the missing links from the other readme files --- README_es.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README_es.md b/README_es.md index 74ad86e3ccbf76..19211b0f508d0f 100644 --- a/README_es.md +++ b/README_es.md @@ -1,5 +1,10 @@ # Vcpkg +[中文总览](README_zh_CN.md) +[English](README.md) +[한국어](README_ko_KR.md) +[Français](README_fr.md) + Vcpkg ayuda a manejar librerías de C y C++ en Windows, Linux y MacOS. Esta herramienta y ecosistema se encuentran en constante evolución ¡Siempre apreciamos contribuciones nuevas! From bf4f99217c7575dbd8f260aec515cca4f956b5ff Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Mon, 11 Jan 2021 15:55:40 +0800 Subject: [PATCH 0447/1694] [libjpeg-turbo/mozjpeg] Add conflict messages (#15196) * [libjpeg-turbo/mozjpeg] Add conflict messages * Add missed CONTROL for libjpeg-turbo * Update ports/mozjpeg/CONTROL --- ports/libjpeg-turbo/CONTROL | 2 +- ports/libjpeg-turbo/portfile.cmake | 4 ++++ ports/mozjpeg/CONTROL | 3 ++- ports/mozjpeg/portfile.cmake | 4 ++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index 8dd51db8a691d9..581b62dd6c05ac 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,6 +1,6 @@ Source: libjpeg-turbo Version: 2.0.5 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/libjpeg-turbo/libjpeg-turbo 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. diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index b135c5aeaaa64f..b218a5f9702c39 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -1,3 +1,7 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/mozjpeg/copyright") + message(FATAL_ERROR "Can't build ${PORT} if mozjpeg is installed. Please remove mozjpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjpeg-turbo/libjpeg-turbo diff --git a/ports/mozjpeg/CONTROL b/ports/mozjpeg/CONTROL index 998e5eacfe4b3f..39ee813a056237 100644 --- a/ports/mozjpeg/CONTROL +++ b/ports/mozjpeg/CONTROL @@ -1,5 +1,6 @@ Source: mozjpeg -Version: 2020-06-02-1 +Version: 2020-06-02 +Port-Version: 2 Build-Depends: libpng Homepage: https://github.com/mozilla/mozjpeg Description: MozJPEG reduces file sizes of JPEG images while retaining quality and compatibility with the vast majority of the world's deployed decoders. It's compatible with libjpeg API and ABI, and can be used as a drop-in replacement for libjpeg. diff --git a/ports/mozjpeg/portfile.cmake b/ports/mozjpeg/portfile.cmake index 9c756e778d11e8..b5095a9adadc6e 100644 --- a/ports/mozjpeg/portfile.cmake +++ b/ports/mozjpeg/portfile.cmake @@ -1,3 +1,7 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/libjpeg-turbo/copyright") + message(FATAL_ERROR "Can't build ${PORT} if libjpeg-turbo is installed. Please remove libjpeg-turbo:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mozilla/mozjpeg From 5a03a4d9331384e4b5cd4099e86997a4caf9e451 Mon Sep 17 00:00:00 2001 From: Stephen Just Date: Sun, 10 Jan 2021 23:59:25 -0800 Subject: [PATCH 0448/1694] [KTX] Add port (#15336) * [KTX] Add port * Apply formatting * Install bash for windows * Attempt to fix bash root and osx build since I can't repro either * Fix windows build * Disable on x86 which is not supported, use vcpkg-supplied zstd headers * Fixes * Fix cut/paste error * Update based on review comments --- ports/ktx/0001-Use-vcpkg-zstd.patch | 16 ++++++ ports/ktx/0002-Fix-versioning.patch | 17 +++++++ ports/ktx/portfile.cmake | 75 +++++++++++++++++++++++++++++ ports/ktx/vcpkg.json | 19 ++++++++ 4 files changed, 127 insertions(+) create mode 100644 ports/ktx/0001-Use-vcpkg-zstd.patch create mode 100644 ports/ktx/0002-Fix-versioning.patch create mode 100644 ports/ktx/portfile.cmake create mode 100644 ports/ktx/vcpkg.json diff --git a/ports/ktx/0001-Use-vcpkg-zstd.patch b/ports/ktx/0001-Use-vcpkg-zstd.patch new file mode 100644 index 00000000000000..9a39573bf02b21 --- /dev/null +++ b/ports/ktx/0001-Use-vcpkg-zstd.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index de38d5fe..1244ce55 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -283,9 +283,10 @@ macro(commom_lib_settings lib write ) + endif() + + if(WIN32) ++ find_package(zstd CONFIG REQUIRED) + target_link_libraries( + ${lib} +- ${CMAKE_CURRENT_SOURCE_DIR}/other_lib/win/Release-x64/zstd_static.lib ++ $,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. diff --git a/ports/ktx/0002-Fix-versioning.patch b/ports/ktx/0002-Fix-versioning.patch new file mode 100644 index 00000000000000..1e5098806a752b --- /dev/null +++ b/ports/ktx/0002-Fix-versioning.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/version.cmake b/cmake/version.cmake +index 4094df1a..3b2af3bb 100644 +--- a/cmake/version.cmake ++++ b/cmake/version.cmake +@@ -108,8 +108,10 @@ function(generate_version _var ) + set(${_var} "${KTX_VERSION}" PARENT_SCOPE) + endfunction() + +-# Get latest tag +-git_describe_raw(KTX_VERSION_FULL --abbrev=0 --match v[0-9]*) ++if (!KTX_VERSION_FULL) ++ # Get latest tag ++ git_describe_raw(KTX_VERSION_FULL --abbrev=0 --match v[0-9]*) ++endif() + #message("KTX full version: ${KTX_VERSION_FULL}") + + # generate_version(TOKTX_VERSION tools/toktx) diff --git a/ports/ktx/portfile.cmake b/ports/ktx/portfile.cmake new file mode 100644 index 00000000000000..a4ef51f4fbdcbc --- /dev/null +++ b/ports/ktx/portfile.cmake @@ -0,0 +1,75 @@ +vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86") + +set(PORT_VERSION 4.0.0-beta5) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/KTX-Software + REF v${PORT_VERSION} + SHA512 8c63be2a7c55b8fdb8c8aee1f7cacdc2105e54061691c69cddbd3bed49f8e907262cc3ae83dfd723e76f0911bd6c85f5bbc19347998988a1fc6ecae26bfecf33 + HEAD_REF master + PATCHES + 0001-Use-vcpkg-zstd.patch + 0002-Fix-versioning.patch +) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_acquire_msys(MSYS_ROOT + PACKAGES + bash + DIRECT_PACKAGES + # Required for "getopt" + "https://repo.msys2.org/msys/x86_64/util-linux-2.35.2-1-x86_64.pkg.tar.zst" + ff951c2cd96d0fda87bacb505c93e4aa1f9aeb35f829c52b5a7862d05e167f69605a4927a0e7197b5ee2b2fa5cb56619ad7a6ba293ede4765fdcacedf2ed35da + ) + vcpkg_add_to_path(${MSYS_ROOT}/usr/bin) + + file(REMOVE + "${SOURCE_PATH}/other_include/zstd.h" + "${SOURCE_PATH}/other_include/zstd_errors.h") +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + tools KTX_FEATURE_TOOLS + vulkan KTX_FEATURE_VULKAN +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DKTX_VERSION_FULL=v${PORT_VERSION} + -DKTX_FEATURE_TESTS=OFF + -DKTX_FEATURE_LOADTEST_APPS=OFF + -DKTX_FEATURE_STATIC_LIBRARY=${ENABLE_STATIC} + ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +if(tools IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES + toktx + ktxsc + ktxinfo + ktx2ktx2 + ktx2check + AUTO_CLEAN + ) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +endif() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ktx TARGET_PATH share/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + +configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +file(COPY ${LICENSE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSES") \ No newline at end of file diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json new file mode 100644 index 00000000000000..0e9be873261c9b --- /dev/null +++ b/ports/ktx/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "ktx", + "version-string": "4.0.0-beta5", + "port-version": 1, + "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", + "supports": "!(uwp | x86)", + "dependencies": [ + "zstd" + ], + "features": { + "tools": { + "description": "Build tools" + }, + "vulkan": { + "description": "Build Vulkan support" + } + } +} From f35e58ffe227a9ca0b3ce3ffb0cff4f0a45200f8 Mon Sep 17 00:00:00 2001 From: kkzi <34122458+kkzi@users.noreply.github.com> Date: Mon, 11 Jan 2021 16:00:26 +0800 Subject: [PATCH 0449/1694] update trantor from 1.1.0-beta to 1.1.1-release (#15460) Co-authored-by: xuan.guo@atomdatatech.com --- ports/trantor/CONTROL | 2 +- ports/trantor/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/trantor/CONTROL b/ports/trantor/CONTROL index b8b62de42cdac2..88be5a34a84167 100644 --- a/ports/trantor/CONTROL +++ b/ports/trantor/CONTROL @@ -1,5 +1,5 @@ Source: trantor -Version: 1.1.0 +Version: 1.1.1 Homepage: https://github.com/an-tao/trantor Description: A non-blocking I/O cross-platform TCP network library, using C++14. Build-Depends: openssl, c-ares diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake index a4c9182296efd2..b5620907ac4966 100644 --- a/ports/trantor/portfile.cmake +++ b/ports/trantor/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor - REF v1.1.0 - SHA512 7177c62644ad941aec446d4e2b4a49ebbae4758dff289ce38a889ec1d2fb52fe968ccf32520bffa6ff6ff478b4752d89b2a798d9e4ce69ae6a81cb024e844487 + REF v1.1.1 + SHA512 525316b88a96acc90cf21aa0d6dc74ccbeb1bf55dda39cd6fb0344f3672e61db37621614d742666fd54c28448e0fbc4cedebda10cadb97a225be9481a6fbd9e2 HEAD_REF master ) From 2cf73564493db4e78d0255a70bfcac9aec88e69f Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Mon, 11 Jan 2021 00:02:08 -0800 Subject: [PATCH 0450/1694] [libepoxy] Update to 1.5.5 (#15482) * [libepoxy] Update to 1.5.5 * [libepoxy] Address CR comments --- ports/libepoxy/CONTROL | 3 +- ...Add_call_convention_to_mock_function.patch | 22 ----- .../libepoxy/libepoxy-1.5.4_meson_c_std.patch | 11 --- ports/libepoxy/portfile.cmake | 83 +++++-------------- 4 files changed, 22 insertions(+), 97 deletions(-) delete mode 100644 ports/libepoxy/libepoxy-1.5.4_Add_call_convention_to_mock_function.patch delete mode 100644 ports/libepoxy/libepoxy-1.5.4_meson_c_std.patch diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL index 1ef7749ebf4d64..7e6b7e53256b1a 100644 --- a/ports/libepoxy/CONTROL +++ b/ports/libepoxy/CONTROL @@ -1,6 +1,5 @@ Source: libepoxy -Version: 1.5.4 -Port-Version: 2 +Version: 1.5.5 Homepage: https://github.com/anholt/libepoxy Description: Epoxy is a library for handling OpenGL function pointer management for you Build-Depends: tool-meson diff --git a/ports/libepoxy/libepoxy-1.5.4_Add_call_convention_to_mock_function.patch b/ports/libepoxy/libepoxy-1.5.4_Add_call_convention_to_mock_function.patch deleted file mode 100644 index d6ddd92e476d94..00000000000000 --- a/ports/libepoxy/libepoxy-1.5.4_Add_call_convention_to_mock_function.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 81d758d025089d6b3b5309205ff4cb75789e6205 Mon Sep 17 00:00:00 2001 -From: crziter -Date: Tue, 25 Feb 2020 11:33:56 +0700 -Subject: [PATCH] Add call convention to mock function - ---- - test/gl_version.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/gl_version.c b/test/gl_version.c -index 9ab0080..9fe1bba 100644 ---- a/test/gl_version.c -+++ b/test/gl_version.c -@@ -29,7 +29,7 @@ GLenum mock_enum; - const char *mock_gl_version; - const char *mock_glsl_version; - --static const GLubyte *override_glGetString(GLenum name) -+static const GLubyte * EPOXY_CALLSPEC override_glGetString(GLenum name) - { - switch (name) { - case GL_VERSION: diff --git a/ports/libepoxy/libepoxy-1.5.4_meson_c_std.patch b/ports/libepoxy/libepoxy-1.5.4_meson_c_std.patch deleted file mode 100644 index 850bbe01bea149..00000000000000 --- a/ports/libepoxy/libepoxy-1.5.4_meson_c_std.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build 2019-11-06 00:08:06.000000000 +0100 -+++ b/meson.build 2020-11-03 20:02:08.201459200 +0100 -@@ -1,7 +1,7 @@ - project('libepoxy', 'c', version: '1.5.4', - default_options: [ - 'buildtype=debugoptimized', -- 'c_std=gnu99', -+ 'c_std=c99', - 'warning_level=1', - ], - license: 'MIT', diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake index 07f81a7b715bc3..90290b5a083fdb 100644 --- a/ports/libepoxy/portfile.cmake +++ b/ports/libepoxy/portfile.cmake @@ -1,75 +1,34 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +if(VCPKG_TARGET_IS_LINUX AND NOT EXISTS "/usr/share/doc/libgles2/copyright") + message(STATUS "libgles2-mesa-dev must be installed before libepoxy can build. Install it with \"apt-get install libgles2-mesa-dev\".") +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO anholt/libepoxy - REF 1.5.4 - SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5 + REF 1.5.5 + SHA512 9056840d887f06c6422f61e65ea02511ed37b866a234d49bf78dc5f2f46e8dd9f029405387da14dced639e6a5740b5c56ab6d88ca23ea3270fc6db6a570b0c45 HEAD_REF master - PATCHES - # https://github.com/anholt/libepoxy/pull/220 - libepoxy-1.5.4_Add_call_convention_to_mock_function.patch - libepoxy-1.5.4_meson_c_std.patch ) if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) - vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -Denable-glx=no - -Denable-egl=no) - vcpkg_install_meson() - vcpkg_copy_pdbs() + set(OPTIONS -Dglx=no -Degl=no -Dx11=false) else() - find_program(autoreconf autoreconf) - if (NOT autoreconf OR NOT EXISTS "/usr/share/doc/libgles2/copyright") - message(FATAL_ERROR "autoreconf and libgles2-mesa-dev must be installed before libepoxy can build. Install them with \"apt-get install dh-autoreconf libgles2-mesa-dev\".") - endif() - - find_program(MAKE make) - if (NOT MAKE) - message(FATAL_ERROR "MAKE not found") - endif() - - file(REMOVE_RECURSE ${SOURCE_PATH}/m4) - file(MAKE_DIRECTORY ${SOURCE_PATH}/m4) - - set(LIBEPOXY_CONFIG_ARGS "--enable-x11=yes --enable-glx=yes --enable-egl=yes") - - vcpkg_execute_required_process( - COMMAND "autoreconf" -v --install - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME autoreconf-${TARGET_TRIPLET} - ) - - message(STATUS "Configuring ${TARGET_TRIPLET}") - set(OUT_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/make-build-${TARGET_TRIPLET}-release) - - file(REMOVE_RECURSE ${OUT_PATH_RELEASE}) - file(MAKE_DIRECTORY ${OUT_PATH_RELEASE}) - - vcpkg_execute_required_process( - COMMAND "./configure" --prefix=${OUT_PATH_RELEASE} "${LIBEPOXY_CONFIG_ARGS}" - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME config-${TARGET_TRIPLET} - ) - - message(STATUS "Building ${TARGET_TRIPLET}") - vcpkg_execute_required_process( - COMMAND make - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}-release - ) - - message(STATUS "Installing ${TARGET_TRIPLET}") - vcpkg_execute_required_process( - COMMAND make install - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME install-${TARGET_TRIPLET}-release - ) - file(COPY ${OUT_PATH_RELEASE}/include DESTINATION ${CURRENT_PACKAGES_DIR}) - file(COPY ${OUT_PATH_RELEASE}/lib DESTINATION ${CURRENT_PACKAGES_DIR}) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/bin) + set(OPTIONS -Dglx=yes -Degl=yes -Dx11=true) endif() +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -Dc_std=c99) +endif() + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${OPTIONS} -Dtests=false +) +vcpkg_install_meson() +vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/pkgconfig) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig) From f343517f25347b4a4c6c0e0b5f84c7fb74e14ff7 Mon Sep 17 00:00:00 2001 From: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Mon, 11 Jan 2021 09:03:33 +0100 Subject: [PATCH 0451/1694] Update to hidapi-0.10.1 (#15485) * Update to hidapi-0.10.1 * Update portfile.cmake * Deleted comment, which is no longer valid * Create CONTROL Added the missing CONTROL file on request of @JonLiu1993 * Delete CONTROL * Update vcpkg.json * Set version to the tag of the release --- ports/hidapi/portfile.cmake | 4 ++-- ports/hidapi/vcpkg.json | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake index ea2cd092bf442a..cf506171b0b05d 100644 --- a/ports/hidapi/portfile.cmake +++ b/ports/hidapi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "linux" "osx" "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libusb/hidapi - REF fc677b81951d8facc99bab6b4f0060b5d89e2e15 # use commit from master for windows/hidapi.vcxproj - SHA512 8a779c1d4fe83e264046f3193a5cefe2d9765dcde30628767838180b3dec2bdd25c9c1ec9a96b3a7edaf00df7662b4d658f2b57bda67cebc7d7cb4e737cb1f88 + REF hidapi-0.10.1 + SHA512 0479706c631775483378070ff7170542725678eabc202a5bd07436c951fd766e01743417999ac3fb2b5436c865f6ace2cfced1f210fa3a3e88c19ceb3bbe0534 HEAD_REF master ) diff --git a/ports/hidapi/vcpkg.json b/ports/hidapi/vcpkg.json index f73f97f2ead62f..2f9181f55c26ad 100644 --- a/ports/hidapi/vcpkg.json +++ b/ports/hidapi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "hidapi", - "version-string": "2019-08-30", - "port-version": 1, + "version-string": "0.10.1", "description": "A Simple library for communicating with USB and Bluetooth HID devices on Linux, Mac and Windows.", "homepage": "https://github.com/libusb/hidapi", "supports": "windows & !(arm | arm64 | uwp)" From e0a22182d71989ffb88b0647c0b3a46ff64491cd Mon Sep 17 00:00:00 2001 From: cedral Date: Mon, 11 Jan 2021 02:05:01 -0600 Subject: [PATCH 0452/1694] Fix duplicate symbols of asio::dummy_return (#15513) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix duplicate symbols of asio::dummy_return * Update ports/boost-asio/CONTROL * Update ports/boost-asio/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/boost-asio/CONTROL | 1 + ports/boost-asio/inline_dummy_return.patch | 13 +++++++++++++ ports/boost-asio/portfile.cmake | 4 +++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 ports/boost-asio/inline_dummy_return.patch diff --git a/ports/boost-asio/CONTROL b/ports/boost-asio/CONTROL index 0ab98158acb7aa..ad44a6be7e21f6 100644 --- a/ports/boost-asio/CONTROL +++ b/ports/boost-asio/CONTROL @@ -1,6 +1,7 @@ # Automatically generated by scripts/boost/generate-ports.ps1 Source: boost-asio Version: 1.75.0 +Port-Version: 1 Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!arm&!uwp&!emscripten), boost-date-time, boost-detail, boost-function, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, openssl Homepage: https://github.com/boostorg/asio Description: Boost asio module diff --git a/ports/boost-asio/inline_dummy_return.patch b/ports/boost-asio/inline_dummy_return.patch new file mode 100644 index 00000000000000..b4c29a6316d1b0 --- /dev/null +++ b/ports/boost-asio/inline_dummy_return.patch @@ -0,0 +1,13 @@ +diff --git a/asio/include/asio/impl/use_awaitable.hpp b/asio/include/asio/impl/use_awaitable.hpp +index 60a6f5cd..af7be635 100644 +--- a/include/boost/asio/impl/use_awaitable.hpp ++++ b/include/boost/asio/impl/use_awaitable.hpp +@@ -236,7 +236,7 @@ T dummy_return() + } + + template <> +-void dummy_return() ++inline void dummy_return() + { + } + #endif // defined(_MSC_VER) diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index cbc976df0ab751..2c511452696963 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF boost-1.75.0 SHA512 5f332644207f87af8ffbf93d9f1f72b7ca6dfa96d77a871308951c492ae27fac20bad2bfdf4e1de06585c1405d1875c4d4335786b3fc08aa0a76ef4de3626c27 HEAD_REF master - PATCHES windows_alloca_header.patch + PATCHES + windows_alloca_header.patch + inline_dummy_return.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) From 3ec770fc37f040890f008ce65d8abb1eb61a43ae Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Mon, 11 Jan 2021 16:06:54 +0800 Subject: [PATCH 0453/1694] [sqlite-orm] Update to 1.6 (#15517) * [sqlite-orm] Update to 1.6 * Removed unused FEATURE_PATCHES * Add vcpkg_fixup_cmake_targets() * Update patch --- ports/sqlite-orm/CONTROL | 3 +- ports/sqlite-orm/fix-build-error.patch | 24 -------- ports/sqlite-orm/fix-dependency.patch | 10 ++++ ports/sqlite-orm/fix-example-feature.patch | 11 ---- .../sqlite-orm/fix-features-build-error.patch | 50 ++++++++++++++++ ports/sqlite-orm/fix-test-feature.patch | 30 ---------- ports/sqlite-orm/fix-usage.patch | 59 ------------------- ports/sqlite-orm/portfile.cmake | 21 ++----- 8 files changed, 67 insertions(+), 141 deletions(-) delete mode 100644 ports/sqlite-orm/fix-build-error.patch create mode 100644 ports/sqlite-orm/fix-dependency.patch delete mode 100644 ports/sqlite-orm/fix-example-feature.patch create mode 100644 ports/sqlite-orm/fix-features-build-error.patch delete mode 100644 ports/sqlite-orm/fix-test-feature.patch delete mode 100644 ports/sqlite-orm/fix-usage.patch diff --git a/ports/sqlite-orm/CONTROL b/ports/sqlite-orm/CONTROL index e5f4bccb04db44..3ae7f4611bb82f 100644 --- a/ports/sqlite-orm/CONTROL +++ b/ports/sqlite-orm/CONTROL @@ -1,6 +1,5 @@ Source: sqlite-orm -Version: 1.5 -Port-Version: 2 +Version: 1.6 Homepage: https://github.com/fnc12/sqlite_orm Build-Depends: sqlite3 Description: SQLite ORM light header only library for modern C++ diff --git a/ports/sqlite-orm/fix-build-error.patch b/ports/sqlite-orm/fix-build-error.patch deleted file mode 100644 index ca4e005d46b425..00000000000000 --- a/ports/sqlite-orm/fix-build-error.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ffbdf3..6debae6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,6 +39,9 @@ set(ProjectName "SqliteOrm") - - option(SqliteOrm_BuildTests "Build sqlite_orm unit tests" ON) - -+find_package(unofficial-sqlite3 CONFIG REQUIRED) -+link_libraries(unofficial::sqlite3::sqlite3) -+ - set(SqliteOrm_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include") - add_library(sqlite_orm INTERFACE) - -@@ -75,7 +78,9 @@ if(SqliteOrm_BuildTests AND BUILD_TESTING) - add_subdirectory(tests) - endif() - -+if(BUILD_EXAMPLES) - add_subdirectory(examples) -+endif() - - install(TARGETS sqlite_orm EXPORT "${ProjectName}Targets" - INCLUDES DESTINATION "${INCLUDE_INSTALL_DIR}" COMPONENT Development diff --git a/ports/sqlite-orm/fix-dependency.patch b/ports/sqlite-orm/fix-dependency.patch new file mode 100644 index 00000000000000..7372d67fe588f0 --- /dev/null +++ b/ports/sqlite-orm/fix-dependency.patch @@ -0,0 +1,10 @@ +diff --git a/cmake/SqliteOrmConfig.cmake.in b/cmake/SqliteOrmConfig.cmake.in +index e0635d2..30403cd 100644 +--- a/cmake/SqliteOrmConfig.cmake.in ++++ b/cmake/SqliteOrmConfig.cmake.in +@@ -1,4 +1,4 @@ + include(CMakeFindDependencyMacro) +-find_dependency(SQLite3) ++find_dependency(unofficial-sqlite3) + + include(${CMAKE_CURRENT_LIST_DIR}/SqliteOrmTargets.cmake) diff --git a/ports/sqlite-orm/fix-example-feature.patch b/ports/sqlite-orm/fix-example-feature.patch deleted file mode 100644 index ad68dade0fc9cc..00000000000000 --- a/ports/sqlite-orm/fix-example-feature.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index 2857b65..3ee46e6 100644 ---- a/examples/CMakeLists.txt -+++ b/examples/CMakeLists.txt -@@ -4,5 +4,5 @@ file(GLOB files "*.cpp") - foreach(file ${files}) - get_filename_component(file_basename ${file} NAME_WE) - add_executable(${file_basename} ${file}) -- target_link_libraries(${file_basename} PRIVATE sqlite_orm sqlite3) -+ target_link_libraries(${file_basename} PRIVATE sqlite_orm) - endforeach() diff --git a/ports/sqlite-orm/fix-features-build-error.patch b/ports/sqlite-orm/fix-features-build-error.patch new file mode 100644 index 00000000000000..ce34583d179b9c --- /dev/null +++ b/ports/sqlite-orm/fix-features-build-error.patch @@ -0,0 +1,50 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dd86d2f..6696809 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,15 +32,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") + include(CTest) + + ### Dependencies +-add_subdirectory(dependencies) + + ### Main Build Targets + set(SqliteOrm_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include") + add_library(sqlite_orm INTERFACE) + add_library(sqlite_orm::sqlite_orm ALIAS sqlite_orm) + +-find_package(SQLite3 REQUIRED) +-target_link_libraries(sqlite_orm INTERFACE SQLite::SQLite3) ++find_package(unofficial-sqlite3 CONFIG REQUIRED) ++target_link_libraries(sqlite_orm INTERFACE unofficial::sqlite3::sqlite3) + + target_sources(sqlite_orm INTERFACE $) + +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index 2857b65..3ee46e6 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -4,5 +4,5 @@ file(GLOB files "*.cpp") + foreach(file ${files}) + get_filename_component(file_basename ${file} NAME_WE) + add_executable(${file_basename} ${file}) +- target_link_libraries(${file_basename} PRIVATE sqlite_orm sqlite3) ++ target_link_libraries(${file_basename} PRIVATE sqlite_orm) + endforeach() +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index fd41e70..8087899 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -7,9 +7,11 @@ option(SqliteOrm_SysSqlite "Use system version of sqlite library" OFF) + if(SqliteOrm_SysSqlite) + message(FATAL_ERROR "WIP: please, disable the SqliteOrm_SysSqlite option.") + else() +- add_subdirectory(third_party/sqlite) ++ find_package(unofficial-sqlite3 CONFIG REQUIRED) + endif() + ++find_package(Catch2 CONFIG REQUIRED) ++ + add_executable(unit_tests tests.cpp tests2.cpp tests3.cpp tests4.cpp tests5.cpp private_getters_tests.cpp pragma_tests.cpp explicit_columns.cpp core_functions_tests.cpp index_tests.cpp constraints/composite_key.cpp static_tests.cpp operators/arithmetic_operators.cpp operators/like.cpp operators/glob.cpp operators/in.cpp operators/cast.cpp operators/is_null.cpp operators/not_operator.cpp operators/bitwise.cpp dynamic_order_by.cpp prepared_statement_tests/select.cpp prepared_statement_tests/get_all.cpp prepared_statement_tests/get_all_pointer.cpp prepared_statement_tests/get_all_optional.cpp prepared_statement_tests/update_all.cpp prepared_statement_tests/remove_all.cpp prepared_statement_tests/get.cpp prepared_statement_tests/get_pointer.cpp prepared_statement_tests/get_optional.cpp prepared_statement_tests/update.cpp prepared_statement_tests/remove.cpp prepared_statement_tests/insert.cpp prepared_statement_tests/replace.cpp prepared_statement_tests/insert_range.cpp prepared_statement_tests/replace_range.cpp prepared_statement_tests/insert_explicit.cpp pragma_tests.cpp simple_query.cpp static_tests/is_bindable.cpp static_tests/arithmetic_operators_result_type.cpp static_tests/tuple_conc.cpp static_tests/node_tuple.cpp static_tests/bindable_filter.cpp static_tests/count_tuple.cpp static_tests/member_traits_tests.cpp static_tests/select_return_type.cpp constraints/default.cpp constraints/unique.cpp constraints/foreign_key.cpp constraints/check.cpp table_tests.cpp statement_serializator_tests/primary_key.cpp statement_serializator_tests/column_names.cpp statement_serializator_tests/autoincrement.cpp statement_serializator_tests/arithmetic_operators.cpp statement_serializator_tests/core_functions.cpp statement_serializator_tests/comparison_operators.cpp statement_serializator_tests/unique.cpp statement_serializator_tests/foreign_key.cpp statement_serializator_tests/collate.cpp statement_serializator_tests/check.cpp statement_serializator_tests/index.cpp statement_serializator_tests/indexed_column.cpp unique_cases/get_all_with_two_tables.cpp unique_cases/prepare_get_all_with_case.cpp unique_cases/index_named_table_with_fk.cpp unique_cases/issue525.cpp unique_cases/delete_with_two_fields.cpp unique_cases/join_iterator_ctor_compilation_error.cpp get_all_custom_containers.cpp select_asterisk.cpp backup_tests.cpp transaction_tests.cpp) + + diff --git a/ports/sqlite-orm/fix-test-feature.patch b/ports/sqlite-orm/fix-test-feature.patch deleted file mode 100644 index 2f825938451914..00000000000000 --- a/ports/sqlite-orm/fix-test-feature.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 578cbed..c1c6d56 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -4,11 +4,11 @@ option(SQLITE_ORM_OMITS_CODECVT "Omits codec testing" OFF) - - option(SqliteOrm_SysSqlite "Use system version of sqlite library" OFF) - --if(SqliteOrm_SysSqlite) -- message(FATAL_ERROR "WIP: please, disable the SqliteOrm_SysSqlite option.") --else() -- add_subdirectory(third_party/sqlite) --endif() -+#if(SqliteOrm_SysSqlite) -+# message(FATAL_ERROR "WIP: please, disable the SqliteOrm_SysSqlite option.") -+#else() -+# add_subdirectory(third_party/sqlite) -+#endif() - - add_executable(unit_tests tests.cpp tests2.cpp tests3.cpp tests4.cpp tests4.cpp private_getters_tests.cpp pragma_tests.cpp explicit_columns.cpp core_functions_tests.cpp composite_key.cpp static_tests.cpp operators.cpp operators/like.cpp operators/glob.cpp operators/in.cpp operators/cast.cpp operators/is_null.cpp dynamic_order_by.cpp prepared_statement_tests/select.cpp prepared_statement_tests/get_all.cpp prepared_statement_tests/get_all_pointer.cpp prepared_statement_tests/get_all_optional.cpp prepared_statement_tests/update_all.cpp prepared_statement_tests/remove_all.cpp prepared_statement_tests/get.cpp prepared_statement_tests/get_pointer.cpp prepared_statement_tests/get_optional.cpp prepared_statement_tests/update.cpp prepared_statement_tests/remove.cpp prepared_statement_tests/insert.cpp prepared_statement_tests/replace.cpp prepared_statement_tests/insert_range.cpp prepared_statement_tests/replace_range.cpp prepared_statement_tests/insert_explicit.cpp pragma_tests.cpp simple_query.cpp static_tests/is_bindable.cpp static_tests/arithmetic_operators_result_type.cpp static_tests/tuple_conc.cpp static_tests/node_tuple.cpp static_tests/bindable_filter.cpp static_tests/count_tuple.cpp constraints/default.cpp constraints/foreign_key.cpp) - -@@ -19,7 +19,7 @@ if(SQLITE_ORM_OMITS_CODECVT) - endif() - - find_package(Catch2 REQUIRED) --target_link_libraries(unit_tests PRIVATE sqlite_orm sqlite3 Catch2::Catch2) -+target_link_libraries(unit_tests PRIVATE sqlite_orm Catch2::Catch2) - - enable_testing() - diff --git a/ports/sqlite-orm/fix-usage.patch b/ports/sqlite-orm/fix-usage.patch deleted file mode 100644 index 7e90b0edff6bfe..00000000000000 --- a/ports/sqlite-orm/fix-usage.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6debae6..facdc1e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,7 +47,7 @@ add_library(sqlite_orm INTERFACE) - - target_sources(sqlite_orm INTERFACE - $ -- $) -+ $) - - target_include_directories(sqlite_orm INTERFACE - $ -@@ -83,11 +83,11 @@ add_subdirectory(examples) - endif() - - install(TARGETS sqlite_orm EXPORT "${ProjectName}Targets" -- INCLUDES DESTINATION "${INCLUDE_INSTALL_DIR}" COMPONENT Development -- PUBLIC_HEADER DESTINATION "${INCLUDE_INSTALL_DIR}" COMPONENT Development) -+ INCLUDES DESTINATION "${INCLUDE_INSTALL_DIR}" -+ PUBLIC_HEADER DESTINATION "${INCLUDE_INSTALL_DIR}") - - install(FILES "include/sqlite_orm/sqlite_orm.h" -- DESTINATION "${INCLUDE_INSTALL_DIR}" COMPONENT Development) -+ DESTINATION "${INCLUDE_INSTALL_DIR}") - - export(EXPORT "${ProjectName}Targets" - FILE "${CMAKE_CURRENT_BINARY_DIR}/${ProjectName}/${ProjectName}Targets.cmake" -diff --git a/build/cmake/GenerateConfigModule.cmake b/build/cmake/GenerateConfigModule.cmake -index 3c5143d..a49f76a 100644 ---- a/build/cmake/GenerateConfigModule.cmake -+++ b/build/cmake/GenerateConfigModule.cmake -@@ -1,7 +1,7 @@ - include(CMakePackageConfigHelpers) - --set(PACKAGE_INCLUDE_INSTALL_DIR "${includedir}/sqlite_orm") --set(PACKAGE_CMAKE_INSTALL_DIR "${cmakedir}/sqlite_orm") -+set(PACKAGE_INCLUDE_INSTALL_DIR "${includedir}") -+set(PACKAGE_CMAKE_INSTALL_DIR "${cmakedir}") - - # In CYGWIN enviroment below commands does not work properly - if (NOT CYGWIN) -diff --git a/build/cmake/SqliteOrmConfig.cmake.in b/build/cmake/SqliteOrmConfig.cmake.in -index a6b6f20..7411aa1 100644 ---- a/build/cmake/SqliteOrmConfig.cmake.in -+++ b/build/cmake/SqliteOrmConfig.cmake.in -@@ -3,10 +3,10 @@ set(SQLITE_ORM_VERSION ${sqlite_orm_VERSION}) - @PACKAGE_INIT@ - - set_and_check(SQLITE_ORM_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") --set_and_check(SQLITE_ORM_CMAKE_DIR "@PACKAGE_CMAKE_INSTALL_DIR@") -+set_and_check(SQLITE_ORM_CMAKE_DIR "@PACKAGE_CMAKE_INSTALL_DIR@/../../") - - if (NOT TARGET sqlite_orm::sqlite_orm) -- include("${SQLITE_ORM_CMAKE_DIR}/SqliteOrmTargets.cmake") -+ include("${SQLITE_ORM_CMAKE_DIR}/share/SqliteOrm/SqliteOrmTargets.cmake") - endif() - - set(SQLITE_ORM_LIBRARIES sqlite_orm::sqlite_orm) diff --git a/ports/sqlite-orm/portfile.cmake b/ports/sqlite-orm/portfile.cmake index 140ab42c612bea..e72426449a1e34 100644 --- a/ports/sqlite-orm/portfile.cmake +++ b/ports/sqlite-orm/portfile.cmake @@ -2,28 +2,19 @@ set(FEATURE_PATCHES) -if(test IN_LIST FEATURES) - list(APPEND FEATURE_PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-test-feature.patch) -endif() - -if(example IN_LIST FEATURES) - list(APPEND FEATURE_PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-example-feature.patch) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fnc12/sqlite_orm - REF b30ddc6a50dc582c93cd49d8d0cf8f5025ba1d2b # 1.5 - SHA512 faeeef88aef11e89e9565850c23087925fb4d75ef48a16434055f18831db8e230d044c81574d840dacca406d7095cb83a113afc326996e289ab11a02d8caa2f4 + REF 4c6a46bd4dcfba14a650e0fafb86331526878587 # 1.6 + SHA512 9626fc20374aff5da718d32c7b942a7a6434920da9cf68df6146e9c25cca61936c2e3091c6476c369c8bf241dcb8473169ee726eaedfeb92d79ff4fa8a6b2d32 HEAD_REF master PATCHES - fix-build-error.patch - fix-usage.patch - ${FEATURE_PATCHES} + fix-features-build-error.patch + fix-dependency.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - test SqliteOrm_BuildTests + test BUILD_TESTING example BUILD_EXAMPLES ) @@ -36,7 +27,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sqlite_orm TARGET_PATH share/SqliteOrm) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SqliteOrm TARGET_PATH share/SqliteOrm) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) From ec6491f00cba8ac3b8089b210ff9158a18d05c16 Mon Sep 17 00:00:00 2001 From: Stephen Eckels Date: Mon, 11 Jan 2021 03:07:19 -0500 Subject: [PATCH 0454/1694] update_polyhook2 (#15537) --- ports/polyhook2/CONTROL | 2 +- ports/polyhook2/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/polyhook2/CONTROL b/ports/polyhook2/CONTROL index 2bd7dcbbefb42a..4c4959ef83abd1 100644 --- a/ports/polyhook2/CONTROL +++ b/ports/polyhook2/CONTROL @@ -1,5 +1,5 @@ Source: polyhook2 -Version: 2020-09-22 +Version: 2021-01-08 Homepage: https://github.com/stevemk14ebr/PolyHook_2_0 Description: C++17, x86/x64 Hooking Library v2.0 Supports: !(arm|uwp|linux|osx) diff --git a/ports/polyhook2/portfile.cmake b/ports/polyhook2/portfile.cmake index a7a86e5879878d..12aec1cf651387 100644 --- a/ports/polyhook2/portfile.cmake +++ b/ports/polyhook2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "Linux" "OSX" "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevemk14ebr/PolyHook_2_0 - REF 99a4b7da142f35380564f462e537f4fe04e5b5f0 - SHA512 2a8e77344deffe5ca345dd6102b92b9154c3c7d36f2b99cfa3bae96cf37078dc9cdeae671f82bfef5d98bbb72507dc39ae569e7b8bcb9698d8bc787dca438d83 + REF ee07729ac1bb8f09549903b5ba69b2544f837ff8 + SHA512 7ffa1b3c51789abfd6e081e1b4d6dd4e9536589c36f0cbc3ded8b7876d065fa8fa407f75786a2c3d6588df9b3336085841e4ba7008ff1f730c948c76b64d76b1 HEAD_REF master ) From 976134bd13c4dabd32424983160b9d9c24d0e6ed Mon Sep 17 00:00:00 2001 From: Andrei Lebedev Date: Mon, 11 Jan 2021 09:08:05 +0100 Subject: [PATCH 0455/1694] [openssl] Update to 1.1.1i (#15298) Signed-off-by: Andrei Lebedev --- ports/openssl/CONTROL | 3 +-- ports/openssl/portfile.cmake | 4 ++-- ports/openssl/unix/CMakeLists.txt | 7 +++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL index ae561f5674f801..2538dd836e0f0c 100644 --- a/ports/openssl/CONTROL +++ b/ports/openssl/CONTROL @@ -1,5 +1,4 @@ Source: openssl -Version: 1.1.1h -Port-Version: 5 +Version: 1.1.1i Homepage: https://www.openssl.org 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. diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index b8666ed2289502..d5b888ab03fd3c 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -2,11 +2,11 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.") endif() -set(OPENSSL_VERSION 1.1.1h) +set(OPENSSL_VERSION 1.1.1i) vcpkg_download_distfile(ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.1.1/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 da50fd99325841ed7a4367d9251c771ce505a443a73b327d8a46b2c6a7d2ea99e43551a164efc86f8743b22c2bdb0020bf24a9cbd445e9d68868b2dc1d34033a + SHA512 fe12e0ab9e1688f24dd862ac633d0ab703b499c0f34b53c3560aa0d3879d81d647aa0678ed517dda5efb2711f669fcb1a1e0e24f6eac2efc2cf4eae6b62014d8 ) vcpkg_find_acquire_program(PERL) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index 356044a34d4b4b..14633c9415c956 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -25,7 +25,11 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS") # disable that makes linkage error (e.g. require stderr usage) list(APPEND DISABLES no-stdio no-ui no-asm) elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(PLATFORM darwin64-x86_64-cc) + if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") + set(PLATFORM darwin64-arm64-cc) + else() + set(PLATFORM darwin64-x86_64-cc) + endif() elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(PLATFORM BSD-generic64) elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") @@ -213,4 +217,3 @@ install( FILES ${INSTALL_PKG_CONFIGS} DESTINATION lib/pkgconfig ) - From 8ffe48204a03466365704a453fa54d3c433bacf3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 11 Jan 2021 09:27:46 +0100 Subject: [PATCH 0456/1694] [fontconfig] add vcpkg cmake wrapper. (#15144) * [fontconfig] add vcpkg cmake wrapper. * fix empty statement in the wrapper * dont depend on Freetype::Freetype if it is unavailable * rename wrapper to cmake.in * Update ports/fontconfig/portfile.cmake Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> --- ports/fontconfig/CONTROL | 2 +- ports/fontconfig/portfile.cmake | 9 +++- ports/fontconfig/vcpkg-cmake-wrapper.cmake.in | 46 +++++++++++++++++++ 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 ports/fontconfig/vcpkg-cmake-wrapper.cmake.in diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL index d02960b62064f4..4b455e985c4155 100644 --- a/ports/fontconfig/CONTROL +++ b/ports/fontconfig/CONTROL @@ -1,6 +1,6 @@ Source: fontconfig Version: 2.13.1 -Port-Version: 2 +Port-Version: 3 Homepage: https://www.freedesktop.org/software/fontconfig/front.html Description: Library for configuring and customizing font access. Build-Depends: freetype, expat, libiconv, dirent, pthread, json-c, dirent, libuuid (!windows&!osx), gettext \ No newline at end of file diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index cf840dd122f74e..d50ff6392d7ddb 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -45,7 +45,7 @@ vcpkg_configure_make( vcpkg_install_make(ADD_BIN_TO_PATH) vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES uuid) +vcpkg_fixup_pkgconfig() # Fix paths in debug pc file. set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontconfig.pc") @@ -98,4 +98,9 @@ endif() if(VCPKG_TARGET_IS_WINDOWS) # Unnecessary make rule creating the fontconfig cache dir on windows. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}LOCAL_APPDATA_FONTCONFIG_CACHE") -endif() \ No newline at end of file +endif() + +if(NOT VCPKG_TARGET_IS_LINUX) + set(VCPKG_TARGET_IS_LINUX 0) # To not leave empty AND statements in the wrapper +endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/ports/fontconfig/vcpkg-cmake-wrapper.cmake.in b/ports/fontconfig/vcpkg-cmake-wrapper.cmake.in new file mode 100644 index 00000000000000..ab2b5679b681e1 --- /dev/null +++ b/ports/fontconfig/vcpkg-cmake-wrapper.cmake.in @@ -0,0 +1,46 @@ +_find_package(${ARGS}) +if(Fontconfig_FOUND) # theoretically this could be skipped. If the wrapper is installed it should be found! + find_package(Freetype) + if(Freetype_FOUND AND TARGET Fontconfig::Fontconfig) + if(TARGET Freetype::Freetype) + set_property(TARGET Fontconfig::Fontconfig APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Freetype::Freetype") + else() + # TODO link Freetype libraries to the target if the target Freetype::Freetype is not defined; + endif() + endif() + if(FREETYPE_LIBRARIES) + list(APPEND Fontconfig_LIBRARIES "${FREETYPE_LIBRARIES}") + endif() + find_package(EXPAT) + if(EXPAT_FOUND AND TARGET Fontconfig::Fontconfig) + set_property(TARGET Fontconfig::Fontconfig APPEND PROPERTY INTERFACE_LINK_LIBRARIES "EXPAT::EXPAT") + endif() + if(EXPAT_LIBRARIES) + list(APPEND Fontconfig_LIBRARIES "${EXPAT_LIBRARIES}") + endif() + include(SelectLibraryConfigurations) + find_library(Fontconfig_LIBRARY_DEBUG NAMES fontconfig fontconfigd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) + find_library(Fontconfig_LIBRARY_RELEASE NAMES fontconfig NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) + select_library_configurations(Fontconfig) + if(@VCPKG_TARGET_IS_LINUX@) + find_library(UUID_LIBRARY_DEBUG NAMES uuid uuidd uuid_d NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) + find_library(UUID_LIBRARY_RELEASE NAMES uuid NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) + select_library_configurations(UUID) + endif() + if(Fontconfig_LIBRARY_DEBUG AND TARGET Fontconfig::Fontconfig) + set_target_properties(Fontconfig::Fontconfig PROPERTIES IMPORTED_LOCATION_DEBUG "${Fontconfig_LIBRARY_DEBUG}") + if(UUID_LIBRARY_DEBUG AND @VCPKG_TARGET_IS_LINUX@) + set_property(TARGET Fontconfig::Fontconfig APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$:${UUID_LIBRARY_DEBUG}>") + endif() + endif() + if(Fontconfig_LIBRARY_RELEASE AND TARGET Fontconfig::Fontconfig) + set_target_properties(Fontconfig::Fontconfig PROPERTIES IMPORTED_LOCATION_RELEASE "${Fontconfig_LIBRARY_RELEASE}") + if(UUID_LIBRARY_RELEASE AND @VCPKG_TARGET_IS_LINUX@) + set_property(TARGET Fontconfig::Fontconfig APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$>:${UUID_LIBRARY_RELEASE}>") + endif() + endif() + + if(UUID_LIBRARIES AND @VCPKG_TARGET_IS_LINUX@) + list(APPEND Fontconfig_LIBRARIES "${UUID_LIBRARIES}") + endif() +endif() From 266c0eed423814c36a41ccc60c46968632660575 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 11 Jan 2021 09:27:56 +0100 Subject: [PATCH 0457/1694] [vcpkg_from_git] new options TAG and X_OUT_REF (#15049) * [vcpkg_from_git] new options TAG and OUT_REF - TAG github tag to checkout - OUT_REF github commit id related to tag or ref (useable for automatic updates of ports if used with a version tag) * Apply suggestions from code review Co-authored-by: Robert Schumacher * additional changes due to CR * regenerate docs Co-authored-by: Robert Schumacher --- docs/maintainers/vcpkg_from_git.md | 7 +++++++ scripts/cmake/vcpkg_from_git.cmake | 24 ++++++++++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/docs/maintainers/vcpkg_from_git.md b/docs/maintainers/vcpkg_from_git.md index 2feed49aa361d2..cb3b9c67f98c89 100644 --- a/docs/maintainers/vcpkg_from_git.md +++ b/docs/maintainers/vcpkg_from_git.md @@ -8,6 +8,7 @@ vcpkg_from_git( OUT_SOURCE_PATH URL REF <59f7335e4d...> + [TAG ] [PATCHES ...] ) ``` @@ -24,11 +25,17 @@ The url of the git repository. ### REF The git sha of the commit to download. +### TAG +An optional git tag to be verified against the `REF`. If the remote repository's tag does not match the specified `REF`, the build will fail. + ### PATCHES A list of patches to be applied to the extracted sources. Relative paths are based on the port directory. +### X_OUT_REF (internal only) +This parameter is used for automatic REF updates for certain ports in the central vcpkg catalog. It should not be used by any ports outside the central catalog and within the central catalog it should not be used on any user path. This parameter may change behavior incompatibly or be removed at any time. + ## Notes: `OUT_SOURCE_PATH`, `REF`, and `URL` must be specified. diff --git a/scripts/cmake/vcpkg_from_git.cmake b/scripts/cmake/vcpkg_from_git.cmake index 54f93996a9650d..d2055f82e07311 100644 --- a/scripts/cmake/vcpkg_from_git.cmake +++ b/scripts/cmake/vcpkg_from_git.cmake @@ -9,6 +9,7 @@ vcpkg_from_git( OUT_SOURCE_PATH URL REF <59f7335e4d...> + [TAG ] [PATCHES ...] ) ``` @@ -25,11 +26,17 @@ The url of the git repository. ### REF The git sha of the commit to download. +### TAG +An optional git tag to be verified against the `REF`. If the remote repository's tag does not match the specified `REF`, the build will fail. + ### PATCHES A list of patches to be applied to the extracted sources. Relative paths are based on the port directory. +### X_OUT_REF (internal only) +This parameter is used for automatic REF updates for certain ports in the central vcpkg catalog. It should not be used by any ports outside the central catalog and within the central catalog it should not be used on any user path. This parameter may change behavior incompatibly or be removed at any time. + ## Notes: `OUT_SOURCE_PATH`, `REF`, and `URL` must be specified. @@ -41,7 +48,7 @@ Relative paths are based on the port directory. include(vcpkg_execute_in_download_mode) function(vcpkg_from_git) - set(oneValueArgs OUT_SOURCE_PATH URL REF) + set(oneValueArgs OUT_SOURCE_PATH URL REF TAG X_OUT_REF) set(multipleValuesArgs PATCHES) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 _vdud "" "${oneValueArgs}" "${multipleValuesArgs}") @@ -58,8 +65,12 @@ function(vcpkg_from_git) message(FATAL_ERROR "The git ref must be specified.") endif() + if(NOT DEFINED _vdud_TAG) + set(_vdud_TAG ${_vdud_REF}) + endif() + # using .tar.gz instead of .zip because the hash of the latter is affected by timezone. - string(REPLACE "/" "-" SANITIZED_REF "${_vdud_REF}") + string(REPLACE "/" "-" SANITIZED_REF "${_vdud_TAG}") set(TEMP_ARCHIVE "${DOWNLOADS}/temp/${PORT}-${SANITIZED_REF}.tar.gz") set(ARCHIVE "${DOWNLOADS}/${PORT}-${SANITIZED_REF}.tar.gz") set(TEMP_SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/${SANITIZED_REF}") @@ -79,7 +90,7 @@ function(vcpkg_from_git) ) vcpkg_execute_required_process( ALLOW_IN_DOWNLOAD_MODE - COMMAND ${GIT} fetch ${_vdud_URL} ${_vdud_REF} --depth 1 -n + COMMAND ${GIT} fetch ${_vdud_URL} ${_vdud_TAG} --depth 1 -n WORKING_DIRECTORY ${DOWNLOADS}/git-tmp LOGNAME git-fetch-${TARGET_TRIPLET} ) @@ -94,8 +105,13 @@ function(vcpkg_from_git) message(FATAL_ERROR "unable to determine FETCH_HEAD after fetching git repository") endif() string(REGEX REPLACE "\n$" "" REV_PARSE_HEAD "${REV_PARSE_HEAD}") - if(NOT REV_PARSE_HEAD STREQUAL _vdud_REF) + if(NOT REV_PARSE_HEAD STREQUAL _vdud_REF AND NOT DEFINED _vdud_X_OUT_REF) + message(STATUS "[Expected : ( ${_vdud_REF} )]") + message(STATUS "[ Actual : ( ${REV_PARSE_HEAD} )]") message(FATAL_ERROR "REF (${_vdud_REF}) does not match FETCH_HEAD (${REV_PARSE_HEAD})") + elseif(DEFINED _vdud_X_OUT_REF) + set(${_vdud_X_OUT_REF} ${REV_PARSE_HEAD} PARENT_SCOPE) + return() endif() file(MAKE_DIRECTORY "${DOWNLOADS}/temp") From 27cd3fa052e8d51897ddd7ba8e0794a6a984e37d Mon Sep 17 00:00:00 2001 From: RonxBulld <526677628@qq.com> Date: Tue, 12 Jan 2021 01:16:32 +0800 Subject: [PATCH 0458/1694] Show the cache file name at download time to provide more ancillary information in non-ARIA2 mode. (#15538) --- scripts/cmake/vcpkg_download_distfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake index 11bbac3b46b63b..8dd193f645981a 100644 --- a/scripts/cmake/vcpkg_download_distfile.cmake +++ b/scripts/cmake/vcpkg_download_distfile.cmake @@ -161,7 +161,7 @@ function(vcpkg_download_distfile VAR) endif() else() foreach(url IN LISTS vcpkg_download_distfile_URLS) - message(STATUS "Downloading ${url}...") + message(STATUS "Downloading ${url} -> ${vcpkg_download_distfile_FILENAME}...") if(vcpkg_download_distfile_HEADERS) foreach(header ${vcpkg_download_distfile_HEADERS}) list(APPEND request_headers HTTPHEADER ${header}) From 930a45a203d2d3ebc4409f03b4e44465a89d9de3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 12 Jan 2021 01:12:01 +0100 Subject: [PATCH 0459/1694] [mesa] new port (#14640) * [mesa] new port * make mesa build more. * more fine tuning * fix x86 * add supports. * comment about EGL feature. * apply suggestion from CR. added opengl feature. error on disabled shared glapi if multiple GL APIs are selected. * fix boolean option * make sharedgl-api=true the hardcoded default * add suggestion from CR * add mesa:x64-windows-static=fail to ci.baseline.txt due to static crt and parts being a dynamic library. * apply CR sugesstion Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- ports/mesa/CONTROL | 31 ++++ ports/mesa/dual-osmesa-part2.patch | 13 ++ ports/mesa/dual-osmesa.patch | 80 +++++++++ ports/mesa/portfile.cmake | 199 ++++++++++++++++++++++ ports/mesa/swravx512.patch | 22 +++ scripts/ci.baseline.txt | 5 + scripts/cmake/vcpkg_configure_meson.cmake | 48 ++++-- 7 files changed, 380 insertions(+), 18 deletions(-) create mode 100644 ports/mesa/CONTROL create mode 100644 ports/mesa/dual-osmesa-part2.patch create mode 100644 ports/mesa/dual-osmesa.patch create mode 100644 ports/mesa/portfile.cmake create mode 100644 ports/mesa/swravx512.patch diff --git a/ports/mesa/CONTROL b/ports/mesa/CONTROL new file mode 100644 index 00000000000000..c29d91e31869a4 --- /dev/null +++ b/ports/mesa/CONTROL @@ -0,0 +1,31 @@ +Source: mesa +Version: 20.2.2 +Homepage: https://www.mesa3d.org/ +Description: Mesa - The 3D Graphics Library +Build-Depends: zlib, zstd, tool-meson +Default-Features: default-features +Supports: !(windows&arm) + +Feature: default-features +Description: Platform dependent default features +Build-Depends: mesa[core,llvm](x64), mesa[core,opengl], mesa[core,gles1], mesa[core,gles2] + +Feature: llvm +Description: Build with llvmpipe +Build-Depends: llvm[core] + +Feature: gles1 +Description: Build support for OpenGL ES 1.x +Build-Depends: mesa[core] + +Feature: gles2 +Description: Build support for OpenGL ES 2.x and 3.x +Build-Depends: mesa[core] + +Feature: opengl +Description: Build support for OpenGL (all versions) +Build-Depends: mesa[core] + +Feature: egl +Description: Build support for EGL platform +Build-Depends: mesa[core] \ No newline at end of file diff --git a/ports/mesa/dual-osmesa-part2.patch b/ports/mesa/dual-osmesa-part2.patch new file mode 100644 index 00000000000000..6d39786d755c25 --- /dev/null +++ b/ports/mesa/dual-osmesa-part2.patch @@ -0,0 +1,13 @@ +diff --git a/src/gallium/meson.build b/src/gallium/meson.build +index 1f81fcf1fd5..5a5a8d2f0a6 100644 +--- a/src/gallium/meson.build ++++ b/src/gallium/meson.build +@@ -175,7 +175,7 @@ if with_dri + subdir('frontends/dri') + subdir('targets/dri') + endif +-if with_osmesa == 'gallium' ++if with_osmesa.contains('gallium') + subdir('frontends/osmesa') + subdir('targets/osmesa') + endif diff --git a/ports/mesa/dual-osmesa.patch b/ports/mesa/dual-osmesa.patch new file mode 100644 index 00000000000000..8acebe64b57d7b --- /dev/null +++ b/ports/mesa/dual-osmesa.patch @@ -0,0 +1,80 @@ +diff --git a/include/meson.build b/include/meson.build +index a64d9373a92..22c50eb5eb7 100644 +--- a/include/meson.build ++++ b/include/meson.build +@@ -89,7 +89,7 @@ if with_egl + ) + endif + +-if with_osmesa != 'none' ++if with_osmesa != [] + install_headers('GL/osmesa.h', subdir : 'GL') + endif + +diff --git a/meson.build b/meson.build +index 898d025f066..d73818e7ce5 100644 +--- a/meson.build ++++ b/meson.build +@@ -444,7 +444,7 @@ if with_any_vk and (with_platform_x11 and not with_dri3) + error('Vulkan drivers require dri3 for X11 support') + endif + if with_dri +- if with_glx == 'disabled' and not with_egl and not with_gbm and with_osmesa != 'classic' ++ if with_glx == 'disabled' and not with_egl and not with_gbm and not with_osmesa.contains('classic') + error('building dri drivers require at least one windowing system or classic osmesa') + endif + endif +@@ -1508,8 +1508,8 @@ else + dep_unwind = null_dep + endif + +-if with_osmesa != 'none' +- if with_osmesa == 'gallium' and not with_gallium_softpipe ++if with_osmesa != [] ++ if with_osmesa.contains('gallium') and not with_gallium_softpipe + error('OSMesa gallium requires gallium softpipe or llvmpipe.') + endif + if host_machine.system() == 'windows' +@@ -1710,10 +1710,10 @@ lines = ['', + with_gles2 ? 'yes' : 'no'), + ] + +-if with_osmesa != 'none' ++if with_osmesa != [] + lines += '' + suffix = '' +- if with_osmesa == 'gallium' ++ if with_osmesa.contains('gallium') + suffix = '(Gallium)' + endif + lines += 'OSMesa: lib' + osmesa_lib_name + suffix +diff --git a/meson_options.txt b/meson_options.txt +index 626baf3d5c2..cb3dc3b383f 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -295,9 +295,9 @@ option( + ) + option( + 'osmesa', +- type : 'combo', +- value : 'none', +- choices : ['none', 'classic', 'gallium'], ++ type : 'array', ++ value : [], ++ choices : ['classic', 'gallium'], + description : 'Build OSmesa.' + ) + option( +diff --git a/src/mesa/meson.build b/src/mesa/meson.build +index fa5c54cc6fb..f7b223862fa 100644 +--- a/src/mesa/meson.build ++++ b/src/mesa/meson.build +@@ -744,7 +744,7 @@ libmesa_gallium = static_library( + ) + + subdir('drivers/dri') +-if with_osmesa == 'classic' ++if with_osmesa.contains('classic') + subdir('drivers/osmesa') + endif + if with_glx == 'xlib' diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake new file mode 100644 index 00000000000000..17e43d2c61be14 --- /dev/null +++ b/ports/mesa/portfile.cmake @@ -0,0 +1,199 @@ +# Build-Depends: From X Window PR: zstd, drm (!windows), elfutils (!windows), wayland (!windows), wayland-protocols (!windows), xdamage, xshmfence (!windows), x11, xcb, xfixes, xext, xxf86vm, xrandr, xv, xvmc (!windows), egl-registry, opengl-registry, tool-meson +# Required LLVM modules: LLVM (modules: bitwriter, core, coroutines, engine, executionengine, instcombine, mcdisassembler, mcjit, scalaropts, transformutils) found: YES + +#patches are from https://github.com/pal1000/mesa-dist-win/tree/master/patches +set(PATCHES dual-osmesa.patch + dual-osmesa-part2.patch + swravx512.patch + ) + +vcpkg_check_linkage(ONLY_DYNAMIC_CRT) +IF(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) # some parts of this port can only build as a shared library. +endif() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO mesa/mesa + REF df2977f871fc70ebd6be48c180d117189b5861b5 #v20.2.2 + SHA512 6c51d817fe265ea6405c4e8afbb516f30cf697d00cf39f162473ea8a59c202bcdfbfe4b6f7c4a6fd2d4e98eb4a1604cb5e0a02558338bf415e53fe5421cbfbbe + HEAD_REF master # branch name + PATCHES ${PATCHES} #patch name +) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") +vcpkg_add_to_path("${PYTHON3_DIR}/Scripts") +set(ENV{PYTHON} "${PYTHON3}") + +function(vcpkg_get_python_package PYTHON_DIR ) + cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") + + if(NOT _vgpp_PYTHON_EXECUTABLE) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") + endif() + if(NOT _vgpp_PACKAGES) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") + endif() + if(NOT _vgpp_PYTHON_DIR) + get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) + endif() + + if (WIN32) + set(PYTHON_OPTION "") + else() + set(PYTHON_OPTION "--user") + endif() + + if("${_vgpp_PYTHON_DIR}" MATCHES "${DOWNLOADS}") # inside vcpkg + if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") + vcpkg_from_github( + OUT_SOURCE_PATH PYFILE_PATH + REPO pypa/get-pip + REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 + SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a + HEAD_REF master + ) + execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) + endif() + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) + endforeach() + else() + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) + endforeach() + endif() + if(NOT VCPKG_TARGET_IS_WINDOWS) + execute_process(COMMAND pip3 install ${_vgpp_PACKAGES}) + endif() + else() # outside vcpkg + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND ${_vgpp_PYTHON_EXECUTABLE} -c "import ${_package}" RESULT_VARIABLE HAS_ERROR) + if(HAS_ERROR) + message(FATAL_ERROR "Python package '${_package}' needs to be installed for port '${PORT}'.\nComplete list of required python packages: ${_vgpp_PACKAGES}") + endif() + endforeach() + endif() +endfunction() + +vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES setuptools mako) + +vcpkg_find_acquire_program(FLEX) +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") +vcpkg_find_acquire_program(BISON) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${BISON_DIR}") + +if(WIN32) # WIN32 HOST probably has win_flex and win_bison! + if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(FLEX_DIR MATCHES "${DOWNLOADS}") + file(CREATE_LINK "${FLEX}" "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") + else() + message(FATAL_ERROR "${PORT} requires flex being named flex on windows and not win_flex!\n(Can be solved by creating a simple link from win_flex to flex)") + endif() + endif() + if(NOT EXISTS "${BISON_DIR}/BISON${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(BISON_DIR MATCHES "${DOWNLOADS}") + file(CREATE_LINK "${BISON}" "${BISON_DIR}/bison${VCPKG_HOST_EXECUTABLE_SUFFIX}") + else() + message(FATAL_ERROR "${PORT} requires bison being named bison on windows and not win_bison!\n(Can be solved by creating a simple link from win_bison to bison)") + endif() + endif() +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) +list(APPEND MESA_OPTIONS -Dlmsensors=disabled) +list(APPEND MESA_OPTIONS -Dvalgrind=disabled) +list(APPEND MESA_OPTIONS -Dglvnd=false) +list(APPEND MESA_OPTIONS -Dglx=disabled) +list(APPEND MESA_OPTIONS -Dgbm=disabled) +#list(APPEND MESA_OPTIONS -Dosmesa=['gallium','classic']) # classic has compiler errors. +list(APPEND MESA_OPTIONS -Dosmesa=['gallium']) + + +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() + list(APPEND MESA_OPTIONS -Dgles1=disabled) +endif() +if("gles2" IN_LIST FEATURES) + list(APPEND MESA_OPTIONS -Dgles2=enabled) +else() + list(APPEND MESA_OPTIONS -Dgles2=disabled) +endif() +if("opengl" IN_LIST FEATURES) + list(APPEND MESA_OPTIONS -Dopengl=true) +else() + list(APPEND MESA_OPTIONS -Dopengl=false) +endif() +if("egl" IN_LIST FEATURES) # EGL feature only works on Linux + list(APPEND MESA_OPTIONS -Degl=enabled) +else() + list(APPEND MESA_OPTIONS -Degl=disabled) +endif() + +list(APPEND MESA_OPTIONS -Dshared-glapi=enabled) #shared GLAPI required when building two or more of the following APIs - opengl, gles1 gles2 + + +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND MESA_OPTIONS -Dplatforms=['windows']) +endif() + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + #-D gles-lib-suffix=_mesa + #-D egl-lib-suffix=_mesa + -Dbuild-tests=false + ${MESA_OPTIONS} + ) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +#installed by egl-registry +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR) +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/egl.h) +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/eglext.h) +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/eglplatform.h) +#installed by opengl-registry +set(_double_files include/GL/glcorearb.h include/GL/glext.h include/GL/glxext.h + include/GLES/egl.h include/GLES/gl.h include/GLES/glext.h include/GLES/glplatform.h + include/GLES2/gl2.h include/GLES2/gl2ext.h include/GLES2/gl2platform.h + include/GLES3/gl3.h include/GLES3/gl31.h include/GLES3/gl32.h include/GLES3/gl3platform.h) +list(TRANSFORM _double_files PREPEND "${CURRENT_PACKAGES_DIR}/") +file(REMOVE ${_double_files}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES2) +# # Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/mesa/swravx512.patch b/ports/mesa/swravx512.patch new file mode 100644 index 00000000000000..c1085252f1b2df --- /dev/null +++ b/ports/mesa/swravx512.patch @@ -0,0 +1,22 @@ +diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build +index 2fad60365a3..dce7f656d64 100644 +--- a/src/gallium/drivers/swr/meson.build ++++ b/src/gallium/drivers/swr/meson.build +@@ -249,7 +249,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.') +@@ -274,7 +274,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.') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5e0a90ea6bedca..77bec59ea4fd65 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -894,6 +894,11 @@ memorymodule:arm-uwp=fail memorymodule:x64-linux=fail memorymodule:x64-osx=fail memorymodule:x64-uwp=fail +# Due to static crt. +mesa:x64-windows-static=fail +# Missing dependent libraries. +mesa:x64-linux=fail +mesa:x64-osx=fail meschach:arm-uwp=fail meschach:x64-linux=fail meschach:x64-osx=fail diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 212bcf07605e6b..0bc181c41ae59b 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -36,7 +36,7 @@ This command supplies many common arguments to Meson. To see the full list, exam * [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) #]===] -function(vcpkg_internal_meson_generate_native_file) #https://mesonbuild.com/Native-environments.html +function(vcpkg_internal_meson_generate_native_file _additional_binaries) #https://mesonbuild.com/Native-environments.html set(NATIVE "[binaries]\n") #set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT) if(VCPKG_TARGET_IS_WINDOWS) @@ -63,6 +63,10 @@ function(vcpkg_internal_meson_generate_native_file) #https://mesonbuild.com/Nati string(APPEND NATIVE "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") endif() string(APPEND NATIVE "cmake = '${CMAKE_COMMAND}'\n") + foreach(_binary IN LISTS ${_additional_binaries}) + string(APPEND NATIVE "${_binary}\n") + endforeach() + string(APPEND NATIVE "[built-in options]\n") #https://mesonbuild.com/Builtin-options.html if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") string(APPEND NATIVE "cpp_eh='none'\n") # To make sure meson is not adding eh flags by itself using msvc @@ -154,6 +158,7 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso string(APPEND NATIVE_${_config} "VCPKG_TARGET_TRIPLET = '${TARGET_TRIPLET}'\n") string(APPEND NATIVE_${_config} "VCPKG_CHAINLOAD_TOOLCHAIN_FILE = '${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}'\n") + string(APPEND NATIVE_${_config} "VCPKG_CRT_LINKAGE = '${VCPKG_CRT_LINKAGE}'\n") string(APPEND NATIVE_${_config} "[built-in options]\n") if(VCPKG_TARGET_IS_WINDOWS) @@ -173,7 +178,7 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso file(WRITE "${_file}" "${NATIVE_${_config}}") endfunction() -function(vcpkg_internal_meson_generate_cross_file) #https://mesonbuild.com/Cross-compilation.html +function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https://mesonbuild.com/Cross-compilation.html if(CMAKE_HOST_WIN32) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) set(BUILD_ARCH $ENV{PROCESSOR_ARCHITEW6432}) @@ -239,6 +244,10 @@ function(vcpkg_internal_meson_generate_cross_file) #https://mesonbuild.com/Cross string(APPEND CROSS "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") string(APPEND CROSS "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") endif() + foreach(_binary IN LISTS ${_additional_binaries}) + string(APPEND CROSS "${_binary}\n") + endforeach() + string(APPEND CROSS "[properties]\n") string(APPEND CROSS "skip_sanity_check = true\n") string(APPEND CROSS "[host_machine]\n") @@ -333,7 +342,7 @@ endfunction() function(vcpkg_configure_meson) # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vcm "" "SOURCE_PATH" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE") + cmake_parse_arguments(PARSE_ARGV 0 _vcm "" "SOURCE_PATH" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;ADDITIONAL_NATIVE_BINARIES;ADDITIONAL_CROSS_BINARIES") file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) @@ -343,10 +352,26 @@ function(vcpkg_configure_meson) debug_message("Including cmake vars from: ${_VCPKG_CMAKE_VARS_FILE}") include("${_VCPKG_CMAKE_VARS_FILE}") + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path("${PYTHON3_DIR}") + list(APPEND _vcm_ADDITIONAL_NATIVE_BINARIES "python = '${PYTHON3}'") + list(APPEND _vcm_ADDITIONAL_CROSS_BINARIES "python = '${PYTHON3}'") + + vcpkg_find_acquire_program(MESON) + + get_filename_component(CMAKE_PATH ${CMAKE_COMMAND} DIRECTORY) + vcpkg_add_to_path("${CMAKE_PATH}") # Make CMake invokeable for Meson + + vcpkg_find_acquire_program(NINJA) + get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) + vcpkg_add_to_path(PREPEND "${NINJA_PATH}") # Need to prepend so that meson picks up the correct ninja from vcpkg .... + # list(APPEND _vcm_ADDITIONAL_NATIVE_BINARIES "ninja = '${NINJA}'") # This does not work due to meson issues ...... + list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) if(NOT VCPKG_MESON_NATIVE_FILE) - vcpkg_internal_meson_generate_native_file() + vcpkg_internal_meson_generate_native_file("_vcm_ADDITIONAL_NATIVE_BINARIES") endif() if(NOT VCPKG_MESON_NATIVE_FILE_DEBUG) vcpkg_internal_meson_generate_native_file_config(DEBUG) @@ -359,7 +384,7 @@ function(vcpkg_configure_meson) list(APPEND _vcm_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE_RELEASE}") if(NOT VCPKG_MESON_CROSS_FILE) - vcpkg_internal_meson_generate_cross_file() + vcpkg_internal_meson_generate_cross_file("_vcm_ADDITIONAL_CROSS_BINARIES") endif() if(NOT VCPKG_MESON_CROSS_FILE_DEBUG AND VCPKG_MESON_CROSS_FILE) vcpkg_internal_meson_generate_cross_file_config(DEBUG) @@ -397,19 +422,6 @@ function(vcpkg_configure_meson) list(APPEND _vcm_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug']") endif() - vcpkg_find_acquire_program(PYTHON3) - get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) - vcpkg_add_to_path("${PYTHON3_DIR}") - - vcpkg_find_acquire_program(MESON) - - get_filename_component(CMAKE_PATH ${CMAKE_COMMAND} DIRECTORY) - vcpkg_add_to_path("${CMAKE_PATH}") # Make CMake invokeable for Meson - - vcpkg_find_acquire_program(NINJA) - get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) - vcpkg_add_to_path("${NINJA_PATH}") - vcpkg_find_acquire_program(PKGCONFIG) get_filename_component(PKGCONFIG_PATH ${PKGCONFIG} DIRECTORY) vcpkg_add_to_path("${PKGCONFIG_PATH}") From b716cd4511ca58e7531a6d7598d45b144dd73d5a Mon Sep 17 00:00:00 2001 From: Daniele Lupo Date: Tue, 12 Jan 2021 05:49:05 +0100 Subject: [PATCH 0460/1694] [qt5-base] mysql plugin added (#15170) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * qt5-base: added mysql plugin. * Fixed netcdf patch. * Build only on windows. * mysql plugin as module The MySQL plugin for QT now is a module of qt5-base * Update ports/qt5-base/portfile.cmake Co-authored-by: Daniele Lupo Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/libcds/001-cmake-install.patch | 4 +- ports/qt5-base/CONTROL | 6 +- ports/qt5-base/patches/mysql-configure.patch | 11 +++ .../patches/mysql_plugin_include.patch | 11 +++ ports/qt5-base/portfile.cmake | 93 ++++++++++++------- ports/qt5/CONTROL | 5 +- 6 files changed, 90 insertions(+), 40 deletions(-) create mode 100644 ports/qt5-base/patches/mysql-configure.patch create mode 100644 ports/qt5-base/patches/mysql_plugin_include.patch diff --git a/ports/libcds/001-cmake-install.patch b/ports/libcds/001-cmake-install.patch index 2a73752f58c850..ae538706fd7e34 100644 --- a/ports/libcds/001-cmake-install.patch +++ b/ports/libcds/001-cmake-install.patch @@ -21,8 +21,8 @@ index d97ee07..f8affbb 100644 -install(TARGETS ${CDS_SHARED_LIBRARY} EXPORT LibCDSConfig LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT ${HEADERS_COMPONENT} NAMELINK_ONLY) -install(TARGETS ${CDS_STATIC_LIBRARY} EXPORT LibCDSConfig DESTINATION lib${LIB_SUFFIX} COMPONENT ${LIBRARIES_COMPONENT}) +if (NOT DISABLE_INSTALL_SHARED) -+ install(TARGETS ${CDS_SHARED_LIBRARY} EXPORT LibCDSConfig RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT ${LIBRARIES_COMPONENT} NAMELINK_SKIP) -+ install(TARGETS ${CDS_SHARED_LIBRARY} EXPORT LibCDSConfig RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT ${HEADERS_COMPONENT} NAMELINK_ONLY) ++ install(TARGETS ${CDS_SHARED_LIBRARY} EXPORT LibCDSConfig RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT ${LIBRARIES_COMPONENT}) ++ #install(TARGETS ${CDS_SHARED_LIBRARY} EXPORT LibCDSConfig RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT ${HEADERS_COMPONENT} NAMELINK_ONLY) +endif() +if (NOT DISABLE_INSTALL_STATIC) + install(TARGETS ${CDS_STATIC_LIBRARY} EXPORT LibCDSConfig DESTINATION lib${LIB_SUFFIX} COMPONENT ${LIBRARIES_COMPONENT}) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index cae36be5a92290..00a2e442cce4cb 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,9 +1,13 @@ Source: qt5-base Version: 5.15.1 -Port-Version: 3 +Port-Version: 4 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, zstd, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) Feature: latest Description: Build latest qt version (5.15.1) instead of LTS (latest and LTS are currently the same) + +Feature: mysqlplugin +Build-Depends: libmysql +Description: Build the sql plugin for connecting to mysql databases diff --git a/ports/qt5-base/patches/mysql-configure.patch b/ports/qt5-base/patches/mysql-configure.patch new file mode 100644 index 00000000000000..1ec06734ecbd9d --- /dev/null +++ b/ports/qt5-base/patches/mysql-configure.patch @@ -0,0 +1,11 @@ +--- a/src/plugins/sqldrivers/configure.json ++++ b/src/plugins/sqldrivers/configure.json +@@ -65,7 +65,7 @@ + ], + "main": "mysql_get_client_version();" + }, +- "headers": "mysql.h", ++ "headers": "mysql/mysql.h", + "sources": [ + { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true }, + { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, diff --git a/ports/qt5-base/patches/mysql_plugin_include.patch b/ports/qt5-base/patches/mysql_plugin_include.patch new file mode 100644 index 00000000000000..a66300d2c98910 --- /dev/null +++ b/ports/qt5-base/patches/mysql_plugin_include.patch @@ -0,0 +1,11 @@ +--- a/src/plugins/sqldrivers/mysql/qsql_mysql_p.h ++++ b/src/plugins/sqldrivers/mysql/qsql_mysql_p.h +@@ -57,7 +57,7 @@ + #include + #endif + +-#include ++#include + + #ifdef QT_PLUGIN + #define Q_EXPORT_SQLDRIVER_MYSQL diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 73d3b836a3f260..2bdfc1873bec15 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -6,6 +6,15 @@ else() option(QT_OPENSSL_LINK "Link against OpenSSL at compile-time." OFF) endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + option(QT_MYSQL_PLUGIN "Create MySQL plugin" OFF) +else() + if ("mysqlplugin" IN_LIST FEATURES) + option(QT_MYSQL_PLUGIN "Create MySQL plugin" ON) + endif() +endif() + + if (VCPKG_TARGET_IS_LINUX) message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libx11-xcb-dev\n\nThese can be installed on Ubuntu systems via apt-get install libx11-xcb-dev.") message(WARNING "${PORT} for qt5-x11extras requires the following libraries from the system package manager:\n libxkbcommon-x11-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxkbcommon-x11-dev.") @@ -17,13 +26,13 @@ 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 + set(PATCHES patches/Qt5BasicConfig.patch patches/Qt5PluginTarget.patch patches/create_cmake.patch ) else() - set(PATCHES + set(PATCHES patches/Qt5BasicConfig.patch patches/Qt5PluginTarget.patch patches/create_cmake.patch @@ -52,17 +61,19 @@ endif() qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH PATCHES - patches/winmain_pro.patch #Moves qtmain to manual-link - patches/windows_prf.patch #fixes the qtmain dependency due to the above move - patches/qt_app.patch #Moves the target location of qt5 host apps to always install into the host dir. - patches/gui_configure.patch #Patches the gui configure.json to break freetype/fontconfig autodetection because it does not include its dependencies. - patches/icu.patch #Help configure find static icu builds in vcpkg on windows - patches/xlib.patch #Patches Xlib check to actually use Pkgconfig instead of makeSpec only - patches/egl.patch #Fix egl detection logic. - patches/zstdd.patch #Fix detection of zstd in debug builds - #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. + patches/winmain_pro.patch #Moves qtmain to manual-link + patches/windows_prf.patch #fixes the qtmain dependency due to the above move + patches/qt_app.patch #Moves the target location of qt5 host apps to always install into the host dir. + patches/gui_configure.patch #Patches the gui configure.json to break freetype/fontconfig autodetection because it does not include its dependencies. + patches/icu.patch #Help configure find static icu builds in vcpkg on windows + patches/xlib.patch #Patches Xlib check to actually use Pkgconfig instead of makeSpec only + patches/egl.patch #Fix egl detection logic. + patches/zstdd.patch #Fix detection of zstd in debug builds + patches/mysql_plugin_include.patch #Fix include path of mysql plugin + patches/mysql-configure.patch #Fix mysql project + #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 @@ -87,7 +98,7 @@ set(CORE_OPTIONS -opensource #-simulator_and_device #-ltcg - #-combined-angle-lib + #-combined-angle-lib # ENV ANGLE_DIR to external angle source dir. (Will always be compiled with Qt) #-optimized-tools #-force-debug-info @@ -112,6 +123,12 @@ if(QT_OPENSSL_LINK) list(APPEND CORE_OPTIONS -openssl-linked) endif() +if(VCPKG_TARGET_IS_WINDOWS) + if(QT_MYSQL_PLUGIN) + list(APPEND CORE_OPTIONS -sql-mysql) + endif() +endif() + find_library(ZLIB_RELEASE NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(JPEG_RELEASE NAMES jpeg jpeg-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) @@ -127,14 +144,16 @@ if(NOT (PSQL_RELEASE MATCHES ".*\.so") AND NOT (PSQL_DEBUG MATCHES ".*\.so")) find_library(PSQL_PORT_RELEASE NAMES pgport libpgport PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) find_library(PSQL_PORT_DEBUG NAMES pgport libpgport pgportd libpgportd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) endif() +find_library(MYSQL_RELEASE NAMES libmysql mysqlclient PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) +find_library(MYSQL_DEBUG NAMES libmysql libmysqld mysqlclient mysqlclientd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(PCRE2_RELEASE NAMES pcre2-16 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(PCRE2_DEBUG NAMES pcre2-16 pcre2-16d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(FREETYPE_RELEASE NAMES freetype PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) #zlib, bzip2, libpng find_library(FREETYPE_DEBUG NAMES freetype freetyped PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(DOUBLECONVERSION_RELEASE NAMES double-conversion PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(DOUBLECONVERSION_RELEASE NAMES double-conversion PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(DOUBLECONVERSION_DEBUG NAMES double-conversion PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(HARFBUZZ_RELEASE NAMES harfbuzz PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(HARFBUZZ_RELEASE NAMES harfbuzz PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(HARFBUZZ_DEBUG NAMES harfbuzz PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) find_library(SQLITE_DEBUG NAMES sqlite3 sqlite3d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) @@ -219,7 +238,6 @@ set(DEBUG_OPTIONS "QMAKE_LIBS_PRIVATE+=${ZSTD_DEBUG}" ) - if(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_TARGET_IS_UWP) list(APPEND CORE_OPTIONS -appstore-compliant) @@ -227,7 +245,7 @@ if(VCPKG_TARGET_IS_WINDOWS) if(NOT ${VCPKG_LIBRARY_LINKAGE} STREQUAL "static") list(APPEND CORE_OPTIONS -opengl dynamic) # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" and "-opengel es2" else() - list(APPEND CORE_OPTIONS -opengl dynamic) # other possible option without moving angle dlls: "-opengl desktop". "-opengel es2" only works with commented patch + list(APPEND CORE_OPTIONS -opengl dynamic) # other possible option without moving angle dlls: "-opengl desktop". "-opengel es2" only works with commented patch endif() list(APPEND RELEASE_OPTIONS "PSQL_LIBS=${PSQL_RELEASE} ${PSQL_PORT_RELEASE} ${PSQL_COMMON_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" @@ -235,13 +253,18 @@ if(VCPKG_TARGET_IS_WINDOWS) "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE} ${FREETYPE_RELEASE_ALL}" "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" ) - + 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" "SQLITE_LIBS=${SQLITE_DEBUG}" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG} ${FREETYPE_DEBUG_ALL}" "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" ) + if (QT_MYSQL_PLUGIN) + list(APPEND RELEASE_OPTIONS "MYSQL_LIBS=${MYSQL_RELEASE}") + list(APPEND DEBUG_OPTIONS "MYSQL_LIBS=${MYSQL_DEBUG}") + endif(QT_MYSQL_PLUGIN) + elseif(VCPKG_TARGET_IS_LINUX) list(APPEND CORE_OPTIONS -fontconfig -xcb-xlib -xcb -linuxfb) if (NOT EXISTS "/usr/include/GL/glu.h") @@ -321,7 +344,7 @@ else() ######################### #TODO: Make this a function since it is also done by modular scripts! # e.g. by patching mkspecs/features/qt_tools.prf somehow - file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/tools/qt5/lib/*.prl" "${CURRENT_PACKAGES_DIR}/tools/qt5/mkspecs/*.pri" + file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/tools/qt5/lib/*.prl" "${CURRENT_PACKAGES_DIR}/tools/qt5/mkspecs/*.pri" "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl" "${CURRENT_PACKAGES_DIR}/tools/qt5/debug/lib/*.prl" "${CURRENT_PACKAGES_DIR}/tools/qt5/debug/mkspecs/*.pri") file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/include" CMAKE_INCLUDE_PATH) @@ -338,10 +361,10 @@ else() file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share/cmake) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) # TODO: check if important debug information for cmake is lost + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) # TODO: check if important debug information for cmake is lost - #This needs a new VCPKG policy or a static angle build (ANGLE needs to be fixed in VCPKG!) - if(VCPKG_TARGET_IS_WINDOWS AND ${VCPKG_LIBRARY_LINKAGE} MATCHES "static") # Move angle dll libraries + #This needs a new VCPKG policy or a static angle build (ANGLE needs to be fixed in VCPKG!) + if(VCPKG_TARGET_IS_WINDOWS AND ${VCPKG_LIBRARY_LINKAGE} MATCHES "static") # Move angle dll libraries if(EXISTS "${CURRENT_PACKAGES_DIR}/bin") message(STATUS "Moving ANGLE dlls from /bin to /tools/qt5-angle/bin. In static builds dlls are not allowed in /bin") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/qt5-angle) @@ -358,32 +381,32 @@ else() file(READ "${cmakefile}" _contents) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_BUILD_TYPE) string(REPLACE "set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)" "set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG)" _contents "${_contents}") - string(REPLACE - [[set(imported_location "${_qt5Core_install_prefix}/lib/qtmain.lib")]] + string(REPLACE + [[set(imported_location "${_qt5Core_install_prefix}/lib/qtmain.lib")]] [[set(imported_location_release "${_qt5Core_install_prefix}/lib/manual-link/qtmain.lib") - set(imported_location_debug "${_qt5Core_install_prefix}/debug/lib/manual-link/qtmaind.lib")]] + set(imported_location_debug "${_qt5Core_install_prefix}/debug/lib/manual-link/qtmaind.lib")]] _contents "${_contents}") - string(REPLACE + string(REPLACE [[ set_target_properties(Qt5::WinMain PROPERTIES IMPORTED_LOCATION_RELEASE ${imported_location} - )]] + )]] [[ set_target_properties(Qt5::WinMain PROPERTIES IMPORTED_LOCATION_RELEASE ${imported_location_release} IMPORTED_LOCATION_DEBUG ${imported_location_debug} - )]] + )]] _contents "${_contents}") else() # Single configuration build (either debug or release) # Release case - string(REPLACE + string(REPLACE [[set(imported_location "${_qt5Core_install_prefix}/lib/qtmain.lib")]] [[set(imported_location "${_qt5Core_install_prefix}/lib/manual-link/qtmain.lib")]] _contents "${_contents}") # Debug case (whichever will match) - string(REPLACE + string(REPLACE [[set(imported_location "${_qt5Core_install_prefix}/lib/qtmaind.lib")]] [[set(imported_location "${_qt5Core_install_prefix}/debug/lib/manual-link/qtmaind.lib")]] _contents "${_contents}") - string(REPLACE + string(REPLACE [[set(imported_location "${_qt5Core_install_prefix}/debug/lib/qtmaind.lib")]] [[set(imported_location "${_qt5Core_install_prefix}/debug/lib/manual-link/qtmaind.lib")]] _contents "${_contents}") @@ -400,7 +423,7 @@ else() file(COPY ${CURRENT_PACKAGES_DIR}/tools/qt5/bin DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5/debug) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qt5/debug/bin) endif() - + if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf) file(REMOVE "${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf") endif() @@ -408,7 +431,7 @@ else() set(CURRENT_INSTALLED_DIR "./../../.." ) # Making the qt.conf relative and not absolute configure_file(${CURRENT_PACKAGES_DIR}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf) # This makes the tools at least useable for release set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}") - + qt_install_copyright(${SOURCE_PATH}) endif() #install scripts for other qt ports @@ -442,7 +465,7 @@ if(QT_BUILD_LATEST) ) endif() -# #Code to get generated CMake files from CI +# #Code to get generated CMake files from CI # file(RENAME "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Core/Qt5CoreConfig.cmake" "${CURRENT_BUILDTREES_DIR}/Qt5CoreConfig.cmake.log") # file(GLOB_RECURSE CMAKE_GUI_FILES "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Gui/*.cmake" ) # foreach(cmake_file ${CMAKE_GUI_FILES}) diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index 337b6942ea4b74..b881ffd1767dc9 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,8 +1,9 @@ Source: qt5 Version: 5.15.1 +Port-Version: 1 Homepage: https://www.qt.io/ Description: Qt5 Application Framework -Build-Depends: qt5-base[core] +Build-Depends: qt5-base[core,mysqlplugin] Default-Features: essentials Feature: essentials @@ -14,7 +15,7 @@ Build-Depends: qt5-base[core, latest] Description: Build latest qt version (5.15.1) instead of LTS (Currently latest==LTS) Feature: all -Build-Depends: qt5[3d, webchannel, websockets, extras, xmlpatterns, sensors, serialport, speech, svg, tools, virtualkeyboard, networkauth, purchasing, quickcontrols, quickcontrols2, script, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, imageformats, location, multimedia, mqtt, webglplugin, webview, serialbus, translations, doc, remoteobjects, connectivity], qt5[core,webengine] (!static), qt5[core,wayland] (!windows) +Build-Depends: qt5[3d, webchannel, websockets, extras, xmlpatterns, sensors, serialport, speech, svg, tools, virtualkeyboard, networkauth, purchasing, quickcontrols, quickcontrols2, script, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, imageformats, location, multimedia, mqtt, webglplugin, webview, serialbus, translations, doc, remoteobjects, connectivity], qt5[core,webengine,mysqlplugin] (!static), qt5[core,wayland] (!windows) Description: Install all Qt5 submodules (Warning: Could take a long time and fail...) Feature: extras From 05a32002ce49f6a9ed43b9a2cf82a89f92a513b5 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 12 Jan 2021 13:01:09 +0800 Subject: [PATCH 0461/1694] [entt] update to <3.6> (#15567) * [entt] update to <3.6> * fix option name --- ports/entt/CONTROL | 2 +- ports/entt/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/entt/CONTROL b/ports/entt/CONTROL index a713aaff95a5ae..64e63c29b41e26 100644 --- a/ports/entt/CONTROL +++ b/ports/entt/CONTROL @@ -1,4 +1,4 @@ Source: entt -Version: 3.5.1 +Version: 3.6.0 Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more. Homepage: https://github.com/skypjack/entt diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake index 68e26364957bf4..890ec090e209ca 100644 --- a/ports/entt/portfile.cmake +++ b/ports/entt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/entt - REF v3.5.1 - SHA512 41d4c56f04e6d98218ce5994636407cef7a73c75a4f3b982b0756b0496002b841c22a652a28575e5d683c45459d66dba47dec3d51a92963b372cb72e95df8a0f + REF 7a949dd32849e8230b15a5ff8ad1104c7f748c2a #v3.6.0 + SHA512 fe1fcac31f174fb878da5c1737ff1261be0c26e896c858f32fa524db45f70f17d7c7b67f8ebdeabe21f6c977fad7642ff9f6fd6a865b645a4f93e13c7812b922 HEAD_REF master ) @@ -11,7 +11,7 @@ vcpkg_configure_cmake( DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS - -DBUILD_TESTING=OFF + -DENTT_BUILD_TESTING=OFF ) vcpkg_install_cmake() From c31ac7914d980cc385185643915319100f33288e Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 12 Jan 2021 13:02:17 +0800 Subject: [PATCH 0462/1694] [paho-mqtt] update to 1.3.8 (#15569) --- ports/paho-mqtt/CONTROL | 2 +- ports/paho-mqtt/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/paho-mqtt/CONTROL b/ports/paho-mqtt/CONTROL index a737277cd0de56..590722471c53ed 100644 --- a/ports/paho-mqtt/CONTROL +++ b/ports/paho-mqtt/CONTROL @@ -1,5 +1,5 @@ Source: paho-mqtt -Version: 1.3.5 +Version: 1.3.8 Homepage: https://github.com/eclipse/paho.mqtt.c Description: Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things Build-Depends: openssl diff --git a/ports/paho-mqtt/portfile.cmake b/ports/paho-mqtt/portfile.cmake index 7a451aca8c428d..a5215dd82e8735 100644 --- a/ports/paho-mqtt/portfile.cmake +++ b/ports/paho-mqtt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/paho.mqtt.c - REF 153dfd3a4a1d510697c5d55e169fa158db16e04a # v1.3.5 - SHA512 231978c9159b85f4b189574bfe982d99ef75aabbb616bf88f251e4fe1797fd89156b4090c6d7e05703fe9394b3243a906196cb54dab3044727b03bbc64a63e5b + REF 317fb008e1541838d1c29076d2bc5c3e4b6c4f53 # v1.3.8 + SHA512 065d850dbcd20144e7f5534d0cac30170c7f90b1cdca90f4eaaa6b7d69056d9e1bfe951ef34aa7e1a2d3bbc193e95a1526d4dee40ea2f243f3120620b577aacb HEAD_REF master PATCHES remove_compiler_options.patch From b9574dc989ac4c585a9c6831db0aa000647097d7 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Tue, 12 Jan 2021 09:26:42 -0800 Subject: [PATCH 0463/1694] [vcpkg] Add a different way to use CommandBuilder, support InWorkingDirectory (#15583) * [vcpkg] Add stuff to the system.process API * CmdLineBuilder - add rvalue overloads * Add InWorkingDirectory support * remove `&&` outside of system.process.cpp * minor CR * move the non-InWorkingDirectory functions into the header as inline * Update toolsrc/include/vcpkg/base/system.process.h Co-authored-by: Billy O'Neal * fix CmdLineBuilder name * moar bugfixin * fix native() location Co-authored-by: Billy O'Neal --- toolsrc/include/vcpkg/base/system.process.h | 76 +++++++++++++---- toolsrc/src/vcpkg-test/system.cpp | 8 +- toolsrc/src/vcpkg/archives.cpp | 8 +- toolsrc/src/vcpkg/base/downloads.cpp | 6 +- toolsrc/src/vcpkg/base/system.process.cpp | 91 +++++++++++++++------ toolsrc/src/vcpkg/binarycaching.cpp | 32 +++++--- toolsrc/src/vcpkg/build.cpp | 2 +- toolsrc/src/vcpkg/commands.porthistory.cpp | 8 +- toolsrc/src/vcpkg/export.cpp | 15 +--- toolsrc/src/vcpkg/export.prefab.cpp | 3 +- toolsrc/src/vcpkg/metrics.cpp | 2 +- toolsrc/src/vcpkg/tools.cpp | 2 +- toolsrc/src/vcpkg/vcpkgpaths.cpp | 12 +-- 13 files changed, 179 insertions(+), 86 deletions(-) diff --git a/toolsrc/include/vcpkg/base/system.process.h b/toolsrc/include/vcpkg/base/system.process.h index 3b60630bb22949..1c62fa28585df5 100644 --- a/toolsrc/include/vcpkg/base/system.process.h +++ b/toolsrc/include/vcpkg/base/system.process.h @@ -26,17 +26,30 @@ namespace vcpkg::System struct CmdLineBuilder { - CmdLineBuilder& path_arg(const fs::path& p) { return string_arg(fs::u8string(p)); } - CmdLineBuilder& string_arg(StringView s); - CmdLineBuilder& ampersand() + CmdLineBuilder() = default; + explicit CmdLineBuilder(const fs::path& p) { path_arg(p); } + explicit CmdLineBuilder(StringView s) { string_arg(s); } + explicit CmdLineBuilder(const std::string& s) { string_arg(s); } + explicit CmdLineBuilder(const char* s) { string_arg({s, ::strlen(s)}); } + + CmdLineBuilder& path_arg(const fs::path& p) & { return string_arg(fs::u8string(p)); } + CmdLineBuilder& string_arg(StringView s) &; + CmdLineBuilder& raw_arg(StringView s) & { - buf.push_back('&'); - buf.push_back('&'); + buf.push_back(' '); + buf.append(s.data(), s.size()); return *this; } - std::string extract() noexcept { return std::move(buf); } - operator ZStringView() const { return buf; } + CmdLineBuilder&& path_arg(const fs::path& p) && { return std::move(path_arg(p)); } + CmdLineBuilder&& string_arg(StringView s) && { return std::move(string_arg(s)); }; + CmdLineBuilder&& raw_arg(StringView s) && { return std::move(raw_arg(s)); } + + std::string&& extract() && { return std::move(buf); } + operator StringView() noexcept { return buf; } + StringView command_line() const { return buf; } + + void clear() { buf.clear(); } private: std::string buf; @@ -61,24 +74,59 @@ namespace vcpkg::System Environment get_modified_clean_environment(const std::unordered_map& extra_env, const std::string& prepend_to_path = {}); - int cmd_execute(const ZStringView cmd_line, const Environment& env = {}); - int cmd_execute_clean(const ZStringView cmd_line); + struct InWorkingDirectory + { + const fs::path& working_directory; + }; + + int cmd_execute(StringView cmd_line, InWorkingDirectory wd, const Environment& env = {}); + inline int cmd_execute(StringView cmd_line, const Environment& env = {}) + { + return cmd_execute(cmd_line, InWorkingDirectory{fs::path()}, env); + } + + int cmd_execute_clean(StringView cmd_line, InWorkingDirectory wd); + inline int cmd_execute_clean(StringView cmd_line) + { + return cmd_execute_clean(cmd_line, InWorkingDirectory{fs::path()}); + } #if defined(_WIN32) - Environment cmd_execute_modify_env(const ZStringView cmd_line, const Environment& env = {}); + Environment cmd_execute_modify_env(StringView cmd_line, const Environment& env = {}); void cmd_execute_background(const StringView cmd_line); #endif - ExitCodeAndOutput cmd_execute_and_capture_output(const ZStringView cmd_line, const Environment& env = {}); + ExitCodeAndOutput cmd_execute_and_capture_output(StringView cmd_line, + InWorkingDirectory wd, + const Environment& env = {}); + inline ExitCodeAndOutput cmd_execute_and_capture_output(StringView cmd_line, const Environment& env = {}) + { + return cmd_execute_and_capture_output(cmd_line, InWorkingDirectory{fs::path()}, env); + } - int cmd_execute_and_stream_lines(const ZStringView cmd_line, - std::function per_line_cb, + int cmd_execute_and_stream_lines(StringView cmd_line, + InWorkingDirectory wd, + std::function per_line_cb, const Environment& env = {}); + inline int cmd_execute_and_stream_lines(StringView cmd_line, + std::function per_line_cb, + const Environment& env = {}) + { + return cmd_execute_and_stream_lines(cmd_line, InWorkingDirectory{fs::path()}, std::move(per_line_cb), env); + } - int cmd_execute_and_stream_data(const ZStringView cmd_line, + int cmd_execute_and_stream_data(StringView cmd_line, + InWorkingDirectory wd, std::function data_cb, const Environment& env = {}); + inline int cmd_execute_and_stream_data(StringView cmd_line, + std::function data_cb, + const Environment& env = {}) + { + return cmd_execute_and_stream_data(cmd_line, InWorkingDirectory{fs::path()}, std::move(data_cb), env); + } + void register_console_ctrl_handler(); #if defined(_WIN32) void initialize_global_job_object(); diff --git a/toolsrc/src/vcpkg-test/system.cpp b/toolsrc/src/vcpkg-test/system.cpp index e7f8aca8ff081a..7ebc621f0e9242 100644 --- a/toolsrc/src/vcpkg-test/system.cpp +++ b/toolsrc/src/vcpkg-test/system.cpp @@ -135,13 +135,15 @@ TEST_CASE ("cmdlinebuilder", "[system]") cmd.string_arg("hello world!"); cmd.string_arg("|"); cmd.string_arg(";"); - REQUIRE(cmd.extract() == "relative/path.exe abc \"hello world!\" \"|\" \";\""); + REQUIRE(cmd.command_line() == "relative/path.exe abc \"hello world!\" \"|\" \";\""); + + cmd.clear(); cmd.path_arg(fs::u8path("trailing\\slash\\")); cmd.string_arg("inner\"quotes"); #ifdef _WIN32 - REQUIRE(cmd.extract() == "\"trailing\\slash\\\\\" \"inner\\\"quotes\""); + REQUIRE(cmd.command_line() == "\"trailing\\slash\\\\\" \"inner\\\"quotes\""); #else - REQUIRE(cmd.extract() == "\"trailing\\\\slash\\\\\" \"inner\\\"quotes\""); + REQUIRE(cmd.command_line() == "\"trailing\\\\slash\\\\\" \"inner\\\"quotes\""); #endif } diff --git a/toolsrc/src/vcpkg/archives.cpp b/toolsrc/src/vcpkg/archives.cpp index 0faf756ad30720..33132f892c4ac3 100644 --- a/toolsrc/src/vcpkg/archives.cpp +++ b/toolsrc/src/vcpkg/archives.cpp @@ -80,14 +80,14 @@ namespace vcpkg::Archives #else if (ext == ".gz" && ext.extension() != ".tar") { - const auto code = System::cmd_execute( - Strings::format(R"(cd '%s' && tar xzf '%s')", fs::u8string(to_path_partial), fs::u8string(archive))); + const auto code = System::cmd_execute(System::CmdLineBuilder{"tar"}.string_arg("xzf").path_arg(archive), + System::InWorkingDirectory{to_path_partial}); Checks::check_exit(VCPKG_LINE_INFO, code == 0, "tar failed while extracting %s", fs::u8string(archive)); } else if (ext == ".zip") { - const auto code = System::cmd_execute( - Strings::format(R"(cd '%s' && unzip -qqo '%s')", fs::u8string(to_path_partial), fs::u8string(archive))); + const auto code = System::cmd_execute(System::CmdLineBuilder{"unzip"}.string_arg("-qqo").path_arg(archive), + System::InWorkingDirectory{to_path_partial}); Checks::check_exit(VCPKG_LINE_INFO, code == 0, "unzip failed while extracting %s", fs::u8string(archive)); } else diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp index 50c4c2a0a617a3..e5b91f61cda0f9 100644 --- a/toolsrc/src/vcpkg/base/downloads.cpp +++ b/toolsrc/src/vcpkg/base/downloads.cpp @@ -230,7 +230,7 @@ namespace vcpkg::Downloads { cmd.string_arg(url); } - auto res = System::cmd_execute_and_stream_lines(cmd, [out](const std::string& line) { + auto res = System::cmd_execute_and_stream_lines(cmd, [out](StringView line) { if (Strings::starts_with(line, guid_marker)) { out->push_back(std::strtol(line.data() + guid_marker.size(), nullptr, 10)); @@ -269,7 +269,7 @@ namespace vcpkg::Downloads { cmd.string_arg(url.first).string_arg("-o").path_arg(url.second); } - auto res = System::cmd_execute_and_stream_lines(cmd, [out](const std::string& line) { + auto res = System::cmd_execute_and_stream_lines(cmd, [out](StringView line) { if (Strings::starts_with(line, guid_marker)) { out->push_back(std::strtol(line.data() + guid_marker.size(), nullptr, 10)); @@ -306,7 +306,7 @@ namespace vcpkg::Downloads cmd.string_arg("-H").string_arg("x-ms-version: 2020-04-08"); cmd.string_arg("-H").string_arg("x-ms-blob-type: BlockBlob"); int code = 0; - auto res = System::cmd_execute_and_stream_lines(cmd, [&code](const std::string& line) { + auto res = System::cmd_execute_and_stream_lines(cmd, [&code](StringView line) { if (Strings::starts_with(line, guid_marker)) { code = std::strtol(line.data() + guid_marker.size(), nullptr, 10); diff --git a/toolsrc/src/vcpkg/base/system.process.cpp b/toolsrc/src/vcpkg/base/system.process.cpp index d4410e28abf560..ff608ea0e50ee5 100644 --- a/toolsrc/src/vcpkg/base/system.process.cpp +++ b/toolsrc/src/vcpkg/base/system.process.cpp @@ -195,10 +195,10 @@ namespace vcpkg cmd.string_arg(var.s); } cmd.string_arg("-P").path_arg(cmake_script); - return cmd.extract(); + return std::move(cmd).extract(); } - System::CmdLineBuilder& System::CmdLineBuilder::string_arg(StringView s) + System::CmdLineBuilder& System::CmdLineBuilder::string_arg(StringView s) & { if (!buf.empty()) buf.push_back(' '); if (Strings::find_first_of(s, " \t\n\r\"\\,;&`^|'") != s.end()) @@ -384,7 +384,10 @@ namespace vcpkg return clean_env; } - int System::cmd_execute_clean(const ZStringView cmd_line) { return cmd_execute(cmd_line, get_clean_environment()); } + int System::cmd_execute_clean(StringView cmd_line, InWorkingDirectory wd) + { + return cmd_execute(cmd_line, wd, get_clean_environment()); + } #if defined(_WIN32) struct ProcessInfo @@ -435,7 +438,8 @@ namespace vcpkg /// If non-null, an environment block to use for the new process. If null, the /// new process will inherit the current environment. - static ExpectedT windows_create_process(const StringView cmd_line, + static ExpectedT windows_create_process(StringView cmd_line, + InWorkingDirectory wd, const Environment& env, DWORD dwCreationFlags, STARTUPINFOW& startup_info) noexcept @@ -446,6 +450,14 @@ namespace vcpkg // Flush stdout before launching external process fflush(nullptr); + std::wstring working_directory; + if (!wd.working_directory.empty()) + { + // this only fails if we can't get the current working directory of vcpkg, and we assume that we have that, + // so it's fine anyways + working_directory = Files::get_real_filesystem().absolute(VCPKG_LINE_INFO, wd.working_directory).native(); + } + VCPKG_MSVC_WARNING(suppress : 6335) // Leaking process information handle 'process_info.proc_info.hProcess' // /analyze can't tell that we transferred ownership here bool succeeded = @@ -458,7 +470,7 @@ namespace vcpkg env.m_env_data.empty() ? nullptr : const_cast(static_cast(env.m_env_data.data())), - nullptr, + working_directory.empty() ? nullptr : working_directory.data(), &startup_info, &process_info.proc_info); @@ -468,7 +480,8 @@ namespace vcpkg return GetLastError(); } - static ExpectedT windows_create_windowless_process(const StringView cmd_line, + static ExpectedT windows_create_windowless_process(StringView cmd_line, + InWorkingDirectory wd, const Environment& env, DWORD dwCreationFlags) noexcept { @@ -478,7 +491,7 @@ namespace vcpkg startup_info.dwFlags = STARTF_USESHOWWINDOW; startup_info.wShowWindow = SW_HIDE; - return windows_create_process(cmd_line, env, dwCreationFlags, startup_info); + return windows_create_process(cmd_line, wd, env, dwCreationFlags, startup_info); } struct ProcessInfoAndPipes @@ -506,7 +519,8 @@ namespace vcpkg } }; - static ExpectedT windows_create_process_redirect(const StringView cmd_line, + static ExpectedT windows_create_process_redirect(StringView cmd_line, + InWorkingDirectory wd, const Environment& env, DWORD dwCreationFlags) noexcept { @@ -533,7 +547,7 @@ namespace vcpkg if (!SetHandleInformation(ret.child_stdin, HANDLE_FLAG_INHERIT, 0)) Checks::exit_fail(VCPKG_LINE_INFO); startup_info.hStdError = startup_info.hStdOutput; - auto maybe_proc_info = windows_create_process(cmd_line, env, dwCreationFlags, startup_info); + auto maybe_proc_info = windows_create_process(cmd_line, wd, env, dwCreationFlags, startup_info); CloseHandle(startup_info.hStdInput); CloseHandle(startup_info.hStdOutput); @@ -555,8 +569,11 @@ namespace vcpkg { auto timer = Chrono::ElapsedTimer::create_started(); - auto process_info = windows_create_windowless_process( - cmd_line, {}, CREATE_NEW_CONSOLE | CREATE_NO_WINDOW | CREATE_BREAKAWAY_FROM_JOB); + auto process_info = + windows_create_windowless_process(cmd_line, + InWorkingDirectory{fs::path()}, + {}, + CREATE_NEW_CONSOLE | CREATE_NO_WINDOW | CREATE_BREAKAWAY_FROM_JOB); if (!process_info.get()) { Debug::print("cmd_execute_background() failed with error code ", process_info.error(), "\n"); @@ -565,7 +582,7 @@ namespace vcpkg Debug::print("cmd_execute_background() took ", static_cast(timer.microseconds()), " us\n"); } - Environment System::cmd_execute_modify_env(const ZStringView cmd_line, const Environment& env) + Environment System::cmd_execute_modify_env(StringView cmd_line, const Environment& env) { static StringLiteral magic_string = "cdARN4xjKueKScMy9C6H"; @@ -600,13 +617,13 @@ namespace vcpkg } #endif - int System::cmd_execute(const ZStringView cmd_line, const Environment& env) + int System::cmd_execute(StringView cmd_line, System::InWorkingDirectory wd, const Environment& env) { auto timer = Chrono::ElapsedTimer::create_started(); #if defined(_WIN32) using vcpkg::g_ctrl_c_state; g_ctrl_c_state.transition_to_spawn_process(); - auto proc_info = windows_create_windowless_process(cmd_line, env, 0); + auto proc_info = windows_create_windowless_process(cmd_line, wd, env, 0); auto long_exit_code = [&]() -> unsigned long { if (auto p = proc_info.get()) return p->wait(); @@ -621,24 +638,36 @@ namespace vcpkg "cmd_execute() returned ", exit_code, " after ", static_cast(timer.microseconds()), " us\n"); #else (void)env; - Debug::print("system(", cmd_line, ")\n"); + std::string real_command_line; + if (wd.working_directory.empty()) + { + real_command_line.assign(cmd_line.begin(), cmd_line.end()); + } + else + { + real_command_line = + System::CmdLineBuilder("cd").path_arg(wd.working_directory).raw_arg("&&").raw_arg(cmd_line).extract(); + } + Debug::print("system(", real_command_line, ")\n"); fflush(nullptr); - int exit_code = system(cmd_line.c_str()); + int exit_code = system(real_command_line.c_str()); Debug::print( "system() returned ", exit_code, " after ", static_cast(timer.microseconds()), " us\n"); #endif return exit_code; } - int System::cmd_execute_and_stream_lines(const ZStringView cmd_line, - std::function per_line_cb, + int System::cmd_execute_and_stream_lines(StringView cmd_line, + System::InWorkingDirectory wd, + std::function per_line_cb, const Environment& env) { std::string buf; auto rc = cmd_execute_and_stream_data( cmd_line, + wd, [&](StringView sv) { auto prev_size = buf.size(); Strings::append(buf, sv); @@ -658,7 +687,8 @@ namespace vcpkg return rc; } - int System::cmd_execute_and_stream_data(const ZStringView cmd_line, + int System::cmd_execute_and_stream_data(StringView cmd_line, + System::InWorkingDirectory wd, std::function data_cb, const Environment& env) { @@ -668,7 +698,7 @@ namespace vcpkg using vcpkg::g_ctrl_c_state; g_ctrl_c_state.transition_to_spawn_process(); - auto maybe_proc_info = windows_create_process_redirect(cmd_line, env, 0); + auto maybe_proc_info = windows_create_process_redirect(cmd_line, wd, env, 0); auto exit_code = [&]() -> unsigned long { if (auto p = maybe_proc_info.get()) return p->wait_and_stream_output(data_cb); @@ -678,7 +708,20 @@ namespace vcpkg g_ctrl_c_state.transition_from_spawn_process(); #else (void)env; - const auto actual_cmd_line = Strings::format(R"###(%s 2>&1)###", cmd_line); + std::string actual_cmd_line; + if (wd.working_directory.empty()) + { + actual_cmd_line = Strings::format(R"(%s 2>&1)", cmd_line); + } + else + { + actual_cmd_line = System::CmdLineBuilder("cd") + .path_arg(wd.working_directory) + .raw_arg("&&") + .raw_arg(cmd_line) + .raw_arg("2>&1") + .extract(); + } Debug::print("popen(", actual_cmd_line, ")\n"); // Flush stdout before launching external process @@ -711,11 +754,13 @@ namespace vcpkg return exit_code; } - ExitCodeAndOutput System::cmd_execute_and_capture_output(const ZStringView cmd_line, const Environment& env) + ExitCodeAndOutput System::cmd_execute_and_capture_output(StringView cmd_line, + System::InWorkingDirectory wd, + const Environment& env) { std::string output; auto rc = cmd_execute_and_stream_data( - cmd_line, [&](StringView sv) { Strings::append(output, sv); }, env); + cmd_line, wd, [&](StringView sv) { Strings::append(output, sv); }, env); return {rc, std::move(output)}; } diff --git a/toolsrc/src/vcpkg/binarycaching.cpp b/toolsrc/src/vcpkg/binarycaching.cpp index cf4888e1be92ba..4592760ecb211f 100644 --- a/toolsrc/src/vcpkg/binarycaching.cpp +++ b/toolsrc/src/vcpkg/binarycaching.cpp @@ -96,13 +96,19 @@ namespace #if defined(_WIN32) auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP); - System::cmd_execute_and_capture_output( - Strings::format( - R"("%s" a "%s" "%s\*")", fs::u8string(seven_zip_exe), fs::u8string(destination), fs::u8string(source)), - System::get_clean_environment()); + System::cmd_execute_and_capture_output(System::CmdLineBuilder{seven_zip_exe} + .string_arg("a") + .path_arg(destination) + .path_arg(source / fs::u8path("*")), + System::get_clean_environment()); #else - System::cmd_execute_clean( - Strings::format(R"(cd '%s' && zip --quiet -y -r '%s' *)", fs::u8string(source), fs::u8string(destination))); + System::cmd_execute_clean(System::CmdLineBuilder{"zip"} + .string_arg("--quiet") + .string_arg("-y") + .string_arg("-r") + .path_arg(destination) + .string_arg("*"), + System::InWorkingDirectory{source}); #endif } @@ -414,7 +420,7 @@ namespace { } - int run_nuget_commandline(const std::string& cmdline) + int run_nuget_commandline(StringView cmdline) { if (m_interactive) { @@ -444,7 +450,7 @@ namespace } else if (res.output.find("for example \"-ApiKey AzureDevOps\"") != std::string::npos) { - auto res2 = System::cmd_execute_and_capture_output(cmdline + " -ApiKey AzureDevOps"); + auto res2 = System::cmd_execute_and_capture_output(Strings::concat(cmdline, " -ApiKey AzureDevOps")); if (Debug::g_debugging) { System::print2(res2.output); @@ -538,7 +544,7 @@ namespace cmdline.string_arg("-NonInteractive"); } - cmdlines.push_back(cmdline.extract()); + cmdlines.push_back(std::move(cmdline).extract()); } for (auto&& cfg : m_read_configs) { @@ -568,7 +574,7 @@ namespace cmdline.string_arg("-NonInteractive"); } - cmdlines.push_back(cmdline.extract()); + cmdlines.push_back(std::move(cmdline).extract()); } const size_t current_restored = m_restored.size(); @@ -647,7 +653,7 @@ namespace .string_arg("-ForceEnglishOutput"); if (!m_interactive) cmdline.string_arg("-NonInteractive"); - auto pack_rc = run_nuget_commandline(cmdline.extract()); + auto pack_rc = run_nuget_commandline(cmdline); if (pack_rc != 0) { @@ -676,7 +682,7 @@ namespace System::print2("Uploading binaries for ", spec, " to NuGet source ", write_src, ".\n"); - auto rc = run_nuget_commandline(cmd.extract()); + auto rc = run_nuget_commandline(cmd); if (rc != 0) { System::print2(System::Color::error, @@ -705,7 +711,7 @@ namespace System::print2( "Uploading binaries for ", spec, " using NuGet config ", fs::u8string(write_cfg), ".\n"); - auto rc = run_nuget_commandline(cmd.extract()); + auto rc = run_nuget_commandline(cmd); if (rc != 0) { diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index eb2a338b26f6be..52385c2792af38 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -565,7 +565,7 @@ namespace vcpkg::Build CompilerInfo compiler_info; System::cmd_execute_and_stream_lines( command, - [&](const std::string& s) { + [&](StringView s) { static const StringLiteral s_hash_marker = "#COMPILER_HASH#"; if (Strings::starts_with(s, s_hash_marker)) { diff --git a/toolsrc/src/vcpkg/commands.porthistory.cpp b/toolsrc/src/vcpkg/commands.porthistory.cpp index 894b46b6ebc00c..e6a7cd5dfee6e8 100644 --- a/toolsrc/src/vcpkg/commands.porthistory.cpp +++ b/toolsrc/src/vcpkg/commands.porthistory.cpp @@ -30,7 +30,7 @@ namespace vcpkg::Commands::PortHistory const System::ExitCodeAndOutput run_git_command_inner(const VcpkgPaths& paths, const fs::path& dot_git_directory, const fs::path& working_directory, - const std::string& cmd) + StringView cmd) { const fs::path& git_exe = paths.get_tool_exe(Tools::GIT); @@ -38,13 +38,13 @@ namespace vcpkg::Commands::PortHistory builder.path_arg(git_exe) .string_arg(Strings::concat("--git-dir=", fs::u8string(dot_git_directory))) .string_arg(Strings::concat("--work-tree=", fs::u8string(working_directory))); - const std::string full_cmd = Strings::concat(builder.extract(), " ", cmd); + const std::string full_cmd = Strings::concat(std::move(builder).extract(), " ", cmd); const auto output = System::cmd_execute_and_capture_output(full_cmd); return output; } - const System::ExitCodeAndOutput run_git_command(const VcpkgPaths& paths, const std::string& cmd) + const System::ExitCodeAndOutput run_git_command(const VcpkgPaths& paths, StringView cmd) { const fs::path& work_dir = paths.root; const fs::path dot_git_dir = paths.root / ".git"; @@ -125,7 +125,7 @@ namespace vcpkg::Commands::PortHistory builder.string_arg("--left-only"); builder.string_arg("--"); // Begin pathspec builder.string_arg(Strings::format("ports/%s/.", port_name)); - const auto output = run_git_command(paths, builder.extract()); + const auto output = run_git_command(paths, builder); auto commits = Util::fmap( Strings::split(output.output, '\n'), [](const std::string& line) -> auto { diff --git a/toolsrc/src/vcpkg/export.cpp b/toolsrc/src/vcpkg/export.cpp index b5c36ff87092fb..de09efaff5e843 100644 --- a/toolsrc/src/vcpkg/export.cpp +++ b/toolsrc/src/vcpkg/export.cpp @@ -173,8 +173,7 @@ namespace vcpkg::Export .path_arg(output_dir) .string_arg("-NoDefaultExcludes"); - const int exit_code = - System::cmd_execute_and_capture_output(cmd.extract(), System::get_clean_environment()).exit_code; + const int exit_code = System::cmd_execute_and_capture_output(cmd, System::get_clean_environment()).exit_code; Checks::check_exit(VCPKG_LINE_INFO, exit_code == 0, "Error: NuGet package creation failed"); const fs::path output_path = output_dir / (nuget_id + "." + nuget_version + ".nupkg"); @@ -225,8 +224,6 @@ namespace vcpkg::Export const fs::path exported_archive_path = (output_dir / exported_archive_filename); System::CmdLineBuilder cmd; - cmd.string_arg("cd").path_arg(raw_exported_dir.parent_path()); - cmd.ampersand(); cmd.path_arg(cmake_exe) .string_arg("-E") .string_arg("tar") @@ -236,14 +233,8 @@ namespace vcpkg::Export .string_arg("--") .path_arg(raw_exported_dir); - auto cmdline = cmd.extract(); -#ifdef WIN32 - // Invoke through `cmd` to support `&&` - cmdline.insert(0, "cmd /c \""); - cmdline.push_back('"'); -#endif - - const int exit_code = System::cmd_execute_clean(cmdline); + const int exit_code = + System::cmd_execute_clean(cmd, System::InWorkingDirectory{raw_exported_dir.parent_path()}); Checks::check_exit( VCPKG_LINE_INFO, exit_code == 0, "Error: %s creation failed", exported_archive_path.generic_string()); return exported_archive_path; diff --git a/toolsrc/src/vcpkg/export.prefab.cpp b/toolsrc/src/vcpkg/export.prefab.cpp index 38d4568a8c4f71..3fb4d17306567f 100644 --- a/toolsrc/src/vcpkg/export.prefab.cpp +++ b/toolsrc/src/vcpkg/export.prefab.cpp @@ -212,7 +212,8 @@ namespace vcpkg::Export::Prefab System::get_clean_environment()); #else System::cmd_execute_clean( - Strings::format(R"(cd '%s' && zip --quiet -r '%s' *)", fs::u8string(source), fs::u8string(destination))); + System::CmdLineBuilder{"zip"}.string_arg("--quiet").string_arg("-r").path_arg(destination).string_arg("*"), + System::InWorkingDirectory{source}); #endif } diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index 0153ff65dfeb56..fd5abea4b0334b 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -491,7 +491,7 @@ namespace vcpkg::Metrics builder.path_arg(temp_folder_path_exe); builder.string_arg("x-upload-metrics"); builder.path_arg(vcpkg_metrics_txt_path); - System::cmd_execute_background(builder.extract()); + System::cmd_execute_background(builder); #else auto escaped_path = Strings::escape_string(fs::u8string(vcpkg_metrics_txt_path), '\'', '\\'); const std::string cmd_line = Strings::format( diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index 54b73c93f72806..bdf2bdf6b79811 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -359,7 +359,7 @@ CMake suite maintained and supported by Kitware (kitware.com/cmake). (void)paths; #endif cmd.path_arg(path_to_exe); - auto rc = System::cmd_execute_and_capture_output(cmd.extract()); + auto rc = System::cmd_execute_and_capture_output(cmd); if (rc.exit_code != 0) { #ifndef _WIN32 diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 27b7cfe0281db3..407a14fd63982e 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -504,7 +504,7 @@ If you wish to silence this error and use classic mode, you can: .string_arg("--no-hardlinks") .path_arg(local_repo) .path_arg(dot_git_dir); - const auto clone_output = System::cmd_execute_and_capture_output(clone_cmd_builder.extract()); + const auto clone_output = System::cmd_execute_and_capture_output(clone_cmd_builder); Checks::check_exit(VCPKG_LINE_INFO, clone_output.exit_code == 0, "Failed to clone temporary vcpkg instance.\n%s\n", @@ -516,7 +516,7 @@ If you wish to silence this error and use classic mode, you can: .string_arg(commit_sha) .string_arg("--") .path_arg(subpath); - const auto checkout_output = System::cmd_execute_and_capture_output(checkout_cmd_builder.extract()); + const auto checkout_output = System::cmd_execute_and_capture_output(checkout_cmd_builder); Checks::check_exit(VCPKG_LINE_INFO, checkout_output.exit_code == 0, "Error: Failed to checkout %s:%s\n%s\n", @@ -552,7 +552,7 @@ If you wish to silence this error and use classic mode, you can: System::CmdLineBuilder showcmd = git_cmd_builder(*this, dot_git_dir, dot_git_dir).string_arg("show").string_arg(treeish); - auto output = System::cmd_execute_and_capture_output(showcmd.extract()); + auto output = System::cmd_execute_and_capture_output(showcmd); if (output.exit_code == 0) { return {std::move(output.output), expected_left_tag}; @@ -631,7 +631,7 @@ If you wish to silence this error and use classic mode, you can: .string_arg("--no-hardlinks") .path_arg(local_repo) .path_arg(dot_git_dir); - const auto clone_output = System::cmd_execute_and_capture_output(clone_cmd_builder.extract()); + const auto clone_output = System::cmd_execute_and_capture_output(clone_cmd_builder); Checks::check_exit(VCPKG_LINE_INFO, clone_output.exit_code == 0, "Failed to clone temporary vcpkg instance.\n%s\n", @@ -641,7 +641,7 @@ If you wish to silence this error and use classic mode, you can: { System::CmdLineBuilder fetch_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree).string_arg("fetch"); - const auto fetch_output = System::cmd_execute_and_capture_output(fetch_cmd_builder.extract()); + const auto fetch_output = System::cmd_execute_and_capture_output(fetch_cmd_builder); Checks::check_exit(VCPKG_LINE_INFO, fetch_output.exit_code == 0, "Failed to update refs on temporary vcpkg repository.\n%s\n", @@ -658,7 +658,7 @@ If you wish to silence this error and use classic mode, you can: .string_arg("checkout") .string_arg(git_object) .string_arg("."); - const auto checkout_output = System::cmd_execute_and_capture_output(checkout_cmd_builder.extract()); + const auto checkout_output = System::cmd_execute_and_capture_output(checkout_cmd_builder); Checks::check_exit(VCPKG_LINE_INFO, checkout_output.exit_code == 0, "Failed to checkout %s", git_object); const auto& containing_folder = destination.parent_path(); From 7ab1bab2e79706a2273c5a1c44c017783353aee2 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 12 Jan 2021 12:19:22 -0800 Subject: [PATCH 0464/1694] [vcpkg] Resolve macos host machines running out of disk space by reducing size and using fixed disks. (#15584) --- scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 | 2 +- scripts/azure-pipelines/osx/configuration/Vagrantfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 b/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 index 4e675660cb11b3..c44858044164b3 100755 --- a/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 +++ b/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 @@ -75,7 +75,7 @@ Param( [String]$BoxName = 'vcpkg/macos-ci', [Parameter()] - [Int]$DiskSize = 350, + [Int]$DiskSize = 250, [Parameter()] [Switch]$Force diff --git a/scripts/azure-pipelines/osx/configuration/Vagrantfile b/scripts/azure-pipelines/osx/configuration/Vagrantfile index f5ff39ff394af4..08c472fe6d6bd7 100644 --- a/scripts/azure-pipelines/osx/configuration/Vagrantfile +++ b/scripts/azure-pipelines/osx/configuration/Vagrantfile @@ -50,7 +50,7 @@ Vagrant.configure('2') do |config| # to do this. When vagrant finishes the `disk` feature, switch # over to that -- Nicole Mazzuca if (not File.exists? diskname) then - system "VBoxManage createmedium --filename #{diskname} --size #{1024 * server[:disk_size]}" + system "VBoxManage createmedium --filename #{diskname} --size #{1024 * server[:disk_size]} --variant Fixed" end config.vm.provider 'virtualbox' do |vb| From adc7df6a4b33dc8ff54d3459fccf040435b05ea0 Mon Sep 17 00:00:00 2001 From: Andrei Lebedev Date: Wed, 13 Jan 2021 04:49:40 +0100 Subject: [PATCH 0465/1694] [vcpkg] use VCPKG_ROOT_DIR instead of DOWNLOADS for WORKING_DIRECTORY in do_version_check (#15299) Signed-off-by: Andrei Lebedev --- scripts/cmake/vcpkg_find_acquire_program.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index f8fc6f6f4e2532..cc6be6b3ea0606 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -71,7 +71,7 @@ function(vcpkg_find_acquire_program VAR) set(PATHS ${DOWNLOADS}/tools/perl/${SUBDIR}/perl/bin) set(BREW_PACKAGE_NAME "perl") set(APT_PACKAGE_NAME "perl") - set(URL + set(URL "https://strawberry.perl.bot/download/${PERL_VERSION}/strawberry-perl-${PERL_VERSION}-32bit.zip" "http://strawberryperl.com/download/${PERL_VERSION}/strawberry-perl-${PERL_VERSION}-32bit.zip" ) @@ -300,7 +300,7 @@ function(vcpkg_find_acquire_program VAR) set(PROGNAME clang) set(SUBDIR "clang-10.0.0") if(CMAKE_HOST_WIN32) - set(PATHS + set(PATHS # Support LLVM in Visual Studio 2019 "$ENV{LLVMInstallDir}/x64/bin" "$ENV{LLVMInstallDir}/bin" @@ -314,7 +314,7 @@ function(vcpkg_find_acquire_program VAR) else() set(HOST_ARCH_ $ENV{PROCESSOR_ARCHITECTURE}) endif() - + if(HOST_ARCH_ MATCHES "64") set(URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe") set(ARCHIVE "LLVM-10.0.0-win64.7z.exe") @@ -360,7 +360,7 @@ function(vcpkg_find_acquire_program VAR) set(SCRIPTNAME "scons.py") set(URL "https://sourceforge.net/projects/scons/files/scons-local-${SCONS_VERSION}.zip/download") set(ARCHIVE "scons-local-${SCONS_VERSION}.zip") - set(HASH fe121b67b979a4e9580c7f62cfdbe0c243eba62a05b560d6d513ac7f35816d439b26d92fc2d7b7d7241c9ce2a49ea7949455a17587ef53c04a5f5125ac635727) + set(HASH fe121b67b979a4e9580c7f62cfdbe0c243eba62a05b560d6d513ac7f35816d439b26d92fc2d7b7d7241c9ce2a49ea7949455a17587ef53c04a5f5125ac635727) elseif(VAR MATCHES "SWIG") set(SWIG_VERSION 4.0.2) set(PROGNAME swig) @@ -468,7 +468,7 @@ function(vcpkg_find_acquire_program VAR) if(VERSION_CMD) vcpkg_execute_in_download_mode( COMMAND ${${VAR}} ${VERSION_CMD} - WORKING_DIRECTORY ${DOWNLOADS} + WORKING_DIRECTORY ${VCPKG_ROOT_DIR} OUTPUT_VARIABLE ${VAR}_VERSION_OUTPUT ) string(STRIP "${${VAR}_VERSION_OUTPUT}" ${VAR}_VERSION_OUTPUT) @@ -481,7 +481,7 @@ function(vcpkg_find_acquire_program VAR) endif() endif() endmacro() - + macro(do_find) if(NOT DEFINED REQUIRED_INTERPRETER) find_program(${VAR} ${PROGNAME} PATHS ${PATHS} NO_DEFAULT_PATH) From dd6ea3aae33e1d6cebdc97f68546de3405607dfa Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Tue, 12 Jan 2021 19:51:46 -0800 Subject: [PATCH 0466/1694] [cppgraphqlgen] Fix --head for new branch/option (#15549) * [cppgraphqlgen] Fix --head for new branch/option * Update ports/cppgraphqlgen/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/cppgraphqlgen/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/cppgraphqlgen/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update CONTROL version * Update ports/cppgraphqlgen/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/cppgraphqlgen/CONTROL | 1 + ports/cppgraphqlgen/portfile.cmake | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL index 30694fac4a9e37..ed84a7ac3fbbbc 100644 --- a/ports/cppgraphqlgen/CONTROL +++ b/ports/cppgraphqlgen/CONTROL @@ -1,5 +1,6 @@ Source: cppgraphqlgen Version: 2020-12-07 +Port-Version: 1 Build-Depends: boost-program-options, pegtl, rapidjson Description: C++ GraphQL schema service generator Homepage: https://github.com/microsoft/cppgraphqlgen diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 662a38db91e3fb..5cdc17faabdf67 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -3,15 +3,23 @@ vcpkg_from_github( REPO microsoft/cppgraphqlgen REF fb4a589c84c102d867e7bfb03884d40f7776315b SHA512 88fedd83b49ae25f2165cff8e3a5e3e46ed853312658924f08b3192c790e92583dc8b8f7a88f39ec17798bd7d986143a78633a89d3867400539c4d315015e29b - HEAD_REF master + HEAD_REF main ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DGRAPHQL_BUILD_TESTS=OFF -DGRAPHQL_UPDATE_SAMPLES=OFF -DGRAPHQL_INSTALL_CONFIGURATIONS=Release - OPTIONS_RELEASE -DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/tools - OPTIONS_DEBUG -DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/debug/tools + OPTIONS + -DGRAPHQL_BUILD_TESTS=OFF + -DGRAPHQL_UPDATE_VERSION=OFF + -DGRAPHQL_UPDATE_SAMPLES=OFF + -DGRAPHQL_INSTALL_CONFIGURATIONS=Release + OPTIONS_RELEASE + -DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share + -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/tools + OPTIONS_DEBUG + -DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share + -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/debug/tools ) vcpkg_install_cmake() From a70de9134fa2f5ef075008a3beb6d189d7cfffa4 Mon Sep 17 00:00:00 2001 From: Luca Schlecker Date: Wed, 13 Jan 2021 04:57:22 +0100 Subject: [PATCH 0467/1694] [palsigslot] New port (#15558) Signed-off-by: Luca Schlecker --- ports/palsigslot/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/palsigslot/usage | 4 ++++ ports/palsigslot/vcpkg.json | 6 ++++++ 3 files changed, 36 insertions(+) create mode 100644 ports/palsigslot/portfile.cmake create mode 100644 ports/palsigslot/usage create mode 100644 ports/palsigslot/vcpkg.json diff --git a/ports/palsigslot/portfile.cmake b/ports/palsigslot/portfile.cmake new file mode 100644 index 00000000000000..0ec29449202d85 --- /dev/null +++ b/ports/palsigslot/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO palacaze/sigslot + REF v1.2.0 + SHA512 6a6fb862a9eeea78732f2191916c7384a4bcb65e42c948f726459ee3cb446f90c4bd18c7c94ee4f9b15c81c5aa729094013805161d532c2284d9e77cdffaa468 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DSIGSLOT_COMPILE_EXAMPLES=OFF + -DSIGSLOT_COMPILE_TESTS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/PalSigslot TARGET_PATH share/PalSigslot) + +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/palsigslot/usage b/ports/palsigslot/usage new file mode 100644 index 00000000000000..6242d2829b8f33 --- /dev/null +++ b/ports/palsigslot/usage @@ -0,0 +1,4 @@ +The package palsigslot is compatible with built-in CMake targets: + + find_package(PalSigslot CONFIG REQUIRED) + target_link_libraries(main PRIVATE Pal::Sigslot) diff --git a/ports/palsigslot/vcpkg.json b/ports/palsigslot/vcpkg.json new file mode 100644 index 00000000000000..d3b7e9f898e142 --- /dev/null +++ b/ports/palsigslot/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "palsigslot", + "version-string": "1.2.0", + "description": "A header-only, thread safe implementation of signal-slots for C++.", + "homepage": "https://github.com/palacaze/sigslot" +} From c3e8a1c4ae880e859cb615869ed4649cbc648967 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 12 Jan 2021 20:01:37 -0800 Subject: [PATCH 0468/1694] directxmesh, directxtex, and uvatlas now support linux (#15554) * Update for directx-headers release 1.0.1 * DirectXMesh, DirectXTex, and UVAtlas now support Linux * Updated hashes and bins * Fix linux builds * Fixed directxtex[openexr] for x64-linux * Removed stray file * directxmath hot-fix for GCC arm64 * Fixed hash * Hash fix again * x64-linux CIs use GCC 7, but I require GCC 9 * Added warning message for GCC 9 requirement --- ports/directx-headers/CONTROL | 2 +- ports/directx-headers/portfile.cmake | 4 +-- ports/directxmath/CONTROL | 2 +- ports/directxmath/portfile.cmake | 5 +-- ports/directxmesh/CONTROL | 5 +-- ports/directxmesh/portfile.cmake | 17 +++++----- ports/directxtex/CONTROL | 5 +-- ports/directxtex/enable_openexr_support.patch | 15 +++------ ports/directxtex/portfile.cmake | 31 +++++++++++-------- ports/directxtk/CONTROL | 2 +- ports/directxtk/portfile.cmake | 13 ++++---- ports/directxtk12/CONTROL | 2 +- ports/directxtk12/portfile.cmake | 12 +++---- ports/uvatlas/CONTROL | 6 ++-- ports/uvatlas/portfile.cmake | 17 +++++----- scripts/ci.baseline.txt | 5 +++ 16 files changed, 77 insertions(+), 66 deletions(-) diff --git a/ports/directx-headers/CONTROL b/ports/directx-headers/CONTROL index ab4b573bb97dc0..08da6a2367fba7 100644 --- a/ports/directx-headers/CONTROL +++ b/ports/directx-headers/CONTROL @@ -1,5 +1,5 @@ Source: directx-headers -Version: 1.0 +Version: 1.0.1 Homepage: https://devblogs.microsoft.com/directx/ Description: Official DirectX headers Supports: windows|linux diff --git a/ports/directx-headers/portfile.cmake b/ports/directx-headers/portfile.cmake index dbb51700029b8d..67408840b77770 100644 --- a/ports/directx-headers/portfile.cmake +++ b/ports/directx-headers/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectX-Headers - REF v1.0 - SHA512 73e35142ff460aa6114a9fa298ce409d4b1cb34fb7bbb1ca55687cf7aca05197c48a02ae8c81bcb36b39b1a3f75d8ecbe503a752df70f4b0980fc026a92df84b + REF v1.0.1 + SHA512 1b0f89088b7dba846d443fd943787848435bd1b731adc7e2f4fab6f32203775153811a7d7c297ecf44ca60628db8346a8246942c609c5116481a70e67633fb04 HEAD_REF master ) diff --git a/ports/directxmath/CONTROL b/ports/directxmath/CONTROL index 6471db4e887be1..bbd86fa2e9da8f 100644 --- a/ports/directxmath/CONTROL +++ b/ports/directxmath/CONTROL @@ -1,4 +1,4 @@ Source: directxmath -Version: dec2020b +Version: jan2021 Homepage: https://walbourn.github.io/introducing-directxmath/ Description: DirectXMath SIMD C++ math library diff --git a/ports/directxmath/portfile.cmake b/ports/directxmath/portfile.cmake index 872f7d93312df0..b9a509edafcf5e 100644 --- a/ports/directxmath/portfile.cmake +++ b/ports/directxmath/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMath - REF dec2020b - SHA512 59f2e7024b145e09ec40639627344175e77db0527888dce07a6e5785cb240ed163c8d5b063222226ddd1af8128de1d842ff15a1f6e9f5e1e1a14dfd2da1a270b + REF jan2021 + SHA512 8288f9e4d30b4947e98122f298ca25b8e2f82091c1257d3a0fd4d8de44c4c9a97d4549c105b388afbefad11ad6f30429e875e3e70eb4aa7865be6d4c08d6d1f3 HEAD_REF master + FILE_DISAMBIGUATOR 2 ) vcpkg_configure_cmake( diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL index 75008c7efefecb..dd19d931aced38 100644 --- a/ports/directxmesh/CONTROL +++ b/ports/directxmesh/CONTROL @@ -1,8 +1,9 @@ Source: directxmesh -Version: nov2020b +Version: jan2021 Homepage: https://walbourn.github.io/directxmesh Description: DirectXMesh geometry processing library -Supports: windows +Build-Depends: directxmath(linux), directx-headers(linux) +Supports: windows|linux Feature: dx12 Description: Build with DirectX12 support for Windows 10 diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index d4540454dd612f..9c7d27a70c1f4c 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") +vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF nov2020b - SHA512 a3520d916324e16004ec0052c6d4c628be2ea62583d0169b663f67ce03ef84c3ba8ea01c239c75dc89a359de6748039dc11e405ba4b0c4f33ee0225e4e248415 + REF jan2021 + SHA512 2e3950571703e48de083900e5f4ff94a6f882071969e48dd200ecbf7d8357f3131f647ba6ad97e7dcdbd3e051edad99521661738e7af73ca6f89e8715cd29f9c HEAD_REF master - FILE_DISAMBIGUATOR 2 ) vcpkg_check_features( @@ -17,6 +16,10 @@ vcpkg_check_features( dx12 BUILD_DX12 ) +if (VCPKG_HOST_IS_LINUX) + message(WARNING "Build ${PORT} requires GCC version 9 or later") +endif() + if(VCPKG_TARGET_IS_UWP) set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF) else() @@ -32,7 +35,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -if(NOT VCPKG_TARGET_IS_UWP) +if((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) vcpkg_copy_tools( TOOL_NAMES meshconvert SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake @@ -40,9 +43,9 @@ if(NOT VCPKG_TARGET_IS_UWP) elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile(meshconvert - URLS "https://github.com/Microsoft/DirectXMesh/releases/download/nov2020/meshconvert.exe" + URLS "https://github.com/Microsoft/DirectXMesh/releases/download/jan2021/meshconvert.exe" FILENAME "meshconvert.exe" - SHA512 189552c74dc634f673a0d15851d7bb7c42c860023b1488086a9904323fc45207244c159c8848a211afafe258825f5051ee6fd85080da3f7f4afdf910764ca8ec + SHA512 7df51baa495859aab418d194fd885cf37945ec2927122c18718b3a1a7d7ceb08c6853d084d74bf2bf2bc9ace47a351fd6b8d03706507f4966111ec1cb83f43a2 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/") diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL index a130f4d2f77014..e2611ffd5d4021 100644 --- a/ports/directxtex/CONTROL +++ b/ports/directxtex/CONTROL @@ -1,8 +1,9 @@ Source: directxtex -Version: nov2020b +Version: jan2021 Homepage: https://walbourn.github.io/directxtex Description: DirectXTex texture processing library -Supports: windows +Build-Depends: directxmath(linux), directx-headers(linux) +Supports: windows|linux Feature: dx12 Description: Build with DirectX12 support for Windows 10 diff --git a/ports/directxtex/enable_openexr_support.patch b/ports/directxtex/enable_openexr_support.patch index 36d3c72c49e8c8..cb4f398ea0d920 100644 --- a/ports/directxtex/enable_openexr_support.patch +++ b/ports/directxtex/enable_openexr_support.patch @@ -1,5 +1,5 @@ diff --git a/DirectXTex/DirectXTexEXR.cpp b/DirectXTex/DirectXTexEXR.cpp -index 0cfd4db..7a6e70c 100644 +index c78f1d1..e073539 100644 --- a/DirectXTex/DirectXTexEXR.cpp +++ b/DirectXTex/DirectXTexEXR.cpp @@ -8,7 +8,7 @@ @@ -11,19 +11,12 @@ index 0cfd4db..7a6e70c 100644 #include "DirectXTexEXR.h" -@@ -38,6 +38,7 @@ +@@ -55,7 +55,7 @@ using namespace DirectX; using PackedVector::XMHALF4; - // Comment out this first anonymous namespace if you add the include of DirectXTexP.h above + // Comment out this anonymous namespace if you add the include of DirectXTexP.h above +-#ifdef WIN32 +#if 0 namespace { struct handle_closer { void operator()(HANDLE h) { assert(h != INVALID_HANDLE_VALUE); if (h) CloseHandle(h); } }; -@@ -70,6 +76,7 @@ - HANDLE m_handle; - }; - } -+#endif - - namespace - { diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 9b1b5cde039bad..9df396562f19e8 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -1,14 +1,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") +vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF nov2020b - SHA512 b32f063f838c150f0ce81f4807bb88090d9695ee9857ec198b22a06c758e905008a3e3c3a1370f89ce5ec4d7e3c66f896a915968312776e8e5ada7e53e346475 + REF jan2021 + SHA512 f48f05aea811b2ce04f7e82837ed8da9cd3452d0f582d933dbd8878acdc94d8dfb123fa85f5d483a9cd688d3a129d765514069c6c83c58eb1880f6e5661d61e8 HEAD_REF master - FILE_DISAMBIGUATOR 2 + FILE_DISAMBIGUATOR 1 ) if("openexr" IN_LIST FEATURES) @@ -22,12 +22,13 @@ if("openexr" IN_LIST FEATURES) vcpkg_download_distfile( DIRECTXTEX_EXR_SOURCE URLS "https://raw.githubusercontent.com/wiki/Microsoft/DirectXTex/DirectXTexEXR.cpp" - FILENAME "DirectXTexEXR.cpp" - SHA512 8bc66e102a0a163e42d428774c857271ad457a85038fd4ddfdbf083674879f9a8406a9aecd26949296b156a5c5fd08fdfba9600b71879be9affb9dabf23a497c + FILENAME "DirectXTexEXR-1.cpp" + SHA512 770fc0325b49139079b0bceb50619f93887e87a3dcf264b10dc01be16209fa51ba03d8273d4d4f84e596ac014376db96b7fed0afabe08c32394ed92495168ea6 ) file(COPY ${DIRECTXTEX_EXR_HEADER} DESTINATION ${SOURCE_PATH}/DirectXTex) file(COPY ${DIRECTXTEX_EXR_SOURCE} DESTINATION ${SOURCE_PATH}/DirectXTex) + file(RENAME ${SOURCE_PATH}/DirectXTex/DirectXTexEXR-1.cpp ${SOURCE_PATH}/DirectXTex/DirectXTexEXR.cpp) vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES enable_openexr_support.patch) endif() @@ -38,6 +39,10 @@ vcpkg_check_features( openexr ENABLE_OPENEXR_SUPPORT ) +if (VCPKG_HOST_IS_LINUX) + message(WARNING "Build ${PORT} requires GCC version 9 or later") +endif() + if(VCPKG_TARGET_IS_UWP) set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF) else() @@ -57,7 +62,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -if(NOT VCPKG_TARGET_IS_UWP) +if((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) vcpkg_copy_tools( TOOL_NAMES texassemble texconv texdiag SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake @@ -65,21 +70,21 @@ if(NOT VCPKG_TARGET_IS_UWP) elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile(texassemble - URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2020/texassemble.exe" + URLS "https://github.com/Microsoft/DirectXTex/releases/download/jan2021/texassemble.exe" FILENAME "texassemble.exe" - SHA512 8094a4ef4a00df3d2cb4a18a1c84664f4a8bf018328751f19feef1691d1a3d9380556039b1a771728e55d94113baa0f69998f63c96a3b4a6f6c3ba9e53a29a64 + SHA512 0def8873358234ea4cd16acd59cb1dda2a8ad132f362502d643caed43e9aef19f9c7e7248494093cbd61e7501a9b44f545d3fbd5f50972ebcee3d01598a7c3b7 ) vcpkg_download_distfile(texconv - URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2020/texconv.exe" + URLS "https://github.com/Microsoft/DirectXTex/releases/download/jan2021/texconv.exe" FILENAME "texconv.exe" - SHA512 91555fae9fadb942e8f3bc7052888fe515b1a0efb17f5eb53ef437e06c2e50baaef6a0552c93f218b028133baf65ba6e3393042a47b210baa9692ed6f8bbed2b + SHA512 77559db65406ad0343901ff22f7647c4f270674f7b0c31b12d8dc26c718f410708ebe95bdc0ddba4049fa6cefd52ff856174530fc4170f9e725b30aacb78249c ) vcpkg_download_distfile(texdiag - URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2020/texdiag.exe" + URLS "https://github.com/Microsoft/DirectXTex/releases/download/jan2021/texdiag.exe" FILENAME "texdiag.exe" - SHA512 7ba66004228ea1830fbfe5c40f4ee6cf1023f8256136a565c28e584a71115dd2d38e5f79f862de39ee54f8b34d7d8848c656082800f2a59f5b4833aee678d4b8 + SHA512 1b9e733050b5f92af86a9a2f415205acbff62f0708e491a3846d7b6e480a9c57086eff636be163d42a40a6d34dafc622cc53940797e7f6f77e739f3a66365f57 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/") diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL index 988163b5e30562..21b673e6ac65db 100644 --- a/ports/directxtk/CONTROL +++ b/ports/directxtk/CONTROL @@ -1,5 +1,5 @@ Source: directxtk -Version: nov2020b +Version: jan2021 Homepage: https://walbourn.github.io/directxtk Description: A collection of helper classes for writing DirectX 11.x code in C++. Supports: windows diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index 9cf412c30bdfdb..b9f1944b72b5d4 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -5,10 +5,9 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF nov2020b - SHA512 25c8404a949988bcb468383bffa9510dfcc4fa5498f10319816024448987bbddbecef4a29c44d414d5696b0ec58704fd10071b674fc24ec5844fc5bf0f58097e + REF jan2021 + SHA512 c0e8df3ef3a276169c219798978eb948947ba63f49fd08be914eee87ed4bb05a4e33e3a4d1c06c4e932f5ad8fa50a14e0b53a9b9f6f749aa15174f343a17555c HEAD_REF master - FILE_DISAMBIGUATOR 2 ) vcpkg_check_features( @@ -47,15 +46,15 @@ if(NOT VCPKG_TARGET_IS_UWP) elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile(makespritefont - URLS "https://github.com/Microsoft/DirectXTK/releases/download/nov2020/MakeSpriteFont.exe" + URLS "https://github.com/Microsoft/DirectXTK/releases/download/jan2021/MakeSpriteFont.exe" FILENAME "makespritefont.exe" - SHA512 d576eecd9763d238e12ba8d865917738a4bc8cbf632943e5c11b9426ecdfeaa9e8522076f1bb7122d41e69158fc7ca0939f2d90f9986470639966b3f849d236a + SHA512 0cca19694fd3625c5130a85456f7bf1dabc8c5f893223c19da134a0c4d64de853f7871644365dcec86012543f3a59a96bfabd9e51947648f6d82480602116fc4 ) vcpkg_download_distfile(xwbtool - URLS "https://github.com/Microsoft/DirectXTK/releases/download/nov2020/XWBTool.exe" + URLS "https://github.com/Microsoft/DirectXTK/releases/download/jan2021/XWBTool.exe" FILENAME "xwbtool.exe" - SHA512 6ac8fc12fcea0f808aac1367907dbbb0c5669c8c654fc21f38b4e1ce951710ade1851515dba074e9254579b018545c3cdb2b6cf57366dfba0196603510bf51cd + SHA512 91c9d0da90697ba3e0ebe4afcc4c8e084045b76b26e94d7acd4fd87e5965b52dd61d26038f5eb749a3f6de07940bf6e3af8e9f19d820bf904fbdb2752b78fce9 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL index 7f0a0842dbf851..fd7e367a349838 100644 --- a/ports/directxtk12/CONTROL +++ b/ports/directxtk12/CONTROL @@ -1,5 +1,5 @@ Source: directxtk12 -Version: nov2020b +Version: jan2021 Homepage: https://walbourn.github.io/directx-tool-kit-for-directx-12 Description: A collection of helper classes for writing DirectX 12 code in C++. Supports: windows diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index a02a284e32d059..99fcea0e86ebef 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF nov2020b - SHA512 3a47209f109f993e4ca779bca9c9417c3f11a0472b3c91f52beb46a388edc5487d4e2cd472371ef6ffc4d3e54782d12e884befe8537fa68190c1556d6e36fbab + REF jan2021 + SHA512 a6938194bc8857fe0076cb21f000aaa4ab4e207342e07f76ecea9d3f064c1b0c220a5f410c2e1184f37d98b54ef2f4852a6bc7cb13a029885bd3c39cb3f1a727 HEAD_REF master ) @@ -21,15 +21,15 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile(makespritefont - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/nov2020/MakeSpriteFont.exe" + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jan2021/MakeSpriteFont.exe" FILENAME "makespritefont.exe" - SHA512 d576eecd9763d238e12ba8d865917738a4bc8cbf632943e5c11b9426ecdfeaa9e8522076f1bb7122d41e69158fc7ca0939f2d90f9986470639966b3f849d236a + SHA512 0cca19694fd3625c5130a85456f7bf1dabc8c5f893223c19da134a0c4d64de853f7871644365dcec86012543f3a59a96bfabd9e51947648f6d82480602116fc4 ) vcpkg_download_distfile(xwbtool - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/nov2020/XWBTool.exe" + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jan2021/XWBTool.exe" FILENAME "xwbtool.exe" - SHA512 6ac8fc12fcea0f808aac1367907dbbb0c5669c8c654fc21f38b4e1ce951710ade1851515dba074e9254579b018545c3cdb2b6cf57366dfba0196603510bf51cd + SHA512 91c9d0da90697ba3e0ebe4afcc4c8e084045b76b26e94d7acd4fd87e5965b52dd61d26038f5eb749a3f6de07940bf6e3af8e9f19d820bf904fbdb2752b78fce9 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") diff --git a/ports/uvatlas/CONTROL b/ports/uvatlas/CONTROL index 9ebfccb6eac1f2..a65d710e2f13f5 100644 --- a/ports/uvatlas/CONTROL +++ b/ports/uvatlas/CONTROL @@ -1,6 +1,6 @@ Source: uvatlas -Version: dec2020b +Version: jan2021 Homepage: https://github.com/Microsoft/UVAtlas Description: UVAtlas isochart texture atlas -Build-Depends: directxmesh(!uwp), directxtex(!uwp) -Supports: windows \ No newline at end of file +Build-Depends: directxmesh(!(uwp|linux)), directxtex(!(uwp|linux)), directxmath(linux), directx-headers(linux) +Supports: windows|linux diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index 9982641ceaa194..14f7a5eed3a2a6 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -1,16 +1,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") +vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF dec2020b - SHA512 4a81f5e45d906a897a73af940e63f684e416e7b851c4c439fb2dc7fe761838f7a84ccd5088bc94460cdb5d5fd9f5105c719a81e65a381bbdd2fad3465cdf3d46 + REF jan2021 + SHA512 a0248f31626a0835c9aaf7ed9cabfc5771e34257b8e8e4a3139dca69d7242d79fbb7883071379cd9202edecef3a518d6cf9e7ef9b0338afd384bf2c9830878d3 HEAD_REF master - FILE_DISAMBIGUATOR 2 ) +if (VCPKG_HOST_IS_LINUX) + message(WARNING "Build ${PORT} requires GCC version 9 or later") +endif() + if(VCPKG_TARGET_IS_UWP) set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF) else() @@ -26,7 +29,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -if(NOT VCPKG_TARGET_IS_UWP) +if((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) vcpkg_copy_tools( TOOL_NAMES uvatlastool SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake @@ -34,9 +37,9 @@ if(NOT VCPKG_TARGET_IS_UWP) elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile(uvatlastool - URLS "https://github.com/Microsoft/UVAtlas/releases/download/dec2020/uvatlastool.exe" + URLS "https://github.com/Microsoft/UVAtlas/releases/download/jan2021/uvatlastool.exe" FILENAME "uvatlastool.exe" - SHA512 f3388e590bb45281a089d6d38ff603e99f2ff9124ec1e6caebae2663e4ab8ccaf06f5cce671f78ed9a1f882c6d2e2b1188212ef0219f96b46872faa20cc649fd + SHA512 8727510f3ec41c2fa7ed75100b8c0f4daa41e93a1b812e5ec3c265dc87c3f48651da37a18af5d8b57a0aa096c42232b58a50a00c036ec7c04dcae4767a2691f9 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/") diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 77bec59ea4fd65..c8f6c14d8bc973 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -193,6 +193,9 @@ devicenameresolver:x64-windows-static-md=fail dimcli:arm-uwp=fail dimcli:x64-osx=fail dimcli:x64-uwp=fail +# directxtex, directxmesh requires GCC 9 or later for linux support +directxtex:x64-linux=fail +directxmesh:x64-linux=fail discord-game-sdk:x64-windows-static=fail discord-game-sdk:x64-windows-static-md=fail discord-rpc:arm-uwp=fail @@ -1649,6 +1652,8 @@ urdfdom:x64-windows-static-md=fail usd:x86-windows=fail uthenticode:arm-uwp=fail uthenticode:x64-uwp=fail +# uvatlas requires GCC 9 or later for linux support +uvatlas:x64-linux=fail v8:arm64-windows=fail v8:arm-uwp=fail v8:x64-osx=fail From a7aa3332473833c97098826a40e38629803d39cd Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 13 Jan 2021 12:05:11 +0800 Subject: [PATCH 0469/1694] [poppler] Fix error gperf is not recognized as an internal or external command (#15574) Co-authored-by: Cheney-Wang --- ports/poppler/0003-fix-gperf-not-recognized.patch | 15 +++++++++++++++ ports/poppler/portfile.cmake | 5 +++++ ports/poppler/vcpkg.json | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ports/poppler/0003-fix-gperf-not-recognized.patch diff --git a/ports/poppler/0003-fix-gperf-not-recognized.patch b/ports/poppler/0003-fix-gperf-not-recognized.patch new file mode 100644 index 00000000000000..e6edf39e79325b --- /dev/null +++ b/ports/poppler/0003-fix-gperf-not-recognized.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cce875a..0b04be7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -530,8 +530,8 @@ endif() + if (GPERF AND RUN_GPERF_IF_PRESENT) + macro(ADD_GPERF_FILE input) + add_custom_command(OUTPUT poppler/${input}.c +- COMMAND gperf poppler/${input}.gperf > ${CMAKE_CURRENT_BINARY_DIR}/poppler/${input}.c +- COMMAND gperf poppler/${input}.gperf > ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c ++ COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_BINARY_DIR}/poppler/${input}.c ++ COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c + COMMAND clang-format -i ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c || true + DEPENDS poppler/${input}.gperf + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/ports/poppler/portfile.cmake b/ports/poppler/portfile.cmake index 89345f0a031948..4d5b58dee75c07 100644 --- a/ports/poppler/portfile.cmake +++ b/ports/poppler/portfile.cmake @@ -7,8 +7,13 @@ vcpkg_from_github( PATCHES 0001-remove-CMAKE_CXX_STANDARD.patch 0002-remove-test-subdirectory.patch + 0003-fix-gperf-not-recognized.patch ) +vcpkg_find_acquire_program(GPERF) +get_filename_component(GPERF_PATH ${GPERF} DIRECTORY) +vcpkg_add_to_path(${GPERF_PATH}) + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS curl ENABLE_CURL zlib ENABLE_ZLIB diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json index 71cb470c5c6910..788c88abc9d5c5 100644 --- a/ports/poppler/vcpkg.json +++ b/ports/poppler/vcpkg.json @@ -1,7 +1,7 @@ { "name": "poppler", "version-string": "20.12.1", - "port-version": 1, + "port-version": 2, "description": "a PDF rendering library", "homepage": "https://poppler.freedesktop.org/", "dependencies": [ From 2da8376e9ae9099e99641c84567292b7245c2d41 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 12 Jan 2021 21:11:21 -0700 Subject: [PATCH 0470/1694] [speexdsp] Configure and install speexdsp.pc (#15585) * [speexdsp] Configure and install speexdsp.pc * remove blank 'Build-Depends' field --- ports/speexdsp/CMakeLists.txt | 13 +++++++++++++ ports/speexdsp/CONTROL | 3 +-- ports/speexdsp/portfile.cmake | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ports/speexdsp/CMakeLists.txt b/ports/speexdsp/CMakeLists.txt index 4f5abea48cf876..6d9658916aa3e8 100644 --- a/ports/speexdsp/CMakeLists.txt +++ b/ports/speexdsp/CMakeLists.txt @@ -101,6 +101,19 @@ set_target_properties(speexdsp PROPERTIES PUBLIC_HEADER "${LIBSPEEXDSP_HEADERS_P set_target_properties(speexdsp PROPERTIES VERSION "${LIBSPEEXDSP_VERSION}") set_target_properties(speexdsp PROPERTIES SOVERSION "${LIBSPEEXDSP_SOVERSION}") +# pkgconfig file +set(prefix "${CMAKE_INSTALL_PREFIX}") +set(exec_prefix \${prefix}) +SET(bindir \${exec_prefix}/${CMAKE_INSTALL_BINDIR}) +SET(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) +SET(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) +if(CMAKE_SYSTEM_NAME MATCHES BSD) + set(PKG_CONFIG_RPATH "-Wl,-R\${libdir}") +endif(CMAKE_SYSTEM_NAME MATCHES BSD) +set(PACKAGE_VERSION "${LIBSPEEXDSP_VERSION}") +configure_file(speexdsp.pc.in speexdsp.pc @ONLY) +install(FILES ${PROJECT_BINARY_DIR}/speexdsp.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install(TARGETS speexdsp ARCHIVE DESTINATION "lib" RUNTIME DESTINATION "bin" diff --git a/ports/speexdsp/CONTROL b/ports/speexdsp/CONTROL index 59ba0f4c0f8744..89d842c471a7e8 100644 --- a/ports/speexdsp/CONTROL +++ b/ports/speexdsp/CONTROL @@ -1,6 +1,5 @@ Source: speexdsp Version: 1.2.0 -Port-Version: 4 +Port-Version: 5 Homepage: https://speex.org/ Description: A patent-free, Open Source/Free Software DSP library. -Build-Depends: diff --git a/ports/speexdsp/portfile.cmake b/ports/speexdsp/portfile.cmake index 429b2f21398ea4..445bc2aca21804 100644 --- a/ports/speexdsp/portfile.cmake +++ b/ports/speexdsp/portfile.cmake @@ -41,6 +41,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") From 8032235c763aa022cc9e85d27ecbfea8cac66362 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 12 Jan 2021 21:12:44 -0700 Subject: [PATCH 0471/1694] [libzip] Relative pkgconfig paths (#15589) --- ports/libzip/CONTROL | 1 + ports/libzip/portfile.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/ports/libzip/CONTROL b/ports/libzip/CONTROL index d0f5e7fa050d54..cb192aa103653a 100644 --- a/ports/libzip/CONTROL +++ b/ports/libzip/CONTROL @@ -1,5 +1,6 @@ Source: libzip Version: 1.7.3 +Port-Version: 1 Homepage: https://github.com/nih-at/libzip Build-Depends: zlib Default-Features: bzip2,default-aes diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake index eb42311b8baa43..7432d4e17d6160 100644 --- a/ports/libzip/portfile.cmake +++ b/ports/libzip/portfile.cmake @@ -33,6 +33,7 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/libzip) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Remove include directories from lib From a8e9a5684ab1fb543cb8fe14dfa3b33d27a565d0 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 13 Jan 2021 12:14:04 +0800 Subject: [PATCH 0472/1694] [nana] Fix fontconfig dependency (#15595) * [nana] Fix fontconfig dependency * Update link library * Update find_package() as find_dependency() in config.cmake.in * Remove keyword REQUIRED from find_dependency() --- ports/nana/CMakeLists.txt | 4 ++-- ports/nana/CONTROL | 1 + ports/nana/config.cmake.in | 15 ++++++++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ports/nana/CMakeLists.txt b/ports/nana/CMakeLists.txt index 036d5bc8f0f30d..c66ce66b52bdb5 100644 --- a/ports/nana/CMakeLists.txt +++ b/ports/nana/CMakeLists.txt @@ -47,8 +47,8 @@ if(UNIX) target_include_directories(nana PUBLIC ${X11_INCLUDE_DIR}) target_link_libraries(nana PUBLIC ${X11_LIBRARIES} ${X11_Xft_LIB}) - find_library(FONTCONFIG_LIB NAMES fontconfig) - target_link_libraries(nana PUBLIC ${FONTCONFIG_LIB}) + find_package(Fontconfig REQUIRED) + target_link_libraries(nana PUBLIC Fontconfig::Fontconfig) endif() if(NANA_ENABLE_PNG) diff --git a/ports/nana/CONTROL b/ports/nana/CONTROL index 65e75a832af527..608fb8747eeb8a 100644 --- a/ports/nana/CONTROL +++ b/ports/nana/CONTROL @@ -1,5 +1,6 @@ Source: nana Version: 1.7.4 +Port-Version: 1 Homepage: https://github.com/cnjinhao/nana Description: Cross-platform library for GUI programming in modern C++ style. Build-Depends: libpng, libjpeg-turbo, freetype (!uwp&&!windows), fontconfig (!uwp&&!windows) diff --git a/ports/nana/config.cmake.in b/ports/nana/config.cmake.in index 43b21dcc4c19d8..86d70cc69a1d20 100644 --- a/ports/nana/config.cmake.in +++ b/ports/nana/config.cmake.in @@ -1,27 +1,28 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) if(UNIX) - find_package(Threads REQUIRED) - find_package(Freetype REQUIRED) - find_package(X11 REQUIRED) - find_library(FONTCONFIG_LIB NAMES fontconfig) + find_dependency(Threads) + find_dependency(Freetype) + find_dependency(X11) + find_dependency(Fontconfig) endif() option(NANA_ENABLE_PNG "Enable PNG support" @NANA_ENABLE_PNG@) option(NANA_ENABLE_JPEG "Enable JPEG support" @NANA_ENABLE_JPEG@) if(NANA_ENABLE_PNG) - find_package(PNG REQUIRED) + find_dependency(PNG) endif() if(NANA_ENABLE_JPEG) - find_package(JPEG REQUIRED) + find_dependency(JPEG) endif() include("${CMAKE_CURRENT_LIST_DIR}/unofficial-nana-targets.cmake") if(UNIX) - target_link_libraries(unofficial::nana::nana INTERFACE ${FONTCONFIG_LIB} ${X11_LIBRARIES} ${X11_Xft_LIB}) + target_link_libraries(unofficial::nana::nana INTERFACE Fontconfig::Fontconfig ${X11_LIBRARIES} ${X11_Xft_LIB}) endif() if(NANA_ENABLE_JPEG) From 68447962e19693da54da3729e21234e9ed5c8540 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Wed, 13 Jan 2021 10:53:29 -0800 Subject: [PATCH 0473/1694] [vcpkg] Add parse checking for version fields and enable non-string versions outside 'versions' flag (#15580) --- toolsrc/src/vcpkg-test/manifests.cpp | 19 ++++++++++++++++ toolsrc/src/vcpkg/sourceparagraph.cpp | 8 ------- toolsrc/src/vcpkg/versiondeserializers.cpp | 25 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 8 deletions(-) diff --git a/toolsrc/src/vcpkg-test/manifests.cpp b/toolsrc/src/vcpkg-test/manifests.cpp index f03caf3bf76bd7..39e4700750dcc8 100644 --- a/toolsrc/src/vcpkg-test/manifests.cpp +++ b/toolsrc/src/vcpkg-test/manifests.cpp @@ -136,6 +136,25 @@ TEST_CASE ("manifest versioning", "[manifests]") "version-semver": "abcd#1" })json", true); + + SECTION ("version syntax") + { + test_parse_manifest(R"json({ + "name": "zlib", + "version-semver": "2020-01-01" + })json", + true); + test_parse_manifest(R"json({ + "name": "zlib", + "version-date": "1.1.1" + })json", + true); + test_parse_manifest(R"json({ + "name": "zlib", + "version": "1.2.3-rc3" + })json", + true); + } } TEST_CASE ("manifest constraints error hash", "[manifests]") diff --git a/toolsrc/src/vcpkg/sourceparagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp index f80a1494e5d963..c4ae3e85569eeb 100644 --- a/toolsrc/src/vcpkg/sourceparagraph.cpp +++ b/toolsrc/src/vcpkg/sourceparagraph.cpp @@ -1009,14 +1009,6 @@ namespace vcpkg { if (!flags.versions) { - if (core_paragraph->version_scheme != Versions::Scheme::String) - { - return Strings::concat(fs::u8string(origin), - " was rejected because it uses a non-string version scheme and the `", - VcpkgCmdArguments::VERSIONS_FEATURE, - "` feature flag is disabled.\nThis can be fixed by using \"version-string\"."); - } - auto check_deps = [&](View deps) -> Optional { for (auto&& dep : deps) { diff --git a/toolsrc/src/vcpkg/versiondeserializers.cpp b/toolsrc/src/vcpkg/versiondeserializers.cpp index d791e3e14569a0..842bdade33ea4a 100644 --- a/toolsrc/src/vcpkg/versiondeserializers.cpp +++ b/toolsrc/src/vcpkg/versiondeserializers.cpp @@ -97,15 +97,40 @@ namespace vcpkg else { if (has_exact) + { version_scheme = Versions::Scheme::String; + } else if (has_relax) + { version_scheme = Versions::Scheme::Relaxed; + auto v = Versions::RelaxedVersion::from_string(version); + if (!v.has_value()) + { + r.add_generic_error(parent_type, "'version' text was not a relaxed version:\n", v.error()); + } + } else if (has_semver) + { version_scheme = Versions::Scheme::Semver; + auto v = Versions::SemanticVersion::from_string(version); + if (!v.has_value()) + { + r.add_generic_error(parent_type, "'version-semver' text was not a semantic version:\n", v.error()); + } + } else if (has_date) + { version_scheme = Versions::Scheme::Date; + auto v = Versions::DateVersion::from_string(version); + if (!v.has_value()) + { + r.add_generic_error(parent_type, "'version-date' text was not a date version:\n", v.error()); + } + } else + { Checks::unreachable(VCPKG_LINE_INFO); + } } return SchemedVersion(version_scheme, VersionT{version, port_version}); From dfff47ae486148f0441e2b18c6029c3c05846d08 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 13 Jan 2021 14:05:38 -0800 Subject: [PATCH 0474/1694] [vcpkg] Add sources for TLS 1.2 downloader tool. (#15516) --- scripts/azure-pipelines/Format-CxxCode.ps1 | 1 + scripts/azure-pipelines/signing.yml | 16 + .../azure-pipelines/windows/signing.signproj | 3 + toolsrc/CMakeLists.txt | 23 +- toolsrc/src/tls12-download.c | 311 ++++++++++++++++++ 5 files changed, 352 insertions(+), 2 deletions(-) create mode 100644 toolsrc/src/tls12-download.c diff --git a/scripts/azure-pipelines/Format-CxxCode.ps1 b/scripts/azure-pipelines/Format-CxxCode.ps1 index a20a9ce0ba3d12..2653562a7e8630 100644 --- a/scripts/azure-pipelines/Format-CxxCode.ps1 +++ b/scripts/azure-pipelines/Format-CxxCode.ps1 @@ -36,6 +36,7 @@ Push-Location $toolsrc try { $files = Get-ChildItem -Recurse -LiteralPath "$toolsrc/src" -Filter '*.cpp' + $files += Get-ChildItem -Recurse -LiteralPath "$toolsrc/src" -Filter '*.c' $files += Get-ChildItem -Recurse -LiteralPath "$toolsrc/include/vcpkg" -Filter '*.h' $files += Get-ChildItem -Recurse -LiteralPath "$toolsrc/include/vcpkg-test" -Filter '*.h' $files += Get-Item "$toolsrc/include/pch.h" diff --git a/scripts/azure-pipelines/signing.yml b/scripts/azure-pipelines/signing.yml index 2d8e0065d22687..b7a3137d99d7fc 100644 --- a/scripts/azure-pipelines/signing.yml +++ b/scripts/azure-pipelines/signing.yml @@ -52,6 +52,10 @@ jobs: inputs: InputType: 'CommandLine' arguments: 'analyze "$(Build.StagingDirectory)\vcpkg.exe"' + - task: BinSkim@3 + inputs: + InputType: 'CommandLine' + arguments: 'analyze "$(Build.StagingDirectory)\tls12-download.exe"' - task: PublishBuildArtifacts@1 displayName: 'Publish vcpkg.exe' inputs: @@ -64,6 +68,18 @@ jobs: PathtoPublish: '$(Build.ArtifactStagingDirectory)\vcpkg.pdb' ArtifactName: 'Windows' publishLocation: 'Container' + - task: PublishBuildArtifacts@1 + displayName: 'Publish tls12-download.exe' + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)\tls12-download.exe' + ArtifactName: 'Windows' + publishLocation: 'Container' + - task: PublishBuildArtifacts@1 + displayName: 'Publish tls12-download.pdb' + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)\tls12-download.pdb' + ArtifactName: 'Windows' + publishLocation: 'Container' - task: MicroBuildCleanup@1 condition: succeededOrFailed() displayName: MicroBuild Cleanup diff --git a/scripts/azure-pipelines/windows/signing.signproj b/scripts/azure-pipelines/windows/signing.signproj index 2ded02c83fa0da..9382e0a0e2d77c 100644 --- a/scripts/azure-pipelines/windows/signing.signproj +++ b/scripts/azure-pipelines/windows/signing.signproj @@ -14,6 +14,9 @@ Microsoft400 + + Microsoft400 + diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt index 529d797060065e..3f0c55cfffb57b 100644 --- a/toolsrc/CMakeLists.txt +++ b/toolsrc/CMakeLists.txt @@ -1,6 +1,11 @@ +if(WIN32) +# 3.16 for MSVC_RUNTIME_LIBRARY +cmake_minimum_required(VERSION 3.16) +else() cmake_minimum_required(VERSION 3.14) +endif() -project(vcpkg CXX) +project(vcpkg C CXX) include(cmake/utilities.cmake) # =============== @@ -178,6 +183,18 @@ if(VCPKG_BUILD_FUZZING) vcpkg_target_add_warning_options(vcpkg-fuzz) endif() + +# === Target: tls12-download === + +set(TLS12_DOWNLOAD_SOURCES src/tls12-download.c) +if(WIN32) + add_executable(tls12-download ${TLS12_DOWNLOAD_SOURCES}) + set_property(TARGET tls12-download PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded") + set_property(TARGET tls12-download APPEND PROPERTY LINK_OPTIONS "$,,/ENTRY:entry>") + target_link_libraries(tls12-download winhttp) +endif() + + # === Target: format === find_program(CLANG_FORMAT clang-format) @@ -196,5 +213,7 @@ if(CLANG_FORMAT) COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKG_TEST_SOURCES} COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKG_TEST_INCLUDES} - COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKG_FUZZ_SOURCES}) + COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKG_FUZZ_SOURCES} + COMMAND ${CLANG_FORMAT} -i -verbose ${TLS12_DOWNLOAD_SOURCES} + ) endif() diff --git a/toolsrc/src/tls12-download.c b/toolsrc/src/tls12-download.c new file mode 100644 index 00000000000000..16edc544845ad7 --- /dev/null +++ b/toolsrc/src/tls12-download.c @@ -0,0 +1,311 @@ +#include +#include +#include +/* + * This program must be as small as possible, because it is committed in binary form to the + * vcpkg github repo to enable downloading the main vcpkg program on Windows 7, where TLS 1.2 is + * unavailable to PowerShell. + * To that end it avoids using C runtime functions (beyond the vcruntime ones the compiler + * injects itself). + * (In testing as of 2021-01-07, this version that doesn't link with the CRT is ~8kb, whereas a + * hello world program that does link with the CRT is ~300kb) + */ + +static void __declspec(noreturn) win32_abort() +{ + /* + * Note that TerminateProcess does not return when called from the terminated process, see + * https://github.com/MicrosoftDocs/sdk-api/pull/626 + */ + TerminateProcess(GetCurrentProcess(), 3); +} + +static size_t wide_length(const wchar_t* str) +{ + size_t answer = 0; + while (*str) + { + ++answer; + ++str; + } + return answer; +} + +static void write_message(const HANDLE std_out, const wchar_t* msg) +{ + size_t wchars_to_write = wide_length(msg); + if (wchars_to_write == 0) + { + return; + } + + if (wchars_to_write > 65535) + { + win32_abort(); + } + + if (WriteConsoleW(std_out, msg, wchars_to_write, 0, 0)) + { + return; + } + + // this happens if output has been redirected + int narrow_chars = WideCharToMultiByte(CP_ACP, 0, msg, (int)wchars_to_write, 0, 0, 0, 0); + if (narrow_chars == 0) + { + win32_abort(); + } + + char* narrow_buffer = HeapAlloc(GetProcessHeap(), 0, (size_t)narrow_chars); + if (WideCharToMultiByte(CP_ACP, 0, msg, (int)wchars_to_write, narrow_buffer, narrow_chars, 0, 0) == 0) + { + win32_abort(); + } + + while (narrow_chars != 0) + { + DWORD chars_written; + if (!WriteFile(std_out, narrow_buffer, (DWORD)narrow_chars, &chars_written, 0)) + { + win32_abort(); + } + + narrow_chars -= (int)chars_written; + } + + if (!HeapFree(GetProcessHeap(), 0, narrow_buffer)) + { + win32_abort(); + } +} + +static void write_number(const HANDLE std_out, DWORD number) +{ + wchar_t buffer[11]; // 4294967295\0 + wchar_t* first_digit = buffer + 11; + *--first_digit = L'\0'; + if (number == 0) + { + *--first_digit = L'0'; + } + else + { + do + { + *--first_digit = L'0' + number % 10; + number /= 10; + } while (number != 0); + } + + write_message(std_out, first_digit); +} + +static void write_hex(const HANDLE std_out, DWORD number) +{ + wchar_t buffer[] = L"0x00000000"; + wchar_t* first_digit = buffer + (sizeof(buffer) / sizeof(wchar_t)) - 1; + while (number != 0) + { + *--first_digit = L"0123456789ABCDEF"[number % 16]; + number /= 16; + } + + write_message(std_out, buffer); +} + +static void __declspec(noreturn) abort_api_failure(const HANDLE std_out, const wchar_t* api_name) +{ + DWORD last_error = GetLastError(); + write_message(std_out, L"While calling Windows API function "); + write_message(std_out, api_name); + write_message(std_out, L" got error "); + write_hex(std_out, last_error); + write_message(std_out, L":\r\n"); + wchar_t* message; + if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ALLOCATE_BUFFER, + GetModuleHandleW(L"winhttp.dll"), + last_error, + 0, + (LPWSTR)&message, + 0, + 0)) + { + write_message(std_out, message); + // intentionally leaks the message buffer + } + else + { + last_error = GetLastError(); + write_message(std_out, L"(unknown error, FormatMessageW failed with "); + write_hex(std_out, last_error); + write_message(std_out, L")"); + } + + write_message(std_out, L"\r\n"); + FlushFileBuffers(std_out); + win32_abort(); +} + +#ifndef NDEBUG +int main() +#else // ^^^ debug // !debug vvv +int __stdcall entry() +#endif // ^^^ !debug +{ +#ifdef NDEBUG + __security_init_cookie(); +#endif // ^^^ release + + const HANDLE std_out = GetStdHandle(STD_OUTPUT_HANDLE); + if (std_out == INVALID_HANDLE_VALUE) + { + win32_abort(); + } + + int argc; + wchar_t** argv = CommandLineToArgvW(GetCommandLineW(), &argc); // intentionally leaks argv + if (argv == 0) + { + win32_abort(); + } + + if (argc != 4) + { + write_message(std_out, L"Usage: tls12-download.exe DOMAIN RELATIVE-PATH OUT-FILE\r\n"); + return 1; + } + + const wchar_t* const domain = argv[1]; + const wchar_t* const relative_path = argv[2]; + const wchar_t* const out_file_path = argv[3]; + write_message(std_out, L"Downloading https://"); + write_message(std_out, domain); + write_message(std_out, relative_path); + write_message(std_out, L" -> "); + write_message(std_out, out_file_path); + + wchar_t https_proxy_env[32767]; + DWORD access_type; + const wchar_t* proxy_setting; + const wchar_t* proxy_bypass_setting; + if (GetEnvironmentVariableW(L"HTTPS_PROXY", https_proxy_env, sizeof(https_proxy_env) / sizeof(wchar_t))) + { + access_type = WINHTTP_ACCESS_TYPE_NAMED_PROXY; + proxy_setting = https_proxy_env; + proxy_bypass_setting = L""; + write_message(std_out, L" (using proxy: "); + write_message(std_out, proxy_setting); + write_message(std_out, L")"); + } + else if (GetLastError() == ERROR_ENVVAR_NOT_FOUND) + { + access_type = WINHTTP_ACCESS_TYPE_NO_PROXY; + proxy_setting = WINHTTP_NO_PROXY_NAME; + proxy_bypass_setting = WINHTTP_NO_PROXY_BYPASS; + } + else + { + abort_api_failure(std_out, L"GetEnvironmentVariableW"); + } + + write_message(std_out, L"\r\n"); + + const HANDLE out_file = CreateFileW(out_file_path, FILE_WRITE_DATA, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (out_file == INVALID_HANDLE_VALUE) + { + abort_api_failure(std_out, L"CreateFileW"); + } + + BOOL results = FALSE; + const HINTERNET session = WinHttpOpen(L"tls12-download/1.0", access_type, proxy_setting, proxy_bypass_setting, 0); + if (!session) + { + abort_api_failure(std_out, L"WinHttpOpen"); + } + + unsigned long secure_protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; + if (!WinHttpSetOption(session, WINHTTP_OPTION_SECURE_PROTOCOLS, &secure_protocols, sizeof(DWORD))) + { + abort_api_failure(std_out, L"WinHttpSetOption"); + } + + const HINTERNET connect = WinHttpConnect(session, domain, INTERNET_DEFAULT_HTTPS_PORT, 0); + if (!connect) + { + abort_api_failure(std_out, L"WinHttpConnect"); + } + + const HINTERNET request = WinHttpOpenRequest( + connect, L"GET", relative_path, 0, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_SECURE); + if (!request) + { + abort_api_failure(std_out, L"WinHttpOpenRequest"); + } + + if (!WinHttpSendRequest(request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0)) + { + abort_api_failure(std_out, L"WinHttpSendRequest"); + } + + if (!WinHttpReceiveResponse(request, 0)) + { + abort_api_failure(std_out, L"WinHttpReceiveResponse"); + } + + DWORD http_code = 0; + DWORD query_headers_buffer_size = sizeof(http_code); + if (!WinHttpQueryHeaders(request, + WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, + WINHTTP_HEADER_NAME_BY_INDEX, + &http_code, + &query_headers_buffer_size, + WINHTTP_NO_HEADER_INDEX)) + { + abort_api_failure(std_out, L"WinHttpQueryHeaders"); + } + + if (http_code != 200) + { + write_message(std_out, L"Download failed, server returned HTTP status: "); + write_number(std_out, http_code); + write_message(std_out, L"\r\n"); + FlushFileBuffers(std_out); + TerminateProcess(GetCurrentProcess(), 2); + } + + char buffer[32768]; + for (;;) + { + DWORD received_bytes; + if (!WinHttpReadData(request, buffer, sizeof(buffer), &received_bytes)) + { + abort_api_failure(std_out, L"WinHttpReadData"); + } + + if (received_bytes == 0) + { + break; // end of response + } + + do + { + DWORD written_bytes; + if (!WriteFile(out_file, buffer, received_bytes, &written_bytes, 0)) + { + abort_api_failure(std_out, L"WriteFile"); + } + + received_bytes -= written_bytes; + } while (received_bytes != 0); + } + + WinHttpCloseHandle(request); + WinHttpCloseHandle(connect); + WinHttpCloseHandle(session); + CloseHandle(out_file); + + write_message(std_out, L"Done.\r\n"); + FlushFileBuffers(std_out); + TerminateProcess(GetCurrentProcess(), 0); + return 0; +} From 9908541cda683b784c7073ce60c2cc7899a88e2d Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 13 Jan 2021 14:06:06 -0800 Subject: [PATCH 0475/1694] [vcpkg] Use a tag file rather than conditional compilation to permanently disable metrics. (#15470) --- .../end-to-end-tests-dir/disable-metrics.ps1 | 61 +++++++++++++++++++ .../end-to-end-tests-prelude.ps1 | 12 +++- scripts/bootstrap.ps1 | 9 ++- scripts/bootstrap.sh | 8 ++- toolsrc/CMakeLists.txt | 7 +-- .../include/vcpkg/commands.upload-metrics.h | 10 --- toolsrc/src/vcpkg.cpp | 44 ++++++++----- toolsrc/src/vcpkg/metrics.cpp | 19 +----- toolsrc/windows-bootstrap/vcpkg.vcxproj | 8 +-- 9 files changed, 124 insertions(+), 54 deletions(-) create mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1 diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1 new file mode 100644 index 00000000000000..efec472b4e3ebd --- /dev/null +++ b/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1 @@ -0,0 +1,61 @@ +. $PSScriptRoot/../end-to-end-tests-prelude.ps1 + +# Test that metrics are on by default +$metricsTagName = 'vcpkg.disable-metrics' +$metricsAreDisabledMessage = 'Warning: passed --sendmetrics, but metrics are disabled.' + +function Test-Metrics-Enabled() { + Param( + [Parameter(ValueFromRemainingArguments)] + [string[]]$TestArgs + ) + + $actualArgs = @('version', '--sendmetrics') + if ($TestArgs.Length -ne 0) { + $actualArgs += $TestArgs + } + + $vcpkgOutput = Run-Vcpkg $actualArgs + if ($vcpkgOutput -contains $metricsAreDisabledMessage) { + Write-Host 'Metrics are disabled' + return $false + } + + Write-Host 'Metrics are enabled' + return $true +} + +# By default, metrics are enabled. +Require-FileNotExists $metricsTagName +if (-Not (Test-Metrics-Enabled)) { + throw "Metrics were not on by default." +} + +if (Test-Metrics-Enabled '--disable-metrics') { + throw "Metrics were not disabled by switch." +} + +$env:VCPKG_DISABLE_METRICS = 'ON' +try { + if (Test-Metrics-Enabled) { + throw "Environment variable did not disable metrics." + } + + if (-Not (Test-Metrics-Enabled '--no-disable-metrics')) { + throw "Environment variable to disable metrics could not be overridden by switch." + } +} finally { + Remove-Item env:VCPKG_DISABLE_METRICS +} + +# If the disable-metrics tag file exists, metrics are disabled even if attempted to be enabled on +# the command line. +Set-Content -Path $metricsTagName -Value "" +try { + if (Test-Metrics-Enabled '--disable-metrics') { + throw "Metrics were not force-disabled by the disable-metrics tag file." + } +} +finally { + Remove-Item $metricsTagName +} diff --git a/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 b/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 index 0c675e9bf23506..1e340eff730025 100644 --- a/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 @@ -59,9 +59,17 @@ function Run-Vcpkg { [Parameter(ValueFromRemainingArguments)] [string[]]$TestArgs ) - $Script:CurrentTest = "./vcpkg $($testArgs -join ' ')" + + if ($IsWindows) { + $vcpkgName = 'vcpkg.exe' + } else { + $vcpkgName = 'vcpkg' + } + + $Script:CurrentTest = "./$vcpkgName $($testArgs -join ' ')" Write-Host $Script:CurrentTest - ./vcpkg @testArgs + & "./$vcpkgName" @testArgs | Tee-Object -Variable 'ConsoleOutput' + return $ConsoleOutput } Refresh-TestRoot diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 67a4bbbef6389e..018ba3f992aa97 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -370,7 +370,6 @@ else $arguments = ( "`"/p:VCPKG_VERSION=-unknownhash`"", -"`"/p:DISABLE_METRICS=$disableMetricsValue`"", "/p:Configuration=Release", "/p:Platform=$platform", "/p:PlatformToolset=$platformToolset", @@ -413,8 +412,14 @@ if ($ec -ne 0) Write-Host "`nBuilding vcpkg.exe... done.`n" -if (-not $disableMetrics) +if ($disableMetrics) +{ + Set-Content -Value "" -Path "$vcpkgRootDir\vcpkg.disable-metrics" -Force +} +elseif (-Not (Test-Path "$vcpkgRootDir\vcpkg.disable-metrics")) { + # Note that we intentionally leave any existing vcpkg.disable-metrics; once a user has + # opted out they should stay opted out. Write-Host @" Telemetry --------- diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index fa1a64622e34c9..ba76f4f6321529 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -280,13 +280,17 @@ buildDir="$vcpkgRootDir/toolsrc/build.rel" rm -rf "$buildDir" mkdir -p "$buildDir" -(cd "$buildDir" && CXX="$CXX" "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DBUILD_TESTING=$vcpkgBuildTests" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_DISABLE_METRICS=$vcpkgDisableMetrics" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 +(cd "$buildDir" && CXX="$CXX" "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DBUILD_TESTING=$vcpkgBuildTests" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 (cd "$buildDir" && "$cmakeExe" --build .) || exit 1 rm -rf "$vcpkgRootDir/vcpkg" cp "$buildDir/vcpkg" "$vcpkgRootDir/" -if ! [ "$vcpkgDisableMetrics" = "ON" ]; then +if [ "$vcpkgDisableMetrics" = "ON" ]; then + touch "$vcpkgRootDir/vcpkg.disable-metrics" +elif ! [ -f "$vcpkgRootDir/vcpkg.disable-metrics" ]; then + # Note that we intentionally leave any existing vcpkg.disable-metrics; once a user has + # opted out they should stay opted out. cat < namespace vcpkg::Commands::UploadMetrics @@ -18,5 +10,3 @@ namespace vcpkg::Commands::UploadMetrics virtual void perform_and_exit(const VcpkgCmdArguments& args, Files::Filesystem& fs) const override; }; } - -#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index f128210fd22588..f3a6ac6a09a1e2 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -227,24 +227,40 @@ int main(const int argc, const char* const* const argv) #endif VcpkgCmdArguments args = VcpkgCmdArguments::create_from_command_line(fs, argc, argv); + if (const auto p = args.debug.get()) Debug::g_debugging = *p; args.imbue_from_environment(); args.check_feature_flag_consistency(); - if (const auto p = args.disable_metrics.get()) Metrics::g_metrics.lock()->set_disabled(*p); - if (const auto p = args.print_metrics.get()) Metrics::g_metrics.lock()->set_print_metrics(*p); - if (const auto p = args.send_metrics.get()) Metrics::g_metrics.lock()->set_send_metrics(*p); - if (const auto p = args.debug.get()) Debug::g_debugging = *p; - - if (args.send_metrics.has_value() && !Metrics::g_metrics.lock()->metrics_enabled()) { - System::print2(System::Color::warning, - "Warning: passed either --sendmetrics or --no-sendmetrics, but metrics are disabled.\n"); - } - if (args.print_metrics.has_value() && !Metrics::g_metrics.lock()->metrics_enabled()) - { - System::print2(System::Color::warning, - "Warning: passed either --printmetrics or --no-printmetrics, but metrics are disabled.\n"); - } + auto metrics = Metrics::g_metrics.lock(); + if (const auto p = args.disable_metrics.get()) + { + metrics->set_disabled(*p); + } + + auto disable_metrics_tag_file_path = + System::get_exe_path_of_current_process().replace_filename(fs::u8path("vcpkg.disable-metrics")); + std::error_code ec; + if (fs.exists(disable_metrics_tag_file_path, ec) || ec) + { + metrics->set_disabled(true); + } + + if (const auto p = args.print_metrics.get()) + { + metrics->set_print_metrics(*p); + } + + if (const auto p = args.send_metrics.get()) + { + metrics->set_send_metrics(*p); + } + + if (args.send_metrics.value_or(true) && !metrics->metrics_enabled()) + { + System::print2(System::Color::warning, "Warning: passed --sendmetrics, but metrics are disabled.\n"); + } + } // unlock Metrics::g_metrics args.debug_print_feature_flags(); args.track_feature_flag_metrics(); diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index fd5abea4b0334b..9e9f43c1582f3e 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -240,20 +240,14 @@ namespace vcpkg::Metrics static MetricMessage g_metricmessage; static bool g_should_send_metrics = -#if defined(NDEBUG) && (VCPKG_DISABLE_METRICS == 0) +#if defined(NDEBUG) true #else false #endif ; static bool g_should_print_metrics = false; - static bool g_metrics_disabled = -#if VCPKG_DISABLE_METRICS - true -#else - false -#endif - ; + static bool g_metrics_disabled = false; std::string get_MAC_user() { @@ -305,14 +299,7 @@ namespace vcpkg::Metrics void Metrics::set_disabled(bool disabled) { g_metrics_disabled = disabled; } - bool Metrics::metrics_enabled() - { -#if VCPKG_DISABLE_METRICS - return false; -#else - return !g_metrics_disabled; -#endif - } + bool Metrics::metrics_enabled() { return !g_metrics_disabled; } void Metrics::track_metric(const std::string& name, double value) { diff --git a/toolsrc/windows-bootstrap/vcpkg.vcxproj b/toolsrc/windows-bootstrap/vcpkg.vcxproj index 9f035bb375b2fc..7aa1535988e135 100644 --- a/toolsrc/windows-bootstrap/vcpkg.vcxproj +++ b/toolsrc/windows-bootstrap/vcpkg.vcxproj @@ -96,7 +96,7 @@ Disabled true ..\include - VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions) + VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions) /std:c++latest %(AdditionalOptions) true false @@ -114,7 +114,7 @@ Disabled true ..\include - VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions) + VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions) /std:c++latest %(AdditionalOptions) true false @@ -134,7 +134,7 @@ true true ..\include - VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions) + VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions) _MBCS;NDEBUG;%(PreprocessorDefinitions) /std:c++latest %(AdditionalOptions) true @@ -156,7 +156,7 @@ true true ..\include - VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions) + VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions) _MBCS;NDEBUG;%(PreprocessorDefinitions) /std:c++latest %(AdditionalOptions) true From 96c2fd591c173b4fac9c44e8f287e538cecff28d Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Wed, 13 Jan 2021 14:41:23 -0800 Subject: [PATCH 0476/1694] [boost][many ports] Reformat manifest files in preparation for #15424 (#15616) Co-authored-by: Robert Schumacher --- ports/ampl-mp/CONTROL | 6 - ports/ampl-mp/vcpkg.json | 10 + ports/boost-accumulators/CONTROL | 6 - ports/boost-accumulators/vcpkg.json | 33 +++ ports/boost-algorithm/CONTROL | 6 - ports/boost-algorithm/vcpkg.json | 28 +++ ports/boost-align/CONTROL | 6 - ports/boost-align/vcpkg.json | 13 ++ ports/boost-any/CONTROL | 6 - ports/boost-any/vcpkg.json | 16 ++ ports/boost-array/CONTROL | 6 - ports/boost-array/vcpkg.json | 15 ++ ports/boost-asio/CONTROL | 8 - ports/boost-asio/vcpkg.json | 32 +++ ports/boost-assert/CONTROL | 6 - ports/boost-assert/vcpkg.json | 10 + ports/boost-assign/CONTROL | 6 - ports/boost-assign/vcpkg.json | 22 ++ ports/boost-atomic/CONTROL | 6 - ports/boost-atomic/vcpkg.json | 20 ++ ports/boost-beast/CONTROL | 7 - ports/boost-beast/vcpkg.json | 31 +++ ports/boost-bimap/CONTROL | 6 - ports/boost-bimap/vcpkg.json | 25 +++ ports/boost-bind/CONTROL | 6 - ports/boost-bind/vcpkg.json | 12 ++ ports/boost-build/CONTROL | 6 - ports/boost-build/vcpkg.json | 10 + ports/boost-callable-traits/CONTROL | 6 - ports/boost-callable-traits/vcpkg.json | 9 + ports/boost-chrono/CONTROL | 6 - ports/boost-chrono/vcpkg.json | 26 +++ ports/boost-circular-buffer/CONTROL | 6 - ports/boost-circular-buffer/vcpkg.json | 18 ++ ports/boost-compatibility/CONTROL | 6 - ports/boost-compatibility/vcpkg.json | 9 + ports/boost-compute/CONTROL | 6 - ports/boost-compute/vcpkg.json | 40 ++++ ports/boost-concept-check/CONTROL | 6 - ports/boost-concept-check/vcpkg.json | 13 ++ ports/boost-config/CONTROL | 6 - ports/boost-config/vcpkg.json | 10 + ports/boost-container-hash/CONTROL | 6 - ports/boost-container-hash/vcpkg.json | 17 ++ ports/boost-container/CONTROL | 6 - ports/boost-container/vcpkg.json | 20 ++ ports/boost-context/CONTROL | 7 - ports/boost-context/vcpkg.json | 21 ++ ports/boost-contract/CONTROL | 6 - ports/boost-contract/vcpkg.json | 28 +++ ports/boost-conversion/CONTROL | 6 - ports/boost-conversion/vcpkg.json | 17 ++ ports/boost-convert/CONTROL | 6 - ports/boost-convert/vcpkg.json | 20 ++ ports/boost-core/CONTROL | 6 - ports/boost-core/vcpkg.json | 10 + ports/boost-coroutine/CONTROL | 7 - ports/boost-coroutine/vcpkg.json | 28 +++ ports/boost-coroutine2/CONTROL | 7 - ports/boost-coroutine2/vcpkg.json | 17 ++ ports/boost-crc/CONTROL | 6 - ports/boost-crc/vcpkg.json | 14 ++ ports/boost-date-time/CONTROL | 6 - ports/boost-date-time/vcpkg.json | 30 +++ ports/boost-detail/CONTROL | 6 - ports/boost-detail/vcpkg.json | 12 ++ ports/boost-di/CONTROL | 4 - ports/boost-di/vcpkg.json | 6 + ports/boost-dll/CONTROL | 6 - ports/boost-dll/vcpkg.json | 28 +++ ports/boost-dynamic-bitset/CONTROL | 6 - ports/boost-dynamic-bitset/vcpkg.json | 10 + ports/boost-endian/CONTROL | 6 - ports/boost-endian/vcpkg.json | 14 ++ ports/boost-exception/CONTROL | 6 - ports/boost-exception/vcpkg.json | 17 ++ ports/boost-fiber/CONTROL | 7 - ports/boost-fiber/vcpkg.json | 29 +++ ports/boost-filesystem/CONTROL | 7 - ports/boost-filesystem/vcpkg.json | 25 +++ ports/boost-flyweight/CONTROL | 6 - ports/boost-flyweight/vcpkg.json | 23 +++ ports/boost-foreach/CONTROL | 6 - ports/boost-foreach/vcpkg.json | 17 ++ ports/boost-format/CONTROL | 6 - ports/boost-format/vcpkg.json | 18 ++ ports/boost-function-types/CONTROL | 6 - ports/boost-function-types/vcpkg.json | 15 ++ ports/boost-function/CONTROL | 6 - ports/boost-function/vcpkg.json | 19 ++ ports/boost-functional/CONTROL | 6 - ports/boost-functional/vcpkg.json | 16 ++ ports/boost-fusion/CONTROL | 6 - ports/boost-fusion/vcpkg.json | 21 ++ ports/boost-geometry/CONTROL | 6 - ports/boost-geometry/vcpkg.json | 40 ++++ ports/boost-gil/CONTROL | 6 - ports/boost-gil/vcpkg.json | 24 +++ ports/boost-graph-parallel/CONTROL | 6 - ports/boost-graph-parallel/vcpkg.json | 37 ++++ ports/boost-graph/CONTROL | 6 - ports/boost-graph/vcpkg.json | 57 ++++++ ports/boost-hana/CONTROL | 6 - ports/boost-hana/vcpkg.json | 14 ++ ports/boost-heap/CONTROL | 6 - ports/boost-heap/vcpkg.json | 21 ++ ports/boost-histogram/CONTROL | 6 - ports/boost-histogram/vcpkg.json | 15 ++ ports/boost-hof/CONTROL | 6 - ports/boost-hof/vcpkg.json | 9 + ports/boost-icl/CONTROL | 6 - ports/boost-icl/vcpkg.json | 23 +++ ports/boost-integer/CONTROL | 6 - ports/boost-integer/vcpkg.json | 16 ++ ports/boost-interprocess/CONTROL | 6 - ports/boost-interprocess/vcpkg.json | 24 +++ ports/boost-interval/CONTROL | 6 - ports/boost-interval/vcpkg.json | 13 ++ ports/boost-intrusive/CONTROL | 6 - ports/boost-intrusive/vcpkg.json | 16 ++ ports/boost-io/CONTROL | 6 - ports/boost-io/vcpkg.json | 10 + ports/boost-iostreams/CONTROL | 7 - ports/boost-iostreams/vcpkg.json | 32 +++ ports/boost-iterator/CONTROL | 6 - ports/boost-iterator/vcpkg.json | 24 +++ ports/boost-json/CONTROL | 6 - ports/boost-json/vcpkg.json | 17 ++ ports/boost-lambda/CONTROL | 6 - ports/boost-lambda/vcpkg.json | 15 ++ ports/boost-leaf/CONTROL | 6 - ports/boost-leaf/vcpkg.json | 9 + ports/boost-lexical-cast/CONTROL | 6 - ports/boost-lexical-cast/vcpkg.json | 22 ++ ports/boost-local-function/CONTROL | 6 - ports/boost-local-function/vcpkg.json | 16 ++ ports/boost-locale/CONTROL | 11 - ports/boost-locale/vcpkg.json | 35 ++++ ports/boost-lockfree/CONTROL | 6 - ports/boost-lockfree/vcpkg.json | 23 +++ ports/boost-log/CONTROL | 7 - ports/boost-log/vcpkg.json | 68 +++++++ ports/boost-logic/CONTROL | 6 - ports/boost-logic/vcpkg.json | 12 ++ ports/boost-math/CONTROL | 6 - ports/boost-math/vcpkg.json | 34 ++++ ports/boost-metaparse/CONTROL | 6 - ports/boost-metaparse/vcpkg.json | 15 ++ ports/boost-modular-build-helper/CONTROL | 4 - ports/boost-modular-build-helper/vcpkg.json | 8 + ports/boost-move/CONTROL | 6 - ports/boost-move/vcpkg.json | 16 ++ ports/boost-mp11/CONTROL | 6 - ports/boost-mp11/vcpkg.json | 9 + ports/boost-mpi/CONTROL | 6 - ports/boost-mpi/vcpkg.json | 35 ++++ ports/boost-mpl/CONTROL | 6 - ports/boost-mpl/vcpkg.json | 16 ++ ports/boost-msm/CONTROL | 6 - ports/boost-msm/vcpkg.json | 27 +++ ports/boost-multi-array/CONTROL | 6 - ports/boost-multi-array/vcpkg.json | 11 + ports/boost-multi-index/CONTROL | 6 - ports/boost-multi-index/vcpkg.json | 29 +++ ports/boost-multiprecision/CONTROL | 6 - ports/boost-multiprecision/vcpkg.json | 26 +++ ports/boost-nowide/CONTROL | 6 - ports/boost-nowide/vcpkg.json | 16 ++ ports/boost-numeric-conversion/CONTROL | 6 - ports/boost-numeric-conversion/vcpkg.json | 17 ++ ports/boost-odeint/CONTROL | 6 - ports/boost-odeint/vcpkg.json | 28 +++ ports/boost-optional/CONTROL | 6 - ports/boost-optional/vcpkg.json | 19 ++ ports/boost-outcome/CONTROL | 6 - ports/boost-outcome/vcpkg.json | 11 + ports/boost-parameter-python/CONTROL | 7 - ports/boost-parameter-python/vcpkg.json | 17 ++ ports/boost-parameter/CONTROL | 6 - ports/boost-parameter/vcpkg.json | 19 ++ ports/boost-pfr/CONTROL | 6 - ports/boost-pfr/vcpkg.json | 9 + ports/boost-phoenix/CONTROL | 6 - ports/boost-phoenix/vcpkg.json | 24 +++ ports/boost-poly-collection/CONTROL | 6 - ports/boost-poly-collection/vcpkg.json | 18 ++ ports/boost-polygon/CONTROL | 6 - ports/boost-polygon/vcpkg.json | 11 + ports/boost-pool/CONTROL | 6 - ports/boost-pool/vcpkg.json | 17 ++ ports/boost-predef/CONTROL | 6 - ports/boost-predef/vcpkg.json | 9 + ports/boost-preprocessor/CONTROL | 6 - ports/boost-preprocessor/vcpkg.json | 9 + ports/boost-process/CONTROL | 7 - ports/boost-process/vcpkg.json | 29 +++ ports/boost-program-options/CONTROL | 6 - ports/boost-program-options/vcpkg.json | 26 +++ ports/boost-property-map/CONTROL | 6 - ports/boost-property-map/vcpkg.json | 29 +++ ports/boost-property-tree/CONTROL | 6 - ports/boost-property-tree/vcpkg.json | 26 +++ ports/boost-proto/CONTROL | 6 - ports/boost-proto/vcpkg.json | 20 ++ ports/boost-ptr-container/CONTROL | 6 - ports/boost-ptr-container/vcpkg.json | 23 +++ ports/boost-python/CONTROL | 12 -- ports/boost-python/vcpkg.json | 45 +++++ ports/boost-qvm/CONTROL | 6 - ports/boost-qvm/vcpkg.json | 14 ++ ports/boost-random/CONTROL | 6 - ports/boost-random/vcpkg.json | 27 +++ ports/boost-range/CONTROL | 6 - ports/boost-range/vcpkg.json | 28 +++ ports/boost-ratio/CONTROL | 6 - ports/boost-ratio/vcpkg.json | 16 ++ ports/boost-rational/CONTROL | 6 - ports/boost-rational/vcpkg.json | 16 ++ ports/boost-regex/CONTROL | 10 - ports/boost-regex/vcpkg.json | 35 ++++ ports/boost-safe-numerics/CONTROL | 6 - ports/boost-safe-numerics/vcpkg.json | 15 ++ ports/boost-scope-exit/CONTROL | 6 - ports/boost-scope-exit/vcpkg.json | 15 ++ ports/boost-serialization/CONTROL | 6 - ports/boost-serialization/vcpkg.json | 33 +++ ports/boost-signals2/CONTROL | 6 - ports/boost-signals2/vcpkg.json | 27 +++ ports/boost-smart-ptr/CONTROL | 6 - ports/boost-smart-ptr/vcpkg.json | 17 ++ ports/boost-sort/CONTROL | 6 - ports/boost-sort/vcpkg.json | 14 ++ ports/boost-spirit/CONTROL | 6 - ports/boost-spirit/vcpkg.json | 42 ++++ ports/boost-stacktrace/CONTROL | 7 - ports/boost-stacktrace/vcpkg.json | 20 ++ ports/boost-statechart/CONTROL | 6 - ports/boost-statechart/vcpkg.json | 21 ++ ports/boost-static-assert/CONTROL | 6 - ports/boost-static-assert/vcpkg.json | 11 + ports/boost-static-string/CONTROL | 6 - ports/boost-static-string/vcpkg.json | 14 ++ ports/boost-stl-interfaces/CONTROL | 6 - ports/boost-stl-interfaces/vcpkg.json | 11 + ports/boost-system/CONTROL | 6 - ports/boost-system/vcpkg.json | 14 ++ ports/boost-test/CONTROL | 7 - ports/boost-test/vcpkg.json | 32 +++ ports/boost-thread/CONTROL | 6 - ports/boost-thread/vcpkg.json | 42 ++++ ports/boost-throw-exception/CONTROL | 6 - ports/boost-throw-exception/vcpkg.json | 11 + ports/boost-timer/CONTROL | 6 - ports/boost-timer/vcpkg.json | 20 ++ ports/boost-tokenizer/CONTROL | 6 - ports/boost-tokenizer/vcpkg.json | 16 ++ ports/boost-tti/CONTROL | 6 - ports/boost-tti/vcpkg.json | 15 ++ ports/boost-tuple/CONTROL | 6 - ports/boost-tuple/vcpkg.json | 14 ++ ports/boost-type-erasure/CONTROL | 6 - ports/boost-type-erasure/vcpkg.json | 26 +++ ports/boost-type-index/CONTROL | 6 - ports/boost-type-index/vcpkg.json | 17 ++ ports/boost-type-traits/CONTROL | 6 - ports/boost-type-traits/vcpkg.json | 12 ++ ports/boost-typeof/CONTROL | 6 - ports/boost-typeof/vcpkg.json | 12 ++ ports/boost-ublas/CONTROL | 6 - ports/boost-ublas/vcpkg.json | 22 ++ ports/boost-uninstall/CONTROL | 4 - ports/boost-uninstall/vcpkg.json | 6 + ports/boost-units/CONTROL | 6 - ports/boost-units/vcpkg.json | 23 +++ ports/boost-unordered/CONTROL | 6 - ports/boost-unordered/vcpkg.json | 25 +++ ports/boost-utility/CONTROL | 6 - ports/boost-utility/vcpkg.json | 18 ++ ports/boost-uuid/CONTROL | 6 - ports/boost-uuid/vcpkg.json | 27 +++ ports/boost-variant/CONTROL | 6 - ports/boost-variant/vcpkg.json | 24 +++ ports/boost-variant2/CONTROL | 6 - ports/boost-variant2/vcpkg.json | 13 ++ ports/boost-vcpkg-helpers/CONTROL | 5 - ports/boost-vcpkg-helpers/vcpkg.json | 9 + ports/boost-vmd/CONTROL | 6 - ports/boost-vmd/vcpkg.json | 10 + ports/boost-wave/CONTROL | 7 - ports/boost-wave/vcpkg.json | 36 ++++ ports/boost-winapi/CONTROL | 6 - ports/boost-winapi/vcpkg.json | 11 + ports/boost-xpressive/CONTROL | 6 - ports/boost-xpressive/vcpkg.json | 34 ++++ ports/boost-yap/CONTROL | 6 - ports/boost-yap/vcpkg.json | 12 ++ ports/boost/CONTROL | 11 - ports/boost/vcpkg.json | 210 ++++++++++++++++++++ ports/caf/CONTROL | 6 - ports/caf/vcpkg.json | 10 + ports/clapack/CONTROL | 6 - ports/clapack/vcpkg.json | 10 + ports/google-cloud-cpp/CONTROL | 6 - ports/google-cloud-cpp/vcpkg.json | 19 ++ ports/grpc/CONTROL | 9 - ports/grpc/vcpkg.json | 24 +++ ports/nettle/CONTROL | 5 - ports/nettle/vcpkg.json | 17 ++ ports/proj4/CONTROL | 18 -- ports/proj4/vcpkg.json | 42 ++++ ports/protobuf/CONTROL | 9 - ports/protobuf/vcpkg.json | 15 ++ ports/qt5-base/CONTROL | 13 -- ports/qt5-base/vcpkg.json | 44 ++++ scripts/boost/generate-ports.ps1 | 154 +++++++------- 315 files changed, 3487 insertions(+), 1063 deletions(-) delete mode 100644 ports/ampl-mp/CONTROL create mode 100644 ports/ampl-mp/vcpkg.json delete mode 100644 ports/boost-accumulators/CONTROL create mode 100644 ports/boost-accumulators/vcpkg.json delete mode 100644 ports/boost-algorithm/CONTROL create mode 100644 ports/boost-algorithm/vcpkg.json delete mode 100644 ports/boost-align/CONTROL create mode 100644 ports/boost-align/vcpkg.json delete mode 100644 ports/boost-any/CONTROL create mode 100644 ports/boost-any/vcpkg.json delete mode 100644 ports/boost-array/CONTROL create mode 100644 ports/boost-array/vcpkg.json delete mode 100644 ports/boost-asio/CONTROL create mode 100644 ports/boost-asio/vcpkg.json delete mode 100644 ports/boost-assert/CONTROL create mode 100644 ports/boost-assert/vcpkg.json delete mode 100644 ports/boost-assign/CONTROL create mode 100644 ports/boost-assign/vcpkg.json delete mode 100644 ports/boost-atomic/CONTROL create mode 100644 ports/boost-atomic/vcpkg.json delete mode 100644 ports/boost-beast/CONTROL create mode 100644 ports/boost-beast/vcpkg.json delete mode 100644 ports/boost-bimap/CONTROL create mode 100644 ports/boost-bimap/vcpkg.json delete mode 100644 ports/boost-bind/CONTROL create mode 100644 ports/boost-bind/vcpkg.json delete mode 100644 ports/boost-build/CONTROL create mode 100644 ports/boost-build/vcpkg.json delete mode 100644 ports/boost-callable-traits/CONTROL create mode 100644 ports/boost-callable-traits/vcpkg.json delete mode 100644 ports/boost-chrono/CONTROL create mode 100644 ports/boost-chrono/vcpkg.json delete mode 100644 ports/boost-circular-buffer/CONTROL create mode 100644 ports/boost-circular-buffer/vcpkg.json delete mode 100644 ports/boost-compatibility/CONTROL create mode 100644 ports/boost-compatibility/vcpkg.json delete mode 100644 ports/boost-compute/CONTROL create mode 100644 ports/boost-compute/vcpkg.json delete mode 100644 ports/boost-concept-check/CONTROL create mode 100644 ports/boost-concept-check/vcpkg.json delete mode 100644 ports/boost-config/CONTROL create mode 100644 ports/boost-config/vcpkg.json delete mode 100644 ports/boost-container-hash/CONTROL create mode 100644 ports/boost-container-hash/vcpkg.json delete mode 100644 ports/boost-container/CONTROL create mode 100644 ports/boost-container/vcpkg.json delete mode 100644 ports/boost-context/CONTROL create mode 100644 ports/boost-context/vcpkg.json delete mode 100644 ports/boost-contract/CONTROL create mode 100644 ports/boost-contract/vcpkg.json delete mode 100644 ports/boost-conversion/CONTROL create mode 100644 ports/boost-conversion/vcpkg.json delete mode 100644 ports/boost-convert/CONTROL create mode 100644 ports/boost-convert/vcpkg.json delete mode 100644 ports/boost-core/CONTROL create mode 100644 ports/boost-core/vcpkg.json delete mode 100644 ports/boost-coroutine/CONTROL create mode 100644 ports/boost-coroutine/vcpkg.json delete mode 100644 ports/boost-coroutine2/CONTROL create mode 100644 ports/boost-coroutine2/vcpkg.json delete mode 100644 ports/boost-crc/CONTROL create mode 100644 ports/boost-crc/vcpkg.json delete mode 100644 ports/boost-date-time/CONTROL create mode 100644 ports/boost-date-time/vcpkg.json delete mode 100644 ports/boost-detail/CONTROL create mode 100644 ports/boost-detail/vcpkg.json delete mode 100644 ports/boost-di/CONTROL create mode 100644 ports/boost-di/vcpkg.json delete mode 100644 ports/boost-dll/CONTROL create mode 100644 ports/boost-dll/vcpkg.json delete mode 100644 ports/boost-dynamic-bitset/CONTROL create mode 100644 ports/boost-dynamic-bitset/vcpkg.json delete mode 100644 ports/boost-endian/CONTROL create mode 100644 ports/boost-endian/vcpkg.json delete mode 100644 ports/boost-exception/CONTROL create mode 100644 ports/boost-exception/vcpkg.json delete mode 100644 ports/boost-fiber/CONTROL create mode 100644 ports/boost-fiber/vcpkg.json delete mode 100644 ports/boost-filesystem/CONTROL create mode 100644 ports/boost-filesystem/vcpkg.json delete mode 100644 ports/boost-flyweight/CONTROL create mode 100644 ports/boost-flyweight/vcpkg.json delete mode 100644 ports/boost-foreach/CONTROL create mode 100644 ports/boost-foreach/vcpkg.json delete mode 100644 ports/boost-format/CONTROL create mode 100644 ports/boost-format/vcpkg.json delete mode 100644 ports/boost-function-types/CONTROL create mode 100644 ports/boost-function-types/vcpkg.json delete mode 100644 ports/boost-function/CONTROL create mode 100644 ports/boost-function/vcpkg.json delete mode 100644 ports/boost-functional/CONTROL create mode 100644 ports/boost-functional/vcpkg.json delete mode 100644 ports/boost-fusion/CONTROL create mode 100644 ports/boost-fusion/vcpkg.json delete mode 100644 ports/boost-geometry/CONTROL create mode 100644 ports/boost-geometry/vcpkg.json delete mode 100644 ports/boost-gil/CONTROL create mode 100644 ports/boost-gil/vcpkg.json delete mode 100644 ports/boost-graph-parallel/CONTROL create mode 100644 ports/boost-graph-parallel/vcpkg.json delete mode 100644 ports/boost-graph/CONTROL create mode 100644 ports/boost-graph/vcpkg.json delete mode 100644 ports/boost-hana/CONTROL create mode 100644 ports/boost-hana/vcpkg.json delete mode 100644 ports/boost-heap/CONTROL create mode 100644 ports/boost-heap/vcpkg.json delete mode 100644 ports/boost-histogram/CONTROL create mode 100644 ports/boost-histogram/vcpkg.json delete mode 100644 ports/boost-hof/CONTROL create mode 100644 ports/boost-hof/vcpkg.json delete mode 100644 ports/boost-icl/CONTROL create mode 100644 ports/boost-icl/vcpkg.json delete mode 100644 ports/boost-integer/CONTROL create mode 100644 ports/boost-integer/vcpkg.json delete mode 100644 ports/boost-interprocess/CONTROL create mode 100644 ports/boost-interprocess/vcpkg.json delete mode 100644 ports/boost-interval/CONTROL create mode 100644 ports/boost-interval/vcpkg.json delete mode 100644 ports/boost-intrusive/CONTROL create mode 100644 ports/boost-intrusive/vcpkg.json delete mode 100644 ports/boost-io/CONTROL create mode 100644 ports/boost-io/vcpkg.json delete mode 100644 ports/boost-iostreams/CONTROL create mode 100644 ports/boost-iostreams/vcpkg.json delete mode 100644 ports/boost-iterator/CONTROL create mode 100644 ports/boost-iterator/vcpkg.json delete mode 100644 ports/boost-json/CONTROL create mode 100644 ports/boost-json/vcpkg.json delete mode 100644 ports/boost-lambda/CONTROL create mode 100644 ports/boost-lambda/vcpkg.json delete mode 100644 ports/boost-leaf/CONTROL create mode 100644 ports/boost-leaf/vcpkg.json delete mode 100644 ports/boost-lexical-cast/CONTROL create mode 100644 ports/boost-lexical-cast/vcpkg.json delete mode 100644 ports/boost-local-function/CONTROL create mode 100644 ports/boost-local-function/vcpkg.json delete mode 100644 ports/boost-locale/CONTROL create mode 100644 ports/boost-locale/vcpkg.json delete mode 100644 ports/boost-lockfree/CONTROL create mode 100644 ports/boost-lockfree/vcpkg.json delete mode 100644 ports/boost-log/CONTROL create mode 100644 ports/boost-log/vcpkg.json delete mode 100644 ports/boost-logic/CONTROL create mode 100644 ports/boost-logic/vcpkg.json delete mode 100644 ports/boost-math/CONTROL create mode 100644 ports/boost-math/vcpkg.json delete mode 100644 ports/boost-metaparse/CONTROL create mode 100644 ports/boost-metaparse/vcpkg.json delete mode 100644 ports/boost-modular-build-helper/CONTROL create mode 100644 ports/boost-modular-build-helper/vcpkg.json delete mode 100644 ports/boost-move/CONTROL create mode 100644 ports/boost-move/vcpkg.json delete mode 100644 ports/boost-mp11/CONTROL create mode 100644 ports/boost-mp11/vcpkg.json delete mode 100644 ports/boost-mpi/CONTROL create mode 100644 ports/boost-mpi/vcpkg.json delete mode 100644 ports/boost-mpl/CONTROL create mode 100644 ports/boost-mpl/vcpkg.json delete mode 100644 ports/boost-msm/CONTROL create mode 100644 ports/boost-msm/vcpkg.json delete mode 100644 ports/boost-multi-array/CONTROL create mode 100644 ports/boost-multi-array/vcpkg.json delete mode 100644 ports/boost-multi-index/CONTROL create mode 100644 ports/boost-multi-index/vcpkg.json delete mode 100644 ports/boost-multiprecision/CONTROL create mode 100644 ports/boost-multiprecision/vcpkg.json delete mode 100644 ports/boost-nowide/CONTROL create mode 100644 ports/boost-nowide/vcpkg.json delete mode 100644 ports/boost-numeric-conversion/CONTROL create mode 100644 ports/boost-numeric-conversion/vcpkg.json delete mode 100644 ports/boost-odeint/CONTROL create mode 100644 ports/boost-odeint/vcpkg.json delete mode 100644 ports/boost-optional/CONTROL create mode 100644 ports/boost-optional/vcpkg.json delete mode 100644 ports/boost-outcome/CONTROL create mode 100644 ports/boost-outcome/vcpkg.json delete mode 100644 ports/boost-parameter-python/CONTROL create mode 100644 ports/boost-parameter-python/vcpkg.json delete mode 100644 ports/boost-parameter/CONTROL create mode 100644 ports/boost-parameter/vcpkg.json delete mode 100644 ports/boost-pfr/CONTROL create mode 100644 ports/boost-pfr/vcpkg.json delete mode 100644 ports/boost-phoenix/CONTROL create mode 100644 ports/boost-phoenix/vcpkg.json delete mode 100644 ports/boost-poly-collection/CONTROL create mode 100644 ports/boost-poly-collection/vcpkg.json delete mode 100644 ports/boost-polygon/CONTROL create mode 100644 ports/boost-polygon/vcpkg.json delete mode 100644 ports/boost-pool/CONTROL create mode 100644 ports/boost-pool/vcpkg.json delete mode 100644 ports/boost-predef/CONTROL create mode 100644 ports/boost-predef/vcpkg.json delete mode 100644 ports/boost-preprocessor/CONTROL create mode 100644 ports/boost-preprocessor/vcpkg.json delete mode 100644 ports/boost-process/CONTROL create mode 100644 ports/boost-process/vcpkg.json delete mode 100644 ports/boost-program-options/CONTROL create mode 100644 ports/boost-program-options/vcpkg.json delete mode 100644 ports/boost-property-map/CONTROL create mode 100644 ports/boost-property-map/vcpkg.json delete mode 100644 ports/boost-property-tree/CONTROL create mode 100644 ports/boost-property-tree/vcpkg.json delete mode 100644 ports/boost-proto/CONTROL create mode 100644 ports/boost-proto/vcpkg.json delete mode 100644 ports/boost-ptr-container/CONTROL create mode 100644 ports/boost-ptr-container/vcpkg.json delete mode 100644 ports/boost-python/CONTROL create mode 100644 ports/boost-python/vcpkg.json delete mode 100644 ports/boost-qvm/CONTROL create mode 100644 ports/boost-qvm/vcpkg.json delete mode 100644 ports/boost-random/CONTROL create mode 100644 ports/boost-random/vcpkg.json delete mode 100644 ports/boost-range/CONTROL create mode 100644 ports/boost-range/vcpkg.json delete mode 100644 ports/boost-ratio/CONTROL create mode 100644 ports/boost-ratio/vcpkg.json delete mode 100644 ports/boost-rational/CONTROL create mode 100644 ports/boost-rational/vcpkg.json delete mode 100644 ports/boost-regex/CONTROL create mode 100644 ports/boost-regex/vcpkg.json delete mode 100644 ports/boost-safe-numerics/CONTROL create mode 100644 ports/boost-safe-numerics/vcpkg.json delete mode 100644 ports/boost-scope-exit/CONTROL create mode 100644 ports/boost-scope-exit/vcpkg.json delete mode 100644 ports/boost-serialization/CONTROL create mode 100644 ports/boost-serialization/vcpkg.json delete mode 100644 ports/boost-signals2/CONTROL create mode 100644 ports/boost-signals2/vcpkg.json delete mode 100644 ports/boost-smart-ptr/CONTROL create mode 100644 ports/boost-smart-ptr/vcpkg.json delete mode 100644 ports/boost-sort/CONTROL create mode 100644 ports/boost-sort/vcpkg.json delete mode 100644 ports/boost-spirit/CONTROL create mode 100644 ports/boost-spirit/vcpkg.json delete mode 100644 ports/boost-stacktrace/CONTROL create mode 100644 ports/boost-stacktrace/vcpkg.json delete mode 100644 ports/boost-statechart/CONTROL create mode 100644 ports/boost-statechart/vcpkg.json delete mode 100644 ports/boost-static-assert/CONTROL create mode 100644 ports/boost-static-assert/vcpkg.json delete mode 100644 ports/boost-static-string/CONTROL create mode 100644 ports/boost-static-string/vcpkg.json delete mode 100644 ports/boost-stl-interfaces/CONTROL create mode 100644 ports/boost-stl-interfaces/vcpkg.json delete mode 100644 ports/boost-system/CONTROL create mode 100644 ports/boost-system/vcpkg.json delete mode 100644 ports/boost-test/CONTROL create mode 100644 ports/boost-test/vcpkg.json delete mode 100644 ports/boost-thread/CONTROL create mode 100644 ports/boost-thread/vcpkg.json delete mode 100644 ports/boost-throw-exception/CONTROL create mode 100644 ports/boost-throw-exception/vcpkg.json delete mode 100644 ports/boost-timer/CONTROL create mode 100644 ports/boost-timer/vcpkg.json delete mode 100644 ports/boost-tokenizer/CONTROL create mode 100644 ports/boost-tokenizer/vcpkg.json delete mode 100644 ports/boost-tti/CONTROL create mode 100644 ports/boost-tti/vcpkg.json delete mode 100644 ports/boost-tuple/CONTROL create mode 100644 ports/boost-tuple/vcpkg.json delete mode 100644 ports/boost-type-erasure/CONTROL create mode 100644 ports/boost-type-erasure/vcpkg.json delete mode 100644 ports/boost-type-index/CONTROL create mode 100644 ports/boost-type-index/vcpkg.json delete mode 100644 ports/boost-type-traits/CONTROL create mode 100644 ports/boost-type-traits/vcpkg.json delete mode 100644 ports/boost-typeof/CONTROL create mode 100644 ports/boost-typeof/vcpkg.json delete mode 100644 ports/boost-ublas/CONTROL create mode 100644 ports/boost-ublas/vcpkg.json delete mode 100644 ports/boost-uninstall/CONTROL create mode 100644 ports/boost-uninstall/vcpkg.json delete mode 100644 ports/boost-units/CONTROL create mode 100644 ports/boost-units/vcpkg.json delete mode 100644 ports/boost-unordered/CONTROL create mode 100644 ports/boost-unordered/vcpkg.json delete mode 100644 ports/boost-utility/CONTROL create mode 100644 ports/boost-utility/vcpkg.json delete mode 100644 ports/boost-uuid/CONTROL create mode 100644 ports/boost-uuid/vcpkg.json delete mode 100644 ports/boost-variant/CONTROL create mode 100644 ports/boost-variant/vcpkg.json delete mode 100644 ports/boost-variant2/CONTROL create mode 100644 ports/boost-variant2/vcpkg.json delete mode 100644 ports/boost-vcpkg-helpers/CONTROL create mode 100644 ports/boost-vcpkg-helpers/vcpkg.json delete mode 100644 ports/boost-vmd/CONTROL create mode 100644 ports/boost-vmd/vcpkg.json delete mode 100644 ports/boost-wave/CONTROL create mode 100644 ports/boost-wave/vcpkg.json delete mode 100644 ports/boost-winapi/CONTROL create mode 100644 ports/boost-winapi/vcpkg.json delete mode 100644 ports/boost-xpressive/CONTROL create mode 100644 ports/boost-xpressive/vcpkg.json delete mode 100644 ports/boost-yap/CONTROL create mode 100644 ports/boost-yap/vcpkg.json delete mode 100644 ports/boost/CONTROL create mode 100644 ports/boost/vcpkg.json delete mode 100644 ports/caf/CONTROL create mode 100644 ports/caf/vcpkg.json delete mode 100644 ports/clapack/CONTROL create mode 100644 ports/clapack/vcpkg.json delete mode 100644 ports/google-cloud-cpp/CONTROL create mode 100644 ports/google-cloud-cpp/vcpkg.json delete mode 100644 ports/grpc/CONTROL create mode 100644 ports/grpc/vcpkg.json delete mode 100644 ports/nettle/CONTROL create mode 100644 ports/nettle/vcpkg.json delete mode 100644 ports/proj4/CONTROL create mode 100644 ports/proj4/vcpkg.json delete mode 100644 ports/protobuf/CONTROL create mode 100644 ports/protobuf/vcpkg.json delete mode 100644 ports/qt5-base/CONTROL create mode 100644 ports/qt5-base/vcpkg.json diff --git a/ports/ampl-mp/CONTROL b/ports/ampl-mp/CONTROL deleted file mode 100644 index 6947d21fe49827..00000000000000 --- a/ports/ampl-mp/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: ampl-mp -Version: 2020-11-11 -Homepage: https://github.com/ampl/mp -Description: An open-source library for mathematical programming -Build-Depends: ampl-asl -Supports: !uwp diff --git a/ports/ampl-mp/vcpkg.json b/ports/ampl-mp/vcpkg.json new file mode 100644 index 00000000000000..cd6f91f5525b84 --- /dev/null +++ b/ports/ampl-mp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "ampl-mp", + "version-string": "2020-11-11", + "description": "An open-source library for mathematical programming", + "homepage": "https://github.com/ampl/mp", + "supports": "!uwp", + "dependencies": [ + "ampl-asl" + ] +} diff --git a/ports/boost-accumulators/CONTROL b/ports/boost-accumulators/CONTROL deleted file mode 100644 index a8133bfbbf3779..00000000000000 --- a/ports/boost-accumulators/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-accumulators -Version: 1.75.0 -Build-Depends: boost-array, boost-assert, boost-circular-buffer, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-interval, boost-iterator, boost-mpl, boost-numeric-conversion, boost-odeint, boost-parameter, boost-preprocessor, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-typeof, boost-ublas, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/accumulators -Description: Boost accumulators module diff --git a/ports/boost-accumulators/vcpkg.json b/ports/boost-accumulators/vcpkg.json new file mode 100644 index 00000000000000..a45654ef940d55 --- /dev/null +++ b/ports/boost-accumulators/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "boost-accumulators", + "version-string": "1.75.0", + "description": "Boost accumulators module", + "homepage": "https://github.com/boostorg/accumulators", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-circular-buffer", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-detail", + "boost-fusion", + "boost-interval", + "boost-iterator", + "boost-mpl", + "boost-numeric-conversion", + "boost-odeint", + "boost-parameter", + "boost-preprocessor", + "boost-range", + "boost-serialization", + "boost-static-assert", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-typeof", + "boost-ublas", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-algorithm/CONTROL b/ports/boost-algorithm/CONTROL deleted file mode 100644 index d655bfdeadb0ac..00000000000000 --- a/ports/boost-algorithm/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-algorithm -Version: 1.75.0 -Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-iterator, boost-mpl, boost-range, boost-regex, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/algorithm -Description: Boost algorithm module diff --git a/ports/boost-algorithm/vcpkg.json b/ports/boost-algorithm/vcpkg.json new file mode 100644 index 00000000000000..f324572f0abec1 --- /dev/null +++ b/ports/boost-algorithm/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "boost-algorithm", + "version-string": "1.75.0", + "description": "Boost algorithm module", + "homepage": "https://github.com/boostorg/algorithm", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-bind", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-detail", + "boost-exception", + "boost-function", + "boost-iterator", + "boost-mpl", + "boost-range", + "boost-regex", + "boost-static-assert", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-unordered", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-align/CONTROL b/ports/boost-align/CONTROL deleted file mode 100644 index 88f17f1a4c19f8..00000000000000 --- a/ports/boost-align/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-align -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-static-assert, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/align -Description: Boost align module diff --git a/ports/boost-align/vcpkg.json b/ports/boost-align/vcpkg.json new file mode 100644 index 00000000000000..e1ec625282e39d --- /dev/null +++ b/ports/boost-align/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "boost-align", + "version-string": "1.75.0", + "description": "Boost align module", + "homepage": "https://github.com/boostorg/align", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-static-assert", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-any/CONTROL b/ports/boost-any/CONTROL deleted file mode 100644 index 049889d02dec75..00000000000000 --- a/ports/boost-any/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-any -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/any -Description: Boost any module diff --git a/ports/boost-any/vcpkg.json b/ports/boost-any/vcpkg.json new file mode 100644 index 00000000000000..0360a82dc15486 --- /dev/null +++ b/ports/boost-any/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-any", + "version-string": "1.75.0", + "description": "Boost any module", + "homepage": "https://github.com/boostorg/any", + "dependencies": [ + "boost-config", + "boost-core", + "boost-static-assert", + "boost-throw-exception", + "boost-type-index", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-array/CONTROL b/ports/boost-array/CONTROL deleted file mode 100644 index 705073a66dd0ad..00000000000000 --- a/ports/boost-array/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-array -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/array -Description: Boost array module diff --git a/ports/boost-array/vcpkg.json b/ports/boost-array/vcpkg.json new file mode 100644 index 00000000000000..552296090bbc37 --- /dev/null +++ b/ports/boost-array/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-array", + "version-string": "1.75.0", + "description": "Boost array module", + "homepage": "https://github.com/boostorg/array", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-detail", + "boost-static-assert", + "boost-throw-exception", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-asio/CONTROL b/ports/boost-asio/CONTROL deleted file mode 100644 index ad44a6be7e21f6..00000000000000 --- a/ports/boost-asio/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-asio -Version: 1.75.0 -Port-Version: 1 -Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!arm&!uwp&!emscripten), boost-date-time, boost-detail, boost-function, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, openssl -Homepage: https://github.com/boostorg/asio -Description: Boost asio module -Supports: !emscripten diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json new file mode 100644 index 00000000000000..2c95b02eb78d33 --- /dev/null +++ b/ports/boost-asio/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "boost-asio", + "version-string": "1.75.0", + "port-version": 1, + "description": "Boost asio module", + "homepage": "https://github.com/boostorg/asio", + "supports": "!emscripten", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-bind", + "boost-chrono", + "boost-compatibility", + "boost-config", + { + "name": "boost-coroutine", + "platform": "!arm & !uwp & !emscripten" + }, + "boost-date-time", + "boost-detail", + "boost-function", + "boost-integer", + "boost-regex", + "boost-smart-ptr", + "boost-system", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + "openssl" + ] +} diff --git a/ports/boost-assert/CONTROL b/ports/boost-assert/CONTROL deleted file mode 100644 index 1e8117463330f8..00000000000000 --- a/ports/boost-assert/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-assert -Version: 1.75.0 -Build-Depends: boost-config, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/assert -Description: Boost assert module diff --git a/ports/boost-assert/vcpkg.json b/ports/boost-assert/vcpkg.json new file mode 100644 index 00000000000000..9c038a8bc4fa79 --- /dev/null +++ b/ports/boost-assert/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-assert", + "version-string": "1.75.0", + "description": "Boost assert module", + "homepage": "https://github.com/boostorg/assert", + "dependencies": [ + "boost-config", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-assign/CONTROL b/ports/boost-assign/CONTROL deleted file mode 100644 index f21022ca0aaa40..00000000000000 --- a/ports/boost-assign/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-assign -Version: 1.75.0 -Build-Depends: boost-array, boost-config, boost-detail, boost-move, boost-mpl, boost-preprocessor, boost-ptr-container, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/assign -Description: Boost assign module diff --git a/ports/boost-assign/vcpkg.json b/ports/boost-assign/vcpkg.json new file mode 100644 index 00000000000000..e8a960f18e8181 --- /dev/null +++ b/ports/boost-assign/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "boost-assign", + "version-string": "1.75.0", + "description": "Boost assign module", + "homepage": "https://github.com/boostorg/assign", + "dependencies": [ + "boost-array", + "boost-config", + "boost-detail", + "boost-move", + "boost-mpl", + "boost-preprocessor", + "boost-ptr-container", + "boost-range", + "boost-static-assert", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-atomic/CONTROL b/ports/boost-atomic/CONTROL deleted file mode 100644 index 8313f466031058..00000000000000 --- a/ports/boost-atomic/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-atomic -Version: 1.75.0 -Build-Depends: boost-align, boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi -Homepage: https://github.com/boostorg/atomic -Description: Boost atomic module diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json new file mode 100644 index 00000000000000..a1973a0a14c809 --- /dev/null +++ b/ports/boost-atomic/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "boost-atomic", + "version-string": "1.75.0", + "description": "Boost atomic module", + "homepage": "https://github.com/boostorg/atomic", + "dependencies": [ + "boost-align", + "boost-assert", + "boost-build", + "boost-config", + "boost-integer", + "boost-modular-build-helper", + "boost-predef", + "boost-preprocessor", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/ports/boost-beast/CONTROL b/ports/boost-beast/CONTROL deleted file mode 100644 index 1a12b71f43666e..00000000000000 --- a/ports/boost-beast/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-beast -Version: 1.75.0 -Build-Depends: boost-asio (!emscripten), boost-assert, boost-bind, boost-config, boost-container, boost-core, boost-endian, boost-intrusive, boost-logic, boost-mp11, boost-optional, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi -Homepage: https://github.com/boostorg/beast -Description: Boost beast module -Supports: !emscripten diff --git a/ports/boost-beast/vcpkg.json b/ports/boost-beast/vcpkg.json new file mode 100644 index 00000000000000..d1f0fdf941cb16 --- /dev/null +++ b/ports/boost-beast/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "boost-beast", + "version-string": "1.75.0", + "description": "Boost beast module", + "homepage": "https://github.com/boostorg/beast", + "supports": "!emscripten", + "dependencies": [ + { + "name": "boost-asio", + "platform": "!emscripten" + }, + "boost-assert", + "boost-bind", + "boost-config", + "boost-container", + "boost-core", + "boost-endian", + "boost-intrusive", + "boost-logic", + "boost-mp11", + "boost-optional", + "boost-smart-ptr", + "boost-static-assert", + "boost-system", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/ports/boost-bimap/CONTROL b/ports/boost-bimap/CONTROL deleted file mode 100644 index db0fb09def835a..00000000000000 --- a/ports/boost-bimap/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-bimap -Version: 1.75.0 -Build-Depends: boost-concept-check, boost-config, boost-container-hash, boost-core, boost-functional, boost-iterator, boost-lambda, boost-mpl, boost-multi-index, boost-preprocessor, boost-property-map, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/bimap -Description: Boost bimap module diff --git a/ports/boost-bimap/vcpkg.json b/ports/boost-bimap/vcpkg.json new file mode 100644 index 00000000000000..be69ae87edd2c1 --- /dev/null +++ b/ports/boost-bimap/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "boost-bimap", + "version-string": "1.75.0", + "description": "Boost bimap module", + "homepage": "https://github.com/boostorg/bimap", + "dependencies": [ + "boost-concept-check", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-functional", + "boost-iterator", + "boost-lambda", + "boost-mpl", + "boost-multi-index", + "boost-preprocessor", + "boost-property-map", + "boost-serialization", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-bind/CONTROL b/ports/boost-bind/CONTROL deleted file mode 100644 index e56dc94fc95920..00000000000000 --- a/ports/boost-bind/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-bind -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/bind -Description: Boost bind module diff --git a/ports/boost-bind/vcpkg.json b/ports/boost-bind/vcpkg.json new file mode 100644 index 00000000000000..b6523bb7427cc3 --- /dev/null +++ b/ports/boost-bind/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "boost-bind", + "version-string": "1.75.0", + "description": "Boost bind module", + "homepage": "https://github.com/boostorg/bind", + "dependencies": [ + "boost-config", + "boost-core", + "boost-detail", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL deleted file mode 100644 index 373f9f7e2736a3..00000000000000 --- a/ports/boost-build/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: boost-build -Version: 1.75.0.beta1 -Port-Version: 1 -Homepage: https://github.com/boostorg/build -Description: Boost.Build -Build-Depends: boost-uninstall \ No newline at end of file diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json new file mode 100644 index 00000000000000..ede34295636323 --- /dev/null +++ b/ports/boost-build/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-build", + "version-string": "1.75.0.beta1", + "port-version": 1, + "description": "Boost.Build", + "homepage": "https://github.com/boostorg/build", + "dependencies": [ + "boost-uninstall" + ] +} diff --git a/ports/boost-callable-traits/CONTROL b/ports/boost-callable-traits/CONTROL deleted file mode 100644 index 154f49dd41c65e..00000000000000 --- a/ports/boost-callable-traits/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-callable-traits -Version: 1.75.0 -Build-Depends: boost-vcpkg-helpers -Homepage: https://github.com/boostorg/callable_traits -Description: Boost callable_traits module diff --git a/ports/boost-callable-traits/vcpkg.json b/ports/boost-callable-traits/vcpkg.json new file mode 100644 index 00000000000000..c5021b3ca623b6 --- /dev/null +++ b/ports/boost-callable-traits/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "boost-callable-traits", + "version-string": "1.75.0", + "description": "Boost callable_traits module", + "homepage": "https://github.com/boostorg/callable_traits", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-chrono/CONTROL b/ports/boost-chrono/CONTROL deleted file mode 100644 index 85db73b6743c8b..00000000000000 --- a/ports/boost-chrono/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-chrono -Version: 1.75.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-move, boost-mpl, boost-predef, boost-ratio, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers, boost-winapi -Homepage: https://github.com/boostorg/chrono -Description: Boost chrono module diff --git a/ports/boost-chrono/vcpkg.json b/ports/boost-chrono/vcpkg.json new file mode 100644 index 00000000000000..52463dcb703bcd --- /dev/null +++ b/ports/boost-chrono/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "boost-chrono", + "version-string": "1.75.0", + "description": "Boost chrono module", + "homepage": "https://github.com/boostorg/chrono", + "dependencies": [ + "boost-assert", + "boost-build", + "boost-config", + "boost-detail", + "boost-integer", + "boost-modular-build-helper", + "boost-move", + "boost-mpl", + "boost-predef", + "boost-ratio", + "boost-static-assert", + "boost-system", + "boost-throw-exception", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/ports/boost-circular-buffer/CONTROL b/ports/boost-circular-buffer/CONTROL deleted file mode 100644 index e465a88e111f7d..00000000000000 --- a/ports/boost-circular-buffer/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-circular-buffer -Version: 1.75.0 -Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-move, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/circular_buffer -Description: Boost circular_buffer module diff --git a/ports/boost-circular-buffer/vcpkg.json b/ports/boost-circular-buffer/vcpkg.json new file mode 100644 index 00000000000000..86d9ad60647c5e --- /dev/null +++ b/ports/boost-circular-buffer/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "boost-circular-buffer", + "version-string": "1.75.0", + "description": "Boost circular_buffer module", + "homepage": "https://github.com/boostorg/circular_buffer", + "dependencies": [ + "boost-assert", + "boost-compatibility", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-move", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-compatibility/CONTROL b/ports/boost-compatibility/CONTROL deleted file mode 100644 index 7db50a238e41d1..00000000000000 --- a/ports/boost-compatibility/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-compatibility -Version: 1.75.0 -Build-Depends: boost-vcpkg-helpers -Homepage: https://github.com/boostorg/compatibility -Description: Boost compatibility module diff --git a/ports/boost-compatibility/vcpkg.json b/ports/boost-compatibility/vcpkg.json new file mode 100644 index 00000000000000..1f8d2d19a3d21d --- /dev/null +++ b/ports/boost-compatibility/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "boost-compatibility", + "version-string": "1.75.0", + "description": "Boost compatibility module", + "homepage": "https://github.com/boostorg/compatibility", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-compute/CONTROL b/ports/boost-compute/CONTROL deleted file mode 100644 index 3ba7fa65c29d27..00000000000000 --- a/ports/boost-compute/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-compute -Version: 1.75.0 -Build-Depends: boost-algorithm, boost-array, boost-assert, boost-chrono, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-function-types, boost-fusion, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-preprocessor, boost-property-tree, boost-proto, boost-range, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tuple, boost-type-traits, boost-typeof, boost-utility, boost-uuid, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/compute -Description: Boost compute module diff --git a/ports/boost-compute/vcpkg.json b/ports/boost-compute/vcpkg.json new file mode 100644 index 00000000000000..7ebc60191015e0 --- /dev/null +++ b/ports/boost-compute/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "boost-compute", + "version-string": "1.75.0", + "description": "Boost compute module", + "homepage": "https://github.com/boostorg/compute", + "dependencies": [ + "boost-algorithm", + "boost-array", + "boost-assert", + "boost-chrono", + "boost-config", + "boost-core", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-function", + "boost-function-types", + "boost-fusion", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-mpl", + "boost-optional", + "boost-preprocessor", + "boost-property-tree", + "boost-proto", + "boost-range", + "boost-smart-ptr", + "boost-static-assert", + "boost-thread", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-uuid", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-concept-check/CONTROL b/ports/boost-concept-check/CONTROL deleted file mode 100644 index 3c2878cc47d44c..00000000000000 --- a/ports/boost-concept-check/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-concept-check -Version: 1.75.0 -Build-Depends: boost-config, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/concept_check -Description: Boost concept_check module diff --git a/ports/boost-concept-check/vcpkg.json b/ports/boost-concept-check/vcpkg.json new file mode 100644 index 00000000000000..3b2efd636f6788 --- /dev/null +++ b/ports/boost-concept-check/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "boost-concept-check", + "version-string": "1.75.0", + "description": "Boost concept_check module", + "homepage": "https://github.com/boostorg/concept_check", + "dependencies": [ + "boost-config", + "boost-preprocessor", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-config/CONTROL b/ports/boost-config/CONTROL deleted file mode 100644 index 05872022387386..00000000000000 --- a/ports/boost-config/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-config -Version: 1.75.0 -Build-Depends: boost-compatibility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/config -Description: Boost config module diff --git a/ports/boost-config/vcpkg.json b/ports/boost-config/vcpkg.json new file mode 100644 index 00000000000000..3b4035dc8d550c --- /dev/null +++ b/ports/boost-config/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-config", + "version-string": "1.75.0", + "description": "Boost config module", + "homepage": "https://github.com/boostorg/config", + "dependencies": [ + "boost-compatibility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-container-hash/CONTROL b/ports/boost-container-hash/CONTROL deleted file mode 100644 index 974d546bd33a98..00000000000000 --- a/ports/boost-container-hash/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-container-hash -Version: 1.75.0 -Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/container_hash -Description: Boost container_hash module diff --git a/ports/boost-container-hash/vcpkg.json b/ports/boost-container-hash/vcpkg.json new file mode 100644 index 00000000000000..c2d8bee8920116 --- /dev/null +++ b/ports/boost-container-hash/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-container-hash", + "version-string": "1.75.0", + "description": "Boost container_hash module", + "homepage": "https://github.com/boostorg/container_hash", + "dependencies": [ + "boost-assert", + "boost-compatibility", + "boost-config", + "boost-core", + "boost-detail", + "boost-integer", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-container/CONTROL b/ports/boost-container/CONTROL deleted file mode 100644 index ad0bfc6eee61e4..00000000000000 --- a/ports/boost-container/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-container -Version: 1.75.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-container-hash, boost-core, boost-integer, boost-intrusive, boost-modular-build-helper, boost-move, boost-static-assert, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/container -Description: Boost container module diff --git a/ports/boost-container/vcpkg.json b/ports/boost-container/vcpkg.json new file mode 100644 index 00000000000000..439ea0d6f0b2ae --- /dev/null +++ b/ports/boost-container/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "boost-container", + "version-string": "1.75.0", + "description": "Boost container module", + "homepage": "https://github.com/boostorg/container", + "dependencies": [ + "boost-assert", + "boost-build", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-integer", + "boost-intrusive", + "boost-modular-build-helper", + "boost-move", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-context/CONTROL b/ports/boost-context/CONTROL deleted file mode 100644 index d55f465adc54ff..00000000000000 --- a/ports/boost-context/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-context -Version: 1.75.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-integer, boost-modular-build-helper, boost-pool, boost-predef, boost-smart-ptr, boost-thread, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/context -Description: Boost context module -Supports: !uwp&!emscripten diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json new file mode 100644 index 00000000000000..95ee33e38f8e43 --- /dev/null +++ b/ports/boost-context/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "boost-context", + "version-string": "1.75.0", + "description": "Boost context module", + "homepage": "https://github.com/boostorg/context", + "supports": "!uwp & !emscripten", + "dependencies": [ + "boost-assert", + "boost-build", + "boost-config", + "boost-core", + "boost-detail", + "boost-integer", + "boost-modular-build-helper", + "boost-pool", + "boost-predef", + "boost-smart-ptr", + "boost-thread", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-contract/CONTROL b/ports/boost-contract/CONTROL deleted file mode 100644 index 1c6d642cc8bf11..00000000000000 --- a/ports/boost-contract/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-contract -Version: 1.75.0 -Build-Depends: boost-any, boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-function-types, boost-modular-build-helper, boost-mpl, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-thread, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/contract -Description: Boost contract module diff --git a/ports/boost-contract/vcpkg.json b/ports/boost-contract/vcpkg.json new file mode 100644 index 00000000000000..d95ecdd0829639 --- /dev/null +++ b/ports/boost-contract/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "boost-contract", + "version-string": "1.75.0", + "description": "Boost contract module", + "homepage": "https://github.com/boostorg/contract", + "dependencies": [ + "boost-any", + "boost-assert", + "boost-build", + "boost-config", + "boost-core", + "boost-detail", + "boost-exception", + "boost-function", + "boost-function-types", + "boost-modular-build-helper", + "boost-mpl", + "boost-optional", + "boost-preprocessor", + "boost-smart-ptr", + "boost-static-assert", + "boost-thread", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-conversion/CONTROL b/ports/boost-conversion/CONTROL deleted file mode 100644 index 56f7f533b1f8a3..00000000000000 --- a/ports/boost-conversion/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-conversion -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-smart-ptr, boost-throw-exception, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/conversion -Description: Boost conversion module diff --git a/ports/boost-conversion/vcpkg.json b/ports/boost-conversion/vcpkg.json new file mode 100644 index 00000000000000..da1ac08150a804 --- /dev/null +++ b/ports/boost-conversion/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-conversion", + "version-string": "1.75.0", + "description": "Boost conversion module", + "homepage": "https://github.com/boostorg/conversion", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-smart-ptr", + "boost-throw-exception", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-convert/CONTROL b/ports/boost-convert/CONTROL deleted file mode 100644 index 57069e9cdf9aee..00000000000000 --- a/ports/boost-convert/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-convert -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-function-types, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-parameter, boost-range, boost-spirit, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/convert -Description: Boost convert module diff --git a/ports/boost-convert/vcpkg.json b/ports/boost-convert/vcpkg.json new file mode 100644 index 00000000000000..9a36044b4c1b67 --- /dev/null +++ b/ports/boost-convert/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "boost-convert", + "version-string": "1.75.0", + "description": "Boost convert module", + "homepage": "https://github.com/boostorg/convert", + "dependencies": [ + "boost-config", + "boost-core", + "boost-function-types", + "boost-lexical-cast", + "boost-math", + "boost-mpl", + "boost-optional", + "boost-parameter", + "boost-range", + "boost-spirit", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-core/CONTROL b/ports/boost-core/CONTROL deleted file mode 100644 index 75057985d0d202..00000000000000 --- a/ports/boost-core/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-core -Version: 1.75.0 -Build-Depends: boost-config, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/core -Description: Boost core module diff --git a/ports/boost-core/vcpkg.json b/ports/boost-core/vcpkg.json new file mode 100644 index 00000000000000..6486bb72857267 --- /dev/null +++ b/ports/boost-core/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-core", + "version-string": "1.75.0", + "description": "Boost core module", + "homepage": "https://github.com/boostorg/core", + "dependencies": [ + "boost-config", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-coroutine/CONTROL b/ports/boost-coroutine/CONTROL deleted file mode 100644 index 07a8c000234b0c..00000000000000 --- a/ports/boost-coroutine/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-coroutine -Version: 1.75.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-context (!uwp&!emscripten), boost-core, boost-detail, boost-exception, boost-integer, boost-modular-build-helper, boost-move, boost-system, boost-thread, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/coroutine -Description: Boost coroutine module -Supports: !arm&!uwp&!emscripten diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json new file mode 100644 index 00000000000000..42dde92ab064c8 --- /dev/null +++ b/ports/boost-coroutine/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "boost-coroutine", + "version-string": "1.75.0", + "description": "Boost coroutine module", + "homepage": "https://github.com/boostorg/coroutine", + "supports": "!arm & !uwp & !emscripten", + "dependencies": [ + "boost-assert", + "boost-build", + "boost-config", + { + "name": "boost-context", + "platform": "!uwp & !emscripten" + }, + "boost-core", + "boost-detail", + "boost-exception", + "boost-integer", + "boost-modular-build-helper", + "boost-move", + "boost-system", + "boost-thread", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-coroutine2/CONTROL b/ports/boost-coroutine2/CONTROL deleted file mode 100644 index 1229e6103911a1..00000000000000 --- a/ports/boost-coroutine2/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-coroutine2 -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-context (!uwp&!emscripten), boost-detail, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/coroutine2 -Description: Boost coroutine2 module -Supports: !emscripten diff --git a/ports/boost-coroutine2/vcpkg.json b/ports/boost-coroutine2/vcpkg.json new file mode 100644 index 00000000000000..23262aaad941fa --- /dev/null +++ b/ports/boost-coroutine2/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-coroutine2", + "version-string": "1.75.0", + "description": "Boost coroutine2 module", + "homepage": "https://github.com/boostorg/coroutine2", + "supports": "!emscripten", + "dependencies": [ + "boost-assert", + "boost-config", + { + "name": "boost-context", + "platform": "!uwp & !emscripten" + }, + "boost-detail", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-crc/CONTROL b/ports/boost-crc/CONTROL deleted file mode 100644 index 404b7f0a6a6169..00000000000000 --- a/ports/boost-crc/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-crc -Version: 1.75.0 -Build-Depends: boost-array, boost-compatibility, boost-config, boost-integer, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/crc -Description: Boost crc module diff --git a/ports/boost-crc/vcpkg.json b/ports/boost-crc/vcpkg.json new file mode 100644 index 00000000000000..5bed63a5fc8f98 --- /dev/null +++ b/ports/boost-crc/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-crc", + "version-string": "1.75.0", + "description": "Boost crc module", + "homepage": "https://github.com/boostorg/crc", + "dependencies": [ + "boost-array", + "boost-compatibility", + "boost-config", + "boost-integer", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-date-time/CONTROL b/ports/boost-date-time/CONTROL deleted file mode 100644 index 53ebef2a9f4147..00000000000000 --- a/ports/boost-date-time/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-date-time -Version: 1.75.0 -Build-Depends: boost-algorithm, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-numeric-conversion, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi -Homepage: https://github.com/boostorg/date_time -Description: Boost date_time module diff --git a/ports/boost-date-time/vcpkg.json b/ports/boost-date-time/vcpkg.json new file mode 100644 index 00000000000000..75b83ffabfeda0 --- /dev/null +++ b/ports/boost-date-time/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "boost-date-time", + "version-string": "1.75.0", + "description": "Boost date_time module", + "homepage": "https://github.com/boostorg/date_time", + "dependencies": [ + "boost-algorithm", + "boost-assert", + "boost-build", + "boost-compatibility", + "boost-config", + "boost-core", + "boost-detail", + "boost-integer", + "boost-io", + "boost-lexical-cast", + "boost-math", + "boost-modular-build-helper", + "boost-numeric-conversion", + "boost-range", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-tokenizer", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/ports/boost-detail/CONTROL b/ports/boost-detail/CONTROL deleted file mode 100644 index 6d8c709e5b1a67..00000000000000 --- a/ports/boost-detail/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-detail -Version: 1.75.0 -Build-Depends: boost-compatibility, boost-config, boost-preprocessor, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/detail -Description: Boost detail module diff --git a/ports/boost-detail/vcpkg.json b/ports/boost-detail/vcpkg.json new file mode 100644 index 00000000000000..1b9204c63a8cf4 --- /dev/null +++ b/ports/boost-detail/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "boost-detail", + "version-string": "1.75.0", + "description": "Boost detail module", + "homepage": "https://github.com/boostorg/detail", + "dependencies": [ + "boost-compatibility", + "boost-config", + "boost-preprocessor", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-di/CONTROL b/ports/boost-di/CONTROL deleted file mode 100644 index 938e28bac9b198..00000000000000 --- a/ports/boost-di/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: boost-di -Version: 1.2.0 -Homepage: https://github.com/boost-ext/di -Description: C++14 Dependency Injection Library. diff --git a/ports/boost-di/vcpkg.json b/ports/boost-di/vcpkg.json new file mode 100644 index 00000000000000..d1250851defaed --- /dev/null +++ b/ports/boost-di/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "boost-di", + "version-string": "1.2.0", + "description": "C++14 Dependency Injection Library.", + "homepage": "https://github.com/boost-ext/di" +} diff --git a/ports/boost-dll/CONTROL b/ports/boost-dll/CONTROL deleted file mode 100644 index 399c09a71c27ce..00000000000000 --- a/ports/boost-dll/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-dll -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-move, boost-predef, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-throw-exception, boost-type-index, boost-type-traits, boost-vcpkg-helpers, boost-winapi -Homepage: https://github.com/boostorg/dll -Description: Boost dll module diff --git a/ports/boost-dll/vcpkg.json b/ports/boost-dll/vcpkg.json new file mode 100644 index 00000000000000..623816e38511a5 --- /dev/null +++ b/ports/boost-dll/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "boost-dll", + "version-string": "1.75.0", + "description": "Boost dll module", + "homepage": "https://github.com/boostorg/dll", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-function", + "boost-integer", + "boost-move", + "boost-predef", + "boost-smart-ptr", + "boost-spirit", + "boost-static-assert", + "boost-system", + "boost-throw-exception", + "boost-type-index", + "boost-type-traits", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/ports/boost-dynamic-bitset/CONTROL b/ports/boost-dynamic-bitset/CONTROL deleted file mode 100644 index 0077c213180c29..00000000000000 --- a/ports/boost-dynamic-bitset/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-dynamic-bitset -Version: 1.75.0 -Build-Depends: boost-core, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/dynamic_bitset -Description: Boost dynamic_bitset module diff --git a/ports/boost-dynamic-bitset/vcpkg.json b/ports/boost-dynamic-bitset/vcpkg.json new file mode 100644 index 00000000000000..a98c6d58188025 --- /dev/null +++ b/ports/boost-dynamic-bitset/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-dynamic-bitset", + "version-string": "1.75.0", + "description": "Boost dynamic_bitset module", + "homepage": "https://github.com/boostorg/dynamic_bitset", + "dependencies": [ + "boost-core", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-endian/CONTROL b/ports/boost-endian/CONTROL deleted file mode 100644 index aefeece6151a28..00000000000000 --- a/ports/boost-endian/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-endian -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/endian -Description: Boost endian module diff --git a/ports/boost-endian/vcpkg.json b/ports/boost-endian/vcpkg.json new file mode 100644 index 00000000000000..33e92015997543 --- /dev/null +++ b/ports/boost-endian/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-endian", + "version-string": "1.75.0", + "description": "Boost endian module", + "homepage": "https://github.com/boostorg/endian", + "dependencies": [ + "boost-config", + "boost-core", + "boost-integer", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-exception/CONTROL b/ports/boost-exception/CONTROL deleted file mode 100644 index f44d3ea9704994..00000000000000 --- a/ports/boost-exception/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-exception -Version: 1.75.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-modular-build-helper, boost-smart-ptr, boost-tuple, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/exception -Description: Boost exception module diff --git a/ports/boost-exception/vcpkg.json b/ports/boost-exception/vcpkg.json new file mode 100644 index 00000000000000..8029992c1369c0 --- /dev/null +++ b/ports/boost-exception/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-exception", + "version-string": "1.75.0", + "description": "Boost exception module", + "homepage": "https://github.com/boostorg/exception", + "dependencies": [ + "boost-assert", + "boost-build", + "boost-config", + "boost-core", + "boost-modular-build-helper", + "boost-smart-ptr", + "boost-tuple", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-fiber/CONTROL b/ports/boost-fiber/CONTROL deleted file mode 100644 index 4b0fb7c036662d..00000000000000 --- a/ports/boost-fiber/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-fiber -Version: 1.75.0 -Build-Depends: boost-algorithm, boost-assert, boost-build, boost-config, boost-context (!uwp&!emscripten), boost-core, boost-detail, boost-filesystem (!uwp), boost-format, boost-intrusive, boost-modular-build-helper, boost-predef, boost-smart-ptr, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/fiber -Description: Boost fiber module -Supports: !osx&!uwp&!arm&!emscripten diff --git a/ports/boost-fiber/vcpkg.json b/ports/boost-fiber/vcpkg.json new file mode 100644 index 00000000000000..fe78650705b468 --- /dev/null +++ b/ports/boost-fiber/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "boost-fiber", + "version-string": "1.75.0", + "description": "Boost fiber module", + "homepage": "https://github.com/boostorg/fiber", + "supports": "!osx & !uwp & !arm & !emscripten", + "dependencies": [ + "boost-algorithm", + "boost-assert", + "boost-build", + "boost-config", + { + "name": "boost-context", + "platform": "!uwp & !emscripten" + }, + "boost-core", + "boost-detail", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-format", + "boost-intrusive", + "boost-modular-build-helper", + "boost-predef", + "boost-smart-ptr", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-filesystem/CONTROL b/ports/boost-filesystem/CONTROL deleted file mode 100644 index 898a3fc3ea46a8..00000000000000 --- a/ports/boost-filesystem/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-filesystem -Version: 1.75.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-predef, boost-smart-ptr, boost-system, boost-type-traits, boost-vcpkg-helpers, boost-winapi -Homepage: https://github.com/boostorg/filesystem -Description: Boost filesystem module -Supports: !uwp diff --git a/ports/boost-filesystem/vcpkg.json b/ports/boost-filesystem/vcpkg.json new file mode 100644 index 00000000000000..2e07c445a623dc --- /dev/null +++ b/ports/boost-filesystem/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "boost-filesystem", + "version-string": "1.75.0", + "description": "Boost filesystem module", + "homepage": "https://github.com/boostorg/filesystem", + "supports": "!uwp", + "dependencies": [ + "boost-assert", + "boost-build", + "boost-config", + "boost-core", + "boost-detail", + "boost-functional", + "boost-integer", + "boost-io", + "boost-iterator", + "boost-modular-build-helper", + "boost-predef", + "boost-smart-ptr", + "boost-system", + "boost-type-traits", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/ports/boost-flyweight/CONTROL b/ports/boost-flyweight/CONTROL deleted file mode 100644 index 49d8da34c12347..00000000000000 --- a/ports/boost-flyweight/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-flyweight -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-functional, boost-interprocess, boost-mpl, boost-multi-index, boost-parameter, boost-preprocessor, boost-serialization, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/flyweight -Description: Boost flyweight module diff --git a/ports/boost-flyweight/vcpkg.json b/ports/boost-flyweight/vcpkg.json new file mode 100644 index 00000000000000..afc8d8019abd8b --- /dev/null +++ b/ports/boost-flyweight/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "boost-flyweight", + "version-string": "1.75.0", + "description": "Boost flyweight module", + "homepage": "https://github.com/boostorg/flyweight", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-detail", + "boost-functional", + "boost-interprocess", + "boost-mpl", + "boost-multi-index", + "boost-parameter", + "boost-preprocessor", + "boost-serialization", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-foreach/CONTROL b/ports/boost-foreach/CONTROL deleted file mode 100644 index 7615cdef26e9c4..00000000000000 --- a/ports/boost-foreach/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-foreach -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-detail, boost-iterator, boost-mpl, boost-range, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/foreach -Description: Boost foreach module diff --git a/ports/boost-foreach/vcpkg.json b/ports/boost-foreach/vcpkg.json new file mode 100644 index 00000000000000..fe096e9dd1ef76 --- /dev/null +++ b/ports/boost-foreach/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-foreach", + "version-string": "1.75.0", + "description": "Boost foreach module", + "homepage": "https://github.com/boostorg/foreach", + "dependencies": [ + "boost-config", + "boost-core", + "boost-detail", + "boost-iterator", + "boost-mpl", + "boost-range", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-format/CONTROL b/ports/boost-format/CONTROL deleted file mode 100644 index 1c9bc42447d7d9..00000000000000 --- a/ports/boost-format/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-format -Version: 1.75.0 -Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-optional, boost-smart-ptr, boost-throw-exception, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/format -Description: Boost format module diff --git a/ports/boost-format/vcpkg.json b/ports/boost-format/vcpkg.json new file mode 100644 index 00000000000000..7dbab9f356196b --- /dev/null +++ b/ports/boost-format/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "boost-format", + "version-string": "1.75.0", + "description": "Boost format module", + "homepage": "https://github.com/boostorg/format", + "dependencies": [ + "boost-assert", + "boost-compatibility", + "boost-config", + "boost-core", + "boost-detail", + "boost-optional", + "boost-smart-ptr", + "boost-throw-exception", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-function-types/CONTROL b/ports/boost-function-types/CONTROL deleted file mode 100644 index bfb7804a8d141e..00000000000000 --- a/ports/boost-function-types/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-function-types -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/function_types -Description: Boost function_types module diff --git a/ports/boost-function-types/vcpkg.json b/ports/boost-function-types/vcpkg.json new file mode 100644 index 00000000000000..39362d0fab2a06 --- /dev/null +++ b/ports/boost-function-types/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-function-types", + "version-string": "1.75.0", + "description": "Boost function_types module", + "homepage": "https://github.com/boostorg/function_types", + "dependencies": [ + "boost-config", + "boost-core", + "boost-detail", + "boost-mpl", + "boost-preprocessor", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-function/CONTROL b/ports/boost-function/CONTROL deleted file mode 100644 index 7a53955e33855a..00000000000000 --- a/ports/boost-function/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-function -Version: 1.75.0 -Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-integer, boost-preprocessor, boost-throw-exception, boost-type-index, boost-type-traits, boost-typeof, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/function -Description: Boost function module diff --git a/ports/boost-function/vcpkg.json b/ports/boost-function/vcpkg.json new file mode 100644 index 00000000000000..9f13b38beb3382 --- /dev/null +++ b/ports/boost-function/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "boost-function", + "version-string": "1.75.0", + "description": "Boost function module", + "homepage": "https://github.com/boostorg/function", + "dependencies": [ + "boost-assert", + "boost-bind", + "boost-config", + "boost-core", + "boost-integer", + "boost-preprocessor", + "boost-throw-exception", + "boost-type-index", + "boost-type-traits", + "boost-typeof", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-functional/CONTROL b/ports/boost-functional/CONTROL deleted file mode 100644 index 69ffcaf8466de6..00000000000000 --- a/ports/boost-functional/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-functional -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-mpl, boost-preprocessor, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/functional -Description: Boost functional module diff --git a/ports/boost-functional/vcpkg.json b/ports/boost-functional/vcpkg.json new file mode 100644 index 00000000000000..a20b8c410cd948 --- /dev/null +++ b/ports/boost-functional/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-functional", + "version-string": "1.75.0", + "description": "Boost functional module", + "homepage": "https://github.com/boostorg/functional", + "dependencies": [ + "boost-config", + "boost-core", + "boost-mpl", + "boost-preprocessor", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-fusion/CONTROL b/ports/boost-fusion/CONTROL deleted file mode 100644 index f589908acd890f..00000000000000 --- a/ports/boost-fusion/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-fusion -Version: 1.75.0 -Build-Depends: boost-config, boost-container-hash, boost-core, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-static-assert, boost-tuple, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/fusion -Description: Boost fusion module diff --git a/ports/boost-fusion/vcpkg.json b/ports/boost-fusion/vcpkg.json new file mode 100644 index 00000000000000..ebfa81e5fb09cf --- /dev/null +++ b/ports/boost-fusion/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "boost-fusion", + "version-string": "1.75.0", + "description": "Boost fusion module", + "homepage": "https://github.com/boostorg/fusion", + "dependencies": [ + "boost-config", + "boost-container-hash", + "boost-core", + "boost-detail", + "boost-function-types", + "boost-mpl", + "boost-preprocessor", + "boost-static-assert", + "boost-tuple", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-geometry/CONTROL b/ports/boost-geometry/CONTROL deleted file mode 100644 index d4c9dcc3df8db0..00000000000000 --- a/ports/boost-geometry/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-geometry -Version: 1.75.0 -Build-Depends: boost-algorithm, boost-array, boost-assert, boost-concept-check, boost-config, boost-container, boost-core, boost-function-types, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-move, boost-mpl, boost-multiprecision, boost-numeric-conversion, boost-polygon, boost-qvm, boost-range, boost-rational, boost-serialization, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tokenizer, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/geometry -Description: Boost geometry module diff --git a/ports/boost-geometry/vcpkg.json b/ports/boost-geometry/vcpkg.json new file mode 100644 index 00000000000000..884a4093742f7c --- /dev/null +++ b/ports/boost-geometry/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "boost-geometry", + "version-string": "1.75.0", + "description": "Boost geometry module", + "homepage": "https://github.com/boostorg/geometry", + "dependencies": [ + "boost-algorithm", + "boost-array", + "boost-assert", + "boost-concept-check", + "boost-config", + "boost-container", + "boost-core", + "boost-function-types", + "boost-fusion", + "boost-integer", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-move", + "boost-mpl", + "boost-multiprecision", + "boost-numeric-conversion", + "boost-polygon", + "boost-qvm", + "boost-range", + "boost-rational", + "boost-serialization", + "boost-smart-ptr", + "boost-static-assert", + "boost-thread", + "boost-throw-exception", + "boost-tokenizer", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-variant", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-gil/CONTROL b/ports/boost-gil/CONTROL deleted file mode 100644 index cb94f0c8558ee9..00000000000000 --- a/ports/boost-gil/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-gil -Version: 1.75.0 -Build-Depends: boost-assert, boost-concept-check, boost-config, boost-core, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-mp11, boost-numeric-conversion, boost-preprocessor, boost-utility, boost-variant2, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/gil -Description: Boost gil module diff --git a/ports/boost-gil/vcpkg.json b/ports/boost-gil/vcpkg.json new file mode 100644 index 00000000000000..de58f8e5aea6f5 --- /dev/null +++ b/ports/boost-gil/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "boost-gil", + "version-string": "1.75.0", + "description": "Boost gil module", + "homepage": "https://github.com/boostorg/gil", + "dependencies": [ + "boost-assert", + "boost-concept-check", + "boost-config", + "boost-core", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-integer", + "boost-iterator", + "boost-mp11", + "boost-numeric-conversion", + "boost-preprocessor", + "boost-utility", + "boost-variant2", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-graph-parallel/CONTROL b/ports/boost-graph-parallel/CONTROL deleted file mode 100644 index c48b2d852c547f..00000000000000 --- a/ports/boost-graph-parallel/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-graph-parallel -Version: 1.75.0 -Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-detail, boost-dynamic-bitset, boost-filesystem (!uwp), boost-foreach, boost-function, boost-graph, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-property-map, boost-random, boost-serialization, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/graph_parallel -Description: Boost graph_parallel module diff --git a/ports/boost-graph-parallel/vcpkg.json b/ports/boost-graph-parallel/vcpkg.json new file mode 100644 index 00000000000000..48600dda68e3a8 --- /dev/null +++ b/ports/boost-graph-parallel/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "boost-graph-parallel", + "version-string": "1.75.0", + "description": "Boost graph_parallel module", + "homepage": "https://github.com/boostorg/graph_parallel", + "dependencies": [ + "boost-assert", + "boost-compatibility", + "boost-concept-check", + "boost-config", + "boost-container-hash", + "boost-detail", + "boost-dynamic-bitset", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-foreach", + "boost-function", + "boost-graph", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-mpl", + "boost-optional", + "boost-property-map", + "boost-random", + "boost-serialization", + "boost-smart-ptr", + "boost-static-assert", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-variant", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-graph/CONTROL b/ports/boost-graph/CONTROL deleted file mode 100644 index b5d9a06fa499c7..00000000000000 --- a/ports/boost-graph/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-graph -Version: 1.75.0 -Build-Depends: boost-algorithm, boost-any, boost-array, boost-assert, boost-bimap, boost-bind, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-multi-index, boost-optional, boost-parameter, boost-preprocessor, boost-property-map, boost-property-tree, boost-random, boost-range, boost-regex, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-test (!uwp), boost-throw-exception, boost-tti, boost-tuple, boost-type-traits, boost-typeof, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-xpressive -Homepage: https://github.com/boostorg/graph -Description: Boost graph module diff --git a/ports/boost-graph/vcpkg.json b/ports/boost-graph/vcpkg.json new file mode 100644 index 00000000000000..38ac4f6d01fad1 --- /dev/null +++ b/ports/boost-graph/vcpkg.json @@ -0,0 +1,57 @@ +{ + "name": "boost-graph", + "version-string": "1.75.0", + "description": "Boost graph module", + "homepage": "https://github.com/boostorg/graph", + "dependencies": [ + "boost-algorithm", + "boost-any", + "boost-array", + "boost-assert", + "boost-bimap", + "boost-bind", + "boost-build", + "boost-compatibility", + "boost-concept-check", + "boost-config", + "boost-container-hash", + "boost-conversion", + "boost-core", + "boost-detail", + "boost-foreach", + "boost-function", + "boost-integer", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-modular-build-helper", + "boost-move", + "boost-mpl", + "boost-multi-index", + "boost-optional", + "boost-parameter", + "boost-preprocessor", + "boost-property-map", + "boost-property-tree", + "boost-random", + "boost-range", + "boost-regex", + "boost-serialization", + "boost-smart-ptr", + "boost-spirit", + "boost-static-assert", + { + "name": "boost-test", + "platform": "!uwp" + }, + "boost-throw-exception", + "boost-tti", + "boost-tuple", + "boost-type-traits", + "boost-typeof", + "boost-unordered", + "boost-utility", + "boost-vcpkg-helpers", + "boost-xpressive" + ] +} diff --git a/ports/boost-hana/CONTROL b/ports/boost-hana/CONTROL deleted file mode 100644 index 6b4e48709a14fc..00000000000000 --- a/ports/boost-hana/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-hana -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/hana -Description: Boost hana module diff --git a/ports/boost-hana/vcpkg.json b/ports/boost-hana/vcpkg.json new file mode 100644 index 00000000000000..4d00d9a5fc22f2 --- /dev/null +++ b/ports/boost-hana/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-hana", + "version-string": "1.75.0", + "description": "Boost hana module", + "homepage": "https://github.com/boostorg/hana", + "dependencies": [ + "boost-config", + "boost-core", + "boost-fusion", + "boost-mpl", + "boost-tuple", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-heap/CONTROL b/ports/boost-heap/CONTROL deleted file mode 100644 index 3396962ef145a6..00000000000000 --- a/ports/boost-heap/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-heap -Version: 1.75.0 -Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-core, boost-integer, boost-intrusive, boost-iterator, boost-parameter, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/heap -Description: Boost heap module diff --git a/ports/boost-heap/vcpkg.json b/ports/boost-heap/vcpkg.json new file mode 100644 index 00000000000000..20b631d6aeb747 --- /dev/null +++ b/ports/boost-heap/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "boost-heap", + "version-string": "1.75.0", + "description": "Boost heap module", + "homepage": "https://github.com/boostorg/heap", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-bind", + "boost-concept-check", + "boost-core", + "boost-integer", + "boost-intrusive", + "boost-iterator", + "boost-parameter", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-histogram/CONTROL b/ports/boost-histogram/CONTROL deleted file mode 100644 index d6bbc0d4a1deca..00000000000000 --- a/ports/boost-histogram/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-histogram -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-mp11, boost-serialization, boost-throw-exception, boost-variant2, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/histogram -Description: Boost histogram module diff --git a/ports/boost-histogram/vcpkg.json b/ports/boost-histogram/vcpkg.json new file mode 100644 index 00000000000000..868625a863b4cb --- /dev/null +++ b/ports/boost-histogram/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-histogram", + "version-string": "1.75.0", + "description": "Boost histogram module", + "homepage": "https://github.com/boostorg/histogram", + "dependencies": [ + "boost-config", + "boost-core", + "boost-mp11", + "boost-serialization", + "boost-throw-exception", + "boost-variant2", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-hof/CONTROL b/ports/boost-hof/CONTROL deleted file mode 100644 index a1a6562c7f8698..00000000000000 --- a/ports/boost-hof/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-hof -Version: 1.75.0 -Build-Depends: boost-vcpkg-helpers -Homepage: https://github.com/boostorg/hof -Description: Boost hof module diff --git a/ports/boost-hof/vcpkg.json b/ports/boost-hof/vcpkg.json new file mode 100644 index 00000000000000..200b09dd44521b --- /dev/null +++ b/ports/boost-hof/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "boost-hof", + "version-string": "1.75.0", + "description": "Boost hof module", + "homepage": "https://github.com/boostorg/hof", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-icl/CONTROL b/ports/boost-icl/CONTROL deleted file mode 100644 index b5fdbece998aaa..00000000000000 --- a/ports/boost-icl/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-icl -Version: 1.75.0 -Build-Depends: boost-assert, boost-concept-check, boost-config, boost-container, boost-date-time, boost-detail, boost-iterator, boost-move, boost-mpl, boost-range, boost-rational, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/icl -Description: Boost icl module diff --git a/ports/boost-icl/vcpkg.json b/ports/boost-icl/vcpkg.json new file mode 100644 index 00000000000000..684746c5bcd731 --- /dev/null +++ b/ports/boost-icl/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "boost-icl", + "version-string": "1.75.0", + "description": "Boost icl module", + "homepage": "https://github.com/boostorg/icl", + "dependencies": [ + "boost-assert", + "boost-concept-check", + "boost-config", + "boost-container", + "boost-date-time", + "boost-detail", + "boost-iterator", + "boost-move", + "boost-mpl", + "boost-range", + "boost-rational", + "boost-static-assert", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-integer/CONTROL b/ports/boost-integer/CONTROL deleted file mode 100644 index 2f1af80a78b7f4..00000000000000 --- a/ports/boost-integer/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-integer -Version: 1.75.0 -Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/integer -Description: Boost integer module diff --git a/ports/boost-integer/vcpkg.json b/ports/boost-integer/vcpkg.json new file mode 100644 index 00000000000000..f06684ccffe307 --- /dev/null +++ b/ports/boost-integer/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-integer", + "version-string": "1.75.0", + "description": "Boost integer module", + "homepage": "https://github.com/boostorg/integer", + "dependencies": [ + "boost-assert", + "boost-compatibility", + "boost-config", + "boost-core", + "boost-detail", + "boost-static-assert", + "boost-throw-exception", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-interprocess/CONTROL b/ports/boost-interprocess/CONTROL deleted file mode 100644 index 8f62fe32544ee0..00000000000000 --- a/ports/boost-interprocess/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-interprocess -Version: 1.75.0 -Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-integer, boost-intrusive, boost-move, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-winapi -Homepage: https://github.com/boostorg/interprocess -Description: Boost interprocess module diff --git a/ports/boost-interprocess/vcpkg.json b/ports/boost-interprocess/vcpkg.json new file mode 100644 index 00000000000000..b5b376a37e5db2 --- /dev/null +++ b/ports/boost-interprocess/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "boost-interprocess", + "version-string": "1.75.0", + "description": "Boost interprocess module", + "homepage": "https://github.com/boostorg/interprocess", + "dependencies": [ + "boost-assert", + "boost-compatibility", + "boost-config", + "boost-container", + "boost-core", + "boost-date-time", + "boost-detail", + "boost-integer", + "boost-intrusive", + "boost-move", + "boost-static-assert", + "boost-type-traits", + "boost-unordered", + "boost-utility", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/ports/boost-interval/CONTROL b/ports/boost-interval/CONTROL deleted file mode 100644 index 13a5d2eaba1611..00000000000000 --- a/ports/boost-interval/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-interval -Version: 1.75.0 -Build-Depends: boost-compatibility, boost-config, boost-detail, boost-logic, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/interval -Description: Boost interval module diff --git a/ports/boost-interval/vcpkg.json b/ports/boost-interval/vcpkg.json new file mode 100644 index 00000000000000..6402338cad0256 --- /dev/null +++ b/ports/boost-interval/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "boost-interval", + "version-string": "1.75.0", + "description": "Boost interval module", + "homepage": "https://github.com/boostorg/interval", + "dependencies": [ + "boost-compatibility", + "boost-config", + "boost-detail", + "boost-logic", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-intrusive/CONTROL b/ports/boost-intrusive/CONTROL deleted file mode 100644 index 7f88fe04ab3e49..00000000000000 --- a/ports/boost-intrusive/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-intrusive -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-container-hash, boost-core, boost-integer, boost-move, boost-static-assert, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/intrusive -Description: Boost intrusive module diff --git a/ports/boost-intrusive/vcpkg.json b/ports/boost-intrusive/vcpkg.json new file mode 100644 index 00000000000000..b56916ebc995b0 --- /dev/null +++ b/ports/boost-intrusive/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-intrusive", + "version-string": "1.75.0", + "description": "Boost intrusive module", + "homepage": "https://github.com/boostorg/intrusive", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-integer", + "boost-move", + "boost-static-assert", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-io/CONTROL b/ports/boost-io/CONTROL deleted file mode 100644 index c0120d7c9baac0..00000000000000 --- a/ports/boost-io/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-io -Version: 1.75.0 -Build-Depends: boost-config, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/io -Description: Boost io module diff --git a/ports/boost-io/vcpkg.json b/ports/boost-io/vcpkg.json new file mode 100644 index 00000000000000..f9ed7c1fbc74b1 --- /dev/null +++ b/ports/boost-io/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-io", + "version-string": "1.75.0", + "description": "Boost io module", + "homepage": "https://github.com/boostorg/io", + "dependencies": [ + "boost-config", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL deleted file mode 100644 index c522ce01cde5aa..00000000000000 --- a/ports/boost-iostreams/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-iostreams -Version: 1.75.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, liblzma, zlib, zstd -Homepage: https://github.com/boostorg/iostreams -Description: Boost iostreams module -Supports: !uwp diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json new file mode 100644 index 00000000000000..3a999515913d45 --- /dev/null +++ b/ports/boost-iostreams/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "boost-iostreams", + "version-string": "1.75.0", + "description": "Boost iostreams module", + "homepage": "https://github.com/boostorg/iostreams", + "supports": "!uwp", + "dependencies": [ + "boost-assert", + "boost-build", + "boost-config", + "boost-core", + "boost-detail", + "boost-function", + "boost-integer", + "boost-modular-build-helper", + "boost-mpl", + "boost-numeric-conversion", + "boost-preprocessor", + "boost-range", + "boost-regex", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + "bzip2", + "liblzma", + "zlib", + "zstd" + ] +} diff --git a/ports/boost-iterator/CONTROL b/ports/boost-iterator/CONTROL deleted file mode 100644 index 74d88d45f52083..00000000000000 --- a/ports/boost-iterator/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-iterator -Version: 1.75.0 -Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-conversion, boost-core, boost-detail, boost-function-types, boost-fusion, boost-mpl, boost-optional, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/iterator -Description: Boost iterator module diff --git a/ports/boost-iterator/vcpkg.json b/ports/boost-iterator/vcpkg.json new file mode 100644 index 00000000000000..805fcb3193963f --- /dev/null +++ b/ports/boost-iterator/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "boost-iterator", + "version-string": "1.75.0", + "description": "Boost iterator module", + "homepage": "https://github.com/boostorg/iterator", + "dependencies": [ + "boost-assert", + "boost-compatibility", + "boost-concept-check", + "boost-config", + "boost-conversion", + "boost-core", + "boost-detail", + "boost-function-types", + "boost-fusion", + "boost-mpl", + "boost-optional", + "boost-smart-ptr", + "boost-static-assert", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-json/CONTROL b/ports/boost-json/CONTROL deleted file mode 100644 index 21423c40b8216b..00000000000000 --- a/ports/boost-json/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-json -Version: 1.75.0 -Build-Depends: boost-align, boost-assert, boost-config, boost-container, boost-exception, boost-system, boost-throw-exception, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/json -Description: Boost json module diff --git a/ports/boost-json/vcpkg.json b/ports/boost-json/vcpkg.json new file mode 100644 index 00000000000000..c11c932920227d --- /dev/null +++ b/ports/boost-json/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-json", + "version-string": "1.75.0", + "description": "Boost json module", + "homepage": "https://github.com/boostorg/json", + "dependencies": [ + "boost-align", + "boost-assert", + "boost-config", + "boost-container", + "boost-exception", + "boost-system", + "boost-throw-exception", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-lambda/CONTROL b/ports/boost-lambda/CONTROL deleted file mode 100644 index c566d0819514f5..00000000000000 --- a/ports/boost-lambda/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-lambda -Version: 1.75.0 -Build-Depends: boost-bind, boost-config, boost-detail, boost-mpl, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/lambda -Description: Boost lambda module diff --git a/ports/boost-lambda/vcpkg.json b/ports/boost-lambda/vcpkg.json new file mode 100644 index 00000000000000..49f999875016cf --- /dev/null +++ b/ports/boost-lambda/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-lambda", + "version-string": "1.75.0", + "description": "Boost lambda module", + "homepage": "https://github.com/boostorg/lambda", + "dependencies": [ + "boost-bind", + "boost-config", + "boost-detail", + "boost-mpl", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-leaf/CONTROL b/ports/boost-leaf/CONTROL deleted file mode 100644 index 2e0d12ca0bab48..00000000000000 --- a/ports/boost-leaf/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-leaf -Version: 1.75.0 -Build-Depends: boost-vcpkg-helpers -Homepage: https://github.com/boostorg/leaf -Description: Boost leaf module diff --git a/ports/boost-leaf/vcpkg.json b/ports/boost-leaf/vcpkg.json new file mode 100644 index 00000000000000..7ff64d65237018 --- /dev/null +++ b/ports/boost-leaf/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "boost-leaf", + "version-string": "1.75.0", + "description": "Boost leaf module", + "homepage": "https://github.com/boostorg/leaf", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-lexical-cast/CONTROL b/ports/boost-lexical-cast/CONTROL deleted file mode 100644 index 3a921e776ee26f..00000000000000 --- a/ports/boost-lexical-cast/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-lexical-cast -Version: 1.75.0 -Build-Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-integer, boost-numeric-conversion, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/lexical_cast -Description: Boost lexical_cast module diff --git a/ports/boost-lexical-cast/vcpkg.json b/ports/boost-lexical-cast/vcpkg.json new file mode 100644 index 00000000000000..a976cf7d8ec3c9 --- /dev/null +++ b/ports/boost-lexical-cast/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "boost-lexical-cast", + "version-string": "1.75.0", + "description": "Boost lexical_cast module", + "homepage": "https://github.com/boostorg/lexical_cast", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-compatibility", + "boost-config", + "boost-container", + "boost-core", + "boost-detail", + "boost-integer", + "boost-numeric-conversion", + "boost-range", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-local-function/CONTROL b/ports/boost-local-function/CONTROL deleted file mode 100644 index f7117778567664..00000000000000 --- a/ports/boost-local-function/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-local-function -Version: 1.75.0 -Build-Depends: boost-config, boost-mpl, boost-preprocessor, boost-scope-exit, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/local_function -Description: Boost local_function module diff --git a/ports/boost-local-function/vcpkg.json b/ports/boost-local-function/vcpkg.json new file mode 100644 index 00000000000000..1d5f9ac682d2cc --- /dev/null +++ b/ports/boost-local-function/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-local-function", + "version-string": "1.75.0", + "description": "Boost local_function module", + "homepage": "https://github.com/boostorg/local_function", + "dependencies": [ + "boost-config", + "boost-mpl", + "boost-preprocessor", + "boost-scope-exit", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL deleted file mode 100644 index 35ecbe2fe1d3d2..00000000000000 --- a/ports/boost-locale/CONTROL +++ /dev/null @@ -1,11 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-locale -Version: 1.75.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows&!mingw) -Homepage: https://github.com/boostorg/locale -Description: Boost locale module -Supports: !uwp - -Feature: icu -Build-Depends: icu -Description: ICU backend for Boost.Locale diff --git a/ports/boost-locale/vcpkg.json b/ports/boost-locale/vcpkg.json new file mode 100644 index 00000000000000..b9033ddf9f4499 --- /dev/null +++ b/ports/boost-locale/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "boost-locale", + "version-string": "1.75.0", + "description": "Boost locale module", + "homepage": "https://github.com/boostorg/locale", + "supports": "!uwp", + "dependencies": [ + "boost-assert", + "boost-build", + "boost-config", + "boost-function", + "boost-integer", + "boost-iterator", + "boost-modular-build-helper", + "boost-smart-ptr", + "boost-static-assert", + "boost-system", + "boost-thread", + "boost-type-traits", + "boost-unordered", + "boost-vcpkg-helpers", + { + "name": "libiconv", + "platform": "!uwp & !windows & !mingw" + } + ], + "features": { + "icu": { + "description": "ICU backend for Boost.Locale", + "dependencies": [ + "icu" + ] + } + } +} diff --git a/ports/boost-lockfree/CONTROL b/ports/boost-lockfree/CONTROL deleted file mode 100644 index 6a2736a25dcc29..00000000000000 --- a/ports/boost-lockfree/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-lockfree -Version: 1.75.0 -Build-Depends: boost-align, boost-array, boost-assert, boost-atomic, boost-config, boost-core, boost-integer, boost-mpl, boost-parameter, boost-predef, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/lockfree -Description: Boost lockfree module diff --git a/ports/boost-lockfree/vcpkg.json b/ports/boost-lockfree/vcpkg.json new file mode 100644 index 00000000000000..05ed46e19e8ba2 --- /dev/null +++ b/ports/boost-lockfree/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "boost-lockfree", + "version-string": "1.75.0", + "description": "Boost lockfree module", + "homepage": "https://github.com/boostorg/lockfree", + "dependencies": [ + "boost-align", + "boost-array", + "boost-assert", + "boost-atomic", + "boost-config", + "boost-core", + "boost-integer", + "boost-mpl", + "boost-parameter", + "boost-predef", + "boost-static-assert", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-log/CONTROL b/ports/boost-log/CONTROL deleted file mode 100644 index 1cf5fb0ae0c158..00000000000000 --- a/ports/boost-log/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-log -Version: 1.75.0 -Build-Depends: boost-align, boost-array, boost-asio (!emscripten), boost-assert, boost-atomic, boost-bind, boost-build, boost-compatibility, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-exception, boost-filesystem (!uwp), boost-function-types, boost-fusion, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iterator, boost-lexical-cast, boost-locale (!uwp), boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-parameter, boost-phoenix, boost-predef, boost-preprocessor, boost-property-tree, boost-proto, boost-random, boost-range, boost-regex, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-thread, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi, boost-xpressive -Homepage: https://github.com/boostorg/log -Description: Boost log module -Supports: !uwp&!emscripten diff --git a/ports/boost-log/vcpkg.json b/ports/boost-log/vcpkg.json new file mode 100644 index 00000000000000..29d819e0383035 --- /dev/null +++ b/ports/boost-log/vcpkg.json @@ -0,0 +1,68 @@ +{ + "name": "boost-log", + "version-string": "1.75.0", + "description": "Boost log module", + "homepage": "https://github.com/boostorg/log", + "supports": "!uwp & !emscripten", + "dependencies": [ + "boost-align", + "boost-array", + { + "name": "boost-asio", + "platform": "!emscripten" + }, + "boost-assert", + "boost-atomic", + "boost-bind", + "boost-build", + "boost-compatibility", + "boost-config", + "boost-container", + "boost-core", + "boost-date-time", + "boost-detail", + "boost-exception", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-function-types", + "boost-fusion", + "boost-integer", + "boost-interprocess", + "boost-intrusive", + "boost-io", + "boost-iterator", + "boost-lexical-cast", + { + "name": "boost-locale", + "platform": "!uwp" + }, + "boost-math", + "boost-modular-build-helper", + "boost-move", + "boost-mpl", + "boost-optional", + "boost-parameter", + "boost-phoenix", + "boost-predef", + "boost-preprocessor", + "boost-property-tree", + "boost-proto", + "boost-random", + "boost-range", + "boost-regex", + "boost-smart-ptr", + "boost-spirit", + "boost-static-assert", + "boost-system", + "boost-thread", + "boost-throw-exception", + "boost-type-index", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + "boost-winapi", + "boost-xpressive" + ] +} diff --git a/ports/boost-logic/CONTROL b/ports/boost-logic/CONTROL deleted file mode 100644 index 3490f1d345da3a..00000000000000 --- a/ports/boost-logic/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-logic -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/logic -Description: Boost logic module diff --git a/ports/boost-logic/vcpkg.json b/ports/boost-logic/vcpkg.json new file mode 100644 index 00000000000000..f4ea7c967dbd60 --- /dev/null +++ b/ports/boost-logic/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "boost-logic", + "version-string": "1.75.0", + "description": "Boost logic module", + "homepage": "https://github.com/boostorg/logic", + "dependencies": [ + "boost-config", + "boost-core", + "boost-detail", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-math/CONTROL b/ports/boost-math/CONTROL deleted file mode 100644 index 89f9ece60b196e..00000000000000 --- a/ports/boost-math/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-math -Version: 1.75.0 -Build-Depends: boost-algorithm, boost-array, boost-assert, boost-atomic, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-modular-build-helper, boost-mp11, boost-mpl, boost-predef, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/math -Description: Boost math module diff --git a/ports/boost-math/vcpkg.json b/ports/boost-math/vcpkg.json new file mode 100644 index 00000000000000..023e4636918c84 --- /dev/null +++ b/ports/boost-math/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "boost-math", + "version-string": "1.75.0", + "description": "Boost math module", + "homepage": "https://github.com/boostorg/math", + "dependencies": [ + "boost-algorithm", + "boost-array", + "boost-assert", + "boost-atomic", + "boost-build", + "boost-compatibility", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-detail", + "boost-fusion", + "boost-integer", + "boost-lambda", + "boost-lexical-cast", + "boost-modular-build-helper", + "boost-mp11", + "boost-mpl", + "boost-predef", + "boost-range", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-metaparse/CONTROL b/ports/boost-metaparse/CONTROL deleted file mode 100644 index 90b0e528a7404c..00000000000000 --- a/ports/boost-metaparse/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-metaparse -Version: 1.75.0 -Build-Depends: boost-config, boost-mpl, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/metaparse -Description: Boost metaparse module diff --git a/ports/boost-metaparse/vcpkg.json b/ports/boost-metaparse/vcpkg.json new file mode 100644 index 00000000000000..b24d2b231e327a --- /dev/null +++ b/ports/boost-metaparse/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-metaparse", + "version-string": "1.75.0", + "description": "Boost metaparse module", + "homepage": "https://github.com/boostorg/metaparse", + "dependencies": [ + "boost-config", + "boost-mpl", + "boost-predef", + "boost-preprocessor", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL deleted file mode 100644 index d59e7580a82009..00000000000000 --- a/ports/boost-modular-build-helper/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: boost-modular-build-helper -Version: 1.75.0 -Port-Version: 2 -Build-Depends: boost-uninstall diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json new file mode 100644 index 00000000000000..3ae62630e50b0b --- /dev/null +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "boost-modular-build-helper", + "version-string": "1.75.0", + "port-version": 2, + "dependencies": [ + "boost-uninstall" + ] +} diff --git a/ports/boost-move/CONTROL b/ports/boost-move/CONTROL deleted file mode 100644 index 6b61e94540300e..00000000000000 --- a/ports/boost-move/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-move -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-static-assert, boost-utility, boost-vcpkg-helpers, boost-winapi -Homepage: https://github.com/boostorg/move -Description: Boost move module diff --git a/ports/boost-move/vcpkg.json b/ports/boost-move/vcpkg.json new file mode 100644 index 00000000000000..2386e134af1823 --- /dev/null +++ b/ports/boost-move/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-move", + "version-string": "1.75.0", + "description": "Boost move module", + "homepage": "https://github.com/boostorg/move", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-integer", + "boost-static-assert", + "boost-utility", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/ports/boost-mp11/CONTROL b/ports/boost-mp11/CONTROL deleted file mode 100644 index b26ffb8bd5e200..00000000000000 --- a/ports/boost-mp11/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-mp11 -Version: 1.75.0 -Build-Depends: boost-vcpkg-helpers -Homepage: https://github.com/boostorg/mp11 -Description: Boost mp11 module diff --git a/ports/boost-mp11/vcpkg.json b/ports/boost-mp11/vcpkg.json new file mode 100644 index 00000000000000..7128f6b324b68b --- /dev/null +++ b/ports/boost-mp11/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "boost-mp11", + "version-string": "1.75.0", + "description": "Boost mp11 module", + "homepage": "https://github.com/boostorg/mp11", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-mpi/CONTROL b/ports/boost-mpi/CONTROL deleted file mode 100644 index 172903157e0ccb..00000000000000 --- a/ports/boost-mpi/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-mpi -Version: 1.75.0 -Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-optional, boost-python (!uwp&!(arm&windows)&!emscripten), boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, mpi -Homepage: https://github.com/boostorg/mpi -Description: Boost mpi module diff --git a/ports/boost-mpi/vcpkg.json b/ports/boost-mpi/vcpkg.json new file mode 100644 index 00000000000000..9233a43c0140b2 --- /dev/null +++ b/ports/boost-mpi/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "boost-mpi", + "version-string": "1.75.0", + "description": "Boost mpi module", + "homepage": "https://github.com/boostorg/mpi", + "dependencies": [ + "boost-assert", + "boost-build", + "boost-compatibility", + "boost-config", + "boost-core", + "boost-foreach", + "boost-function", + "boost-graph", + "boost-integer", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-modular-build-helper", + "boost-mpl", + "boost-optional", + { + "name": "boost-python", + "platform": "!uwp & !(arm & windows) & !emscripten" + }, + "boost-serialization", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + "mpi" + ] +} diff --git a/ports/boost-mpl/CONTROL b/ports/boost-mpl/CONTROL deleted file mode 100644 index 4afce80dcacf3e..00000000000000 --- a/ports/boost-mpl/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-mpl -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/mpl -Description: Boost mpl module diff --git a/ports/boost-mpl/vcpkg.json b/ports/boost-mpl/vcpkg.json new file mode 100644 index 00000000000000..1bf8235732a932 --- /dev/null +++ b/ports/boost-mpl/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-mpl", + "version-string": "1.75.0", + "description": "Boost mpl module", + "homepage": "https://github.com/boostorg/mpl", + "dependencies": [ + "boost-config", + "boost-core", + "boost-detail", + "boost-predef", + "boost-preprocessor", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-msm/CONTROL b/ports/boost-msm/CONTROL deleted file mode 100644 index c4d89e51c6a127..00000000000000 --- a/ports/boost-msm/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-msm -Version: 1.75.0 -Build-Depends: boost-any, boost-assert, boost-bind, boost-circular-buffer, boost-config, boost-core, boost-function, boost-fusion, boost-mpl, boost-parameter, boost-phoenix, boost-preprocessor, boost-proto, boost-serialization, boost-tuple, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/msm -Description: Boost msm module diff --git a/ports/boost-msm/vcpkg.json b/ports/boost-msm/vcpkg.json new file mode 100644 index 00000000000000..ac45635322c54a --- /dev/null +++ b/ports/boost-msm/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "boost-msm", + "version-string": "1.75.0", + "description": "Boost msm module", + "homepage": "https://github.com/boostorg/msm", + "dependencies": [ + "boost-any", + "boost-assert", + "boost-bind", + "boost-circular-buffer", + "boost-config", + "boost-core", + "boost-function", + "boost-fusion", + "boost-mpl", + "boost-parameter", + "boost-phoenix", + "boost-preprocessor", + "boost-proto", + "boost-serialization", + "boost-tuple", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-multi-array/CONTROL b/ports/boost-multi-array/CONTROL deleted file mode 100644 index 2797cb65798054..00000000000000 --- a/ports/boost-multi-array/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-multi-array -Version: 1.75.0 -Build-Depends: boost-compatibility, boost-config, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/multi_array -Description: Boost multi_array module diff --git a/ports/boost-multi-array/vcpkg.json b/ports/boost-multi-array/vcpkg.json new file mode 100644 index 00000000000000..16477bd4e8aff1 --- /dev/null +++ b/ports/boost-multi-array/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "boost-multi-array", + "version-string": "1.75.0", + "description": "Boost multi_array module", + "homepage": "https://github.com/boostorg/multi_array", + "dependencies": [ + "boost-compatibility", + "boost-config", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-multi-index/CONTROL b/ports/boost-multi-index/CONTROL deleted file mode 100644 index 8882dab96ae13b..00000000000000 --- a/ports/boost-multi-index/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-multi-index -Version: 1.75.0 -Build-Depends: boost-assert, boost-bind, boost-compatibility, boost-config, boost-container-hash, boost-core, boost-detail, boost-foreach, boost-functional, boost-integer, boost-iterator, boost-move, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/multi_index -Description: Boost multi_index module diff --git a/ports/boost-multi-index/vcpkg.json b/ports/boost-multi-index/vcpkg.json new file mode 100644 index 00000000000000..cb9a5467ab92ae --- /dev/null +++ b/ports/boost-multi-index/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "boost-multi-index", + "version-string": "1.75.0", + "description": "Boost multi_index module", + "homepage": "https://github.com/boostorg/multi_index", + "dependencies": [ + "boost-assert", + "boost-bind", + "boost-compatibility", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-detail", + "boost-foreach", + "boost-functional", + "boost-integer", + "boost-iterator", + "boost-move", + "boost-mpl", + "boost-preprocessor", + "boost-serialization", + "boost-static-assert", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-multiprecision/CONTROL b/ports/boost-multiprecision/CONTROL deleted file mode 100644 index aefbaf13333acf..00000000000000 --- a/ports/boost-multiprecision/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-multiprecision -Version: 1.75.0 -Build-Depends: boost-array, boost-assert, boost-atomic, boost-config, boost-container-hash, boost-core, boost-functional, boost-integer, boost-lexical-cast, boost-mpl, boost-predef, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/multiprecision -Description: Boost multiprecision module diff --git a/ports/boost-multiprecision/vcpkg.json b/ports/boost-multiprecision/vcpkg.json new file mode 100644 index 00000000000000..cb4e8d0970aa78 --- /dev/null +++ b/ports/boost-multiprecision/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "boost-multiprecision", + "version-string": "1.75.0", + "description": "Boost multiprecision module", + "homepage": "https://github.com/boostorg/multiprecision", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-atomic", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-functional", + "boost-integer", + "boost-lexical-cast", + "boost-mpl", + "boost-predef", + "boost-rational", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-nowide/CONTROL b/ports/boost-nowide/CONTROL deleted file mode 100644 index 399fa954e6683a..00000000000000 --- a/ports/boost-nowide/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-nowide -Version: 1.75.0 -Build-Depends: boost-build, boost-config, boost-filesystem (!uwp), boost-modular-build-helper, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/nowide -Description: Boost nowide module diff --git a/ports/boost-nowide/vcpkg.json b/ports/boost-nowide/vcpkg.json new file mode 100644 index 00000000000000..234dc681c630f2 --- /dev/null +++ b/ports/boost-nowide/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-nowide", + "version-string": "1.75.0", + "description": "Boost nowide module", + "homepage": "https://github.com/boostorg/nowide", + "dependencies": [ + "boost-build", + "boost-config", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-modular-build-helper", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-numeric-conversion/CONTROL b/ports/boost-numeric-conversion/CONTROL deleted file mode 100644 index 3b8b45715de829..00000000000000 --- a/ports/boost-numeric-conversion/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-numeric-conversion -Version: 1.75.0 -Build-Depends: boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/numeric_conversion -Description: Boost numeric_conversion module diff --git a/ports/boost-numeric-conversion/vcpkg.json b/ports/boost-numeric-conversion/vcpkg.json new file mode 100644 index 00000000000000..eec4c866d6a9e0 --- /dev/null +++ b/ports/boost-numeric-conversion/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-numeric-conversion", + "version-string": "1.75.0", + "description": "Boost numeric_conversion module", + "homepage": "https://github.com/boostorg/numeric_conversion", + "dependencies": [ + "boost-compatibility", + "boost-config", + "boost-conversion", + "boost-core", + "boost-detail", + "boost-integer", + "boost-preprocessor", + "boost-throw-exception", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-odeint/CONTROL b/ports/boost-odeint/CONTROL deleted file mode 100644 index 88bda92a952343..00000000000000 --- a/ports/boost-odeint/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-odeint -Version: 1.75.0 -Build-Depends: boost-array, boost-assert, boost-bind, boost-compute, boost-config, boost-core, boost-function, boost-fusion, boost-iterator, boost-math, boost-mpl, boost-multi-array, boost-preprocessor, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-units, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/odeint -Description: Boost odeint module diff --git a/ports/boost-odeint/vcpkg.json b/ports/boost-odeint/vcpkg.json new file mode 100644 index 00000000000000..f3025958e44bcc --- /dev/null +++ b/ports/boost-odeint/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "boost-odeint", + "version-string": "1.75.0", + "description": "Boost odeint module", + "homepage": "https://github.com/boostorg/odeint", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-bind", + "boost-compute", + "boost-config", + "boost-core", + "boost-function", + "boost-fusion", + "boost-iterator", + "boost-math", + "boost-mpl", + "boost-multi-array", + "boost-preprocessor", + "boost-range", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-units", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-optional/CONTROL b/ports/boost-optional/CONTROL deleted file mode 100644 index 89672a24df4020..00000000000000 --- a/ports/boost-optional/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-optional -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-move, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/optional -Description: Boost optional module diff --git a/ports/boost-optional/vcpkg.json b/ports/boost-optional/vcpkg.json new file mode 100644 index 00000000000000..7afa11956ee9eb --- /dev/null +++ b/ports/boost-optional/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "boost-optional", + "version-string": "1.75.0", + "description": "Boost optional module", + "homepage": "https://github.com/boostorg/optional", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-detail", + "boost-move", + "boost-predef", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-outcome/CONTROL b/ports/boost-outcome/CONTROL deleted file mode 100644 index 656848684f2b9f..00000000000000 --- a/ports/boost-outcome/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-outcome -Version: 1.75.0 -Build-Depends: boost-config, boost-throw-exception, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/outcome -Description: Boost outcome module diff --git a/ports/boost-outcome/vcpkg.json b/ports/boost-outcome/vcpkg.json new file mode 100644 index 00000000000000..01622ebbd7aed7 --- /dev/null +++ b/ports/boost-outcome/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "boost-outcome", + "version-string": "1.75.0", + "description": "Boost outcome module", + "homepage": "https://github.com/boostorg/outcome", + "dependencies": [ + "boost-config", + "boost-throw-exception", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-parameter-python/CONTROL b/ports/boost-parameter-python/CONTROL deleted file mode 100644 index 4d5ec3a2539544..00000000000000 --- a/ports/boost-parameter-python/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-parameter-python -Version: 1.75.0 -Build-Depends: boost-mpl, boost-parameter, boost-preprocessor, boost-python (!uwp&!(arm&windows)&!emscripten), boost-vcpkg-helpers -Homepage: https://github.com/boostorg/parameter_python -Description: Boost parameter_python module -Supports: !emscripten diff --git a/ports/boost-parameter-python/vcpkg.json b/ports/boost-parameter-python/vcpkg.json new file mode 100644 index 00000000000000..d9f704e7319b7c --- /dev/null +++ b/ports/boost-parameter-python/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-parameter-python", + "version-string": "1.75.0", + "description": "Boost parameter_python module", + "homepage": "https://github.com/boostorg/parameter_python", + "supports": "!emscripten", + "dependencies": [ + "boost-mpl", + "boost-parameter", + "boost-preprocessor", + { + "name": "boost-python", + "platform": "!uwp & !(arm & windows) & !emscripten" + }, + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-parameter/CONTROL b/ports/boost-parameter/CONTROL deleted file mode 100644 index 2df9f067e1157b..00000000000000 --- a/ports/boost-parameter/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-parameter -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-function, boost-fusion, boost-mp11, boost-mpl, boost-optional, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/parameter -Description: Boost parameter module diff --git a/ports/boost-parameter/vcpkg.json b/ports/boost-parameter/vcpkg.json new file mode 100644 index 00000000000000..3012eca5854e8f --- /dev/null +++ b/ports/boost-parameter/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "boost-parameter", + "version-string": "1.75.0", + "description": "Boost parameter module", + "homepage": "https://github.com/boostorg/parameter", + "dependencies": [ + "boost-config", + "boost-core", + "boost-function", + "boost-fusion", + "boost-mp11", + "boost-mpl", + "boost-optional", + "boost-preprocessor", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-pfr/CONTROL b/ports/boost-pfr/CONTROL deleted file mode 100644 index 06a26ed4c3d6e2..00000000000000 --- a/ports/boost-pfr/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-pfr -Version: 1.75.0 -Build-Depends: boost-vcpkg-helpers -Homepage: https://github.com/boostorg/pfr -Description: Boost pfr module diff --git a/ports/boost-pfr/vcpkg.json b/ports/boost-pfr/vcpkg.json new file mode 100644 index 00000000000000..ace648fd1bdc31 --- /dev/null +++ b/ports/boost-pfr/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "boost-pfr", + "version-string": "1.75.0", + "description": "Boost pfr module", + "homepage": "https://github.com/boostorg/pfr", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-phoenix/CONTROL b/ports/boost-phoenix/CONTROL deleted file mode 100644 index 4417e058193830..00000000000000 --- a/ports/boost-phoenix/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-phoenix -Version: 1.75.0 -Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-fusion, boost-mpl, boost-predef, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/phoenix -Description: Boost phoenix module diff --git a/ports/boost-phoenix/vcpkg.json b/ports/boost-phoenix/vcpkg.json new file mode 100644 index 00000000000000..63a44db1d132c0 --- /dev/null +++ b/ports/boost-phoenix/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "boost-phoenix", + "version-string": "1.75.0", + "description": "Boost phoenix module", + "homepage": "https://github.com/boostorg/phoenix", + "dependencies": [ + "boost-assert", + "boost-bind", + "boost-config", + "boost-core", + "boost-detail", + "boost-function", + "boost-fusion", + "boost-mpl", + "boost-predef", + "boost-preprocessor", + "boost-proto", + "boost-range", + "boost-smart-ptr", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-poly-collection/CONTROL b/ports/boost-poly-collection/CONTROL deleted file mode 100644 index 17f71efb850451..00000000000000 --- a/ports/boost-poly-collection/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-poly-collection -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-iterator, boost-mp11, boost-mpl, boost-type-erasure, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/poly_collection -Description: Boost poly_collection module diff --git a/ports/boost-poly-collection/vcpkg.json b/ports/boost-poly-collection/vcpkg.json new file mode 100644 index 00000000000000..25999dba871c72 --- /dev/null +++ b/ports/boost-poly-collection/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "boost-poly-collection", + "version-string": "1.75.0", + "description": "Boost poly_collection module", + "homepage": "https://github.com/boostorg/poly_collection", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-detail", + "boost-iterator", + "boost-mp11", + "boost-mpl", + "boost-type-erasure", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-polygon/CONTROL b/ports/boost-polygon/CONTROL deleted file mode 100644 index 742d0ced5caa24..00000000000000 --- a/ports/boost-polygon/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-polygon -Version: 1.75.0 -Build-Depends: boost-config, boost-integer, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/polygon -Description: Boost polygon module diff --git a/ports/boost-polygon/vcpkg.json b/ports/boost-polygon/vcpkg.json new file mode 100644 index 00000000000000..7f42e2c93564fe --- /dev/null +++ b/ports/boost-polygon/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "boost-polygon", + "version-string": "1.75.0", + "description": "Boost polygon module", + "homepage": "https://github.com/boostorg/polygon", + "dependencies": [ + "boost-config", + "boost-integer", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-pool/CONTROL b/ports/boost-pool/CONTROL deleted file mode 100644 index dd8fd1d7d336a8..00000000000000 --- a/ports/boost-pool/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-pool -Version: 1.75.0 -Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers, boost-winapi -Homepage: https://github.com/boostorg/pool -Description: Boost pool module diff --git a/ports/boost-pool/vcpkg.json b/ports/boost-pool/vcpkg.json new file mode 100644 index 00000000000000..94ad6b384a50ad --- /dev/null +++ b/ports/boost-pool/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-pool", + "version-string": "1.75.0", + "description": "Boost pool module", + "homepage": "https://github.com/boostorg/pool", + "dependencies": [ + "boost-assert", + "boost-compatibility", + "boost-config", + "boost-detail", + "boost-integer", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/ports/boost-predef/CONTROL b/ports/boost-predef/CONTROL deleted file mode 100644 index 39fe4bfd262da7..00000000000000 --- a/ports/boost-predef/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-predef -Version: 1.75.0 -Build-Depends: boost-vcpkg-helpers -Homepage: https://github.com/boostorg/predef -Description: Boost predef module diff --git a/ports/boost-predef/vcpkg.json b/ports/boost-predef/vcpkg.json new file mode 100644 index 00000000000000..0290057040d2b9 --- /dev/null +++ b/ports/boost-predef/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "boost-predef", + "version-string": "1.75.0", + "description": "Boost predef module", + "homepage": "https://github.com/boostorg/predef", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-preprocessor/CONTROL b/ports/boost-preprocessor/CONTROL deleted file mode 100644 index 8c147b09e9bf17..00000000000000 --- a/ports/boost-preprocessor/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-preprocessor -Version: 1.75.0 -Build-Depends: boost-vcpkg-helpers -Homepage: https://github.com/boostorg/preprocessor -Description: Boost preprocessor module diff --git a/ports/boost-preprocessor/vcpkg.json b/ports/boost-preprocessor/vcpkg.json new file mode 100644 index 00000000000000..a78c26e7547595 --- /dev/null +++ b/ports/boost-preprocessor/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "boost-preprocessor", + "version-string": "1.75.0", + "description": "Boost preprocessor module", + "homepage": "https://github.com/boostorg/preprocessor", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-process/CONTROL b/ports/boost-process/CONTROL deleted file mode 100644 index 6135e047779c8d..00000000000000 --- a/ports/boost-process/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-process -Version: 1.75.0 -Build-Depends: boost-algorithm, boost-asio (!emscripten), boost-config, boost-core, boost-filesystem (!uwp), boost-fusion, boost-iterator, boost-move, boost-optional, boost-system, boost-tokenizer, boost-type-index, boost-vcpkg-helpers, boost-winapi -Homepage: https://github.com/boostorg/process -Description: Boost process module -Supports: !emscripten diff --git a/ports/boost-process/vcpkg.json b/ports/boost-process/vcpkg.json new file mode 100644 index 00000000000000..61fac938120b4b --- /dev/null +++ b/ports/boost-process/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "boost-process", + "version-string": "1.75.0", + "description": "Boost process module", + "homepage": "https://github.com/boostorg/process", + "supports": "!emscripten", + "dependencies": [ + "boost-algorithm", + { + "name": "boost-asio", + "platform": "!emscripten" + }, + "boost-config", + "boost-core", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-fusion", + "boost-iterator", + "boost-move", + "boost-optional", + "boost-system", + "boost-tokenizer", + "boost-type-index", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/ports/boost-program-options/CONTROL b/ports/boost-program-options/CONTROL deleted file mode 100644 index 0eec763fd16b62..00000000000000 --- a/ports/boost-program-options/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-program-options -Version: 1.75.0 -Build-Depends: boost-any, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/program_options -Description: Boost program_options module diff --git a/ports/boost-program-options/vcpkg.json b/ports/boost-program-options/vcpkg.json new file mode 100644 index 00000000000000..2846e56109cc21 --- /dev/null +++ b/ports/boost-program-options/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "boost-program-options", + "version-string": "1.75.0", + "description": "Boost program_options module", + "homepage": "https://github.com/boostorg/program_options", + "dependencies": [ + "boost-any", + "boost-bind", + "boost-build", + "boost-compatibility", + "boost-config", + "boost-core", + "boost-detail", + "boost-function", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-modular-build-helper", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-tokenizer", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-property-map/CONTROL b/ports/boost-property-map/CONTROL deleted file mode 100644 index ea990ee34cbc86..00000000000000 --- a/ports/boost-property-map/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-property-map -Version: 1.75.0 -Build-Depends: boost-any, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-multi-index, boost-optional, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/property_map -Description: Boost property_map module diff --git a/ports/boost-property-map/vcpkg.json b/ports/boost-property-map/vcpkg.json new file mode 100644 index 00000000000000..11640d4c326986 --- /dev/null +++ b/ports/boost-property-map/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "boost-property-map", + "version-string": "1.75.0", + "description": "Boost property_map module", + "homepage": "https://github.com/boostorg/property_map", + "dependencies": [ + "boost-any", + "boost-assert", + "boost-bind", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-function", + "boost-integer", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-mpl", + "boost-multi-index", + "boost-optional", + "boost-serialization", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-property-tree/CONTROL b/ports/boost-property-tree/CONTROL deleted file mode 100644 index df07d89601930f..00000000000000 --- a/ports/boost-property-tree/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-property-tree -Version: 1.75.0 -Build-Depends: boost-any, boost-assert, boost-bind, boost-compatibility, boost-config, boost-core, boost-format, boost-iterator, boost-mpl, boost-multi-index, boost-optional, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/property_tree -Description: Boost property_tree module diff --git a/ports/boost-property-tree/vcpkg.json b/ports/boost-property-tree/vcpkg.json new file mode 100644 index 00000000000000..b519b086f647b5 --- /dev/null +++ b/ports/boost-property-tree/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "boost-property-tree", + "version-string": "1.75.0", + "description": "Boost property_tree module", + "homepage": "https://github.com/boostorg/property_tree", + "dependencies": [ + "boost-any", + "boost-assert", + "boost-bind", + "boost-compatibility", + "boost-config", + "boost-core", + "boost-format", + "boost-iterator", + "boost-mpl", + "boost-multi-index", + "boost-optional", + "boost-range", + "boost-serialization", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-proto/CONTROL b/ports/boost-proto/CONTROL deleted file mode 100644 index 029ffa3c5f7187..00000000000000 --- a/ports/boost-proto/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-proto -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-detail, boost-fusion, boost-mpl, boost-preprocessor, boost-range, boost-static-assert, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/proto -Description: Boost proto module diff --git a/ports/boost-proto/vcpkg.json b/ports/boost-proto/vcpkg.json new file mode 100644 index 00000000000000..55fb7f458fe4bf --- /dev/null +++ b/ports/boost-proto/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "boost-proto", + "version-string": "1.75.0", + "description": "Boost proto module", + "homepage": "https://github.com/boostorg/proto", + "dependencies": [ + "boost-config", + "boost-core", + "boost-detail", + "boost-fusion", + "boost-mpl", + "boost-preprocessor", + "boost-range", + "boost-static-assert", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-ptr-container/CONTROL b/ports/boost-ptr-container/CONTROL deleted file mode 100644 index 17e33d107371c6..00000000000000 --- a/ports/boost-ptr-container/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-ptr-container -Version: 1.75.0 -Build-Depends: boost-array, boost-assert, boost-circular-buffer, boost-config, boost-core, boost-iterator, boost-mpl, boost-range, boost-serialization, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/ptr_container -Description: Boost ptr_container module diff --git a/ports/boost-ptr-container/vcpkg.json b/ports/boost-ptr-container/vcpkg.json new file mode 100644 index 00000000000000..79440cbccbb048 --- /dev/null +++ b/ports/boost-ptr-container/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "boost-ptr-container", + "version-string": "1.75.0", + "description": "Boost ptr_container module", + "homepage": "https://github.com/boostorg/ptr_container", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-circular-buffer", + "boost-config", + "boost-core", + "boost-iterator", + "boost-mpl", + "boost-range", + "boost-serialization", + "boost-smart-ptr", + "boost-static-assert", + "boost-type-traits", + "boost-unordered", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL deleted file mode 100644 index 1aa018b7a53f5e..00000000000000 --- a/ports/boost-python/CONTROL +++ /dev/null @@ -1,12 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-python -Version: 1.75.0 -Port-Version: 1 -Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3 -Homepage: https://github.com/boostorg/python -Description: Boost python module -Supports: !uwp&!(arm&windows)&!emscripten - -Feature: python2 -Build-Depends: python2 (windows) -Description: Build with Python2 support diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json new file mode 100644 index 00000000000000..942366f9271950 --- /dev/null +++ b/ports/boost-python/vcpkg.json @@ -0,0 +1,45 @@ +{ + "name": "boost-python", + "version-string": "1.75.0", + "port-version": 1, + "description": "Boost python module", + "homepage": "https://github.com/boostorg/python", + "supports": "!uwp & !(arm & windows) & !emscripten", + "dependencies": [ + "boost-bind", + "boost-compatibility", + "boost-config", + "boost-conversion", + "boost-core", + "boost-detail", + "boost-foreach", + "boost-function", + "boost-graph", + "boost-integer", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-mpl", + "boost-numeric-conversion", + "boost-preprocessor", + "boost-property-map", + "boost-smart-ptr", + "boost-static-assert", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + "python3" + ], + "features": { + "python2": { + "description": "Build with Python2 support", + "dependencies": [ + { + "name": "python2", + "platform": "windows" + } + ] + } + } +} diff --git a/ports/boost-qvm/CONTROL b/ports/boost-qvm/CONTROL deleted file mode 100644 index fbec4245aca12c..00000000000000 --- a/ports/boost-qvm/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-qvm -Version: 1.75.0 -Build-Depends: boost-assert, boost-exception, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/qvm -Description: Boost qvm module diff --git a/ports/boost-qvm/vcpkg.json b/ports/boost-qvm/vcpkg.json new file mode 100644 index 00000000000000..eedba0c2cf9d03 --- /dev/null +++ b/ports/boost-qvm/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-qvm", + "version-string": "1.75.0", + "description": "Boost qvm module", + "homepage": "https://github.com/boostorg/qvm", + "dependencies": [ + "boost-assert", + "boost-exception", + "boost-static-assert", + "boost-throw-exception", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-random/CONTROL b/ports/boost-random/CONTROL deleted file mode 100644 index b247bdbb98b063..00000000000000 --- a/ports/boost-random/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-random -Version: 1.75.0 -Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-dynamic-bitset, boost-integer, boost-io, boost-math, boost-modular-build-helper, boost-multiprecision, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/random -Description: Boost random module diff --git a/ports/boost-random/vcpkg.json b/ports/boost-random/vcpkg.json new file mode 100644 index 00000000000000..cb45186a9ea30a --- /dev/null +++ b/ports/boost-random/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "boost-random", + "version-string": "1.75.0", + "description": "Boost random module", + "homepage": "https://github.com/boostorg/random", + "dependencies": [ + "boost-assert", + "boost-build", + "boost-compatibility", + "boost-config", + "boost-core", + "boost-detail", + "boost-dynamic-bitset", + "boost-integer", + "boost-io", + "boost-math", + "boost-modular-build-helper", + "boost-multiprecision", + "boost-range", + "boost-static-assert", + "boost-system", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-range/CONTROL b/ports/boost-range/CONTROL deleted file mode 100644 index 184fc70f8945c9..00000000000000 --- a/ports/boost-range/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-range -Version: 1.75.0 -Build-Depends: boost-array, boost-assert, boost-concept-check, boost-config, boost-container-hash, boost-conversion, boost-core, boost-detail, boost-integer, boost-iterator, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-regex, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/range -Description: Boost range module diff --git a/ports/boost-range/vcpkg.json b/ports/boost-range/vcpkg.json new file mode 100644 index 00000000000000..4d65bf99863d31 --- /dev/null +++ b/ports/boost-range/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "boost-range", + "version-string": "1.75.0", + "description": "Boost range module", + "homepage": "https://github.com/boostorg/range", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-concept-check", + "boost-config", + "boost-container-hash", + "boost-conversion", + "boost-core", + "boost-detail", + "boost-integer", + "boost-iterator", + "boost-mpl", + "boost-numeric-conversion", + "boost-optional", + "boost-preprocessor", + "boost-regex", + "boost-static-assert", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-ratio/CONTROL b/ports/boost-ratio/CONTROL deleted file mode 100644 index 5a0f03b8131328..00000000000000 --- a/ports/boost-ratio/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-ratio -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-integer, boost-mpl, boost-rational, boost-static-assert, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/ratio -Description: Boost ratio module diff --git a/ports/boost-ratio/vcpkg.json b/ports/boost-ratio/vcpkg.json new file mode 100644 index 00000000000000..75772ccc51b69b --- /dev/null +++ b/ports/boost-ratio/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-ratio", + "version-string": "1.75.0", + "description": "Boost ratio module", + "homepage": "https://github.com/boostorg/ratio", + "dependencies": [ + "boost-config", + "boost-core", + "boost-integer", + "boost-mpl", + "boost-rational", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-rational/CONTROL b/ports/boost-rational/CONTROL deleted file mode 100644 index 633c0ac2b306c1..00000000000000 --- a/ports/boost-rational/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-rational -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-integer, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/rational -Description: Boost rational module diff --git a/ports/boost-rational/vcpkg.json b/ports/boost-rational/vcpkg.json new file mode 100644 index 00000000000000..fcd8367b8685bf --- /dev/null +++ b/ports/boost-rational/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-rational", + "version-string": "1.75.0", + "description": "Boost rational module", + "homepage": "https://github.com/boostorg/rational", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-integer", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-regex/CONTROL b/ports/boost-regex/CONTROL deleted file mode 100644 index a9d15c9262cc2e..00000000000000 --- a/ports/boost-regex/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-regex -Version: 1.75.0 -Build-Depends: boost-assert, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-predef, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/regex -Description: Boost regex module - -Feature: icu -Build-Depends: icu -Description: ICU backend for Boost.Regex diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json new file mode 100644 index 00000000000000..ab241a824be324 --- /dev/null +++ b/ports/boost-regex/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "boost-regex", + "version-string": "1.75.0", + "description": "Boost regex module", + "homepage": "https://github.com/boostorg/regex", + "dependencies": [ + "boost-assert", + "boost-build", + "boost-compatibility", + "boost-concept-check", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-detail", + "boost-integer", + "boost-iterator", + "boost-modular-build-helper", + "boost-mpl", + "boost-predef", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ], + "features": { + "icu": { + "description": "ICU backend for Boost.Regex", + "dependencies": [ + "icu" + ] + } + } +} diff --git a/ports/boost-safe-numerics/CONTROL b/ports/boost-safe-numerics/CONTROL deleted file mode 100644 index fe8ee7f4f28286..00000000000000 --- a/ports/boost-safe-numerics/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-safe-numerics -Version: 1.75.0 -Build-Depends: boost-concept-check, boost-config, boost-core, boost-integer, boost-logic, boost-mp11, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/safe_numerics -Description: Boost safe_numerics module diff --git a/ports/boost-safe-numerics/vcpkg.json b/ports/boost-safe-numerics/vcpkg.json new file mode 100644 index 00000000000000..27ed80ed66a846 --- /dev/null +++ b/ports/boost-safe-numerics/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-safe-numerics", + "version-string": "1.75.0", + "description": "Boost safe_numerics module", + "homepage": "https://github.com/boostorg/safe_numerics", + "dependencies": [ + "boost-concept-check", + "boost-config", + "boost-core", + "boost-integer", + "boost-logic", + "boost-mp11", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-scope-exit/CONTROL b/ports/boost-scope-exit/CONTROL deleted file mode 100644 index f9192977cb4f15..00000000000000 --- a/ports/boost-scope-exit/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-scope-exit -Version: 1.75.0 -Build-Depends: boost-config, boost-detail, boost-function, boost-preprocessor, boost-type-traits, boost-typeof, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/scope_exit -Description: Boost scope_exit module diff --git a/ports/boost-scope-exit/vcpkg.json b/ports/boost-scope-exit/vcpkg.json new file mode 100644 index 00000000000000..d9bf5bdbee3c3c --- /dev/null +++ b/ports/boost-scope-exit/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-scope-exit", + "version-string": "1.75.0", + "description": "Boost scope_exit module", + "homepage": "https://github.com/boostorg/scope_exit", + "dependencies": [ + "boost-config", + "boost-detail", + "boost-function", + "boost-preprocessor", + "boost-type-traits", + "boost-typeof", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-serialization/CONTROL b/ports/boost-serialization/CONTROL deleted file mode 100644 index e96f5b5308e6f4..00000000000000 --- a/ports/boost-serialization/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-serialization -Version: 1.75.0 -Build-Depends: boost-array, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-spirit, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/serialization -Description: Boost serialization module diff --git a/ports/boost-serialization/vcpkg.json b/ports/boost-serialization/vcpkg.json new file mode 100644 index 00000000000000..c0d2017047e4fa --- /dev/null +++ b/ports/boost-serialization/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "boost-serialization", + "version-string": "1.75.0", + "description": "Boost serialization module", + "homepage": "https://github.com/boostorg/serialization", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-build", + "boost-compatibility", + "boost-config", + "boost-core", + "boost-detail", + "boost-function", + "boost-integer", + "boost-io", + "boost-iterator", + "boost-modular-build-helper", + "boost-move", + "boost-mpl", + "boost-optional", + "boost-predef", + "boost-preprocessor", + "boost-smart-ptr", + "boost-spirit", + "boost-static-assert", + "boost-type-traits", + "boost-unordered", + "boost-utility", + "boost-variant", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-signals2/CONTROL b/ports/boost-signals2/CONTROL deleted file mode 100644 index 3467e1dd1ee354..00000000000000 --- a/ports/boost-signals2/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-signals2 -Version: 1.75.0 -Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-iterator, boost-mpl, boost-optional, boost-parameter, boost-predef, boost-preprocessor, boost-smart-ptr, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/signals2 -Description: Boost signals2 module diff --git a/ports/boost-signals2/vcpkg.json b/ports/boost-signals2/vcpkg.json new file mode 100644 index 00000000000000..48d8728a6c67cd --- /dev/null +++ b/ports/boost-signals2/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "boost-signals2", + "version-string": "1.75.0", + "description": "Boost signals2 module", + "homepage": "https://github.com/boostorg/signals2", + "dependencies": [ + "boost-assert", + "boost-bind", + "boost-config", + "boost-core", + "boost-detail", + "boost-function", + "boost-iterator", + "boost-mpl", + "boost-optional", + "boost-parameter", + "boost-predef", + "boost-preprocessor", + "boost-smart-ptr", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-variant", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-smart-ptr/CONTROL b/ports/boost-smart-ptr/CONTROL deleted file mode 100644 index 58ebabf9d31aa4..00000000000000 --- a/ports/boost-smart-ptr/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-smart-ptr -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-move, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/smart_ptr -Description: Boost smart_ptr module diff --git a/ports/boost-smart-ptr/vcpkg.json b/ports/boost-smart-ptr/vcpkg.json new file mode 100644 index 00000000000000..d199b31cf4666a --- /dev/null +++ b/ports/boost-smart-ptr/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-smart-ptr", + "version-string": "1.75.0", + "description": "Boost smart_ptr module", + "homepage": "https://github.com/boostorg/smart_ptr", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-integer", + "boost-move", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-sort/CONTROL b/ports/boost-sort/CONTROL deleted file mode 100644 index 89e7bfe3651040..00000000000000 --- a/ports/boost-sort/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-sort -Version: 1.75.0 -Build-Depends: boost-integer, boost-range, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/sort -Description: Boost sort module diff --git a/ports/boost-sort/vcpkg.json b/ports/boost-sort/vcpkg.json new file mode 100644 index 00000000000000..fd4b9c73644a1b --- /dev/null +++ b/ports/boost-sort/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-sort", + "version-string": "1.75.0", + "description": "Boost sort module", + "homepage": "https://github.com/boostorg/sort", + "dependencies": [ + "boost-integer", + "boost-range", + "boost-static-assert", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-spirit/CONTROL b/ports/boost-spirit/CONTROL deleted file mode 100644 index 7dc32bdee6de92..00000000000000 --- a/ports/boost-spirit/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-spirit -Version: 1.75.0 -Build-Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-endian, boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iterator, boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-type-traits, boost-typeof, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/spirit -Description: Boost spirit module diff --git a/ports/boost-spirit/vcpkg.json b/ports/boost-spirit/vcpkg.json new file mode 100644 index 00000000000000..382e0954f3d277 --- /dev/null +++ b/ports/boost-spirit/vcpkg.json @@ -0,0 +1,42 @@ +{ + "name": "boost-spirit", + "version-string": "1.75.0", + "description": "Boost spirit module", + "homepage": "https://github.com/boostorg/spirit", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-compatibility", + "boost-config", + "boost-core", + "boost-detail", + "boost-endian", + "boost-foreach", + "boost-function", + "boost-function-types", + "boost-fusion", + "boost-integer", + "boost-io", + "boost-iterator", + "boost-math", + "boost-move", + "boost-mpl", + "boost-optional", + "boost-phoenix", + "boost-pool", + "boost-preprocessor", + "boost-proto", + "boost-range", + "boost-regex", + "boost-smart-ptr", + "boost-static-assert", + "boost-thread", + "boost-throw-exception", + "boost-type-traits", + "boost-typeof", + "boost-unordered", + "boost-utility", + "boost-variant", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-stacktrace/CONTROL b/ports/boost-stacktrace/CONTROL deleted file mode 100644 index eb6e2309e0f8b2..00000000000000 --- a/ports/boost-stacktrace/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-stacktrace -Version: 1.75.0 -Build-Depends: boost-array, boost-build, boost-config, boost-container-hash, boost-core, boost-modular-build-helper, boost-predef, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi -Homepage: https://github.com/boostorg/stacktrace -Description: Boost stacktrace module -Supports: !uwp diff --git a/ports/boost-stacktrace/vcpkg.json b/ports/boost-stacktrace/vcpkg.json new file mode 100644 index 00000000000000..f30cc61196d721 --- /dev/null +++ b/ports/boost-stacktrace/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "boost-stacktrace", + "version-string": "1.75.0", + "description": "Boost stacktrace module", + "homepage": "https://github.com/boostorg/stacktrace", + "supports": "!uwp", + "dependencies": [ + "boost-array", + "boost-build", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-modular-build-helper", + "boost-predef", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/ports/boost-statechart/CONTROL b/ports/boost-statechart/CONTROL deleted file mode 100644 index 09b8a3c3511432..00000000000000 --- a/ports/boost-statechart/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-statechart -Version: 1.75.0 -Build-Depends: boost-assert, boost-bind, boost-config, boost-conversion, boost-core, boost-detail, boost-function, boost-mpl, boost-smart-ptr, boost-static-assert, boost-thread, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/statechart -Description: Boost statechart module diff --git a/ports/boost-statechart/vcpkg.json b/ports/boost-statechart/vcpkg.json new file mode 100644 index 00000000000000..ef30a780315d61 --- /dev/null +++ b/ports/boost-statechart/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "boost-statechart", + "version-string": "1.75.0", + "description": "Boost statechart module", + "homepage": "https://github.com/boostorg/statechart", + "dependencies": [ + "boost-assert", + "boost-bind", + "boost-config", + "boost-conversion", + "boost-core", + "boost-detail", + "boost-function", + "boost-mpl", + "boost-smart-ptr", + "boost-static-assert", + "boost-thread", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-static-assert/CONTROL b/ports/boost-static-assert/CONTROL deleted file mode 100644 index 9ffab13571fd13..00000000000000 --- a/ports/boost-static-assert/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-static-assert -Version: 1.75.0 -Build-Depends: boost-config, boost-detail, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/static_assert -Description: Boost static_assert module diff --git a/ports/boost-static-assert/vcpkg.json b/ports/boost-static-assert/vcpkg.json new file mode 100644 index 00000000000000..beb398fab484c8 --- /dev/null +++ b/ports/boost-static-assert/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "boost-static-assert", + "version-string": "1.75.0", + "description": "Boost static_assert module", + "homepage": "https://github.com/boostorg/static_assert", + "dependencies": [ + "boost-config", + "boost-detail", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-static-string/CONTROL b/ports/boost-static-string/CONTROL deleted file mode 100644 index f82fe744b2d426..00000000000000 --- a/ports/boost-static-string/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-static-string -Version: 1.75.0 -Build-Depends: boost-assert, boost-container-hash, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/static_string -Description: Boost static_string module diff --git a/ports/boost-static-string/vcpkg.json b/ports/boost-static-string/vcpkg.json new file mode 100644 index 00000000000000..0406e828a05ec4 --- /dev/null +++ b/ports/boost-static-string/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-static-string", + "version-string": "1.75.0", + "description": "Boost static_string module", + "homepage": "https://github.com/boostorg/static_string", + "dependencies": [ + "boost-assert", + "boost-container-hash", + "boost-static-assert", + "boost-throw-exception", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-stl-interfaces/CONTROL b/ports/boost-stl-interfaces/CONTROL deleted file mode 100644 index 03357ef2f91f49..00000000000000 --- a/ports/boost-stl-interfaces/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-stl-interfaces -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/stl_interfaces -Description: Boost stl_interfaces module diff --git a/ports/boost-stl-interfaces/vcpkg.json b/ports/boost-stl-interfaces/vcpkg.json new file mode 100644 index 00000000000000..23ff866f3e163b --- /dev/null +++ b/ports/boost-stl-interfaces/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "boost-stl-interfaces", + "version-string": "1.75.0", + "description": "Boost stl_interfaces module", + "homepage": "https://github.com/boostorg/stl_interfaces", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-system/CONTROL b/ports/boost-system/CONTROL deleted file mode 100644 index 0e65363045cb4a..00000000000000 --- a/ports/boost-system/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-system -Version: 1.75.0 -Build-Depends: boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-vcpkg-helpers, boost-winapi -Homepage: https://github.com/boostorg/system -Description: Boost system module diff --git a/ports/boost-system/vcpkg.json b/ports/boost-system/vcpkg.json new file mode 100644 index 00000000000000..df0fe9d46b4ee1 --- /dev/null +++ b/ports/boost-system/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-system", + "version-string": "1.75.0", + "description": "Boost system module", + "homepage": "https://github.com/boostorg/system", + "dependencies": [ + "boost-build", + "boost-config", + "boost-integer", + "boost-modular-build-helper", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/ports/boost-test/CONTROL b/ports/boost-test/CONTROL deleted file mode 100644 index ea7ded87add281..00000000000000 --- a/ports/boost-test/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-test -Version: 1.75.0 -Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/test -Description: Boost test module -Supports: !uwp diff --git a/ports/boost-test/vcpkg.json b/ports/boost-test/vcpkg.json new file mode 100644 index 00000000000000..886dfd4da68553 --- /dev/null +++ b/ports/boost-test/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "boost-test", + "version-string": "1.75.0", + "description": "Boost test module", + "homepage": "https://github.com/boostorg/test", + "supports": "!uwp", + "dependencies": [ + "boost-algorithm", + "boost-assert", + "boost-bind", + "boost-build", + "boost-compatibility", + "boost-config", + "boost-core", + "boost-detail", + "boost-exception", + "boost-function", + "boost-integer", + "boost-io", + "boost-iterator", + "boost-modular-build-helper", + "boost-mpl", + "boost-numeric-conversion", + "boost-optional", + "boost-preprocessor", + "boost-smart-ptr", + "boost-static-assert", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL deleted file mode 100644 index 5e52007093db17..00000000000000 --- a/ports/boost-thread/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-thread -Version: 1.75.0 -Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi -Homepage: https://github.com/boostorg/thread -Description: Boost thread module diff --git a/ports/boost-thread/vcpkg.json b/ports/boost-thread/vcpkg.json new file mode 100644 index 00000000000000..5cc1d3b32eac85 --- /dev/null +++ b/ports/boost-thread/vcpkg.json @@ -0,0 +1,42 @@ +{ + "name": "boost-thread", + "version-string": "1.75.0", + "description": "Boost thread module", + "homepage": "https://github.com/boostorg/thread", + "dependencies": [ + "boost-algorithm", + "boost-assert", + "boost-atomic", + "boost-bind", + "boost-build", + "boost-chrono", + "boost-concept-check", + "boost-config", + "boost-container", + "boost-container-hash", + "boost-core", + "boost-date-time", + "boost-detail", + "boost-exception", + "boost-function", + "boost-integer", + "boost-intrusive", + "boost-io", + "boost-lexical-cast", + "boost-math", + "boost-modular-build-helper", + "boost-move", + "boost-optional", + "boost-predef", + "boost-preprocessor", + "boost-smart-ptr", + "boost-static-assert", + "boost-system", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/ports/boost-throw-exception/CONTROL b/ports/boost-throw-exception/CONTROL deleted file mode 100644 index e377121d54a07a..00000000000000 --- a/ports/boost-throw-exception/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-throw-exception -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/throw_exception -Description: Boost throw_exception module diff --git a/ports/boost-throw-exception/vcpkg.json b/ports/boost-throw-exception/vcpkg.json new file mode 100644 index 00000000000000..b32ea2c12b7609 --- /dev/null +++ b/ports/boost-throw-exception/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "boost-throw-exception", + "version-string": "1.75.0", + "description": "Boost throw_exception module", + "homepage": "https://github.com/boostorg/throw_exception", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-timer/CONTROL b/ports/boost-timer/CONTROL deleted file mode 100644 index 76b5d2344b1333..00000000000000 --- a/ports/boost-timer/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-timer -Version: 1.75.0 -Build-Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-predef, boost-system, boost-throw-exception, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/timer -Description: Boost timer module diff --git a/ports/boost-timer/vcpkg.json b/ports/boost-timer/vcpkg.json new file mode 100644 index 00000000000000..2f9944cbb6da72 --- /dev/null +++ b/ports/boost-timer/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "boost-timer", + "version-string": "1.75.0", + "description": "Boost timer module", + "homepage": "https://github.com/boostorg/timer", + "dependencies": [ + "boost-build", + "boost-chrono", + "boost-compatibility", + "boost-config", + "boost-core", + "boost-integer", + "boost-io", + "boost-modular-build-helper", + "boost-predef", + "boost-system", + "boost-throw-exception", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-tokenizer/CONTROL b/ports/boost-tokenizer/CONTROL deleted file mode 100644 index 7f436c1aa3b886..00000000000000 --- a/ports/boost-tokenizer/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-tokenizer -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/tokenizer -Description: Boost tokenizer module diff --git a/ports/boost-tokenizer/vcpkg.json b/ports/boost-tokenizer/vcpkg.json new file mode 100644 index 00000000000000..3b52cc9a142e73 --- /dev/null +++ b/ports/boost-tokenizer/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-tokenizer", + "version-string": "1.75.0", + "description": "Boost tokenizer module", + "homepage": "https://github.com/boostorg/tokenizer", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-detail", + "boost-iterator", + "boost-mpl", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-tti/CONTROL b/ports/boost-tti/CONTROL deleted file mode 100644 index 40aad5ea5ecd79..00000000000000 --- a/ports/boost-tti/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-tti -Version: 1.75.0 -Build-Depends: boost-config, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/tti -Description: Boost tti module diff --git a/ports/boost-tti/vcpkg.json b/ports/boost-tti/vcpkg.json new file mode 100644 index 00000000000000..aebf9f124ea167 --- /dev/null +++ b/ports/boost-tti/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-tti", + "version-string": "1.75.0", + "description": "Boost tti module", + "homepage": "https://github.com/boostorg/tti", + "dependencies": [ + "boost-config", + "boost-detail", + "boost-function-types", + "boost-mpl", + "boost-preprocessor", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-tuple/CONTROL b/ports/boost-tuple/CONTROL deleted file mode 100644 index 3c13674bebb81d..00000000000000 --- a/ports/boost-tuple/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-tuple -Version: 1.75.0 -Build-Depends: boost-config, boost-core, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/tuple -Description: Boost tuple module diff --git a/ports/boost-tuple/vcpkg.json b/ports/boost-tuple/vcpkg.json new file mode 100644 index 00000000000000..832c954651227a --- /dev/null +++ b/ports/boost-tuple/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-tuple", + "version-string": "1.75.0", + "description": "Boost tuple module", + "homepage": "https://github.com/boostorg/tuple", + "dependencies": [ + "boost-config", + "boost-core", + "boost-static-assert", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-type-erasure/CONTROL b/ports/boost-type-erasure/CONTROL deleted file mode 100644 index 7f2bdf24f955ee..00000000000000 --- a/ports/boost-type-erasure/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-type-erasure -Version: 1.75.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-fusion, boost-iterator, boost-modular-build-helper, boost-mp11, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-thread, boost-throw-exception, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers, boost-vmd -Homepage: https://github.com/boostorg/type_erasure -Description: Boost type_erasure module diff --git a/ports/boost-type-erasure/vcpkg.json b/ports/boost-type-erasure/vcpkg.json new file mode 100644 index 00000000000000..2af0eddf8866e9 --- /dev/null +++ b/ports/boost-type-erasure/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "boost-type-erasure", + "version-string": "1.75.0", + "description": "Boost type_erasure module", + "homepage": "https://github.com/boostorg/type_erasure", + "dependencies": [ + "boost-assert", + "boost-build", + "boost-config", + "boost-detail", + "boost-fusion", + "boost-iterator", + "boost-modular-build-helper", + "boost-mp11", + "boost-mpl", + "boost-preprocessor", + "boost-smart-ptr", + "boost-thread", + "boost-throw-exception", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers", + "boost-vmd" + ] +} diff --git a/ports/boost-type-index/CONTROL b/ports/boost-type-index/CONTROL deleted file mode 100644 index 14ce61d3fa4df4..00000000000000 --- a/ports/boost-type-index/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-type-index -Version: 1.75.0 -Build-Depends: boost-config, boost-container-hash, boost-core, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/type_index -Description: Boost type_index module diff --git a/ports/boost-type-index/vcpkg.json b/ports/boost-type-index/vcpkg.json new file mode 100644 index 00000000000000..7f9a1931ec019d --- /dev/null +++ b/ports/boost-type-index/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-type-index", + "version-string": "1.75.0", + "description": "Boost type_index module", + "homepage": "https://github.com/boostorg/type_index", + "dependencies": [ + "boost-config", + "boost-container-hash", + "boost-core", + "boost-preprocessor", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-type-traits/CONTROL b/ports/boost-type-traits/CONTROL deleted file mode 100644 index d54f2588baedff..00000000000000 --- a/ports/boost-type-traits/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-type-traits -Version: 1.75.0 -Build-Depends: boost-config, boost-detail, boost-static-assert, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/type_traits -Description: Boost type_traits module diff --git a/ports/boost-type-traits/vcpkg.json b/ports/boost-type-traits/vcpkg.json new file mode 100644 index 00000000000000..8033416b8399c2 --- /dev/null +++ b/ports/boost-type-traits/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "boost-type-traits", + "version-string": "1.75.0", + "description": "Boost type_traits module", + "homepage": "https://github.com/boostorg/type_traits", + "dependencies": [ + "boost-config", + "boost-detail", + "boost-static-assert", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-typeof/CONTROL b/ports/boost-typeof/CONTROL deleted file mode 100644 index 2ebd24a3843e31..00000000000000 --- a/ports/boost-typeof/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-typeof -Version: 1.75.0 -Build-Depends: boost-config, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/typeof -Description: Boost typeof module diff --git a/ports/boost-typeof/vcpkg.json b/ports/boost-typeof/vcpkg.json new file mode 100644 index 00000000000000..f69177c5a7d86b --- /dev/null +++ b/ports/boost-typeof/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "boost-typeof", + "version-string": "1.75.0", + "description": "Boost typeof module", + "homepage": "https://github.com/boostorg/typeof", + "dependencies": [ + "boost-config", + "boost-preprocessor", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-ublas/CONTROL b/ports/boost-ublas/CONTROL deleted file mode 100644 index 9d21f865f3fb79..00000000000000 --- a/ports/boost-ublas/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-ublas -Version: 1.75.0 -Build-Depends: boost-compute, boost-concept-check, boost-config, boost-core, boost-iterator, boost-mpl, boost-range, boost-serialization, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/ublas -Description: Boost ublas module diff --git a/ports/boost-ublas/vcpkg.json b/ports/boost-ublas/vcpkg.json new file mode 100644 index 00000000000000..9c63a113170c00 --- /dev/null +++ b/ports/boost-ublas/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "boost-ublas", + "version-string": "1.75.0", + "description": "Boost ublas module", + "homepage": "https://github.com/boostorg/ublas", + "dependencies": [ + "boost-compute", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-iterator", + "boost-mpl", + "boost-range", + "boost-serialization", + "boost-smart-ptr", + "boost-static-assert", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-uninstall/CONTROL b/ports/boost-uninstall/CONTROL deleted file mode 100644 index ee449a66a405c6..00000000000000 --- a/ports/boost-uninstall/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: boost-uninstall -Version: 1.75.0 -Homepage: https://boost.org -Description: boost uninstall port \ No newline at end of file diff --git a/ports/boost-uninstall/vcpkg.json b/ports/boost-uninstall/vcpkg.json new file mode 100644 index 00000000000000..f419d200ff3bf9 --- /dev/null +++ b/ports/boost-uninstall/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "boost-uninstall", + "version-string": "1.75.0", + "description": "boost uninstall port", + "homepage": "https://boost.org" +} diff --git a/ports/boost-units/CONTROL b/ports/boost-units/CONTROL deleted file mode 100644 index 2fc92c6d9340b8..00000000000000 --- a/ports/boost-units/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-units -Version: 1.75.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-io, boost-lambda, boost-math, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/units -Description: Boost units module diff --git a/ports/boost-units/vcpkg.json b/ports/boost-units/vcpkg.json new file mode 100644 index 00000000000000..15b5d9eabb03cc --- /dev/null +++ b/ports/boost-units/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "boost-units", + "version-string": "1.75.0", + "description": "Boost units module", + "homepage": "https://github.com/boostorg/units", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-integer", + "boost-io", + "boost-lambda", + "boost-math", + "boost-mpl", + "boost-preprocessor", + "boost-serialization", + "boost-static-assert", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-unordered/CONTROL b/ports/boost-unordered/CONTROL deleted file mode 100644 index 1220a6af2332a0..00000000000000 --- a/ports/boost-unordered/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-unordered -Version: 1.75.0 -Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container, boost-container-hash, boost-core, boost-detail, boost-functional, boost-move, boost-predef, boost-preprocessor, boost-smart-ptr, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/unordered -Description: Boost unordered module diff --git a/ports/boost-unordered/vcpkg.json b/ports/boost-unordered/vcpkg.json new file mode 100644 index 00000000000000..4b65536cac373c --- /dev/null +++ b/ports/boost-unordered/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "boost-unordered", + "version-string": "1.75.0", + "description": "Boost unordered module", + "homepage": "https://github.com/boostorg/unordered", + "dependencies": [ + "boost-assert", + "boost-compatibility", + "boost-config", + "boost-container", + "boost-container-hash", + "boost-core", + "boost-detail", + "boost-functional", + "boost-move", + "boost-predef", + "boost-preprocessor", + "boost-smart-ptr", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-utility/CONTROL b/ports/boost-utility/CONTROL deleted file mode 100644 index 0d7f03b4e7d28b..00000000000000 --- a/ports/boost-utility/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-utility -Version: 1.75.0 -Build-Depends: boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-io, boost-preprocessor, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/utility -Description: Boost utility module diff --git a/ports/boost-utility/vcpkg.json b/ports/boost-utility/vcpkg.json new file mode 100644 index 00000000000000..1370bd4ac1f92c --- /dev/null +++ b/ports/boost-utility/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "boost-utility", + "version-string": "1.75.0", + "description": "Boost utility module", + "homepage": "https://github.com/boostorg/utility", + "dependencies": [ + "boost-config", + "boost-container-hash", + "boost-core", + "boost-detail", + "boost-integer", + "boost-io", + "boost-preprocessor", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-uuid/CONTROL b/ports/boost-uuid/CONTROL deleted file mode 100644 index ce631c7e1751a4..00000000000000 --- a/ports/boost-uuid/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-uuid -Version: 1.75.0 -Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container-hash, boost-conversion, boost-core, boost-integer, boost-io, boost-move, boost-numeric-conversion, boost-predef, boost-random, boost-serialization, boost-static-assert, boost-throw-exception, boost-tti, boost-type-traits, boost-vcpkg-helpers, boost-winapi -Homepage: https://github.com/boostorg/uuid -Description: Boost uuid module diff --git a/ports/boost-uuid/vcpkg.json b/ports/boost-uuid/vcpkg.json new file mode 100644 index 00000000000000..71664c694eaadf --- /dev/null +++ b/ports/boost-uuid/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "boost-uuid", + "version-string": "1.75.0", + "description": "Boost uuid module", + "homepage": "https://github.com/boostorg/uuid", + "dependencies": [ + "boost-assert", + "boost-compatibility", + "boost-config", + "boost-container-hash", + "boost-conversion", + "boost-core", + "boost-integer", + "boost-io", + "boost-move", + "boost-numeric-conversion", + "boost-predef", + "boost-random", + "boost-serialization", + "boost-static-assert", + "boost-throw-exception", + "boost-tti", + "boost-type-traits", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/ports/boost-variant/CONTROL b/ports/boost-variant/CONTROL deleted file mode 100644 index 89039e8ca420e1..00000000000000 --- a/ports/boost-variant/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-variant -Version: 1.75.0 -Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-move, boost-mpl, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/variant -Description: Boost variant module diff --git a/ports/boost-variant/vcpkg.json b/ports/boost-variant/vcpkg.json new file mode 100644 index 00000000000000..b22a988c91b1ff --- /dev/null +++ b/ports/boost-variant/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "boost-variant", + "version-string": "1.75.0", + "description": "Boost variant module", + "homepage": "https://github.com/boostorg/variant", + "dependencies": [ + "boost-assert", + "boost-bind", + "boost-config", + "boost-core", + "boost-detail", + "boost-functional", + "boost-integer", + "boost-move", + "boost-mpl", + "boost-preprocessor", + "boost-static-assert", + "boost-throw-exception", + "boost-type-index", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-variant2/CONTROL b/ports/boost-variant2/CONTROL deleted file mode 100644 index 9c12dd2b81da5f..00000000000000 --- a/ports/boost-variant2/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-variant2 -Version: 1.75.0 -Build-Depends: boost-config, boost-detail, boost-integer, boost-mp11, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/variant2 -Description: Boost variant2 module diff --git a/ports/boost-variant2/vcpkg.json b/ports/boost-variant2/vcpkg.json new file mode 100644 index 00000000000000..4c9b060f691fd8 --- /dev/null +++ b/ports/boost-variant2/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "boost-variant2", + "version-string": "1.75.0", + "description": "Boost variant2 module", + "homepage": "https://github.com/boostorg/variant2", + "dependencies": [ + "boost-config", + "boost-detail", + "boost-integer", + "boost-mp11", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-vcpkg-helpers/CONTROL b/ports/boost-vcpkg-helpers/CONTROL deleted file mode 100644 index e2c97b035302f5..00000000000000 --- a/ports/boost-vcpkg-helpers/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: boost-vcpkg-helpers -Version: 7 -Port-Version: 2 -Description: a set of vcpkg-internal scripts used to modularize boost -Build-Depends: boost-uninstall \ No newline at end of file diff --git a/ports/boost-vcpkg-helpers/vcpkg.json b/ports/boost-vcpkg-helpers/vcpkg.json new file mode 100644 index 00000000000000..d22659efc64678 --- /dev/null +++ b/ports/boost-vcpkg-helpers/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "boost-vcpkg-helpers", + "version-string": "7", + "port-version": 2, + "description": "a set of vcpkg-internal scripts used to modularize boost", + "dependencies": [ + "boost-uninstall" + ] +} diff --git a/ports/boost-vmd/CONTROL b/ports/boost-vmd/CONTROL deleted file mode 100644 index e5ac72f200de26..00000000000000 --- a/ports/boost-vmd/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-vmd -Version: 1.75.0 -Build-Depends: boost-preprocessor, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/vmd -Description: Boost vmd module diff --git a/ports/boost-vmd/vcpkg.json b/ports/boost-vmd/vcpkg.json new file mode 100644 index 00000000000000..126c0a6acad1dc --- /dev/null +++ b/ports/boost-vmd/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-vmd", + "version-string": "1.75.0", + "description": "Boost vmd module", + "homepage": "https://github.com/boostorg/vmd", + "dependencies": [ + "boost-preprocessor", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-wave/CONTROL b/ports/boost-wave/CONTROL deleted file mode 100644 index 9cc3184268403b..00000000000000 --- a/ports/boost-wave/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-wave -Version: 1.75.0 -Build-Depends: boost-assert, boost-build, boost-concept-check, boost-config, boost-core, boost-detail, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-multi-index, boost-optional, boost-pool, boost-preprocessor, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/wave -Description: Boost wave module -Supports: !uwp diff --git a/ports/boost-wave/vcpkg.json b/ports/boost-wave/vcpkg.json new file mode 100644 index 00000000000000..556c1449bbb764 --- /dev/null +++ b/ports/boost-wave/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "boost-wave", + "version-string": "1.75.0", + "description": "Boost wave module", + "homepage": "https://github.com/boostorg/wave", + "supports": "!uwp", + "dependencies": [ + "boost-assert", + "boost-build", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-detail", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-integer", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-modular-build-helper", + "boost-mpl", + "boost-multi-index", + "boost-optional", + "boost-pool", + "boost-preprocessor", + "boost-serialization", + "boost-smart-ptr", + "boost-spirit", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-winapi/CONTROL b/ports/boost-winapi/CONTROL deleted file mode 100644 index 2497d0eed539a9..00000000000000 --- a/ports/boost-winapi/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-winapi -Version: 1.75.0 -Build-Depends: boost-config, boost-predef, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/winapi -Description: Boost winapi module diff --git a/ports/boost-winapi/vcpkg.json b/ports/boost-winapi/vcpkg.json new file mode 100644 index 00000000000000..baf2b9c0d22cee --- /dev/null +++ b/ports/boost-winapi/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "boost-winapi", + "version-string": "1.75.0", + "description": "Boost winapi module", + "homepage": "https://github.com/boostorg/winapi", + "dependencies": [ + "boost-config", + "boost-predef", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-xpressive/CONTROL b/ports/boost-xpressive/CONTROL deleted file mode 100644 index d0c8cf93dd302b..00000000000000 --- a/ports/boost-xpressive/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-xpressive -Version: 1.75.0 -Build-Depends: boost-assert, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-exception, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-type-traits, boost-typeof, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/xpressive -Description: Boost xpressive module diff --git a/ports/boost-xpressive/vcpkg.json b/ports/boost-xpressive/vcpkg.json new file mode 100644 index 00000000000000..8a27ba751d6767 --- /dev/null +++ b/ports/boost-xpressive/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "boost-xpressive", + "version-string": "1.75.0", + "description": "Boost xpressive module", + "homepage": "https://github.com/boostorg/xpressive", + "dependencies": [ + "boost-assert", + "boost-compatibility", + "boost-config", + "boost-conversion", + "boost-core", + "boost-detail", + "boost-exception", + "boost-fusion", + "boost-integer", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-mpl", + "boost-numeric-conversion", + "boost-optional", + "boost-preprocessor", + "boost-proto", + "boost-range", + "boost-smart-ptr", + "boost-spirit", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-yap/CONTROL b/ports/boost-yap/CONTROL deleted file mode 100644 index c1fcf50f703535..00000000000000 --- a/ports/boost-yap/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost-yap -Version: 1.75.0 -Build-Depends: boost-hana, boost-preprocessor, boost-type-index, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/yap -Description: Boost yap module diff --git a/ports/boost-yap/vcpkg.json b/ports/boost-yap/vcpkg.json new file mode 100644 index 00000000000000..58d2c84dfac9b0 --- /dev/null +++ b/ports/boost-yap/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "boost-yap", + "version-string": "1.75.0", + "description": "Boost yap module", + "homepage": "https://github.com/boostorg/yap", + "dependencies": [ + "boost-hana", + "boost-preprocessor", + "boost-type-index", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL deleted file mode 100644 index e26a30796d2312..00000000000000 --- a/ports/boost/CONTROL +++ /dev/null @@ -1,11 +0,0 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 -Source: boost -Version: 1.75.0 -Port-Version: -Homepage: https://boost.org -Description: Peer-reviewed portable C++ source libraries -Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio (!emscripten), boost-assert, boost-assign, boost-atomic, boost-beast (!emscripten), boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-context (!uwp&!emscripten), boost-contract, boost-conversion, boost-convert, boost-core, boost-coroutine (!arm&!uwp&!emscripten), boost-coroutine2 (!emscripten), boost-crc, boost-date-time, boost-detail, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (!osx&!uwp&!arm&!emscripten), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-function-types, boost-functional, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-histogram, boost-hof, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-json, boost-lambda, boost-leaf, boost-lexical-cast, boost-local-function, boost-locale (!uwp), boost-lockfree, boost-log (!uwp&!emscripten), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multi-array, boost-multi-index, boost-multiprecision, boost-nowide, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-optional, boost-outcome, boost-parameter, boost-parameter-python (!emscripten), boost-pfr, boost-phoenix, boost-poly-collection, boost-polygon, boost-pool, boost-predef, boost-preprocessor, boost-process (!emscripten), boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (!uwp&!(arm&windows)&!emscripten), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-scope-exit, boost-serialization, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-static-string, boost-stl-interfaces, boost-system, boost-test (!uwp), boost-thread, boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-type-erasure, boost-type-index, boost-type-traits, boost-typeof, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-variant2, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap - -Feature: mpi -Description: Build with MPI support -Build-Depends: boost-mpi diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json new file mode 100644 index 00000000000000..eecff5fbcf1ec8 --- /dev/null +++ b/ports/boost/vcpkg.json @@ -0,0 +1,210 @@ +{ + "name": "boost", + "version-string": "1.75.0", + "description": "Peer-reviewed portable C++ source libraries", + "homepage": "https://boost.org", + "dependencies": [ + "boost-accumulators", + "boost-algorithm", + "boost-align", + "boost-any", + "boost-array", + { + "name": "boost-asio", + "platform": "!emscripten" + }, + "boost-assert", + "boost-assign", + "boost-atomic", + { + "name": "boost-beast", + "platform": "!emscripten" + }, + "boost-bimap", + "boost-bind", + "boost-callable-traits", + "boost-chrono", + "boost-circular-buffer", + "boost-compatibility", + "boost-compute", + "boost-concept-check", + "boost-config", + "boost-container", + "boost-container-hash", + { + "name": "boost-context", + "platform": "!uwp & !emscripten" + }, + "boost-contract", + "boost-conversion", + "boost-convert", + "boost-core", + { + "name": "boost-coroutine", + "platform": "!arm & !uwp & !emscripten" + }, + { + "name": "boost-coroutine2", + "platform": "!emscripten" + }, + "boost-crc", + "boost-date-time", + "boost-detail", + "boost-dll", + "boost-dynamic-bitset", + "boost-endian", + "boost-exception", + { + "name": "boost-fiber", + "platform": "!osx & !uwp & !arm & !emscripten" + }, + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-flyweight", + "boost-foreach", + "boost-format", + "boost-function", + "boost-function-types", + "boost-functional", + "boost-fusion", + "boost-geometry", + "boost-gil", + "boost-graph", + "boost-graph-parallel", + "boost-hana", + "boost-heap", + "boost-histogram", + "boost-hof", + "boost-icl", + "boost-integer", + "boost-interprocess", + "boost-interval", + "boost-interval", + "boost-intrusive", + "boost-io", + { + "name": "boost-iostreams", + "platform": "!uwp" + }, + "boost-iterator", + "boost-json", + "boost-lambda", + "boost-leaf", + "boost-lexical-cast", + "boost-local-function", + { + "name": "boost-locale", + "platform": "!uwp" + }, + "boost-lockfree", + { + "name": "boost-log", + "platform": "!uwp & !emscripten" + }, + "boost-logic", + "boost-math", + "boost-metaparse", + "boost-move", + "boost-mp11", + "boost-mpl", + "boost-msm", + "boost-multi-array", + "boost-multi-index", + "boost-multiprecision", + "boost-nowide", + "boost-numeric-conversion", + "boost-numeric-conversion", + "boost-odeint", + "boost-odeint", + "boost-optional", + "boost-outcome", + "boost-parameter", + { + "name": "boost-parameter-python", + "platform": "!emscripten" + }, + "boost-pfr", + "boost-phoenix", + "boost-poly-collection", + "boost-polygon", + "boost-pool", + "boost-predef", + "boost-preprocessor", + { + "name": "boost-process", + "platform": "!emscripten" + }, + "boost-program-options", + "boost-property-map", + "boost-property-tree", + "boost-proto", + "boost-ptr-container", + { + "name": "boost-python", + "platform": "!uwp & !(arm & windows) & !emscripten" + }, + "boost-qvm", + "boost-random", + "boost-range", + "boost-ratio", + "boost-rational", + "boost-regex", + "boost-safe-numerics", + "boost-safe-numerics", + "boost-scope-exit", + "boost-serialization", + "boost-signals2", + "boost-smart-ptr", + "boost-sort", + "boost-spirit", + { + "name": "boost-stacktrace", + "platform": "!uwp" + }, + "boost-statechart", + "boost-static-assert", + "boost-static-string", + "boost-stl-interfaces", + "boost-system", + { + "name": "boost-test", + "platform": "!uwp" + }, + "boost-thread", + "boost-throw-exception", + "boost-timer", + "boost-tokenizer", + "boost-tti", + "boost-tuple", + "boost-type-erasure", + "boost-type-index", + "boost-type-traits", + "boost-typeof", + "boost-ublas", + "boost-ublas", + "boost-units", + "boost-unordered", + "boost-utility", + "boost-uuid", + "boost-variant", + "boost-variant2", + "boost-vmd", + { + "name": "boost-wave", + "platform": "!uwp" + }, + "boost-winapi", + "boost-xpressive", + "boost-yap" + ], + "features": { + "mpi": { + "description": "Build with MPI support", + "dependencies": [ + "boost-mpi" + ] + } + } +} diff --git a/ports/caf/CONTROL b/ports/caf/CONTROL deleted file mode 100644 index 964096bf15d1e5..00000000000000 --- a/ports/caf/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: caf -Version: 0.17.6 -Port-Version: 1 -Homepage: https://github.com/actor-framework/actor-framework -Build-Depends: openssl -Description: an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more. diff --git a/ports/caf/vcpkg.json b/ports/caf/vcpkg.json new file mode 100644 index 00000000000000..c0dad8bd06d8a6 --- /dev/null +++ b/ports/caf/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "caf", + "version-string": "0.17.6", + "port-version": 1, + "description": "an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.", + "homepage": "https://github.com/actor-framework/actor-framework", + "dependencies": [ + "openssl" + ] +} diff --git a/ports/clapack/CONTROL b/ports/clapack/CONTROL deleted file mode 100644 index f24dee073da3b7..00000000000000 --- a/ports/clapack/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: clapack -Version: 3.2.1 -Port-Version: 16 -Homepage: https://www.netlib.org/clapack -Description: CLAPACK (f2c'ed version of LAPACK) -Build-Depends: blas diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json new file mode 100644 index 00000000000000..7d7c90a419829d --- /dev/null +++ b/ports/clapack/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "clapack", + "version-string": "3.2.1", + "port-version": 16, + "description": "CLAPACK (f2c'ed version of LAPACK)", + "homepage": "https://www.netlib.org/clapack", + "dependencies": [ + "blas" + ] +} diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL deleted file mode 100644 index c5a8ee3192c7be..00000000000000 --- a/ports/google-cloud-cpp/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: google-cloud-cpp -Version: 1.22.0 -Build-Depends: abseil, grpc, curl[ssl], crc32c, nlohmann-json -Description: C++ Client Libraries for Google Cloud Platform APIs. -Homepage: https://github.com/googleapis/google-cloud-cpp -Supports: !uwp diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json new file mode 100644 index 00000000000000..ddc2b1ac8e50b3 --- /dev/null +++ b/ports/google-cloud-cpp/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "google-cloud-cpp", + "version-string": "1.22.0", + "description": "C++ Client Libraries for Google Cloud Platform APIs.", + "homepage": "https://github.com/googleapis/google-cloud-cpp", + "supports": "!uwp", + "dependencies": [ + "abseil", + "crc32c", + { + "name": "curl", + "features": [ + "ssl" + ] + }, + "grpc", + "nlohmann-json" + ] +} diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL deleted file mode 100644 index 208332e5322048..00000000000000 --- a/ports/grpc/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: grpc -Version: 1.33.1 -Port-Version: 2 -Build-Depends: zlib, openssl, protobuf, c-ares (!uwp), upb, abseil, re2 -Homepage: https://github.com/grpc/grpc -Description: An RPC library and framework - -Feature: absl-sync -Description: Use abseil synchronization module diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json new file mode 100644 index 00000000000000..0a180bea0a1b51 --- /dev/null +++ b/ports/grpc/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "grpc", + "version-string": "1.33.1", + "port-version": 2, + "description": "An RPC library and framework", + "homepage": "https://github.com/grpc/grpc", + "dependencies": [ + "abseil", + { + "name": "c-ares", + "platform": "!uwp" + }, + "openssl", + "protobuf", + "re2", + "upb", + "zlib" + ], + "features": { + "absl-sync": { + "description": "Use abseil synchronization module" + } + } +} diff --git a/ports/nettle/CONTROL b/ports/nettle/CONTROL deleted file mode 100644 index 1fe47b5a21960b..00000000000000 --- a/ports/nettle/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: nettle -Version: 3.6 -Homepage: https://git.lysator.liu.se/nettle/nettle -Description: Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space. -Build-Depends: gmp, vs-yasm (windows), yasm-tool-helper (windows) diff --git a/ports/nettle/vcpkg.json b/ports/nettle/vcpkg.json new file mode 100644 index 00000000000000..72df593ce020db --- /dev/null +++ b/ports/nettle/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "nettle", + "version-string": "3.6", + "description": "Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.", + "homepage": "https://git.lysator.liu.se/nettle/nettle", + "dependencies": [ + "gmp", + { + "name": "vs-yasm", + "platform": "windows" + }, + { + "name": "yasm-tool-helper", + "platform": "windows" + } + ] +} diff --git a/ports/proj4/CONTROL b/ports/proj4/CONTROL deleted file mode 100644 index 6a5133f10d2968..00000000000000 --- a/ports/proj4/CONTROL +++ /dev/null @@ -1,18 +0,0 @@ -Source: proj4 -Version: 7.2.0 -Homepage: https://github.com/OSGeo/PROJ -Description: PROJ.4 library for cartographic projections -Build-Depends: sqlite3[core] -Default-Features: database,tiff - -Feature: tiff -Build-Depends: tiff -Description: Enable TIFF support to read some grids - -Feature: database -Build-Depends: sqlite3[tool] (!uwp&!arm) -Description: generate database - -Feature: tools -Build-Depends: curl -Description: generate tools diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json new file mode 100644 index 00000000000000..778020fd46a9eb --- /dev/null +++ b/ports/proj4/vcpkg.json @@ -0,0 +1,42 @@ +{ + "name": "proj4", + "version-string": "7.2.0", + "description": "PROJ.4 library for cartographic projections", + "homepage": "https://github.com/OSGeo/PROJ", + "dependencies": [ + { + "name": "sqlite3", + "default-features": false + } + ], + "default-features": [ + "database", + "tiff" + ], + "features": { + "database": { + "description": "generate database", + "dependencies": [ + { + "name": "sqlite3", + "features": [ + "tool" + ], + "platform": "!uwp & !arm" + } + ] + }, + "tiff": { + "description": "Enable TIFF support to read some grids", + "dependencies": [ + "tiff" + ] + }, + "tools": { + "description": "generate tools", + "dependencies": [ + "curl" + ] + } + } +} diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL deleted file mode 100644 index 967503724c472e..00000000000000 --- a/ports/protobuf/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: protobuf -Version: 3.14.0 -Port-Version: 1 -Homepage: https://github.com/protocolbuffers/protobuf -Description: Protocol Buffers - Google's data interchange format - -Feature: zlib -Description: ZLib based features like Gzip streams -Build-Depends: zlib diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json new file mode 100644 index 00000000000000..fef05b79ddb544 --- /dev/null +++ b/ports/protobuf/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "protobuf", + "version-string": "3.14.0", + "port-version": 1, + "description": "Protocol Buffers - Google's data interchange format", + "homepage": "https://github.com/protocolbuffers/protobuf", + "features": { + "zlib": { + "description": "ZLib based features like Gzip streams", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL deleted file mode 100644 index 00a2e442cce4cb..00000000000000 --- a/ports/qt5-base/CONTROL +++ /dev/null @@ -1,13 +0,0 @@ -Source: qt5-base -Version: 5.15.1 -Port-Version: 4 -Homepage: https://www.qt.io/ -Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, zstd, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) - -Feature: latest -Description: Build latest qt version (5.15.1) instead of LTS (latest and LTS are currently the same) - -Feature: mysqlplugin -Build-Depends: libmysql -Description: Build the sql plugin for connecting to mysql databases diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json new file mode 100644 index 00000000000000..16827c1321e3a1 --- /dev/null +++ b/ports/qt5-base/vcpkg.json @@ -0,0 +1,44 @@ +{ + "name": "qt5-base", + "version-string": "5.15.1", + "port-version": 4, + "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "angle", + "platform": "!windows" + }, + "double-conversion", + "egl-registry", + { + "name": "fontconfig", + "platform": "!windows" + }, + "freetype", + "harfbuzz", + { + "name": "icu", + "platform": "!uwp" + }, + "libjpeg-turbo", + "libpng", + "libpq", + "openssl", + "pcre2", + "sqlite3", + "zlib", + "zstd" + ], + "features": { + "latest": { + "description": "Build latest qt version (5.15.1) instead of LTS (latest and LTS are currently the same)" + }, + "mysqlplugin": { + "description": "Build the sql plugin for connecting to mysql databases", + "dependencies": [ + "libmysql" + ] + } + } +} diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index afa7d64da8758e..f3620aa73e00c6 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -16,15 +16,19 @@ if ($null -eq $portsDir) if ($IsWindows) { $vcpkg = "$scriptsDir/../../vcpkg.exe" + $curl = "curl.exe" } else { $vcpkg = "$scriptsDir/../../vcpkg" + $curl = "curl" } -# Optionally clear this array when moving to a new boost version +# Clear this array when moving to a new boost version $port_versions = @{ #e.g. "asio" = 1; + "asio" = 1; + "python" = 1; } $per_port_data = @{ @@ -42,25 +46,32 @@ $per_port_data = @{ "log" = @{ "supports" = "!uwp&!emscripten" }; "locale" = @{ "supports" = "!uwp"; - "features" = @( - "Feature: icu" - "Build-Depends: icu" - "Description: ICU backend for Boost.Locale" - )}; + "features" = @{ + icu=@{ + dependencies=@("icu") + description="ICU backend for Boost.Locale" + } + } + }; "parameter-python" = @{ "supports" = "!emscripten" }; "process" = @{ "supports" = "!emscripten" }; "python" = @{ "supports" = "!uwp&!(arm&windows)&!emscripten"; - "features" = @( - "Feature: python2" - "Build-Depends: python2 (windows)" - "Description: Build with Python2 support" - )}; - "regex" = @{ "features" = @( - "Feature: icu" - "Build-Depends: icu" - "Description: ICU backend for Boost.Regex" - )} + "features" = @{ + python2=@{ + dependencies=@(@{name="python2"; platform="windows"}) + description="Build with Python2 support" + } + } + }; + "regex" = @{ + "features" = @{ + icu=@{ + dependencies=@("icu") + description="ICU backend for Boost.Regex" + } + } + } } function TransformReference() @@ -71,11 +82,11 @@ function TransformReference() if ($per_port_data[$library].supports) { - "$library ($($per_port_data[$library].supports))" + @{name="boost-$library"; platform=$per_port_data[$library].supports} } else { - "$library" + "boost-$library" } } @@ -89,32 +100,25 @@ function Generate() $Depends = @() ) - $controlDeps = ($Depends | sort) -join ", " - - mkdir "$portsDir/boost-$PortName" -erroraction SilentlyContinue | out-null - $controlLines = @( - "# Automatically generated by scripts/boost/generate-ports.ps1" - "Source: boost-$PortName" - "Version: $version" - ) - if ($port_versions[$PortName]) - { - $controlLines += @("Port-Version: $($port_versions[$PortName])") + New-Item -ItemType "Directory" "$portsDir/boost-$PortName" -erroraction SilentlyContinue | out-null + $controlLines = @{ + name="boost-$PortName"; ` + "version-string"=$version; ` + dependencies=$Depends; ` + homepage="https://github.com/boostorg/$Name"; ` + description="Boost $Name module" ` } - $controlLines += @( - "Build-Depends: $controlDeps" - "Homepage: https://github.com/boostorg/$Name" - "Description: Boost $Name module" - ) - if ($per_port_data[$PortName].supports) + if ($port_versions[$PortName]) { - $controlLines += @("Supports: $($per_port_data[$PortName].supports)") + $controlLines["port-version"] = $port_versions[$PortName] } - if ($per_port_data[$PortName].features) + + if ($per_port_data[$PortName]) { - $controlLines += @("") + $per_port_data[$PortName].features + $controlLines += $per_port_data[$PortName] } - $controlLines | out-file -enc ascii "$portsDir/boost-$PortName/CONTROL" + $controlLines | ConvertTo-Json -Depth 10 -Compress | out-file -enc ascii "$portsDir/boost-$PortName/vcpkg.json" + & $vcpkg format-manifest "$portsDir/boost-$PortName/vcpkg.json" $portfileLines = @( "# Automatically generated by scripts/boost/generate-ports.ps1" @@ -137,7 +141,7 @@ function Generate() " SHA512 $Hash" " HEAD_REF master" ) - $patches = ls $portsDir/boost-$PortName/*.patch + $patches = Get-ChildItem $portsDir/boost-$PortName/*.patch if ($patches.Count -eq 0) { } @@ -210,7 +214,8 @@ function Generate() $portfileLines += @(get-content "$scriptsDir/post-build-stubs/$PortName.cmake") } - $portfileLines | out-file -enc ascii "$portsDir/boost-$PortName/portfile.cmake" + $portfileLines += @("") + $($portfileLines -join "`r`n") | out-file -enc ascii "$portsDir/boost-$PortName/portfile.cmake" -NoNewline } if (!(Test-Path "$scriptsDir/boost")) @@ -240,7 +245,7 @@ else } } -$libraries_found = ls $scriptsDir/boost/libs -directory | % name | % { +$libraries_found = Get-ChildItem $scriptsDir/boost/libs -directory | % name | % { if ($_ -match "numeric") { "numeric_conversion" @@ -258,7 +263,7 @@ $libraries_found = ls $scriptsDir/boost/libs -directory | % name | % { } } -mkdir $scriptsDir/downloads -erroraction SilentlyContinue | out-null +New-Item -ItemType "Directory" $scriptsDir/downloads -erroraction SilentlyContinue | out-null if ($libraries.Length -eq 0) { @@ -274,14 +279,14 @@ foreach ($library in $libraries) if (!(Test-Path $archive)) { "Downloading boost/$library..." - & @(& $vcpkg fetch aria2)[-1] "https://github.com/boostorg/$library/archive/boost-$version.tar.gz" -d "$scriptsDir/downloads" -o "$library-boost-$version.tar.gz" + & $curl -L "https://github.com/boostorg/$library/archive/boost-$version.tar.gz" --output "$scriptsDir/downloads/$library-boost-$version.tar.gz" } $hash = & $vcpkg hash $archive $unpacked = "$scriptsDir/libs/$library-boost-$version" if (!(Test-Path $unpacked)) { "Unpacking boost/$library..." - mkdir $scriptsDir/libs -erroraction SilentlyContinue | out-null + New-Item -ItemType "Directory" $scriptsDir/libs -erroraction SilentlyContinue | out-null pushd $scriptsDir/libs try { @@ -295,12 +300,22 @@ foreach ($library in $libraries) pushd $unpacked try { - $groups = $( - findstr /si /C:"include Date: Wed, 13 Jan 2021 21:12:34 -0300 Subject: [PATCH 0477/1694] [graphicsmagick] update to version 1.3.36 (#15600) --- ports/graphicsmagick/CMakeLists.txt | 1 + ports/graphicsmagick/CONTROL | 3 +-- ports/graphicsmagick/portfile.cmake | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/graphicsmagick/CMakeLists.txt b/ports/graphicsmagick/CMakeLists.txt index 4dcf2d6611e974..7e6be2992629fb 100644 --- a/ports/graphicsmagick/CMakeLists.txt +++ b/ports/graphicsmagick/CMakeLists.txt @@ -50,6 +50,7 @@ string(REPLACE "#undef HAVE_VSNPRINTF" "#define HAVE_VSNPRINTF" CONFIG_H "${CONF string(REPLACE "#undef MagickLibSubdir" "#define MagickLibSubdir \"magick\"" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef MagickLibConfigSubDir" "#define MagickLibConfigSubDir \"magick/config\"" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef MagickShareConfigSubDir" "#define MagickShareConfigSubDir \"magick/config\"" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef HAVE_STDINT_H" "#define HAVE_STDINT_H" CONFIG_H "${CONFIG_H}") endif () file(WRITE "magick/magick_config.h" "${CONFIG_H}") diff --git a/ports/graphicsmagick/CONTROL b/ports/graphicsmagick/CONTROL index 158710f4573e03..cec6a804024272 100644 --- a/ports/graphicsmagick/CONTROL +++ b/ports/graphicsmagick/CONTROL @@ -1,6 +1,5 @@ Source: graphicsmagick -Version: 1.3.35 -Port-Version: 3 +Version: 1.3.36 Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff Homepage: https://sourceforge.net/projects/graphicsmagick/ Description: Image processing library diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake index ff4beac889269f..11b1252dc6ee36 100644 --- a/ports/graphicsmagick/portfile.cmake +++ b/ports/graphicsmagick/portfile.cmake @@ -1,11 +1,11 @@ -set(GM_VERSION 1.3.35) +set(GM_VERSION 1.3.36) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO graphicsmagick/graphicsmagick REF ${GM_VERSION} FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z" - SHA512 bf3ade807de54f366e49df5b754d8321978d8e1ed4275364fb7e861ff04f0780a698fcb4e0a110a45213209ff846034f2add00a3443ed31db2c842530199bd1f + SHA512 4976816acb9d348b83cc33c1ad2b0a3f9c4174c8983b3a3f867bcd6369984bea34b203a4e168f52f556c94288b9340db1357f614e8ff3a8802bef859378bdd31 PATCHES # GM always requires a dynamic BZIP2. This patch makes this dependent if _DLL is defined dynamic_bzip2.patch From d7b9e45b6ca7062c78bc16591edeba79f384a289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 13 Jan 2021 16:14:04 -0800 Subject: [PATCH 0478/1694] [qt5-base] Improve the warning message on Linux (#15596) * [qt5-base] Improve the warning message on Linux * [qt5-base] Update warning message --- ports/qt5-base/portfile.cmake | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 2bdfc1873bec15..ac02f7d2f1359b 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -16,9 +16,15 @@ endif() if (VCPKG_TARGET_IS_LINUX) - message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libx11-xcb-dev\n\nThese can be installed on Ubuntu systems via apt-get install libx11-xcb-dev.") - message(WARNING "${PORT} for qt5-x11extras requires the following libraries from the system package manager:\n libxkbcommon-x11-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxkbcommon-x11-dev.") - # + message(WARNING "qt5-base currently requires some packages from the system package manager, see https://doc.qt.io/qt-5/linux-requirements.html") + message(WARNING +[[ +qt5-base for qt5-x11extras requires the following libraries from the system package manager: + libxkbcommon-x11-dev + +These can be installed on Ubuntu systems via apt-get install libxkbcommon-x11-dev. +]] + ) endif() list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) From b9da593a235e74ab6c30e7c29341737ad4516005 Mon Sep 17 00:00:00 2001 From: Rich Logan Date: Thu, 14 Jan 2021 00:22:54 +0000 Subject: [PATCH 0479/1694] [tool-meson] Rev vcpkg's meson build (#15200) --- ports/tool-meson/CONTROL | 2 +- scripts/cmake/vcpkg_find_acquire_program.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/tool-meson/CONTROL b/ports/tool-meson/CONTROL index f40ea553fb969b..2c817f2473d841 100644 --- a/ports/tool-meson/CONTROL +++ b/ports/tool-meson/CONTROL @@ -1,4 +1,4 @@ Source: tool-meson -Version: 0.56.01 +Version: 0.56.02 Homepage: https://github.com/mesonbuild/meson Description: Meson build system diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index cc6be6b3ea0606..e3679c80a91fde 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -257,13 +257,13 @@ function(vcpkg_find_acquire_program VAR) set(APT_PACKAGE_NAME "meson") set(BREW_PACKAGE_NAME "meson") set(SCRIPTNAME meson meson.py) - set(PATHS ${DOWNLOADS}/tools/meson/meson-91876b40316962620c1705ae14075ab46f8dd644) - set(URL "https://github.com/mesonbuild/meson/archive/91876b40316962620c1705ae14075ab46f8dd644.tar.gz") - set(ARCHIVE "meson-91876b40316962620c1705ae14075ab46f8dd644.tar.gz") + set(PATHS ${DOWNLOADS}/tools/meson/meson-f5871f434a5b768ad9fcafa797a6db0286421842) + set(URL "https://github.com/mesonbuild/meson/archive/f5871f434a5b768ad9fcafa797a6db0286421842.tar.gz") + set(ARCHIVE "meson-f5871f434a5b768ad9fcafa797a6db0286421842.tar.gz") #set(PATHS ${DOWNLOADS}/tools/meson/meson-${MESON_VERSION}) #set(URL "https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz") #set(ARCHIVE "meson-${MESON_VERSION}.tar.gz") - set(HASH 784b740a01de70312f9240d38b683b2065f40572c87d30929386fe417b2cc70bcc86213c86e143f349c78121c9cc6d7392526d6e53512ae22a6ec0db57f26e3e) + set(HASH e8c36166b673acfccda54dcdbbc2414c9d0ce018debcdf6a09418f2f240edf14e72725188fe7ff7a3fcdc3942e8d1393e08a28d6f1bded4610f3ab836ab8e254) set(_vfa_SUPPORTED ON) set(VERSION_CMD --version) elseif(VAR MATCHES "FLEX" OR VAR MATCHES "BISON") From f4e02082752a3903afcd6f90cec9587b324b2763 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 14 Jan 2021 08:41:53 -0800 Subject: [PATCH 0480/1694] [vcpkg] Fix incorrect handling of messages for permenantly disabled metrics. (#15636) Fixes #15630 --- .../end-to-end-tests-dir/disable-metrics.ps1 | 6 ++++++ toolsrc/src/vcpkg.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1 index efec472b4e3ebd..5ad7616b487970 100644 --- a/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1 @@ -41,6 +41,12 @@ try { throw "Environment variable did not disable metrics." } + # Also test that you get no message without --sendmetrics + $vcpkgOutput = Run-Vcpkg list + if ($vcpkgOutput -contains $metricsAreDisabledMessage) { + throw "Disabled metrics emit message even without --sendmetrics" + } + if (-Not (Test-Metrics-Enabled '--no-disable-metrics')) { throw "Environment variable to disable metrics could not be overridden by switch." } diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index f3a6ac6a09a1e2..783cb04292d24f 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -256,7 +256,7 @@ int main(const int argc, const char* const* const argv) metrics->set_send_metrics(*p); } - if (args.send_metrics.value_or(true) && !metrics->metrics_enabled()) + if (args.send_metrics.value_or(false) && !metrics->metrics_enabled()) { System::print2(System::Color::warning, "Warning: passed --sendmetrics, but metrics are disabled.\n"); } From 732c86338ca2d7ea760b1bffdf95c5894c1f92bf Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 14 Jan 2021 08:57:05 -0800 Subject: [PATCH 0481/1694] [vcpkg] Change version field in `baseline.json` (#15633) * [vcpkg] Change version field in `baseline.json` * Change name from `version-tag` to `baseline` * [vcpkg] x-history serializes version scheme * Update e2e tests * Update baseline e2e test --- scripts/e2e_ports/port_versions/baseline.json | 2 +- scripts/generateBaseline.py | 35 ++++++---- .../default-baseline-2/vcpkg.json | 2 +- .../version-files/port_versions/baseline.json | 8 +-- .../port_versions_incomplete/baseline.json | 8 +-- toolsrc/include/vcpkg/registries.h | 4 +- toolsrc/include/vcpkg/sourceparagraph.h | 5 ++ toolsrc/include/vcpkg/versiondeserializers.h | 1 + toolsrc/src/vcpkg/commands.add-version.cpp | 65 ++++++++++++++----- .../src/vcpkg/commands.civerifyversions.cpp | 38 ++++++----- toolsrc/src/vcpkg/commands.porthistory.cpp | 6 +- toolsrc/src/vcpkg/registries.cpp | 10 +-- toolsrc/src/vcpkg/versiondeserializers.cpp | 62 +++++++++--------- 13 files changed, 149 insertions(+), 97 deletions(-) diff --git a/scripts/e2e_ports/port_versions/baseline.json b/scripts/e2e_ports/port_versions/baseline.json index 953e8752d5ae58..98e63d8b5ed518 100644 --- a/scripts/e2e_ports/port_versions/baseline.json +++ b/scripts/e2e_ports/port_versions/baseline.json @@ -1,3 +1,3 @@ { - "vcpkg-internal-e2e-test-port": { "version-string": "1.0.0" } + "vcpkg-internal-e2e-test-port": { "baseline": "1.0.0" } } diff --git a/scripts/generateBaseline.py b/scripts/generateBaseline.py index 55bea6ba218011..d70ab369b01b5c 100644 --- a/scripts/generateBaseline.py +++ b/scripts/generateBaseline.py @@ -11,6 +11,24 @@ VERSIONS_DB_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../port_versions') +def get_version_tag(version): + if 'version' in version: + return version['version'] + elif 'version-date' in version: + return version['version-date'] + elif 'version-semver' in version: + return version['version-semver'] + elif 'version-string' in version: + return version['version-string'] + sys.exit(1) + + +def get_version_port_version(version): + if 'port-version' in version: + return version['port-version'] + return 0 + + def generate_baseline(): start_time = time.time() @@ -35,18 +53,11 @@ def generate_baseline(): try: versions_object = json.load(db_file) if versions_object['versions']: - last_version = versions_object['versions'][0] - version_obj = {} - if 'version' in last_version: - version_obj['version'] = last_version['version'] - elif 'version-date' in last_version: - version_obj['version-date'] = last_version['version-date'] - elif 'version-semver' in last_version: - version_obj['version-semver'] - last_version['version-semver'] - else: - version_obj['version-string'] = last_version['version-string'] - version_obj['port-version'] = last_version['port-version'] - baseline_entries[port_name] = version_obj + last_version = versions_object['versions'][0] + baseline_entries[port_name] = { + 'baseline': get_version_tag(last_version), + 'port-version': get_version_port_version(last_version) + } except json.JSONDecodeError as e: print(f'Error: Decoding {port_file_path}\n{e}\n') baseline_object = {} diff --git a/scripts/testing/version-files/default-baseline-2/vcpkg.json b/scripts/testing/version-files/default-baseline-2/vcpkg.json index 1e41002ff99bf5..af353c09d7116b 100644 --- a/scripts/testing/version-files/default-baseline-2/vcpkg.json +++ b/scripts/testing/version-files/default-baseline-2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "default-baseline-test", "version-string": "0", - "$x-default-baseline": "cbd5a68012471f820b7cf28d618199b4a4d89c58", + "$x-default-baseline": "16002d9c2318dec4c69e02d9af8c0e11dca0d4c6", "dependencies": [ "zlib" ] diff --git a/scripts/testing/version-files/port_versions/baseline.json b/scripts/testing/version-files/port_versions/baseline.json index bfe49f98465648..44a4764a14fe6c 100644 --- a/scripts/testing/version-files/port_versions/baseline.json +++ b/scripts/testing/version-files/port_versions/baseline.json @@ -1,19 +1,19 @@ { "default": { "cat": { - "version-string": "1.0", + "baseline": "1.0", "port-version": 0 }, "dog": { - "version-string": "2001-01-01", + "baseline": "2001-01-01", "port-version": 0 }, "duck": { - "version-string": "mallard", + "baseline": "mallard", "port-version": 0 }, "mouse": { - "version-string": "1.0.0", + "baseline": "1.0.0", "port-version": 0 } } diff --git a/scripts/testing/version-files/port_versions_incomplete/baseline.json b/scripts/testing/version-files/port_versions_incomplete/baseline.json index aadd634fc9e022..7f27e5b65e0663 100644 --- a/scripts/testing/version-files/port_versions_incomplete/baseline.json +++ b/scripts/testing/version-files/port_versions_incomplete/baseline.json @@ -1,19 +1,19 @@ { "default": { "cat": { - "version-string": "1.0", + "baseline": "1.0", "port-version": 0 }, "dog": { - "version-string": "2001-01-01", + "baseline": "2001-01-01", "port-version": 0 }, "duck": { - "version-string": "mallard", + "baseline": "mallard", "port-version": 0 }, "fish": { - "version-string": "1.0.0", + "baseline": "1.0.0", "port-version": 0 } } diff --git a/toolsrc/include/vcpkg/registries.h b/toolsrc/include/vcpkg/registries.h index c36c0179dc6ad4..74782859dad30f 100644 --- a/toolsrc/include/vcpkg/registries.h +++ b/toolsrc/include/vcpkg/registries.h @@ -106,8 +106,8 @@ namespace vcpkg std::unique_ptr>> get_registry_array_deserializer( const fs::path& configuration_directory); - ExpectedS>> get_builtin_versions(const VcpkgPaths& paths, - StringView port_name); + ExpectedS>> get_builtin_versions(const VcpkgPaths& paths, + StringView port_name); ExpectedS>> get_builtin_baseline(const VcpkgPaths& paths); } diff --git a/toolsrc/include/vcpkg/sourceparagraph.h b/toolsrc/include/vcpkg/sourceparagraph.h index 50417b8adc4061..f2dd0798b9df3d 100644 --- a/toolsrc/include/vcpkg/sourceparagraph.h +++ b/toolsrc/include/vcpkg/sourceparagraph.h @@ -12,6 +12,7 @@ #include #include #include +#include #include namespace vcpkg @@ -107,6 +108,10 @@ namespace vcpkg const FeatureFlagSettings& flags) const; VersionT to_versiont() const { return core_paragraph->to_versiont(); } + SchemedVersion to_schemed_version() const + { + return SchemedVersion{core_paragraph->version_scheme, core_paragraph->to_versiont()}; + } friend bool operator==(const SourceControlFile& lhs, const SourceControlFile& rhs); friend bool operator!=(const SourceControlFile& lhs, const SourceControlFile& rhs) { return !(lhs == rhs); } diff --git a/toolsrc/include/vcpkg/versiondeserializers.h b/toolsrc/include/vcpkg/versiondeserializers.h index 02696d39b9895e..ae368f6c52fbba 100644 --- a/toolsrc/include/vcpkg/versiondeserializers.h +++ b/toolsrc/include/vcpkg/versiondeserializers.h @@ -11,6 +11,7 @@ namespace vcpkg { Json::IDeserializer& get_versiont_deserializer_instance(); + Json::IDeserializer& get_versiontag_deserializer_instance(); std::unique_ptr> make_version_deserializer(StringLiteral type_name); struct SchemedVersion diff --git a/toolsrc/src/vcpkg/commands.add-version.cpp b/toolsrc/src/vcpkg/commands.add-version.cpp index c650fa9dd2a105..9d7a74465eb77c 100644 --- a/toolsrc/src/vcpkg/commands.add-version.cpp +++ b/toolsrc/src/vcpkg/commands.add-version.cpp @@ -16,21 +16,51 @@ using namespace vcpkg; namespace { - using VersionGitTree = std::pair; + constexpr StringLiteral BASELINE = "baseline"; + constexpr StringLiteral VERSION_RELAXED = "version"; + constexpr StringLiteral VERSION_SEMVER = "version-semver"; + constexpr StringLiteral VERSION_DATE = "version-date"; + constexpr StringLiteral VERSION_STRING = "version-string"; - void insert_version_to_json_object(Json::Object& obj, const VersionT& version) + using VersionGitTree = std::pair; + + void insert_version_to_json_object(Json::Object& obj, const VersionT& version, StringLiteral version_field) { - obj.insert("version-string", Json::Value::string(version.text())); + obj.insert(version_field, Json::Value::string(version.text())); obj.insert("port-version", Json::Value::integer(version.port_version())); } + void insert_schemed_version_to_json_object(Json::Object& obj, const SchemedVersion& version) + { + if (version.scheme == Versions::Scheme::Relaxed) + { + return insert_version_to_json_object(obj, version.versiont, VERSION_RELAXED); + } + + if (version.scheme == Versions::Scheme::Semver) + { + return insert_version_to_json_object(obj, version.versiont, VERSION_SEMVER); + } + + if (version.scheme == Versions::Scheme::Date) + { + return insert_version_to_json_object(obj, version.versiont, VERSION_DATE); + } + + if (version.scheme == Versions::Scheme::String) + { + return insert_version_to_json_object(obj, version.versiont, VERSION_STRING); + } + Checks::unreachable(VCPKG_LINE_INFO); + } + static Json::Object serialize_baseline(const std::map>& baseline) { Json::Object port_entries_obj; for (auto&& kv_pair : baseline) { Json::Object baseline_version_obj; - insert_version_to_json_object(baseline_version_obj, kv_pair.second); + insert_version_to_json_object(baseline_version_obj, kv_pair.second, BASELINE); port_entries_obj.insert(kv_pair.first, baseline_version_obj); } @@ -46,7 +76,7 @@ namespace { Json::Object version_obj; version_obj.insert("git-tree", Json::Value::string(version.second)); - insert_version_to_json_object(version_obj, version.first); + insert_schemed_version_to_json_object(version_obj, version.first); versions_array.push_back(std::move(version_obj)); } @@ -169,7 +199,7 @@ namespace static void update_version_db_file(const VcpkgPaths& paths, const std::string& port_name, - const VersionT& version, + const SchemedVersion& version, const std::string& git_tree, const fs::path& version_db_file_path, bool overwrite_version, @@ -185,7 +215,7 @@ namespace { System::printf(System::Color::success, "Added version `%s` to `%s` (new file).\n", - version.to_string(), + version.versiont, fs::u8string(version_db_file_path)); } return; @@ -200,13 +230,13 @@ namespace versions->begin(), versions_end, [&](auto&& entry) -> bool { return entry.second == git_tree; }); if (found_same_sha != versions_end) { - if (found_same_sha->first == version) + if (found_same_sha->first.versiont == version.versiont) { if (print_success) { System::printf(System::Color::success, "Version `%s` is already in `%s`\n", - version.to_string(), + version.versiont, fs::u8string(version_db_file_path)); } return; @@ -216,15 +246,16 @@ namespace "-- SHA: %s\n" "-- Did you remember to commit your changes?\n" "***No files were updated.***\n", - found_same_sha->first.to_string(), + found_same_sha->first.versiont, fs::u8string(version_db_file_path), git_tree); if (keep_going) return; Checks::exit_fail(VCPKG_LINE_INFO); } - auto it = std::find_if( - versions->begin(), versions_end, [&](auto&& entry) -> bool { return entry.first == version; }); + auto it = std::find_if(versions->begin(), versions_end, [&](auto&& entry) -> bool { + return entry.first.versiont == version.versiont; + }); if (it != versions_end) { @@ -239,7 +270,7 @@ namespace "-- Pass `--overwrite-version` to bypass this check.\n" "***No files were updated.***\n", port_name, - version.to_string(), + version.versiont, it->second, git_tree); if (keep_going) return; @@ -259,7 +290,7 @@ namespace { System::printf(System::Color::success, "Added version `%s` to `%s`.\n", - version.to_string(), + version.versiont, fs::u8string(version_db_file_path)); } return; @@ -352,7 +383,7 @@ namespace vcpkg::Commands::AddVersion } const auto& scf = maybe_scf.value_or_exit(VCPKG_LINE_INFO); - const auto& versiont = scf->to_versiont(); + const auto& schemed_version = scf->to_schemed_version(); auto git_tree_it = git_tree_map.find(port_name); if (git_tree_it == git_tree_map.end()) @@ -370,8 +401,8 @@ namespace vcpkg::Commands::AddVersion auto port_versions_path = paths.builtin_port_versions / Strings::concat(port_name[0], '-') / Strings::concat(port_name, ".json"); update_version_db_file( - paths, port_name, versiont, git_tree, port_versions_path, overwrite_version, verbose, add_all); - update_baseline_version(paths, port_name, versiont, baseline_path, verbose); + paths, port_name, schemed_version, git_tree, port_versions_path, overwrite_version, verbose, add_all); + update_baseline_version(paths, port_name, schemed_version.versiont, baseline_path, verbose); } Checks::exit_success(VCPKG_LINE_INFO); } diff --git a/toolsrc/src/vcpkg/commands.civerifyversions.cpp b/toolsrc/src/vcpkg/commands.civerifyversions.cpp index a0de254c532ee4..00c95f79245f1f 100644 --- a/toolsrc/src/vcpkg/commands.civerifyversions.cpp +++ b/toolsrc/src/vcpkg/commands.civerifyversions.cpp @@ -85,23 +85,23 @@ namespace vcpkg::Commands::CIVerifyVersions return { Strings::format("Error: Unable to parse `%s` used in version `%s`.\n%s\n", treeish, - version_entry.first.to_string(), + version_entry.first.versiont, maybe_scf.error()->error), expected_right_tag, }; } const auto& scf = maybe_scf.value_or_exit(VCPKG_LINE_INFO); - auto&& git_tree_version = scf.get()->to_versiont(); - if (version_entry.first != git_tree_version) + auto&& git_tree_version = scf.get()->to_schemed_version(); + if (version_entry.first.versiont != git_tree_version.versiont) { return { Strings::format("Error: Version in git-tree `%s` does not match version in file " "`%s`.\n\tgit-tree version: %s\n\t file version: %s\n", version_entry.second, fs::u8string(versions_file_path), - git_tree_version.to_string(), - version_entry.first.to_string()), + git_tree_version.versiont, + version_entry.first.versiont), expected_right_tag, }; } @@ -115,7 +115,7 @@ namespace vcpkg::Commands::CIVerifyVersions Strings::format("Error: The git-tree `%s` for version `%s` in `%s` does not contain a " "CONTROL file or vcpkg.json file.", version_entry.second, - version_entry.first, + version_entry.first.versiont, fs::u8string(versions_file_path)), expected_right_tag, }; @@ -134,17 +134,18 @@ namespace vcpkg::Commands::CIVerifyVersions }; } - const auto found_version = maybe_scf.value_or_exit(VCPKG_LINE_INFO)->to_versiont(); - if (top_entry.first != found_version) + const auto found_version = maybe_scf.value_or_exit(VCPKG_LINE_INFO)->to_schemed_version(); + if (top_entry.first.versiont != found_version.versiont) { auto versions_end = versions.end(); - auto it = std::find_if( - versions.begin(), versions_end, [&](auto&& entry) { return entry.first == found_version; }); + auto it = std::find_if(versions.begin(), versions_end, [&](auto&& entry) { + return entry.first.versiont == found_version.versiont; + }); if (it != versions_end) { return { Strings::format("Error: Version `%s` found but is not the top entry in `%s`.", - found_version, + found_version.versiont, fs::u8string(versions_file_path)), expected_right_tag, }; @@ -152,8 +153,9 @@ namespace vcpkg::Commands::CIVerifyVersions else { return { - Strings::format( - "Error: Version `%s` not found in `%s`.", found_version, fs::u8string(versions_file_path)), + Strings::format("Error: Version `%s` not found in `%s`.", + found_version.versiont, + fs::u8string(versions_file_path)), expected_right_tag, }; } @@ -165,7 +167,7 @@ namespace vcpkg::Commands::CIVerifyVersions Strings::format("Error: Git tree-ish object for version `%s` in `%s` does not match local port files.\n" "\tLocal SHA: %s\n" "\t File SHA: %s", - found_version, + found_version.versiont, fs::u8string(versions_file_path), local_git_tree, top_entry.second), @@ -183,7 +185,7 @@ namespace vcpkg::Commands::CIVerifyVersions } auto&& baseline_version = maybe_baseline->second; - if (baseline_version != top_entry.first) + if (baseline_version != top_entry.first.versiont) { return { Strings::format("Error: The baseline version for port `%s` doesn't match the latest version.\n" @@ -191,7 +193,7 @@ namespace vcpkg::Commands::CIVerifyVersions "\t Latest version: %s (%s)", port_name, baseline_version, - top_entry.first, + top_entry.first.versiont, fs::u8string(versions_file_path)), expected_right_tag, }; @@ -203,7 +205,7 @@ namespace vcpkg::Commands::CIVerifyVersions Strings::format("Error: Git tree-ish object for version `%s` in `%s` does not match local port files.\n" "\tLocal SHA: %s\n" "\t File SHA: %s", - found_version, + found_version.versiont, fs::u8string(versions_file_path), local_git_tree, top_entry.second), @@ -212,7 +214,7 @@ namespace vcpkg::Commands::CIVerifyVersions } return { - Strings::format("OK: %s\t%s -> %s\n", top_entry.second, port_name, top_entry.first), + Strings::format("OK: %s\t%s -> %s\n", top_entry.second, port_name, top_entry.first.versiont), expected_left_tag, }; } diff --git a/toolsrc/src/vcpkg/commands.porthistory.cpp b/toolsrc/src/vcpkg/commands.porthistory.cpp index e6a7cd5dfee6e8..392bde7d0d6287 100644 --- a/toolsrc/src/vcpkg/commands.porthistory.cpp +++ b/toolsrc/src/vcpkg/commands.porthistory.cpp @@ -25,6 +25,7 @@ namespace vcpkg::Commands::PortHistory std::string version_string; std::string version; int port_version; + Versions::Scheme scheme; }; const System::ExitCodeAndOutput run_git_command_inner(const VcpkgPaths& paths, @@ -66,6 +67,7 @@ namespace vcpkg::Commands::PortHistory { auto version = scf->core_paragraph->version; auto port_version = scf->core_paragraph->port_version; + auto scheme = scf->core_paragraph->version_scheme; return HistoryVersion{ port_name, git_tree, @@ -74,6 +76,7 @@ namespace vcpkg::Commands::PortHistory Strings::concat(version, "#", port_version), version, port_version, + scheme, }; } } @@ -193,8 +196,7 @@ namespace vcpkg::Commands::PortHistory Json::Object object; object.insert("git-tree", Json::Value::string(version.git_tree)); - serialize_schemed_version( - object, Versions::Scheme::String, version.version, version.port_version, true); + serialize_schemed_version(object, version.scheme, version.version, version.port_version, true); versions_json.push_back(std::move(object)); } diff --git a/toolsrc/src/vcpkg/registries.cpp b/toolsrc/src/vcpkg/registries.cpp index 31f3078deb13f6..7f84b507517627 100644 --- a/toolsrc/src/vcpkg/registries.cpp +++ b/toolsrc/src/vcpkg/registries.cpp @@ -484,7 +484,7 @@ namespace { const auto& version_value = pr.second; VersionT version; - r.visit_in_key(version_value, pr.first, version, get_versiont_deserializer_instance()); + r.visit_in_key(version_value, pr.first, version, get_versiontag_deserializer_instance()); result.emplace(pr.first.to_string(), std::move(version)); } @@ -964,15 +964,17 @@ namespace vcpkg return true; } - ExpectedS>> get_builtin_versions(const VcpkgPaths& paths, - StringView port_name) + ExpectedS>> get_builtin_versions(const VcpkgPaths& paths, + StringView port_name) { auto maybe_versions = load_versions_file(paths.get_filesystem(), VersionDbType::Git, paths.builtin_port_versions, port_name); if (auto pversions = maybe_versions.get()) { return Util::fmap( - *pversions, [](auto&& entry) -> auto { return std::make_pair(entry.version, entry.git_tree); }); + *pversions, [](auto&& entry) -> auto { + return std::make_pair(SchemedVersion{entry.scheme, entry.version}, entry.git_tree); + }); } return maybe_versions.error(); diff --git a/toolsrc/src/vcpkg/versiondeserializers.cpp b/toolsrc/src/vcpkg/versiondeserializers.cpp index 842bdade33ea4a..2892aa567e0523 100644 --- a/toolsrc/src/vcpkg/versiondeserializers.cpp +++ b/toolsrc/src/vcpkg/versiondeserializers.cpp @@ -7,6 +7,7 @@ using namespace vcpkg::Versions; namespace { + constexpr StringLiteral BASELINE = "baseline"; constexpr StringLiteral VERSION_RELAXED = "version"; constexpr StringLiteral VERSION_SEMVER = "version-semver"; constexpr StringLiteral VERSION_STRING = "version-string"; @@ -36,6 +37,26 @@ namespace } StringLiteral m_type; }; + + struct GenericVersionTDeserializer : Json::IDeserializer + { + GenericVersionTDeserializer(StringLiteral version_field) : m_version_field(version_field) { } + StringView type_name() const override { return " a version object"; } + + Optional visit_object(Json::Reader& r, const Json::Object& obj) override + { + std::string version; + int port_version = 0; + + static VersionDeserializer version_deserializer{"version"}; + + r.required_object_field(type_name(), obj, m_version_field, version, version_deserializer); + r.optional_object_field(obj, PORT_VERSION, port_version, Json::NaturalNumberDeserializer::instance); + + return VersionT{std::move(version), port_version}; + } + StringLiteral m_version_field; + }; } namespace vcpkg @@ -167,38 +188,15 @@ namespace vcpkg } } -} - -namespace -{ - struct VersionTDeserializer final : Json::IDeserializer + Json::IDeserializer& get_versiont_deserializer_instance() { - StringView type_name() const override { return "a version object"; } - View valid_fields() const override - { - static const StringView t[] = {VERSION_STRING, PORT_VERSION}; - return t; - } - - Optional visit_object(Json::Reader& r, const Json::Object& obj) override - { - std::string version; - int port_version = 0; - - static VersionDeserializer version_deserializer{"version"}; - - r.required_object_field(type_name(), obj, VERSION_STRING, version, version_deserializer); - r.optional_object_field(obj, PORT_VERSION, port_version, Json::NaturalNumberDeserializer::instance); - - return VersionT{std::move(version), port_version}; - } - static VersionTDeserializer instance; - }; - - VersionTDeserializer VersionTDeserializer::instance; -} + static GenericVersionTDeserializer deserializer(VERSION_STRING); + return deserializer; + } -namespace vcpkg -{ - Json::IDeserializer& get_versiont_deserializer_instance() { return VersionTDeserializer::instance; } + Json::IDeserializer& get_versiontag_deserializer_instance() + { + static GenericVersionTDeserializer deserializer(BASELINE); + return deserializer; + } } From 74f0710c9e9fe7b42c3572688cda9e0682e7a34c Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 14 Jan 2021 09:06:31 -0800 Subject: [PATCH 0482/1694] [vcpkg] Rewriting CmdLineBuilder (2/n) (#15627) * [vcpkg] Rewriting CmdLineBuilder (2/n) I would like, and I think the team would like generally, to switch to using stuff like `posix_spawn`, as opposed to the existing use of `system` and `popen`. This requires a pretty large change to how we use CmdLineBuilder. The first change we have to make is that the execute functions _cannot_ take a StringView anymore. This PR makes that change. --- format.diff | 0 test.cmake | 1 + toolsrc/include/vcpkg/base/cache.h | 4 +- toolsrc/include/vcpkg/base/system.process.h | 42 ++++++----- toolsrc/include/vcpkg/build.h | 4 +- toolsrc/include/vcpkg/buildenvironment.h | 6 +- toolsrc/src/vcpkg/archives.cpp | 33 ++++++--- toolsrc/src/vcpkg/base/system.process.cpp | 81 ++++++++++++--------- toolsrc/src/vcpkg/binarycaching.cpp | 12 +-- toolsrc/src/vcpkg/build.cpp | 19 ++--- toolsrc/src/vcpkg/buildenvironment.cpp | 6 +- toolsrc/src/vcpkg/commands.contact.cpp | 2 +- toolsrc/src/vcpkg/commands.create.cpp | 2 +- toolsrc/src/vcpkg/commands.edit.cpp | 14 ++-- toolsrc/src/vcpkg/commands.env.cpp | 6 +- toolsrc/src/vcpkg/commands.integrate.cpp | 18 +++-- toolsrc/src/vcpkg/commands.porthistory.cpp | 22 +++--- toolsrc/src/vcpkg/commands.portsdiff.cpp | 21 +++--- toolsrc/src/vcpkg/export.chocolatey.cpp | 10 ++- toolsrc/src/vcpkg/export.ifw.cpp | 33 +++++---- toolsrc/src/vcpkg/export.prefab.cpp | 22 +++--- toolsrc/src/vcpkg/metrics.cpp | 22 ++++-- toolsrc/src/vcpkg/postbuildlint.cpp | 23 +++--- toolsrc/src/vcpkg/tools.cpp | 16 ++-- toolsrc/src/vcpkg/vcpkgpaths.cpp | 18 +++-- toolsrc/src/vcpkg/visualstudio.cpp | 10 ++- 26 files changed, 258 insertions(+), 189 deletions(-) delete mode 100644 format.diff create mode 100644 test.cmake diff --git a/format.diff b/format.diff deleted file mode 100644 index e69de29bb2d1d6..00000000000000 diff --git a/test.cmake b/test.cmake new file mode 100644 index 00000000000000..9989339c245629 --- /dev/null +++ b/test.cmake @@ -0,0 +1 @@ +execute_process(COMMAND "bash" "-c" "echo \$TEST_ENV_VAR") diff --git a/toolsrc/include/vcpkg/base/cache.h b/toolsrc/include/vcpkg/base/cache.h index 1996f2587d9169..7efae1361a7171 100644 --- a/toolsrc/include/vcpkg/base/cache.h +++ b/toolsrc/include/vcpkg/base/cache.h @@ -4,7 +4,7 @@ namespace vcpkg { - template + template> struct Cache { template @@ -16,6 +16,6 @@ namespace vcpkg } private: - mutable std::map m_cache; + mutable std::map m_cache; }; } diff --git a/toolsrc/include/vcpkg/base/system.process.h b/toolsrc/include/vcpkg/base/system.process.h index 1c62fa28585df5..68d4da4e4b504b 100644 --- a/toolsrc/include/vcpkg/base/system.process.h +++ b/toolsrc/include/vcpkg/base/system.process.h @@ -20,10 +20,6 @@ namespace vcpkg::System std::string s; }; - std::string make_basic_cmake_cmd(const fs::path& cmake_tool_path, - const fs::path& cmake_script, - const std::vector& pass_variables); - struct CmdLineBuilder { CmdLineBuilder() = default; @@ -46,15 +42,27 @@ namespace vcpkg::System CmdLineBuilder&& raw_arg(StringView s) && { return std::move(raw_arg(s)); } std::string&& extract() && { return std::move(buf); } - operator StringView() noexcept { return buf; } StringView command_line() const { return buf; } void clear() { buf.clear(); } + bool empty() const { return buf.empty(); } private: std::string buf; }; + struct CmdLineBuilderMapLess + { + bool operator()(const CmdLineBuilder& lhs, const CmdLineBuilder& rhs) const + { + return lhs.command_line() < rhs.command_line(); + } + }; + + CmdLineBuilder make_basic_cmake_cmd(const fs::path& cmake_tool_path, + const fs::path& cmake_script, + const std::vector& pass_variables); + fs::path get_exe_path_of_current_process(); struct ExitCodeAndOutput @@ -79,48 +87,48 @@ namespace vcpkg::System const fs::path& working_directory; }; - int cmd_execute(StringView cmd_line, InWorkingDirectory wd, const Environment& env = {}); - inline int cmd_execute(StringView cmd_line, const Environment& env = {}) + int cmd_execute(const CmdLineBuilder& cmd_line, InWorkingDirectory wd, const Environment& env = {}); + inline int cmd_execute(const CmdLineBuilder& cmd_line, const Environment& env = {}) { return cmd_execute(cmd_line, InWorkingDirectory{fs::path()}, env); } - int cmd_execute_clean(StringView cmd_line, InWorkingDirectory wd); - inline int cmd_execute_clean(StringView cmd_line) + int cmd_execute_clean(const CmdLineBuilder& cmd_line, InWorkingDirectory wd); + inline int cmd_execute_clean(const CmdLineBuilder& cmd_line) { return cmd_execute_clean(cmd_line, InWorkingDirectory{fs::path()}); } #if defined(_WIN32) - Environment cmd_execute_modify_env(StringView cmd_line, const Environment& env = {}); + Environment cmd_execute_modify_env(const CmdLineBuilder& cmd_line, const Environment& env = {}); - void cmd_execute_background(const StringView cmd_line); + void cmd_execute_background(const CmdLineBuilder& cmd_line); #endif - ExitCodeAndOutput cmd_execute_and_capture_output(StringView cmd_line, + ExitCodeAndOutput cmd_execute_and_capture_output(const CmdLineBuilder& cmd_line, InWorkingDirectory wd, const Environment& env = {}); - inline ExitCodeAndOutput cmd_execute_and_capture_output(StringView cmd_line, const Environment& env = {}) + inline ExitCodeAndOutput cmd_execute_and_capture_output(const CmdLineBuilder& cmd_line, const Environment& env = {}) { return cmd_execute_and_capture_output(cmd_line, InWorkingDirectory{fs::path()}, env); } - int cmd_execute_and_stream_lines(StringView cmd_line, + int cmd_execute_and_stream_lines(const CmdLineBuilder& cmd_line, InWorkingDirectory wd, std::function per_line_cb, const Environment& env = {}); - inline int cmd_execute_and_stream_lines(StringView cmd_line, + inline int cmd_execute_and_stream_lines(const CmdLineBuilder& cmd_line, std::function per_line_cb, const Environment& env = {}) { return cmd_execute_and_stream_lines(cmd_line, InWorkingDirectory{fs::path()}, std::move(per_line_cb), env); } - int cmd_execute_and_stream_data(StringView cmd_line, + int cmd_execute_and_stream_data(const CmdLineBuilder& cmd_line, InWorkingDirectory wd, std::function data_cb, const Environment& env = {}); - inline int cmd_execute_and_stream_data(StringView cmd_line, + inline int cmd_execute_and_stream_data(const CmdLineBuilder& cmd_line, std::function data_cb, const Environment& env = {}) { diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index bd5188b9fbd18e..0659eedcd12661 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -232,7 +232,7 @@ namespace vcpkg::Build const VcpkgPaths& m_paths; }; - std::string make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset); + System::CmdLineBuilder make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset); struct ExtendedBuildResult { @@ -369,7 +369,7 @@ namespace vcpkg::Build struct EnvMapEntry { std::unordered_map env_map; - Cache cmd_cache; + Cache cmd_cache; }; Cache, EnvMapEntry> envs; diff --git a/toolsrc/include/vcpkg/buildenvironment.h b/toolsrc/include/vcpkg/buildenvironment.h index aa69708b670746..54977232051458 100644 --- a/toolsrc/include/vcpkg/buildenvironment.h +++ b/toolsrc/include/vcpkg/buildenvironment.h @@ -9,7 +9,7 @@ namespace vcpkg { - std::string make_cmake_cmd(const VcpkgPaths& paths, - const fs::path& cmake_script, - std::vector&& pass_variables); + System::CmdLineBuilder make_cmake_cmd(const VcpkgPaths& paths, + const fs::path& cmake_script, + std::vector&& pass_variables); } diff --git a/toolsrc/src/vcpkg/archives.cpp b/toolsrc/src/vcpkg/archives.cpp index 33132f892c4ac3..25449cd63d5677 100644 --- a/toolsrc/src/vcpkg/archives.cpp +++ b/toolsrc/src/vcpkg/archives.cpp @@ -44,13 +44,21 @@ namespace vcpkg::Archives const std::string nugetid = match[1]; const std::string version = match[2]; - const auto code_and_output = System::cmd_execute_and_capture_output(Strings::format( - R"("%s" install %s -Version %s -OutputDirectory "%s" -Source "%s" -nocache -DirectDownload -NonInteractive -ForceEnglishOutput -PackageSaveMode nuspec)", - fs::u8string(nuget_exe), - nugetid, - version, - fs::u8string(to_path_partial), - fs::u8string(paths.downloads))); + const auto code_and_output = System::cmd_execute_and_capture_output(System::CmdLineBuilder{nuget_exe} + .string_arg("install") + .string_arg(nugetid) + .string_arg("-Version") + .string_arg(version) + .string_arg("-OutputDirectory") + .path_arg(to_path_partial) + .string_arg("-Source") + .path_arg(paths.downloads) + .string_arg("-nocache") + .string_arg("-DirectDownload") + .string_arg("-NonInteractive") + .string_arg("-ForceEnglishOutput") + .string_arg("-PackageSaveMode") + .string_arg("nuspec")); Checks::check_exit(VCPKG_LINE_INFO, code_and_output.exit_code == 0, @@ -65,11 +73,12 @@ namespace vcpkg::Archives Checks::check_exit(VCPKG_LINE_INFO, !recursion_limiter_sevenzip); recursion_limiter_sevenzip = true; const auto seven_zip = paths.get_tool_exe(Tools::SEVEN_ZIP); - const auto code_and_output = - System::cmd_execute_and_capture_output(Strings::format(R"("%s" x "%s" -o"%s" -y)", - fs::u8string(seven_zip), - fs::u8string(archive), - fs::u8string(to_path_partial))); + const auto code_and_output = System::cmd_execute_and_capture_output( + System::CmdLineBuilder{seven_zip} + .string_arg("x") + .path_arg(archive) + .string_arg(Strings::format("-o%s", fs::u8string(to_path_partial))) + .string_arg("-y")); Checks::check_exit(VCPKG_LINE_INFO, code_and_output.exit_code == 0, "7zip failed while extracting '%s' with message:\n%s", diff --git a/toolsrc/src/vcpkg/base/system.process.cpp b/toolsrc/src/vcpkg/base/system.process.cpp index ff608ea0e50ee5..e4218b7162fa39 100644 --- a/toolsrc/src/vcpkg/base/system.process.cpp +++ b/toolsrc/src/vcpkg/base/system.process.cpp @@ -184,18 +184,17 @@ namespace vcpkg } System::CMakeVariable::CMakeVariable(std::string var) : s(std::move(var)) { } - std::string System::make_basic_cmake_cmd(const fs::path& cmake_tool_path, - const fs::path& cmake_script, - const std::vector& pass_variables) + System::CmdLineBuilder System::make_basic_cmake_cmd(const fs::path& cmake_tool_path, + const fs::path& cmake_script, + const std::vector& pass_variables) { - System::CmdLineBuilder cmd; - cmd.path_arg(cmake_tool_path); + System::CmdLineBuilder cmd{cmake_tool_path}; for (auto&& var : pass_variables) { cmd.string_arg(var.s); } cmd.string_arg("-P").path_arg(cmake_script); - return std::move(cmd).extract(); + return cmd; } System::CmdLineBuilder& System::CmdLineBuilder::string_arg(StringView s) & @@ -384,7 +383,7 @@ namespace vcpkg return clean_env; } - int System::cmd_execute_clean(StringView cmd_line, InWorkingDirectory wd) + int System::cmd_execute_clean(const CmdLineBuilder& cmd_line, InWorkingDirectory wd) { return cmd_execute(cmd_line, wd, get_clean_environment()); } @@ -565,12 +564,12 @@ namespace vcpkg #endif #if defined(_WIN32) - void System::cmd_execute_background(StringView cmd_line) + void System::cmd_execute_background(const CmdLineBuilder& cmd_line) { auto timer = Chrono::ElapsedTimer::create_started(); auto process_info = - windows_create_windowless_process(cmd_line, + windows_create_windowless_process(cmd_line.command_line(), InWorkingDirectory{fs::path()}, {}, CREATE_NEW_CONSOLE | CREATE_NO_WINDOW | CREATE_BREAKAWAY_FROM_JOB); @@ -582,48 +581,55 @@ namespace vcpkg Debug::print("cmd_execute_background() took ", static_cast(timer.microseconds()), " us\n"); } - Environment System::cmd_execute_modify_env(StringView cmd_line, const Environment& env) + Environment System::cmd_execute_modify_env(const CmdLineBuilder& cmd_line, const Environment& env) { static StringLiteral magic_string = "cdARN4xjKueKScMy9C6H"; - auto actual_cmd_line = Strings::concat(cmd_line, " & echo ", magic_string, "& set"); + auto actual_cmd_line = cmd_line; + actual_cmd_line.raw_arg(Strings::concat(" & echo ", magic_string, " & set")); auto rc_output = cmd_execute_and_capture_output(actual_cmd_line, env); Checks::check_exit(VCPKG_LINE_INFO, rc_output.exit_code == 0); - auto it = Strings::search(rc_output.output, Strings::concat(magic_string, "\r\n")); - const auto e = static_cast(rc_output.output.data()) + rc_output.output.size(); - Checks::check_exit(VCPKG_LINE_INFO, it != e); - it += magic_string.size() + 2; + Debug::print("command line: ", actual_cmd_line.command_line(), "\n"); + Debug::print(rc_output.output, "\n"); + + auto it = Strings::search(rc_output.output, magic_string); + const char* const last = rc_output.output.data() + rc_output.output.size(); + + Checks::check_exit(VCPKG_LINE_INFO, it != last); + // find the first non-whitespace character after the magic string + it = std::find_if_not(it + magic_string.size(), last, ::isspace); + Checks::check_exit(VCPKG_LINE_INFO, it != last); std::wstring out_env; for (;;) { - auto eq = std::find(it, e, '='); - if (eq == e) break; - StringView varname(it, eq); - auto nl = std::find(eq + 1, e, '\r'); - if (nl == e) break; - StringView value(eq + 1, nl); - - out_env.append(Strings::to_utf16(Strings::concat(varname, '=', value))); + auto equal_it = std::find(it, last, '='); + if (equal_it == last) break; + StringView variable_name(it, equal_it); + auto newline_it = std::find(equal_it + 1, last, '\r'); + if (newline_it == last) break; + StringView value(equal_it + 1, newline_it); + + out_env.append(Strings::to_utf16(Strings::concat(variable_name, '=', value))); out_env.push_back(L'\0'); - it = nl + 1; - if (it != e && *it == '\n') ++it; + it = newline_it + 1; + if (it != last && *it == '\n') ++it; } return {std::move(out_env)}; } #endif - int System::cmd_execute(StringView cmd_line, System::InWorkingDirectory wd, const Environment& env) + int System::cmd_execute(const CmdLineBuilder& cmd_line, System::InWorkingDirectory wd, const Environment& env) { auto timer = Chrono::ElapsedTimer::create_started(); #if defined(_WIN32) using vcpkg::g_ctrl_c_state; g_ctrl_c_state.transition_to_spawn_process(); - auto proc_info = windows_create_windowless_process(cmd_line, wd, env, 0); + auto proc_info = windows_create_windowless_process(cmd_line.command_line(), wd, env, 0); auto long_exit_code = [&]() -> unsigned long { if (auto p = proc_info.get()) return p->wait(); @@ -641,12 +647,15 @@ namespace vcpkg std::string real_command_line; if (wd.working_directory.empty()) { - real_command_line.assign(cmd_line.begin(), cmd_line.end()); + real_command_line = cmd_line.command_line().to_string(); } else { - real_command_line = - System::CmdLineBuilder("cd").path_arg(wd.working_directory).raw_arg("&&").raw_arg(cmd_line).extract(); + real_command_line = System::CmdLineBuilder("cd") + .path_arg(wd.working_directory) + .raw_arg("&&") + .raw_arg(cmd_line.command_line()) + .extract(); } Debug::print("system(", real_command_line, ")\n"); fflush(nullptr); @@ -658,7 +667,7 @@ namespace vcpkg return exit_code; } - int System::cmd_execute_and_stream_lines(StringView cmd_line, + int System::cmd_execute_and_stream_lines(const CmdLineBuilder& cmd_line, System::InWorkingDirectory wd, std::function per_line_cb, const Environment& env) @@ -687,7 +696,7 @@ namespace vcpkg return rc; } - int System::cmd_execute_and_stream_data(StringView cmd_line, + int System::cmd_execute_and_stream_data(const CmdLineBuilder& cmd_line, System::InWorkingDirectory wd, std::function data_cb, const Environment& env) @@ -698,7 +707,7 @@ namespace vcpkg using vcpkg::g_ctrl_c_state; g_ctrl_c_state.transition_to_spawn_process(); - auto maybe_proc_info = windows_create_process_redirect(cmd_line, wd, env, 0); + auto maybe_proc_info = windows_create_process_redirect(cmd_line.command_line(), wd, env, 0); auto exit_code = [&]() -> unsigned long { if (auto p = maybe_proc_info.get()) return p->wait_and_stream_output(data_cb); @@ -711,14 +720,14 @@ namespace vcpkg std::string actual_cmd_line; if (wd.working_directory.empty()) { - actual_cmd_line = Strings::format(R"(%s 2>&1)", cmd_line); + actual_cmd_line = Strings::format(R"(%s 2>&1)", cmd_line.command_line()); } else { actual_cmd_line = System::CmdLineBuilder("cd") .path_arg(wd.working_directory) .raw_arg("&&") - .raw_arg(cmd_line) + .raw_arg(cmd_line.command_line()) .raw_arg("2>&1") .extract(); } @@ -754,7 +763,7 @@ namespace vcpkg return exit_code; } - ExitCodeAndOutput System::cmd_execute_and_capture_output(StringView cmd_line, + ExitCodeAndOutput System::cmd_execute_and_capture_output(const CmdLineBuilder& cmd_line, System::InWorkingDirectory wd, const Environment& env) { diff --git a/toolsrc/src/vcpkg/binarycaching.cpp b/toolsrc/src/vcpkg/binarycaching.cpp index 4592760ecb211f..d3e464f77d5c87 100644 --- a/toolsrc/src/vcpkg/binarycaching.cpp +++ b/toolsrc/src/vcpkg/binarycaching.cpp @@ -420,7 +420,7 @@ namespace { } - int run_nuget_commandline(StringView cmdline) + int run_nuget_commandline(const System::CmdLineBuilder& cmdline) { if (m_interactive) { @@ -450,7 +450,9 @@ namespace } else if (res.output.find("for example \"-ApiKey AzureDevOps\"") != std::string::npos) { - auto res2 = System::cmd_execute_and_capture_output(Strings::concat(cmdline, " -ApiKey AzureDevOps")); + auto real_cmdline = cmdline; + real_cmdline.string_arg("-ApiKey").string_arg("AzureDevOps"); + auto res2 = System::cmd_execute_and_capture_output(real_cmdline); if (Debug::g_debugging) { System::print2(res2.output); @@ -514,7 +516,7 @@ namespace }; const auto& nuget_exe = paths.get_tool_exe("nuget"); - std::vector cmdlines; + std::vector cmdlines; if (!m_read_sources.empty()) { @@ -544,7 +546,7 @@ namespace cmdline.string_arg("-NonInteractive"); } - cmdlines.push_back(std::move(cmdline).extract()); + cmdlines.push_back(std::move(cmdline)); } for (auto&& cfg : m_read_configs) { @@ -574,7 +576,7 @@ namespace cmdline.string_arg("-NonInteractive"); } - cmdlines.push_back(std::move(cmdline).extract()); + cmdlines.push_back(std::move(cmdline)); } const size_t current_restored = m_restored.size(); diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 52385c2792af38..29514b2b27ee7d 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -328,7 +328,7 @@ namespace vcpkg::Build #if defined(_WIN32) const System::Environment& EnvCache::get_action_env(const VcpkgPaths& paths, const AbiInfo& abi_info) { - std::string build_env_cmd = + auto build_env_cmd = make_build_env_cmd(*abi_info.pre_build_info, abi_info.toolset.value_or_exit(VCPKG_LINE_INFO)); const auto& base_env = envs.get_lazy(abi_info.pre_build_info->passthrough_env_vars, [&]() -> EnvMapEntry { @@ -439,9 +439,9 @@ namespace vcpkg::Build }); } - std::string make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset) + System::CmdLineBuilder make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset) { - if (!pre_build_info.using_vcvars()) return ""; + if (!pre_build_info.using_vcvars()) return {}; const char* tonull = " >nul"; if (Debug::g_debugging) @@ -452,12 +452,13 @@ namespace vcpkg::Build const auto arch = to_vcvarsall_toolchain(pre_build_info.target_architecture, toolset); const auto target = to_vcvarsall_target(pre_build_info.cmake_system_name); - return Strings::format(R"(cmd /c ""%s" %s %s %s %s 2>&1 &1 create_binary_control_file( diff --git a/toolsrc/src/vcpkg/buildenvironment.cpp b/toolsrc/src/vcpkg/buildenvironment.cpp index 2b63a16b508572..cfcedff2fc75e9 100644 --- a/toolsrc/src/vcpkg/buildenvironment.cpp +++ b/toolsrc/src/vcpkg/buildenvironment.cpp @@ -4,9 +4,9 @@ namespace vcpkg { - std::string make_cmake_cmd(const VcpkgPaths& paths, - const fs::path& cmake_script, - std::vector&& pass_variables) + System::CmdLineBuilder make_cmake_cmd(const VcpkgPaths& paths, + const fs::path& cmake_script, + std::vector&& pass_variables) { auto local_variables = std::move(pass_variables); local_variables.emplace_back("VCPKG_ROOT_DIR", paths.root); diff --git a/toolsrc/src/vcpkg/commands.contact.cpp b/toolsrc/src/vcpkg/commands.contact.cpp index e40aa34b29236c..68519c7e7e57f6 100644 --- a/toolsrc/src/vcpkg/commands.contact.cpp +++ b/toolsrc/src/vcpkg/commands.contact.cpp @@ -45,7 +45,7 @@ namespace vcpkg::Commands::Contact } #if defined(_WIN32) - System::cmd_execute("start https://aka.ms/NPS_vcpkg"); + System::cmd_execute(System::CmdLineBuilder("start").string_arg("https://aka.ms/NPS_vcpkg")); System::print2("Default browser launched to https://aka.ms/NPS_vcpkg; thank you for your feedback!\n"); #else System::print2("Please navigate to https://aka.ms/NPS_vcpkg in your preferred browser. Thank you for your " diff --git a/toolsrc/src/vcpkg/commands.create.cpp b/toolsrc/src/vcpkg/commands.create.cpp index 28f0377c58f9d0..44c2c55ab9b789 100644 --- a/toolsrc/src/vcpkg/commands.create.cpp +++ b/toolsrc/src/vcpkg/commands.create.cpp @@ -51,7 +51,7 @@ namespace vcpkg::Commands::Create cmake_args.emplace_back("FILENAME", zip_file_name); } - const std::string cmd_launch_cmake = make_cmake_cmd(paths, paths.ports_cmake, std::move(cmake_args)); + auto cmd_launch_cmake = make_cmake_cmd(paths, paths.ports_cmake, std::move(cmake_args)); return System::cmd_execute_clean(cmd_launch_cmake); } diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp index e23b35d0cf1829..86e0b7e3289bb9 100644 --- a/toolsrc/src/vcpkg/commands.edit.cpp +++ b/toolsrc/src/vcpkg/commands.edit.cpp @@ -219,14 +219,15 @@ namespace vcpkg::Commands::Edit candidate_paths.push_back(fs::path{"/usr/share/code/bin/code"}); candidate_paths.push_back(fs::path{"/usr/bin/code"}); - if (System::cmd_execute("command -v xdg-mime") == 0) + if (System::cmd_execute(System::CmdLineBuilder("command").string_arg("-v").string_arg("xdg-mime")) == 0) { - auto mime_qry = Strings::format(R"(xdg-mime query default text/plain)"); + auto mime_qry = + System::CmdLineBuilder("xdg-mime").string_arg("query").string_arg("default").string_arg("text/plain"); auto execute_result = System::cmd_execute_and_capture_output(mime_qry); if (execute_result.exit_code == 0 && !execute_result.output.empty()) { - mime_qry = Strings::format(R"(command -v %s)", - execute_result.output.substr(0, execute_result.output.find('.'))); + mime_qry = System::CmdLineBuilder("command").string_arg("-v").string_arg( + execute_result.output.substr(0, execute_result.output.find('.'))); execute_result = System::cmd_execute_and_capture_output(mime_qry); if (execute_result.exit_code == 0 && !execute_result.output.empty()) { @@ -254,7 +255,7 @@ namespace vcpkg::Commands::Edit const fs::path env_editor = *it; const std::vector arguments = create_editor_arguments(paths, options, ports); const auto args_as_string = Strings::join(" ", arguments); - const auto cmd_line = Strings::format(R"("%s" %s -n)", fs::u8string(env_editor), args_as_string); + auto cmd_line = System::CmdLineBuilder(env_editor).raw_arg(args_as_string).string_arg("-n"); auto editor_exe = fs::u8string(env_editor.filename()); @@ -262,7 +263,8 @@ namespace vcpkg::Commands::Edit if (editor_exe == "Code.exe" || editor_exe == "Code - Insiders.exe") { // note that we are invoking cmd silently but Code.exe is relaunched from there - System::cmd_execute_background(Strings::concat("cmd /c \"", cmd_line, " NuGet Package Manager->Package Manager Console const fs::path script_path = paths.scripts / "addPoshVcpkgToPowershellProfile.ps1"; const auto& ps = paths.get_tool_exe("powershell-core"); - const std::string cmd = Strings::format(R"("%s" -NoProfile -ExecutionPolicy Bypass -Command "& {& '%s' }")", - fs::u8string(ps), - fs::u8string(script_path)); + auto cmd = System::CmdLineBuilder(ps) + .string_arg("-NoProfile") + .string_arg("-ExecutionPolicy") + .string_arg("Bypass") + .string_arg("-Command") + .string_arg(Strings::format("& {& '%s' }", fs::u8string(script_path))); const int rc = System::cmd_execute(cmd); if (rc) { diff --git a/toolsrc/src/vcpkg/commands.porthistory.cpp b/toolsrc/src/vcpkg/commands.porthistory.cpp index 392bde7d0d6287..a2938242f55330 100644 --- a/toolsrc/src/vcpkg/commands.porthistory.cpp +++ b/toolsrc/src/vcpkg/commands.porthistory.cpp @@ -31,21 +31,20 @@ namespace vcpkg::Commands::PortHistory const System::ExitCodeAndOutput run_git_command_inner(const VcpkgPaths& paths, const fs::path& dot_git_directory, const fs::path& working_directory, - StringView cmd) + const System::CmdLineBuilder& cmd) { const fs::path& git_exe = paths.get_tool_exe(Tools::GIT); - System::CmdLineBuilder builder; - builder.path_arg(git_exe) - .string_arg(Strings::concat("--git-dir=", fs::u8string(dot_git_directory))) - .string_arg(Strings::concat("--work-tree=", fs::u8string(working_directory))); - const std::string full_cmd = Strings::concat(std::move(builder).extract(), " ", cmd); + auto full_cmd = System::CmdLineBuilder(git_exe) + .string_arg(Strings::concat("--git-dir=", fs::u8string(dot_git_directory))) + .string_arg(Strings::concat("--work-tree=", fs::u8string(working_directory))) + .raw_arg(cmd.command_line()); - const auto output = System::cmd_execute_and_capture_output(full_cmd); + auto output = System::cmd_execute_and_capture_output(full_cmd); return output; } - const System::ExitCodeAndOutput run_git_command(const VcpkgPaths& paths, StringView cmd) + const System::ExitCodeAndOutput run_git_command(const VcpkgPaths& paths, const System::CmdLineBuilder& cmd) { const fs::path& work_dir = paths.root; const fs::path dot_git_dir = paths.root / ".git"; @@ -89,7 +88,8 @@ namespace vcpkg::Commands::PortHistory const std::string& commit_date, const std::string& port_name) { - const std::string rev_parse_cmd = Strings::format("rev-parse %s:ports/%s", commit_id, port_name); + auto rev_parse_cmd = + System::CmdLineBuilder("rev-parse").string_arg(Strings::concat(commit_id, ":ports/", port_name)); auto rev_parse_output = run_git_command(paths, rev_parse_cmd); if (rev_parse_output.exit_code == 0) { @@ -97,7 +97,7 @@ namespace vcpkg::Commands::PortHistory const auto git_tree = Strings::trim(std::move(rev_parse_output.output)); // Do we have a manifest file? - const std::string manifest_cmd = Strings::format(R"(show %s:vcpkg.json)", git_tree, port_name); + auto manifest_cmd = System::CmdLineBuilder("show").string_arg(Strings::concat(git_tree, ":vcpkg.json")); auto manifest_output = run_git_command(paths, manifest_cmd); if (manifest_output.exit_code == 0) { @@ -105,7 +105,7 @@ namespace vcpkg::Commands::PortHistory manifest_output.output, git_tree, commit_id, commit_date, port_name, true); } - const std::string cmd = Strings::format(R"(show %s:CONTROL)", git_tree, commit_id, port_name); + auto cmd = System::CmdLineBuilder("show").string_arg(Strings::concat(git_tree, ":CONTROL")); auto control_output = run_git_command(paths, cmd); if (control_output.exit_code == 0) diff --git a/toolsrc/src/vcpkg/commands.portsdiff.cpp b/toolsrc/src/vcpkg/commands.portsdiff.cpp index d93d4d98a84981..2de30355b67667 100644 --- a/toolsrc/src/vcpkg/commands.portsdiff.cpp +++ b/toolsrc/src/vcpkg/commands.portsdiff.cpp @@ -91,15 +91,18 @@ namespace vcpkg::Commands::PortsDiff const auto checkout_this_dir = Strings::format(R"(.\%s)", ports_dir_name_as_string); // Must be relative to the root of the repository - const std::string cmd = Strings::format(R"("%s" --git-dir="%s" --work-tree="%s" checkout %s -f -q -- %s %s)", - fs::u8string(git_exe), - fs::u8string(dot_git_dir), - fs::u8string(temp_checkout_path), - git_commit_id, - checkout_this_dir, - ".vcpkg-root"); + auto cmd = System::CmdLineBuilder(git_exe) + .string_arg(Strings::format("--git-dir=%s", fs::u8string(dot_git_dir))) + .string_arg(Strings::format("--work-tree=%s", fs::u8string(temp_checkout_path))) + .string_arg("checkout") + .string_arg(git_commit_id) + .string_arg("-f") + .string_arg("-q") + .string_arg("--") + .string_arg(checkout_this_dir) + .string_arg(".vcpkg-root"); System::cmd_execute_and_capture_output(cmd, System::get_clean_environment()); - System::cmd_execute_and_capture_output(Strings::format(R"("%s" reset)", fs::u8string(git_exe)), + System::cmd_execute_and_capture_output(System::CmdLineBuilder(git_exe).string_arg("reset"), System::get_clean_environment()); const auto ports_at_commit = Paragraphs::load_overlay_ports(paths, temp_checkout_path / ports_dir_name_as_string); @@ -117,7 +120,7 @@ namespace vcpkg::Commands::PortsDiff { static const std::string VALID_COMMIT_OUTPUT = "commit\n"; - const auto cmd = Strings::format(R"("%s" cat-file -t %s)", fs::u8string(git_exe), git_commit_id); + auto cmd = System::CmdLineBuilder(git_exe).string_arg("cat-file").string_arg("-t").string_arg(git_commit_id); const System::ExitCodeAndOutput output = System::cmd_execute_and_capture_output(cmd); Checks::check_exit( VCPKG_LINE_INFO, output.output == VALID_COMMIT_OUTPUT, "Invalid commit id %s", git_commit_id); diff --git a/toolsrc/src/vcpkg/export.chocolatey.cpp b/toolsrc/src/vcpkg/export.chocolatey.cpp index b9f14a4d1e2a2f..13df2c909f0bfb 100644 --- a/toolsrc/src/vcpkg/export.chocolatey.cpp +++ b/toolsrc/src/vcpkg/export.chocolatey.cpp @@ -216,10 +216,12 @@ if (Test-Path $installedDir) const fs::path chocolatey_uninstall_file_path = per_package_dir_path / "tools" / "chocolateyUninstall.ps1"; fs.write_contents(chocolatey_uninstall_file_path, chocolatey_uninstall_content, VCPKG_LINE_INFO); - const auto cmd_line = Strings::format(R"("%s" pack -OutputDirectory "%s" "%s" -NoDefaultExcludes)", - fs::u8string(nuget_exe), - fs::u8string(exported_dir_path), - fs::u8string(nuspec_file_path)); + auto cmd_line = System::CmdLineBuilder(nuget_exe) + .string_arg("pack") + .string_arg("-OutputDirectory") + .path_arg(exported_dir_path) + .path_arg(nuspec_file_path) + .string_arg("-NoDefaultExcludes"); const int exit_code = System::cmd_execute_and_capture_output(cmd_line, System::get_clean_environment()).exit_code; diff --git a/toolsrc/src/vcpkg/export.ifw.cpp b/toolsrc/src/vcpkg/export.ifw.cpp index 9726a93f92d13a..a2582d213e8e49 100644 --- a/toolsrc/src/vcpkg/export.ifw.cpp +++ b/toolsrc/src/vcpkg/export.ifw.cpp @@ -370,10 +370,10 @@ namespace vcpkg::Export::IFW fs::generic_u8string(repository_dir), failure_point.string()); - const auto cmd_line = Strings::format(R"("%s" --packages "%s" "%s")", - fs::u8string(repogen_exe), - fs::u8string(packages_dir), - fs::u8string(repository_dir)); + auto cmd_line = System::CmdLineBuilder(repogen_exe) + .string_arg("--packages") + .path_arg(packages_dir) + .path_arg(repository_dir); const int exit_code = System::cmd_execute_and_capture_output(cmd_line, System::get_clean_environment()).exit_code; @@ -393,24 +393,27 @@ namespace vcpkg::Export::IFW System::printf("Generating installer %s...\n", fs::generic_u8string(installer_file)); - std::string cmd_line; + System::CmdLineBuilder cmd_line; std::string ifw_repo_url = ifw_options.maybe_repository_url.value_or(""); if (!ifw_repo_url.empty()) { - cmd_line = Strings::format(R"("%s" --online-only --config "%s" --repository "%s" "%s")", - fs::u8string(binarycreator_exe), - fs::u8string(config_file), - fs::u8string(repository_dir), - fs::u8string(installer_file)); + cmd_line = System::CmdLineBuilder(binarycreator_exe) + .string_arg("--online-only") + .string_arg("--config") + .path_arg(config_file) + .string_arg("--repository") + .path_arg(repository_dir) + .path_arg(installer_file); } else { - cmd_line = Strings::format(R"("%s" --config "%s" --packages "%s" "%s")", - fs::u8string(binarycreator_exe), - fs::u8string(config_file), - fs::u8string(packages_dir), - fs::u8string(installer_file)); + cmd_line = System::CmdLineBuilder(binarycreator_exe) + .string_arg("--config") + .path_arg(config_file) + .string_arg("--packages") + .path_arg(packages_dir) + .path_arg(installer_file); } const int exit_code = diff --git a/toolsrc/src/vcpkg/export.prefab.cpp b/toolsrc/src/vcpkg/export.prefab.cpp index 3fb4d17306567f..9a625157c54e2d 100644 --- a/toolsrc/src/vcpkg/export.prefab.cpp +++ b/toolsrc/src/vcpkg/export.prefab.cpp @@ -206,10 +206,11 @@ namespace vcpkg::Export::Prefab #if defined(_WIN32) auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP); - System::cmd_execute_and_capture_output( - Strings::format( - R"("%s" a "%s" "%s\*")", fs::u8string(seven_zip_exe), fs::u8string(destination), fs::u8string(source)), - System::get_clean_environment()); + System::cmd_execute_and_capture_output(System::CmdLineBuilder(seven_zip_exe) + .string_arg("a") + .path_arg(destination) + .path_arg(source / fs::u8path("*")), + System::get_clean_environment()); #else System::cmd_execute_clean( System::CmdLineBuilder{"zip"}.string_arg("--quiet").string_arg("-r").path_arg(destination).string_arg("*"), @@ -223,11 +224,14 @@ namespace vcpkg::Export::Prefab { System::print2("\n[DEBUG] Installing POM and AAR file to ~/.m2\n\n"); } - const char* cmd_line_format = prefab_options.enable_debug - ? R"("%s" "install:install-file" "-Dfile=%s" "-DpomFile=%s")" - : R"("%s" "-q" "install:install-file" "-Dfile=%s" "-DpomFile=%s")"; - - const auto cmd_line = Strings::format(cmd_line_format, Tools::MAVEN, fs::u8string(aar), fs::u8string(pom)); + auto cmd_line = System::CmdLineBuilder(Tools::MAVEN); + if (!prefab_options.enable_debug) + { + cmd_line.string_arg("-q"); + } + cmd_line.string_arg("install:install-file") + .string_arg(Strings::concat("-Dfile=", fs::u8string(aar))) + .string_arg(Strings::concat("-DpomFile=", fs::u8string(pom))); const int exit_code = System::cmd_execute_clean(cmd_line); Checks::check_exit( VCPKG_LINE_INFO, exit_code == 0, "Error: %s installing maven file", fs::generic_u8string(aar)); diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index 9e9f43c1582f3e..587e48d0b12ba2 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -257,7 +257,7 @@ namespace vcpkg::Metrics return "{}"; } - auto getmac = System::cmd_execute_and_capture_output("getmac"); + auto getmac = System::cmd_execute_and_capture_output(System::CmdLineBuilder("getmac")); if (getmac.exit_code != 0) return "0"; @@ -480,11 +480,21 @@ namespace vcpkg::Metrics builder.path_arg(vcpkg_metrics_txt_path); System::cmd_execute_background(builder); #else - auto escaped_path = Strings::escape_string(fs::u8string(vcpkg_metrics_txt_path), '\'', '\\'); - const std::string cmd_line = Strings::format( - R"((curl "https://dc.services.visualstudio.com/v2/track" -H "Content-Type: application/json" -X POST --tlsv1.2 --data '@%s' >/dev/null 2>&1; rm '%s') &)", - escaped_path, - escaped_path); + // TODO: convert to cmd_execute_background or something. + auto curl = System::CmdLineBuilder("curl") + .string_arg("https://dc.services.visualstudio.com/v2/track") + .string_arg("-H") + .string_arg("Content-Type: application/json") + .string_arg("-X") + .string_arg("POST") + .string_arg("--tlsv1.2") + .string_arg("--data") + .string_arg(Strings::concat("@", fs::u8string(vcpkg_metrics_txt_path))) + .raw_arg(">/dev/null") + .raw_arg("2>&1"); + auto remove = System::CmdLineBuilder("rm").path_arg(vcpkg_metrics_txt_path); + System::CmdLineBuilder cmd_line; + cmd_line.raw_arg("(").raw_arg(curl.command_line()).raw_arg(";").raw_arg(remove.command_line()).raw_arg(") &"); System::cmd_execute_clean(cmd_line); #endif } diff --git a/toolsrc/src/vcpkg/postbuildlint.cpp b/toolsrc/src/vcpkg/postbuildlint.cpp index 0ea5786f6a9776..5248a025a0cf1b 100644 --- a/toolsrc/src/vcpkg/postbuildlint.cpp +++ b/toolsrc/src/vcpkg/postbuildlint.cpp @@ -390,10 +390,10 @@ namespace vcpkg::PostBuildLint std::vector dlls_with_no_exports; for (const fs::path& dll : dlls) { - const std::string cmd_line = - Strings::format(R"("%s" /exports "%s")", fs::u8string(dumpbin_exe), fs::u8string(dll)); + auto cmd_line = System::CmdLineBuilder(dumpbin_exe).string_arg("/exports").path_arg(dll); System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line); - Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line); + Checks::check_exit( + VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line.command_line()); if (ec_data.output.find("ordinal hint RVA name") == std::string::npos) { @@ -428,10 +428,10 @@ namespace vcpkg::PostBuildLint std::vector dlls_with_improper_uwp_bit; for (const fs::path& dll : dlls) { - const std::string cmd_line = - Strings::format(R"("%s" /headers "%s")", fs::u8string(dumpbin_exe), fs::u8string(dll)); + auto cmd_line = System::CmdLineBuilder(dumpbin_exe).string_arg("/headers").path_arg(dll); System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line); - Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line); + Checks::check_exit( + VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line.command_line()); if (ec_data.output.find("App Container") == std::string::npos) { @@ -720,13 +720,12 @@ namespace vcpkg::PostBuildLint for (const fs::path& lib : libs) { - const std::string cmd_line = - Strings::format(R"("%s" /directives "%s")", fs::u8string(dumpbin_exe), fs::u8string(lib)); + auto cmd_line = System::CmdLineBuilder(dumpbin_exe).string_arg("/directives").path_arg(lib); System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line); Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed with message:\n%s", - cmd_line, + cmd_line.command_line(), ec_data.output); for (const BuildType& bad_build_type : bad_build_types) @@ -775,10 +774,10 @@ namespace vcpkg::PostBuildLint for (const fs::path& dll : dlls) { - const auto cmd_line = - Strings::format(R"("%s" /dependents "%s")", fs::u8string(dumpbin_exe), fs::u8string(dll)); + auto cmd_line = System::CmdLineBuilder(dumpbin_exe).string_arg("/dependents").path_arg(dll); System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line); - Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line); + Checks::check_exit( + VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line.command_line()); for (const OutdatedDynamicCrt& outdated_crt : get_outdated_dynamic_crts(pre_build_info.platform_toolset)) { diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index bdf2bdf6b79811..55476f2683e273 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -297,7 +297,7 @@ namespace vcpkg } virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { - const std::string cmd = Strings::format(R"("%s" --version)", fs::u8string(path_to_exe)); + auto cmd = System::CmdLineBuilder(path_to_exe).string_arg("--version"); auto rc = System::cmd_execute_and_capture_output(cmd); if (rc.exit_code != 0) { @@ -326,7 +326,7 @@ CMake suite maintained and supported by Kitware (kitware.com/cmake). virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { - const std::string cmd = Strings::format(R"("%s" --version)", fs::u8string(path_to_exe)); + auto cmd = System::CmdLineBuilder(path_to_exe).string_arg("--version"); auto rc = System::cmd_execute_and_capture_output(cmd); if (rc.exit_code != 0) { @@ -414,7 +414,7 @@ Type 'NuGet help ' for help on a specific command. virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { - const std::string cmd = Strings::format(R"("%s" --version)", fs::u8string(path_to_exe)); + auto cmd = System::CmdLineBuilder(path_to_exe).string_arg("--version"); auto rc = System::cmd_execute_and_capture_output(cmd); if (rc.exit_code != 0) { @@ -443,8 +443,8 @@ git version 2.17.1.windows.2 virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { - auto rc = System::cmd_execute_and_capture_output( - System::CmdLineBuilder().path_arg(path_to_exe).string_arg("--version").extract()); + auto rc = + System::cmd_execute_and_capture_output(System::CmdLineBuilder(path_to_exe).string_arg("--version")); if (rc.exit_code != 0) { return {Strings::concat( @@ -485,7 +485,7 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50 virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { - const std::string cmd = Strings::format(R"("%s" --framework-version)", fs::u8string(path_to_exe)); + auto cmd = System::CmdLineBuilder(path_to_exe).string_arg("--framework-version"); auto rc = System::cmd_execute_and_capture_output(cmd); if (rc.exit_code != 0) { @@ -512,8 +512,8 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50 virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { - auto rc = System::cmd_execute_and_capture_output( - System::CmdLineBuilder().path_arg(path_to_exe).string_arg("--version").extract()); + auto rc = + System::cmd_execute_and_capture_output(System::CmdLineBuilder(path_to_exe).string_arg("--version")); if (rc.exit_code != 0) { return {Strings::concat( diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 407a14fd63982e..1c65cd17001281 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -573,8 +573,7 @@ If you wish to silence this error and use classic mode, you can: .string_arg("-d") .string_arg("HEAD") .string_arg("--") - .path_arg(path_with_separator) - .extract(); + .path_arg(path_with_separator); auto output = System::cmd_execute_and_capture_output(git_cmd); if (output.exit_code != 0) @@ -589,19 +588,22 @@ If you wish to silence this error and use classic mode, you can: // SP SP TAB auto split_line = Strings::split(line, '\t'); if (split_line.size() != 2) - return Strings::format( - "Error: Unexpected output from command `%s`. Couldn't split by `\\t`.\n%s", git_cmd, line); + return Strings::format("Error: Unexpected output from command `%s`. Couldn't split by `\\t`.\n%s", + git_cmd.command_line(), + line); auto file_info_section = Strings::split(split_line[0], ' '); if (file_info_section.size() != 3) - return Strings::format( - "Error: Unexepcted output from command `%s`. Couldn't split by ` `.\n%s", git_cmd, line); + return Strings::format("Error: Unexepcted output from command `%s`. Couldn't split by ` `.\n%s", + git_cmd.command_line(), + line); const auto index = split_line[1].find_last_of('/'); if (index == std::string::npos) { - return Strings::format( - "Error: Unexpected output from command `%s`. Couldn't split by `/`.\n%s", git_cmd, line); + return Strings::format("Error: Unexpected output from command `%s`. Couldn't split by `/`.\n%s", + git_cmd.command_line(), + line); } ret.emplace(split_line[1].substr(index + 1), file_info_section.back()); diff --git a/toolsrc/src/vcpkg/visualstudio.cpp b/toolsrc/src/vcpkg/visualstudio.cpp index 7c9331da5bf99b..f55f8e6bc0bdf9 100644 --- a/toolsrc/src/vcpkg/visualstudio.cpp +++ b/toolsrc/src/vcpkg/visualstudio.cpp @@ -84,8 +84,14 @@ namespace vcpkg::VisualStudio const fs::path vswhere_exe = program_files_32_bit / "Microsoft Visual Studio" / "Installer" / "vswhere.exe"; if (fs.exists(vswhere_exe)) { - const auto code_and_output = System::cmd_execute_and_capture_output( - Strings::format(R"("%s" -all -prerelease -legacy -products * -format xml)", fs::u8string(vswhere_exe))); + const auto code_and_output = System::cmd_execute_and_capture_output(System::CmdLineBuilder(vswhere_exe) + .string_arg("-all") + .string_arg("-prerelease") + .string_arg("-legacy") + .string_arg("-products") + .string_arg("*") + .string_arg("-format") + .string_arg("xml")); Checks::check_exit(VCPKG_LINE_INFO, code_and_output.exit_code == 0, "Running vswhere.exe failed with message:\n%s", From 0843f63718f129d5c702f545be0acc8fc7900fda Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 14 Jan 2021 09:58:40 -0800 Subject: [PATCH 0483/1694] Improve `x-ci-verify-versions` error messages (#15651) * [vcpkg] Change version field in `baseline.json` * Change name from `version-tag` to `baseline` * [vcpkg] x-history serializes version scheme * Update e2e tests * Update baseline e2e test * [x-ci-verify-versions] Improve error messages * Enable CI check for port_versions * Fix missing and extra line breaks. * Remove CI check --- .../src/vcpkg/commands.civerifyversions.cpp | 195 +++++++++++++----- 1 file changed, 140 insertions(+), 55 deletions(-) diff --git a/toolsrc/src/vcpkg/commands.civerifyversions.cpp b/toolsrc/src/vcpkg/commands.civerifyversions.cpp index 00c95f79245f1f..7f142e279bcf4e 100644 --- a/toolsrc/src/vcpkg/commands.civerifyversions.cpp +++ b/toolsrc/src/vcpkg/commands.civerifyversions.cpp @@ -15,6 +15,17 @@ namespace { using namespace vcpkg; + std::string get_scheme_name(Versions::Scheme scheme) + { + switch (scheme) + { + case Versions::Scheme::Relaxed: return "version"; + case Versions::Scheme::Semver: return "version-semver"; + case Versions::Scheme::String: return "version-string"; + case Versions::Scheme::Date: return "version-date"; + default: Checks::unreachable(VCPKG_LINE_INFO); + } + } } namespace vcpkg::Commands::CIVerifyVersions @@ -52,8 +63,11 @@ namespace vcpkg::Commands::CIVerifyVersions if (!maybe_versions.has_value()) { return { - Strings::format( - "Error: Cannot parse `%s`.\n\t%s", fs::u8string(versions_file_path), maybe_versions.error()), + Strings::format("Error: While attempting to parse versions for port %s from file: %s\n" + " Found the following error(s):\n%s", + port_name, + fs::u8string(versions_file_path), + maybe_versions.error()), expected_right_tag, }; } @@ -62,7 +76,10 @@ namespace vcpkg::Commands::CIVerifyVersions if (versions.empty()) { return { - Strings::format("Error: File `%s` contains no versions.", fs::u8string(versions_file_path)), + Strings::format("Error: While reading versions for port %s from file: %s\n" + " File contains no versions.", + port_name, + fs::u8string(versions_file_path)), expected_right_tag, }; } @@ -83,9 +100,14 @@ namespace vcpkg::Commands::CIVerifyVersions if (!maybe_scf.has_value()) { return { - Strings::format("Error: Unable to parse `%s` used in version `%s`.\n%s\n", - treeish, + Strings::format("Error: While reading versions for port %s from file: %s\n" + " While validating version: %s.\n" + " While trying to load port from: %s\n" + " Found the following error(s):\n%s", + port_name, + fs::u8string(versions_file_path), version_entry.first.versiont, + treeish, maybe_scf.error()->error), expected_right_tag, }; @@ -96,12 +118,16 @@ namespace vcpkg::Commands::CIVerifyVersions if (version_entry.first.versiont != git_tree_version.versiont) { return { - Strings::format("Error: Version in git-tree `%s` does not match version in file " - "`%s`.\n\tgit-tree version: %s\n\t file version: %s\n", - version_entry.second, - fs::u8string(versions_file_path), - git_tree_version.versiont, - version_entry.first.versiont), + Strings::format( + "Error: While reading versions for port %s from file: %s\n" + " While validating version: %s.\n" + " The version declared in file does not match checked-out version: %s\n" + " Checked out Git SHA: %s", + port_name, + fs::u8string(versions_file_path), + version_entry.first.versiont, + git_tree_version.versiont, + version_entry.second), expected_right_tag, }; } @@ -112,11 +138,15 @@ namespace vcpkg::Commands::CIVerifyVersions if (!version_ok) { return { - Strings::format("Error: The git-tree `%s` for version `%s` in `%s` does not contain a " - "CONTROL file or vcpkg.json file.", - version_entry.second, - version_entry.first.versiont, - fs::u8string(versions_file_path)), + Strings::format( + "Error: While reading versions for port %s from file: %s\n" + " While validating version: %s.\n" + " The checked-out object does not contain a CONTROL file or vcpkg.json file.\n" + " Checked out Git SHA: %s", + port_name, + fs::u8string(versions_file_path), + version_entry.first.versiont, + version_entry.second), expected_right_tag, }; } @@ -129,48 +159,87 @@ namespace vcpkg::Commands::CIVerifyVersions if (!maybe_scf.has_value()) { return { - Strings::format("Error: Cannot load port `%s`.\n\t%s", port_name, maybe_scf.error()->error), + Strings::format("Error: While attempting to load local port %s.\n" + " Found the following error(s):\n%s", + port_name, + maybe_scf.error()->error), expected_right_tag, }; } - const auto found_version = maybe_scf.value_or_exit(VCPKG_LINE_INFO)->to_schemed_version(); - if (top_entry.first.versiont != found_version.versiont) + const auto local_port_version = maybe_scf.value_or_exit(VCPKG_LINE_INFO)->to_schemed_version(); + + if (top_entry.first.versiont != local_port_version.versiont) { auto versions_end = versions.end(); auto it = std::find_if(versions.begin(), versions_end, [&](auto&& entry) { - return entry.first.versiont == found_version.versiont; + return entry.first.versiont == local_port_version.versiont; }); if (it != versions_end) { return { - Strings::format("Error: Version `%s` found but is not the top entry in `%s`.", - found_version.versiont, - fs::u8string(versions_file_path)), + Strings::format("Error: While reading versions for port %s from file: %s\n" + " Local port version `%s` exists in version file but it's not the first " + "entry in the \"versions\" array.", + port_name, + fs::u8string(versions_file_path), + local_port_version.versiont), expected_right_tag, }; } else { return { - Strings::format("Error: Version `%s` not found in `%s`.", - found_version.versiont, - fs::u8string(versions_file_path)), + Strings::format("Error: While reading versions for port %s from file: %s\n" + " Version `%s` was not found in versions file.\n" + " Run:\n\n" + " vcpkg x-add-version %s\n\n" + " to add the new port version.", + port_name, + fs::u8string(versions_file_path), + local_port_version.versiont, + port_name), expected_right_tag, }; } } + if (top_entry.first.scheme != local_port_version.scheme) + { + return { + Strings::format("Error: While reading versions for port %s from file: %s\n" + " File declares version `%s` with scheme: `%s`.\n" + " But local port declares the same version with a different scheme: `%s`.\n" + " Version must be unique even between different schemes.\n" + " Run:\n\n" + " vcpkg x-add-version %s --overwrite-version\n\n" + " to overwrite the declared version's scheme.", + port_name, + fs::u8string(versions_file_path), + top_entry.first.versiont, + get_scheme_name(top_entry.first.scheme), + get_scheme_name(local_port_version.scheme), + port_name), + expected_right_tag, + }; + } + if (local_git_tree != top_entry.second) { return { - Strings::format("Error: Git tree-ish object for version `%s` in `%s` does not match local port files.\n" - "\tLocal SHA: %s\n" - "\t File SHA: %s", - found_version.versiont, + Strings::format("Error: While reading versions for port %s from file: %s\n" + " File declares version `%s` with SHA: %s\n" + " But local port with the same verion has a differint SHA: %s\n" + " This may be caused by locally commited changes to the port.\n" + " Run:\n\n" + " vcpkg x-add-version %s --overwrite-version\n\n" + " to overwrite the declared version's SHA.", + port_name, fs::u8string(versions_file_path), + top_entry.first.versiont, local_git_tree, - top_entry.second), + top_entry.second, + port_name), expected_right_tag, }; } @@ -179,7 +248,14 @@ namespace vcpkg::Commands::CIVerifyVersions if (maybe_baseline == baseline.end()) { return { - Strings::format("Error: Couldn't find baseline version for port `%s`.", port_name), + Strings::format("Error: While reading baseline version for port %s.\n" + " Baseline version not found.\n" + " Run:\n\n" + " vcpkg x-add-version %s\n\n" + " to set version %s as the baseline version.", + port_name, + port_name, + local_port_version.versiont), expected_right_tag, }; } @@ -188,27 +264,18 @@ namespace vcpkg::Commands::CIVerifyVersions if (baseline_version != top_entry.first.versiont) { return { - Strings::format("Error: The baseline version for port `%s` doesn't match the latest version.\n" - "\tBaseline version: %s\n" - "\t Latest version: %s (%s)", + Strings::format("Error: While reading baseline version for port %s.\n" + " While validating latest version from file: %s\n" + " Baseline file declares version: %s.\n" + " But the latest version in version files is: %s.\n" + " Run:\n\n" + " vcpkg x-add-version %s\n\n" + " to update the baseline version.", port_name, + fs::u8string(versions_file_path), baseline_version, top_entry.first.versiont, - fs::u8string(versions_file_path)), - expected_right_tag, - }; - } - - if (local_git_tree != top_entry.second) - { - return { - Strings::format("Error: Git tree-ish object for version `%s` in `%s` does not match local port files.\n" - "\tLocal SHA: %s\n" - "\t File SHA: %s", - found_version.versiont, - fs::u8string(versions_file_path), - local_git_tree, - top_entry.second), + port_name), expected_right_tag, }; } @@ -238,7 +305,7 @@ namespace vcpkg::Commands::CIVerifyVersions auto maybe_port_git_tree_map = paths.git_get_local_port_treeish_map(); Checks::check_exit(VCPKG_LINE_INFO, maybe_port_git_tree_map.has_value(), - "Error: Failed to obtain git treeish objects for local ports.\n%s", + "Fatal error: Failed to obtain git SHAs for local ports.\n%s", maybe_port_git_tree_map.error()); auto port_git_tree_map = maybe_port_git_tree_map.value_or_exit(VCPKG_LINE_INFO); @@ -260,7 +327,17 @@ namespace vcpkg::Commands::CIVerifyVersions if (git_tree_it == port_git_tree_map.end()) { System::printf(System::Color::error, "FAIL: %s\n", port_name); - errors.emplace(Strings::format("Error: Missing local git tree object for port `%s`.", port_name)); + errors.emplace(Strings::format("Error: While validating port %s.\n" + " Missing Git SHA.\n" + " Run:\n\n" + " git add %s.\n" + " git commit -m \"[%s] Add new port\"\n" + " vcpkg x-add-version %s\n\n" + " to commit the new port and create its version file.", + port_name, + fs::u8string(port_path), + port_name, + port_name)); continue; } auto git_tree = git_tree_it->second; @@ -274,7 +351,9 @@ namespace vcpkg::Commands::CIVerifyVersions { System::printf(System::Color::error, "FAIL: %s\n", port_name); errors.emplace( - Strings::format("Error: Both a manifest file and a CONTROL file exist in port directory: %s", + Strings::format("Error: While validating port %s.\n" + " Both a manifest file and a CONTROL file exist in port directory: %s", + port_name, fs::u8string(port_path))); continue; } @@ -282,7 +361,9 @@ namespace vcpkg::Commands::CIVerifyVersions if (!manifest_exists && !control_exists) { System::printf(System::Color::error, "FAIL: %s\n", port_name); - errors.emplace(Strings::format("Error: No manifest file or CONTROL file exist in port directory: %s", + errors.emplace(Strings::format("Error: While validating port %s.\n" + " No manifest file or CONTROL file exist in port directory: %s", + port_name, fs::u8string(port_path))); continue; } @@ -292,7 +373,8 @@ namespace vcpkg::Commands::CIVerifyVersions if (!fs.exists(versions_file_path)) { System::printf(System::Color::error, "FAIL: %s\n", port_name); - errors.emplace(Strings::format("Error: Missing versions file for `%s`. Expected at `%s`.", + errors.emplace(Strings::format("Error: While validating port %s.\n" + " Missing expected versions file at: %s", port_name, fs::u8string(versions_file_path))); continue; @@ -318,6 +400,9 @@ namespace vcpkg::Commands::CIVerifyVersions { System::printf(System::Color::error, "%s\n", error); } + System::print2(System::Color::error, + "\nTo attempt to resolve all erros at once, run:\n\n" + " vcpkg x-add-version --all --overwrite-versions\n\n"); Checks::exit_fail(VCPKG_LINE_INFO); } Checks::exit_success(VCPKG_LINE_INFO); From ec1dab36d07d73be855bd8a310ddc574819eda5f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 14 Jan 2021 23:51:36 +0100 Subject: [PATCH 0484/1694] don't change line endings on patching. (#15578) --- scripts/cmake/vcpkg_apply_patches.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_apply_patches.cmake b/scripts/cmake/vcpkg_apply_patches.cmake index a3b6a46ee0ec25..b2e2263511241e 100644 --- a/scripts/cmake/vcpkg_apply_patches.cmake +++ b/scripts/cmake/vcpkg_apply_patches.cmake @@ -51,7 +51,7 @@ function(vcpkg_apply_patches) message(STATUS "Applying patch ${PATCH}") set(LOGNAME patch-${TARGET_TRIPLET}-${PATCHNUM}) vcpkg_execute_in_download_mode( - COMMAND ${GIT} -c core.longpaths=true --work-tree=. --git-dir=.git apply "${ABSOLUTE_PATCH}" --ignore-whitespace --whitespace=nowarn --verbose + COMMAND ${GIT} -c core.longpaths=true -c core.autocrlf=false --work-tree=. --git-dir=.git apply "${ABSOLUTE_PATCH}" --ignore-whitespace --whitespace=nowarn --verbose OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-out.log ERROR_VARIABLE error WORKING_DIRECTORY ${_ap_SOURCE_PATH} From 21faf7f0ed32b48eccac2a329263e0abe2737bc0 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 14 Jan 2021 16:08:36 -0800 Subject: [PATCH 0485/1694] [vcpkg] Add version files (#15652) * Add version files * Remove unnecessary file --- .gitignore | 2 - port_versions/3-/3fd.json | 34 ++ port_versions/7-/7zip.json | 19 ++ port_versions/a-/abseil.json | 294 ++++++++++++++++++ port_versions/a-/absent.json | 14 + port_versions/a-/ace.json | 169 ++++++++++ port_versions/a-/activemq-cpp.json | 24 ++ port_versions/a-/ade.json | 19 ++ port_versions/a-/aixlog.json | 29 ++ port_versions/a-/akali.json | 29 ++ port_versions/a-/alac-decoder.json | 24 ++ port_versions/a-/alac.json | 14 + port_versions/a-/alembic.json | 139 +++++++++ port_versions/a-/aliyun-oss-c-sdk.json | 19 ++ port_versions/a-/allegro5.json | 39 +++ port_versions/a-/ampl-asl.json | 9 + port_versions/a-/ampl-mp.json | 24 ++ port_versions/a-/amqpcpp.json | 24 ++ port_versions/a-/anax.json | 39 +++ port_versions/a-/angelscript.json | 29 ++ port_versions/a-/angle.json | 104 +++++++ port_versions/a-/antlr4.json | 49 +++ port_versions/a-/any-lite.json | 9 + port_versions/a-/anyrpc.json | 24 ++ port_versions/a-/apr-util.json | 49 +++ port_versions/a-/apr.json | 64 ++++ port_versions/a-/arb.json | 34 ++ port_versions/a-/arcus.json | 9 + port_versions/a-/argagg.json | 14 + port_versions/a-/argh.json | 19 ++ port_versions/a-/argparse.json | 24 ++ port_versions/a-/args.json | 59 ++++ port_versions/a-/argtable2.json | 34 ++ port_versions/a-/argtable3.json | 14 + port_versions/a-/argumentum.json | 14 + port_versions/a-/armadillo.json | 64 ++++ port_versions/a-/arrayfire.json | 19 ++ port_versions/a-/arrow.json | 129 ++++++++ port_versions/a-/ashes.json | 9 + port_versions/a-/asio.json | 64 ++++ port_versions/a-/asiosdk.json | 14 + port_versions/a-/asmjit.json | 59 ++++ port_versions/a-/assimp.json | 124 ++++++++ port_versions/a-/asynch.json | 14 + port_versions/a-/asyncplusplus.json | 14 + port_versions/a-/atk.json | 49 +++ port_versions/a-/atkmm.json | 34 ++ port_versions/a-/atlmfc.json | 9 + port_versions/a-/aubio.json | 84 +++++ port_versions/a-/audiofile.json | 9 + port_versions/a-/aurora.json | 9 + port_versions/a-/autobahn.json | 14 + port_versions/a-/avisynthplus.json | 24 ++ port_versions/a-/avro-c.json | 39 +++ port_versions/a-/avro-cpp.json | 9 + port_versions/a-/aws-c-common.json | 34 ++ port_versions/a-/aws-c-event-stream.json | 19 ++ port_versions/a-/aws-checksums.json | 24 ++ port_versions/a-/aws-lambda-cpp.json | 34 ++ port_versions/a-/aws-sdk-cpp.json | 274 ++++++++++++++++ port_versions/a-/azmq.json | 14 + port_versions/a-/azure-c-shared-utility.json | 134 ++++++++ port_versions/a-/azure-iot-sdk-c.json | 154 +++++++++ port_versions/a-/azure-kinect-sensor-sdk.json | 39 +++ port_versions/a-/azure-macro-utils-c.json | 64 ++++ port_versions/a-/azure-storage-cpp.json | 139 +++++++++ port_versions/a-/azure-uamqp-c.json | 114 +++++++ port_versions/a-/azure-uhttp-c.json | 104 +++++++ port_versions/a-/azure-umqtt-c.json | 119 +++++++ port_versions/b-/basisu.json | 34 ++ port_versions/b-/bcg729.json | 9 + port_versions/b-/bde.json | 19 ++ port_versions/b-/bdwgc.json | 9 + port_versions/b-/beast.json | 69 ++++ port_versions/b-/behaviortree-cpp.json | 19 ++ port_versions/b-/benchmark.json | 64 ++++ port_versions/b-/bento4.json | 9 + port_versions/b-/berkeleydb.json | 34 ++ port_versions/b-/bfgroup-lyra.json | 19 ++ port_versions/b-/bigint.json | 39 +++ port_versions/b-/binn.json | 24 ++ port_versions/b-/bitmagic.json | 9 + .../b-/bitserializer-cpprestjson.json | 19 ++ port_versions/b-/bitserializer-pugixml.json | 14 + port_versions/b-/bitserializer-rapidjson.json | 19 ++ port_versions/b-/bitserializer-rapidyaml.json | 14 + port_versions/b-/bitserializer.json | 24 ++ port_versions/b-/bitsery.json | 34 ++ port_versions/b-/blas.json | 9 + port_versions/b-/blaze.json | 79 +++++ port_versions/b-/blend2d.json | 64 ++++ port_versions/b-/blitz.json | 14 + port_versions/b-/blosc.json | 54 ++++ port_versions/b-/bond.json | 84 +++++ port_versions/b-/boolinq.json | 9 + port_versions/b-/boost-accumulators.json | 54 ++++ port_versions/b-/boost-algorithm.json | 54 ++++ port_versions/b-/boost-align.json | 54 ++++ port_versions/b-/boost-any.json | 54 ++++ port_versions/b-/boost-array.json | 54 ++++ port_versions/b-/boost-asio.json | 79 +++++ port_versions/b-/boost-assert.json | 54 ++++ port_versions/b-/boost-assign.json | 54 ++++ port_versions/b-/boost-atomic.json | 54 ++++ port_versions/b-/boost-beast.json | 59 ++++ port_versions/b-/boost-bimap.json | 54 ++++ port_versions/b-/boost-bind.json | 54 ++++ port_versions/b-/boost-build.json | 109 +++++++ port_versions/b-/boost-callable-traits.json | 59 ++++ port_versions/b-/boost-chrono.json | 54 ++++ port_versions/b-/boost-circular-buffer.json | 54 ++++ port_versions/b-/boost-compatibility.json | 54 ++++ port_versions/b-/boost-compute.json | 54 ++++ port_versions/b-/boost-concept-check.json | 54 ++++ port_versions/b-/boost-config.json | 54 ++++ port_versions/b-/boost-container-hash.json | 49 +++ port_versions/b-/boost-container.json | 54 ++++ port_versions/b-/boost-context.json | 69 ++++ port_versions/b-/boost-contract.json | 49 +++ port_versions/b-/boost-conversion.json | 54 ++++ port_versions/b-/boost-convert.json | 54 ++++ port_versions/b-/boost-core.json | 54 ++++ port_versions/b-/boost-coroutine.json | 69 ++++ port_versions/b-/boost-coroutine2.json | 59 ++++ port_versions/b-/boost-crc.json | 54 ++++ port_versions/b-/boost-date-time.json | 54 ++++ port_versions/b-/boost-detail.json | 54 ++++ port_versions/b-/boost-di.json | 29 ++ port_versions/b-/boost-dll.json | 54 ++++ port_versions/b-/boost-dynamic-bitset.json | 54 ++++ port_versions/b-/boost-endian.json | 54 ++++ port_versions/b-/boost-exception.json | 54 ++++ port_versions/b-/boost-fiber.json | 64 ++++ port_versions/b-/boost-filesystem.json | 59 ++++ port_versions/b-/boost-flyweight.json | 54 ++++ port_versions/b-/boost-foreach.json | 54 ++++ port_versions/b-/boost-format.json | 54 ++++ port_versions/b-/boost-function-types.json | 54 ++++ port_versions/b-/boost-function.json | 54 ++++ port_versions/b-/boost-functional.json | 54 ++++ port_versions/b-/boost-fusion.json | 54 ++++ port_versions/b-/boost-geometry.json | 54 ++++ port_versions/b-/boost-gil.json | 54 ++++ port_versions/b-/boost-graph-parallel.json | 59 ++++ port_versions/b-/boost-graph.json | 54 ++++ port_versions/b-/boost-hana.json | 64 ++++ port_versions/b-/boost-heap.json | 54 ++++ port_versions/b-/boost-histogram.json | 34 ++ port_versions/b-/boost-hof.json | 49 +++ port_versions/b-/boost-icl.json | 54 ++++ port_versions/b-/boost-integer.json | 54 ++++ port_versions/b-/boost-interprocess.json | 54 ++++ port_versions/b-/boost-interval.json | 54 ++++ port_versions/b-/boost-intrusive.json | 54 ++++ port_versions/b-/boost-io.json | 54 ++++ port_versions/b-/boost-iostreams.json | 79 +++++ port_versions/b-/boost-iterator.json | 54 ++++ port_versions/b-/boost-json.json | 9 + port_versions/b-/boost-lambda.json | 54 ++++ port_versions/b-/boost-leaf.json | 9 + port_versions/b-/boost-lexical-cast.json | 54 ++++ port_versions/b-/boost-local-function.json | 54 ++++ port_versions/b-/boost-locale.json | 84 +++++ port_versions/b-/boost-lockfree.json | 59 ++++ port_versions/b-/boost-log.json | 64 ++++ port_versions/b-/boost-logic.json | 54 ++++ port_versions/b-/boost-math.json | 54 ++++ port_versions/b-/boost-metaparse.json | 54 ++++ .../b-/boost-modular-build-helper.json | 149 +++++++++ port_versions/b-/boost-move.json | 54 ++++ port_versions/b-/boost-mp11.json | 54 ++++ port_versions/b-/boost-mpi.json | 69 ++++ port_versions/b-/boost-mpl.json | 54 ++++ port_versions/b-/boost-msm.json | 54 ++++ port_versions/b-/boost-multi-array.json | 59 ++++ port_versions/b-/boost-multi-index.json | 54 ++++ port_versions/b-/boost-multiprecision.json | 54 ++++ port_versions/b-/boost-nowide.json | 19 ++ .../b-/boost-numeric-conversion.json | 54 ++++ port_versions/b-/boost-odeint.json | 54 ++++ port_versions/b-/boost-optional.json | 54 ++++ port_versions/b-/boost-outcome.json | 34 ++ port_versions/b-/boost-parameter-python.json | 49 +++ port_versions/b-/boost-parameter.json | 54 ++++ port_versions/b-/boost-pfr.json | 9 + port_versions/b-/boost-phoenix.json | 54 ++++ port_versions/b-/boost-poly-collection.json | 59 ++++ port_versions/b-/boost-polygon.json | 54 ++++ port_versions/b-/boost-pool.json | 54 ++++ port_versions/b-/boost-predef.json | 54 ++++ port_versions/b-/boost-preprocessor.json | 54 ++++ port_versions/b-/boost-process.json | 64 ++++ port_versions/b-/boost-program-options.json | 54 ++++ port_versions/b-/boost-property-map.json | 54 ++++ port_versions/b-/boost-property-tree.json | 54 ++++ port_versions/b-/boost-proto.json | 54 ++++ port_versions/b-/boost-ptr-container.json | 54 ++++ port_versions/b-/boost-python.json | 84 +++++ port_versions/b-/boost-qvm.json | 54 ++++ port_versions/b-/boost-random.json | 54 ++++ port_versions/b-/boost-range.json | 54 ++++ port_versions/b-/boost-ratio.json | 54 ++++ port_versions/b-/boost-rational.json | 54 ++++ port_versions/b-/boost-regex.json | 54 ++++ port_versions/b-/boost-safe-numerics.json | 44 +++ port_versions/b-/boost-scope-exit.json | 54 ++++ port_versions/b-/boost-serialization.json | 54 ++++ port_versions/b-/boost-signals2.json | 54 ++++ port_versions/b-/boost-smart-ptr.json | 54 ++++ port_versions/b-/boost-sort.json | 54 ++++ port_versions/b-/boost-spirit.json | 54 ++++ port_versions/b-/boost-stacktrace.json | 59 ++++ port_versions/b-/boost-statechart.json | 54 ++++ port_versions/b-/boost-static-assert.json | 54 ++++ port_versions/b-/boost-static-string.json | 19 ++ port_versions/b-/boost-stl-interfaces.json | 14 + port_versions/b-/boost-system.json | 59 ++++ port_versions/b-/boost-test.json | 69 ++++ port_versions/b-/boost-thread.json | 59 ++++ port_versions/b-/boost-throw-exception.json | 54 ++++ port_versions/b-/boost-timer.json | 54 ++++ port_versions/b-/boost-tokenizer.json | 54 ++++ port_versions/b-/boost-tti.json | 54 ++++ port_versions/b-/boost-tuple.json | 54 ++++ port_versions/b-/boost-type-erasure.json | 59 ++++ port_versions/b-/boost-type-index.json | 54 ++++ port_versions/b-/boost-type-traits.json | 54 ++++ port_versions/b-/boost-typeof.json | 54 ++++ port_versions/b-/boost-ublas.json | 54 ++++ port_versions/b-/boost-uninstall.json | 19 ++ port_versions/b-/boost-units.json | 54 ++++ port_versions/b-/boost-unordered.json | 54 ++++ port_versions/b-/boost-utility.json | 54 ++++ port_versions/b-/boost-uuid.json | 54 ++++ port_versions/b-/boost-variant.json | 54 ++++ port_versions/b-/boost-variant2.json | 29 ++ port_versions/b-/boost-vcpkg-helpers.json | 49 +++ port_versions/b-/boost-vmd.json | 54 ++++ port_versions/b-/boost-wave.json | 59 ++++ port_versions/b-/boost-winapi.json | 54 ++++ port_versions/b-/boost-xpressive.json | 54 ++++ port_versions/b-/boost-yap.json | 44 +++ port_versions/b-/boost.json | 234 ++++++++++++++ port_versions/b-/boringssl.json | 19 ++ port_versions/b-/botan.json | 84 +++++ port_versions/b-/box2d.json | 34 ++ port_versions/b-/breakpad.json | 109 +++++++ port_versions/b-/brigand.json | 9 + port_versions/b-/brotli.json | 59 ++++ port_versions/b-/brpc.json | 9 + port_versions/b-/brunocodutra-metal.json | 14 + port_versions/b-/brynet.json | 39 +++ port_versions/b-/bullet3.json | 64 ++++ port_versions/b-/bustache.json | 9 + port_versions/b-/butteraugli.json | 34 ++ port_versions/b-/byte-lite.json | 9 + port_versions/b-/bzip2.json | 54 ++++ port_versions/baseline.json | 1 + port_versions/c-/c-ares.json | 49 +++ port_versions/c-/c4core.json | 9 + port_versions/c-/caf.json | 49 +++ port_versions/c-/caffe2.json | 24 ++ port_versions/c-/cairo.json | 109 +++++++ port_versions/c-/cairomm.json | 29 ++ port_versions/c-/camport3.json | 9 + port_versions/c-/capnproto.json | 34 ++ port_versions/c-/capstone.json | 29 ++ port_versions/c-/cartographer.json | 44 +++ port_versions/c-/casclib.json | 19 ++ port_versions/c-/catch-classic.json | 29 ++ port_versions/c-/catch.json | 74 +++++ port_versions/c-/catch2.json | 134 ++++++++ port_versions/c-/cccapstone.json | 14 + port_versions/c-/ccd.json | 34 ++ port_versions/c-/ccfits.json | 39 +++ port_versions/c-/cctz.json | 29 ++ port_versions/c-/celero.json | 64 ++++ port_versions/c-/cello.json | 9 + port_versions/c-/cereal.json | 29 ++ port_versions/c-/ceres.json | 119 +++++++ port_versions/c-/cfitsio.json | 34 ++ port_versions/c-/cgal.json | 124 ++++++++ port_versions/c-/cgicc.json | 34 ++ port_versions/c-/cgl.json | 14 + port_versions/c-/cgltf.json | 29 ++ port_versions/c-/cgns.json | 9 + port_versions/c-/chaiscript.json | 19 ++ port_versions/c-/chakracore.json | 159 ++++++++++ port_versions/c-/charls.json | 29 ++ port_versions/c-/chartdir.json | 19 ++ port_versions/c-/check.json | 39 +++ port_versions/c-/chipmunk.json | 19 ++ port_versions/c-/chmlib.json | 29 ++ port_versions/c-/chromium-base.json | 14 + port_versions/c-/cimg.json | 94 ++++++ port_versions/c-/cityhash.json | 9 + port_versions/c-/civetweb.json | 34 ++ port_versions/c-/cjson.json | 24 ++ port_versions/c-/clapack.json | 79 +++++ port_versions/c-/clara.json | 54 ++++ port_versions/c-/clblas.json | 24 ++ port_versions/c-/clblast.json | 19 ++ port_versions/c-/clfft.json | 19 ++ port_versions/c-/cli.json | 34 ++ port_versions/c-/cli11.json | 39 +++ port_versions/c-/clickhouse-cpp.json | 9 + port_versions/c-/clipp.json | 9 + port_versions/c-/clockutils.json | 29 ++ port_versions/c-/clp.json | 44 +++ port_versions/c-/clrng.json | 9 + port_versions/c-/clue.json | 9 + port_versions/c-/cmark.json | 24 ++ port_versions/c-/cmcstl2.json | 9 + port_versions/c-/cmocka.json | 24 ++ port_versions/c-/cnl.json | 14 + port_versions/c-/coin.json | 19 ++ port_versions/c-/coinutils.json | 34 ++ port_versions/c-/collada-dom.json | 24 ++ port_versions/c-/colmap.json | 9 + port_versions/c-/comms-ublox.json | 19 ++ port_versions/c-/comms.json | 24 ++ port_versions/c-/commsdsl.json | 29 ++ port_versions/c-/concurrentqueue.json | 24 ++ port_versions/c-/console-bridge.json | 49 +++ port_versions/c-/constexpr-contracts.json | 9 + port_versions/c-/constexpr.json | 14 + port_versions/c-/coolprop.json | 34 ++ port_versions/c-/coroutine.json | 44 +++ port_versions/c-/corrade.json | 69 ++++ port_versions/c-/cpp-base64.json | 9 + port_versions/c-/cpp-httplib.json | 54 ++++ port_versions/c-/cpp-netlib.json | 29 ++ port_versions/c-/cpp-peglib.json | 9 + port_versions/c-/cpp-redis.json | 49 +++ port_versions/c-/cpp-taskflow.json | 29 ++ port_versions/c-/cppad.json | 9 + port_versions/c-/cppcms.json | 34 ++ port_versions/c-/cppcodec.json | 9 + port_versions/c-/cppcoro.json | 24 ++ port_versions/c-/cppfs.json | 19 ++ port_versions/c-/cppgraphqlgen.json | 89 ++++++ port_versions/c-/cppitertools.json | 19 ++ port_versions/c-/cppkafka.json | 19 ++ port_versions/c-/cppmicroservices.json | 24 ++ port_versions/c-/cpprestsdk.json | 169 ++++++++++ port_versions/c-/cpptoml.json | 9 + port_versions/c-/cppunit.json | 24 ++ port_versions/c-/cpputest.json | 14 + port_versions/c-/cppwinrt.json | 44 +++ port_versions/c-/cppzmq.json | 49 +++ port_versions/c-/cpr.json | 49 +++ port_versions/c-/cpu-features.json | 9 + port_versions/c-/cpuid.json | 14 + port_versions/c-/cpuinfo.json | 14 + port_versions/c-/cr.json | 9 + port_versions/c-/crashpad.json | 9 + port_versions/c-/crashrpt.json | 9 + port_versions/c-/crc32c.json | 44 +++ port_versions/c-/crfsuite.json | 9 + port_versions/c-/croncpp.json | 9 + port_versions/c-/crossguid.json | 14 + port_versions/c-/crow.json | 14 + port_versions/c-/cryptopp.json | 64 ++++ port_versions/c-/cspice.json | 19 ++ port_versions/c-/ctbignum.json | 9 + port_versions/c-/ctemplate.json | 29 ++ port_versions/c-/ctp.json | 14 + port_versions/c-/ctre.json | 24 ++ port_versions/c-/cub.json | 14 + port_versions/c-/cuda.json | 49 +++ port_versions/c-/cudnn.json | 29 ++ port_versions/c-/cunit.json | 34 ++ port_versions/c-/curl.json | 269 ++++++++++++++++ port_versions/c-/curlpp.json | 24 ++ port_versions/c-/cute-headers.json | 9 + port_versions/c-/cutelyst2.json | 39 +++ port_versions/c-/cwalk.json | 9 + port_versions/c-/cxxopts.json | 44 +++ port_versions/c-/czmq.json | 29 ++ port_versions/d-/d3dx12.json | 9 + port_versions/d-/darknet.json | 84 +++++ port_versions/d-/darts-clone.json | 14 + port_versions/d-/dartsim.json | 14 + port_versions/d-/dataframe.json | 9 + port_versions/d-/date.json | 69 ++++ port_versions/d-/dbg-macro.json | 9 + port_versions/d-/dbghelp.json | 9 + port_versions/d-/dbow2.json | 9 + port_versions/d-/dbow3.json | 9 + port_versions/d-/dcmtk.json | 34 ++ port_versions/d-/debug-assert.json | 9 + port_versions/d-/decimal-for-cpp.json | 19 ++ port_versions/d-/detours.json | 14 + port_versions/d-/devicenameresolver.json | 14 + port_versions/d-/devil.json | 44 +++ port_versions/d-/dimcli.json | 59 ++++ port_versions/d-/directx-headers.json | 14 + port_versions/d-/directxmath.json | 19 ++ port_versions/d-/directxmesh.json | 134 ++++++++ port_versions/d-/directxsdk.json | 9 + port_versions/d-/directxtex.json | 139 +++++++++ port_versions/d-/directxtk.json | 154 +++++++++ port_versions/d-/directxtk12.json | 84 +++++ port_versions/d-/dirent.json | 19 ++ port_versions/d-/discord-game-sdk.json | 14 + port_versions/d-/discord-rpc.json | 49 +++ port_versions/d-/discount.json | 9 + port_versions/d-/distorm.json | 14 + port_versions/d-/dlfcn-win32.json | 34 ++ port_versions/d-/dlib.json | 159 ++++++++++ port_versions/d-/dmlc.json | 29 ++ port_versions/d-/docopt.json | 14 + port_versions/d-/doctest.json | 99 ++++++ port_versions/d-/double-conversion.json | 54 ++++ port_versions/d-/dpdk.json | 9 + port_versions/d-/draco.json | 44 +++ port_versions/d-/drlibs.json | 9 + port_versions/d-/drogon.json | 34 ++ port_versions/d-/dtl.json | 9 + port_versions/d-/duckx.json | 14 + port_versions/d-/duilib.json | 19 ++ port_versions/d-/duktape.json | 84 +++++ port_versions/d-/dx.json | 19 ++ port_versions/d-/dxut.json | 24 ++ port_versions/e-/eabase.json | 19 ++ port_versions/e-/eastl.json | 114 +++++++ port_versions/e-/easycl.json | 9 + port_versions/e-/easyhook.json | 9 + port_versions/e-/easyloggingpp.json | 19 ++ port_versions/e-/eathread.json | 14 + port_versions/e-/ebml.json | 49 +++ port_versions/e-/ecm.json | 74 +++++ port_versions/e-/ecos.json | 9 + port_versions/e-/ecsutil.json | 144 +++++++++ port_versions/e-/edlib.json | 9 + port_versions/e-/effolkronium-random.json | 19 ++ port_versions/e-/efsw.json | 14 + port_versions/e-/egl-registry.json | 29 ++ port_versions/e-/eigen3.json | 139 +++++++++ port_versions/e-/elfio.json | 9 + port_versions/e-/elfutils.json | 9 + port_versions/e-/embree2.json | 24 ++ port_versions/e-/embree3.json | 64 ++++ port_versions/e-/enet.json | 24 ++ port_versions/e-/ensmallen.json | 54 ++++ port_versions/e-/entityx.json | 44 +++ port_versions/e-/entt.json | 94 ++++++ port_versions/e-/epsilon.json | 24 ++ port_versions/e-/esaxx.json | 9 + port_versions/e-/evpp.json | 49 +++ port_versions/e-/exiv2.json | 189 +++++++++++ port_versions/e-/expat.json | 54 ++++ port_versions/e-/expected-lite.json | 9 + port_versions/e-/exprtk.json | 54 ++++ port_versions/e-/ezc3d.json | 9 + port_versions/f-/faad2.json | 14 + port_versions/f-/fadbad.json | 9 + port_versions/f-/faiss.json | 9 + port_versions/f-/fann.json | 14 + port_versions/f-/farmhash.json | 19 ++ port_versions/f-/fast-cpp-csv-parser.json | 9 + port_versions/f-/fastcdr.json | 34 ++ port_versions/f-/fastcgi.json | 9 + port_versions/f-/fastfeat.json | 14 + port_versions/f-/fastlz.json | 24 ++ port_versions/f-/fastrtps.json | 29 ++ port_versions/f-/fbthrift.json | 14 + port_versions/f-/fcl.json | 54 ++++ port_versions/f-/fdk-aac.json | 39 +++ port_versions/f-/fdlibm.json | 19 ++ port_versions/f-/ffmpeg.json | 249 +++++++++++++++ port_versions/f-/ffnvcodec.json | 34 ++ port_versions/f-/fftw3.json | 64 ++++ port_versions/f-/fftwpp.json | 14 + port_versions/f-/field3d.json | 19 ++ port_versions/f-/fixed-string.json | 9 + port_versions/f-/fizz.json | 64 ++++ port_versions/f-/flann.json | 79 +++++ port_versions/f-/flashlight-cuda.json | 14 + port_versions/f-/flatbuffers.json | 74 +++++ port_versions/f-/flint.json | 29 ++ port_versions/f-/fltk.json | 59 ++++ port_versions/f-/fluidlite.json | 14 + port_versions/f-/fluidsynth.json | 29 ++ port_versions/f-/fmem.json | 9 + port_versions/f-/fmi4cpp.json | 29 ++ port_versions/f-/fmilib.json | 24 ++ port_versions/f-/fmt.json | 169 ++++++++++ port_versions/f-/folly.json | 229 ++++++++++++++ port_versions/f-/font-chef.json | 9 + port_versions/f-/fontconfig.json | 84 +++++ port_versions/f-/foonathan-memory.json | 14 + port_versions/f-/forest.json | 104 +++++++ port_versions/f-/forge.json | 24 ++ port_versions/f-/fplus.json | 9 + port_versions/f-/freeglut.json | 74 +++++ port_versions/f-/freeimage.json | 109 +++++++ port_versions/f-/freeopcua.json | 24 ++ port_versions/f-/freerdp.json | 99 ++++++ port_versions/f-/freetds.json | 34 ++ port_versions/f-/freetype-gl.json | 54 ++++ port_versions/f-/freetype.json | 154 +++++++++ port_versions/f-/freexl.json | 54 ++++ port_versions/f-/fribidi.json | 49 +++ port_versions/f-/frozen.json | 9 + port_versions/f-/fruit.json | 19 ++ port_versions/f-/ftgl.json | 19 ++ port_versions/f-/function2.json | 14 + port_versions/f-/fuzzylite.json | 24 ++ port_versions/g-/g2o.json | 44 +++ port_versions/g-/g3log.json | 14 + port_versions/g-/gainput.json | 24 ++ port_versions/g-/gamedev-framework.json | 24 ++ port_versions/g-/gamma.json | 19 ++ port_versions/g-/gasol.json | 9 + port_versions/g-/gaussianlib.json | 9 + port_versions/g-/gcem.json | 19 ++ port_versions/g-/gdal.json | 159 ++++++++++ port_versions/g-/gdcm.json | 59 ++++ port_versions/g-/gdcm2.json | 64 ++++ port_versions/g-/gdk-pixbuf.json | 59 ++++ port_versions/g-/genann.json | 9 + port_versions/g-/geogram.json | 64 ++++ port_versions/g-/geographiclib.json | 94 ++++++ port_versions/g-/geos.json | 59 ++++ port_versions/g-/geotrans.json | 29 ++ port_versions/g-/getdns.json | 9 + port_versions/g-/getopt-win32.json | 9 + port_versions/g-/getopt.json | 14 + port_versions/g-/gettext.json | 79 +++++ port_versions/g-/gettimeofday.json | 19 ++ port_versions/g-/gflags.json | 69 ++++ port_versions/g-/gherkin-c.json | 24 ++ port_versions/g-/giflib.json | 34 ++ port_versions/g-/gl2ps.json | 29 ++ port_versions/g-/gl3w.json | 24 ++ port_versions/g-/glad.json | 44 +++ port_versions/g-/glbinding.json | 59 ++++ port_versions/g-/glew.json | 74 +++++ port_versions/g-/glfw3.json | 59 ++++ port_versions/g-/gli.json | 24 ++ port_versions/g-/glib.json | 109 +++++++ port_versions/g-/glibmm.json | 49 +++ port_versions/g-/glm.json | 79 +++++ port_versions/g-/globjects.json | 34 ++ port_versions/g-/glog.json | 49 +++ port_versions/g-/gloo.json | 9 + port_versions/g-/glslang.json | 59 ++++ port_versions/g-/glui.json | 9 + port_versions/g-/gmime.json | 34 ++ port_versions/g-/gmmlib.json | 29 ++ port_versions/g-/gmp.json | 34 ++ port_versions/g-/google-cloud-cpp-common.json | 49 +++ .../g-/google-cloud-cpp-spanner.json | 34 ++ port_versions/g-/google-cloud-cpp.json | 164 ++++++++++ port_versions/g-/googleapis.json | 54 ++++ port_versions/g-/gperf.json | 9 + port_versions/g-/gperftools.json | 9 + port_versions/g-/gpgme.json | 9 + port_versions/g-/gppanel.json | 14 + port_versions/g-/graphicsmagick.json | 104 +++++++ port_versions/g-/graphite2.json | 29 ++ port_versions/g-/graphqlparser.json | 19 ++ port_versions/g-/greatest.json | 9 + port_versions/g-/grpc.json | 284 +++++++++++++++++ port_versions/g-/grppi.json | 9 + port_versions/g-/gsl-lite.json | 34 ++ port_versions/g-/gsl.json | 59 ++++ port_versions/g-/gsoap.json | 69 ++++ port_versions/g-/gtest.json | 119 +++++++ port_versions/g-/gtk.json | 54 ++++ port_versions/g-/gtkmm.json | 29 ++ port_versions/g-/gts.json | 24 ++ port_versions/g-/guetzli.json | 34 ++ port_versions/g-/gumbo.json | 24 ++ port_versions/g-/gzip-hpp.json | 9 + port_versions/h-/h3.json | 9 + port_versions/h-/h5py-lzf.json | 9 + port_versions/h-/halide.json | 44 +++ port_versions/h-/harfbuzz.json | 189 +++++++++++ port_versions/h-/hayai.json | 9 + port_versions/h-/hdf5.json | 89 ++++++ port_versions/h-/healpix.json | 34 ++ port_versions/h-/hedley.json | 14 + port_versions/h-/hffix.json | 9 + port_versions/h-/hfsm2.json | 9 + port_versions/h-/hidapi.json | 19 ++ port_versions/h-/highfive.json | 39 +++ port_versions/h-/hiredis.json | 29 ++ port_versions/h-/hpx.json | 104 +++++++ port_versions/h-/http-parser.json | 59 ++++ port_versions/h-/hungarian.json | 9 + port_versions/h-/hunspell.json | 34 ++ port_versions/h-/hwloc.json | 34 ++ port_versions/h-/hyperscan.json | 44 +++ port_versions/h-/hypre.json | 34 ++ port_versions/i-/icu.json | 129 ++++++++ port_versions/i-/ideviceinstaller.json | 9 + port_versions/i-/idevicerestore.json | 24 ++ port_versions/i-/if97.json | 14 + port_versions/i-/igloo.json | 9 + port_versions/i-/ignition-cmake0.json | 19 ++ port_versions/i-/ignition-cmake2.json | 29 ++ port_versions/i-/ignition-common1.json | 14 + port_versions/i-/ignition-common3.json | 9 + port_versions/i-/ignition-fuel-tools1.json | 19 ++ port_versions/i-/ignition-math4.json | 14 + port_versions/i-/ignition-math6.json | 14 + port_versions/i-/ignition-modularscripts.json | 49 +++ port_versions/i-/ignition-msgs1.json | 24 ++ port_versions/i-/ignition-msgs5.json | 24 ++ port_versions/i-/ignition-msgs6.json | 14 + port_versions/i-/ignition-plugin1.json | 9 + port_versions/i-/ignition-transport4.json | 19 ++ port_versions/i-/ignition-transport8.json | 14 + port_versions/i-/ignition-transport9.json | 9 + port_versions/i-/ijg-libjpeg.json | 9 + port_versions/i-/ilmbase.json | 24 ++ port_versions/i-/imgui-sfml.json | 24 ++ port_versions/i-/imgui.json | 174 +++++++++++ port_versions/i-/immer.json | 9 + port_versions/i-/implot.json | 24 ++ port_versions/i-/indicators.json | 19 ++ port_versions/i-/infoware.json | 24 ++ port_versions/i-/inih.json | 39 +++ port_versions/i-/iniparser.json | 9 + port_versions/i-/inja.json | 24 ++ port_versions/i-/intel-ipsec.json | 14 + port_versions/i-/intel-mkl.json | 14 + port_versions/i-/intelrdfpmathlib.json | 14 + port_versions/i-/io2d.json | 54 ++++ port_versions/i-/irrlicht.json | 54 ++++ port_versions/i-/irrxml.json | 14 + port_versions/i-/isal.json | 9 + port_versions/i-/ismrmrd.json | 49 +++ port_versions/i-/itk.json | 104 +++++++ port_versions/i-/itpp.json | 29 ++ port_versions/i-/ixwebsocket.json | 49 +++ port_versions/j-/jack2.json | 34 ++ port_versions/j-/jaeger-client-cpp.json | 14 + port_versions/j-/jansson.json | 44 +++ port_versions/j-/jasper.json | 44 +++ port_versions/j-/jbig2dec.json | 29 ++ port_versions/j-/jbigkit.json | 29 ++ port_versions/j-/jemalloc.json | 29 ++ port_versions/j-/jinja2cpplight.json | 9 + port_versions/j-/josuttis-jthread.json | 14 + port_versions/j-/jsmn.json | 9 + port_versions/j-/json-c.json | 19 ++ port_versions/j-/json-dto.json | 49 +++ port_versions/j-/json-schema-validator.json | 9 + port_versions/j-/json-spirit.json | 14 + port_versions/j-/json11.json | 19 ++ port_versions/j-/json5-parser.json | 19 ++ port_versions/j-/jsoncons.json | 139 +++++++++ port_versions/j-/jsoncpp.json | 44 +++ port_versions/j-/jsonnet.json | 149 +++++++++ port_versions/j-/jwt-cpp.json | 19 ++ port_versions/j-/jxrlib.json | 69 ++++ port_versions/k-/kangaru.json | 44 +++ port_versions/k-/kcp.json | 9 + port_versions/k-/kd-soap.json | 29 ++ port_versions/k-/kealib.json | 29 ++ port_versions/k-/kenlm.json | 14 + port_versions/k-/keystone.json | 14 + port_versions/k-/kf5archive.json | 34 ++ port_versions/k-/kf5completion.json | 9 + port_versions/k-/kf5config.json | 9 + port_versions/k-/kf5coreaddons.json | 9 + port_versions/k-/kf5crash.json | 9 + port_versions/k-/kf5guiaddons.json | 9 + port_versions/k-/kf5holidays.json | 29 ++ port_versions/k-/kf5i18n.json | 14 + port_versions/k-/kf5itemmodels.json | 9 + port_versions/k-/kf5itemviews.json | 9 + port_versions/k-/kf5plotting.json | 34 ++ port_versions/k-/kf5syntaxhighlighting.json | 14 + port_versions/k-/kf5widgetsaddons.json | 9 + port_versions/k-/kf5windowsystem.json | 9 + port_versions/k-/kfr.json | 9 + port_versions/k-/kinectsdk1.json | 19 ++ port_versions/k-/kinectsdk2.json | 19 ++ port_versions/k-/kissfft.json | 9 + port_versions/k-/knet.json | 14 + port_versions/k-/krabsetw.json | 14 + port_versions/k-/ktx.json | 9 + port_versions/k-/kubazip.json | 9 + port_versions/k-/kuku.json | 9 + port_versions/k-/kvasir-mpl.json | 9 + port_versions/l-/lapack-reference.json | 29 ++ port_versions/l-/lapack.json | 29 ++ port_versions/l-/lastools.json | 14 + port_versions/l-/laszip.json | 19 ++ port_versions/l-/lazy-importer.json | 9 + port_versions/l-/lcm.json | 24 ++ port_versions/l-/lcms.json | 49 +++ port_versions/l-/leaf.json | 24 ++ port_versions/l-/lemon.json | 14 + port_versions/l-/leptonica.json | 59 ++++ port_versions/l-/lerc.json | 14 + port_versions/l-/lest.json | 19 ++ port_versions/l-/leveldb.json | 34 ++ port_versions/l-/levmar.json | 9 + port_versions/l-/libaaplus.json | 24 ++ port_versions/l-/libaiff.json | 34 ++ port_versions/l-/libarchive.json | 114 +++++++ port_versions/l-/libass.json | 34 ++ port_versions/l-/libassuan.json | 9 + port_versions/l-/libb2.json | 29 ++ port_versions/l-/libbf.json | 14 + port_versions/l-/libbson.json | 99 ++++++ port_versions/l-/libcds.json | 14 + port_versions/l-/libcerf.json | 9 + port_versions/l-/libconfig.json | 34 ++ port_versions/l-/libconfuse.json | 9 + port_versions/l-/libcopp.json | 44 +++ port_versions/l-/libcrafter.json | 19 ++ port_versions/l-/libcroco.json | 19 ++ port_versions/l-/libcuckoo.json | 14 + port_versions/l-/libdatachannel.json | 9 + port_versions/l-/libdatrie.json | 19 ++ port_versions/l-/libde265.json | 14 + port_versions/l-/libdisasm.json | 34 ++ port_versions/l-/libdivide.json | 9 + port_versions/l-/libdshowcapture.json | 14 + port_versions/l-/libepoxy.json | 84 +++++ port_versions/l-/libevent.json | 79 +++++ port_versions/l-/libevhtp.json | 9 + port_versions/l-/libexif.json | 19 ++ port_versions/l-/libfabric.json | 29 ++ port_versions/l-/libffi.json | 74 +++++ port_versions/l-/libflac.json | 79 +++++ port_versions/l-/libfort.json | 9 + port_versions/l-/libfreenect2.json | 34 ++ port_versions/l-/libftdi.json | 14 + port_versions/l-/libftdi1.json | 14 + port_versions/l-/libgcrypt.json | 9 + port_versions/l-/libgd.json | 54 ++++ port_versions/l-/libgeotiff.json | 59 ++++ port_versions/l-/libgit2.json | 69 ++++ port_versions/l-/libgo.json | 29 ++ port_versions/l-/libgpg-error.json | 9 + port_versions/l-/libgpod.json | 19 ++ port_versions/l-/libgta.json | 14 + port_versions/l-/libguarded.json | 14 + port_versions/l-/libharu.json | 49 +++ port_versions/l-/libhdfs3.json | 9 + port_versions/l-/libheif.json | 24 ++ port_versions/l-/libhsplasma.json | 9 + port_versions/l-/libhydrogen.json | 9 + port_versions/l-/libiconv.json | 79 +++++ port_versions/l-/libics.json | 24 ++ port_versions/l-/libideviceactivation.json | 34 ++ port_versions/l-/libidn2.json | 54 ++++ port_versions/l-/libigl.json | 34 ++ port_versions/l-/libilbc.json | 9 + port_versions/l-/libimobiledevice.json | 34 ++ port_versions/l-/libirecovery.json | 14 + port_versions/l-/libjpeg-turbo.json | 94 ++++++ port_versions/l-/libjuice.json | 14 + port_versions/l-/libkml.json | 39 +++ port_versions/l-/liblas.json | 29 ++ port_versions/l-/liblbfgs.json | 9 + port_versions/l-/liblemon.json | 39 +++ port_versions/l-/liblinear.json | 29 ++ port_versions/l-/liblo.json | 19 ++ port_versions/l-/liblsl.json | 24 ++ port_versions/l-/liblzma.json | 69 ++++ port_versions/l-/libmad.json | 44 +++ port_versions/l-/libmagic.json | 19 ++ port_versions/l-/libmariadb.json | 104 +++++++ port_versions/l-/libmaxminddb.json | 19 ++ port_versions/l-/libmediainfo.json | 19 ++ port_versions/l-/libmesh.json | 14 + port_versions/l-/libmicrohttpd.json | 44 +++ port_versions/l-/libmikmod.json | 49 +++ port_versions/l-/libmodbus.json | 34 ++ port_versions/l-/libmodman.json | 19 ++ port_versions/l-/libmodplug.json | 34 ++ port_versions/l-/libmorton.json | 14 + port_versions/l-/libmpeg2.json | 9 + port_versions/l-/libmspack.json | 29 ++ port_versions/l-/libmupdf.json | 59 ++++ port_versions/l-/libmysql.json | 79 +++++ port_versions/l-/libnice.json | 54 ++++ port_versions/l-/libnoise.json | 14 + port_versions/l-/libodb-boost.json | 19 ++ port_versions/l-/libodb-mysql.json | 39 +++ port_versions/l-/libodb-pgsql.json | 24 ++ port_versions/l-/libodb-sqlite.json | 49 +++ port_versions/l-/libodb.json | 39 +++ port_versions/l-/libogg.json | 64 ++++ port_versions/l-/libopenmpt.json | 14 + port_versions/l-/libopusenc.json | 19 ++ port_versions/l-/libosip2.json | 29 ++ port_versions/l-/libosmium.json | 9 + port_versions/l-/libosmscout.json | 9 + port_versions/l-/libp7-baical.json | 39 +++ port_versions/l-/libp7client.json | 14 + port_versions/l-/libpcap.json | 24 ++ port_versions/l-/libpff.json | 14 + port_versions/l-/libplist.json | 34 ++ port_versions/l-/libpmemobj-cpp.json | 34 ++ port_versions/l-/libpng.json | 159 ++++++++++ port_versions/l-/libpopt.json | 29 ++ port_versions/l-/libpq.json | 114 +++++++ port_versions/l-/libpqxx.json | 64 ++++ port_versions/l-/libprotobuf-mutator.json | 9 + port_versions/l-/libproxy.json | 19 ++ port_versions/l-/libqcow.json | 19 ++ port_versions/l-/libqglviewer.json | 39 +++ port_versions/l-/libqrencode.json | 29 ++ port_versions/l-/librabbitmq.json | 34 ++ port_versions/l-/libraqm.json | 24 ++ port_versions/l-/libraw.json | 94 ++++++ port_versions/l-/librdkafka.json | 74 +++++ port_versions/l-/libressl.json | 19 ++ port_versions/l-/librsvg.json | 19 ++ port_versions/l-/librsync.json | 24 ++ port_versions/l-/librtmp.json | 34 ++ port_versions/l-/librttopo.json | 9 + port_versions/l-/libsamplerate.json | 24 ++ port_versions/l-/libsbml.json | 9 + port_versions/l-/libsigcpp-3.json | 9 + port_versions/l-/libsigcpp.json | 44 +++ port_versions/l-/libsndfile.json | 74 +++++ port_versions/l-/libsodium.json | 64 ++++ port_versions/l-/libsoundio.json | 19 ++ port_versions/l-/libspatialindex.json | 9 + port_versions/l-/libspatialite.json | 49 +++ port_versions/l-/libspnav.json | 9 + port_versions/l-/libsquish.json | 34 ++ port_versions/l-/libsrt.json | 9 + port_versions/l-/libsrtp.json | 9 + port_versions/l-/libssh.json | 74 +++++ port_versions/l-/libssh2.json | 39 +++ port_versions/l-/libstemmer.json | 29 ++ port_versions/l-/libstk.json | 14 + port_versions/l-/libsvm.json | 14 + port_versions/l-/libtheora.json | 39 +++ port_versions/l-/libtins.json | 24 ++ port_versions/l-/libtomcrypt.json | 9 + port_versions/l-/libtommath.json | 9 + port_versions/l-/libtorrent.json | 119 +++++++ port_versions/l-/libu2f-server.json | 14 + port_versions/l-/libudis86.json | 9 + port_versions/l-/libudns.json | 19 ++ port_versions/l-/libui.json | 14 + port_versions/l-/libunibreak.json | 39 +++ port_versions/l-/libusb-win32.json | 34 ++ port_versions/l-/libusb.json | 49 +++ port_versions/l-/libusbmuxd.json | 44 +++ port_versions/l-/libuuid.json | 39 +++ port_versions/l-/libuv.json | 179 +++++++++++ port_versions/l-/libvmdk.json | 14 + port_versions/l-/libvorbis.json | 69 ++++ port_versions/l-/libvpx.json | 114 +++++++ port_versions/l-/libwandio.json | 19 ++ port_versions/l-/libwebm.json | 29 ++ port_versions/l-/libwebp.json | 94 ++++++ port_versions/l-/libwebsockets.json | 119 +++++++ port_versions/l-/libxdiff.json | 9 + port_versions/l-/libxlsxwriter.json | 24 ++ port_versions/l-/libxml2.json | 69 ++++ port_versions/l-/libxmlmm.json | 9 + port_versions/l-/libxmlpp.json | 39 +++ port_versions/l-/libxmp-lite.json | 34 ++ port_versions/l-/libxslt.json | 59 ++++ port_versions/l-/libyaml.json | 34 ++ port_versions/l-/libyuv.json | 24 ++ port_versions/l-/libzen.json | 14 + port_versions/l-/libzip.json | 94 ++++++ port_versions/l-/libzippp.json | 34 ++ port_versions/l-/licensepp.json | 14 + port_versions/l-/lilv.json | 9 + port_versions/l-/linalg.json | 9 + port_versions/l-/linenoise-ng.json | 14 + port_versions/l-/live555.json | 79 +++++ port_versions/l-/llgl.json | 14 + port_versions/l-/llvm.json | 149 +++++++++ port_versions/l-/lmdb.json | 49 +++ port_versions/l-/lodepng.json | 54 ++++ port_versions/l-/log4cplus.json | 54 ++++ port_versions/l-/log4cpp.json | 19 ++ port_versions/l-/log4cxx.json | 19 ++ port_versions/l-/loguru.json | 19 ++ port_versions/l-/lpeg.json | 34 ++ port_versions/l-/lua.json | 84 +++++ port_versions/l-/luabridge.json | 29 ++ port_versions/l-/luafilesystem.json | 29 ++ port_versions/l-/luajit.json | 24 ++ port_versions/l-/luasocket.json | 44 +++ port_versions/l-/lv2.json | 9 + port_versions/l-/lz4.json | 79 +++++ port_versions/l-/lzfse.json | 19 ++ port_versions/l-/lzo.json | 39 +++ port_versions/l-/lzokay.json | 9 + port_versions/m-/magic-enum.json | 59 ++++ port_versions/m-/magic-get.json | 19 ++ port_versions/m-/magnum-extras.json | 44 +++ port_versions/m-/magnum-integration.json | 39 +++ port_versions/m-/magnum-plugins.json | 94 ++++++ port_versions/m-/magnum.json | 89 ++++++ port_versions/m-/mapbox-variant.json | 19 ++ port_versions/m-/marble.json | 9 + port_versions/m-/marl.json | 29 ++ port_versions/m-/mathc.json | 9 + port_versions/m-/mathgl.json | 34 ++ port_versions/m-/matio.json | 54 ++++ port_versions/m-/matplotlib-cpp.json | 14 + port_versions/m-/matroska.json | 44 +++ port_versions/m-/mbedtls.json | 49 +++ port_versions/m-/mcpp.json | 19 ++ port_versions/m-/mdns.json | 9 + port_versions/m-/mdnsresponder.json | 24 ++ port_versions/m-/mecab.json | 19 ++ port_versions/m-/memorymodule.json | 9 + port_versions/m-/mesa.json | 9 + port_versions/m-/meschach.json | 29 ++ port_versions/m-/meshoptimizer.json | 9 + port_versions/m-/metis.json | 44 +++ port_versions/m-/metrohash.json | 14 + port_versions/m-/mgnlibs.json | 9 + port_versions/m-/mhook.json | 9 + port_versions/m-/microsoft-signalr.json | 19 ++ port_versions/m-/mikktspace.json | 9 + port_versions/m-/milerius-sfml-imgui.json | 19 ++ port_versions/m-/mimalloc.json | 29 ++ port_versions/m-/minc.json | 14 + port_versions/m-/minhook.json | 14 + port_versions/m-/minifb.json | 9 + port_versions/m-/minimp3.json | 19 ++ port_versions/m-/minisat-master-keying.json | 14 + port_versions/m-/minitrace.json | 9 + port_versions/m-/miniupnpc.json | 14 + port_versions/m-/miniz.json | 19 ++ port_versions/m-/minizip.json | 44 +++ port_versions/m-/mio.json | 14 + port_versions/m-/mlpack.json | 69 ++++ port_versions/m-/mman.json | 24 ++ port_versions/m-/mmloader.json | 14 + port_versions/m-/mmx.json | 9 + port_versions/m-/modp-base64.json | 19 ++ port_versions/m-/mongo-c-driver.json | 114 +++++++ port_versions/m-/mongo-cxx-driver.json | 84 +++++ port_versions/m-/mongoose.json | 14 + port_versions/m-/monkeys-audio.json | 64 ++++ port_versions/m-/moos-core.json | 34 ++ port_versions/m-/moos-essential.json | 19 ++ port_versions/m-/moos-ui.json | 19 ++ port_versions/m-/morton-nd.json | 14 + port_versions/m-/mosquitto.json | 74 +++++ port_versions/m-/mozjpeg.json | 39 +++ port_versions/m-/mp-units.json | 9 + port_versions/m-/mp3lame.json | 34 ++ port_versions/m-/mpark-variant.json | 14 + port_versions/m-/mpfr.json | 49 +++ port_versions/m-/mpg123.json | 94 ++++++ port_versions/m-/mpi.json | 9 + port_versions/m-/mpir.json | 64 ++++ port_versions/m-/mpmcqueue.json | 9 + port_versions/m-/mqtt-cpp.json | 19 ++ port_versions/m-/ms-angle.json | 24 ++ port_versions/m-/ms-gsl.json | 129 ++++++++ port_versions/m-/msgpack.json | 44 +++ port_versions/m-/msgpack11.json | 14 + port_versions/m-/msinttypes.json | 14 + port_versions/m-/msix.json | 39 +++ port_versions/m-/msmpi.json | 44 +++ port_versions/m-/mstch.json | 9 + port_versions/m-/mujs.json | 39 +++ port_versions/m-/munit.json | 14 + port_versions/m-/muparser.json | 19 ++ port_versions/m-/murmurhash.json | 19 ++ port_versions/m-/mygui.json | 9 + port_versions/n-/nameof.json | 29 ++ port_versions/n-/nana.json | 104 +++++++ port_versions/n-/nano-signal-slot.json | 19 ++ port_versions/n-/nanobench.json | 14 + port_versions/n-/nanodbc.json | 64 ++++ port_versions/n-/nanoflann.json | 9 + port_versions/n-/nanogui.json | 14 + port_versions/n-/nanomsg.json | 29 ++ port_versions/n-/nanopb.json | 14 + port_versions/n-/nanoprintf.json | 9 + port_versions/n-/nanorange.json | 14 + port_versions/n-/nanort.json | 14 + port_versions/n-/nanovg.json | 24 ++ port_versions/n-/nativefiledialog.json | 9 + port_versions/n-/nccl.json | 9 + port_versions/n-/neargye-semver.json | 9 + port_versions/n-/netcdf-c.json | 94 ++++++ port_versions/n-/netcdf-cxx4.json | 44 +++ port_versions/n-/nethost.json | 9 + port_versions/n-/nettle.json | 39 +++ port_versions/n-/networkdirect-sdk.json | 14 + port_versions/n-/nghttp2.json | 69 ++++ port_versions/n-/ngspice.json | 14 + port_versions/n-/nifticlib.json | 9 + port_versions/n-/nlohmann-fifo-map.json | 14 + port_versions/n-/nlohmann-json.json | 99 ++++++ port_versions/n-/nlopt.json | 44 +++ port_versions/n-/nmap.json | 24 ++ port_versions/n-/nmslib.json | 39 +++ port_versions/n-/nng.json | 34 ++ port_versions/n-/nngpp.json | 19 ++ port_versions/n-/nonius.json | 14 + port_versions/n-/nowide.json | 24 ++ port_versions/n-/nrf-ble-driver.json | 29 ++ port_versions/n-/nt-wrapper.json | 9 + port_versions/n-/nuklear.json | 114 +++++++ port_versions/n-/numactl.json | 9 + port_versions/n-/numcpp.json | 9 + port_versions/n-/nuspell.json | 29 ++ port_versions/n-/nvtt.json | 39 +++ port_versions/o-/oatpp-consul.json | 24 ++ port_versions/o-/oatpp-curl.json | 29 ++ port_versions/o-/oatpp-libressl.json | 24 ++ port_versions/o-/oatpp-mbedtls.json | 24 ++ port_versions/o-/oatpp-mongo.json | 9 + port_versions/o-/oatpp-postgresql.json | 9 + port_versions/o-/oatpp-sqlite.json | 14 + port_versions/o-/oatpp-swagger.json | 24 ++ port_versions/o-/oatpp-websocket.json | 24 ++ port_versions/o-/oatpp-zlib.json | 9 + port_versions/o-/oatpp.json | 24 ++ port_versions/o-/observer-ptr-lite.json | 14 + port_versions/o-/ocilib.json | 24 ++ port_versions/o-/octomap.json | 49 +++ port_versions/o-/ode.json | 34 ++ port_versions/o-/offscale-libetcd-cpp.json | 14 + port_versions/o-/ogdf.json | 24 ++ port_versions/o-/ogre-next.json | 14 + port_versions/o-/ogre.json | 124 ++++++++ port_versions/o-/ois.json | 19 ++ port_versions/o-/ompl.json | 54 ++++ port_versions/o-/onednn.json | 14 + port_versions/o-/oniguruma.json | 39 +++ port_versions/o-/onnxruntime-gpu.json | 9 + port_versions/o-/open62541.json | 54 ++++ port_versions/o-/openal-soft.json | 84 +++++ port_versions/o-/openblas.json | 119 +++++++ port_versions/o-/opencascade.json | 24 ++ port_versions/o-/opencc.json | 34 ++ port_versions/o-/opencensus-cpp.json | 14 + port_versions/o-/opencl.json | 49 +++ port_versions/o-/opencolorio-tools.json | 9 + port_versions/o-/opencolorio.json | 29 ++ port_versions/o-/opencsg.json | 14 + port_versions/o-/opencv.json | 194 ++++++++++++ port_versions/o-/opencv2.json | 34 ++ port_versions/o-/opencv3.json | 64 ++++ port_versions/o-/opencv4.json | 64 ++++ port_versions/o-/opendnp3.json | 14 + port_versions/o-/openexr.json | 59 ++++ port_versions/o-/opengl-registry.json | 29 ++ port_versions/o-/opengl.json | 49 +++ port_versions/o-/openigtlink.json | 9 + port_versions/o-/openimageio.json | 129 ++++++++ port_versions/o-/openjpeg.json | 59 ++++ port_versions/o-/openmama.json | 39 +++ port_versions/o-/openmesh.json | 29 ++ port_versions/o-/openmpi.json | 24 ++ port_versions/o-/openmvg.json | 54 ++++ port_versions/o-/openmvs.json | 59 ++++ port_versions/o-/openni2.json | 54 ++++ port_versions/o-/openscap.json | 9 + port_versions/o-/openssl-unix.json | 109 +++++++ port_versions/o-/openssl-uwp.json | 74 +++++ port_versions/o-/openssl-windows.json | 89 ++++++ port_versions/o-/openssl.json | 184 +++++++++++ port_versions/o-/opensubdiv.json | 9 + port_versions/o-/opentracing.json | 24 ++ port_versions/o-/openvdb.json | 59 ++++ port_versions/o-/openvpn3.json | 24 ++ port_versions/o-/openvr.json | 69 ++++ port_versions/o-/openxr-loader.json | 49 +++ port_versions/o-/optional-bare.json | 9 + port_versions/o-/optional-lite.json | 9 + port_versions/o-/opus.json | 64 ++++ port_versions/o-/opusfile.json | 44 +++ port_versions/o-/orc.json | 49 +++ port_versions/o-/orocos-kdl.json | 24 ++ port_versions/o-/osg-qt.json | 29 ++ port_versions/o-/osg.json | 104 +++++++ port_versions/o-/osgearth.json | 64 ++++ port_versions/o-/osi.json | 34 ++ port_versions/o-/otl.json | 54 ++++ port_versions/o-/outcome.json | 14 + port_versions/p-/p-ranav-csv.json | 9 + port_versions/p-/p-ranav-csv2.json | 14 + port_versions/p-/paho-mqtt.json | 69 ++++ port_versions/p-/paho-mqttpp3.json | 34 ++ port_versions/p-/palsigslot.json | 9 + port_versions/p-/pango.json | 74 +++++ port_versions/p-/pangolin.json | 69 ++++ port_versions/p-/pangomm.json | 29 ++ port_versions/p-/parallel-hashmap.json | 44 +++ port_versions/p-/parallelstl.json | 19 ++ port_versions/p-/paraview.json | 24 ++ port_versions/p-/parmetis.json | 24 ++ port_versions/p-/parquet.json | 14 + port_versions/p-/parson.json | 54 ++++ port_versions/p-/pbc.json | 29 ++ port_versions/p-/pcg.json | 9 + port_versions/p-/pcl.json | 189 +++++++++++ port_versions/p-/pcre.json | 89 ++++++ port_versions/p-/pcre2.json | 84 +++++ port_versions/p-/pdal-c.json | 19 ++ port_versions/p-/pdal.json | 54 ++++ port_versions/p-/pdcurses.json | 39 +++ port_versions/p-/pdqsort.json | 9 + port_versions/p-/pe-parse.json | 9 + port_versions/p-/pegtl-2.json | 24 ++ port_versions/p-/pegtl.json | 54 ++++ port_versions/p-/pfring.json | 19 ++ port_versions/p-/pfultz2-linq.json | 14 + port_versions/p-/phnt.json | 9 + port_versions/p-/physfs.json | 49 +++ port_versions/p-/physx.json | 39 +++ port_versions/p-/picojson.json | 19 ++ port_versions/p-/picosha2.json | 24 ++ port_versions/p-/piex.json | 34 ++ port_versions/p-/pistache.json | 9 + port_versions/p-/pixel.json | 19 ++ port_versions/p-/pixman.json | 69 ++++ port_versions/p-/platform-folders.json | 19 ++ port_versions/p-/plf-colony.json | 14 + port_versions/p-/plf-list.json | 9 + port_versions/p-/plf-nanotimer.json | 9 + port_versions/p-/plf-stack.json | 9 + port_versions/p-/plib.json | 19 ++ port_versions/p-/plibsys.json | 34 ++ port_versions/p-/plog.json | 19 ++ port_versions/p-/plplot.json | 44 +++ port_versions/p-/plustache.json | 9 + port_versions/p-/pmdk.json | 69 ++++ port_versions/p-/pngpp.json | 9 + port_versions/p-/pngwriter.json | 14 + port_versions/p-/poco.json | 139 +++++++++ port_versions/p-/podofo.json | 69 ++++ port_versions/p-/poly2tri.json | 9 + port_versions/p-/polyclipping.json | 34 ++ port_versions/p-/polyhook2.json | 54 ++++ port_versions/p-/polymorphic-value.json | 9 + port_versions/p-/ponder.json | 14 + port_versions/p-/poppler.json | 19 ++ port_versions/p-/portable-snippets.json | 9 + port_versions/p-/portaudio.json | 64 ++++ port_versions/p-/portmidi.json | 29 ++ port_versions/p-/ppconsul.json | 34 ++ port_versions/p-/ppmagic.json | 9 + port_versions/p-/pprint.json | 14 + port_versions/p-/pqp.json | 29 ++ port_versions/p-/proj.json | 19 ++ port_versions/p-/proj4.json | 74 +++++ port_versions/p-/prometheus-cpp.json | 34 ++ port_versions/p-/protobuf-c.json | 19 ++ port_versions/p-/protobuf.json | 239 ++++++++++++++ port_versions/p-/protopuf.json | 9 + port_versions/p-/protozero.json | 9 + port_versions/p-/proxygen.json | 14 + port_versions/p-/proxywrapper.json | 9 + port_versions/p-/ptex.json | 29 ++ port_versions/p-/pthread.json | 9 + port_versions/p-/pthreads.json | 69 ++++ port_versions/p-/pugixml.json | 59 ++++ port_versions/p-/pybind11.json | 99 ++++++ port_versions/p-/pystring.json | 19 ++ port_versions/p-/python2.json | 14 + port_versions/p-/python3.json | 99 ++++++ port_versions/q-/qca.json | 54 ++++ port_versions/q-/qcustomplot.json | 19 ++ port_versions/q-/qhull.json | 64 ++++ port_versions/q-/qpid-proton.json | 39 +++ port_versions/q-/qscintilla.json | 64 ++++ .../q-/qt-advanced-docking-system.json | 49 +++ port_versions/q-/qt5-3d.json | 74 +++++ port_versions/q-/qt5-activeqt.json | 79 +++++ port_versions/q-/qt5-androidextras.json | 24 ++ port_versions/q-/qt5-base.json | 264 ++++++++++++++++ port_versions/q-/qt5-canvas3d.json | 19 ++ port_versions/q-/qt5-charts.json | 74 +++++ port_versions/q-/qt5-connectivity.json | 59 ++++ port_versions/q-/qt5-datavis3d.json | 74 +++++ port_versions/q-/qt5-declarative.json | 79 +++++ port_versions/q-/qt5-doc.json | 24 ++ port_versions/q-/qt5-gamepad.json | 84 +++++ port_versions/q-/qt5-graphicaleffects.json | 79 +++++ port_versions/q-/qt5-imageformats.json | 94 ++++++ port_versions/q-/qt5-location.json | 74 +++++ port_versions/q-/qt5-macextras.json | 49 +++ port_versions/q-/qt5-modularscripts.json | 69 ++++ port_versions/q-/qt5-mqtt.json | 49 +++ port_versions/q-/qt5-multimedia.json | 74 +++++ port_versions/q-/qt5-networkauth.json | 74 +++++ port_versions/q-/qt5-purchasing.json | 59 ++++ port_versions/q-/qt5-quickcontrols.json | 79 +++++ port_versions/q-/qt5-quickcontrols2.json | 79 +++++ port_versions/q-/qt5-remoteobjects.json | 59 ++++ port_versions/q-/qt5-script.json | 69 ++++ port_versions/q-/qt5-scxml.json | 69 ++++ port_versions/q-/qt5-sensors.json | 59 ++++ port_versions/q-/qt5-serialbus.json | 24 ++ port_versions/q-/qt5-serialport.json | 74 +++++ port_versions/q-/qt5-speech.json | 74 +++++ port_versions/q-/qt5-svg.json | 69 ++++ port_versions/q-/qt5-tools.json | 99 ++++++ port_versions/q-/qt5-translations.json | 24 ++ port_versions/q-/qt5-virtualkeyboard.json | 74 +++++ port_versions/q-/qt5-wayland.json | 24 ++ port_versions/q-/qt5-webchannel.json | 59 ++++ port_versions/q-/qt5-webengine.json | 29 ++ port_versions/q-/qt5-webglplugin.json | 24 ++ port_versions/q-/qt5-websockets.json | 69 ++++ port_versions/q-/qt5-webview.json | 54 ++++ port_versions/q-/qt5-winextras.json | 74 +++++ port_versions/q-/qt5-x11extras.json | 24 ++ port_versions/q-/qt5-xmlpatterns.json | 74 +++++ port_versions/q-/qt5.json | 169 ++++++++++ port_versions/q-/qtkeychain.json | 19 ++ port_versions/q-/quadtree.json | 14 + port_versions/q-/quantlib.json | 9 + port_versions/q-/quaternions.json | 9 + port_versions/q-/quazip.json | 9 + port_versions/q-/quickfast.json | 9 + port_versions/q-/quickfix.json | 24 ++ port_versions/q-/quill.json | 44 +++ port_versions/q-/quirc.json | 34 ++ port_versions/q-/qwt.json | 79 +++++ port_versions/q-/qwtw.json | 14 + port_versions/r-/rabit.json | 19 ++ port_versions/r-/ragel.json | 34 ++ port_versions/r-/rang.json | 9 + port_versions/r-/range-v3-vs2015.json | 9 + port_versions/r-/range-v3.json | 104 +++++++ port_versions/r-/rapidcheck.json | 19 ++ port_versions/r-/rapidjson.json | 54 ++++ port_versions/r-/rapidxml-ns.json | 14 + port_versions/r-/rapidxml.json | 24 ++ port_versions/r-/rappture.json | 9 + port_versions/r-/raylib.json | 44 +++ port_versions/r-/rbdl.json | 9 + port_versions/r-/re2.json | 139 +++++++++ port_versions/r-/readerwriterqueue.json | 24 ++ port_versions/r-/readline-win32.json | 9 + port_versions/r-/readline.json | 14 + port_versions/r-/readosm.json | 29 ++ port_versions/r-/realsense2.json | 134 ++++++++ port_versions/r-/recast.json | 24 ++ port_versions/r-/redis-plus-plus.json | 24 ++ port_versions/r-/refl-cpp.json | 14 + port_versions/r-/refprop-headers.json | 14 + port_versions/r-/replxx.json | 19 ++ port_versions/r-/reproc.json | 54 ++++ port_versions/r-/rest-rpc.json | 14 + port_versions/r-/restbed.json | 24 ++ port_versions/r-/restclient-cpp.json | 29 ++ port_versions/r-/restinio.json | 164 ++++++++++ port_versions/r-/rhash.json | 34 ++ port_versions/r-/riffcpp.json | 19 ++ port_versions/r-/ring-span-lite.json | 9 + port_versions/r-/roaring.json | 14 + port_versions/r-/robin-hood-hashing.json | 34 ++ port_versions/r-/robin-map.json | 24 ++ port_versions/r-/rocksdb.json | 149 +++++++++ port_versions/r-/rpclib.json | 24 ++ port_versions/r-/rply.json | 9 + port_versions/r-/rs-core-lib.json | 154 +++++++++ port_versions/r-/rsocket.json | 9 + port_versions/r-/rtabmap.json | 14 + port_versions/r-/rtaudio.json | 9 + port_versions/r-/rtlsdr.json | 14 + port_versions/r-/rtmidi.json | 29 ++ port_versions/r-/rttr.json | 39 +++ port_versions/r-/rxcpp.json | 34 ++ port_versions/r-/rxqt.json | 14 + port_versions/r-/rxspencer.json | 9 + port_versions/r-/ryml.json | 9 + port_versions/r-/ryu.json | 19 ++ port_versions/s-/safeint.json | 29 ++ port_versions/s-/sail.json | 14 + port_versions/s-/sais.json | 14 + port_versions/s-/sajson.json | 9 + port_versions/s-/scintilla.json | 39 +++ port_versions/s-/sciter.json | 174 +++++++++++ port_versions/s-/scnlib.json | 14 + port_versions/s-/scylla-wrapper.json | 9 + port_versions/s-/sdformat10.json | 9 + port_versions/s-/sdformat6.json | 14 + port_versions/s-/sdformat9.json | 14 + port_versions/s-/sdl1-net.json | 14 + port_versions/s-/sdl1.json | 59 ++++ port_versions/s-/sdl2-gfx.json | 59 ++++ port_versions/s-/sdl2-image.json | 74 +++++ port_versions/s-/sdl2-mixer.json | 104 +++++++ port_versions/s-/sdl2-net.json | 49 +++ port_versions/s-/sdl2-ttf.json | 49 +++ port_versions/s-/sdl2.json | 154 +++++++++ port_versions/s-/sdl2pp.json | 19 ++ port_versions/s-/seal.json | 24 ++ port_versions/s-/secp256k1.json | 29 ++ port_versions/s-/selene.json | 39 +++ port_versions/s-/sentencepiece.json | 9 + port_versions/s-/sentry-native.json | 49 +++ port_versions/s-/septag-sx.json | 24 ++ port_versions/s-/seqan.json | 14 + port_versions/s-/serd.json | 9 + port_versions/s-/sf2cute.json | 14 + port_versions/s-/sfgui.json | 29 ++ port_versions/s-/sfml.json | 94 ++++++ port_versions/s-/sfsexp.json | 9 + port_versions/s-/shaderc.json | 39 +++ port_versions/s-/shaderwriter.json | 9 + port_versions/s-/shapelib.json | 24 ++ port_versions/s-/shiva-sfml.json | 29 ++ port_versions/s-/shiva.json | 54 ++++ port_versions/s-/shogun.json | 59 ++++ port_versions/s-/signalrclient.json | 54 ++++ port_versions/s-/sigslot.json | 19 ++ port_versions/s-/simage.json | 9 + port_versions/s-/simde.json | 14 + port_versions/s-/simdjson.json | 54 ++++ port_versions/s-/simple-fft.json | 9 + port_versions/s-/simpleini.json | 24 ++ port_versions/s-/skia.json | 34 ++ port_versions/s-/skyr-url.json | 54 ++++ port_versions/s-/slikenet.json | 19 ++ port_versions/s-/sltbench.json | 9 + port_versions/s-/smpeg2.json | 34 ++ port_versions/s-/snappy.json | 39 +++ port_versions/s-/sndfile.json | 19 ++ port_versions/s-/snowhouse.json | 29 ++ port_versions/s-/so5extra.json | 54 ++++ port_versions/s-/sobjectizer.json | 124 ++++++++ port_versions/s-/soci.json | 49 +++ port_versions/s-/socket-io-client.json | 14 + port_versions/s-/sockpp.json | 9 + port_versions/s-/soem.json | 9 + port_versions/s-/soil.json | 14 + port_versions/s-/soil2.json | 14 + port_versions/s-/sokol.json | 9 + port_versions/s-/sol2.json | 54 ++++ port_versions/s-/solid3.json | 9 + port_versions/s-/sophus.json | 24 ++ port_versions/s-/soqt.json | 19 ++ port_versions/s-/sord.json | 9 + port_versions/s-/soundtouch.json | 39 +++ port_versions/s-/soxr.json | 19 ++ port_versions/s-/spaceland.json | 29 ++ port_versions/s-/span-lite.json | 24 ++ port_versions/s-/sparsehash.json | 9 + port_versions/s-/sparsepp.json | 14 + port_versions/s-/spatialite-tools.json | 49 +++ port_versions/s-/spdk-dpdk.json | 9 + port_versions/s-/spdk-ipsec.json | 9 + port_versions/s-/spdk-isal.json | 9 + port_versions/s-/spdk.json | 14 + port_versions/s-/spdlog.json | 109 +++++++ port_versions/s-/spectra.json | 24 ++ port_versions/s-/speex.json | 54 ++++ port_versions/s-/speexdsp.json | 49 +++ port_versions/s-/spirit-po.json | 14 + port_versions/s-/spirv-cross.json | 24 ++ port_versions/s-/spirv-headers.json | 19 ++ port_versions/s-/spirv-tools.json | 69 ++++ port_versions/s-/sprout.json | 9 + port_versions/s-/spscqueue.json | 14 + port_versions/s-/sqlcipher.json | 19 ++ port_versions/s-/sqlite-modern-cpp.json | 24 ++ port_versions/s-/sqlite-orm.json | 49 +++ port_versions/s-/sqlite3.json | 169 ++++++++++ port_versions/s-/sqlitecpp.json | 54 ++++ port_versions/s-/sqlpp11-connector-mysql.json | 34 ++ .../s-/sqlpp11-connector-sqlite3.json | 24 ++ port_versions/s-/sqlpp11.json | 44 +++ port_versions/s-/sratom.json | 9 + port_versions/s-/status-value-lite.json | 9 + port_versions/s-/stb.json | 54 ++++ port_versions/s-/stlab.json | 34 ++ port_versions/s-/stormlib.json | 24 ++ port_versions/s-/strict-variant.json | 14 + port_versions/s-/string-theory.json | 64 ++++ port_versions/s-/string-view-lite.json | 9 + port_versions/s-/strtk.json | 34 ++ port_versions/s-/stx.json | 9 + port_versions/s-/stxxl.json | 19 ++ port_versions/s-/suitesparse.json | 84 +++++ port_versions/s-/sundials.json | 34 ++ port_versions/s-/superlu.json | 14 + port_versions/s-/symengine.json | 9 + port_versions/s-/systemc.json | 19 ++ port_versions/s-/szip.json | 49 +++ port_versions/t-/tabulate.json | 9 + port_versions/t-/tacopie.json | 34 ++ port_versions/t-/taglib.json | 34 ++ port_versions/t-/taocpp-json.json | 24 ++ port_versions/t-/tap-windows6.json | 9 + port_versions/t-/taskflow.json | 14 + port_versions/t-/tbb.json | 139 +++++++++ port_versions/t-/tcl.json | 29 ++ port_versions/t-/tclap.json | 29 ++ port_versions/t-/teemo.json | 24 ++ port_versions/t-/telnetpp.json | 39 +++ port_versions/t-/tensorflow-cc.json | 49 +++ port_versions/t-/tensorflow-common.json | 14 + port_versions/t-/tensorflow.json | 14 + port_versions/t-/termcolor.json | 9 + port_versions/t-/tesseract.json | 99 ++++++ port_versions/t-/tfhe.json | 14 + port_versions/t-/tgbot-cpp.json | 9 + port_versions/t-/tgc.json | 14 + port_versions/t-/tgui.json | 39 +++ port_versions/t-/theia.json | 44 +++ port_versions/t-/think-cell-range.json | 29 ++ port_versions/t-/thor.json | 34 ++ port_versions/t-/threadpool.json | 9 + port_versions/t-/thrift.json | 239 ++++++++++++++ port_versions/t-/tidy-html5.json | 44 +++ port_versions/t-/tiff.json | 109 +++++++ port_versions/t-/tinkerforge.json | 9 + port_versions/t-/tiny-aes-c.json | 9 + port_versions/t-/tiny-bignum-c.json | 9 + port_versions/t-/tiny-dnn.json | 49 +++ port_versions/t-/tiny-process-library.json | 14 + port_versions/t-/tiny-regex-c.json | 9 + port_versions/t-/tinycthread.json | 9 + port_versions/t-/tinydir.json | 14 + port_versions/t-/tinyexif.json | 49 +++ port_versions/t-/tinyexpr.json | 9 + port_versions/t-/tinyexr.json | 24 ++ port_versions/t-/tinyfiledialogs.json | 44 +++ port_versions/t-/tinygltf.json | 14 + port_versions/t-/tinynpy.json | 14 + port_versions/t-/tinyobjloader.json | 34 ++ port_versions/t-/tinyply.json | 9 + port_versions/t-/tinyspline.json | 14 + port_versions/t-/tinythread.json | 24 ++ port_versions/t-/tinytoml.json | 9 + port_versions/t-/tinyutf8.json | 29 ++ port_versions/t-/tinyxml.json | 34 ++ port_versions/t-/tinyxml2.json | 69 ++++ port_versions/t-/tl-expected.json | 14 + port_versions/t-/tl-function-ref.json | 9 + port_versions/t-/tl-optional.json | 14 + port_versions/t-/tlx.json | 9 + port_versions/t-/tmx.json | 24 ++ port_versions/t-/tmxlite.json | 9 + port_versions/t-/tmxparser.json | 24 ++ port_versions/t-/toml11.json | 19 ++ port_versions/t-/tomlplusplus.json | 24 ++ port_versions/t-/tool-meson.json | 44 +++ port_versions/t-/torch-th.json | 34 ++ port_versions/t-/trantor.json | 34 ++ port_versions/t-/tre.json | 9 + port_versions/t-/treehopper.json | 24 ++ port_versions/t-/triangle.json | 9 + port_versions/t-/trompeloeil.json | 34 ++ port_versions/t-/tsl-hopscotch-map.json | 24 ++ port_versions/t-/tsl-ordered-map.json | 24 ++ port_versions/t-/tsl-sparse-map.json | 24 ++ port_versions/t-/turbobase64.json | 9 + port_versions/t-/tweeny.json | 9 + port_versions/t-/type-lite.json | 9 + port_versions/t-/type-safe.json | 9 + port_versions/u-/uchardet.json | 9 + port_versions/u-/umock-c.json | 59 ++++ port_versions/u-/unicorn-lib.json | 129 ++++++++ port_versions/u-/unicorn.json | 104 +++++++ port_versions/u-/units.json | 14 + port_versions/u-/unittest-cpp.json | 14 + port_versions/u-/unixodbc.json | 19 ++ port_versions/u-/unqlite.json | 9 + port_versions/u-/unrar.json | 34 ++ port_versions/u-/upb.json | 24 ++ port_versions/u-/urdfdom-headers.json | 44 +++ port_versions/u-/urdfdom.json | 54 ++++ port_versions/u-/uriparser.json | 59 ++++ port_versions/u-/usbmuxd.json | 34 ++ port_versions/u-/usd.json | 34 ++ port_versions/u-/usockets.json | 39 +++ port_versions/u-/usrsctp.json | 19 ++ port_versions/u-/utf8h.json | 14 + port_versions/u-/utf8proc.json | 29 ++ port_versions/u-/utfcpp.json | 39 +++ port_versions/u-/utfz.json | 14 + port_versions/u-/uthenticode.json | 19 ++ port_versions/u-/uvatlas.json | 39 +++ port_versions/u-/uvw.json | 44 +++ port_versions/u-/uwebsockets.json | 114 +++++++ port_versions/v-/v-hacd.json | 14 + port_versions/v-/v8.json | 14 + port_versions/v-/valijson.json | 14 + port_versions/v-/value-ptr-lite.json | 9 + port_versions/v-/variant-lite.json | 9 + port_versions/v-/vc.json | 9 + port_versions/v-/vcglib.json | 9 + port_versions/v-/vcpkg-gfortran.json | 14 + port_versions/v-/vectorclass.json | 9 + port_versions/v-/visit-struct.json | 14 + port_versions/v-/vlfeat.json | 9 + port_versions/v-/vlpp.json | 29 ++ port_versions/v-/volk.json | 14 + port_versions/v-/vs-yasm.json | 14 + port_versions/v-/vtk-dicom.json | 29 ++ port_versions/v-/vtk-m.json | 14 + port_versions/v-/vtk.json | 214 +++++++++++++ port_versions/v-/vulkan-headers.json | 9 + port_versions/v-/vulkan-hpp.json | 14 + port_versions/v-/vulkan-memory-allocator.json | 19 ++ port_versions/v-/vulkan.json | 14 + port_versions/v-/vxl.json | 49 +++ port_versions/w-/wampcc.json | 9 + port_versions/w-/wangle.json | 89 ++++++ port_versions/w-/wavelib.json | 9 + port_versions/w-/wavpack.json | 44 +++ port_versions/w-/websocketpp.json | 29 ++ port_versions/w-/wepoll.json | 19 ++ port_versions/w-/wg21-sg14.json | 9 + port_versions/w-/wil.json | 39 +++ port_versions/w-/wildmidi.json | 24 ++ port_versions/w-/wincrypt.json | 19 ++ port_versions/w-/winpcap.json | 34 ++ port_versions/w-/winreg.json | 44 +++ port_versions/w-/winsock2.json | 19 ++ port_versions/w-/wintoast.json | 9 + port_versions/w-/woff2.json | 9 + port_versions/w-/wordnet.json | 9 + port_versions/w-/wpilib.json | 19 ++ port_versions/w-/wren.json | 9 + port_versions/w-/wt.json | 109 +++++++ port_versions/w-/wtl.json | 64 ++++ port_versions/w-/wxchartdir.json | 9 + port_versions/w-/wxwidgets.json | 74 +++++ port_versions/x-/x-plane.json | 19 ++ port_versions/x-/x264.json | 84 +++++ port_versions/x-/x265.json | 69 ++++ port_versions/x-/xalan-c.json | 64 ++++ port_versions/x-/xbyak.json | 24 ++ port_versions/x-/xerces-c.json | 84 +++++ port_versions/x-/xeus.json | 44 +++ port_versions/x-/xframe.json | 9 + port_versions/x-/xlnt.json | 59 ++++ port_versions/x-/xmlsec.json | 39 +++ port_versions/x-/xmsh.json | 19 ++ port_versions/x-/xorstr.json | 14 + port_versions/x-/xproperty.json | 9 + port_versions/x-/xsimd.json | 64 ++++ port_versions/x-/xtensor-blas.json | 24 ++ port_versions/x-/xtensor-fftw.json | 9 + port_versions/x-/xtensor-io.json | 19 ++ port_versions/x-/xtensor.json | 59 ++++ port_versions/x-/xtl.json | 44 +++ port_versions/x-/xxhash.json | 44 +++ port_versions/y-/yajl.json | 9 + port_versions/y-/yaml-cpp.json | 59 ++++ port_versions/y-/yara.json | 34 ++ port_versions/y-/yas.json | 14 + port_versions/y-/yasm-tool-helper.json | 9 + port_versions/y-/yasm-tool.json | 9 + port_versions/y-/yasm.json | 9 + port_versions/y-/yato.json | 19 ++ port_versions/y-/yoga.json | 59 ++++ port_versions/z-/z3.json | 39 +++ port_versions/z-/z85.json | 9 + port_versions/z-/zeromq.json | 174 +++++++++++ port_versions/z-/zfp.json | 14 + port_versions/z-/zkpp.json | 9 + port_versions/z-/zlib.json | 59 ++++ port_versions/z-/zookeeper.json | 14 + port_versions/z-/zopfli.json | 19 ++ port_versions/z-/zserge-webview.json | 14 + port_versions/z-/zstd.json | 84 +++++ port_versions/z-/zstr.json | 14 + port_versions/z-/zxing-cpp.json | 39 +++ port_versions/z-/zydis.json | 19 ++ port_versions/z-/zyre.json | 14 + port_versions/z-/zziplib.json | 49 +++ 1578 files changed, 61540 insertions(+), 2 deletions(-) create mode 100644 port_versions/3-/3fd.json create mode 100644 port_versions/7-/7zip.json create mode 100644 port_versions/a-/abseil.json create mode 100644 port_versions/a-/absent.json create mode 100644 port_versions/a-/ace.json create mode 100644 port_versions/a-/activemq-cpp.json create mode 100644 port_versions/a-/ade.json create mode 100644 port_versions/a-/aixlog.json create mode 100644 port_versions/a-/akali.json create mode 100644 port_versions/a-/alac-decoder.json create mode 100644 port_versions/a-/alac.json create mode 100644 port_versions/a-/alembic.json create mode 100644 port_versions/a-/aliyun-oss-c-sdk.json create mode 100644 port_versions/a-/allegro5.json create mode 100644 port_versions/a-/ampl-asl.json create mode 100644 port_versions/a-/ampl-mp.json create mode 100644 port_versions/a-/amqpcpp.json create mode 100644 port_versions/a-/anax.json create mode 100644 port_versions/a-/angelscript.json create mode 100644 port_versions/a-/angle.json create mode 100644 port_versions/a-/antlr4.json create mode 100644 port_versions/a-/any-lite.json create mode 100644 port_versions/a-/anyrpc.json create mode 100644 port_versions/a-/apr-util.json create mode 100644 port_versions/a-/apr.json create mode 100644 port_versions/a-/arb.json create mode 100644 port_versions/a-/arcus.json create mode 100644 port_versions/a-/argagg.json create mode 100644 port_versions/a-/argh.json create mode 100644 port_versions/a-/argparse.json create mode 100644 port_versions/a-/args.json create mode 100644 port_versions/a-/argtable2.json create mode 100644 port_versions/a-/argtable3.json create mode 100644 port_versions/a-/argumentum.json create mode 100644 port_versions/a-/armadillo.json create mode 100644 port_versions/a-/arrayfire.json create mode 100644 port_versions/a-/arrow.json create mode 100644 port_versions/a-/ashes.json create mode 100644 port_versions/a-/asio.json create mode 100644 port_versions/a-/asiosdk.json create mode 100644 port_versions/a-/asmjit.json create mode 100644 port_versions/a-/assimp.json create mode 100644 port_versions/a-/asynch.json create mode 100644 port_versions/a-/asyncplusplus.json create mode 100644 port_versions/a-/atk.json create mode 100644 port_versions/a-/atkmm.json create mode 100644 port_versions/a-/atlmfc.json create mode 100644 port_versions/a-/aubio.json create mode 100644 port_versions/a-/audiofile.json create mode 100644 port_versions/a-/aurora.json create mode 100644 port_versions/a-/autobahn.json create mode 100644 port_versions/a-/avisynthplus.json create mode 100644 port_versions/a-/avro-c.json create mode 100644 port_versions/a-/avro-cpp.json create mode 100644 port_versions/a-/aws-c-common.json create mode 100644 port_versions/a-/aws-c-event-stream.json create mode 100644 port_versions/a-/aws-checksums.json create mode 100644 port_versions/a-/aws-lambda-cpp.json create mode 100644 port_versions/a-/aws-sdk-cpp.json create mode 100644 port_versions/a-/azmq.json create mode 100644 port_versions/a-/azure-c-shared-utility.json create mode 100644 port_versions/a-/azure-iot-sdk-c.json create mode 100644 port_versions/a-/azure-kinect-sensor-sdk.json create mode 100644 port_versions/a-/azure-macro-utils-c.json create mode 100644 port_versions/a-/azure-storage-cpp.json create mode 100644 port_versions/a-/azure-uamqp-c.json create mode 100644 port_versions/a-/azure-uhttp-c.json create mode 100644 port_versions/a-/azure-umqtt-c.json create mode 100644 port_versions/b-/basisu.json create mode 100644 port_versions/b-/bcg729.json create mode 100644 port_versions/b-/bde.json create mode 100644 port_versions/b-/bdwgc.json create mode 100644 port_versions/b-/beast.json create mode 100644 port_versions/b-/behaviortree-cpp.json create mode 100644 port_versions/b-/benchmark.json create mode 100644 port_versions/b-/bento4.json create mode 100644 port_versions/b-/berkeleydb.json create mode 100644 port_versions/b-/bfgroup-lyra.json create mode 100644 port_versions/b-/bigint.json create mode 100644 port_versions/b-/binn.json create mode 100644 port_versions/b-/bitmagic.json create mode 100644 port_versions/b-/bitserializer-cpprestjson.json create mode 100644 port_versions/b-/bitserializer-pugixml.json create mode 100644 port_versions/b-/bitserializer-rapidjson.json create mode 100644 port_versions/b-/bitserializer-rapidyaml.json create mode 100644 port_versions/b-/bitserializer.json create mode 100644 port_versions/b-/bitsery.json create mode 100644 port_versions/b-/blas.json create mode 100644 port_versions/b-/blaze.json create mode 100644 port_versions/b-/blend2d.json create mode 100644 port_versions/b-/blitz.json create mode 100644 port_versions/b-/blosc.json create mode 100644 port_versions/b-/bond.json create mode 100644 port_versions/b-/boolinq.json create mode 100644 port_versions/b-/boost-accumulators.json create mode 100644 port_versions/b-/boost-algorithm.json create mode 100644 port_versions/b-/boost-align.json create mode 100644 port_versions/b-/boost-any.json create mode 100644 port_versions/b-/boost-array.json create mode 100644 port_versions/b-/boost-asio.json create mode 100644 port_versions/b-/boost-assert.json create mode 100644 port_versions/b-/boost-assign.json create mode 100644 port_versions/b-/boost-atomic.json create mode 100644 port_versions/b-/boost-beast.json create mode 100644 port_versions/b-/boost-bimap.json create mode 100644 port_versions/b-/boost-bind.json create mode 100644 port_versions/b-/boost-build.json create mode 100644 port_versions/b-/boost-callable-traits.json create mode 100644 port_versions/b-/boost-chrono.json create mode 100644 port_versions/b-/boost-circular-buffer.json create mode 100644 port_versions/b-/boost-compatibility.json create mode 100644 port_versions/b-/boost-compute.json create mode 100644 port_versions/b-/boost-concept-check.json create mode 100644 port_versions/b-/boost-config.json create mode 100644 port_versions/b-/boost-container-hash.json create mode 100644 port_versions/b-/boost-container.json create mode 100644 port_versions/b-/boost-context.json create mode 100644 port_versions/b-/boost-contract.json create mode 100644 port_versions/b-/boost-conversion.json create mode 100644 port_versions/b-/boost-convert.json create mode 100644 port_versions/b-/boost-core.json create mode 100644 port_versions/b-/boost-coroutine.json create mode 100644 port_versions/b-/boost-coroutine2.json create mode 100644 port_versions/b-/boost-crc.json create mode 100644 port_versions/b-/boost-date-time.json create mode 100644 port_versions/b-/boost-detail.json create mode 100644 port_versions/b-/boost-di.json create mode 100644 port_versions/b-/boost-dll.json create mode 100644 port_versions/b-/boost-dynamic-bitset.json create mode 100644 port_versions/b-/boost-endian.json create mode 100644 port_versions/b-/boost-exception.json create mode 100644 port_versions/b-/boost-fiber.json create mode 100644 port_versions/b-/boost-filesystem.json create mode 100644 port_versions/b-/boost-flyweight.json create mode 100644 port_versions/b-/boost-foreach.json create mode 100644 port_versions/b-/boost-format.json create mode 100644 port_versions/b-/boost-function-types.json create mode 100644 port_versions/b-/boost-function.json create mode 100644 port_versions/b-/boost-functional.json create mode 100644 port_versions/b-/boost-fusion.json create mode 100644 port_versions/b-/boost-geometry.json create mode 100644 port_versions/b-/boost-gil.json create mode 100644 port_versions/b-/boost-graph-parallel.json create mode 100644 port_versions/b-/boost-graph.json create mode 100644 port_versions/b-/boost-hana.json create mode 100644 port_versions/b-/boost-heap.json create mode 100644 port_versions/b-/boost-histogram.json create mode 100644 port_versions/b-/boost-hof.json create mode 100644 port_versions/b-/boost-icl.json create mode 100644 port_versions/b-/boost-integer.json create mode 100644 port_versions/b-/boost-interprocess.json create mode 100644 port_versions/b-/boost-interval.json create mode 100644 port_versions/b-/boost-intrusive.json create mode 100644 port_versions/b-/boost-io.json create mode 100644 port_versions/b-/boost-iostreams.json create mode 100644 port_versions/b-/boost-iterator.json create mode 100644 port_versions/b-/boost-json.json create mode 100644 port_versions/b-/boost-lambda.json create mode 100644 port_versions/b-/boost-leaf.json create mode 100644 port_versions/b-/boost-lexical-cast.json create mode 100644 port_versions/b-/boost-local-function.json create mode 100644 port_versions/b-/boost-locale.json create mode 100644 port_versions/b-/boost-lockfree.json create mode 100644 port_versions/b-/boost-log.json create mode 100644 port_versions/b-/boost-logic.json create mode 100644 port_versions/b-/boost-math.json create mode 100644 port_versions/b-/boost-metaparse.json create mode 100644 port_versions/b-/boost-modular-build-helper.json create mode 100644 port_versions/b-/boost-move.json create mode 100644 port_versions/b-/boost-mp11.json create mode 100644 port_versions/b-/boost-mpi.json create mode 100644 port_versions/b-/boost-mpl.json create mode 100644 port_versions/b-/boost-msm.json create mode 100644 port_versions/b-/boost-multi-array.json create mode 100644 port_versions/b-/boost-multi-index.json create mode 100644 port_versions/b-/boost-multiprecision.json create mode 100644 port_versions/b-/boost-nowide.json create mode 100644 port_versions/b-/boost-numeric-conversion.json create mode 100644 port_versions/b-/boost-odeint.json create mode 100644 port_versions/b-/boost-optional.json create mode 100644 port_versions/b-/boost-outcome.json create mode 100644 port_versions/b-/boost-parameter-python.json create mode 100644 port_versions/b-/boost-parameter.json create mode 100644 port_versions/b-/boost-pfr.json create mode 100644 port_versions/b-/boost-phoenix.json create mode 100644 port_versions/b-/boost-poly-collection.json create mode 100644 port_versions/b-/boost-polygon.json create mode 100644 port_versions/b-/boost-pool.json create mode 100644 port_versions/b-/boost-predef.json create mode 100644 port_versions/b-/boost-preprocessor.json create mode 100644 port_versions/b-/boost-process.json create mode 100644 port_versions/b-/boost-program-options.json create mode 100644 port_versions/b-/boost-property-map.json create mode 100644 port_versions/b-/boost-property-tree.json create mode 100644 port_versions/b-/boost-proto.json create mode 100644 port_versions/b-/boost-ptr-container.json create mode 100644 port_versions/b-/boost-python.json create mode 100644 port_versions/b-/boost-qvm.json create mode 100644 port_versions/b-/boost-random.json create mode 100644 port_versions/b-/boost-range.json create mode 100644 port_versions/b-/boost-ratio.json create mode 100644 port_versions/b-/boost-rational.json create mode 100644 port_versions/b-/boost-regex.json create mode 100644 port_versions/b-/boost-safe-numerics.json create mode 100644 port_versions/b-/boost-scope-exit.json create mode 100644 port_versions/b-/boost-serialization.json create mode 100644 port_versions/b-/boost-signals2.json create mode 100644 port_versions/b-/boost-smart-ptr.json create mode 100644 port_versions/b-/boost-sort.json create mode 100644 port_versions/b-/boost-spirit.json create mode 100644 port_versions/b-/boost-stacktrace.json create mode 100644 port_versions/b-/boost-statechart.json create mode 100644 port_versions/b-/boost-static-assert.json create mode 100644 port_versions/b-/boost-static-string.json create mode 100644 port_versions/b-/boost-stl-interfaces.json create mode 100644 port_versions/b-/boost-system.json create mode 100644 port_versions/b-/boost-test.json create mode 100644 port_versions/b-/boost-thread.json create mode 100644 port_versions/b-/boost-throw-exception.json create mode 100644 port_versions/b-/boost-timer.json create mode 100644 port_versions/b-/boost-tokenizer.json create mode 100644 port_versions/b-/boost-tti.json create mode 100644 port_versions/b-/boost-tuple.json create mode 100644 port_versions/b-/boost-type-erasure.json create mode 100644 port_versions/b-/boost-type-index.json create mode 100644 port_versions/b-/boost-type-traits.json create mode 100644 port_versions/b-/boost-typeof.json create mode 100644 port_versions/b-/boost-ublas.json create mode 100644 port_versions/b-/boost-uninstall.json create mode 100644 port_versions/b-/boost-units.json create mode 100644 port_versions/b-/boost-unordered.json create mode 100644 port_versions/b-/boost-utility.json create mode 100644 port_versions/b-/boost-uuid.json create mode 100644 port_versions/b-/boost-variant.json create mode 100644 port_versions/b-/boost-variant2.json create mode 100644 port_versions/b-/boost-vcpkg-helpers.json create mode 100644 port_versions/b-/boost-vmd.json create mode 100644 port_versions/b-/boost-wave.json create mode 100644 port_versions/b-/boost-winapi.json create mode 100644 port_versions/b-/boost-xpressive.json create mode 100644 port_versions/b-/boost-yap.json create mode 100644 port_versions/b-/boost.json create mode 100644 port_versions/b-/boringssl.json create mode 100644 port_versions/b-/botan.json create mode 100644 port_versions/b-/box2d.json create mode 100644 port_versions/b-/breakpad.json create mode 100644 port_versions/b-/brigand.json create mode 100644 port_versions/b-/brotli.json create mode 100644 port_versions/b-/brpc.json create mode 100644 port_versions/b-/brunocodutra-metal.json create mode 100644 port_versions/b-/brynet.json create mode 100644 port_versions/b-/bullet3.json create mode 100644 port_versions/b-/bustache.json create mode 100644 port_versions/b-/butteraugli.json create mode 100644 port_versions/b-/byte-lite.json create mode 100644 port_versions/b-/bzip2.json create mode 100644 port_versions/baseline.json create mode 100644 port_versions/c-/c-ares.json create mode 100644 port_versions/c-/c4core.json create mode 100644 port_versions/c-/caf.json create mode 100644 port_versions/c-/caffe2.json create mode 100644 port_versions/c-/cairo.json create mode 100644 port_versions/c-/cairomm.json create mode 100644 port_versions/c-/camport3.json create mode 100644 port_versions/c-/capnproto.json create mode 100644 port_versions/c-/capstone.json create mode 100644 port_versions/c-/cartographer.json create mode 100644 port_versions/c-/casclib.json create mode 100644 port_versions/c-/catch-classic.json create mode 100644 port_versions/c-/catch.json create mode 100644 port_versions/c-/catch2.json create mode 100644 port_versions/c-/cccapstone.json create mode 100644 port_versions/c-/ccd.json create mode 100644 port_versions/c-/ccfits.json create mode 100644 port_versions/c-/cctz.json create mode 100644 port_versions/c-/celero.json create mode 100644 port_versions/c-/cello.json create mode 100644 port_versions/c-/cereal.json create mode 100644 port_versions/c-/ceres.json create mode 100644 port_versions/c-/cfitsio.json create mode 100644 port_versions/c-/cgal.json create mode 100644 port_versions/c-/cgicc.json create mode 100644 port_versions/c-/cgl.json create mode 100644 port_versions/c-/cgltf.json create mode 100644 port_versions/c-/cgns.json create mode 100644 port_versions/c-/chaiscript.json create mode 100644 port_versions/c-/chakracore.json create mode 100644 port_versions/c-/charls.json create mode 100644 port_versions/c-/chartdir.json create mode 100644 port_versions/c-/check.json create mode 100644 port_versions/c-/chipmunk.json create mode 100644 port_versions/c-/chmlib.json create mode 100644 port_versions/c-/chromium-base.json create mode 100644 port_versions/c-/cimg.json create mode 100644 port_versions/c-/cityhash.json create mode 100644 port_versions/c-/civetweb.json create mode 100644 port_versions/c-/cjson.json create mode 100644 port_versions/c-/clapack.json create mode 100644 port_versions/c-/clara.json create mode 100644 port_versions/c-/clblas.json create mode 100644 port_versions/c-/clblast.json create mode 100644 port_versions/c-/clfft.json create mode 100644 port_versions/c-/cli.json create mode 100644 port_versions/c-/cli11.json create mode 100644 port_versions/c-/clickhouse-cpp.json create mode 100644 port_versions/c-/clipp.json create mode 100644 port_versions/c-/clockutils.json create mode 100644 port_versions/c-/clp.json create mode 100644 port_versions/c-/clrng.json create mode 100644 port_versions/c-/clue.json create mode 100644 port_versions/c-/cmark.json create mode 100644 port_versions/c-/cmcstl2.json create mode 100644 port_versions/c-/cmocka.json create mode 100644 port_versions/c-/cnl.json create mode 100644 port_versions/c-/coin.json create mode 100644 port_versions/c-/coinutils.json create mode 100644 port_versions/c-/collada-dom.json create mode 100644 port_versions/c-/colmap.json create mode 100644 port_versions/c-/comms-ublox.json create mode 100644 port_versions/c-/comms.json create mode 100644 port_versions/c-/commsdsl.json create mode 100644 port_versions/c-/concurrentqueue.json create mode 100644 port_versions/c-/console-bridge.json create mode 100644 port_versions/c-/constexpr-contracts.json create mode 100644 port_versions/c-/constexpr.json create mode 100644 port_versions/c-/coolprop.json create mode 100644 port_versions/c-/coroutine.json create mode 100644 port_versions/c-/corrade.json create mode 100644 port_versions/c-/cpp-base64.json create mode 100644 port_versions/c-/cpp-httplib.json create mode 100644 port_versions/c-/cpp-netlib.json create mode 100644 port_versions/c-/cpp-peglib.json create mode 100644 port_versions/c-/cpp-redis.json create mode 100644 port_versions/c-/cpp-taskflow.json create mode 100644 port_versions/c-/cppad.json create mode 100644 port_versions/c-/cppcms.json create mode 100644 port_versions/c-/cppcodec.json create mode 100644 port_versions/c-/cppcoro.json create mode 100644 port_versions/c-/cppfs.json create mode 100644 port_versions/c-/cppgraphqlgen.json create mode 100644 port_versions/c-/cppitertools.json create mode 100644 port_versions/c-/cppkafka.json create mode 100644 port_versions/c-/cppmicroservices.json create mode 100644 port_versions/c-/cpprestsdk.json create mode 100644 port_versions/c-/cpptoml.json create mode 100644 port_versions/c-/cppunit.json create mode 100644 port_versions/c-/cpputest.json create mode 100644 port_versions/c-/cppwinrt.json create mode 100644 port_versions/c-/cppzmq.json create mode 100644 port_versions/c-/cpr.json create mode 100644 port_versions/c-/cpu-features.json create mode 100644 port_versions/c-/cpuid.json create mode 100644 port_versions/c-/cpuinfo.json create mode 100644 port_versions/c-/cr.json create mode 100644 port_versions/c-/crashpad.json create mode 100644 port_versions/c-/crashrpt.json create mode 100644 port_versions/c-/crc32c.json create mode 100644 port_versions/c-/crfsuite.json create mode 100644 port_versions/c-/croncpp.json create mode 100644 port_versions/c-/crossguid.json create mode 100644 port_versions/c-/crow.json create mode 100644 port_versions/c-/cryptopp.json create mode 100644 port_versions/c-/cspice.json create mode 100644 port_versions/c-/ctbignum.json create mode 100644 port_versions/c-/ctemplate.json create mode 100644 port_versions/c-/ctp.json create mode 100644 port_versions/c-/ctre.json create mode 100644 port_versions/c-/cub.json create mode 100644 port_versions/c-/cuda.json create mode 100644 port_versions/c-/cudnn.json create mode 100644 port_versions/c-/cunit.json create mode 100644 port_versions/c-/curl.json create mode 100644 port_versions/c-/curlpp.json create mode 100644 port_versions/c-/cute-headers.json create mode 100644 port_versions/c-/cutelyst2.json create mode 100644 port_versions/c-/cwalk.json create mode 100644 port_versions/c-/cxxopts.json create mode 100644 port_versions/c-/czmq.json create mode 100644 port_versions/d-/d3dx12.json create mode 100644 port_versions/d-/darknet.json create mode 100644 port_versions/d-/darts-clone.json create mode 100644 port_versions/d-/dartsim.json create mode 100644 port_versions/d-/dataframe.json create mode 100644 port_versions/d-/date.json create mode 100644 port_versions/d-/dbg-macro.json create mode 100644 port_versions/d-/dbghelp.json create mode 100644 port_versions/d-/dbow2.json create mode 100644 port_versions/d-/dbow3.json create mode 100644 port_versions/d-/dcmtk.json create mode 100644 port_versions/d-/debug-assert.json create mode 100644 port_versions/d-/decimal-for-cpp.json create mode 100644 port_versions/d-/detours.json create mode 100644 port_versions/d-/devicenameresolver.json create mode 100644 port_versions/d-/devil.json create mode 100644 port_versions/d-/dimcli.json create mode 100644 port_versions/d-/directx-headers.json create mode 100644 port_versions/d-/directxmath.json create mode 100644 port_versions/d-/directxmesh.json create mode 100644 port_versions/d-/directxsdk.json create mode 100644 port_versions/d-/directxtex.json create mode 100644 port_versions/d-/directxtk.json create mode 100644 port_versions/d-/directxtk12.json create mode 100644 port_versions/d-/dirent.json create mode 100644 port_versions/d-/discord-game-sdk.json create mode 100644 port_versions/d-/discord-rpc.json create mode 100644 port_versions/d-/discount.json create mode 100644 port_versions/d-/distorm.json create mode 100644 port_versions/d-/dlfcn-win32.json create mode 100644 port_versions/d-/dlib.json create mode 100644 port_versions/d-/dmlc.json create mode 100644 port_versions/d-/docopt.json create mode 100644 port_versions/d-/doctest.json create mode 100644 port_versions/d-/double-conversion.json create mode 100644 port_versions/d-/dpdk.json create mode 100644 port_versions/d-/draco.json create mode 100644 port_versions/d-/drlibs.json create mode 100644 port_versions/d-/drogon.json create mode 100644 port_versions/d-/dtl.json create mode 100644 port_versions/d-/duckx.json create mode 100644 port_versions/d-/duilib.json create mode 100644 port_versions/d-/duktape.json create mode 100644 port_versions/d-/dx.json create mode 100644 port_versions/d-/dxut.json create mode 100644 port_versions/e-/eabase.json create mode 100644 port_versions/e-/eastl.json create mode 100644 port_versions/e-/easycl.json create mode 100644 port_versions/e-/easyhook.json create mode 100644 port_versions/e-/easyloggingpp.json create mode 100644 port_versions/e-/eathread.json create mode 100644 port_versions/e-/ebml.json create mode 100644 port_versions/e-/ecm.json create mode 100644 port_versions/e-/ecos.json create mode 100644 port_versions/e-/ecsutil.json create mode 100644 port_versions/e-/edlib.json create mode 100644 port_versions/e-/effolkronium-random.json create mode 100644 port_versions/e-/efsw.json create mode 100644 port_versions/e-/egl-registry.json create mode 100644 port_versions/e-/eigen3.json create mode 100644 port_versions/e-/elfio.json create mode 100644 port_versions/e-/elfutils.json create mode 100644 port_versions/e-/embree2.json create mode 100644 port_versions/e-/embree3.json create mode 100644 port_versions/e-/enet.json create mode 100644 port_versions/e-/ensmallen.json create mode 100644 port_versions/e-/entityx.json create mode 100644 port_versions/e-/entt.json create mode 100644 port_versions/e-/epsilon.json create mode 100644 port_versions/e-/esaxx.json create mode 100644 port_versions/e-/evpp.json create mode 100644 port_versions/e-/exiv2.json create mode 100644 port_versions/e-/expat.json create mode 100644 port_versions/e-/expected-lite.json create mode 100644 port_versions/e-/exprtk.json create mode 100644 port_versions/e-/ezc3d.json create mode 100644 port_versions/f-/faad2.json create mode 100644 port_versions/f-/fadbad.json create mode 100644 port_versions/f-/faiss.json create mode 100644 port_versions/f-/fann.json create mode 100644 port_versions/f-/farmhash.json create mode 100644 port_versions/f-/fast-cpp-csv-parser.json create mode 100644 port_versions/f-/fastcdr.json create mode 100644 port_versions/f-/fastcgi.json create mode 100644 port_versions/f-/fastfeat.json create mode 100644 port_versions/f-/fastlz.json create mode 100644 port_versions/f-/fastrtps.json create mode 100644 port_versions/f-/fbthrift.json create mode 100644 port_versions/f-/fcl.json create mode 100644 port_versions/f-/fdk-aac.json create mode 100644 port_versions/f-/fdlibm.json create mode 100644 port_versions/f-/ffmpeg.json create mode 100644 port_versions/f-/ffnvcodec.json create mode 100644 port_versions/f-/fftw3.json create mode 100644 port_versions/f-/fftwpp.json create mode 100644 port_versions/f-/field3d.json create mode 100644 port_versions/f-/fixed-string.json create mode 100644 port_versions/f-/fizz.json create mode 100644 port_versions/f-/flann.json create mode 100644 port_versions/f-/flashlight-cuda.json create mode 100644 port_versions/f-/flatbuffers.json create mode 100644 port_versions/f-/flint.json create mode 100644 port_versions/f-/fltk.json create mode 100644 port_versions/f-/fluidlite.json create mode 100644 port_versions/f-/fluidsynth.json create mode 100644 port_versions/f-/fmem.json create mode 100644 port_versions/f-/fmi4cpp.json create mode 100644 port_versions/f-/fmilib.json create mode 100644 port_versions/f-/fmt.json create mode 100644 port_versions/f-/folly.json create mode 100644 port_versions/f-/font-chef.json create mode 100644 port_versions/f-/fontconfig.json create mode 100644 port_versions/f-/foonathan-memory.json create mode 100644 port_versions/f-/forest.json create mode 100644 port_versions/f-/forge.json create mode 100644 port_versions/f-/fplus.json create mode 100644 port_versions/f-/freeglut.json create mode 100644 port_versions/f-/freeimage.json create mode 100644 port_versions/f-/freeopcua.json create mode 100644 port_versions/f-/freerdp.json create mode 100644 port_versions/f-/freetds.json create mode 100644 port_versions/f-/freetype-gl.json create mode 100644 port_versions/f-/freetype.json create mode 100644 port_versions/f-/freexl.json create mode 100644 port_versions/f-/fribidi.json create mode 100644 port_versions/f-/frozen.json create mode 100644 port_versions/f-/fruit.json create mode 100644 port_versions/f-/ftgl.json create mode 100644 port_versions/f-/function2.json create mode 100644 port_versions/f-/fuzzylite.json create mode 100644 port_versions/g-/g2o.json create mode 100644 port_versions/g-/g3log.json create mode 100644 port_versions/g-/gainput.json create mode 100644 port_versions/g-/gamedev-framework.json create mode 100644 port_versions/g-/gamma.json create mode 100644 port_versions/g-/gasol.json create mode 100644 port_versions/g-/gaussianlib.json create mode 100644 port_versions/g-/gcem.json create mode 100644 port_versions/g-/gdal.json create mode 100644 port_versions/g-/gdcm.json create mode 100644 port_versions/g-/gdcm2.json create mode 100644 port_versions/g-/gdk-pixbuf.json create mode 100644 port_versions/g-/genann.json create mode 100644 port_versions/g-/geogram.json create mode 100644 port_versions/g-/geographiclib.json create mode 100644 port_versions/g-/geos.json create mode 100644 port_versions/g-/geotrans.json create mode 100644 port_versions/g-/getdns.json create mode 100644 port_versions/g-/getopt-win32.json create mode 100644 port_versions/g-/getopt.json create mode 100644 port_versions/g-/gettext.json create mode 100644 port_versions/g-/gettimeofday.json create mode 100644 port_versions/g-/gflags.json create mode 100644 port_versions/g-/gherkin-c.json create mode 100644 port_versions/g-/giflib.json create mode 100644 port_versions/g-/gl2ps.json create mode 100644 port_versions/g-/gl3w.json create mode 100644 port_versions/g-/glad.json create mode 100644 port_versions/g-/glbinding.json create mode 100644 port_versions/g-/glew.json create mode 100644 port_versions/g-/glfw3.json create mode 100644 port_versions/g-/gli.json create mode 100644 port_versions/g-/glib.json create mode 100644 port_versions/g-/glibmm.json create mode 100644 port_versions/g-/glm.json create mode 100644 port_versions/g-/globjects.json create mode 100644 port_versions/g-/glog.json create mode 100644 port_versions/g-/gloo.json create mode 100644 port_versions/g-/glslang.json create mode 100644 port_versions/g-/glui.json create mode 100644 port_versions/g-/gmime.json create mode 100644 port_versions/g-/gmmlib.json create mode 100644 port_versions/g-/gmp.json create mode 100644 port_versions/g-/google-cloud-cpp-common.json create mode 100644 port_versions/g-/google-cloud-cpp-spanner.json create mode 100644 port_versions/g-/google-cloud-cpp.json create mode 100644 port_versions/g-/googleapis.json create mode 100644 port_versions/g-/gperf.json create mode 100644 port_versions/g-/gperftools.json create mode 100644 port_versions/g-/gpgme.json create mode 100644 port_versions/g-/gppanel.json create mode 100644 port_versions/g-/graphicsmagick.json create mode 100644 port_versions/g-/graphite2.json create mode 100644 port_versions/g-/graphqlparser.json create mode 100644 port_versions/g-/greatest.json create mode 100644 port_versions/g-/grpc.json create mode 100644 port_versions/g-/grppi.json create mode 100644 port_versions/g-/gsl-lite.json create mode 100644 port_versions/g-/gsl.json create mode 100644 port_versions/g-/gsoap.json create mode 100644 port_versions/g-/gtest.json create mode 100644 port_versions/g-/gtk.json create mode 100644 port_versions/g-/gtkmm.json create mode 100644 port_versions/g-/gts.json create mode 100644 port_versions/g-/guetzli.json create mode 100644 port_versions/g-/gumbo.json create mode 100644 port_versions/g-/gzip-hpp.json create mode 100644 port_versions/h-/h3.json create mode 100644 port_versions/h-/h5py-lzf.json create mode 100644 port_versions/h-/halide.json create mode 100644 port_versions/h-/harfbuzz.json create mode 100644 port_versions/h-/hayai.json create mode 100644 port_versions/h-/hdf5.json create mode 100644 port_versions/h-/healpix.json create mode 100644 port_versions/h-/hedley.json create mode 100644 port_versions/h-/hffix.json create mode 100644 port_versions/h-/hfsm2.json create mode 100644 port_versions/h-/hidapi.json create mode 100644 port_versions/h-/highfive.json create mode 100644 port_versions/h-/hiredis.json create mode 100644 port_versions/h-/hpx.json create mode 100644 port_versions/h-/http-parser.json create mode 100644 port_versions/h-/hungarian.json create mode 100644 port_versions/h-/hunspell.json create mode 100644 port_versions/h-/hwloc.json create mode 100644 port_versions/h-/hyperscan.json create mode 100644 port_versions/h-/hypre.json create mode 100644 port_versions/i-/icu.json create mode 100644 port_versions/i-/ideviceinstaller.json create mode 100644 port_versions/i-/idevicerestore.json create mode 100644 port_versions/i-/if97.json create mode 100644 port_versions/i-/igloo.json create mode 100644 port_versions/i-/ignition-cmake0.json create mode 100644 port_versions/i-/ignition-cmake2.json create mode 100644 port_versions/i-/ignition-common1.json create mode 100644 port_versions/i-/ignition-common3.json create mode 100644 port_versions/i-/ignition-fuel-tools1.json create mode 100644 port_versions/i-/ignition-math4.json create mode 100644 port_versions/i-/ignition-math6.json create mode 100644 port_versions/i-/ignition-modularscripts.json create mode 100644 port_versions/i-/ignition-msgs1.json create mode 100644 port_versions/i-/ignition-msgs5.json create mode 100644 port_versions/i-/ignition-msgs6.json create mode 100644 port_versions/i-/ignition-plugin1.json create mode 100644 port_versions/i-/ignition-transport4.json create mode 100644 port_versions/i-/ignition-transport8.json create mode 100644 port_versions/i-/ignition-transport9.json create mode 100644 port_versions/i-/ijg-libjpeg.json create mode 100644 port_versions/i-/ilmbase.json create mode 100644 port_versions/i-/imgui-sfml.json create mode 100644 port_versions/i-/imgui.json create mode 100644 port_versions/i-/immer.json create mode 100644 port_versions/i-/implot.json create mode 100644 port_versions/i-/indicators.json create mode 100644 port_versions/i-/infoware.json create mode 100644 port_versions/i-/inih.json create mode 100644 port_versions/i-/iniparser.json create mode 100644 port_versions/i-/inja.json create mode 100644 port_versions/i-/intel-ipsec.json create mode 100644 port_versions/i-/intel-mkl.json create mode 100644 port_versions/i-/intelrdfpmathlib.json create mode 100644 port_versions/i-/io2d.json create mode 100644 port_versions/i-/irrlicht.json create mode 100644 port_versions/i-/irrxml.json create mode 100644 port_versions/i-/isal.json create mode 100644 port_versions/i-/ismrmrd.json create mode 100644 port_versions/i-/itk.json create mode 100644 port_versions/i-/itpp.json create mode 100644 port_versions/i-/ixwebsocket.json create mode 100644 port_versions/j-/jack2.json create mode 100644 port_versions/j-/jaeger-client-cpp.json create mode 100644 port_versions/j-/jansson.json create mode 100644 port_versions/j-/jasper.json create mode 100644 port_versions/j-/jbig2dec.json create mode 100644 port_versions/j-/jbigkit.json create mode 100644 port_versions/j-/jemalloc.json create mode 100644 port_versions/j-/jinja2cpplight.json create mode 100644 port_versions/j-/josuttis-jthread.json create mode 100644 port_versions/j-/jsmn.json create mode 100644 port_versions/j-/json-c.json create mode 100644 port_versions/j-/json-dto.json create mode 100644 port_versions/j-/json-schema-validator.json create mode 100644 port_versions/j-/json-spirit.json create mode 100644 port_versions/j-/json11.json create mode 100644 port_versions/j-/json5-parser.json create mode 100644 port_versions/j-/jsoncons.json create mode 100644 port_versions/j-/jsoncpp.json create mode 100644 port_versions/j-/jsonnet.json create mode 100644 port_versions/j-/jwt-cpp.json create mode 100644 port_versions/j-/jxrlib.json create mode 100644 port_versions/k-/kangaru.json create mode 100644 port_versions/k-/kcp.json create mode 100644 port_versions/k-/kd-soap.json create mode 100644 port_versions/k-/kealib.json create mode 100644 port_versions/k-/kenlm.json create mode 100644 port_versions/k-/keystone.json create mode 100644 port_versions/k-/kf5archive.json create mode 100644 port_versions/k-/kf5completion.json create mode 100644 port_versions/k-/kf5config.json create mode 100644 port_versions/k-/kf5coreaddons.json create mode 100644 port_versions/k-/kf5crash.json create mode 100644 port_versions/k-/kf5guiaddons.json create mode 100644 port_versions/k-/kf5holidays.json create mode 100644 port_versions/k-/kf5i18n.json create mode 100644 port_versions/k-/kf5itemmodels.json create mode 100644 port_versions/k-/kf5itemviews.json create mode 100644 port_versions/k-/kf5plotting.json create mode 100644 port_versions/k-/kf5syntaxhighlighting.json create mode 100644 port_versions/k-/kf5widgetsaddons.json create mode 100644 port_versions/k-/kf5windowsystem.json create mode 100644 port_versions/k-/kfr.json create mode 100644 port_versions/k-/kinectsdk1.json create mode 100644 port_versions/k-/kinectsdk2.json create mode 100644 port_versions/k-/kissfft.json create mode 100644 port_versions/k-/knet.json create mode 100644 port_versions/k-/krabsetw.json create mode 100644 port_versions/k-/ktx.json create mode 100644 port_versions/k-/kubazip.json create mode 100644 port_versions/k-/kuku.json create mode 100644 port_versions/k-/kvasir-mpl.json create mode 100644 port_versions/l-/lapack-reference.json create mode 100644 port_versions/l-/lapack.json create mode 100644 port_versions/l-/lastools.json create mode 100644 port_versions/l-/laszip.json create mode 100644 port_versions/l-/lazy-importer.json create mode 100644 port_versions/l-/lcm.json create mode 100644 port_versions/l-/lcms.json create mode 100644 port_versions/l-/leaf.json create mode 100644 port_versions/l-/lemon.json create mode 100644 port_versions/l-/leptonica.json create mode 100644 port_versions/l-/lerc.json create mode 100644 port_versions/l-/lest.json create mode 100644 port_versions/l-/leveldb.json create mode 100644 port_versions/l-/levmar.json create mode 100644 port_versions/l-/libaaplus.json create mode 100644 port_versions/l-/libaiff.json create mode 100644 port_versions/l-/libarchive.json create mode 100644 port_versions/l-/libass.json create mode 100644 port_versions/l-/libassuan.json create mode 100644 port_versions/l-/libb2.json create mode 100644 port_versions/l-/libbf.json create mode 100644 port_versions/l-/libbson.json create mode 100644 port_versions/l-/libcds.json create mode 100644 port_versions/l-/libcerf.json create mode 100644 port_versions/l-/libconfig.json create mode 100644 port_versions/l-/libconfuse.json create mode 100644 port_versions/l-/libcopp.json create mode 100644 port_versions/l-/libcrafter.json create mode 100644 port_versions/l-/libcroco.json create mode 100644 port_versions/l-/libcuckoo.json create mode 100644 port_versions/l-/libdatachannel.json create mode 100644 port_versions/l-/libdatrie.json create mode 100644 port_versions/l-/libde265.json create mode 100644 port_versions/l-/libdisasm.json create mode 100644 port_versions/l-/libdivide.json create mode 100644 port_versions/l-/libdshowcapture.json create mode 100644 port_versions/l-/libepoxy.json create mode 100644 port_versions/l-/libevent.json create mode 100644 port_versions/l-/libevhtp.json create mode 100644 port_versions/l-/libexif.json create mode 100644 port_versions/l-/libfabric.json create mode 100644 port_versions/l-/libffi.json create mode 100644 port_versions/l-/libflac.json create mode 100644 port_versions/l-/libfort.json create mode 100644 port_versions/l-/libfreenect2.json create mode 100644 port_versions/l-/libftdi.json create mode 100644 port_versions/l-/libftdi1.json create mode 100644 port_versions/l-/libgcrypt.json create mode 100644 port_versions/l-/libgd.json create mode 100644 port_versions/l-/libgeotiff.json create mode 100644 port_versions/l-/libgit2.json create mode 100644 port_versions/l-/libgo.json create mode 100644 port_versions/l-/libgpg-error.json create mode 100644 port_versions/l-/libgpod.json create mode 100644 port_versions/l-/libgta.json create mode 100644 port_versions/l-/libguarded.json create mode 100644 port_versions/l-/libharu.json create mode 100644 port_versions/l-/libhdfs3.json create mode 100644 port_versions/l-/libheif.json create mode 100644 port_versions/l-/libhsplasma.json create mode 100644 port_versions/l-/libhydrogen.json create mode 100644 port_versions/l-/libiconv.json create mode 100644 port_versions/l-/libics.json create mode 100644 port_versions/l-/libideviceactivation.json create mode 100644 port_versions/l-/libidn2.json create mode 100644 port_versions/l-/libigl.json create mode 100644 port_versions/l-/libilbc.json create mode 100644 port_versions/l-/libimobiledevice.json create mode 100644 port_versions/l-/libirecovery.json create mode 100644 port_versions/l-/libjpeg-turbo.json create mode 100644 port_versions/l-/libjuice.json create mode 100644 port_versions/l-/libkml.json create mode 100644 port_versions/l-/liblas.json create mode 100644 port_versions/l-/liblbfgs.json create mode 100644 port_versions/l-/liblemon.json create mode 100644 port_versions/l-/liblinear.json create mode 100644 port_versions/l-/liblo.json create mode 100644 port_versions/l-/liblsl.json create mode 100644 port_versions/l-/liblzma.json create mode 100644 port_versions/l-/libmad.json create mode 100644 port_versions/l-/libmagic.json create mode 100644 port_versions/l-/libmariadb.json create mode 100644 port_versions/l-/libmaxminddb.json create mode 100644 port_versions/l-/libmediainfo.json create mode 100644 port_versions/l-/libmesh.json create mode 100644 port_versions/l-/libmicrohttpd.json create mode 100644 port_versions/l-/libmikmod.json create mode 100644 port_versions/l-/libmodbus.json create mode 100644 port_versions/l-/libmodman.json create mode 100644 port_versions/l-/libmodplug.json create mode 100644 port_versions/l-/libmorton.json create mode 100644 port_versions/l-/libmpeg2.json create mode 100644 port_versions/l-/libmspack.json create mode 100644 port_versions/l-/libmupdf.json create mode 100644 port_versions/l-/libmysql.json create mode 100644 port_versions/l-/libnice.json create mode 100644 port_versions/l-/libnoise.json create mode 100644 port_versions/l-/libodb-boost.json create mode 100644 port_versions/l-/libodb-mysql.json create mode 100644 port_versions/l-/libodb-pgsql.json create mode 100644 port_versions/l-/libodb-sqlite.json create mode 100644 port_versions/l-/libodb.json create mode 100644 port_versions/l-/libogg.json create mode 100644 port_versions/l-/libopenmpt.json create mode 100644 port_versions/l-/libopusenc.json create mode 100644 port_versions/l-/libosip2.json create mode 100644 port_versions/l-/libosmium.json create mode 100644 port_versions/l-/libosmscout.json create mode 100644 port_versions/l-/libp7-baical.json create mode 100644 port_versions/l-/libp7client.json create mode 100644 port_versions/l-/libpcap.json create mode 100644 port_versions/l-/libpff.json create mode 100644 port_versions/l-/libplist.json create mode 100644 port_versions/l-/libpmemobj-cpp.json create mode 100644 port_versions/l-/libpng.json create mode 100644 port_versions/l-/libpopt.json create mode 100644 port_versions/l-/libpq.json create mode 100644 port_versions/l-/libpqxx.json create mode 100644 port_versions/l-/libprotobuf-mutator.json create mode 100644 port_versions/l-/libproxy.json create mode 100644 port_versions/l-/libqcow.json create mode 100644 port_versions/l-/libqglviewer.json create mode 100644 port_versions/l-/libqrencode.json create mode 100644 port_versions/l-/librabbitmq.json create mode 100644 port_versions/l-/libraqm.json create mode 100644 port_versions/l-/libraw.json create mode 100644 port_versions/l-/librdkafka.json create mode 100644 port_versions/l-/libressl.json create mode 100644 port_versions/l-/librsvg.json create mode 100644 port_versions/l-/librsync.json create mode 100644 port_versions/l-/librtmp.json create mode 100644 port_versions/l-/librttopo.json create mode 100644 port_versions/l-/libsamplerate.json create mode 100644 port_versions/l-/libsbml.json create mode 100644 port_versions/l-/libsigcpp-3.json create mode 100644 port_versions/l-/libsigcpp.json create mode 100644 port_versions/l-/libsndfile.json create mode 100644 port_versions/l-/libsodium.json create mode 100644 port_versions/l-/libsoundio.json create mode 100644 port_versions/l-/libspatialindex.json create mode 100644 port_versions/l-/libspatialite.json create mode 100644 port_versions/l-/libspnav.json create mode 100644 port_versions/l-/libsquish.json create mode 100644 port_versions/l-/libsrt.json create mode 100644 port_versions/l-/libsrtp.json create mode 100644 port_versions/l-/libssh.json create mode 100644 port_versions/l-/libssh2.json create mode 100644 port_versions/l-/libstemmer.json create mode 100644 port_versions/l-/libstk.json create mode 100644 port_versions/l-/libsvm.json create mode 100644 port_versions/l-/libtheora.json create mode 100644 port_versions/l-/libtins.json create mode 100644 port_versions/l-/libtomcrypt.json create mode 100644 port_versions/l-/libtommath.json create mode 100644 port_versions/l-/libtorrent.json create mode 100644 port_versions/l-/libu2f-server.json create mode 100644 port_versions/l-/libudis86.json create mode 100644 port_versions/l-/libudns.json create mode 100644 port_versions/l-/libui.json create mode 100644 port_versions/l-/libunibreak.json create mode 100644 port_versions/l-/libusb-win32.json create mode 100644 port_versions/l-/libusb.json create mode 100644 port_versions/l-/libusbmuxd.json create mode 100644 port_versions/l-/libuuid.json create mode 100644 port_versions/l-/libuv.json create mode 100644 port_versions/l-/libvmdk.json create mode 100644 port_versions/l-/libvorbis.json create mode 100644 port_versions/l-/libvpx.json create mode 100644 port_versions/l-/libwandio.json create mode 100644 port_versions/l-/libwebm.json create mode 100644 port_versions/l-/libwebp.json create mode 100644 port_versions/l-/libwebsockets.json create mode 100644 port_versions/l-/libxdiff.json create mode 100644 port_versions/l-/libxlsxwriter.json create mode 100644 port_versions/l-/libxml2.json create mode 100644 port_versions/l-/libxmlmm.json create mode 100644 port_versions/l-/libxmlpp.json create mode 100644 port_versions/l-/libxmp-lite.json create mode 100644 port_versions/l-/libxslt.json create mode 100644 port_versions/l-/libyaml.json create mode 100644 port_versions/l-/libyuv.json create mode 100644 port_versions/l-/libzen.json create mode 100644 port_versions/l-/libzip.json create mode 100644 port_versions/l-/libzippp.json create mode 100644 port_versions/l-/licensepp.json create mode 100644 port_versions/l-/lilv.json create mode 100644 port_versions/l-/linalg.json create mode 100644 port_versions/l-/linenoise-ng.json create mode 100644 port_versions/l-/live555.json create mode 100644 port_versions/l-/llgl.json create mode 100644 port_versions/l-/llvm.json create mode 100644 port_versions/l-/lmdb.json create mode 100644 port_versions/l-/lodepng.json create mode 100644 port_versions/l-/log4cplus.json create mode 100644 port_versions/l-/log4cpp.json create mode 100644 port_versions/l-/log4cxx.json create mode 100644 port_versions/l-/loguru.json create mode 100644 port_versions/l-/lpeg.json create mode 100644 port_versions/l-/lua.json create mode 100644 port_versions/l-/luabridge.json create mode 100644 port_versions/l-/luafilesystem.json create mode 100644 port_versions/l-/luajit.json create mode 100644 port_versions/l-/luasocket.json create mode 100644 port_versions/l-/lv2.json create mode 100644 port_versions/l-/lz4.json create mode 100644 port_versions/l-/lzfse.json create mode 100644 port_versions/l-/lzo.json create mode 100644 port_versions/l-/lzokay.json create mode 100644 port_versions/m-/magic-enum.json create mode 100644 port_versions/m-/magic-get.json create mode 100644 port_versions/m-/magnum-extras.json create mode 100644 port_versions/m-/magnum-integration.json create mode 100644 port_versions/m-/magnum-plugins.json create mode 100644 port_versions/m-/magnum.json create mode 100644 port_versions/m-/mapbox-variant.json create mode 100644 port_versions/m-/marble.json create mode 100644 port_versions/m-/marl.json create mode 100644 port_versions/m-/mathc.json create mode 100644 port_versions/m-/mathgl.json create mode 100644 port_versions/m-/matio.json create mode 100644 port_versions/m-/matplotlib-cpp.json create mode 100644 port_versions/m-/matroska.json create mode 100644 port_versions/m-/mbedtls.json create mode 100644 port_versions/m-/mcpp.json create mode 100644 port_versions/m-/mdns.json create mode 100644 port_versions/m-/mdnsresponder.json create mode 100644 port_versions/m-/mecab.json create mode 100644 port_versions/m-/memorymodule.json create mode 100644 port_versions/m-/mesa.json create mode 100644 port_versions/m-/meschach.json create mode 100644 port_versions/m-/meshoptimizer.json create mode 100644 port_versions/m-/metis.json create mode 100644 port_versions/m-/metrohash.json create mode 100644 port_versions/m-/mgnlibs.json create mode 100644 port_versions/m-/mhook.json create mode 100644 port_versions/m-/microsoft-signalr.json create mode 100644 port_versions/m-/mikktspace.json create mode 100644 port_versions/m-/milerius-sfml-imgui.json create mode 100644 port_versions/m-/mimalloc.json create mode 100644 port_versions/m-/minc.json create mode 100644 port_versions/m-/minhook.json create mode 100644 port_versions/m-/minifb.json create mode 100644 port_versions/m-/minimp3.json create mode 100644 port_versions/m-/minisat-master-keying.json create mode 100644 port_versions/m-/minitrace.json create mode 100644 port_versions/m-/miniupnpc.json create mode 100644 port_versions/m-/miniz.json create mode 100644 port_versions/m-/minizip.json create mode 100644 port_versions/m-/mio.json create mode 100644 port_versions/m-/mlpack.json create mode 100644 port_versions/m-/mman.json create mode 100644 port_versions/m-/mmloader.json create mode 100644 port_versions/m-/mmx.json create mode 100644 port_versions/m-/modp-base64.json create mode 100644 port_versions/m-/mongo-c-driver.json create mode 100644 port_versions/m-/mongo-cxx-driver.json create mode 100644 port_versions/m-/mongoose.json create mode 100644 port_versions/m-/monkeys-audio.json create mode 100644 port_versions/m-/moos-core.json create mode 100644 port_versions/m-/moos-essential.json create mode 100644 port_versions/m-/moos-ui.json create mode 100644 port_versions/m-/morton-nd.json create mode 100644 port_versions/m-/mosquitto.json create mode 100644 port_versions/m-/mozjpeg.json create mode 100644 port_versions/m-/mp-units.json create mode 100644 port_versions/m-/mp3lame.json create mode 100644 port_versions/m-/mpark-variant.json create mode 100644 port_versions/m-/mpfr.json create mode 100644 port_versions/m-/mpg123.json create mode 100644 port_versions/m-/mpi.json create mode 100644 port_versions/m-/mpir.json create mode 100644 port_versions/m-/mpmcqueue.json create mode 100644 port_versions/m-/mqtt-cpp.json create mode 100644 port_versions/m-/ms-angle.json create mode 100644 port_versions/m-/ms-gsl.json create mode 100644 port_versions/m-/msgpack.json create mode 100644 port_versions/m-/msgpack11.json create mode 100644 port_versions/m-/msinttypes.json create mode 100644 port_versions/m-/msix.json create mode 100644 port_versions/m-/msmpi.json create mode 100644 port_versions/m-/mstch.json create mode 100644 port_versions/m-/mujs.json create mode 100644 port_versions/m-/munit.json create mode 100644 port_versions/m-/muparser.json create mode 100644 port_versions/m-/murmurhash.json create mode 100644 port_versions/m-/mygui.json create mode 100644 port_versions/n-/nameof.json create mode 100644 port_versions/n-/nana.json create mode 100644 port_versions/n-/nano-signal-slot.json create mode 100644 port_versions/n-/nanobench.json create mode 100644 port_versions/n-/nanodbc.json create mode 100644 port_versions/n-/nanoflann.json create mode 100644 port_versions/n-/nanogui.json create mode 100644 port_versions/n-/nanomsg.json create mode 100644 port_versions/n-/nanopb.json create mode 100644 port_versions/n-/nanoprintf.json create mode 100644 port_versions/n-/nanorange.json create mode 100644 port_versions/n-/nanort.json create mode 100644 port_versions/n-/nanovg.json create mode 100644 port_versions/n-/nativefiledialog.json create mode 100644 port_versions/n-/nccl.json create mode 100644 port_versions/n-/neargye-semver.json create mode 100644 port_versions/n-/netcdf-c.json create mode 100644 port_versions/n-/netcdf-cxx4.json create mode 100644 port_versions/n-/nethost.json create mode 100644 port_versions/n-/nettle.json create mode 100644 port_versions/n-/networkdirect-sdk.json create mode 100644 port_versions/n-/nghttp2.json create mode 100644 port_versions/n-/ngspice.json create mode 100644 port_versions/n-/nifticlib.json create mode 100644 port_versions/n-/nlohmann-fifo-map.json create mode 100644 port_versions/n-/nlohmann-json.json create mode 100644 port_versions/n-/nlopt.json create mode 100644 port_versions/n-/nmap.json create mode 100644 port_versions/n-/nmslib.json create mode 100644 port_versions/n-/nng.json create mode 100644 port_versions/n-/nngpp.json create mode 100644 port_versions/n-/nonius.json create mode 100644 port_versions/n-/nowide.json create mode 100644 port_versions/n-/nrf-ble-driver.json create mode 100644 port_versions/n-/nt-wrapper.json create mode 100644 port_versions/n-/nuklear.json create mode 100644 port_versions/n-/numactl.json create mode 100644 port_versions/n-/numcpp.json create mode 100644 port_versions/n-/nuspell.json create mode 100644 port_versions/n-/nvtt.json create mode 100644 port_versions/o-/oatpp-consul.json create mode 100644 port_versions/o-/oatpp-curl.json create mode 100644 port_versions/o-/oatpp-libressl.json create mode 100644 port_versions/o-/oatpp-mbedtls.json create mode 100644 port_versions/o-/oatpp-mongo.json create mode 100644 port_versions/o-/oatpp-postgresql.json create mode 100644 port_versions/o-/oatpp-sqlite.json create mode 100644 port_versions/o-/oatpp-swagger.json create mode 100644 port_versions/o-/oatpp-websocket.json create mode 100644 port_versions/o-/oatpp-zlib.json create mode 100644 port_versions/o-/oatpp.json create mode 100644 port_versions/o-/observer-ptr-lite.json create mode 100644 port_versions/o-/ocilib.json create mode 100644 port_versions/o-/octomap.json create mode 100644 port_versions/o-/ode.json create mode 100644 port_versions/o-/offscale-libetcd-cpp.json create mode 100644 port_versions/o-/ogdf.json create mode 100644 port_versions/o-/ogre-next.json create mode 100644 port_versions/o-/ogre.json create mode 100644 port_versions/o-/ois.json create mode 100644 port_versions/o-/ompl.json create mode 100644 port_versions/o-/onednn.json create mode 100644 port_versions/o-/oniguruma.json create mode 100644 port_versions/o-/onnxruntime-gpu.json create mode 100644 port_versions/o-/open62541.json create mode 100644 port_versions/o-/openal-soft.json create mode 100644 port_versions/o-/openblas.json create mode 100644 port_versions/o-/opencascade.json create mode 100644 port_versions/o-/opencc.json create mode 100644 port_versions/o-/opencensus-cpp.json create mode 100644 port_versions/o-/opencl.json create mode 100644 port_versions/o-/opencolorio-tools.json create mode 100644 port_versions/o-/opencolorio.json create mode 100644 port_versions/o-/opencsg.json create mode 100644 port_versions/o-/opencv.json create mode 100644 port_versions/o-/opencv2.json create mode 100644 port_versions/o-/opencv3.json create mode 100644 port_versions/o-/opencv4.json create mode 100644 port_versions/o-/opendnp3.json create mode 100644 port_versions/o-/openexr.json create mode 100644 port_versions/o-/opengl-registry.json create mode 100644 port_versions/o-/opengl.json create mode 100644 port_versions/o-/openigtlink.json create mode 100644 port_versions/o-/openimageio.json create mode 100644 port_versions/o-/openjpeg.json create mode 100644 port_versions/o-/openmama.json create mode 100644 port_versions/o-/openmesh.json create mode 100644 port_versions/o-/openmpi.json create mode 100644 port_versions/o-/openmvg.json create mode 100644 port_versions/o-/openmvs.json create mode 100644 port_versions/o-/openni2.json create mode 100644 port_versions/o-/openscap.json create mode 100644 port_versions/o-/openssl-unix.json create mode 100644 port_versions/o-/openssl-uwp.json create mode 100644 port_versions/o-/openssl-windows.json create mode 100644 port_versions/o-/openssl.json create mode 100644 port_versions/o-/opensubdiv.json create mode 100644 port_versions/o-/opentracing.json create mode 100644 port_versions/o-/openvdb.json create mode 100644 port_versions/o-/openvpn3.json create mode 100644 port_versions/o-/openvr.json create mode 100644 port_versions/o-/openxr-loader.json create mode 100644 port_versions/o-/optional-bare.json create mode 100644 port_versions/o-/optional-lite.json create mode 100644 port_versions/o-/opus.json create mode 100644 port_versions/o-/opusfile.json create mode 100644 port_versions/o-/orc.json create mode 100644 port_versions/o-/orocos-kdl.json create mode 100644 port_versions/o-/osg-qt.json create mode 100644 port_versions/o-/osg.json create mode 100644 port_versions/o-/osgearth.json create mode 100644 port_versions/o-/osi.json create mode 100644 port_versions/o-/otl.json create mode 100644 port_versions/o-/outcome.json create mode 100644 port_versions/p-/p-ranav-csv.json create mode 100644 port_versions/p-/p-ranav-csv2.json create mode 100644 port_versions/p-/paho-mqtt.json create mode 100644 port_versions/p-/paho-mqttpp3.json create mode 100644 port_versions/p-/palsigslot.json create mode 100644 port_versions/p-/pango.json create mode 100644 port_versions/p-/pangolin.json create mode 100644 port_versions/p-/pangomm.json create mode 100644 port_versions/p-/parallel-hashmap.json create mode 100644 port_versions/p-/parallelstl.json create mode 100644 port_versions/p-/paraview.json create mode 100644 port_versions/p-/parmetis.json create mode 100644 port_versions/p-/parquet.json create mode 100644 port_versions/p-/parson.json create mode 100644 port_versions/p-/pbc.json create mode 100644 port_versions/p-/pcg.json create mode 100644 port_versions/p-/pcl.json create mode 100644 port_versions/p-/pcre.json create mode 100644 port_versions/p-/pcre2.json create mode 100644 port_versions/p-/pdal-c.json create mode 100644 port_versions/p-/pdal.json create mode 100644 port_versions/p-/pdcurses.json create mode 100644 port_versions/p-/pdqsort.json create mode 100644 port_versions/p-/pe-parse.json create mode 100644 port_versions/p-/pegtl-2.json create mode 100644 port_versions/p-/pegtl.json create mode 100644 port_versions/p-/pfring.json create mode 100644 port_versions/p-/pfultz2-linq.json create mode 100644 port_versions/p-/phnt.json create mode 100644 port_versions/p-/physfs.json create mode 100644 port_versions/p-/physx.json create mode 100644 port_versions/p-/picojson.json create mode 100644 port_versions/p-/picosha2.json create mode 100644 port_versions/p-/piex.json create mode 100644 port_versions/p-/pistache.json create mode 100644 port_versions/p-/pixel.json create mode 100644 port_versions/p-/pixman.json create mode 100644 port_versions/p-/platform-folders.json create mode 100644 port_versions/p-/plf-colony.json create mode 100644 port_versions/p-/plf-list.json create mode 100644 port_versions/p-/plf-nanotimer.json create mode 100644 port_versions/p-/plf-stack.json create mode 100644 port_versions/p-/plib.json create mode 100644 port_versions/p-/plibsys.json create mode 100644 port_versions/p-/plog.json create mode 100644 port_versions/p-/plplot.json create mode 100644 port_versions/p-/plustache.json create mode 100644 port_versions/p-/pmdk.json create mode 100644 port_versions/p-/pngpp.json create mode 100644 port_versions/p-/pngwriter.json create mode 100644 port_versions/p-/poco.json create mode 100644 port_versions/p-/podofo.json create mode 100644 port_versions/p-/poly2tri.json create mode 100644 port_versions/p-/polyclipping.json create mode 100644 port_versions/p-/polyhook2.json create mode 100644 port_versions/p-/polymorphic-value.json create mode 100644 port_versions/p-/ponder.json create mode 100644 port_versions/p-/poppler.json create mode 100644 port_versions/p-/portable-snippets.json create mode 100644 port_versions/p-/portaudio.json create mode 100644 port_versions/p-/portmidi.json create mode 100644 port_versions/p-/ppconsul.json create mode 100644 port_versions/p-/ppmagic.json create mode 100644 port_versions/p-/pprint.json create mode 100644 port_versions/p-/pqp.json create mode 100644 port_versions/p-/proj.json create mode 100644 port_versions/p-/proj4.json create mode 100644 port_versions/p-/prometheus-cpp.json create mode 100644 port_versions/p-/protobuf-c.json create mode 100644 port_versions/p-/protobuf.json create mode 100644 port_versions/p-/protopuf.json create mode 100644 port_versions/p-/protozero.json create mode 100644 port_versions/p-/proxygen.json create mode 100644 port_versions/p-/proxywrapper.json create mode 100644 port_versions/p-/ptex.json create mode 100644 port_versions/p-/pthread.json create mode 100644 port_versions/p-/pthreads.json create mode 100644 port_versions/p-/pugixml.json create mode 100644 port_versions/p-/pybind11.json create mode 100644 port_versions/p-/pystring.json create mode 100644 port_versions/p-/python2.json create mode 100644 port_versions/p-/python3.json create mode 100644 port_versions/q-/qca.json create mode 100644 port_versions/q-/qcustomplot.json create mode 100644 port_versions/q-/qhull.json create mode 100644 port_versions/q-/qpid-proton.json create mode 100644 port_versions/q-/qscintilla.json create mode 100644 port_versions/q-/qt-advanced-docking-system.json create mode 100644 port_versions/q-/qt5-3d.json create mode 100644 port_versions/q-/qt5-activeqt.json create mode 100644 port_versions/q-/qt5-androidextras.json create mode 100644 port_versions/q-/qt5-base.json create mode 100644 port_versions/q-/qt5-canvas3d.json create mode 100644 port_versions/q-/qt5-charts.json create mode 100644 port_versions/q-/qt5-connectivity.json create mode 100644 port_versions/q-/qt5-datavis3d.json create mode 100644 port_versions/q-/qt5-declarative.json create mode 100644 port_versions/q-/qt5-doc.json create mode 100644 port_versions/q-/qt5-gamepad.json create mode 100644 port_versions/q-/qt5-graphicaleffects.json create mode 100644 port_versions/q-/qt5-imageformats.json create mode 100644 port_versions/q-/qt5-location.json create mode 100644 port_versions/q-/qt5-macextras.json create mode 100644 port_versions/q-/qt5-modularscripts.json create mode 100644 port_versions/q-/qt5-mqtt.json create mode 100644 port_versions/q-/qt5-multimedia.json create mode 100644 port_versions/q-/qt5-networkauth.json create mode 100644 port_versions/q-/qt5-purchasing.json create mode 100644 port_versions/q-/qt5-quickcontrols.json create mode 100644 port_versions/q-/qt5-quickcontrols2.json create mode 100644 port_versions/q-/qt5-remoteobjects.json create mode 100644 port_versions/q-/qt5-script.json create mode 100644 port_versions/q-/qt5-scxml.json create mode 100644 port_versions/q-/qt5-sensors.json create mode 100644 port_versions/q-/qt5-serialbus.json create mode 100644 port_versions/q-/qt5-serialport.json create mode 100644 port_versions/q-/qt5-speech.json create mode 100644 port_versions/q-/qt5-svg.json create mode 100644 port_versions/q-/qt5-tools.json create mode 100644 port_versions/q-/qt5-translations.json create mode 100644 port_versions/q-/qt5-virtualkeyboard.json create mode 100644 port_versions/q-/qt5-wayland.json create mode 100644 port_versions/q-/qt5-webchannel.json create mode 100644 port_versions/q-/qt5-webengine.json create mode 100644 port_versions/q-/qt5-webglplugin.json create mode 100644 port_versions/q-/qt5-websockets.json create mode 100644 port_versions/q-/qt5-webview.json create mode 100644 port_versions/q-/qt5-winextras.json create mode 100644 port_versions/q-/qt5-x11extras.json create mode 100644 port_versions/q-/qt5-xmlpatterns.json create mode 100644 port_versions/q-/qt5.json create mode 100644 port_versions/q-/qtkeychain.json create mode 100644 port_versions/q-/quadtree.json create mode 100644 port_versions/q-/quantlib.json create mode 100644 port_versions/q-/quaternions.json create mode 100644 port_versions/q-/quazip.json create mode 100644 port_versions/q-/quickfast.json create mode 100644 port_versions/q-/quickfix.json create mode 100644 port_versions/q-/quill.json create mode 100644 port_versions/q-/quirc.json create mode 100644 port_versions/q-/qwt.json create mode 100644 port_versions/q-/qwtw.json create mode 100644 port_versions/r-/rabit.json create mode 100644 port_versions/r-/ragel.json create mode 100644 port_versions/r-/rang.json create mode 100644 port_versions/r-/range-v3-vs2015.json create mode 100644 port_versions/r-/range-v3.json create mode 100644 port_versions/r-/rapidcheck.json create mode 100644 port_versions/r-/rapidjson.json create mode 100644 port_versions/r-/rapidxml-ns.json create mode 100644 port_versions/r-/rapidxml.json create mode 100644 port_versions/r-/rappture.json create mode 100644 port_versions/r-/raylib.json create mode 100644 port_versions/r-/rbdl.json create mode 100644 port_versions/r-/re2.json create mode 100644 port_versions/r-/readerwriterqueue.json create mode 100644 port_versions/r-/readline-win32.json create mode 100644 port_versions/r-/readline.json create mode 100644 port_versions/r-/readosm.json create mode 100644 port_versions/r-/realsense2.json create mode 100644 port_versions/r-/recast.json create mode 100644 port_versions/r-/redis-plus-plus.json create mode 100644 port_versions/r-/refl-cpp.json create mode 100644 port_versions/r-/refprop-headers.json create mode 100644 port_versions/r-/replxx.json create mode 100644 port_versions/r-/reproc.json create mode 100644 port_versions/r-/rest-rpc.json create mode 100644 port_versions/r-/restbed.json create mode 100644 port_versions/r-/restclient-cpp.json create mode 100644 port_versions/r-/restinio.json create mode 100644 port_versions/r-/rhash.json create mode 100644 port_versions/r-/riffcpp.json create mode 100644 port_versions/r-/ring-span-lite.json create mode 100644 port_versions/r-/roaring.json create mode 100644 port_versions/r-/robin-hood-hashing.json create mode 100644 port_versions/r-/robin-map.json create mode 100644 port_versions/r-/rocksdb.json create mode 100644 port_versions/r-/rpclib.json create mode 100644 port_versions/r-/rply.json create mode 100644 port_versions/r-/rs-core-lib.json create mode 100644 port_versions/r-/rsocket.json create mode 100644 port_versions/r-/rtabmap.json create mode 100644 port_versions/r-/rtaudio.json create mode 100644 port_versions/r-/rtlsdr.json create mode 100644 port_versions/r-/rtmidi.json create mode 100644 port_versions/r-/rttr.json create mode 100644 port_versions/r-/rxcpp.json create mode 100644 port_versions/r-/rxqt.json create mode 100644 port_versions/r-/rxspencer.json create mode 100644 port_versions/r-/ryml.json create mode 100644 port_versions/r-/ryu.json create mode 100644 port_versions/s-/safeint.json create mode 100644 port_versions/s-/sail.json create mode 100644 port_versions/s-/sais.json create mode 100644 port_versions/s-/sajson.json create mode 100644 port_versions/s-/scintilla.json create mode 100644 port_versions/s-/sciter.json create mode 100644 port_versions/s-/scnlib.json create mode 100644 port_versions/s-/scylla-wrapper.json create mode 100644 port_versions/s-/sdformat10.json create mode 100644 port_versions/s-/sdformat6.json create mode 100644 port_versions/s-/sdformat9.json create mode 100644 port_versions/s-/sdl1-net.json create mode 100644 port_versions/s-/sdl1.json create mode 100644 port_versions/s-/sdl2-gfx.json create mode 100644 port_versions/s-/sdl2-image.json create mode 100644 port_versions/s-/sdl2-mixer.json create mode 100644 port_versions/s-/sdl2-net.json create mode 100644 port_versions/s-/sdl2-ttf.json create mode 100644 port_versions/s-/sdl2.json create mode 100644 port_versions/s-/sdl2pp.json create mode 100644 port_versions/s-/seal.json create mode 100644 port_versions/s-/secp256k1.json create mode 100644 port_versions/s-/selene.json create mode 100644 port_versions/s-/sentencepiece.json create mode 100644 port_versions/s-/sentry-native.json create mode 100644 port_versions/s-/septag-sx.json create mode 100644 port_versions/s-/seqan.json create mode 100644 port_versions/s-/serd.json create mode 100644 port_versions/s-/sf2cute.json create mode 100644 port_versions/s-/sfgui.json create mode 100644 port_versions/s-/sfml.json create mode 100644 port_versions/s-/sfsexp.json create mode 100644 port_versions/s-/shaderc.json create mode 100644 port_versions/s-/shaderwriter.json create mode 100644 port_versions/s-/shapelib.json create mode 100644 port_versions/s-/shiva-sfml.json create mode 100644 port_versions/s-/shiva.json create mode 100644 port_versions/s-/shogun.json create mode 100644 port_versions/s-/signalrclient.json create mode 100644 port_versions/s-/sigslot.json create mode 100644 port_versions/s-/simage.json create mode 100644 port_versions/s-/simde.json create mode 100644 port_versions/s-/simdjson.json create mode 100644 port_versions/s-/simple-fft.json create mode 100644 port_versions/s-/simpleini.json create mode 100644 port_versions/s-/skia.json create mode 100644 port_versions/s-/skyr-url.json create mode 100644 port_versions/s-/slikenet.json create mode 100644 port_versions/s-/sltbench.json create mode 100644 port_versions/s-/smpeg2.json create mode 100644 port_versions/s-/snappy.json create mode 100644 port_versions/s-/sndfile.json create mode 100644 port_versions/s-/snowhouse.json create mode 100644 port_versions/s-/so5extra.json create mode 100644 port_versions/s-/sobjectizer.json create mode 100644 port_versions/s-/soci.json create mode 100644 port_versions/s-/socket-io-client.json create mode 100644 port_versions/s-/sockpp.json create mode 100644 port_versions/s-/soem.json create mode 100644 port_versions/s-/soil.json create mode 100644 port_versions/s-/soil2.json create mode 100644 port_versions/s-/sokol.json create mode 100644 port_versions/s-/sol2.json create mode 100644 port_versions/s-/solid3.json create mode 100644 port_versions/s-/sophus.json create mode 100644 port_versions/s-/soqt.json create mode 100644 port_versions/s-/sord.json create mode 100644 port_versions/s-/soundtouch.json create mode 100644 port_versions/s-/soxr.json create mode 100644 port_versions/s-/spaceland.json create mode 100644 port_versions/s-/span-lite.json create mode 100644 port_versions/s-/sparsehash.json create mode 100644 port_versions/s-/sparsepp.json create mode 100644 port_versions/s-/spatialite-tools.json create mode 100644 port_versions/s-/spdk-dpdk.json create mode 100644 port_versions/s-/spdk-ipsec.json create mode 100644 port_versions/s-/spdk-isal.json create mode 100644 port_versions/s-/spdk.json create mode 100644 port_versions/s-/spdlog.json create mode 100644 port_versions/s-/spectra.json create mode 100644 port_versions/s-/speex.json create mode 100644 port_versions/s-/speexdsp.json create mode 100644 port_versions/s-/spirit-po.json create mode 100644 port_versions/s-/spirv-cross.json create mode 100644 port_versions/s-/spirv-headers.json create mode 100644 port_versions/s-/spirv-tools.json create mode 100644 port_versions/s-/sprout.json create mode 100644 port_versions/s-/spscqueue.json create mode 100644 port_versions/s-/sqlcipher.json create mode 100644 port_versions/s-/sqlite-modern-cpp.json create mode 100644 port_versions/s-/sqlite-orm.json create mode 100644 port_versions/s-/sqlite3.json create mode 100644 port_versions/s-/sqlitecpp.json create mode 100644 port_versions/s-/sqlpp11-connector-mysql.json create mode 100644 port_versions/s-/sqlpp11-connector-sqlite3.json create mode 100644 port_versions/s-/sqlpp11.json create mode 100644 port_versions/s-/sratom.json create mode 100644 port_versions/s-/status-value-lite.json create mode 100644 port_versions/s-/stb.json create mode 100644 port_versions/s-/stlab.json create mode 100644 port_versions/s-/stormlib.json create mode 100644 port_versions/s-/strict-variant.json create mode 100644 port_versions/s-/string-theory.json create mode 100644 port_versions/s-/string-view-lite.json create mode 100644 port_versions/s-/strtk.json create mode 100644 port_versions/s-/stx.json create mode 100644 port_versions/s-/stxxl.json create mode 100644 port_versions/s-/suitesparse.json create mode 100644 port_versions/s-/sundials.json create mode 100644 port_versions/s-/superlu.json create mode 100644 port_versions/s-/symengine.json create mode 100644 port_versions/s-/systemc.json create mode 100644 port_versions/s-/szip.json create mode 100644 port_versions/t-/tabulate.json create mode 100644 port_versions/t-/tacopie.json create mode 100644 port_versions/t-/taglib.json create mode 100644 port_versions/t-/taocpp-json.json create mode 100644 port_versions/t-/tap-windows6.json create mode 100644 port_versions/t-/taskflow.json create mode 100644 port_versions/t-/tbb.json create mode 100644 port_versions/t-/tcl.json create mode 100644 port_versions/t-/tclap.json create mode 100644 port_versions/t-/teemo.json create mode 100644 port_versions/t-/telnetpp.json create mode 100644 port_versions/t-/tensorflow-cc.json create mode 100644 port_versions/t-/tensorflow-common.json create mode 100644 port_versions/t-/tensorflow.json create mode 100644 port_versions/t-/termcolor.json create mode 100644 port_versions/t-/tesseract.json create mode 100644 port_versions/t-/tfhe.json create mode 100644 port_versions/t-/tgbot-cpp.json create mode 100644 port_versions/t-/tgc.json create mode 100644 port_versions/t-/tgui.json create mode 100644 port_versions/t-/theia.json create mode 100644 port_versions/t-/think-cell-range.json create mode 100644 port_versions/t-/thor.json create mode 100644 port_versions/t-/threadpool.json create mode 100644 port_versions/t-/thrift.json create mode 100644 port_versions/t-/tidy-html5.json create mode 100644 port_versions/t-/tiff.json create mode 100644 port_versions/t-/tinkerforge.json create mode 100644 port_versions/t-/tiny-aes-c.json create mode 100644 port_versions/t-/tiny-bignum-c.json create mode 100644 port_versions/t-/tiny-dnn.json create mode 100644 port_versions/t-/tiny-process-library.json create mode 100644 port_versions/t-/tiny-regex-c.json create mode 100644 port_versions/t-/tinycthread.json create mode 100644 port_versions/t-/tinydir.json create mode 100644 port_versions/t-/tinyexif.json create mode 100644 port_versions/t-/tinyexpr.json create mode 100644 port_versions/t-/tinyexr.json create mode 100644 port_versions/t-/tinyfiledialogs.json create mode 100644 port_versions/t-/tinygltf.json create mode 100644 port_versions/t-/tinynpy.json create mode 100644 port_versions/t-/tinyobjloader.json create mode 100644 port_versions/t-/tinyply.json create mode 100644 port_versions/t-/tinyspline.json create mode 100644 port_versions/t-/tinythread.json create mode 100644 port_versions/t-/tinytoml.json create mode 100644 port_versions/t-/tinyutf8.json create mode 100644 port_versions/t-/tinyxml.json create mode 100644 port_versions/t-/tinyxml2.json create mode 100644 port_versions/t-/tl-expected.json create mode 100644 port_versions/t-/tl-function-ref.json create mode 100644 port_versions/t-/tl-optional.json create mode 100644 port_versions/t-/tlx.json create mode 100644 port_versions/t-/tmx.json create mode 100644 port_versions/t-/tmxlite.json create mode 100644 port_versions/t-/tmxparser.json create mode 100644 port_versions/t-/toml11.json create mode 100644 port_versions/t-/tomlplusplus.json create mode 100644 port_versions/t-/tool-meson.json create mode 100644 port_versions/t-/torch-th.json create mode 100644 port_versions/t-/trantor.json create mode 100644 port_versions/t-/tre.json create mode 100644 port_versions/t-/treehopper.json create mode 100644 port_versions/t-/triangle.json create mode 100644 port_versions/t-/trompeloeil.json create mode 100644 port_versions/t-/tsl-hopscotch-map.json create mode 100644 port_versions/t-/tsl-ordered-map.json create mode 100644 port_versions/t-/tsl-sparse-map.json create mode 100644 port_versions/t-/turbobase64.json create mode 100644 port_versions/t-/tweeny.json create mode 100644 port_versions/t-/type-lite.json create mode 100644 port_versions/t-/type-safe.json create mode 100644 port_versions/u-/uchardet.json create mode 100644 port_versions/u-/umock-c.json create mode 100644 port_versions/u-/unicorn-lib.json create mode 100644 port_versions/u-/unicorn.json create mode 100644 port_versions/u-/units.json create mode 100644 port_versions/u-/unittest-cpp.json create mode 100644 port_versions/u-/unixodbc.json create mode 100644 port_versions/u-/unqlite.json create mode 100644 port_versions/u-/unrar.json create mode 100644 port_versions/u-/upb.json create mode 100644 port_versions/u-/urdfdom-headers.json create mode 100644 port_versions/u-/urdfdom.json create mode 100644 port_versions/u-/uriparser.json create mode 100644 port_versions/u-/usbmuxd.json create mode 100644 port_versions/u-/usd.json create mode 100644 port_versions/u-/usockets.json create mode 100644 port_versions/u-/usrsctp.json create mode 100644 port_versions/u-/utf8h.json create mode 100644 port_versions/u-/utf8proc.json create mode 100644 port_versions/u-/utfcpp.json create mode 100644 port_versions/u-/utfz.json create mode 100644 port_versions/u-/uthenticode.json create mode 100644 port_versions/u-/uvatlas.json create mode 100644 port_versions/u-/uvw.json create mode 100644 port_versions/u-/uwebsockets.json create mode 100644 port_versions/v-/v-hacd.json create mode 100644 port_versions/v-/v8.json create mode 100644 port_versions/v-/valijson.json create mode 100644 port_versions/v-/value-ptr-lite.json create mode 100644 port_versions/v-/variant-lite.json create mode 100644 port_versions/v-/vc.json create mode 100644 port_versions/v-/vcglib.json create mode 100644 port_versions/v-/vcpkg-gfortran.json create mode 100644 port_versions/v-/vectorclass.json create mode 100644 port_versions/v-/visit-struct.json create mode 100644 port_versions/v-/vlfeat.json create mode 100644 port_versions/v-/vlpp.json create mode 100644 port_versions/v-/volk.json create mode 100644 port_versions/v-/vs-yasm.json create mode 100644 port_versions/v-/vtk-dicom.json create mode 100644 port_versions/v-/vtk-m.json create mode 100644 port_versions/v-/vtk.json create mode 100644 port_versions/v-/vulkan-headers.json create mode 100644 port_versions/v-/vulkan-hpp.json create mode 100644 port_versions/v-/vulkan-memory-allocator.json create mode 100644 port_versions/v-/vulkan.json create mode 100644 port_versions/v-/vxl.json create mode 100644 port_versions/w-/wampcc.json create mode 100644 port_versions/w-/wangle.json create mode 100644 port_versions/w-/wavelib.json create mode 100644 port_versions/w-/wavpack.json create mode 100644 port_versions/w-/websocketpp.json create mode 100644 port_versions/w-/wepoll.json create mode 100644 port_versions/w-/wg21-sg14.json create mode 100644 port_versions/w-/wil.json create mode 100644 port_versions/w-/wildmidi.json create mode 100644 port_versions/w-/wincrypt.json create mode 100644 port_versions/w-/winpcap.json create mode 100644 port_versions/w-/winreg.json create mode 100644 port_versions/w-/winsock2.json create mode 100644 port_versions/w-/wintoast.json create mode 100644 port_versions/w-/woff2.json create mode 100644 port_versions/w-/wordnet.json create mode 100644 port_versions/w-/wpilib.json create mode 100644 port_versions/w-/wren.json create mode 100644 port_versions/w-/wt.json create mode 100644 port_versions/w-/wtl.json create mode 100644 port_versions/w-/wxchartdir.json create mode 100644 port_versions/w-/wxwidgets.json create mode 100644 port_versions/x-/x-plane.json create mode 100644 port_versions/x-/x264.json create mode 100644 port_versions/x-/x265.json create mode 100644 port_versions/x-/xalan-c.json create mode 100644 port_versions/x-/xbyak.json create mode 100644 port_versions/x-/xerces-c.json create mode 100644 port_versions/x-/xeus.json create mode 100644 port_versions/x-/xframe.json create mode 100644 port_versions/x-/xlnt.json create mode 100644 port_versions/x-/xmlsec.json create mode 100644 port_versions/x-/xmsh.json create mode 100644 port_versions/x-/xorstr.json create mode 100644 port_versions/x-/xproperty.json create mode 100644 port_versions/x-/xsimd.json create mode 100644 port_versions/x-/xtensor-blas.json create mode 100644 port_versions/x-/xtensor-fftw.json create mode 100644 port_versions/x-/xtensor-io.json create mode 100644 port_versions/x-/xtensor.json create mode 100644 port_versions/x-/xtl.json create mode 100644 port_versions/x-/xxhash.json create mode 100644 port_versions/y-/yajl.json create mode 100644 port_versions/y-/yaml-cpp.json create mode 100644 port_versions/y-/yara.json create mode 100644 port_versions/y-/yas.json create mode 100644 port_versions/y-/yasm-tool-helper.json create mode 100644 port_versions/y-/yasm-tool.json create mode 100644 port_versions/y-/yasm.json create mode 100644 port_versions/y-/yato.json create mode 100644 port_versions/y-/yoga.json create mode 100644 port_versions/z-/z3.json create mode 100644 port_versions/z-/z85.json create mode 100644 port_versions/z-/zeromq.json create mode 100644 port_versions/z-/zfp.json create mode 100644 port_versions/z-/zkpp.json create mode 100644 port_versions/z-/zlib.json create mode 100644 port_versions/z-/zookeeper.json create mode 100644 port_versions/z-/zopfli.json create mode 100644 port_versions/z-/zserge-webview.json create mode 100644 port_versions/z-/zstd.json create mode 100644 port_versions/z-/zstr.json create mode 100644 port_versions/z-/zxing-cpp.json create mode 100644 port_versions/z-/zydis.json create mode 100644 port_versions/z-/zyre.json create mode 100644 port_versions/z-/zziplib.json diff --git a/.gitignore b/.gitignore index d12fd1363f3bab..ed388f4a1c7a48 100644 --- a/.gitignore +++ b/.gitignore @@ -295,8 +295,6 @@ __pycache__/ /toolsrc/windows-bootstrap/msbuild.x86.release/ /toolsrc/windows-bootstrap/msbuild.x64.debug/ /toolsrc/windows-bootstrap/msbuild.x64.release/ -#ignore db -/port_versions/ #ignore custom triplets /triplets/* #add vcpkg-designed triplets back in diff --git a/port_versions/3-/3fd.json b/port_versions/3-/3fd.json new file mode 100644 index 00000000000000..d10496a29adb41 --- /dev/null +++ b/port_versions/3-/3fd.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "73ad3c823ef701c37421b450a34271d6beaf7b07", + "version-string": "2.6.3", + "port-version": 0 + }, + { + "git-tree": "70ed3ae824a2f31ed56b6c6105232bfe2aebe43e", + "version-string": "2.6.2", + "port-version": 3 + }, + { + "git-tree": "abd29087cbcde4a7416618fea70094c09fa16c37", + "version-string": "2.6.2-3", + "port-version": 0 + }, + { + "git-tree": "963060040c3ca463d17136e39c7317efb15eb6a5", + "version-string": "2.6.2-2", + "port-version": 0 + }, + { + "git-tree": "548c90710d59c174aa9ab10a24deb69f1d75ff8f", + "version-string": "2.6.2-1", + "port-version": 0 + }, + { + "git-tree": "67d60699c271b7716279fdea5a5c6543929eb90e", + "version-string": "2.6.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/7-/7zip.json b/port_versions/7-/7zip.json new file mode 100644 index 00000000000000..075175c5d053a7 --- /dev/null +++ b/port_versions/7-/7zip.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "64b14288536f6e4de77972a54ebf5277780ce222", + "version-string": "19.00", + "port-version": 2 + }, + { + "git-tree": "40d15a494f1cc001c6150ced483f21acc037ce9d", + "version-string": "19.00", + "port-version": 1 + }, + { + "git-tree": "85736d9cce870e956f244b78cf384be7afb18f0f", + "version-string": "19.00", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/abseil.json b/port_versions/a-/abseil.json new file mode 100644 index 00000000000000..9c4938698f00ba --- /dev/null +++ b/port_versions/a-/abseil.json @@ -0,0 +1,294 @@ +{ + "versions": [ + { + "git-tree": "3d9d65e41e314658c5e18839117ebf7f060b9cb7", + "version-string": "2020-09-23", + "port-version": 1 + }, + { + "git-tree": "4258e2e692cb3ee0ab68eb253ee8df5296fcc206", + "version-string": "2020-09-23", + "port-version": 0 + }, + { + "git-tree": "0d4dfbea87f5b8903a5db5ed3ed6851b6e6a3a79", + "version-string": "2020-03-03", + "port-version": 8 + }, + { + "git-tree": "28fa609b06eec70bb06e61891e94b94f35f7d06e", + "version-string": "2020-03-03", + "port-version": 7 + }, + { + "git-tree": "606b9214364983e5df021d0556dbec5e44f4b0a8", + "version-string": "2020-03-03-7", + "port-version": 0 + }, + { + "git-tree": "1f8a41353506f308128d9818ce82afefa8f5cbaa", + "version-string": "2020-03-03-6", + "port-version": 0 + }, + { + "git-tree": "f12f0fd203075e10e997740f9a859ff2afb8aef9", + "version-string": "2020-03-03-5", + "port-version": 0 + }, + { + "git-tree": "d87b9a5227dc88a046586fad46bdb087c8ee4a8a", + "version-string": "2020-03-03-4", + "port-version": 0 + }, + { + "git-tree": "574159a94de7e13a16df672d7694747d15b51b6e", + "version-string": "2020-03-03-3", + "port-version": 0 + }, + { + "git-tree": "83c70111363fd72030199cd4746febd5a3deb86b", + "version-string": "2020-03-03-2", + "port-version": 0 + }, + { + "git-tree": "3fe1459a1ed06573700901f46c55b8515125bcc8", + "version-string": "2020-03-03-1", + "port-version": 0 + }, + { + "git-tree": "cb05f05a1ee7fcc5b545e23387c0e97904181a45", + "version-string": "2020-03-03", + "port-version": 0 + }, + { + "git-tree": "42821eb6795ede2674126dd8a63a8270d625fb71", + "version-string": "2019-12-19", + "port-version": 0 + }, + { + "git-tree": "67ffa71966b97cce9af682a6ab313077e9e8fdec", + "version-string": "2019-05-08-1", + "port-version": 0 + }, + { + "git-tree": "b47a07ae7d4bf6245622289ad4f61d8378d4b4d4", + "version-string": "2019-05-08", + "port-version": 0 + }, + { + "git-tree": "219eed8e70aba774359db6a7305da67f5c37286c", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "1290314a9cc3848d55f78ba479a1e8010c3575c1", + "version-string": "2019-04-19-1", + "port-version": 0 + }, + { + "git-tree": "f4ab7cf4b0d4c7936dd92670bc80d1da7935754d", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "d1c95bdf0be59c5169d4585159c3ede6cdd0f648", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "0ec930976860b806e67ccd7e317f3409e7312d31", + "version-string": "2019_01_30-1", + "port-version": 0 + }, + { + "git-tree": "474e0d01ab4f28129b27d8bb206a12f0b6083cf6", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "b1dc60998cf959863511719bb8f652415b0c3616", + "version-string": "2019-01-09-1", + "port-version": 0 + }, + { + "git-tree": "c72de9332fdffd942d9f8faab0d467b4b7a4517d", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "a486c9d12f167abdf62e82705f8de0c1d6800b86", + "version-string": "2018-11-08-1", + "port-version": 0 + }, + { + "git-tree": "6e5c38debfc9ba9095f7b541c4004bc6d91dfb53", + "version-string": "2018-11-08", + "port-version": 0 + }, + { + "git-tree": "6a7a573563cfb875a1cb6d14ff7a256949206d26", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "340bbf898c959ea9873328e54dd4f6243b9f6101", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "e58db76030f30c070b6682ceaab92bce107b689c", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "389bc4ecb350878ce52467d94de8f15d3faa2465", + "version-string": "2018-09-18-3", + "port-version": 0 + }, + { + "git-tree": "9014f0fed8d78a07f17f0f31ff979cbc978b455b", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "b5fb3ddc7aedb015cce6001f91eada613d5c12f2", + "version-string": "2018-08-03", + "port-version": 0 + }, + { + "git-tree": "918f4b2105b2b2804e3037eb8cb9ec78442373bd", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "f1574d6d5ac00c0eb3c841705c8309e9299ea09a", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "ed2c2706442eae786013ac1e96aa1c305e472f0d", + "version-string": "2018-07-03", + "port-version": 0 + }, + { + "git-tree": "87deb0db1be83281dfa8bdda25d0682039797e3e", + "version-string": "2018-07-01", + "port-version": 0 + }, + { + "git-tree": "efdfc3d7e6bb0ea93b9ab714d428e328cd387e00", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "221188807a3daefbdd47860678e3d694a75881f6", + "version-string": "2018-06-12-1", + "port-version": 0 + }, + { + "git-tree": "efe7369a1c9660b854d72fbfc236a7c7853160f9", + "version-string": "2018-05-01-1", + "port-version": 0 + }, + { + "git-tree": "86be3d78ea2cda31298e855723eeabc1e01956d8", + "version-string": "2018-04-25-1", + "port-version": 0 + }, + { + "git-tree": "8542937b2ad319fac2b555dff1db37158efe0f9d", + "version-string": "2018-04-12", + "port-version": 0 + }, + { + "git-tree": "cfbabf336133d3277c875863885aeb21bbe94672", + "version-string": "2018-04-09", + "port-version": 0 + }, + { + "git-tree": "fe36a137929999662114548bb9cb805300f9f7f4", + "version-string": "2018-04-05", + "port-version": 0 + }, + { + "git-tree": "8271c3e6bb3cd27ffffff70d044dedeadcabce5e", + "version-string": "2018-04-02", + "port-version": 0 + }, + { + "git-tree": "9b7bd36ba59ae3d43ec88e8f31bccb3820147d90", + "version-string": "2018-03-29", + "port-version": 0 + }, + { + "git-tree": "fe36d92dbdc2c773ee0808305af8bb04c7f7e1ae", + "version-string": "2018-03-27", + "port-version": 0 + }, + { + "git-tree": "f9206e416a8f76f9cfdcb34e18ebdc6364a68e09", + "version-string": "2018-03-23", + "port-version": 0 + }, + { + "git-tree": "d974de4bf17feeff3b1dd02938ce71c4faa0dae5", + "version-string": "2018-03-20", + "port-version": 0 + }, + { + "git-tree": "9c62ecef7e2c6fd477828349bd479ff8ae7829ff", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "68068406842e8cadd24cec3d4fa92e4a4c5a1762", + "version-string": "2018-03-14", + "port-version": 0 + }, + { + "git-tree": "4c47db1ff8f8cc3667f50479330149ce74fd51ea", + "version-string": "2018-03-13", + "port-version": 0 + }, + { + "git-tree": "8171362241e62f412834c7bb2a8f32645479f3a2", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "ad7f8d103d0150e9f0d26a8b15d3d254366dcf99", + "version-string": "2018-03-02", + "port-version": 0 + }, + { + "git-tree": "f937714f50ad98cbfe320864d1f91aaba042ba43", + "version-string": "2018-2-23", + "port-version": 0 + }, + { + "git-tree": "21c19b70eb5a2e072cbbc143834a70210ed2f60f", + "version-string": "2018-2-5", + "port-version": 0 + }, + { + "git-tree": "6c87b15fce15d6781c993ce619fa1cd8ca34cb6e", + "version-string": "2017-11-10-1", + "port-version": 0 + }, + { + "git-tree": "76598c99218db15f5e300e26ec75e29e8c4b8e10", + "version-string": "2017-11-10", + "port-version": 0 + }, + { + "git-tree": "84bd3ac433569058fe7e58defc219e939917daab", + "version-string": "2017-10-14", + "port-version": 0 + }, + { + "git-tree": "01ef56b603dac7b3e3bbefac09df439e2d159219", + "version-string": "2017-09-28", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/absent.json b/port_versions/a-/absent.json new file mode 100644 index 00000000000000..9ff4e862c7b717 --- /dev/null +++ b/port_versions/a-/absent.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "872663f3498a2b8f0a6d0e0503c4c2838438b42d", + "version-string": "0.3.1", + "port-version": 0 + }, + { + "git-tree": "547cd60c3353637f8124cc2a2f4c8c1f82c3b216", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/ace.json b/port_versions/a-/ace.json new file mode 100644 index 00000000000000..6089ae49226fe8 --- /dev/null +++ b/port_versions/a-/ace.json @@ -0,0 +1,169 @@ +{ + "versions": [ + { + "git-tree": "8b23f37d4b1c965115ae6fbe79686605997fe659", + "version-string": "6.5.12", + "port-version": 1 + }, + { + "git-tree": "3ec027b385329149d469f4425ece1c448170927b", + "version-string": "6.5.12", + "port-version": 0 + }, + { + "git-tree": "9b700b928b55baac62dc2f808ba366fc065ea085", + "version-string": "6.5.11", + "port-version": 0 + }, + { + "git-tree": "b46a375bbc0f75a69943381ffdfcd715596a4fae", + "version-string": "6.5.10", + "port-version": 0 + }, + { + "git-tree": "012391958fe8d6dae00b0ea5a3bb8ea74f2fba85", + "version-string": "6.5.9-5", + "port-version": 0 + }, + { + "git-tree": "31f1639de02c65ddfe0dc41dee23dd2f7efd9c6f", + "version-string": "6.5.9-4", + "port-version": 0 + }, + { + "git-tree": "4c5ea2580f2bc59411d4b471f18a4670565e60ef", + "version-string": "6.5.9-3", + "port-version": 0 + }, + { + "git-tree": "fffc7828cdb75b3bdaac0c2565f8342f210a1f65", + "version-string": "6.5.9-2", + "port-version": 0 + }, + { + "git-tree": "6de81bc1ec54191accc6d2d88a804eeff228f085", + "version-string": "6.5.9-1", + "port-version": 0 + }, + { + "git-tree": "5a2c4cff39253124f54b94cae24b3a0b59e42092", + "version-string": "6.5.9", + "port-version": 0 + }, + { + "git-tree": "ec3d4336726ef2438b0c6f8995827d60380ce55c", + "version-string": "6.5.8-1", + "port-version": 0 + }, + { + "git-tree": "e32b36ec3da04f9a3e0bc4afc7aa888be3346787", + "version-string": "6.5.8", + "port-version": 0 + }, + { + "git-tree": "dc23482187fda6854e6893d9ebf6aa2bded873dc", + "version-string": "6.5.7-1", + "port-version": 0 + }, + { + "git-tree": "08d3e2a110c4bbec49243d1ec0e6a6101a823f84", + "version-string": "6.5.7", + "port-version": 0 + }, + { + "git-tree": "a4ea954de4af8ebe3adfadc9dcb5dfcfa82a0b51", + "version-string": "6.5.6", + "port-version": 0 + }, + { + "git-tree": "ef0d308766c81587020090166f0c76178ebda2da", + "version-string": "6.5.5-1", + "port-version": 0 + }, + { + "git-tree": "46b028f234eeddb808c0a870bc3002f03745d740", + "version-string": "6.5.5", + "port-version": 0 + }, + { + "git-tree": "57b537f14ea8f6257f7cb13633a57d1338c9e7c8", + "version-string": "6.5.4-3", + "port-version": 0 + }, + { + "git-tree": "8f66b7308ead7caee78459a54b2e856597e5f36c", + "version-string": "6.5.4-2", + "port-version": 0 + }, + { + "git-tree": "670773498c9568c9e3607eb9890b630524692136", + "version-string": "6.5.4-1", + "port-version": 0 + }, + { + "git-tree": "937c1bc48daca299b8569669ffe9b5e56bd01077", + "version-string": "6.5.4", + "port-version": 0 + }, + { + "git-tree": "33579fee5a02f1e46b1644a63594cfca3b6b205e", + "version-string": "6.5.3", + "port-version": 0 + }, + { + "git-tree": "313520797b6ca7af4651b4e10b28a6a3660e3b66", + "version-string": "6.5.2", + "port-version": 0 + }, + { + "git-tree": "f953ba30fe110708ac69e32a95b9a070cdb00a27", + "version-string": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "cbf8d6ec29760d00f3eb3fb018e2384cf53c5b27", + "version-string": "6.5.0", + "port-version": 0 + }, + { + "git-tree": "7267b96c7f7828997a37cda85a3e4356e0314b15", + "version-string": "6.4.8", + "port-version": 0 + }, + { + "git-tree": "4c1478889623de771a7382e6a497c2406f781161", + "version-string": "6.4.7", + "port-version": 0 + }, + { + "git-tree": "e390406693383b179cb83feb0e6c7ca430233286", + "version-string": "6.4.6", + "port-version": 0 + }, + { + "git-tree": "e97361d3b4fe96846a1f2e46b95e62d731192a36", + "version-string": "6.4.5", + "port-version": 0 + }, + { + "git-tree": "3eda18a0204a25e9269a69c60f7980e7710eef74", + "version-string": "6.4.4", + "port-version": 0 + }, + { + "git-tree": "d4286f1a52e8dfe240663e97d0c70f18597f2515", + "version-string": "6.4.3", + "port-version": 0 + }, + { + "git-tree": "ee618e8a429a56b4ae412bd43bab859a8592294f", + "version-string": "6.4.2", + "port-version": 0 + }, + { + "git-tree": "cbfc33d5980b991b984c2877a2c39fbcaca40c6f", + "version-string": "6.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/activemq-cpp.json b/port_versions/a-/activemq-cpp.json new file mode 100644 index 00000000000000..57e4db6478cf2d --- /dev/null +++ b/port_versions/a-/activemq-cpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "edc82536f9d433e0f473a11a534b1e443e9ea3f4", + "version-string": "3.9.5-3", + "port-version": 0 + }, + { + "git-tree": "a00bfbcafac2b0c183530c0cd0ed9e399bf2889c", + "version-string": "3.9.5-2", + "port-version": 0 + }, + { + "git-tree": "06fc338f511f5f31eb5e823bb7de4db82a32ba5e", + "version-string": "3.9.5-1", + "port-version": 0 + }, + { + "git-tree": "492c064ceb9259a0299ab04df98e0ea8efe35725", + "version-string": "3.9.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/ade.json b/port_versions/a-/ade.json new file mode 100644 index 00000000000000..be6e3c310a1aa2 --- /dev/null +++ b/port_versions/a-/ade.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e767fb59fbab737caf770f1aec618a17b503c321", + "version-string": "0.1.1f", + "port-version": 0 + }, + { + "git-tree": "c03d856ae43b5442e4b5b5e90068832b29e46aa7", + "version-string": "0.1.1e", + "port-version": 0 + }, + { + "git-tree": "85edf1c81b1a1127728e98c1b408a36f021877a3", + "version-string": "0.1.1d", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/aixlog.json b/port_versions/a-/aixlog.json new file mode 100644 index 00000000000000..ce2a415ade78b8 --- /dev/null +++ b/port_versions/a-/aixlog.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "b75ca5f2a37de51c0e0b369a124fb0ae5a05d323", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "f9146c4e4e54b27fc70131dc02b4ccc8f215c56e", + "version-string": "1.2.4", + "port-version": 0 + }, + { + "git-tree": "d5ee8c1580e08da8872ca3725845cb93b0bdd251", + "version-string": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "cf91ab61a055e89e263e0de41e6da25a968e7904", + "version-string": "1.2.1-1", + "port-version": 0 + }, + { + "git-tree": "4169bbdf0aca9ef1f6f2f7552e45e308a25f29d7", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/akali.json b/port_versions/a-/akali.json new file mode 100644 index 00000000000000..bc9b4339fea7e3 --- /dev/null +++ b/port_versions/a-/akali.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "29f022ed905404ee53af3197de0f01afb22c15dd", + "version-string": "1.42", + "port-version": 1 + }, + { + "git-tree": "853f2563be7dfce5e0d8cd341b6d7bb0bc168dc3", + "version-string": "1.42", + "port-version": 0 + }, + { + "git-tree": "1ad229b03a2a137effc57a038a0483d0bcf923b2", + "version-string": "1.41", + "port-version": 1 + }, + { + "git-tree": "0308674259f709ce412a0a960fd014cffecdfd08", + "version-string": "1.41", + "port-version": 0 + }, + { + "git-tree": "4234ffec7e9a98ba5950636e8930c29b52f4e03d", + "version-string": "1.39", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/alac-decoder.json b/port_versions/a-/alac-decoder.json new file mode 100644 index 00000000000000..48110f6f97a1fb --- /dev/null +++ b/port_versions/a-/alac-decoder.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "1ad081bc124fafdd099eca78f1a7f9a0ea99cc61", + "version-string": "0.2", + "port-version": 4 + }, + { + "git-tree": "b9b65f791964c956a1fa9b5a948c09efdfa6ceb5", + "version-string": "0.2-3", + "port-version": 0 + }, + { + "git-tree": "f4ec04b6d879e15cd93cc25270989e36e7e95d14", + "version-string": "0.2-1", + "port-version": 0 + }, + { + "git-tree": "86b3b9d0796b7ee5fabb737fd6802aa76b6c5adc", + "version-string": "0.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/alac.json b/port_versions/a-/alac.json new file mode 100644 index 00000000000000..ea974a8e3c1e51 --- /dev/null +++ b/port_versions/a-/alac.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "2a3cdc11a3c1cdcfc947dfd0f3fa18c40e4091b6", + "version-string": "2017-11-03-c38887c5-1", + "port-version": 0 + }, + { + "git-tree": "20da8404615cb13666efac35d2187d3c73ee3eb0", + "version-string": "2017-11-03-c38887c5", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/alembic.json b/port_versions/a-/alembic.json new file mode 100644 index 00000000000000..c35cbf3e85e648 --- /dev/null +++ b/port_versions/a-/alembic.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "41cf27d8f6792056c456e4640f20f13a016db205", + "version-string": "1.7.16", + "port-version": 0 + }, + { + "git-tree": "f08ae63294c12debee9b5b6f0e1dfc54fb56b023", + "version-string": "1.7.15", + "port-version": 0 + }, + { + "git-tree": "6f7aff420c086cead0dfc14409393d614fe3cfb2", + "version-string": "1.7.13", + "port-version": 1 + }, + { + "git-tree": "3d9b782158bdfe5148bbf86c53fecaff6bb8671f", + "version-string": "1.7.13", + "port-version": 0 + }, + { + "git-tree": "86a501ebd47e6eb4d809d9310bf6525f59e2d555", + "version-string": "1.7.12", + "port-version": 2 + }, + { + "git-tree": "c8ba9dbbcf4ebff8fc86253f361eb3f01d51613f", + "version-string": "1.7.12-1", + "port-version": 0 + }, + { + "git-tree": "bc2cd117c898e2385afdf00dd3cef8aaf25fcb46", + "version-string": "1.7.12", + "port-version": 0 + }, + { + "git-tree": "0a82b1d59bd85a0d2e46e5688ac5bddf7b5abcae", + "version-string": "1.7.11-6", + "port-version": 0 + }, + { + "git-tree": "16238952f8ea025df971839c2009cd49a0a3fac9", + "version-string": "1.7.11-5", + "port-version": 0 + }, + { + "git-tree": "4bb5f9ced085059ea62e03fa39efaca0fbea4247", + "version-string": "1.7.11-4", + "port-version": 0 + }, + { + "git-tree": "206e194854b1a72bccf94677aa673a0a4730f320", + "version-string": "1.7.11-3", + "port-version": 0 + }, + { + "git-tree": "85399a4537af6b4110360a7027afe6d1a86df9df", + "version-string": "1.7.11-2", + "port-version": 0 + }, + { + "git-tree": "8a431c2ee4fc4a8bd209f1c0f661fec6c5250676", + "version-string": "1.7.11", + "port-version": 0 + }, + { + "git-tree": "3a6833d65d3406fd17cf5126d3de8e7fab59e676", + "version-string": "1.7.10-1", + "port-version": 0 + }, + { + "git-tree": "0433eda538d2ab58aa0ad8eb8bfa3c72d0ff5682", + "version-string": "1.7.10", + "port-version": 0 + }, + { + "git-tree": "37ad7480d4e2dca5c8180021eeb3a9db5be5f2a6", + "version-string": "1.7.9", + "port-version": 0 + }, + { + "git-tree": "daea41d6d1e48d768611dbb833e8adb91cba30a2", + "version-string": "1.7.8", + "port-version": 0 + }, + { + "git-tree": "1d59b1308b33189843d14214666c1f9a3e998236", + "version-string": "1.7.7", + "port-version": 0 + }, + { + "git-tree": "697c6b8d21e916b2d539bc7e5d2139f92057b5c7", + "version-string": "1.7.6", + "port-version": 0 + }, + { + "git-tree": "bf8386a43c79b0beb98e843b4da166f5f4614758", + "version-string": "1.7.5", + "port-version": 0 + }, + { + "git-tree": "ba53b637017e402f8750554c50b77fec21b72533", + "version-string": "1.7.4-1", + "port-version": 0 + }, + { + "git-tree": "60d00b25f144d07e8a6eaf07008badb5a15d1477", + "version-string": "1.7.4", + "port-version": 0 + }, + { + "git-tree": "42aeaa7b70b25b9b110501a50358e2cc829c1993", + "version-string": "1.7.1-4", + "port-version": 0 + }, + { + "git-tree": "393b64e63168c81e50720f718fb1dcb2c1e5dabc", + "version-string": "1.7.1-3", + "port-version": 0 + }, + { + "git-tree": "0a6d62e1eb4b65721c34b0d836d3c99d42f8fb14", + "version-string": "1.7.1-2", + "port-version": 0 + }, + { + "git-tree": "7945c22ccf204610e393913e2b8d9c592d9defd1", + "version-string": "1.7.1-1", + "port-version": 0 + }, + { + "git-tree": "654e296aa8e829a2df738c57faee9bdd008756aa", + "version-string": "1.7.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/aliyun-oss-c-sdk.json b/port_versions/a-/aliyun-oss-c-sdk.json new file mode 100644 index 00000000000000..12cbb68be2ca3f --- /dev/null +++ b/port_versions/a-/aliyun-oss-c-sdk.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "bae10b829d8e75fd53eb0027db88d2bab6caff5f", + "version-string": "3.10.0", + "port-version": 0 + }, + { + "git-tree": "e6eaae5aaee3342a31902a178801d6fa0b4ba3ea", + "version-string": "3.9.1", + "port-version": 0 + }, + { + "git-tree": "cd4515c0c4a3f0908014e280d2ce3672d9e1dda6", + "version-string": "3.7.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/allegro5.json b/port_versions/a-/allegro5.json new file mode 100644 index 00000000000000..5b737ffce4b1cc --- /dev/null +++ b/port_versions/a-/allegro5.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "ffd182fe5ba2979356a59dee5cb050e22ef500e9", + "version-string": "5.2.6.0", + "port-version": 0 + }, + { + "git-tree": "ef65b320c2e3883754864c5d48cbe13c87e6c7fc", + "version-string": "5.2.5.0", + "port-version": 0 + }, + { + "git-tree": "8500276a3ca03004cb29567610c290c9a0721dae", + "version-string": "5.2.4.0", + "port-version": 0 + }, + { + "git-tree": "2274709c94ff5ff042e9897edf2f733b27a0f6f4", + "version-string": "5.2.3.0", + "port-version": 0 + }, + { + "git-tree": "e0420072b463baa2a4ce2bb822cfe38abbb74b8e", + "version-string": "5.2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "3bdf60902a17f71f5bf5b76d3ba9e30f0f77de26", + "version-string": "5.2.2.0", + "port-version": 0 + }, + { + "git-tree": "28877a283e94840b4c6af34edca91fd657e36f21", + "version-string": "5.2.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/ampl-asl.json b/port_versions/a-/ampl-asl.json new file mode 100644 index 00000000000000..ddcf5ec84f7b96 --- /dev/null +++ b/port_versions/a-/ampl-asl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f8a838c084e07d088ca9dbe0b6c4d7da091482f1", + "version-string": "2020-11-11", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/ampl-mp.json b/port_versions/a-/ampl-mp.json new file mode 100644 index 00000000000000..78186295da94b3 --- /dev/null +++ b/port_versions/a-/ampl-mp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "0517040d73dca1a3da9cb9ed482ba6e6aa27a510", + "version-string": "2020-11-11", + "port-version": 0 + }, + { + "git-tree": "c4763f69a5b93e96073ec227d63f9b7a174268b4", + "version-string": "2019-03-21-1", + "port-version": 0 + }, + { + "git-tree": "0ec6a903c79001abe0cfe9edd626573083ff6908", + "version-string": "2019-03-21", + "port-version": 0 + }, + { + "git-tree": "8ccb4cd94a1f05ae2cef1e2e846b1ddd72a39c68", + "version-string": "2019-02-08", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/amqpcpp.json b/port_versions/a-/amqpcpp.json new file mode 100644 index 00000000000000..2372b1eb225339 --- /dev/null +++ b/port_versions/a-/amqpcpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "21de530c9f72229e46bff4a9d39036a4e355941e", + "version-string": "4.1.7", + "port-version": 0 + }, + { + "git-tree": "2ec71510c25ab47c7611d23ffaea4bffa258df61", + "version-string": "4.1.5", + "port-version": 0 + }, + { + "git-tree": "d0c229f05c0853f33f7b22b64d76c14cc7660bc3", + "version-string": "4.1.4", + "port-version": 0 + }, + { + "git-tree": "3a3e3eea25a7263461a38c5f21e6d9a2883610e1", + "version-string": "4.1.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/anax.json b/port_versions/a-/anax.json new file mode 100644 index 00000000000000..ca7c7a7c47e7b4 --- /dev/null +++ b/port_versions/a-/anax.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "561c057f2d0478df1e08b0e07247b8ddf5c8a04a", + "version-string": "2.1.0-6", + "port-version": 0 + }, + { + "git-tree": "a1cfbdd5189cb5cd4ee7a20087c6dc7014063eeb", + "version-string": "2.1.0-5", + "port-version": 0 + }, + { + "git-tree": "035862c3dbc640e495e3a37c80984aa45d1cb3cd", + "version-string": "2.1.0-4", + "port-version": 0 + }, + { + "git-tree": "2bc88f133ecc6dcc53158816cf64a8e15d38cc2e", + "version-string": "2.1.0-3", + "port-version": 0 + }, + { + "git-tree": "e95be4e570a7e59deb1e1c5d85e6b3a05a94c502", + "version-string": "2.1.0-2", + "port-version": 0 + }, + { + "git-tree": "6586db19661389cab598aa9c64ed0bbf684959cf", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "e4bdb59bf7b80aa938e901ed3eea5e7b730f9930", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/angelscript.json b/port_versions/a-/angelscript.json new file mode 100644 index 00000000000000..a18118eb2aaf74 --- /dev/null +++ b/port_versions/a-/angelscript.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "bca26a9780ffe5a26b45abb86e05603a4eec0719", + "version-string": "2.34.0", + "port-version": 0 + }, + { + "git-tree": "f0d6ec2421c37a42be20e6e9c13d6a2f3ceec036", + "version-string": "2.33.1-2", + "port-version": 0 + }, + { + "git-tree": "d34e5e6016ea62f476fd7c3612dd9cb3eccbc83f", + "version-string": "2.33.1-1", + "port-version": 0 + }, + { + "git-tree": "9e00224b27ff07b1f5788cc62d60d29b24f8d7ef", + "version-string": "2.33.0-1", + "port-version": 0 + }, + { + "git-tree": "795c9f8063ea84fb70fa6d0be7564f5637c11696", + "version-string": "2.33.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/angle.json b/port_versions/a-/angle.json new file mode 100644 index 00000000000000..ebfff5b08734cd --- /dev/null +++ b/port_versions/a-/angle.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "936af02bc2517e092035c23ca444a3d638b9a713", + "version-string": "2020-05-15-1", + "port-version": 0 + }, + { + "git-tree": "cc220213f73cd22cccac6818c2a04c435dd155b3", + "version-string": "2020-05-15", + "port-version": 0 + }, + { + "git-tree": "0bd711b33715ba2f3b8a90d80ea4f7901ac38910", + "version-string": "2019-12-31-2", + "port-version": 0 + }, + { + "git-tree": "3ea01e4bcb47f589bd9d828e913139f08f6e15e3", + "version-string": "2019-12-31-1", + "port-version": 0 + }, + { + "git-tree": "0387e91062e10aeb210189c67dd1cf2059e54c30", + "version-string": "2019-12-31", + "port-version": 0 + }, + { + "git-tree": "b84ea94a8d1854952309abd8076f399255414cd6", + "version-string": "2019-07-19-4", + "port-version": 0 + }, + { + "git-tree": "fef408b631525b0ff7ff82e03589c0ea1394c9c0", + "version-string": "2019-07-19-3", + "port-version": 0 + }, + { + "git-tree": "420036ef2449007a884c9116d16e910af220e000", + "version-string": "2019-07-19-2", + "port-version": 0 + }, + { + "git-tree": "94ede0abe4a61a85be4988293baf83440b05f57d", + "version-string": "2019-07-19-1", + "port-version": 0 + }, + { + "git-tree": "686901f127fd4567932e4b9e05e44b8a7b022794", + "version-string": "2019-06-13", + "port-version": 0 + }, + { + "git-tree": "8fa8c7c513ec3b443f5f9740e87b2c73fe72145b", + "version-string": "2019-03-13-c2ee2cc-3", + "port-version": 0 + }, + { + "git-tree": "a5f3c934fce4260519e11c95ab00e41d0c093e9f", + "version-string": "2019-03-13-c2ee2cc-2", + "port-version": 0 + }, + { + "git-tree": "5993d35b9153c81a186199616936ccdda6240cdb", + "version-string": "2019-03-13-c2ee2cc-1", + "port-version": 0 + }, + { + "git-tree": "1bde1864f6cba3d44ad8652c49c5ea92959ac6d5", + "version-string": "2019-03-13-c2ee2cc", + "port-version": 0 + }, + { + "git-tree": "7197ae943c2454ebcf38d74fca50596778d142ce", + "version-string": "2019-01-14-c2ee2cc", + "port-version": 0 + }, + { + "git-tree": "88427126ebabc91a7444ad14acd3e2d1e7338d70", + "version-string": "2017-06-14-8d471f-5", + "port-version": 0 + }, + { + "git-tree": "f2caf5579a346513dae79103c1ca3fe862fe0348", + "version-string": "2017-06-14-8d471f-4", + "port-version": 0 + }, + { + "git-tree": "d14e94eecc0b4bbdcbdb37ca09bbb0594b1aa00c", + "version-string": "2017-06-14-8d471f-2", + "port-version": 0 + }, + { + "git-tree": "9e65a5fce159caa6dfa36d4112d1f160f32abad9", + "version-string": "2017-06-14-8d471f-1", + "port-version": 0 + }, + { + "git-tree": "7dabf17bc4c33618ff098eb80b18e5837aecd5db", + "version-string": "2017-06-14-8d471f", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/antlr4.json b/port_versions/a-/antlr4.json new file mode 100644 index 00000000000000..d6c0f87550231e --- /dev/null +++ b/port_versions/a-/antlr4.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "ed270bdb7075f6ed46cbe345c367ecb00ef64eff", + "version-string": "4.8", + "port-version": 1 + }, + { + "git-tree": "1c0f17bc114b3f94e31bd6ecbef4ee2457768b5f", + "version-string": "4.8", + "port-version": 0 + }, + { + "git-tree": "8f10523941e1e8d75a88feb08b1e0b711ae98a03", + "version-string": "4.7.1-3", + "port-version": 0 + }, + { + "git-tree": "6eb22d8be66dcd33b068f3fb25ae06445fd7dd61", + "version-string": "4.7.1-2", + "port-version": 0 + }, + { + "git-tree": "7b3883e70e318f9a15f4b27a9d71c26e7eb9d957", + "version-string": "4.7.1-1", + "port-version": 0 + }, + { + "git-tree": "bdcdb19ea351359d51b11e772fa396c90b014856", + "version-string": "4.7.1", + "port-version": 0 + }, + { + "git-tree": "34a4ebe35067164ad729d4b66e502c57271ec8a0", + "version-string": "4.7", + "port-version": 0 + }, + { + "git-tree": "984fdaa45d466efa9b2dd00661731a115e4c6292", + "version-string": "4.6-1", + "port-version": 0 + }, + { + "git-tree": "49539bff6d8bf30a96b0228ac27439d946b81dfb", + "version-string": "4.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/any-lite.json b/port_versions/a-/any-lite.json new file mode 100644 index 00000000000000..50b9920160adbc --- /dev/null +++ b/port_versions/a-/any-lite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cf16580f5d27b67f0fca4ebf3eba27ad70925859", + "version-string": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/anyrpc.json b/port_versions/a-/anyrpc.json new file mode 100644 index 00000000000000..f37d0d4a7281d3 --- /dev/null +++ b/port_versions/a-/anyrpc.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e82759546790c693469c78e166e6c83f745849b3", + "version-string": "2020-01-13", + "port-version": 2 + }, + { + "git-tree": "22ee16b848c25142909111d43775ee8a4bd1c081", + "version-string": "2020-01-13-1", + "port-version": 0 + }, + { + "git-tree": "f4f69ae4702ed2b075d1233666f835a6061818fc", + "version-string": "2017-12-01-1", + "port-version": 0 + }, + { + "git-tree": "47a6f247dea1214328dbd6408e1f000a7bbf5a0c", + "version-string": "2017-12-01", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/apr-util.json b/port_versions/a-/apr-util.json new file mode 100644 index 00000000000000..b5a3492ae501ee --- /dev/null +++ b/port_versions/a-/apr-util.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "6f367c81a074fd156d7f054bcacbdae0b01a5f5c", + "version-string": "1.6.1", + "port-version": 3 + }, + { + "git-tree": "9178b7e078f0093aa2cc4b42cd22e9bbc5537f6c", + "version-string": "1.6.1", + "port-version": 2 + }, + { + "git-tree": "450b0cdebafbdebc56b926d372307d1b86f6b9f9", + "version-string": "1.6.1-1", + "port-version": 0 + }, + { + "git-tree": "a2f0bcf9b2f562d2cd6a033d4552a638e6b849bb", + "version-string": "1.6.1", + "port-version": 0 + }, + { + "git-tree": "22f26a9e37de504ad54cc30e407d3f2644600b73", + "version-string": "1.6.0-5", + "port-version": 0 + }, + { + "git-tree": "96cf1cbcb872aaada516d15a77b607f93c812fa0", + "version-string": "1.6.0-3", + "port-version": 0 + }, + { + "git-tree": "5aad761bd51d83bf2d2ab9d0d4fbab5b59d96b9d", + "version-string": "1.6.0-2", + "port-version": 0 + }, + { + "git-tree": "426ca0a02ae6c9299754074d38f26ce31238fc32", + "version-string": "1.6.0-1", + "port-version": 0 + }, + { + "git-tree": "a595d02e90cecaf2795f639814030395f0fb126c", + "version-string": "1.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/apr.json b/port_versions/a-/apr.json new file mode 100644 index 00000000000000..6f5ea6bf9b870c --- /dev/null +++ b/port_versions/a-/apr.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "ca62f9b23d92ff6bb375277cb56e6ea1cde2c9f1", + "version-string": "1.7.0", + "port-version": 3 + }, + { + "git-tree": "797a6206562e8117ad675a90c9d46b48990b940a", + "version-string": "1.7.0", + "port-version": 2 + }, + { + "git-tree": "6aa7aa09fd5a2643cd81b057fecffec21e4f63b2", + "version-string": "1.7.0-1", + "port-version": 0 + }, + { + "git-tree": "b96ddcb0be5a1c8b9700a814d896a827a9ae8c62", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "90b953c11908d63d8e626ba0b9d50fffa00f3a3d", + "version-string": "1.6.5-3", + "port-version": 0 + }, + { + "git-tree": "ee9ffad2399eab5b9ef3e05fa6e7619c832cec3e", + "version-string": "1.6.5-2", + "port-version": 0 + }, + { + "git-tree": "c8e0e8a2991924d58cf52101abfce5794e251e7e", + "version-string": "1.6.5-1", + "port-version": 0 + }, + { + "git-tree": "948cdca3bdef7122b7d66ddd04444ac74b36fc88", + "version-string": "1.6.5", + "port-version": 0 + }, + { + "git-tree": "1f3668a8e6a98805034f45de3bb6f8a4d64bd4db", + "version-string": "1.6.3", + "port-version": 0 + }, + { + "git-tree": "560a1a5a93b64d0766f85439288cd598bddc62d3", + "version-string": "1.6.2-1", + "port-version": 0 + }, + { + "git-tree": "2f8522ca18fd918f2e8af4cfb0eb104df8295658", + "version-string": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "16ad7018f8cda5739413851dc879ec4061da5812", + "version-string": "1.5.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/arb.json b/port_versions/a-/arb.json new file mode 100644 index 00000000000000..ec119cdbfb2c33 --- /dev/null +++ b/port_versions/a-/arb.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "7a1fad4344b58a4c70a15c0a2a890c011a52c75f", + "version-string": "2.18.1", + "port-version": 0 + }, + { + "git-tree": "6add6cb53869d0c182da4dea8dd049a846cc8c41", + "version-string": "2.17.0", + "port-version": 0 + }, + { + "git-tree": "492a3e49ecd0cb6f806f03eccdc836a03fffcc38", + "version-string": "2.16.0", + "port-version": 0 + }, + { + "git-tree": "1380d6df87f04cdb99ebdd50af031b456033da3c", + "version-string": "2.11.1-2", + "port-version": 0 + }, + { + "git-tree": "d0101f7b492d597152d392af47c394b5d159a3a2", + "version-string": "2.11.1-1", + "port-version": 0 + }, + { + "git-tree": "fb3d463b6fae7f3bc030a93a22af93af05357e69", + "version-string": "2.11.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/arcus.json b/port_versions/a-/arcus.json new file mode 100644 index 00000000000000..1c8f915e0aa38c --- /dev/null +++ b/port_versions/a-/arcus.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "60c6c8f7ebf7b481fba071481b60e89085093e87", + "version-string": "4.8.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/argagg.json b/port_versions/a-/argagg.json new file mode 100644 index 00000000000000..b88418d4ef4d1f --- /dev/null +++ b/port_versions/a-/argagg.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "031214af5025d198e84dd9d21fe071199ad1623c", + "version-string": "0.4.6", + "port-version": 0 + }, + { + "git-tree": "a23fc9ac0a6c78412d55ff890da0c65568fba54b", + "version-string": "2019-01-25", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/argh.json b/port_versions/a-/argh.json new file mode 100644 index 00000000000000..6258cc58f00113 --- /dev/null +++ b/port_versions/a-/argh.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "079af0048f435a7d950a29772462a553a80078f1", + "version-string": "2018-12-18-2", + "port-version": 0 + }, + { + "git-tree": "2370ebefd700536d00c92d0e2ceeeffbe4212dbe", + "version-string": "2018-12-18-1", + "port-version": 0 + }, + { + "git-tree": "cfd4467e76cccb610fbc8b1c7590c44365245de3", + "version-string": "2018-12-18", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/argparse.json b/port_versions/a-/argparse.json new file mode 100644 index 00000000000000..d82767675e5ebe --- /dev/null +++ b/port_versions/a-/argparse.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b97b900df917ed17a16e28f3ea86cc66a82ced4e", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "82aa2d55fa1a64ccb97072a21e5a383b779a8acb", + "version-string": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "4f76a49308623bcbd93f2b69d40d9ae2548828bf", + "version-string": "1.9", + "port-version": 0 + }, + { + "git-tree": "b6a2f5c6e86c542876392c744f7055bf68ffe917", + "version-string": "2019-06-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/args.json b/port_versions/a-/args.json new file mode 100644 index 00000000000000..84f2c3af546a29 --- /dev/null +++ b/port_versions/a-/args.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "df53fcfe0380622c0ae4b19c66b3d78eddb32644", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "a04399a85d83caad71a9022b5a9c330414942b14", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "dcb221ca71d0ab533d632698825989986d288870", + "version-string": "2019-05-01", + "port-version": 0 + }, + { + "git-tree": "c894c00b57a945aa6fdfe80804950addeb7295f4", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "a48ceaddde2848dcdb3a15e250cb36468a518ac4", + "version-string": "2019-01-18", + "port-version": 0 + }, + { + "git-tree": "d1ecad6153a9ea9e493279b62bbd25f43992ca8a", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "6c280b96419508283dbfb744cb6174977fd79d21", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "46273254e3cfe34691a430e8a0eca99e2ee96708", + "version-string": "2018-06-28", + "port-version": 0 + }, + { + "git-tree": "e5a7d23d255a6eabd8ce9fb8ea8c62f04e7eec43", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "5a6052bd2acef6edca4eafbade1bc2fca972340e", + "version-string": "2018-02-23", + "port-version": 0 + }, + { + "git-tree": "967b94170418459a4acab553b955794d5952730b", + "version-string": "d8905de", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/argtable2.json b/port_versions/a-/argtable2.json new file mode 100644 index 00000000000000..63d2536bb39ce6 --- /dev/null +++ b/port_versions/a-/argtable2.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "84477794d507fde26a891a7282b5322bb8d0e632", + "version-string": "2.13", + "port-version": 8 + }, + { + "git-tree": "5f692e274330bf55809bd591a4f94098a22d840b", + "version-string": "2.13-7", + "port-version": 0 + }, + { + "git-tree": "03c9c44716d9785aabaa94a2050c4c2e5753d48a", + "version-string": "2.13-5", + "port-version": 0 + }, + { + "git-tree": "76147077ed008a4c662e85f956d8ade35c50aa18", + "version-string": "2.13-4", + "port-version": 0 + }, + { + "git-tree": "a5aa85058c61fea7507d0f7963075f83d5cafe87", + "version-string": "2.13-2", + "port-version": 0 + }, + { + "git-tree": "a8d6bf4f29b8b423396128bb49ed51b2f23f7853", + "version-string": "2.13-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/argtable3.json b/port_versions/a-/argtable3.json new file mode 100644 index 00000000000000..44ba57bac9af5e --- /dev/null +++ b/port_versions/a-/argtable3.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "7a1d8f216b96823aed9e08cd73efc09ca7baec14", + "version-string": "3.1.5", + "port-version": 0 + }, + { + "git-tree": "fc26a0ec4d041d390728046549a4502b922086b7", + "version-string": "2019-08-21", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/argumentum.json b/port_versions/a-/argumentum.json new file mode 100644 index 00000000000000..53ced38734fab0 --- /dev/null +++ b/port_versions/a-/argumentum.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4ddbb18467acb4d4bcddb23e1ba6c956aeaee72f", + "version-string": "0.3.1", + "port-version": 0 + }, + { + "git-tree": "e6f62b26b2d823054e4b3da822f7223e98badbcf", + "version-string": "0.2.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/armadillo.json b/port_versions/a-/armadillo.json new file mode 100644 index 00000000000000..fa267c3876288d --- /dev/null +++ b/port_versions/a-/armadillo.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "fa82d7d3b12f794825dad7fddcda2b08f268c2b2", + "version-string": "10.1.0", + "port-version": 0 + }, + { + "git-tree": "26c12504729aa9721a0ddacc4379a4a186131cd8", + "version-string": "2019-04-16", + "port-version": 10 + }, + { + "git-tree": "a1b22abfe2cf95afdbfa2035d398f5e3631b10eb", + "version-string": "2019-04-16", + "port-version": 9 + }, + { + "git-tree": "cc023d9cc156eb5ca8679d2ec71ed76aa2370de6", + "version-string": "2019-04-16-8", + "port-version": 0 + }, + { + "git-tree": "49f2598bbf5973b40b790e8bde134debdcfd9b6a", + "version-string": "2019-04-16-6", + "port-version": 0 + }, + { + "git-tree": "b6884042c9d5cbd748768125337f7ba0f1e13746", + "version-string": "2019-04-16-5", + "port-version": 0 + }, + { + "git-tree": "c4804f0f1bf5ab832e6f41c880d03f0c7f216186", + "version-string": "2019-04-16-4", + "port-version": 0 + }, + { + "git-tree": "5253e776b3b0154830cbf7423f521e1044fd0421", + "version-string": "2019-04-16-3", + "port-version": 0 + }, + { + "git-tree": "e7bcd1561e9f742ef22389fabdd2adaa0a36f941", + "version-string": "2019-04-16-2", + "port-version": 0 + }, + { + "git-tree": "278d63ef5ee8e0e6af178f29ca51df22c5ae26d5", + "version-string": "2019-04-16-1", + "port-version": 0 + }, + { + "git-tree": "a976a647cd788e9ebfc2933e824168fbe902af82", + "version-string": "2019-04-16-f00d3225", + "port-version": 0 + }, + { + "git-tree": "3c6e533f56dea7b9985f2babfa4df812d8d90fe1", + "version-string": "8.400.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/arrayfire.json b/port_versions/a-/arrayfire.json new file mode 100644 index 00000000000000..18814a994b0837 --- /dev/null +++ b/port_versions/a-/arrayfire.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ec3188e3259a9b123ebbbb0e2ede933a59d42092", + "version-string": "3.7.3", + "port-version": 3 + }, + { + "git-tree": "c5d51d516a2f179871125b9adb59a0d545c55cdb", + "version-string": "3.7.3", + "port-version": 2 + }, + { + "git-tree": "68b7bed9be6cf106ea00ea8d073597f862904bef", + "version-string": "3.7.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/arrow.json b/port_versions/a-/arrow.json new file mode 100644 index 00000000000000..cd706d26e9ba4f --- /dev/null +++ b/port_versions/a-/arrow.json @@ -0,0 +1,129 @@ +{ + "versions": [ + { + "git-tree": "604537d50ab45ff96911b5330c51137ac5fc4040", + "version-string": "1.0.1", + "port-version": 2 + }, + { + "git-tree": "be3074d5934a54a0595d65d172a2a2d906d5ec91", + "version-string": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "eb5f80ce39b4ba0842b1cb1c5077d42f17785b25", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "5044fd2ee5182bbda8b1d1173d09829494e9b9c3", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "d809f7bd41d0b826cb5bb9aa1ec6fa1662270ba2", + "version-string": "0.17.1", + "port-version": 0 + }, + { + "git-tree": "7cd5a5f2d222b71099f529f6c7965f60002ce1a5", + "version-string": "0.17.0-2", + "port-version": 0 + }, + { + "git-tree": "c2e58d5b8f273280512f3fd368b5ebe1e15fa77f", + "version-string": "0.17.0-1", + "port-version": 0 + }, + { + "git-tree": "1a38e418d3c0ff8068a348fd9be7b56a91c07fed", + "version-string": "0.17.0", + "port-version": 0 + }, + { + "git-tree": "87f44dc6a17cd7d29daec3d81c9d9bb2360a7a98", + "version-string": "0.16.0", + "port-version": 0 + }, + { + "git-tree": "146a5af0ecbf438e35f9e0dcafc962c0d7a01333", + "version-string": "0.15.1", + "port-version": 0 + }, + { + "git-tree": "e5633dfddebee8fe155dbe844bbfa605021eb513", + "version-string": "0.16.0", + "port-version": 0 + }, + { + "git-tree": "9c1913e23a13f374fa40ca0a2f3faf3507295950", + "version-string": "0.15.1", + "port-version": 0 + }, + { + "git-tree": "2e43c6b165eb93e14f0cc5455e94ad4901f0dc93", + "version-string": "0.14.1-1", + "port-version": 0 + }, + { + "git-tree": "057b3df9f5accf607b256740d57ef52d4767bb6f", + "version-string": "0.14.1", + "port-version": 0 + }, + { + "git-tree": "8bbcceba647f76d767bc091df746b25cb5e2c93c", + "version-string": "0.13.0-4", + "port-version": 0 + }, + { + "git-tree": "84856823fe2bdf8f91b0b8578b05701e67b5c490", + "version-string": "0.13.0-3", + "port-version": 0 + }, + { + "git-tree": "fc32bf086a868c7e241de1cdbe38e6715f7e55cc", + "version-string": "0.13.0-2", + "port-version": 0 + }, + { + "git-tree": "45b01fb66fee5fcddee02c1739988408358474b3", + "version-string": "0.13.0-1", + "port-version": 0 + }, + { + "git-tree": "96330c763d3cd5d7c0f733c19b56e59bfdb5a1de", + "version-string": "0.13.0", + "port-version": 0 + }, + { + "git-tree": "488e7538261148c4b8f3dc0482c33871297e24c9", + "version-string": "0.11.1", + "port-version": 0 + }, + { + "git-tree": "19aa1a29600333325990c981fd3fb8fbe0c0330f", + "version-string": "0.9.0-1", + "port-version": 0 + }, + { + "git-tree": "48ccb35a5d68f54398fae0bc0d8f55508a405c18", + "version-string": "0.6.0-1", + "port-version": 0 + }, + { + "git-tree": "f20f5071e4d65267e34c2a6b7641ccb30ea881d7", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "e98f2877f3936625ea17a1ef6da69b8c3e634933", + "version-string": "apache-arrow-0.4.0-1", + "port-version": 0 + }, + { + "git-tree": "dd778519bde3107f576c7960193c2dbc551ec884", + "version-string": "apache-arrow-0.4.0 ", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/ashes.json b/port_versions/a-/ashes.json new file mode 100644 index 00000000000000..4fe0cdfb2e7ed6 --- /dev/null +++ b/port_versions/a-/ashes.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6b5482b87c4a123fe71d94ede2e04296a7281b9b", + "version-string": "2020-10-21", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/asio.json b/port_versions/a-/asio.json new file mode 100644 index 00000000000000..b93c03c46e0f31 --- /dev/null +++ b/port_versions/a-/asio.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "49f198a6e3cf688db2a0fe78de28214397fdd39d", + "version-string": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "73931d34afbd50a664751df84991865ae89af7e4", + "version-string": "1.12.2-2", + "port-version": 0 + }, + { + "git-tree": "5f4d959b8b58a77d149f7aa083f6b525872bff99", + "version-string": "1.12.2-1", + "port-version": 0 + }, + { + "git-tree": "4d9f361442f1c97e98d449999c2bda4e181fc5df", + "version-string": "1.12.2", + "port-version": 0 + }, + { + "git-tree": "463163c76085b16d8c9d7996810930da06ae0380", + "version-string": "1.12.1-1", + "port-version": 0 + }, + { + "git-tree": "a428645a3450eb5822d31b1347bf1b69d899f4be", + "version-string": "1.12.1", + "port-version": 0 + }, + { + "git-tree": "fc627635b936a7422fd66c1f1f64034510ca08d1", + "version-string": "1.12.0-2", + "port-version": 0 + }, + { + "git-tree": "57277aed65e6c97f789356a796e29aee7c9133ef", + "version-string": "1.12.0-1", + "port-version": 0 + }, + { + "git-tree": "697366e6e4661a88923558ffcff92838aa344c25", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "d99e0e51fee4f8a8df42844a48a8852fa2d7283f", + "version-string": "1.10.8-1", + "port-version": 0 + }, + { + "git-tree": "404c7cb32cc6450b82fb99c07e6ba05e4228539f", + "version-string": "1.10.8", + "port-version": 0 + }, + { + "git-tree": "ec4bac325cbc717f0bbb02c9492a4914728d3d84", + "version-string": "1.10.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/asiosdk.json b/port_versions/a-/asiosdk.json new file mode 100644 index 00000000000000..840fb93ef786a7 --- /dev/null +++ b/port_versions/a-/asiosdk.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "d2330df0e338b51a2e303ed1d0403545883b7428", + "version-string": "2.3.3-1", + "port-version": 0 + }, + { + "git-tree": "42ef941b2c44f84dff260c30f892cb626b6ee76c", + "version-string": "2.3.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/asmjit.json b/port_versions/a-/asmjit.json new file mode 100644 index 00000000000000..b37505fd41a83d --- /dev/null +++ b/port_versions/a-/asmjit.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "ce18730abf423893475a9addc5c55cea38964e0b", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "fa0c36ba15b48959ab5a2df3463299e1d2473b6f", + "version-string": "2020-07-22", + "port-version": 0 + }, + { + "git-tree": "39200e33a095d15021817855a9fefa990ab7d2e4", + "version-string": "2020-05-08", + "port-version": 0 + }, + { + "git-tree": "5bca13a7f4b836d2374bda5fa0efffd111605173", + "version-string": "2020-02-08", + "port-version": 0 + }, + { + "git-tree": "6d945eeaa2d16fee0d06c8aa24fc68ea311ce972", + "version-string": "2020-01-20", + "port-version": 0 + }, + { + "git-tree": "36ac008bddeab18b7a6624d32650ebbebcd48542", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "c8f517fbc415e6e0025d4f75f3bc94bc08552f6b", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "d69f0c00009f2dfabf734adbc695f200feae82d9", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "d880c763130f58ffe017d06af086668cfd0c03f4", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "40297c743469da0422db8bebed32b15aa2e6de19", + "version-string": "2018-11-08", + "port-version": 0 + }, + { + "git-tree": "ab02180a87128ab2f2cee98de3c7ed8ed0ff4fbc", + "version-string": "673dcefaa048c5f5a2bf8b85daf8f7b9978d018a", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/assimp.json b/port_versions/a-/assimp.json new file mode 100644 index 00000000000000..a4af2a7874b1b9 --- /dev/null +++ b/port_versions/a-/assimp.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "b0bd03f6677d06cc56fbcecb15ff205a9a43b66c", + "version-string": "5.0.1", + "port-version": 4 + }, + { + "git-tree": "d4228d8fc413efb47e151af707b6f1036c58b524", + "version-string": "5.0.1", + "port-version": 3 + }, + { + "git-tree": "835678d00f79a0633e787f2a9bcdf8569b50ce1a", + "version-string": "5.0.1", + "port-version": 2 + }, + { + "git-tree": "ae7164957f4d0939cd442331dd2a9bfe56430051", + "version-string": "5.0.1", + "port-version": 1 + }, + { + "git-tree": "1302729a9916e49763f596f27b8f7a078a3e295a", + "version-string": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "f64ea36b5d8c21c60c59958df022037fe7ed3932", + "version-string": "5.0.0-2", + "port-version": 0 + }, + { + "git-tree": "c5c58bf13f6c7849d5f7f9d805334fc589848df1", + "version-string": "5.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d05b368668ecb85ca0e8c3d7727d3639cc11f381", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "bc39933b997e72876250e65cc0baf94a099394fc", + "version-string": "4.1.0-8", + "port-version": 0 + }, + { + "git-tree": "56f302b766f710e85906d5b008c2b4b784178038", + "version-string": "4.1.0-5", + "port-version": 0 + }, + { + "git-tree": "bcd43128f09a1206a231cd5279bb9ec74d75715e", + "version-string": "4.1.0-4", + "port-version": 0 + }, + { + "git-tree": "a6f54c4aee8b9d96f9944df107bef204e33eeb22", + "version-string": "4.1.0-3", + "port-version": 0 + }, + { + "git-tree": "ff167f3fc7d4c8177ab371520553be012c466276", + "version-string": "4.1.0-2", + "port-version": 0 + }, + { + "git-tree": "435f1e736588b3d29f64e8198d58506115db39ab", + "version-string": "4.1.0-1", + "port-version": 0 + }, + { + "git-tree": "14923a9e7e72c854f259313474be015fc3d67efb", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "6e0021228c36fd58b2b0648d82d8638404f38004", + "version-string": "4.0.1-3", + "port-version": 0 + }, + { + "git-tree": "880c6f28522040ec88f7bbff8b46996db50d12e1", + "version-string": "4.0.1-2", + "port-version": 0 + }, + { + "git-tree": "7feb4e6445d69845d3749b8c46a8aadc9a7b43c7", + "version-string": "4.0.1-1", + "port-version": 0 + }, + { + "git-tree": "2f1952a8ef4f38ae627e8c39c44eb41668f00d5a", + "version-string": "4.0.1", + "port-version": 0 + }, + { + "git-tree": "dc206c1ce726af6f25ff75bd1c4590c190601263", + "version-string": "4.0.0-2", + "port-version": 0 + }, + { + "git-tree": "d3973ad124bd172e9621c53896da2cfa69891101", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "a97b97ef3c6754dbda9d02b7ff41c11a84b260f4", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "620a3ea9e55329625a48a01a58cd9217c11e5621", + "version-string": "3.3.1", + "port-version": 0 + }, + { + "git-tree": "4fc82cfbc7d8285e54202eddcffb67757a5d0f48", + "version-string": "3.2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/asynch.json b/port_versions/a-/asynch.json new file mode 100644 index 00000000000000..5be75524724315 --- /dev/null +++ b/port_versions/a-/asynch.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4955ffe2f2e53d427532418c0a77e9b5ec94b0aa", + "version-string": "2019-09-21-1", + "port-version": 0 + }, + { + "git-tree": "29a5b1b0fabe2bf4f1477f263087ccf135e298d3", + "version-string": "2019-09-21", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/asyncplusplus.json b/port_versions/a-/asyncplusplus.json new file mode 100644 index 00000000000000..14475c844a551c --- /dev/null +++ b/port_versions/a-/asyncplusplus.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "87a28ca122377134fb51ad27cf2a4a800fbc6bd8", + "version-string": "1.1", + "port-version": 0 + }, + { + "git-tree": "06dc11e4e504f924ed6dfa5dca8ec9270667d87f", + "version-string": "1.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/atk.json b/port_versions/a-/atk.json new file mode 100644 index 00000000000000..163f0e3aed978e --- /dev/null +++ b/port_versions/a-/atk.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "28ffcc285239b3ca0d99752bc740f9349f996ad1", + "version-string": "2.24.0-5", + "port-version": 2 + }, + { + "git-tree": "8b340fffd56bb314c9013f55af518bf111af666b", + "version-string": "2.24.0-5", + "port-version": 1 + }, + { + "git-tree": "18245a7bfaf409eba114baf41896ca126163851e", + "version-string": "2.24.0-5", + "port-version": 0 + }, + { + "git-tree": "791aa9841eab23cc72d2f98381ed132a32567035", + "version-string": "2.24.0-4", + "port-version": 0 + }, + { + "git-tree": "4df135cf73816939af5416dca1e535553a4b035e", + "version-string": "2.24.0-3", + "port-version": 0 + }, + { + "git-tree": "bc8acf75ad0c136ff158548200c08dfa0f59cb42", + "version-string": "2.24.0-2", + "port-version": 0 + }, + { + "git-tree": "faf0b23eedbc6ea044f3730cc1b525f663b3d11b", + "version-string": "2.24.0-1", + "port-version": 0 + }, + { + "git-tree": "aad9b11c6426bc739a899deb478fd4f49f70c3f5", + "version-string": "2.24.0", + "port-version": 0 + }, + { + "git-tree": "d99d3626bf81d50c0c51d3c39592d00178c0db26", + "version-string": "2.22.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/atkmm.json b/port_versions/a-/atkmm.json new file mode 100644 index 00000000000000..e239881ae79757 --- /dev/null +++ b/port_versions/a-/atkmm.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "6147b7b2b6af5fac8a05e48cb4e624fb2fdde235", + "version-string": "2.24.2", + "port-version": 5 + }, + { + "git-tree": "e3fe7e543a9580c2ea9116d66376d2744cd627ed", + "version-string": "2.24.2", + "port-version": 4 + }, + { + "git-tree": "528633a4adac405a9fc4ee39ae45352ab47c6f98", + "version-string": "2.24.2", + "port-version": 3 + }, + { + "git-tree": "e1ec86f38809f14d500d14012da83824c1538071", + "version-string": "2.24.2-2", + "port-version": 0 + }, + { + "git-tree": "33fec2fc8ed32dd427c1e27252b3ec9af049f8df", + "version-string": "2.24.2-1", + "port-version": 0 + }, + { + "git-tree": "b3eca50169f8ca7c03816ac3486269e2512b59fa", + "version-string": "2.24.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/atlmfc.json b/port_versions/a-/atlmfc.json new file mode 100644 index 00000000000000..98a8ee82100802 --- /dev/null +++ b/port_versions/a-/atlmfc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bf15a689a8ab4c50dbf2e6eef2c3a7fff5e6dd8f", + "version-string": "0", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/aubio.json b/port_versions/a-/aubio.json new file mode 100644 index 00000000000000..adb765817a6d09 --- /dev/null +++ b/port_versions/a-/aubio.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "4623a0698d9f9775a12e41f282e2b131f32ea09f", + "version-string": "0.4.9", + "port-version": 3 + }, + { + "git-tree": "3a1b37a405232977d957c365019ed85a4c8ad009", + "version-string": "0.4.9", + "port-version": 2 + }, + { + "git-tree": "fc538d2460c0110f71b3255826c3b193175422c2", + "version-string": "0.4.9-1", + "port-version": 0 + }, + { + "git-tree": "a202c56d375aa33d948e71f1f776fc9cc4a09eab", + "version-string": "0.4.9", + "port-version": 0 + }, + { + "git-tree": "00cf95c6fcb5d83046fb353c910e70d8d1a980a1", + "version-string": "0.4.8-1", + "port-version": 0 + }, + { + "git-tree": "7f4ce7b7e1d4bd4c99c23fa8cac84163db0b4468", + "version-string": "0.4.8", + "port-version": 0 + }, + { + "git-tree": "2a8f1ef1cbfc2fe87239bbe379490e6452acc276", + "version-string": "0.4.6-967e4041f-2", + "port-version": 0 + }, + { + "git-tree": "acde13c98ba29a9936de1d4c98c2b4c973970b56", + "version-string": "0.4.6-2", + "port-version": 0 + }, + { + "git-tree": "005bb8735251e9c77d2c5ced392f01bb05e682bc", + "version-string": "0.4.6-1", + "port-version": 0 + }, + { + "git-tree": "542773bbef586a34953826aaff9f5a7378004798", + "version-string": "0.4.6", + "port-version": 0 + }, + { + "git-tree": "fc6b19d961492dc1f1ce5ca068e09b6a7b86314d", + "version-string": "0.46", + "port-version": 0 + }, + { + "git-tree": "49c57b3338cfcdf1e2613a00b794fe00d4a62b99", + "version-string": "0.46~alpha-4", + "port-version": 0 + }, + { + "git-tree": "53b5167f7b8d12cd07353feca07203319dfda73a", + "version-string": "0.46~alpha-3", + "port-version": 0 + }, + { + "git-tree": "be74b6c5a73af43313c11a4d3e64d1dd65f2569a", + "version-string": "0.46~alpha-2", + "port-version": 0 + }, + { + "git-tree": "fce6ff31ff9335fc9df0eacdedc522f921025a9a", + "version-string": "0.46~alpha-1", + "port-version": 0 + }, + { + "git-tree": "ff49e16d707219bff9c3e09a00dd119aabb25d1b", + "version-string": "0.46~alpha", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/audiofile.json b/port_versions/a-/audiofile.json new file mode 100644 index 00000000000000..44ce155fb6ef96 --- /dev/null +++ b/port_versions/a-/audiofile.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3bf2b19891a915f88803b1fa079c525e4d253ba0", + "version-string": "1.0.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/aurora.json b/port_versions/a-/aurora.json new file mode 100644 index 00000000000000..b13e6ff311f93f --- /dev/null +++ b/port_versions/a-/aurora.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "027accab492d7272fdd2d70916fd97f2c36644a3", + "version-string": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/autobahn.json b/port_versions/a-/autobahn.json new file mode 100644 index 00000000000000..5e82d66a3261b1 --- /dev/null +++ b/port_versions/a-/autobahn.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "0389b345f8b7cc5f7c4cfb7a461cee02a76e0034", + "version-string": "20.8.1", + "port-version": 0 + }, + { + "git-tree": "07faa0f6be019d2d32b1652567bd0bf64c8e419b", + "version-string": "18.4.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/avisynthplus.json b/port_versions/a-/avisynthplus.json new file mode 100644 index 00000000000000..9dcdf7313258ab --- /dev/null +++ b/port_versions/a-/avisynthplus.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "de073b58132bfad56e8b89ece1e9e4c995df607b", + "version-string": "3.6.1", + "port-version": 0 + }, + { + "git-tree": "5f71f3a1d842ba88c356e32fe1d2fbc487b47855", + "version-string": "3.6.0", + "port-version": 1 + }, + { + "git-tree": "294672fd504c5667c368b0c3288b6be1e34810cb", + "version-string": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "04d2366805052941a50dc8db53c45d1a9265bb72", + "version-string": "3.5.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/avro-c.json b/port_versions/a-/avro-c.json new file mode 100644 index 00000000000000..deecd119a1155e --- /dev/null +++ b/port_versions/a-/avro-c.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "09783bc724dc91b8c456cbb060043ccb206e8595", + "version-string": "1.9.2-1", + "port-version": 0 + }, + { + "git-tree": "99bbfcf0dc88ff4fb93fee1e252a1488d0be5bdb", + "version-string": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "c6e0d310e5ed9c1cac48a2076ba67323acf25882", + "version-string": "1.8.2-4", + "port-version": 0 + }, + { + "git-tree": "7946d8a20fa3d901dfdcf9a76c361a1c0f9b095d", + "version-string": "1.8.2-3", + "port-version": 0 + }, + { + "git-tree": "617a18c6d4bf8718e7010da2797c60f63fba082b", + "version-string": "1.8.2-2", + "port-version": 0 + }, + { + "git-tree": "a3052db22f21a58023818a908d156fa4a9e4574c", + "version-string": "1.8.2-1", + "port-version": 0 + }, + { + "git-tree": "ab59da4973872f333444eb0847dcc80abc5dd3a2", + "version-string": "1.8.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/avro-cpp.json b/port_versions/a-/avro-cpp.json new file mode 100644 index 00000000000000..51e35c874836fc --- /dev/null +++ b/port_versions/a-/avro-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e6253ca701d576b97c1625beeb8a1767eb73bae4", + "version-string": "1.9.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/aws-c-common.json b/port_versions/a-/aws-c-common.json new file mode 100644 index 00000000000000..84a58aa974077a --- /dev/null +++ b/port_versions/a-/aws-c-common.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "3b58ff9b212a0910118c979470d7e53925d1b705", + "version-string": "0.4.56", + "port-version": 0 + }, + { + "git-tree": "de827b03e2db3b173e5d6d25266e6489608c119d", + "version-string": "0.4.15", + "port-version": 0 + }, + { + "git-tree": "0d766b6dc8e60e4d7a4c3a6eb7e15fba323fdff6", + "version-string": "0.4.1", + "port-version": 0 + }, + { + "git-tree": "f70c131558d24973206d24f40356a30346617c1e", + "version-string": "0.3.11-1", + "port-version": 0 + }, + { + "git-tree": "68789bb84f4ad94e006386403e46970c280d6d46", + "version-string": "0.3.11", + "port-version": 0 + }, + { + "git-tree": "f60a72a5b4fb56cc3f952fb8acf1800776b56eda", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/aws-c-event-stream.json b/port_versions/a-/aws-c-event-stream.json new file mode 100644 index 00000000000000..5314bd7c7614c9 --- /dev/null +++ b/port_versions/a-/aws-c-event-stream.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "50134e5fe6fa4dd534238fd2a799722b918704a9", + "version-string": "0.1.6", + "port-version": 0 + }, + { + "git-tree": "d8569065153318306e1b6cc224d2b28ddd170f0b", + "version-string": "0.1.4", + "port-version": 0 + }, + { + "git-tree": "c20f3cd8616b1b985414c66f40774c15a523a851", + "version-string": "0.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/aws-checksums.json b/port_versions/a-/aws-checksums.json new file mode 100644 index 00000000000000..7b8423c7ff6145 --- /dev/null +++ b/port_versions/a-/aws-checksums.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "4be7a5832f122e6c98d235bd58c55ea2d83dcdea", + "version-string": "0.1.9", + "port-version": 0 + }, + { + "git-tree": "03a865bfedb1a3ae47b3e284bd15443612aa664e", + "version-string": "0.1.5", + "port-version": 0 + }, + { + "git-tree": "a93bdeae64de7039871839c398ba3f97c9d9a4cc", + "version-string": "0.1.3", + "port-version": 0 + }, + { + "git-tree": "46b79a9d66e687e13345c6f2b2f1eade29505c6b", + "version-string": "0.1.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/aws-lambda-cpp.json b/port_versions/a-/aws-lambda-cpp.json new file mode 100644 index 00000000000000..28d2c64e8691e1 --- /dev/null +++ b/port_versions/a-/aws-lambda-cpp.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "bfe8b19021e8359832f5e32438cb988f4edf0fdf", + "version-string": "0.2.6", + "port-version": 0 + }, + { + "git-tree": "7790810f7e80d8c0387fcf87984848da82da0539", + "version-string": "0.2.4", + "port-version": 0 + }, + { + "git-tree": "7d46b881faa433de4780e0e49994ecc1a4208733", + "version-string": "0.1.0-2", + "port-version": 0 + }, + { + "git-tree": "ba62336bf04861892999b45d5595c7f75a9487b8", + "version-string": "0.1.0-1", + "port-version": 0 + }, + { + "git-tree": "e2e3a86bb6bd0ab4a024c199d9c2c67da50f288d", + "version-string": "0.1.0", + "port-version": 0 + }, + { + "git-tree": "903f5e36f05a7f9c1a21c870886f59212f5f939e", + "version-string": "2018-12-06", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/aws-sdk-cpp.json b/port_versions/a-/aws-sdk-cpp.json new file mode 100644 index 00000000000000..a8ac33f4b97fea --- /dev/null +++ b/port_versions/a-/aws-sdk-cpp.json @@ -0,0 +1,274 @@ +{ + "versions": [ + { + "git-tree": "1474856fe6fdeb8feab5068959e189bc9f6c0327", + "version-string": "1.8.83", + "port-version": 4 + }, + { + "git-tree": "0e9236d4366958451f888a5f6616aa64a26afa61", + "version-string": "1.8.83", + "port-version": 3 + }, + { + "git-tree": "948e791fc4effed6d27b6ad4da335a51ba6111bd", + "version-string": "1.8.83", + "port-version": 2 + }, + { + "git-tree": "bc319d0eaa3164611ee527fbea2e2762a463f2fb", + "version-string": "1.8.83", + "port-version": 1 + }, + { + "git-tree": "1ab9d27ef480aa31ff61d26bc119065d033de186", + "version-string": "1.8.83", + "port-version": 0 + }, + { + "git-tree": "25296cbd7a7d602b8aa13ad09536845e2d39e4fd", + "version-string": "1.8.4", + "port-version": 1 + }, + { + "git-tree": "2a538315e8d87e1c1b309df02df48c8d1ac2c8fb", + "version-string": "1.8.4", + "port-version": 0 + }, + { + "git-tree": "08ea7a610c40148e3482a69e61b35243bd32d653", + "version-string": "1.7.333", + "port-version": 0 + }, + { + "git-tree": "796789e5892ff15bd488c929097f6bf49d4d5757", + "version-string": "1.7.270", + "port-version": 0 + }, + { + "git-tree": "d52df80388ebf58e81fbd305767274cc46a28098", + "version-string": "1.7.214-1", + "port-version": 0 + }, + { + "git-tree": "2ee25c13ac13de82586aa5f8739c79442d584e96", + "version-string": "1.7.214", + "port-version": 0 + }, + { + "git-tree": "003e047531084b5607bf0fa7650d9306368931c7", + "version-string": "1.7.142-1", + "port-version": 0 + }, + { + "git-tree": "37100a1d00ea1fa12500c305efdfc9c2d39db249", + "version-string": "1.7.142", + "port-version": 0 + }, + { + "git-tree": "c70be8918571b0047fe5c8dd99fb28361579c235", + "version-string": "1.7.116", + "port-version": 0 + }, + { + "git-tree": "24e8b096060af9ba178fdab1ae2cec5680848a93", + "version-string": "1.7.106", + "port-version": 0 + }, + { + "git-tree": "4d1a7231e28d990a993ddd7238dccc53cb4d3ff0", + "version-string": "1.7.100", + "port-version": 0 + }, + { + "git-tree": "f30834108da8e38617086267dfee6a4e4e2ccb02", + "version-string": "1.7.98", + "port-version": 0 + }, + { + "git-tree": "61bf71b5041f2c2a624aa0fdf21bb6ddbfd48924", + "version-string": "1.7.89", + "port-version": 0 + }, + { + "git-tree": "e797ed8e640e800bf556fe9981cf735927a6eb3c", + "version-string": "1.7.80", + "port-version": 0 + }, + { + "git-tree": "b83bc0e52d936be054b490ef50c79adf73f68fa5", + "version-string": "1.7.41", + "port-version": 0 + }, + { + "git-tree": "9cdf6e74b272bb883bb536c9960f67e0af3a7c69", + "version-string": "1.7.38", + "port-version": 0 + }, + { + "git-tree": "2f6bee8ce92ba561c5aabb43a16daacb22941c03", + "version-string": "1.6.47", + "port-version": 0 + }, + { + "git-tree": "3ec29fd4a699993cda047b1e00663b786c120efa", + "version-string": "1.6.43", + "port-version": 0 + }, + { + "git-tree": "b75b33c86cafda26afec82d8e9d52aaebb924d51", + "version-string": "1.6.38", + "port-version": 0 + }, + { + "git-tree": "ca0eede4bb07d50f091fdfe1e1f1615bdcd24f00", + "version-string": "1.6.29", + "port-version": 0 + }, + { + "git-tree": "f325650c4c786a5f7fdf6ed7a7190e5799287f9c", + "version-string": "1.6.12-1", + "port-version": 0 + }, + { + "git-tree": "70753f945bfcb0b66c577748dddbec17a0d9c0e7", + "version-string": "1.6.12", + "port-version": 0 + }, + { + "git-tree": "05d10ce3843b6d373a39f74abd2ec6774e38faff", + "version-string": "1.5.7", + "port-version": 0 + }, + { + "git-tree": "7569d8b07f3244919df76e4338793d5c15d69902", + "version-string": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "c8d693c088850ae34c45b06dc8c93b5a186577c7", + "version-string": "1.4.82", + "port-version": 0 + }, + { + "git-tree": "270e45b8b39a33ccd0c17275a9eb8e14da2722dd", + "version-string": "1.4.78", + "port-version": 0 + }, + { + "git-tree": "8aaaec26546bc6e9d266651a18d834af099d30ff", + "version-string": "1.4.69", + "port-version": 0 + }, + { + "git-tree": "33cb870a4b73c0e490d2fae7b3a6a11abc017898", + "version-string": "1.4.65", + "port-version": 0 + }, + { + "git-tree": "5e76ee91aabaaa2421b689716a5555cd7cfc4319", + "version-string": "1.4.52", + "port-version": 0 + }, + { + "git-tree": "df7dbeb03eb5b09a4585caa02cf44813513bbced", + "version-string": "1.4.40", + "port-version": 0 + }, + { + "git-tree": "7616504952d47da4523f5479eecea772229a29fc", + "version-string": "1.4.38", + "port-version": 0 + }, + { + "git-tree": "88c68e5bb2a3413d19b049d9c408a4316ec0b000", + "version-string": "1.4.33", + "port-version": 0 + }, + { + "git-tree": "cccf3ff726ac8b25ad4babd21f7db9fddb7a8ee6", + "version-string": "1.4.32", + "port-version": 0 + }, + { + "git-tree": "1c6995e70f2974f07c40b57eab2766faef273cbb", + "version-string": "1.4.31-1", + "port-version": 0 + }, + { + "git-tree": "f4734cfc713d954afe15a3aafa86580cdf2f257d", + "version-string": "1.4.30-1", + "port-version": 0 + }, + { + "git-tree": "2a95b31e39214a2cbc3f6ef804b2ada00f16b8ea", + "version-string": "1.4.30", + "port-version": 0 + }, + { + "git-tree": "914fb03e175de5741eab4e4790d7c6f1c6096b67", + "version-string": "1.4.27", + "port-version": 0 + }, + { + "git-tree": "9ee7b941c0e7f8ab6166704830c2203845f2c755", + "version-string": "1.4.26", + "port-version": 0 + }, + { + "git-tree": "a480a4d56b1f297d5b843194a4fcfea8396a61b9", + "version-string": "1.4.24", + "port-version": 0 + }, + { + "git-tree": "bf2a19a867c4ff6ab44d87545ff33465827ad419", + "version-string": "1.4.23", + "port-version": 0 + }, + { + "git-tree": "6755840b50489b95087b94c21144300270813014", + "version-string": "1.4.21", + "port-version": 0 + }, + { + "git-tree": "ef5dff7ac71c02c2787310917d89778bce5b2406", + "version-string": "1.3.58", + "port-version": 0 + }, + { + "git-tree": "4ada15f7756b0d9c2b367f579136963ebab4b891", + "version-string": "1.3.15", + "port-version": 0 + }, + { + "git-tree": "52e1dfc53de2b0f66dc212e3acc1fbc7a6a1d248", + "version-string": "1.2.4", + "port-version": 0 + }, + { + "git-tree": "1c1682b10a345a4ec9b263c1f2421e5173be0260", + "version-string": "1.0.61-1", + "port-version": 0 + }, + { + "git-tree": "5269268896d55c8a0d8f04de0757e37133f20b19", + "version-string": "1.0.61", + "port-version": 0 + }, + { + "git-tree": "0a426cf5a8d5de394f31d2672f29fb78c2626a32", + "version-string": "1.0.47", + "port-version": 0 + }, + { + "git-tree": "4d41e1e89793bc5b18df6cf604cdbc81445078bb", + "version-string": "1.0.34-1", + "port-version": 0 + }, + { + "git-tree": "d39ebb54cfebceb23fce3f52ddfbafc34589e8af", + "version-string": "1.0.34", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/azmq.json b/port_versions/a-/azmq.json new file mode 100644 index 00000000000000..b2e502516cdc62 --- /dev/null +++ b/port_versions/a-/azmq.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "528140b63c42e48f1bc4aaf93a40f2233d8a2547", + "version-string": "2020-03-03", + "port-version": 0 + }, + { + "git-tree": "4fc0cb9a9049ada78b75273121818b08914a7741", + "version-string": "1.0.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/azure-c-shared-utility.json b/port_versions/a-/azure-c-shared-utility.json new file mode 100644 index 00000000000000..b1f90d9a30fd4f --- /dev/null +++ b/port_versions/a-/azure-c-shared-utility.json @@ -0,0 +1,134 @@ +{ + "versions": [ + { + "git-tree": "67f510493f8011d403918b4da617f970d9cff74c", + "version-string": "2020-12-09", + "port-version": 0 + }, + { + "git-tree": "4c625de7e91f3a5ee7436bab7f36808e3174a418", + "version-string": "2020-07-19", + "port-version": 0 + }, + { + "git-tree": "e0cadffece84a5453207e36695258e2035d7a975", + "version-string": "2020-06-17-1", + "port-version": 0 + }, + { + "git-tree": "4628674e9a38f1003f4366a8a6258514c2c53a01", + "version-string": "2020-02-04.1", + "port-version": 0 + }, + { + "git-tree": "9ad6e737af31d3f7d519c5672da9ff994a88ca92", + "version-string": "2020-01-22-1", + "port-version": 0 + }, + { + "git-tree": "e76ebdc7e003ea3ec5c1220fb5af21f4f4373bd1", + "version-string": "2020-01-22", + "port-version": 0 + }, + { + "git-tree": "679836f28df60473388c9b1da394fd3bde2283ad", + "version-string": "2019-10-07.2-1", + "port-version": 0 + }, + { + "git-tree": "e37ed048340182e819e3c379c8fbb4e43743bb2f", + "version-string": "2019-10-07.2", + "port-version": 0 + }, + { + "git-tree": "50520ec3d56f9edf54c164193613c41d0bea2827", + "version-string": "2019-07-01-LTS-1", + "port-version": 0 + }, + { + "git-tree": "857da91906824cab4591611fec1de7578cfea29c", + "version-string": "2019-10-07.1-1", + "port-version": 0 + }, + { + "git-tree": "00f6def9c33c61a51d860ac525994b9055c4ab57", + "version-string": "2019-08-20.1-1", + "port-version": 0 + }, + { + "git-tree": "cd7027588afbe8ec39fd9025833846517cb49265", + "version-string": "2019-08-20.1", + "port-version": 0 + }, + { + "git-tree": "0435e8b8e615631392475bc23a8d6ea32c17bfed", + "version-string": "2019-05-16.1", + "port-version": 0 + }, + { + "git-tree": "0d9589620702fea689795bb37ba86dc9c0cd5166", + "version-string": "2019-05-16", + "port-version": 0 + }, + { + "git-tree": "78dea6be920279e7f9738682b4fbf9bb275ae7b7", + "version-string": "2019-03-18-1", + "port-version": 0 + }, + { + "git-tree": "303085f40c9c765cdf66d83875f39ab01194cae9", + "version-string": "2019-03-18", + "port-version": 0 + }, + { + "git-tree": "9b62efe1b7bc66c9866315ad6112e1dafe78ccf5", + "version-string": "1.1.11-5", + "port-version": 0 + }, + { + "git-tree": "00cb4786f1169a7c22cadf20f98c792b4437903f", + "version-string": "1.1.11-4", + "port-version": 0 + }, + { + "git-tree": "40332ca7b7bcffc50305b79d983c68f021ab705d", + "version-string": "1.1.11-3", + "port-version": 0 + }, + { + "git-tree": "cb4ba8882b3b6ebadbe3956e58e774e3c440be84", + "version-string": "1.1.11-1", + "port-version": 0 + }, + { + "git-tree": "985ec32a265176922c5946d630e0be2445f9f0ad", + "version-string": "1.1.10-1", + "port-version": 0 + }, + { + "git-tree": "e00788fa9dd3fccfef5af9b0f1e47f29dcba03df", + "version-string": "1.1.5", + "port-version": 0 + }, + { + "git-tree": "f3d9eb6e853e637480f3055df8cb5187509bbb34", + "version-string": "1.1.3", + "port-version": 0 + }, + { + "git-tree": "f0f33cc67f8a097394805954c116428b06b86038", + "version-string": "1.1.2", + "port-version": 0 + }, + { + "git-tree": "a941f289fae7fcfd16b694d39d328ad6e3511cba", + "version-string": "1.0.0-pre-release-1.0.9", + "port-version": 0 + }, + { + "git-tree": "fdda2fa0e141399859515231fc360ca8ddf60ccc", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/azure-iot-sdk-c.json b/port_versions/a-/azure-iot-sdk-c.json new file mode 100644 index 00000000000000..4e77989eb34ca9 --- /dev/null +++ b/port_versions/a-/azure-iot-sdk-c.json @@ -0,0 +1,154 @@ +{ + "versions": [ + { + "git-tree": "d74324af317840ffb5c5aa54f1579ef2faab4a0e", + "version-string": "2020-12-09", + "port-version": 0 + }, + { + "git-tree": "9f3df818a2c11f1ff3cd08ae120a51ea3cee6de0", + "version-string": "2020-07-19", + "port-version": 1 + }, + { + "git-tree": "0be2c84c3e66aa2edd82864aa792b1d41dbebdcd", + "version-string": "2020-07-19", + "port-version": 0 + }, + { + "git-tree": "7a25f1e3d02b4eb7ec7110fd0e90ebca37a8fd0c", + "version-string": "2020-06-17-2", + "port-version": 0 + }, + { + "git-tree": "7a289a2df8fcb5e844e339f6e7140331532188b3", + "version-string": "2020-06-17-1", + "port-version": 0 + }, + { + "git-tree": "bf6fc7dd2473f26b4289c3f0a73e92a1c495b750", + "version-string": "2020-02-04.1-1", + "port-version": 0 + }, + { + "git-tree": "4bc8edb99e357d3b403331dba9b26e158ea09ae5", + "version-string": "2020-02-04.1", + "port-version": 0 + }, + { + "git-tree": "311aea20dcb9d5c799300ad53491aae614d808ab", + "version-string": "2020-01-22", + "port-version": 0 + }, + { + "git-tree": "b170755eee93c5fe19f70d720c067059e025b5c3", + "version-string": "2019-11-27.1", + "port-version": 0 + }, + { + "git-tree": "953cc7e3e5cc4418ca7d05e42c33100f4c526fcc", + "version-string": "2019-11-21.1", + "port-version": 0 + }, + { + "git-tree": "0e71a03764a86d5f9562b23d7eb5910c538f5673", + "version-string": "2019-10-11.2", + "port-version": 0 + }, + { + "git-tree": "d689c0fe5967ec4c806c2afa657fe38de305879a", + "version-string": "2019-07-01-LTS-1", + "port-version": 0 + }, + { + "git-tree": "b3aabfdbf4fa08d131af2ba0e671777b903fda67", + "version-string": "2019-10-11.1", + "port-version": 0 + }, + { + "git-tree": "3aadeec4f601503581fd3d8c699bba7ba53e8a5a", + "version-string": "2019-10-07.1", + "port-version": 0 + }, + { + "git-tree": "5874d9743da2f26c679a19877dff7e083d06bb21", + "version-string": "2019-08-20.1", + "port-version": 0 + }, + { + "git-tree": "ba8e85e3be7c7106f8203a650917d6ffaa19046d", + "version-string": "2019-07-01.1", + "port-version": 0 + }, + { + "git-tree": "296fe87f58018fa040fda8561e355c9caed83b07", + "version-string": "2019-05-16.1", + "port-version": 0 + }, + { + "git-tree": "18a24f4ebe62009734771b6f294f1104ead6c304", + "version-string": "2019-05-16", + "port-version": 0 + }, + { + "git-tree": "ceca4996aa20303fcdc5514ffc541121bc9fb166", + "version-string": "2019-03-18-1", + "port-version": 0 + }, + { + "git-tree": "510ab167e1507d21e7262222b989df0b8a5d098a", + "version-string": "2019-03-18", + "port-version": 0 + }, + { + "git-tree": "1aff5c53dc1341378225fc60e88a7a449a30c887", + "version-string": "1.2.14-1", + "port-version": 0 + }, + { + "git-tree": "3d7d4e4db5bccac0c1f4cbfe7c22fac0bd80eb1e", + "version-string": "1.2.13-2", + "port-version": 0 + }, + { + "git-tree": "efbcb2ec25b4eb70275154ff461b88516444234a", + "version-string": "1.2.13-1", + "port-version": 0 + }, + { + "git-tree": "0dd6d00aad65af3f3f4cef6f6c31ef36a2014b20", + "version-string": "1.2.12-1", + "port-version": 0 + }, + { + "git-tree": "3d88f6ac92bf4d917808273d441da9eb10d8d862", + "version-string": "1.2.11-1", + "port-version": 0 + }, + { + "git-tree": "e44b08db6ae01fe2dc7dfbdd54a35a9ed6b53ee0", + "version-string": "1.2.10-1", + "port-version": 0 + }, + { + "git-tree": "9d849a4587dc0b8488ed1f837d52c2f8e02af77d", + "version-string": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "714bc742002d224bc8356c64f756891b812b83ff", + "version-string": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "9149197625c7fdf70de9bda91ec9c2e55dbe8ff4", + "version-string": "1.0.0-pre-release-1.0.9", + "port-version": 0 + }, + { + "git-tree": "a5985efd11e9b382eb98916a3193e0bbd320fb7b", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/azure-kinect-sensor-sdk.json b/port_versions/a-/azure-kinect-sensor-sdk.json new file mode 100644 index 00000000000000..9a466c027b0180 --- /dev/null +++ b/port_versions/a-/azure-kinect-sensor-sdk.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "dfd54f8c9eeba870d560c0a157996357aeda331c", + "version-string": "1.4.0-alpha.0", + "port-version": 6 + }, + { + "git-tree": "20326da559a175eeff6bcffd4e019f846df30f97", + "version-string": "1.4.0-alpha.0-5", + "port-version": 0 + }, + { + "git-tree": "b351a4567478ee583e9f4deb60acd361579ef4ba", + "version-string": "1.4.0-alpha.0-4", + "port-version": 0 + }, + { + "git-tree": "e164dc694eff10a4032203b5bcd73afec7adae8d", + "version-string": "1.4.0-alpha.0-3", + "port-version": 0 + }, + { + "git-tree": "fe03af276cc717392f9116cdeb42960c4029a76d", + "version-string": "1.4.0-alpha.0-2", + "port-version": 0 + }, + { + "git-tree": "431a999f4c33bf8e25e3eac03acf45c6abb81d52", + "version-string": "1.4.0-alpha.0-1", + "port-version": 0 + }, + { + "git-tree": "ce50b6b24387a85d6d83988007a18a290a4ce3a4", + "version-string": "1.4.0-alpha.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/azure-macro-utils-c.json b/port_versions/a-/azure-macro-utils-c.json new file mode 100644 index 00000000000000..1d44e91dd95ef9 --- /dev/null +++ b/port_versions/a-/azure-macro-utils-c.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "5929e9b68ee080e5535eb12e48e182b04310ff0d", + "version-string": "2020-06-17", + "port-version": 2 + }, + { + "git-tree": "5f0ef9c1c4c9cae50a61b5f88497c3ca42146dfa", + "version-string": "2020-06-17-1", + "port-version": 0 + }, + { + "git-tree": "d6ae8d30c57b65db496154c80f8ca80992d5d1bd", + "version-string": "2020-02-04.1", + "port-version": 0 + }, + { + "git-tree": "1651a335030d25654378f8a3ae715ee40c424d5d", + "version-string": "2020-01-22", + "port-version": 0 + }, + { + "git-tree": "19841d0ff449cf59f69579d428e0e13572f6fb51", + "version-string": "2019-11-27.1", + "port-version": 0 + }, + { + "git-tree": "82ea324cb22549134cac1eaf5bd81916be6e8556", + "version-string": "2019-10-07.2", + "port-version": 0 + }, + { + "git-tree": "299721b78ac595310c35de9f80233ba604f27181", + "version-string": "2019-07-01-LTS-1", + "port-version": 0 + }, + { + "git-tree": "1f4f3443b1ed9d8051b10077c10fe0f1f4eeff0c", + "version-string": "2019-10-07.1", + "port-version": 0 + }, + { + "git-tree": "9d08ab1555940f0856e9dc339d30152a5242ca1f", + "version-string": "2019-08-20.1", + "port-version": 0 + }, + { + "git-tree": "2246a1b87f1e4147401c156928fccc8aca2e4889", + "version-string": "2019-05-16.1", + "port-version": 0 + }, + { + "git-tree": "05d3942ba6c1dd2d26eb8be9612308a337415a06", + "version-string": "2019-05-16", + "port-version": 0 + }, + { + "git-tree": "fdcc445c49e3c6ec45eedf634714baf7dbe6b0ec", + "version-string": "2019-04-11-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/azure-storage-cpp.json b/port_versions/a-/azure-storage-cpp.json new file mode 100644 index 00000000000000..d448c12603085e --- /dev/null +++ b/port_versions/a-/azure-storage-cpp.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "2f95f8b92596e23af8db61cd1b4e11a06078015f", + "version-string": "7.5.0", + "port-version": 0 + }, + { + "git-tree": "a959aee61eeba3a31e035f78118a0894b67a2bfb", + "version-string": "7.4.0", + "port-version": 0 + }, + { + "git-tree": "bc34d8e584b67a85f79264d0e259163a51680dcb", + "version-string": "7.3.0", + "port-version": 0 + }, + { + "git-tree": "0d153822a012b3b858eea2ef866ae6c9f0d60ebf", + "version-string": "7.2.0", + "port-version": 0 + }, + { + "git-tree": "099e98f46bf9a1360d6e139a391766bb4436e676", + "version-string": "7.1.0-1", + "port-version": 0 + }, + { + "git-tree": "91c1b8fcf36f2ba7e97f6724b77da2ef76fbb516", + "version-string": "7.1.0", + "port-version": 0 + }, + { + "git-tree": "c449a7819d020f486f971bba480e55faf3d2bd41", + "version-string": "7.0.0", + "port-version": 0 + }, + { + "git-tree": "3932b14ec40b79f338f8d9bcfa39250465df4a51", + "version-string": "6.1.0-2", + "port-version": 0 + }, + { + "git-tree": "d15a10ff5b204a33653cea5b1ab14373a3a93afc", + "version-string": "6.1.0-1", + "port-version": 0 + }, + { + "git-tree": "464ab45096c32986d063da8157de284b548ab108", + "version-string": "6.1.0", + "port-version": 0 + }, + { + "git-tree": "5604ed9c7a670dfb03415213318cf8830037b2b7", + "version-string": "6.0.0-3", + "port-version": 0 + }, + { + "git-tree": "72310adf4a4239bdc29dabb9b9c78954100f9eca", + "version-string": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "7e3b2c2691b4202f0f43ae2af11ff05691c865e2", + "version-string": "5.2.0", + "port-version": 0 + }, + { + "git-tree": "4cfca65bd62b171742e3c3ed55ca51e194f684a2", + "version-string": "5.1.1", + "port-version": 0 + }, + { + "git-tree": "a9cb3b3f2f17cc2608f31f6634b4772d8396787c", + "version-string": "5.1.0", + "port-version": 0 + }, + { + "git-tree": "ca6caf3d6959b308f6ca6b5c055d75d90aa64cdd", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "bf972195233f5b6c78874757b6b5590d8dafc9bc", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "8ad04fdbfe0e29af2ddc9ac13a443861ea05f6c5", + "version-string": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "c5a231ec907f5b18009a22725de36d5ed420ff6d", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "2cc5b2823c57a603b7ebc4f9a1f3c556d3bfd836", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "d24d43fa7d807cc0000f833fbfc07397d9bb864c", + "version-string": "3.0.0-4", + "port-version": 0 + }, + { + "git-tree": "ff41aa4982c80be4a9fec1b87055a636bf50df0a", + "version-string": "3.0.0-3", + "port-version": 0 + }, + { + "git-tree": "d547c4343ed3d21b28f1afa55bfca3cd06395e9b", + "version-string": "3.0.0-2", + "port-version": 0 + }, + { + "git-tree": "10d9f0c7e3110bdf5d6b317921c051b0b5536a57", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "770d68a119da409998480068b307d492eb98083a", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "c08dceda7dd8bcdec488a8e27f215d0785b46ad2", + "version-string": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "241728cab83f4a4bc8269cc5855d9f0ce2508bfa", + "version-string": "2.5.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/azure-uamqp-c.json b/port_versions/a-/azure-uamqp-c.json new file mode 100644 index 00000000000000..d1aeee8dc74664 --- /dev/null +++ b/port_versions/a-/azure-uamqp-c.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "096e993556ef33559bb27d42edea1fa75175f784", + "version-string": "2020-12-09", + "port-version": 0 + }, + { + "git-tree": "fdd8cf49346e6cbcbca1cb1d6e3b9b313e5e471a", + "version-string": "2020-07-19", + "port-version": 0 + }, + { + "git-tree": "64e118e5e32a279f64668774b5490b2245bc0141", + "version-string": "2020-06-17-1", + "port-version": 0 + }, + { + "git-tree": "489fd45170014fa7060cb1cf41e3373b4aae8b62", + "version-string": "2020-02-04.1", + "port-version": 0 + }, + { + "git-tree": "66b73eb2c1437238df11f923120d9dc27a0c1a41", + "version-string": "2020-01-22", + "port-version": 0 + }, + { + "git-tree": "bdac83317fff376ec6d776cd1cd0918251ce2030", + "version-string": "2019-11-27.1", + "port-version": 0 + }, + { + "git-tree": "8f41108d4bc7244e858ad55e613890f0ef6f6a3c", + "version-string": "2019-10-07.2", + "port-version": 0 + }, + { + "git-tree": "ef5e92210d614a96c3f4c53a87f8b46e5cb6c9e6", + "version-string": "2019-07-01-LTS-1", + "port-version": 0 + }, + { + "git-tree": "9bb33a228ba0c130c98af9f668c4d5bb663e39c4", + "version-string": "2019-10-07.1", + "port-version": 0 + }, + { + "git-tree": "3242d9517ef2c11c8285f26aeab648fb78b1fa79", + "version-string": "2019-08-20.1", + "port-version": 0 + }, + { + "git-tree": "5ebd59864582ae4af73544cebd27f0fe98f9cedf", + "version-string": "2019-05-16.1", + "port-version": 0 + }, + { + "git-tree": "8c350b5cf183bdaa721fc266b52e85dfce860b42", + "version-string": "2019-05-16", + "port-version": 0 + }, + { + "git-tree": "90abd689148e310756d3236418c5e3c2bae0cd13", + "version-string": "2019-03-18-1", + "port-version": 0 + }, + { + "git-tree": "4e96328de5eedc1ed9d3e0e3c6f754d1e3899014", + "version-string": "2019-03-18", + "port-version": 0 + }, + { + "git-tree": "b16d3d599d8af974b73d4b967e3904469ee3d0ec", + "version-string": "1.2.11-4", + "port-version": 0 + }, + { + "git-tree": "3bbcdf4aaed25fbb69bd228e8698eb2c925a7f1f", + "version-string": "1.2.11-3", + "port-version": 0 + }, + { + "git-tree": "3849017b4e91011aad79f5830d7ad9dc8639b62f", + "version-string": "1.2.11-2", + "port-version": 0 + }, + { + "git-tree": "62d4246e4511cd7ff8495148fa6c8f207eb97c05", + "version-string": "1.2.11-1", + "port-version": 0 + }, + { + "git-tree": "500be5e7dafb1174abe65edddcfa50d5ddca2506", + "version-string": "1.2.10-1", + "port-version": 0 + }, + { + "git-tree": "1c67aed1d764a1298111031d26ef499d7ba8d3af", + "version-string": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "a0cf5eeeaf0d1c9b9be1a80f04e4a999f00730b4", + "version-string": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "6c0930123a5b9044c5f5502a4205de12efc9164e", + "version-string": "1.0.0-pre-release-1.0.9", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/azure-uhttp-c.json b/port_versions/a-/azure-uhttp-c.json new file mode 100644 index 00000000000000..bb2a7115eaf1fd --- /dev/null +++ b/port_versions/a-/azure-uhttp-c.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "9a13676c37e46791196a860835b8695c80359a8c", + "version-string": "2020-12-09", + "port-version": 0 + }, + { + "git-tree": "513bbf277bea7cab05324f63fcf92c31278d0cd0", + "version-string": "2020-07-19", + "port-version": 0 + }, + { + "git-tree": "783ccc8f09a5b64a69746ea8347108fa4796acb1", + "version-string": "2020-06-17-1", + "port-version": 0 + }, + { + "git-tree": "cd299156829305f542f2a58f2c0ad1ae7fd6e422", + "version-string": "2020-02-04.1", + "port-version": 0 + }, + { + "git-tree": "cf8a101ec7b2eef153413450e20ee7302a9cb08c", + "version-string": "2020-01-22", + "port-version": 0 + }, + { + "git-tree": "272c0efc43af9ad96cbe02f6e8437dde2ad2e8ea", + "version-string": "2019-11-27.1", + "port-version": 0 + }, + { + "git-tree": "6f8347b504ec9b8a615adb6a8d101a64adccec2c", + "version-string": "2019-10-07.2", + "port-version": 0 + }, + { + "git-tree": "9e01150cda7d35c0c98a8735534eb3e3f5db8a7d", + "version-string": "2019-07-01-LTS-1", + "port-version": 0 + }, + { + "git-tree": "b5671c11fbf975ba1ac8c0b745a22b206a4d2620", + "version-string": "2019-10-07.1", + "port-version": 0 + }, + { + "git-tree": "ad7702d6c55d9555116160b4765559577d42e39b", + "version-string": "2019-08-20.1", + "port-version": 0 + }, + { + "git-tree": "baad42dbd22efc4700082fdc6f8ecded19e77443", + "version-string": "2019-05-16.1", + "port-version": 0 + }, + { + "git-tree": "79360ada83b099160f76196be323db8204c19272", + "version-string": "2019-05-16", + "port-version": 0 + }, + { + "git-tree": "021c7a7968aad7c8c6da668bf7f1de4108384743", + "version-string": "2019-03-18-1", + "port-version": 0 + }, + { + "git-tree": "de07eeb4d01a07d43d1a9a583f85165bc0c79d44", + "version-string": "2019-03-18", + "port-version": 0 + }, + { + "git-tree": "aed24bc3d18a7441a9cdac323dbaaff013b31b72", + "version-string": "1.1.11-4", + "port-version": 0 + }, + { + "git-tree": "a5c7c3c89f6d4f9a3e87e938693677393f60e339", + "version-string": "1.1.11-3", + "port-version": 0 + }, + { + "git-tree": "4a64e161a06d13036cc2f446e658a2cf9c47233c", + "version-string": "1.1.11-2", + "port-version": 0 + }, + { + "git-tree": "b113618fc27109974a70fce1cea2952bda002e54", + "version-string": "1.1.10-1", + "port-version": 0 + }, + { + "git-tree": "282b129f4560c46b74c9f2fb639e2d6d9614a804", + "version-string": "LTS_01_2018_Ref01", + "port-version": 0 + }, + { + "git-tree": "108d7ee321497da69e8f232e8234623ec31b860f", + "version-string": "2018-02-09", + "port-version": 0 + } + ] +} diff --git a/port_versions/a-/azure-umqtt-c.json b/port_versions/a-/azure-umqtt-c.json new file mode 100644 index 00000000000000..c07bf2c5711741 --- /dev/null +++ b/port_versions/a-/azure-umqtt-c.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "c49491f7d067b2c52a2751941b3e335c0e04eebf", + "version-string": "2020-12-09", + "port-version": 0 + }, + { + "git-tree": "8d51af6bf69894b2cca6adcb4de0054fad38975d", + "version-string": "2020-07-19", + "port-version": 0 + }, + { + "git-tree": "cc4c0ca6bd502a53e16cd65146b73f32fe31d078", + "version-string": "2020-06-17-1", + "port-version": 0 + }, + { + "git-tree": "939b7ea915b34711ae4833df3806a0f17222c029", + "version-string": "2020-02-04.1", + "port-version": 0 + }, + { + "git-tree": "3264926a34488626a31d70d335a5d4bd5ccba056", + "version-string": "2020-01-22", + "port-version": 0 + }, + { + "git-tree": "846ac1694e7431ae912a33335e8f92760acd3c0c", + "version-string": "2019-11-27.1", + "port-version": 0 + }, + { + "git-tree": "adfd8d739fcb9ab85a890ed891c3185009518063", + "version-string": "2019-10-07.2", + "port-version": 0 + }, + { + "git-tree": "688882c617afe5e5eea928511608c2d94ae996d6", + "version-string": "2019-07-01-LTS-1", + "port-version": 0 + }, + { + "git-tree": "17e9465a21add076539299d860fafb6dd28a5efb", + "version-string": "2019-10-07.1", + "port-version": 0 + }, + { + "git-tree": "ffd6ee62ced00cbb2a42c5ad55e3f0b45f5f295d", + "version-string": "2019-08-20.1", + "port-version": 0 + }, + { + "git-tree": "7d45115e43f9bebef8351e3ac435db6d1067c55a", + "version-string": "2019-05-16.1", + "port-version": 0 + }, + { + "git-tree": "b9e5ff88cbd7942410ad2c09a648e4e27f5d02ac", + "version-string": "2019-05-16", + "port-version": 0 + }, + { + "git-tree": "8b849ec32e01c06a30a6869401c17223e28e0911", + "version-string": "2019-03-18-1", + "port-version": 0 + }, + { + "git-tree": "550b9e414a6c150d0d7277077dc1376259b14101", + "version-string": "2019-03-18", + "port-version": 0 + }, + { + "git-tree": "e9a2eaa20c1b898db070849c169289ca00c4686f", + "version-string": "1.1.11-4", + "port-version": 0 + }, + { + "git-tree": "2a4566761f3818e5d409a3c99d130bd538db7c7f", + "version-string": "1.1.11-3", + "port-version": 0 + }, + { + "git-tree": "e2a526771e5e74100256ec2b3ff82277d29f972e", + "version-string": "1.1.11-2", + "port-version": 0 + }, + { + "git-tree": "0dce7fed719e84b0baf807fe7d969eb9e41e209e", + "version-string": "1.1.11-1", + "port-version": 0 + }, + { + "git-tree": "bbe2746e302cf5aae7af538210a81a1de7096b1c", + "version-string": "1.1.10-1", + "port-version": 0 + }, + { + "git-tree": "e99f3408eae3d4315315343407f8b9534508fd1b", + "version-string": "1.1.5", + "port-version": 0 + }, + { + "git-tree": "0324121e1997f31963da5534d6b65acd37799f7c", + "version-string": "1.1.3", + "port-version": 0 + }, + { + "git-tree": "73f1093a2b8a52a0b02a0851fbc380307ecb34dc", + "version-string": "1.1.2", + "port-version": 0 + }, + { + "git-tree": "7671c8b335377c2087158ac9077cf1a62c23c64e", + "version-string": "1.0.0-pre-release-1.0.9", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/basisu.json b/port_versions/b-/basisu.json new file mode 100644 index 00000000000000..d09db0db58d42e --- /dev/null +++ b/port_versions/b-/basisu.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "0645a595b0b20a3db1cd8fe19abc9e81c0c16714", + "version-string": "1.11-4", + "port-version": 0 + }, + { + "git-tree": "04ef2fd4d845551f7fd2fd5e53e98bce8a5e87f2", + "version-string": "1.11-3", + "port-version": 0 + }, + { + "git-tree": "a494d655f8774ec5b13548ed1d495cc36d8f4343", + "version-string": "1.11-2", + "port-version": 0 + }, + { + "git-tree": "14a1a4b19de73b57ba66094a54733f8fb83bfed8", + "version-string": "1.11-1", + "port-version": 0 + }, + { + "git-tree": "e8f3474c1d3f5a3ad53aea729c64f7c91f8bc68e", + "version-string": "0.0.1-1", + "port-version": 0 + }, + { + "git-tree": "e0cad9e36e3b6d558bbf1cbe6db49a7d44a5e9c5", + "version-string": "0.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bcg729.json b/port_versions/b-/bcg729.json new file mode 100644 index 00000000000000..07eb8c734a18b9 --- /dev/null +++ b/port_versions/b-/bcg729.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "666c71eec6573ef70d9f2630962511687723bb0e", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bde.json b/port_versions/b-/bde.json new file mode 100644 index 00000000000000..39c7f3214a82a7 --- /dev/null +++ b/port_versions/b-/bde.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b1182a3ba7b24edd58e7471796c1f157c9ff402c", + "version-string": "3.2.0.0", + "port-version": 2 + }, + { + "git-tree": "d25bfe5e576d146569520871134a5c6fecb16a96", + "version-string": "3.2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "0ee2aa4b9efbf8de1fc277f0064e6022fbfac778", + "version-string": "3.2.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bdwgc.json b/port_versions/b-/bdwgc.json new file mode 100644 index 00000000000000..4382f9415c740a --- /dev/null +++ b/port_versions/b-/bdwgc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d3fb7b17d683581e6f34599e0cc0295a7d315bb2", + "version-string": "8.0.4-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/beast.json b/port_versions/b-/beast.json new file mode 100644 index 00000000000000..318a6136a0a8b3 --- /dev/null +++ b/port_versions/b-/beast.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "17c08b9a2f5c67b9ab0fb3d231bb6d67af26a208", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "96c1896f31f03bb3cbcc6dc929b3339fe0cf637b", + "version-string": "v84-1", + "port-version": 0 + }, + { + "git-tree": "e1a868241c6382332cf8517844f6875102a3f934", + "version-string": "v84", + "port-version": 0 + }, + { + "git-tree": "1009f20a8e7bb16325e7d417f328050fc43f467c", + "version-string": "v76", + "port-version": 0 + }, + { + "git-tree": "c1788efff3acb96100ee071a1353265bc8a0d417", + "version-string": "v66", + "port-version": 0 + }, + { + "git-tree": "f9b9a887ec00934c88032d5bdc71ed765a205073", + "version-string": "v63", + "port-version": 0 + }, + { + "git-tree": "da69804ed4cf00f6d4bc41da99c58d41491c54b1", + "version-string": "v59", + "port-version": 0 + }, + { + "git-tree": "29778f7db1809ab37ceba1984949601a1f4b616b", + "version-string": "v58", + "port-version": 0 + }, + { + "git-tree": "7719ad1d340f47cb354ddf1a5b1cc8b5a68e2222", + "version-string": "v56", + "port-version": 0 + }, + { + "git-tree": "9047b144fc312b5a38a90c1d88ef431c08bf0303", + "version-string": "v55", + "port-version": 0 + }, + { + "git-tree": "c854069b8be8cd787a3c26d4a5a975df4556192f", + "version-string": "v54", + "port-version": 0 + }, + { + "git-tree": "ff3e24da713abac7593360e51f6d79e17bd30631", + "version-string": "v40", + "port-version": 0 + }, + { + "git-tree": "dc897bb38d39c0c5126faf56107d79733fcaed1e", + "version-string": "1.0.0-b30", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/behaviortree-cpp.json b/port_versions/b-/behaviortree-cpp.json new file mode 100644 index 00000000000000..2ed7ff7a11c113 --- /dev/null +++ b/port_versions/b-/behaviortree-cpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "450257131642541acbb14602fc6f2b2b83d1c2c1", + "version-string": "3.5.1", + "port-version": 2 + }, + { + "git-tree": "7f52ca5d5baec941483c0ea7d9729588ae4bfe11", + "version-string": "3.5.1", + "port-version": 1 + }, + { + "git-tree": "481770abcc1b466f5aad1f736cca3469e2928f22", + "version-string": "3.5.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/benchmark.json b/port_versions/b-/benchmark.json new file mode 100644 index 00000000000000..b50f650ab65720 --- /dev/null +++ b/port_versions/b-/benchmark.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "9edadb1ffe2869bf6c1b2271e89576e05234e9a5", + "version-string": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "c34c7f87fa809b48939739b8bc5f6c470183785c", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "40008da96f863b599bc4baf6a67b0098cd4f2f20", + "version-string": "1.5", + "port-version": 0 + }, + { + "git-tree": "cc0ead7fc8bd351e83e8b8bea18b873cef29a5d4", + "version-string": "1.4.1-1", + "port-version": 0 + }, + { + "git-tree": "6ced1b2d998cbdde77f5b714fb535e226ca54622", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "3d4ec76a11e75737766febf542994fd5378edbd4", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "18111d9e7da0117faf580770a6575d16df91df4b", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "8ccaa53faad37d6c5e7f77e44735bef80fc54c76", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "9ff9432ca00fa3dd59a08df178fdd77f0c3bea42", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "d77a75cf312347169a81037292d30ca3083b6534", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "393dcd92e077eb836e857158f8a75a54e78783ad", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "bf11e604384baf1f1ee1d8dbc2e32b6fa4a3e252", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bento4.json b/port_versions/b-/bento4.json new file mode 100644 index 00000000000000..2ab6aa653349b9 --- /dev/null +++ b/port_versions/b-/bento4.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "176077782d332c5366ab2ad4055bc76c62633d7e", + "version-string": "1.5.1-628", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/berkeleydb.json b/port_versions/b-/berkeleydb.json new file mode 100644 index 00000000000000..0d6a7c6376ab94 --- /dev/null +++ b/port_versions/b-/berkeleydb.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "e0ed5491b8a0001f97470f65cc9addf2c403f658", + "version-string": "4.8.30", + "port-version": 5 + }, + { + "git-tree": "d55b50f30f9ea89e25dbf8dc1befee3e7e375391", + "version-string": "4.8.30-4", + "port-version": 0 + }, + { + "git-tree": "1709618b935f9be25e82465f94db0fa6a0f90682", + "version-string": "4.8.30-3", + "port-version": 0 + }, + { + "git-tree": "41169c982c74f22b67fda5a3bd9410a0a0fc5539", + "version-string": "4.8.30-2", + "port-version": 0 + }, + { + "git-tree": "cfb04a51e793d0769c00dfc8674baa171af80f38", + "version-string": "4.8.30-1", + "port-version": 0 + }, + { + "git-tree": "cfa54d7bb62818caca88f109dc6b5381437545ab", + "version-string": "4.8.30", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bfgroup-lyra.json b/port_versions/b-/bfgroup-lyra.json new file mode 100644 index 00000000000000..0ed1493cdd90d7 --- /dev/null +++ b/port_versions/b-/bfgroup-lyra.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c4a41ae13598868ce4257c7791ea89665d8104b8", + "version-string": "1.5", + "port-version": 0 + }, + { + "git-tree": "5eeee80b2083f3e63aacae1232856638640e3448", + "version-string": "1.3", + "port-version": 0 + }, + { + "git-tree": "ec5bc3e16425d6cf7466cc28f64cad560d5f1601", + "version-string": "1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bigint.json b/port_versions/b-/bigint.json new file mode 100644 index 00000000000000..abca9e2ab1d8a7 --- /dev/null +++ b/port_versions/b-/bigint.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "00e038eff99864c2c73a807f0641c17e364547b0", + "version-string": "2010.04.30", + "port-version": 6 + }, + { + "git-tree": "3d92889fb018b73f520bde1a623db283838f5a7d", + "version-string": "2010.04.30", + "port-version": 5 + }, + { + "git-tree": "ece18a8ff1b53330cbde718bc977d16e83b3f752", + "version-string": "2010.04.30-4", + "port-version": 0 + }, + { + "git-tree": "b65e19d6308e31ce43180f125f08fb5d357c3de0", + "version-string": "2010.04.30-3", + "port-version": 0 + }, + { + "git-tree": "942ddfd589666b15e4113df6438078cd7a3931c2", + "version-string": "2010.04.30-2", + "port-version": 0 + }, + { + "git-tree": "687c95e2d8c5e4dd9df75df005c8920c788b4834", + "version-string": "2010.04.30-1", + "port-version": 0 + }, + { + "git-tree": "f051f0cf6a477a97b412bef03d3e80341149c7e0", + "version-string": "2010.04.30", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/binn.json b/port_versions/b-/binn.json new file mode 100644 index 00000000000000..506fd316bd3388 --- /dev/null +++ b/port_versions/b-/binn.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f572fc1577b9e8176015a54393657dfdfb245b78", + "version-string": "3.0", + "port-version": 0 + }, + { + "git-tree": "91721ef9120b0d8a6719858756451d6326bbd647", + "version-string": "2.0", + "port-version": 1 + }, + { + "git-tree": "df9576da4d413599e502f5ce9410128896a12637", + "version-string": "2.0", + "port-version": 0 + }, + { + "git-tree": "76b91d53b30719970a5668d6297e72c8f579cba4", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bitmagic.json b/port_versions/b-/bitmagic.json new file mode 100644 index 00000000000000..6c1ac9ce553a42 --- /dev/null +++ b/port_versions/b-/bitmagic.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f6b7d113e8f4ef1dd43faf316ee848f35fdf0ace", + "version-string": "6.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bitserializer-cpprestjson.json b/port_versions/b-/bitserializer-cpprestjson.json new file mode 100644 index 00000000000000..f3153a3f1cef0d --- /dev/null +++ b/port_versions/b-/bitserializer-cpprestjson.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "af219f0644caccabb3d8fc0908c70c6f216c6c7e", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "13b3133dcffccb176ecba66be6a09df4917ab6d1", + "version-string": "0.9", + "port-version": 0 + }, + { + "git-tree": "27d06b8e4fbcd8f39f90426559acebaf106925b5", + "version-string": "0.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bitserializer-pugixml.json b/port_versions/b-/bitserializer-pugixml.json new file mode 100644 index 00000000000000..5eef4f3026ab03 --- /dev/null +++ b/port_versions/b-/bitserializer-pugixml.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "35575e8e78a65d2ebecd065cdae32ad51b03cee3", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "046159738ddc292978f666bd4836f5c4beed1fbf", + "version-string": "0.9", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bitserializer-rapidjson.json b/port_versions/b-/bitserializer-rapidjson.json new file mode 100644 index 00000000000000..b78473a9d11730 --- /dev/null +++ b/port_versions/b-/bitserializer-rapidjson.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "6039c5207e9aef672cb2d9250761419d2e937e8d", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "c4e4b7defc05f1a2061a6882c2773f0670af7f82", + "version-string": "0.9", + "port-version": 0 + }, + { + "git-tree": "6366f9629d1a06de7b12a72b3bbaf9a4e60f1b4a", + "version-string": "0.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bitserializer-rapidyaml.json b/port_versions/b-/bitserializer-rapidyaml.json new file mode 100644 index 00000000000000..ca064dd7f10e00 --- /dev/null +++ b/port_versions/b-/bitserializer-rapidyaml.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "146cc1679c8fa5e740a3ef71cfbf2b3bf67e7647", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "6628759322670c36cee1164b50561e5b61d7c581", + "version-string": "0.9", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bitserializer.json b/port_versions/b-/bitserializer.json new file mode 100644 index 00000000000000..5e3fd467f69642 --- /dev/null +++ b/port_versions/b-/bitserializer.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7ad926d8d5b488348fb195aa2180443a986e3464", + "version-string": "0.10", + "port-version": 0 + }, + { + "git-tree": "529a84c174c81cf0d5b398ef74b780d5c48b4bc1", + "version-string": "0.9", + "port-version": 0 + }, + { + "git-tree": "d0f968ac3cd0cc6c8d2883e9917a97730f56d43b", + "version-string": "0.8", + "port-version": 0 + }, + { + "git-tree": "d3f5b741089ec695e2d088cf1d130823f1cddab9", + "version-string": "0.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bitsery.json b/port_versions/b-/bitsery.json new file mode 100644 index 00000000000000..3b4b91e96c740b --- /dev/null +++ b/port_versions/b-/bitsery.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b7b53af2d59fe702bcbefc77e31745f2a916afc8", + "version-string": "5.2.1", + "port-version": 0 + }, + { + "git-tree": "e3f91c87735a3cffdc76bc6da0b723cc5b4f2c3d", + "version-string": "5.1.0", + "port-version": 0 + }, + { + "git-tree": "d6e86f417c1729f51182a199b260c50398eb5a40", + "version-string": "5.0.3", + "port-version": 0 + }, + { + "git-tree": "4b3721d445e8dff8f26a93e6c5849bf94577e654", + "version-string": "5.0.1-1", + "port-version": 0 + }, + { + "git-tree": "899f3adebd9df6968c017ca9b87ff44a644f405a", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "e34ebee8cbfffd7a4b05a07df93f476e916ff146", + "version-string": "4.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/blas.json b/port_versions/b-/blas.json new file mode 100644 index 00000000000000..7fb01927b6b3e0 --- /dev/null +++ b/port_versions/b-/blas.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2877c1693c63195d4edacfb42156c9d8874ad046", + "version-string": "1", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/blaze.json b/port_versions/b-/blaze.json new file mode 100644 index 00000000000000..9181825c9be027 --- /dev/null +++ b/port_versions/b-/blaze.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "0929cccabaf3511161aa06789a414a2937629679", + "version-string": "3.8", + "port-version": 1 + }, + { + "git-tree": "0a3d771a22aa157efa6509d71ca490c0837245ba", + "version-string": "3.8", + "port-version": 0 + }, + { + "git-tree": "030ff934e5ec3edf938b5c7af9ee2d0aaf2312a3", + "version-string": "3.7", + "port-version": 1 + }, + { + "git-tree": "31cd07691fc311e7162d87a5fa3a9c57c1394a45", + "version-string": "3.7", + "port-version": 0 + }, + { + "git-tree": "c8c9bc05c29ce0eb5f92c342f55769350f3b05cf", + "version-string": "3.6-1", + "port-version": 0 + }, + { + "git-tree": "601997a4170c6ae1c3abc833b9903ed3d8e76074", + "version-string": "3.6", + "port-version": 0 + }, + { + "git-tree": "0c07a59546a7c2c5f1192e0bff318c9df2ce248c", + "version-string": "3.5", + "port-version": 0 + }, + { + "git-tree": "3f72a5942a99dd91142e5abdc1baa783330b127b", + "version-string": "3.4-1", + "port-version": 0 + }, + { + "git-tree": "f26995e1fb9fe7e85ce58eca839126c280b6e46e", + "version-string": "3.4", + "port-version": 0 + }, + { + "git-tree": "d00bace3480f1f01ac244f1d0a81588f1bbfa8ba", + "version-string": "3.3", + "port-version": 0 + }, + { + "git-tree": "637fc709acbb54db8d3cfbb6f3ac10ec93870ed2", + "version-string": "3.2-3", + "port-version": 0 + }, + { + "git-tree": "e472a441bdfffb537058d7aea7c67e3221053c38", + "version-string": "3.2-2", + "port-version": 0 + }, + { + "git-tree": "1e22d37bf1c1ef3d5f76d12d917f30d39da28897", + "version-string": "3.2-1", + "port-version": 0 + }, + { + "git-tree": "15ef5588a761e515cf91f2527cffe3f9f9387f03", + "version-string": "3.2", + "port-version": 0 + }, + { + "git-tree": "d2ec68e6acec03edbe7a55b3fa317f104e74c859", + "version-string": "3.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/blend2d.json b/port_versions/b-/blend2d.json new file mode 100644 index 00000000000000..209b23d55100af --- /dev/null +++ b/port_versions/b-/blend2d.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "7772d070a8aa7b0b06508ae45bb3c22e9bbe774f", + "version-string": "beta_2020-08-24", + "port-version": 0 + }, + { + "git-tree": "ffce764b880d8cc24e3b00328aa3861f15bae91d", + "version-string": "beta_2020-07-31", + "port-version": 0 + }, + { + "git-tree": "03a43f03eb0cab95aac27a77b71273fc4aa2e94d", + "version-string": "beta_2020-07-09", + "port-version": 0 + }, + { + "git-tree": "4b67e6ac18485e7209ec86219d16ce3659446e8a", + "version-string": "beta_2020-06-01", + "port-version": 0 + }, + { + "git-tree": "085240b75db115d9a8506dfbece3654c747695ef", + "version-string": "beta_2020-05-04", + "port-version": 0 + }, + { + "git-tree": "e5803599f8a8cd230e2c47c0621730fe68621c2e", + "version-string": "beta_2020-04-19", + "port-version": 0 + }, + { + "git-tree": "98f049cf4d0022cefd9d47a7e8610bba0cab3c0e", + "version-string": "beta_2020-04-15", + "port-version": 0 + }, + { + "git-tree": "142a63cd15830f4bdd62eafbca53a526449cfeaf", + "version-string": "beta_2020-03-29", + "port-version": 0 + }, + { + "git-tree": "bacc881cce92ba0f700fa1979b338a523d31b2f5", + "version-string": "beta_2019-12-27", + "port-version": 0 + }, + { + "git-tree": "ce604b67ae70294390e5563df15fe6cb2cf53b11", + "version-string": "beta_2019-10-09", + "port-version": 0 + }, + { + "git-tree": "aa93039c5b51abe4372278bbdfef33ebb3726fc2", + "version-string": "beta_2019-07-16", + "port-version": 0 + }, + { + "git-tree": "52ab0ec1c89dd5b33dbd03678034e772c36474d1", + "version-string": "beta_2019-04-30", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/blitz.json b/port_versions/b-/blitz.json new file mode 100644 index 00000000000000..390f6e869b2189 --- /dev/null +++ b/port_versions/b-/blitz.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "5cd50e6a9001065a85965fd67c63304912ca902b", + "version-string": "2020-03-25", + "port-version": 0 + }, + { + "git-tree": "2412730aa808b2aae82af8b0f79c79e24b7bacc6", + "version-string": "2019-09-26", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/blosc.json b/port_versions/b-/blosc.json new file mode 100644 index 00000000000000..4393dca06cfa9f --- /dev/null +++ b/port_versions/b-/blosc.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "117ae787801719558e153574030647da9fc16cf7", + "version-string": "1.18.1-1", + "port-version": 0 + }, + { + "git-tree": "0cecc386e1baf145470db8b70665961eec9e9747", + "version-string": "1.17.1", + "port-version": 0 + }, + { + "git-tree": "da134ec965f1cdb754429bed31f5791e7664c285", + "version-string": "1.17.0-1", + "port-version": 0 + }, + { + "git-tree": "901567081986ac0c6c0439eb3051362d3eb76712", + "version-string": "1.17.0", + "port-version": 0 + }, + { + "git-tree": "d4d243af848ef5d98e8dcbbb4c321d93d24e5b7a", + "version-string": "1.16.3-2", + "port-version": 0 + }, + { + "git-tree": "31cddb54ae5c7610884c84368d7c4397c78fee76", + "version-string": "1.16.3-1", + "port-version": 0 + }, + { + "git-tree": "b23aeb29445076d710423ebbae55bc3450fdb69c", + "version-string": "1.16.3", + "port-version": 0 + }, + { + "git-tree": "97e82fc8da36b2ecd4660ed9cbda3a2c2d8225fe", + "version-string": "1.13.5-1", + "port-version": 0 + }, + { + "git-tree": "5a5ca69dc95323c180acf87676eb9f5107c74828", + "version-string": "1.13.5", + "port-version": 0 + }, + { + "git-tree": "c2403773d4b9e8c8146534ba2581806fab2da116", + "version-string": "1.12.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bond.json b/port_versions/b-/bond.json new file mode 100644 index 00000000000000..d4c2879d564df5 --- /dev/null +++ b/port_versions/b-/bond.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "bde4f6ac4c95a05f823e8de810f57df015738ac4", + "version-string": "9.0.3", + "port-version": 0 + }, + { + "git-tree": "296d1334803fea55c08752d656a60c70c53ae600", + "version-string": "9.0.2", + "port-version": 0 + }, + { + "git-tree": "80d1a672e033ad1bf2f1551f46e42f4daaebcb6e", + "version-string": "9.0.0", + "port-version": 0 + }, + { + "git-tree": "499ddc4155f82ac0b3e42f01cba694660778aa40", + "version-string": "8.1.0-4", + "port-version": 0 + }, + { + "git-tree": "9414919f360dd7837bb1c584ace15ad2212b664b", + "version-string": "8.1.0-3", + "port-version": 0 + }, + { + "git-tree": "7b3c4a2299a891b66e71e1d1db9434dbaecd792f", + "version-string": "8.1.0-2", + "port-version": 0 + }, + { + "git-tree": "b3d448758eb450af042c8bc054e65d9f9bd784c2", + "version-string": "8.1.0-1", + "port-version": 0 + }, + { + "git-tree": "af8ab5c553049c589bc6ad65a9de3640a04df6c8", + "version-string": "8.1.0", + "port-version": 0 + }, + { + "git-tree": "ab2bf47ea2bfd5e792aa269b982a9a43879d652d", + "version-string": "7.0.2-2", + "port-version": 0 + }, + { + "git-tree": "00722ab36c76488de79d06c23752157b0b462e38", + "version-string": "7.0.2-1", + "port-version": 0 + }, + { + "git-tree": "5f6299740eb7b94ec88c3e02990b4f2090c82714", + "version-string": "7.0.2", + "port-version": 0 + }, + { + "git-tree": "4eae9ef01bdc97bac6d4d950b32444bef5411beb", + "version-string": "6.0.0-1", + "port-version": 0 + }, + { + "git-tree": "b7540e50de294b554b594249161801d7821356d6", + "version-string": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "4b01091acd27382258e2a3696bdde3a23ffa0158", + "version-string": "5.3.1", + "port-version": 0 + }, + { + "git-tree": "3b0d66a75c2119cbea37fd7553e796b7f84f69fa", + "version-string": "5.2.0", + "port-version": 0 + }, + { + "git-tree": "e31c6ab00354074e55dbb06bd9c8fd7878c38dc4", + "version-string": "5.0.0-4-g53ea136", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boolinq.json b/port_versions/b-/boolinq.json new file mode 100644 index 00000000000000..482b28417be3af --- /dev/null +++ b/port_versions/b-/boolinq.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "29ffea33c381e00d2728bc3cb97fbbc0b669547a", + "version-string": "2019-07-22", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-accumulators.json b/port_versions/b-/boost-accumulators.json new file mode 100644 index 00000000000000..f916e3c4f3e357 --- /dev/null +++ b/port_versions/b-/boost-accumulators.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "5b1b9c1e8dbb75740b1795ae712e8a4612e91c58", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "2f5cd36c753176957adcdc9415f7fc3f16b1fef8", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "2ebc0372de20817fb72dd042ee3e574241d399b6", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0e60d48bae391a4498520834fa606c5f122a75ed", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "cb6ed4faa7aed8e72f40cbdbec477cc1333b86bd", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "c9906574c83dd3d152989c733819eb9f791df0de", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "dc755bca2ec376d006691ce2a72bb84d10c2e5ba", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e1a48ebe8c8b4c1e3b2a95125340e30bc6ee51e6", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "77b9a480f702f25f27ef8a804b2c9e179679ad6d", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "53a2e90bd350f75ec72b9be3d1bb7d7579b0eaae", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-algorithm.json b/port_versions/b-/boost-algorithm.json new file mode 100644 index 00000000000000..04901523949df1 --- /dev/null +++ b/port_versions/b-/boost-algorithm.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "c720beaff3f3325f63ed3c0d76bfce956e2d9442", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "d89bcd64693c86a2721ac96a7184d06c0ea2e720", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "176da63bb34d5d5d244103f938f4c5acee267671", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9b5645315be80f6998ba7e76d0ac3dc3be5743e8", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "160e392c44f4ecae9d3fb796d1f55b7cd6f574f5", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "cbb4255f2568bd50392989d2da11c11b0ffde059", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "047689ce9696334a44323e3aa2b0ee5cadabb76e", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "b9d62e0bc21550e9d55fb216ebe6f010af92ba3b", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e28334868b9c5aba6b126d51edba9decb758c37d", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "48b43af95bc43e02edb114f0b544e5584ed57638", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-align.json b/port_versions/b-/boost-align.json new file mode 100644 index 00000000000000..da2cad1dca9ba7 --- /dev/null +++ b/port_versions/b-/boost-align.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "9f77d89d4c76cf998be2d4f15aa922e04f233f1c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b65eace9d2a5a9e298da6abd40633df2ba46b1a8", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "69bd6d3868596f19f979c61cc518f323a997b9c7", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "c07aae49296c7c1f08bd8b02e170fc33891d55c7", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "09b5fa93236762ff898b0b44445699887d78cc20", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "c7d72a5dcd40e19dd8f30b1ea3dab4eb5e21dd31", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "fc272586f6caf54a8752c73f92b09eb4b75ba59b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e6e410db21abed895f60babfd235ccd35d186ae1", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "8f3177dceea4f3ae2c29b83fc6bc9ff9f974b767", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "fc9baf9d5614a9f460b2abad0eab46f7db130829", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-any.json b/port_versions/b-/boost-any.json new file mode 100644 index 00000000000000..54e0c539b4771b --- /dev/null +++ b/port_versions/b-/boost-any.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "c78437716768273f86dc2f9132d865a0f44a0971", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "8f13f67a837750f79e1b782e1ac3e35e26973f9e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "4f6a1fc711bdd94605a8f9d1e4e877e33c3fac87", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "68134dd58df425dc6e74d94d1a691402370006bc", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b080fd24eb6dd9182790060b2715de33f6a960ff", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0fb6e10a37900d07bca38b3b7152f79c2bcf9859", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "3e8417759ed1d22a1954d055d49d86fec3ed5ccc", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "a833cfc69ef4338fb9924cf6c740a3573a508626", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "a845fa017dd11c5f284c52c51558d643dafdb3dc", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "33ffc0547d8b52cd92a0af12c481e5d8b6dbc59c", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-array.json b/port_versions/b-/boost-array.json new file mode 100644 index 00000000000000..6a3a3ec2cf83c2 --- /dev/null +++ b/port_versions/b-/boost-array.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "5cc33df23211b2d4a2ed7b0b563140ddd74a7358", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "bd44c0793f910cfd8421c6689284084782426640", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3d0f10310e0895562576b582eeafcd5265cf3caf", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "b97252c681d83ede6ae390c45e289c3f25265fc6", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "5ae8d7039eaff7005f55d50bd803cfba15bfe75a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d27628d9a0832fb99c3adb78cc1807b5e4ecd7ac", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "6e914ef7dbe4e53d9f0ce560b244b15527b5b3b3", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "6a079c0d561c1cc583e4e28d598d0342e8b65a18", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b5def50edec8f2033f17ba1b1796cdca78346a1f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5a20baa7c5b08995b78ff4cb123206d08cb15e85", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-asio.json b/port_versions/b-/boost-asio.json new file mode 100644 index 00000000000000..8000bfd27b1527 --- /dev/null +++ b/port_versions/b-/boost-asio.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "43233c66944ac53a423bba45a46708a308d786e3", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "06479d413007b9c36b25b67276fea3b4d297a62d", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "afcf84f3c1da251f42c2efa2507b6f727315b03e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3e50713661351f5e710f78832367be066507ace8", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "9a6beeb70a04892bca2119db641701ef9cece96c", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "e47eb6b1747ba6675826dcd315c350c1cd8a68d2", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e36d8d7f01e8b6a893f1ca5516df5f6b70908059", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "8c4d5979549147317924bf641fb2cb3a7a926469", + "version-string": "1.71.0-1", + "port-version": 0 + }, + { + "git-tree": "8f730c9bf4fcc233ec5a43c5584c9694cc2f3916", + "version-string": "1.70.0-2", + "port-version": 0 + }, + { + "git-tree": "976690d3279a285d3a688e55230b1713ff200d4f", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "1540dccd31812ea9ef217276cb7e5700eed486d9", + "version-string": "1.69.0-1", + "port-version": 0 + }, + { + "git-tree": "72d6518ae8e319be7e4362b4e57bcc60b1f7d2f1", + "version-string": "1.68.0-1", + "port-version": 0 + }, + { + "git-tree": "d7dace27d51c1a44a2c8e4f1449e5809a6602351", + "version-string": "1.67.0-1", + "port-version": 0 + }, + { + "git-tree": "c2685d2878d579296d184012d65743fd8f776a2c", + "version-string": "1.66.0-1", + "port-version": 0 + }, + { + "git-tree": "e620c595110e6dfaa4a88240ce6b20355f0543c5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-assert.json b/port_versions/b-/boost-assert.json new file mode 100644 index 00000000000000..a91b00d33b2729 --- /dev/null +++ b/port_versions/b-/boost-assert.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "3393715b4ebe30fe1c3b68acf7f84363e611f156", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c52a60adb19dab70d7a42243d0039e675636b320", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "af7d1f9f7cc7833920bcd8bbac4374ea9783fa27", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "6754398591f48435b28014ca0d60e5375a4c04d1", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "19af4f81da14dcc3a10204bbad1137b72bbd583d", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "c15b043ae043bc75504501011ecbb7ad572993d5", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "8c4b239444789a6989049a561a3ea8db1f48f922", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "9d4646a6f8b42cd5654efb937647138d6a6d09b6", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "9d040cab6a01efc5c9dfbbf51247c7813eafc897", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "51b832c056165ab81038f049e5a3f763043b194b", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-assign.json b/port_versions/b-/boost-assign.json new file mode 100644 index 00000000000000..8b0b744625abcf --- /dev/null +++ b/port_versions/b-/boost-assign.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "593134d9603cdcd0232608aea11c4969df7f5b1f", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c5719c39013cff915d04188ed303d58a661b7d70", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "e660b231334f1e8c9bef6e76e469591766798034", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5bc1de2c6a4546617aafea575e6f46f1f0d8dc33", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "9c04d48b4379b4a2ff84a41547ce0f487d6ca906", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "39cc9ab15940475ef8d3ca13e5809f502f956f2c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "9036e3fdcf5ec728362794dabb744c831c53f57b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "7b04ec83d57b909f329a8bdebe74fe2b68fa1af3", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "edffce8092141c444c5151c354fd21361157fa98", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "3f087c838fb1eec9cbc0c6dfaa289efafd0a1de4", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-atomic.json b/port_versions/b-/boost-atomic.json new file mode 100644 index 00000000000000..d66b38eb8f7a87 --- /dev/null +++ b/port_versions/b-/boost-atomic.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "4a0c37b7c48d8ca93df2c83b8bda9f8256f63513", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b5d964f865b163273f26f176b55b2fe9681f50b4", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "df43a48b5d3a1d0398623be79069d6d7a0033573", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "c11ae99a61b31eb7b4af415eee74fcd1af694db0", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "fdae922070632ca60b0e3b3e7b35c0ec302a0b14", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "7fbd1f36be3b3af96dfc4521fa0f0f4f3b518ed4", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "ce6a2fd5e15e6d0eee4645a20da85a6ab41b186d", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "f341ae516b70d185b82dd9f306ca130fbb490ad4", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "6ea50a53f5359ca089e75f77fc4b9d46de5191fb", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "db1fbe5d1f4641922f8e2a4225112116f11bc3af", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-beast.json b/port_versions/b-/boost-beast.json new file mode 100644 index 00000000000000..2ee59827ce49fe --- /dev/null +++ b/port_versions/b-/boost-beast.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "cf5aa1fd8b53f127b259d919c0bbf4659d3196e0", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "ce54cf1adba89aa745d0eac8c494ea813a3d5a3b", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "5c381f5f35e94e3a53f5d59ff18b8f26aa50e349", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "4343a247cb428a1b78b68779b6adfa983be25b65", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9c16d29f96479caa74ba595f380999fb699af91e", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "4a770bc4000f070d01821d8ec1838a5af00ae39e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "6f1c53bceb4056846bfd31e5dd474d20a40b8237", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "e97b76d5d7f98483d8ae3e23be4feb6db16b7be8", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "eb6165654c32c389c0369f23ff6f52db585732cc", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "5dde2f28dcaa5246b97a895cb499e6000ed4625a", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "4bf27532cf1595733470b0e2f2e4b471275fed5f", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-bimap.json b/port_versions/b-/boost-bimap.json new file mode 100644 index 00000000000000..765ede68ba247c --- /dev/null +++ b/port_versions/b-/boost-bimap.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "ca2e28851246c3fcbba2e8c5b36ba2b1e43587a7", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "070dcbecc7424d9777c9c94397e22975c7af9319", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "eaa15dae5f8c4ad5bea8312d9d2c3747427600c6", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "fd928fbeccf53880cba623ecfae968943aabfa88", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c44b8b94b80f0162d84cb4fdb2fa15a15acf5c0d", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "dbdd1f50e9b40d31ef700d68e4d6756e068123e0", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "1d714be52c5d0b421fc19a58200c252c885e84de", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "44a0b3fbb3ca6549e00f733c9ca64600f26613f5", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "f375a908d3bb0633b7758ea359fc6b47ecd9d007", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "98e89f9b3156cd060f0c2be0764e17c39a9aa05b", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-bind.json b/port_versions/b-/boost-bind.json new file mode 100644 index 00000000000000..b7822f37ccbb75 --- /dev/null +++ b/port_versions/b-/boost-bind.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "110fc6710128cce06256143e5c2df83bf3060a42", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "5a9391097dd5644a6b902c54d86a394719dbfb37", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "65a63dc4317fcd9402caf3311dcb45bf850cecc1", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0e96cc4cb23ad980a1674dc1b4e029c24f7b4a47", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c1da8316d401da955e5a128322ae35d941082dc2", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "6cab60787204287b8b9f3303c35e64ac33cd4496", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "c98fccdb43cbe8eb529413b5e16a7e2701224d13", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "63f7d8110fef3b12fc29428e12d23f4c1802f11d", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "1b75e5fd76c80a828177c37881a98afb53d6a6c8", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "93cc104912be8400a1128b24152c6e202929f11d", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-build.json b/port_versions/b-/boost-build.json new file mode 100644 index 00000000000000..554ae0c58a9f76 --- /dev/null +++ b/port_versions/b-/boost-build.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "f6c7fe38fdff5e1a5d4ffe9e9fbc7efe0f7e01d3", + "version-string": "1.75.0.beta1", + "port-version": 1 + }, + { + "git-tree": "bce0d26494d48d983b9b0e552e661f2d0dd36074", + "version-string": "1.75.0.beta1", + "port-version": 0 + }, + { + "git-tree": "727c3400fff7c138685446c6f376211b4f5eca27", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "60c33b1ff1ce49acd675eab581ea75b2c47b3e1d", + "version-string": "1.73.0", + "port-version": 4 + }, + { + "git-tree": "2d6e98097126d9260a67301b0f6d216aafc7373f", + "version-string": "1.73.0", + "port-version": 3 + }, + { + "git-tree": "76e980f33124dd0d7b59aa3b46715dd0451baff2", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "9e4a505b1b099566aba67e432117597106eb55bb", + "version-string": "1.73.0-1", + "port-version": 0 + }, + { + "git-tree": "7adce9cc7f1895945d50e62fbc4931d7c9eac653", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "fd5a7cbab5f0950a8837faf3274349438fdf16a0", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "71dd8bdd4d6cccbfb313df02c5b91f1708591f39", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "c8d848cca27ce0684091f6172f239010d691ef03", + "version-string": "1.69.0-1", + "port-version": 0 + }, + { + "git-tree": "98d3243a531892e9b8364f7b5ebd22026a615bbf", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "a9f1262d1f02144c7e2679971079d2ca7996eaf6", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "c97cb58d831d637ef85e3dbd0f0c852fd573a5d1", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "8ab758023950242c3eba841c57bf898b9cfd03d3", + "version-string": "1.66.0-8", + "port-version": 0 + }, + { + "git-tree": "b89da20a42524a47cabacc4f3958cdba993177e5", + "version-string": "1.66.0-5", + "port-version": 0 + }, + { + "git-tree": "f95779327492afdf6e54a6100abef5f2a14f5914", + "version-string": "1.66.0-4", + "port-version": 0 + }, + { + "git-tree": "b2a0b243604ddd018ed13999a4f3f5a9b6b73be6", + "version-string": "1.66.0-3", + "port-version": 0 + }, + { + "git-tree": "d83e7a452b8eb80d9bc0c88db6ea6a508ea0fa2a", + "version-string": "1.66.0-2", + "port-version": 0 + }, + { + "git-tree": "1d84503651e93f119b56c6729f6d10d586d181ed", + "version-string": "1.66.0-1", + "port-version": 0 + }, + { + "git-tree": "b7f6d8a9687e18b558f9902a2f732f4f7ea19e9b", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-callable-traits.json b/port_versions/b-/boost-callable-traits.json new file mode 100644 index 00000000000000..aa3cfb2628691b --- /dev/null +++ b/port_versions/b-/boost-callable-traits.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "7f76365f342942ba11c0c1352434d980dc905f13", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "a9680f87166c2c0f05400f323b51189240d4f21d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "135048bd0ce2c6ec9341109ed4b56f38f61a9dea", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0ee3af44715fc30b9072ff39a4bd73ac1b60ff21", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "16fcdb42ec27af3cae676c9572ab23c4f8edd06a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "76f1d85cd9cdd09c5bab78bc72f708f3c5fa4eff", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "c132abcab0025075459d8200e776223c627b43e8", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "f0c7df368f22ff112b99bbcfe1923cbbc9b82b36", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "d1a91d13ebc508fc0f5a17664431df4860340158", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "158b00daf144ae9888cce40de2d25b1a2712ae7c", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "6b95b527e8e5a1caccad0b52edc98bbd5ad4c5c6", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-chrono.json b/port_versions/b-/boost-chrono.json new file mode 100644 index 00000000000000..c678bac8e6c2eb --- /dev/null +++ b/port_versions/b-/boost-chrono.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "ab63f094dd2f18ed66be7513a412896cddf83a2d", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "4db91fd0fd0ac86a6ad9bed143d319715b4625d8", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "e432ac49efc4b6f3bdc79e1074dae8ac1232ca32", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e9780fbc28e70bb37521bdc544039e6d0ea21f0e", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "cdf23f284069eef2195519e94a15509ad3819c97", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "dd04b900019af0043d0e550f865856313dced71a", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "5f131c619605fc5d37267e2761fae0fc52cc6b77", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ee07fabd3be87648f24b47047af1043f3bafbf4d", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "2f6f0e422e7dfc47e4202ca1ff6a83e6f4f35d76", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "209c9e52d5d04c140b63ff5dd36eaf5876592e44", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-circular-buffer.json b/port_versions/b-/boost-circular-buffer.json new file mode 100644 index 00000000000000..311c0cc4d7f9b3 --- /dev/null +++ b/port_versions/b-/boost-circular-buffer.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "b3714023e5d74d66c24ef7aad21acf08146cb200", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "a363ba35a54953007e71a9b5a8b9502937e3463c", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "9be9ea26e4b2143aab087a9bc6e8bf0b74dd387a", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9118debfb3c75cec047c3d368ecb8f2aaae951b1", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "2da9399e3379be6168fec2f9a61b004fa27df964", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "01bdf72e07636610711a54286a413ee2432229fa", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "499ddf8c7e0952be418544105ce9da94b903b911", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "fd3e46ccab176fc064bd3fcd3f6c2d95534d2a14", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "13e1e09d210b64f4270ea6f7d688f3ac97174a3c", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "3ffb910efc83c838b16090423e689b40aa3886e7", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-compatibility.json b/port_versions/b-/boost-compatibility.json new file mode 100644 index 00000000000000..8fbd1de76d96a0 --- /dev/null +++ b/port_versions/b-/boost-compatibility.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "cda5675366367789659c59aca65fc57d03c51deb", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "a7812edda8e2159ecd422f18eaad6d2f0cb30346", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "59f8965026f47cd2849c90088405b3eee08d6c82", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9893ff3c554575bc712df4108a949e07b269f401", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "85c3b6d7f9c6ca662146e9800193a6424d8db9da", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "3645b2c8207a79ab1af3336fadf9ce60f26fac82", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "f21f62a1fb65e9761135d8816c820b31df3440ac", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "141c26d5ffa0ed3890f6c042dc47c33a7c65e564", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "5b7956d33159d2758ac93a3a57f57369ce8c45ca", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "dceaba2b169f994a4e99111c9d116c94c6fcbdbc", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-compute.json b/port_versions/b-/boost-compute.json new file mode 100644 index 00000000000000..412e344161d8d3 --- /dev/null +++ b/port_versions/b-/boost-compute.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "37841dcc219f46d503d6c8d6710e759583403020", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "0238cc1bd703254e03ae7cc4a608e230b140a21d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "a7f516597efbc2b0c69635eb07408320c709af3b", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "227af17d6242c305d1294bb57bd9998ec95c337c", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "6ec5b08fcdf83cb6dfae75a0309016ede6ce59d9", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "1a6d79a0666aac975d793b3f582e785e6c06f644", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "088f8118eebaa586edbd1b4be581abc230c1e4cd", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "8ca65a85a685d12959ee8f5d79d08c4ab98df2b3", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e8e6e437212bce0e2950e4281b5131386b410b51", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "9ebfe4d0db5bbc56a1668a4f43f70cedb1f2e0d5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-concept-check.json b/port_versions/b-/boost-concept-check.json new file mode 100644 index 00000000000000..8c0f92908b2cea --- /dev/null +++ b/port_versions/b-/boost-concept-check.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "d3dcbf8caf23130b9b3bdbe0f896d4db4b87e362", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "1e2aa4a271954658330692be62864abcb2758583", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "ec5b225fdc18752612792c659575b7763ac5e716", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "f126ad738a7460d171920e15862378e158e678d8", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a06d7260df33a445dc2aaed9416d40f9dc462edb", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "15721dd0909c768e8acaf2528a159c1722d003c9", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "a6d304fff5328aa1004287e42d9c43d49e8b3eb8", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "a2c0de8c906bc109a708cc104a62380a0c223e67", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "92a22ed3ecbd98835e2bcc347c4f667160a91f38", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "3757144b365ffba55472095f5003e6f2e454ba04", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-config.json b/port_versions/b-/boost-config.json new file mode 100644 index 00000000000000..61c6ba3c590e16 --- /dev/null +++ b/port_versions/b-/boost-config.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "ca82ca1b9c1739c91f3cf42c68cee56c896ae6bd", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "99ed244677f790e4e37c64183e4eb9de6055bce2", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "ad92a28f8a25946b7d3e191c3511b4f62aed9757", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "de2784767046b06ec31eb718f10df512e51f2aad", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "ad065cce471a1f0d58615ab98efecb7e2f974a6e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "a359a48043ba5944aed3790039e544ff3241b53a", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "816f2e56828ccef2f277d252f74ed8c143628fe2", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "b63b19278c67a2cc752ff990108a758ebc050c03", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b0eb4dc6b84e5494cf53e9b27cdfe5e5eec83c9d", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "d186301b89d1c3f59fbdb76c3c994475763c9bbe", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-container-hash.json b/port_versions/b-/boost-container-hash.json new file mode 100644 index 00000000000000..49df2775691a98 --- /dev/null +++ b/port_versions/b-/boost-container-hash.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "bf472c23d29c3d80b562c43471eb92cea998f372", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "4d149c5e8ef36c49a6d1c46484f18747e3481e5d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "c512f39250ff698934ae86f9a90f0c9d359dcb0f", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "cc19fb0154bbef188f309f49b2664ec7623b96b6", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "80e815f112ae43a6ea30b46aead116deb7f883bc", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "62baa61f7cbd880c109e3e0358062640c9d924a7", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "eb44887e0770904ffb1d833ab5906cf35ff61e46", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "223b957e4989a0c5ae06c224c2451f01e8947995", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "423887180c685c5ef8c33e487b4b4bd29db2ba5a", + "version-string": "1.67.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-container.json b/port_versions/b-/boost-container.json new file mode 100644 index 00000000000000..9a7a746a7447ac --- /dev/null +++ b/port_versions/b-/boost-container.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "60816c8a5eebe510557d8f78f3a1686fadfdb783", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "afb906ffc02b952298fbcab8dbd1517d355360d8", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f4fe476cf131a0f6a9bb54e037ad660b27727fdb", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "07e488dac7c585c61c0ce206b432e0d62774947f", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "8e06814d564f94fd27d36dd7a41e9da1f43f6fd1", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "63b0e947562a8bb6480e5a64ca046dc3d9c03c46", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "a8d170b330aab8af2d8e11d12eba27c2f9a48de9", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "722fcbbbb26c4879575ffa9574f1546d4e58d574", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "089a0a64d6cd34bbbff00a9cdb4b5a4b8e809b34", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5693c508bbd09e12e34690c9c1b58c4b8a33a712", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-context.json b/port_versions/b-/boost-context.json new file mode 100644 index 00000000000000..a379f68d36ddcd --- /dev/null +++ b/port_versions/b-/boost-context.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "a122c48db7645becfa084e9af1e57035870cb806", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "af0196e51d5f5d1ef93d4e80d32281346ebd9486", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "0bb5b708ce7dfe28c141d051c2e95a0ee0908500", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "f64b1a3bd6d01b98c377c7aa33b749ca785750e3", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "65f0f8ca8b7bcce52255ad5b9c40629cd15c214c", + "version-string": "1.73.0-1", + "port-version": 0 + }, + { + "git-tree": "8828cd95f58f6cd77f1d389bb16422eaa0c06d00", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "47b45566fae242e6e6ae356fb85c2aea3b328b9d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c10b94df8b7cb18b1692232ac669b6263b706d05", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "030837836d3170f22c85fa87a62ddbbcc8ecdfa6", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "27000a889b7661deb010f7851614fa65f2506a11", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "cd28cfcd0fa89b578f26a3ff7b6b10ba03890496", + "version-string": "1.68.0-1", + "port-version": 0 + }, + { + "git-tree": "0e06db2527185618d1afadedc5dfaa700398ce9a", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "908f28b05f28a43846f6cc85ec52a541aeb34c0e", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-contract.json b/port_versions/b-/boost-contract.json new file mode 100644 index 00000000000000..dc93635c42330c --- /dev/null +++ b/port_versions/b-/boost-contract.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "474446bf2ddf3627c5643aa36ed0c79c24f4e41c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "7311f523ed4ddb327e88e2fd1dfc1f825bd690d3", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3b1fa988e66a65e1c9d37026bdaa7bb1ab4d7c44", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "2782814a6ae7266bdc2f7aaff6ece447936c70b1", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "e97d18765b0debe3c54dd8a0c654f310e765fcdb", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "996827a7079785e48e640dccc8a69235fdf9c7eb", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "9831393df2e49ba23c48f4b0e2c364762a5830ca", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "a36b572dc05ab05cb2c87dbbc0a181a8aa965388", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "ee7da253a1c28773377f8d6f5dbcb62aeb6e6245", + "version-string": "1.67.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-conversion.json b/port_versions/b-/boost-conversion.json new file mode 100644 index 00000000000000..bdffee7bec2318 --- /dev/null +++ b/port_versions/b-/boost-conversion.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "9f366dd9e7f48c0cbf16725eff9b035ed7ff2d5a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "66b5da5909c47b08b613f4127e57ae02b24fade3", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "b3e08f49a7e98928320d01c83aa0afe70c4ac097", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "04071d9a4d95bd41b129fc77a82db879c14a4565", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c5d196892907020325d3fe182741f7142f55492a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "33c1b5bc2477ecc988409886f4b4219c8140e8e7", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "3d5362892a857c662e0577a9a91306256f4c6a66", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "3ac54f232d78b29fce3136b3246f5fae91308c82", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "fb445fbd03211098a4cb83fc73314b48a36eea94", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "21c88774f349b8488300e4401b32af9b862b19b5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-convert.json b/port_versions/b-/boost-convert.json new file mode 100644 index 00000000000000..7cf739e9b822ea --- /dev/null +++ b/port_versions/b-/boost-convert.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "5c71e3bd86d4e105b3ec7722e5f1468a50ad6fb5", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "e9718131f316ac62c69625a622edb137e5cb08e1", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "2d34564e7ffc30c228ed76ec431c9ef5c57aa2c5", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "1258127122b16003d158013e449bae53d533125b", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "1a6118a3d7d617f4d57e4b0149941379d2945b25", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "45101530f7940894661beb6535fd71edd1ee0952", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "cc0c7f9939dd63ce4a3ff7e5bd3cb88a9c762fc6", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "487282494d4163c805396b4ee8a1325e43652683", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "86cdcb365cebffb4644146e80f1d5c4b5741773e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5185fb4fb22d45199972a3bb84a4783f3e36d4a9", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-core.json b/port_versions/b-/boost-core.json new file mode 100644 index 00000000000000..54c24b14d77399 --- /dev/null +++ b/port_versions/b-/boost-core.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "20a19f6ece37686a02eed33e1f58add8b7a2582a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "febbc9ecc144ae2979ca1f6f12e9a3dbc7d6bd71", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "6a34d4c2d4f52d0355e96f63788336b6e2985960", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0eb5e20df9e267e9eca325be946f52ceb8a60229", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "df3a5235a6aa7bd9a9cf93d88fc57d21d76141f2", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "624bf52f04427877bc51d0b152b26b64785f194a", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "ad905b649a559d1e4ead3c5063486beb22714025", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "bda4dd64a723ddb2abb6bc88881c1912666ab199", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "2e00c990421c0ab8f0cf2f3777d1b44e12f8564a", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "8853b6979ac57905ae7a8b813e01af76389f4a9b", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-coroutine.json b/port_versions/b-/boost-coroutine.json new file mode 100644 index 00000000000000..2eacea5abef21d --- /dev/null +++ b/port_versions/b-/boost-coroutine.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "126ca8af94215f8d49d6b5a16515661e2999d9d1", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "9b1f17ff8a5e815baa0a2a658482b6ac896359d1", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "6e6253709103fdabf9f4acbed55a8f864b5b6b00", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "e5cd536d31b9ee1a14f045004f0f2cad79071466", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "9291b90b9ce474e770f17ab00924d220f264a22d", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "c95c3f32e1816dac4238d4c53e7d7af2c41ca2c1", + "version-string": "1.72.0-1", + "port-version": 0 + }, + { + "git-tree": "30401a95f0b6800826044293c1c8d38fbd582785", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a9fe9978917d449996dc99579cb2f673af30ba1b", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d5b684f5ac2b1ced1ee77bdc7cecc50991684944", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "804d6a6db063c5518a0c78a8143d88c5a255e6bd", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "4ea290b7fd5acbd612cdc5af2586b246e1f5a8cf", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "bec17bb5e38a7e4f2daa7a061ecea27e3230c979", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "ded2b7dc5b938872e89abc8fdf7912bf10f63371", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-coroutine2.json b/port_versions/b-/boost-coroutine2.json new file mode 100644 index 00000000000000..e0c61519093a0b --- /dev/null +++ b/port_versions/b-/boost-coroutine2.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "2123dd1b276ae094358dc982c1f37661d0f38e04", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b32ddd8c4ca99ef8f6ed36778ea751c2ec181afe", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "442c89b92083fb299e4d37381603bcb74f6d938b", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "c0f56893f5de8240d29e783b9c1fa3aab080d7c8", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "ef07a674c5cdf3cad2ce59029926647583880d36", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "63ed92a52a85b89ba5d330742082a9dba141d747", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "b3fa7b90febc911b1e21d40305e7320cceaeb8d0", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "3b91221c1df7cf522f69d0f30d2eba485ec6d6f7", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e18d338410491b506f3dbdc85afd728814f3dce3", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "5dfef177c84e649b0c3f4116082c8439226990ef", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "c16fbfadc5c9d831fa9ab73d454ca3c676564719", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-crc.json b/port_versions/b-/boost-crc.json new file mode 100644 index 00000000000000..0c84cc46d92141 --- /dev/null +++ b/port_versions/b-/boost-crc.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "d85306a89ba8e94f3f9ce92dcff832b54b6fe36c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "50b395ef5adb04b0397a627028d6cc2028d15bd6", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "61bb53d33cdc7c34aeed89ef14342ecca82e3d47", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "f89e4bc8b2678164d9b8c65e85b48207a1278950", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "8291d140c0c7246d2c87e50c399b4f199e168316", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "cc3c9d417bd42e313c3a1587473aab72fe850a4f", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "6c9e2e515b0b58e6bab880b79fda45685f8abdd1", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ae021327b2c9570b0eeb2b6959fd8b7a8a1c25f1", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "50dad24d2cfab57b98d84423653eeeb815432a7d", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "c923a756b3fea47bf16feb78d6974b29686fe55b", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-date-time.json b/port_versions/b-/boost-date-time.json new file mode 100644 index 00000000000000..dad885189eb4a7 --- /dev/null +++ b/port_versions/b-/boost-date-time.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "29999306731019b2e72d13fc47bf6567e38333af", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "e4e3b8362f29d3b7d2894f6fd3258afddab13341", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "84a294c7e2a2a3e46743be55e4603f25f8956bc1", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5a9df8f71083ba3a05f5b7442ea07f4c1d3a4124", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c10342e378322762f8b73e4ed27f43e25f684e83", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "68b4aa76f870d0c3bfa8c7ebe16456cc06508046", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "5ad830d20f20cbd2faf32a7553895533d8a2752a", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "6fdedcf8d44b32794a89049690ac3ee955d3c630", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "f1057443f9c812bb611ae7edb406eb622a8d7330", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "b0cc6dae48fd9a6708bf1185afa10d0f195685e7", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-detail.json b/port_versions/b-/boost-detail.json new file mode 100644 index 00000000000000..fb255c7c0c83d6 --- /dev/null +++ b/port_versions/b-/boost-detail.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "96744251f025f9b3c856a275dfc338031876777b", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "2bca20aa3e58b25201b4aaf6810561bd76365f1b", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "47a79afeb2fc8d5fb00d10073dce46c923823efe", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "759d7c6a3f9dbaed0b0c69fa0bb764f7606bb02d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "2790c82d26230c810da18669b6e929941e7ce5c6", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "b41ba2031492395461d03e97433cbf3b13bec953", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "06da489280ed6a323980b59c0c49f1c85a6a5bdf", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "07211d7e325131bc29336dac80f291458d0bc132", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "acd9c6be4af0cddba229aed6c8134978547dc59a", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "8a3e36c4a7097a45d67771c367b6f50549d64075", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-di.json b/port_versions/b-/boost-di.json new file mode 100644 index 00000000000000..b79ed607890f53 --- /dev/null +++ b/port_versions/b-/boost-di.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "b3427bb52844782f7d8b88b69669ba692313c077", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "7338a2a451a002e881b0cf63801f2b7ec844d54c", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "b98731cbbfb5b39389c2b7be699a376c3251b3eb", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "f301f252cc349020a23efc0486474717e2786a5f", + "version-string": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "d830a19a60a66b024e64ac9a6a2e77844f93cd63", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-dll.json b/port_versions/b-/boost-dll.json new file mode 100644 index 00000000000000..bb21663e21f0e7 --- /dev/null +++ b/port_versions/b-/boost-dll.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "d3a8b7568bf78bb6d894cfbf857dee96be2298b9", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "a0d6a2f3d8ea63f49d7e7618c2ad18ef59b7b0ed", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "b706fb2b46338fac7c6a4255d214ca5f0d261ac0", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "efff54bc7f260460aa910019bb0ad49a2386f87d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "6e63a3fb079ead7b7c24860ad5e64e482d26143e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "48189f9beb70791f4382909d1fa4cc191ccaadb1", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "814bd1b232bc05b52be7f62fea9e02203b18d43c", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e63b540184662dceeac1081470a7e383123c627c", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "a53f6d4aef0385a0bc46f95eca19213198b15596", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "e2e034371dd0fdf7ea2e1cb528953a6729124c63", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-dynamic-bitset.json b/port_versions/b-/boost-dynamic-bitset.json new file mode 100644 index 00000000000000..04f10d446a162a --- /dev/null +++ b/port_versions/b-/boost-dynamic-bitset.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "8616ee67880d16f75306371c1c1be70f8df9a189", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "5015e482cdc4c54bb956a55234f350ef6486ee1f", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "1e7759bdf94d7a8e84fa0134785b97aaa7049e47", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "cb1f097248b36c762bdedd41853b4326c22c6e63", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "388724ed7265f2ade6b67994170b8b5e5ca1d121", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "851d8117f7b6fc18ceca2e5db852ab7ee169ca9b", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "bf0d0962bf606aaa77d04dbe20cdc217139f57ce", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ffdb9fa38a636ff48d966e49f89a06720fd48a53", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "1e2345f78a76afa6065d6e69800591bd77b9683d", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "287fd7e578962c23f7f985b5082c2f4e883d199e", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-endian.json b/port_versions/b-/boost-endian.json new file mode 100644 index 00000000000000..2ab901a183e08b --- /dev/null +++ b/port_versions/b-/boost-endian.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "4c89bc4f6b5208fc931ba4d79223ad085bb4490a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "ea0817d7159425bfe788f061fff16f2d3578830d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "102cb68b3f9744ff57490a392a36c672bd97adef", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "302003887252323941427dad2d6a52c92734127a", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "33317a6c2cefbc8521d907ed3fed5c61deb31bf4", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d5c99ffa97be4dd9a39da0604c97b488b68e905c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "67a20e4d444983e690848e0eba57109bed6980b3", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "afacab87270354cf200bd65782837dd50aae9df7", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "4646441284b7d5b06eefff8eb6662632aadd5dfc", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "2994f980aee9647b8a058547a77fccce42ecdf8e", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-exception.json b/port_versions/b-/boost-exception.json new file mode 100644 index 00000000000000..448bb4f6b4e306 --- /dev/null +++ b/port_versions/b-/boost-exception.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "04e69dc9dad0ee8db88c11ba295e9a0773f69d02", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "139a608c9d4f1303c1ed2dac7aa80e1be3b38036", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "bfe897dca198b5ec6f1c2dba50c66d16d6fb99c0", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "d1918862a01b74450e541c2b1d861f90014fe5ac", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "00f07fe3e7870a993e5ff4a9dde11249ffea64d5", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "3b2956424061bfdd46071c919b275cb2ffa60235", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "7e3fc9cb5a946a66cd574ffa8c57aa0c3f1da7f9", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "4ec2493359849291141a5d0c0103da8d074dd439", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "675af2e15fdfc3e8c5598ce8dad0c3563ab8755b", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "6924b2fcde9add57c375625b67463b5ed18b2983", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-fiber.json b/port_versions/b-/boost-fiber.json new file mode 100644 index 00000000000000..ca291d8a115259 --- /dev/null +++ b/port_versions/b-/boost-fiber.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "3d9ca70a2ae4a6f786c4d5445515223a7b80fa8f", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "5a2169080179250fc26699c07550823b2aee3e7e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "237ddc05dbdfa5b720aa182db405a675f04885c3", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "ca54371f7f25200c0fa8599dd824d71b031d395e", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "8f84ffcf36fad1e1a20e0af5b120cfe33c29a024", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "7ef6a2a6c507ff4ec590e67387b87d291db3bd3a", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "cceec09d81ac13fa1f5c13b971e1414c2759f20e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "eb3157d1bcc16e4c7b4a7f14af966e4ca5c9728d", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "ee0868e08823fe6f5f18cfab31679ab553eaac7a", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "897a915396cea87f5a1e8ac6ec27d08830ff114c", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "07d5f146d4fafb9a8aa058db08627591f22abe7c", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "55635f1187b4d697e843362d5fc663b41493c924", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-filesystem.json b/port_versions/b-/boost-filesystem.json new file mode 100644 index 00000000000000..7af074b738d2ed --- /dev/null +++ b/port_versions/b-/boost-filesystem.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "66643e83f9815f81f671e25440c5383d29549d9b", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "106d3d34b44ee36cc05c1727672aa0a45725ef0c", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "ca3f2d17408aa615e034544f2a24785641cb663d", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "e87591dcc23aed3bc2caa4f1046c4d5fbb149fb9", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e09ec730d3dba40cc5b630d167101957a8b67abb", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "38d6bacf07012380da449ffb63b593a368d2b729", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "08b8b5ce3fbb1b65efb653d99781b6da0e8f5f17", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "f1e6c65197a406f933de4782022da1c41c0bb34d", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "092c1cdd85ca06ab6f7186c17fa7b42df2ab9b4d", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e1183fa10857302770a8c9f3fdc7c318e36c6f11", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "997a4ad70418a006592b6e5d58cab7dfeccaf59a", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-flyweight.json b/port_versions/b-/boost-flyweight.json new file mode 100644 index 00000000000000..fca664ca7cc617 --- /dev/null +++ b/port_versions/b-/boost-flyweight.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "dee29c76a897b9430f109238464d04d1a892b2c5", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "6044a7be847a36194d81063786b4507a70cd1e4b", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "cd81f59b277a62d38eed5731c9da51beefeb130d", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "1a519d39adb4c4c63b5aa3879c36413e857184bc", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c33aa459d8b97420dc9be69ccb8d11336bddc6e4", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "c4ff1c6f35c3042b4d50371d87a1db49f58d5653", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "79a184485a38c73314f74ea17c4bef96073d31f3", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "d2ed0186cefb9f4be75f2daf2de174acc35dacf5", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "67fb51dffb1810d70b63c8a9d2707725a9acc52e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "9c1cd737e76c18a8c5520a2b8052e104d98c93d3", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-foreach.json b/port_versions/b-/boost-foreach.json new file mode 100644 index 00000000000000..ffd3e94757445a --- /dev/null +++ b/port_versions/b-/boost-foreach.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "0858efd566bcda59a52b99a57203ef4d6fbfe1cf", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "40f12c44a787b514d99916450bed7738e1e63123", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "0a5b1cff9bbd97ef5e92e3397920e7caa4a0d790", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e8d052231eac42bd0153bc8059d76bd5874e7ea2", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "791411a9de3197391afc34f4b353a56528d10375", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "cd8015ee0f7717458b6f8121691b23686ba46c95", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "04912cd07fcedb968946ef4d962450e8f9beee10", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "5e5b9f79c5342c8797ee86ab76fc37ad371aaf8f", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "dec25f531846c69f3b7bc34d5e16b1132ce24258", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "0fef6dfbbbc26838cdf1aeabc610c61512f62e7a", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-format.json b/port_versions/b-/boost-format.json new file mode 100644 index 00000000000000..73adda35f84b7d --- /dev/null +++ b/port_versions/b-/boost-format.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "9ebb4d57edeea6e294e0974f2fa68c61267d7c1e", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "f93be0e11dda65c103fb5a4d99b3e65f0d6522ed", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "37bafd2bb1f1e060f0d421b648c429cf0b5275ae", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5bc5e5887e15c4ced41fc6e8b09f0ba442329f19", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "4cd07c6e6703126828b64e56a438df4363a2ee5f", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "f1807fb9234c76e92581c398a7d121a6cb89a690", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "b68dae1fed40b36124e501db6099ea299fb503b4", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ee7856020e6b25f23b01bcdc8e1c46bf69801022", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "6b94368f580fe9996c4d699407c3c2863bb1dc8f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "82f8512970c22ae2885847bb20a05bd3746eee89", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-function-types.json b/port_versions/b-/boost-function-types.json new file mode 100644 index 00000000000000..1ea97fc7c2cdb5 --- /dev/null +++ b/port_versions/b-/boost-function-types.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "a6cb5686b38457ecccc96480f5268772bef6a6fb", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "a2369833ecdf43bd825f433945510a992bcee989", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "b8fd587279015c05c6990368748f9ceb304fb340", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "fd186cb2044ad241c97ebabc408ee175544eb77c", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b44865bd6514b29584593eeaf3e6f3a80c6d3096", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "979a82f02c522a90a1f6c066f35bfb5ae8c11f9d", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "8c4bbd7925148804606aaf8de66798413cdd7158", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "152d2f99a1363de1047f68a6afea5b54ef301dba", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "57c3a113c76954f29e4fb417e2d3cd72b6fd06bc", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "9e63e3ed8a4668b89e9fe12fcb6a1aa5fa3c3f52", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-function.json b/port_versions/b-/boost-function.json new file mode 100644 index 00000000000000..037a6c1f982cd2 --- /dev/null +++ b/port_versions/b-/boost-function.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "7698d7fd2822972ca04cfe1c9778c9f04fb56c3e", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "2587658b7f554ae2f511f5b6f60eacd7ef9445ae", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "7909b7580775de1415ab8dc39c5e2f0129a40492", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "71548401e59f7399ff8f2c44a17e41194643ceaa", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "705467644a18ee7984ad8c2fa23e255a7922c9c0", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "b31fc6976a0dc0fd88b0d655c22ce0ba4f57b6a7", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "96accd0c39bb10476592bf1dd2c2e803bde52bbc", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "559bac35d4a461dc12a9b6b4a4eb630817d00508", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "8bb9a1e360b9c8490e3160744f4332c7b63a309b", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "3a7b27de15f0cba563fa6eb9c100bb0e870b3525", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-functional.json b/port_versions/b-/boost-functional.json new file mode 100644 index 00000000000000..84a3d600a332df --- /dev/null +++ b/port_versions/b-/boost-functional.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "f74e3af1a511361a97810fef8ed7aedbfff6706e", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "48a83df9fabe3740fd776de03952b9e682e8804a", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "1f3450aec1f61b162578eb248dc32a638278884b", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "b944d1bcc38c95fe8dffcc0399846f8ded9397cf", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "99d35f74a877fad4439aa38e57b5e8a18265c095", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "a6e572d32456fd108d2e0211b48c5e76ac682cdc", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "77a4b666dde24b6f8f12ed5d755be57cf4dd9c3f", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e9986fa958e109b271e09df87fc044940ec74d85", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "35815977396813873d3f6a7f2248207e462446b7", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "66b907d1960b8eaf1c0b69755a9562de5cd034fa", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-fusion.json b/port_versions/b-/boost-fusion.json new file mode 100644 index 00000000000000..cf200027f501f1 --- /dev/null +++ b/port_versions/b-/boost-fusion.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "4a2c7b6ae8f3faad83ee354e4bf9023ab9e7d1c1", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "d299aa16799fc91a5d902e54dbe12eb234756293", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "d23a350e5837b5d12bfc0d5e3a8ee54e1ab93928", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "88a7edbe3b27916036cf55fada773b206478df28", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "11cff4b1f47639b22c5f10f1069d1f774160867b", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "e0367b03a2f0cab43b3413ef6a148339c6f0a132", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "2ca42617107d772c2028db500205b9eccfc6b3fd", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "55a49ead107cedf511b40faef530f4c123991bfd", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "dc578fadd38a0e438786a3821d778aed2db48e1e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "8c08f9779d4bf23710998c6cdb5d9e1864b2b885", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-geometry.json b/port_versions/b-/boost-geometry.json new file mode 100644 index 00000000000000..5e380e53277cbd --- /dev/null +++ b/port_versions/b-/boost-geometry.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "1d40cdf7af5bd875fe73020d7efa5e7a61ea07a1", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "aca46b177a6183db2102b947df5778cec4f8d46d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f038a62e72808a64a2810c97865a309e8204054c", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "f297e97e820a52a7908e4ad532995f9f6b2acc47", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "38e8e685d9940578820398cc3ec2b029b89b4188", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "3d6605392ce3986290dbdc1eb3e371deb3670e39", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "4ffbded3c5bcd8159a6d9a3710be5297545095c0", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "20633f32f9d12fd2d444038435c8ee9873af4578", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "aa0af012ee6403a3d46a63784d8fefb13be12a8f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "51b8fa3a16c3bdd26c1e643196539f9204abb5f4", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-gil.json b/port_versions/b-/boost-gil.json new file mode 100644 index 00000000000000..e8c0565e0ac4d2 --- /dev/null +++ b/port_versions/b-/boost-gil.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "1e6fa6894d7d35173abae2aab50e772fe6219340", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "3118f2bd41ee5d4090f65fd744059eccd7354624", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "2140de981a3619717847deb365b7dc0ba4671f84", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "b665b6fd4b9bf2b5feecf4ba7d3bd3c7f5f1e89d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "585a36d3b204b5436e758773cbbbdf4d4dfe5957", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "ca65b78a4395a7f4a3a61d6d7de41172586109f9", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "90ef69828e1910031fe3169e41b5727013dd6fb7", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "2cea779a516581694aee780d55ccbc194dea6eeb", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "23cf8cf124803cb76a8f43a0b2a502472cd11339", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "e9aae1786c82d6d6d8df8be38d40e4012e42fe04", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-graph-parallel.json b/port_versions/b-/boost-graph-parallel.json new file mode 100644 index 00000000000000..d78c07d7071449 --- /dev/null +++ b/port_versions/b-/boost-graph-parallel.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "2dac60f2be18293521f7b65f6b47cd1f94760491", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "1cebec2eccaf5ecb9e5ec1ef6459c80b2bb3d73f", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f56ff1f6929ab78ab6afbf815c3cef78712fae91", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "ad8ed8eddc955335f036a01d1d8ccab264a10172", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "7597dc5fb1dbc43093d92721de4a09bc7dc14a5b", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "4d9af1f1223b650a270d6d61d8938c007d884dd0", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "839527dc6b38fb3570b0daab610371442e4b19c1", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "dfb2ea19a4a53ca95a5218bc4ac095de731d945b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ae5a36dc24a75a595e82194d757a16433423adc8", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "7fd2581affcad742948de2bb613fc7b923b8ca30", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "18b2df12e0f5905ec79152d0f83008bea6085480", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-graph.json b/port_versions/b-/boost-graph.json new file mode 100644 index 00000000000000..3c3074d0d3cc59 --- /dev/null +++ b/port_versions/b-/boost-graph.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "e59a90a49c6f92b540f8350f8bad63104438245b", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "e8845637669efa4cc70ecff5f03f33f5d16e5639", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "a5c17602ca9994b15dd6f34a35fce8915a65fea7", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "09bbd8019bf0acd2a98b0b6dfd9908a2fe664e10", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "67f0220d2f05d75dea5b456a13f3c0754348a2d8", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "ee090689af149f896264707fee2e7282d18ed61e", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "bf39e1ff8f477a00e5d5972c30856db387e96c22", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "1006a7d0e775d6e21eb94d8c16e7b06e39d9059f", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "f67119b7b095731112d35e28674a0d291e080d0b", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "fa1171101310305e714c4d4a5634870017f6e892", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-hana.json b/port_versions/b-/boost-hana.json new file mode 100644 index 00000000000000..94fd4bab003972 --- /dev/null +++ b/port_versions/b-/boost-hana.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "1e41f17ca0e3d7b6918bb37a2918cee5399c0b39", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "5d22fc6d56f826ee443d2c049cd1b95d6a625217", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "cabaca11ff778ee09070254f943ee14f2f5836c5", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e61b2cf8453794b627f5b81c4a3143c80830ff5d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "879c77cfbac432ccc48053adf009537242963853", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "21bef5638c6446396aa9ad059de2940789ec69bf", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "0c9495415a7e68805f583b56d0bfc6b196ac7da7", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "f80e68923f39a9da7fbed22f7bd20474d3ae36fb", + "version-string": "1.68.0-1", + "port-version": 0 + }, + { + "git-tree": "fe2864e7436df466d9d5f27f446168720fe1733c", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "d28e07a525b685b88130a792cb5322d409546f68", + "version-string": "1.67.0-1", + "port-version": 0 + }, + { + "git-tree": "ca224e3cc8c3b4af823dfd7537caa949855aa1b2", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "74b076598e1212e4b4c1382f2dd19ca3a78a500a", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-heap.json b/port_versions/b-/boost-heap.json new file mode 100644 index 00000000000000..0f60a30c5ec458 --- /dev/null +++ b/port_versions/b-/boost-heap.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "b9b42d92244a3cbc265a562cee71f792997fe5a9", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "3608fa1571c2213d0c7b9f32044aee7cffed3450", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "2904e44a1748a001cea78dd70146d2cb0043a5ad", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0378653343a32297617fff5aada3302e7d4d3c64", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "209843f55bed4a1592e65d86a387dea4661fd6a0", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "40435b933423f5c066010e07d869edaa7c88645c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "f4c0c69a49a79bec20a03ef00f452f247a3a0cd9", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "4a013536278c65f1bf337ec1820a420adde6fdab", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "3ce93239361454ca14026151d4db8bd5e4707960", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "be0a9c9fba0fdaea85ad9935d71ee1c85e391df0", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-histogram.json b/port_versions/b-/boost-histogram.json new file mode 100644 index 00000000000000..065ff002b88fec --- /dev/null +++ b/port_versions/b-/boost-histogram.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "ab55551ec17e50829409f586a5a34adf5a50ae5c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "173e5d74d7bf701a3e6f0aec3e0395d0770b5cc0", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "413c415e731b5975cd216b18c5d59a85d0f95d4e", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "dede7e3bbac394763d5bb0b32b9e1c001a46c918", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "10f29ce482381d7d61183926878c4c5a2c4bf87e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "28a97cb5e04c8264aeaa49d65f0c211af844c964", + "version-string": "1.70.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-hof.json b/port_versions/b-/boost-hof.json new file mode 100644 index 00000000000000..189ceaf26e3e48 --- /dev/null +++ b/port_versions/b-/boost-hof.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "6f5fab9a08a313e03867147bf73ba966873039b7", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "2287c8486a1a80546318ecfdbcd9ff03abaae6bd", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "c2a32c161bce303306e8dd9b60c933647a362c21", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "60b5ee174c9b4f37d1a72a7f379b9af39d4cbfcb", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "ec76a42f72f5128ae7043fb80a63769039fc83f2", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "b0bc0ab3791d10eb971f3a4dff63777d5fa23978", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "38a4e85d5b67407cac8b163ad5ce2ddf5524f186", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "9bff5f69fa7b4c9e4aa252170765f591ad808272", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e3a810f552d89e930cd23b3b78da774f064f620f", + "version-string": "1.67.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-icl.json b/port_versions/b-/boost-icl.json new file mode 100644 index 00000000000000..782e1d5de7540b --- /dev/null +++ b/port_versions/b-/boost-icl.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "ed49dae8b85d0e4833c06dee49367ea99083cb8b", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "67b543024af53abb0da3fddfdd3cbb261d040612", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "c824b2a02652f39e46bf42e19b9bcdf25fe606b0", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "20fa126a6b1dd3068d54f65dbbb677be4e4b8dad", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "7d038d78b6a9a2947771c83614b18470378f01a8", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "791ba36f47c6565c51e33cfd925fa02bccd54370", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "7c606c24c50c7a1f42916bebc9990ad172bf759e", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "9bdd2bc348d296f3c891a606e85e9ece3809f061", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "65e31fa324ea2a1791f45c62de1167c3d0c91a9e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5248d68e10b387c031529124a7d7f6e45ec1651e", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-integer.json b/port_versions/b-/boost-integer.json new file mode 100644 index 00000000000000..163716e558d517 --- /dev/null +++ b/port_versions/b-/boost-integer.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "de70ce0d1500df1eda3496c4f98f42f5db256b4a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "96ca1fb123e6d59d2f26b4fa2201fb71ebf86e2d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "49614065d63f536117dc73509735f121e9fc5d85", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "173956c61a26e83b0f8b58b0baf60f06aeee637c", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "00ba8db1b3c811f4643be561ac251545e845ad7f", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "766ad7ba2aa1627ab2d1dfdcefe04ce3bcb974f2", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "359bc0161ab1806de51b0e96bee83cb22c2729c5", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "00198657d22adbd3b3be3606aad8dc3cd77f99f3", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "8860236c4936a1bd2daba10adc592278668cd771", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "51bc582666ba37ef4c04355dadfa2bfb21d26593", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-interprocess.json b/port_versions/b-/boost-interprocess.json new file mode 100644 index 00000000000000..35135b8b445639 --- /dev/null +++ b/port_versions/b-/boost-interprocess.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "1ad6903e562cc3464bbb35bcef49019bdfc81c5c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "aa4515196d5e946d62d40f6c1fa48959fdf18a03", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "6fc3deeff3f8b9dbdd381cf8ea3566dc9992a439", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "32b1336d2f512c1ef7406c2a6d1de878e08a590b", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a4bba7c47e00fd2650be458f14784f3e4a7adb0b", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "4e58829ee4fd79c42f506bb4cdfdc61da6c00386", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "d66d64cf172899e74cf93ed0a9a9c4227938cce5", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "326f127429b4ac45e614b202afed77ab876b1f14", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "f24b6f297fadcf132ceadd6c93ffbec49f3e095c", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "176f18d74fdf4c8122a3e151556fe9bdfdc93351", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-interval.json b/port_versions/b-/boost-interval.json new file mode 100644 index 00000000000000..68ff4e08f36eba --- /dev/null +++ b/port_versions/b-/boost-interval.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "f397df607d232f6a241571ee0b105bcdac4eb6d9", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "3781783a7cd287ebedfe5fc779f5b942796ffc3c", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "482101711382bcdc093a95cc29d102a3d7f9d3bd", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "442e0015e885d6fb746f79acceee978269404fc5", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "12ad9a0049e30a20815733b2ea16cf8a6ecb5c4d", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "7e0f662d9a68b5326b41ff5146e8d9d68f07dcd5", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "8af28aa1146b7f70325abeba60b3248a25cdd806", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ce6890a813e1eb95d73143147cdb12049496c27e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e719d66e35c99c9dbee5be3d7e56b1dc0f5d7b34", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "f73fe84d5d82b52afa2c9081201abf7a4d977a5e", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-intrusive.json b/port_versions/b-/boost-intrusive.json new file mode 100644 index 00000000000000..e36f203d997b06 --- /dev/null +++ b/port_versions/b-/boost-intrusive.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "138cc5e30e17278c8247882027053e5e55983edb", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "0ed5eabbc8b4060255baa26ca7749c47fce0b5ac", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "198d6267ede5c74f2f8a475cb0e45e3f9a983a86", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "60b6ce48f2d00c71f858704706d8e2c6a8e3d5df", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "0cad083c85f69a8f2bb9fd6d52ba051b9580c9c1", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "2bb8d9d14fd3701b7c02d5fe262b583b677dd42c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "f52f29e102153ffa743c86802973aed3c4bf56b4", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ef88f9601d7de908f6d1529a1dce4e55c0920154", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "7d6083a0db55c19849b2cf09199f00ce85e7a3db", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "c23bebc1e03ebc5872dc9627af9a89494f5f85d4", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-io.json b/port_versions/b-/boost-io.json new file mode 100644 index 00000000000000..5833ed32ae15d9 --- /dev/null +++ b/port_versions/b-/boost-io.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "7bf3407372f8fc2a99321d24a0e952d44fe25bf3", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "f732621c8b9c2bc455d848fa08345e987fb8178e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "406f4ccf94edf942df4c257d900dbc8cf94760b7", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "d55d1d87b52e03c69824a0bd2b09ee80218017a2", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "24ae8d54155f8f2bcc6e641ab00bd95cdcfd78f4", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0d0e25c5ecaa73859f9262ff50695cc4b4673635", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "2eb12d8533bdec0cc5186760b6a66c151ff0916b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "599397428a5768949f00dc40f1edc16b5a652348", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "bf8c222bd844a970fa6d7d754b61deb7661e52f3", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a28f4caa94b41b5c6f0e23680f5813ea7db74f31", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-iostreams.json b/port_versions/b-/boost-iostreams.json new file mode 100644 index 00000000000000..ffb5ee54b0863d --- /dev/null +++ b/port_versions/b-/boost-iostreams.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "2b708757922b782c079c4a77e08f8531e17eb41d", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "375ce4c4f471699c1ac0a746bfd7d0dc11f1c9f5", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "6c2e14f3af068ae9da54517afdf7da56c2f39c2b", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "7cf49ab9bccb31dbc5a861d3b5a5333fa94a86b0", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "2e5bbc43df6ada5973c4265a2462384e30d336b5", + "version-string": "1.72.0-1", + "port-version": 0 + }, + { + "git-tree": "562431746a94b0247194b705fc68746de101b11e", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "09d5568e52ea48f9a89051156b9af7667be22f7a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "dd5ba91e8770366ac4e5be28a978ae3930ff46c7", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "56dabe65865150f9e79e1615b7c5e51eb5d89746", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "16026f8896bf4136ba3f73e8841692252dec3eea", + "version-string": "1.69.0-3", + "port-version": 0 + }, + { + "git-tree": "aac37ccf7cdd00686884b912e59aa707c761a902", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "de6d34777cffe0ae6141f1cfae3e372868467972", + "version-string": "1.67.0-1", + "port-version": 0 + }, + { + "git-tree": "7a91e4c2c2392c8ae1a339ccf1c54f2851392b62", + "version-string": "1.67.1", + "port-version": 0 + }, + { + "git-tree": "11eb33dffa1196fa9a1e766316f7d61f672cc3bf", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "fc8c3ed37cd0e35242400d151907cc891e2c9275", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-iterator.json b/port_versions/b-/boost-iterator.json new file mode 100644 index 00000000000000..9bc957fc342f84 --- /dev/null +++ b/port_versions/b-/boost-iterator.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "9796d7066c411c9e540919d37456d79e54cdc2cc", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "7e6906049be8b43bc404dec8bff8a4e315f41d3d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "741d285427fa1c3a6a1b2ed27b44c5c794616ed0", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5b9275973d112488b78e500867f99ae5dd31cf5f", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "354b7979c62c509a89620a0653250a8644c93ae6", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d50f6ab4481fd899799ef8e798360c9d6f18102c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "b8d080ec9e23272a7730d60b83b8a5985c30e1ab", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "d07c820b6443a7100848d20e8da0ffd726e2ee42", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "8cd12f01bf776a3c1cfbcc341133007250d2675e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a691363dc4c9d891c1519a2622caa77e549977cb", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-json.json b/port_versions/b-/boost-json.json new file mode 100644 index 00000000000000..1ccd22535c3380 --- /dev/null +++ b/port_versions/b-/boost-json.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e32cc65f06f648018ea098e89fad7277ddacfb36", + "version-string": "1.75.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-lambda.json b/port_versions/b-/boost-lambda.json new file mode 100644 index 00000000000000..3cbfcd3ed0aaa3 --- /dev/null +++ b/port_versions/b-/boost-lambda.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "c3c314ac0cc6971f58c7dd9fc1708caaa059b7ae", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "ecd59c68772feb74919ebdf44c167cc4861d96c5", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "b84d08f24d75980f71fd3eb32cabf04abad9f910", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "a69106d4b2c7538346b30a3835bd62a02380ef80", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "416917de2911aa77376bb216144c5689ede56a4f", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "b7bca98db8904b795465f145f8b2dd97fcd52771", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "d09d4f548eac0af72de975c7a2f927387bfa7626", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "7a405bc2379ebc1b22949de2b43bc0e7880992ba", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "d6229bccd7e425ca229739ad6ff4fa24b40acda6", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "66815689094ae90c8d8783cea5f78a455779fb24", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-leaf.json b/port_versions/b-/boost-leaf.json new file mode 100644 index 00000000000000..f1202177d2671f --- /dev/null +++ b/port_versions/b-/boost-leaf.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b6f4d7fa7cc1bdf8c780bf165d4c4d1fcbb337ff", + "version-string": "1.75.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-lexical-cast.json b/port_versions/b-/boost-lexical-cast.json new file mode 100644 index 00000000000000..a4ed70008ff562 --- /dev/null +++ b/port_versions/b-/boost-lexical-cast.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "8f6324928977e29a23540dcd6c8c3ec74984362d", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "dc020ba4e0f6338668c6db25c0dd323e96add037", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "4c1d82abcb3f206fde75176819c75390e0a74bea", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "1ddd2ded9c58e8d5ff9ee920ca4833e9dd29bfc7", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "bc327b1b9765b577f64e69065ab7cde202b873ca", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0d81c9256f1dcf4190d10319281d66ebd712679b", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "4a2f89ab882a10cc8cff4943c7ad83bafc8c9e82", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "f113282f97588f8685799172585764fb8c0e558e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "5b76eb68df10019ae2018fc02e078d6490146952", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5810ba781fbc0429e72db4fc1f821f14fb0d42db", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-local-function.json b/port_versions/b-/boost-local-function.json new file mode 100644 index 00000000000000..06d2d473219c5f --- /dev/null +++ b/port_versions/b-/boost-local-function.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "d7fd32b69bcf0f1037f2fa6a136b8a48622f32f6", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "40f4ad6992b177c1158927f2e1b1fca6751821a5", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "a42b2727e8318f40a3d3d0802226277c3d210fac", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "952dbc9aac25f8004587707312c967f150059fc8", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "ea6cac0311c7b808ae1a6ee80ad75c0632c8c860", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0eefc83c76aa85e7ce0dd343a1b04b85643ef377", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "9469616148d494ddef0e4e30d76165bd9db55973", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "b104d815817322dc79ea7bb3f28deff0191c6fec", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "eecb84b10db388d3d01a395d602d988eabd3d3b5", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a0f36f3c66485f31adcc72defb3d476333ee357c", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-locale.json b/port_versions/b-/boost-locale.json new file mode 100644 index 00000000000000..c5b917b534a186 --- /dev/null +++ b/port_versions/b-/boost-locale.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "88631ecdc11e6ba3b30ee058381a62cf02a0a816", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b460ca406b34de5462897cc8bb19bf8f222f901b", + "version-string": "1.74.0", + "port-version": 3 + }, + { + "git-tree": "fdb8a069843fff9b20c1e4bbc2b9765c18d08842", + "version-string": "1.74.0", + "port-version": 1 + }, + { + "git-tree": "dd377e66f921969039e53ae54ee4188650186900", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "300b8d29fd8d5e68e656b6631508d270f0d4ee41", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "985191f2d22a7506857ac716710e33db2b049235", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "ebd4554338817615b52492b6c7b7aa082432abb9", + "version-string": "1.73.0-1", + "port-version": 0 + }, + { + "git-tree": "bb5dc584efe979dcf062e004a286f38f31aa3553", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0600db4eec7b9dd4e766c269604631cfb5dc7085", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "887545c032faf22782e6098c2673d20901bf5db8", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "e0517cb5df86eceaa7c867e816e865231800fee9", + "version-string": "1.70.0-2", + "port-version": 0 + }, + { + "git-tree": "f1a752c1c4b3acaba4b43e3114457db78e3137a1", + "version-string": "1.69.0-1", + "port-version": 0 + }, + { + "git-tree": "17fd8111b73cc0f1671e5b95d1d2f2e226f9e820", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "37270ff9f45a849316046294682911f70abb1d7e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "954d1f8d2ad999a38dfcbd72514d33749131b3da", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a4950a31da1d394911e3085abd2d125dbecac95b", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-lockfree.json b/port_versions/b-/boost-lockfree.json new file mode 100644 index 00000000000000..acbbc4fa320d22 --- /dev/null +++ b/port_versions/b-/boost-lockfree.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "b844f385ea73f91499660ae8626dc9cb01548988", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "de86b64830362319c5a39aca2b7ae8f08d2533ba", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "c3d1f223a0ccaf290b9dce486b8359abc957e95e", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "f8a35299bb83ecbbc9d0df731eac88ffcf960ded", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "7fb2ef2fb3c2f7e2b33707d58f2c6e5098a0af54", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0e095e924353c2b2fd8fa2046a463bfa03ffd2b4", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "c444655580be5ae947db51404b92ec7ac3a6fe54", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "8017348963b18b7906834a8002b75f2e74253e2f", + "version-string": "1.68.0-1", + "port-version": 0 + }, + { + "git-tree": "1bacb7537e106c5922ff0c9043cfcbd72156dd28", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "57d0a8c5cab71e0cb3dd1db4273185a768b102a2", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "f28400094bbd31b1b6b06993aad8f6b7b3e8af1e", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-log.json b/port_versions/b-/boost-log.json new file mode 100644 index 00000000000000..aab1b8229db037 --- /dev/null +++ b/port_versions/b-/boost-log.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "dc9c81741939604af989dcb44a3f3ff0848f6ee5", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "2c0ee65be4901aa606626951acbef6594b1a7bf1", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "54db4ed7b1440aa771134416b8ae6bee7445dd6e", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "9626fc024f9f790ec9906d50b7e2bb4450471823", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "53bf278b4081cb48707cee26fa3e820d01baf860", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e5ee85c7e909b122b49f0c9792cc40e73fa2d152", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "6cb70042bd6ae96ee6967d56e723e6bdeff52795", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "3f2647473e4b79073601769def3c968af97dead2", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "9c5d70c92638bd13c0480b3f9185d4792c672ce4", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "f404f709cba67ddd2c0c72e460ec3c5258f0f743", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "d531ab2861fa7804584411d46d0682dce268a56b", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "31204c7228854a72cf8f48b1f79e55e95f6bb2bd", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-logic.json b/port_versions/b-/boost-logic.json new file mode 100644 index 00000000000000..971463989d6eec --- /dev/null +++ b/port_versions/b-/boost-logic.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "39dcf6bd80995585db199c583ab79be17711948c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "4c5e115360dcbb3d1800ce16bd95c98618b77653", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "d97e24d7b90452ca07cc590f19a04a1b3776d8fe", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "aaafe2af06a5ba56e0eebc1500040926d3b00caa", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "e81d5fe53c76a474e8f9ac9543eaa37565d4bdc0", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "5d7857a973a124b7fd320ce6a6d38a61f5e0ea8e", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "233ed1195c27d4606dd05069aa0d652eedb71228", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "738ad9f3b151a583c4cc495ed62c255b6a74765a", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "7192a88b73713379ce041ff567fabee610f9e7c2", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "1496954650cdb0875230fe412a1ac186c8dbbbd8", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-math.json b/port_versions/b-/boost-math.json new file mode 100644 index 00000000000000..ebc2b5b0b58031 --- /dev/null +++ b/port_versions/b-/boost-math.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "5bc31e3f9ebaffcc0281f7d13759019c1171caec", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "fbe16002a415cd53a730c4046df48381ac7a399c", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "db4adfb015bd64c01e4a2f8b4f392a5e6d7b66f9", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "563eb86d1e24a7413604096762f54be667855d7a", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b63e3459068be35c36691e329b848e7686cbf7b8", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "70d3584029da499d7c56cabd18f88c8fb33046c4", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "ca1619db41df02ec348b7a2605919ea5f0cf944a", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "d9bbeb51ebae31f0b6b07aa8140769e240b456f4", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "29c8a06c624bcaa26458b4b07364e5012936c56e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "cd141c9889b1ac5370c4b061f39625b1dfbe8a31", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-metaparse.json b/port_versions/b-/boost-metaparse.json new file mode 100644 index 00000000000000..865769be3b67dd --- /dev/null +++ b/port_versions/b-/boost-metaparse.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "06142d599d8265c27584b59a352f07264b5137c7", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "052956ebccd6709f65a87b02f6fdf15900f2a662", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "d75127ba71d92e1f5f30299570e7a29a77d708cc", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "8760b1c0d5f1edfe4140d839741c19eafb5b2a39", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "8900c8cf99da8ee8d9ba0871c2f1ba8f8dfcccdf", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "3d1af58c3d0791006135f42601010003abe29725", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "e653d239e22422fdc1b45302e5a36240f2bee4b5", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "83be90c1cda8b1c32af10baf4c3103fef41a28e7", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b0c7f41c10bf58e0b15dd689c2a766ce120b699f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "313033111bac68f7df6f8cbd2f0f034267617108", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-modular-build-helper.json b/port_versions/b-/boost-modular-build-helper.json new file mode 100644 index 00000000000000..f0353be18a9054 --- /dev/null +++ b/port_versions/b-/boost-modular-build-helper.json @@ -0,0 +1,149 @@ +{ + "versions": [ + { + "git-tree": "1b4dda192c485153b97512519e48a06202fd6930", + "version-string": "1.75.0", + "port-version": 2 + }, + { + "git-tree": "b428c968cc712ea1ca411b21b5a865ea08d02d9f", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "2fe7c2b476f9fd5764944abf12a4b938883ad4ab", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "d404ce9e23e6c5aba490c76a96e9d97e44a89e5d", + "version-string": "1.74.0", + "port-version": 2 + }, + { + "git-tree": "fef0735e9d00a6b655339400b52795f05e76a84e", + "version-string": "1.74.0", + "port-version": 1 + }, + { + "git-tree": "2adeff495465934900529cc655da90613856e92f", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "07fbf366dc1af5b6c0df2ef31c99e09d14c4f6eb", + "version-string": "1.73.0", + "port-version": 6 + }, + { + "git-tree": "85b687465f887cf6908e895af9cbd998cea4b217", + "version-string": "1.73.0", + "port-version": 5 + }, + { + "git-tree": "e7a07964dade0335112b423f32538e75ddaa462b", + "version-string": "1.73.0", + "port-version": 4 + }, + { + "git-tree": "1163ca30716cf6a53e626cc88ebb547a413b16ee", + "version-string": "1.73.0", + "port-version": 3 + }, + { + "git-tree": "112db3279a3c9d1896b68066ffff10e70be699fe", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "187aeb16654eb4187644c087a57acaeff1998ad5", + "version-string": "1.73.0-1", + "port-version": 0 + }, + { + "git-tree": "56db6458d3a98f8c5725937630841bfb2340a8dc", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5abf207242b1d686cba82abb8065b586fd38bba3", + "version-string": "1.72.0-2", + "port-version": 0 + }, + { + "git-tree": "b2b2dccc730717369f2437b1d08ce94b6c180f00", + "version-string": "1.72.0-1", + "port-version": 0 + }, + { + "git-tree": "e016658c94588bab8325dfb10adcffdb3475526a", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "96fa79eb2d77e1a729086f7c46f09ab0ddc021f9", + "version-string": "1.71.0-1", + "port-version": 0 + }, + { + "git-tree": "7a383777c9b1034a4205aed82733dea261ca7e64", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "5e0a8f45104ab676d2a64dbd6df23173fe4ff7e6", + "version-string": "1.70.0-2", + "port-version": 0 + }, + { + "git-tree": "274e704bcaa5b68eeee5211740a871af28e6d68a", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "c5e51e29da4a0d4d00add2eb277603351b3bc7f3", + "version-string": "2019-04-25", + "port-version": 0 + }, + { + "git-tree": "5a8bc5b9c1369690407626cad3da3b9386171cb1", + "version-string": "2019-01-25", + "port-version": 0 + }, + { + "git-tree": "e7722e94f1a004096ce88cb2c9f121380931b07c", + "version-string": "2018-10-19", + "port-version": 0 + }, + { + "git-tree": "b19c20f312d5ebd5df85c93169c729471d1daacc", + "version-string": "2018-08-21", + "port-version": 0 + }, + { + "git-tree": "a672e1b6192248d46c4dabd14db7c8b02280c0c1", + "version-string": "2018-05-14", + "port-version": 0 + }, + { + "git-tree": "726297f8f0b1be5f21118d68a9387aed964ab44b", + "version-string": "2018-04-16-4", + "port-version": 0 + }, + { + "git-tree": "971b341a8567cc62eaa795b8261047b513dc916d", + "version-string": "2018-04-15", + "port-version": 0 + }, + { + "git-tree": "1b37a2650461129b1742326a4945b05ebebe2539", + "version-string": "2", + "port-version": 0 + }, + { + "git-tree": "f43cd59d9cdce8411743f198eafe6061323d9a78", + "version-string": "1", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-move.json b/port_versions/b-/boost-move.json new file mode 100644 index 00000000000000..5e36bc27d777b8 --- /dev/null +++ b/port_versions/b-/boost-move.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "ffdab61d5b17d4a25826bc539dba867ed992b276", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "701d9ebb086a0dae796087101c5a3afc75d8dc11", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f42046e67f057300bb31a96aed527695967d07e0", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "26af1464e0d14d0c8846698001ed8ac9577ca043", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "82f2136d999a52a9d9c3e78f4703eba6a4d5a1c1", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "4d47160c2375a60229f9f651c1da5720b104e5b4", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "652a316b36b800350993be47a76ea4fb06826f95", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "d4c2a9674e20ea8c649e7d91d0ee32faceb9cc3a", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "4634cdbbfb44a85aa21161a59bc5f032b0ee4188", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "2f37f95cd1abaa8e43fcd1d63cc10d0990de6b09", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-mp11.json b/port_versions/b-/boost-mp11.json new file mode 100644 index 00000000000000..21eee097b35d61 --- /dev/null +++ b/port_versions/b-/boost-mp11.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "d70457824e1e3084281f6841211641a548a2ea56", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "4003de72c8eb8f7e4bb101b0d21a8e4a9432c312", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "d7b9226116f2204f71ad246ad9b3fa58383dbb89", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "cf0cb4f72a150d9b42e0b8f90931a5965ca7006d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b909beef1cec65f538778b83d63b95f6c020773e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "9a7c325b864b29ec8ac9642ef871a290535bea83", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "6ab800982a2a8c5cac6ed3ccc6bcd88943a22ba2", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "67ffaf39aa68fa6665aac6280cc2fc906e124169", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "456ebbb4880423898e7ecfc9372ee2cbdf3914a2", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "654783543beb195e24715a4c9c1fe288b4ae0956", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-mpi.json b/port_versions/b-/boost-mpi.json new file mode 100644 index 00000000000000..6085ba814365f0 --- /dev/null +++ b/port_versions/b-/boost-mpi.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "b73cbaa6892ded2b7a7f67df13bb9ef3bc1b9a3a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "6c832d51e87e57d57382fea9ea768439bd3e2b4e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "802dd2ddbc750b1510ccbfb5e48c283f1cf518d6", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "702933c4ea1e670bd6ea902d406b3cf77cde82b2", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "03ee796d10ac56c0ec1fbebe738dd653c4895a68", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "ff128639a8085aa032b7c9a8374c7cfedbe9f040", + "version-string": "1.71.0-1", + "port-version": 0 + }, + { + "git-tree": "efd23f789796665bc811713dfa1d43b5a4b8da23", + "version-string": "1.70.0-2", + "port-version": 0 + }, + { + "git-tree": "cb6fe91adc54717c8c7a2cb494bf72ec15883077", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "36beb281c8b83c9ec6a33e9f635128dd0f342f41", + "version-string": "1.69.0-1", + "port-version": 0 + }, + { + "git-tree": "dac5c4486a87fc70358daaa6e92587c00bde4dda", + "version-string": "1.68.0-1", + "port-version": 0 + }, + { + "git-tree": "c80438a9fc2e9a604f4fd517ad957d4ff7f761c8", + "version-string": "1.67.0-1", + "port-version": 0 + }, + { + "git-tree": "328d2456081e6415410a60ef19bf5707d2da184a", + "version-string": "1.66.0-1", + "port-version": 0 + }, + { + "git-tree": "7c083cfd06f2898658233401980a855f5464b009", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-mpl.json b/port_versions/b-/boost-mpl.json new file mode 100644 index 00000000000000..9a7aa904760c7a --- /dev/null +++ b/port_versions/b-/boost-mpl.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "3c6847d1a221443ccdfefc9a8618c928af1137da", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "5058b7a6caf7e35dc719433daed180a2c85b0bb9", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "d579d7cb90cfb3377f303e51e46b1bdfc2128043", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "db53ae1618f8c64c038ebd7a98c073b7e5fb9c3d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "ba4c64243ef0fdd469781c359acf0d632a932464", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "c2e35925c51500846264e061103894e50b9e6a2f", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "a44e1065bec0a44bc8f565961e514ec54ef94143", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "33966a121a81af8df7ec11446b9109d5d0aa131a", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "8c3dffc715814dc459f4239bccae3a3689abf719", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "58b4c8525b6d8e05a4aafb4e3439a43c1abeb0d4", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-msm.json b/port_versions/b-/boost-msm.json new file mode 100644 index 00000000000000..12e907338d44e5 --- /dev/null +++ b/port_versions/b-/boost-msm.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "cf4e64e71731c3fc1db88a352aa9727082f80626", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "543ebfdf21bab811c42f765551b609e78344f07d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "38dae5cf4f5c478aed7dcdb25f7057f5ccc0900d", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0a849a17b265353a5c6e4039196b12ba0ba265ce", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "1a9c7a83f8321709662bc86efe34f284cf4f6119", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "080132bde79192ae83d9378c72521f0f7afde1cf", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "92a0a0c736364e37904d52e64dddae6aa95e5212", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "b0e07ea98f91f607de95196cc8239f3788dda6e2", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "4d15c083bc7c51c407e00b11c12f8635751235d4", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "47f760095d0ef58fc74ad559ef63ce87a2127ba4", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-multi-array.json b/port_versions/b-/boost-multi-array.json new file mode 100644 index 00000000000000..1f4fd3c26e0244 --- /dev/null +++ b/port_versions/b-/boost-multi-array.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "44693eca97005d75a9871243de567016b1716a56", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "bb28ff427fe1f8f63b8027aee5eebc6a823f6c0c", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "5ba4659f4d21219ef466f4fe626179f8ce930f71", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "e11a2c27455bc9cd48dfcd25cea92c3f83bc9213", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "3cba477108c2268163182f9c9be437f18de07715", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "715fba4596b1596a09cd0843273178f350761fb7", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "7f6818543d02c48b54b235e300113edf1d2af9b0", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "1283be03b2d0702223aedff37cf8dc292e641918", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "3950dfb42a636152bfcbe127e746705991686597", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "59e2e24de69fe4b917a238646ce6f03a69efaba5", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "afe0599f506cca9d4b7fab2c30a77b48f692c6f5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-multi-index.json b/port_versions/b-/boost-multi-index.json new file mode 100644 index 00000000000000..a57ae6486c167e --- /dev/null +++ b/port_versions/b-/boost-multi-index.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "6de9dddaca9c32451cad1f9ab60a27ecdcb345e6", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "44b1753c8c1bf0e4daa3820acfe891fb93becfe9", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3855df4da24a17001705a1f198597682422ab0e5", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "1b0fb25698290f2e71bd502b09b909978db5d75e", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "740d6ae8322e2ba093606a7459412671c7869073", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "44e14ed344d6e9f1b98b656383211db418c3d786", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "8541a7128902357fcfee35e5e0d90b4def824ef9", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "91d83cd96d115c4dea50884904772baeb44cb3ce", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "f11f869b3b77081f937346ce1faf996ce0143576", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "f28f49eddc9dff09b657594a4b165c5ce321f8ca", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-multiprecision.json b/port_versions/b-/boost-multiprecision.json new file mode 100644 index 00000000000000..82418b10f48dd5 --- /dev/null +++ b/port_versions/b-/boost-multiprecision.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "6d5a003c951b208d27de281020c305977859eedb", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "1469cb24a4869538139a0bd626700152ba4c81e9", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "ca5497b49bca01da2bca0b1541c2b9f112fa5782", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "da3f93b10a9839dbcaab403d463939062387d21a", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b9146946c094ab979c9778110029690ad5b31ce1", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "5c514d4414375348e4916343ae4113c3e0b9aaf7", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "36f0f4cbf16f060437357ae32fcf5074393a3997", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "c5b4c1941ef87661538a6dced0ffd43ec3026df5", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "c1b19785f1d04ff838d1a8c98755b40999c10e68", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "c4184d5187d5e60edbb1a98be3e516c885c05467", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-nowide.json b/port_versions/b-/boost-nowide.json new file mode 100644 index 00000000000000..944575d8b6a83b --- /dev/null +++ b/port_versions/b-/boost-nowide.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "3ebf4a6c8d6bdde7a66ffa7c08a35c477dfdcc10", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "21bcba28e4ef0abcdc645c34529979f0812ae123", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "5f98e5fcd3cd4bd476ba78be6e7d815c623526c9", + "version-string": "1.73.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-numeric-conversion.json b/port_versions/b-/boost-numeric-conversion.json new file mode 100644 index 00000000000000..4fe4b9b3cd8cbc --- /dev/null +++ b/port_versions/b-/boost-numeric-conversion.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "9de299c79ee96b9090a3a27cbbaee41b62455003", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "4f206a22dbbf0283bb5c2a21840fa464da51878d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "84e03c7a7731f3351abf0e47b4541a49f9c3d9be", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "4904b5b839c765dc1befc48fadf0c6aa7fb2d669", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "cff35b245bd34a2feffe8b7a96d0b73417e531f6", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d28bc5bb6312ab583a3ed5c3999e662007090805", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "caf2dc34e95d974e833ab8953406cb09e7548a2c", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "cfbc5f6f663f2c268ee3e175e3c28da42467792b", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "97b385de93d6beb4873b6b20c20aae9d2168587b", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "68b1d75d2cede34245dff141bca02743c53dac95", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-odeint.json b/port_versions/b-/boost-odeint.json new file mode 100644 index 00000000000000..2fc3ae4f86b6fa --- /dev/null +++ b/port_versions/b-/boost-odeint.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "92ab84d7e417a2d14c7358145cf83af87e7c85c0", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "0f938fcdb7c996dd3d24c01d4bff1e0cf808a55e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "32bb87656fb8b1354d71920fcd04268fbff5f943", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "359febae8648a57639d494837d9136fb3943344d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "d6762c830572ebbd4323684a8f7e4e83b358156a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "ec79ec83a8ac8d0c7197d88922af3c7c409fc1b0", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "7a36e9f91d3f8f11b7b38d541d5a922a06ff4934", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "b98f6084bf20dbc571744b0bb2b7b1dd1f2b86ab", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e53c52d9f85430fe9ecd93aa08ecc2bc8ec94f5f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a52b62113e8c49a01c7d28c275849302bd173cea", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-optional.json b/port_versions/b-/boost-optional.json new file mode 100644 index 00000000000000..10afad5dc6d61c --- /dev/null +++ b/port_versions/b-/boost-optional.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "bc9caf056bf385d810fd7cea00b6ef7a646edee6", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "be71f26ed429ad7401d2d49ae5bb8b5f021a6036", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3c72f374212dc6a739958ba97b3eb5db2ebfe992", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "63ac403fbc9394f9bcb0d704a2a833703480aefc", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b1af3c7275b7cc47f3f02e4c80ef2c626b30f33f", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "575b825d3738b5d32949e32d15075aa309c21520", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "50c656d90eccb3d880f7a8bc863769cea821bd70", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "2c457cdb8a547534fdc200f77b62b268fcef057e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "cd2da61394cdeae60e771e31791cfd1321e54326", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5f667b71b3b4294585fd5922f24fde5377c79a34", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-outcome.json b/port_versions/b-/boost-outcome.json new file mode 100644 index 00000000000000..a98413cf640b91 --- /dev/null +++ b/port_versions/b-/boost-outcome.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "078abc59d831a640ca9ab5391f63e8aa8a95bf99", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "bade5fbaf73d4a6e5856d1170801b4861ad54eee", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "837ca9a2dd5d41179c6fc3192f74083c3ea34951", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "7122cc6b69c8c46c6e3d7ba54359fbeb85cd7507", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "f95d70d844d51cf422d3874a73a06a4029707ca3", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "ed6420c7c96b34c23c66cffe00c88aaa083d910f", + "version-string": "1.70.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-parameter-python.json b/port_versions/b-/boost-parameter-python.json new file mode 100644 index 00000000000000..ef367d39bb4b80 --- /dev/null +++ b/port_versions/b-/boost-parameter-python.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "dec159c5ad8645f1527a9c00d9cd56840a7bea2a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "fc3e94ffb7d3a6bd9346be50a55cd8d388ad3bdd", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "e464519c64bdc19c366c3fe4f81a567488aa4bf9", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "adc1306f39dc508ea895ee309f262879bc260f7e", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "4177f6ede7a5ad40f1defda81d881af503e8f80f", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "7e22f05569f68c13a71f33474b3a0e28b8f4323a", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "2e24d0a65859716b3054acf46cb3183eeb4d35d4", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "cee396ffefb0e63caf08216be30ce57ad27b56a9", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "21fc6116c1798fcecc5cec8fd5174c7c8c13052a", + "version-string": "1.69.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-parameter.json b/port_versions/b-/boost-parameter.json new file mode 100644 index 00000000000000..f896a6d384b1cf --- /dev/null +++ b/port_versions/b-/boost-parameter.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "04759c54c296fc98c5fd452b7e1707b5d2e8908d", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "a8a05117ff17b78c9e25d5edc7b934ec2bd97de5", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "6b9936e2941180b9915722f9fa172b24e0e0816f", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "2236b9fcb36ac57a86672580631a5a38588435c2", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c7ad0049a8a02f146d611893c1d25b004b679efc", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "56cf52161854c2019244accc1567869626810cc7", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "579c568bd7eca04004fa0f3a30e20c9c93ec48d2", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e4d056f3c6c7d1dfd1dc4d43557f73aec54265ca", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "0f21615783b3b0b3bd710d3100ef3fffe60538d4", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "bae9960ebd64abb05f988d01f95e39a55deb085c", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-pfr.json b/port_versions/b-/boost-pfr.json new file mode 100644 index 00000000000000..6909df69afbe4e --- /dev/null +++ b/port_versions/b-/boost-pfr.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "96688c29c3a5a60c3b347391664756f884eda90d", + "version-string": "1.75.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-phoenix.json b/port_versions/b-/boost-phoenix.json new file mode 100644 index 00000000000000..82ed89c3d88a73 --- /dev/null +++ b/port_versions/b-/boost-phoenix.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "5f58bbd7060a9f72ea2a61edb03250ee079965a4", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "d19c6271f74420af372b2452ec699e4caab07ea1", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "80392f2d9ab9abf6ae587de851ec4b49c42fe9e2", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9e7ee11598554bf50d36481b29b1ea964f4cb1d1", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "631ea14e6ac2fd604fb3c7c8797fd55cea03c030", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "067e1f80ed1afd316020d1d84692b3b674e44f56", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "15b6cece21643e0ab0ded10cd182004a513b9d80", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "c02691b2970cb0170308e2455dbf110c358921fa", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "6aab7720ed6a6fc75b24d2c9fec365cb60751543", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "8889e9d0ef6ac1a42e5f06ff8a0671bbcc309cb3", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-poly-collection.json b/port_versions/b-/boost-poly-collection.json new file mode 100644 index 00000000000000..6c08f6628d8a96 --- /dev/null +++ b/port_versions/b-/boost-poly-collection.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "6867f4f5795c457b9f726b907606da8570c9f66f", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "1809da29e58709fca479c620ae0c885f30fa3960", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f8c72c96d595aeda145b193248e8ec219019b527", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "ed0fa4128c2da0b5670fe7c0f4fa257b68fd1246", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "deac35b40f793ed891ce85801391b50daa15d196", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "9b05e6d6f8ce8f7a20a9031aa6d2e6200ad0a359", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d1f35527bb9a66cad7bd047b53cc754d6e47e387", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "2e17c7509e0a77e2db62a15c3055e66b6a7e63a9", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "9514f57ba3b3f520f580a5d1f6b0fc95aaba78b8", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "33ab2258117d2b42ad9d64509d5c8ca42f9d7157", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "2b55d26b9e35dc6e503ec439265a30f6942ce63c", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-polygon.json b/port_versions/b-/boost-polygon.json new file mode 100644 index 00000000000000..f82066aaa585c7 --- /dev/null +++ b/port_versions/b-/boost-polygon.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "990f655bf0d76d2a916bd7c0631f01a7a6516c05", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "3027fec8cf1e3ee70b118ef8e8252a7248a96b1e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "26532b34fdb394b72a8eb9de5fd86251a93278d3", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "07372871233a994115153c9903ade00b8422c9d0", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "2bf4ac6eaa8ede6f507a6ef22f91697ca86929d9", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "18a84857c891e7535699a75b62751951a973ce31", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "275611a9e6f6751e6f9d97faa8ff35a0585147c2", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ca20a1061687f8269a014139ff51c9eb15e3b63e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b559e6fba3459eb443caccfb6abc1877b655b0d3", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "9f2b5cf8d10cf6ef07ec370f4a0fa42340427c03", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-pool.json b/port_versions/b-/boost-pool.json new file mode 100644 index 00000000000000..61dd5c74ea64ba --- /dev/null +++ b/port_versions/b-/boost-pool.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "90d72e8d8b2f27deb72fc883542f130142878a86", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "29785b25e33658943f0234f3e741472d66413a80", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "4b431893dd45ff5a697ddb75bdb547c5ae2ef2ba", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9381b2c96b09c0517db355129c141c74fdcfc855", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "9571c024c000de5d15b9ddf619375526bdc0ba80", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "2eab2d4bc130fa83a3c089c023767b587dd60d42", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "8ac91086194bd77765f3e3027156af1593b70fa9", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "96a5ad7352606709f08c9134e884e4ba591c012f", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "1573a51340947950bb5cb90b619e697ec6f60896", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "8d97a0c77b606097ab9d9418a4cb602763391fc8", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-predef.json b/port_versions/b-/boost-predef.json new file mode 100644 index 00000000000000..ed3a483c27219c --- /dev/null +++ b/port_versions/b-/boost-predef.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "d4eea152778c8edf5ac36cfc804b4a4c38e2586a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "93c1d220a8aad92e3ea944241b6c012a100135e0", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "12e0ad4d58cf353a20f2bc4e06144d7d706dca6c", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "686bf9480ebc915a51c29add1a79ee1ac2faeb43", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a06cb7fd99d03c259c143acf0f49e47aa5ec43da", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0674481bed721602a63397c5f1ead31d25722dd9", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "2e3b623903c5015a0f5abd40a676d448ad9efee7", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "db5c78b777b8eb604b036ecd49bc2591f8e30b19", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "9c2da3374a19b46eaefdbd947806354255d2a3e4", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "d14c0c29c9a15ed60470e864b3456c17617230da", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-preprocessor.json b/port_versions/b-/boost-preprocessor.json new file mode 100644 index 00000000000000..f71afabc17e264 --- /dev/null +++ b/port_versions/b-/boost-preprocessor.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "8d78b8ba2e9f54cb00137115ddd2ffec1c63c149", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "df5e8b789fb8ba8db75ea28bab8572d51abd571b", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "5e362423a1e37acab0ed4384c4ff7d404fd14503", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "86eb3938b7875f124feb845331dbe84cbab5d1c6", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a5ac87f78f12cdae644df906759a37fc73bf4651", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0f6068598d7166ac3c86e6b2a2941ad87c664a57", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "d1d614dd9f5ed6360df11e450c877429a45157ca", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "7d3271021cd76a790b2d1295e07eb537c01d2d8f", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "40d7329109bab9f2da994006e49662cbd58a5b55", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "85ed15dc13f1d463b3ab8ff25f7e2c246286746a", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-process.json b/port_versions/b-/boost-process.json new file mode 100644 index 00000000000000..10fe607619719d --- /dev/null +++ b/port_versions/b-/boost-process.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "5d47762887873d2311645a3bd38757e2cb657f8e", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "6dfe0cdc876f8250e2531fc5f8e5435269285623", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "fb8f0358a83ee209192b713e6ff095b2a9bcd36f", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "e0d4d0470b2a3e4d650c3555e6092e5ff82e0f82", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9e5f0fd21217726b4e5b16f58290fae47152d908", + "version-string": "1.72.0-1", + "port-version": 0 + }, + { + "git-tree": "1caa98406872113999b5222d9600415aae6b405b", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "32470356be5168af75860d960e3ce25ebe7b0a9e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d48806ad51c459e803b7411ece1d8fe5927ed982", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "f738b1fc105ea6ae5e699e7afcc5d4cc0cc871d6", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "6766bae1fcb24e1efa5eaa462172e758673cf163", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e52b46514451baa1dd5c22f7ab6d522499736ff0", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "3e5c76798b923364a290c0617029edb85921ec31", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-program-options.json b/port_versions/b-/boost-program-options.json new file mode 100644 index 00000000000000..e6237f297338e7 --- /dev/null +++ b/port_versions/b-/boost-program-options.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "b9d572b6e3313c7153c36bbb365e76d32ed3a7d9", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "dce02e15c577240c07fc1f8688a9d0c54e50ab8f", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "91fd98ee6b5ba3cb49d4d2375caefe9d44ea2b49", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "ba77e03e2b09d888225b31c3cac7e792cfec3710", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "573433b2628e8050b34e5c848429730e4db1832d", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "16447985ef585f3f44cda1531cff5bc03160fb9e", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "c562ecf725cd9bf0bd5588bd88224171635cbf0a", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "5a763d66ce013ce7602b802c19e840dd563a6bb7", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "cbf38850c9195656fc10a9e3708ce02b2001f0be", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "071cbe77828f797d6b1df7e3cc1c6f8473ed88d4", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-property-map.json b/port_versions/b-/boost-property-map.json new file mode 100644 index 00000000000000..693df9881c2d31 --- /dev/null +++ b/port_versions/b-/boost-property-map.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "5d13650ce8dc9bd2f1af435bc5a3ee2f96e699a3", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b7956347c484064bffa998c333c98131578b64fe", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3225be410e371a11a1467e7c9301a35886cb0a7d", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5ac347143fffe173b866ad1c741d6ffb57ceefce", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "38d2b66b0221e17cebad6d1dc4216bfeda0e3a79", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "1d51c37f141352b566775a9f6781f40e0501a5e4", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "37155a43753832feb4b73f254bb9ec45f0c958fe", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "6c3b625c2605984644140cbdd80d832d1d4cd243", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "63848a008f106c02306ede099ea18df431c18f19", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "96ed4c2d491eadd7d2994954bdcc6a99fe858ac3", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-property-tree.json b/port_versions/b-/boost-property-tree.json new file mode 100644 index 00000000000000..befd8639c729c6 --- /dev/null +++ b/port_versions/b-/boost-property-tree.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "dbd7fa06c82727307d26033c3ce4679c05489726", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c05b856dedef9d5309b6f9012d887c7dce28d243", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "85183ae9b96b68e82c3d5c67bbbe4c229d8cc2e3", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "d7cab40cbf6a78f391dd2e3529620883107e5bb5", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "ea4ffc0acb0dbf71f4242f004d5398cb7524ecee", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0053dbedf61b06ba3202acc81c7bace3b51ef859", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "379c055c6fedd0955cd3f1476f02995922bdbcae", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "fbb67501862446edc1071b44b258e8532ed231db", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "c7843abc73a0bb131f48010a6978ce440d8ace8b", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "7120fb2cfb6d68cd809907f1782bad0cc73acaa8", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-proto.json b/port_versions/b-/boost-proto.json new file mode 100644 index 00000000000000..afd97bf4e22744 --- /dev/null +++ b/port_versions/b-/boost-proto.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "212e0551c299f67ccaf077cf376ed9da38af6b5b", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "2aaaf7930b6b5b3a29d4008604768a0943ff929a", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "cb39aa32e10a83818fcbd7a82acd0291ad8f56af", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "f0b7aa34b48f91ad089f6cd0d9c0b7a6b4190e84", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "8bd94a4b20959832581149a776c2f4b4fec8237c", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "dc00c855c680d14be5cd82b216a8b10638d27fc8", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "16247abb0f9eab54b00aa071cc90e84561e93436", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "7c3306c33e84b1c09c4d5cc86800060b560d3a9d", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "c1fb2eebf8724e2cb1ba263a3b793d3ea3b09508", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "3889615be6c3ebe792eca8de0e3df1371306ad77", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-ptr-container.json b/port_versions/b-/boost-ptr-container.json new file mode 100644 index 00000000000000..96c9433b0e3440 --- /dev/null +++ b/port_versions/b-/boost-ptr-container.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "a864f78b06709be6f35ed5b8e64919f3794a5a74", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "4d9eac4fba8786b3e8b9c64faa74b73acb76aae9", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "431ee05083e5f6352bbcce649fa512e567394372", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "dcc85f5764e00d11327d25aab0ea30c9e4459e1f", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "0c30d9fa0c2507bb350756d95cf0ca5bd7be062a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "ed1ca28ffba240cc7a603b58ddda034c05516833", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "9dc7c4b73d25b8b8aff652f9fec737687c80f16d", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "6b32d64ca812c11888370c2081b99148aad04762", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "7c60dbdc785106c8677e999b0e96e1e4cac673a8", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "375e47b2d4987029b6bc19969d74f284f0eca643", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-python.json b/port_versions/b-/boost-python.json new file mode 100644 index 00000000000000..8392af0d7931ce --- /dev/null +++ b/port_versions/b-/boost-python.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "780820881ae469bb68c86d48a5693f616c2c3b6a", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "f38e7a5dfd9892965a37a4aedf055950e7769477", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "5561267a2aa6d56e0451294589ff1f2b8ed8987b", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f113307649505569e6dd31317d9a64472eb78117", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "d63a0984ca7e73741159f820827ac18ab3f924e6", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "4d4f15ff9590cfa09fd3fdfb2c0c892b64a3b72d", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e8defb6be7a16787c193ba536b3c8075abe48e2d", + "version-string": "1.72.0-1", + "port-version": 0 + }, + { + "git-tree": "0b1e4a833c1ca38910b639c853a87b637b340792", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "1f560c0eee02f5a55166e0cc2439cf384edbc76a", + "version-string": "1.71.0-1", + "port-version": 0 + }, + { + "git-tree": "4dd7edd79ef06d3c7bfb7e985847ec3a0c6345b9", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "400dbaa4966a954770e9d8759778db83b3faecc1", + "version-string": "1.69.0-1", + "port-version": 0 + }, + { + "git-tree": "247a010215bde83a0f975080a6d7a6c830f0a6cb", + "version-string": "1.68.0-2", + "port-version": 0 + }, + { + "git-tree": "ce8819c258d304814d123715f4f1c395de9163bd", + "version-string": "1.67.0-2", + "port-version": 0 + }, + { + "git-tree": "923554ebe60611577550c6a39cac0f8b988c6b94", + "version-string": "1.67.0-1", + "port-version": 0 + }, + { + "git-tree": "4cb5033cf45e98be657f57114b7f0c7ef81bcd3e", + "version-string": "1.66.0-1", + "port-version": 0 + }, + { + "git-tree": "1fefff58b74c58d6af63fd36fb83198a1cc32de8", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-qvm.json b/port_versions/b-/boost-qvm.json new file mode 100644 index 00000000000000..6803932b17db30 --- /dev/null +++ b/port_versions/b-/boost-qvm.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "93abe1969976dcf265014b8e7f5463ee3b3b76d1", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "bf878abd4682e1ade2169d87639d5aabb66571bf", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "8935c84edc35077cf28149e42ffe6768a926a73b", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "59dbb65ff0a083dd51c070f2d485f0b85a2f6b40", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "82aafdeb7881bece44c278c6fae415b10fc8d709", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "eb34d5101d14f066aef9b00dc43570693ad837cc", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "d61f5ff2c62184804fe18d07f3c9ca5dfbd2a469", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "afcb1dc25280ca21ecf5f93adeecdd2fe5a806ea", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "1cc5002253146f8166c424a11ba4542090a69673", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5db32bca005d838a106957200f46e93b85921fcf", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-random.json b/port_versions/b-/boost-random.json new file mode 100644 index 00000000000000..244bf656f840ee --- /dev/null +++ b/port_versions/b-/boost-random.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "8a957fa31444da59d5f8ba9ee8254670e18b7bef", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "e68a19bdf537ff1a19b5bba7d1766636adced790", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "1de432aacf0b6e3b397a53ddd385d94c9b04b058", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "85c3c8a654edd92af468bf9c35be1a9de2cfdb2d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c67cfc419002d8967f967edb0649d6ad6a6719fa", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "b3fe5a5db069ff41cb1266f8a26d37f9c6282358", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "fbf4c33b43d8739a5a4cc91ef074ea140cc52c00", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "9ec6ee12311fc2d31fb247f577d68c0273fa265e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "715b2b14eb6205cd71755fa298a527aaa03dae8b", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5eefeffdb653765eb57cb73148fe46627ee82bc9", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-range.json b/port_versions/b-/boost-range.json new file mode 100644 index 00000000000000..8bcfa6406d2a2f --- /dev/null +++ b/port_versions/b-/boost-range.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "57c3a7dae1c551c1839a35a2d518c2ea0dd43795", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "e72c575bac8ae7881b8cf97ef205568b73c25584", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "bd7374b3bb9739b5cdbcd3d475a020447efeb2dc", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "c4005c95b14524a19b489792bb091e24f9364b53", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "6b994f0a853e0625e60b1c1cde0169c5bee9414b", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "6d4e87ced25a91bbee77de9f02f5a11ef65ca09b", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "9c902b35dabb37844088b348cf7240050e930541", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "6999e22de76169dd3037f7d2a7c159be8223b549", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "99af4e93420453476a98f336df95ee4ace4e7403", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a26179112d828a3262ff88a323a014366cecbc10", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-ratio.json b/port_versions/b-/boost-ratio.json new file mode 100644 index 00000000000000..c421a7ae32e1fb --- /dev/null +++ b/port_versions/b-/boost-ratio.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "bfdcac03e6dd3a24818ca99a96f464a2404f2f0b", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "338c5b178e5e2723ac77d1fe0085dd3845980f79", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "eacddea39d880446b3e8e64a6527599f15c0d63c", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "c88f3286de646a9f20b9941699fe02df0f7ec69c", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "e81e746062e1570980d7204b186ca43da5ec7c03", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "31d533e60133675e7935e08a8c90ca3abc5974b1", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "6bcb8d63edaa6a5bf2ede29779b63076e3ca316c", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "c63b827e87addd3e5869c346ce9dad791df6e82e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "744d6f12b83ddb7da0b154646d8652a8a6fc6f3e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "b64059a18774ceac71aad3220138fefc06d96f84", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-rational.json b/port_versions/b-/boost-rational.json new file mode 100644 index 00000000000000..37dd056f1b3575 --- /dev/null +++ b/port_versions/b-/boost-rational.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "27fc174ae8a94007819eecfa02e8830e85017ebd", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "8de4e22e52ba7019b8731d4a5cd3e9f86eca4461", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "042d0bdfcf016ebed794774036238d299cce574b", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "ccf4141c0e92f26d702767087499fb0f5653337c", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "5df9940dea5be4c08f4e47c3ee1eb8a483fcb4f3", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "aa923124baa6d31432e6f4c81295978b570ade8e", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "d840a346cf5f7701eda2eba4445ebdecfd545096", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "98ae814a844d35e5a9b0abdf3f5ae7b5eb199483", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b8eda38a953ea0b50c13cab0e2591cfb8efaee41", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "1f8a8d0303f89b086c8b1419695c60b99e9d0c02", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-regex.json b/port_versions/b-/boost-regex.json new file mode 100644 index 00000000000000..f1f7405b2ea6e4 --- /dev/null +++ b/port_versions/b-/boost-regex.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "d52e8d7a6b4b98dd2c489abac3e33d108e8afdce", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "f9b464cfd360625b5d29a7ae731c36354af05cd5", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "de4ccb00a13b4fe4b28d27be7da9a2959f8d43d5", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "b61c5d82e609c7e3826c7b19a45b9fc102ee9544", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "bdaadfa01307e637d7cc6e669da68feb4f19358a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "3269dd4ed71148cfa61587436d96058e58b799b1", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "d4f7fc5b13dbed2badce5c38063a8ba06e2ee977", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "48c27f7d81f24494594de9eab666d70836bdce0e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "014297cecaf0ddcf8801ee52864d66f9a7bcbfe9", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "24725c0e6f8784c90287ad966d89a0ce1446e3da", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-safe-numerics.json b/port_versions/b-/boost-safe-numerics.json new file mode 100644 index 00000000000000..2e6eea223a21a1 --- /dev/null +++ b/port_versions/b-/boost-safe-numerics.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "1a6a483b16ebab8a08db06a64157d9eb563ec0ea", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "7a64b01c4ca808e998f62d3889f7d21fdc9ac29b", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "db4ca1a37a1b6f58fd39b61a9a1ff9c8b3a5267b", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "c7691df2a74b37995e47c47c1bda8809f0b9d1d3", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "20cfe7cfaedbb7b7999a71171fb7027b12a21dfe", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b77ea4e8c3c17627465da32b39aeee79dcf8ae36", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "21dcebb8e32cc01c1b9da77cdbafa0f2774f222a", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "2ed9daec6c942f444508c6b182dadf0eef889481", + "version-string": "1.69.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-scope-exit.json b/port_versions/b-/boost-scope-exit.json new file mode 100644 index 00000000000000..5cb79cdaf32a6b --- /dev/null +++ b/port_versions/b-/boost-scope-exit.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "b9b04d9a4c678589f8944d4bdb2b33746cfe21d5", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "8fa4144cd296ee0a1dc3b94885e9ca0e929d0455", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "48e5d3b3c6e3dbaa76c9f15efafcf68bb2e5f5c9", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "1edee114d8de1c81ceaf77247e9528d4ef7a1501", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "25aefd5e795b2b5924845d26124c55fdf7805d39", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "07195716f55b643cc65cc377467840e151b3612d", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "fa86efc2dbbc71d3e774168dfc33132e4c0fedb6", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "351acfa4c6ebb40777051fc8ff690ac58c3aba09", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "dc3c46019810e572f84a4763dc7488a2e33f6ead", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "d5d33e7e395d24c640d0dcccb36f28ffc22f46e0", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-serialization.json b/port_versions/b-/boost-serialization.json new file mode 100644 index 00000000000000..0cadeac310f125 --- /dev/null +++ b/port_versions/b-/boost-serialization.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "dc3da425b2263d9b4443a1344007bfb0f395cb38", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "df6523833c2d6808dbd43791234cf067a94fbb12", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "2a31e8cdbc82b37a61fdad948249f7e314ed3e58", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "d4b9786242cd0d205bb3a2d8cd21b020cb7d0a2d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "be3940250a015636c06a04f2ecbc2426b75e95a0", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "ea20f0300a1af6300c1132038dbe65c5deb0e428", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "8689534823be018efd6158623b2bbfa30d692b88", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "992416ac0dc16fb2b145cb8dce056951fe358bc2", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "d197dd0f237c04b277a4b1fbe2b12cd5a99a3b84", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "d11ba4cfd902b080ea15e1b3c6da7f5dd9718124", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-signals2.json b/port_versions/b-/boost-signals2.json new file mode 100644 index 00000000000000..5ab1948051e437 --- /dev/null +++ b/port_versions/b-/boost-signals2.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "767d42c39507b5461591bf3c212ac5c5f1f29b91", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c230360cf949b220768e7c758ed7facfe446527e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "2a915d1599c07072c0f1e14e1d83df17a935d17d", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "87d87de6922a4d8032796ffb9d37a9e78416d78d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b4c9eaa3fab2ce9a835cd79ac95ea1a9357258ce", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "f6861bea368c6d68df969d8aef32c3e1d2addc4c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "a6b330c3b6f26b4916c6b1145c39d8c63d2d1b2f", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "6fa54e2a7ed9bdfbcfc699b85420e8f0fb1a2ff1", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "c61348056eb07b84bf6883484f740c9565c5c899", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "ca46589531bb374aa5dc11d339800c14238b3668", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-smart-ptr.json b/port_versions/b-/boost-smart-ptr.json new file mode 100644 index 00000000000000..4b2552d12a6586 --- /dev/null +++ b/port_versions/b-/boost-smart-ptr.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "d18232c6100b5b8836e3c14faca691fa9afb1e1a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "64ae2e6142d5c91d57f9937bdfbfcec148ac6013", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "346986194740c9cad2a8a77d55813a5d337874a3", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "496120ad295ac7ac2d3d87e25ad344e70b6b2e46", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "1dbd9d51df0c2e8f7fb56f8f3a3e0a1e0713bdcc", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "3a67884a42fccc770c55769aa708dee5cfbf6bf2", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "77d4b19196b0c9d5e2e7ddf2616ccda30e930e4c", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "d38abd1148d0451d8dc021cfaf1e3d0fed1a7bcd", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e23c07e3c33edcb285faf922bf15246ea561afa1", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "bca03314abd2fcf7d1c20e6b0625f71d5f8810c7", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-sort.json b/port_versions/b-/boost-sort.json new file mode 100644 index 00000000000000..eb02daa301ae9e --- /dev/null +++ b/port_versions/b-/boost-sort.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "6838da5ade313772c95807dadf2c6f10978887b8", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c1ca8ba2b6acb4a4bb92c3acde6f11ba41f781dc", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "956f9b4d12deddcdacd1fdbdde8af2556bc5ed37", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5a15c890f01cf116fa2780f64ec023bebe9ad33e", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "44deef7477fda8e74ba1639c7c0c3f68f2f051ee", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "e31a83a7ea77b007e23d5571e13fd50fc812b4df", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "c38dbe69658bd2ba811e084a0506ef91089df94c", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "79259585455c9a147d23da62aaaad316e9e0a705", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "28f38389b2b943f74742b55e57f8b593e81197c5", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "e6c059e9ed2be834bcadcbb64b5e9cf5dce2daf5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-spirit.json b/port_versions/b-/boost-spirit.json new file mode 100644 index 00000000000000..72d3e3862ebd83 --- /dev/null +++ b/port_versions/b-/boost-spirit.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "7e42477706e50953271cf2b9ce6d3f4ad9669124", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c5f1b643139d3ced0325e49d58322066037b2114", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "c000ac17ef26528602d249511c28a8f82484c7b2", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "6fc1172e43201e03e87bba11ef2c233f7b795f44", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "0b0d43428e8c359ea681398b1a9db6b921e2ba2e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "cc606d6cb20a92527a0f6fe77e7c1fed26f4141b", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "d88b6b6399f661e8499a47a46eacdc29bf12a8a3", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "7703105abc52e7994ae0c34dd92e869e3f8cc292", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "9fd98a94bb0f0bb90c48370b0c032ce4876aeac3", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5e75a1bf820b22f5ae86555402c96d2921bf6427", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-stacktrace.json b/port_versions/b-/boost-stacktrace.json new file mode 100644 index 00000000000000..c386190e311b19 --- /dev/null +++ b/port_versions/b-/boost-stacktrace.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "a6e6a66f2bd2227224064f4e1aeba56cd27d9f3c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "d1f97a37915b43eca3d51336393fbb58ad2a3839", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3e89fe0f6ae03fa0051955dc2d97200ad073b8db", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "a5b1378bff1508e443e02a8dba876797c50f8c34", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "c1a348b46ca401b00d64048ff016a1c34e7648ad", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "d29fc35c3d581a3c662318b8cb90f6608da589e4", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d28ad966e96fc64954bd0fb569c922499cbf84bd", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "7db733b796b8988061000988c406bafededccfed", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "a698a2f55ecb95b7b50de7c5bf363134aed945eb", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b0b26afd13d3f3bf27206efdcbb68462f2a8da1f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "692d7b64297b627d70c7a41188151dee9a588038", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-statechart.json b/port_versions/b-/boost-statechart.json new file mode 100644 index 00000000000000..f4359f237fb5cf --- /dev/null +++ b/port_versions/b-/boost-statechart.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "0a5df3d26698c16a1152ab418b6f6258621eff40", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "3322770a8d0a4e29fe9b9bcf167f9f8c55aa9b2b", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "c1e377e054dff8c480169c8b6196adcdb9d5a22c", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0c5b644cfa888c4b8b273c2f312959bd05fe9628", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a992d34a93176220e154aae79675dd42868fce3a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "f10853ba92bee21021f12e068b2d49d435c4d9ae", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "af46ade625eae800a0f78100c2d36035c4b13705", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "4426492741769f9365fa03b0f55ae72a75daed43", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "3d796b5c6b250166a26290350d0f068a8dbf959c", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "cc2ca4607e8a1b6846bd89b16ae52edb078a05a5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-static-assert.json b/port_versions/b-/boost-static-assert.json new file mode 100644 index 00000000000000..bd3d32b8e716d9 --- /dev/null +++ b/port_versions/b-/boost-static-assert.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "2a41c4703c7122de25b1c60510c43edc9371f63d", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "871d4013cd853e5e440fe61fbd468a8b96f41c14", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f131491fc0280897f8786f170aaa04950a1326b2", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e82d8f7f3ee07e927dc374f5a08ed6d6f4ef81f4", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "3de4428d58f0ac3ef3ab748a9b910c288ba31f50", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "9d33cc31778b5cb134f282cd7a11161b83ddc649", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "b84e0e934fa66da86f8aa032bc32ddb447c70b2b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "effa8bf80331215aaff7d1c40ad873c4afa0807f", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "6beb3e46c04a4fac712635b8524ad876a7c20e8a", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "6d891e259b071689460551d67a60eddb2879d5d8", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-static-string.json b/port_versions/b-/boost-static-string.json new file mode 100644 index 00000000000000..7fcb2fdc9e036e --- /dev/null +++ b/port_versions/b-/boost-static-string.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "3bbe6c7f88321969abd4926c439851286fa4cfb0", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "ba59342bca213a38e77b5abf9764826927f31e06", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "313a87142b4f844e7a2d839309bef8a39c8f023a", + "version-string": "1.73.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-stl-interfaces.json b/port_versions/b-/boost-stl-interfaces.json new file mode 100644 index 00000000000000..fe5a16137bb850 --- /dev/null +++ b/port_versions/b-/boost-stl-interfaces.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "39f712a73b762150961fda9a9f81edfe2ecaea32", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "be85d9bd6d129bf9af47e0b4cbbc966c08fe02f3", + "version-string": "1.74.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-system.json b/port_versions/b-/boost-system.json new file mode 100644 index 00000000000000..c5a5b83ba6a2f4 --- /dev/null +++ b/port_versions/b-/boost-system.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "48db433d88b5e7a37e26f8fae95786790be9b158", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "ef09e0f830b84cce404229bacbbad7bfb58ee46f", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3a5039dcf7b8857d1c8293a4cf40942023604a6f", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "b6722bb909e96ced9b3d043365beb524139694cf", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "4250413c5ce279a13b4c21ff6244a21fc8f13a50", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "7836cbdbab4e91472fbe3e828a89c42b63d3f220", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "bdb51c22b1c2b5588a71378f0eacf34fb77535ce", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "f23babc95421144bab207f6b2dfcbd6f8cdea32b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "734c3846580e4d62401506adf6ec95e0f9c67dc4", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "7922688edb05ed05f51e00f4793acb94f6284e06", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a097e5c43513d91ac8ff646e3c5e5b3ba24fca17", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-test.json b/port_versions/b-/boost-test.json new file mode 100644 index 00000000000000..5ddbc41e1a5ff3 --- /dev/null +++ b/port_versions/b-/boost-test.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "85ea380a4cde12732bc96bc9b4c092909421afca", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "04265aa4f689d56685b42bf28f2e26765bbdce64", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "df00b98a0286d12dd2f1d17c09824c23425001e3", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "de0ce09d5749cbf94461ad62c8a57bcb103777a7", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5d9504bd94654eefa35421706e8d6dceae9560e6", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "d3f7b73a7fa28e58a177da854620a43cbc26c0f1", + "version-string": "1.71.0-2", + "port-version": 0 + }, + { + "git-tree": "fb08e6bc51befef2eb9553791764940a2758a1be", + "version-string": "1.70.0-2", + "port-version": 0 + }, + { + "git-tree": "39fc82e5c21755871e00352516937f805e8f0583", + "version-string": "1.69.0-2", + "port-version": 0 + }, + { + "git-tree": "c39461bce96acba27f69260f64db03963f126560", + "version-string": "1.68.0-2", + "port-version": 0 + }, + { + "git-tree": "d81331534236510acce87442ea5543c29db97077", + "version-string": "1.67.0-2", + "port-version": 0 + }, + { + "git-tree": "e4a53915142485fe9c88a9df76628f3ec98fbf83", + "version-string": "1.66.0-2", + "port-version": 0 + }, + { + "git-tree": "993245a1057b1a17b03ab592cc1303b4a40b7f5e", + "version-string": "1.66.0-1", + "port-version": 0 + }, + { + "git-tree": "7061c73053764f235ca6112af77e67ef84b55fbf", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-thread.json b/port_versions/b-/boost-thread.json new file mode 100644 index 00000000000000..4a75acd5e9d562 --- /dev/null +++ b/port_versions/b-/boost-thread.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "e37b7227025ce689055e4fa560973d0d8778e6f4", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "12e8de872c0b45b884db604ece353585ac66bf45", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "bac44c27a61325152af7b5470f7b8f6b9920928c", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9f8ea338d5b510309f8a64f04766f5cc3f4d32a2", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a3cb8223a9186884ca8881c2eac17ac37415663c", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "40bbe28aaadbb700bce86e15962e088341c34da7", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "87d272992bc51ff47ee345f377148c5dbef22707", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "4a05d4c14b5445d58a08e8bd81987673e7d8d294", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "fac02771c6ae3a7e91f63ed40375357ae25ed005", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "099d6b8e2429a8702d65d7edf56dc9c4f9e6d2a5", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "b35a337eed03a72499ed08770dc5bc79ca285c53", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-throw-exception.json b/port_versions/b-/boost-throw-exception.json new file mode 100644 index 00000000000000..0f4fbc0ac2cf55 --- /dev/null +++ b/port_versions/b-/boost-throw-exception.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "b13bdf32a20786a0165cc20205ef63765cac0627", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "1f89573490e0b85c91e0b0e26da69287d02eff91", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f7f521fd833b3a78f070d8ecc79747cde60d646a", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "64df295f7df41de4fcb219834889b126b5020def", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b78dd0a3e6ede4a123197db887e928c36d6bfea1", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "eadefcf3d182c023ff231e86e6d3f3b2ee7b62af", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "2b136c90d4171b755b9626e11c69220b13e2dbd4", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "66f2fb485888ade0b17ed3e66a256b81214341cf", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "a168b3729dcd60ea97a765db00dff076d1906ca5", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "79f3aab1a3420de75d36beb99cb22fb2cca12e03", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-timer.json b/port_versions/b-/boost-timer.json new file mode 100644 index 00000000000000..d4316b712a97c7 --- /dev/null +++ b/port_versions/b-/boost-timer.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "05606fbfb07b35716e76153b1e0d5b481f6c8c4f", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "8c7b4e5dbe9c0635836d34927cc23899459dee64", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "ec9ee82d5ebbbe5bc4f9c19cb1b999fa584d5f15", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "a3a4d63652cdd22876f9409ec61a84d162e2fc60", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "1a6b9527ec613a614601a841ffca6bc7fbb32a5c", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "50cbf677f19310767ffa18ffd6c1ce44c50d2232", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "53091c6d7704f7ab1bbf369c37d492d46d8fef1c", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "c1ddab95bcdcf7a931bff607b9cc79bf54cd1a93", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "5b7731ad8b90f59fc6e8bb56088390274f479697", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "cfff6c7a460bb95152a3256f445876bf1ae0de4e", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-tokenizer.json b/port_versions/b-/boost-tokenizer.json new file mode 100644 index 00000000000000..143d1c7b486c1b --- /dev/null +++ b/port_versions/b-/boost-tokenizer.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "ce248c1ba37037937a656c72bfaafb0d523559e4", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "d890c67cc38ddce8342e4aa562a9616e0c6a0867", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "e5bfeda78c8d8c3d87c42eb1f56fa91a7757eedf", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e89c1589ba3f4d1e5c7c33fca4ffe39e98f3f482", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "cdfa7b0092a0758580da3d935ff10fc5d787b80f", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "8a5552093fcfcec34893e5569e4fae0bd4b8345f", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "09f264b65c105bd680840a250db1bb3dd7fea89f", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "31ba0cf0bf5b52ca8461db12511ed732e9114cd3", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "7284a81ceab33f80f6df51903f489f696298a81e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5ec38f4d91af2e1f7f09f57886910f750244290d", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-tti.json b/port_versions/b-/boost-tti.json new file mode 100644 index 00000000000000..2ef3e80d8bdf46 --- /dev/null +++ b/port_versions/b-/boost-tti.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "9881d849d33fedde2628cd86c41a58731c18f3e7", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "501d5e8c95bc65e2981961705ffb3a9439a82215", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "9de156b86d42da0e2a6270f055348fd8775bf074", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "d72b195b9ce5fac70f1ec5827cbebc7d7c7fde31", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "398c45dad3e814b515c06ce8c8583ea4d3e8d8bf", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "a45a22438cdfd5338779a05ffecb022d738e7f96", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "aebf50464d8d22aa5f7c780587f2678026545712", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "93f6a8ec049f6cbd3f58bb9d724b6b8911ef0b1a", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b10f1ce4f70393804eb04ec64a8067f757d566c2", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "87ea566fd6f9fc801a7ae1dfb886d537ecffd00c", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-tuple.json b/port_versions/b-/boost-tuple.json new file mode 100644 index 00000000000000..7ea3faa97c7cb0 --- /dev/null +++ b/port_versions/b-/boost-tuple.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "22e3d000a178a88992c430d8ae8a0244c7dea674", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "562f2fee1c2129626c5b8421174ff84736151973", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "bb5cae261bac33ab0ebb8c0b04101c62caf190a8", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "b3e1b01ffce6e367e4fed0a5538a8546abacb6b2", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "64fc3b0ef2ba7aef6abb102614043d7a6cf19547", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "df5ed8963506ba03134775932cda4440cf77e2e2", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "9bfdc62df0b361a82b4c4a4de4b432f2cf294ef6", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "dda5e202cd4f2dc30b518b1ef81bb66a58940c7d", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "1caed0304a71e0e4e820c8922a7de56cdaba6b79", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "6d6bf89db13afc182b82cbbb666fa93fdaf574f5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-type-erasure.json b/port_versions/b-/boost-type-erasure.json new file mode 100644 index 00000000000000..4e44c06ed0ad3a --- /dev/null +++ b/port_versions/b-/boost-type-erasure.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "49c43a8416a153e6c4e74961052a305d77b4ae1f", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c89bed9c69a1e46e0ce5a6eead498a7079790321", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "1508f27714e220d2ffb2a4616b144aff6b64d1aa", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "1939a16f61b2975d16616b2639f3b7650f136235", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "1992a8c6b6aacba1501789d9e0a7ce7c03bce971", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "a652501ee6a0cf7af74edffab459507cde4e7b3a", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "fe070b82349f4038aef2518d7a25f7c4f82ec4dc", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "56ff420088d27eddc62baf6216f44081cddba66a", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "00048b24d2a7a56b66e903dc55ad08552d410020", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "a83f188486e22d3339a1545a5ee8d683efce0db1", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5b2b6fcc5a73c99cc1ea645aaa7c4423067db7fc", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-type-index.json b/port_versions/b-/boost-type-index.json new file mode 100644 index 00000000000000..01d346a59973cb --- /dev/null +++ b/port_versions/b-/boost-type-index.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "1ed3f10185cfa0140d6b5dd5e7be18b7b3b447c6", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "6b914d083750c72bb4c7d06fb7e7deef60143938", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "cb66a1ce3fa6b73c6cf579c4ef4ed522d044f614", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "3cc8b8f2c29b09a143a0a4457ea6506fab39d28f", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "cac4808e4b98fd347adb090e7ae708796bc45804", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "beef9158a1456247009dd8e0e652fd350dea8b13", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "0608ab262ba92443a7a2e28a3cf351e2a22206e2", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "37602b22e5d865cb5e06561fa7a4d1bb1f338de5", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "d0055c098723d5c4532037e495989f246be0e405", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "4cff8dc347bbd84314c1c583ff76f490b3e6c608", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-type-traits.json b/port_versions/b-/boost-type-traits.json new file mode 100644 index 00000000000000..313697d7f2b480 --- /dev/null +++ b/port_versions/b-/boost-type-traits.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "8829793f6c6c913257314caa317599f8d253a5ca", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "e1d488b4b26c28e7ea1e260c96848efa91440c61", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "96512f55a3d7511a8e3a18c450b5d0b9f4656137", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5e44ec657660eccf4d3b2710b092dd238e1e7a2d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "3c704482bd51dd8bc367004549c17e9d3055b61b", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "8c895c6cb9fe88504b8b83cf8c4a20e08d50f31b", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "15ad64909825d185b509efb82e26f52506c948cc", + "version-string": "1.69.0-1", + "port-version": 0 + }, + { + "git-tree": "a6c6cf3c6a45343bef732b4edf0f0c6f5202de3b", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "bcad128d5506265d5d986a3683e178cb2ec8c360", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "6c118f2ec5cf2ed118564e187d386d36e8a92213", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-typeof.json b/port_versions/b-/boost-typeof.json new file mode 100644 index 00000000000000..ab03fa8bfe94a1 --- /dev/null +++ b/port_versions/b-/boost-typeof.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "99523ccd2d55e2f3f04e1548a5e9ad899d482740", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c977ae832df8c880d62cae1434b836f93d93360f", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "5b74820e028b2f24e7da23740f5ca00a34fa1e10", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "a559d9f2f7b084a00669a37082bee77cb8e26619", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "165e014fee340d51facd6fa1018e181389977bb1", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "6cd58db8edd3c36da6fdcfba9f8c46cc6fa424be", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "247e15545701ce59d9a1261843bfd0a9073c6ea6", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "eeb05d075b53a93ea9b5f473311cedb7a19b7072", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "3c1941add0bae53c3883ed66bd68bc06653a9ce7", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "8c250c90ffc91633c9d349f845a1c2f1e35d6468", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-ublas.json b/port_versions/b-/boost-ublas.json new file mode 100644 index 00000000000000..d7fb9dee6bb47b --- /dev/null +++ b/port_versions/b-/boost-ublas.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "c1e8379989f44bf779ee47f1b102bb450963799d", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "886844895cc3cc1bf3c0440d58c35ef833ec1fd6", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "a506df2b6ae04dd5d8d81c72c2aba96c432059c3", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "f52e1b70ccf697ec2f1bd1b65e36c717d62e2f8e", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a77604aa79c236a0b647ff00bb7fe6de9c4dd9da", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "daf720632883046e99dffe0405912bd2bf8ddd1c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "c97c7bcf450fbb18d8697777d21d250ab90af0ee", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "4217a7a788ebb948dc97f0c5a40f9f811da55b29", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "00dca0edbebdf2225be728a8a7f4055455e187aa", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "f9cbaf2dd9eea2815aa267762ba53ecdff47002a", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-uninstall.json b/port_versions/b-/boost-uninstall.json new file mode 100644 index 00000000000000..a0c99662a44c5a --- /dev/null +++ b/port_versions/b-/boost-uninstall.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "08933bad27b6d41caef0940c31e2069ecb6a079c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "bbd9f511923b04506c7bdedc3b1b89eff6939075", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "fe74b49c39386f4171827ee18acab23afe6570a6", + "version-string": "1.73.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-units.json b/port_versions/b-/boost-units.json new file mode 100644 index 00000000000000..4bcdd75fff047e --- /dev/null +++ b/port_versions/b-/boost-units.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "2ffcf405ef8f3b0cf735c47a21bd7082ccc17779", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b6f52a2069891a08e69e565dd1b77ed50dc8c153", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "01ffa3e6852709e3a68d9d2a08e8619d4a3dd761", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "16363ec5d1af338befbe98cca09cc3b4d0b016bc", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "81a6f440f2793649c0b0efd93a6fe078e3b79c4f", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "442302b3c2255bc330fafe8c637664568714b79c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "92c1cf9aa29e5b13904de1c303ce65e81944ed7b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "c201d317f21285c8e7995056fff3276627209cb8", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b10117f248194e7fa753b75ca1947eea900b0a82", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "f31078638fedbb265dfecc5ff2a57e22c654c3d5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-unordered.json b/port_versions/b-/boost-unordered.json new file mode 100644 index 00000000000000..7f546635cbd509 --- /dev/null +++ b/port_versions/b-/boost-unordered.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "28c6f9fc668fed0a0f193cda0a99619e8beeb398", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "417509630e50c5acc581f6de0de0d9df2ddbd039", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "44f800096cd2cd980864cf0930ab3ac8fb802ae6", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "c4f9b65d3387c7cd9a3418b7c37a1951ea3414cd", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "ee153a1e836ce0d5d5fcc4e1c263ad821cb49f66", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "2dc37fc7dcc2d6abb9fb3c7cf0ff792df1aa6d75", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "26a98546a05a6d47badc4ee4353cd4e9a3b657c1", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "302904425988af035dae121a08e825fefd300ce8", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "c7d9480c3a3cc8c5ce261b7b000f5414598bb7be", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "3251fef6f3ed1e0e7d0ef3de8d2bfddcf8aacda0", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-utility.json b/port_versions/b-/boost-utility.json new file mode 100644 index 00000000000000..430739b7df1f12 --- /dev/null +++ b/port_versions/b-/boost-utility.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "47572946bf6a63c731b9c4142eecb8bef3d3b270", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "ccd0b9f9a2038cb05ab5d1f0191e8339835acdcb", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3a6fd97dea7b338282794863c9f12a00a19bc998", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "7d721b2458d5d595ac341eb54883274f38a4b8c2", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "3c4b288886b3c768a877e7120d8be3de70f132a5", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0fa784ada078c94136a617eee6658dff2d54783a", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "5cf5376f161c7c7cab3fd04c8f7788e18a15a29b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "7dcf0bbcfe96352c9b71596652d84b89ce2dd003", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "8b440873324bfda9976d126c2e859e95517aa8b5", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "7ff3565c61004bd559870fe73529c640d2b37dd0", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-uuid.json b/port_versions/b-/boost-uuid.json new file mode 100644 index 00000000000000..538d1378648fcb --- /dev/null +++ b/port_versions/b-/boost-uuid.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "6fdc41ce442e95260c89dbb925edf9de8fe69fa4", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "0189eaeb3291115448a4489a963573d1699ea3b3", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "ab93b56cbe60c45a9b104c2487ca21fa3c732fbe", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "a72c1523545fd9f52968a0640d6e70c3007a90d3", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "f9776dd0dfefa4566a2ac8943a25ecb0f62fed76", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "2180a32f9ec248bf35d5465ae58885da9ac73cc8", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "485ce09ae5b285a310bbfcd54e0e7012f73cdf1f", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "bcb1f96c361a0f0fae24187a5b7f6cd8cc305156", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "4bbcc8d7612deb3405ce918da6e1695cdf265ffa", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a7f7f5f4406f0aa8ab4f3298688e35e7ace80a75", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-variant.json b/port_versions/b-/boost-variant.json new file mode 100644 index 00000000000000..a7903a3a0197f0 --- /dev/null +++ b/port_versions/b-/boost-variant.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "3ecbd86059d27b3f63278089ffe13cf974f11926", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "20a957c6b26ab6e198703dbba3798e0284512c86", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "88c6eef9028f80ea6e91909d11e9165710d36783", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "87357492dfbd9319f5a3509a8a5e590738f166b6", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c9924241bf6b0e8593c7e221d1feca0d8af71a88", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "5de8f950c1497eeb8c8357d385bad992b145c21e", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "b0afb2236747e7738303dc64697ddbbee116be62", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "3402583d5397ad2674fe6dfa58268ac904d8ded9", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "66a8424b73a3f8254eb75a4c89f4ee31f5af64de", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "fa1b9542247c1b7883eba711d08fef6f2eef7db4", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-variant2.json b/port_versions/b-/boost-variant2.json new file mode 100644 index 00000000000000..cc9b33a05f53bf --- /dev/null +++ b/port_versions/b-/boost-variant2.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "fe84b0a24b896d88677494ee69347a7501746002", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "6db0d72abbf8ed888d15c6f76204b4832c2243aa", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "9520cf21a0bc2b52b316acbf141f1c1a1bbca3c3", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "96dd9caa0e1c42029b18c7ea4b5122a96d167443", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "fca12216c8b22e1e91d9d527440a0ca2b630c7ee", + "version-string": "1.71.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-vcpkg-helpers.json b/port_versions/b-/boost-vcpkg-helpers.json new file mode 100644 index 00000000000000..c57f5962ccd404 --- /dev/null +++ b/port_versions/b-/boost-vcpkg-helpers.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "2a21e5ab45d1ce41c185faf85dff0670ea6def1d", + "version-string": "7", + "port-version": 2 + }, + { + "git-tree": "749173195871ff15190b29ea87cabef8ca064501", + "version-string": "7", + "port-version": 1 + }, + { + "git-tree": "a1648c6c2074328746d742e28e7bdd9788e35313", + "version-string": "7", + "port-version": 0 + }, + { + "git-tree": "471191263d5fbb921cda78c41293d5f64c9ff59d", + "version-string": "6", + "port-version": 0 + }, + { + "git-tree": "fc106316082f957faedf68cc5d5901fba93680da", + "version-string": "5", + "port-version": 0 + }, + { + "git-tree": "4b2061cc827814bccbb3c79f5f297d772ba2fafa", + "version-string": "4", + "port-version": 0 + }, + { + "git-tree": "f1707816ad9165ffff9f2e25f40e2357367638ac", + "version-string": "3", + "port-version": 0 + }, + { + "git-tree": "1f3772e4f83dd9854008667b64df572f04aa64af", + "version-string": "2", + "port-version": 0 + }, + { + "git-tree": "d27cc122c289092fb50d06554a494a3b2d9f8f7c", + "version-string": "1", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-vmd.json b/port_versions/b-/boost-vmd.json new file mode 100644 index 00000000000000..560d29677a759e --- /dev/null +++ b/port_versions/b-/boost-vmd.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "68de048561ba7a30f2cbba3c472c19cae63230e4", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "4f8dfa7b7636393a50ee0a988abbb24da3660876", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "726e48378ecafbf3937950332718e327b72755b5", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "994385bdae4fd4832a3f6911bad9dadb5bcafeb4", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "6c5629caf9f90150e48fd3793a0cf93689b3b317", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "8b8fc1dd2f03e6d8712434f4b936428b11679407", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "5db94c580dd2db739326288a9fa09ed25e24d660", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e33b9227b844afe29223e27e783c303ce77ce49a", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "a4ed9599dd8c8c8a20010ee32912d50a701b9de1", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "0cb6162a8f1f001d804cd1d6d0cebec607a12a36", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-wave.json b/port_versions/b-/boost-wave.json new file mode 100644 index 00000000000000..2d50eebbc321a1 --- /dev/null +++ b/port_versions/b-/boost-wave.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "8a33ec8327cf9af65de2ec5315c97d2caa011316", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "3df5326cad890816870ae9a2e0ad304e284b1076", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "5a6beb99dfe38ed636de4c65f63a87edf23e1701", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "95b87d5425cc4cabb24134a371a92d8d89c9e6dc", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "2d219c6be511c134faf77a77f4a6311aaa8f650d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "4799f93f334fb485eeac86030faddc9aa6fccc46", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "94e7f3e08fe70dc07ed0fb27cc0f2e56dd6a0e31", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "05c99cf139e5b9255cd5cb3bd2742fbc1109b870", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "489ad79ac0dc0aae47e3aa7316e8139da171028b", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "8eac228577ce0cd9d08f2ca449535cf50d28d75f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "e9a75c555c9e47be7e1cee00b656c6bc678b6f6f", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-winapi.json b/port_versions/b-/boost-winapi.json new file mode 100644 index 00000000000000..e7dfd17457bd09 --- /dev/null +++ b/port_versions/b-/boost-winapi.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "e7ad07379e1cbc96c79a08a773441845e8f86691", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "62117b89dedc1807c7de0bfce139141aedeb8bd7", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "cd4c6389b967d0622ae9d548ca58b64fc80bf6e1", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "8a10e5aedcd8445a681166eb2477ccfd1efa9172", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "d1e678ea12bf54f2451155df2fcdacd41ce78b50", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "19ee38ad8e9cdb56fd6bdda57b333fbe6d06547a", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "4c3417de972b813cccaa7aa4e123d7ebea1c7981", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "470723c9a0fca75ce966bd1a77cbf0fd30f10199", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "a3af2bc99345063e259760672d0c2c751256b52e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "1e152377edb1f8868197278f4d691bcd3680f668", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-xpressive.json b/port_versions/b-/boost-xpressive.json new file mode 100644 index 00000000000000..f2ef5a871db8b8 --- /dev/null +++ b/port_versions/b-/boost-xpressive.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "4529a218720a8856e510778eaf5e2c8c1f1ca971", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b41f4f06dc05791936ed8f82f934847224e28e60", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "6602308faa3a77cfed6a2640b386e12e8284c946", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "1c6c5ba53ea4b004cf629384bc643295ebeb9209", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "87c2bf709a347edebec7bd9b2a1ca10d1bb6435a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "624d656b13094cc50fe4f1c9dbe10900076cd7fa", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "2879c781288c19ea72c7a8abdff1becbbf9ccd08", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "5815a43a48c0438ceefdc042d5aca810402ad482", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "c387943293d19f93812594b448b09d980ee09238", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "dd9f5871d80a21bd0a6ee96623e5e91682284262", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost-yap.json b/port_versions/b-/boost-yap.json new file mode 100644 index 00000000000000..61b63f81cd9e86 --- /dev/null +++ b/port_versions/b-/boost-yap.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "ecf8a43a095687fe67389aa43323e30464646089", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b7b7cceb0644a979c72977538180240927428de9", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "efeaf147485ccb7654b63ff9718e3b278e5729e3", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "8e391d021967d9a460f6e6d5b65800da63f69923", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "824a34eb588cff05b3c6af0a36e694b70e4ea781", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "02db42a61cbaaad9cc5a18fc74a4d51a6e7793b4", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "0908df30f087d9efd779ea34ba60cd8a66a2b8c9", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "0cf114b0b2caf786d56a7350e0c54d76c939fe41", + "version-string": "1.68.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boost.json b/port_versions/b-/boost.json new file mode 100644 index 00000000000000..fe86c1f0b9f943 --- /dev/null +++ b/port_versions/b-/boost.json @@ -0,0 +1,234 @@ +{ + "versions": [ + { + "git-tree": "d24cc9e13f1aef8ae26b68f3b3e34495431110e3", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "d0f1655d8c46ee762961387d92587c26753a4fc9", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "1f69d2e5ea88d9dc27a8c63c673154f141503cb1", + "version-string": "1.73.0", + "port-version": 4 + }, + { + "git-tree": "2122fc37c88dd1a918e86449dec8398a01fa9718", + "version-string": "1.73.0", + "port-version": 3 + }, + { + "git-tree": "96931595b124b1e6fcbdfe278d10433aa8db8130", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "107538ffb7becac4d12224ff4626dd4de1b594c3", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "63d6902965351f76a54349c16d7de318c14dbab7", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9b8b0ee499c305c57cc6876dd8605a85656bfe6d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "bc08a119d170a0adfe8014b4dd91fad7f12264fd", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "68850f56b534290c069f0fe4ef9d97f7025a81cc", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "c373fa02d226f0262cc6ba52d34fe6111a12f948", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e6972c6176cb56a986e28431e20c2b33a060db45", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "cf05c5aba1d1af12659a1fd2bdf75720df61888f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "f1e3f63c6e831af8f1787be0d64d023b43e94b66", + "version-string": "1.66.0", + "port-version": 0 + }, + { + "git-tree": "716fe8d433c8593020b68accdb9890f59e2f4ff7", + "version-string": "1.65.1-3", + "port-version": 0 + }, + { + "git-tree": "ddbec542d798e3b7eeba323111385966e6e87817", + "version-string": "1.65.1-2", + "port-version": 0 + }, + { + "git-tree": "8e8f60d45ad310e9ec3ba28af1040649181d091c", + "version-string": "1.65.1-1", + "port-version": 0 + }, + { + "git-tree": "0b253075f1611f0a86c77494ff3134fd53196080", + "version-string": "1.65.1", + "port-version": 0 + }, + { + "git-tree": "c786bf44c7aeaa4f196444cd79a5745a9bc663d0", + "version-string": "1.65-1", + "port-version": 0 + }, + { + "git-tree": "f666638c221fa08912348791f530970beba055b6", + "version-string": "1.65", + "port-version": 0 + }, + { + "git-tree": "25e362d1bad9d69541f0faa74677a3c2365e877c", + "version-string": "1.64-5", + "port-version": 0 + }, + { + "git-tree": "1dee285bbe05342984987da3460174f47b747b11", + "version-string": "1.64-4", + "port-version": 0 + }, + { + "git-tree": "ee758ff279590079553c743ea61939a32cdb61ea", + "version-string": "1.64-3", + "port-version": 0 + }, + { + "git-tree": "f0f99f25017ecfc45be8894944a924ba9dea5e0c", + "version-string": "1.64-2", + "port-version": 0 + }, + { + "git-tree": "2e58ede1ec4159790f31069e19b7dd3adcaab0ce", + "version-string": "1.64-1", + "port-version": 0 + }, + { + "git-tree": "22b76107a08a4953fec45e53b49a6d2742ba0c78", + "version-string": "1.64", + "port-version": 0 + }, + { + "git-tree": "6d4ec812d4cd1917f6c15c3bcc999745e480fe6d", + "version-string": "1.63-4", + "port-version": 0 + }, + { + "git-tree": "4da649fdf59dee5e7d5cda85827a4c2d72b4f23a", + "version-string": "1.63-3", + "port-version": 0 + }, + { + "git-tree": "db60c99e4dcbf9f83cdb05e0316978a9a3a4c9bd", + "version-string": "1.63-2", + "port-version": 0 + }, + { + "git-tree": "169ad1a96c3294c945f1873d04f274a6679d70ca", + "version-string": "1.63-1", + "port-version": 0 + }, + { + "git-tree": "e842601f9fca85798c0690af2ac695019bc6b59e", + "version-string": "1.63", + "port-version": 0 + }, + { + "git-tree": "54f63d0a146afb8529d9429f749a90ef42487c19", + "version-string": "1.62-12", + "port-version": 0 + }, + { + "git-tree": "021e05591fead1c9e6ed94ff942f36cf06149f5f", + "version-string": "1.62-11", + "port-version": 0 + }, + { + "git-tree": "882bbf98f710737f4056617144ee640f0e46fbe9", + "version-string": "1.62-10", + "port-version": 0 + }, + { + "git-tree": "471aa06c45d5ab56fff0a50a75d77eedb2d4982f", + "version-string": "1.62-9", + "port-version": 0 + }, + { + "git-tree": "7ab4e8b1f0b97df62121410fd2c59b89a03ed8b9", + "version-string": "1.62-8", + "port-version": 0 + }, + { + "git-tree": "970a7333583be9aa9bd03acf0ad2eb76d7ec15df", + "version-string": "1.62-7", + "port-version": 0 + }, + { + "git-tree": "361c8325dc436afdb3b28e22112c00493999a68a", + "version-string": "1.62-6", + "port-version": 0 + }, + { + "git-tree": "50947a16c73ed4c1ae01ae940a9b6ea77bd0623b", + "version-string": "1.62-5", + "port-version": 0 + }, + { + "git-tree": "63c83e9efac3fa2c69e55867cbdb71ff2fdf97c7", + "version-string": "1.62-4", + "port-version": 0 + }, + { + "git-tree": "a17cd67a8d429ea500752b58d23388538d1c500c", + "version-string": "1.62-3", + "port-version": 0 + }, + { + "git-tree": "e4f0d78865135992a6c688f0d090e37d1f65c378", + "version-string": "1.62-2", + "port-version": 0 + }, + { + "git-tree": "cb9dd398defae6e5e25b8df7f8889cb92fb0b504", + "version-string": "1.62-1", + "port-version": 0 + }, + { + "git-tree": "4657f0e4e9e1e7f7a025caf567c8e99710582271", + "version-string": "1.62", + "port-version": 0 + }, + { + "git-tree": "0f9b34f2c83ea913e08337a34fa5f2b42cdebdec", + "version-string": "1.61", + "port-version": 0 + }, + { + "git-tree": "392a06544f25bd41ca24b66f3157ebb392f702fe", + "version-string": "1.60", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/boringssl.json b/port_versions/b-/boringssl.json new file mode 100644 index 00000000000000..1be3ecf03d5535 --- /dev/null +++ b/port_versions/b-/boringssl.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "efaff27f5d50195917c54e210f4904b80d73399a", + "version-string": "2020-04-07", + "port-version": 2 + }, + { + "git-tree": "02d882a47dda51d6d001af8ab4b3571e67a20f47", + "version-string": "2020-04-07", + "port-version": 1 + }, + { + "git-tree": "a0fb9977bef29fa26e66155d89997236473f77e8", + "version-string": "2020-04-07", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/botan.json b/port_versions/b-/botan.json new file mode 100644 index 00000000000000..d9d9b8fd99753d --- /dev/null +++ b/port_versions/b-/botan.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "cb5674c8a62b85d8862f3064b2797173df10950d", + "version-string": "2.16.0", + "port-version": 0 + }, + { + "git-tree": "cdad0593bd7a584ff8ecdeb2135b423d54eee1fd", + "version-string": "2.15.0", + "port-version": 1 + }, + { + "git-tree": "93772a2aa43c559c309885a56bc4ae0b92d2b8f7", + "version-string": "2.15.0", + "port-version": 0 + }, + { + "git-tree": "f52798a57954eaa194597a042b95e67abbe8c6e2", + "version-string": "2.12.1-1", + "port-version": 0 + }, + { + "git-tree": "3cabf26f7fc95e13362ea865e084988ee9152415", + "version-string": "2.12.1", + "port-version": 0 + }, + { + "git-tree": "2248a885c0827a1e4360484b549cc713db402a37", + "version-string": "2.11.0", + "port-version": 0 + }, + { + "git-tree": "4f208b0ec8db7c17dac32a16e064566dbe33f113", + "version-string": "2.9.0-2", + "port-version": 0 + }, + { + "git-tree": "53dc2e4b5d70a333570c7e65b4e6572039c26042", + "version-string": "2.9.0-1", + "port-version": 0 + }, + { + "git-tree": "ec10ddbbd53c60c3ffbb8fa7db80014f12bf2a44", + "version-string": "2.9.0", + "port-version": 0 + }, + { + "git-tree": "b2c1010d75db7f0bb02c3023ea2b988ddcaef000", + "version-string": "2.8.0", + "port-version": 0 + }, + { + "git-tree": "9ff0ab321b6504dfccd8dc7b8f9067f3d95a6048", + "version-string": "2.6.0-2", + "port-version": 0 + }, + { + "git-tree": "e0d6e9cdf7d4ad3a1024f1130f5494211057a056", + "version-string": "2.6.0-1", + "port-version": 0 + }, + { + "git-tree": "52d7655f4acf2ce9dd9e0a85dce5c9abc1a79315", + "version-string": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "74299dade32477f47be842b9c39810b1614db455", + "version-string": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "5360c9eb65d58acf2deff29dc503e7764aaf8b93", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "74299dade32477f47be842b9c39810b1614db455", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/box2d.json b/port_versions/b-/box2d.json new file mode 100644 index 00000000000000..8999b7937d1a33 --- /dev/null +++ b/port_versions/b-/box2d.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "61a9394741ba7f08404d1c7f2b77a9d8b9456bc2", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "62d471eaf5e87ef759a716a13db7decb1cc1fc8e", + "version-string": "2019-12-31", + "port-version": 0 + }, + { + "git-tree": "042a70aea5f44f5fe8cc7c5dfc36229badcf264b", + "version-string": "2.3.1-374664b-2", + "port-version": 0 + }, + { + "git-tree": "202b7d3f4a73dab47e0a05b0aacf48a48189d71f", + "version-string": "2.3.1-374664b-1", + "port-version": 0 + }, + { + "git-tree": "1e24dac01c8f4655c355a3c30ebf0a9adda85f20", + "version-string": "2.3.1-374664b", + "port-version": 0 + }, + { + "git-tree": "840fb28c94896399957f5b7acfa8ae0297a628d7", + "version-string": "374664b", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/breakpad.json b/port_versions/b-/breakpad.json new file mode 100644 index 00000000000000..89a5a9d826b100 --- /dev/null +++ b/port_versions/b-/breakpad.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "e266c29cb65ac51e96422f0788dae07529f1f493", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "f088fa69e17bda03e45686245cb7dd47d0351064", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "7b2bb5f2a3d4995f52528e54cf3df165aace94d5", + "version-string": "2019-07-11-2", + "port-version": 0 + }, + { + "git-tree": "74c1e6008d13a09f9b8937445ff64d48234f3fdf", + "version-string": "2019-07-11-1", + "port-version": 0 + }, + { + "git-tree": "9f3e9c1eccd500bd649cad04fdcb202e49d09c53", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "10be3edd4e14259baa2f52e32cd4eae01b30940c", + "version-string": "2019-05-08", + "port-version": 0 + }, + { + "git-tree": "b07a4d267b3235725c4ee929190c6ce2c5cdb484", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "278889227ab763ac44bc3dbabd518cd0bfc71645", + "version-string": "2018-08-03-1", + "port-version": 0 + }, + { + "git-tree": "70da3dfcfebdff3f898651e9723f222d0b493259", + "version-string": "2018-07-30-2", + "port-version": 0 + }, + { + "git-tree": "9625e031da06b22fe747b1fd39815c3b051ead08", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "f85b4570ca43263fa600caeae3b5d601a0d64bfb", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "5a923eac9f23d816a62e08c9dbb227be2106ef3b", + "version-string": "2018-06-28", + "port-version": 0 + }, + { + "git-tree": "cc07770bafeafa162ef126bc5ad3abad0900567d", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "4c60174bc8dafd05e1fa12dbf3075bb937ec605d", + "version-string": "2018-04-17", + "port-version": 0 + }, + { + "git-tree": "349bcf71e14497bd57b12e69549004cbb41e0fcd", + "version-string": "2018-04-12", + "port-version": 0 + }, + { + "git-tree": "09fd05fac620d5c99716ec0023ea1af091870852", + "version-string": "2018-04-05", + "port-version": 0 + }, + { + "git-tree": "e2981e346f312045c0d47aa5eac9fff7ede2655d", + "version-string": "2018-03-27", + "port-version": 0 + }, + { + "git-tree": "fc5ce981eec58bcdd21d03618a583e9c85a5aa03", + "version-string": "2018-03-13", + "port-version": 0 + }, + { + "git-tree": "cb9c3c17a2ca2f8cc40ad1f76f16f4f10bc86ca8", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "ad0a5faf3f0c2cac452c9979101b6b1162e63591", + "version-string": "2018-2-19-1", + "port-version": 0 + }, + { + "git-tree": "a7347475d92becb8bd1e4a30c799918a41c1b919", + "version-string": "2018-2-19", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/brigand.json b/port_versions/b-/brigand.json new file mode 100644 index 00000000000000..376882fafe5353 --- /dev/null +++ b/port_versions/b-/brigand.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c43c5b02c14b89e55f9a85d9a7c835f3bf9ea582", + "version-string": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/brotli.json b/port_versions/b-/brotli.json new file mode 100644 index 00000000000000..16c653fcd64b5e --- /dev/null +++ b/port_versions/b-/brotli.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "4aaf6f174ede5bc58872943a5e32d96c5e0d45da", + "version-string": "1.0.9", + "port-version": 0 + }, + { + "git-tree": "7e68bd8e6bf02393de13fc5e7d3a57cf3bfc505e", + "version-string": "1.0.7", + "port-version": 3 + }, + { + "git-tree": "0937ca99bab9fc5e64772b4237cc1a31c2f01b36", + "version-string": "1.0.7-1", + "port-version": 0 + }, + { + "git-tree": "836e8e42c4e3b77af26352e20c101f7c6c761301", + "version-string": "1.0.7", + "port-version": 0 + }, + { + "git-tree": "4d17fcb9230ee38d00dab99de2a383ad3c13bf8a", + "version-string": "1.0.2-4", + "port-version": 0 + }, + { + "git-tree": "2120a8509eb5bf1d425d39e80bb14b0974402263", + "version-string": "1.0.2-3", + "port-version": 0 + }, + { + "git-tree": "8f30ae817585218bad8de88a24a708f6fb474710", + "version-string": "1.0.2-2", + "port-version": 0 + }, + { + "git-tree": "ef43588bc6238859ec72888bbdadfcc08b6c1063", + "version-string": "1.0.2-1", + "port-version": 0 + }, + { + "git-tree": "846df5f69ab48681d2607463485cfaa90fa045c0", + "version-string": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "eaea323f02f988a3331968d16effd4a7c0ce9183", + "version-string": "0.6.0-1", + "port-version": 0 + }, + { + "git-tree": "e4658337e5ae62e78adb7939bf3b6a566c7545de", + "version-string": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/brpc.json b/port_versions/b-/brpc.json new file mode 100644 index 00000000000000..f2cf910513742f --- /dev/null +++ b/port_versions/b-/brpc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d3461edb01babdda0886b7173a7fba194e30d149", + "version-string": "0.9.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/brunocodutra-metal.json b/port_versions/b-/brunocodutra-metal.json new file mode 100644 index 00000000000000..ada0576d55c0ce --- /dev/null +++ b/port_versions/b-/brunocodutra-metal.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b96a170666d35da8f66b89c12c62699db55b269c", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "3f232829f6de377883a98c20564515631d8b2583", + "version-string": "v2.0.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/brynet.json b/port_versions/b-/brynet.json new file mode 100644 index 00000000000000..ab15b0478296c8 --- /dev/null +++ b/port_versions/b-/brynet.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "bad044dbd66d5067fee727b602485d30c4ab2c09", + "version-string": "1.0.7", + "port-version": 0 + }, + { + "git-tree": "3b2ac80940cc348d324ea44a72cfa9045bf874be", + "version-string": "1.0.5", + "port-version": 0 + }, + { + "git-tree": "eb9f460da35590e7f15d1ad6ef430dac2029abad", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "db463fa0a2d7511abcd288f20b5139b4057ceb9f", + "version-string": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "27a2dfd1bf9f9189b1b096250a329116e6e56bfd", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "6aef5fe19ed0a5a8dbce4e4f41be3e6145b7f086", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "ca9a4a6c001c01483f54245afa62c747e8db8ef7", + "version-string": "0.9.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bullet3.json b/port_versions/b-/bullet3.json new file mode 100644 index 00000000000000..f7a2680067df03 --- /dev/null +++ b/port_versions/b-/bullet3.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "5917d99eda4055b22a1e49e6f2a37ebd9dd26e9e", + "version-string": "2.89-1", + "port-version": 0 + }, + { + "git-tree": "6b2fa43c85ca822f5e65a0a17744b61720705c57", + "version-string": "2.89", + "port-version": 0 + }, + { + "git-tree": "bfd0993507e461259cdd11bada1044a19de3a32f", + "version-string": "2.88-2", + "port-version": 0 + }, + { + "git-tree": "bf3ac776df8d254e8262872f163955a88f27a599", + "version-string": "2.88-1", + "port-version": 0 + }, + { + "git-tree": "4616688aadf1f29a31a5b54f0a69a85c702b288b", + "version-string": "2.88", + "port-version": 0 + }, + { + "git-tree": "8fe3e6a20c356c49c76a0057721612ebc14cd3f1", + "version-string": "2.87-1", + "port-version": 0 + }, + { + "git-tree": "9b4ec044e6bcc1a18069973b04c44362156e0a11", + "version-string": "2.87", + "port-version": 0 + }, + { + "git-tree": "64e6fdc497f9da91574cf4ec59eb12b35ec4a45a", + "version-string": "2.86.1-1", + "port-version": 0 + }, + { + "git-tree": "97f69ed15982ddce6cfd3ca1e1f828ac65e779b9", + "version-string": "2.86.1", + "port-version": 0 + }, + { + "git-tree": "0f5fed31c787480aa3d9e3fd95345995ab817481", + "version-string": "2.83.7.98d4780", + "port-version": 0 + }, + { + "git-tree": "c847799ff0a47c82cca3394130b56e2b84feb8eb", + "version-string": "2.83.7 @98d4780", + "port-version": 0 + }, + { + "git-tree": "5e172359752a380c4990f451b3a742bb1ec3cbff", + "version-string": "2.83.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bustache.json b/port_versions/b-/bustache.json new file mode 100644 index 00000000000000..d40ca8eb4ae0f3 --- /dev/null +++ b/port_versions/b-/bustache.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3844f9514372b696483caa83af21759c1ddf2c67", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/butteraugli.json b/port_versions/b-/butteraugli.json new file mode 100644 index 00000000000000..6451351f0e5581 --- /dev/null +++ b/port_versions/b-/butteraugli.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b0a1f3b7adf27f8437a4d6af30ec5367a225341d", + "version-string": "2019-05-08-1", + "port-version": 0 + }, + { + "git-tree": "3c33456e75584e5c4a1e8cacaf0dd398e545ce13", + "version-string": "2019-05-08", + "port-version": 0 + }, + { + "git-tree": "38f189c21d0d0c0121254a51bc3453446c2e9215", + "version-string": "2018-02-25-1", + "port-version": 0 + }, + { + "git-tree": "a799a90e828b4a20c584dee68c20b9c0322ad467", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "4d12f7ea4aeb8d0042692c41698d68283d2cfc6d", + "version-string": "2017-09-02-8c60a2aefa19adb-1", + "port-version": 0 + }, + { + "git-tree": "d2c79b617b16c4c4bb8773dd73f2dd266004a28b", + "version-string": "2017-09-02-8c60a2aefa19adb", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/byte-lite.json b/port_versions/b-/byte-lite.json new file mode 100644 index 00000000000000..e0c162563c01dc --- /dev/null +++ b/port_versions/b-/byte-lite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b8ac7b847acca6724eb539674e7243b477163607", + "version-string": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/b-/bzip2.json b/port_versions/b-/bzip2.json new file mode 100644 index 00000000000000..807881050df8b7 --- /dev/null +++ b/port_versions/b-/bzip2.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "5a1b1b8d666b9ef64e8596e4716c2e2f654f4532", + "version-string": "1.0.8", + "port-version": 1 + }, + { + "git-tree": "3b585ec14d62fcd6573fb1a67989292a7455440d", + "version-string": "1.0.8", + "port-version": 0 + }, + { + "git-tree": "916c629389f6bcead7b4914304cc52a6ed4abad6", + "version-string": "1.0.6", + "port-version": 7 + }, + { + "git-tree": "90fdb940b53d87fa9c1984fbb0d9b38d5fbcfece", + "version-string": "1.0.6-6", + "port-version": 0 + }, + { + "git-tree": "a3c18b760c9c233f263c9cba08b1b27cb7bcddb6", + "version-string": "1.0.6-5", + "port-version": 0 + }, + { + "git-tree": "8e0b27dfdffb1bb806a248c12255dc07185c66c0", + "version-string": "1.0.6-4", + "port-version": 0 + }, + { + "git-tree": "6c9756bcffe55c228f0c2843687db6a9c8ea3560", + "version-string": "1.0.6-3", + "port-version": 0 + }, + { + "git-tree": "8322dd10d768f96c4e48a6241c1e5c37a5c11dc1", + "version-string": "1.0.6-2", + "port-version": 0 + }, + { + "git-tree": "37735da283a93cb3a4d7c828943819a8d07c226c", + "version-string": "1.0.6-1", + "port-version": 0 + }, + { + "git-tree": "4bb7bb31abfc9bc33ff0655a1552e6e88244dc97", + "version-string": "1.0.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/baseline.json b/port_versions/baseline.json new file mode 100644 index 00000000000000..3f68b84d6c4e62 --- /dev/null +++ b/port_versions/baseline.json @@ -0,0 +1 @@ +{"default": {"3fd": {"baseline": "2.6.3", "port-version": 0}, "7zip": {"baseline": "19.00", "port-version": 2}, "abseil": {"baseline": "2020-09-23", "port-version": 1}, "absent": {"baseline": "0.3.1", "port-version": 0}, "ace": {"baseline": "6.5.12", "port-version": 1}, "activemq-cpp": {"baseline": "3.9.5-3", "port-version": 0}, "ade": {"baseline": "0.1.1f", "port-version": 0}, "aixlog": {"baseline": "1.4.0", "port-version": 0}, "akali": {"baseline": "1.42", "port-version": 1}, "alac": {"baseline": "2017-11-03-c38887c5-1", "port-version": 0}, "alac-decoder": {"baseline": "0.2", "port-version": 4}, "alembic": {"baseline": "1.7.16", "port-version": 0}, "aliyun-oss-c-sdk": {"baseline": "3.10.0", "port-version": 0}, "allegro5": {"baseline": "5.2.6.0", "port-version": 0}, "ampl-asl": {"baseline": "2020-11-11", "port-version": 0}, "ampl-mp": {"baseline": "2020-11-11", "port-version": 0}, "amqpcpp": {"baseline": "4.1.7", "port-version": 0}, "anax": {"baseline": "2.1.0-6", "port-version": 0}, "angelscript": {"baseline": "2.34.0", "port-version": 0}, "angle": {"baseline": "2020-05-15-1", "port-version": 0}, "antlr4": {"baseline": "4.8", "port-version": 1}, "any-lite": {"baseline": "0.2.0", "port-version": 0}, "anyrpc": {"baseline": "2020-01-13", "port-version": 2}, "apr": {"baseline": "1.7.0", "port-version": 3}, "apr-util": {"baseline": "1.6.1", "port-version": 3}, "arb": {"baseline": "2.18.1", "port-version": 0}, "arcus": {"baseline": "4.8.0", "port-version": 0}, "argagg": {"baseline": "0.4.6", "port-version": 0}, "argh": {"baseline": "2018-12-18-2", "port-version": 0}, "argparse": {"baseline": "2.1", "port-version": 0}, "args": {"baseline": "2020-09-14", "port-version": 0}, "argtable2": {"baseline": "2.13", "port-version": 8}, "argtable3": {"baseline": "3.1.5", "port-version": 0}, "argumentum": {"baseline": "0.3.1", "port-version": 0}, "armadillo": {"baseline": "10.1.0", "port-version": 0}, "arrayfire": {"baseline": "3.7.3", "port-version": 3}, "arrow": {"baseline": "1.0.1", "port-version": 2}, "ashes": {"baseline": "2020-10-21", "port-version": 0}, "asio": {"baseline": "1.18.0", "port-version": 0}, "asiosdk": {"baseline": "2.3.3-1", "port-version": 0}, "asmjit": {"baseline": "2020-09-14", "port-version": 0}, "assimp": {"baseline": "5.0.1", "port-version": 4}, "asynch": {"baseline": "2019-09-21-1", "port-version": 0}, "asyncplusplus": {"baseline": "1.1", "port-version": 0}, "atk": {"baseline": "2.24.0-5", "port-version": 2}, "atkmm": {"baseline": "2.24.2", "port-version": 5}, "atlmfc": {"baseline": "0", "port-version": 0}, "aubio": {"baseline": "0.4.9", "port-version": 3}, "audiofile": {"baseline": "1.0.7", "port-version": 0}, "aurora": {"baseline": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", "port-version": 0}, "autobahn": {"baseline": "20.8.1", "port-version": 0}, "avisynthplus": {"baseline": "3.6.1", "port-version": 0}, "avro-c": {"baseline": "1.9.2-1", "port-version": 0}, "avro-cpp": {"baseline": "1.9.2", "port-version": 0}, "aws-c-common": {"baseline": "0.4.56", "port-version": 0}, "aws-c-event-stream": {"baseline": "0.1.6", "port-version": 0}, "aws-checksums": {"baseline": "0.1.9", "port-version": 0}, "aws-lambda-cpp": {"baseline": "0.2.6", "port-version": 0}, "aws-sdk-cpp": {"baseline": "1.8.83", "port-version": 4}, "azmq": {"baseline": "2020-03-03", "port-version": 0}, "azure-c-shared-utility": {"baseline": "2020-12-09", "port-version": 0}, "azure-iot-sdk-c": {"baseline": "2020-12-09", "port-version": 0}, "azure-kinect-sensor-sdk": {"baseline": "1.4.0-alpha.0", "port-version": 6}, "azure-macro-utils-c": {"baseline": "2020-06-17", "port-version": 2}, "azure-storage-cpp": {"baseline": "7.5.0", "port-version": 0}, "azure-uamqp-c": {"baseline": "2020-12-09", "port-version": 0}, "azure-uhttp-c": {"baseline": "2020-12-09", "port-version": 0}, "azure-umqtt-c": {"baseline": "2020-12-09", "port-version": 0}, "basisu": {"baseline": "1.11-4", "port-version": 0}, "bcg729": {"baseline": "1.1.1", "port-version": 0}, "bde": {"baseline": "3.2.0.0", "port-version": 2}, "bdwgc": {"baseline": "8.0.4-1", "port-version": 0}, "beast": {"baseline": "0", "port-version": 0}, "behaviortree-cpp": {"baseline": "3.5.1", "port-version": 2}, "benchmark": {"baseline": "1.5.2", "port-version": 0}, "bento4": {"baseline": "1.5.1-628", "port-version": 0}, "berkeleydb": {"baseline": "4.8.30", "port-version": 5}, "bfgroup-lyra": {"baseline": "1.5", "port-version": 0}, "bigint": {"baseline": "2010.04.30", "port-version": 6}, "binn": {"baseline": "3.0", "port-version": 0}, "bitmagic": {"baseline": "6.4.0", "port-version": 0}, "bitserializer": {"baseline": "0.10", "port-version": 0}, "bitserializer-cpprestjson": {"baseline": "alias", "port-version": 0}, "bitserializer-pugixml": {"baseline": "alias", "port-version": 0}, "bitserializer-rapidjson": {"baseline": "alias", "port-version": 0}, "bitserializer-rapidyaml": {"baseline": "alias", "port-version": 0}, "bitsery": {"baseline": "5.2.1", "port-version": 0}, "blas": {"baseline": "1", "port-version": 0}, "blaze": {"baseline": "3.8", "port-version": 1}, "blend2d": {"baseline": "beta_2020-08-24", "port-version": 0}, "blitz": {"baseline": "2020-03-25", "port-version": 0}, "blosc": {"baseline": "1.18.1-1", "port-version": 0}, "bond": {"baseline": "9.0.3", "port-version": 0}, "boolinq": {"baseline": "2019-07-22", "port-version": 0}, "boost": {"baseline": "1.75.0", "port-version": 0}, "boost-accumulators": {"baseline": "1.75.0", "port-version": 0}, "boost-algorithm": {"baseline": "1.75.0", "port-version": 0}, "boost-align": {"baseline": "1.75.0", "port-version": 0}, "boost-any": {"baseline": "1.75.0", "port-version": 0}, "boost-array": {"baseline": "1.75.0", "port-version": 0}, "boost-asio": {"baseline": "1.75.0", "port-version": 1}, "boost-assert": {"baseline": "1.75.0", "port-version": 0}, "boost-assign": {"baseline": "1.75.0", "port-version": 0}, "boost-atomic": {"baseline": "1.75.0", "port-version": 0}, "boost-beast": {"baseline": "1.75.0", "port-version": 0}, "boost-bimap": {"baseline": "1.75.0", "port-version": 0}, "boost-bind": {"baseline": "1.75.0", "port-version": 0}, "boost-build": {"baseline": "1.75.0.beta1", "port-version": 1}, "boost-callable-traits": {"baseline": "1.75.0", "port-version": 0}, "boost-chrono": {"baseline": "1.75.0", "port-version": 0}, "boost-circular-buffer": {"baseline": "1.75.0", "port-version": 0}, "boost-compatibility": {"baseline": "1.75.0", "port-version": 0}, "boost-compute": {"baseline": "1.75.0", "port-version": 0}, "boost-concept-check": {"baseline": "1.75.0", "port-version": 0}, "boost-config": {"baseline": "1.75.0", "port-version": 0}, "boost-container": {"baseline": "1.75.0", "port-version": 0}, "boost-container-hash": {"baseline": "1.75.0", "port-version": 0}, "boost-context": {"baseline": "1.75.0", "port-version": 0}, "boost-contract": {"baseline": "1.75.0", "port-version": 0}, "boost-conversion": {"baseline": "1.75.0", "port-version": 0}, "boost-convert": {"baseline": "1.75.0", "port-version": 0}, "boost-core": {"baseline": "1.75.0", "port-version": 0}, "boost-coroutine": {"baseline": "1.75.0", "port-version": 0}, "boost-coroutine2": {"baseline": "1.75.0", "port-version": 0}, "boost-crc": {"baseline": "1.75.0", "port-version": 0}, "boost-date-time": {"baseline": "1.75.0", "port-version": 0}, "boost-detail": {"baseline": "1.75.0", "port-version": 0}, "boost-di": {"baseline": "1.2.0", "port-version": 0}, "boost-dll": {"baseline": "1.75.0", "port-version": 0}, "boost-dynamic-bitset": {"baseline": "1.75.0", "port-version": 0}, "boost-endian": {"baseline": "1.75.0", "port-version": 0}, "boost-exception": {"baseline": "1.75.0", "port-version": 0}, "boost-fiber": {"baseline": "1.75.0", "port-version": 0}, "boost-filesystem": {"baseline": "1.75.0", "port-version": 0}, "boost-flyweight": {"baseline": "1.75.0", "port-version": 0}, "boost-foreach": {"baseline": "1.75.0", "port-version": 0}, "boost-format": {"baseline": "1.75.0", "port-version": 0}, "boost-function": {"baseline": "1.75.0", "port-version": 0}, "boost-function-types": {"baseline": "1.75.0", "port-version": 0}, "boost-functional": {"baseline": "1.75.0", "port-version": 0}, "boost-fusion": {"baseline": "1.75.0", "port-version": 0}, "boost-geometry": {"baseline": "1.75.0", "port-version": 0}, "boost-gil": {"baseline": "1.75.0", "port-version": 0}, "boost-graph": {"baseline": "1.75.0", "port-version": 0}, "boost-graph-parallel": {"baseline": "1.75.0", "port-version": 0}, "boost-hana": {"baseline": "1.75.0", "port-version": 0}, "boost-heap": {"baseline": "1.75.0", "port-version": 0}, "boost-histogram": {"baseline": "1.75.0", "port-version": 0}, "boost-hof": {"baseline": "1.75.0", "port-version": 0}, "boost-icl": {"baseline": "1.75.0", "port-version": 0}, "boost-integer": {"baseline": "1.75.0", "port-version": 0}, "boost-interprocess": {"baseline": "1.75.0", "port-version": 0}, "boost-interval": {"baseline": "1.75.0", "port-version": 0}, "boost-intrusive": {"baseline": "1.75.0", "port-version": 0}, "boost-io": {"baseline": "1.75.0", "port-version": 0}, "boost-iostreams": {"baseline": "1.75.0", "port-version": 0}, "boost-iterator": {"baseline": "1.75.0", "port-version": 0}, "boost-json": {"baseline": "1.75.0", "port-version": 0}, "boost-lambda": {"baseline": "1.75.0", "port-version": 0}, "boost-leaf": {"baseline": "1.75.0", "port-version": 0}, "boost-lexical-cast": {"baseline": "1.75.0", "port-version": 0}, "boost-local-function": {"baseline": "1.75.0", "port-version": 0}, "boost-locale": {"baseline": "1.75.0", "port-version": 0}, "boost-lockfree": {"baseline": "1.75.0", "port-version": 0}, "boost-log": {"baseline": "1.75.0", "port-version": 0}, "boost-logic": {"baseline": "1.75.0", "port-version": 0}, "boost-math": {"baseline": "1.75.0", "port-version": 0}, "boost-metaparse": {"baseline": "1.75.0", "port-version": 0}, "boost-modular-build-helper": {"baseline": "1.75.0", "port-version": 2}, "boost-move": {"baseline": "1.75.0", "port-version": 0}, "boost-mp11": {"baseline": "1.75.0", "port-version": 0}, "boost-mpi": {"baseline": "1.75.0", "port-version": 0}, "boost-mpl": {"baseline": "1.75.0", "port-version": 0}, "boost-msm": {"baseline": "1.75.0", "port-version": 0}, "boost-multi-array": {"baseline": "1.75.0", "port-version": 0}, "boost-multi-index": {"baseline": "1.75.0", "port-version": 0}, "boost-multiprecision": {"baseline": "1.75.0", "port-version": 0}, "boost-nowide": {"baseline": "1.75.0", "port-version": 0}, "boost-numeric-conversion": {"baseline": "1.75.0", "port-version": 0}, "boost-odeint": {"baseline": "1.75.0", "port-version": 0}, "boost-optional": {"baseline": "1.75.0", "port-version": 0}, "boost-outcome": {"baseline": "1.75.0", "port-version": 0}, "boost-parameter": {"baseline": "1.75.0", "port-version": 0}, "boost-parameter-python": {"baseline": "1.75.0", "port-version": 0}, "boost-pfr": {"baseline": "1.75.0", "port-version": 0}, "boost-phoenix": {"baseline": "1.75.0", "port-version": 0}, "boost-poly-collection": {"baseline": "1.75.0", "port-version": 0}, "boost-polygon": {"baseline": "1.75.0", "port-version": 0}, "boost-pool": {"baseline": "1.75.0", "port-version": 0}, "boost-predef": {"baseline": "1.75.0", "port-version": 0}, "boost-preprocessor": {"baseline": "1.75.0", "port-version": 0}, "boost-process": {"baseline": "1.75.0", "port-version": 0}, "boost-program-options": {"baseline": "1.75.0", "port-version": 0}, "boost-property-map": {"baseline": "1.75.0", "port-version": 0}, "boost-property-tree": {"baseline": "1.75.0", "port-version": 0}, "boost-proto": {"baseline": "1.75.0", "port-version": 0}, "boost-ptr-container": {"baseline": "1.75.0", "port-version": 0}, "boost-python": {"baseline": "1.75.0", "port-version": 1}, "boost-qvm": {"baseline": "1.75.0", "port-version": 0}, "boost-random": {"baseline": "1.75.0", "port-version": 0}, "boost-range": {"baseline": "1.75.0", "port-version": 0}, "boost-ratio": {"baseline": "1.75.0", "port-version": 0}, "boost-rational": {"baseline": "1.75.0", "port-version": 0}, "boost-regex": {"baseline": "1.75.0", "port-version": 0}, "boost-safe-numerics": {"baseline": "1.75.0", "port-version": 0}, "boost-scope-exit": {"baseline": "1.75.0", "port-version": 0}, "boost-serialization": {"baseline": "1.75.0", "port-version": 0}, "boost-signals2": {"baseline": "1.75.0", "port-version": 0}, "boost-smart-ptr": {"baseline": "1.75.0", "port-version": 0}, "boost-sort": {"baseline": "1.75.0", "port-version": 0}, "boost-spirit": {"baseline": "1.75.0", "port-version": 0}, "boost-stacktrace": {"baseline": "1.75.0", "port-version": 0}, "boost-statechart": {"baseline": "1.75.0", "port-version": 0}, "boost-static-assert": {"baseline": "1.75.0", "port-version": 0}, "boost-static-string": {"baseline": "1.75.0", "port-version": 0}, "boost-stl-interfaces": {"baseline": "1.75.0", "port-version": 0}, "boost-system": {"baseline": "1.75.0", "port-version": 0}, "boost-test": {"baseline": "1.75.0", "port-version": 0}, "boost-thread": {"baseline": "1.75.0", "port-version": 0}, "boost-throw-exception": {"baseline": "1.75.0", "port-version": 0}, "boost-timer": {"baseline": "1.75.0", "port-version": 0}, "boost-tokenizer": {"baseline": "1.75.0", "port-version": 0}, "boost-tti": {"baseline": "1.75.0", "port-version": 0}, "boost-tuple": {"baseline": "1.75.0", "port-version": 0}, "boost-type-erasure": {"baseline": "1.75.0", "port-version": 0}, "boost-type-index": {"baseline": "1.75.0", "port-version": 0}, "boost-type-traits": {"baseline": "1.75.0", "port-version": 0}, "boost-typeof": {"baseline": "1.75.0", "port-version": 0}, "boost-ublas": {"baseline": "1.75.0", "port-version": 0}, "boost-uninstall": {"baseline": "1.75.0", "port-version": 0}, "boost-units": {"baseline": "1.75.0", "port-version": 0}, "boost-unordered": {"baseline": "1.75.0", "port-version": 0}, "boost-utility": {"baseline": "1.75.0", "port-version": 0}, "boost-uuid": {"baseline": "1.75.0", "port-version": 0}, "boost-variant": {"baseline": "1.75.0", "port-version": 0}, "boost-variant2": {"baseline": "1.75.0", "port-version": 0}, "boost-vcpkg-helpers": {"baseline": "7", "port-version": 2}, "boost-vmd": {"baseline": "1.75.0", "port-version": 0}, "boost-wave": {"baseline": "1.75.0", "port-version": 0}, "boost-winapi": {"baseline": "1.75.0", "port-version": 0}, "boost-xpressive": {"baseline": "1.75.0", "port-version": 0}, "boost-yap": {"baseline": "1.75.0", "port-version": 0}, "boringssl": {"baseline": "2020-04-07", "port-version": 2}, "botan": {"baseline": "2.16.0", "port-version": 0}, "box2d": {"baseline": "2.4.0", "port-version": 0}, "breakpad": {"baseline": "2020-09-14", "port-version": 1}, "brigand": {"baseline": "1.3.0", "port-version": 0}, "brotli": {"baseline": "1.0.9", "port-version": 0}, "brpc": {"baseline": "0.9.7", "port-version": 0}, "brunocodutra-metal": {"baseline": "2.1.1", "port-version": 0}, "brynet": {"baseline": "1.0.7", "port-version": 0}, "bullet3": {"baseline": "2.89-1", "port-version": 0}, "bustache": {"baseline": "1.1.0", "port-version": 0}, "butteraugli": {"baseline": "2019-05-08-1", "port-version": 0}, "byte-lite": {"baseline": "0.2.0", "port-version": 0}, "bzip2": {"baseline": "1.0.8", "port-version": 1}, "c-ares": {"baseline": "1.17.1", "port-version": 0}, "c4core": {"baseline": "2020-04-12", "port-version": 0}, "caf": {"baseline": "0.17.6", "port-version": 1}, "caffe2": {"baseline": "0.8.1-3", "port-version": 0}, "cairo": {"baseline": "1.16.0", "port-version": 8}, "cairomm": {"baseline": "1.15.3", "port-version": 5}, "camport3": {"baseline": "1.5.3", "port-version": 0}, "capnproto": {"baseline": "0.8.0", "port-version": 1}, "capstone": {"baseline": "4.0.2", "port-version": 1}, "cartographer": {"baseline": "1.0.0-3", "port-version": 0}, "casclib": {"baseline": "1.50b-1", "port-version": 0}, "catch": {"baseline": "alias", "port-version": 0}, "catch-classic": {"baseline": "1.12.2", "port-version": 0}, "catch2": {"baseline": "2.13.1", "port-version": 0}, "cccapstone": {"baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1", "port-version": 0}, "ccd": {"baseline": "2.1-4", "port-version": 0}, "ccfits": {"baseline": "2.5", "port-version": 6}, "cctz": {"baseline": "2.3-2", "port-version": 0}, "celero": {"baseline": "2.6.0-1", "port-version": 0}, "cello": {"baseline": "2019-07-23", "port-version": 0}, "cereal": {"baseline": "1.3.0", "port-version": 0}, "ceres": {"baseline": "2.0.0", "port-version": 2}, "cfitsio": {"baseline": "3.49", "port-version": 0}, "cgal": {"baseline": "5.1.1", "port-version": 0}, "cgicc": {"baseline": "3.2.19-4", "port-version": 0}, "cgl": {"baseline": "0.60.2-2", "port-version": 0}, "cgltf": {"baseline": "1.8", "port-version": 0}, "cgns": {"baseline": "3.4.0-1", "port-version": 0}, "chaiscript": {"baseline": "6.1.0-1", "port-version": 0}, "chakracore": {"baseline": "1.11.22", "port-version": 1}, "charls": {"baseline": "2.1.0-1", "port-version": 0}, "chartdir": {"baseline": "6.3.1", "port-version": 2}, "check": {"baseline": "0.15.2", "port-version": 0}, "chipmunk": {"baseline": "7.0.3", "port-version": 1}, "chmlib": {"baseline": "0.40-4", "port-version": 0}, "chromium-base": {"baseline": "86.0.4199.1", "port-version": 1}, "cimg": {"baseline": "2.9.4", "port-version": 0}, "cityhash": {"baseline": "2013-01-08", "port-version": 0}, "civetweb": {"baseline": "1.13", "port-version": 1}, "cjson": {"baseline": "2019-11-30-1", "port-version": 0}, "clapack": {"baseline": "3.2.1", "port-version": 16}, "clara": {"baseline": "1.1.5", "port-version": 0}, "clblas": {"baseline": "2.12-4", "port-version": 0}, "clblast": {"baseline": "1.5.1", "port-version": 0}, "clfft": {"baseline": "2.12.2-2", "port-version": 0}, "cli": {"baseline": "1.2.1", "port-version": 0}, "cli11": {"baseline": "1.9.1", "port-version": 0}, "clickhouse-cpp": {"baseline": "2019-05-22", "port-version": 0}, "clipp": {"baseline": "2019-04-30", "port-version": 0}, "clockutils": {"baseline": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-3", "port-version": 0}, "clp": {"baseline": "1.17.6", "port-version": 0}, "clrng": {"baseline": "2020-12-01", "port-version": 0}, "clue": {"baseline": "1.0.0-alpha.7", "port-version": 0}, "cmark": {"baseline": "0.29.0", "port-version": 0}, "cmcstl2": {"baseline": "2019-07-20", "port-version": 0}, "cmocka": {"baseline": "2020-08-01", "port-version": 0}, "cnl": {"baseline": "2019-06-23", "port-version": 0}, "coin": {"baseline": "4.0.0", "port-version": 2}, "coinutils": {"baseline": "2.11.4", "port-version": 0}, "collada-dom": {"baseline": "2.5.0-3", "port-version": 0}, "colmap": {"baseline": "3.6", "port-version": 0}, "comms": {"baseline": "3.1.3", "port-version": 1}, "comms-ublox": {"baseline": "0.20.0", "port-version": 1}, "commsdsl": {"baseline": "3.6.0", "port-version": 1}, "concurrentqueue": {"baseline": "1.0.2", "port-version": 0}, "console-bridge": {"baseline": "1.0.1", "port-version": 1}, "constexpr": {"baseline": "1.0-1", "port-version": 0}, "constexpr-contracts": {"baseline": "2020-08-09", "port-version": 0}, "coolprop": {"baseline": "6.4.1", "port-version": 0}, "coroutine": {"baseline": "1.5.0", "port-version": 1}, "corrade": {"baseline": "2020.06", "port-version": 0}, "cpp-base64": {"baseline": "2019-06-19", "port-version": 0}, "cpp-httplib": {"baseline": "0.7.18", "port-version": 0}, "cpp-netlib": {"baseline": "0.13.0", "port-version": 4}, "cpp-peglib": {"baseline": "0.1.0", "port-version": 0}, "cpp-redis": {"baseline": "4.3.1-2", "port-version": 0}, "cpp-taskflow": {"baseline": "2.6.0", "port-version": 0}, "cppad": {"baseline": "20200000.3", "port-version": 0}, "cppcms": {"baseline": "1.2.1", "port-version": 2}, "cppcodec": {"baseline": "0.2", "port-version": 0}, "cppcoro": {"baseline": "2020-2-28-1", "port-version": 0}, "cppfs": {"baseline": "1.3.0", "port-version": 0}, "cppgraphqlgen": {"baseline": "2020-12-07", "port-version": 1}, "cppitertools": {"baseline": "2.0", "port-version": 0}, "cppkafka": {"baseline": "0.3.1-2", "port-version": 0}, "cppmicroservices": {"baseline": "3.4.0", "port-version": 2}, "cpprestsdk": {"baseline": "2.10.17", "port-version": 0}, "cpptoml": {"baseline": "v0.1.1", "port-version": 0}, "cppunit": {"baseline": "1.15.1", "port-version": 0}, "cpputest": {"baseline": "2019-9-16-1", "port-version": 0}, "cppwinrt": {"baseline": "windows-sdk", "port-version": 0}, "cppzmq": {"baseline": "4.7.1", "port-version": 1}, "cpr": {"baseline": "1.5.2", "port-version": 0}, "cpu-features": {"baseline": "0.4.1", "port-version": 0}, "cpuid": {"baseline": "0.4.1-1", "port-version": 0}, "cpuinfo": {"baseline": "2019-07-28-1", "port-version": 0}, "cr": {"baseline": "2020-04-26", "port-version": 0}, "crashpad": {"baseline": "2020-03-18", "port-version": 0}, "crashrpt": {"baseline": "1.4.3", "port-version": 0}, "crc32c": {"baseline": "1.1.1", "port-version": 0}, "crfsuite": {"baseline": "2019-07-21", "port-version": 0}, "croncpp": {"baseline": "2020-09-04", "port-version": 1}, "crossguid": {"baseline": "0.2.2-2018-06-16-1", "port-version": 0}, "crow": {"baseline": "0.1-1", "port-version": 0}, "cryptopp": {"baseline": "8.2.0-2", "port-version": 0}, "cspice": {"baseline": "66", "port-version": 3}, "ctbignum": {"baseline": "2019-08-02", "port-version": 0}, "ctemplate": {"baseline": "2020-09-14", "port-version": 0}, "ctp": {"baseline": "6.3.15_20190220_se", "port-version": 1}, "ctre": {"baseline": "2.10", "port-version": 0}, "cub": {"baseline": "1.8.0-1", "port-version": 0}, "cuda": {"baseline": "10.1", "port-version": 5}, "cudnn": {"baseline": "7.6", "port-version": 4}, "cunit": {"baseline": "2.1.3-6", "port-version": 0}, "curl": {"baseline": "7.74.0", "port-version": 2}, "curlpp": {"baseline": "2018-06-15-3", "port-version": 0}, "cute-headers": {"baseline": "2019-09-20", "port-version": 0}, "cutelyst2": {"baseline": "2.12.0", "port-version": 0}, "cwalk": {"baseline": "1.2.5", "port-version": 0}, "cxxopts": {"baseline": "2.2.1", "port-version": 0}, "czmq": {"baseline": "2019-06-10-4", "port-version": 0}, "d3dx12": {"baseline": "may2020", "port-version": 0}, "darknet": {"baseline": "2020-08-30", "port-version": 2}, "darts-clone": {"baseline": "1767ab87cffe-1", "port-version": 0}, "dartsim": {"baseline": "6.9.4", "port-version": 0}, "dataframe": {"baseline": "1.12.0", "port-version": 0}, "date": {"baseline": "3.0.0", "port-version": 1}, "dbg-macro": {"baseline": "2019-07-11", "port-version": 0}, "dbghelp": {"baseline": "0.0", "port-version": 0}, "dbow2": {"baseline": "2019-08-05", "port-version": 0}, "dbow3": {"baseline": "1.0.0", "port-version": 0}, "dcmtk": {"baseline": "3.6.5+_20191213", "port-version": 0}, "debug-assert": {"baseline": "1.3.3", "port-version": 0}, "decimal-for-cpp": {"baseline": "1.16", "port-version": 1}, "detours": {"baseline": "4.0.1-1", "port-version": 0}, "devicenameresolver": {"baseline": "2016-06-26-0850d88fa6-1", "port-version": 0}, "devil": {"baseline": "1.8.0", "port-version": 7}, "dimcli": {"baseline": "5.0.2", "port-version": 0}, "directx-headers": {"baseline": "1.0.1", "port-version": 0}, "directxmath": {"baseline": "jan2021", "port-version": 0}, "directxmesh": {"baseline": "jan2021", "port-version": 0}, "directxsdk": {"baseline": "jun10", "port-version": 0}, "directxtex": {"baseline": "jan2021", "port-version": 0}, "directxtk": {"baseline": "jan2021", "port-version": 0}, "directxtk12": {"baseline": "jan2021", "port-version": 0}, "dirent": {"baseline": "1.23.2", "port-version": 0}, "discord-game-sdk": {"baseline": "2.5.6-1", "port-version": 0}, "discord-rpc": {"baseline": "3.4.0", "port-version": 0}, "discount": {"baseline": "2.2.6", "port-version": 0}, "distorm": {"baseline": "3.4.1", "port-version": 0}, "dlfcn-win32": {"baseline": "1.1.1-4", "port-version": 0}, "dlib": {"baseline": "19.21", "port-version": 4}, "dmlc": {"baseline": "2019-08-12-4", "port-version": 0}, "docopt": {"baseline": "2018-11-01", "port-version": 0}, "doctest": {"baseline": "2.4.0", "port-version": 0}, "double-conversion": {"baseline": "3.1.5", "port-version": 0}, "dpdk": {"baseline": "19.02", "port-version": 0}, "draco": {"baseline": "1.3.6", "port-version": 0}, "drlibs": {"baseline": "2019-08-12", "port-version": 0}, "drogon": {"baseline": "1.1.0", "port-version": 0}, "dtl": {"baseline": "1.19", "port-version": 0}, "duckx": {"baseline": "1.0.0", "port-version": 0}, "duilib": {"baseline": "2019-4-28-2", "port-version": 0}, "duktape": {"baseline": "2.5.0", "port-version": 1}, "dx": {"baseline": "1.0.1-1", "port-version": 0}, "dxut": {"baseline": "11.14-3", "port-version": 0}, "eabase": {"baseline": "2.09.12-1", "port-version": 0}, "eastl": {"baseline": "3.17.03", "port-version": 0}, "easycl": {"baseline": "0.3", "port-version": 0}, "easyhook": {"baseline": "2.7.6789.0", "port-version": 0}, "easyloggingpp": {"baseline": "9.96.7-1", "port-version": 0}, "eathread": {"baseline": "1.32.09-1", "port-version": 0}, "ebml": {"baseline": "1.4.0", "port-version": 0}, "ecm": {"baseline": "5.74.0", "port-version": 0}, "ecos": {"baseline": "2.0.7", "port-version": 0}, "ecsutil": {"baseline": "1.0.7.15", "port-version": 0}, "edlib": {"baseline": "1.2.6", "port-version": 0}, "effolkronium-random": {"baseline": "1.3.1", "port-version": 0}, "efsw": {"baseline": "2020-06-08", "port-version": 1}, "egl-registry": {"baseline": "2020-02-20", "port-version": 0}, "eigen3": {"baseline": "3.3.9", "port-version": 0}, "elfio": {"baseline": "3.8", "port-version": 0}, "elfutils": {"baseline": "0.182", "port-version": 0}, "embree2": {"baseline": "2.17.7", "port-version": 0}, "embree3": {"baseline": "3.11.0", "port-version": 1}, "enet": {"baseline": "1.3.16", "port-version": 0}, "ensmallen": {"baseline": "2.14.2", "port-version": 0}, "entityx": {"baseline": "1.3.0-2", "port-version": 0}, "entt": {"baseline": "3.6.0", "port-version": 0}, "epsilon": {"baseline": "0.9.2-4", "port-version": 0}, "esaxx": {"baseline": "ca7cb332011ec37", "port-version": 0}, "evpp": {"baseline": "0.7.0", "port-version": 4}, "exiv2": {"baseline": "0.27.3", "port-version": 4}, "expat": {"baseline": "2020-08-18", "port-version": 0}, "expected-lite": {"baseline": "0.3.0", "port-version": 0}, "exprtk": {"baseline": "2020-09-14", "port-version": 0}, "ezc3d": {"baseline": "1.3.7", "port-version": 0}, "faad2": {"baseline": "2.9.1", "port-version": 2}, "fadbad": {"baseline": "2.1.0", "port-version": 0}, "faiss": {"baseline": "1.6.4", "port-version": 0}, "fann": {"baseline": "2.2.0-1", "port-version": 0}, "farmhash": {"baseline": "1.1", "port-version": 2}, "fast-cpp-csv-parser": {"baseline": "2019-08-14", "port-version": 0}, "fastcdr": {"baseline": "1.0.15", "port-version": 0}, "fastcgi": {"baseline": "2020-09-11", "port-version": 0}, "fastfeat": {"baseline": "391d5e9-1", "port-version": 0}, "fastlz": {"baseline": "1.0-3", "port-version": 0}, "fastrtps": {"baseline": "2.0.1", "port-version": 0}, "fbthrift": {"baseline": "2020.10.19.00", "port-version": 0}, "fcl": {"baseline": "0.6.1", "port-version": 0}, "fdk-aac": {"baseline": "2018-07-08-2", "port-version": 0}, "fdlibm": {"baseline": "5.3-4", "port-version": 0}, "ffmpeg": {"baseline": "4.3.1", "port-version": 9}, "ffnvcodec": {"baseline": "10.0.26.0", "port-version": 0}, "fftw3": {"baseline": "3.3.8-7", "port-version": 0}, "fftwpp": {"baseline": "2019-12-19", "port-version": 0}, "field3d": {"baseline": "1.7.3", "port-version": 1}, "fixed-string": {"baseline": "0.1.0", "port-version": 0}, "fizz": {"baseline": "2020.10.19.00", "port-version": 0}, "flann": {"baseline": "2019-04-07", "port-version": 1}, "flashlight-cuda": {"baseline": "20201201", "port-version": 0}, "flatbuffers": {"baseline": "1.12.0", "port-version": 0}, "flint": {"baseline": "2.5.2-4", "port-version": 0}, "fltk": {"baseline": "1.3.5", "port-version": 3}, "fluidlite": {"baseline": "2020-08-27", "port-version": 0}, "fluidsynth": {"baseline": "2.1.4", "port-version": 0}, "fmem": {"baseline": "c-libs-2ccee3d2fb", "port-version": 0}, "fmi4cpp": {"baseline": "0.7.0-2", "port-version": 0}, "fmilib": {"baseline": "2.0.3", "port-version": 3}, "fmt": {"baseline": "7.1.3", "port-version": 0}, "folly": {"baseline": "2020.10.19.00", "port-version": 0}, "font-chef": {"baseline": "1.0.1", "port-version": 0}, "fontconfig": {"baseline": "2.13.1", "port-version": 3}, "foonathan-memory": {"baseline": "2019-07-21-1", "port-version": 0}, "forest": {"baseline": "12.1.0", "port-version": 0}, "forge": {"baseline": "1.0.5", "port-version": 0}, "fplus": {"baseline": "0.2.3-p0", "port-version": 0}, "freeglut": {"baseline": "3.2.1-4", "port-version": 0}, "freeimage": {"baseline": "3.18.0", "port-version": 18}, "freeopcua": {"baseline": "20190125-3", "port-version": 0}, "freerdp": {"baseline": "2.2.0", "port-version": 0}, "freetds": {"baseline": "1.2.11", "port-version": 1}, "freetype": {"baseline": "2.10.4", "port-version": 0}, "freetype-gl": {"baseline": "2020-09-14", "port-version": 0}, "freexl": {"baseline": "1.0.4", "port-version": 11}, "fribidi": {"baseline": "1.0.10", "port-version": 1}, "frozen": {"baseline": "1.0.0", "port-version": 0}, "fruit": {"baseline": "3.6.0", "port-version": 0}, "ftgl": {"baseline": "2.4.0-2", "port-version": 0}, "function2": {"baseline": "4.1.0", "port-version": 0}, "fuzzylite": {"baseline": "6.0", "port-version": 3}, "g2o": {"baseline": "2020-02-07", "port-version": 1}, "g3log": {"baseline": "2019-07-29", "port-version": 0}, "gainput": {"baseline": "1.0.0-3", "port-version": 0}, "gamedev-framework": {"baseline": "0.18.1", "port-version": 0}, "gamma": {"baseline": "gamma-2018-01-27", "port-version": 2}, "gasol": {"baseline": "2018-01-04", "port-version": 0}, "gaussianlib": {"baseline": "2019-08-04", "port-version": 0}, "gcem": {"baseline": "1.13.1", "port-version": 0}, "gdal": {"baseline": "3.1.3", "port-version": 1}, "gdcm": {"baseline": "3.0.7", "port-version": 0}, "gdcm2": {"baseline": "deprecated", "port-version": 0}, "gdk-pixbuf": {"baseline": "2.36.9-5", "port-version": 7}, "genann": {"baseline": "2019-07-10", "port-version": 0}, "geogram": {"baseline": "1.7.5", "port-version": 2}, "geographiclib": {"baseline": "1.51", "port-version": 0}, "geos": {"baseline": "3.8.1", "port-version": 1}, "geotrans": {"baseline": "3.8", "port-version": 0}, "getdns": {"baseline": "1.6.0", "port-version": 0}, "getopt": {"baseline": "0", "port-version": 0}, "getopt-win32": {"baseline": "0.1", "port-version": 0}, "gettext": {"baseline": "0.21", "port-version": 0}, "gettimeofday": {"baseline": "2017-10-14-3", "port-version": 0}, "gflags": {"baseline": "2.2.2-1", "port-version": 0}, "gherkin-c": {"baseline": "2019-10-07-1", "port-version": 0}, "giflib": {"baseline": "5.1.4-6", "port-version": 0}, "gl2ps": {"baseline": "1.4.0-3", "port-version": 0}, "gl3w": {"baseline": "2018-05-31-2", "port-version": 0}, "glad": {"baseline": "0.1.33-1", "port-version": 0}, "glbinding": {"baseline": "3.1.0", "port-version": 3}, "glew": {"baseline": "2.1.0", "port-version": 9}, "glfw3": {"baseline": "3.3.2", "port-version": 0}, "gli": {"baseline": "dd17acf-1", "port-version": 0}, "glib": {"baseline": "2.52.3", "port-version": 25}, "glibmm": {"baseline": "2.52.1", "port-version": 14}, "glm": {"baseline": "0.9.9.8", "port-version": 0}, "globjects": {"baseline": "1.1.0-3", "port-version": 0}, "glog": {"baseline": "0.4.0-3", "port-version": 0}, "gloo": {"baseline": "20201203", "port-version": 0}, "glslang": {"baseline": "2019-03-05-1", "port-version": 0}, "glui": {"baseline": "2019-11-30", "port-version": 0}, "gmime": {"baseline": "3.2.6", "port-version": 1}, "gmmlib": {"baseline": "20.3.1", "port-version": 0}, "gmp": {"baseline": "6.2.1-2", "port-version": 0}, "google-cloud-cpp": {"baseline": "1.22.0", "port-version": 0}, "google-cloud-cpp-common": {"baseline": "alias", "port-version": 0}, "google-cloud-cpp-spanner": {"baseline": "alias", "port-version": 0}, "googleapis": {"baseline": "alias", "port-version": 0}, "gperf": {"baseline": "3.1-1", "port-version": 0}, "gperftools": {"baseline": "2019-09-02", "port-version": 0}, "gpgme": {"baseline": "1.14.0", "port-version": 0}, "gppanel": {"baseline": "2020-05-20", "port-version": 0}, "graphicsmagick": {"baseline": "1.3.36", "port-version": 0}, "graphite2": {"baseline": "1.3.14", "port-version": 0}, "graphqlparser": {"baseline": "0.7.0-1", "port-version": 0}, "greatest": {"baseline": "1.4.2", "port-version": 0}, "grpc": {"baseline": "1.33.1", "port-version": 2}, "grppi": {"baseline": "0.4.0", "port-version": 0}, "gsl": {"baseline": "2.6", "port-version": 0}, "gsl-lite": {"baseline": "0.37.0", "port-version": 0}, "gsoap": {"baseline": "2.8.105", "port-version": 0}, "gtest": {"baseline": "1.10.0", "port-version": 2}, "gtk": {"baseline": "3.22.19-4", "port-version": 0}, "gtkmm": {"baseline": "3.22.2", "port-version": 5}, "gts": {"baseline": "0.7.6-3", "port-version": 0}, "guetzli": {"baseline": "2020-09-14", "port-version": 0}, "gumbo": {"baseline": "0.10.1-3", "port-version": 0}, "gzip-hpp": {"baseline": "0.1.0", "port-version": 0}, "h3": {"baseline": "3.6.3", "port-version": 0}, "h5py-lzf": {"baseline": "2019-12-04", "port-version": 0}, "halide": {"baseline": "10.0.0", "port-version": 0}, "harfbuzz": {"baseline": "2.7.2", "port-version": 1}, "hayai": {"baseline": "2019-08-10", "port-version": 0}, "hdf5": {"baseline": "1.12.0", "port-version": 0}, "healpix": {"baseline": "1.12.10", "port-version": 7}, "hedley": {"baseline": "14", "port-version": 0}, "hffix": {"baseline": "1.0.0", "port-version": 0}, "hfsm2": {"baseline": "beta7", "port-version": 0}, "hidapi": {"baseline": "0.10.1", "port-version": 0}, "highfive": {"baseline": "2.2.2", "port-version": 1}, "hiredis": {"baseline": "1.0.0", "port-version": 0}, "hpx": {"baseline": "1.5.1", "port-version": 1}, "http-parser": {"baseline": "2.9.4", "port-version": 0}, "hungarian": {"baseline": "v0.1.3", "port-version": 0}, "hunspell": {"baseline": "1.7.0", "port-version": 2}, "hwloc": {"baseline": "2.2.0", "port-version": 0}, "hyperscan": {"baseline": "5.3.0", "port-version": 1}, "hypre": {"baseline": "2.19.0", "port-version": 0}, "icu": {"baseline": "67.1", "port-version": 7}, "ideviceinstaller": {"baseline": "1.1.2.23-1", "port-version": 0}, "idevicerestore": {"baseline": "1.0.12-4", "port-version": 0}, "if97": {"baseline": "2.1.2", "port-version": 0}, "igloo": {"baseline": "1.1.1", "port-version": 0}, "ignition-cmake0": {"baseline": "0.6.2-2", "port-version": 0}, "ignition-cmake2": {"baseline": "2.5.0", "port-version": 0}, "ignition-common1": {"baseline": "1.1.1-1", "port-version": 0}, "ignition-common3": {"baseline": "3.9.0", "port-version": 0}, "ignition-fuel-tools1": {"baseline": "1.2.0-2", "port-version": 0}, "ignition-math4": {"baseline": "4.0.0-1", "port-version": 0}, "ignition-math6": {"baseline": "6.6.0", "port-version": 0}, "ignition-modularscripts": {"baseline": "2020-11-23", "port-version": 0}, "ignition-msgs1": {"baseline": "1.0.0", "port-version": 3}, "ignition-msgs5": {"baseline": "5.3.0", "port-version": 2}, "ignition-msgs6": {"baseline": "6.0.0", "port-version": 1}, "ignition-plugin1": {"baseline": "1.1.0", "port-version": 0}, "ignition-transport4": {"baseline": "4.0.0-2", "port-version": 0}, "ignition-transport8": {"baseline": "8.1.0", "port-version": 0}, "ignition-transport9": {"baseline": "9.0.0", "port-version": 0}, "ijg-libjpeg": {"baseline": "9d", "port-version": 0}, "ilmbase": {"baseline": "2.3.0", "port-version": 0}, "imgui": {"baseline": "1.79", "port-version": 4}, "imgui-sfml": {"baseline": "2.1-2", "port-version": 0}, "immer": {"baseline": "2019-06-07", "port-version": 0}, "implot": {"baseline": "0.8", "port-version": 0}, "indicators": {"baseline": "2020-10-30", "port-version": 0}, "infoware": {"baseline": "0.5.5", "port-version": 1}, "inih": {"baseline": "51", "port-version": 0}, "iniparser": {"baseline": "2020-04-06", "port-version": 0}, "inja": {"baseline": "3.0.0", "port-version": 0}, "intel-ipsec": {"baseline": "0.52-1", "port-version": 0}, "intel-mkl": {"baseline": "2020.0.0", "port-version": 0}, "intelrdfpmathlib": {"baseline": "20U2-1", "port-version": 0}, "io2d": {"baseline": "2020-09-14", "port-version": 1}, "irrlicht": {"baseline": "1.8.4-10", "port-version": 0}, "irrxml": {"baseline": "0", "port-version": 0}, "isal": {"baseline": "2.25.0", "port-version": 0}, "ismrmrd": {"baseline": "1.4.2", "port-version": 0}, "itk": {"baseline": "5.1.0", "port-version": 5}, "itpp": {"baseline": "4.3.1-5", "port-version": 0}, "ixwebsocket": {"baseline": "11.0.4", "port-version": 0}, "jack2": {"baseline": "1.9.14", "port-version": 0}, "jaeger-client-cpp": {"baseline": "0.5.1-1", "port-version": 0}, "jansson": {"baseline": "2.13.1", "port-version": 0}, "jasper": {"baseline": "2.0.20", "port-version": 0}, "jbig2dec": {"baseline": "0.19", "port-version": 0}, "jbigkit": {"baseline": "2.1-4", "port-version": 0}, "jemalloc": {"baseline": "4.3.1-4", "port-version": 0}, "jinja2cpplight": {"baseline": "2018-05-08", "port-version": 0}, "josuttis-jthread": {"baseline": "2020-07-21", "port-version": 1}, "jsmn": {"baseline": "2019-04-27", "port-version": 0}, "json-c": {"baseline": "2019-09-10", "port-version": 1}, "json-dto": {"baseline": "0.2.11", "port-version": 0}, "json-schema-validator": {"baseline": "2.1.0", "port-version": 0}, "json-spirit": {"baseline": "4.1.0-1", "port-version": 0}, "json11": {"baseline": "2017-06-20-2", "port-version": 0}, "json5-parser": {"baseline": "1.0.0", "port-version": 2}, "jsoncons": {"baseline": "0.159.0", "port-version": 0}, "jsoncpp": {"baseline": "1.9.4", "port-version": 0}, "jsonnet": {"baseline": "0.16.0", "port-version": 1}, "jwt-cpp": {"baseline": "0.4.0", "port-version": 0}, "jxrlib": {"baseline": "2019.10.9", "port-version": 2}, "kangaru": {"baseline": "4.2.4", "port-version": 0}, "kcp": {"baseline": "2019-09-20", "port-version": 0}, "kd-soap": {"baseline": "1.9.0", "port-version": 0}, "kealib": {"baseline": "1.4.11-3", "port-version": 0}, "kenlm": {"baseline": "20200924", "port-version": 1}, "keystone": {"baseline": "0.9.2", "port-version": 0}, "kf5archive": {"baseline": "5.74.0", "port-version": 1}, "kf5completion": {"baseline": "5.64.0", "port-version": 0}, "kf5config": {"baseline": "5.64.0", "port-version": 0}, "kf5coreaddons": {"baseline": "5.64.0", "port-version": 0}, "kf5crash": {"baseline": "5.64.0", "port-version": 0}, "kf5guiaddons": {"baseline": "5.64.0", "port-version": 0}, "kf5holidays": {"baseline": "5.74.0", "port-version": 0}, "kf5i18n": {"baseline": "5.64.0", "port-version": 1}, "kf5itemmodels": {"baseline": "5.64.0", "port-version": 0}, "kf5itemviews": {"baseline": "5.64.0", "port-version": 0}, "kf5plotting": {"baseline": "5.74.0", "port-version": 0}, "kf5syntaxhighlighting": {"baseline": "5.64.0-1", "port-version": 0}, "kf5widgetsaddons": {"baseline": "5.64.0", "port-version": 0}, "kf5windowsystem": {"baseline": "5.64.0", "port-version": 0}, "kfr": {"baseline": "2020-06-15", "port-version": 0}, "kinectsdk1": {"baseline": "1.8-2", "port-version": 0}, "kinectsdk2": {"baseline": "2.0-2", "port-version": 0}, "kissfft": {"baseline": "2020-03-30", "port-version": 0}, "knet": {"baseline": "1.0.1", "port-version": 1}, "krabsetw": {"baseline": "4.1.14", "port-version": 0}, "ktx": {"baseline": "4.0.0-beta5", "port-version": 1}, "kubazip": {"baseline": "0.1.19", "port-version": 0}, "kuku": {"baseline": "2.0", "port-version": 0}, "kvasir-mpl": {"baseline": "2019-08-06", "port-version": 0}, "lapack": {"baseline": "3", "port-version": 1}, "lapack-reference": {"baseline": "3.8.0", "port-version": 4}, "lastools": {"baseline": "2020-05-09", "port-version": 0}, "laszip": {"baseline": "3.4.3", "port-version": 0}, "lazy-importer": {"baseline": "2019-08-10", "port-version": 0}, "lcm": {"baseline": "1.4.0", "port-version": 1}, "lcms": {"baseline": "2.11", "port-version": 0}, "leaf": {"baseline": "0.2.2", "port-version": 1}, "lemon": {"baseline": "0", "port-version": 0}, "leptonica": {"baseline": "1.80.0", "port-version": 1}, "lerc": {"baseline": "2.2", "port-version": 1}, "lest": {"baseline": "1.35.1", "port-version": 1}, "leveldb": {"baseline": "1.22-1", "port-version": 0}, "levmar": {"baseline": "2.6", "port-version": 0}, "libaaplus": {"baseline": "2.12-1", "port-version": 0}, "libaiff": {"baseline": "5.0-6", "port-version": 0}, "libarchive": {"baseline": "3.4.3", "port-version": 2}, "libass": {"baseline": "0.15.0", "port-version": 0}, "libassuan": {"baseline": "2.5.3", "port-version": 0}, "libb2": {"baseline": "0.98.1", "port-version": 4}, "libbf": {"baseline": "1.0.0-1", "port-version": 0}, "libbson": {"baseline": "1.16.1", "port-version": 2}, "libcds": {"baseline": "2.3.3", "port-version": 0}, "libcerf": {"baseline": "1.13", "port-version": 0}, "libconfig": {"baseline": "1.7.2-2", "port-version": 0}, "libconfuse": {"baseline": "2019-07-14", "port-version": 0}, "libcopp": {"baseline": "1.3.4", "port-version": 0}, "libcrafter": {"baseline": "0.3", "port-version": 2}, "libcroco": {"baseline": "0.6.13", "port-version": 2}, "libcuckoo": {"baseline": "0.3", "port-version": 0}, "libdatachannel": {"baseline": "v0.10.1", "port-version": 0}, "libdatrie": {"baseline": "0.2.10-3", "port-version": 0}, "libde265": {"baseline": "1.0.8", "port-version": 0}, "libdisasm": {"baseline": "0.23-7", "port-version": 0}, "libdivide": {"baseline": "3.0", "port-version": 0}, "libdshowcapture": {"baseline": "0.6.0-1", "port-version": 0}, "libepoxy": {"baseline": "1.5.5", "port-version": 0}, "libevent": {"baseline": "2.1.12", "port-version": 1}, "libevhtp": {"baseline": "1.2.18", "port-version": 0}, "libexif": {"baseline": "0.6.22", "port-version": 0}, "libfabric": {"baseline": "1.8.1-1", "port-version": 0}, "libffi": {"baseline": "3.3", "port-version": 6}, "libflac": {"baseline": "1.3.3", "port-version": 5}, "libfort": {"baseline": "0.4.1", "port-version": 0}, "libfreenect2": {"baseline": "0.2.0", "port-version": 5}, "libftdi": {"baseline": "0.20-1", "port-version": 0}, "libftdi1": {"baseline": "1.4-1", "port-version": 0}, "libgcrypt": {"baseline": "1.8.6", "port-version": 0}, "libgd": {"baseline": "2.2.5-4", "port-version": 0}, "libgeotiff": {"baseline": "1.6.0", "port-version": 0}, "libgit2": {"baseline": "1.1.0", "port-version": 0}, "libgo": {"baseline": "3.1-1", "port-version": 0}, "libgpg-error": {"baseline": "1.39", "port-version": 0}, "libgpod": {"baseline": "2019-08-29", "port-version": 2}, "libgta": {"baseline": "1.0.8-1", "port-version": 0}, "libguarded": {"baseline": "2019-08-27-1", "port-version": 0}, "libharu": {"baseline": "2017-08-15-9", "port-version": 0}, "libhdfs3": {"baseline": "2019-11-05", "port-version": 0}, "libheif": {"baseline": "1.10.0", "port-version": 0}, "libhsplasma": {"baseline": "2020.08.30", "port-version": 0}, "libhydrogen": {"baseline": "2019-08-11", "port-version": 0}, "libiconv": {"baseline": "1.16", "port-version": 6}, "libics": {"baseline": "1.6.4", "port-version": 0}, "libideviceactivation": {"baseline": "1.2.235", "port-version": 0}, "libidn2": {"baseline": "2.3.0", "port-version": 1}, "libigl": {"baseline": "2.2.0", "port-version": 3}, "libilbc": {"baseline": "3.0.3", "port-version": 0}, "libimobiledevice": {"baseline": "1.3.6", "port-version": 1}, "libirecovery": {"baseline": "1.0.25-2", "port-version": 0}, "libjpeg-turbo": {"baseline": "2.0.5", "port-version": 3}, "libjuice": {"baseline": "0.6.0", "port-version": 0}, "libkml": {"baseline": "1.3.0", "port-version": 6}, "liblas": {"baseline": "1.8.1", "port-version": 5}, "liblbfgs": {"baseline": "1.10", "port-version": 0}, "liblemon": {"baseline": "2019-06-13-1", "port-version": 0}, "liblinear": {"baseline": "241", "port-version": 0}, "liblo": {"baseline": "0.31", "port-version": 0}, "liblsl": {"baseline": "1.13.1", "port-version": 0}, "liblzma": {"baseline": "5.2.5", "port-version": 2}, "libmad": {"baseline": "0.15.1-8", "port-version": 0}, "libmagic": {"baseline": "5.37", "port-version": 2}, "libmariadb": {"baseline": "3.1.10", "port-version": 4}, "libmaxminddb": {"baseline": "1.4.3", "port-version": 0}, "libmediainfo": {"baseline": "20.09", "port-version": 0}, "libmesh": {"baseline": "1.5.0-1", "port-version": 0}, "libmicrohttpd": {"baseline": "0.9.63", "port-version": 4}, "libmikmod": {"baseline": "3.3.11.1-8", "port-version": 0}, "libmodbus": {"baseline": "3.1.6", "port-version": 1}, "libmodman": {"baseline": "2.0.1-2", "port-version": 0}, "libmodplug": {"baseline": "0.8.9.0", "port-version": 6}, "libmorton": {"baseline": "0.2", "port-version": 0}, "libmpeg2": {"baseline": "0.5.1", "port-version": 0}, "libmspack": {"baseline": "0.10.1-3", "port-version": 0}, "libmupdf": {"baseline": "1.18.0", "port-version": 0}, "libmysql": {"baseline": "8.0.20", "port-version": 1}, "libnice": {"baseline": "0.1.15", "port-version": 6}, "libnoise": {"baseline": "1.0.0", "port-version": 1}, "libodb": {"baseline": "2.4.0-6", "port-version": 0}, "libodb-boost": {"baseline": "2.4.0-3", "port-version": 0}, "libodb-mysql": {"baseline": "2.4.0-7", "port-version": 0}, "libodb-pgsql": {"baseline": "2.4.0-3", "port-version": 0}, "libodb-sqlite": {"baseline": "2.4.0", "port-version": 7}, "libogg": {"baseline": "1.3.4", "port-version": 3}, "libopenmpt": {"baseline": "2017-01-28-cf2390140", "port-version": 1}, "libopusenc": {"baseline": "0.2.1", "port-version": 0}, "libosip2": {"baseline": "5.1.0-4", "port-version": 0}, "libosmium": {"baseline": "2.15.5", "port-version": 0}, "libosmscout": {"baseline": "1.1.1", "port-version": 0}, "libp7-baical": {"baseline": "replaced", "port-version": 0}, "libp7client": {"baseline": "5.6", "port-version": 0}, "libpcap": {"baseline": "1.9.1-2", "port-version": 0}, "libpff": {"baseline": "2018-07-14-1", "port-version": 0}, "libplist": {"baseline": "1.3.6", "port-version": 0}, "libpmemobj-cpp": {"baseline": "1.11", "port-version": 0}, "libpng": {"baseline": "1.6.37", "port-version": 14}, "libpopt": {"baseline": "1.16-13", "port-version": 0}, "libpq": {"baseline": "12.2", "port-version": 10}, "libpqxx": {"baseline": "7.3.0", "port-version": 0}, "libprotobuf-mutator": {"baseline": "1.0", "port-version": 0}, "libproxy": {"baseline": "0.4.15-2", "port-version": 0}, "libqcow": {"baseline": "20200928", "port-version": 0}, "libqglviewer": {"baseline": "2.7.2-3", "port-version": 0}, "libqrencode": {"baseline": "4.1.0", "port-version": 0}, "librabbitmq": {"baseline": "2020-06-03", "port-version": 0}, "libraqm": {"baseline": "0.7.0", "port-version": 2}, "libraw": {"baseline": "201903-3", "port-version": 0}, "librdkafka": {"baseline": "1.5.0", "port-version": 0}, "libressl": {"baseline": "2.9.1", "port-version": 3}, "librsvg": {"baseline": "2.40.20-2", "port-version": 0}, "librsync": {"baseline": "2020-09-16", "port-version": 1}, "librtmp": {"baseline": "2019-11-11_1", "port-version": 0}, "librttopo": {"baseline": "1.1.0-2", "port-version": 0}, "libsamplerate": {"baseline": "0.1.9.0", "port-version": 3}, "libsbml": {"baseline": "5.18.0", "port-version": 0}, "libsigcpp": {"baseline": "2.10-3", "port-version": 2}, "libsigcpp-3": {"baseline": "3.0.3", "port-version": 0}, "libsndfile": {"baseline": "1.0.30", "port-version": 1}, "libsodium": {"baseline": "1.0.18", "port-version": 3}, "libsoundio": {"baseline": "2.0.0-3", "port-version": 0}, "libspatialindex": {"baseline": "1.9.0", "port-version": 0}, "libspatialite": {"baseline": "5.0.0", "port-version": 0}, "libspnav": {"baseline": "0.2.3", "port-version": 0}, "libsquish": {"baseline": "1.15-7", "port-version": 0}, "libsrt": {"baseline": "1.3.4", "port-version": 0}, "libsrtp": {"baseline": "2.2.0", "port-version": 0}, "libssh": {"baseline": "0.9.5", "port-version": 0}, "libssh2": {"baseline": "1.9.0", "port-version": 0}, "libstemmer": {"baseline": "2017-9-5", "port-version": 0}, "libstk": {"baseline": "4.6.1", "port-version": 0}, "libsvm": {"baseline": "323-1", "port-version": 0}, "libtheora": {"baseline": "1.2.0alpha1-20170719", "port-version": 2}, "libtins": {"baseline": "4.3", "port-version": 0}, "libtomcrypt": {"baseline": "1.18.2-1", "port-version": 0}, "libtommath": {"baseline": "1.2.0-1", "port-version": 0}, "libtorrent": {"baseline": "1.2.11", "port-version": 0}, "libu2f-server": {"baseline": "1.1.0", "port-version": 2}, "libudis86": {"baseline": "2018-01-28-56ff6c87", "port-version": 0}, "libudns": {"baseline": "0.4-2", "port-version": 0}, "libui": {"baseline": "2018-11-03-1", "port-version": 0}, "libunibreak": {"baseline": "4.3-0", "port-version": 0}, "libusb": {"baseline": "1.0.23", "port-version": 3}, "libusb-win32": {"baseline": "1.2.6.0-6", "port-version": 0}, "libusbmuxd": {"baseline": "1.2.219", "port-version": 0}, "libuuid": {"baseline": "1.0.3-7", "port-version": 0}, "libuv": {"baseline": "1.39.0", "port-version": 0}, "libvmdk": {"baseline": "20200926", "port-version": 0}, "libvorbis": {"baseline": "1.3.7", "port-version": 1}, "libvpx": {"baseline": "1.9.0", "port-version": 5}, "libwandio": {"baseline": "4.2.1", "port-version": 3}, "libwebm": {"baseline": "1.0.0.27-5", "port-version": 0}, "libwebp": {"baseline": "1.1.0", "port-version": 1}, "libwebsockets": {"baseline": "4.1.3", "port-version": 1}, "libxdiff": {"baseline": "0.23", "port-version": 0}, "libxlsxwriter": {"baseline": "0.9.4", "port-version": 0}, "libxml2": {"baseline": "2.9.10", "port-version": 2}, "libxmlmm": {"baseline": "0.6.0", "port-version": 0}, "libxmlpp": {"baseline": "2.40.1", "port-version": 8}, "libxmp-lite": {"baseline": "4.4.1-6", "port-version": 0}, "libxslt": {"baseline": "1.1.33", "port-version": 8}, "libyaml": {"baseline": "0.2.5", "port-version": 0}, "libyuv": {"baseline": "fec9121", "port-version": 3}, "libzen": {"baseline": "0.4.38", "port-version": 0}, "libzip": {"baseline": "1.7.3", "port-version": 1}, "libzippp": {"baseline": "4.0-1.7.3", "port-version": 3}, "licensepp": {"baseline": "2020-05-19", "port-version": 1}, "lilv": {"baseline": "0.24.10", "port-version": 0}, "linalg": {"baseline": "2.1", "port-version": 0}, "linenoise-ng": {"baseline": "4754bee2d8eb3-1", "port-version": 0}, "live555": {"baseline": "latest-1", "port-version": 0}, "llgl": {"baseline": "2019-08-15", "port-version": 1}, "llvm": {"baseline": "11.0.0", "port-version": 0}, "lmdb": {"baseline": "0.9.24", "port-version": 0}, "lodepng": {"baseline": "2020-03-15", "port-version": 0}, "log4cplus": {"baseline": "2.0.5", "port-version": 1}, "log4cpp": {"baseline": "2.9.1", "port-version": 3}, "log4cxx": {"baseline": "0.11.0", "port-version": 1}, "loguru": {"baseline": "2.1.0-1", "port-version": 0}, "lpeg": {"baseline": "1.0.2-1", "port-version": 0}, "lua": {"baseline": "5.4.1", "port-version": 0}, "luabridge": {"baseline": "2.6", "port-version": 0}, "luafilesystem": {"baseline": "1.8.0-1", "port-version": 0}, "luajit": {"baseline": "2.0.5-3", "port-version": 0}, "luasocket": {"baseline": "2020-09-14", "port-version": 0}, "lv2": {"baseline": "1.18.0", "port-version": 0}, "lz4": {"baseline": "1.9.2-2", "port-version": 0}, "lzfse": {"baseline": "1.0-2", "port-version": 0}, "lzo": {"baseline": "2.10-5", "port-version": 0}, "lzokay": {"baseline": "2020-07-30", "port-version": 0}, "magic-enum": {"baseline": "0.7.1", "port-version": 0}, "magic-get": {"baseline": "2019-09-02", "port-version": 2}, "magnum": {"baseline": "2020.06", "port-version": 2}, "magnum-extras": {"baseline": "2020.06", "port-version": 0}, "magnum-integration": {"baseline": "2020.06", "port-version": 0}, "magnum-plugins": {"baseline": "2020.06", "port-version": 1}, "mapbox-variant": {"baseline": "1.2.0", "port-version": 0}, "marble": {"baseline": "19.08.2", "port-version": 0}, "marl": {"baseline": "2020-10-10", "port-version": 0}, "mathc": {"baseline": "2019-09-29", "port-version": 0}, "mathgl": {"baseline": "2.4.3-6", "port-version": 0}, "matio": {"baseline": "1.5.17", "port-version": 0}, "matplotlib-cpp": {"baseline": "2020-08-27", "port-version": 0}, "matroska": {"baseline": "1.6.2", "port-version": 0}, "mbedtls": {"baseline": "2.24.0", "port-version": 1}, "mcpp": {"baseline": "2.7.2.14", "port-version": 2}, "mdns": {"baseline": "1.1", "port-version": 0}, "mdnsresponder": {"baseline": "765.30.11", "port-version": 3}, "mecab": {"baseline": "2019-09-25", "port-version": 1}, "memorymodule": {"baseline": "2019-12-31", "port-version": 0}, "mesa": {"baseline": "20.2.2", "port-version": 0}, "meschach": {"baseline": "1.2b-3", "port-version": 0}, "meshoptimizer": {"baseline": "0.14", "port-version": 1}, "metis": {"baseline": "5.1.0", "port-version": 7}, "metrohash": {"baseline": "1.1.3-1", "port-version": 0}, "mgnlibs": {"baseline": "2019-09-29", "port-version": 0}, "mhook": {"baseline": "2.5.1-1", "port-version": 0}, "microsoft-signalr": {"baseline": "0.1.0-alpha1", "port-version": 2}, "mikktspace": {"baseline": "2020-10-06", "port-version": 0}, "milerius-sfml-imgui": {"baseline": "1.1-2", "port-version": 0}, "mimalloc": {"baseline": "1.6.4", "port-version": 0}, "minc": {"baseline": "2.4.03", "port-version": 1}, "minhook": {"baseline": "1.3.3", "port-version": 1}, "minifb": {"baseline": "2019-08-20-1", "port-version": 0}, "minimp3": {"baseline": "2020-12-25", "port-version": 0}, "minisat-master-keying": {"baseline": "2.2-mod-2", "port-version": 0}, "minitrace": {"baseline": "2019.02.06", "port-version": 0}, "miniupnpc": {"baseline": "2.1-1", "port-version": 0}, "miniz": {"baseline": "2.1.0-1", "port-version": 0}, "minizip": {"baseline": "1.2.11", "port-version": 7}, "mio": {"baseline": "2019-02-10", "port-version": 0}, "mlpack": {"baseline": "3.4.1", "port-version": 0}, "mman": {"baseline": "git-f5ff813-3", "port-version": 0}, "mmloader": {"baseline": "2020-05-15", "port-version": 1}, "mmx": {"baseline": "2019-09-29", "port-version": 0}, "modp-base64": {"baseline": "2020-09-26", "port-version": 0}, "mongo-c-driver": {"baseline": "1.16.1", "port-version": 3}, "mongo-cxx-driver": {"baseline": "3.4.0-5", "port-version": 1}, "mongoose": {"baseline": "6.15-2", "port-version": 0}, "monkeys-audio": {"baseline": "5.70", "port-version": 0}, "moos-core": {"baseline": "10.4.0", "port-version": 5}, "moos-essential": {"baseline": "10.0.1-2", "port-version": 0}, "moos-ui": {"baseline": "10.0.1-2", "port-version": 0}, "morton-nd": {"baseline": "3.0.0", "port-version": 0}, "mosquitto": {"baseline": "1.6.8", "port-version": 3}, "mozjpeg": {"baseline": "2020-06-02", "port-version": 2}, "mp-units": {"baseline": "0.6.0", "port-version": 0}, "mp3lame": {"baseline": "3.100", "port-version": 6}, "mpark-variant": {"baseline": "1.4.0", "port-version": 0}, "mpfr": {"baseline": "4.0.2-2", "port-version": 0}, "mpg123": {"baseline": "1.26.3", "port-version": 0}, "mpi": {"baseline": "1", "port-version": 0}, "mpir": {"baseline": "3.0.0", "port-version": 10}, "mpmcqueue": {"baseline": "2019-07-26", "port-version": 0}, "mqtt-cpp": {"baseline": "7.0.1-2", "port-version": 0}, "ms-angle": {"baseline": "alias", "port-version": 0}, "ms-gsl": {"baseline": "3.1.0", "port-version": 0}, "msgpack": {"baseline": "3.3.0", "port-version": 0}, "msgpack11": {"baseline": "0.0.10-1", "port-version": 0}, "msinttypes": {"baseline": "2018-02-25", "port-version": 0}, "msix": {"baseline": "1.7-2", "port-version": 0}, "msmpi": {"baseline": "10.1", "port-version": 0}, "mstch": {"baseline": "1.0.2-2", "port-version": 0}, "mujs": {"baseline": "2018-07-30-1", "port-version": 0}, "munit": {"baseline": "2019-04-06", "port-version": 1}, "muparser": {"baseline": "2.3.2", "port-version": 0}, "murmurhash": {"baseline": "2016-01-09-3", "port-version": 0}, "mygui": {"baseline": "2020-06-17", "port-version": 0}, "nameof": {"baseline": "0.9.4", "port-version": 0}, "nana": {"baseline": "1.7.4", "port-version": 1}, "nano-signal-slot": {"baseline": "2.0.1", "port-version": 0}, "nanobench": {"baseline": "4.3.0", "port-version": 0}, "nanodbc": {"baseline": "2.13.0", "port-version": 0}, "nanoflann": {"baseline": "1.3.1", "port-version": 0}, "nanogui": {"baseline": "2019-09-23", "port-version": 1}, "nanomsg": {"baseline": "1.1.5-2", "port-version": 0}, "nanopb": {"baseline": "2019-02-12-2", "port-version": 0}, "nanoprintf": {"baseline": "2020-05-27", "port-version": 0}, "nanorange": {"baseline": "0.0.0", "port-version": 0}, "nanort": {"baseline": "2019-08-20-1", "port-version": 0}, "nanovg": {"baseline": "2019-8-30-3", "port-version": 0}, "nativefiledialog": {"baseline": "2019-08-28", "port-version": 0}, "nccl": {"baseline": "2.4.6", "port-version": 0}, "neargye-semver": {"baseline": "0.2.2", "port-version": 0}, "netcdf-c": {"baseline": "4.7.4", "port-version": 1}, "netcdf-cxx4": {"baseline": "4.3.1", "port-version": 2}, "nethost": {"baseline": "2019-12-21", "port-version": 0}, "nettle": {"baseline": "3.6", "port-version": 0}, "networkdirect-sdk": {"baseline": "2.0.1", "port-version": 1}, "nghttp2": {"baseline": "1.42.0", "port-version": 0}, "ngspice": {"baseline": "32", "port-version": 1}, "nifticlib": {"baseline": "2020-04-30", "port-version": 0}, "nlohmann-fifo-map": {"baseline": "2018.05.07-1", "port-version": 0}, "nlohmann-json": {"baseline": "3.9.1", "port-version": 0}, "nlopt": {"baseline": "2.7.0", "port-version": 0}, "nmap": {"baseline": "7.70-4", "port-version": 0}, "nmslib": {"baseline": "2.0.6", "port-version": 0}, "nng": {"baseline": "1.3.2", "port-version": 0}, "nngpp": {"baseline": "1.3.0", "port-version": 0}, "nonius": {"baseline": "2019-04-20-1", "port-version": 0}, "nowide": {"baseline": "11.0.0", "port-version": 0}, "nrf-ble-driver": {"baseline": "4.1.2", "port-version": 0}, "nt-wrapper": {"baseline": "2019-08-10", "port-version": 0}, "nuklear": {"baseline": "2020-09-14", "port-version": 0}, "numactl": {"baseline": "2.0.12", "port-version": 0}, "numcpp": {"baseline": "2.1.0", "port-version": 0}, "nuspell": {"baseline": "4.2.0", "port-version": 0}, "nvtt": {"baseline": "2.1.2", "port-version": 1}, "oatpp": {"baseline": "1.2.0", "port-version": 1}, "oatpp-consul": {"baseline": "1.2.0", "port-version": 1}, "oatpp-curl": {"baseline": "1.2.0", "port-version": 2}, "oatpp-libressl": {"baseline": "1.2.0", "port-version": 1}, "oatpp-mbedtls": {"baseline": "1.2.0", "port-version": 1}, "oatpp-mongo": {"baseline": "1.2.0", "port-version": 1}, "oatpp-postgresql": {"baseline": "1.2.0", "port-version": 1}, "oatpp-sqlite": {"baseline": "1.2.0", "port-version": 1}, "oatpp-swagger": {"baseline": "1.2.0", "port-version": 1}, "oatpp-websocket": {"baseline": "1.2.0", "port-version": 1}, "oatpp-zlib": {"baseline": "1.2.0", "port-version": 1}, "observer-ptr-lite": {"baseline": "0.4.0", "port-version": 0}, "ocilib": {"baseline": "4.7.1", "port-version": 0}, "octomap": {"baseline": "1.9.5", "port-version": 0}, "ode": {"baseline": "0.16.1", "port-version": 0}, "offscale-libetcd-cpp": {"baseline": "2019-07-10-1", "port-version": 0}, "ogdf": {"baseline": "2019-08-23", "port-version": 1}, "ogre": {"baseline": "1.12.9", "port-version": 4}, "ogre-next": {"baseline": "2019-10-20-1", "port-version": 0}, "ois": {"baseline": "1.5", "port-version": 2}, "ompl": {"baseline": "1.5.1", "port-version": 0}, "onednn": {"baseline": "2.0", "port-version": 1}, "oniguruma": {"baseline": "6.9.4", "port-version": 0}, "onnxruntime-gpu": {"baseline": "1.5.1", "port-version": 0}, "open62541": {"baseline": "1.1.2", "port-version": 0}, "openal-soft": {"baseline": "1.20.1", "port-version": 5}, "openblas": {"baseline": "0.3.10", "port-version": 0}, "opencascade": {"baseline": "7.4.0", "port-version": 3}, "opencc": {"baseline": "2020-04-26", "port-version": 7}, "opencensus-cpp": {"baseline": "0.4.0-1", "port-version": 0}, "opencl": {"baseline": "2.2", "port-version": 6}, "opencolorio": {"baseline": "1.1.1", "port-version": 4}, "opencolorio-tools": {"baseline": "1.1.1", "port-version": 0}, "opencsg": {"baseline": "1.4.2-1", "port-version": 0}, "opencv": {"baseline": "4.3.0", "port-version": 0}, "opencv2": {"baseline": "2.4.13.7", "port-version": 4}, "opencv3": {"baseline": "3.4.10", "port-version": 4}, "opencv4": {"baseline": "4.3.0", "port-version": 4}, "opendnp3": {"baseline": "3.1.0", "port-version": 0}, "openexr": {"baseline": "2.5.0", "port-version": 2}, "opengl": {"baseline": "0.0", "port-version": 8}, "opengl-registry": {"baseline": "2020-03-25", "port-version": 0}, "openigtlink": {"baseline": "3.0", "port-version": 0}, "openimageio": {"baseline": "2.1.16.0", "port-version": 4}, "openjpeg": {"baseline": "2.3.1", "port-version": 2}, "openmama": {"baseline": "6.3.1", "port-version": 0}, "openmesh": {"baseline": "8.1", "port-version": 0}, "openmpi": {"baseline": "4.0.3", "port-version": 3}, "openmvg": {"baseline": "1.6", "port-version": 0}, "openmvs": {"baseline": "1.1", "port-version": 4}, "openni2": {"baseline": "2.2.0.33-11", "port-version": 0}, "openscap": {"baseline": "1.3.1", "port-version": 0}, "openssl": {"baseline": "1.1.1i", "port-version": 0}, "openssl-unix": {"baseline": "1.1.1h", "port-version": 1}, "openssl-uwp": {"baseline": "1.1.1h", "port-version": 1}, "openssl-windows": {"baseline": "1.1.1h", "port-version": 1}, "opensubdiv": {"baseline": "3.4.3", "port-version": 0}, "opentracing": {"baseline": "1.6.0", "port-version": 1}, "openvdb": {"baseline": "7.1.0", "port-version": 1}, "openvpn3": {"baseline": "3.4.1-1", "port-version": 0}, "openvr": {"baseline": "1.12.5", "port-version": 0}, "openxr-loader": {"baseline": "1.0.11", "port-version": 1}, "optional-bare": {"baseline": "1.1.0", "port-version": 0}, "optional-lite": {"baseline": "3.2.0", "port-version": 0}, "opus": {"baseline": "1.3.1", "port-version": 5}, "opusfile": {"baseline": "0.12", "port-version": 0}, "orc": {"baseline": "1.6.4", "port-version": 1}, "orocos-kdl": {"baseline": "1.4", "port-version": 3}, "osg": {"baseline": "3.6.5", "port-version": 5}, "osg-qt": {"baseline": "Qt4", "port-version": 3}, "osgearth": {"baseline": "3.1", "port-version": 0}, "osi": {"baseline": "0.108.6", "port-version": 0}, "otl": {"baseline": "4.0.455", "port-version": 0}, "outcome": {"baseline": "2.1.3", "port-version": 0}, "p-ranav-csv": {"baseline": "2019-07-11", "port-version": 0}, "p-ranav-csv2": {"baseline": "2020-12-14", "port-version": 0}, "paho-mqtt": {"baseline": "1.3.8", "port-version": 0}, "paho-mqttpp3": {"baseline": "1.1", "port-version": 1}, "palsigslot": {"baseline": "1.2.0", "port-version": 0}, "pango": {"baseline": "1.40.11", "port-version": 8}, "pangolin": {"baseline": "0.5", "port-version": 11}, "pangomm": {"baseline": "2.40.1", "port-version": 4}, "parallel-hashmap": {"baseline": "1.32", "port-version": 0}, "parallelstl": {"baseline": "20200330", "port-version": 0}, "paraview": {"baseline": "5.8.0", "port-version": 3}, "parmetis": {"baseline": "4.0.3-3", "port-version": 0}, "parquet": {"baseline": "0", "port-version": 0}, "parson": {"baseline": "2020-09-14", "port-version": 0}, "pbc": {"baseline": "0.5.14", "port-version": 4}, "pcg": {"baseline": "0.98.1", "port-version": 0}, "pcl": {"baseline": "1.11.1", "port-version": 1}, "pcre": {"baseline": "8.44", "port-version": 8}, "pcre2": {"baseline": "10.35", "port-version": 2}, "pdal": {"baseline": "1.7.1", "port-version": 10}, "pdal-c": {"baseline": "1.8-2", "port-version": 0}, "pdcurses": {"baseline": "3.9", "port-version": 0}, "pdqsort": {"baseline": "2019-07-30", "port-version": 0}, "pe-parse": {"baseline": "1.2.0", "port-version": 0}, "pegtl": {"baseline": "3.1.0", "port-version": 0}, "pegtl-2": {"baseline": "2.8.3", "port-version": 0}, "pfring": {"baseline": "2019-10-17-2", "port-version": 0}, "pfultz2-linq": {"baseline": "2019-05-14", "port-version": 0}, "phnt": {"baseline": "2019-05-01", "port-version": 0}, "physfs": {"baseline": "3.0.2-2", "port-version": 0}, "physx": {"baseline": "4.1.1", "port-version": 6}, "picojson": {"baseline": "1.3.0-1", "port-version": 0}, "picosha2": {"baseline": "2018-07-30", "port-version": 0}, "piex": {"baseline": "2019-07-11", "port-version": 0}, "pistache": {"baseline": "2019-08-05", "port-version": 0}, "pixel": {"baseline": "0.3-1", "port-version": 0}, "pixman": {"baseline": "0.38.4", "port-version": 2}, "platform-folders": {"baseline": "4.0.0", "port-version": 6}, "plf-colony": {"baseline": "5.33", "port-version": 0}, "plf-list": {"baseline": "2019-08-10", "port-version": 0}, "plf-nanotimer": {"baseline": "2019-08-10", "port-version": 0}, "plf-stack": {"baseline": "2019-08-10", "port-version": 0}, "plib": {"baseline": "1.8.5-4", "port-version": 0}, "plibsys": {"baseline": "0.0.4", "port-version": 4}, "plog": {"baseline": "1.1.5", "port-version": 0}, "plplot": {"baseline": "5.13.0", "port-version": 9}, "plustache": {"baseline": "0.4.0-1", "port-version": 0}, "pmdk": {"baseline": "1.9", "port-version": 0}, "pngpp": {"baseline": "0.2.10", "port-version": 0}, "pngwriter": {"baseline": "0.7.0-2", "port-version": 0}, "poco": {"baseline": "1.10.1", "port-version": 3}, "podofo": {"baseline": "0.9.6", "port-version": 12}, "poly2tri": {"baseline": "2020-07-21", "port-version": 0}, "polyclipping": {"baseline": "6.4.2", "port-version": 6}, "polyhook2": {"baseline": "2021-01-08", "port-version": 0}, "polymorphic-value": {"baseline": "1.3.0-1", "port-version": 0}, "ponder": {"baseline": "3.0.0-1", "port-version": 0}, "poppler": {"baseline": "20.12.1", "port-version": 2}, "portable-snippets": {"baseline": "2019-09-20", "port-version": 0}, "portaudio": {"baseline": "2020-02-02", "port-version": 2}, "portmidi": {"baseline": "0.234", "port-version": 0}, "ppconsul": {"baseline": "0.5-1", "port-version": 0}, "ppmagic": {"baseline": "2020-07-03", "port-version": 0}, "pprint": {"baseline": "2019-07-19", "port-version": 0}, "pqp": {"baseline": "1.3-4", "port-version": 0}, "proj": {"baseline": "0", "port-version": 0}, "proj4": {"baseline": "7.2.0", "port-version": 0}, "prometheus-cpp": {"baseline": "0.11.0", "port-version": 0}, "protobuf": {"baseline": "3.14.0", "port-version": 1}, "protobuf-c": {"baseline": "1.3.2-2", "port-version": 0}, "protopuf": {"baseline": "1.0.0", "port-version": 0}, "protozero": {"baseline": "1.6.8", "port-version": 0}, "proxygen": {"baseline": "2020.10.19.00", "port-version": 0}, "proxywrapper": {"baseline": "1.0.0", "port-version": 0}, "ptex": {"baseline": "2.3.2", "port-version": 2}, "pthread": {"baseline": "3.0.0", "port-version": 0}, "pthreads": {"baseline": "3.0.0-6", "port-version": 0}, "pugixml": {"baseline": "1.11.1", "port-version": 0}, "pybind11": {"baseline": "2.6.0", "port-version": 3}, "pystring": {"baseline": "1.1.3-2", "port-version": 0}, "python2": {"baseline": "2.7.15-2", "port-version": 0}, "python3": {"baseline": "3.9.0", "port-version": 3}, "qca": {"baseline": "2.3.1", "port-version": 2}, "qcustomplot": {"baseline": "2.0.1-4", "port-version": 0}, "qhull": {"baseline": "8.0.2", "port-version": 0}, "qpid-proton": {"baseline": "0.32.0", "port-version": 0}, "qscintilla": {"baseline": "2.11.4-2", "port-version": 0}, "qt-advanced-docking-system": {"baseline": "3.6.3", "port-version": 1}, "qt5": {"baseline": "5.15.1", "port-version": 1}, "qt5-3d": {"baseline": "5.15.1", "port-version": 0}, "qt5-activeqt": {"baseline": "5.15.1", "port-version": 0}, "qt5-androidextras": {"baseline": "5.15.1", "port-version": 0}, "qt5-base": {"baseline": "5.15.1", "port-version": 4}, "qt5-canvas3d": {"baseline": "0", "port-version": 0}, "qt5-charts": {"baseline": "5.15.1", "port-version": 0}, "qt5-connectivity": {"baseline": "5.15.1", "port-version": 1}, "qt5-datavis3d": {"baseline": "5.15.1", "port-version": 0}, "qt5-declarative": {"baseline": "5.15.1", "port-version": 0}, "qt5-doc": {"baseline": "5.15.1", "port-version": 0}, "qt5-gamepad": {"baseline": "5.15.1", "port-version": 0}, "qt5-graphicaleffects": {"baseline": "5.15.1", "port-version": 0}, "qt5-imageformats": {"baseline": "5.15.1", "port-version": 1}, "qt5-location": {"baseline": "5.15.1", "port-version": 2}, "qt5-macextras": {"baseline": "5.15.1", "port-version": 0}, "qt5-modularscripts": {"baseline": "deprecated", "port-version": 0}, "qt5-mqtt": {"baseline": "5.15.1", "port-version": 0}, "qt5-multimedia": {"baseline": "5.15.1", "port-version": 0}, "qt5-networkauth": {"baseline": "5.15.1", "port-version": 0}, "qt5-purchasing": {"baseline": "5.15.1", "port-version": 0}, "qt5-quickcontrols": {"baseline": "5.15.1", "port-version": 0}, "qt5-quickcontrols2": {"baseline": "5.15.1", "port-version": 0}, "qt5-remoteobjects": {"baseline": "5.15.1", "port-version": 0}, "qt5-script": {"baseline": "5.15.1", "port-version": 0}, "qt5-scxml": {"baseline": "5.15.1", "port-version": 0}, "qt5-sensors": {"baseline": "5.15.1", "port-version": 0}, "qt5-serialbus": {"baseline": "5.15.1", "port-version": 0}, "qt5-serialport": {"baseline": "5.15.1", "port-version": 0}, "qt5-speech": {"baseline": "5.15.1", "port-version": 0}, "qt5-svg": {"baseline": "5.15.1", "port-version": 0}, "qt5-tools": {"baseline": "5.15.1", "port-version": 1}, "qt5-translations": {"baseline": "5.15.1", "port-version": 0}, "qt5-virtualkeyboard": {"baseline": "5.15.1", "port-version": 0}, "qt5-wayland": {"baseline": "5.15.1", "port-version": 0}, "qt5-webchannel": {"baseline": "5.15.1", "port-version": 0}, "qt5-webengine": {"baseline": "5.15.1", "port-version": 1}, "qt5-webglplugin": {"baseline": "5.15.1", "port-version": 0}, "qt5-websockets": {"baseline": "5.15.1", "port-version": 0}, "qt5-webview": {"baseline": "5.15.1", "port-version": 0}, "qt5-winextras": {"baseline": "5.15.1", "port-version": 0}, "qt5-x11extras": {"baseline": "5.15.1", "port-version": 0}, "qt5-xmlpatterns": {"baseline": "5.15.1", "port-version": 0}, "qtkeychain": {"baseline": "0.11.1", "port-version": 0}, "quadtree": {"baseline": "2020-04-13", "port-version": 0}, "quantlib": {"baseline": "2019-09-02", "port-version": 0}, "quaternions": {"baseline": "1.0.0", "port-version": 0}, "quazip": {"baseline": "0.9.1", "port-version": 0}, "quickfast": {"baseline": "1.5", "port-version": 0}, "quickfix": {"baseline": "1.15.1-4", "port-version": 0}, "quill": {"baseline": "1.6.1", "port-version": 0}, "quirc": {"baseline": "1.1", "port-version": 1}, "qwt": {"baseline": "6.1.5", "port-version": 0}, "qwtw": {"baseline": "3.1.0", "port-version": 0}, "rabit": {"baseline": "0.1-2", "port-version": 0}, "ragel": {"baseline": "6.10-3", "port-version": 0}, "rang": {"baseline": "3.1.0", "port-version": 0}, "range-v3": {"baseline": "0.11.0", "port-version": 0}, "range-v3-vs2015": {"baseline": "20151130-vcpkg5", "port-version": 0}, "rapidcheck": {"baseline": "2020-08-25", "port-version": 0}, "rapidjson": {"baseline": "2020-09-14", "port-version": 0}, "rapidxml": {"baseline": "1.13-4", "port-version": 0}, "rapidxml-ns": {"baseline": "1.13.2", "port-version": 0}, "rappture": {"baseline": "1.9", "port-version": 0}, "raylib": {"baseline": "3.5.0", "port-version": 0}, "rbdl": {"baseline": "2.6.0", "port-version": 0}, "re2": {"baseline": "2020-10-01", "port-version": 0}, "readerwriterqueue": {"baseline": "1.0.3", "port-version": 0}, "readline": {"baseline": "0", "port-version": 0}, "readline-win32": {"baseline": "5.0-2", "port-version": 0}, "readosm": {"baseline": "1.1.0a", "port-version": 0}, "realsense2": {"baseline": "2.40.0", "port-version": 0}, "recast": {"baseline": "1.5.1-3", "port-version": 0}, "redis-plus-plus": {"baseline": "1.2.1", "port-version": 1}, "refl-cpp": {"baseline": "0.12.0", "port-version": 0}, "refprop-headers": {"baseline": "2019-04-14", "port-version": 0}, "replxx": {"baseline": "0.0.2-2", "port-version": 0}, "reproc": {"baseline": "14.1.0", "port-version": 0}, "rest-rpc": {"baseline": "0.07", "port-version": 1}, "restbed": {"baseline": "4.7", "port-version": 0}, "restclient-cpp": {"baseline": "0.5.2", "port-version": 0}, "restinio": {"baseline": "0.6.13", "port-version": 0}, "rhash": {"baseline": "1.4.0", "port-version": 0}, "riffcpp": {"baseline": "2.2.4", "port-version": 0}, "ring-span-lite": {"baseline": "0.3.0", "port-version": 0}, "roaring": {"baseline": "2019-03-05-2", "port-version": 0}, "robin-hood-hashing": {"baseline": "3.9.1", "port-version": 0}, "robin-map": {"baseline": "0.6.3", "port-version": 0}, "rocksdb": {"baseline": "6.14.6", "port-version": 0}, "rpclib": {"baseline": "2.2.1", "port-version": 2}, "rply": {"baseline": "1.1.4", "port-version": 0}, "rs-core-lib": {"baseline": "2020-09-14", "port-version": 0}, "rsocket": {"baseline": "2020.05.04.00-1", "port-version": 0}, "rtabmap": {"baseline": "0.20.3", "port-version": 1}, "rtaudio": {"baseline": "5.1.0", "port-version": 0}, "rtlsdr": {"baseline": "2020-04-16-1", "port-version": 0}, "rtmidi": {"baseline": "4.0.0", "port-version": 2}, "rttr": {"baseline": "0.9.6-2", "port-version": 0}, "rxcpp": {"baseline": "4.1.0-1", "port-version": 0}, "rxqt": {"baseline": "bb2138c", "port-version": 0}, "rxspencer": {"baseline": "2020-01-12", "port-version": 0}, "ryml": {"baseline": "2020-04-12", "port-version": 0}, "ryu": {"baseline": "2.0-2", "port-version": 0}, "safeint": {"baseline": "3.24", "port-version": 0}, "sail": {"baseline": "0.9.0-pre11", "port-version": 0}, "sais": {"baseline": "2.4.1-1", "port-version": 0}, "sajson": {"baseline": "2018-09-21", "port-version": 0}, "scintilla": {"baseline": "4.4.5", "port-version": 0}, "sciter": {"baseline": "4.4.3.20", "port-version": 0}, "scnlib": {"baseline": "0.3", "port-version": 0}, "scylla-wrapper": {"baseline": "2018-08-26-16e6f435", "port-version": 0}, "sdformat10": {"baseline": "10.0.0", "port-version": 0}, "sdformat6": {"baseline": "6.2.0-1", "port-version": 0}, "sdformat9": {"baseline": "9.2.0-1", "port-version": 0}, "sdl1": {"baseline": "1.2.15", "port-version": 13}, "sdl1-net": {"baseline": "1.2.8-3", "port-version": 0}, "sdl2": {"baseline": "2.0.14", "port-version": 0}, "sdl2-gfx": {"baseline": "1.0.4", "port-version": 7}, "sdl2-image": {"baseline": "2.0.5", "port-version": 1}, "sdl2-mixer": {"baseline": "2.0.4", "port-version": 10}, "sdl2-net": {"baseline": "2.0.1-8", "port-version": 0}, "sdl2-ttf": {"baseline": "2.0.15-3", "port-version": 0}, "sdl2pp": {"baseline": "0.16.1", "port-version": 0}, "seal": {"baseline": "3.6.0", "port-version": 0}, "secp256k1": {"baseline": "2017-19-10", "port-version": 3}, "selene": {"baseline": "0.3.1", "port-version": 3}, "sentencepiece": {"baseline": "v0.1.82", "port-version": 0}, "sentry-native": {"baseline": "0.4.4", "port-version": 1}, "septag-sx": {"baseline": "2019-05-07-2", "port-version": 0}, "seqan": {"baseline": "2.4.0-1", "port-version": 0}, "serd": {"baseline": "0.30.4", "port-version": 0}, "sf2cute": {"baseline": "0.2.0-1", "port-version": 0}, "sfgui": {"baseline": "0.4.0-3", "port-version": 0}, "sfml": {"baseline": "2.5.1", "port-version": 9}, "sfsexp": {"baseline": "1.3", "port-version": 0}, "shaderc": {"baseline": "2019-06-26-1", "port-version": 0}, "shaderwriter": {"baseline": "2020-10-15", "port-version": 0}, "shapelib": {"baseline": "1.5.0", "port-version": 0}, "shiva": {"baseline": "1.0-3", "port-version": 0}, "shiva-sfml": {"baseline": "1.0-1", "port-version": 0}, "shogun": {"baseline": "6.1.4", "port-version": 4}, "signalrclient": {"baseline": "1.0.0-beta1-9", "port-version": 0}, "sigslot": {"baseline": "1.0.0-3", "port-version": 0}, "simage": {"baseline": "1.8.0", "port-version": 0}, "simde": {"baseline": "0.7.0", "port-version": 0}, "simdjson": {"baseline": "0.7.1", "port-version": 0}, "simple-fft": {"baseline": "2020-06-14", "port-version": 0}, "simpleini": {"baseline": "2018-08-31-4", "port-version": 0}, "skia": {"baseline": "2020-05-18", "port-version": 4}, "skyr-url": {"baseline": "1.13.0", "port-version": 0}, "slikenet": {"baseline": "2019-10-22-2", "port-version": 0}, "sltbench": {"baseline": "2.4.0", "port-version": 0}, "smpeg2": {"baseline": "2.0.0-6", "port-version": 0}, "snappy": {"baseline": "1.1.8", "port-version": 0}, "sndfile": {"baseline": "0", "port-version": 0}, "snowhouse": {"baseline": "5.0.0", "port-version": 0}, "so5extra": {"baseline": "1.4.1", "port-version": 0}, "sobjectizer": {"baseline": "5.7.2.1", "port-version": 0}, "soci": {"baseline": "4.0.1", "port-version": 0}, "socket-io-client": {"baseline": "1.6.1-1", "port-version": 0}, "sockpp": {"baseline": "0.7", "port-version": 0}, "soem": {"baseline": "1.4.0", "port-version": 0}, "soil": {"baseline": "2008.07.07-2", "port-version": 0}, "soil2": {"baseline": "release-1.11-1", "port-version": 0}, "sokol": {"baseline": "2019-09-09", "port-version": 0}, "sol2": {"baseline": "3.2.2", "port-version": 0}, "solid3": {"baseline": "3.5.8", "port-version": 0}, "sophus": {"baseline": "1.0.0-6", "port-version": 0}, "soqt": {"baseline": "1.6.0", "port-version": 2}, "sord": {"baseline": "0.16.4", "port-version": 0}, "soundtouch": {"baseline": "2.0.0-6", "port-version": 0}, "soxr": {"baseline": "0.1.3", "port-version": 3}, "spaceland": {"baseline": "7.8.2-4", "port-version": 0}, "span-lite": {"baseline": "0.9.0", "port-version": 0}, "sparsehash": {"baseline": "2.0.3", "port-version": 0}, "sparsepp": {"baseline": "1.22-1", "port-version": 0}, "spatialite-tools": {"baseline": "5.0.0", "port-version": 0}, "spdk": {"baseline": "19.01.1", "port-version": 1}, "spdk-dpdk": {"baseline": "20181124", "port-version": 0}, "spdk-ipsec": {"baseline": "20180711", "port-version": 0}, "spdk-isal": {"baseline": "20181006", "port-version": 0}, "spdlog": {"baseline": "1.8.0", "port-version": 1}, "spectra": {"baseline": "0.9.0", "port-version": 0}, "speex": {"baseline": "1.2.0", "port-version": 7}, "speexdsp": {"baseline": "1.2.0", "port-version": 5}, "spirit-po": {"baseline": "1.1.2-1", "port-version": 0}, "spirv-cross": {"baseline": "2020-02-26", "port-version": 0}, "spirv-headers": {"baseline": "1.5.1", "port-version": 0}, "spirv-tools": {"baseline": "2020.1-1", "port-version": 0}, "sprout": {"baseline": "2019-06-20", "port-version": 0}, "spscqueue": {"baseline": "1.0", "port-version": 0}, "sqlcipher": {"baseline": "4.4.1", "port-version": 0}, "sqlite-modern-cpp": {"baseline": "3.2-936cd0c8", "port-version": 0}, "sqlite-orm": {"baseline": "1.6", "port-version": 0}, "sqlite3": {"baseline": "3.33.0", "port-version": 0}, "sqlitecpp": {"baseline": "3.1.1", "port-version": 1}, "sqlpp11": {"baseline": "0.60", "port-version": 0}, "sqlpp11-connector-mysql": {"baseline": "0.29-1", "port-version": 0}, "sqlpp11-connector-sqlite3": {"baseline": "0.30", "port-version": 0}, "sratom": {"baseline": "0.6.4", "port-version": 0}, "status-value-lite": {"baseline": "1.1.0", "port-version": 0}, "stb": {"baseline": "2020-09-14", "port-version": 0}, "stlab": {"baseline": "1.5.2-1", "port-version": 0}, "stormlib": {"baseline": "2019-05-10", "port-version": 2}, "strict-variant": {"baseline": "0.5", "port-version": 0}, "string-theory": {"baseline": "3.4", "port-version": 0}, "string-view-lite": {"baseline": "1.3.0", "port-version": 0}, "strtk": {"baseline": "2020-09-14", "port-version": 0}, "stx": {"baseline": "1.0.1", "port-version": 0}, "stxxl": {"baseline": "2018-11-15-2", "port-version": 0}, "suitesparse": {"baseline": "5.8.0", "port-version": 0}, "sundials": {"baseline": "5.5.0", "port-version": 0}, "superlu": {"baseline": "2020-01-07", "port-version": 2}, "symengine": {"baseline": "2020-05-25", "port-version": 0}, "systemc": {"baseline": "2.3.3-4", "port-version": 0}, "szip": {"baseline": "2.1.1-6", "port-version": 0}, "tabulate": {"baseline": "2019-01-06", "port-version": 0}, "tacopie": {"baseline": "3.2.0-2", "port-version": 0}, "taglib": {"baseline": "1.11.1-20190531", "port-version": 0}, "taocpp-json": {"baseline": "2020-09-14", "port-version": 0}, "tap-windows6": {"baseline": "9.21.2-0e30f5c", "port-version": 0}, "taskflow": {"baseline": "2.7.0", "port-version": 0}, "tbb": {"baseline": "2020_U3", "port-version": 3}, "tcl": {"baseline": "core-9-0-a1", "port-version": 1}, "tclap": {"baseline": "1.2.2-3", "port-version": 0}, "teemo": {"baseline": "2.1", "port-version": 0}, "telnetpp": {"baseline": "2.1.2", "port-version": 0}, "tensorflow": {"baseline": "2.3.1", "port-version": 1}, "tensorflow-cc": {"baseline": "2.3.1", "port-version": 2}, "tensorflow-common": {"baseline": "2.3.1", "port-version": 1}, "termcolor": {"baseline": "1.0.1", "port-version": 0}, "tesseract": {"baseline": "4.1.1", "port-version": 5}, "tfhe": {"baseline": "1.0.1-1", "port-version": 0}, "tgbot-cpp": {"baseline": "1.2.1", "port-version": 0}, "tgc": {"baseline": "2019-08-11-1", "port-version": 0}, "tgui": {"baseline": "0.8.8", "port-version": 0}, "theia": {"baseline": "0.8", "port-version": 3}, "think-cell-range": {"baseline": "498839d-1", "port-version": 0}, "thor": {"baseline": "2.0-3", "port-version": 0}, "threadpool": {"baseline": "0.2.5", "port-version": 1}, "thrift": {"baseline": "0.13.0", "port-version": 0}, "tidy-html5": {"baseline": "5.7.28-2", "port-version": 0}, "tiff": {"baseline": "4.1.0", "port-version": 0}, "tinkerforge": {"baseline": "2.1.25", "port-version": 0}, "tiny-aes-c": {"baseline": "2019-07-31", "port-version": 0}, "tiny-bignum-c": {"baseline": "2019-07-31", "port-version": 0}, "tiny-dnn": {"baseline": "2018-10-25", "port-version": 0}, "tiny-process-library": {"baseline": "2.0.4", "port-version": 0}, "tiny-regex-c": {"baseline": "2019-07-31", "port-version": 0}, "tinycthread": {"baseline": "2019-08-06", "port-version": 0}, "tinydir": {"baseline": "1.2.4", "port-version": 0}, "tinyexif": {"baseline": "1.0.2-6", "port-version": 0}, "tinyexpr": {"baseline": "2020-09-25", "port-version": 0}, "tinyexr": {"baseline": "2020-03-15", "port-version": 0}, "tinyfiledialogs": {"baseline": "3.6.3", "port-version": 0}, "tinygltf": {"baseline": "2020-07-28", "port-version": 0}, "tinynpy": {"baseline": "1.0.0-3", "port-version": 0}, "tinyobjloader": {"baseline": "2.0.0-rc2", "port-version": 0}, "tinyply": {"baseline": "2020-05-22", "port-version": 0}, "tinyspline": {"baseline": "0.2.0-3", "port-version": 0}, "tinythread": {"baseline": "1.1-3", "port-version": 0}, "tinytoml": {"baseline": "20180219-1", "port-version": 0}, "tinyutf8": {"baseline": "4.0.2", "port-version": 0}, "tinyxml": {"baseline": "2.6.2-7", "port-version": 0}, "tinyxml2": {"baseline": "8.0.0-1", "port-version": 0}, "tl-expected": {"baseline": "1.0.0-1", "port-version": 0}, "tl-function-ref": {"baseline": "1.0.0-1", "port-version": 0}, "tl-optional": {"baseline": "1.0.0-1", "port-version": 0}, "tlx": {"baseline": "0.5.20191212", "port-version": 0}, "tmx": {"baseline": "1.1.0", "port-version": 0}, "tmxlite": {"baseline": "2019-03-05", "port-version": 0}, "tmxparser": {"baseline": "2.1.0-4", "port-version": 0}, "toml11": {"baseline": "3.5.0", "port-version": 1}, "tomlplusplus": {"baseline": "2.3.0", "port-version": 0}, "tool-meson": {"baseline": "0.56.02", "port-version": 0}, "torch-th": {"baseline": "2019-04-19-2", "port-version": 0}, "trantor": {"baseline": "1.1.1", "port-version": 0}, "tre": {"baseline": "0.8.0-1", "port-version": 0}, "treehopper": {"baseline": "1.11.3-4", "port-version": 0}, "triangle": {"baseline": "1.6", "port-version": 0}, "trompeloeil": {"baseline": "38", "port-version": 0}, "tsl-hopscotch-map": {"baseline": "2.3.0", "port-version": 0}, "tsl-ordered-map": {"baseline": "1.0.0", "port-version": 0}, "tsl-sparse-map": {"baseline": "0.6.2", "port-version": 0}, "turbobase64": {"baseline": "2020-01-12", "port-version": 0}, "tweeny": {"baseline": "3.0", "port-version": 0}, "type-lite": {"baseline": "0.1.0", "port-version": 0}, "type-safe": {"baseline": "0.2.1", "port-version": 0}, "uchardet": {"baseline": "2020-04-26", "port-version": 0}, "umock-c": {"baseline": "2020-06-17-1", "port-version": 0}, "unicorn": {"baseline": "2020-09-14", "port-version": 0}, "unicorn-lib": {"baseline": "2020-03-02", "port-version": 0}, "units": {"baseline": "2.3.1", "port-version": 0}, "unittest-cpp": {"baseline": "2.0.0-1", "port-version": 0}, "unixodbc": {"baseline": "2.3.7", "port-version": 2}, "unqlite": {"baseline": "1.1.9", "port-version": 0}, "unrar": {"baseline": "5.8.1", "port-version": 0}, "upb": {"baseline": "2020-08-19", "port-version": 0}, "urdfdom": {"baseline": "1.0.4", "port-version": 3}, "urdfdom-headers": {"baseline": "1.0.5", "port-version": 1}, "uriparser": {"baseline": "0.9.4", "port-version": 0}, "usbmuxd": {"baseline": "1.2.235", "port-version": 0}, "usd": {"baseline": "20.08", "port-version": 0}, "usockets": {"baseline": "0.6.0", "port-version": 1}, "usrsctp": {"baseline": "0db9691", "port-version": 0}, "utf8h": {"baseline": "2020-06-14", "port-version": 0}, "utf8proc": {"baseline": "2.5.0", "port-version": 0}, "utfcpp": {"baseline": "3.1.2", "port-version": 1}, "utfz": {"baseline": "1.2-1", "port-version": 0}, "uthenticode": {"baseline": "1.0.4", "port-version": 0}, "uvatlas": {"baseline": "jan2021", "port-version": 0}, "uvw": {"baseline": "2.7.0", "port-version": 0}, "uwebsockets": {"baseline": "18.13.0", "port-version": 0}, "v-hacd": {"baseline": "3.2.0", "port-version": 1}, "v8": {"baseline": "8.6.395.17", "port-version": 0}, "valijson": {"baseline": "2018-11-17-1", "port-version": 0}, "value-ptr-lite": {"baseline": "0.2.1", "port-version": 0}, "variant-lite": {"baseline": "1.2.2", "port-version": 0}, "vc": {"baseline": "1.4.1", "port-version": 0}, "vcglib": {"baseline": "1.0.1", "port-version": 0}, "vcpkg-gfortran": {"baseline": "3", "port-version": 0}, "vectorclass": {"baseline": "2.00.01", "port-version": 0}, "visit-struct": {"baseline": "1.0-1", "port-version": 0}, "vlfeat": {"baseline": "2020-07-10", "port-version": 0}, "vlpp": {"baseline": "0.11.0.0", "port-version": 0}, "volk": {"baseline": "2019-09-26", "port-version": 0}, "vs-yasm": {"baseline": "0.5.0", "port-version": 1}, "vtk": {"baseline": "9.0.1", "port-version": 3}, "vtk-dicom": {"baseline": "0.8.12-1", "port-version": 0}, "vtk-m": {"baseline": "1.5.0", "port-version": 1}, "vulkan": {"baseline": "1.1.82.1-1", "port-version": 0}, "vulkan-headers": {"baseline": "1.2.157", "port-version": 0}, "vulkan-hpp": {"baseline": "2019-05-11-1", "port-version": 0}, "vulkan-memory-allocator": {"baseline": "2.3.0", "port-version": 0}, "vxl": {"baseline": "2.0.2", "port-version": 2}, "wampcc": {"baseline": "2019-09-04", "port-version": 0}, "wangle": {"baseline": "2020.10.19.00", "port-version": 1}, "wavelib": {"baseline": "2020-05-29", "port-version": 0}, "wavpack": {"baseline": "5.3.0", "port-version": 0}, "websocketpp": {"baseline": "0.8.2", "port-version": 0}, "wepoll": {"baseline": "1.5.8", "port-version": 1}, "wg21-sg14": {"baseline": "2019-08-13", "port-version": 0}, "wil": {"baseline": "2020-05-19", "port-version": 1}, "wildmidi": {"baseline": "0.4.3-1", "port-version": 0}, "wincrypt": {"baseline": "0.0-2", "port-version": 0}, "winpcap": {"baseline": "4.1.3", "port-version": 4}, "winreg": {"baseline": "3.1.0", "port-version": 0}, "winsock2": {"baseline": "0.0-2", "port-version": 0}, "wintoast": {"baseline": "1.2.0", "port-version": 0}, "woff2": {"baseline": "1.0.2", "port-version": 0}, "wordnet": {"baseline": "3.0", "port-version": 0}, "wpilib": {"baseline": "2020.3.2", "port-version": 0}, "wren": {"baseline": "2019-07-01", "port-version": 0}, "wt": {"baseline": "4.5.0", "port-version": 0}, "wtl": {"baseline": "10.0.10320", "port-version": 0}, "wxchartdir": {"baseline": "1.0.0", "port-version": 0}, "wxwidgets": {"baseline": "3.1.4", "port-version": 3}, "x-plane": {"baseline": "3.0.3", "port-version": 0}, "x264": {"baseline": "157-303c484ec828ed0", "port-version": 14}, "x265": {"baseline": "3.4", "port-version": 2}, "xalan-c": {"baseline": "1.11-12", "port-version": 0}, "xbyak": {"baseline": "5.991", "port-version": 0}, "xerces-c": {"baseline": "3.2.3-1", "port-version": 0}, "xeus": {"baseline": "0.24.3", "port-version": 0}, "xframe": {"baseline": "0.3.0", "port-version": 0}, "xlnt": {"baseline": "1.5.0", "port-version": 0}, "xmlsec": {"baseline": "1.2.31", "port-version": 0}, "xmsh": {"baseline": "0.5.2-1", "port-version": 0}, "xorstr": {"baseline": "2020-02-11", "port-version": 0}, "xproperty": {"baseline": "0.8.1", "port-version": 0}, "xsimd": {"baseline": "7.4.9", "port-version": 0}, "xtensor": {"baseline": "0.21.9", "port-version": 0}, "xtensor-blas": {"baseline": "0.17.2", "port-version": 0}, "xtensor-fftw": {"baseline": "2019-11-30", "port-version": 0}, "xtensor-io": {"baseline": "0.9.0", "port-version": 1}, "xtl": {"baseline": "0.6.21", "port-version": 0}, "xxhash": {"baseline": "0.8.0", "port-version": 1}, "yajl": {"baseline": "2.1.0-1", "port-version": 0}, "yaml-cpp": {"baseline": "0.6.3", "port-version": 0}, "yara": {"baseline": "4.0.2", "port-version": 0}, "yas": {"baseline": "7.0.5", "port-version": 0}, "yasm": {"baseline": "1.3.0", "port-version": 0}, "yasm-tool": {"baseline": "2020-10-12", "port-version": 0}, "yasm-tool-helper": {"baseline": "2020-10-12", "port-version": 0}, "yato": {"baseline": "1.0-2", "port-version": 0}, "yoga": {"baseline": "1.18.0-1", "port-version": 0}, "z3": {"baseline": "4.8.9", "port-version": 0}, "z85": {"baseline": "1.0", "port-version": 0}, "zeromq": {"baseline": "2019-09-20", "port-version": 2}, "zfp": {"baseline": "0.5.5-2", "port-version": 0}, "zkpp": {"baseline": "0.2.3", "port-version": 0}, "zlib": {"baseline": "1.2.11", "port-version": 9}, "zookeeper": {"baseline": "3.5.5-1", "port-version": 0}, "zopfli": {"baseline": "1.0.3", "port-version": 0}, "zserge-webview": {"baseline": "2019-04-27-2", "port-version": 0}, "zstd": {"baseline": "1.4.5", "port-version": 1}, "zstr": {"baseline": "1.0.4", "port-version": 0}, "zxing-cpp": {"baseline": "3.3.3", "port-version": 8}, "zydis": {"baseline": "3.1.0-1", "port-version": 0}, "zyre": {"baseline": "2019-07-07-1", "port-version": 0}, "zziplib": {"baseline": "0.13.71", "port-version": 1}}} \ No newline at end of file diff --git a/port_versions/c-/c-ares.json b/port_versions/c-/c-ares.json new file mode 100644 index 00000000000000..d3fbc142ed8025 --- /dev/null +++ b/port_versions/c-/c-ares.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "a35b0a23f91ec79cecdcb83c82840f7305dbd709", + "version-string": "1.17.1", + "port-version": 0 + }, + { + "git-tree": "ae086dbb7d9fb7e728b7444bdd2a709fd84c16e0", + "version-string": "2019-5-2-1", + "port-version": 0 + }, + { + "git-tree": "355c7fdfd00cc9c97853fdef147e23a811d92c6c", + "version-string": "2019-5-2", + "port-version": 0 + }, + { + "git-tree": "53380b1119aabe24897834f871d94f19c7ddc183", + "version-string": "cares-1_15_0", + "port-version": 0 + }, + { + "git-tree": "3e3bde543c25991f1e106ade2ce7bc07c33ca81a", + "version-string": "cares-1_14_0", + "port-version": 0 + }, + { + "git-tree": "2ae21dbbdedbdae911e2ebeab2968f2c314f7e82", + "version-string": "1.13.0-1", + "port-version": 0 + }, + { + "git-tree": "3ab176274fcae1450a660d4b4fc6c34300ba115e", + "version-string": "1.13.0", + "port-version": 0 + }, + { + "git-tree": "ee00b66606f9f4ddc2f6fcef64c180abcc14218d", + "version-string": "1.12.1-dev-40eb41f-1", + "port-version": 0 + }, + { + "git-tree": "43771efaa165dcb3da7acaaa0c44dff81bca629d", + "version-string": "1.12.1-dev-40eb41f", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/c4core.json b/port_versions/c-/c4core.json new file mode 100644 index 00000000000000..71fe2c8c7dfe7b --- /dev/null +++ b/port_versions/c-/c4core.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bd4565e8ab55bc5e098a1750fa5ff0bc4406ca9b", + "version-string": "2020-04-12", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/caf.json b/port_versions/c-/caf.json new file mode 100644 index 00000000000000..4602eadf497975 --- /dev/null +++ b/port_versions/c-/caf.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "1928bc65900b86623983ce9af14ae7c166f2f277", + "version-string": "0.17.6", + "port-version": 1 + }, + { + "git-tree": "3a47471cd39542757f4365b3dc95fb3701ada880", + "version-string": "0.17.6", + "port-version": 0 + }, + { + "git-tree": "6310328f5a309491fbfb92a752b492a0e4db434d", + "version-string": "0.17.3", + "port-version": 0 + }, + { + "git-tree": "97ffb178c663a65fcfd7464bf569bf3dba6809d1", + "version-string": "0.17.2", + "port-version": 0 + }, + { + "git-tree": "5bbdf0cb436aa414d79dcf07e359f7158bffa303", + "version-string": "0.16.3", + "port-version": 0 + }, + { + "git-tree": "df584a465850084b5dbe6702cfdfdb2b92ac7753", + "version-string": "0.16.2-1", + "port-version": 0 + }, + { + "git-tree": "1ee31b1a613901392482be46a4cb33880af0941a", + "version-string": "0.16.2", + "port-version": 0 + }, + { + "git-tree": "a3e94ee25f14290e8b25b73571820f35290f15dc", + "version-string": "0.15.7", + "port-version": 0 + }, + { + "git-tree": "00709c0afd3c3fa6389a12cb9ee34cc86c664b32", + "version-string": "0.15.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/caffe2.json b/port_versions/c-/caffe2.json new file mode 100644 index 00000000000000..bcf68a4876830c --- /dev/null +++ b/port_versions/c-/caffe2.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "ffdaf1c10102d0ed5eb1c558420ade4ec6adb309", + "version-string": "0.8.1-3", + "port-version": 0 + }, + { + "git-tree": "dcabbd8cab9c09c7ec5b79a05e1947bd88a69de0", + "version-string": "0.8.1-2", + "port-version": 0 + }, + { + "git-tree": "30fc09ba074c965bd000435be9664557c1d98514", + "version-string": "0.8.1-1", + "port-version": 0 + }, + { + "git-tree": "8aed8b8f420422cedbb5a1815b32def7b9770868", + "version-string": "0.8.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cairo.json b/port_versions/c-/cairo.json new file mode 100644 index 00000000000000..aefdf577b92b33 --- /dev/null +++ b/port_versions/c-/cairo.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "b3a1d73d5c8c18a8c6512385b59d40719f963c8c", + "version-string": "1.16.0", + "port-version": 8 + }, + { + "git-tree": "a652fb78c5f52b49620a1419f4901a59a4bbc04a", + "version-string": "1.16.0", + "port-version": 7 + }, + { + "git-tree": "c5b328e93ced121254a822e15448ae839a60078f", + "version-string": "1.16.0-6", + "port-version": 0 + }, + { + "git-tree": "ca028fe074a13ed1d58594900d43bddfd9115422", + "version-string": "1.16.0-5", + "port-version": 0 + }, + { + "git-tree": "3eaf304157d3ab9b295039bbe0c358fc26bb4889", + "version-string": "1.16.0-4", + "port-version": 0 + }, + { + "git-tree": "5958c725d44a3e639e7ebde832a4acbcd4829af7", + "version-string": "1.16.0-3", + "port-version": 0 + }, + { + "git-tree": "52c8160d526b5e3d938396872f0b14ad4916581a", + "version-string": "1.16.0-2", + "port-version": 0 + }, + { + "git-tree": "6ff3d42bca307ba305e37ba08baccb43f599c8ec", + "version-string": "1.16.0-1", + "port-version": 0 + }, + { + "git-tree": "b8dcde063802ba0d8e22ef7bda62cdae97c00c9d", + "version-string": "1.16.0", + "port-version": 0 + }, + { + "git-tree": "6b85d387914d7755adc34dfbfe446d024c49a1b4", + "version-string": "1.15.8-5", + "port-version": 0 + }, + { + "git-tree": "56f5c938bec84bd5fe03f580a07354a0f64a15b5", + "version-string": "1.15.8-4", + "port-version": 0 + }, + { + "git-tree": "8708ab4c1978ac895cab43d2ca7ab942e29770fb", + "version-string": "1.15.8-3", + "port-version": 0 + }, + { + "git-tree": "e1d53a1d015778171e9b9adba938bb1a6343a39c", + "version-string": "1.15.8-2", + "port-version": 0 + }, + { + "git-tree": "1a100e45de4853019289d2be58c1c89beb8cae24", + "version-string": "1.15.8-1", + "port-version": 0 + }, + { + "git-tree": "7d02d3a980f099f536abd19ca2f82a048400e540", + "version-string": "1.15.8", + "port-version": 0 + }, + { + "git-tree": "75d0521512675f85e88ff13900e2f514850cff58", + "version-string": "1.15.6", + "port-version": 0 + }, + { + "git-tree": "a71fbe017034ff998867feaeb697082a04c3aab5", + "version-string": "1.15.4-3", + "port-version": 0 + }, + { + "git-tree": "75b97288df14ae263a1cfe05e6f05fc80cf67000", + "version-string": "1.15.4-2", + "port-version": 0 + }, + { + "git-tree": "0244d36ad3428139fbacbabc36629f960c5862b8", + "version-string": "1.15.4-1", + "port-version": 0 + }, + { + "git-tree": "e04a8fe2b70ca6e266c77631a2eee5c1300fddd7", + "version-string": "1.15.4", + "port-version": 0 + }, + { + "git-tree": "fd9154d1e67fa788702b3cc2e55515cb6210c11a", + "version-string": "1.14.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cairomm.json b/port_versions/c-/cairomm.json new file mode 100644 index 00000000000000..0e8797f14846c2 --- /dev/null +++ b/port_versions/c-/cairomm.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "0dce5120b52866ee6e0b485081389f9ea9679fb4", + "version-string": "1.15.3", + "port-version": 5 + }, + { + "git-tree": "e7260551be637784abc3768868d6286f2052ae38", + "version-string": "1.15.3-4", + "port-version": 0 + }, + { + "git-tree": "59e5fb3c1f885b6b21d04ce41f157c02bbe8b9d1", + "version-string": "1.15.3-3", + "port-version": 0 + }, + { + "git-tree": "58b22b6d2c30d63d1ff744f5bb902435a4608a8f", + "version-string": "1.15.3-2", + "port-version": 0 + }, + { + "git-tree": "903a0d94dc27e12a6d066b3e3f121dbf6fb5affa", + "version-string": "1.15.3-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/camport3.json b/port_versions/c-/camport3.json new file mode 100644 index 00000000000000..6fc79b2fc14172 --- /dev/null +++ b/port_versions/c-/camport3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "05713425b9fc380bcb6f2f016032e6fb1c8fc0b2", + "version-string": "1.5.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/capnproto.json b/port_versions/c-/capnproto.json new file mode 100644 index 00000000000000..6c507d9db15c85 --- /dev/null +++ b/port_versions/c-/capnproto.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "5fcc22513f8ac440cd0d056c76ae35bcef96c787", + "version-string": "0.8.0", + "port-version": 1 + }, + { + "git-tree": "2b4a5558ce6b709f99c149a7335c28eaa4823569", + "version-string": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "397e759d6cf8199c95a649ea33a92d1b8193a576", + "version-string": "0.7.0-3", + "port-version": 0 + }, + { + "git-tree": "6078d2a885b5b7702da176e958e711bd009042ad", + "version-string": "0.7.0-2", + "port-version": 0 + }, + { + "git-tree": "7f7d19e6920cdbdb82a41285cfa9cf427eec1c3d", + "version-string": "0.7.0-1", + "port-version": 0 + }, + { + "git-tree": "955b67bb45349a0c2c2a34697d95e7585742514c", + "version-string": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/capstone.json b/port_versions/c-/capstone.json new file mode 100644 index 00000000000000..a74ac9b9255393 --- /dev/null +++ b/port_versions/c-/capstone.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "7c919b056af0b624766a625f1de7847f97262d92", + "version-string": "4.0.2", + "port-version": 1 + }, + { + "git-tree": "51b67182eea9570f020b2bff552935491f88c5cc", + "version-string": "4.0.2", + "port-version": 0 + }, + { + "git-tree": "eb04e9d160890416135df17b8ac65b011ef38103", + "version-string": "4.0.1-120373dc", + "port-version": 0 + }, + { + "git-tree": "916b15afacc560a726f4dcfa5c8bcddb2b1116f2", + "version-string": "3.0.5-rc3", + "port-version": 0 + }, + { + "git-tree": "a14312793849bbe5d40a122fc52c44be0790e381", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cartographer.json b/port_versions/c-/cartographer.json new file mode 100644 index 00000000000000..71eb9875c12507 --- /dev/null +++ b/port_versions/c-/cartographer.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "1bd9454fd218a1755ab651e97769f69b2d2fc315", + "version-string": "1.0.0-3", + "port-version": 0 + }, + { + "git-tree": "045ef786b9d3a2d5d9f1096f118cf6e39ea08c79", + "version-string": "1.0.0-2", + "port-version": 0 + }, + { + "git-tree": "0af6f1b35db62fd52bd0695a03ec69679ce2fb80", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "473af71f3b2014e34d957eede82178f3ae6272a5", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "4706465acae9a157a820b098c357712a8d098545", + "version-string": "0.3.0-6", + "port-version": 0 + }, + { + "git-tree": "cb846a419ab42b35851532b4f2d2b637ea9f0d86", + "version-string": "0.3.0-5", + "port-version": 0 + }, + { + "git-tree": "c3e824a15cc586e34d76eca9f6f84f24c924a67c", + "version-string": "0.3.0-4", + "port-version": 0 + }, + { + "git-tree": "8ae50f8349189772fd4acf8c68125634aaffbe6e", + "version-string": "0.3.0-3", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/casclib.json b/port_versions/c-/casclib.json new file mode 100644 index 00000000000000..d617c969131429 --- /dev/null +++ b/port_versions/c-/casclib.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "dcebf3fda8b82d3576cfd89cb27f55da9149d9e9", + "version-string": "1.50b-1", + "port-version": 0 + }, + { + "git-tree": "65be0df88dd2dbba0d98e6ceff98358914b1426a", + "version-string": "1.50-1", + "port-version": 0 + }, + { + "git-tree": "d3ac14e638afc3485a503eaa902c8cac14850c6a", + "version-string": "1.50", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/catch-classic.json b/port_versions/c-/catch-classic.json new file mode 100644 index 00000000000000..c818b0fac1b748 --- /dev/null +++ b/port_versions/c-/catch-classic.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "21f00f9e0bf6d9338ca58abc3e761db376883285", + "version-string": "1.12.2", + "port-version": 0 + }, + { + "git-tree": "fa68344904e679040abafe8bdee9f06f96ddf955", + "version-string": "1.12.1", + "port-version": 0 + }, + { + "git-tree": "dc2687c95785c76a55314e74d79886c22eba4067", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "7c6cd494c2c7c00a1a7507502fcf8c2924bdb127", + "version-string": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "92788e8410dde4706b4b725d47852a7e8f199eb1", + "version-string": "1.10.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/catch.json b/port_versions/c-/catch.json new file mode 100644 index 00000000000000..c6852fa1a0aac3 --- /dev/null +++ b/port_versions/c-/catch.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "1847097b1369a19c41e695e809a91923d95efd4d", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "b08f20188fcfc3e5c5d30d72f4a75c03dfca110b", + "version-string": "2.0.1-1", + "port-version": 0 + }, + { + "git-tree": "3a8ff2af44bbc79323a5278cd2100b5933290f6b", + "version-string": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "1bc0b237d321f03d1d059c1588f42860ebd409f2", + "version-string": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "e3cfb2ebc46897c8cdf3b6f2abf2bc71cc07227d", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "a6db724e345b4d19f6ab625c723c4f441d2b353c", + "version-string": "1.9.7", + "port-version": 0 + }, + { + "git-tree": "d1fc377c44fe261263361527cb80987a33c523f5", + "version-string": "1.9.6", + "port-version": 0 + }, + { + "git-tree": "b3cdc9bb97ead24ae0c75cc63d5819ff7895ee3e", + "version-string": "1.9.5-1", + "port-version": 0 + }, + { + "git-tree": "ee1709bb21ed940740a9b3ae837226fc71765103", + "version-string": "1.9.5", + "port-version": 0 + }, + { + "git-tree": "b8bde75a27102c182feb7d8e3443d2b2f4e747ff", + "version-string": "1.9.4", + "port-version": 0 + }, + { + "git-tree": "af5a5bf586f3b3a2173aac0660d8778f35242627", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "a0d3d912a1dbe700e83951f87118186e5a0cd3fd", + "version-string": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "4bd1360b247abd0d67dc3af50e73005dba9f351c", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "81335c5a51db8928df33dc42ffc8c90e7fa3af63", + "version-string": "1.5.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/catch2.json b/port_versions/c-/catch2.json new file mode 100644 index 00000000000000..fde3f307460695 --- /dev/null +++ b/port_versions/c-/catch2.json @@ -0,0 +1,134 @@ +{ + "versions": [ + { + "git-tree": "519a6fcb84ac66fdffb75f3d5555496228e43e5f", + "version-string": "2.13.1", + "port-version": 0 + }, + { + "git-tree": "3b15bdf4ada3be3818bcac4c14ed9a437393495d", + "version-string": "2.12.1", + "port-version": 0 + }, + { + "git-tree": "c23bc9d8f947cc5d30521dea008e52994c07b569", + "version-string": "2.11.3", + "port-version": 0 + }, + { + "git-tree": "af82155f661ed603bc2222173920be964063266a", + "version-string": "2.11.1", + "port-version": 0 + }, + { + "git-tree": "926e53bcc845e228d8ac5e277bea9d68ae33faa8", + "version-string": "2.11.0", + "port-version": 0 + }, + { + "git-tree": "429625df870d438e2c767734a76f4875fb5836c5", + "version-string": "2.10.1-1", + "port-version": 0 + }, + { + "git-tree": "f9cd513b2dc93059c3ab06e8c1c476ce067e07eb", + "version-string": "2.9.2", + "port-version": 0 + }, + { + "git-tree": "8a7db60e1027dc2271aaf2bd2338b438a3228da3", + "version-string": "2.9.1-1", + "port-version": 0 + }, + { + "git-tree": "6d733ce4e562f2f9b9bb41a864496be37d842609", + "version-string": "2.7.2-2", + "port-version": 0 + }, + { + "git-tree": "9470a421046617fdf9ea5f9b9bb6ef25d3dfdfcf", + "version-string": "2.7.2", + "port-version": 0 + }, + { + "git-tree": "e1d981f5b5bb4879df9b2b9fd92c5170444a6616", + "version-string": "2.7.1", + "port-version": 0 + }, + { + "git-tree": "13131c8f454c2d9f21595e72a203b8352a6cd4cb", + "version-string": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "d401ef70ec4acae9a030e0b0fee19d68ef0fe2c8", + "version-string": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "06f1dab44255e1d16a1631da9ac8144158f8a5bd", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "a8a00251638f77f165384d7a365e153d8df82934", + "version-string": "2.4.2", + "port-version": 0 + }, + { + "git-tree": "7a63deae50cd91bffd011bef9b93099dceadc32f", + "version-string": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "f71dd3372ed04416c19ae68cf1cb76c1a103edcb", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "e674f9a0c8b098b2152fed9f7647a58051ed7a84", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "bcdba32718c44cab06591beb131873375aef80e2", + "version-string": "2.2.3", + "port-version": 0 + }, + { + "git-tree": "e4060ca446e5115b4fcf829a0e7d17a5270bbe61", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "be0f043cab6bdffccfa4ccffe9da70378fdce0e3", + "version-string": "2.2.1-1", + "port-version": 0 + }, + { + "git-tree": "b4ac8a6069b1e77f307afca3351fe2af0105b521", + "version-string": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "54829ec460805d60e814db0640b195756bd41e5a", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "f34017e4212b92b3648d0708729be8e60a12d75d", + "version-string": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "4a403184b56702ad589e5eb018735628265d5cc5", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "b2a9bdc0cd72b9b42bbed2167ee30b236e7ed77a", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cccapstone.json b/port_versions/c-/cccapstone.json new file mode 100644 index 00000000000000..87c0040b6d727a --- /dev/null +++ b/port_versions/c-/cccapstone.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "20a6a52cad8fb2db9aa7b023c09ce53eb2ed5343", + "version-string": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1", + "port-version": 0 + }, + { + "git-tree": "50425b6f2870af272be9014fa545368b8040a155", + "version-string": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/ccd.json b/port_versions/c-/ccd.json new file mode 100644 index 00000000000000..da47a0a54e4562 --- /dev/null +++ b/port_versions/c-/ccd.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "c5315a631ffcea9c2a158578e73c53d8455808de", + "version-string": "2.1-4", + "port-version": 0 + }, + { + "git-tree": "f50fc4c977c7ee43dbddf3d5b8c08694843f41a7", + "version-string": "2.1-3", + "port-version": 0 + }, + { + "git-tree": "7ecb86d672441a33985f400435082f119b3b1428", + "version-string": "2.1-1", + "port-version": 0 + }, + { + "git-tree": "c6bc0a25e0b963d679e5739c5e83bf31c0a9ff9a", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "6cd15fcab18c56ab38f84446ad5d60b32bd102a1", + "version-string": "2.0.0-2", + "port-version": 0 + }, + { + "git-tree": "56bd676f18957cef95e0ffc9b454f3082c50360b", + "version-string": "2.0.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/ccfits.json b/port_versions/c-/ccfits.json new file mode 100644 index 00000000000000..a1a5ba604927f5 --- /dev/null +++ b/port_versions/c-/ccfits.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "c72b341528629e93108ce5317dd3802dc9b4ac11", + "version-string": "2.5", + "port-version": 6 + }, + { + "git-tree": "06f0bdeafc82f9dc2df1cf6e84cea717955bc173", + "version-string": "2.5-5", + "port-version": 0 + }, + { + "git-tree": "dc89a93f5fb8aff0da1d456d2e2afd56c079f9a5", + "version-string": "2.5-4", + "port-version": 0 + }, + { + "git-tree": "35befe94faaf195405bb683a87bec10ff844b187", + "version-string": "2.5-3", + "port-version": 0 + }, + { + "git-tree": "ec9558b182333a1b5b541dd6e627ca7e5e31ac4f", + "version-string": "2.5-2", + "port-version": 0 + }, + { + "git-tree": "47d10b581eb3f9b7673a54813bf5f6cd91e86611", + "version-string": "2.5-1", + "port-version": 0 + }, + { + "git-tree": "679c0db99a0448c35f7837909b0be283fe71915b", + "version-string": "2.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cctz.json b/port_versions/c-/cctz.json new file mode 100644 index 00000000000000..1d2601c1e7db7b --- /dev/null +++ b/port_versions/c-/cctz.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "8568acc72750187c3c08b29a6e273ce8508cd522", + "version-string": "2.3-2", + "port-version": 0 + }, + { + "git-tree": "e94cb87cf3b7a4aa29939cf07f6d97b7789c0edc", + "version-string": "2.3", + "port-version": 0 + }, + { + "git-tree": "660a0b23b0e9f8dbd9afddedd51a8dbbdddcc7bd", + "version-string": "2.2", + "port-version": 0 + }, + { + "git-tree": "57dbb3f749a8171a5e6c2e60da0223baa36d82d8", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "2641c2672fc767a4a8ce26aaf35385483d921f84", + "version-string": "v2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/celero.json b/port_versions/c-/celero.json new file mode 100644 index 00000000000000..16a9ece3871643 --- /dev/null +++ b/port_versions/c-/celero.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "754905c9baebd27cf1312f7054403f3e901d5d53", + "version-string": "2.6.0-1", + "port-version": 0 + }, + { + "git-tree": "64e373a8e9115c984f399afda24a437ace26b4ba", + "version-string": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "51246db8056526db6c835be4c7696ebeb3510595", + "version-string": "2.5.0-1", + "port-version": 0 + }, + { + "git-tree": "6b0d0ecb2631cfb977ee4455273cc61edd505295", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "d24ee3a6772134b4075509cb0c968112d0d4cfa5", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "6b0d0ecb2631cfb977ee4455273cc61edd505295", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "d24ee3a6772134b4075509cb0c968112d0d4cfa5", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "1828a39a6c5ac19533b15a24b0bd9de8328eff56", + "version-string": "2.3.0-1", + "port-version": 0 + }, + { + "git-tree": "257a3d0cfb2b03dcadc647145e776c1892966d79", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "890613b2325cf744c650259aabccafa0b0fdd3b6", + "version-string": "2.1.0-2", + "port-version": 0 + }, + { + "git-tree": "2848e553555ffa2cc32e17e8613511a042a212b6", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "01616c4f432067367bd0c4786e44667da33bcd81", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cello.json b/port_versions/c-/cello.json new file mode 100644 index 00000000000000..161b9021eeb142 --- /dev/null +++ b/port_versions/c-/cello.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ee7bb8fff5e2b12f7c6ae5a2d435c8ce1638e103", + "version-string": "2019-07-23", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cereal.json b/port_versions/c-/cereal.json new file mode 100644 index 00000000000000..26bdad974199f4 --- /dev/null +++ b/port_versions/c-/cereal.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "2df2d8bdb54e554795344bafe05bf0a1eaa28537", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "ecf0a70523709732832f115b4f90a1bffdc9c1f7", + "version-string": "1.2.2-2", + "port-version": 0 + }, + { + "git-tree": "1492f676a63290569dd7e834ef393d2611ca83c7", + "version-string": "1.2.2-1", + "port-version": 0 + }, + { + "git-tree": "f0f4ec8e160319af2e540f2f4b7637c636dcb9bd", + "version-string": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "23d90191ceeeef4c2687be0829eb9f5c68158e02", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/ceres.json b/port_versions/c-/ceres.json new file mode 100644 index 00000000000000..5071e44c890c37 --- /dev/null +++ b/port_versions/c-/ceres.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "216c1a351f8af9be7952bd5dfcf262a66e24c11e", + "version-string": "2.0.0", + "port-version": 2 + }, + { + "git-tree": "f2df3997629106946a1a576a773cfd08f5978643", + "version-string": "2.0.0", + "port-version": 1 + }, + { + "git-tree": "03366aab447c889feefae20c3e652283f2ac2bf4", + "version-string": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "f888f21a1b1323a866deead771a7ca520d7bfb27", + "version-string": "1.14.0", + "port-version": 10 + }, + { + "git-tree": "4efd490b4b57f087fe1ab516919568c49028f6f6", + "version-string": "1.14.0", + "port-version": 9 + }, + { + "git-tree": "5e18168bf5e9452a060112f346b59d6b5e459efa", + "version-string": "1.14.0", + "port-version": 8 + }, + { + "git-tree": "413d81210f1cfe26ac97d2a4c9817ead50e23d48", + "version-string": "1.14.0-7", + "port-version": 0 + }, + { + "git-tree": "e0f395fb4c421ae34156f43cb48a144e79f5e830", + "version-string": "1.14.0-6", + "port-version": 0 + }, + { + "git-tree": "38018a4aa3c9f1fae2f5cf509dd58d47dad69c70", + "version-string": "1.14.0-4", + "port-version": 0 + }, + { + "git-tree": "6d8d790253ac5b723b055319b859351e9bb4886c", + "version-string": "1.14.0-3", + "port-version": 0 + }, + { + "git-tree": "fabee8219a8e5d115cb1e6443b2d746bb31eab3a", + "version-string": "1.14.0-1", + "port-version": 0 + }, + { + "git-tree": "057ce8f86607d0db4794596e12e894f61ba7e398", + "version-string": "1.14.0", + "port-version": 0 + }, + { + "git-tree": "6f19269a2cd33bd29b2c8102802973536db1561c", + "version-string": "1.13.0-4", + "port-version": 0 + }, + { + "git-tree": "74d107a642327542adcd78e2d2a922b7f4f49030", + "version-string": "1.13.0-2", + "port-version": 0 + }, + { + "git-tree": "e890d1caa869b6bcea6d1647e9d13b81bb6d7a9f", + "version-string": "1.13.0-1", + "port-version": 0 + }, + { + "git-tree": "a4661d6ba00c69776b7866d8cc867888854a68fc", + "version-string": "1.13.0", + "port-version": 0 + }, + { + "git-tree": "5ebae76c072aa16a9bd7fdfe1a782488c4ffa812", + "version-string": "1.12.0-4", + "port-version": 0 + }, + { + "git-tree": "04f6cf2e6acda493f6ab2d92bfee5678b14693d4", + "version-string": "1.12.0-3", + "port-version": 0 + }, + { + "git-tree": "8b33250d2b3d20ccc7b2a78307e0ce848ae680da", + "version-string": "1.12.0-2", + "port-version": 0 + }, + { + "git-tree": "235410ef15628f65efd324216f9adf80ac32f212", + "version-string": "1.12.0-1", + "port-version": 0 + }, + { + "git-tree": "2fee66a97b3b504a740e280356e200d3c1b05896", + "version-string": "1.12.0-2", + "port-version": 0 + }, + { + "git-tree": "6fdcd6eb670d631572d444a773cf434a89644d74", + "version-string": "1.12.0-1", + "port-version": 0 + }, + { + "git-tree": "ab6ea40874887e7e65cd76c492ec554c70d1d1fb", + "version-string": "1.12.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cfitsio.json b/port_versions/c-/cfitsio.json new file mode 100644 index 00000000000000..5763f0addc3d99 --- /dev/null +++ b/port_versions/c-/cfitsio.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "cd71c6293e902542ed6cb0c146b5de5d6d7906a9", + "version-string": "3.49", + "port-version": 0 + }, + { + "git-tree": "db0ccc1ac8399ba98af2cf3e5084eaad4eb25776", + "version-string": "3.410", + "port-version": 4 + }, + { + "git-tree": "09ed62edbadc068497fcdac795e038b64fbe3dfc", + "version-string": "3.410-3", + "port-version": 0 + }, + { + "git-tree": "0adbd2e17eaa588f30df8cc135859636489ddf37", + "version-string": "3.410-2", + "port-version": 0 + }, + { + "git-tree": "fd4eded59633e176311d5f34f10f4807db2d2533", + "version-string": "3.410-1", + "port-version": 0 + }, + { + "git-tree": "a5f320eb3baee508c3a2ab3d6bc2b276a4dbe7ea", + "version-string": "3.410", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cgal.json b/port_versions/c-/cgal.json new file mode 100644 index 00000000000000..0052d73fd88654 --- /dev/null +++ b/port_versions/c-/cgal.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "1618e4fdb8df228e557d622d97e766059e02a97a", + "version-string": "5.1.1", + "port-version": 0 + }, + { + "git-tree": "1c33788089dc3c7bc78a983d5e7a8eb66e5de5ea", + "version-string": "5.1", + "port-version": 0 + }, + { + "git-tree": "50d3e54d6d6656a391f83b83e1d30da93f03d272", + "version-string": "5.1-beta2", + "port-version": 0 + }, + { + "git-tree": "c630161b04b2c960065ec75f0d21bd0ca199e303", + "version-string": "5.0.3", + "port-version": 0 + }, + { + "git-tree": "6d1a36217111e1c54e64ae8e251408c576653b84", + "version-string": "5.0.2-2", + "port-version": 0 + }, + { + "git-tree": "07ebf53c7a3b2296980fe5d067b6ae3b83b5fb76", + "version-string": "5.0.2-1", + "port-version": 0 + }, + { + "git-tree": "6b522572549f9d96ea7c08fbdd47e3d7c8fae8d0", + "version-string": "5.0.2", + "port-version": 0 + }, + { + "git-tree": "be960a2167c1745c2d551cc9ced3698c06ca5616", + "version-string": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "67ffee79aa65d6a25f201e628b84ca31762dd413", + "version-string": "5.0", + "port-version": 0 + }, + { + "git-tree": "911b95d80f01cbf6ddf1166d6f1f12f4dad19d01", + "version-string": "5.0-beta2-0.1", + "port-version": 0 + }, + { + "git-tree": "6511fec22f6fac6b51246ba8d6b8915badd63cc5", + "version-string": "5.0-beta1-0.1", + "port-version": 0 + }, + { + "git-tree": "dc5a47cc775628b2f049a53b08170b22bb9232d6", + "version-string": "5.0", + "port-version": 0 + }, + { + "git-tree": "5e28ca831836bfaf91f9a1ef72bcab2d61a47a46", + "version-string": "4.14-3", + "port-version": 0 + }, + { + "git-tree": "ac76b96512255b61b411e0b31a6196d9e4f35110", + "version-string": "4.14-2", + "port-version": 0 + }, + { + "git-tree": "a898c4cdb7f5c9601b62a6d2752477e24b5a0be4", + "version-string": "4.14-1", + "port-version": 0 + }, + { + "git-tree": "8ea2ee636e49dae963ef36112424b1e3727f5579", + "version-string": "4.13-3", + "port-version": 0 + }, + { + "git-tree": "5e331bf03572ccd2270139b3bbec40bbe5892e26", + "version-string": "4.13-2", + "port-version": 0 + }, + { + "git-tree": "90764d0b3730082adbee8addffff072d88da69d3", + "version-string": "4.13-1", + "port-version": 0 + }, + { + "git-tree": "e87dc7986f2030cf3d39e0f1cfcebe155eadbd4b", + "version-string": "4.12", + "port-version": 0 + }, + { + "git-tree": "6809f8f5e3a61b233ee96c8a4e02df7c54b8860a", + "version-string": "4.11.1", + "port-version": 0 + }, + { + "git-tree": "f7ce924779fb487caea48f7a2db95b846c16608c", + "version-string": "4.11-3", + "port-version": 0 + }, + { + "git-tree": "dbeefd7cebe1496efb3f7da4cc785e3c55e37566", + "version-string": "4.11-2", + "port-version": 0 + }, + { + "git-tree": "75f11610a1f67a87d794c5986a5eb858e6dfd49d", + "version-string": "4.11-1", + "port-version": 0 + }, + { + "git-tree": "d29ac80aaecb18655a10edca0db08ebfee922a38", + "version-string": "4.11", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cgicc.json b/port_versions/c-/cgicc.json new file mode 100644 index 00000000000000..a5831bbb833f1b --- /dev/null +++ b/port_versions/c-/cgicc.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "80b636f7c2459aaebfdaeade4f9f0c3892e785dd", + "version-string": "3.2.19-4", + "port-version": 0 + }, + { + "git-tree": "742cbabc36815039e7824e4d4517ac9ad5bc3aa0", + "version-string": "3.2.19-3", + "port-version": 0 + }, + { + "git-tree": "379b56c46cd2139b66c84c8bc67edf5bc3362a34", + "version-string": "3.2.19-2", + "port-version": 0 + }, + { + "git-tree": "add04fedcda8d675524d3ecc4b1900ad19ad66d5", + "version-string": "3.2.19-1", + "port-version": 0 + }, + { + "git-tree": "c0bc902c6bf35178030984307f7b0cd7b45604ec", + "version-string": "3.2.19", + "port-version": 0 + }, + { + "git-tree": "3bbf8f6e51b061b7023c5dc9d88862b9f5c2928b", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cgl.json b/port_versions/c-/cgl.json new file mode 100644 index 00000000000000..42cb15681e8d98 --- /dev/null +++ b/port_versions/c-/cgl.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1842a39e0a0fa8b8d62fb875e750a07b5fe78709", + "version-string": "0.60.2-2", + "port-version": 0 + }, + { + "git-tree": "f74bd4202498c6351c3927afc9d6dd10a8b60355", + "version-string": "0.60.2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cgltf.json b/port_versions/c-/cgltf.json new file mode 100644 index 00000000000000..c703bfa9180d43 --- /dev/null +++ b/port_versions/c-/cgltf.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "27d089cd8ef3a46c94daa6e90c4c2689052fe3c0", + "version-string": "1.8", + "port-version": 0 + }, + { + "git-tree": "6816a8dcdaa549afb7c24cd9e815512500f683f3", + "version-string": "1.5", + "port-version": 0 + }, + { + "git-tree": "593e2a321bdd5461d5660a1ed9a405d487481bd1", + "version-string": "1.3", + "port-version": 0 + }, + { + "git-tree": "352d59c3e2861cbbaf37a008273c6f45a152573e", + "version-string": "1.2", + "port-version": 0 + }, + { + "git-tree": "802d7db81d92d4d79e78111b8254d328dd263988", + "version-string": "2019-04-30", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cgns.json b/port_versions/c-/cgns.json new file mode 100644 index 00000000000000..6a9a059d3c04dd --- /dev/null +++ b/port_versions/c-/cgns.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cc70f3fcc3f4ff2dad2712400208181dc7bb280d", + "version-string": "3.4.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/chaiscript.json b/port_versions/c-/chaiscript.json new file mode 100644 index 00000000000000..8b7b2694132168 --- /dev/null +++ b/port_versions/c-/chaiscript.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "42a36da45b402e64b30d4292bf2ed49e029a4177", + "version-string": "6.1.0-1", + "port-version": 0 + }, + { + "git-tree": "d85843cc7870ae045579d1d1b0e4722b4b626502", + "version-string": "6.1.0", + "port-version": 0 + }, + { + "git-tree": "b149c97ee946f1d621a8e10874ef8559a7275d57", + "version-string": "6.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/chakracore.json b/port_versions/c-/chakracore.json new file mode 100644 index 00000000000000..889e61da0cac1a --- /dev/null +++ b/port_versions/c-/chakracore.json @@ -0,0 +1,159 @@ +{ + "versions": [ + { + "git-tree": "89c6f3a1c86e3849e7f58941ab165af8da0b2f25", + "version-string": "1.11.22", + "port-version": 1 + }, + { + "git-tree": "7a4613ffc09fc76e06277028b747f1b69f69b852", + "version-string": "1.11.22", + "port-version": 0 + }, + { + "git-tree": "2ca419681ed3a534f27ccf0127dbc3f56b49738c", + "version-string": "1.11.15", + "port-version": 0 + }, + { + "git-tree": "0b2e6d64d357718e2b0a3c72b80d0cd6032ff378", + "version-string": "1.11.14", + "port-version": 0 + }, + { + "git-tree": "71a1aa606b905a943c820d8eb9903b4d8e9f322a", + "version-string": "1.11.13", + "port-version": 0 + }, + { + "git-tree": "83a9fac77ff0db1cfa2fdd0a8f982dbc3c4ab6e2", + "version-string": "1.11.12", + "port-version": 0 + }, + { + "git-tree": "e664b82f33c3699d9fae48560225bf176845cd56", + "version-string": "1.11.11", + "port-version": 0 + }, + { + "git-tree": "6df9ccec9806ae3c646e2f8963340cc1c974d2c6", + "version-string": "1.11.9", + "port-version": 0 + }, + { + "git-tree": "a9d3ba9be4848102537b95b934e7198fd38d282e", + "version-string": "1.11.8", + "port-version": 0 + }, + { + "git-tree": "c96a1be59aca2aebe0c5a84cc63539b221b20dc8", + "version-string": "1.11.7", + "port-version": 0 + }, + { + "git-tree": "b3df766e21d574d79ea1d92e82d91b927267ad85", + "version-string": "1.11.5", + "port-version": 0 + }, + { + "git-tree": "35646ec58dff3de7b286a4225c2e498b0591e296", + "version-string": "1.11.4", + "port-version": 0 + }, + { + "git-tree": "849ea1fa5e4835d0a21c710203646c118aafcda4", + "version-string": "1.11.2", + "port-version": 0 + }, + { + "git-tree": "ad93a98d2d508ae6f3d6b5468dc45eed932132e9", + "version-string": "1.11.1-1", + "port-version": 0 + }, + { + "git-tree": "da157994a1ca198c2291dce508007e2c3fbf9275", + "version-string": "1.11.1", + "port-version": 0 + }, + { + "git-tree": "445d9cc153f175468ba6f7a9065f0a6d073330ea", + "version-string": "1.10.1-1", + "port-version": 0 + }, + { + "git-tree": "869014878c1d6c90f7ef8afdf762d596aa57de21", + "version-string": "1.10.1", + "port-version": 0 + }, + { + "git-tree": "0203a2c674c84e4f847a69092f8e05881aa1d780", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "544f12820c7a87300f2132a500da5c720a9c2397", + "version-string": "1.8.5", + "port-version": 0 + }, + { + "git-tree": "ea25d1092f2f0a622ab1eb00fc63414e901f306c", + "version-string": "1.8.4", + "port-version": 0 + }, + { + "git-tree": "e010dcad67e297d01b9e81bd105b70222e673a99", + "version-string": "1.8.3", + "port-version": 0 + }, + { + "git-tree": "d9b292fc28aebb259c0f8be2cca52fd40ed9b34d", + "version-string": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "aa6cca2de50287424211a5ecb74a7c054e47138c", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "5619524dc45e2e4d7372f236eeb5d34a8a2787ca", + "version-string": "1.7.4-1", + "port-version": 0 + }, + { + "git-tree": "e88be82a454cf70d207ff9344c78e8cd2a75d015", + "version-string": "1.7.4", + "port-version": 0 + }, + { + "git-tree": "160eabab2bb1d5a409e24b1e0a037e24bd4284ef", + "version-string": "1.4.3", + "port-version": 0 + }, + { + "git-tree": "14eba2da734ab5bab48aeabd831ae5d03bef0067", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "91e7d1ad207b7288e59c91a6147f02de4c95cd3d", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "e6cfebcad51cb25fa742f774af1be79909e01fc5", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "55b6461f0e945885ffce0e490603ff170fec690d", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "61f66358358575de7d803afbffae1622685062d0", + "version-string": "1.2.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/charls.json b/port_versions/c-/charls.json new file mode 100644 index 00000000000000..a735a08635a477 --- /dev/null +++ b/port_versions/c-/charls.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "2fa61c15c3a5e28cb65a32bce7769942d8a8f061", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "7c242f5202e4483fa223f0cf6243f7c62ce4fb1b", + "version-string": "2.0.0-3", + "port-version": 0 + }, + { + "git-tree": "d24536d72857fd7a9f78eed901f8e365c3f46ac1", + "version-string": "2.0.0-2", + "port-version": 0 + }, + { + "git-tree": "af633d8047f2486b1f3c525a5aa285afc26b4347", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "f43231dbadb55d20a0df8623d03be555bf9cd12a", + "version-string": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/chartdir.json b/port_versions/c-/chartdir.json new file mode 100644 index 00000000000000..95aa67e68afeeb --- /dev/null +++ b/port_versions/c-/chartdir.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9fde410f21fe4ab0dfdc3980210c97a17d752380", + "version-string": "6.3.1", + "port-version": 2 + }, + { + "git-tree": "6db8fed22b0db913c97ccf1c64e274528e6f8eee", + "version-string": "6.3.1-1", + "port-version": 0 + }, + { + "git-tree": "4d096dc755e553ce08011ccc7116566f8be9eb59", + "version-string": "6.3.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/check.json b/port_versions/c-/check.json new file mode 100644 index 00000000000000..f73f793e3c9992 --- /dev/null +++ b/port_versions/c-/check.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "5495ef66bb5b37ceabf5ddd8b7ee534f1475f3c9", + "version-string": "0.15.2", + "port-version": 0 + }, + { + "git-tree": "76067a985b85fd4a0223634beb2f3bbb347128c1", + "version-string": "0.14.0", + "port-version": 0 + }, + { + "git-tree": "ff6d53690d3f8cd7cd75844fdc95de8589947047", + "version-string": "0.13.0-2", + "port-version": 0 + }, + { + "git-tree": "a6737ac83c44221927230e0765a1c8f73ad65db5", + "version-string": "0.13.0-1", + "port-version": 0 + }, + { + "git-tree": "768d50c53e9d0546aa8fd12d18cd167f8704dd5b", + "version-string": "0.13.0", + "port-version": 0 + }, + { + "git-tree": "0a5b1f033d538cfee6676bcc97f0f803b1596cba", + "version-string": "0.12.0-2", + "port-version": 0 + }, + { + "git-tree": "cdbd554ab0647106628943194c888286191b4419", + "version-string": "0.12.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/chipmunk.json b/port_versions/c-/chipmunk.json new file mode 100644 index 00000000000000..0c7fbf106bc906 --- /dev/null +++ b/port_versions/c-/chipmunk.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "4c12d64b4bc53958dce0a82a4ae41457ee6e2bc5", + "version-string": "7.0.3", + "port-version": 1 + }, + { + "git-tree": "1ad780da368cbf02bb78ae3d1c1b6432e0683e90", + "version-string": "7.0.3", + "port-version": 0 + }, + { + "git-tree": "7bd1bc11f039325e18e226b3f50f4e65869a073b", + "version-string": "7.0.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/chmlib.json b/port_versions/c-/chmlib.json new file mode 100644 index 00000000000000..37557a6be90546 --- /dev/null +++ b/port_versions/c-/chmlib.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "4801e25e62b144f41dfa8408351f1bab4d7c85b1", + "version-string": "0.40-4", + "port-version": 0 + }, + { + "git-tree": "2dd1f48712e00c423cf711c17cb046ea1e08c478", + "version-string": "0.40-3", + "port-version": 0 + }, + { + "git-tree": "89bb46618cba5beea2e91cfe872759e145a51b58", + "version-string": "0.40-2", + "port-version": 0 + }, + { + "git-tree": "c17af4f58e15ecffe085c937d1d6e448994148da", + "version-string": "0.40-1", + "port-version": 0 + }, + { + "git-tree": "44c860e56e349c399faaa275a008e1d934df4ac2", + "version-string": "0.40", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/chromium-base.json b/port_versions/c-/chromium-base.json new file mode 100644 index 00000000000000..c5acc843a63e56 --- /dev/null +++ b/port_versions/c-/chromium-base.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "32032ff366c12fd25721222708291f36c9c7cc32", + "version-string": "86.0.4199.1", + "port-version": 1 + }, + { + "git-tree": "9594776ec730e788a81d35607b42765968a0c1d2", + "version-string": "86.0.4199.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cimg.json b/port_versions/c-/cimg.json new file mode 100644 index 00000000000000..c08430c45f31d2 --- /dev/null +++ b/port_versions/c-/cimg.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "eb83122db781cf448f7485bc5b55c7497c8941d9", + "version-string": "2.9.4", + "port-version": 0 + }, + { + "git-tree": "ad4965f4c862383047f8d61e997fa34072772ee8", + "version-string": "2.6.2", + "port-version": 0 + }, + { + "git-tree": "e63daa06cdd9de965d5b8027b77881c79d442314", + "version-string": "2.6.1", + "port-version": 0 + }, + { + "git-tree": "5259ce4ffce511c33ef32f3fffdc70c9be0edc3c", + "version-string": "2.5.7", + "port-version": 0 + }, + { + "git-tree": "b5f68739aa9e4c8565b2135b6d0016f86a74e3a4", + "version-string": "2.5.5", + "port-version": 0 + }, + { + "git-tree": "96e22b9eff01511e598e2506454e77d29225b326", + "version-string": "2.4.5", + "port-version": 0 + }, + { + "git-tree": "536e1ebc791fd572511b933f3702ef781ab36b7b", + "version-string": "2.4.4", + "port-version": 0 + }, + { + "git-tree": "0cc22064dbe06dcdb3727d0a636030a131cdf81b", + "version-string": "2.4.2", + "port-version": 0 + }, + { + "git-tree": "aacf6d53c723df2317091252da3814b3f968b726", + "version-string": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "0280b9fc74014aaa976ab0a506b18f3234efdb07", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "7366a7f23b0903f69eefb09433e80af3cc182a8e", + "version-string": "2.3.6", + "port-version": 0 + }, + { + "git-tree": "7e7a286f55014c3ce2e20806fafac2a31dad60fb", + "version-string": "2.3.3", + "port-version": 0 + }, + { + "git-tree": "6263f2ecb3760fd524356be1d5690ad45e74f341", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "5b3d8f9f77263a362aeedbfb2ab453d14bee0b07", + "version-string": "2.2.3", + "port-version": 0 + }, + { + "git-tree": "f30cf7cac1d29608aecd1bf75d99b5028ee9b487", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "8183d26673abb8ba4922b0a7ad62be1fb4d6be06", + "version-string": "221", + "port-version": 0 + }, + { + "git-tree": "fa1beed18975776efdd88979fdd5caf2718dc645", + "version-string": "220", + "port-version": 0 + }, + { + "git-tree": "6e493c8269509fcbea2be99ecffe94d4bf6c9a04", + "version-string": "2.1.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cityhash.json b/port_versions/c-/cityhash.json new file mode 100644 index 00000000000000..d32490641189cf --- /dev/null +++ b/port_versions/c-/cityhash.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3976c756d432396374de92f20289f5e966d4109a", + "version-string": "2013-01-08", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/civetweb.json b/port_versions/c-/civetweb.json new file mode 100644 index 00000000000000..669cb9a5696a7d --- /dev/null +++ b/port_versions/c-/civetweb.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "c66a22f30f2b72f81ae2bb23cce2bfc512b6e983", + "version-string": "1.13", + "port-version": 1 + }, + { + "git-tree": "1776aa61de3940a5f6edda1191097fc16eb53cf5", + "version-string": "1.13", + "port-version": 0 + }, + { + "git-tree": "3f053b157e06c3b8638c54708f248aba7c8215a5", + "version-string": "1.12", + "port-version": 0 + }, + { + "git-tree": "c6ff8d6e1603f36d329f5b7c53d8530df6d951e4", + "version-string": "2019-07-05-1", + "port-version": 0 + }, + { + "git-tree": "b4bccfc4ccd7097f18ee43a4ad5e736d27ea841b", + "version-string": "2019-07-05", + "port-version": 0 + }, + { + "git-tree": "fa1536cafad57ebd2dd512783aa333faa403df71", + "version-string": "1.11-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cjson.json b/port_versions/c-/cjson.json new file mode 100644 index 00000000000000..60a5fdf30eb2b9 --- /dev/null +++ b/port_versions/c-/cjson.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "2a1edb97563c7a8e4007f479bfdcb33122911e16", + "version-string": "2019-11-30-1", + "port-version": 0 + }, + { + "git-tree": "6417e86b41b39045d328c14e75e763a20c1d75f0", + "version-string": "2019-11-30", + "port-version": 0 + }, + { + "git-tree": "820bf0e6f96df213008242f4c17ca4e270cf741a", + "version-string": "1.7.12", + "port-version": 0 + }, + { + "git-tree": "cf63a25f59243203efb7f01c06e20fd735ce7f9c", + "version-string": "1.7.10-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/clapack.json b/port_versions/c-/clapack.json new file mode 100644 index 00000000000000..b03c545371e6bc --- /dev/null +++ b/port_versions/c-/clapack.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "8958d14a08da3ed544cd126331db33768af294cb", + "version-string": "3.2.1", + "port-version": 16 + }, + { + "git-tree": "93ee7dc5582d65acbd3c51ab0b1374b7b8d2e59c", + "version-string": "3.2.1", + "port-version": 15 + }, + { + "git-tree": "5054e025c2ab843a2a77bcd2fadaa10a5139bb01", + "version-string": "3.2.1", + "port-version": 14 + }, + { + "git-tree": "f1d46d74a6edf9270ba1dbeb87b47f56b2c618da", + "version-string": "3.2.1", + "port-version": 13 + }, + { + "git-tree": "4d6ace5497a1be65cab7b9afce93478614080103", + "version-string": "3.2.1-13", + "port-version": 0 + }, + { + "git-tree": "478b43e2fe6194105a4cc91200f027663e80ba0e", + "version-string": "3.2.1-12", + "port-version": 0 + }, + { + "git-tree": "04772a560855daa48239b2eea1179586f7df6fe4", + "version-string": "3.2.1-11", + "port-version": 0 + }, + { + "git-tree": "8ac89e53f42afc5c7d696c11aff57c98db6c80ed", + "version-string": "3.2.1-10", + "port-version": 0 + }, + { + "git-tree": "eed4720be7cc3b882d2c8278fe98d1992b03b4bc", + "version-string": "3.2.1-9", + "port-version": 0 + }, + { + "git-tree": "b4f2e61478621a87629438d55a0628ae02e43f26", + "version-string": "3.2.1-6", + "port-version": 0 + }, + { + "git-tree": "06355e6da5386dba274b27fdaf24bac94f5f2bfa", + "version-string": "3.2.1-4", + "port-version": 0 + }, + { + "git-tree": "cb6e0fe3229da9d239f557bb0aeae95952f72731", + "version-string": "3.2.1-3", + "port-version": 0 + }, + { + "git-tree": "d12dfdf726225876e4785bf1b7cfe91fa5216086", + "version-string": "3.2.1-2", + "port-version": 0 + }, + { + "git-tree": "e6bcb47d8349edc1400573f78f4a8c0985ed2407", + "version-string": "3.2.1-1", + "port-version": 0 + }, + { + "git-tree": "97aa58f96c370605c8d70f816fc78c43e1c0e94d", + "version-string": "3.2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/clara.json b/port_versions/c-/clara.json new file mode 100644 index 00000000000000..d2eae36cf7dddb --- /dev/null +++ b/port_versions/c-/clara.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "7c34c7f065f811d99fe3aa30bbe84f9ac580c0f8", + "version-string": "1.1.5", + "port-version": 0 + }, + { + "git-tree": "3bf349ff0faa032132a525d7a5d429abd21efb8e", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "d1cce1303a06e9ea2c9bcf3be072ac630ace5fa2", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "6b3700225424235ebd6eae6cca857ec4d92be7d0", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "56039d7150142cc0ddd2129d2dcaa5b8a409af71", + "version-string": "2018-04-02", + "port-version": 0 + }, + { + "git-tree": "d5de4c5a95aa6725296b0613502b0bf153f3bc69", + "version-string": "2018-03-23", + "port-version": 0 + }, + { + "git-tree": "95a83230895abb9f527a57f9cdecc0b8df3cac72", + "version-string": "2018-03-11", + "port-version": 0 + }, + { + "git-tree": "ee4d136f6a2815d7b3acc7faac7a89bba5a503e8", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "24d857fd302406c577b0ec7bbb84154f134dafd4", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "dafbbb9fd26a25e9d757f0d29ab471066aceab44", + "version-string": "2017-07-20-9661f2b4a50895d52ebb4c59382785a2b416c310", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/clblas.json b/port_versions/c-/clblas.json new file mode 100644 index 00000000000000..8a0314576f9609 --- /dev/null +++ b/port_versions/c-/clblas.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e4744af3eaf0b0d24b2c60b7c3f85565e399961e", + "version-string": "2.12-4", + "port-version": 0 + }, + { + "git-tree": "ca8bf8d9213393fce5ae7757dc422f056a780ffa", + "version-string": "2.12-3", + "port-version": 0 + }, + { + "git-tree": "877ea154609214d86f41c69ff6239671338c533d", + "version-string": "2.12-2", + "port-version": 0 + }, + { + "git-tree": "121d625c8b7962c34f4cd5b8414f6518b39b5526", + "version-string": "2.12-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/clblast.json b/port_versions/c-/clblast.json new file mode 100644 index 00000000000000..fd270fc6985980 --- /dev/null +++ b/port_versions/c-/clblast.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "59011ea56f7531acf901ef6bc7f17ab6492f7b79", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "8963217e0a1f3564d95832c2178db30618312eab", + "version-string": "1.5.0-1", + "port-version": 0 + }, + { + "git-tree": "90acecd3a3606d0009162352d6204e57689ac32a", + "version-string": "1.5.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/clfft.json b/port_versions/c-/clfft.json new file mode 100644 index 00000000000000..77cb894619dd98 --- /dev/null +++ b/port_versions/c-/clfft.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e4985dd521a5d7e29a259339805619913c0e3876", + "version-string": "2.12.2-2", + "port-version": 0 + }, + { + "git-tree": "d0273b5847f17e5fb8b12f5cea4bbea7533c0012", + "version-string": "2.12.2-1", + "port-version": 0 + }, + { + "git-tree": "983bac4dd3ecaeef65610d4650d6b44ef4636c18", + "version-string": "2.12.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cli.json b/port_versions/c-/cli.json new file mode 100644 index 00000000000000..a2a1d8e0f52c8e --- /dev/null +++ b/port_versions/c-/cli.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "ae335f0cbfecdfb4f7d5448bf3e1fec0ae9aecb9", + "version-string": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "0686bd749bb0fe462cdd7455b4ff23408ddc6efe", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "89045e1c68f2e0190da173359ad79f3bf868d734", + "version-string": "1.1.1", + "port-version": 0 + }, + { + "git-tree": "5bc59c44c0a9a39684454157dda3a7c56a37b7e5", + "version-string": "1.1-1", + "port-version": 0 + }, + { + "git-tree": "5aa8fbe623b52b18518db5cfb6dfc8194024c4e3", + "version-string": "1.1", + "port-version": 0 + }, + { + "git-tree": "7f76a495c9e7f6f8cd709499d3d384ed8bedbad4", + "version-string": "2019-03-21", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cli11.json b/port_versions/c-/cli11.json new file mode 100644 index 00000000000000..ce5f0cd51af241 --- /dev/null +++ b/port_versions/c-/cli11.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "47d52d6f0f742e0c0799cd5de355c81732d82d5b", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "c1e68f22fc5b4cda723b490171a541aa1b9cd6d4", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "e5176f97d0d9bde0f70fc54f9f8feacaf7f79897", + "version-string": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "4da425405d2829f4bf8a53c98ecd5e98ff9de0d8", + "version-string": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "b99037553e78952ff6e0243626640e5d9130bed0", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "17868365a2236ed8a3559920918eaa0b6d32a521", + "version-string": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "c823576ada3264d2a7b10dcfb549c4e60a679f03", + "version-string": "1.6.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/clickhouse-cpp.json b/port_versions/c-/clickhouse-cpp.json new file mode 100644 index 00000000000000..20039f22b9ebf0 --- /dev/null +++ b/port_versions/c-/clickhouse-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bd61eb545cd11c0329de99de697ef0dd124cce60", + "version-string": "2019-05-22", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/clipp.json b/port_versions/c-/clipp.json new file mode 100644 index 00000000000000..32c3d34cd72273 --- /dev/null +++ b/port_versions/c-/clipp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2f0d21d6f8ca2d0768b52fd43ee9beb771c291fd", + "version-string": "2019-04-30", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/clockutils.json b/port_versions/c-/clockutils.json new file mode 100644 index 00000000000000..44cc18fa9f9352 --- /dev/null +++ b/port_versions/c-/clockutils.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "cea253009dc17e485177d45dd2b67334db8fc7b4", + "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-3", + "port-version": 0 + }, + { + "git-tree": "1099670eb247ce26881c2d121ccdb13ede01a7ba", + "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-2", + "port-version": 0 + }, + { + "git-tree": "162495da5f294284be07957fde8eedf158c9ce5c", + "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-1", + "port-version": 0 + }, + { + "git-tree": "23ad4618ca9fc9a5617b236ccca524b53dff0c0e", + "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5", + "port-version": 0 + }, + { + "git-tree": "9ebf14ea7f9be8ff5c2d749a66b0b3bf7654d227", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/clp.json b/port_versions/c-/clp.json new file mode 100644 index 00000000000000..80f6d525e3744c --- /dev/null +++ b/port_versions/c-/clp.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "a0176c86ad90803b7bbf0327edbbfc8c48d4407e", + "version-string": "1.17.6", + "port-version": 0 + }, + { + "git-tree": "46976cb32fcdc6d89e76591f1c82f7004baeac1b", + "version-string": "1.17.5", + "port-version": 0 + }, + { + "git-tree": "9ced0062a007a5831bd6374bdccc2bd51c33287e", + "version-string": "1.17.3", + "port-version": 0 + }, + { + "git-tree": "0f46d76811ffad1a4b2b3f835a058aebeccde0de", + "version-string": "1.17.2-2", + "port-version": 0 + }, + { + "git-tree": "0484f61cd4d1962b0c346ca6e3fc4f35cf32bff1", + "version-string": "1.17.2-1", + "port-version": 0 + }, + { + "git-tree": "000fc62fa341573f5cd780d3ce52a2f0d173a4eb", + "version-string": "1.17.2", + "port-version": 0 + }, + { + "git-tree": "f696708a0c8ec58bb76de608ccd9de42b87449e0", + "version-string": "1.16.11-1", + "port-version": 0 + }, + { + "git-tree": "f91480cbc57442e18fc1ce033283cc6d2be87bfd", + "version-string": "1.16.11-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/clrng.json b/port_versions/c-/clrng.json new file mode 100644 index 00000000000000..7769fa4742ee45 --- /dev/null +++ b/port_versions/c-/clrng.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "700b4cbcd0d99feefabf96621a5b217e56dc5a38", + "version-string": "2020-12-01", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/clue.json b/port_versions/c-/clue.json new file mode 100644 index 00000000000000..ae2eb1280ba21e --- /dev/null +++ b/port_versions/c-/clue.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f4b5156fc9604848b9aa627ef0bf7ab21e9ad5ac", + "version-string": "1.0.0-alpha.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cmark.json b/port_versions/c-/cmark.json new file mode 100644 index 00000000000000..3a6bd5ac98aa36 --- /dev/null +++ b/port_versions/c-/cmark.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "64a4cd4c7db7d6aed511c8cdbac1b8339093ea4b", + "version-string": "0.29.0", + "port-version": 0 + }, + { + "git-tree": "e6049400752f6211b738f040231e96af36a6ab33", + "version-string": "0.28.3-3", + "port-version": 0 + }, + { + "git-tree": "c42765ed8387ebc52ce3541b517f2ad001e48279", + "version-string": "0.28.3-2", + "port-version": 0 + }, + { + "git-tree": "86267aab8dd3e577c54c787719e23835bb386e21", + "version-string": "0.28.3-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cmcstl2.json b/port_versions/c-/cmcstl2.json new file mode 100644 index 00000000000000..b6f287606ceb9d --- /dev/null +++ b/port_versions/c-/cmcstl2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bf1ca5917946395732a4553392212ddb0e4296c1", + "version-string": "2019-07-20", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cmocka.json b/port_versions/c-/cmocka.json new file mode 100644 index 00000000000000..7d3c2316dd2b97 --- /dev/null +++ b/port_versions/c-/cmocka.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "feb5623c3cdb647c97be873f2a625468305d8a5d", + "version-string": "2020-08-01", + "port-version": 0 + }, + { + "git-tree": "0dd7932405f9c83f0e219cd865c04784609f0339", + "version-string": "1.1.5", + "port-version": 3 + }, + { + "git-tree": "145824db7ad861a4451397515288da776d3dc464", + "version-string": "1.1.5", + "port-version": 2 + }, + { + "git-tree": "392e863a956094948feb621f3b0f8600ffeb4be4", + "version-string": "1.1.5-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cnl.json b/port_versions/c-/cnl.json new file mode 100644 index 00000000000000..9f2ab96483c086 --- /dev/null +++ b/port_versions/c-/cnl.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4778a9818faef4bfac563accbca398763a725cfc", + "version-string": "2019-06-23", + "port-version": 0 + }, + { + "git-tree": "463ac0214681e010d4369a6b21f36d651fb7daf4", + "version-string": "2019-01-09", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/coin.json b/port_versions/c-/coin.json new file mode 100644 index 00000000000000..462576cefc82e0 --- /dev/null +++ b/port_versions/c-/coin.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "cb2008a3d6429f3ff34e3fd3b5e72153f29f36e6", + "version-string": "4.0.0", + "port-version": 2 + }, + { + "git-tree": "63dc609564e196e6e5bae206da6790da3ab72bcf", + "version-string": "4.0.0", + "port-version": 1 + }, + { + "git-tree": "f8177462d3f2f6892e475ba8f89390d2ab479bab", + "version-string": "4.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/coinutils.json b/port_versions/c-/coinutils.json new file mode 100644 index 00000000000000..0bfbb4119c5da8 --- /dev/null +++ b/port_versions/c-/coinutils.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "18e68cecf80c5ee106b7e3819ea2a17bfb0a1b5a", + "version-string": "2.11.4", + "port-version": 0 + }, + { + "git-tree": "5b96c74da5d25b5a90acadd0ec6dd0ae3963c4cf", + "version-string": "2.11.2-2", + "port-version": 0 + }, + { + "git-tree": "c7bc7d7b8b79bfd8a0cdd1528a3903e6067ba276", + "version-string": "2.11.2-1", + "port-version": 0 + }, + { + "git-tree": "947055f96054850e91f7219eb9faf417a17c9f74", + "version-string": "2.11.2", + "port-version": 0 + }, + { + "git-tree": "c73711fa0f35ff1a03915de759029a07f31dba3f", + "version-string": "2.10.14-1", + "port-version": 0 + }, + { + "git-tree": "d4037100e6763f2a3557ca583a3a298611ffaea9", + "version-string": "2.10.14-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/collada-dom.json b/port_versions/c-/collada-dom.json new file mode 100644 index 00000000000000..11502551876229 --- /dev/null +++ b/port_versions/c-/collada-dom.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f53be121329578c16d057a2019a9ced1bbb24457", + "version-string": "2.5.0-3", + "port-version": 0 + }, + { + "git-tree": "f2a6731ce68c7c026f823f44a610574383f43eaa", + "version-string": "2.5.0-2", + "port-version": 0 + }, + { + "git-tree": "ba37824fd88d9f09a227ca81b84befd5ac9266f0", + "version-string": "2.5.0-1", + "port-version": 0 + }, + { + "git-tree": "f0552350082d5e21a81cb7603db97786ac26750b", + "version-string": "2.5.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/colmap.json b/port_versions/c-/colmap.json new file mode 100644 index 00000000000000..712aae6b4f11ad --- /dev/null +++ b/port_versions/c-/colmap.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e2d108b4334d41c2cc500c5dfe4c389127a46220", + "version-string": "3.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/comms-ublox.json b/port_versions/c-/comms-ublox.json new file mode 100644 index 00000000000000..4edef780808af7 --- /dev/null +++ b/port_versions/c-/comms-ublox.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c54bc435620cecd7569ad27d615728b82d7f1c39", + "version-string": "0.20.0", + "port-version": 1 + }, + { + "git-tree": "d7f6b9039e26695d21306b82b805ae057614b8b4", + "version-string": "0.20.0", + "port-version": 0 + }, + { + "git-tree": "96f06165036235d78178de38c1223b7f16d9cb9c", + "version-string": "0.19.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/comms.json b/port_versions/c-/comms.json new file mode 100644 index 00000000000000..3b070d9d770df4 --- /dev/null +++ b/port_versions/c-/comms.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f767daddd556d8848fe375b07293c5df62a3bd9b", + "version-string": "3.1.3", + "port-version": 1 + }, + { + "git-tree": "35063dc22c382a2460a0f5ee1131c5e5b55dbd4a", + "version-string": "3.1.3", + "port-version": 0 + }, + { + "git-tree": "7d5791ad7c86f0bb680c22887f909d1820ee2d23", + "version-string": "3.1.2", + "port-version": 0 + }, + { + "git-tree": "e61903231d55ee3580267fb805b93de0cb42e2e6", + "version-string": "3.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/commsdsl.json b/port_versions/c-/commsdsl.json new file mode 100644 index 00000000000000..83bf3a75d70707 --- /dev/null +++ b/port_versions/c-/commsdsl.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "7e27fe7eb3c6be733037eeceefbb7c1805974e30", + "version-string": "3.6.0", + "port-version": 1 + }, + { + "git-tree": "2ee87822b95d40f9663a8be40ba32b600609c639", + "version-string": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "41af4565962cba1d1115dbde4903f0843530430f", + "version-string": "3.5.4", + "port-version": 0 + }, + { + "git-tree": "59d95afa8f69a045fe5a353995cdbd72ec1d5a9b", + "version-string": "3.5.3", + "port-version": 0 + }, + { + "git-tree": "8ffb0156aa811d2537c57b901a9a44023051cf1e", + "version-string": "3.5.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/concurrentqueue.json b/port_versions/c-/concurrentqueue.json new file mode 100644 index 00000000000000..db7c25ecd39968 --- /dev/null +++ b/port_versions/c-/concurrentqueue.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "c3ff6de6bf5fe5a62c4fc71aa6b58aff79d246d2", + "version-string": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "03df55152da84b4ecc523cde6dedd0c5adc3f037", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "52fff0951458b77ebab611dc674a0e374332c572", + "version-string": "1.0.0-beta-dea078c", + "port-version": 0 + }, + { + "git-tree": "52dbb3f673dc60771f666b98365db3ea70bdfb94", + "version-string": "1.0.0-beta", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/console-bridge.json b/port_versions/c-/console-bridge.json new file mode 100644 index 00000000000000..2cb9379d9ddf85 --- /dev/null +++ b/port_versions/c-/console-bridge.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "d6e04ef880522a8fedfe59bee4081441332fb937", + "version-string": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "ccd84d2fb891ccf98a90476689b6c858a0e24098", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "b4cb5b4c685cc493ac9cb1f61d631318367d0184", + "version-string": "0.4.4", + "port-version": 0 + }, + { + "git-tree": "7f91110bdaaae815030c2a730853ee2bc06e3711", + "version-string": "0.4.3-2", + "port-version": 0 + }, + { + "git-tree": "199568cd689ad1966f129685698b4a5fffc5229f", + "version-string": "0.4.3-1", + "port-version": 0 + }, + { + "git-tree": "d1f4084a37d97521a69a8ca531daefc95052e5f6", + "version-string": "0.3.2-4", + "port-version": 0 + }, + { + "git-tree": "ff3c0a6f49008ee59f7cd64b35fa830c4093c36c", + "version-string": "0.3.2-3", + "port-version": 0 + }, + { + "git-tree": "26f69f04a42829d689b1f51521fa199dc9f36327", + "version-string": "0.3.2-2", + "port-version": 0 + }, + { + "git-tree": "f48f54e29f481ce2850db52f346b6104e6042946", + "version-string": "0.3.2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/constexpr-contracts.json b/port_versions/c-/constexpr-contracts.json new file mode 100644 index 00000000000000..846a6416c42d70 --- /dev/null +++ b/port_versions/c-/constexpr-contracts.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fd80e997ec7b9870af5d3872d02be03b36e1c50f", + "version-string": "2020-08-09", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/constexpr.json b/port_versions/c-/constexpr.json new file mode 100644 index 00000000000000..8403348e1998a8 --- /dev/null +++ b/port_versions/c-/constexpr.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e9a01ad3c59cf253ec364331beb22ff697739f8e", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "9992deb4033ceedce33caad72d7a887817ff3df9", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/coolprop.json b/port_versions/c-/coolprop.json new file mode 100644 index 00000000000000..4b2f29718234fe --- /dev/null +++ b/port_versions/c-/coolprop.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "5b29615cb7e9dffd253398cd0d7d06a9b9b9fcb2", + "version-string": "6.4.1", + "port-version": 0 + }, + { + "git-tree": "80fb6d7f66ff93d08f1db76ccaeed25132d5e4dc", + "version-string": "6.1.0-5", + "port-version": 0 + }, + { + "git-tree": "d224ff6f1aecff5b4de877827df14bf4e4e51725", + "version-string": "6.1.0-4", + "port-version": 0 + }, + { + "git-tree": "9957f6c15695a63c227d9007b4ce950ac4594498", + "version-string": "6.1.0-3", + "port-version": 0 + }, + { + "git-tree": "4869e3d639e900ab526b258fd5d684fb00a1f432", + "version-string": "6.1.0-2", + "port-version": 0 + }, + { + "git-tree": "0fd1734f0cb259d9911c97f1486522de51501a10", + "version-string": "6.1.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/coroutine.json b/port_versions/c-/coroutine.json new file mode 100644 index 00000000000000..96c52d448b58fe --- /dev/null +++ b/port_versions/c-/coroutine.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "da458b763cbbbbba0acf20b1895ddd4ee4ff8d0b", + "version-string": "1.5.0", + "port-version": 1 + }, + { + "git-tree": "d9b9fe1d75f4154810f944accc760250ca6b5c8b", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "e314079f32680af6dbf65a83961333a105365620", + "version-string": "2020-01-13", + "port-version": 0 + }, + { + "git-tree": "56729270f8d2294018155cc9b50f19fcc86a8711", + "version-string": "1.4.3", + "port-version": 0 + }, + { + "git-tree": "1b4080bd0c5fbcc57c71c8398e8ef06866124c3e", + "version-string": "1.4.1-1", + "port-version": 0 + }, + { + "git-tree": "3b4aa6029e45c8149674e3a0e62058f57990ef4a", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "babe3bac4e7332b1e6a5fc1a9b97eedbfacd2b2b", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "9846cd5a1690ac97f0940798a5c980080659ed4d", + "version-string": "1.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/corrade.json b/port_versions/c-/corrade.json new file mode 100644 index 00000000000000..9b5589672c1f12 --- /dev/null +++ b/port_versions/c-/corrade.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "f96e0a1ac4f3b72bedf9f1bf099bb91cceba0456", + "version-string": "2020.06", + "port-version": 0 + }, + { + "git-tree": "e62f81f5559a5c1075ebf2b1917d52ebe437268d", + "version-string": "2019.10-1", + "port-version": 0 + }, + { + "git-tree": "a3d5befb3385358ea9aa93837971f7a752a04199", + "version-string": "2019.10", + "port-version": 0 + }, + { + "git-tree": "ce6e9d237104dd8fe2b1dd628d63e952a5725ca4", + "version-string": "2019.01-1", + "port-version": 0 + }, + { + "git-tree": "7050d3a4e544bd339b8af51c0413b6711faaa85a", + "version-string": "2018.10-2", + "port-version": 0 + }, + { + "git-tree": "29cbc467fe04662c2f9e67cf81266f10b0ef35a9", + "version-string": "2018.10-1", + "port-version": 0 + }, + { + "git-tree": "1567bb131df07f7783449b9c2bc18f13a4d6b699", + "version-string": "2018.04-1", + "port-version": 0 + }, + { + "git-tree": "6623e1833545fdcff44e74d4d605f9fa7e9fda5f", + "version-string": "2018.02-1", + "port-version": 0 + }, + { + "git-tree": "168c2aeb500f28c5bc65759ef1ad12bd0095ad2a", + "version-string": "jan2018-1", + "port-version": 0 + }, + { + "git-tree": "a9528d7b8c661cfe7b8ca3d77ce98ac54a3c2a83", + "version-string": "jun2017-3", + "port-version": 0 + }, + { + "git-tree": "ca4dcbe6376bb92154632e96d73ede86582cfca3", + "version-string": "jun2017-2", + "port-version": 0 + }, + { + "git-tree": "fcf193b7e759b5a06fbeb9b83a1831e2a5c1ed80", + "version-string": "jun2017-1", + "port-version": 0 + }, + { + "git-tree": "d3dbea489cf5899780b71097ef614cab4607d44e", + "version-string": "jun2017", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cpp-base64.json b/port_versions/c-/cpp-base64.json new file mode 100644 index 00000000000000..69592b17d4b59b --- /dev/null +++ b/port_versions/c-/cpp-base64.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e25f62c15f68a721ee74c0739e3cbafbd76efa40", + "version-string": "2019-06-19", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cpp-httplib.json b/port_versions/c-/cpp-httplib.json new file mode 100644 index 00000000000000..61d34e47692122 --- /dev/null +++ b/port_versions/c-/cpp-httplib.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "c91293d5ebdef52d74de927342c75230d17f741f", + "version-string": "0.7.18", + "port-version": 0 + }, + { + "git-tree": "f52415b469f9fd27f775790663ba6f266a0b661c", + "version-string": "0.7.15", + "port-version": 0 + }, + { + "git-tree": "dbf92e33069d9fc4c7dfea6912f7f7550f11bc7a", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "8d0e8947058383eb72fa7da6420bbfee6602fd15", + "version-string": "0.5.1", + "port-version": 0 + }, + { + "git-tree": "ab5517f200506396decd501341aa7c363d1369e4", + "version-string": "0.4.2", + "port-version": 0 + }, + { + "git-tree": "4f8b66a4aca6e3002ea45a980d0ec353e6796683", + "version-string": "0.2.5", + "port-version": 0 + }, + { + "git-tree": "bbb55a9d1fbf4018816b149dc58fc7a2a827f515", + "version-string": "0.2.4", + "port-version": 0 + }, + { + "git-tree": "df7b1057a9c38a9b1d87a4f9ed5a963699dfa10c", + "version-string": "0.2.2", + "port-version": 0 + }, + { + "git-tree": "0085261f79efd1bba7173fa94be5f80c411a54e8", + "version-string": "0.2.1", + "port-version": 0 + }, + { + "git-tree": "58a5df37f5e58df734fa316eb9b8506b5c048d97", + "version-string": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cpp-netlib.json b/port_versions/c-/cpp-netlib.json new file mode 100644 index 00000000000000..6da07307368284 --- /dev/null +++ b/port_versions/c-/cpp-netlib.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "52deb7c24c307a3089b818d3b35bd7b19b1e4dc2", + "version-string": "0.13.0", + "port-version": 4 + }, + { + "git-tree": "8a0b0215fd6f8ac92b1ef9a159531840551c8dbb", + "version-string": "0.13.0-3", + "port-version": 0 + }, + { + "git-tree": "1eec50f9389302cc76df41306d01d955f5a67d22", + "version-string": "0.13.0-2", + "port-version": 0 + }, + { + "git-tree": "b3f4a127b4bb5ce74bc1081465c12c7ab0da1f75", + "version-string": "0.13.0-final", + "port-version": 0 + }, + { + "git-tree": "c87e2c49f00112069635fddc0d0b4b24ce9e3036", + "version-string": "0.13.0-rc3", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cpp-peglib.json b/port_versions/c-/cpp-peglib.json new file mode 100644 index 00000000000000..c0b71a55b9e8a0 --- /dev/null +++ b/port_versions/c-/cpp-peglib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bd023f488fbfc178695bdab57978bf6fd8db5750", + "version-string": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cpp-redis.json b/port_versions/c-/cpp-redis.json new file mode 100644 index 00000000000000..c27088641093e5 --- /dev/null +++ b/port_versions/c-/cpp-redis.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "6e73617915b055400da154a55b8c3682a0ace51c", + "version-string": "4.3.1-2", + "port-version": 0 + }, + { + "git-tree": "69f9fe97f257cb03b1d3746e4ac9a5a020044b47", + "version-string": "4.3.1-1", + "port-version": 0 + }, + { + "git-tree": "1aecbff26478a3de6098ab3e954253cb905c442d", + "version-string": "4.3.1", + "port-version": 0 + }, + { + "git-tree": "4a6ab5d4e38191cfd6a56d1ec63a65996255d8e9", + "version-string": "4.3.0", + "port-version": 0 + }, + { + "git-tree": "55b68b47bc2b3844eeaa690339d1c497ec8662a4", + "version-string": "3.5.2-2", + "port-version": 0 + }, + { + "git-tree": "c72ae6224b21ed61122f73d8af15cb8f9346e32d", + "version-string": "3.5.2-1", + "port-version": 0 + }, + { + "git-tree": "692097332992307fa26f25c9d6ea9fdfbbcd120f", + "version-string": "3.5.2", + "port-version": 0 + }, + { + "git-tree": "d8c526ede1b8b2f7600e61c540f134b99ed41feb", + "version-string": "3.5.1-1", + "port-version": 0 + }, + { + "git-tree": "e299dadaf41b8f460109f2e8206b4c5cc4a1a2fa", + "version-string": "3.5.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cpp-taskflow.json b/port_versions/c-/cpp-taskflow.json new file mode 100644 index 00000000000000..f0dfe81b4d8926 --- /dev/null +++ b/port_versions/c-/cpp-taskflow.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "b07021eb35b87c012df20b3720bf0ee2743eb5c8", + "version-string": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "4d892699b08144eb75d0a5555ac542b2d9cf2df1", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "8b8b9c6b78b27e5a058c1e46a560acc8bf26a59c", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "34bd6dbd41ae1167b83f6576897a407515a18821", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "c94fc4051157f810125817baf9914fc95a137327", + "version-string": "2018-11-30", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cppad.json b/port_versions/c-/cppad.json new file mode 100644 index 00000000000000..0fb26ef232838a --- /dev/null +++ b/port_versions/c-/cppad.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b18a6d765c26ff523ffec8761974e16343935e79", + "version-string": "20200000.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cppcms.json b/port_versions/c-/cppcms.json new file mode 100644 index 00000000000000..36200c0b221456 --- /dev/null +++ b/port_versions/c-/cppcms.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "d05a10e23b006a8c29e74810a7062f7f13bae6da", + "version-string": "1.2.1", + "port-version": 2 + }, + { + "git-tree": "5759a8eadf7334bdac9cfd467786a7f178ce2b65", + "version-string": "1.2.1-1", + "port-version": 0 + }, + { + "git-tree": "0fcc8a66b1985d0eb5438de868d2117465286d79", + "version-string": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "108a211292ada68ac2b2fba6977d4c06a74461f8", + "version-string": "1.1.0-2", + "port-version": 0 + }, + { + "git-tree": "bbf85ac89ed48da6cb54c6245e68dfd806754c63", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "38fe906677326d42240faa24a5aa987fb78f4df3", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cppcodec.json b/port_versions/c-/cppcodec.json new file mode 100644 index 00000000000000..9f26ae355cd49e --- /dev/null +++ b/port_versions/c-/cppcodec.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a31ff53a915e7fd45a3d7ada497f363ead024e71", + "version-string": "0.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cppcoro.json b/port_versions/c-/cppcoro.json new file mode 100644 index 00000000000000..5e0757162f9934 --- /dev/null +++ b/port_versions/c-/cppcoro.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "3ef6ef3cc3d6a50556d72ff1cd2c9f29e72d9769", + "version-string": "2020-2-28-1", + "port-version": 0 + }, + { + "git-tree": "28e22062a5885a689dbfddafae18907a7ed33c71", + "version-string": "2020-2-28", + "port-version": 0 + }, + { + "git-tree": "05da039516c924cb2ea4519cb311997d59f284e0", + "version-string": "2020.2", + "port-version": 0 + }, + { + "git-tree": "e974868f0f8b8eddc3f983f9546122159d498ed5", + "version-string": "2020.04", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cppfs.json b/port_versions/c-/cppfs.json new file mode 100644 index 00000000000000..7e7ce649917c19 --- /dev/null +++ b/port_versions/c-/cppfs.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9ba2e6a6be415048178367ecb17357c8c089fe76", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "bddd082629e8df8adcdc4fd95691fafca65be0a2", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "4c351e3f8fa1c6e8bdbbd1568a5d334d1eb12986", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cppgraphqlgen.json b/port_versions/c-/cppgraphqlgen.json new file mode 100644 index 00000000000000..62aa232729c9c9 --- /dev/null +++ b/port_versions/c-/cppgraphqlgen.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "2aab4f37ff7fc5961bfd7b91197c03d7ceb13a4a", + "version-string": "2020-12-07", + "port-version": 1 + }, + { + "git-tree": "c782c47d82aaf461f25be826dc6e5db982fbfcbe", + "version-string": "2020-12-07", + "port-version": 0 + }, + { + "git-tree": "cbdc16ea22f85a727ec48ce8d7e8d359ef2f5df3", + "version-string": "3.2.4", + "port-version": 0 + }, + { + "git-tree": "5b1b2287a1c76519202ff9c771fd5b742bdb22c0", + "version-string": "3.2.3", + "port-version": 0 + }, + { + "git-tree": "c4cd8f004c6aa884edb1d0399fa27331bd502dfb", + "version-string": "3.2.2", + "port-version": 0 + }, + { + "git-tree": "3026c5caefe5258ec4d56d27e7517c034797bb39", + "version-string": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "499a160a471826a9149c075318fc4d1c66af110e", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "c743b5aa0d542506881287c615b333050504f956", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "e43a98291331105e7f8afbf3f15da23b221eb597", + "version-string": "3.0.4", + "port-version": 0 + }, + { + "git-tree": "358aeec17f0b217b540595bdf41d80a1c1a6392b", + "version-string": "3.0.2", + "port-version": 0 + }, + { + "git-tree": "a73fd5e13009872a82ae7e98348440934d07c3ea", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "82fac752477dd25b7f69a6c18c2f1d8effda159d", + "version-string": "3.0.0-pre", + "port-version": 0 + }, + { + "git-tree": "accff1ec7158de0a00d3f0266b8c67b224c4c273", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "2b511ce7745ab708729cdc0f89e228f43226e0c8", + "version-string": "2.0.2", + "port-version": 0 + }, + { + "git-tree": "620f83ec562fd474124f723f6f175f8025a7f400", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "871c5ac386fa72a877f212882416bd74eab75ae7", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "d6d46aa6911761d7d4d5b8af4043bcc90a83b2a1", + "version-string": "0.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cppitertools.json b/port_versions/c-/cppitertools.json new file mode 100644 index 00000000000000..cb19009476d90d --- /dev/null +++ b/port_versions/c-/cppitertools.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "6f5ac65e92858f04e97468de01d59b60c0eac058", + "version-string": "2.0", + "port-version": 0 + }, + { + "git-tree": "b4f28eea9e6278533d369d168ebcff3306cd9c15", + "version-string": "2019-04-14-3", + "port-version": 0 + }, + { + "git-tree": "517143a7337d455f3a71ef24c530f8b0bc227eb3", + "version-string": "2019-04-14-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cppkafka.json b/port_versions/c-/cppkafka.json new file mode 100644 index 00000000000000..04aa49680219f6 --- /dev/null +++ b/port_versions/c-/cppkafka.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "93a1c2dd03f298272dbb69df1920b9897adff338", + "version-string": "0.3.1-2", + "port-version": 0 + }, + { + "git-tree": "bf9c72dbf5bd39d235ca8a045d20ec6c8b70758f", + "version-string": "0.3.1-1", + "port-version": 0 + }, + { + "git-tree": "2bd9536d096114471009902f29fd9a47cff3b1b5", + "version-string": "0.3.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cppmicroservices.json b/port_versions/c-/cppmicroservices.json new file mode 100644 index 00000000000000..1b19c277bcaca1 --- /dev/null +++ b/port_versions/c-/cppmicroservices.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "70e0b19ff0c3df69f82cc8aed8eb6d4add67bec2", + "version-string": "3.4.0", + "port-version": 2 + }, + { + "git-tree": "601bcc5a44a0093cda891fc3b5b92a9f61e0ed03", + "version-string": "3.4.0-1", + "port-version": 0 + }, + { + "git-tree": "e96000d51bc3b8a826c13033c9da1c6abefb28a7", + "version-string": "v3.4.0", + "port-version": 0 + }, + { + "git-tree": "65158d87c0e23f3f588bd804481f945469c30a87", + "version-string": "4.0.0-pre1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cpprestsdk.json b/port_versions/c-/cpprestsdk.json new file mode 100644 index 00000000000000..6a59cc4c8c750f --- /dev/null +++ b/port_versions/c-/cpprestsdk.json @@ -0,0 +1,169 @@ +{ + "versions": [ + { + "git-tree": "ff5cd3ae0efdd9346d66c0a1d0623be23eee837c", + "version-string": "2.10.17", + "port-version": 0 + }, + { + "git-tree": "1fb06431492f382bb54834c567db83bcb6cabe0b", + "version-string": "2.10.16-3", + "port-version": 0 + }, + { + "git-tree": "17cb3f7a61a5091087d53dbce2a8c2d328342ee8", + "version-string": "2.10.16-2", + "port-version": 0 + }, + { + "git-tree": "9e6aa1f352765cab12b207b4c195221bdf43c28b", + "version-string": "2.10.16-1", + "port-version": 0 + }, + { + "git-tree": "140c63764a9d13e325b065e30fb119d3f3d010a3", + "version-string": "2.10.16", + "port-version": 0 + }, + { + "git-tree": "e47b918125027860a9fff53282af5b5429019c7b", + "version-string": "2.10.15-1", + "port-version": 0 + }, + { + "git-tree": "2de6826ede1e8e28e1fa1f92afa1aaf0982fcede", + "version-string": "2.10.15", + "port-version": 0 + }, + { + "git-tree": "62ba6e5405bdf0806d8e8408a547e5872b8cba5d", + "version-string": "2.10.14-1", + "port-version": 0 + }, + { + "git-tree": "9f2e01f4c876c5915b7a685fd431a9ad98fb780f", + "version-string": "2.10.14", + "port-version": 0 + }, + { + "git-tree": "338cfcef457aaff1a329f7feeab92e21b9c96e5a", + "version-string": "2.10.13-1", + "port-version": 0 + }, + { + "git-tree": "e35cbfd7d6956d26a77f5cd607b129065856bb82", + "version-string": "2.10.13", + "port-version": 0 + }, + { + "git-tree": "64aa62b7a6fbbcdbb81588d23665a8c9f1e933aa", + "version-string": "2.10.12", + "port-version": 0 + }, + { + "git-tree": "4f987cafc2d3ab844221d48a077a766d9a3ee29e", + "version-string": "2.10.11", + "port-version": 0 + }, + { + "git-tree": "191b71a47f0e6220785677363f5d5cea098b5955", + "version-string": "2.10.10", + "port-version": 0 + }, + { + "git-tree": "2b2d0ceec9678fc5e7db0e7556745d8972395b0e", + "version-string": "2.10.7", + "port-version": 0 + }, + { + "git-tree": "d069e89c749dedcbafcef8f7e81e8b45d0658df2", + "version-string": "2.10.6-3", + "port-version": 0 + }, + { + "git-tree": "172a3a97fcd45e292496211fe91e574176bc66cf", + "version-string": "2.10.6-2", + "port-version": 0 + }, + { + "git-tree": "124a27eb315f4dc7c6239ab7922472e44e9154ec", + "version-string": "2.10.6-1", + "port-version": 0 + }, + { + "git-tree": "4598e0984e115a80d224b3fdf1c93f6af248daff", + "version-string": "2.10.6", + "port-version": 0 + }, + { + "git-tree": "3657c1899d91376fab9f85237f0869eaf7956673", + "version-string": "2.10.5", + "port-version": 0 + }, + { + "git-tree": "564f603510f30b61eae4daa39988950ed7d28bbf", + "version-string": "2.10.4", + "port-version": 0 + }, + { + "git-tree": "01dc05ee45ec6244d05ff645f494d6e9c9a8d109", + "version-string": "2.10.3-1", + "port-version": 0 + }, + { + "git-tree": "46e51015a1c082a2d5c05832ad39924f0470f526", + "version-string": "2.10.2-1", + "port-version": 0 + }, + { + "git-tree": "8431a5fe877e18bb6429a94ae05bf472d116e032", + "version-string": "2.10.2", + "port-version": 0 + }, + { + "git-tree": "78735f0f239560b88ec3ff1edd961a07f8d50e4e", + "version-string": "2.10.1-1", + "port-version": 0 + }, + { + "git-tree": "28426fb1d9d848d07082a0d3e3c7e0496a4c065a", + "version-string": "2.10.1", + "port-version": 0 + }, + { + "git-tree": "589c3b533d10da50f6f69cae7dde72fa78827c4e", + "version-string": "2.10.0", + "port-version": 0 + }, + { + "git-tree": "fa4bd515204c443f85bae314d0913ddc02332756", + "version-string": "2.9.0-4", + "port-version": 0 + }, + { + "git-tree": "0d9a0686badbc54f5ab73213aec95db2dbae88c3", + "version-string": "2.9.0-3", + "port-version": 0 + }, + { + "git-tree": "6696c08718d02424257e824f37b07bff3f54eff4", + "version-string": "2.9.0-2", + "port-version": 0 + }, + { + "git-tree": "c3fe95100142c708c7ba0386d2bb6e4671c3f4ed", + "version-string": "2.9.0-1", + "port-version": 0 + }, + { + "git-tree": "662d0903cce0892f8322bf3a273f865572ed6f31", + "version-string": "2.9.0", + "port-version": 0 + }, + { + "git-tree": "284d94938a84aa0380cf2f2f97c81281a2f0598a", + "version-string": "2.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cpptoml.json b/port_versions/c-/cpptoml.json new file mode 100644 index 00000000000000..50deb74915ba83 --- /dev/null +++ b/port_versions/c-/cpptoml.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b0520fd38bc9993e9a30a85f703e1a8941375a6c", + "version-string": "v0.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cppunit.json b/port_versions/c-/cppunit.json new file mode 100644 index 00000000000000..83bdc7a1ae5b7d --- /dev/null +++ b/port_versions/c-/cppunit.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "51029930bf5c3a123e0243de6b00ae385b654d5d", + "version-string": "1.15.1", + "port-version": 0 + }, + { + "git-tree": "8a2f0c4d2de8eda873fa115b8947649c79f9bc69", + "version-string": "1.14.0-1", + "port-version": 0 + }, + { + "git-tree": "a5fe83f49ae012a95b89a648009d4a2907211cc7", + "version-string": "1.14.0", + "port-version": 0 + }, + { + "git-tree": "4e658bc0aa6bd89be6d699b632542e1b7e2f603e", + "version-string": "1.13.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cpputest.json b/port_versions/c-/cpputest.json new file mode 100644 index 00000000000000..dd8ee292673bb4 --- /dev/null +++ b/port_versions/c-/cpputest.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4c3ab93d9f7c45b366a5ec0cc1cc3e69d4ef1d5c", + "version-string": "2019-9-16-1", + "port-version": 0 + }, + { + "git-tree": "6bbde7b8c1dbd7e6e226f89c36495cfdb53989d5", + "version-string": "2019-9-16", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cppwinrt.json b/port_versions/c-/cppwinrt.json new file mode 100644 index 00000000000000..da64d482478525 --- /dev/null +++ b/port_versions/c-/cppwinrt.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "191643fbd9c127658cf1724216a3b393951bd68e", + "version-string": "windows-sdk", + "port-version": 0 + }, + { + "git-tree": "a0c036af150f2403027d65dd1edf67912bb15038", + "version-string": "fall_2017_creators_update_for_vs_15.3-2", + "port-version": 0 + }, + { + "git-tree": "74b0e44f3bfbf43e2ce2b6a991ca2e4bb76c38bb", + "version-string": "fall_2017_creators_update_for_vs_15.3-1", + "port-version": 0 + }, + { + "git-tree": "871ffe70cfbe76920953fe524c54b3740ece517f", + "version-string": "fall_2017_creators_update_for_vs_15.3", + "port-version": 0 + }, + { + "git-tree": "3a1d02f146a6a6964bb2bfcce386b32653b4d522", + "version-string": "Fall_2017_Creators_Update_for_VS_15.3", + "port-version": 0 + }, + { + "git-tree": "2543006744c679e58a360a5215a95e8a2d651bfe", + "version-string": "spring_2017_creators_update_for_vs_15.3", + "port-version": 0 + }, + { + "git-tree": "1305a06f0e3f5e2bd2f2da5d15d74b85f1831e34", + "version-string": "feb2017_refresh-14393", + "port-version": 0 + }, + { + "git-tree": "8949a78637f33efc88f24c55d1ad0af28e312536", + "version-string": "1.010.0.14393.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cppzmq.json b/port_versions/c-/cppzmq.json new file mode 100644 index 00000000000000..caaa7cfa80a1d0 --- /dev/null +++ b/port_versions/c-/cppzmq.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "8f196edc3e7a6d6d26e14162ed542848d1eee4c1", + "version-string": "4.7.1", + "port-version": 1 + }, + { + "git-tree": "fba9b093eb785ca3319fd77193525533d6f3ea5d", + "version-string": "4.7.1", + "port-version": 0 + }, + { + "git-tree": "bf47fabe65f9440de51e6dc73ae76335d06173ea", + "version-string": "4.6.0", + "port-version": 0 + }, + { + "git-tree": "0424a180db1083469d5de966ebc4210df64a220c", + "version-string": "4.4.1", + "port-version": 0 + }, + { + "git-tree": "27ce123d5f695d0559583370f1678a1e21d6f765", + "version-string": "4.3.0-1", + "port-version": 0 + }, + { + "git-tree": "c95be3f1cd3205c897f4f9ed4af464624de3ce4d", + "version-string": "4.2.2-1", + "port-version": 0 + }, + { + "git-tree": "120c05998b1af4349cf112bf83792e38aa152081", + "version-string": "4.2.2", + "port-version": 0 + }, + { + "git-tree": "3c4fee746a83a2a1c2a82e219f315e2cc322f12b", + "version-string": "4.2.1", + "port-version": 0 + }, + { + "git-tree": "c405558ecd3631be2ae9c99647d9bcbe8e500416", + "version-string": "0.0.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cpr.json b/port_versions/c-/cpr.json new file mode 100644 index 00000000000000..edda87dadcdb67 --- /dev/null +++ b/port_versions/c-/cpr.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "0a3303682963a35032b7203c69051cf2edfaf41a", + "version-string": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "1e06a5e6c538b8e4aadba26caf119d68181ea648", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "a85262e3d90694d3d5201a31d6f54f79f8df18aa", + "version-string": "1.3.0-8", + "port-version": 0 + }, + { + "git-tree": "94d8bc574374b6624c06d9ea48fe7f1cacaf52b5", + "version-string": "1.3.0-7", + "port-version": 0 + }, + { + "git-tree": "35223ace2a569565da9efdc1e47266677220711a", + "version-string": "1.3.0-6", + "port-version": 0 + }, + { + "git-tree": "07bb80f5c054678cfad6daf3322bb455fc0a1d33", + "version-string": "1.3.0-4", + "port-version": 0 + }, + { + "git-tree": "0d9cab7dc1a45730e981984cf2e86747103cf054", + "version-string": "1.3.0-3", + "port-version": 0 + }, + { + "git-tree": "d6dad15c85eb9d8fbdffebdd22de92e2ed948f89", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "0023cfcf7b7b3f8da3cfe521fba5ba9d3cfdec88", + "version-string": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cpu-features.json b/port_versions/c-/cpu-features.json new file mode 100644 index 00000000000000..952b552974e46f --- /dev/null +++ b/port_versions/c-/cpu-features.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e622c89147a667757495a82dfd7e4239b2782bd7", + "version-string": "0.4.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cpuid.json b/port_versions/c-/cpuid.json new file mode 100644 index 00000000000000..811c4be14f1d62 --- /dev/null +++ b/port_versions/c-/cpuid.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "f802d870a436a93b77d88e007088880a41432dad", + "version-string": "0.4.1-1", + "port-version": 0 + }, + { + "git-tree": "0c783b61ec291c85d2a70427ae956b9bd2fc198e", + "version-string": "0.4.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cpuinfo.json b/port_versions/c-/cpuinfo.json new file mode 100644 index 00000000000000..3935c0e78a956e --- /dev/null +++ b/port_versions/c-/cpuinfo.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4e4c0561ce8cb5f57c0a63ce070598dc1544acde", + "version-string": "2019-07-28-1", + "port-version": 0 + }, + { + "git-tree": "cf29596ba95d0239461c492583384218b5e8a431", + "version-string": "2019-07-28", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cr.json b/port_versions/c-/cr.json new file mode 100644 index 00000000000000..fdfeff11c45490 --- /dev/null +++ b/port_versions/c-/cr.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2c71bf1df729facbf1f2ffcf77341ff901b00eda", + "version-string": "2020-04-26", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/crashpad.json b/port_versions/c-/crashpad.json new file mode 100644 index 00000000000000..7d1a2201677504 --- /dev/null +++ b/port_versions/c-/crashpad.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0de198199fe4c71142640bb10fd9fffe28a79349", + "version-string": "2020-03-18", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/crashrpt.json b/port_versions/c-/crashrpt.json new file mode 100644 index 00000000000000..665df26dda7ed0 --- /dev/null +++ b/port_versions/c-/crashrpt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "671b2d16a22bdaf8718e15fa13554c838b6e6ce7", + "version-string": "1.4.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/crc32c.json b/port_versions/c-/crc32c.json new file mode 100644 index 00000000000000..8cd7d7c4b021e6 --- /dev/null +++ b/port_versions/c-/crc32c.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "0e0e15c0dc05913aa952e8d0ce68b145ce8cdfdf", + "version-string": "1.1.1", + "port-version": 0 + }, + { + "git-tree": "3283a8e4667c1f13418f951e474d576a4fc01f88", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "f389d4282afd60d710f395e3aa3bff2a98e388e3", + "version-string": "1.0.7-1", + "port-version": 0 + }, + { + "git-tree": "3f24ca27d2d2f730b51e320676248d41445342e0", + "version-string": "1.0.7", + "port-version": 0 + }, + { + "git-tree": "745d73eb1ee20976f49f7d256dab79b1b0c48afe", + "version-string": "1.0.6-1", + "port-version": 0 + }, + { + "git-tree": "1e2099cd49db892b57d25113c7dc846d1a2b0fea", + "version-string": "1.0.6", + "port-version": 0 + }, + { + "git-tree": "e827e0e16d52ac19ce656dd1456817eec645d0cb", + "version-string": "1.0.5-1", + "port-version": 0 + }, + { + "git-tree": "63c19d9c0702e151f94c895f074df8ae1d115c17", + "version-string": "1.0.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/crfsuite.json b/port_versions/c-/crfsuite.json new file mode 100644 index 00000000000000..a05123c187fb2e --- /dev/null +++ b/port_versions/c-/crfsuite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "779f57b3fd1e0e2a15df5baf4488ef149f7f0cfd", + "version-string": "2019-07-21", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/croncpp.json b/port_versions/c-/croncpp.json new file mode 100644 index 00000000000000..6a60325c7b1dec --- /dev/null +++ b/port_versions/c-/croncpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "efc67eae1ad2b9fa1c1655c977b0800ef2113313", + "version-string": "2020-09-04", + "port-version": 1 + } + ] +} diff --git a/port_versions/c-/crossguid.json b/port_versions/c-/crossguid.json new file mode 100644 index 00000000000000..42806aa2fabea7 --- /dev/null +++ b/port_versions/c-/crossguid.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4b44e01ccbe952e12c3be478e0d5bc4340f4c9df", + "version-string": "0.2.2-2018-06-16-1", + "port-version": 0 + }, + { + "git-tree": "879a9da5c388f9a0e44d915f1c1fd9134a51d273", + "version-string": "0.2.2-2018-06-16", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/crow.json b/port_versions/c-/crow.json new file mode 100644 index 00000000000000..dcbe0b3be7d310 --- /dev/null +++ b/port_versions/c-/crow.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "5759b9679960c34a0e663f83ad32ba2e1320e2d5", + "version-string": "0.1-1", + "port-version": 0 + }, + { + "git-tree": "2bda17839e15cd3eb12caaaf15257c289a234e4e", + "version-string": "0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cryptopp.json b/port_versions/c-/cryptopp.json new file mode 100644 index 00000000000000..a51537096fb94f --- /dev/null +++ b/port_versions/c-/cryptopp.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "ad41b9e4eb55001f640b5aab811f288862829d70", + "version-string": "8.2.0-2", + "port-version": 0 + }, + { + "git-tree": "1f72925199ecfcd7e2b929372af100e95c80bc2e", + "version-string": "8.2.0-1", + "port-version": 0 + }, + { + "git-tree": "c38385f64a782e04b07d8d52270238d7c67531c0", + "version-string": "8.2.0", + "port-version": 0 + }, + { + "git-tree": "9abae7256650f7984be9a8842e2065632fa04873", + "version-string": "8.1.0-2", + "port-version": 0 + }, + { + "git-tree": "301eaab34677f43ea45fc8a3595b95e1dba667b9", + "version-string": "8.1.0-1", + "port-version": 0 + }, + { + "git-tree": "6214913a24800179f96967ff011b4971f0ba37c4", + "version-string": "8.1.0", + "port-version": 0 + }, + { + "git-tree": "ed9ae9c16bf325ce8174bca07b5c631d67a476a4", + "version-string": "8.0.0", + "port-version": 0 + }, + { + "git-tree": "1ba7e947a88e4974ef1cfa79fd593ac76fdec852", + "version-string": "7.0.0", + "port-version": 0 + }, + { + "git-tree": "2092d28a83d075bd3e55502cd553bdc05bfbe5d9", + "version-string": "6.1.0-2", + "port-version": 0 + }, + { + "git-tree": "9120c6cf23a2f6d11b278b84dca0293f339a4335", + "version-string": "6.1.0-1", + "port-version": 0 + }, + { + "git-tree": "2ea8fd174557a9efb2964a7c725f04b599caac12", + "version-string": "5.6.5-1", + "port-version": 0 + }, + { + "git-tree": "48bdda8cdb96b1feeb88c61c839ea06db57c723d", + "version-string": "5.6.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cspice.json b/port_versions/c-/cspice.json new file mode 100644 index 00000000000000..59a41ecb21a126 --- /dev/null +++ b/port_versions/c-/cspice.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "743b26ef365d681a5252d2d72a58aa8c2e76d80b", + "version-string": "66", + "port-version": 3 + }, + { + "git-tree": "3c62eb98ca2a5c0df94fbab74649c3af954232d5", + "version-string": "66", + "port-version": 2 + }, + { + "git-tree": "037c7e4203b58cc2febead341cc17e9abf37c117", + "version-string": "66-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/ctbignum.json b/port_versions/c-/ctbignum.json new file mode 100644 index 00000000000000..90efde08d0e75c --- /dev/null +++ b/port_versions/c-/ctbignum.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ff7d4b1e86ce05b4b86cf72977181f1173b68ba1", + "version-string": "2019-08-02", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/ctemplate.json b/port_versions/c-/ctemplate.json new file mode 100644 index 00000000000000..f51ec5cda446bf --- /dev/null +++ b/port_versions/c-/ctemplate.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "96aee13ec21957f5d9253a4e382f1896c312d7e8", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "c3864e4d9a627e75fb34b84351242574dad9c6df", + "version-string": "2017-06-23-44b7c5-4", + "port-version": 0 + }, + { + "git-tree": "a43674ee869a388a4e1dcab7a5fb727ad18de7a0", + "version-string": "2017-06-23-44b7c5-3", + "port-version": 0 + }, + { + "git-tree": "4d9b580f94963badba330f29c958021148bd1f31", + "version-string": "2017-06-23-44b7c5-2", + "port-version": 0 + }, + { + "git-tree": "8bca75088fb256f77df0783c8c0687ae5a3a0fe0", + "version-string": "2017-06-23-44b7c5b918a08ad561c63e9d28beecb40c10ebca", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/ctp.json b/port_versions/c-/ctp.json new file mode 100644 index 00000000000000..fb66ad203f22ef --- /dev/null +++ b/port_versions/c-/ctp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "8536b8c9fe4d95bb93ebd961e1e1dadc9dd6e4e9", + "version-string": "6.3.15_20190220_se", + "port-version": 1 + }, + { + "git-tree": "e785bad86454f3e0a8fef0705cfadb061003834c", + "version-string": "6.3.15_20190220_se", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/ctre.json b/port_versions/c-/ctre.json new file mode 100644 index 00000000000000..fab0a526f83e8e --- /dev/null +++ b/port_versions/c-/ctre.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e50c31381fad0a8a4ac062531eaef4f728c2a469", + "version-string": "2.10", + "port-version": 0 + }, + { + "git-tree": "646f2e3d033ffb68de2b1ae551c1dbae3f0b1cda", + "version-string": "2.7", + "port-version": 0 + }, + { + "git-tree": "093722ff97cf6e82157693f8d93ad91ef414bbb9", + "version-string": "2.6.4", + "port-version": 0 + }, + { + "git-tree": "0fec09f20afaba210be40d91b71723541e2ab16e", + "version-string": "2.2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cub.json b/port_versions/c-/cub.json new file mode 100644 index 00000000000000..54f9e9761f1224 --- /dev/null +++ b/port_versions/c-/cub.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "3d12aea8561ac6b5566b5ade8379993b82d8d6b1", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "62e5e295c5bd4102785083c15f4e88725cf3890e", + "version-string": "1.8.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cuda.json b/port_versions/c-/cuda.json new file mode 100644 index 00000000000000..4c9ba054ab3373 --- /dev/null +++ b/port_versions/c-/cuda.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "0022275f9aa9e2d70f6a35d7e28fb27ab21fd13e", + "version-string": "10.1", + "port-version": 5 + }, + { + "git-tree": "b692639f7b4b82f90b80e33dc3d6da2983975ab5", + "version-string": "10.1", + "port-version": 4 + }, + { + "git-tree": "ca5aa9e76b7b91b7104ad108b448dbf1719b5530", + "version-string": "10.1", + "port-version": 3 + }, + { + "git-tree": "e21c4698f343b201e52e8fc6163a4573bf94b274", + "version-string": "10.1", + "port-version": 2 + }, + { + "git-tree": "896402a9ab10ead504697b7fd62992ce379f1f13", + "version-string": "10.1-1", + "port-version": 0 + }, + { + "git-tree": "4b8ccbadfeb5ec1148135d0620c203f6ceeaf813", + "version-string": "10.1", + "port-version": 0 + }, + { + "git-tree": "aac6a595a656340084cd13ee7aa8e39308e60cb9", + "version-string": "9.0", + "port-version": 0 + }, + { + "git-tree": "18842eaf8f339b66d8bf7bc1e1cb52f7d0674db0", + "version-string": "8.0-1", + "port-version": 0 + }, + { + "git-tree": "aa51016a592261707294e823934d0464b988d3ac", + "version-string": "8.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cudnn.json b/port_versions/c-/cudnn.json new file mode 100644 index 00000000000000..4ae95501c8f3a5 --- /dev/null +++ b/port_versions/c-/cudnn.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "8f40428fb1779b79fbbb08e3e52e984fe656439d", + "version-string": "7.6", + "port-version": 4 + }, + { + "git-tree": "05c5ad2600e1b2c17c8ddd8cc4fd54f360c01f2e", + "version-string": "7.6", + "port-version": 3 + }, + { + "git-tree": "37da8c573edd47c0cbefddd148f3f9eeac40adb1", + "version-string": "7.6", + "port-version": 2 + }, + { + "git-tree": "80dc9ac0ec8a2ab687d9b3f23dedae79376b89e6", + "version-string": "7.6", + "port-version": 1 + }, + { + "git-tree": "29d3b0383cd8f92e8b8c88b1d8f4e88860d1e0e5", + "version-string": "7.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cunit.json b/port_versions/c-/cunit.json new file mode 100644 index 00000000000000..78cf499eee03a0 --- /dev/null +++ b/port_versions/c-/cunit.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "f534a55290d8bce0e7d8fd5f443550c4565a4b63", + "version-string": "2.1.3-6", + "port-version": 0 + }, + { + "git-tree": "8af22f1b574a271ad022d4d15ce261a913d6f6f5", + "version-string": "2.1.3-4", + "port-version": 0 + }, + { + "git-tree": "d3f77bce6db68e69e816ea95122a625c082b08c0", + "version-string": "2.1.3-3", + "port-version": 0 + }, + { + "git-tree": "e50560ddf376a65ed799c20b617eebd8fb519e67", + "version-string": "2.1.3-2", + "port-version": 0 + }, + { + "git-tree": "560210636b2139272be5a80f64b56651180e77f7", + "version-string": "2.1.3-1", + "port-version": 0 + }, + { + "git-tree": "ff164993a7b025594837f969f6efb0b17bde31ad", + "version-string": "2.1.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/curl.json b/port_versions/c-/curl.json new file mode 100644 index 00000000000000..bb7c2498489859 --- /dev/null +++ b/port_versions/c-/curl.json @@ -0,0 +1,269 @@ +{ + "versions": [ + { + "git-tree": "60383eff8665ca21ab8e2596ecafd27c7e001f5c", + "version-string": "7.74.0", + "port-version": 2 + }, + { + "git-tree": "339c5526eafa56c12aa1ba2f00c1d86778f4eb2c", + "version-string": "7.74.0", + "port-version": 1 + }, + { + "git-tree": "d5d242c3311f6d6f3b779ea169911382e99d2c9a", + "version-string": "7.74.0", + "port-version": 0 + }, + { + "git-tree": "811ecaeda7d73ffee81358981432326aee4b3ed1", + "version-string": "7.73.0", + "port-version": 4 + }, + { + "git-tree": "7fd5c9f0c5b8e54e32c02f35955796362a8344ce", + "version-string": "7.73.0", + "port-version": 3 + }, + { + "git-tree": "946d1b2dfd87703f7a5e758aaeb6b880dccc580f", + "version-string": "7.73.0", + "port-version": 2 + }, + { + "git-tree": "91875b9759f0bc2be5259ff0f02f63447a8ed4f7", + "version-string": "7.73.0", + "port-version": 1 + }, + { + "git-tree": "827731725a04ef7b9a801c7ddd424f797b46ec29", + "version-string": "7.73.0", + "port-version": 0 + }, + { + "git-tree": "1ceea1068a6ad293e19d2e9d99f52d3a09784b44", + "version-string": "7.72.0", + "port-version": 0 + }, + { + "git-tree": "8dc1c6c898d97efedd41b2946e69aa4ff2602ed8", + "version-string": "7.71.1", + "port-version": 2 + }, + { + "git-tree": "cbf8512f3b54afedaad106819a786cfefd133586", + "version-string": "7.71.1", + "port-version": 1 + }, + { + "git-tree": "05ef3cff9d206a5cef9311dd4a46129eabeb24e3", + "version-string": "7.71.1", + "port-version": 0 + }, + { + "git-tree": "0784d746f99f03aae43d64d5440186b08b1021b4", + "version-string": "7.68.0-3", + "port-version": 0 + }, + { + "git-tree": "2dbb8c19b478cc2d21b5ec391726af3a082f3105", + "version-string": "7.68.0-2", + "port-version": 0 + }, + { + "git-tree": "a3de120d738af7e4497b94d450d6c81588b2941b", + "version-string": "7.68.0-1", + "port-version": 0 + }, + { + "git-tree": "411397475467e68ef64452323732507337b10a89", + "version-string": "7.68.0", + "port-version": 0 + }, + { + "git-tree": "e257a8eb6852e23bc4e537e981275128fc65a915", + "version-string": "7.66.0-2", + "port-version": 0 + }, + { + "git-tree": "3df3fb9850115ba5f5b1e95aa216cdf8ded5cef2", + "version-string": "7.66.0-1", + "port-version": 0 + }, + { + "git-tree": "6a4d320e2ea2240024b8bbd6a2140758c71e5bae", + "version-string": "7.66.0", + "port-version": 0 + }, + { + "git-tree": "a37d5a2c1c1f280771896bcce6625059f556fc1b", + "version-string": "7.65.2-1", + "port-version": 0 + }, + { + "git-tree": "95a7b48ce1b1bb954b66fe8f36bde5a1f19467b1", + "version-string": "7.65.0-3", + "port-version": 0 + }, + { + "git-tree": "b8bab287650fd1c911306dccfb5a0930339dfe95", + "version-string": "7.65.0-2", + "port-version": 0 + }, + { + "git-tree": "94c1017f39d4cbf03a432f0017bd4931827ae31c", + "version-string": "7.65.0-1", + "port-version": 0 + }, + { + "git-tree": "9a1ad4846968fbdc30eb12342718a808cf72e599", + "version-string": "7.65.0", + "port-version": 0 + }, + { + "git-tree": "c8cbb2083b611478ae87e48b0a084e11ba5b81db", + "version-string": "7.61.1-7", + "port-version": 0 + }, + { + "git-tree": "5bdb85e44410b31db141e7fc566a832d77a6fb72", + "version-string": "7.61.1-6", + "port-version": 0 + }, + { + "git-tree": "9df7b77979747327805a1d28d9b6c92ded93951b", + "version-string": "7.61.1-5", + "port-version": 0 + }, + { + "git-tree": "96044857ad378b99e6d2c166722d0ed55e3b34fd", + "version-string": "7.61.1-4", + "port-version": 0 + }, + { + "git-tree": "31583ef83f7a254a0fb85631fc1be6208bb6d81b", + "version-string": "7.61.1-3", + "port-version": 0 + }, + { + "git-tree": "870b88aaf136109a501bbf0d2ffed92adc77a0e8", + "version-string": "7.61.1-2", + "port-version": 0 + }, + { + "git-tree": "de08b253f7a08595237086df793568fa3046eeb8", + "version-string": "7.61.1-1", + "port-version": 0 + }, + { + "git-tree": "89ff21bc295a1960addad44620abdd648a986bd7", + "version-string": "7.61.1", + "port-version": 0 + }, + { + "git-tree": "634222adc293f6917c0ad29f28810fa562efaa62", + "version-string": "7.61.0", + "port-version": 0 + }, + { + "git-tree": "febe31ccc4ac1700375e616f22545b564256538f", + "version-string": "7.60.0-2", + "port-version": 0 + }, + { + "git-tree": "5c99a5b08e3cd576af10a7f8ec15bb148c1fb113", + "version-string": "7.60.0-1", + "port-version": 0 + }, + { + "git-tree": "0ab38392eaa1139eef0195034ad790533956ae47", + "version-string": "7.60.0", + "port-version": 0 + }, + { + "git-tree": "3bc5aead178374533462dbe60c71bebbcec5ee73", + "version-string": "7_59_0-2", + "port-version": 0 + }, + { + "git-tree": "e97e031a8c8f8a72f5af1d8dc8013ff1f32b4599", + "version-string": "7_59_0-1", + "port-version": 0 + }, + { + "git-tree": "319a46d30ebaf47de0535e346ea07cf4de80ed64", + "version-string": "7.59.0", + "port-version": 0 + }, + { + "git-tree": "838a2f6c4d823c6e0143edc4a3310b702a86e992", + "version-string": "7.58.0-5", + "port-version": 0 + }, + { + "git-tree": "e562a0f028793f7b53de8b8a637f098656f8aa2c", + "version-string": "7.58.0-4", + "port-version": 0 + }, + { + "git-tree": "9606747f24fd42c10e74fa19926564e786165d73", + "version-string": "7.58.0-1", + "port-version": 0 + }, + { + "git-tree": "10c9b5413c70832a2a9daf2687fbc498b685bd2e", + "version-string": "7.58.0", + "port-version": 0 + }, + { + "git-tree": "bb2822ab3af6dcb9224745033e04a7abac7a82ca", + "version-string": "7.57.0-2", + "port-version": 0 + }, + { + "git-tree": "488e8f8e4edbc0ae1f43218a2ec6327003e0b1d3", + "version-string": "7.57.0-1", + "port-version": 0 + }, + { + "git-tree": "e62c2e7f3bddd211a08a4e9d9bd75c79077446b6", + "version-string": "7.55.1-1", + "port-version": 0 + }, + { + "git-tree": "1a5a244a1d2a1c9a062cde3545e9f28e3d29b031", + "version-string": "7.55.1", + "port-version": 0 + }, + { + "git-tree": "a8328541662f68cf18c3f6b96ffe4e9a8eb4125e", + "version-string": "7.55.0", + "port-version": 0 + }, + { + "git-tree": "d81fb4fe0783b6a61aadf7eea5a4f08f5bea91dc", + "version-string": "7.51.0-3", + "port-version": 0 + }, + { + "git-tree": "1edce6a49fe36df502fff68465b07dcf7cbdbc1a", + "version-string": "7.51.0-2", + "port-version": 0 + }, + { + "git-tree": "240594d0f45e0f8f8a2eb978af3febee7d9ec6ea", + "version-string": "7.51.0-1", + "port-version": 0 + }, + { + "git-tree": "a0dde0f9340d6ae56ec6959f9c9a8316e6f6f945", + "version-string": "7.51.0", + "port-version": 0 + }, + { + "git-tree": "bd88d5710b7efffa20c9815d3cb9142e842bd58e", + "version-string": "7.48.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/curlpp.json b/port_versions/c-/curlpp.json new file mode 100644 index 00000000000000..205c427040fbd7 --- /dev/null +++ b/port_versions/c-/curlpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "121083d20c3bd1cdb738697da5ae8ae1917ccee8", + "version-string": "2018-06-15-3", + "port-version": 0 + }, + { + "git-tree": "ccdf1419c1aa3030cba618bf696e064e8a089772", + "version-string": "2018-06-15-2", + "port-version": 0 + }, + { + "git-tree": "55c1ee44b050a3a3d79a2e2d7bf3df7dfaca0fb1", + "version-string": "2018-06-15-1", + "port-version": 0 + }, + { + "git-tree": "8b7093e6772f8b0e137fa018122444e15f194bef", + "version-string": "2018-06-15", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cute-headers.json b/port_versions/c-/cute-headers.json new file mode 100644 index 00000000000000..066c59028aa478 --- /dev/null +++ b/port_versions/c-/cute-headers.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c8b815cb53310c522b4789c34e1961c4a816beab", + "version-string": "2019-09-20", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cutelyst2.json b/port_versions/c-/cutelyst2.json new file mode 100644 index 00000000000000..fa0c1847be0537 --- /dev/null +++ b/port_versions/c-/cutelyst2.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "d451e8108a8ac3305fda61e441505d6244260329", + "version-string": "2.12.0", + "port-version": 0 + }, + { + "git-tree": "4eb08152bc0a1ba92fdff5844c3181efd7374765", + "version-string": "2.9.0-1", + "port-version": 0 + }, + { + "git-tree": "3fa16ba6900d9ddce5f2b5c7c807e1501bebe84f", + "version-string": "2.9.0", + "port-version": 0 + }, + { + "git-tree": "775839495211e69907a217fe3443897e4ddf0e16", + "version-string": "2.8.0", + "port-version": 0 + }, + { + "git-tree": "04e5bee0904e5e1277ca5287ffc591b6e06f6711", + "version-string": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "84836e89d33907828ea8481de27d0e42842c2873", + "version-string": "2.5.2-2", + "port-version": 0 + }, + { + "git-tree": "ba146ce08b03e85b46ba478826e2d10386778817", + "version-string": "2.5.2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cwalk.json b/port_versions/c-/cwalk.json new file mode 100644 index 00000000000000..16a560bb3a3473 --- /dev/null +++ b/port_versions/c-/cwalk.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5cec9575426a50a36612850c9681b8216572a3db", + "version-string": "1.2.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/cxxopts.json b/port_versions/c-/cxxopts.json new file mode 100644 index 00000000000000..78acabcd7d370f --- /dev/null +++ b/port_versions/c-/cxxopts.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "b366e598bbb99685f33563a0b224f710be2b5124", + "version-string": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "e0ddc1ffcbf704aaca88504484c4dd5624e84782", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "a368104bdfd4a1284e8b3853e83a2fc0fa750663", + "version-string": "2.1.2-1", + "port-version": 0 + }, + { + "git-tree": "f825f847c7a1cadb04d7c5310aa56498cb679f26", + "version-string": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "4804e5bda99dbbb19fa3216f7ccb623400f12379", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "3895ddad1f82d26e71ca7b0cf463e6fce2fc0d6e", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "dd7333b303b3b07d77481b1cd36f022845ab208d", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "b96dbdf46cca0f4b6cc4ed5f60a98de3e168bf5c", + "version-string": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/c-/czmq.json b/port_versions/c-/czmq.json new file mode 100644 index 00000000000000..3d8139285e5882 --- /dev/null +++ b/port_versions/c-/czmq.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "31aceda22627ab6f97f03868d5f92a4cc78a275e", + "version-string": "2019-06-10-4", + "port-version": 0 + }, + { + "git-tree": "46b00b984d0ab212fd51b1205eb75ced5c7ca3be", + "version-string": "2019-06-10-3", + "port-version": 0 + }, + { + "git-tree": "4ef1ce1d90c4740423a6de5a1baa8ace8825723a", + "version-string": "2019-06-10-2", + "port-version": 0 + }, + { + "git-tree": "1a6acfd363bbeb4d170f8ce9b57ac5342f6c662e", + "version-string": "2019-06-10-1", + "port-version": 0 + }, + { + "git-tree": "4ba8a7fc3d6250d6335b76732863c7602a6d3837", + "version-string": "2019-06-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/d3dx12.json b/port_versions/d-/d3dx12.json new file mode 100644 index 00000000000000..15520eefdccb16 --- /dev/null +++ b/port_versions/d-/d3dx12.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8ee92f85b281f540bb897404333cd300bd02e015", + "version-string": "may2020", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/darknet.json b/port_versions/d-/darknet.json new file mode 100644 index 00000000000000..c7e4b4daa1754b --- /dev/null +++ b/port_versions/d-/darknet.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "5013a879bca7ed0f5a443fa9e379abbedfd38eeb", + "version-string": "2020-08-30", + "port-version": 2 + }, + { + "git-tree": "112131c0ca5d5d396ec1c64f52f7609f12629df7", + "version-string": "2020-08-30", + "port-version": 1 + }, + { + "git-tree": "bd9030de7c341f1e5ea65a0ef7f3804d4cb8a15d", + "version-string": "2020-08-30", + "port-version": 0 + }, + { + "git-tree": "0ed3c7001cc0e5c9c8236a597eabe8c80b042771", + "version-string": "2020-06-29", + "port-version": 0 + }, + { + "git-tree": "6f518b887149ce83d9cc3459678acab773392a37", + "version-string": "2020-03-02", + "port-version": 0 + }, + { + "git-tree": "d182106de516d8071c4fa2a7a28e7ce8b1de3b87", + "version-string": "0.2.5.1-1", + "port-version": 0 + }, + { + "git-tree": "7ce2f496849dc8c4b05c6e6485ed403f4fa06275", + "version-string": "0.2.5.1", + "port-version": 0 + }, + { + "git-tree": "297845c7627bddbb821fc70529f1573db47f19fc", + "version-string": "0.2.5-6", + "port-version": 0 + }, + { + "git-tree": "f5e89045b030a26eae504a302a5f75bffe72e2be", + "version-string": "0.2.5-5", + "port-version": 0 + }, + { + "git-tree": "620693c86298122d0a9a2697a860b4f0606eeafb", + "version-string": "0.2.5-4", + "port-version": 0 + }, + { + "git-tree": "b34cc69fde346abedd8da82d5fd0b2f771e7b5fc", + "version-string": "0.2.5-3", + "port-version": 0 + }, + { + "git-tree": "82b472bbbbb8548462a3ee18c161a522d669bd74", + "version-string": "0.2.5-1", + "port-version": 0 + }, + { + "git-tree": "57a08801e58c9d5cb053d5607c542bd41eab20ae", + "version-string": "0.2.5", + "port-version": 0 + }, + { + "git-tree": "bd529056d9c1c1efd32d06de69277d45775dd5b8", + "version-string": "1.0.0-2", + "port-version": 0 + }, + { + "git-tree": "b17f58f85878ed7a5296376516d39f17d3766c7b", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "9b09d121b686c7a75520b7e8af399c266cc4309c", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/darts-clone.json b/port_versions/d-/darts-clone.json new file mode 100644 index 00000000000000..9cc1ad2c6c3bb8 --- /dev/null +++ b/port_versions/d-/darts-clone.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b54d1af1ee2c42b0b298fa3d40c7e283b3da015c", + "version-string": "1767ab87cffe-1", + "port-version": 0 + }, + { + "git-tree": "3e3ba2742cbbf9670330537de59a170c93dc43c0", + "version-string": "1767ab87cffe", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dartsim.json b/port_versions/d-/dartsim.json new file mode 100644 index 00000000000000..4fd122f2f9fe73 --- /dev/null +++ b/port_versions/d-/dartsim.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e9a9e2df385efc1d41aeea022f88f7e6a07f81ba", + "version-string": "6.9.4", + "port-version": 0 + }, + { + "git-tree": "69ef8d2e6929546c0e8e3103a5badafc31ac775a", + "version-string": "9.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dataframe.json b/port_versions/d-/dataframe.json new file mode 100644 index 00000000000000..0a419a3b5d7adc --- /dev/null +++ b/port_versions/d-/dataframe.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b640578906e46407df50c501573ceb04980d6dfc", + "version-string": "1.12.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/date.json b/port_versions/d-/date.json new file mode 100644 index 00000000000000..4f4350366dcb29 --- /dev/null +++ b/port_versions/d-/date.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "42976b85736114e38204b7d8cd5ea5e74a73c7cd", + "version-string": "3.0.0", + "port-version": 1 + }, + { + "git-tree": "0bbf15fc741ad797a3ec3cce9ab9680314193893", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "b63095cd5aa753503485086cc3d1de7dc90f582c", + "version-string": "2019-11-08", + "port-version": 0 + }, + { + "git-tree": "07207105c10a4c3af8c5d1e3aa4db0a40504a253", + "version-string": "2019-09-09", + "port-version": 0 + }, + { + "git-tree": "fd3b27793570e0e280484742d317ab1c9e8fa8b7", + "version-string": "2019-05-18-1", + "port-version": 0 + }, + { + "git-tree": "218b69419ce2cd95376d9997c607272c53af9329", + "version-string": "ed0368f", + "port-version": 0 + }, + { + "git-tree": "dbd5ad3d1ad0c3833c96c135916bde49de140cbc", + "version-string": "081e9af", + "port-version": 0 + }, + { + "git-tree": "1819dbe39242b7a3a7f4ef72b5e5bf144bc778ff", + "version-string": "9dc96fd", + "port-version": 0 + }, + { + "git-tree": "41512b5bc68599041b958ddbf26dacbf088706f2", + "version-string": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "99b3cbf711c0ec049445cf5586a2ee6373280892", + "version-string": "2.4", + "port-version": 0 + }, + { + "git-tree": "f893b79100322bff63486b8f162d5ad94e3490b9", + "version-string": "2.3-c286981b3bf83c79554769df68b27415cee68d77", + "port-version": 0 + }, + { + "git-tree": "16b03b9409ef7736aa57323363c04b3a4cd14c3f", + "version-string": "2.3", + "port-version": 0 + }, + { + "git-tree": "0d7d4b3336f8d2e169fdc3305199a1b84abf40bb", + "version-string": "2.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dbg-macro.json b/port_versions/d-/dbg-macro.json new file mode 100644 index 00000000000000..fbc08e0d9644c8 --- /dev/null +++ b/port_versions/d-/dbg-macro.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0a78c2a06c6717eb7b5049c72b6529b7ce88942b", + "version-string": "2019-07-11", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dbghelp.json b/port_versions/d-/dbghelp.json new file mode 100644 index 00000000000000..21ea91a6bf374a --- /dev/null +++ b/port_versions/d-/dbghelp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9a5b9a5962883da2ac82a87f9b0bf78c0c8b0f62", + "version-string": "0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dbow2.json b/port_versions/d-/dbow2.json new file mode 100644 index 00000000000000..8fe2ec85ef0735 --- /dev/null +++ b/port_versions/d-/dbow2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e26ed5627995f7e51f34cb8dfe2044397bb4e932", + "version-string": "2019-08-05", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dbow3.json b/port_versions/d-/dbow3.json new file mode 100644 index 00000000000000..4957cbed59f4c3 --- /dev/null +++ b/port_versions/d-/dbow3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "85a92409d590110eafbc10a26486a531749e9dd1", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dcmtk.json b/port_versions/d-/dcmtk.json new file mode 100644 index 00000000000000..6ef310557993d5 --- /dev/null +++ b/port_versions/d-/dcmtk.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "c5cc40d9aabe103e79ca9315543646243b001814", + "version-string": "3.6.5+_20191213", + "port-version": 0 + }, + { + "git-tree": "d1268262fdac724d439ce2950d6b00058ede17fb", + "version-string": "3.6.4-2", + "port-version": 0 + }, + { + "git-tree": "3088b7b6f30c56be7c6b2bc5b9f67418b9c13304", + "version-string": "3.6.4-1", + "port-version": 0 + }, + { + "git-tree": "1360e42bd90285d9008a1cf1fc45180fe996f8ab", + "version-string": "3.6.4", + "port-version": 0 + }, + { + "git-tree": "4c631af1b36122e775699e41567c26de0c65959f", + "version-string": "3.6.3-1", + "port-version": 0 + }, + { + "git-tree": "e66fa18f406e495a6f130273c3a4be915fbdb625", + "version-string": "3.6.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/debug-assert.json b/port_versions/d-/debug-assert.json new file mode 100644 index 00000000000000..99356b87ce68e7 --- /dev/null +++ b/port_versions/d-/debug-assert.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "06dae04f139744f1065ed1a6ed41631c6a431a5c", + "version-string": "1.3.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/decimal-for-cpp.json b/port_versions/d-/decimal-for-cpp.json new file mode 100644 index 00000000000000..99b7bd5d62587a --- /dev/null +++ b/port_versions/d-/decimal-for-cpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9a7b8c44bcd4ee8396edbb03495d998169d4f292", + "version-string": "1.16", + "port-version": 1 + }, + { + "git-tree": "c012da22fcf945d11b7257267dc4f3bac624559b", + "version-string": "1.16", + "port-version": 0 + }, + { + "git-tree": "28fac5873c038e12018866b22733778e55d8c9ad", + "version-string": "1.12", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/detours.json b/port_versions/d-/detours.json new file mode 100644 index 00000000000000..6726eb336462eb --- /dev/null +++ b/port_versions/d-/detours.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ab6a570459cbae07325fbfdd4b51992c9dad3e41", + "version-string": "4.0.1-1", + "port-version": 0 + }, + { + "git-tree": "70b3a37716498dc7d45218e40a984b3a77c35b1b", + "version-string": "4.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/devicenameresolver.json b/port_versions/d-/devicenameresolver.json new file mode 100644 index 00000000000000..d35668c1399cdf --- /dev/null +++ b/port_versions/d-/devicenameresolver.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a0053afe91272f44589a53a866a3bc766d9e9d09", + "version-string": "2016-06-26-0850d88fa6-1", + "port-version": 0 + }, + { + "git-tree": "b786b6ee7391af2848f90d2e55b05df6c27f385b", + "version-string": "2016-06-26-0850d88fa6", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/devil.json b/port_versions/d-/devil.json new file mode 100644 index 00000000000000..9a2d82abe679d1 --- /dev/null +++ b/port_versions/d-/devil.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "d3e52a6334ec5ccb93fba69e531ab4979b827522", + "version-string": "1.8.0", + "port-version": 7 + }, + { + "git-tree": "6f70f69f1b91d2c33d481334d78243878b3da2fd", + "version-string": "1.8.0", + "port-version": 6 + }, + { + "git-tree": "2b7b10fb9655228c83df012ccb8caac214388ea6", + "version-string": "1.8.0-5", + "port-version": 0 + }, + { + "git-tree": "d864c1c66cd7609f7c4ee805f346347e363c186b", + "version-string": "1.8.0-4", + "port-version": 0 + }, + { + "git-tree": "6b64bfbb1af606b470c2e3e5f863ff3922a24bff", + "version-string": "1.8.0-3", + "port-version": 0 + }, + { + "git-tree": "64cae9e0a9595b8a48543cca4717d4883b0eedaf", + "version-string": "1.8.0-2", + "port-version": 0 + }, + { + "git-tree": "8d470e89ca3f784e2c7815a2c0394738e354a6df", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "68da11879927880fc04d13c1a66eb1dc0b444cfc", + "version-string": "1.8.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dimcli.json b/port_versions/d-/dimcli.json new file mode 100644 index 00000000000000..843a92705ba302 --- /dev/null +++ b/port_versions/d-/dimcli.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "da33c865acdf04845f77a46b89264544bfaf30cf", + "version-string": "5.0.2", + "port-version": 0 + }, + { + "git-tree": "508a42a39d654dd70909b5fea498b4b068ba6a09", + "version-string": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "57a85674889c21c25770d674cee523e6040326e2", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "4780b3c02c9a92cc283f2da1c35214cb6e0f4cf5", + "version-string": "4.1.0-1", + "port-version": 0 + }, + { + "git-tree": "80dd089d889a2cdcdb95305892ae046892eb7167", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "c6b92cf16ca57984325782d235c5fa912d5d7d4e", + "version-string": "4.0.1-1", + "port-version": 0 + }, + { + "git-tree": "efa4837be64a9f13910f42f42acebeeceff9cd72", + "version-string": "3.1.1-2", + "port-version": 0 + }, + { + "git-tree": "bbd300e066b856253b1b8c0f0efb60a9541b24cc", + "version-string": "3.1.1-1", + "port-version": 0 + }, + { + "git-tree": "7c043529d43f507b1324fdc73894ec7fbdee7996", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "f752db5c7989a9628b165cd449f2af19cf48d4d1", + "version-string": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "bb50d32b30352fa1ebd31e92e488a519b3da87c7", + "version-string": "1.0.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/directx-headers.json b/port_versions/d-/directx-headers.json new file mode 100644 index 00000000000000..604e58330b61a5 --- /dev/null +++ b/port_versions/d-/directx-headers.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a45e68ef2cc77f2d8d39817ace66ef699deea3a5", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "2fb0e8c15d2643d303a989d9d553f93627e28869", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/directxmath.json b/port_versions/d-/directxmath.json new file mode 100644 index 00000000000000..5f0c61ee6fe86f --- /dev/null +++ b/port_versions/d-/directxmath.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "381e0fc938992c45b9c2000e25bb4265f408ee27", + "version-string": "jan2021", + "port-version": 0 + }, + { + "git-tree": "764e3d177617a6dc0dec55415f7ae1828a40f5a7", + "version-string": "dec2020b", + "port-version": 0 + }, + { + "git-tree": "930a5068c034a9f40f92b7986696bebfed42ca75", + "version-string": "3.1.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/directxmesh.json b/port_versions/d-/directxmesh.json new file mode 100644 index 00000000000000..c8725cb7042b58 --- /dev/null +++ b/port_versions/d-/directxmesh.json @@ -0,0 +1,134 @@ +{ + "versions": [ + { + "git-tree": "05b2c430ee01c88129da70cf887321d662be4e35", + "version-string": "jan2021", + "port-version": 0 + }, + { + "git-tree": "36706ee72a180f2e4d6aa3ed122a8eb5ceda2136", + "version-string": "nov2020b", + "port-version": 0 + }, + { + "git-tree": "176b6fd412dcff8ebb4d645021bc93991ee19b1f", + "version-string": "nov2020", + "port-version": 0 + }, + { + "git-tree": "4dde4fd5b61bf7a29841905d75b5d0e06203334c", + "version-string": "aug2020", + "port-version": 1 + }, + { + "git-tree": "11012f2e40a49c1d7f2d9d91eb418987dc5ee984", + "version-string": "aug2020", + "port-version": 0 + }, + { + "git-tree": "9f1bcaa4295b54482edf640a759d832080cc6f54", + "version-string": "jul2020", + "port-version": 0 + }, + { + "git-tree": "bb53ff8eca39b6c05c4ecac55ba9f2b554644f30", + "version-string": "jun2020", + "port-version": 0 + }, + { + "git-tree": "dc7a666e5a0571efc1d3aed1d27ddfa0510d7702", + "version-string": "dec2019-1", + "port-version": 0 + }, + { + "git-tree": "d6b3bc6f4b0c003679e035ae148bf86849a9d410", + "version-string": "dec2019", + "port-version": 0 + }, + { + "git-tree": "bafff2bf1c4f335459ad5e73a5be6942c3041469", + "version-string": "aug2019", + "port-version": 0 + }, + { + "git-tree": "14ea82b9bff0c5bca4cfe6de70537b4a33509d22", + "version-string": "jun2019-1", + "port-version": 0 + }, + { + "git-tree": "6f3c4677e6dcef4de0110c3e0a30b293ff5a0556", + "version-string": "apr2019", + "port-version": 0 + }, + { + "git-tree": "048e11d168c28f71b4d4fbab9af60311a937d23f", + "version-string": "feb2019-1", + "port-version": 0 + }, + { + "git-tree": "36b86baaef891917a11e4357e07de4e487769db3", + "version-string": "feb2019", + "port-version": 0 + }, + { + "git-tree": "b7981db46e9c6b5f51a849ba297514fbba341b68", + "version-string": "nov2018", + "port-version": 0 + }, + { + "git-tree": "052d255fcddc025ffb5cf0642f3545245a8871f9", + "version-string": "oct2018", + "port-version": 0 + }, + { + "git-tree": "554b0715d99ce7e1eed0dfc65c7b6f6c04b16cc3", + "version-string": "aug2018", + "port-version": 0 + }, + { + "git-tree": "abc75a8cb8638bdf36078814e2e3d05cb5ccad27", + "version-string": "jul2018", + "port-version": 0 + }, + { + "git-tree": "7d777b5aa3a872d525a45731fcf992e51fd7ba4f", + "version-string": "may2018b", + "port-version": 0 + }, + { + "git-tree": "5e652eaab953898bf11378f94e2690d51f2bf197", + "version-string": "may2018-9f0b4e3", + "port-version": 0 + }, + { + "git-tree": "1c5e1b457db4485ba8b29f34e07bac2f482c95ed", + "version-string": "may2018", + "port-version": 0 + }, + { + "git-tree": "2af43cbe62c1ffd869ed7593d634a3aa50bbedc1", + "version-string": "apr2018", + "port-version": 0 + }, + { + "git-tree": "f9ed42ee6df11d55634f0b0c312c0ed01788615d", + "version-string": "feb2018-eb751e0b631b05aa25c36c08e7d6bbf09f5e94a9", + "port-version": 0 + }, + { + "git-tree": "3f579dc4fd821dd00e1f124974e57caf9052c3b0", + "version-string": "feb2018", + "port-version": 0 + }, + { + "git-tree": "5392ae90a7b8357b90f2262a6a863c046e6b43d5", + "version-string": "dec2017", + "port-version": 0 + }, + { + "git-tree": "be1e2590b15f8727be109883389c2ab2cdfd374e", + "version-string": "oct2016", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/directxsdk.json b/port_versions/d-/directxsdk.json new file mode 100644 index 00000000000000..8d1849cba885ba --- /dev/null +++ b/port_versions/d-/directxsdk.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "dc3241d51d057a92ef8db501c80a749a46ed4461", + "version-string": "jun10", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/directxtex.json b/port_versions/d-/directxtex.json new file mode 100644 index 00000000000000..70548d6f7b247f --- /dev/null +++ b/port_versions/d-/directxtex.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "8bd2114b5c801b2dd0119df1cdf292c706e6c710", + "version-string": "jan2021", + "port-version": 0 + }, + { + "git-tree": "2f29b7ea4fb20230a14416b74217338f73321891", + "version-string": "nov2020b", + "port-version": 0 + }, + { + "git-tree": "3ed048d179ae760252ebfbae239032aaa4a55668", + "version-string": "nov2020", + "port-version": 0 + }, + { + "git-tree": "5f66ada1df71f6a66eab3e3a7f542062c05a2b65", + "version-string": "sept2020", + "port-version": 2 + }, + { + "git-tree": "9511ea0d21a048706ce9ab43f58e6e11c07c5a4f", + "version-string": "sept2020", + "port-version": 1 + }, + { + "git-tree": "da4ebd681e2f73abdd1e6ddb98227da9016039d4", + "version-string": "sept2020", + "port-version": 0 + }, + { + "git-tree": "86e422fd0e56896c67b2c9c6162131c153809a95", + "version-string": "aug2020", + "port-version": 0 + }, + { + "git-tree": "33274d5f0375ed3a24c86e5a44aa5b0ebb0eed29", + "version-string": "jul2020", + "port-version": 0 + }, + { + "git-tree": "379036fe39bd6ad5773beee39419948b2bb3667e", + "version-string": "jun2020b", + "port-version": 0 + }, + { + "git-tree": "41ce0a7f91a597423828735e95864983c542f146", + "version-string": "jun2020", + "port-version": 0 + }, + { + "git-tree": "66c6f4f723a23c0595fbd2f2499d5f956947386d", + "version-string": "dec2019", + "port-version": 0 + }, + { + "git-tree": "c26133b6a3a7283e33b723038043d65765222bba", + "version-string": "oct2019", + "port-version": 0 + }, + { + "git-tree": "82d51f420c61c107d8a0c29b250d4e91b2f94bd5", + "version-string": "aug2019", + "port-version": 0 + }, + { + "git-tree": "b7b13b8a15845208e7559384bdc81d3ed34309fe", + "version-string": "jun2019-1", + "port-version": 0 + }, + { + "git-tree": "e48a17dd7f8c6652f36e6913b51c2edd2f4ec41e", + "version-string": "apr2019", + "port-version": 0 + }, + { + "git-tree": "ce07779d60ac49db824ee83ee6d4fe1d085a5c25", + "version-string": "feb2019-1", + "port-version": 0 + }, + { + "git-tree": "301416c327fdfc9f271fe3df1984cf8af9510816", + "version-string": "feb2019", + "port-version": 0 + }, + { + "git-tree": "dcdc0b5c38f139c5fe7749d284807040c7c65696", + "version-string": "nov2018", + "port-version": 0 + }, + { + "git-tree": "2bc7a2b49986852099bb0e72f665fb4472ca8294", + "version-string": "oct2018", + "port-version": 0 + }, + { + "git-tree": "84dd8306057434231b28f19c4dbcc4286ebd6e6d", + "version-string": "aug2018b", + "port-version": 0 + }, + { + "git-tree": "e18d086dc950b71afe80543efeadbcd4f79e07ac", + "version-string": "jul2018", + "port-version": 0 + }, + { + "git-tree": "08f880f1e198a73b411667cb431b6309cb1f170e", + "version-string": "may2018b", + "port-version": 0 + }, + { + "git-tree": "ac8192166d62e84887c0539389f32375880b1342", + "version-string": "may2018", + "port-version": 0 + }, + { + "git-tree": "aa6e8e6e8483e0a5e9a3365abe73cb97a4f17e54", + "version-string": "apr2018", + "port-version": 0 + }, + { + "git-tree": "5511ded31e60723b5fe9f0a8861e4a412ee5d5cb", + "version-string": "feb2018b", + "port-version": 0 + }, + { + "git-tree": "3fc7690926dc0adce5b969e9ba29d3b41efb08f1", + "version-string": "dec2017", + "port-version": 0 + }, + { + "git-tree": "9bc9560883bbd8d08110b546f4436d6accb1ed66", + "version-string": "dec2016", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/directxtk.json b/port_versions/d-/directxtk.json new file mode 100644 index 00000000000000..c6060bf3d4b733 --- /dev/null +++ b/port_versions/d-/directxtk.json @@ -0,0 +1,154 @@ +{ + "versions": [ + { + "git-tree": "ec32976b82af8176471254162dd09194e254f7b2", + "version-string": "jan2021", + "port-version": 0 + }, + { + "git-tree": "43f077920adfae3d487889ebf68d92ae3ec9b2ed", + "version-string": "nov2020b", + "port-version": 0 + }, + { + "git-tree": "f0965d2f781f3ef9d573e68da46a369777f2f11e", + "version-string": "nov2020", + "port-version": 0 + }, + { + "git-tree": "df5e106f8e90ee40e4803d9b8e9586ece62d1bef", + "version-string": "sept2020", + "port-version": 1 + }, + { + "git-tree": "8f7bf3e38141622996c0ec8df5ff4bbc02ba3b30", + "version-string": "sept2020", + "port-version": 0 + }, + { + "git-tree": "2a1421fa43499dca6b752d61d9b901c910abec4f", + "version-string": "aug2020", + "port-version": 0 + }, + { + "git-tree": "0b5e1c0f132a31fc844ffee9628a025954746daa", + "version-string": "jul2020", + "port-version": 0 + }, + { + "git-tree": "d74ac33d2e6f633e9d78b0689c0b7a2a08a7071c", + "version-string": "jun2020", + "port-version": 0 + }, + { + "git-tree": "8b277e925bb60796962657881428fefb3f0748f9", + "version-string": "2019-12-31", + "port-version": 0 + }, + { + "git-tree": "d94f6451426231b43551862ddf7d72a494c42b46", + "version-string": "dec2019", + "port-version": 0 + }, + { + "git-tree": "8eed45640bd0e08e6944688810b49377a2cc847b", + "version-string": "oct2019", + "port-version": 0 + }, + { + "git-tree": "27a975b88cf7873f364ae0ae731efb5843c5d1ea", + "version-string": "aug2019", + "port-version": 0 + }, + { + "git-tree": "fe2f5f5412bd1c531f021015c018de32043bc470", + "version-string": "jun2019-1", + "port-version": 0 + }, + { + "git-tree": "b835f1587f6be6ae891fea5ad138ad8a2b64a61b", + "version-string": "apr2019-1", + "port-version": 0 + }, + { + "git-tree": "e7850594d678996a7485c8de494d7e2f6eae1620", + "version-string": "apr2019", + "port-version": 0 + }, + { + "git-tree": "5becf0551f97678676e78dd466dcd33b618fa7b8", + "version-string": "feb2019-1", + "port-version": 0 + }, + { + "git-tree": "5e0e15791435bfa9b05677077f0aa372658d20d9", + "version-string": "feb2019", + "port-version": 0 + }, + { + "git-tree": "ff8911bb856544c9932d02a5a3f4d2c957c55c50", + "version-string": "nov2018", + "port-version": 0 + }, + { + "git-tree": "3ae18c92bb0c51f89d7dc82fa8fb564dbe8d9d49", + "version-string": "oct2018b", + "port-version": 0 + }, + { + "git-tree": "548da8b2a50c39f1c67865bb7d9bf31e5d25c9f5", + "version-string": "aug2018", + "port-version": 0 + }, + { + "git-tree": "7b28a0b4dbb03f0e064a5cc50c9a2d8b27cd75ee", + "version-string": "jul2018", + "port-version": 0 + }, + { + "git-tree": "688d5c633ee85625a4254fb1f12f1c9a477e96fa", + "version-string": "may2018b", + "port-version": 0 + }, + { + "git-tree": "0977fc3a6e9f9ca7ff4813924b04b7b93fcd7378", + "version-string": "may2018", + "port-version": 0 + }, + { + "git-tree": "b5a0baf4b41b3af8a50cc2a504beab2de87fec5a", + "version-string": "apr2018", + "port-version": 0 + }, + { + "git-tree": "ec7e6aadae150836f154fb175c04dd4b3643d337", + "version-string": "feb2018", + "port-version": 0 + }, + { + "git-tree": "ec1819eb1afab7b4cb925b1f331f01efdf24b405", + "version-string": "dec2017", + "port-version": 0 + }, + { + "git-tree": "b5ee3b59c872066abb1e2cd402849d7e9b1a933b", + "version-string": "dec2016-1", + "port-version": 0 + }, + { + "git-tree": "e7f55a7894c50c4df6d3790c7072e4f0cbbca978", + "version-string": "dec2016", + "port-version": 0 + }, + { + "git-tree": "0351068f11e674838541e58f59aec84bb2b62b1a", + "version-string": "oct2016-1", + "port-version": 0 + }, + { + "git-tree": "f71eb813a31f5af63e693bee7390f9f49daaaf9a", + "version-string": "oct2016", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/directxtk12.json b/port_versions/d-/directxtk12.json new file mode 100644 index 00000000000000..d19fd9689d263d --- /dev/null +++ b/port_versions/d-/directxtk12.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "33e0b497c7aed981580b9e651a57f202fa8cc2bc", + "version-string": "jan2021", + "port-version": 0 + }, + { + "git-tree": "091e8374dd6d3e6791c707e70d532534eed6446d", + "version-string": "nov2020b", + "port-version": 0 + }, + { + "git-tree": "eb5e1ee7e45db4d3eae9c88c04fb7fdf578637c0", + "version-string": "nov2020", + "port-version": 0 + }, + { + "git-tree": "e2ec3cbf346af2d03ac533d1afaf006e2c93b95f", + "version-string": "sept2020", + "port-version": 1 + }, + { + "git-tree": "6a10203845e82341e76bf024877f58fbce14c19d", + "version-string": "sept2020", + "port-version": 0 + }, + { + "git-tree": "0ab4298254947d4e2ba940d37e56e1f85ad2f609", + "version-string": "aug2020", + "port-version": 0 + }, + { + "git-tree": "46c64e6720edf886d41568d60d4808b739dee9c6", + "version-string": "jul2020", + "port-version": 0 + }, + { + "git-tree": "da75188b5c809b6c9eb9e4877677a5e307f5ca65", + "version-string": "jun2020b", + "port-version": 0 + }, + { + "git-tree": "93a0da0782de00d288548b425c5ab10eccb379b8", + "version-string": "jun2020", + "port-version": 0 + }, + { + "git-tree": "ad32aa7512aced016ce6c9e7f6e844a4864d29cd", + "version-string": "dec2019", + "port-version": 0 + }, + { + "git-tree": "1c6076fb89534f09a6c49f77acb71c39252de1bb", + "version-string": "oct2019", + "port-version": 0 + }, + { + "git-tree": "f27570b4715f87eaadb3b0b3e8f420a2e6fc57c1", + "version-string": "aug2019", + "port-version": 0 + }, + { + "git-tree": "cfc2ce5a2867056d9130e8c96b4d71333f2f033e", + "version-string": "jun2019-1", + "port-version": 0 + }, + { + "git-tree": "81b3d5878ce96169cdd5c6c6a86584d3cbd4431d", + "version-string": "dec2016-1", + "port-version": 0 + }, + { + "git-tree": "721c82212aa2db6deae89e92baebd7aacd87b71b", + "version-string": "dec2016", + "port-version": 0 + }, + { + "git-tree": "f494f61b7f9a8c200fc8be555254747305d24d20", + "version-string": "oct2016", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dirent.json b/port_versions/d-/dirent.json new file mode 100644 index 00000000000000..61f9899b39086d --- /dev/null +++ b/port_versions/d-/dirent.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b1ac2911c352ec0e8485c4cb49f544d0f05d749b", + "version-string": "1.23.2", + "port-version": 0 + }, + { + "git-tree": "9ac9e39d19d468c4379bbc2dd007bd36c41e02c9", + "version-string": "1.23.1", + "port-version": 0 + }, + { + "git-tree": "b437dfebb93d0be9351f37361b7b7d3473f09893", + "version-string": "2017-06-23-5c7194c2fe2c68c1a8212712c0b4b6195382d27d", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/discord-game-sdk.json b/port_versions/d-/discord-game-sdk.json new file mode 100644 index 00000000000000..202d07f4f798e0 --- /dev/null +++ b/port_versions/d-/discord-game-sdk.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b3144d3d155b301d8a23508ae75be2f630ede9f0", + "version-string": "2.5.6-1", + "port-version": 0 + }, + { + "git-tree": "edc6272d96fe6c701cc1d5565a654fa99298aed8", + "version-string": "2.5.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/discord-rpc.json b/port_versions/d-/discord-rpc.json new file mode 100644 index 00000000000000..01aa0f70a957e6 --- /dev/null +++ b/port_versions/d-/discord-rpc.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "161afe071b88dc53bff7dd5b13909872ee370f92", + "version-string": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "884bdeec3cee8a31ef3582bd02d7d5f74bb7350c", + "version-string": "3.3.0-2", + "port-version": 0 + }, + { + "git-tree": "c91435c083272a10a6dde2b60f459b3935a27352", + "version-string": "3.3.0-1", + "port-version": 0 + }, + { + "git-tree": "43ca432511afc78b75a2e2f1cd6af4cfb3c4e03e", + "version-string": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "404cac887c7f316b8611fdb02a711f13ae72ebaa", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "064e1e21b008cd25b2109d2587c27aa2a975ea3b", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "cdda8cfdba2b8ed6626145c9427da3ab62fa4b9c", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "963a072ff188cc86de5b03e57dfe671ed20b6f37", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "dd9d629d2964c2339f8f8d06557b64a6d9077344", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/discount.json b/port_versions/d-/discount.json new file mode 100644 index 00000000000000..932b2400a92e95 --- /dev/null +++ b/port_versions/d-/discount.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b5d813e867f3c5a663035c966b9259d20e21113d", + "version-string": "2.2.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/distorm.json b/port_versions/d-/distorm.json new file mode 100644 index 00000000000000..05b03c4e4203a0 --- /dev/null +++ b/port_versions/d-/distorm.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "15c619603ae1ba21211e5dd32887461375dde046", + "version-string": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "9898eb0abde3836b84b1d2ad494171c24b40ebcf", + "version-string": "2018-08-26-16e6f435-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dlfcn-win32.json b/port_versions/d-/dlfcn-win32.json new file mode 100644 index 00000000000000..ca3194c11bd8c1 --- /dev/null +++ b/port_versions/d-/dlfcn-win32.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "1d930427c522c5e3e56535ee4739b0157b3f6592", + "version-string": "1.1.1-4", + "port-version": 0 + }, + { + "git-tree": "300cb04ec355e27343fda27793230ecc70be22ff", + "version-string": "1.1.1-3", + "port-version": 0 + }, + { + "git-tree": "a3bc391b0c50eb710a532a376d4e2c417202fae5", + "version-string": "1.1.1-2", + "port-version": 0 + }, + { + "git-tree": "2355654c9ec494b10af17a1e4fbddb70044352da", + "version-string": "1.1.1-1", + "port-version": 0 + }, + { + "git-tree": "00028cfa9a7fc204b3e3c017c09891e8fc999c96", + "version-string": "1.1.1", + "port-version": 0 + }, + { + "git-tree": "3d9dfd1b7f891fc7f284a467697c45d3825c533d", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dlib.json b/port_versions/d-/dlib.json new file mode 100644 index 00000000000000..1984302539f7de --- /dev/null +++ b/port_versions/d-/dlib.json @@ -0,0 +1,159 @@ +{ + "versions": [ + { + "git-tree": "498121f386e722fbc511caac849425041206735b", + "version-string": "19.21", + "port-version": 4 + }, + { + "git-tree": "93c3650ee6698683d7a65f8a7cc03e5fee7fdda9", + "version-string": "19.21", + "port-version": 3 + }, + { + "git-tree": "36ff8f0b680d1068b6318e1dc149096a28fed41f", + "version-string": "19.21", + "port-version": 2 + }, + { + "git-tree": "48c6040ef938ee53379ed4bccd8cd2fe5a9551ee", + "version-string": "19.19", + "port-version": 2 + }, + { + "git-tree": "e41e2e3c3e8f11c6277e583b8a50a8a10604483b", + "version-string": "19.19-1", + "port-version": 0 + }, + { + "git-tree": "007b52ee0b6dc11eee049d5930a32d5864eef6d2", + "version-string": "19.19", + "port-version": 0 + }, + { + "git-tree": "a04fc6d703749c451fcf4c589929c73a5ab82e2a", + "version-string": "19.17-1", + "port-version": 0 + }, + { + "git-tree": "63e4ee29f9b50429441592177e358774d3f20a5a", + "version-string": "19.17", + "port-version": 0 + }, + { + "git-tree": "a57ef7b003f8051f391a0bc82866c126f8173b7e", + "version-string": "19.16-3", + "port-version": 0 + }, + { + "git-tree": "60da09f41659a5729ba95a6b50304a8d9c4eda65", + "version-string": "19.16-2", + "port-version": 0 + }, + { + "git-tree": "c57d410e5f4d38060115cb965a8105aedf4f8147", + "version-string": "19.16-1", + "port-version": 0 + }, + { + "git-tree": "0e2377249ea97283032ae089bcbae5309a74f402", + "version-string": "19.16", + "port-version": 0 + }, + { + "git-tree": "c4273f5170685fc99eb06e7a83c0dd4efcad0ba6", + "version-string": "19.15", + "port-version": 0 + }, + { + "git-tree": "e50d155c9403c58c5e23e3470acd567abc8d2e04", + "version-string": "19.14", + "port-version": 0 + }, + { + "git-tree": "cba74e361c6fe3a8ed61fb97915bdf4cf671f0f1", + "version-string": "19.13-1", + "port-version": 0 + }, + { + "git-tree": "97c184de034ad641b2b0d8d4a8a23c26ad339d7b", + "version-string": "19.13", + "port-version": 0 + }, + { + "git-tree": "f0cadc6c201deccbb53d1121d2e2ae61485f5969", + "version-string": "19.12", + "port-version": 0 + }, + { + "git-tree": "239bf64f33b79e3f0c07b67f0ae89b990a78e620", + "version-string": "19.11", + "port-version": 0 + }, + { + "git-tree": "b30cc97571f2d9c7de1fdffed7a85d372b441bc6", + "version-string": "19.10-1", + "port-version": 0 + }, + { + "git-tree": "030a4b514766957430e353ad1c961a0f874cae78", + "version-string": "19.10", + "port-version": 0 + }, + { + "git-tree": "1ed8369719493c97d5a61e4c69c14723de2171a3", + "version-string": "19.9-1", + "port-version": 0 + }, + { + "git-tree": "f812072b97e6d2fec21d2f814ee4e7177285d18e", + "version-string": "19.9", + "port-version": 0 + }, + { + "git-tree": "52e052f19698d56ad12c29ed2893f117dab6e103", + "version-string": "19.8", + "port-version": 0 + }, + { + "git-tree": "a4fd10e90817e483d22b36777b4c4e40fb924762", + "version-string": "19.7", + "port-version": 0 + }, + { + "git-tree": "96fa3b8551d9025e70daf4668a39f5ef8cc11c7e", + "version-string": "19.4-5", + "port-version": 0 + }, + { + "git-tree": "e2c08671198089e1afcf6bb5e02405b7eee6ef9b", + "version-string": "19.4-4", + "port-version": 0 + }, + { + "git-tree": "d7254e9ed6f9c2996a9339b8a0d11b464d8aedd6", + "version-string": "19.4-3", + "port-version": 0 + }, + { + "git-tree": "5fee6c59aa53e2151015d6274be960637ff6abdf", + "version-string": "19.4-2", + "port-version": 0 + }, + { + "git-tree": "871149e3fd2c483cd70a7da63cb2198ae42b9d57", + "version-string": "19.4-1", + "port-version": 0 + }, + { + "git-tree": "b8736ac9920fc03825f21f3d33da9177be9fbfbe", + "version-string": "19.4", + "port-version": 0 + }, + { + "git-tree": "04858033c7eec029d9373f5195af24077e12b14e", + "version-string": "19.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dmlc.json b/port_versions/d-/dmlc.json new file mode 100644 index 00000000000000..ad9766a0c8b79f --- /dev/null +++ b/port_versions/d-/dmlc.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "679cba8e39c453c95a626180449c68a0aa41f724", + "version-string": "2019-08-12-4", + "port-version": 0 + }, + { + "git-tree": "8144bc4d160d6b8b5b587b09e928bcd63cd8f999", + "version-string": "2019-08-12-3", + "port-version": 0 + }, + { + "git-tree": "9ffee91ae2b218213b6b3ec3168dfbbaa6091035", + "version-string": "2019-08-12-2", + "port-version": 0 + }, + { + "git-tree": "e53b33f0463c5ca5b90ed092f964aca0fd5381b2", + "version-string": "2019-08-12-1", + "port-version": 0 + }, + { + "git-tree": "d458cedfdd6545d210d99785e53cc45b833ab994", + "version-string": "2019-08-12", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/docopt.json b/port_versions/d-/docopt.json new file mode 100644 index 00000000000000..d16fa264439325 --- /dev/null +++ b/port_versions/d-/docopt.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e1556dd1eee1f9dcbef7040a36be5ea88cbfdc05", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "d9916398df4ec979a0d913fd3547bebc49195146", + "version-string": "2018-04-16-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/doctest.json b/port_versions/d-/doctest.json new file mode 100644 index 00000000000000..11f797a47f2687 --- /dev/null +++ b/port_versions/d-/doctest.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "1d58c700fab37cda9857b949305ac9b270847099", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "8cf78ba91767e6f8d77a486483957042e1aab8d9", + "version-string": "2.3.7", + "port-version": 0 + }, + { + "git-tree": "25285c4f4856b1cdfc61f4122fa50d3608e364cc", + "version-string": "2.3.6", + "port-version": 0 + }, + { + "git-tree": "da99fb407acfff68d6c001d55764742f8444af65", + "version-string": "2.3.5", + "port-version": 0 + }, + { + "git-tree": "ad8731ea9a4f7fe3e5623d69d47b0e81128d7679", + "version-string": "2.3.4", + "port-version": 0 + }, + { + "git-tree": "639b20350fbc0b76534e7b4d226ee3851a2a80a1", + "version-string": "2.3.3", + "port-version": 0 + }, + { + "git-tree": "6f3c6cfa086c5a32390fba4527c2f15d8955940c", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "54e9d742bfa919458a0c70d60f4854b04a5d0932", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "89514eff610a5dfec90619c6816aa081e20ad758", + "version-string": "2.2.3", + "port-version": 0 + }, + { + "git-tree": "ce59f0d2b9707d682b1ab7ccf8b2cc8039e0e901", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "c892b11d6c6b8e2390801d11756deae63a47f46f", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "26b186663d4f3bd3faa287dc120855fcd851d3b3", + "version-string": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "264e1b8a34213bb76800163e96e0d1d4fab7b41d", + "version-string": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "797abd04148ac16ec746dc5870d5ad4ac2f5114d", + "version-string": "1.2.9", + "port-version": 0 + }, + { + "git-tree": "d986d30a2bcf793684ab50eb834a8944c3cbad48", + "version-string": "1.2.8", + "port-version": 0 + }, + { + "git-tree": "dd4c3ee882ff9d258691b5ff28ac99cd3b6c6a2b", + "version-string": "1.2.7", + "port-version": 0 + }, + { + "git-tree": "012933eb4feab18e017ef270b668c465cdb168b3", + "version-string": "1.2.6", + "port-version": 0 + }, + { + "git-tree": "8baa5aef61bf5aa97b8e24f0cb63b44b151b50af", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "9948fb5980e7bfa684554922681b34a34de6ac53", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/double-conversion.json b/port_versions/d-/double-conversion.json new file mode 100644 index 00000000000000..9b16fa857d433b --- /dev/null +++ b/port_versions/d-/double-conversion.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "ce6fc681ae5017ab5c3a7b166ab4de2f62f8a78d", + "version-string": "3.1.5", + "port-version": 0 + }, + { + "git-tree": "1939d35942dc9afe61c0ae1152d05162747ffcd3", + "version-string": "3.1.4", + "port-version": 0 + }, + { + "git-tree": "fcc1a2eb7cab96a1de2ec8d92742e586cfd85e26", + "version-string": "3.1.0-2", + "port-version": 0 + }, + { + "git-tree": "da4b2c13e88c06b80ec09cb0455dd72e47b22330", + "version-string": "3.1.0-1", + "port-version": 0 + }, + { + "git-tree": "27f908a453ae74155875f4d01018755ddbb1ec09", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "3c54f258cf2f6c0da55274b2d67eb1f8a27e60c5", + "version-string": "3.0.0-2", + "port-version": 0 + }, + { + "git-tree": "670c6500028c70c426c8778d70026481617ff3c0", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "2c903d35e18cf71696663cb8da6875afce4a0523", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "1c74cd82ed07054ad12700bea60df097a4d1e43e", + "version-string": "2.0.1-1", + "port-version": 0 + }, + { + "git-tree": "3885e419b52751a3ca75aa407c029f4f65fbdb46", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dpdk.json b/port_versions/d-/dpdk.json new file mode 100644 index 00000000000000..0aea03ec7fa1aa --- /dev/null +++ b/port_versions/d-/dpdk.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7ceb4ec08ceffd575220fb624ef996d4fd83a938", + "version-string": "19.02", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/draco.json b/port_versions/d-/draco.json new file mode 100644 index 00000000000000..4486003a3f366f --- /dev/null +++ b/port_versions/d-/draco.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "14563e699abc99cebdcd2b4e54b76e91c05d96be", + "version-string": "1.3.6", + "port-version": 0 + }, + { + "git-tree": "5761b113b143fc3aee0d887b4fbe08394940e5b9", + "version-string": "1.3.5", + "port-version": 0 + }, + { + "git-tree": "c65dcbf013091adae5df1bf6ab682bcd43bec7f5", + "version-string": "1.3.3-2", + "port-version": 0 + }, + { + "git-tree": "3276b205448d44b284db7cc7fc6c3115e63e38a6", + "version-string": "1.3.3-1", + "port-version": 0 + }, + { + "git-tree": "7895001547ede04d85923e3f5042894014f57a5e", + "version-string": "1.3.3", + "port-version": 0 + }, + { + "git-tree": "b95ae63ee54d658206b66932df715b581b23a076", + "version-string": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "c4e4c95ec50227c780e5839d67e0fc2095059d78", + "version-string": "0.10.0-1", + "port-version": 0 + }, + { + "git-tree": "efcd666252609b815e92299676ffab9658874e85", + "version-string": "0.10.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/drlibs.json b/port_versions/d-/drlibs.json new file mode 100644 index 00000000000000..331bb147d101b1 --- /dev/null +++ b/port_versions/d-/drlibs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "503bcfa3a091377c8a53f52b12c463a1570b6af6", + "version-string": "2019-08-12", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/drogon.json b/port_versions/d-/drogon.json new file mode 100644 index 00000000000000..799e30866b68bb --- /dev/null +++ b/port_versions/d-/drogon.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "f6370e6a96e12ad2fdd2cbefbe442e6b794091dc", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "680d234c5fb187d7a81e8852ba7657e3219f349c", + "version-string": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "74b42c3e5deada7e972999fb18e5c6613e18cd3c", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "70642f5b56566490fe37e91535f9aa54730595e8", + "version-string": "v1.0.0-beta21", + "port-version": 0 + }, + { + "git-tree": "09b0f3721d903e2f4845892f56fbbee6a8ae785c", + "version-string": "v1.0.0-beta20", + "port-version": 0 + }, + { + "git-tree": "0709b03e378fff2af3f383f6ef3debf20c572b2a", + "version-string": "v1.0.0-beta18", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dtl.json b/port_versions/d-/dtl.json new file mode 100644 index 00000000000000..12d9b2ade6e22d --- /dev/null +++ b/port_versions/d-/dtl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d6fe181396229123090f09dcb6a9d7cff25f8045", + "version-string": "1.19", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/duckx.json b/port_versions/d-/duckx.json new file mode 100644 index 00000000000000..6d50f35968067b --- /dev/null +++ b/port_versions/d-/duckx.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b0d07b78faf406cedb00c24f66a546abc6492f6f", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "0cfc85b61c6fe9dd13442c33b1ecaad1ef83ec30", + "version-string": "2019-08-06", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/duilib.json b/port_versions/d-/duilib.json new file mode 100644 index 00000000000000..ca3a95a0211efe --- /dev/null +++ b/port_versions/d-/duilib.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d1a36d9e38313306f28b94d238e120deabfec9ea", + "version-string": "2019-4-28-2", + "port-version": 0 + }, + { + "git-tree": "7b2ac283b271794651cb3ec15aed29c39f63871e", + "version-string": "2019-4-28-1", + "port-version": 0 + }, + { + "git-tree": "2d4e7b730b791c10f6ee5768fe826e3883255720", + "version-string": "2019-4-28", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/duktape.json b/port_versions/d-/duktape.json new file mode 100644 index 00000000000000..20bfc556e206a2 --- /dev/null +++ b/port_versions/d-/duktape.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "bb94b30a10ff262e574d2824c503c0be67e09e80", + "version-string": "2.5.0", + "port-version": 1 + }, + { + "git-tree": "b193e6414ec9e5404927edbb2113b9c7ed3d7f73", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "a53aa75f27ae8b289fb9c292c74b7a730091aca2", + "version-string": "2.4.0-7", + "port-version": 0 + }, + { + "git-tree": "d85fa17f714209148e10d76bc52d78d5a5c21d50", + "version-string": "2.4.0-6", + "port-version": 0 + }, + { + "git-tree": "0b306f9abd0fcffd0c144dfc31d85b6f24d07185", + "version-string": "2.4.0-5", + "port-version": 0 + }, + { + "git-tree": "59b24806daec2039df467169cc74a475047e15e0", + "version-string": "2.4.0-4", + "port-version": 0 + }, + { + "git-tree": "a751082f25e5eddb0b03cce1e55a2a2a9f295413", + "version-string": "2.4.0-3", + "port-version": 0 + }, + { + "git-tree": "1cbd391df5f63deaf525a8ad3422c096d40b0cfd", + "version-string": "2.3.0-3", + "port-version": 0 + }, + { + "git-tree": "4e6474670cff47f42afed4cb97ba589bb8df89e4", + "version-string": "2.3.0-2", + "port-version": 0 + }, + { + "git-tree": "aeaccb9d00f157d5b1f9303f96e48b28014df1e9", + "version-string": "2.3.0-1", + "port-version": 0 + }, + { + "git-tree": "bb5cc7b63a51364aa9b952c7ede51d07c4480056", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "e5e4405efa24f0641d5be03a659c4424dfac89e2", + "version-string": "2.0.3-6", + "port-version": 0 + }, + { + "git-tree": "8e404cf257e1b452db3bcb4f00ee18aa051d489e", + "version-string": "2.0.3-5", + "port-version": 0 + }, + { + "git-tree": "70c4b7ab84e2c87f38498ab99e94a838fd7012e3", + "version-string": "2.0.3-4", + "port-version": 0 + }, + { + "git-tree": "dc290001e17d67ddb187b8ad48c204417a8166ca", + "version-string": "2.0.3-3", + "port-version": 0 + }, + { + "git-tree": "fa53abf608f8b76d5aca8a2ba471340eb6577136", + "version-string": "2.0.3-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dx.json b/port_versions/d-/dx.json new file mode 100644 index 00000000000000..b4bbac9ee3122a --- /dev/null +++ b/port_versions/d-/dx.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e215daa609ec48fa696871c83ad6fac358898309", + "version-string": "1.0.1-1", + "port-version": 0 + }, + { + "git-tree": "5e68673a631068ce608cb1a291a4dcc4a6c71bf4", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "1c0dbde0cf00869ad7ddd9e6421cbbf00be66613", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/d-/dxut.json b/port_versions/d-/dxut.json new file mode 100644 index 00000000000000..97184b77e1dd03 --- /dev/null +++ b/port_versions/d-/dxut.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "27f3d4fe979fbc45d132894a80c6712d27be4c49", + "version-string": "11.14-3", + "port-version": 0 + }, + { + "git-tree": "9dfe80f61e8e47b031291160f1e4af01829e3cc7", + "version-string": "11.14-2", + "port-version": 0 + }, + { + "git-tree": "7afae620bf87d9fe9c3f7714f21d9791bd2ed7d3", + "version-string": "11.14-1", + "port-version": 0 + }, + { + "git-tree": "6c83b8b3dcc9d161f468dd699ea5ec10a44f9b75", + "version-string": "11.14", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/eabase.json b/port_versions/e-/eabase.json new file mode 100644 index 00000000000000..fbbfcdb80d4c49 --- /dev/null +++ b/port_versions/e-/eabase.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "171ca1fc19c06e74b273601aa815049126f84212", + "version-string": "2.09.12-1", + "port-version": 0 + }, + { + "git-tree": "7fc2d9235186046afab9b8cd9b93c7feddc3a3b6", + "version-string": "2.09.12", + "port-version": 0 + }, + { + "git-tree": "1cff06bd764ebcd3a967c683eb8d99f93b196892", + "version-string": "2.09.10", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/eastl.json b/port_versions/e-/eastl.json new file mode 100644 index 00000000000000..7e72cfba2b5460 --- /dev/null +++ b/port_versions/e-/eastl.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "69fe302d6e81880f94a6a9b3ddb88437e42a9731", + "version-string": "3.17.03", + "port-version": 0 + }, + { + "git-tree": "a67055b3693b8d8906f1f51a4d90f4974b72aa0c", + "version-string": "3.16.07", + "port-version": 0 + }, + { + "git-tree": "00a4d64edf27c3db438eb9b92b3082bdb033e5cf", + "version-string": "3.16.05", + "port-version": 0 + }, + { + "git-tree": "33791e4308b71f79906925c733b03b486f9e250f", + "version-string": "3.16.01", + "port-version": 0 + }, + { + "git-tree": "793f94d38a08673020ad2cf018a94ba0aefcdd02", + "version-string": "3.14.01", + "port-version": 0 + }, + { + "git-tree": "5058008abe4fbd0b7d6971c7b7e55a1a174541bd", + "version-string": "3.14.00", + "port-version": 0 + }, + { + "git-tree": "ebdfb2b8c7523b49f5808647c6031944567e55eb", + "version-string": "3.13.05-1", + "port-version": 0 + }, + { + "git-tree": "91b64e145767f33f3295c4115f72d5af4f52ae9c", + "version-string": "3.13.05", + "port-version": 0 + }, + { + "git-tree": "e1555a1eda7b2e71921dc5491c9e36b3f6e0b7e1", + "version-string": "3.13.04-1", + "port-version": 0 + }, + { + "git-tree": "43feed149cf3008cbda6dcdb4421be2a8be361f8", + "version-string": "3.13.04", + "port-version": 0 + }, + { + "git-tree": "b101dfea873b3131ceaa876d61c52d6f91e962dc", + "version-string": "3.13.00", + "port-version": 0 + }, + { + "git-tree": "72eea3a46d4a1fd156cd29b146928dfbcac78010", + "version-string": "3.12.08", + "port-version": 0 + }, + { + "git-tree": "0a79009d6dd78f67684eaec09b01796d83705c34", + "version-string": "3.12.07", + "port-version": 0 + }, + { + "git-tree": "1585ccb53c02fc65e27688fea618e4926479bf64", + "version-string": "3.12.04", + "port-version": 0 + }, + { + "git-tree": "bd6889ee3b295ecf49f5472d472dea1c160e034a", + "version-string": "3.12.01", + "port-version": 0 + }, + { + "git-tree": "379b6cd0a250116d04de1f8bf2f4642793b3d6a3", + "version-string": "3.10.00", + "port-version": 0 + }, + { + "git-tree": "d36f15691b08df89fcfa1caaf306fdfe98c85d0a", + "version-string": "3.09.00-1", + "port-version": 0 + }, + { + "git-tree": "7663b19e2a69cb52d771dad84f363f779026f9c9", + "version-string": "3.09.00", + "port-version": 0 + }, + { + "git-tree": "3c5fab2baa9660a0f357352ea87afce5f497fc0b", + "version-string": "3.08.00", + "port-version": 0 + }, + { + "git-tree": "7e7bea9f6ac0c4cd04ffe7166f56e0087a3b7472", + "version-string": "3.07.02", + "port-version": 0 + }, + { + "git-tree": "7758ba1c4094151415a30333065593d8213a0ab8", + "version-string": "3.07.00", + "port-version": 0 + }, + { + "git-tree": "d7a646d4487b9e1737f7a3527e6d191234b2584c", + "version-string": "3.05.08", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/easycl.json b/port_versions/e-/easycl.json new file mode 100644 index 00000000000000..0b2db106486714 --- /dev/null +++ b/port_versions/e-/easycl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "172a7b81ef634d827a5a1fb3eaf3beb10a0e3923", + "version-string": "0.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/easyhook.json b/port_versions/e-/easyhook.json new file mode 100644 index 00000000000000..044a1539e7a0b4 --- /dev/null +++ b/port_versions/e-/easyhook.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cf87554bbdd4736b3b64210e7662d6bbe3d72b2a", + "version-string": "2.7.6789.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/easyloggingpp.json b/port_versions/e-/easyloggingpp.json new file mode 100644 index 00000000000000..9b1fa8f5b2f7db --- /dev/null +++ b/port_versions/e-/easyloggingpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "22fde45fd8d035536d9d3bbb8b174649c037e831", + "version-string": "9.96.7-1", + "port-version": 0 + }, + { + "git-tree": "87b2df47847f79e4249a92f02428548ec951763c", + "version-string": "9.96.7", + "port-version": 0 + }, + { + "git-tree": "33abdeaa7319ba4d62db32fa7d82abc472a577b1", + "version-string": "9.96.5-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/eathread.json b/port_versions/e-/eathread.json new file mode 100644 index 00000000000000..0081edae0e7ece --- /dev/null +++ b/port_versions/e-/eathread.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "d184652fe784ad6994bb56ca562539fc0f4bb49a", + "version-string": "1.32.09-1", + "port-version": 0 + }, + { + "git-tree": "c28844e46a71c719433f2f78d74779a1a5f4b195", + "version-string": "1.32.09", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/ebml.json b/port_versions/e-/ebml.json new file mode 100644 index 00000000000000..fc17b220c35451 --- /dev/null +++ b/port_versions/e-/ebml.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "bcf2ed38acfba94d49dfe9f4c96559771d8032c8", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "73fbf83ff5922adc1d576b12287760ac62746470", + "version-string": "1.3.10", + "port-version": 0 + }, + { + "git-tree": "22aa8d7b36297a2dea4cea042eabb89b34213213", + "version-string": "1.3.9", + "port-version": 0 + }, + { + "git-tree": "2b9aad9296245c45e56d8970d7f21cf5a3766f5b", + "version-string": "1.3.8", + "port-version": 0 + }, + { + "git-tree": "599c3901990b47d7ef9fec6e744501ca88b71834", + "version-string": "1.3.7-1", + "port-version": 0 + }, + { + "git-tree": "c2c669762fcb37711b0d70252ba49d6fda41ff71", + "version-string": "1.3.7", + "port-version": 0 + }, + { + "git-tree": "3aeaa0b4b3d5066303e1b70b62853314e60c07a5", + "version-string": "1.3.6-1", + "port-version": 0 + }, + { + "git-tree": "9c56155357fe56cd5f933290136cdc0555edcd29", + "version-string": "1.3.5-1", + "port-version": 0 + }, + { + "git-tree": "1e2d9637ba70018f164465daccbd3ec9a7dd8f2c", + "version-string": "1.3.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/ecm.json b/port_versions/e-/ecm.json new file mode 100644 index 00000000000000..a327078bac2a6c --- /dev/null +++ b/port_versions/e-/ecm.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "ef6c69c364962a681a9f97d8babc7e10c8d84bfe", + "version-string": "5.74.0", + "port-version": 0 + }, + { + "git-tree": "c93a80089d3ce4686d2ff507c20664a6f24ebe48", + "version-string": "5.66.0", + "port-version": 0 + }, + { + "git-tree": "9e5675b6fd45efb6a84afe103e201195d9e7bc11", + "version-string": "5.64.0-1", + "port-version": 0 + }, + { + "git-tree": "b06385518a67215d6af00ffcd920e0104c44203e", + "version-string": "5.60.0-2", + "port-version": 0 + }, + { + "git-tree": "65c9d579ad7c48181a3a14fd8366aa91a150a887", + "version-string": "5.60.0-1", + "port-version": 0 + }, + { + "git-tree": "74432fc50a0d055605f7bbd973d8487504ef3576", + "version-string": "5.60.0", + "port-version": 0 + }, + { + "git-tree": "23e1a1d4d92a6362ec37a6de5125e49aaf968fb4", + "version-string": "5.58.0", + "port-version": 0 + }, + { + "git-tree": "a6e7b64384bc8b47f59e76b4ebdf733d00392dc1", + "version-string": "5.56.0", + "port-version": 0 + }, + { + "git-tree": "80a7b8aafd7f9a6e8560acdf8ea167ac712601a6", + "version-string": "5.53.0", + "port-version": 0 + }, + { + "git-tree": "cef66b5948a134c2e5635b37d681cf9beb0ccdb8", + "version-string": "5.50.0", + "port-version": 0 + }, + { + "git-tree": "1be6f7d66136cd8d8a939e553accfc1ff50cee55", + "version-string": "5.40.0", + "port-version": 0 + }, + { + "git-tree": "e1f1fdb8cebe4ebfdc57ecb0160615e93f9aa575", + "version-string": "5.37.0-1", + "port-version": 0 + }, + { + "git-tree": "f83d6360b0b950826ee599ebd7eb4620c93da003", + "version-string": "5.37.0", + "port-version": 0 + }, + { + "git-tree": "28cdc09a25c8a85ef6f353b47af02752e40ac4eb", + "version-string": "5.32.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/ecos.json b/port_versions/e-/ecos.json new file mode 100644 index 00000000000000..8e87ab4cb81471 --- /dev/null +++ b/port_versions/e-/ecos.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "320007532a19ebb663420e8a702813e31b71da06", + "version-string": "2.0.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/ecsutil.json b/port_versions/e-/ecsutil.json new file mode 100644 index 00000000000000..9394deea721c81 --- /dev/null +++ b/port_versions/e-/ecsutil.json @@ -0,0 +1,144 @@ +{ + "versions": [ + { + "git-tree": "e6816d896c639acee9ea9aed9c4f6bfb3f9dbb1a", + "version-string": "1.0.7.15", + "port-version": 0 + }, + { + "git-tree": "18b022def8950388622c6d92697c485d06c98e40", + "version-string": "1.0.7.10", + "port-version": 0 + }, + { + "git-tree": "8d6723a5971e6912bda02c8d67781ba86be30c17", + "version-string": "1.0.7.9", + "port-version": 0 + }, + { + "git-tree": "0c85ec883190ed02f60728203a3291e6e3aa327b", + "version-string": "1.0.7.8", + "port-version": 0 + }, + { + "git-tree": "4cfdafa7db2d496f5c782e8b9f8f1aca6a756aff", + "version-string": "1.0.7.3", + "port-version": 0 + }, + { + "git-tree": "3cf83b91c9ee41074c1254af24be06c69528f25b", + "version-string": "1.0.7.2", + "port-version": 0 + }, + { + "git-tree": "550a92d5b0515a1697235b27e569b9bfff18e43e", + "version-string": "1.0.6.1-1", + "port-version": 0 + }, + { + "git-tree": "aedc1767af5d8afbff0f88c8189f794ea928c1d3", + "version-string": "1.0.6.1", + "port-version": 0 + }, + { + "git-tree": "f6796447d3682caea2ade82a2c2b9ef577571eb5", + "version-string": "1.0.3.1", + "port-version": 0 + }, + { + "git-tree": "592b903ab6cab601038fe88dc50a27a4a200f8b4", + "version-string": "1.0.2.1", + "port-version": 0 + }, + { + "git-tree": "5691156c70d48681221b9d57266139dfc03c8e87", + "version-string": "1.0.1.4", + "port-version": 0 + }, + { + "git-tree": "225f1907c66059054e67d927f766c9ab68003dc1", + "version-string": "1.0.1.3", + "port-version": 0 + }, + { + "git-tree": "830b1e14a4ca0b7ea19ea2bab01dac45d915cde4", + "version-string": "1.0.1.2-1", + "port-version": 0 + }, + { + "git-tree": "a714f2a28f323bf09400dc7ddc9aeb8c07ce5332", + "version-string": "1.0.1.3", + "port-version": 0 + }, + { + "git-tree": "5a3a63d23beca3b1ff6c81d8cd562550d4d7c7ce", + "version-string": "1.0.1.2-1", + "port-version": 0 + }, + { + "git-tree": "dacf113ed3b18973ca93530ff7ad3f161d6c8ef1", + "version-string": "1.0.1.2", + "port-version": 0 + }, + { + "git-tree": "bb2ae3c9c61baf4d83f86caa045cdcfaa05feceb", + "version-string": "1.0.1.1", + "port-version": 0 + }, + { + "git-tree": "45e12088ee3615d15a93a0401ef5de973a90bc63", + "version-string": "1.0.0.2", + "port-version": 0 + }, + { + "git-tree": "925b21e50d070732ae2ecc00352b49dcab48388b", + "version-string": "1.0.0.1", + "port-version": 0 + }, + { + "git-tree": "3eb88292cec6a1f7234db47049fc655dc03cf454", + "version-string": "0.9.0.9", + "port-version": 0 + }, + { + "git-tree": "5d66991ce8e5d4e96e428df18844e8f6e255bc74", + "version-string": "0.9.0.8", + "port-version": 0 + }, + { + "git-tree": "10f19ccb150b70ec3eaf51fd646465719869b4b6", + "version-string": "0.9.0.7", + "port-version": 0 + }, + { + "git-tree": "2518b4d30f6a7e3868bf9939f81bb176e3af8176", + "version-string": "0.9.0.6", + "port-version": 0 + }, + { + "git-tree": "584ed258614a3bd50a3089e46e2d86accc9c2801", + "version-string": "0.9.0.5", + "port-version": 0 + }, + { + "git-tree": "81f5d54170008f59e31b4edd5e809521ce6511bf", + "version-string": "0.9.0.4", + "port-version": 0 + }, + { + "git-tree": "bc78b4ef66133c9e3d2759b318fb1162a1b4b279", + "version-string": "0.9.0.3", + "port-version": 0 + }, + { + "git-tree": "2811bf65848b1c276c629607a1e96875bb5568b1", + "version-string": "0.9.0.2", + "port-version": 0 + }, + { + "git-tree": "63b061658c8f04d1075c34f553a928287da822b0", + "version-string": "0.9.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/edlib.json b/port_versions/e-/edlib.json new file mode 100644 index 00000000000000..d00bcfe8fc7439 --- /dev/null +++ b/port_versions/e-/edlib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a8e115424a7e2e54788cdda6bd0dad6a097f508d", + "version-string": "1.2.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/effolkronium-random.json b/port_versions/e-/effolkronium-random.json new file mode 100644 index 00000000000000..c0f3a35765a9a9 --- /dev/null +++ b/port_versions/e-/effolkronium-random.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "8e1984293d7e95cdab2dff086ad58f639297a924", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "87c432f402e97b4568f03bd61b544e1a335f71cd", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "b4dcdac8c50023d5a19c2a05780249fdf3ea8772", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/efsw.json b/port_versions/e-/efsw.json new file mode 100644 index 00000000000000..15bfab79884eaf --- /dev/null +++ b/port_versions/e-/efsw.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "6fec8b0d52b78fd74b35373e89ff32862ee4597c", + "version-string": "2020-06-08", + "port-version": 1 + }, + { + "git-tree": "497b4a848ae1ffaf34f91728a1b6c2194eed6bcc", + "version-string": "2020-06-08", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/egl-registry.json b/port_versions/e-/egl-registry.json new file mode 100644 index 00000000000000..de47f4d860434b --- /dev/null +++ b/port_versions/e-/egl-registry.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "3140fdc59c3d9481800dd9f9e3fbe75bd4595c6f", + "version-string": "2020-02-20", + "port-version": 0 + }, + { + "git-tree": "5fe5eb54c245bc87d9b4e9e2f483cccdd1b92891", + "version-string": "2020-02-03", + "port-version": 0 + }, + { + "git-tree": "dfee16f129bc15ef5bf5a5f62f704f9db10fed58", + "version-string": "2019-08-08", + "port-version": 0 + }, + { + "git-tree": "c009d4f3a058e48744e7e4177b23b8b08f124869", + "version-string": "2018-06-30-1", + "port-version": 0 + }, + { + "git-tree": "464033366eb8c25de822059ab15eb242150c54b7", + "version-string": "2018-06-30", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/eigen3.json b/port_versions/e-/eigen3.json new file mode 100644 index 00000000000000..0b5015f180f7ed --- /dev/null +++ b/port_versions/e-/eigen3.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "7a4f98a4624de567ff1bf9fa82668eae42e0f996", + "version-string": "3.3.9", + "port-version": 0 + }, + { + "git-tree": "b9090476c373e1c73df0317dae84015a8fac7432", + "version-string": "3.3.7", + "port-version": 8 + }, + { + "git-tree": "97b93ce8d10cc8f3bdf74f78491468fce1b6c86a", + "version-string": "3.3.7", + "port-version": 7 + }, + { + "git-tree": "9c582bb3f87a1a71b8fe7730581f864b8707d301", + "version-string": "3.3.7", + "port-version": 6 + }, + { + "git-tree": "49b1725f9d03cfbf6a6a853b026eea34a86ee5d6", + "version-string": "3.3.7-5", + "port-version": 0 + }, + { + "git-tree": "81980716d7c7849b0fab6092b17b0a943c15cdea", + "version-string": "3.3.7-4", + "port-version": 0 + }, + { + "git-tree": "1ffdcc022c0b77d3064152c96892a36d79391de2", + "version-string": "3.3.7-3", + "port-version": 0 + }, + { + "git-tree": "2cbe54ff3e01f1e4403d0dde5cb98e7fb6ec8ceb", + "version-string": "3.3.7-2", + "port-version": 0 + }, + { + "git-tree": "0f4d4403e7b923e0d60f97a7efd49fdd5890c864", + "version-string": "3.3.7-1", + "port-version": 0 + }, + { + "git-tree": "65f6abba610b69501020eb8c7e7c8d8c4f87d357", + "version-string": "3.3.7", + "port-version": 0 + }, + { + "git-tree": "406065e68c5511732b80145bed1c705159146738", + "version-string": "3.3.5", + "port-version": 0 + }, + { + "git-tree": "8e37c6450cc0522686593205f4c9af0d5748cdb6", + "version-string": "3.3.7", + "port-version": 0 + }, + { + "git-tree": "890d508bcf2929d80518ba37d7954f0d15c85e20", + "version-string": "3.3.5", + "port-version": 0 + }, + { + "git-tree": "8ae375528d7e019a8631cce1924f626b5589165f", + "version-string": "3.3.4-2", + "port-version": 0 + }, + { + "git-tree": "27640ace725d230c153be186d847a1dad97ff4ba", + "version-string": "3.3.4-1", + "port-version": 0 + }, + { + "git-tree": "9fc7f6a3467ba8db529ded6b6b5541022cf323eb", + "version-string": "3.3.4", + "port-version": 0 + }, + { + "git-tree": "ba6106ad2ba44fc13cf8db3a01d2690a219ddf11", + "version-string": "3.3.3-5", + "port-version": 0 + }, + { + "git-tree": "34706ca3d5496a286babfaf6d936fa6ddbb51243", + "version-string": "3.3.3-4", + "port-version": 0 + }, + { + "git-tree": "aecb6d1159e2f8b018670a688b91b93f034fa46c", + "version-string": "3.3.3-3", + "port-version": 0 + }, + { + "git-tree": "1b866fd4ca43b31b332edc72acd37f44bce28975", + "version-string": "3.3.3-2", + "port-version": 0 + }, + { + "git-tree": "83e7a4ad48a0f83722e5c3b57a314c3419307e12", + "version-string": "3.3.3-1", + "port-version": 0 + }, + { + "git-tree": "82fd5a5591c9ff4f052893f4621da24f652ebdc0", + "version-string": "3.3.3", + "port-version": 0 + }, + { + "git-tree": "3d38e168d81ed1c2fb5153ac6f6d52bf3e07eee4", + "version-string": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "5200130549e5b6e42ecd3f7d4a517fe7c7ac0ced", + "version-string": "3.2.10-2", + "port-version": 0 + }, + { + "git-tree": "62a2861278fa08d17d28a507874d2b3beb12a599", + "version-string": "3.2.10-1", + "port-version": 0 + }, + { + "git-tree": "f6ff87ce8b7ddd61c0ca0bbc31104ec565d321cf", + "version-string": "3.2.10", + "port-version": 0 + }, + { + "git-tree": "2f8ec62522a95c5f8a34aa9cc2ddd00bb0e8974e", + "version-string": "3.2.9", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/elfio.json b/port_versions/e-/elfio.json new file mode 100644 index 00000000000000..95899ed2ce887b --- /dev/null +++ b/port_versions/e-/elfio.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "19659f0b36d05c1643f7ecb4b553341a942b1fd5", + "version-string": "3.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/elfutils.json b/port_versions/e-/elfutils.json new file mode 100644 index 00000000000000..2ebe9478fefc7e --- /dev/null +++ b/port_versions/e-/elfutils.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2695bb6d07358b642791808399b606fe52374572", + "version-string": "0.182", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/embree2.json b/port_versions/e-/embree2.json new file mode 100644 index 00000000000000..6992e14342a968 --- /dev/null +++ b/port_versions/e-/embree2.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "3a87d7af065343c7a78620fa2f432272cb56c117", + "version-string": "2.17.7", + "port-version": 0 + }, + { + "git-tree": "7e1ebb90189c8cdfb129cc5bd342df64b69a3cca", + "version-string": "2.16.4-4", + "port-version": 0 + }, + { + "git-tree": "80379f4e8cd94e6ce9f1a2a5ea2a1c22e68c10cd", + "version-string": "2.16.4-3", + "port-version": 0 + }, + { + "git-tree": "c63b3da6b78721cb05cd0d5b11a88f7997af5304", + "version-string": "2.16.4-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/embree3.json b/port_versions/e-/embree3.json new file mode 100644 index 00000000000000..0c66449e62aad7 --- /dev/null +++ b/port_versions/e-/embree3.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "c8355374d128022898e8694462f47103bd730684", + "version-string": "3.11.0", + "port-version": 1 + }, + { + "git-tree": "1005c5b3886fa14360a5a06486c7d5797d8a1d0a", + "version-string": "3.11.0", + "port-version": 0 + }, + { + "git-tree": "fec1ee7f9132cf7c77a446441abaca728ccb6f59", + "version-string": "3.8.0", + "port-version": 0 + }, + { + "git-tree": "28ecc22532d99a411afd28b3a446398360c85b23", + "version-string": "3.6.1-1", + "port-version": 0 + }, + { + "git-tree": "fd760aad4fb8bfa342049d4e06bbb5610c506e87", + "version-string": "3.6.1", + "port-version": 0 + }, + { + "git-tree": "455d9ccc9a9c7dcedc6a7e8d37a90ca7d2e948e4", + "version-string": "3.5.2-3", + "port-version": 0 + }, + { + "git-tree": "41246d35ea9a9d8404e1f0751eda9eb110225acc", + "version-string": "3.5.2-2", + "port-version": 0 + }, + { + "git-tree": "46b116c0f60bfb0647ffd6cd47dfc9e7271960ef", + "version-string": "3.5.2-1", + "port-version": 0 + }, + { + "git-tree": "141aa4e3cd707097ba84565a71f5e97346bc5f2c", + "version-string": "3.5.2", + "port-version": 0 + }, + { + "git-tree": "3a3dc257f2c5a93fc2653f465d4572f33edad654", + "version-string": "3.2.0-3", + "port-version": 0 + }, + { + "git-tree": "97872753e9c6ce0d1de63fc9a5cf1aabccd04195", + "version-string": "3.2.0-2", + "port-version": 0 + }, + { + "git-tree": "cb908c622a393405b78a0a05eb049f6ece637798", + "version-string": "3.2.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/enet.json b/port_versions/e-/enet.json new file mode 100644 index 00000000000000..97a6bea857245e --- /dev/null +++ b/port_versions/e-/enet.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "c75008fab4c7484a37a6693dfd206067e54e439f", + "version-string": "1.3.16", + "port-version": 0 + }, + { + "git-tree": "9b5f005db8d7e0515d31dafa78a5148546b9d37a", + "version-string": "1.3.15", + "port-version": 0 + }, + { + "git-tree": "c4d7e28ed50333c1d425fdb3e5071c2251e7925a", + "version-string": "1.3.13-1", + "port-version": 0 + }, + { + "git-tree": "b7881bc5f3ac79d8c5028a1ee2756ef5e793a39d", + "version-string": "1.3.13", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/ensmallen.json b/port_versions/e-/ensmallen.json new file mode 100644 index 00000000000000..488a414f739acc --- /dev/null +++ b/port_versions/e-/ensmallen.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "9d153b1e8d36e03fedd90ef42d8477380cf264a4", + "version-string": "2.14.2", + "port-version": 0 + }, + { + "git-tree": "20ca406ac47f9f279e917a219e7bf0c4edd514db", + "version-string": "2.11.2", + "port-version": 2 + }, + { + "git-tree": "790db95f443ab1324e98d457a35ea8606ea3c3e1", + "version-string": "2.11.2", + "port-version": 1 + }, + { + "git-tree": "f4d467ae6b1a13f339e1588df75e395084466665", + "version-string": "2.11.2", + "port-version": 0 + }, + { + "git-tree": "ae4f5355b2c656848599440e168470887504924d", + "version-string": "1.15.1", + "port-version": 0 + }, + { + "git-tree": "0e419f997095c435892965f2b2a5c2bad87fbec7", + "version-string": "1.15.0-1", + "port-version": 0 + }, + { + "git-tree": "01eb3d2f1ac3e9fc1223eb6a3a26dd75a6750f6c", + "version-string": "1.15.0", + "port-version": 0 + }, + { + "git-tree": "091ab741819396b75a5ded722d8d280cf8c87905", + "version-string": "1.14.3", + "port-version": 0 + }, + { + "git-tree": "1641086807b14ea7926cf70d79197ee9744527b2", + "version-string": "1.14.2", + "port-version": 0 + }, + { + "git-tree": "7334b23bad4be303b5115b64d4124aec1d830668", + "version-string": "1.14.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/entityx.json b/port_versions/e-/entityx.json new file mode 100644 index 00000000000000..15ab870b469222 --- /dev/null +++ b/port_versions/e-/entityx.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "1c855d1902c11d9ef82d873ae86ad70052082728", + "version-string": "1.3.0-2", + "port-version": 0 + }, + { + "git-tree": "36e4d2470d2d7a52d73a1a632c89477d14749dd8", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "912e4c60393fe3a1db6134574e4d1037d87f6c99", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "bc27172b71e04aed7ae800793f71ff69fa5d897a", + "version-string": "1.2.0-3", + "port-version": 0 + }, + { + "git-tree": "d72489397349d441c51068b326077f4acef22f81", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "1b21dbbbcd0c99eca03a2dbba9ef73e8c2aec0ba", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "c3eb8524d40e82deb1d7740ab27569daa12d688b", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "ad00f952a01ae90204c401d6cba33687372bf96a", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/entt.json b/port_versions/e-/entt.json new file mode 100644 index 00000000000000..1e8b150242010a --- /dev/null +++ b/port_versions/e-/entt.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "9ac028a6b2a32e309f446f9afa9242a0ce2fd891", + "version-string": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "6813e4834592c0a9add40fe263763287ebfac97f", + "version-string": "3.5.1", + "port-version": 0 + }, + { + "git-tree": "8908629e8755efba3bb0ab9a9dd1cf20db393482", + "version-string": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "0ff9daf827a7ef2f7aecce34b563b8b3389280b3", + "version-string": "3.3.2", + "port-version": 0 + }, + { + "git-tree": "cbdc74ee5555e01f4a0b6871d34a1b6ba5c55d8a", + "version-string": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "abdb72d8cf0e6b2db3d0095962930f65fb4ba482", + "version-string": "3.2.2", + "port-version": 0 + }, + { + "git-tree": "44cb9dcf15af291eae200caae101ba79afa831b1", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "8ccb2747f39d2ab4b95d6fd962452a9a42ad37e8", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "cee913133bd55b08ed3229bf9bac0b98fe807320", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "a592610f52923bc2732df059a5108e16c117d82a", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "db2fe8b52c5e1d01102e57060ccb298b4620c867", + "version-string": "2.7.3-1", + "port-version": 0 + }, + { + "git-tree": "1ee672b3bc66d26043aa4dc1ddf50194a9a534ac", + "version-string": "cpp14", + "port-version": 0 + }, + { + "git-tree": "2d1b7037c76bf500b1dde9bf1857bf0f783786bc", + "version-string": "2.7.3", + "port-version": 0 + }, + { + "git-tree": "3390c42341b5dea4589374f92ba748268abee508", + "version-string": "2.7.2", + "port-version": 0 + }, + { + "git-tree": "2002d88f4dbd38d98fc98cbbd40a7d8ce681df03", + "version-string": "2.7.1", + "port-version": 0 + }, + { + "git-tree": "6631c591b7fdb134d186bfaf0cde10c5e6bd25b3", + "version-string": "2.6.1", + "port-version": 0 + }, + { + "git-tree": "647177d66f05756ebe5d7cc526200da9932970bc", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "f03391eccd0e454d9fa01e462d492751f5e8521a", + "version-string": "2.4.2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/epsilon.json b/port_versions/e-/epsilon.json new file mode 100644 index 00000000000000..46cb2702df8965 --- /dev/null +++ b/port_versions/e-/epsilon.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "9d0ee89af9a1cd0f574dac537598e33a1afddf74", + "version-string": "0.9.2-4", + "port-version": 0 + }, + { + "git-tree": "d6368309836d17be941cc74dc3bd4c000a158c7c", + "version-string": "0.9.2-2", + "port-version": 0 + }, + { + "git-tree": "e586e52627b09d76c253b01d669b893575105dbe", + "version-string": "0.9.2-1", + "port-version": 0 + }, + { + "git-tree": "860e044276fa0de579685ffb15af384ee769345d", + "version-string": "0.9.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/esaxx.json b/port_versions/e-/esaxx.json new file mode 100644 index 00000000000000..c6b3e3e99f7d82 --- /dev/null +++ b/port_versions/e-/esaxx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2a5e4429567a9e4f0a5a23df2e097d6cb01d8175", + "version-string": "ca7cb332011ec37", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/evpp.json b/port_versions/e-/evpp.json new file mode 100644 index 00000000000000..1183c6bd76d98b --- /dev/null +++ b/port_versions/e-/evpp.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "f460fd6d64355ccd3ed62d95e79485161aafba85", + "version-string": "0.7.0", + "port-version": 4 + }, + { + "git-tree": "7c904d1be94626ab05c89e7c5933a47201e43df1", + "version-string": "0.7.0-3", + "port-version": 0 + }, + { + "git-tree": "3bc50223ad9b30e894381b064c7ba993da989eca", + "version-string": "0.7.0-2", + "port-version": 0 + }, + { + "git-tree": "10cf6e09e690d2c55e36007fa37b330a2fdcf14f", + "version-string": "0.7.0-1", + "port-version": 0 + }, + { + "git-tree": "485bb830fca08799ba9b190aaaf4ca037a2d957a", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "68c5c0899b17a9e9250ed4123e098aef0b6adace", + "version-string": "0.6.1-2", + "port-version": 0 + }, + { + "git-tree": "d8ccbe116f8f3330e529c0956689db40495ef816", + "version-string": "0.6.1-1", + "port-version": 0 + }, + { + "git-tree": "5853a9c8c20656a6663c8b730756a13a58bac480", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "dad9af676427555291736c096d859d075052128f", + "version-string": "0.5.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/exiv2.json b/port_versions/e-/exiv2.json new file mode 100644 index 00000000000000..6f6848cc146cb0 --- /dev/null +++ b/port_versions/e-/exiv2.json @@ -0,0 +1,189 @@ +{ + "versions": [ + { + "git-tree": "e38c35650c00596aafb8dda45b0d0e7f0a591563", + "version-string": "0.27.3", + "port-version": 4 + }, + { + "git-tree": "412904042cf27c7b49c02c36f4dc90ecaf0112ec", + "version-string": "0.27.3", + "port-version": 3 + }, + { + "git-tree": "8ae29b5306e974b23525e088ce8ceef718a1421e", + "version-string": "0.27.3", + "port-version": 2 + }, + { + "git-tree": "53685f0febdfa0bc634f9bfbb1380873d9fc2907", + "version-string": "0.27.3", + "port-version": 1 + }, + { + "git-tree": "3b8adff2f361ce718efc0135c904a958a280b4f8", + "version-string": "0.27.3", + "port-version": 0 + }, + { + "git-tree": "43a3fa06f5ae55a5eae0e2598955e16ed9aacdad", + "version-string": "0.27.2-1", + "port-version": 0 + }, + { + "git-tree": "17a92a002b3261ec1b79457d090b60a3fc8d8469", + "version-string": "0.27.1-1", + "port-version": 0 + }, + { + "git-tree": "722cc78a61b6c684d6d58a63a60f414e362d7c8f", + "version-string": "0.27.1", + "port-version": 0 + }, + { + "git-tree": "bfa291bdcee8c35275d518c656dc5d9f074dd265", + "version-string": "0.27", + "port-version": 0 + }, + { + "git-tree": "1ece8ea0e01d46e6efd35c7a318d1d89953aa88b", + "version-string": "2018-11-08", + "port-version": 0 + }, + { + "git-tree": "7e117afdb18673e47e9fd00d693a2c3bbb7f80f4", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "35fba01e0198ca5bdc7eb804e4688711edc04de3", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "37f3bdc2808081a280053f0bc1e962ad5b5b5e08", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "db5ac84ccc46bd3ac358e5511d5e7cb286a15ba4", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "5f17a88525c79254c7857598d8655290b3c2be31", + "version-string": "2018-08-03", + "port-version": 0 + }, + { + "git-tree": "e7cfe56c8281371b6bd73edfc355c453f4410a93", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "dc5b63224d6b65ba15cda5edbd9f4aa779135022", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "ad6be0dd6d7050f65ab2373df4cd5ddb92d5221a", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "3108e31a89840f4d82bdee2fb5bc0e1bff2ea85f", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "2e4159b17b72862b98949306b8f1211b693b49ea", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "aa1cd53a0a18c6353422425beebea40e7df0ac15", + "version-string": "2018-04-12", + "port-version": 0 + }, + { + "git-tree": "8822d320c13eb799412cb0846162bafa4d7c4c25", + "version-string": "2018-04-09", + "port-version": 0 + }, + { + "git-tree": "ab3b340877d8fc8bda09d71cfe2aac79597f5209", + "version-string": "2018-04-06", + "port-version": 0 + }, + { + "git-tree": "909c753014f7af686e26569037a4a1299b20fafe", + "version-string": "2018-04-05", + "port-version": 0 + }, + { + "git-tree": "cd71596c2e97816a0a3212b1cc6bf4590211d51e", + "version-string": "2018-04-02", + "port-version": 0 + }, + { + "git-tree": "c060318e9bfd845ea70c61aaac5f21eea037a52f", + "version-string": "2018-03-29", + "port-version": 0 + }, + { + "git-tree": "1fb9dae159e559028130a795af178e527f45823e", + "version-string": "2018-03-27", + "port-version": 0 + }, + { + "git-tree": "3166610abafe5777dbd13a0924d82d2aa2be3a8f", + "version-string": "2018-03-23", + "port-version": 0 + }, + { + "git-tree": "904b94051e07cbd0e1077fbfb2aba96f9936f6e1", + "version-string": "2018-03-20", + "port-version": 0 + }, + { + "git-tree": "a8242c226bb87a04a0c616d56faedff0452cb923", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "7f0eb48767ec847b268b7f319f00d513b6a486c6", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "1a0d2db81a2ddf36bbd289756b250e95304da7de", + "version-string": "8f5b795eaa4bc414d2d6041c1dbd1a7f7bf1fc99-3", + "port-version": 0 + }, + { + "git-tree": "c1e4ae854e0d49cabc272a2f533e3c2755a4db32", + "version-string": "8f5b795eaa4bc414d2d6041c1dbd1a7f7bf1fc99-2", + "port-version": 0 + }, + { + "git-tree": "7766aaf508dd77891ed4da8e93992ce2ac10c31c", + "version-string": "8f5b795eaa4bc414d2d6041c1dbd1a7f7bf1fc99-1", + "port-version": 0 + }, + { + "git-tree": "9854fbdbc4077ca9ab3a187f59d0b0183afe6e01", + "version-string": "8f5b795eaa4bc414d2d6041c1dbd1a7f7bf1fc99", + "port-version": 0 + }, + { + "git-tree": "cc201361949c95b03d6f6fdc3094b7a0aed27e15", + "version-string": "4f4add2cdcbe73af7098122a509dff0739d15908", + "port-version": 0 + }, + { + "git-tree": "2aa65aa2b68f8494978ef6192ef30f6d6885ae0b", + "version-string": "327b3f6c4de4ffda82818367fc870640d2ae8820", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/expat.json b/port_versions/e-/expat.json new file mode 100644 index 00000000000000..94d3ccd20e1873 --- /dev/null +++ b/port_versions/e-/expat.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "f9cd8671e2436416fa63363267574f508aadee9b", + "version-string": "2020-08-18", + "port-version": 0 + }, + { + "git-tree": "945ad2f2899e6543ecc6754f3f90dda9ef888c6c", + "version-string": "2.2.9", + "port-version": 0 + }, + { + "git-tree": "e81844645ff55ac1a4dc8d9e25acbc027a691f8f", + "version-string": "2.2.7", + "port-version": 0 + }, + { + "git-tree": "34c2b1f9cbde41c90fcf58651b971f76a92a37da", + "version-string": "2.2.6", + "port-version": 0 + }, + { + "git-tree": "d7c8d73b3090cf9487ae7caa76201e5455628aec", + "version-string": "2.2.5", + "port-version": 0 + }, + { + "git-tree": "3ca9d898840f161d5ef19e46d5fea0d461661415", + "version-string": "2.2.4-2", + "port-version": 0 + }, + { + "git-tree": "d50bd476d9e34785abc837d1b7f4a3f958a01c18", + "version-string": "2.2.4-1", + "port-version": 0 + }, + { + "git-tree": "a103749efe13a8aa6497b7ec91f93a24d3fe1f77", + "version-string": "2.2.4", + "port-version": 0 + }, + { + "git-tree": "56a210e91dc39098760cbfb5beab008209f819d9", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "2982d118ed6fd966d329162929f9318c3ab7d4f3", + "version-string": "2.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/expected-lite.json b/port_versions/e-/expected-lite.json new file mode 100644 index 00000000000000..8d5270ddbfe0eb --- /dev/null +++ b/port_versions/e-/expected-lite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a3d0c35d13d31b4ea4417e89cb3fd37bbc6fb9c4", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/exprtk.json b/port_versions/e-/exprtk.json new file mode 100644 index 00000000000000..cbfa2ce9b965d5 --- /dev/null +++ b/port_versions/e-/exprtk.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "8052628829fe4c863db89f423ea72afb169db258", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "70f8fa916a05424b2c9c847e3430fd6ccc442712", + "version-string": "2020-01-01", + "port-version": 0 + }, + { + "git-tree": "701185b6ca41473835a65e659acd8557877aa866", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "45114fc733c0760141abe9271eaa1e747890ee3b", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "e86a684d83a39e347e719ee1520ae8b621a60d3b", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "4b4e53d6dc9e1044d4c4a36cbfb80e6a773158db", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "5ac1d0e72bb1cd44883b18257bb2753c0b4246e9", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "abe7e1a710cfd4d93eec6602eeab53e76830f398", + "version-string": "2018.09.30-9836f21", + "port-version": 0 + }, + { + "git-tree": "6f843b1c41139e5ea0ecb94c4c23f528a92d4ea2", + "version-string": "2018.04.30-46877b6", + "port-version": 0 + }, + { + "git-tree": "afccdbf107de0a65a40b4573411739f2dd4d73ca", + "version-string": "2018.01.01-f32d2b4", + "port-version": 0 + } + ] +} diff --git a/port_versions/e-/ezc3d.json b/port_versions/e-/ezc3d.json new file mode 100644 index 00000000000000..606952a6d1021f --- /dev/null +++ b/port_versions/e-/ezc3d.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ef3430033f1d62974ad03b445cee043327516a05", + "version-string": "1.3.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/faad2.json b/port_versions/f-/faad2.json new file mode 100644 index 00000000000000..db7b534e861113 --- /dev/null +++ b/port_versions/f-/faad2.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "52205fadafc9f2d30a0a6d2a3f10407cf1275a3d", + "version-string": "2.9.1", + "port-version": 2 + }, + { + "git-tree": "dde27c5531803105f25f9b7ec0dd1b7b08281129", + "version-string": "2.9.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fadbad.json b/port_versions/f-/fadbad.json new file mode 100644 index 00000000000000..9d41c4803b6830 --- /dev/null +++ b/port_versions/f-/fadbad.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "468c63dfb708e90b78bc67241a9eafdd60a3b15d", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/faiss.json b/port_versions/f-/faiss.json new file mode 100644 index 00000000000000..a8209b68eaebe8 --- /dev/null +++ b/port_versions/f-/faiss.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "57552b56d2871ea87459fc655463067e1b02fcf3", + "version-string": "1.6.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fann.json b/port_versions/f-/fann.json new file mode 100644 index 00000000000000..5b445bb0505242 --- /dev/null +++ b/port_versions/f-/fann.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "7efe8090234f2f2bd71fc7d90eee0248af8741b0", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "8b1ffc0c7f16c4573a9c499afe7ab8f446bd36da", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/farmhash.json b/port_versions/f-/farmhash.json new file mode 100644 index 00000000000000..9d3fa80f9fdcc6 --- /dev/null +++ b/port_versions/f-/farmhash.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "905ec49a7fce57f5c28c60e858ccd443c343894a", + "version-string": "1.1", + "port-version": 2 + }, + { + "git-tree": "733d0cbc6db8340768fb94b657b91b644e9c929a", + "version-string": "1.1-1", + "port-version": 0 + }, + { + "git-tree": "29721e7f90bf6d3ffca45ef79bcaa5eec6358673", + "version-string": "1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fast-cpp-csv-parser.json b/port_versions/f-/fast-cpp-csv-parser.json new file mode 100644 index 00000000000000..65870fed97652c --- /dev/null +++ b/port_versions/f-/fast-cpp-csv-parser.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e2987a08764b26275d4ed8fc728b9460acc9db5e", + "version-string": "2019-08-14", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fastcdr.json b/port_versions/f-/fastcdr.json new file mode 100644 index 00000000000000..87de4ed5ad53b9 --- /dev/null +++ b/port_versions/f-/fastcdr.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "2737f3f6c1cb3e6d652f474740726eb93f4e420a", + "version-string": "1.0.15", + "port-version": 0 + }, + { + "git-tree": "5a17c52543c57bc1c07028a390e1c3dc9531bc1b", + "version-string": "1.0.11", + "port-version": 0 + }, + { + "git-tree": "2ea8f798a0def7da620f7fa328bc98919d550e4c", + "version-string": "1.0.10", + "port-version": 0 + }, + { + "git-tree": "8cd9beeb6b498bceac458d788801515ff18a7b32", + "version-string": "1.0.9-1", + "port-version": 0 + }, + { + "git-tree": "f74618f657cb4d43266720210d2d53cd8a742c72", + "version-string": "1.0.6-2", + "port-version": 0 + }, + { + "git-tree": "e9dbb8bb5fdcce1dbc49d4636f894bd680042b81", + "version-string": "1.0.6-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fastcgi.json b/port_versions/f-/fastcgi.json new file mode 100644 index 00000000000000..ffe90a34527647 --- /dev/null +++ b/port_versions/f-/fastcgi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4626d60c5ae870e59c3a1c04b38379e1be739889", + "version-string": "2020-09-11", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fastfeat.json b/port_versions/f-/fastfeat.json new file mode 100644 index 00000000000000..b1a52c3bc8bf8c --- /dev/null +++ b/port_versions/f-/fastfeat.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "0e8001ec0aef17a819af7f25f4e490a3368ed677", + "version-string": "391d5e9-1", + "port-version": 0 + }, + { + "git-tree": "3ec19766e20f341cef54c2661f0eb3e599c7035f", + "version-string": "391d5e9", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fastlz.json b/port_versions/f-/fastlz.json new file mode 100644 index 00000000000000..9bec493990ad22 --- /dev/null +++ b/port_versions/f-/fastlz.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "04cbfde66bfdf61b82b0248f21a466d69dcb3e0f", + "version-string": "1.0-3", + "port-version": 0 + }, + { + "git-tree": "2d4c900444cb6a51a8da59946a8ef304d1106e88", + "version-string": "1.0-2", + "port-version": 0 + }, + { + "git-tree": "d5f0aeaa4973c61137b10ad65c09fae62a7c3a9c", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "6f6c042ead09ad02f3ad8e503670223edaf6e8db", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fastrtps.json b/port_versions/f-/fastrtps.json new file mode 100644 index 00000000000000..581d1043de4f8f --- /dev/null +++ b/port_versions/f-/fastrtps.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "e51ca9a6f1e9a2e3d838927fbf255a827e7d2014", + "version-string": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "aa40bbcf396f97933016f3c195bfc0d4e212c134", + "version-string": "1.5.0-3", + "port-version": 0 + }, + { + "git-tree": "17766b7858439aa162dfe0a585aee24d5faf311c", + "version-string": "1.5.0-2", + "port-version": 0 + }, + { + "git-tree": "53262c94641be5ba67758fffa2ae03bdcc9ee830", + "version-string": "1.5.0-1", + "port-version": 0 + }, + { + "git-tree": "f2a0d7295ff083e9ee163d7be29aa7c88b3f5fd7", + "version-string": "1.5.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fbthrift.json b/port_versions/f-/fbthrift.json new file mode 100644 index 00000000000000..c5ab1556e9a5c8 --- /dev/null +++ b/port_versions/f-/fbthrift.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4f77ee90c3b33600d679483776c5b5f7cb59def7", + "version-string": "2020.10.19.00", + "port-version": 0 + }, + { + "git-tree": "241d78314ad7872caad18acfe5b1d742249ddc16", + "version-string": "2019.11.11.00", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fcl.json b/port_versions/f-/fcl.json new file mode 100644 index 00000000000000..01253d0f75820f --- /dev/null +++ b/port_versions/f-/fcl.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "52a59e9f37b1e0db67ab735c29199f7eaf6ff1b8", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "2ea3393213f782ec570e7964de5cb48726d88400", + "version-string": "0.6.0-1", + "port-version": 0 + }, + { + "git-tree": "eb5b239c1912dfed5e9b87ac23a2085973b071d7", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "2d9043ecd2095d989dd082a48beaddf64f984f21", + "version-string": "0.5.0-7", + "port-version": 0 + }, + { + "git-tree": "389f3adf2e0b7acb1c511dc53673923d140d4e7d", + "version-string": "0.5.0-6", + "port-version": 0 + }, + { + "git-tree": "65b329630785aafa07fc75bcb87341014b66d61e", + "version-string": "0.5.0-5", + "port-version": 0 + }, + { + "git-tree": "8e4f163e6f265302485cda587b99a90391abf64a", + "version-string": "0.5.0-4", + "port-version": 0 + }, + { + "git-tree": "b165475332793a49c0a2671bdec393ac979b8c35", + "version-string": "0.5.0-3", + "port-version": 0 + }, + { + "git-tree": "a431a8e141b13406c850a81731e86a0faf5617d8", + "version-string": "0.5.0-2", + "port-version": 0 + }, + { + "git-tree": "af91670ae8791c355625eebec28ee88634abf33f", + "version-string": "0.5.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fdk-aac.json b/port_versions/f-/fdk-aac.json new file mode 100644 index 00000000000000..ba737a95d94228 --- /dev/null +++ b/port_versions/f-/fdk-aac.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "4652092e7f7d8dc6578db286c7ce4ef7f5aebafd", + "version-string": "2018-07-08-2", + "port-version": 0 + }, + { + "git-tree": "e26243ad747010ca5b1d0f48fb0486a669b6c977", + "version-string": "2018-07-08-1", + "port-version": 0 + }, + { + "git-tree": "164060857673a39936e2334ecbea4bfa40ccd343", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "96ca4688688ebd4778245baaf83a1563e742fb53", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "b01e29c7e87048047d79eee60b98856c1624f079", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "f4b69a6409221fe9ef9e1edd1a673fe8f337fbfc", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "b0b2d9b833eb0d4078bf3dcbeb812ec96dcc9575", + "version-string": "2017-11-02-1e351", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fdlibm.json b/port_versions/f-/fdlibm.json new file mode 100644 index 00000000000000..7976217f4ba371 --- /dev/null +++ b/port_versions/f-/fdlibm.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "46cc1958aab2e70eb861dc35c58b2e2942c50af7", + "version-string": "5.3-4", + "port-version": 0 + }, + { + "git-tree": "cf2f544939d1f1cb2bd7e8495d352299912b8e06", + "version-string": "5.3-3", + "port-version": 0 + }, + { + "git-tree": "d9f2b360d155a552dbcafcadc72edc60be698adf", + "version-string": "5.3-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/ffmpeg.json b/port_versions/f-/ffmpeg.json new file mode 100644 index 00000000000000..a9bdb56b99701e --- /dev/null +++ b/port_versions/f-/ffmpeg.json @@ -0,0 +1,249 @@ +{ + "versions": [ + { + "git-tree": "f591a51746536b99b4621d39ea7e0dcd8a693016", + "version-string": "4.3.1", + "port-version": 9 + }, + { + "git-tree": "56dab7a1a3ff71df3326e9553990c46404982e37", + "version-string": "4.3.1", + "port-version": 8 + }, + { + "git-tree": "21563dd4914fb2d42c8cf7695df530f5f751520e", + "version-string": "4.3.1", + "port-version": 7 + }, + { + "git-tree": "5d3a6fc704dd62de45a7b95272d726f98e788dba", + "version-string": "4.3.1", + "port-version": 6 + }, + { + "git-tree": "3053f5dde46b866a4541107444c1a84172492d0b", + "version-string": "4.3.1", + "port-version": 5 + }, + { + "git-tree": "f96950f67dffcc135df77d16a0032a34fa9598ec", + "version-string": "4.3.1", + "port-version": 4 + }, + { + "git-tree": "63a43bd6b78c391a6d039fbd7b34e5a4a1fd6e09", + "version-string": "4.3.1", + "port-version": 3 + }, + { + "git-tree": "81f4d565456beadd30b85ef9e6395d24e4a3b0fd", + "version-string": "4.3.1", + "port-version": 2 + }, + { + "git-tree": "e703cb3d8c5fb22dfd8f3e8eb8bab4cad15afb84", + "version-string": "4.3.1", + "port-version": 1 + }, + { + "git-tree": "990cb0b368f3b880dfcfdf3259a0df7c11dd8719", + "version-string": "4.3.1", + "port-version": 0 + }, + { + "git-tree": "7f9c74614e3a1ee21e06958d79bd41bdfd37e3af", + "version-string": "4.2", + "port-version": 26 + }, + { + "git-tree": "eed5ad124dac13ee9c6f31069fc7555732f5d8f5", + "version-string": "4.2", + "port-version": 25 + }, + { + "git-tree": "b317ae50ae955d07f4c2a1fee4e7be7a37f8aa12", + "version-string": "4.2", + "port-version": 24 + }, + { + "git-tree": "fa7f3f153e52596eed0182ef2995c69d9384abae", + "version-string": "4.2", + "port-version": 23 + }, + { + "git-tree": "92523b7fc3aa45025bfd248659b50c627c2542d6", + "version-string": "4.2", + "port-version": 22 + }, + { + "git-tree": "bcb0ebc1e8e60726e495cb5de905fccb324e1172", + "version-string": "4.2", + "port-version": 21 + }, + { + "git-tree": "162cf208619223da97006e66f7444e95fb7f57d8", + "version-string": "4.2", + "port-version": 20 + }, + { + "git-tree": "39539ff22a99d1977d0b08c67b508df01a17bf92", + "version-string": "4.2", + "port-version": 18 + }, + { + "git-tree": "4d94134006280c76c2120c9323b1b9e08e66c762", + "version-string": "4.2", + "port-version": 17 + }, + { + "git-tree": "810d6ba48a4a33c28a3dc625a2416c7660e86813", + "version-string": "4.2", + "port-version": 16 + }, + { + "git-tree": "ea1522ec7f0ec26e24ba4bb70d793bba6461abf5", + "version-string": "4.2", + "port-version": 14 + }, + { + "git-tree": "f8f7689e18892cf97ec1d6aa6b1ab9e66cec39b5", + "version-string": "4.2-13", + "port-version": 0 + }, + { + "git-tree": "864ebd9faa5c0a55a53bb39a01fd4bb8ee557197", + "version-string": "4.2-12", + "port-version": 0 + }, + { + "git-tree": "c2fffbe216b11de1627f5f96a21e3e01bc8eb471", + "version-string": "4.2-11", + "port-version": 0 + }, + { + "git-tree": "eea24ede6c067ac06f34c8c2e2a3f785c01657d2", + "version-string": "4.2-10", + "port-version": 0 + }, + { + "git-tree": "7939a53aa9549939561174707977ab69ff32dbd5", + "version-string": "4.2-9", + "port-version": 0 + }, + { + "git-tree": "8be89f932db0f832ce2b36b63b4509d13685a3f1", + "version-string": "4.2-8", + "port-version": 0 + }, + { + "git-tree": "7ca822bc5250e5361f0801436ab6d868f185e55f", + "version-string": "4.2-7", + "port-version": 0 + }, + { + "git-tree": "d2a10049d6930d640c92a9bd8a03b455b6168ce0", + "version-string": "4.2-6", + "port-version": 0 + }, + { + "git-tree": "8efd7f0b5997b489035aa9c4befbca6e569d4e9c", + "version-string": "4.2-5", + "port-version": 0 + }, + { + "git-tree": "411f10c7243e8ad2a0f5d6852e0310c5e9152a12", + "version-string": "4.2-4", + "port-version": 0 + }, + { + "git-tree": "4371027b0f7a0116db07dfe92a7a00ac326e65b2", + "version-string": "4.2-3", + "port-version": 0 + }, + { + "git-tree": "06ec77181acb20fda2b026cad7d03d85d2f8e53b", + "version-string": "4.2-2", + "port-version": 0 + }, + { + "git-tree": "d372fb2a85b2fc2506fa3762e0d3c8efe5a4999c", + "version-string": "4.2-1", + "port-version": 0 + }, + { + "git-tree": "9b9865be60af0b5186043381768640732679cd3a", + "version-string": "4.2", + "port-version": 0 + }, + { + "git-tree": "1e72c606874a0e1c79002eb4d752c449ef8eec4a", + "version-string": "4.1-3", + "port-version": 0 + }, + { + "git-tree": "51d21e09f4f5152c0ada7f5d88f02cc465d713c7", + "version-string": "4.1-2", + "port-version": 0 + }, + { + "git-tree": "dc480a741f2ff0e63225e39b415d965a49a7515a", + "version-string": "4.1-1", + "port-version": 0 + }, + { + "git-tree": "1ae4caf941f3908b598360dca392e25d1bdcae29", + "version-string": "4.1", + "port-version": 0 + }, + { + "git-tree": "e1c4b3e44f893fbad624800d6aef0e9eddc41cea", + "version-string": "3.3.3-5", + "port-version": 0 + }, + { + "git-tree": "8500b5bcfc6a12ee01bfa3dff3163e7c44b4b7ac", + "version-string": "3.3.3-4", + "port-version": 0 + }, + { + "git-tree": "d6218854d621773b40f8cfeb9c0f185099648b4e", + "version-string": "3.3.3-3", + "port-version": 0 + }, + { + "git-tree": "18f28cfa969a99014fc04496375c11b5d36fee2d", + "version-string": "3.3.3-2", + "port-version": 0 + }, + { + "git-tree": "680aeb47309e74cccf4b0b179dd6ade64b9638c8", + "version-string": "3.3.3-1", + "port-version": 0 + }, + { + "git-tree": "3baec998af60cf506907d2c016359e724348f388", + "version-string": "3.3.3", + "port-version": 0 + }, + { + "git-tree": "5530cc21f9e1eb9edf69c7602f9645217f7f323a", + "version-string": "3.2.4-3", + "port-version": 0 + }, + { + "git-tree": "d80899800ac507ae63774b7d03db7f576bba5ff2", + "version-string": "3.2.4-2", + "port-version": 0 + }, + { + "git-tree": "c9be73c2c1dac33183fcdac503790fcc8fc63093", + "version-string": "3.2.4-1", + "port-version": 0 + }, + { + "git-tree": "34eff5419f7d31101020b47ef6bcd7d17f544ae0", + "version-string": "3.2.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/ffnvcodec.json b/port_versions/f-/ffnvcodec.json new file mode 100644 index 00000000000000..fb611ffb34ebed --- /dev/null +++ b/port_versions/f-/ffnvcodec.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "85f47c87ba8461e3fddb5dfb28e4a89af683a989", + "version-string": "10.0.26.0", + "port-version": 0 + }, + { + "git-tree": "2b1e8c7a20685587250e73aa5893ec257a85f24e", + "version-string": "9.1.23.1", + "port-version": 4 + }, + { + "git-tree": "16317ac71b729d2c2a13e6cf65c8c8f2f48175e7", + "version-string": "9.1.23.1", + "port-version": 3 + }, + { + "git-tree": "65524efaf89bd4c6dab638dbae6c2b86f56e5761", + "version-string": "9.1.23.1-1", + "port-version": 0 + }, + { + "git-tree": "ee4d88eb9aa3687ca2e57d7f8e7db96876138668", + "version-string": "9.1.23.1", + "port-version": 0 + }, + { + "git-tree": "2ab33a804638583554feaa279c52d5a0cc04a7f7", + "version-string": "9.1.23.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fftw3.json b/port_versions/f-/fftw3.json new file mode 100644 index 00000000000000..5abf3a408798a6 --- /dev/null +++ b/port_versions/f-/fftw3.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "6fd8682a3c82db155e040aa24a3a396b5c6c1332", + "version-string": "3.3.8-7", + "port-version": 0 + }, + { + "git-tree": "9e0d5349ca5f6276ce373b00c15b6104be804345", + "version-string": "3.3.8-6", + "port-version": 0 + }, + { + "git-tree": "f4ed64b300f17d9f5612ecd409b160c3d9d86f77", + "version-string": "3.3.8-4", + "port-version": 0 + }, + { + "git-tree": "b57d7e5b258c380aed3acc8e3e4a352497d18a2d", + "version-string": "3.3.8-3", + "port-version": 0 + }, + { + "git-tree": "7aa37378631cfcdbbd23d86142a8a8416ca4914a", + "version-string": "3.3.8-2", + "port-version": 0 + }, + { + "git-tree": "0b73d8f18166631bc59bfc00b3089dfe1c6a9254", + "version-string": "3.3.8", + "port-version": 0 + }, + { + "git-tree": "308bc57914e8c63f71fe1507682f91083d2ba584", + "version-string": "3.3.7-2", + "port-version": 0 + }, + { + "git-tree": "19fd0241d4a2c1d6b38e387efacaa8078f00cf45", + "version-string": "3.3.7-1", + "port-version": 0 + }, + { + "git-tree": "0e68b167bb5bdd5782569b73bd575af3abc2c71c", + "version-string": "3.3.7", + "port-version": 0 + }, + { + "git-tree": "20b4949f00e19110889ea457018e84ab1f2bf220", + "version-string": "3.3.6-p12-1", + "port-version": 0 + }, + { + "git-tree": "29901dfdf496984836ee93766830ddfbd7aa1496", + "version-string": "3.3.6-p12", + "port-version": 0 + }, + { + "git-tree": "bf731bb6cbf5d3f2054fc112a0ce1c35cff89727", + "version-string": "3.3.6-p11", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fftwpp.json b/port_versions/f-/fftwpp.json new file mode 100644 index 00000000000000..c40df3388700cd --- /dev/null +++ b/port_versions/f-/fftwpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "71459a57c6722279dc89288662bf2dd1b6612a58", + "version-string": "2019-12-19", + "port-version": 0 + }, + { + "git-tree": "791ecd52f8bf308fb709eced88cff4ed4d798dc4", + "version-string": "2.05", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/field3d.json b/port_versions/f-/field3d.json new file mode 100644 index 00000000000000..42693d2330784c --- /dev/null +++ b/port_versions/f-/field3d.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "12a46a3791ba70f5da571e9de8fdd6ac4be921f6", + "version-string": "1.7.3", + "port-version": 1 + }, + { + "git-tree": "508621aeb164ada68155a52c44de9cf541868d31", + "version-string": "1.7.3", + "port-version": 0 + }, + { + "git-tree": "bd1daf533aee9576406b0e2db3f3e3153ad05a88", + "version-string": "1.7.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fixed-string.json b/port_versions/f-/fixed-string.json new file mode 100644 index 00000000000000..b61727e2626ae0 --- /dev/null +++ b/port_versions/f-/fixed-string.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5fadefa9a548c0a653cadda794513f9bcde94ceb", + "version-string": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fizz.json b/port_versions/f-/fizz.json new file mode 100644 index 00000000000000..84d20909bca4ba --- /dev/null +++ b/port_versions/f-/fizz.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "2ff51a6f541e733b1c5ae13927be1fd83c7ea977", + "version-string": "2020.10.19.00", + "port-version": 0 + }, + { + "git-tree": "d01402deb79efbd950ee36abb2e8ddb6f5466359", + "version-string": "2020.02.03.00", + "port-version": 1 + }, + { + "git-tree": "ed2c02f8f547ae042e8923f1036d80d92c950a26", + "version-string": "2020.02.03.00", + "port-version": 0 + }, + { + "git-tree": "d979125e61dca6fc9107f122f59cd905f45e758f", + "version-string": "2020.01.20.00", + "port-version": 0 + }, + { + "git-tree": "93c14b33b9776d109ae7ecd927eb07b13091863c", + "version-string": "2019.10.28.00", + "port-version": 0 + }, + { + "git-tree": "0c00b17ead7393ec8f8ad5fbf18630c9a7c97b90", + "version-string": "2019.07.08.00", + "port-version": 0 + }, + { + "git-tree": "069e1d215c60eec3d0fe05e43e93d7dbee0c97b4", + "version-string": "2019.05.20.00-1", + "port-version": 0 + }, + { + "git-tree": "aaee95cb802f3156eff7bbc0fc9f87cb23314936", + "version-string": "2019.05.20.00", + "port-version": 0 + }, + { + "git-tree": "75fdaf681e1ffc8c1dd60c9fdd4357dae222e539", + "version-string": "2019.05.13.00", + "port-version": 0 + }, + { + "git-tree": "93dbfb4399aac9566c5bdab8314c284aa5b34d8f", + "version-string": "2019.04.15.00-1", + "port-version": 0 + }, + { + "git-tree": "b2d6d864379e31903cc41a4da000ab6bd5a29c15", + "version-string": "2019.01.14.00", + "port-version": 0 + }, + { + "git-tree": "a6e3f2d53ac56ce4e099875c94116eb909548428", + "version-string": "2018.10.15.00", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/flann.json b/port_versions/f-/flann.json new file mode 100644 index 00000000000000..b0006366a3713e --- /dev/null +++ b/port_versions/f-/flann.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "a5855028e07259d339cb5a39c45fe92e679aa82b", + "version-string": "2019-04-07", + "port-version": 1 + }, + { + "git-tree": "12f0772fdde28d1ec740ed7cc817d2417026c9a5", + "version-string": "2019-04-07-1", + "port-version": 0 + }, + { + "git-tree": "ea923329f471f230a00ee98b4c9504866c17cc52", + "version-string": "1.9.1-1", + "port-version": 0 + }, + { + "git-tree": "6c9f07f5730026da84965254ffec60f07acc2539", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "0fe1c2452556eb5da16e06dfa04a59c5b37d0f38", + "version-string": "jan2019", + "port-version": 0 + }, + { + "git-tree": "5476a7b1778e6a562f7754b2d4234fbd1f6ecadd", + "version-string": "1.9.1-9", + "port-version": 0 + }, + { + "git-tree": "f56250284c5eb640038ec9c3a3aad258cc10d03c", + "version-string": "1.9.1-8", + "port-version": 0 + }, + { + "git-tree": "6dd49b8f331e4c07e7ff3d8de30d1429f6a3181a", + "version-string": "1.9.1-7", + "port-version": 0 + }, + { + "git-tree": "5bf7cd595057768a52c80de5935d41d5a890766b", + "version-string": "1.9.1-6", + "port-version": 0 + }, + { + "git-tree": "f0bdaf685fcb24a2a2d41bc811f9e0e64dd4f6af", + "version-string": "1.9.1-5", + "port-version": 0 + }, + { + "git-tree": "2279a72c63ebcc85aee91f09aa7ad902355c683d", + "version-string": "1.9.1-4", + "port-version": 0 + }, + { + "git-tree": "9898ad6165be3aa44f3648c3115752f4040e7a92", + "version-string": "1.9.1-3", + "port-version": 0 + }, + { + "git-tree": "2344a0a796ee67718cafc18ffa62959e0d2f0974", + "version-string": "1.9.1-2", + "port-version": 0 + }, + { + "git-tree": "88a928edd33bb1471cca604d5378b451486c9b9f", + "version-string": "1.9.1-1", + "port-version": 0 + }, + { + "git-tree": "2e16cfed0b4c184f1c692f611f350292b27ad7e6", + "version-string": "1.9.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/flashlight-cuda.json b/port_versions/f-/flashlight-cuda.json new file mode 100644 index 00000000000000..987e28af3317a0 --- /dev/null +++ b/port_versions/f-/flashlight-cuda.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "2f4a40c0f613e3c43752f0a818667dcc4b932d28", + "version-string": "20201201", + "port-version": 0 + }, + { + "git-tree": "37c77db0b5f04ae99a144cdd6489b3c7d4f51be6", + "version-string": "20201120", + "port-version": 1 + } + ] +} diff --git a/port_versions/f-/flatbuffers.json b/port_versions/f-/flatbuffers.json new file mode 100644 index 00000000000000..ead5fa66607a99 --- /dev/null +++ b/port_versions/f-/flatbuffers.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "7a379bb07674796e20d0a52c915d7c7d534674a7", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "6019ea7cde6494f696f6f8fd2fb65389703461cc", + "version-string": "1.11.0-1", + "port-version": 0 + }, + { + "git-tree": "1c4f349a62d1f5890dc89efe3203590a600a6ca5", + "version-string": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "fbaabdca9a3ef5a70f7a52d460313f71a841fce8", + "version-string": "1.10.0-1", + "port-version": 0 + }, + { + "git-tree": "8b895daa917130be93228d9d448bbb9c0ddbcbb2", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "e60c85bb9d79dc14a510832504f9a428e11d5bb3", + "version-string": "1.9.0-3", + "port-version": 0 + }, + { + "git-tree": "8f06389a78a19d4b4e2b1114faea2154264d676e", + "version-string": "1.9.0-2", + "port-version": 0 + }, + { + "git-tree": "535cf8f59692a6ff92558630d2cf02bf5f0c0ce4", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "ab0690b27cb8b29b54ab30e62657bb7084fa7df3", + "version-string": "1.8.0-2", + "port-version": 0 + }, + { + "git-tree": "927a4cc9941d3dd8c35dc16cd57f6fc7757021e8", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "e74a42d2729fbcff4d2c635f45b3a443bf779087", + "version-string": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "c95138c1a6669da9d2c602856dad9597530cdd8c", + "version-string": "1.7.1-1", + "port-version": 0 + }, + { + "git-tree": "a2ab6f7dfb8b0f3fc1b1a3c2b0a39bda3ea3e246", + "version-string": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "9987954a65e8356691a797eff1a083a0b57f4f99", + "version-string": "1.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/flint.json b/port_versions/f-/flint.json new file mode 100644 index 00000000000000..7e00ec8ad9e6bf --- /dev/null +++ b/port_versions/f-/flint.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "a8b922c64296e22e3dcbd3d88e689c1ff4e8c046", + "version-string": "2.5.2-4", + "port-version": 0 + }, + { + "git-tree": "bd6a9bf81ef5d141bf190c551704a86d0ad71625", + "version-string": "2.5.2-3", + "port-version": 0 + }, + { + "git-tree": "3f0947c56ac77fa6c0cc5087885216a9733a6a2f", + "version-string": "2.5.2-2", + "port-version": 0 + }, + { + "git-tree": "ec69ad86b37c116e4ef4ccfd2e3cf8c7504438d1", + "version-string": "2.5.2-1", + "port-version": 0 + }, + { + "git-tree": "8f1203f4af8339d41c7cddde541cbd2abb3c69c5", + "version-string": "2.5.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fltk.json b/port_versions/f-/fltk.json new file mode 100644 index 00000000000000..7248be77fe2c40 --- /dev/null +++ b/port_versions/f-/fltk.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "4f56d4551d634591725cc016e804323a7a793faa", + "version-string": "1.3.5", + "port-version": 3 + }, + { + "git-tree": "48eb2531a42e12fcaebf8207366aedefa60def6d", + "version-string": "1.3.5-2", + "port-version": 0 + }, + { + "git-tree": "8d539c078b1a4c3bf3010ab5972ac0d489dc7f40", + "version-string": "1.3.5-1", + "port-version": 0 + }, + { + "git-tree": "baf8caec3e403ff24810ce3da95491c3fe9c7264", + "version-string": "1.3.4-8", + "port-version": 0 + }, + { + "git-tree": "40a4ab0721568550c1f4cc70ff7ed14b2b1f23d1", + "version-string": "1.3.4-7", + "port-version": 0 + }, + { + "git-tree": "388cc2edba9c3fe9f4ecb0f5ea2219f6da2213a0", + "version-string": "1.3.4-6", + "port-version": 0 + }, + { + "git-tree": "28f0fdb5e4ccaf69a69090c38fba644164b08236", + "version-string": "1.3.4-5", + "port-version": 0 + }, + { + "git-tree": "bb0dbc0e835ec189df13055d54ab9a33081e4c3f", + "version-string": "1.3.4-4", + "port-version": 0 + }, + { + "git-tree": "4917e493970f9ee3910d1688a53fee3ceb8bff9a", + "version-string": "1.3.4-3", + "port-version": 0 + }, + { + "git-tree": "b3da8d6f9603a8a2ee6826631954666b0196bb5f", + "version-string": "1.3.4-2", + "port-version": 0 + }, + { + "git-tree": "04dc68cd375c9b468facba579ef78431a9737b11", + "version-string": "1.3.4-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fluidlite.json b/port_versions/f-/fluidlite.json new file mode 100644 index 00000000000000..e223aa78db8a99 --- /dev/null +++ b/port_versions/f-/fluidlite.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "af618c785b8b72c9c9b4be2bee261fac2b86a604", + "version-string": "2020-08-27", + "port-version": 0 + }, + { + "git-tree": "269562a89747aaff1ff9f35f87023a3fa8df0cc0", + "version-string": "2020-08-20", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fluidsynth.json b/port_versions/f-/fluidsynth.json new file mode 100644 index 00000000000000..a766ae2ca7c7b7 --- /dev/null +++ b/port_versions/f-/fluidsynth.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "3c4776e7b26493ea0fa2f825a2e855231805e978", + "version-string": "2.1.4", + "port-version": 0 + }, + { + "git-tree": "fc73c9d5b255126928fc898cb44fd97fd07c1be6", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "11b0e06f40f22adcad7b66e23b14c287dff55ee3", + "version-string": "2.0.5-1", + "port-version": 0 + }, + { + "git-tree": "23f2e524a1ef423ffc02972deff4188768d116c7", + "version-string": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "c763c3d84858e73f9844268c57175ff4d8111da5", + "version-string": "1.1.10", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fmem.json b/port_versions/f-/fmem.json new file mode 100644 index 00000000000000..3a88bc60096139 --- /dev/null +++ b/port_versions/f-/fmem.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bbb6f896858f86d8c7ec02b7e49236dba9ca6bc1", + "version-string": "c-libs-2ccee3d2fb", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fmi4cpp.json b/port_versions/f-/fmi4cpp.json new file mode 100644 index 00000000000000..ce6ab8640ae645 --- /dev/null +++ b/port_versions/f-/fmi4cpp.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "726b0dcda1a5a9040c6ee9088be9071a97380804", + "version-string": "0.7.0-2", + "port-version": 0 + }, + { + "git-tree": "02ff049a480b4c92073aae7d0d1329ce022a6205", + "version-string": "0.7.0-1", + "port-version": 0 + }, + { + "git-tree": "9735eac8fcfd069e6f665bfff7e549479f0b3b27", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "525fe6052925c414dbda95a8610cecb123ee7616", + "version-string": "0.5.3", + "port-version": 0 + }, + { + "git-tree": "7e7db93a9ae51760fdf9c26b33df4ff1e3726fca", + "version-string": "0.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fmilib.json b/port_versions/f-/fmilib.json new file mode 100644 index 00000000000000..2f82459bb4665f --- /dev/null +++ b/port_versions/f-/fmilib.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "13d2aaa0b4dedd6e8b1e7b47a91fd113f80dff87", + "version-string": "2.0.3", + "port-version": 3 + }, + { + "git-tree": "01fab530018dd2a3130c07f0805c82529d8591a3", + "version-string": "2.0.3-2", + "port-version": 0 + }, + { + "git-tree": "a59c81fe436aa6560c108e49641a2e34fab1fb01", + "version-string": "2.0.3-1", + "port-version": 0 + }, + { + "git-tree": "14c32629bcd9d7f92943f345db030adad64b24ff", + "version-string": "2.0.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fmt.json b/port_versions/f-/fmt.json new file mode 100644 index 00000000000000..504ff0772ba413 --- /dev/null +++ b/port_versions/f-/fmt.json @@ -0,0 +1,169 @@ +{ + "versions": [ + { + "git-tree": "dd8cf5e1a2dce2680189a0744102d4b0f1cfb8b6", + "version-string": "7.1.3", + "port-version": 0 + }, + { + "git-tree": "e5f88eb21eeff1e08cb468a48ee808ca65fb01f4", + "version-string": "7.1.2", + "port-version": 0 + }, + { + "git-tree": "17b7a1396df4e214ac3ff5dbae3158e465db6d15", + "version-string": "7.1.1", + "port-version": 0 + }, + { + "git-tree": "dccca1b66d759f9496524c41aae593b0efd56650", + "version-string": "7.1.0", + "port-version": 0 + }, + { + "git-tree": "29b0a65ad50ef811a1eb3a2dff0e1a3bf773bd5c", + "version-string": "7.0.3", + "port-version": 3 + }, + { + "git-tree": "85f02ca7bf140590c53f727f6e67b55dbf0f9c94", + "version-string": "7.0.3", + "port-version": 2 + }, + { + "git-tree": "b8fa9a2b1a88f1efb3a9b450f9be86080af99cdd", + "version-string": "7.0.3", + "port-version": 0 + }, + { + "git-tree": "6a3064224a64e1eced055f2fc53bf9a2b1675ec9", + "version-string": "7.0.2", + "port-version": 0 + }, + { + "git-tree": "dc405c40eb48c9be904aa93bdab522d135a9fc2b", + "version-string": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "0f3778e53ef20a699f6659f744840996c3e76a5d", + "version-string": "6.2.0-1", + "port-version": 0 + }, + { + "git-tree": "49b618918e15459cf1ac6cb46fc24a73019aaeaa", + "version-string": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "f482cb01bd066ff6a26d87f64d05d8a7fc94ace2", + "version-string": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "5820ce164923af8447309d73d79f819aac215341", + "version-string": "6.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d99b6a35e1406ba6b6e09d719bebd086f83ed5f3", + "version-string": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "ce8065ba4b6c0684d54fe330a91e707fa56fbc61", + "version-string": "5.3.0-2", + "port-version": 0 + }, + { + "git-tree": "14ae41740d43442b12f3be229232698dd10b33d5", + "version-string": "5.3.0-1", + "port-version": 0 + }, + { + "git-tree": "c5b92fb6d399e8a8c0e0c4c1f34d110dd9c5b08f", + "version-string": "5.3.0", + "port-version": 0 + }, + { + "git-tree": "4bedcb554cab76e06e99f3fa92ca42aadb868789", + "version-string": "5.2.1", + "port-version": 0 + }, + { + "git-tree": "21f31d03f769bac6b5dea923b80bd9655032323b", + "version-string": "5.2.0", + "port-version": 0 + }, + { + "git-tree": "2f1e98c6ab80ede944577754231eb08349dad90b", + "version-string": "5.1.0", + "port-version": 0 + }, + { + "git-tree": "3b28e51314235400f20c454833cc78669072d783", + "version-string": "5.0.0-1", + "port-version": 0 + }, + { + "git-tree": "7729c49049007671ef242dd7ba88b6dd5a808815", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "eb4c1b0f13dc30c1df45096b8af6853bb84a26f1", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "a5a6be6938e0278a8a9670d15f2f54dbeb5e163a", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "0aefce69119f589236ce566db138df2bbc246c65", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "20eac8a304df2054e596a3ead7bb6b987bb1aa23", + "version-string": "3.0.2", + "port-version": 0 + }, + { + "git-tree": "1032f0f8564db1167bd8435921e58ec0472f95f1", + "version-string": "3.0.1-4", + "port-version": 0 + }, + { + "git-tree": "3b13981d879679bfead73fcfdb85f35988797a7b", + "version-string": "3.0.1-3", + "port-version": 0 + }, + { + "git-tree": "a387db3f034d772673cfaf97058307f79a1dc6ff", + "version-string": "3.0.1-2", + "port-version": 0 + }, + { + "git-tree": "474fae3d40a56c2648ffe6a2052a856fac2cc613", + "version-string": "3.0.1-1", + "port-version": 0 + }, + { + "git-tree": "035bb83b2e692fa0650e7a452c7dd703ee523bfd", + "version-string": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "d034424c150bc874bc7bbc9ad20fd69fc470294e", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d75df7f1760ecaf26d0bc7afbb8181e05713dedc", + "version-string": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/folly.json b/port_versions/f-/folly.json new file mode 100644 index 00000000000000..827da2bec249c4 --- /dev/null +++ b/port_versions/f-/folly.json @@ -0,0 +1,229 @@ +{ + "versions": [ + { + "git-tree": "d7afcb1c0bffe2133bdb889652977a7c31937828", + "version-string": "2020.10.19.00", + "port-version": 0 + }, + { + "git-tree": "76898bf8da99c18fc5a86d58c09ccc7bd3cbb609", + "version-string": "2019.10.21.00", + "port-version": 5 + }, + { + "git-tree": "f1d03d6fd5c93718d8bccdf0165f3edee3b85ec6", + "version-string": "2019.10.21.00", + "port-version": 4 + }, + { + "git-tree": "4ee0f51b82a1b37d9241ef2b210362add64ed91d", + "version-string": "2019.10.21.00", + "port-version": 3 + }, + { + "git-tree": "c832396d957cb000f3381ba6812927fb0b5b3a83", + "version-string": "2019.10.21.00-2", + "port-version": 0 + }, + { + "git-tree": "83c9964f88bda7ef548f24f130964b1ce61efed8", + "version-string": "2019.10.21.00-1", + "port-version": 0 + }, + { + "git-tree": "dede57bccf509881e8267cd621a0b72ba70d639a", + "version-string": "2019.10.21.00", + "port-version": 0 + }, + { + "git-tree": "62c3629a991d3588f092e035a9e3e03ccce5bf8e", + "version-string": "2019.06.17.00", + "port-version": 0 + }, + { + "git-tree": "82352adbd550669ffb89bc750e70303b2c2f5a79", + "version-string": "2019.05.20.00-1", + "port-version": 0 + }, + { + "git-tree": "859e00c976d67aeb3d49eae11fc6bf021cbaf563", + "version-string": "2019.05.20.00", + "port-version": 0 + }, + { + "git-tree": "e9d792a127d06c5a950f4d0ba21c0e08cf7f9859", + "version-string": "2019.05.13.00", + "port-version": 0 + }, + { + "git-tree": "3a0f484cedde3dea088cb32a6d8151722b4967ee", + "version-string": "2019.04.15.00-2", + "port-version": 0 + }, + { + "git-tree": "42acf282f3c202c9fc2155d5604a5aee6fcf88f5", + "version-string": "2019.01.28.00-4", + "port-version": 0 + }, + { + "git-tree": "1ca47f4a451b7bfd84d1b98e350ea14a2a7935ca", + "version-string": "2019.01.28.00-1", + "port-version": 0 + }, + { + "git-tree": "df59c83ec385020cc2db539a576aae830122d017", + "version-string": "2019.01.28.00", + "port-version": 0 + }, + { + "git-tree": "672a9a3ea135bf87b475b6a341ee8ea342a24cff", + "version-string": "2019.01.07.00", + "port-version": 0 + }, + { + "git-tree": "e497410cc6710e00ee379e0cb5872846ac508948", + "version-string": "2018.12.10.00", + "port-version": 0 + }, + { + "git-tree": "685ec7915ad19dbe714bf6ddd1764f7acedd8bbd", + "version-string": "2018.11.26.00", + "port-version": 0 + }, + { + "git-tree": "bc5a01c90a1083864081d35f750af20a672251ba", + "version-string": "2018.11.05.00", + "port-version": 0 + }, + { + "git-tree": "2eccbcb08adb7328e625bb98afb5cc984e4ea2b3", + "version-string": "2018.10.29.00", + "port-version": 0 + }, + { + "git-tree": "518dbe2fcf83f087049b3d7aefe91486fb8953c6", + "version-string": "2018.10.22.00", + "port-version": 0 + }, + { + "git-tree": "c4e9325dc97a358fa1e150c62f6719bc2427f90a", + "version-string": "2018.10.08.00", + "port-version": 0 + }, + { + "git-tree": "e430d0f762660eab5e84098fa8c6d430e991100d", + "version-string": "2018.09.17.00", + "port-version": 0 + }, + { + "git-tree": "14b16eb86d5d682cac801e615532ef58a8e7c9d2", + "version-string": "2018.07.30.00", + "port-version": 0 + }, + { + "git-tree": "e3dde7dbb616614617a195eafa22bb8013d4caaf", + "version-string": "2018.07.02.00", + "port-version": 0 + }, + { + "git-tree": "f46a442c96971a3c4a9bce85b7616c39c1c800aa", + "version-string": "2018.06.25.00", + "port-version": 0 + }, + { + "git-tree": "f03de0ff72e9f2588c57b68cdb0c11c604500692", + "version-string": "2018.05.14.00-01", + "port-version": 0 + }, + { + "git-tree": "d1b9a3c588e76a8c3c250d75426746547c6392fc", + "version-string": "2018.05.14.00", + "port-version": 0 + }, + { + "git-tree": "fca97093afb81b821118b46f0ca4a2337a03273d", + "version-string": "2018.04.30.00", + "port-version": 0 + }, + { + "git-tree": "2ca6602be4799f1fb3e0dd77fe36f35a3518f307", + "version-string": "2018.04.23.00", + "port-version": 0 + }, + { + "git-tree": "8eeb79e2d7101a61461843ad3e959f3c5141cb72", + "version-string": "2018.04.16.00", + "port-version": 0 + }, + { + "git-tree": "39060ddbab252ff9886fb3f613c3dc534166c2e2", + "version-string": "2018.04.09.00", + "port-version": 0 + }, + { + "git-tree": "ad6e20f3b0e1e509e79a048bcbaff04f6574fa94", + "version-string": "2018.03.19.00-2", + "port-version": 0 + }, + { + "git-tree": "6af545445c05893f08683ae02122bb36b62542db", + "version-string": "2018.03.19.00-1", + "port-version": 0 + }, + { + "git-tree": "3dd204b0e700f18fa154dce95ab3b8d4eb46459a", + "version-string": "2017.11.27.00-3", + "port-version": 0 + }, + { + "git-tree": "a61cfd7f02cdfff97337123621596f5c0436b4e8", + "version-string": "2017.11.27.00-2", + "port-version": 0 + }, + { + "git-tree": "d79da0a5d5e7a1d4f95c8af752fe0c052ba944a8", + "version-string": "2017.11.27.00-1", + "port-version": 0 + }, + { + "git-tree": "bd4ba1a797fff1adcc9bbb71e13820f52ff6e1f4", + "version-string": "2017.11.27.00", + "port-version": 0 + }, + { + "git-tree": "a96f69d46196da0013891a1a2f1f8c0c25e8f174", + "version-string": "2017.10.02.00", + "port-version": 0 + }, + { + "git-tree": "92c2e783108aa66f31b8f25ab3bcb250804b94fd", + "version-string": "v2017.10.02.00", + "port-version": 0 + }, + { + "git-tree": "569335027818754d4161525bb5772009918aeb67", + "version-string": "v2017.07.17.01-1", + "port-version": 0 + }, + { + "git-tree": "7ef0ba670fb7e1dcac400074bb128cc848515b76", + "version-string": "v2017.07.17.01", + "port-version": 0 + }, + { + "git-tree": "c23d0840c79bcf0e4cb4945bb48aa8135fc86b2f", + "version-string": "v2017.05.08.00-2", + "port-version": 0 + }, + { + "git-tree": "ba3d7f11a4325aac523c72e30b2be5d9f236cbf3", + "version-string": "v2017.05.08.00-1", + "port-version": 0 + }, + { + "git-tree": "899dba6e2cb7da08ba8cab8c7b402660c97a3217", + "version-string": "v2017.05.08.00", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/font-chef.json b/port_versions/f-/font-chef.json new file mode 100644 index 00000000000000..02eb31ab1f6a13 --- /dev/null +++ b/port_versions/f-/font-chef.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ce88b662a652a10ab2daa61073656a7e0659b91f", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fontconfig.json b/port_versions/f-/fontconfig.json new file mode 100644 index 00000000000000..97cf49e3ddec07 --- /dev/null +++ b/port_versions/f-/fontconfig.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "e4e2d26ab9639fb737206592a04791d998461fa3", + "version-string": "2.13.1", + "port-version": 3 + }, + { + "git-tree": "5fb742a57db672816af7eebfc22a73bf6815428f", + "version-string": "2.13.1", + "port-version": 2 + }, + { + "git-tree": "1e05a2ce1df8f7db65d4d4d0434ead5c050c954e", + "version-string": "2.13.1", + "port-version": 1 + }, + { + "git-tree": "1817e2f41fca036c8b6b340a209b904dcd29a895", + "version-string": "2.13.1", + "port-version": 0 + }, + { + "git-tree": "ef58378bedab373531c754a81b8687c61579d05e", + "version-string": "2.12.4", + "port-version": 13 + }, + { + "git-tree": "8ddbd806b6c40ea75e5008e21120085b52ff3be2", + "version-string": "2.12.4", + "port-version": 12 + }, + { + "git-tree": "18f64ffe4ab99c2c888c78775c08e79932718823", + "version-string": "2.12.4", + "port-version": 11 + }, + { + "git-tree": "c65451f9851fd35f076b2963545bfa88ec503836", + "version-string": "2.12.4-10", + "port-version": 0 + }, + { + "git-tree": "c15189e3f664d9ffca32aefff5ad2ae546abf98b", + "version-string": "2.12.4-9", + "port-version": 0 + }, + { + "git-tree": "7fa8b59fa80c072900155658a325d02191800416", + "version-string": "2.12.4-8", + "port-version": 0 + }, + { + "git-tree": "c17032b6a6676742de24abf031d192ae91c6fda3", + "version-string": "2.12.4-7", + "port-version": 0 + }, + { + "git-tree": "d44d2b6b00d1e48719ce44275bf86aafad12ad1b", + "version-string": "2.12.4-3", + "port-version": 0 + }, + { + "git-tree": "5866944bc2f1980f56703db34b9e6f771683cf27", + "version-string": "2.12.4-1", + "port-version": 0 + }, + { + "git-tree": "8830aabee30aa2f5b471a2e2693c3742ecf522c2", + "version-string": "2.12.4", + "port-version": 0 + }, + { + "git-tree": "c06d475a3ccd902568eb8bb9b39a6bd68df203f2", + "version-string": "2.12.3", + "port-version": 0 + }, + { + "git-tree": "05a5789f8f51bdea6b40ae0c57fa7f4cdf3a73de", + "version-string": "2.12.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/foonathan-memory.json b/port_versions/f-/foonathan-memory.json new file mode 100644 index 00000000000000..9e964cf7c85e1f --- /dev/null +++ b/port_versions/f-/foonathan-memory.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "fbb7ebb8d13d36b8ce0369dd801de6302f412512", + "version-string": "2019-07-21-1", + "port-version": 0 + }, + { + "git-tree": "42382ab1e2981171a512cc5fc349c173d3935b0f", + "version-string": "2019-07-21", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/forest.json b/port_versions/f-/forest.json new file mode 100644 index 00000000000000..01ee43a8415463 --- /dev/null +++ b/port_versions/f-/forest.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "86bfd1af7a9a1606a526260d5e625cf6cd894b07", + "version-string": "12.1.0", + "port-version": 0 + }, + { + "git-tree": "78e99ef56d7301bde8950a08fea4255f7efcd2ba", + "version-string": "12.0.4", + "port-version": 0 + }, + { + "git-tree": "766e475b70e7b34d7e2a2d47803630df4b81cbe5", + "version-string": "12.0.3", + "port-version": 0 + }, + { + "git-tree": "f4f76354c59d58cf4db65db7e8f43a458565adf7", + "version-string": "12.0.0", + "port-version": 0 + }, + { + "git-tree": "19444e7f5c675905e088f59ced6795aaf9e6aa77", + "version-string": "11.0.1", + "port-version": 0 + }, + { + "git-tree": "2c82f330a9cf7aa66f1fd903d42e32e0bc198f0b", + "version-string": "11.0.0", + "port-version": 0 + }, + { + "git-tree": "367f16b0f8882d352730094100cd1a3be66ad9f4", + "version-string": "10.1.1-1", + "port-version": 0 + }, + { + "git-tree": "b9df0580da9a02307d1c660df367231fe6846332", + "version-string": "10.1.1", + "port-version": 0 + }, + { + "git-tree": "82c84ecb58938542fdd8ebd3de73708e27076750", + "version-string": "9.0.6", + "port-version": 0 + }, + { + "git-tree": "4464760043fb72edce823f31c65c42f0d1ae2e40", + "version-string": "9.0.5", + "port-version": 0 + }, + { + "git-tree": "d9735bcd63f23d818ce0c86f99dfb5aaa65ece05", + "version-string": "9.0.1", + "port-version": 0 + }, + { + "git-tree": "dc71d0f7cc0befc1c48e7bfa601cbca4ec48bd01", + "version-string": "9.0.0", + "port-version": 0 + }, + { + "git-tree": "5398bb6b3e41428f2b9e2307d5262e5c1b4745e1", + "version-string": "8.2.0", + "port-version": 0 + }, + { + "git-tree": "b346c4d691ea3272abc19155c836f0a55c012df6", + "version-string": "8.1.1", + "port-version": 0 + }, + { + "git-tree": "c9a4539a709e36ad9da48f44da17557bffedc2d3", + "version-string": "8.0.1", + "port-version": 0 + }, + { + "git-tree": "a8131c659e44b9c4d5ef387ad7acf5917fa46cc4", + "version-string": "7.0.7", + "port-version": 0 + }, + { + "git-tree": "e941b2f0d07c53d5b505613b4c6228f08e1aa1e9", + "version-string": "7.0.6", + "port-version": 0 + }, + { + "git-tree": "74df18ac34d0ffb75dda0c8e0234cec9bca33c74", + "version-string": "7.0.3", + "port-version": 0 + }, + { + "git-tree": "7c749e6d579c3bd8144606a7ee9f2d74cca68a49", + "version-string": "7.0.1", + "port-version": 0 + }, + { + "git-tree": "2350c8255f7fb88024c7fa749e91e8ea3122e5ab", + "version-string": "4.5.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/forge.json b/port_versions/f-/forge.json new file mode 100644 index 00000000000000..d6249928583003 --- /dev/null +++ b/port_versions/f-/forge.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "29625ec4b111b2a3925f77222d9aa600229c8d96", + "version-string": "1.0.5", + "port-version": 0 + }, + { + "git-tree": "0bc3e2443ab15ace08aaee05044596cb78a8c535", + "version-string": "1.0.4-2", + "port-version": 0 + }, + { + "git-tree": "75ae5e24dfe897d8bb259b6389fa328c55bcc91c", + "version-string": "1.0.4-1", + "port-version": 0 + }, + { + "git-tree": "413d6728e689c16fba9ce02790de309b95a77e8e", + "version-string": "1.0.3-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fplus.json b/port_versions/f-/fplus.json new file mode 100644 index 00000000000000..dcf18dfb9b6c4c --- /dev/null +++ b/port_versions/f-/fplus.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "20f3419dc98addfb673ee94bc256aed778dfc568", + "version-string": "0.2.3-p0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/freeglut.json b/port_versions/f-/freeglut.json new file mode 100644 index 00000000000000..eff22f2c7ae8f2 --- /dev/null +++ b/port_versions/f-/freeglut.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "e74a294251de6c8168d8c7015a497a9a0dd91185", + "version-string": "3.2.1-4", + "port-version": 0 + }, + { + "git-tree": "9a44b3ab8895a9a0c355280e89d8bcf1a1952f54", + "version-string": "3.2.1-2", + "port-version": 0 + }, + { + "git-tree": "5b1624ac930d31a4a6240da335be3be9bb94952d", + "version-string": "3.2.1-1", + "port-version": 0 + }, + { + "git-tree": "ffb0fc4d48a0660a27d21a7c3f360baa9be9e773", + "version-string": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "732672fe4e52daec7d724306f61a294e572a998a", + "version-string": "3.0.0-9", + "port-version": 0 + }, + { + "git-tree": "9e70602bc65fada7f8c732063cd6f639e7097861", + "version-string": "3.0.0-8", + "port-version": 0 + }, + { + "git-tree": "1395636f1595dbdee7a8476e206285c6338fe06e", + "version-string": "3.0.0-7", + "port-version": 0 + }, + { + "git-tree": "9bdaf794a8402cf24f71299d8ab812cb4aa53de3", + "version-string": "3.0.0-6", + "port-version": 0 + }, + { + "git-tree": "d1ec2367e350126494330879c2bafecd64eb5f32", + "version-string": "3.0.0-5", + "port-version": 0 + }, + { + "git-tree": "5e18393e2adaf8022fd3fc6d5d9fb410e440aff3", + "version-string": "3.0.0-4", + "port-version": 0 + }, + { + "git-tree": "60e8b9879521d6bd5e4326e0f80af61d51900d4e", + "version-string": "3.0.0-3", + "port-version": 0 + }, + { + "git-tree": "f6492aad63022ab06c0a5c23af106b363c79084a", + "version-string": "3.0.0-2", + "port-version": 0 + }, + { + "git-tree": "890f5e592f28ef98b9e10d34f4d0d79670539987", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "4bb24b2206a2441baa09ac2db53f87a43a6586d0", + "version-string": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/freeimage.json b/port_versions/f-/freeimage.json new file mode 100644 index 00000000000000..c68c6c87a672a5 --- /dev/null +++ b/port_versions/f-/freeimage.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "76911a1130a9c099e49e9fc07a2f5f7cf4c86125", + "version-string": "3.18.0", + "port-version": 18 + }, + { + "git-tree": "f5e71864bf889aee3b6b2491c96f38f0a3801eb0", + "version-string": "3.18.0", + "port-version": 17 + }, + { + "git-tree": "b90040201b75af36504d2f32487a6ec83a666d5e", + "version-string": "3.18.0", + "port-version": 16 + }, + { + "git-tree": "eeccf360adb2438749349ce1a4c8d7c6f3c812a2", + "version-string": "3.18.0", + "port-version": 15 + }, + { + "git-tree": "f35c533652a98afb7b4510687aedc955d93907a6", + "version-string": "3.18.0", + "port-version": 13 + }, + { + "git-tree": "465abdea0090a91cb512e6dd3c860da6acc794c3", + "version-string": "3.18.0-12", + "port-version": 0 + }, + { + "git-tree": "e823f80604efe17747d35e69fdef8459375f67ea", + "version-string": "3.18.0-10", + "port-version": 0 + }, + { + "git-tree": "b852b66cc5f11a9456af47e473983afdcf043b29", + "version-string": "3.18.0-9", + "port-version": 0 + }, + { + "git-tree": "bb35665ba508c70cb816a7eded1c7e641637af9a", + "version-string": "3.18.0-8", + "port-version": 0 + }, + { + "git-tree": "f2c1ff7a5831bbc4f603efc956c411cb5116a3fc", + "version-string": "3.18.0-7", + "port-version": 0 + }, + { + "git-tree": "bc232e84ebe305816123682af33f4e6d247a245b", + "version-string": "3.18.0-6", + "port-version": 0 + }, + { + "git-tree": "c1742fc4977130dbdf70f6616a2ba7be288bb5b7", + "version-string": "3.18.0-5", + "port-version": 0 + }, + { + "git-tree": "5922381d2bbca21d42f08e55674a00b51b548850", + "version-string": "3.18.0-4", + "port-version": 0 + }, + { + "git-tree": "8d78bdc2db3ad483af50c8ab3a27d336114e45a9", + "version-string": "3.18.0-3", + "port-version": 0 + }, + { + "git-tree": "1b4990358cced937bf2625f3bb6061be2d0bc717", + "version-string": "3.18.0-2", + "port-version": 0 + }, + { + "git-tree": "5af0544aaa35eb89ed1f0682869d656c8c71daa6", + "version-string": "3.18.0-1", + "port-version": 0 + }, + { + "git-tree": "28e08beb392fe720d34ee7bfe59b9cc164553691", + "version-string": "3.17.0-4", + "port-version": 0 + }, + { + "git-tree": "5e3985b261929ca6696c71847ec4e4f48af1317e", + "version-string": "3.17.0-3", + "port-version": 0 + }, + { + "git-tree": "f6e5a2b99cf21bf265f6acee6ba0466fd07161fd", + "version-string": "3.17.0-2", + "port-version": 0 + }, + { + "git-tree": "6155a4de218f6bf2892fb4c342754d9161fc11df", + "version-string": "3.17.0-1", + "port-version": 0 + }, + { + "git-tree": "10f466265fffc19a76dde5ee7ea86b6c71c2fcbf", + "version-string": "3.17.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/freeopcua.json b/port_versions/f-/freeopcua.json new file mode 100644 index 00000000000000..abb625eef73222 --- /dev/null +++ b/port_versions/f-/freeopcua.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "c111b437e30a05cded36f1994f24606c70c0c326", + "version-string": "20190125-3", + "port-version": 0 + }, + { + "git-tree": "5570f6134f2de2693ef7301c1617368b5970d111", + "version-string": "20190125-2", + "port-version": 0 + }, + { + "git-tree": "6fe95c4e36b1b43c1163e4c9edc2e7a990853654", + "version-string": "20190125-1", + "port-version": 0 + }, + { + "git-tree": "4c00e8f38cee7e67a342038931e03e74ca61b878", + "version-string": "20190125", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/freerdp.json b/port_versions/f-/freerdp.json new file mode 100644 index 00000000000000..f4b760ab9a5d4e --- /dev/null +++ b/port_versions/f-/freerdp.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "1c37decc1c0ae21cb895e8c263e7ff06454425e8", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "c5570fd8d4d98729d085a36950faea8d8a53cf5a", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "062d933e3d9d8f6f9cd5ea4c6a7c9914baf6fb6e", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "4e192d61b67c92110fe373ee4efb590e59bd7321", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "b6aa77a82ad6f20daec8ec4d86f9fe00f0870ef0", + "version-string": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "593c2401e654c386b78da29be7a34be37a813156", + "version-string": "2.0.0-rc4-7", + "port-version": 0 + }, + { + "git-tree": "ae206ebddcbb2a2af3b77024f0e77cfad475b96e", + "version-string": "2.0.0-rc4-6", + "port-version": 0 + }, + { + "git-tree": "80b5b7d76990b51a9550586f41703b078c91d06a", + "version-string": "2.0.0-rc4-5", + "port-version": 0 + }, + { + "git-tree": "af49ef7e7ded92744b51009625fb6bc5f2006c1c", + "version-string": "2.0.0-rc4-4", + "port-version": 0 + }, + { + "git-tree": "4de9a797f785cea795d9eeee4af5330244feebbc", + "version-string": "2.0.0-rc4-3", + "port-version": 0 + }, + { + "git-tree": "00df49231521b5e9485d76bad6e678fffa58fb1b", + "version-string": "2.0.0-rc4-2", + "port-version": 0 + }, + { + "git-tree": "70048fa5e3a76603c151b89bbdef9109c8c6cbac", + "version-string": "2.0.0-rc4-1", + "port-version": 0 + }, + { + "git-tree": "dd733e725b2d3bba7a7a106d6cf1e45774377628", + "version-string": "2.0.0-rc4", + "port-version": 0 + }, + { + "git-tree": "4e8d577b95fd9af066a3c09b2bb714d80e9f50f9", + "version-string": "2.0.0-rc1~vcpkg1-1", + "port-version": 0 + }, + { + "git-tree": "031ee4887e09f3623d3739c997625c0dc199eda4", + "version-string": "2.0.0-rc1~vcpkg1", + "port-version": 0 + }, + { + "git-tree": "2ecc613d11614a024950bef07314e7d50a5709d9", + "version-string": "2.0.0-rc0~vcpkg1-1", + "port-version": 0 + }, + { + "git-tree": "11a158a9cd1d634bc4d9d5a9ce33d99a76e57eb6", + "version-string": "2.0.0-rc0~vcpkg1", + "port-version": 0 + }, + { + "git-tree": "fd0237d8397bf2b49e3fc9d24e0ad6ea8f6638ac", + "version-string": "2.0.0-beta1+android11~vcpkg1", + "port-version": 0 + }, + { + "git-tree": "4a703a01ce702b0fbf3a79a4e1fe8c820a14e293", + "version-string": "2.0.0-beta1+android11", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/freetds.json b/port_versions/f-/freetds.json new file mode 100644 index 00000000000000..cb6828f879e92c --- /dev/null +++ b/port_versions/f-/freetds.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "78236f0bd404616850bc174e84bb6736cc197d73", + "version-string": "1.2.11", + "port-version": 1 + }, + { + "git-tree": "439c96e2d69abf4f1e4a462164bd3f43f764bd41", + "version-string": "1.2.11", + "port-version": 0 + }, + { + "git-tree": "2123a9defa2feacf14d70c50f936b6c912ad8543", + "version-string": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "eeec4d1fbaa17b0929038cfd1bc28d28781bf879", + "version-string": "1.1.17", + "port-version": 0 + }, + { + "git-tree": "dbade27568ad8a35b927b2e740c9df191f51b793", + "version-string": "1.1.6-1", + "port-version": 0 + }, + { + "git-tree": "55d76ed2acda18d5262cdd239659c73435d7ba41", + "version-string": "1.1.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/freetype-gl.json b/port_versions/f-/freetype-gl.json new file mode 100644 index 00000000000000..1bdf8240cd28d9 --- /dev/null +++ b/port_versions/f-/freetype-gl.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "510adf88620e2f9d059d5fad33826148cd157957", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "70864cb04a4c9b3e006b61174572fd73d9636b2f", + "version-string": "2019-03-29", + "port-version": 4 + }, + { + "git-tree": "bc1822817ca08f645cff5f3fa7004b7f2c87c4d1", + "version-string": "2019-03-29-3", + "port-version": 0 + }, + { + "git-tree": "4221297464606010bc9f77daf5ae8be4b2f1c523", + "version-string": "2019-03-29-2", + "port-version": 0 + }, + { + "git-tree": "e52376d6a52e61c69680b317a5f3fd3f15f63829", + "version-string": "2019-03-29-1", + "port-version": 0 + }, + { + "git-tree": "aa481e047172bc4aaf23658fdc2aa26d108daf52", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "704b2c66ea56709f33dfb22703a4927e8af4a922", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "73845f2ec15e48b73d4fbf3c0d0f0934d4582c76", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "c8a43eaf03ce3a6bec67d700359b7d42e67ff4d6", + "version-string": "2017-10-9-82fb152a74f01b1483ac80d15935fbdfaf3ed836", + "port-version": 0 + }, + { + "git-tree": "a94520898aa0e54b08562e0ece07d312cc302b95", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/freetype.json b/port_versions/f-/freetype.json new file mode 100644 index 00000000000000..4462655c851df0 --- /dev/null +++ b/port_versions/f-/freetype.json @@ -0,0 +1,154 @@ +{ + "versions": [ + { + "git-tree": "dabcba1d5153c796480c50c459ef045b5db8d2a4", + "version-string": "2.10.4", + "port-version": 0 + }, + { + "git-tree": "1cb9be3e21abf88d9607f250dceaeca6ac0b1ed9", + "version-string": "2.10.2", + "port-version": 7 + }, + { + "git-tree": "99c654355743a6c93c80e4cab1eda3cfd3fc8160", + "version-string": "2.10.2", + "port-version": 6 + }, + { + "git-tree": "2ea07e49ef4c7e147a344a0652060544ba6203d0", + "version-string": "2.10.2", + "port-version": 5 + }, + { + "git-tree": "5617afec62e979a2f6c540fe71ee9edf0190d510", + "version-string": "2.10.2", + "port-version": 4 + }, + { + "git-tree": "feace7c60ed1b85ef794cf148f7248caea554ea0", + "version-string": "2.10.2", + "port-version": 3 + }, + { + "git-tree": "58c6c681699fd8788c8e6634007db06477b177f8", + "version-string": "2.10.2", + "port-version": 2 + }, + { + "git-tree": "64d028f31c310cbe8a67c0a794fc6749be2d39d1", + "version-string": "2.10.2", + "port-version": 1 + }, + { + "git-tree": "208324c4f1b5ddda676af728adf0f3576f782754", + "version-string": "2.10.1-6", + "port-version": 0 + }, + { + "git-tree": "2d07c58f326488b7f34947f53df711f98d7adc5b", + "version-string": "2.10.1-5", + "port-version": 0 + }, + { + "git-tree": "6770e1464a643bc7c1544c307a4081ddeda847e2", + "version-string": "2.10.1-4", + "port-version": 0 + }, + { + "git-tree": "2128fe69a7209b207c28a0e490cec703348d1c71", + "version-string": "2.10.1-3", + "port-version": 0 + }, + { + "git-tree": "b2ac8435a6be8bc5f142cc42058c2bb05a54f68d", + "version-string": "2.10.1-2", + "port-version": 0 + }, + { + "git-tree": "bed0c9ff4fd5b89c11aff6834affc9f616c178a9", + "version-string": "2.10.1-1", + "port-version": 0 + }, + { + "git-tree": "2f500736d0b0af3d480ae55f6e0f6650713ea092", + "version-string": "2.10.0-1", + "port-version": 0 + }, + { + "git-tree": "6a1585a8624af605e2b4ee1fcf73f193c8e92d97", + "version-string": "2.10.0", + "port-version": 0 + }, + { + "git-tree": "9bf7e372c7f9d153c4c9da108c4acb8878ca618a", + "version-string": "2.9.1-2", + "port-version": 0 + }, + { + "git-tree": "3a1f9ec900a84b9cf7ac9fee240cc724b6a4d914", + "version-string": "2.9.1-1", + "port-version": 0 + }, + { + "git-tree": "e4b2b5267a039246cff146d301a356cb41298c68", + "version-string": "2.9.1", + "port-version": 0 + }, + { + "git-tree": "350223fe34104da2c1af3a35a2a35a5ff5393569", + "version-string": "2.8.1-4", + "port-version": 0 + }, + { + "git-tree": "bb10d0eba6916c18ab5f96863ff785a355419a7c", + "version-string": "2.8.1-3", + "port-version": 0 + }, + { + "git-tree": "a379db61c0507527b1c6b91ef7a28c3b85a84e95", + "version-string": "2.8.1-1", + "port-version": 0 + }, + { + "git-tree": "dd7c9908be49bd1f7eeaed239abb61786f46dc5c", + "version-string": "2.8-1", + "port-version": 0 + }, + { + "git-tree": "be76f27592bba7ed8998bd91b0fbb47eef90c0fa", + "version-string": "2.8", + "port-version": 0 + }, + { + "git-tree": "ec1f534cbfa539d7fd2fdc158599fdae36ce406a", + "version-string": "2.6.3-5", + "port-version": 0 + }, + { + "git-tree": "d710681643612a39848e95741c9fe9b9692a76a4", + "version-string": "2.6.3-4", + "port-version": 0 + }, + { + "git-tree": "d27015841edd5cc6890e943f4f551038159715d7", + "version-string": "2.6.3-3", + "port-version": 0 + }, + { + "git-tree": "08f108a3a615a834244bf856c5f27c66250b049d", + "version-string": "2.6.3-2", + "port-version": 0 + }, + { + "git-tree": "8a146a9ae2b230c5732817b8077f8472feb7a9e9", + "version-string": "2.6.3-1", + "port-version": 0 + }, + { + "git-tree": "db411c17d642c61fcca8f29001fd08423187361c", + "version-string": "2.6.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/freexl.json b/port_versions/f-/freexl.json new file mode 100644 index 00000000000000..8883043b52ac96 --- /dev/null +++ b/port_versions/f-/freexl.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "eb377ce039ce22eaec25f3bf81668c5d77bec086", + "version-string": "1.0.4", + "port-version": 11 + }, + { + "git-tree": "7621887e434dcd5436b2d4b814fc569e7470d2ae", + "version-string": "1.0.4", + "port-version": 10 + }, + { + "git-tree": "8bedb6059320daeaf3053397f006c33345c42b08", + "version-string": "1.0.4-9", + "port-version": 0 + }, + { + "git-tree": "e244c1326fd2e11371c0dfde72764a62645e8863", + "version-string": "1.0.4-8", + "port-version": 0 + }, + { + "git-tree": "93e13d9107e454293c42d1f5d0c8b10aef997c26", + "version-string": "1.0.4-7", + "port-version": 0 + }, + { + "git-tree": "0653fd4cccb65cd5afdc08be557eedcdd5bc9c32", + "version-string": "1.0.4-6", + "port-version": 0 + }, + { + "git-tree": "34267284d78ad994c64070ca1f83e6aa2e6fa9ae", + "version-string": "1.0.4-5", + "port-version": 0 + }, + { + "git-tree": "ba53878a24c9b345fee375d52946db8f1441c52d", + "version-string": "1.0.4-2", + "port-version": 0 + }, + { + "git-tree": "59d726a486ff7f4246088c9ddffd2311811c664d", + "version-string": "1.0.4-1", + "port-version": 0 + }, + { + "git-tree": "78018658069204bfb1444a91e5246542eed918a4", + "version-string": "1.0.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fribidi.json b/port_versions/f-/fribidi.json new file mode 100644 index 00000000000000..343c1c72a505cc --- /dev/null +++ b/port_versions/f-/fribidi.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "cfd7b4f4b0342721b50ef5eab54510351797e343", + "version-string": "1.0.10", + "port-version": 1 + }, + { + "git-tree": "40cbd20c8b1111f20989db2341eadd77a2935ba2", + "version-string": "1.0.10", + "port-version": 0 + }, + { + "git-tree": "b450252220350ac81b7ffe9da01b5ab8a591f282", + "version-string": "1.0.9-1", + "port-version": 0 + }, + { + "git-tree": "c331cf608aabdbf5014c8ce53ce28535e7d0d056", + "version-string": "1.0.9", + "port-version": 0 + }, + { + "git-tree": "6f7db7694f8d226c6e7819ceabb6c9dfadf7a5e7", + "version-string": "2019-02-04-3", + "port-version": 0 + }, + { + "git-tree": "6b759ba74a5377a29b53383857f603e29d2272ce", + "version-string": "2019-02-04-2", + "port-version": 0 + }, + { + "git-tree": "17cdd47123a95be41d62c67043d6195e0bc352b9", + "version-string": "2019-02-04-1", + "port-version": 0 + }, + { + "git-tree": "de69bf0436d96861f2d9b48ce70537babfe717db", + "version-string": "58c6cb3", + "port-version": 0 + }, + { + "git-tree": "63d551d740ff3476f8047fbc11c06f4c420898b0", + "version-string": "1.0.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/frozen.json b/port_versions/f-/frozen.json new file mode 100644 index 00000000000000..37bf0e27b72353 --- /dev/null +++ b/port_versions/f-/frozen.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "db2f839a9c1bfea5b1916b1dffab205ea64144b4", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fruit.json b/port_versions/f-/fruit.json new file mode 100644 index 00000000000000..3a1ad775c68670 --- /dev/null +++ b/port_versions/f-/fruit.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e6dae7cd2c3f307a0cbc6d2a676ae582afea6cd8", + "version-string": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "ea035b31414afce156eba8a6e84d06e1b8f23884", + "version-string": "3.4.0-2", + "port-version": 0 + }, + { + "git-tree": "441e8134c24195a5ff65632eb9168b71c547f2f6", + "version-string": "3.4.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/ftgl.json b/port_versions/f-/ftgl.json new file mode 100644 index 00000000000000..132ff5f90a63e2 --- /dev/null +++ b/port_versions/f-/ftgl.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "394f15ad9c241aec2909e3c28b2dc04a7b412e30", + "version-string": "2.4.0-2", + "port-version": 0 + }, + { + "git-tree": "320c9a877d560b757606384c9a72a45d89351e3a", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "c797f24d2b95a56a8174299494530c7617ea57aa", + "version-string": "2.3.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/function2.json b/port_versions/f-/function2.json new file mode 100644 index 00000000000000..5ff59f200adba5 --- /dev/null +++ b/port_versions/f-/function2.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1e02d8c31f298e37fe21781f8114c31ae29a1e73", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "2fceb990aff2d58fedcdd536e731876427df9edb", + "version-string": "4.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/fuzzylite.json b/port_versions/f-/fuzzylite.json new file mode 100644 index 00000000000000..55cb29b1bdfe20 --- /dev/null +++ b/port_versions/f-/fuzzylite.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "374c4e29fa24184089d4622061f11481dae3ddf3", + "version-string": "6.0", + "port-version": 3 + }, + { + "git-tree": "0a835a50d74e23daaf0851d47fe12c528cc1394f", + "version-string": "6.0-2", + "port-version": 0 + }, + { + "git-tree": "6acf57d6d12d70de1cce275c14f6d28d8a01c95a", + "version-string": "6.0-1", + "port-version": 0 + }, + { + "git-tree": "7902b2f4f48814fbd79364e1ec9acc4ece59dfb3", + "version-string": "6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/g2o.json b/port_versions/g-/g2o.json new file mode 100644 index 00000000000000..984acec6c68db0 --- /dev/null +++ b/port_versions/g-/g2o.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "d0ac4605d18f07a2a3087a71be8c84f6ad0fbfa8", + "version-string": "2020-02-07", + "port-version": 1 + }, + { + "git-tree": "7d418d32b5bf4d25c51cc84fe67186a03c289c15", + "version-string": "2020-02-07", + "port-version": 0 + }, + { + "git-tree": "b8d549421281befb7d6d5c5056275d245c17c69c", + "version-string": "20170730_git-5", + "port-version": 0 + }, + { + "git-tree": "a52a19ce11fc752a0256720a3cac9514de58742e", + "version-string": "20170730_git-4", + "port-version": 0 + }, + { + "git-tree": "f4224207001b084a57bb179a658890e3029ed6c6", + "version-string": "20170730_git-3", + "port-version": 0 + }, + { + "git-tree": "9596412729bf6ca5cc6290b37a451be668c7d3c5", + "version-string": "20170730_git-2", + "port-version": 0 + }, + { + "git-tree": "4a825f4f5c10a40d9604ad9f3a2d20a14b1f26d4", + "version-string": "20170730_git-1", + "port-version": 0 + }, + { + "git-tree": "72ea0e28f85e20e62aa30a045d9672c6c50b595d", + "version-string": "20170730_git", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/g3log.json b/port_versions/g-/g3log.json new file mode 100644 index 00000000000000..87ea9bcf4e48ed --- /dev/null +++ b/port_versions/g-/g3log.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "dea4491e152ae900d6677244552b14be3bf4c125", + "version-string": "2019-07-29", + "port-version": 0 + }, + { + "git-tree": "ee6c6eee295d8a73fecaa35742d50e8abc04be5e", + "version-string": "2019-05-14-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gainput.json b/port_versions/g-/gainput.json new file mode 100644 index 00000000000000..8667f33e23d974 --- /dev/null +++ b/port_versions/g-/gainput.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "db05d34018ddbbfb24d06d2f5afcd51f1def0820", + "version-string": "1.0.0-3", + "port-version": 0 + }, + { + "git-tree": "99b7d6e2fa73fd4eb28d9001148a44a40183206a", + "version-string": "1.0.0-2", + "port-version": 0 + }, + { + "git-tree": "3490da61454df8c322103829ddf1d8ed824d6468", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "b3556cad0c2075723f26a31c4ba2d297626654dc", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gamedev-framework.json b/port_versions/g-/gamedev-framework.json new file mode 100644 index 00000000000000..9e5df9ac187e32 --- /dev/null +++ b/port_versions/g-/gamedev-framework.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f2b6019722d4b0a58278a92dc29c4cb649256083", + "version-string": "0.18.1", + "port-version": 0 + }, + { + "git-tree": "577ec11df3de153105eafe87f6b9214827867ecf", + "version-string": "0.18.0", + "port-version": 0 + }, + { + "git-tree": "135e76b803173ac7d3c6f218839b9a13eb58a466", + "version-string": "0.17", + "port-version": 1 + }, + { + "git-tree": "fa493a07b83c63e5d7c6c09e8f8d8baeb62a2aab", + "version-string": "0.17", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gamma.json b/port_versions/g-/gamma.json new file mode 100644 index 00000000000000..238124214297e6 --- /dev/null +++ b/port_versions/g-/gamma.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "5ce812228d6667a97bff96462c591eec32184cc9", + "version-string": "gamma-2018-01-27", + "port-version": 2 + }, + { + "git-tree": "fd6472b7d487872812477d84d19e0a4565ebc890", + "version-string": "gamma-2018-01-27-1", + "port-version": 0 + }, + { + "git-tree": "47a2badd9e413049c3b2e0c63e150768fb19665a", + "version-string": "gamma-2018-01-27", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gasol.json b/port_versions/g-/gasol.json new file mode 100644 index 00000000000000..ee0bf1e26c58d3 --- /dev/null +++ b/port_versions/g-/gasol.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e8163bf2d3dc55fc60058bccc216f37af6451796", + "version-string": "2018-01-04", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gaussianlib.json b/port_versions/g-/gaussianlib.json new file mode 100644 index 00000000000000..1bdf4e6492e0f7 --- /dev/null +++ b/port_versions/g-/gaussianlib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "521b395417590d5aa1cc0fa06cef081c5b14fc96", + "version-string": "2019-08-04", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gcem.json b/port_versions/g-/gcem.json new file mode 100644 index 00000000000000..2b4a627b0b8bd3 --- /dev/null +++ b/port_versions/g-/gcem.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d65e2e2add7a84fdc29049058d9678c025783123", + "version-string": "1.13.1", + "port-version": 0 + }, + { + "git-tree": "407747ebdcebacdc169b487bc8445eb0ba344aa8", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "187d71d44420931552570a8f4d3ea5114bbb5cdb", + "version-string": "1.8.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gdal.json b/port_versions/g-/gdal.json new file mode 100644 index 00000000000000..c0a48048b2f121 --- /dev/null +++ b/port_versions/g-/gdal.json @@ -0,0 +1,159 @@ +{ + "versions": [ + { + "git-tree": "fc7d76bf3899b89791a7699037bed3532cdc0c60", + "version-string": "3.1.3", + "port-version": 1 + }, + { + "git-tree": "ce628f1ed087dc7d0be29ff484895fab1c992228", + "version-string": "3.1.3", + "port-version": 0 + }, + { + "git-tree": "fb802c0f6e1b27c52a536a54fe3e983db2ed8078", + "version-string": "2.4.1", + "port-version": 14 + }, + { + "git-tree": "09c17ced8d0c36fb39d82b961567635b428a306b", + "version-string": "2.4.1", + "port-version": 13 + }, + { + "git-tree": "794d34d7524369ff21e1cd9e08375fd19299c07e", + "version-string": "2.4.1", + "port-version": 12 + }, + { + "git-tree": "e8922800d4b5ae222c4dc31ddacf13ac0948ccb6", + "version-string": "2.4.1", + "port-version": 11 + }, + { + "git-tree": "3f1fef0f90db6f004c572014ba19a10997cb3868", + "version-string": "2.4.1", + "port-version": 10 + }, + { + "git-tree": "c8ecaef2226d498408ec8b7f8e9f6884c5470f47", + "version-string": "2.4.1-9", + "port-version": 0 + }, + { + "git-tree": "66f895894f4d9f4009d1039154e1c12cb64ae2a4", + "version-string": "2.4.1-8", + "port-version": 0 + }, + { + "git-tree": "cf5b9d5d3202b07908b2e9de372f927737ed9b10", + "version-string": "2.4.1-7", + "port-version": 0 + }, + { + "git-tree": "6979604bbc0cec851a1b2b4d293eb5438cd4389a", + "version-string": "2.4.1-5", + "port-version": 0 + }, + { + "git-tree": "9c8914ac204ea2232a0151c3fdf6d02e08e52dce", + "version-string": "2.4.1-4", + "port-version": 0 + }, + { + "git-tree": "cc8ea7762a1c4476214387dd030ae56432462e24", + "version-string": "2.4.1-3", + "port-version": 0 + }, + { + "git-tree": "f702bb7a936630aca29bb5da54210dee379355cf", + "version-string": "2.4.1-1", + "port-version": 0 + }, + { + "git-tree": "2c258cf1345997fd636d05c4c0c3f130fcc59346", + "version-string": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "c6219ad16447f839ca5c91d47702de3dd1524dc8", + "version-string": "2.4.0-2", + "port-version": 0 + }, + { + "git-tree": "52c3b9a6d95a77bd1853dd3c510edf4c0d02a001", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "ec633db2064617e9eabef4632bda485a411863af", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "c0d740e3203055bca7299dd7095b47defd1c418c", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "2c728c1d650e11ef61d40f4376ff31069da5dd68", + "version-string": "2.3.0-2", + "port-version": 0 + }, + { + "git-tree": "1e0b79e6c3fdec9dfb63a82fdb0dc778ca7a06ed", + "version-string": "2.3.0-1", + "port-version": 0 + }, + { + "git-tree": "5b5448cf1a48e837b5fac39204a2e0295fdc48c3", + "version-string": "2.2.2-1", + "port-version": 0 + }, + { + "git-tree": "4bde362b5161d385d952aebf3201af6667d6952b", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "9c4345e31c9104e65651939dd1c3c531c511c121", + "version-string": "1.11.3-5", + "port-version": 0 + }, + { + "git-tree": "880d759b43656c67e0d64937359fdf9c849f844f", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "18130a2dcb16a83047e0432a30fc1521b86bd1ab", + "version-string": "1.11.3-5", + "port-version": 0 + }, + { + "git-tree": "7f9603300d3343e432d86479c3c1d68ed8b37913", + "version-string": "1.11.3-4", + "port-version": 0 + }, + { + "git-tree": "cafeff1ea00ba0a45ec4ed8dd9c457471e743ca8", + "version-string": "1.11.3-3", + "port-version": 0 + }, + { + "git-tree": "a0ee8782e3dc3f1d2e90736f10b45fa7b68d4388", + "version-string": "1.11.3-2", + "port-version": 0 + }, + { + "git-tree": "9398b88bc7326a8156f31857b8391bdbe06241aa", + "version-string": "1.11.3-1", + "port-version": 0 + }, + { + "git-tree": "76b4681a0f1be6d3dde9a06a5f0b58e642727b14", + "version-string": "1.11.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gdcm.json b/port_versions/g-/gdcm.json new file mode 100644 index 00000000000000..5c3ab5d3271059 --- /dev/null +++ b/port_versions/g-/gdcm.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "cc2b78ff93cde95d5d9a4c9c9b4b2a393a7195a2", + "version-string": "3.0.7", + "port-version": 0 + }, + { + "git-tree": "a90576c98449304ca63c768b12a1bb6a835dd826", + "version-string": "3.0.5", + "port-version": 2 + }, + { + "git-tree": "9ed2e5b2f5a05dcddc1c7c1c03678c5cfc851978", + "version-string": "3.0.5", + "port-version": 1 + }, + { + "git-tree": "8a05d65aaea041c99672c3d3d69c6e894025f47f", + "version-string": "3.0.5", + "port-version": 0 + }, + { + "git-tree": "648168de0deb524f6bded1326db7a155236158c4", + "version-string": "3.0.4", + "port-version": 0 + }, + { + "git-tree": "32c6e94e0f14e1f26f115941cf63511cd6c53a81", + "version-string": "3.0.3", + "port-version": 0 + }, + { + "git-tree": "1ee5966160db987c0728f3b2811bb671c9a3d387", + "version-string": "3.0.0-5", + "port-version": 0 + }, + { + "git-tree": "fff56335563ec44d4b4be4827c7d8b4830f6f832", + "version-string": "3.0.0-4", + "port-version": 0 + }, + { + "git-tree": "9c6002d6e3211063797f9c2fc069dd221e201045", + "version-string": "3.0.0-3", + "port-version": 0 + }, + { + "git-tree": "845db920b3de438ec5ca11358e6108e129b5c481", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "cb4895b9198833684ef8b8a02b204c51047740e9", + "version-string": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gdcm2.json b/port_versions/g-/gdcm2.json new file mode 100644 index 00000000000000..e337bc910da863 --- /dev/null +++ b/port_versions/g-/gdcm2.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "dfe78f1df5d0fc56c69eeea5096e093cbd6499e5", + "version-string": "deprecated", + "port-version": 0 + }, + { + "git-tree": "af9178d0515bc8019a0863f171533989ad4a2596", + "version-string": "2.8.9", + "port-version": 0 + }, + { + "git-tree": "4e514d0621af19f1fbe1ccaf51d28722603a0fa7", + "version-string": "2.8.8-2", + "port-version": 0 + }, + { + "git-tree": "92ec32d0d5cf7d8fcf4d3aef5070b0b5af7c7505", + "version-string": "2.8.8", + "port-version": 0 + }, + { + "git-tree": "87cf0d35f157ef37ef7501df468c3f26447cf620", + "version-string": "2.8.7", + "port-version": 0 + }, + { + "git-tree": "1a82ec04d2689902bed84bfe47bd02e31deaa5b4", + "version-string": "2.8.6", + "port-version": 0 + }, + { + "git-tree": "11dc452146814541826f33caba0f130ee3d0cbab", + "version-string": "2.8.5", + "port-version": 0 + }, + { + "git-tree": "b38c43fcae1d8aacf12a892bb0258e11c933c979", + "version-string": "2.8.4", + "port-version": 0 + }, + { + "git-tree": "ded71c576a891ef907f2216750a1a479d6d39ba2", + "version-string": "2.8.3", + "port-version": 0 + }, + { + "git-tree": "83d3297813e834c6d175d94219a1fb35ae06c848", + "version-string": "2.6.8-1", + "port-version": 0 + }, + { + "git-tree": "f746dd83ce41698054fd9468c3c05a9644fac3ca", + "version-string": "2.6.8", + "port-version": 0 + }, + { + "git-tree": "4c5050c55886cffff0cf870fa165d166fc0439a5", + "version-string": "2.6.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gdk-pixbuf.json b/port_versions/g-/gdk-pixbuf.json new file mode 100644 index 00000000000000..b97d4dc18f7215 --- /dev/null +++ b/port_versions/g-/gdk-pixbuf.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "f6d6e3ba09cf7cf29266570a1b6315f406ca5b09", + "version-string": "2.36.9-5", + "port-version": 7 + }, + { + "git-tree": "19543fcddd66a688aa878482e39bec4be1eaf801", + "version-string": "2.36.9-5", + "port-version": 6 + }, + { + "git-tree": "2aeb5ad0a34338caf863437c7a53898dcd7a920d", + "version-string": "2.36.9-5", + "port-version": 0 + }, + { + "git-tree": "7b26d8f50a0f9d5a2df574cbc0ab594005162e85", + "version-string": "2.36.9-4", + "port-version": 0 + }, + { + "git-tree": "3a5fa8b4568f486c6fa295dbcf492b1e5c381615", + "version-string": "2.36.9-3", + "port-version": 0 + }, + { + "git-tree": "4603a70c7832eae4cfeb29082dabb08e0d2bfa71", + "version-string": "2.36.9-2", + "port-version": 0 + }, + { + "git-tree": "0919ae2c5d0fe985706690a45ed5dcd655e97fec", + "version-string": "2.36.9-1", + "port-version": 0 + }, + { + "git-tree": "501ca9ca73a66e1f01425b1fe99f378cb9efa348", + "version-string": "2.36.9", + "port-version": 0 + }, + { + "git-tree": "94d6c8461b4b90c1574cd75dcd878adcc1b1a860", + "version-string": "2.36.6", + "port-version": 0 + }, + { + "git-tree": "62ebf69cbff912496c5177dbc002f73536818ba0", + "version-string": "2.36.5", + "port-version": 0 + }, + { + "git-tree": "1012f17578ee7cc8f149d900f4d363357a300528", + "version-string": "2.36.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/genann.json b/port_versions/g-/genann.json new file mode 100644 index 00000000000000..dcb7ff340b74fe --- /dev/null +++ b/port_versions/g-/genann.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bf7df34f8a169dd885b019d42aa0dd2db3d97178", + "version-string": "2019-07-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/geogram.json b/port_versions/g-/geogram.json new file mode 100644 index 00000000000000..fb07c2a516b689 --- /dev/null +++ b/port_versions/g-/geogram.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "3661680b65627a46b6570d9017100f3e64d1f742", + "version-string": "1.7.5", + "port-version": 2 + }, + { + "git-tree": "d248018f0bdde0fdb6d27b8f2994eeac71cf88b7", + "version-string": "1.7.5", + "port-version": 1 + }, + { + "git-tree": "6fe5b800672699045732c9b80cc26473f18dbe21", + "version-string": "1.7.5", + "port-version": 0 + }, + { + "git-tree": "b00cc11186674c48e242ffd936b9ab406cad9d88", + "version-string": "1.6.9", + "port-version": 8 + }, + { + "git-tree": "fa45a82c396d39b2bfaf69ba856a8091a5d0e4ff", + "version-string": "1.6.9-7", + "port-version": 0 + }, + { + "git-tree": "27d5f56c9b3cf919ecf96797674525cbe336f843", + "version-string": "1.6.9-6", + "port-version": 0 + }, + { + "git-tree": "96032ec3b2b1320f1ff7aaa3c3e008e4dab7bb52", + "version-string": "1.6.9-3", + "port-version": 0 + }, + { + "git-tree": "52bb9e8f3dc50ff567d53096d94c37f5f428bc8d", + "version-string": "1.6.9-2", + "port-version": 0 + }, + { + "git-tree": "c9a2bb4c6418d001c16a4eeb0625747c74cf8d3d", + "version-string": "1.6.4", + "port-version": 0 + }, + { + "git-tree": "eb43d5f3fd1cfd25be60b75117735fb547d4f217", + "version-string": "1.6.0-1", + "port-version": 0 + }, + { + "git-tree": "0822334912bec36a41f2e28fa8c3dc14cf50e48c", + "version-string": "1.4.9-1", + "port-version": 0 + }, + { + "git-tree": "b079bd8c75a8d18f74404fab1081b7928b26a87a", + "version-string": "1.4.9", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/geographiclib.json b/port_versions/g-/geographiclib.json new file mode 100644 index 00000000000000..dd034bcd511365 --- /dev/null +++ b/port_versions/g-/geographiclib.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "eafff91d7abd708bd49584dc4070e091d427e333", + "version-string": "1.51", + "port-version": 0 + }, + { + "git-tree": "53938b70c3d6fdca51510ad2c1febac4ef0d4118", + "version-string": "1.50.1", + "port-version": 0 + }, + { + "git-tree": "2d5023520e77c7840e343c5be656622f63f36841", + "version-string": "1.47-patch1-16", + "port-version": 0 + }, + { + "git-tree": "6d3ebb559da52dabd5bfe3043d5d7a0bd07047d3", + "version-string": "1.47-patch1-14", + "port-version": 0 + }, + { + "git-tree": "aded7980da90d94c7ced5de7f5cc9f0be96c8e47", + "version-string": "1.47-patch1-13", + "port-version": 0 + }, + { + "git-tree": "2e8bf4b050e566eea3c781b68c073773a2e10963", + "version-string": "1.47-patch1-12", + "port-version": 0 + }, + { + "git-tree": "e49bce3f3ddbaa260f1b7958fcf7419a6cc02224", + "version-string": "1.47-patch1-11", + "port-version": 0 + }, + { + "git-tree": "de63b33b1ae18bdb603ca56908a340d4415f9427", + "version-string": "1.47-patch1-10", + "port-version": 0 + }, + { + "git-tree": "5f7671fa4358d6506014295a5d6bb81b3d7271fa", + "version-string": "1.47-patch1-9", + "port-version": 0 + }, + { + "git-tree": "0edb7df67184cee2ef220867612c97a629959ee0", + "version-string": "1.47-patch1-8", + "port-version": 0 + }, + { + "git-tree": "0242cc576a6189d61ae5e6231d40e47811860ccc", + "version-string": "1.47-patch1-7", + "port-version": 0 + }, + { + "git-tree": "449619defb3f4be3702bc4b6b3b60c7db8e49ecd", + "version-string": "1.47-patch1-6", + "port-version": 0 + }, + { + "git-tree": "6c3d9b00140cf0fe368af4e5609acfba24eca3c7", + "version-string": "1.47-patch1-5", + "port-version": 0 + }, + { + "git-tree": "417137f049e29b2480e35f14bc98f67fc4d62cb2", + "version-string": "1.47-patch1-4", + "port-version": 0 + }, + { + "git-tree": "f7e079feb902bbf7073ce23c087d9ebb0dcf6eb6", + "version-string": "1.47-patch1-3", + "port-version": 0 + }, + { + "git-tree": "3484bfab1a911e4c63d4480827211fb0f981cc1f", + "version-string": "1.47-patch1-2", + "port-version": 0 + }, + { + "git-tree": "8ceb4ff484132ddddf5b0a17a2be1cb90da47e0a", + "version-string": "1.47-patch1-1", + "port-version": 0 + }, + { + "git-tree": "38441530fc7e9b99829a0cb89a395fff9b231206", + "version-string": "1.47-patch1", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/geos.json b/port_versions/g-/geos.json new file mode 100644 index 00000000000000..58a7a8eeaca1cb --- /dev/null +++ b/port_versions/g-/geos.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "e71bfd0742035ab5630ea9849eeda3ecd1a71118", + "version-string": "3.8.1", + "port-version": 1 + }, + { + "git-tree": "c4b4bddcd19215a60dc9529ecec0e865c3ed1c77", + "version-string": "3.8.1", + "port-version": 0 + }, + { + "git-tree": "025f38165ee2f83a89869652029f6ed70d61f06d", + "version-string": "3.6.4", + "port-version": 0 + }, + { + "git-tree": "994935a727c40aa3bac643e4f33b0a9a03981599", + "version-string": "3.6.3-3", + "port-version": 0 + }, + { + "git-tree": "0745405a8af5e0808ac648f1622af89fd42ae99f", + "version-string": "3.6.3-2", + "port-version": 0 + }, + { + "git-tree": "e91a82715a9de3802b17b431051cd972fc126ee6", + "version-string": "3.6.2-3", + "port-version": 0 + }, + { + "git-tree": "2c23287ac171b6f8c2732efa17c02f8f889a8624", + "version-string": "3.6.2-2", + "port-version": 0 + }, + { + "git-tree": "c9c77484eb6214d1cfb1d56533d8a86a3371bf1e", + "version-string": "3.6.2-1", + "port-version": 0 + }, + { + "git-tree": "1f526b880fb825299b90aef0618933c888b0a598", + "version-string": "3.6.2", + "port-version": 0 + }, + { + "git-tree": "1b3af641ca82928f0897993d3f2c7efa7d8829b9", + "version-string": "3.5.0-1", + "port-version": 0 + }, + { + "git-tree": "eee9edf2a47b8dc59fbff38f805ebd32a97a4b0c", + "version-string": "3.5.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/geotrans.json b/port_versions/g-/geotrans.json new file mode 100644 index 00000000000000..b9668b6ab5b8d7 --- /dev/null +++ b/port_versions/g-/geotrans.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "c49a4b2acb6f902afde98571c97ef6c8358d2c89", + "version-string": "3.8", + "port-version": 0 + }, + { + "git-tree": "a162e312a990029cf2895fdee2028e5fe07353bc", + "version-string": "3.7", + "port-version": 0 + }, + { + "git-tree": "c2245141128ba0910d36e4ff7f92e7cd282409f7", + "version-string": "3.8", + "port-version": 0 + }, + { + "git-tree": "d4ba6c5f7307420e38b93e0fe132bd899b7304fa", + "version-string": "3.7-1", + "port-version": 0 + }, + { + "git-tree": "e0c6be6d920d8f2efbef8a58736cb6278692d6cd", + "version-string": "3.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/getdns.json b/port_versions/g-/getdns.json new file mode 100644 index 00000000000000..34370a5a7ff744 --- /dev/null +++ b/port_versions/g-/getdns.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2ad34d7694f942b2967d6c88acfde707c27f9bb5", + "version-string": "1.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/getopt-win32.json b/port_versions/g-/getopt-win32.json new file mode 100644 index 00000000000000..91f3a4c7d96a09 --- /dev/null +++ b/port_versions/g-/getopt-win32.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f54e92c884b42be2395cb2c5929785cb2db8ad9b", + "version-string": "0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/getopt.json b/port_versions/g-/getopt.json new file mode 100644 index 00000000000000..5a0f80878f4bae --- /dev/null +++ b/port_versions/g-/getopt.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "41acbc45d9d32b8e0dfdb758169e2184e18a8c04", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "2a197d631bf961f9d1d87d5fcdbd6406814321c8", + "version-string": "0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gettext.json b/port_versions/g-/gettext.json new file mode 100644 index 00000000000000..eac400cd4465c5 --- /dev/null +++ b/port_versions/g-/gettext.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "1b286fee6011adfb00e7cf79ec7c8673262b7cfd", + "version-string": "0.21", + "port-version": 0 + }, + { + "git-tree": "6fa0e30f9b2e17be28f096eb81731e3d5de14ee5", + "version-string": "0.19-15", + "port-version": 0 + }, + { + "git-tree": "e4d6c73ed089a5992679c4f98e4d9715558ee5dd", + "version-string": "0.19-14", + "port-version": 0 + }, + { + "git-tree": "c8b2aa4bb65e9afb54c947efe0dd44f2940488dd", + "version-string": "0.19-13", + "port-version": 0 + }, + { + "git-tree": "cba315290e8c155d40b9e495a2552a40a98bae5e", + "version-string": "0.19-12", + "port-version": 0 + }, + { + "git-tree": "5e5a03e65241b659eb7152d4a4ce1b6e07029ebd", + "version-string": "0.19-11", + "port-version": 0 + }, + { + "git-tree": "ef7e323a01b973d94e4041c295e2a33493672eda", + "version-string": "0.19-10", + "port-version": 0 + }, + { + "git-tree": "bf6a9c5733d83fb4da7c9ab42f7dd07c772a8ef1", + "version-string": "0.19-9", + "port-version": 0 + }, + { + "git-tree": "e6a10f19444f23196fdfc73e6f7bb5c7f925f414", + "version-string": "0.19-8", + "port-version": 0 + }, + { + "git-tree": "9536497114f652ee8c3a5374673d653df60ee111", + "version-string": "0.19-7", + "port-version": 0 + }, + { + "git-tree": "68548b7fdad5920e1a9ce95b0f9013cb009ec76f", + "version-string": "0.19-5", + "port-version": 0 + }, + { + "git-tree": "8af20d63dd83e665a1da0e5d6fad711f6c040550", + "version-string": "0.19-4", + "port-version": 0 + }, + { + "git-tree": "65b80277ca10bb5953d1a36a2d86f0337f981f2a", + "version-string": "0.19-2", + "port-version": 0 + }, + { + "git-tree": "241120007045c1865a87dae7d484fc4705865224", + "version-string": "0.19-1", + "port-version": 0 + }, + { + "git-tree": "1412c12036606c06911ed48c2e2e1b2877c0b3c0", + "version-string": "0.19", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gettimeofday.json b/port_versions/g-/gettimeofday.json new file mode 100644 index 00000000000000..46a5ef6f97c5de --- /dev/null +++ b/port_versions/g-/gettimeofday.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "893c7107fc161346544c8b75340cb64e6b850798", + "version-string": "2017-10-14-3", + "port-version": 0 + }, + { + "git-tree": "48e80b4d2fa9382e7c27de36261ab6010aced7bd", + "version-string": "2017-10-14-2", + "port-version": 0 + }, + { + "git-tree": "a6b05006fb0181526d907df595491f0eed5a745e", + "version-string": "2017-10-14-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gflags.json b/port_versions/g-/gflags.json new file mode 100644 index 00000000000000..93fbb9bf9d0e18 --- /dev/null +++ b/port_versions/g-/gflags.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "7dd635d5295af145f4601ba13219aa0d84630f27", + "version-string": "2.2.2-1", + "port-version": 0 + }, + { + "git-tree": "39ba6241412a077825245387c47a4c852ce17eee", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "8a1a5ddb1bfdeef3bca28a5eeed54e1a994677b5", + "version-string": "2.2.1-3", + "port-version": 0 + }, + { + "git-tree": "baf634e885fd97d04ec201c69f8c3476a9a9eeb7", + "version-string": "2.2.1-2", + "port-version": 0 + }, + { + "git-tree": "39423af1f3eebe995ef703161c9ca8542554731c", + "version-string": "2.2.1-1", + "port-version": 0 + }, + { + "git-tree": "1b50210294077dcec83017e971b04df73b6ad951", + "version-string": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "8767ae5dff28ff194c01839711be5963628804ac", + "version-string": "2.2.0-5", + "port-version": 0 + }, + { + "git-tree": "cb356e2b88dfa102e03737c8b6844d6e19cdc4e8", + "version-string": "2.2.0-4", + "port-version": 0 + }, + { + "git-tree": "593df2168f4f241374e47a88d00599caaa5e9912", + "version-string": "2.2.0-3", + "port-version": 0 + }, + { + "git-tree": "b995fb2a9bec152784685f4edd161e19ca986723", + "version-string": "2.2.0-2", + "port-version": 0 + }, + { + "git-tree": "47dec7ab4a4e5933b739ed97eee0ec20d338fd90", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "91097a4b2d78bcb9367c3e758370c5baa713290a", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "5eb5acbb6f05a75d26ab47ad522be9c72a11f8ce", + "version-string": "2.1.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gherkin-c.json b/port_versions/g-/gherkin-c.json new file mode 100644 index 00000000000000..61857344076a2a --- /dev/null +++ b/port_versions/g-/gherkin-c.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "c411eed077ea98e771d2eda4f985dd4702b33ce2", + "version-string": "2019-10-07-1", + "port-version": 0 + }, + { + "git-tree": "cf6023b8e68b5c131631e70ee914c5049f8b9253", + "version-string": "2019-10-07", + "port-version": 0 + }, + { + "git-tree": "e83f94a2682dbcb029ba64097fd4f6af63c74402", + "version-string": "4.1.2", + "port-version": 0 + }, + { + "git-tree": "02167db8dbc6005bfa1779420c6fb9dd8a4dfb76", + "version-string": "c-libs-e63e83104b", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/giflib.json b/port_versions/g-/giflib.json new file mode 100644 index 00000000000000..31565c99eef919 --- /dev/null +++ b/port_versions/g-/giflib.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "053e7dd7e20392f9168d982e026a7fd71afbefe3", + "version-string": "5.1.4-6", + "port-version": 0 + }, + { + "git-tree": "1d1a1ef619d9eaf08f8c1858b273b7d1ff0c2d47", + "version-string": "5.1.4-4", + "port-version": 0 + }, + { + "git-tree": "6920e201f559f5d2cf371cb75c32f8d4eab6340c", + "version-string": "5.1.4-3", + "port-version": 0 + }, + { + "git-tree": "f8b43586a1bbcee2d49964b548d98aab3229428d", + "version-string": "5.1.4-2", + "port-version": 0 + }, + { + "git-tree": "87afd30d52d56ad1aa234ff670b0d562c621e6e0", + "version-string": "5.1.4-1", + "port-version": 0 + }, + { + "git-tree": "aa3bd08125b93cdcc2576c8da4d6f851540272dc", + "version-string": "5.1.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gl2ps.json b/port_versions/g-/gl2ps.json new file mode 100644 index 00000000000000..06e08514f959db --- /dev/null +++ b/port_versions/g-/gl2ps.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "2242a8c42e3e756657f4e149702de688f6b07e14", + "version-string": "1.4.0-3", + "port-version": 0 + }, + { + "git-tree": "2e8bd0d62085233d63e2d477509e020bca427931", + "version-string": "1.4.0-2", + "port-version": 0 + }, + { + "git-tree": "bdc5e96af5d2a44857f5757db82ee21eb783ba7f", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "fce8fefd1e355e73a583439a8c73b51dbd8056b6", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "a87f0e103cadf39979ebe4f87386949480886598", + "version-string": "OpenGL to PostScript Printing Library", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gl3w.json b/port_versions/g-/gl3w.json new file mode 100644 index 00000000000000..0cfc000c43214a --- /dev/null +++ b/port_versions/g-/gl3w.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7786d613957355b4d238d8fd2278f78fbab5a886", + "version-string": "2018-05-31-2", + "port-version": 0 + }, + { + "git-tree": "f91a2109d77a805a788fb153f74cbf9261e8adb8", + "version-string": "2018-05-31-1", + "port-version": 0 + }, + { + "git-tree": "2859fa6238feaf7aeaf00fbc282dc352debdcb28", + "version-string": "99ed3211", + "port-version": 0 + }, + { + "git-tree": "878394b03bdee68ac1343c9385e497efdab0f166", + "version-string": "8f7f459d", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/glad.json b/port_versions/g-/glad.json new file mode 100644 index 00000000000000..d1411e042db160 --- /dev/null +++ b/port_versions/g-/glad.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "abaac8ade7697e7f6ae4a82c981aafa2cc6a5359", + "version-string": "0.1.33-1", + "port-version": 0 + }, + { + "git-tree": "487a060e29e971e32135bde5c6743aa3db5740fd", + "version-string": "0.1.33", + "port-version": 0 + }, + { + "git-tree": "9c601cb232d5f2b58c3244bcc6677fe47d97e772", + "version-string": "0.1.31", + "port-version": 0 + }, + { + "git-tree": "33726baf62afe206a41fee506b4ff8b1dd234b31", + "version-string": "0.1.30", + "port-version": 0 + }, + { + "git-tree": "ac38882a795fc7769d10d706361a3c57fb2e89b8", + "version-string": "0.1.29", + "port-version": 0 + }, + { + "git-tree": "020d76de451af7a2b4e688d60500fbef67f9b50f", + "version-string": "0.1.28-3", + "port-version": 0 + }, + { + "git-tree": "b12757dbab00493adaffc7c67250f02ea3801150", + "version-string": "0.1.28-2", + "port-version": 0 + }, + { + "git-tree": "5f632ca7c1d94db7f3bae6d5aab5ba6d4bf3fae6", + "version-string": "0.1.28", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/glbinding.json b/port_versions/g-/glbinding.json new file mode 100644 index 00000000000000..657a17a96eef8c --- /dev/null +++ b/port_versions/g-/glbinding.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "6feb489ecd418b013262401ff4911eccf5c03deb", + "version-string": "3.1.0", + "port-version": 3 + }, + { + "git-tree": "3a9a97ff96199754a22850cb85df908391803afd", + "version-string": "3.1.0-2", + "port-version": 0 + }, + { + "git-tree": "c909e692c9bd0846d72007074755257e7d1edb73", + "version-string": "3.1.0-1", + "port-version": 0 + }, + { + "git-tree": "a358f6a64a516446977a28468abde74c423a1ef8", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "f18bae17dde78154f125b3e8f4b4b61da980c1e0", + "version-string": "3.0.2-5", + "port-version": 0 + }, + { + "git-tree": "86a1b652d06306f3f9a50b7bdbd1510d3a0a09ac", + "version-string": "3.0.2-4", + "port-version": 0 + }, + { + "git-tree": "d2a02bcf05cff60b61451822400a8fd67cd9c192", + "version-string": "3.0.2-3", + "port-version": 0 + }, + { + "git-tree": "dc2595b76958b8cf36e9505f719757c2ea474b82", + "version-string": "2.1.1-3", + "port-version": 0 + }, + { + "git-tree": "c8b6e350affe801cc9ad9bfd816f82774d411f3e", + "version-string": "2.1.1-2", + "port-version": 0 + }, + { + "git-tree": "eb683aae3cec5efd219cd56736dae6f2279d3b8e", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "a55ddfbeaaa26f71064d74a767828356bfae841c", + "version-string": "2.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/glew.json b/port_versions/g-/glew.json new file mode 100644 index 00000000000000..1901c1e6b26f82 --- /dev/null +++ b/port_versions/g-/glew.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "f8fbe21d53746e72320d363c852bb10f734e5237", + "version-string": "2.1.0", + "port-version": 9 + }, + { + "git-tree": "4fe995caf0d5b268d48520a3ff55b1dbeb41483a", + "version-string": "2.1.0-8", + "port-version": 0 + }, + { + "git-tree": "505463b94ee704f46a2569565ba9be571b9aaaee", + "version-string": "2.1.0-7", + "port-version": 0 + }, + { + "git-tree": "e58a5b1ac835284ce8917483bc368eaf3ab9e40d", + "version-string": "2.1.0-6", + "port-version": 0 + }, + { + "git-tree": "edd7069951eafc616eb21cc10af2f1f80f52ff46", + "version-string": "2.1.0-5", + "port-version": 0 + }, + { + "git-tree": "af01532327b5411fceabf855cf5f43da8b5ff7e1", + "version-string": "2.1.0-4", + "port-version": 0 + }, + { + "git-tree": "968ff5441f3c55753fdb0237782cc66ae8684d1b", + "version-string": "2.1.0-3", + "port-version": 0 + }, + { + "git-tree": "0622d53fab3c2dde2e4cdc6155c21d915e6ca04d", + "version-string": "2.1.0-2", + "port-version": 0 + }, + { + "git-tree": "29e3dd700db2f87bd763d4bb8458fd69cc289409", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "e0c22b8441ea59b7a48ef9335e9cfce146daff14", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "51fd753599eaf07b5bfcc5ec503ebaa1788952e1", + "version-string": "2.0.0-2", + "port-version": 0 + }, + { + "git-tree": "9b418220122d501b0f46e6661c8b5b452791b28b", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "e3ea6bd1639b303d8159467442939b3c4f995522", + "version-string": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "6375eaf079dae0aec5f3f766b525c72b2cd1157e", + "version-string": "1.13.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/glfw3.json b/port_versions/g-/glfw3.json new file mode 100644 index 00000000000000..36e2809ce42004 --- /dev/null +++ b/port_versions/g-/glfw3.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "948e1bd3085f0de7b3af12c5a71afe1c8969ea55", + "version-string": "3.3.2", + "port-version": 0 + }, + { + "git-tree": "f0d43637cb9cc08c45b05bca4aa0eb4fceadc23a", + "version-string": "3.3.1", + "port-version": 0 + }, + { + "git-tree": "d68c3ac87254e2aafa9b0b63e40d1325b132aa04", + "version-string": "3.3-3", + "port-version": 0 + }, + { + "git-tree": "677f8fbc04df2aa528a4b09163b5c5d6c5fae084", + "version-string": "3.3-2", + "port-version": 0 + }, + { + "git-tree": "e555c65a4547aaecec6e8a6260ec4da0a1fd385d", + "version-string": "3.3-1", + "port-version": 0 + }, + { + "git-tree": "d7c63d9600318824c4c1c69e0ca5e1f9f7db0c91", + "version-string": "3.3", + "port-version": 0 + }, + { + "git-tree": "be1864a02919617804b1cad8dde794ec13ea55f6", + "version-string": "3.2.1-3", + "port-version": 0 + }, + { + "git-tree": "42c1c6fa342e0075389240556b8ce824c41619ca", + "version-string": "3.2.1-2", + "port-version": 0 + }, + { + "git-tree": "4059e56d7cde2a11f85a8e5abb76e41ce9a843bb", + "version-string": "3.2.1-1", + "port-version": 0 + }, + { + "git-tree": "343c437b1c6bafb19541c72210547a4a9f00ae93", + "version-string": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "47b9f73b81799bd141dc5d5865941a0841603559", + "version-string": "3.1.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gli.json b/port_versions/g-/gli.json new file mode 100644 index 00000000000000..07cfbac5b5e035 --- /dev/null +++ b/port_versions/g-/gli.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "d6453871d306fd1f5501954f4b3722f97cd525d4", + "version-string": "dd17acf-1", + "port-version": 0 + }, + { + "git-tree": "e8b62796037970ba9fcb475bdcbca194a8c1b7ab", + "version-string": "dd17acf", + "port-version": 0 + }, + { + "git-tree": "6235b7bcd9715a1b4fbfb497304b9f28017a381d", + "version-string": "0.8.2-1", + "port-version": 0 + }, + { + "git-tree": "4fea7386b951c9777cc5079bef716507490d1c7e", + "version-string": "0.8.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/glib.json b/port_versions/g-/glib.json new file mode 100644 index 00000000000000..9cfd59ea012ad3 --- /dev/null +++ b/port_versions/g-/glib.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "5cadd8fd83d64bc11b551994268c796eabf629b6", + "version-string": "2.52.3", + "port-version": 25 + }, + { + "git-tree": "9e13bcbbd42e56f605cd35fd91f5ec37a950125e", + "version-string": "2.52.3", + "port-version": 24 + }, + { + "git-tree": "15f26f46baf92b18d543bba85fd7edc264353cf3", + "version-string": "2.52.3", + "port-version": 23 + }, + { + "git-tree": "6510e733a11ce5d8a777345e4dbe054ded6aa689", + "version-string": "2.52.3-14-7", + "port-version": 0 + }, + { + "git-tree": "8106169c4653397b0ffe716f9561a62b0fa5ef5c", + "version-string": "2.52.3-14-6", + "port-version": 0 + }, + { + "git-tree": "a1901953a15a5fbb77778a07fa4edd240fba080a", + "version-string": "2.52.3-14-5", + "port-version": 0 + }, + { + "git-tree": "9dc6be30f40ff9bbb2f90dff5fa1771e8ae110a0", + "version-string": "2.52.3-14-4", + "port-version": 0 + }, + { + "git-tree": "3c0db4754e4d9817d9837296505afe70c9a1eb46", + "version-string": "2.52.3-14-3", + "port-version": 0 + }, + { + "git-tree": "e66bda92e63e91a70b7dea4341c141191a693778", + "version-string": "2.52.3-14-2", + "port-version": 0 + }, + { + "git-tree": "2dbebef8f014644db9487a78f45e8df6c5bcbe5c", + "version-string": "2.52.3-14-1", + "port-version": 0 + }, + { + "git-tree": "df5a8ddc127af105bab51869e40440b42e3e124f", + "version-string": "2.52.3-13-1", + "port-version": 0 + }, + { + "git-tree": "913187276bc3d6c9e4fb1be8df2848cd41af0102", + "version-string": "2.52.3-13", + "port-version": 0 + }, + { + "git-tree": "6498770a24e72c36e7cd74706a21c48b088d91b6", + "version-string": "2.52.3-11", + "port-version": 0 + }, + { + "git-tree": "617a73af1ec358daad034fe131d571b06de4f597", + "version-string": "2.52.3-9", + "port-version": 0 + }, + { + "git-tree": "61e39be5a86dc5a3a37520685caccbd9d8bbcbf2", + "version-string": "2.52.3-2", + "port-version": 0 + }, + { + "git-tree": "d8dd8a424815aff6dba64bd05e5d2b3ba046064e", + "version-string": "2.52.3-1", + "port-version": 0 + }, + { + "git-tree": "6c3b7897d27da263940f1d4781f506b67d6dd17d", + "version-string": "2.52.3", + "port-version": 0 + }, + { + "git-tree": "2f69ab92f8b3b2f1286d94921a76420864a09af8", + "version-string": "2.52.2", + "port-version": 0 + }, + { + "git-tree": "faa5193e0884ddd3aa5c58eb7feba9d2e133d2b4", + "version-string": "2.52.1", + "port-version": 0 + }, + { + "git-tree": "526ca7ffc215d06e1488d76b5cdddbc762f286eb", + "version-string": "2.50.3", + "port-version": 0 + }, + { + "git-tree": "95c3c71f0346540e51fe03249738dc5fb564c252", + "version-string": "2.50.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/glibmm.json b/port_versions/g-/glibmm.json new file mode 100644 index 00000000000000..4cf69bdaf52f74 --- /dev/null +++ b/port_versions/g-/glibmm.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "14ee726ce8905eca50e9cc6d5a478d9401c5954e", + "version-string": "2.52.1", + "port-version": 14 + }, + { + "git-tree": "abc38a94621d26d81c09daffddbb61458d60899d", + "version-string": "2.52.1", + "port-version": 13 + }, + { + "git-tree": "a689656051e237b360fd108fc13d91951ecbc8b4", + "version-string": "2.52.1", + "port-version": 12 + }, + { + "git-tree": "32ba5fe5eff5992b6565d5f48da73c815038a68b", + "version-string": "2.52.1-11", + "port-version": 0 + }, + { + "git-tree": "0f683e998ef55bf2406e0d81a212a4bb6684f17e", + "version-string": "2.52.1-10", + "port-version": 0 + }, + { + "git-tree": "76ba0437d836722da9ef44c99b616f7cfd743fc5", + "version-string": "2.52.1-9", + "port-version": 0 + }, + { + "git-tree": "3493ffee69d8c1013ad8907ecff4c53df8062cb9", + "version-string": "2.52.1-8", + "port-version": 0 + }, + { + "git-tree": "fc14768059bee43d287242a08cb09323dd5851c6", + "version-string": "2.52.1-7", + "port-version": 0 + }, + { + "git-tree": "d9cd46a14a3ca6557fba4f5be48ee8636b8c1167", + "version-string": "2.52.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/glm.json b/port_versions/g-/glm.json new file mode 100644 index 00000000000000..e1a52539f9bdb3 --- /dev/null +++ b/port_versions/g-/glm.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "14a7c57c30809e4f4c953dd60fa335bb194d0be5", + "version-string": "0.9.9.8", + "port-version": 0 + }, + { + "git-tree": "423235ffa15d9138dbcab1a86140f3afa86b5717", + "version-string": "0.9.9.7", + "port-version": 0 + }, + { + "git-tree": "609da764e8418d9ddc57263f86a8374d099c7b46", + "version-string": "0.9.9.5-3", + "port-version": 0 + }, + { + "git-tree": "545f424ba64c395284b64a238557857c1f6dfd89", + "version-string": "0.9.9.5-2", + "port-version": 0 + }, + { + "git-tree": "e0420d690f1619d78c50045f2718cec0790dc925", + "version-string": "0.9.9.5", + "port-version": 0 + }, + { + "git-tree": "e70ed78b570242280acf1a27c394c946ff98810b", + "version-string": "0.9.9.4", + "port-version": 0 + }, + { + "git-tree": "2aa1ea119444ba242a29733c2969c827b0885b52", + "version-string": "0.9.9.3", + "port-version": 0 + }, + { + "git-tree": "d8f913287219615123b8da343f7320ea318e4418", + "version-string": "0.9.9.2", + "port-version": 0 + }, + { + "git-tree": "ba55ec73ddba0272e990febc79ad854dd27129a2", + "version-string": "0.9.9.0", + "port-version": 0 + }, + { + "git-tree": "aae504ba9df7d41e235d4382a83e2b5ad2575277", + "version-string": "0.9.8.5-1", + "port-version": 0 + }, + { + "git-tree": "bc4221b98be2163c2096af6ea94056efc2d5a46d", + "version-string": "0.9.8.5", + "port-version": 0 + }, + { + "git-tree": "a0575135be360fd9e8f7b8768e52367b4c5bc579", + "version-string": "0.9.8.4-1", + "port-version": 0 + }, + { + "git-tree": "a7c02c49c06b555f346a8b30a8c72fe8ab8032a4", + "version-string": "0.9.8.4", + "port-version": 0 + }, + { + "git-tree": "0ee843746d211dd56c52a7bbb863ee3b79b9edb7", + "version-string": "0.9.8.1", + "port-version": 0 + }, + { + "git-tree": "ba9297410faea7d19c5a1b8f0a4a0ec45f447500", + "version-string": "0.9.8.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/globjects.json b/port_versions/g-/globjects.json new file mode 100644 index 00000000000000..75d9b7d96859a4 --- /dev/null +++ b/port_versions/g-/globjects.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b2e73ec8949205afcdcf9c8b7f5e536275f0ed19", + "version-string": "1.1.0-3", + "port-version": 0 + }, + { + "git-tree": "94d28ae5e7be9ae1865705a124244274a29de29f", + "version-string": "1.1.0-2", + "port-version": 0 + }, + { + "git-tree": "97c49f2dc4fff4a21a2a462a00e648270fffaaf6", + "version-string": "1.1.0-2018-09-19-1", + "port-version": 0 + }, + { + "git-tree": "a32f6bbdb50e7d2f5f7e8120da7746749cbac43e", + "version-string": "1.1.0-2018-09-19", + "port-version": 0 + }, + { + "git-tree": "81a5bbc965826e4680d129e59d84d6b2c2e12ce0", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "50b7e6e2994558d1dc44157636b365e38b429668", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/glog.json b/port_versions/g-/glog.json new file mode 100644 index 00000000000000..7cb107996df647 --- /dev/null +++ b/port_versions/g-/glog.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "ec7f01875b20c7145088d5ec7a1927a5faea5ca6", + "version-string": "0.4.0-3", + "port-version": 0 + }, + { + "git-tree": "1259c0962eb1027fdb884f5ddca131f37d182ada", + "version-string": "0.4.0-2", + "port-version": 0 + }, + { + "git-tree": "3e42b59038804aeccbb8572a7f39f4b93f171b29", + "version-string": "0.4.0-1", + "port-version": 0 + }, + { + "git-tree": "ce92e93c37ae6faf8ff82f5ef14a66b8977ed5e7", + "version-string": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "8baba65e1ef246885a8366c863e1c3a7185effd1", + "version-string": "0.3.5-1", + "port-version": 0 + }, + { + "git-tree": "4323414e8ab13cd3dab50c3c03a5fe3e9af38352", + "version-string": "0.3.5", + "port-version": 0 + }, + { + "git-tree": "bf209ae19c87850aaad51929fa9dbac4df10058a", + "version-string": "0.3.4-0472b91-1", + "port-version": 0 + }, + { + "git-tree": "3b64e82075666999b8d477c3b49ee955aa1b21c6", + "version-string": "0.3.4-0472b91", + "port-version": 0 + }, + { + "git-tree": "9ae61ae2b5e7a2829072ded07af8202568e2afd1", + "version-string": "0472b91", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gloo.json b/port_versions/g-/gloo.json new file mode 100644 index 00000000000000..ca6fac1e07ad98 --- /dev/null +++ b/port_versions/g-/gloo.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "18761f45d66d3eae3a73891f39142bbae80460b8", + "version-string": "20201203", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/glslang.json b/port_versions/g-/glslang.json new file mode 100644 index 00000000000000..13cdce3ef537e2 --- /dev/null +++ b/port_versions/g-/glslang.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "02b23c6369ff2b1aed2e57bceeb184b544d388e2", + "version-string": "2019-03-05-1", + "port-version": 0 + }, + { + "git-tree": "c53ece4686a07a0d5cd60353e4ad01cf04aae50d", + "version-string": "2019-03-05", + "port-version": 0 + }, + { + "git-tree": "1f7191e1b8bcc36e377539da957c0fe7ad66a29f", + "version-string": "2018-03-02-2", + "port-version": 0 + }, + { + "git-tree": "3a3d3578e965c1e9725c06a85d0ae2551bb70440", + "version-string": "2018-03-02-1", + "port-version": 0 + }, + { + "git-tree": "45dc1dab260e1a52180bd5c5295d54bf0b96f97d", + "version-string": "2018-03-02", + "port-version": 0 + }, + { + "git-tree": "3ff408c6d555321bfaf65bf65c1b71cc80af830f", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "35858c6199aff1462cc94c5b98c39c529065d55a", + "version-string": "3a21c880500eac21cdf79bef5b80f970a55ac6af-1", + "port-version": 0 + }, + { + "git-tree": "5fb45d844a17c8c8ed6b51defe80463c89edc1aa", + "version-string": "3a21c880500eac21cdf79bef5b80f970a55ac6af", + "port-version": 0 + }, + { + "git-tree": "c87804bbeb491fafde21000bd21822bff9953227", + "version-string": "1c573fbcfba6b3d631008b1babc838501ca925d3-2", + "port-version": 0 + }, + { + "git-tree": "908a1a421e087042a77780636180b5f5aaf25735", + "version-string": "1c573fbcfba6b3d631008b1babc838501ca925d3-1", + "port-version": 0 + }, + { + "git-tree": "3f4c9fdc048e425aa144ea58619b89b50e0ed473", + "version-string": "1c573fbcfba6b3d631008b1babc838501ca925d3", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/glui.json b/port_versions/g-/glui.json new file mode 100644 index 00000000000000..aa39db51a51129 --- /dev/null +++ b/port_versions/g-/glui.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "83686597c999bba02534d78083a8c3ca4af831e0", + "version-string": "2019-11-30", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gmime.json b/port_versions/g-/gmime.json new file mode 100644 index 00000000000000..2e7e8725fd3c3e --- /dev/null +++ b/port_versions/g-/gmime.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b44824b9edf5ce5c9870802facff3f3097b7977c", + "version-string": "3.2.6", + "port-version": 1 + }, + { + "git-tree": "4288225d0685ccdbbf53bdbb366a619234d1033d", + "version-string": "3.2.6", + "port-version": 0 + }, + { + "git-tree": "3d0d4a625458c87cddf6eb0d2a770dfdb9aa9802", + "version-string": "3.2.3-1", + "port-version": 0 + }, + { + "git-tree": "49f07ecfad2b70207ff85f19122a0b58d44bee44", + "version-string": "3.2.3", + "port-version": 0 + }, + { + "git-tree": "269cc06ef1dc06b233e318f4bb49aaed5865a333", + "version-string": "3.0.5", + "port-version": 0 + }, + { + "git-tree": "2a674251352bbc2666d182503081d4da38f9d65e", + "version-string": "3.0.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gmmlib.json b/port_versions/g-/gmmlib.json new file mode 100644 index 00000000000000..59bb4844e6db71 --- /dev/null +++ b/port_versions/g-/gmmlib.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "7fc340ea71bdc0798d55f0e3df2069ae215a6acb", + "version-string": "20.3.1", + "port-version": 0 + }, + { + "git-tree": "8a28386de58cb8db047ede0708253c9a939686e6", + "version-string": "19.4.1", + "port-version": 0 + }, + { + "git-tree": "409c2b96c8cce05ed597b657a550a42952cf638c", + "version-string": "19.2.3", + "port-version": 0 + }, + { + "git-tree": "5972c055111a757915149270d9bb13ba94bb76f3", + "version-string": "19.1.2", + "port-version": 0 + }, + { + "git-tree": "5847a84461844b252f4eee7a15211614ec5fcc5e", + "version-string": "18.3.pre2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gmp.json b/port_versions/g-/gmp.json new file mode 100644 index 00000000000000..db8776cc2fa8bf --- /dev/null +++ b/port_versions/g-/gmp.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "7f067caae5b946b5906abdfee1fb72b53922fef5", + "version-string": "6.2.1-2", + "port-version": 0 + }, + { + "git-tree": "2bccd7ded07ce0829b8cf5cd00e5967908a4d68e", + "version-string": "6.2.0", + "port-version": 5 + }, + { + "git-tree": "00e37cc531fc6b32d6b6044d7e74828af3857bb2", + "version-string": "6.2.0", + "port-version": 3 + }, + { + "git-tree": "e46f0eb1b95b8f4a6172603a6c8ece7d3a34ce79", + "version-string": "6.2.0-2", + "port-version": 0 + }, + { + "git-tree": "10db7a9c49c7ad83e4ace8f5fc2c6ad6184a2430", + "version-string": "6.2.0-1", + "port-version": 0 + }, + { + "git-tree": "2912fa8a1078d2367e3d9b866e8b24f6ff32bdb5", + "version-string": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/google-cloud-cpp-common.json b/port_versions/g-/google-cloud-cpp-common.json new file mode 100644 index 00000000000000..8c0565ec9ed328 --- /dev/null +++ b/port_versions/g-/google-cloud-cpp-common.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "6e60e7b9b08e821b11e3e1512bbd1b3caffbc21b", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "a9681d3e137a323b07e3c7540a53eb120d1a4dd6", + "version-string": "0.25.0", + "port-version": 0 + }, + { + "git-tree": "e694b18a9c319a548e711726ecd23371d20674a4", + "version-string": "0.21.0", + "port-version": 0 + }, + { + "git-tree": "56624554a6224d8dde6b080055042c7db739884f", + "version-string": "0.20.0", + "port-version": 0 + }, + { + "git-tree": "4f3466fd53b4d726a5339784f2c7af973e2c4231", + "version-string": "0.19.0", + "port-version": 0 + }, + { + "git-tree": "b7140fb29c018fcb3970ae4bcae81e74c90182d8", + "version-string": "0.18.0", + "port-version": 0 + }, + { + "git-tree": "b75cd45782941bceed2f41b9eba995a39ed3a86a", + "version-string": "0.16.0-1", + "port-version": 0 + }, + { + "git-tree": "1499ccc25e9d9d8003863af89b484aee54839ff8", + "version-string": "0.16.0", + "port-version": 0 + }, + { + "git-tree": "0fb815d0f006996c31975f02a1244946d7ebd2c6", + "version-string": "0.15.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/google-cloud-cpp-spanner.json b/port_versions/g-/google-cloud-cpp-spanner.json new file mode 100644 index 00000000000000..08b34ecc629a62 --- /dev/null +++ b/port_versions/g-/google-cloud-cpp-spanner.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "1dd73203e70438024236fa43f7454d160a16a8ce", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "3c9504519183c5f848c946e65d8b6761cc5d8ad3", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "20ac26bad7571f81d5e20e880e9f1ce94251ea0e", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "814f5c7ede4b9d303d857d6ba96141f2543065e1", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "6577b1af95d86b562a53427d4a0f4a15adbf2023", + "version-string": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "cb7a117efead8e2411205ef913dbb8e113e55829", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/google-cloud-cpp.json b/port_versions/g-/google-cloud-cpp.json new file mode 100644 index 00000000000000..178cb1928b0132 --- /dev/null +++ b/port_versions/g-/google-cloud-cpp.json @@ -0,0 +1,164 @@ +{ + "versions": [ + { + "git-tree": "85ed59dd339159f0600765d49cb7e1e723e67fec", + "version-string": "1.22.0", + "port-version": 0 + }, + { + "git-tree": "8cd6472a3f9bbb44fb73d7ae053098f3e38e8ee2", + "version-string": "1.21.0", + "port-version": 0 + }, + { + "git-tree": "bf429f159295f55917a153351f4e3cacc6ff1ef6", + "version-string": "1.20.0", + "port-version": 0 + }, + { + "git-tree": "59bf156235030361bdb5acf54f544284a3aa9754", + "version-string": "1.19.0", + "port-version": 0 + }, + { + "git-tree": "69917d9f2e5096f98deac99e711ec752c689f7c3", + "version-string": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "fb9b65a2cb366c1daf755059abfd2d95aaba9e7a", + "version-string": "1.17.1", + "port-version": 0 + }, + { + "git-tree": "2c97742fd3d6b7c93bfb8ff88d5619ed4412f473", + "version-string": "1.16.0", + "port-version": 0 + }, + { + "git-tree": "712f8a863b2dfe78c13148e81d3212efb5a8ed97", + "version-string": "1.15.0", + "port-version": 0 + }, + { + "git-tree": "c43175be8261276b1783667357c7945158fe958f", + "version-string": "1.14.0", + "port-version": 0 + }, + { + "git-tree": "52c57b66e005aa31e111a15bf77143c957d2e89c", + "version-string": "0.21.0", + "port-version": 0 + }, + { + "git-tree": "9bc8ac8316d13f9030a9d567232470914de91e0a", + "version-string": "0.20.0", + "port-version": 0 + }, + { + "git-tree": "8ef2b02db68faa89633ebba272f07239050cae29", + "version-string": "0.19.0", + "port-version": 0 + }, + { + "git-tree": "eb0cf475c99430d3bcaf4f52ab576d8eb653e16c", + "version-string": "0.18.0", + "port-version": 0 + }, + { + "git-tree": "00498368ad052708ff4ab0007e7c9e2ba254a14d", + "version-string": "0.17.0", + "port-version": 0 + }, + { + "git-tree": "73b08543dcf70c3788f24522a9a760146f5542a3", + "version-string": "0.15.0", + "port-version": 0 + }, + { + "git-tree": "424f6cb8f1523a67b8d17e38d054d724af9bf288", + "version-string": "0.14.0-1", + "port-version": 0 + }, + { + "git-tree": "55f7ea6570a8347107f0088b8d275af382b831f4", + "version-string": "0.14.0", + "port-version": 0 + }, + { + "git-tree": "8ba7ff1b5b1023e8ac0f2e474bd68ded5cecc077", + "version-string": "0.13.0", + "port-version": 0 + }, + { + "git-tree": "04080464b28da820cd25910378a2a82e777a25da", + "version-string": "0.12.0", + "port-version": 0 + }, + { + "git-tree": "b9db46a33268ec3b23e6499f244e6ab8c9a2680d", + "version-string": "0.11.0", + "port-version": 0 + }, + { + "git-tree": "21aeb9f2d880397831202f0b6ad184942b1a32d1", + "version-string": "0.10.0", + "port-version": 0 + }, + { + "git-tree": "737c20a6baffd851d34d121a942bee74c044f53c", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "7e68f5fd615216033490e1c35ed3b0ecaa2afa11", + "version-string": "0.8.1-1", + "port-version": 0 + }, + { + "git-tree": "e0d1065da2edb91743dd18b701a06a22adf860e0", + "version-string": "0.8.0-1", + "port-version": 0 + }, + { + "git-tree": "17db695ea8da500d3d8df815c718da04b1c77a98", + "version-string": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "919ab4fadde542d660016dbc1a37b401cc0e84ec", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "f695b99935d98c05bc6d79dec8029ebda4ab3722", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "3070578d2ff6641a4acfa7bd23c3f8f6970e5d26", + "version-string": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "a74e28a214a8434f3a5313c450ec234fd2c07882", + "version-string": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "436feabe3adf421c80a6bd7a6c5a19aa8abba011", + "version-string": "0.3.0-1", + "port-version": 0 + }, + { + "git-tree": "d31aae0639ac2e3bb90c20722c718367910a7d19", + "version-string": "0.1.0-1", + "port-version": 0 + }, + { + "git-tree": "90463477b1a37c4e5f47ee9f1c756c9e140914b4", + "version-string": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/googleapis.json b/port_versions/g-/googleapis.json new file mode 100644 index 00000000000000..0fbc81e9eef248 --- /dev/null +++ b/port_versions/g-/googleapis.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "732e1808e521305fa8f5210395976b9ed06f6ee1", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "75c5474e5857491f13f6e57a53f997f5f49c1301", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "a16c63d07fdf56b97bf13f73455fbf4b6cb476bf", + "version-string": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "b8be6ae916d08dcd2dd1cd91cd62789e6553dd76", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "376f06cdb6b6512e68c7c037a45e750a9f1743c4", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "9ed86edf4a6cc11f4a4afee4c63cfae37092ec61", + "version-string": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "7632c519ca5c65e85670e46410dff41e210383ea", + "version-string": "0.4.1", + "port-version": 0 + }, + { + "git-tree": "e355db0ea6570e3be0ef737f03c426e574ea50af", + "version-string": "0.1.5", + "port-version": 0 + }, + { + "git-tree": "df850cd74ada9b2aa8253ca49461fbc258ec44c5", + "version-string": "0.1.3", + "port-version": 0 + }, + { + "git-tree": "daeed28ede1c2fce9fd9ae5cecace5234c2abc90", + "version-string": "0.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gperf.json b/port_versions/g-/gperf.json new file mode 100644 index 00000000000000..ee9894dfd41ffc --- /dev/null +++ b/port_versions/g-/gperf.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a88953c10ae0ac1312b9bf79bf0bc4feaaf124fc", + "version-string": "3.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gperftools.json b/port_versions/g-/gperftools.json new file mode 100644 index 00000000000000..a32f9eb6ac692c --- /dev/null +++ b/port_versions/g-/gperftools.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ca64f86fb8b7ffd55e935d885d08f50d6271a755", + "version-string": "2019-09-02", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gpgme.json b/port_versions/g-/gpgme.json new file mode 100644 index 00000000000000..2c980c56c05008 --- /dev/null +++ b/port_versions/g-/gpgme.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e8114364d2581d57cd19f81da7e7581b3f803a5f", + "version-string": "1.14.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gppanel.json b/port_versions/g-/gppanel.json new file mode 100644 index 00000000000000..a085dafc2a3139 --- /dev/null +++ b/port_versions/g-/gppanel.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "9345e63310617dade1d1664276a36f5ca4578546", + "version-string": "2020-05-20", + "port-version": 0 + }, + { + "git-tree": "8afd0cd5a90f42ea074657edf5de40c2714db615", + "version-string": "2018-04-06", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/graphicsmagick.json b/port_versions/g-/graphicsmagick.json new file mode 100644 index 00000000000000..b7774529a3beb7 --- /dev/null +++ b/port_versions/g-/graphicsmagick.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "583006cf5cb77ea009d82d0b3226c3d2c4011ae4", + "version-string": "1.3.36", + "port-version": 0 + }, + { + "git-tree": "d9178814498d48e9814853ec809ae9fdff3ec224", + "version-string": "1.3.35", + "port-version": 3 + }, + { + "git-tree": "17cc4b0e81f234abbfc38d4def9f5c3671354462", + "version-string": "1.3.35-2", + "port-version": 0 + }, + { + "git-tree": "3982c8bfa0248f3fe83605b944ef5b2a49f602df", + "version-string": "1.3.35-1", + "port-version": 0 + }, + { + "git-tree": "b509aad411b616688af929e9ed12fe9d5b099d63", + "version-string": "1.3.35", + "port-version": 0 + }, + { + "git-tree": "8e05a9f0d5df4ad092eab2d1c932014422f837bf", + "version-string": "1.3.34", + "port-version": 0 + }, + { + "git-tree": "97217cd2bea991ebae4c4f64e6baaff0c95b83bd", + "version-string": "1.3.33-1", + "port-version": 0 + }, + { + "git-tree": "eab30046a2c3c68d8eb9f7930ea3b6b602266641", + "version-string": "1.3.33", + "port-version": 0 + }, + { + "git-tree": "1f739b89dbf1389d435841f3bd9a2d083321828f", + "version-string": "1.3.32-1", + "port-version": 0 + }, + { + "git-tree": "7b89e875e52f834f2e6dc84b4b52458d27132b51", + "version-string": "1.3.32", + "port-version": 0 + }, + { + "git-tree": "782a17a069f0757b56872e9907bda5a0c1988350", + "version-string": "1.3.31-1", + "port-version": 0 + }, + { + "git-tree": "080a85fc351370ae83920cd23211f8ad1f802798", + "version-string": "1.3.31", + "port-version": 0 + }, + { + "git-tree": "659c2a03426b6b0630e526d63384a97672988d8a", + "version-string": "1.3.30-1", + "port-version": 0 + }, + { + "git-tree": "a59532845bdda37245a2bd4d93ac0847d96617cd", + "version-string": "1.3.30", + "port-version": 0 + }, + { + "git-tree": "d1c4d3a1d273bb319e3f7addec2d920675bd492e", + "version-string": "1.3.29", + "port-version": 0 + }, + { + "git-tree": "257e5f04c747b2c9c68c3e95e15ff89def37e61b", + "version-string": "1.3.28", + "port-version": 0 + }, + { + "git-tree": "819d4cb9a9ea3d07612479608faf6d757eab2ed5", + "version-string": "1.3.26-2", + "port-version": 0 + }, + { + "git-tree": "b1cb90ce62353c49edb5d463b588e0a78a2f7e19", + "version-string": "1.3.26-1", + "port-version": 0 + }, + { + "git-tree": "574ced3b87c620299ffedc0797c41609c6efb3ed", + "version-string": "1.3.26", + "port-version": 0 + }, + { + "git-tree": "c5868428eda89f9e1b34a0c9b7c2bebbabc4cebf", + "version-string": "1.3.25", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/graphite2.json b/port_versions/g-/graphite2.json new file mode 100644 index 00000000000000..cbf5ced0b8334d --- /dev/null +++ b/port_versions/g-/graphite2.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "e5e37f083538f0e7390369a399e8ce2a32810b00", + "version-string": "1.3.14", + "port-version": 0 + }, + { + "git-tree": "8e3cde3e79154188035d3161023d71341f4077c3", + "version-string": "1.3.13", + "port-version": 0 + }, + { + "git-tree": "3153fda2f03d6f82711164d38eafe5646d2e0fe7", + "version-string": "1.3.12-1", + "port-version": 0 + }, + { + "git-tree": "0c442b8a43aa78930ab5c98c0fcd7b1a810935bd", + "version-string": "1.3.12", + "port-version": 0 + }, + { + "git-tree": "5bd373f9ec9664b5da0ae5ba0cb4f2ab16f74866", + "version-string": "1.3.10", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/graphqlparser.json b/port_versions/g-/graphqlparser.json new file mode 100644 index 00000000000000..d577bf05e9f84d --- /dev/null +++ b/port_versions/g-/graphqlparser.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "24d87a9dc777a9ebd15ec9ff2ab7ade51134c86d", + "version-string": "0.7.0-1", + "port-version": 0 + }, + { + "git-tree": "9a55874be09e976852e74cbc00509fc946676f93", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "b3d5bd161357ca5746bde673117c523092de5aa3", + "version-string": "v0.7.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/greatest.json b/port_versions/g-/greatest.json new file mode 100644 index 00000000000000..394ef531104b0a --- /dev/null +++ b/port_versions/g-/greatest.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "046876099d8e773082ce18b0c85fab4174a4c89e", + "version-string": "1.4.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/grpc.json b/port_versions/g-/grpc.json new file mode 100644 index 00000000000000..9b2f1d7d849e47 --- /dev/null +++ b/port_versions/g-/grpc.json @@ -0,0 +1,284 @@ +{ + "versions": [ + { + "git-tree": "ab4f43b11a69edb96385c532af17876bc2c8849c", + "version-string": "1.33.1", + "port-version": 2 + }, + { + "git-tree": "adc3ac1f7f87af8ab8a4e96ba85ef6be654950fc", + "version-string": "1.33.1", + "port-version": 1 + }, + { + "git-tree": "3e7e326813a67313789e980cb862c33aecc67690", + "version-string": "1.33.1", + "port-version": 0 + }, + { + "git-tree": "72f856f287158681ff576c2acc416e487230c221", + "version-string": "1.32.0", + "port-version": 1 + }, + { + "git-tree": "7f72c709b55b90a4e7b1645bba41d02a348d55b9", + "version-string": "1.32.0", + "port-version": 0 + }, + { + "git-tree": "0d93ed617c894d2183f46d9ccdaad61181b2a601", + "version-string": "1.31.2", + "port-version": 0 + }, + { + "git-tree": "9ab4829edb98ab9d1a847c863562328fea6d2602", + "version-string": "1.31.1", + "port-version": 0 + }, + { + "git-tree": "4a7dd1eae9b1f0e6bc7ee18939913b928cb15bb2", + "version-string": "1.30.2", + "port-version": 0 + }, + { + "git-tree": "bc1bc900c449ab2db70e65f4d523bc45bc285fad", + "version-string": "1.29.1", + "port-version": 1 + }, + { + "git-tree": "1f739772878f0e6d4a92c5d963fc929756cfe555", + "version-string": "1.29.1", + "port-version": 0 + }, + { + "git-tree": "7c63cb274d82d144d487d514ad51e39d9a496a6a", + "version-string": "1.28.1-1", + "port-version": 0 + }, + { + "git-tree": "5e345956a839aab60f922d116bbe1c5d8879977e", + "version-string": "1.28.1", + "port-version": 0 + }, + { + "git-tree": "c9187499a007bef4b055deb6d7e6a29a765324b5", + "version-string": "1.27.3", + "port-version": 0 + }, + { + "git-tree": "06670704e9677a0650e15df041740da5d0421a01", + "version-string": "1.27.1-1", + "port-version": 0 + }, + { + "git-tree": "c4691f7c07342a03286b269a12fb0c680128a577", + "version-string": "1.26.0-1", + "port-version": 0 + }, + { + "git-tree": "fc0a9d470f78e6ff0ea3ec4a193595903017de1f", + "version-string": "1.26.0", + "port-version": 0 + }, + { + "git-tree": "e8e33fd3ba0af63e36e129917d1f743e2cf7d7c3", + "version-string": "1.24.3", + "port-version": 0 + }, + { + "git-tree": "e54c2118a214cea44561189ad275a0c360c94118", + "version-string": "1.23.1-1", + "port-version": 0 + }, + { + "git-tree": "616a5a7c30020d61b8db97dab96a1c98eaf93c6e", + "version-string": "1.23.1", + "port-version": 0 + }, + { + "git-tree": "f4265c4065acf6a69aa9c97f417ab7049874a7e9", + "version-string": "1.23.0", + "port-version": 0 + }, + { + "git-tree": "f9ee8bb31f04f4e6a8c0d3e96fbb98deeb448d45", + "version-string": "1.22.0", + "port-version": 0 + }, + { + "git-tree": "67cefd8a55f6e957820968290447bb6bb29d22f3", + "version-string": "1.21.1-1", + "port-version": 0 + }, + { + "git-tree": "099e5944ed218291c12e722af1204275f6490f0a", + "version-string": "1.21.1", + "port-version": 0 + }, + { + "git-tree": "c1b8adacfc22626bb61995a3f58a36aa3ee28498", + "version-string": "1.20.1-1", + "port-version": 0 + }, + { + "git-tree": "72acfa0be290e226346be28b2297425bdd72965c", + "version-string": "1.20.1", + "port-version": 0 + }, + { + "git-tree": "398b999c0d1feceef1905e2336f62e9f95a7eb75", + "version-string": "1.19.1-1", + "port-version": 0 + }, + { + "git-tree": "8a8d7fd405a76e9b385bc1f123ac79c34e239de5", + "version-string": "1.19.1", + "port-version": 0 + }, + { + "git-tree": "3db6dedc6f03cc3690dfa803ea2a92916e59918d", + "version-string": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "780431ef68413d44065b0ca93d14a48a8c7ae8ae", + "version-string": "1.17.1", + "port-version": 0 + }, + { + "git-tree": "4235415f88e59b170f8e96d0b53bbce33e2da982", + "version-string": "1.16.1", + "port-version": 0 + }, + { + "git-tree": "256d7c09c3321bbaaaab5271af4368b9fbc8b116", + "version-string": "1.14.1", + "port-version": 0 + }, + { + "git-tree": "76eb4d0670af7d34ecdd8751e1faaabf2de313eb", + "version-string": "1.13.1", + "port-version": 0 + }, + { + "git-tree": "a68c4d1d31ea3dee5bce2a0a0c39c9f7b90fe309", + "version-string": "1.12.0-2", + "port-version": 0 + }, + { + "git-tree": "afc236b4935c6e386c65117ba35ba49351b128f9", + "version-string": "1.10.1-3", + "port-version": 0 + }, + { + "git-tree": "54dbeb916f067f6948f8692a0a452234351606e7", + "version-string": "1.10.1-2", + "port-version": 0 + }, + { + "git-tree": "f4aa40cf03cbdcf4582716b45e93fce8bdc1699e", + "version-string": "1.10.1-1", + "port-version": 0 + }, + { + "git-tree": "ad1cbea3db45cf9956a05067ac2550ca5e24c259", + "version-string": "1.10.1", + "port-version": 0 + }, + { + "git-tree": "5840deaacb275de341d3a93ee1db4d86bc013fc3", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "987e5e57fbb4a72440d02f23859b3c9ce7107bfd", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "6d921f5c4898f1c25ba242502d669832003b1bb0", + "version-string": "1.8.3", + "port-version": 0 + }, + { + "git-tree": "0a7bd2f3d59f77f9a36cf1c57d00fb6d0e674de1", + "version-string": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "1b7ae381841029198a6f6427612eac7d33f08659", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "430bb1ffd656184eaa5979c810c7aad553a7c193", + "version-string": "1.6.0-2", + "port-version": 0 + }, + { + "git-tree": "62d92cc4d2cf25a3d24d31b603176368b0be7600", + "version-string": "1.6.0-1", + "port-version": 0 + }, + { + "git-tree": "05e542602faae95ccea2a3635aba8adf0d90a2bb", + "version-string": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "2e85a5de8c93caa84304b3d87bafca836fbedc6e", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "56991c65d5e75b6ecb3e15997e3363c4e5987519", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "9d500f866c228bf1c2a5fb360b8737568497e5cd", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "7ab0dec5f0337d932d9611bee479d84d5cef811b", + "version-string": "1.3.1-1", + "port-version": 0 + }, + { + "git-tree": "008ba545474e0ce96864bfa769c40947e4cf31ea", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "16549125396ff279ab4d5a8d4576fd132abb3dec", + "version-string": "1.2.3-1", + "port-version": 0 + }, + { + "git-tree": "7538aa479fc04545a7005ba2768b72a91301b23f", + "version-string": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "fd2c3f393c8921f0aad691589a89719564cae97c", + "version-string": "1.1.2-1", + "port-version": 0 + }, + { + "git-tree": "f029c6269a459317a8287494b78ac4ffabfe32d8", + "version-string": "1.1.0-dev-1674f65-2", + "port-version": 0 + }, + { + "git-tree": "2745369ca9bb24eeb7c7a75f4c2888655587b95b", + "version-string": "1.1.0-dev-1674f65-1", + "port-version": 0 + }, + { + "git-tree": "46ec04756b42c82638777f019766df191c62d5ef", + "version-string": "1.1.0-dev-1674f65", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/grppi.json b/port_versions/g-/grppi.json new file mode 100644 index 00000000000000..160e73345b418f --- /dev/null +++ b/port_versions/g-/grppi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "379e8c8ba1f8f97532ae5c1c68f542e32b7e0a15", + "version-string": "0.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gsl-lite.json b/port_versions/g-/gsl-lite.json new file mode 100644 index 00000000000000..81170a352bfcae --- /dev/null +++ b/port_versions/g-/gsl-lite.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "d043228295d723584f0143ed1395945c677e05e9", + "version-string": "0.37.0", + "port-version": 0 + }, + { + "git-tree": "8cb44f17f356d6625e03c5ade10525514e0812d7", + "version-string": "0.36.0", + "port-version": 0 + }, + { + "git-tree": "60874d27a6ffacedc5e67fffde456607a6909e33", + "version-string": "0.34.0", + "port-version": 0 + }, + { + "git-tree": "88339bf11d562c56672400f724a3a41a344bcb9c", + "version-string": "0.28.0", + "port-version": 0 + }, + { + "git-tree": "deed9d0f082c7c60dfc8ef2bf4eae4aff85bd897", + "version-string": "0.26.0", + "port-version": 0 + }, + { + "git-tree": "1fd0b3c9a2f5288956c498cefc20f933c8f7276c", + "version-string": "0.24.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gsl.json b/port_versions/g-/gsl.json new file mode 100644 index 00000000000000..25bbc623f86eb0 --- /dev/null +++ b/port_versions/g-/gsl.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "a102b1a49d711cdf9b8cfe4bc1e06836dc2c2423", + "version-string": "2.6", + "port-version": 0 + }, + { + "git-tree": "c6689303d23d4842b8e05790ebf2d1c0461437b1", + "version-string": "2.4-5", + "port-version": 0 + }, + { + "git-tree": "a9ffe7894b0178b9882932547b1762f8f254fe1a", + "version-string": "2.4-4", + "port-version": 0 + }, + { + "git-tree": "3c7e304f8df732b5e1c0917bc3d2c46671416382", + "version-string": "2.4-3", + "port-version": 0 + }, + { + "git-tree": "2b64b4b83e13130bce0662cf2db9a5e74029b537", + "version-string": "2.4-2", + "port-version": 0 + }, + { + "git-tree": "076b7fb7f496e8786cf0d86580f15ff0f83d85a1", + "version-string": "2.4-1", + "port-version": 0 + }, + { + "git-tree": "b96222d7cfea143d249b116d125f32827c39ffc6", + "version-string": "2.3-2", + "port-version": 0 + }, + { + "git-tree": "84f3ee603381282005bdd2858e21f57c2462dedd", + "version-string": "2.3-1", + "port-version": 0 + }, + { + "git-tree": "801c2bb3d96697ff371628d492715c0766faed24", + "version-string": "2.3", + "port-version": 0 + }, + { + "git-tree": "5fb729245794cb443bc51644ec131f1e5938c0e4", + "version-string": "20170425-8b320e3f5d016f953e55dfc7ec8694c1349d3fe4", + "port-version": 0 + }, + { + "git-tree": "b7972852cc97a2565472489d6ad30fd7d3f1c977", + "version-string": "0-fd5ad87bf", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gsoap.json b/port_versions/g-/gsoap.json new file mode 100644 index 00000000000000..bad3effc8ba2b7 --- /dev/null +++ b/port_versions/g-/gsoap.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "a376e6e1ce84fa44f521c1cd75ac61ad71d811d9", + "version-string": "2.8.105", + "port-version": 0 + }, + { + "git-tree": "a0738cd5e913ea4cf3ba3e309458ed2e03f82c17", + "version-string": "2.8.102-4", + "port-version": 0 + }, + { + "git-tree": "39309e4b3757b57205531b0d43372ea5d2a2bd21", + "version-string": "2.8.102-1", + "port-version": 0 + }, + { + "git-tree": "9692cf77ea87fedb7f443d41aa339078f5466928", + "version-string": "2.8.102", + "port-version": 0 + }, + { + "git-tree": "dfbb127058c877cd552da59464c5763d31803935", + "version-string": "2.8.93-3", + "port-version": 0 + }, + { + "git-tree": "e3b7d072ef45acb0f66e0de72efc2d987272349a", + "version-string": "2.8.93-2", + "port-version": 0 + }, + { + "git-tree": "be8f0ae616b40382e2ed79e6770bbd2c3474724b", + "version-string": "2.8.93-1", + "port-version": 0 + }, + { + "git-tree": "3dc4fc1dbb33b4ebbd394cb2e29048deb61eab90", + "version-string": "2.8.87-1", + "port-version": 0 + }, + { + "git-tree": "8cb97f22897e80fad6f53ca0b1e2095cc63a3fbf", + "version-string": "2.8.84-1", + "port-version": 0 + }, + { + "git-tree": "fff621f752f6c7814af5c570e4a4cad0f66f3921", + "version-string": "2.8.82-2", + "port-version": 0 + }, + { + "git-tree": "82e57a18575678e16bde1d37a09c5c53c9ae0fb7", + "version-string": "2.8.82-1", + "port-version": 0 + }, + { + "git-tree": "c4bd372b3a99227c0b5c226a86f22c00bdda9b22", + "version-string": "2.8.81-1", + "port-version": 0 + }, + { + "git-tree": "d4be417443dec19ed09ef16421e5e070a6b9b38e", + "version-string": "2.8.78-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gtest.json b/port_versions/g-/gtest.json new file mode 100644 index 00000000000000..4497553b1a09b2 --- /dev/null +++ b/port_versions/g-/gtest.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "88de073e86bcae80206fca0ff4f4f8e6c165f43a", + "version-string": "1.10.0", + "port-version": 2 + }, + { + "git-tree": "0c8b452fb8d54869457115b48aab06fb98b6534b", + "version-string": "1.10.0", + "port-version": 1 + }, + { + "git-tree": "31e482c8e02dd0e45cf439e8aec3d1320bdee511", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "75dae957802959a17feb7abb0272e9cac461e15a", + "version-string": "2019-10-09-1", + "port-version": 0 + }, + { + "git-tree": "4d97b8deb4711d7c03e63bf65b76a99945a7c71c", + "version-string": "2019-10-09", + "port-version": 0 + }, + { + "git-tree": "a29f51c59277dbb8f862a5e11a07b4f83a3eaa36", + "version-string": "2019-08-14-2", + "port-version": 0 + }, + { + "git-tree": "e529eb7ad6690c4fc8af907a0f9cd8b560b544e9", + "version-string": "2019-08-14-1", + "port-version": 0 + }, + { + "git-tree": "9a7027ffa93624c8a278a3fd5b42c078fb133f00", + "version-string": "2019-08-14", + "port-version": 0 + }, + { + "git-tree": "227f76bb1f104bd9ddd1e616c95ce71c69f92c27", + "version-string": "2019-01-04-3", + "port-version": 0 + }, + { + "git-tree": "b1e09efb4d16b2e25e2a79df06c10a655f924628", + "version-string": "2019-01-04-2", + "port-version": 0 + }, + { + "git-tree": "dd99fb7f94ea139eee54de7f680834ddf7a0a14b", + "version-string": "2019-01-04-1", + "port-version": 0 + }, + { + "git-tree": "70710e8f4d6e7bb29acf650a488090c437575b42", + "version-string": "2019-01-04", + "port-version": 0 + }, + { + "git-tree": "d3ab4a5a85169afe461c1a31185b86568f80816a", + "version-string": "1.8.1-1", + "port-version": 0 + }, + { + "git-tree": "f0efedd5859bf4059abe60094c45a607fcb0156f", + "version-string": "1.8.0-9", + "port-version": 0 + }, + { + "git-tree": "e04d7151d7e83e946d4c984d6bdccc2be248f917", + "version-string": "1.8.0-8", + "port-version": 0 + }, + { + "git-tree": "845c1e67bb649afa531b7eebc5938b4886084902", + "version-string": "1.8.0-7", + "port-version": 0 + }, + { + "git-tree": "02934f188f4bbd3f63be75da2a4517dbb9c586d0", + "version-string": "1.8.0-6", + "port-version": 0 + }, + { + "git-tree": "9498b6fc87ab652fe2d4bf3a0f3b52eb92c701a8", + "version-string": "1.8.0-5", + "port-version": 0 + }, + { + "git-tree": "f0c348870f545170035e034a58684158014aee80", + "version-string": "1.8.0-4", + "port-version": 0 + }, + { + "git-tree": "226154c349bc9c02e7f9a491a99f28342e663888", + "version-string": "1.8.0-3", + "port-version": 0 + }, + { + "git-tree": "c9981c030cd1671d5326f1374d8ed02ed1809720", + "version-string": "1.8.0-2", + "port-version": 0 + }, + { + "git-tree": "07dc2cb3655bfce4f47ac8553eb374313f2f4b98", + "version-string": "1.8-1", + "port-version": 0 + }, + { + "git-tree": "b0e42ede345cbb1a8660033dcabccc9886882728", + "version-string": "1.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gtk.json b/port_versions/g-/gtk.json new file mode 100644 index 00000000000000..f56dba6ffdc30e --- /dev/null +++ b/port_versions/g-/gtk.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "da7eb978b76a72cf192b98a2740cbfbd23b50bb5", + "version-string": "3.22.19-4", + "port-version": 0 + }, + { + "git-tree": "f31b6257fdf87f1f40905e5556c10037f0038298", + "version-string": "3.22.19-3", + "port-version": 0 + }, + { + "git-tree": "fb7d35a53d85cca046b000fce7e463f7a34d100b", + "version-string": "3.22.19-2", + "port-version": 0 + }, + { + "git-tree": "c53244e6b476fb0e5376c020e4a2830b0410f3c5", + "version-string": "3.22.19-1", + "port-version": 0 + }, + { + "git-tree": "f5f4bb4bb1ccb0785a7b2336684fec9d392f7536", + "version-string": "3.22.19", + "port-version": 0 + }, + { + "git-tree": "f23ca137de531a9653f6bb6d03fe160ec4a3d43d", + "version-string": "3.22.15", + "port-version": 0 + }, + { + "git-tree": "64cf61ca6bbd56f4a2170da7735b77a5aea7af03", + "version-string": "3.22.14", + "port-version": 0 + }, + { + "git-tree": "866096e3e4c4ccc3d3a789f2869b2123c0fc7162", + "version-string": "3.22.11", + "port-version": 0 + }, + { + "git-tree": "64ab7ce404fc0ae42ab2acaf4befdea573e7e1ff", + "version-string": "3.22.9", + "port-version": 0 + }, + { + "git-tree": "d7bbb49cbbefff127fcb42baaf57dad592817d8f", + "version-string": "3.22.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gtkmm.json b/port_versions/g-/gtkmm.json new file mode 100644 index 00000000000000..3b53b748c7077b --- /dev/null +++ b/port_versions/g-/gtkmm.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "3db7e5662e816c4a10a625f31a4aa77b2331b2fd", + "version-string": "3.22.2", + "port-version": 5 + }, + { + "git-tree": "6b0cb028ccbdeb67852ac3a92861df4fb9bcb3b7", + "version-string": "3.22.2", + "port-version": 4 + }, + { + "git-tree": "f6f5771fe15afab22c0fe2c9edf046b068d0f675", + "version-string": "3.22.2-2", + "port-version": 0 + }, + { + "git-tree": "4278800454ac2d95bb2eb13925c9e2586db61426", + "version-string": "3.22.2-1", + "port-version": 0 + }, + { + "git-tree": "4ceb1e90e6f6f9a6ea0fcc1491ff35e92f0ca6c9", + "version-string": "3.22.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gts.json b/port_versions/g-/gts.json new file mode 100644 index 00000000000000..536f7229e8a253 --- /dev/null +++ b/port_versions/g-/gts.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "d353bfe6f51567882c443a76763f94a7f7290563", + "version-string": "0.7.6-3", + "port-version": 0 + }, + { + "git-tree": "1cca7f74de18f264bfcad602ab8c78719db52182", + "version-string": "0.7.6-2", + "port-version": 0 + }, + { + "git-tree": "694f1b49ce6ebfd230cc54181352a7ebeba6e29a", + "version-string": "0.7.6-1", + "port-version": 0 + }, + { + "git-tree": "b5dc11b38be99bd70b3c0663dadce93f85e89bc2", + "version-string": "0.7.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/guetzli.json b/port_versions/g-/guetzli.json new file mode 100644 index 00000000000000..ee70d13c38f206 --- /dev/null +++ b/port_versions/g-/guetzli.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "6a8b09c3639cf50beb79315f87382cbbcf377e66", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "7c618d0a1c68a72706865de96833a01f00a6eb93", + "version-string": "2018-07-30-2", + "port-version": 0 + }, + { + "git-tree": "4c7d148764b13c7cc56815d773febe64c33b09f8", + "version-string": "2018-07-30-1", + "port-version": 0 + }, + { + "git-tree": "4efb1bf652deb1a8c66a01cf646b9e3e060021c6", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "31e7c14e150fbfc8e9a05d07dd96e14cf496eae1", + "version-string": "2017-09-02-cb5e4a86f69628-1", + "port-version": 0 + }, + { + "git-tree": "c072038c84e8177d36fde2a7ab3bef2bdc79ce1f", + "version-string": "2017-09-02-cb5e4a86f69628", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gumbo.json b/port_versions/g-/gumbo.json new file mode 100644 index 00000000000000..71f81fd602ccd2 --- /dev/null +++ b/port_versions/g-/gumbo.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "997baf0b8c0cd0d7db6e3e991596c8f88d23d804", + "version-string": "0.10.1-3", + "port-version": 0 + }, + { + "git-tree": "a3699efd0b8dbb4230f212d7381ae55535a29e3f", + "version-string": "0.10.1-2", + "port-version": 0 + }, + { + "git-tree": "59d1ae36616f1ec3d66f74db7be9c6c678bc5e21", + "version-string": "0.10.1-1", + "port-version": 0 + }, + { + "git-tree": "3cab3be84cb1f43dea44f88b2c0ace56b08b999f", + "version-string": "0.10.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/g-/gzip-hpp.json b/port_versions/g-/gzip-hpp.json new file mode 100644 index 00000000000000..c7ebae6673730d --- /dev/null +++ b/port_versions/g-/gzip-hpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4d9fe13f9fc7b82f2adf374e3d8ff70a2759cccb", + "version-string": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/h3.json b/port_versions/h-/h3.json new file mode 100644 index 00000000000000..698478948ae382 --- /dev/null +++ b/port_versions/h-/h3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fa85d7bae358fa15d03381d256c84bccb04ff1ea", + "version-string": "3.6.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/h5py-lzf.json b/port_versions/h-/h5py-lzf.json new file mode 100644 index 00000000000000..58140dbcf7440d --- /dev/null +++ b/port_versions/h-/h5py-lzf.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "478e2b35b0c4964627b73d28f54798cd48f15872", + "version-string": "2019-12-04", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/halide.json b/port_versions/h-/halide.json new file mode 100644 index 00000000000000..d96ad78c59a0e3 --- /dev/null +++ b/port_versions/h-/halide.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "c1c73129b398eeb00757d2e09fec220dafa7d0c9", + "version-string": "10.0.0", + "port-version": 0 + }, + { + "git-tree": "431a3f5e31c6ee9f3946ca65764bce830ab94ae7", + "version-string": "master_2020_03_07", + "port-version": 0 + }, + { + "git-tree": "b832d8bdb482dd5c17e96137f055fe4fdb7f398f", + "version-string": "release_2019_08_27-2", + "port-version": 0 + }, + { + "git-tree": "0a5e689d817d18da53c4df75ab631a31b0ac01db", + "version-string": "release_2019_08_27-1", + "port-version": 0 + }, + { + "git-tree": "c2630480b670409646c050acc4d166320d88a2d7", + "version-string": "release_2019_08_27", + "port-version": 0 + }, + { + "git-tree": "bdfa7176ff183c9b55ae348d1aa5fdc9ed6c3ff6", + "version-string": "release_2018_02_15-1", + "port-version": 0 + }, + { + "git-tree": "7bedef639822d13053f1a958fdd9aee7de1c4d88", + "version-string": "release_2018_02_15", + "port-version": 0 + }, + { + "git-tree": "a0c9d2fd0ab44537361f15a3d90ba9e06a3199a7", + "version-string": "release_2017_10_30", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/harfbuzz.json b/port_versions/h-/harfbuzz.json new file mode 100644 index 00000000000000..c5a87612582f00 --- /dev/null +++ b/port_versions/h-/harfbuzz.json @@ -0,0 +1,189 @@ +{ + "versions": [ + { + "git-tree": "2a196719fa9c0b074b71119ee781233eecf2a455", + "version-string": "2.7.2", + "port-version": 1 + }, + { + "git-tree": "91aa22841e264803434659d863f2e69957f232d0", + "version-string": "2.7.2", + "port-version": 0 + }, + { + "git-tree": "076576fc2c2a50851c12426641d4c508fd0a10e3", + "version-string": "2.6.6", + "port-version": 1 + }, + { + "git-tree": "a774cec85651ed6598ea3b7a4f297ec691ac85de", + "version-string": "2.6.6", + "port-version": 0 + }, + { + "git-tree": "4762646b1e24e4ffc76edb3b09159c365f6d9262", + "version-string": "2.5.3-1", + "port-version": 0 + }, + { + "git-tree": "2bed6d0f82b99b3695c4c5c7fef233a1bfce8626", + "version-string": "2.5.3", + "port-version": 0 + }, + { + "git-tree": "897c7d72801377b0fcdb002ede9a917977a9a18a", + "version-string": "2.5.1-1", + "port-version": 0 + }, + { + "git-tree": "94e2022645b927a97cad57d3366c626c4e6380b2", + "version-string": "2.5.1", + "port-version": 0 + }, + { + "git-tree": "737da7cc1fb34bb3c8a4fd5ad488e51eabdd5034", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "5217d3e40ab1c53bd0211fa7816cb81a4080e8e5", + "version-string": "2.3.1-3", + "port-version": 0 + }, + { + "git-tree": "1eb3aba33feb6fc72b6b75b7504498fa6debb304", + "version-string": "2.3.1-2", + "port-version": 0 + }, + { + "git-tree": "bd8d33f7871c04e5558ac9fe02950039249345da", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "66e072b146f47d2a2c3af658c037707582af7aee", + "version-string": "1.8.4-4", + "port-version": 0 + }, + { + "git-tree": "b8d7ac94ecbb8c8964915e5bbd63d7e2cab92ab9", + "version-string": "1.8.4-3", + "port-version": 0 + }, + { + "git-tree": "84a50d962a59ffb7de3cb9ea713e7fbcc641795d", + "version-string": "1.8.4-2", + "port-version": 0 + }, + { + "git-tree": "f7c5fa205b5636726aa510a28334155d24f9caba", + "version-string": "1.8.4-1", + "port-version": 0 + }, + { + "git-tree": "ad2402f2608f73805cbc0d2b98ddb0168ad6c638", + "version-string": "1.8.4", + "port-version": 0 + }, + { + "git-tree": "2ce4bba3c5d2667ff02b370381fafe9693d96b99", + "version-string": "1.8.2-3", + "port-version": 0 + }, + { + "git-tree": "1f41a4acbe2af0370994cf55270a31856103017c", + "version-string": "1.8.2-2", + "port-version": 0 + }, + { + "git-tree": "7619da228dff1d0154144ec5ef7ab50d67c13be0", + "version-string": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "67ecbaf4252e5a9c84c201ab905553d4bf87dece", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "2a0514c06349077cc117da9dd030bed929fdbf34", + "version-string": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "e44d153727ad5410440139a256dad848b7c38b93", + "version-string": "1.7.6-1", + "port-version": 0 + }, + { + "git-tree": "d37706b30d6e90179a66f0bee0d13e590bfb37c5", + "version-string": "1.7.6", + "port-version": 0 + }, + { + "git-tree": "349e6e35c17e087c36fbd1cfabdb50c7565ea996", + "version-string": "1.7.5", + "port-version": 0 + }, + { + "git-tree": "bb5481a02968cf70c8bea87a4f723f48db43ee09", + "version-string": "1.7.4", + "port-version": 0 + }, + { + "git-tree": "aca18734b04e8b12d2307e21e8e960aba203c6e4", + "version-string": "1.6.3-1", + "port-version": 0 + }, + { + "git-tree": "fc47fa0456f1ad448bda22f5bd4f4821fc44ec83", + "version-string": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "aca18734b04e8b12d2307e21e8e960aba203c6e4", + "version-string": "1.6.3-1", + "port-version": 0 + }, + { + "git-tree": "3ace3f59214ad9873116c8c32d635381b8d5fd0d", + "version-string": "1.6.3", + "port-version": 0 + }, + { + "git-tree": "d08f55c635c41e68c01cff7cfdf7ed91b7618f25", + "version-string": "1.4.6-2", + "port-version": 0 + }, + { + "git-tree": "013e9b7a559316684b1154831e2e65ae0a531169", + "version-string": "1.4.6-1", + "port-version": 0 + }, + { + "git-tree": "1274359c098198bbe9cf04d8c65de9d578b2700b", + "version-string": "1.4.6", + "port-version": 0 + }, + { + "git-tree": "117c585bb053ac82f44d36cd822fb5cb89db815f", + "version-string": "1.3.4-2", + "port-version": 0 + }, + { + "git-tree": "4cc988ca05f8c5adb6bbd479d63d7982e3227a15", + "version-string": "1.3.4-1", + "port-version": 0 + }, + { + "git-tree": "cfa58727bd1c52da7a93f7e1986bc1abf83d6ddc", + "version-string": "1.3.4", + "port-version": 0 + }, + { + "git-tree": "2fa14b6f1737ecec66dfbd81598c83bb7e440543", + "version-string": "1.3.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/hayai.json b/port_versions/h-/hayai.json new file mode 100644 index 00000000000000..5c56dd44a7d67a --- /dev/null +++ b/port_versions/h-/hayai.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0998208b524c86d2820be639403afb5f5763d62c", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/hdf5.json b/port_versions/h-/hdf5.json new file mode 100644 index 00000000000000..ce67208394a7a0 --- /dev/null +++ b/port_versions/h-/hdf5.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "44e842d3e953523fb313d56e4af9bb51af40e507", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "7cf9655c711cf11dcea55e6962ecf78bee6b3252", + "version-string": "1.10.5-12", + "port-version": 0 + }, + { + "git-tree": "b128d0ea0bf375fc83a72955bf6730f84cb359a7", + "version-string": "1.10.5-10", + "port-version": 0 + }, + { + "git-tree": "95997de442bca4c93b80091d207d237174d73170", + "version-string": "1.10.5-9", + "port-version": 0 + }, + { + "git-tree": "fc1152f71ede376bfc00366986c9c7b4a057210d", + "version-string": "1.10.5-8", + "port-version": 0 + }, + { + "git-tree": "205d0d7a55abebc1885b702e035c2cfd07e84ce4", + "version-string": "1.10.5-7", + "port-version": 0 + }, + { + "git-tree": "c13e7b5e5b00abd339b045cb31cf7e372433642e", + "version-string": "1.10.5-6", + "port-version": 0 + }, + { + "git-tree": "d4b1a7f45b0f8615c10415e61f8c109ce74af4b5", + "version-string": "1.10.5-5", + "port-version": 0 + }, + { + "git-tree": "21eaa3d6f47b66258273c93ab4bbf8ca92bafaad", + "version-string": "1.10.5-4", + "port-version": 0 + }, + { + "git-tree": "e5357ff90c02732cd090f09ac5b1a99c8be33015", + "version-string": "1.10.5-3", + "port-version": 0 + }, + { + "git-tree": "15c03394c634563ec9097cfc08cad23dc8b98c23", + "version-string": "1.10.5-1", + "port-version": 0 + }, + { + "git-tree": "2c055b5a50d0fd66a6f54a74315f293e347e2cfe", + "version-string": "1.10.1-1", + "port-version": 0 + }, + { + "git-tree": "84c670e0b960515031718442c031f0ed5e17b1e3", + "version-string": "1.10.1", + "port-version": 0 + }, + { + "git-tree": "555159439fb6d107243d637a03db142d10199598", + "version-string": "1.10.0-patch1-2", + "port-version": 0 + }, + { + "git-tree": "c001924b0f9f135c0f279e1c03a2bd4c4726f5c8", + "version-string": "1.10.0-patch1-1", + "port-version": 0 + }, + { + "git-tree": "6b72c120880223c0bc2e2a894b80f9c566601c87", + "version-string": "1.10.0-patch1", + "port-version": 0 + }, + { + "git-tree": "f2d6516720dc272f823aa72f82bf8714772eb669", + "version-string": "1.8.18", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/healpix.json b/port_versions/h-/healpix.json new file mode 100644 index 00000000000000..37a3a76ddc26a6 --- /dev/null +++ b/port_versions/h-/healpix.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "8b4976feec333064ba50d96cfa8458afeb01783c", + "version-string": "1.12.10", + "port-version": 7 + }, + { + "git-tree": "158a498ff4af7528dff7ee004306dce22185614d", + "version-string": "1.12.10", + "port-version": 6 + }, + { + "git-tree": "4c5e66ee76c9fb2085dbddf9a2385b36692922f7", + "version-string": "1.12.10-5", + "port-version": 0 + }, + { + "git-tree": "961bb91b13917046cc3bfb186b6bf337ce05e3aa", + "version-string": "1.12.10-2", + "port-version": 0 + }, + { + "git-tree": "d52359ab326c4e66c077370c0d3577be4d7600ac", + "version-string": "1.12.10-1", + "port-version": 0 + }, + { + "git-tree": "1e332ae8d98b3fab07d5d10323bf90d9760a1828", + "version-string": "1.12.10", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/hedley.json b/port_versions/h-/hedley.json new file mode 100644 index 00000000000000..694a6f48a364c8 --- /dev/null +++ b/port_versions/h-/hedley.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "408d71ebd4c7429c04cce019743e3cb59f327959", + "version-string": "14", + "port-version": 0 + }, + { + "git-tree": "6f2c286914bf5f5d66d1588d2faeb0898bc6a0d3", + "version-string": "2019-05-08-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/hffix.json b/port_versions/h-/hffix.json new file mode 100644 index 00000000000000..222e9e500f990b --- /dev/null +++ b/port_versions/h-/hffix.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6e523c6f54e9afbd5a3626927a222ee4cfe7bdef", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/hfsm2.json b/port_versions/h-/hfsm2.json new file mode 100644 index 00000000000000..b40fd24bb2c506 --- /dev/null +++ b/port_versions/h-/hfsm2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "911d9cf3b289887ec59c5ea175126c084c4c6254", + "version-string": "beta7", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/hidapi.json b/port_versions/h-/hidapi.json new file mode 100644 index 00000000000000..56a48cbe6833b9 --- /dev/null +++ b/port_versions/h-/hidapi.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e252d2cc9ecde0cdecdf424af08a4292440f9efd", + "version-string": "0.10.1", + "port-version": 0 + }, + { + "git-tree": "9cd282bf1d058764b6f660790ffc47ae0d8b2f0d", + "version-string": "2019-08-30", + "port-version": 1 + }, + { + "git-tree": "83f307ab7d353fd5a57254a4d94278c40a4b25c8", + "version-string": "2019-08-30", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/highfive.json b/port_versions/h-/highfive.json new file mode 100644 index 00000000000000..977c678931500d --- /dev/null +++ b/port_versions/h-/highfive.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "b26cc2dbfcf688652fc8b8c711806c3034296237", + "version-string": "2.2.2", + "port-version": 1 + }, + { + "git-tree": "33e914e4f1216ed621883ba8dce0a0cf3829bae1", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "3825616d8983da6a1276b8896b8e0d727573f774", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "9b4385988c212f2ee8bd5627f9596e23ff3606dc", + "version-string": "2.0", + "port-version": 0 + }, + { + "git-tree": "407d61e660def5da6a3627328f07a21c51ffb9a5", + "version-string": "1.5-1", + "port-version": 0 + }, + { + "git-tree": "df47d577422fde1244ce6f8f8c5dc51aa9e31cde", + "version-string": "1.5", + "port-version": 0 + }, + { + "git-tree": "5179e02cd8b0aee849d181641b5111c37319a00e", + "version-string": "1.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/hiredis.json b/port_versions/h-/hiredis.json new file mode 100644 index 00000000000000..5522d98ffdad13 --- /dev/null +++ b/port_versions/h-/hiredis.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "e9c2ffbff25b0e22f0b09ec594b3f4288f685762", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "4a9dc3f6a23b635c93d1abde65678f086ade77f8", + "version-string": "2019-11-2", + "port-version": 2 + }, + { + "git-tree": "61fb5afd449f8c6e2d05e1f07463fa3f66c609aa", + "version-string": "2019-11-2-1", + "port-version": 0 + }, + { + "git-tree": "c1975a687ede27d3ae6876fbf856d60f8ecb292f", + "version-string": "2019-11-2", + "port-version": 0 + }, + { + "git-tree": "aff2e9b3c8e71a55e82d315ee28a64025f188f0f", + "version-string": "2019-11-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/hpx.json b/port_versions/h-/hpx.json new file mode 100644 index 00000000000000..8076c8605128dc --- /dev/null +++ b/port_versions/h-/hpx.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "0d953f6271ca1239062cf9d4d4854820c5f853a3", + "version-string": "1.5.1", + "port-version": 1 + }, + { + "git-tree": "e54e429dd54b4683d4402bcbff3aa5412e4cb1c5", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "09298c2ccdaddd5de485a0a1dddd5a988a093da0", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "c9102df79e91df26590a8ac90d0aee495f0e01be", + "version-string": "1.4.1-1", + "port-version": 0 + }, + { + "git-tree": "6f9c4aca81b46bdbd75fa35745a084416c193655", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "b4915d3955b7c4f22bf7f36a5e782b6614ee3238", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "ec18df284aaae6f9a4279f6a4473a60935d3ca21", + "version-string": "1.3.0-2", + "port-version": 0 + }, + { + "git-tree": "638eb9bef11f1e5ce498a0df5151fe9b053e17e9", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "8ae92e5f4518e2eeb8c42031b1bce0d75c0e48e9", + "version-string": "1.2.1-1", + "port-version": 0 + }, + { + "git-tree": "7fab6b09eb2d716be628379c03c4e9fdc19f5ff6", + "version-string": "1.2.1-0", + "port-version": 0 + }, + { + "git-tree": "ac33c17cf60f5d11ec9f95401095c3aae0b39add", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "318331a93aa3b38469682e5009db36fb3909ecdb", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "52bcad625c0e17b817364f0385645e3c4a975cc0", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "6aead4affc4449e35cb7ca485bda7cbd52d17ce3", + "version-string": "1.0.0-8", + "port-version": 0 + }, + { + "git-tree": "06318f8ddbe8c85c42a51fdd64f1cf3874efd3d8", + "version-string": "1.0.0-7", + "port-version": 0 + }, + { + "git-tree": "745cc197f381856e849dbbf9789c915279dfdc9c", + "version-string": "1.0.0-6", + "port-version": 0 + }, + { + "git-tree": "68e456e0f0b31bbef5aad689735d7daa2703b468", + "version-string": "1.0.0-5", + "port-version": 0 + }, + { + "git-tree": "c815328bd20f06fd3d72aac6902e0fbc2562e2bd", + "version-string": "1.0.0-4", + "port-version": 0 + }, + { + "git-tree": "37bb288337583e525185a166106217a508ec5d85", + "version-string": "1.0.0-3", + "port-version": 0 + }, + { + "git-tree": "167510a95f9e468406142c310d3d39c6f182a75d", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/http-parser.json b/port_versions/h-/http-parser.json new file mode 100644 index 00000000000000..db21d8d0d04e3a --- /dev/null +++ b/port_versions/h-/http-parser.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "ad1f223d4c2eaa1a904f08153ec3b09854c0e393", + "version-string": "2.9.4", + "port-version": 0 + }, + { + "git-tree": "8525a804bbb90dcf1ac4f28b176e205c0af26519", + "version-string": "2.9.3", + "port-version": 0 + }, + { + "git-tree": "e1af42a470fee65bfbab0dad2ef6011d885b7390", + "version-string": "2.9.2-1", + "port-version": 0 + }, + { + "git-tree": "ed7bcfe851f539b4949b9e4947f4191a50dbc2b9", + "version-string": "2.9.2", + "port-version": 0 + }, + { + "git-tree": "8330edae768537c8a68241a33a34a8da2d2c5f4c", + "version-string": "2.9.0-1", + "port-version": 0 + }, + { + "git-tree": "b69b623e0c2bb31af83b21778b7ab4e33abb46d3", + "version-string": "2.9.0", + "port-version": 0 + }, + { + "git-tree": "47283005d12933a6fed28bb6a9a1422f818df496", + "version-string": "2.8.1", + "port-version": 0 + }, + { + "git-tree": "30d289cfa6f6ac7e9a898dba5016d9c444abdf2c", + "version-string": "2.7.1-3", + "port-version": 0 + }, + { + "git-tree": "9d99708da66254c483bbc93b1ea01849dedf8090", + "version-string": "2.7.1-2", + "port-version": 0 + }, + { + "git-tree": "ded9b7f2ee8f087925d7a6ed61cbedddf1d055a9", + "version-string": "2.7.1-1", + "port-version": 0 + }, + { + "git-tree": "af958e429245254d86d3845fef33bfb07649ddbe", + "version-string": "2.7.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/hungarian.json b/port_versions/h-/hungarian.json new file mode 100644 index 00000000000000..1600621647e4d3 --- /dev/null +++ b/port_versions/h-/hungarian.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "66d26b2162c1337d91ce5047c412788a220bacee", + "version-string": "v0.1.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/hunspell.json b/port_versions/h-/hunspell.json new file mode 100644 index 00000000000000..e74ce46d675170 --- /dev/null +++ b/port_versions/h-/hunspell.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "2d430ba4b4104cdf4f38babf9918c292d7d90b7e", + "version-string": "1.7.0", + "port-version": 2 + }, + { + "git-tree": "99e4148dd8bcbd76246c2f1fafa84e892eab8a46", + "version-string": "1.7.0-1", + "port-version": 0 + }, + { + "git-tree": "749ec4402a9b0a6e102d4716276c9714f6a6d158", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "73f04bb987e8720dea3c85898ad169d2981c0a8b", + "version-string": "1.6.1-3", + "port-version": 0 + }, + { + "git-tree": "240f54ec59fe1abeb93671a694a304eccf39829a", + "version-string": "1.6.1-2", + "port-version": 0 + }, + { + "git-tree": "5968fb791f81937f680562b2564ec5ac31feda7f", + "version-string": "1.6.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/hwloc.json b/port_versions/h-/hwloc.json new file mode 100644 index 00000000000000..1b6c36b2792f6e --- /dev/null +++ b/port_versions/h-/hwloc.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "fdafa8b57a94773fa46c24d7a3bcdb3d75867825", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "91f081628fbfd5099341bb48554a1bc1cab2e0ff", + "version-string": "1.11.7-4", + "port-version": 0 + }, + { + "git-tree": "5539c5ea3d8a0fdbba08c38b3a7408bd18420765", + "version-string": "1.11.7-3", + "port-version": 0 + }, + { + "git-tree": "7a60409a87b2a9fd50684db89f4c29708f361a31", + "version-string": "1.11.7-2", + "port-version": 0 + }, + { + "git-tree": "cfa2c7f7c209e74b231e9bc485e528ff3c161a06", + "version-string": "1.11.7-1", + "port-version": 0 + }, + { + "git-tree": "28ad2779072f2bad9c61e355f3dc729af77d7cab", + "version-string": "1.11.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/hyperscan.json b/port_versions/h-/hyperscan.json new file mode 100644 index 00000000000000..e0cd57f91a3abf --- /dev/null +++ b/port_versions/h-/hyperscan.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "1a0f3d2c664a03ed56917c7eb127fa907e4c3386", + "version-string": "5.3.0", + "port-version": 1 + }, + { + "git-tree": "3932d96d4ba2d75bfc41532938375e10e453817c", + "version-string": "5.3.0", + "port-version": 0 + }, + { + "git-tree": "333aac02c9fbf8c23e05328494c0079576be8e68", + "version-string": "5.2.1-1", + "port-version": 0 + }, + { + "git-tree": "51dd21b9ebd700d24a9ac034072ca09b5e40a406", + "version-string": "5.2.1", + "port-version": 0 + }, + { + "git-tree": "ef883e470f2ad9298986d82d6ed299a6a9a0ba55", + "version-string": "5.1.0-4", + "port-version": 0 + }, + { + "git-tree": "ccca38886f217e80c1d36f77c0d9057b18cf60b3", + "version-string": "5.1.0-3", + "port-version": 0 + }, + { + "git-tree": "f3775fe5c4acf7545b436081ba4af850f0edc143", + "version-string": "5.0.1-2", + "port-version": 0 + }, + { + "git-tree": "2f92dfa4257072709424f97ca61360b81be8efdb", + "version-string": "5.0.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/h-/hypre.json b/port_versions/h-/hypre.json new file mode 100644 index 00000000000000..82002f2984b45d --- /dev/null +++ b/port_versions/h-/hypre.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "1643e99e1d689845a05bd360bed378965ce9c0cc", + "version-string": "2.19.0", + "port-version": 0 + }, + { + "git-tree": "0ca106b1e3ee3b085e6853a5ce4f05c868ad32ea", + "version-string": "2.11.2-3", + "port-version": 0 + }, + { + "git-tree": "d53450e820eedadc2acf1e63dfd5cb387424f719", + "version-string": "2.11.2-2", + "port-version": 0 + }, + { + "git-tree": "e00e7348029f4bb45e36fdd4f1abe74a9f6344c6", + "version-string": "2.11.2-1", + "port-version": 0 + }, + { + "git-tree": "481e46f98a23c5b01d599ca3fb55757bd28880e5", + "version-string": "2.11.2", + "port-version": 0 + }, + { + "git-tree": "d8675c56f0f5fa18d2680496c2f6619b9e734023", + "version-string": "2.11.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/icu.json b/port_versions/i-/icu.json new file mode 100644 index 00000000000000..38be600599c1ee --- /dev/null +++ b/port_versions/i-/icu.json @@ -0,0 +1,129 @@ +{ + "versions": [ + { + "git-tree": "e224ca4ff2e2bcb1c4b72a1813ab886c1dfa2bfc", + "version-string": "67.1", + "port-version": 7 + }, + { + "git-tree": "4ea2d507d5bb2f0a1fc20ef26deca88eb4edf307", + "version-string": "67.1", + "port-version": 6 + }, + { + "git-tree": "1efce2f8881faeee06f4f6ef22d6f92ddacbda75", + "version-string": "67.1", + "port-version": 5 + }, + { + "git-tree": "43003ffdf4e30ab69904383c0aa0792faf78dad4", + "version-string": "67.1", + "port-version": 4 + }, + { + "git-tree": "aebdc1084eae7eab416a7c71bb80b44dee810d31", + "version-string": "67.1-3", + "port-version": 0 + }, + { + "git-tree": "f28d3cf55ee38272270be7664e27f9cb6ae53b3d", + "version-string": "67.1-2", + "port-version": 0 + }, + { + "git-tree": "546ed7ce43119a1a195db0d3f04c03ce603e8866", + "version-string": "67.1-1", + "port-version": 0 + }, + { + "git-tree": "ba1be2fe3dd80271753b7f694f995b2309e145b5", + "version-string": "67.1", + "port-version": 0 + }, + { + "git-tree": "46ad24657d02205eeaa7f4cce82812afee4df0cb", + "version-string": "65.1-4", + "port-version": 0 + }, + { + "git-tree": "c00fc558a4bfe370588a72a6e13a024ef099eea3", + "version-string": "65.1-3", + "port-version": 0 + }, + { + "git-tree": "ba7fae6e96f9531f47781764cc68a1d6efe7290e", + "version-string": "65.1-2", + "port-version": 0 + }, + { + "git-tree": "75a1e5adc53915064f526242983c7d12f22297d6", + "version-string": "65.1-1", + "port-version": 0 + }, + { + "git-tree": "ab3f6cc6808d79c9517be0f549241a5606a36607", + "version-string": "61.1-8", + "port-version": 0 + }, + { + "git-tree": "37ee3cec63a8a15c8b9348f847d25ed60dd95235", + "version-string": "61.1-7", + "port-version": 0 + }, + { + "git-tree": "2a7dd2543b22bc577581ea507f7dd4dcf7f15b58", + "version-string": "61.1-6", + "port-version": 0 + }, + { + "git-tree": "0b941a96d473945a564775372b1b03e478638952", + "version-string": "61.1-5", + "port-version": 0 + }, + { + "git-tree": "97283eb1d49b55916632759aca12ae562d48c500", + "version-string": "61.1-4", + "port-version": 0 + }, + { + "git-tree": "3cf7f454a9959e974f296e3809e0cbc7842d36a4", + "version-string": "61.1-3", + "port-version": 0 + }, + { + "git-tree": "de658cb3e2f4cf74f876057a58dd86fb47ef2383", + "version-string": "61.1-2", + "port-version": 0 + }, + { + "git-tree": "c28e2fce25b5590e2557c9a01cd9d9ca11eb9142", + "version-string": "61.1-1", + "port-version": 0 + }, + { + "git-tree": "c6e1d6ed22cdaddf8545d31992b94965e6122648", + "version-string": "59.1-1", + "port-version": 0 + }, + { + "git-tree": "b6d11f8dff64fcfe783f20172c01862da490b421", + "version-string": "59.1", + "port-version": 0 + }, + { + "git-tree": "d0658dc140b67cd34d39f6244dddc4b891027004", + "version-string": "58.2-1", + "port-version": 0 + }, + { + "git-tree": "b6e309e3c6e5a4ba675adc7a2d1b145219233925", + "version-string": "58.2", + "port-version": 0 + }, + { + "git-tree": "b10467e77c56b0d138d90256917ab9a6a2d96532", + "version-string": "58.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ideviceinstaller.json b/port_versions/i-/ideviceinstaller.json new file mode 100644 index 00000000000000..29d34c4afbb721 --- /dev/null +++ b/port_versions/i-/ideviceinstaller.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "22efe10c7de92708548907150b4dd448de67150a", + "version-string": "1.1.2.23-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/idevicerestore.json b/port_versions/i-/idevicerestore.json new file mode 100644 index 00000000000000..51bb0a547525b8 --- /dev/null +++ b/port_versions/i-/idevicerestore.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "ca67e457702ccad00ebe9a49eb75221b86db6d96", + "version-string": "1.0.12-4", + "port-version": 0 + }, + { + "git-tree": "f51218d9ee053cae5ea46cb0270fdf3d204be120", + "version-string": "1.0.12-3", + "port-version": 0 + }, + { + "git-tree": "1cf6868c029bbda96040503bcd31ccba9f400078", + "version-string": "1.0.12-2", + "port-version": 0 + }, + { + "git-tree": "897894688ee68ad1699cab4c5c1256a3379ec903", + "version-string": "1.0.12-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/if97.json b/port_versions/i-/if97.json new file mode 100644 index 00000000000000..84772ee6c316f3 --- /dev/null +++ b/port_versions/i-/if97.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "eb85fac9729456ec259c779df99d16aa32dbe2ce", + "version-string": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "cbdad3c183cfb5e59151a111cb33f58e978aa787", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/igloo.json b/port_versions/i-/igloo.json new file mode 100644 index 00000000000000..79c1d789f951db --- /dev/null +++ b/port_versions/i-/igloo.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5bbaba2a845fb358c0e65fb4f9bbb9d4b338f901", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-cmake0.json b/port_versions/i-/ignition-cmake0.json new file mode 100644 index 00000000000000..720e6e019f39b3 --- /dev/null +++ b/port_versions/i-/ignition-cmake0.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "2214c0356313bf4b9ac99a8554050e623ec9cb9a", + "version-string": "0.6.2-2", + "port-version": 0 + }, + { + "git-tree": "dfc6632fb7e7fd352f93ae8c0626bcb6c1087acd", + "version-string": "0.6.2-1", + "port-version": 0 + }, + { + "git-tree": "867ddd6a73be3e7ee4335f8ab0e4c5c166881278", + "version-string": "0.6.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-cmake2.json b/port_versions/i-/ignition-cmake2.json new file mode 100644 index 00000000000000..f229c494bdb39e --- /dev/null +++ b/port_versions/i-/ignition-cmake2.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "79ed070b59395cdd29bbc781269be3eb1d26bfda", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "c4d2b262a92f499d74d5dc468a7678364d3a65c9", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "631723c5355bc47aeec0714339d2c6ac7e70c69d", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "954c92d4a288d502753e49f89651afb923709a29", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "e10e4fc64d8ceb7f9583ae2b78cb9f54dcb74c22", + "version-string": "2.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-common1.json b/port_versions/i-/ignition-common1.json new file mode 100644 index 00000000000000..5d898b2cdeb848 --- /dev/null +++ b/port_versions/i-/ignition-common1.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a79aa681c879a9e76a80df3ca14d228224bcd22c", + "version-string": "1.1.1-1", + "port-version": 0 + }, + { + "git-tree": "194c75d1a53a9c666205679bb3a6788e2528f9fc", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-common3.json b/port_versions/i-/ignition-common3.json new file mode 100644 index 00000000000000..3f5138ecc7231f --- /dev/null +++ b/port_versions/i-/ignition-common3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "87a639da8095ce4a421733485fa1104959ccfe02", + "version-string": "3.9.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-fuel-tools1.json b/port_versions/i-/ignition-fuel-tools1.json new file mode 100644 index 00000000000000..62d4a57dbfd28e --- /dev/null +++ b/port_versions/i-/ignition-fuel-tools1.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d32162d2fdffea4d19a358e13e270a709940aa58", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "3b8c373cdca1eacce987c114572c180612c965bc", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "1fa42f60434882f6cdd21d536bdac1a857c04dd4", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-math4.json b/port_versions/i-/ignition-math4.json new file mode 100644 index 00000000000000..d83aaef76ca80a --- /dev/null +++ b/port_versions/i-/ignition-math4.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c2cf4af319039b3f94554d71eafe3ba4554de06b", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d8ce71406e7b23d8e5305a7c8dba1b4843ad4d4e", + "version-string": "4.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-math6.json b/port_versions/i-/ignition-math6.json new file mode 100644 index 00000000000000..2553272a38eaf0 --- /dev/null +++ b/port_versions/i-/ignition-math6.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "d2f578e91ac205b450f5046e871c49fcdd5a4471", + "version-string": "6.6.0", + "port-version": 0 + }, + { + "git-tree": "2ee0f91d2ca15a904dd1838114ee660da12e0dd3", + "version-string": "6.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-modularscripts.json b/port_versions/i-/ignition-modularscripts.json new file mode 100644 index 00000000000000..fa7be1e105acef --- /dev/null +++ b/port_versions/i-/ignition-modularscripts.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "29ded62ecf82daf0e42756ed617c38aa98fb215a", + "version-string": "2020-11-23", + "port-version": 0 + }, + { + "git-tree": "32d32f91b04ab247f2febd2097834b24f1384114", + "version-string": "2020-05-16", + "port-version": 2 + }, + { + "git-tree": "2d89e9326d7b330c1e11db6f01a78991bfe1b1d3", + "version-string": "2020-05-16", + "port-version": 1 + }, + { + "git-tree": "18f34d6551c407e49c8d81dc6ca22c7fd7a079eb", + "version-string": "2020-05-16", + "port-version": 0 + }, + { + "git-tree": "834d4b6ebc371c448f2e322cfa34d29f0cfc11c4", + "version-string": "2020-05-09", + "port-version": 0 + }, + { + "git-tree": "be14de1c2204f8d09cf076b622e14f81099bdbbd", + "version-string": "2020-04-16", + "port-version": 0 + }, + { + "git-tree": "8085dcf458f3d90246ee830f4dd5f9ba13b1d09b", + "version-string": "2020-02-10", + "port-version": 0 + }, + { + "git-tree": "cf763d56e064e5c230385fc41a42cf5fac6b4b41", + "version-string": "2019-09-11", + "port-version": 0 + }, + { + "git-tree": "f9cbdac4ce316ddb2877c5e8389a33eda4b1bac3", + "version-string": "2019-08-20", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-msgs1.json b/port_versions/i-/ignition-msgs1.json new file mode 100644 index 00000000000000..4a7ec88692d985 --- /dev/null +++ b/port_versions/i-/ignition-msgs1.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "6deeb37a3e78a86b0997ffe605e149b79c4ad224", + "version-string": "1.0.0", + "port-version": 3 + }, + { + "git-tree": "26d5a8cb5d65f3c92a09ddc1bee3409e526f1ec9", + "version-string": "1.0.0", + "port-version": 2 + }, + { + "git-tree": "7beda1d05c59bb872d69dc56d2f898bda4f3b9cd", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "46c685c58e9e2aba51d7efcb3cfab3f92347cb98", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-msgs5.json b/port_versions/i-/ignition-msgs5.json new file mode 100644 index 00000000000000..bb6e6344796d31 --- /dev/null +++ b/port_versions/i-/ignition-msgs5.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e8619eab2a3fa0fa87af043ae46d7afb7629acc6", + "version-string": "5.3.0", + "port-version": 2 + }, + { + "git-tree": "d9a45aab4edbe498d71a48737199bf7612d09a8b", + "version-string": "5.3.0", + "port-version": 1 + }, + { + "git-tree": "96845db33a7c98aa65b4ac3e63b2da3d3248cf34", + "version-string": "5.1.0", + "port-version": 1 + }, + { + "git-tree": "c581f62b21ecbf784e169ad64074e51d254152f1", + "version-string": "5.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-msgs6.json b/port_versions/i-/ignition-msgs6.json new file mode 100644 index 00000000000000..8c18547769b0b7 --- /dev/null +++ b/port_versions/i-/ignition-msgs6.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "37ea9fd8ab03a9a1d836513a22fb81cb56b69c03", + "version-string": "6.0.0", + "port-version": 1 + }, + { + "git-tree": "0514d783ad3b65c3a5df006edc5fbf45d1d823d4", + "version-string": "6.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-plugin1.json b/port_versions/i-/ignition-plugin1.json new file mode 100644 index 00000000000000..e7130589635a83 --- /dev/null +++ b/port_versions/i-/ignition-plugin1.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2c0c2d15d4f71838cd518e9c9d09db5a34f93782", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-transport4.json b/port_versions/i-/ignition-transport4.json new file mode 100644 index 00000000000000..77218a0e9ba86a --- /dev/null +++ b/port_versions/i-/ignition-transport4.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "69f5299f9f0cc2c7206d086ee3424df68a90aaf2", + "version-string": "4.0.0-2", + "port-version": 0 + }, + { + "git-tree": "ec513567382cdc1d11da6a70b5c236ea662a3278", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "762aa22f9910c1bb0588d3a9f7e49776feb38b4b", + "version-string": "4.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-transport8.json b/port_versions/i-/ignition-transport8.json new file mode 100644 index 00000000000000..f8491eb7d6e9c7 --- /dev/null +++ b/port_versions/i-/ignition-transport8.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "049dc0f48ee619d631034d14674e94bac4317be1", + "version-string": "8.1.0", + "port-version": 0 + }, + { + "git-tree": "299f4539b1b7ce103e774e0578dbc99e9e275fdb", + "version-string": "8.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ignition-transport9.json b/port_versions/i-/ignition-transport9.json new file mode 100644 index 00000000000000..736c43ffb1426e --- /dev/null +++ b/port_versions/i-/ignition-transport9.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "282fbad5eec25e8d6f6a7224101ad61556d89039", + "version-string": "9.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ijg-libjpeg.json b/port_versions/i-/ijg-libjpeg.json new file mode 100644 index 00000000000000..d6ce80d4420ac3 --- /dev/null +++ b/port_versions/i-/ijg-libjpeg.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "320dc4cbe69f8dea86bce50c1445f51f780de1a3", + "version-string": "9d", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ilmbase.json b/port_versions/i-/ilmbase.json new file mode 100644 index 00000000000000..6a3d4163eb33e8 --- /dev/null +++ b/port_versions/i-/ilmbase.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "993cdd111c509def2dad3cb7ce7462414b671cbb", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "4e392ec6f9324dbf0534e6e5d7e6f3675dd60f3b", + "version-string": "2.2.1-1", + "port-version": 0 + }, + { + "git-tree": "d3c29dcababc7ac6776a6d9b32cf561004a9bb59", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "a8ceee817cce0ad2b7361818cfed6ff25dd2bbfa", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/imgui-sfml.json b/port_versions/i-/imgui-sfml.json new file mode 100644 index 00000000000000..8b186cb33f9248 --- /dev/null +++ b/port_versions/i-/imgui-sfml.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "3975d5a33116814ea022e63fc270fa440af46c66", + "version-string": "2.1-2", + "port-version": 0 + }, + { + "git-tree": "6ce7827cf5c4af285d1dbb6bf92ac15bdef1bafd", + "version-string": "2.1-1", + "port-version": 0 + }, + { + "git-tree": "509640541b1c9caaaa3b990b258a129175fdb57e", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "0c59cd60910fe695e3f050d4eacb6700abf5162a", + "version-string": "2.0.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/imgui.json b/port_versions/i-/imgui.json new file mode 100644 index 00000000000000..937717004f38ba --- /dev/null +++ b/port_versions/i-/imgui.json @@ -0,0 +1,174 @@ +{ + "versions": [ + { + "git-tree": "0fea0243629f67c771a4a6d9ce357ecc92021a7b", + "version-string": "1.79", + "port-version": 4 + }, + { + "git-tree": "d4c6640290ae387691c19c8dd1eb3614383caf2c", + "version-string": "1.79", + "port-version": 3 + }, + { + "git-tree": "41dae2be1e14e585515ab387a1092fb95ce7ce63", + "version-string": "1.79", + "port-version": 1 + }, + { + "git-tree": "efd7d264523a424147f80fb3e32866304b99afa0", + "version-string": "1.78", + "port-version": 3 + }, + { + "git-tree": "16b83faa248c2a361cd69bccb6c9191b9162432d", + "version-string": "1.78", + "port-version": 2 + }, + { + "git-tree": "705bdeba0a7e8970f6d26324b8d22139d2ce11de", + "version-string": "1.78", + "port-version": 1 + }, + { + "git-tree": "a3a036b98321cde29f02610fa777794b2d13410e", + "version-string": "1.77", + "port-version": 3 + }, + { + "git-tree": "ef65086ccbecee1e7eeb4364c3d22abc68f71174", + "version-string": "1.77", + "port-version": 2 + }, + { + "git-tree": "ef81242f039bf0ec5ec89803f073395fa033d631", + "version-string": "1.77", + "port-version": 1 + }, + { + "git-tree": "51c0afa3f72e6058b0b886d3e8474ac976ea0170", + "version-string": "1.77", + "port-version": 0 + }, + { + "git-tree": "1f855de57a014e9b204e62009fea7848444d717c", + "version-string": "1.76-2", + "port-version": 0 + }, + { + "git-tree": "ef8ed0214bf8f9d561bf0623ba2dffbe750e6d5f", + "version-string": "1.76-1", + "port-version": 0 + }, + { + "git-tree": "ccae8ffd4e9805736146282f0308062d7b590b88", + "version-string": "1.74-1", + "port-version": 0 + }, + { + "git-tree": "06692b1acd434245950474a2a82b8a82d5ee4197", + "version-string": "1.74", + "port-version": 0 + }, + { + "git-tree": "5bff82a6734735f84d228c8993d633905f7b3715", + "version-string": "1.73-1", + "port-version": 0 + }, + { + "git-tree": "48b3c37be1296377d95eee6e770c700de527af5c", + "version-string": "1.73", + "port-version": 0 + }, + { + "git-tree": "d3bdfac0aa03c3286e2980994470bf5b314f07c7", + "version-string": "1.72b", + "port-version": 0 + }, + { + "git-tree": "87a2b3ef91a95758d1a1115d0d332d28bf9f26cc", + "version-string": "1.70-1", + "port-version": 0 + }, + { + "git-tree": "909bffbc2f21eb85bc96c6249fac706ef9f74685", + "version-string": "1.70", + "port-version": 0 + }, + { + "git-tree": "c6620baccaa26c2158b37750b63990930151e520", + "version-string": "1.69-1", + "port-version": 0 + }, + { + "git-tree": "f4eea2402036c4933f7e4f91b2985bdf26fd74b0", + "version-string": "1.69", + "port-version": 0 + }, + { + "git-tree": "a1a1d39c5c8e2aa39cba640b1547b2abd88d9105", + "version-string": "1.68", + "port-version": 0 + }, + { + "git-tree": "6073a808ff4936b63c9fe7549e0fafbb5f62f1d5", + "version-string": "1.67-1", + "port-version": 0 + }, + { + "git-tree": "7184e2c2dc30b99e5277f125edf7144af704e5bc", + "version-string": "1.67", + "port-version": 0 + }, + { + "git-tree": "8f17ee8c230009750eabfae7c4b91a0dd07239b6", + "version-string": "1.66b", + "port-version": 0 + }, + { + "git-tree": "0238a176592faf88ec4adab09a9e2017f948f5fb", + "version-string": "1.66", + "port-version": 0 + }, + { + "git-tree": "42ba951bfb9aefe07acb86cf2aa0463a7fd4dc56", + "version-string": "1.65", + "port-version": 0 + }, + { + "git-tree": "e2c6f35b7ececd1821b862aafe895ba823b07914", + "version-string": "1.64", + "port-version": 0 + }, + { + "git-tree": "afe8e08338667fc57ddfd04f09bb062440ccb035", + "version-string": "1.62", + "port-version": 0 + }, + { + "git-tree": "8f476e68405fcf80ce09e1c8ffe5e916523f4098", + "version-string": "1.60", + "port-version": 0 + }, + { + "git-tree": "f88d0a04d71f7ea07a59ce2371c4dee8815864df", + "version-string": "1.53", + "port-version": 0 + }, + { + "git-tree": "0b6bbab540bd7cfa07cf345211ee4df9e368c5e8", + "version-string": "1.52", + "port-version": 0 + }, + { + "git-tree": "55f97d45ebddf3f17e53ebea7ed774325d402faa", + "version-string": "1.51-1", + "port-version": 0 + }, + { + "git-tree": "ee1971bd50d07c71a408836d9715028787b5bd6c", + "version-string": "1.51", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/immer.json b/port_versions/i-/immer.json new file mode 100644 index 00000000000000..5aa14d0562878b --- /dev/null +++ b/port_versions/i-/immer.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "515103042c70e0f9cf8d1518816d09fc6110a669", + "version-string": "2019-06-07", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/implot.json b/port_versions/i-/implot.json new file mode 100644 index 00000000000000..9cd1ab6bc3d38a --- /dev/null +++ b/port_versions/i-/implot.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "d44f8a4dda02f0d31c5dce6d5adca8e4caa504e1", + "version-string": "0.8", + "port-version": 0 + }, + { + "git-tree": "72cab3504da84ff79724003c0fa7d003aa0f26f8", + "version-string": "0.7", + "port-version": 0 + }, + { + "git-tree": "49d3f3c8598f518bbdee68c48bfc0ac68622740e", + "version-string": "0.4", + "port-version": 0 + }, + { + "git-tree": "66e3dd41d431cafa1c9647fd06e1f5227b2b8e2c", + "version-string": "0.3-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/indicators.json b/port_versions/i-/indicators.json new file mode 100644 index 00000000000000..6f33bb92cef0d6 --- /dev/null +++ b/port_versions/i-/indicators.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "85e30c7a947d0081282323d5d0b7daf9cfd561aa", + "version-string": "2020-10-30", + "port-version": 0 + }, + { + "git-tree": "5c7829f8387b34ab77996785c07c528e6de7e5c6", + "version-string": "1.7", + "port-version": 0 + }, + { + "git-tree": "75e34e449b187f73e9816e89e3c5bd8ebabefcd4", + "version-string": "1.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/infoware.json b/port_versions/i-/infoware.json new file mode 100644 index 00000000000000..0dec91127de661 --- /dev/null +++ b/port_versions/i-/infoware.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "5b7cda9f7b8eb929162ab979be0d2a6a01d37292", + "version-string": "0.5.5", + "port-version": 1 + }, + { + "git-tree": "ed2c00122823b77b0ef74a94031a6cacbb015ffb", + "version-string": "0.5.5", + "port-version": 0 + }, + { + "git-tree": "8bfd4af8d1a7f17e086f2e1a8c205f38b4c4b255", + "version-string": "0.5.4", + "port-version": 0 + }, + { + "git-tree": "263f7da8f2331a6e6891af54268f2f7bf0df9ca6", + "version-string": "0.5.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/inih.json b/port_versions/i-/inih.json new file mode 100644 index 00000000000000..8e72572d991600 --- /dev/null +++ b/port_versions/i-/inih.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "ca47d6341b0674f1473717bc8f6df7ce0922e8da", + "version-string": "51", + "port-version": 0 + }, + { + "git-tree": "4f1c00eb929f01703965877dc262cdaf967d2b35", + "version-string": "47", + "port-version": 0 + }, + { + "git-tree": "33d682392c4eb31eefa3d8788f1920509d0aa1aa", + "version-string": "45", + "port-version": 0 + }, + { + "git-tree": "90a92e5be19a788fcc7ce653e8caa0e22fdc7fb5", + "version-string": "44", + "port-version": 0 + }, + { + "git-tree": "e971c34f4334937d4382805ab24b6308c0b60495", + "version-string": "43", + "port-version": 0 + }, + { + "git-tree": "2225a5a48c72afbf0c5f8146691474aa121ff795", + "version-string": "42-1", + "port-version": 0 + }, + { + "git-tree": "7c1d8d5ec1ee664791e99ce714d946445e43aa38", + "version-string": "42", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/iniparser.json b/port_versions/i-/iniparser.json new file mode 100644 index 00000000000000..91e982caded816 --- /dev/null +++ b/port_versions/i-/iniparser.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "81d9ca94f32e83d70012e4627f27f54d123a0a0b", + "version-string": "2020-04-06", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/inja.json b/port_versions/i-/inja.json new file mode 100644 index 00000000000000..dad446925e5c11 --- /dev/null +++ b/port_versions/i-/inja.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "75912f4f1a231ef59ced49def181169f33b3b336", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "b80103ab74a87444ee0a060212d65df97155d8a5", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "388b764d358618d1feeec3d828d03ab0f8766600", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "3862efbee55c27b8c037cd7d39992e414264b726", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/intel-ipsec.json b/port_versions/i-/intel-ipsec.json new file mode 100644 index 00000000000000..0215cd171e518c --- /dev/null +++ b/port_versions/i-/intel-ipsec.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e6218e69e9ba8c71aecd1c41184edd4e0342120b", + "version-string": "0.52-1", + "port-version": 0 + }, + { + "git-tree": "aa4b531f331e2517c48232174a7264fba93aee40", + "version-string": "0.52", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/intel-mkl.json b/port_versions/i-/intel-mkl.json new file mode 100644 index 00000000000000..36b7db4f226abf --- /dev/null +++ b/port_versions/i-/intel-mkl.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "27543f95c3c01ee6993990c80b06217a1e2dd9fe", + "version-string": "2020.0.0", + "port-version": 0 + }, + { + "git-tree": "3ff310708feb35b18dba4afb080bceed4a8cacc6", + "version-string": "2018.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/intelrdfpmathlib.json b/port_versions/i-/intelrdfpmathlib.json new file mode 100644 index 00000000000000..22c4ba7dd70c07 --- /dev/null +++ b/port_versions/i-/intelrdfpmathlib.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "5e8cca9f7fc31ea5bce8603c546c4b5953e666e3", + "version-string": "20U2-1", + "port-version": 0 + }, + { + "git-tree": "3b433269a9ffcd198c649ea540ad09cd6d9143f1", + "version-string": "20U2", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/io2d.json b/port_versions/i-/io2d.json new file mode 100644 index 00000000000000..dd9370afdbb5b8 --- /dev/null +++ b/port_versions/i-/io2d.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "4e68bb018148f239aaccd4bfbc24f6a60c344cd6", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "91cc7821caf7005c8278881d50e2ac0db64c3572", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "852b25826fd9ea9a34309b6d7c1d1c2b3fc98cf2", + "version-string": "2019-07-11", + "port-version": 3 + }, + { + "git-tree": "2b471bdf3f3281940a8528068e765d70d07bf873", + "version-string": "2019-07-11-2", + "port-version": 0 + }, + { + "git-tree": "77c473223ab74f5af1cea5dfb949c08783985dc6", + "version-string": "2019-07-11-1", + "port-version": 0 + }, + { + "git-tree": "8ce3a9ee4d67a2fd565364929d2c5082f4441e5e", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "cb46a7b697570a239cf0efdce0877217f2597bd2", + "version-string": "0.1-2", + "port-version": 0 + }, + { + "git-tree": "678f38738365fbd37333ddc595306531af64c40e", + "version-string": "0.1-1", + "port-version": 0 + }, + { + "git-tree": "fc40cf0987580dc4e8f889b026d8b8000b45eb94", + "version-string": "0.1", + "port-version": 0 + }, + { + "git-tree": "647662b29982a3ce83ae028fcaf0704f58273fa3", + "version-string": "0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/irrlicht.json b/port_versions/i-/irrlicht.json new file mode 100644 index 00000000000000..a5fb44f207eb38 --- /dev/null +++ b/port_versions/i-/irrlicht.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "e2b2dd836e693401dab067c5064665e926a46b07", + "version-string": "1.8.4-10", + "port-version": 0 + }, + { + "git-tree": "214feb3c3310a1698e7e82607a275ce3e172d5e5", + "version-string": "1.8.4-8", + "port-version": 0 + }, + { + "git-tree": "36f2a0f205529376895d5165c8a60f817c414f59", + "version-string": "1.8.4-5", + "port-version": 0 + }, + { + "git-tree": "0bd5929ddb43fa2a977224ce6f514ba78fb1a9dd", + "version-string": "1.8.4-4", + "port-version": 0 + }, + { + "git-tree": "05b8bacdac66bca9f29e765c58dd145fd332a1cf", + "version-string": "1.8.4-3", + "port-version": 0 + }, + { + "git-tree": "0775696b834a2840bc5ec929d39d65ae594b97e4", + "version-string": "1.8.4-2", + "port-version": 0 + }, + { + "git-tree": "ebcdea29e03e637fc9ec3fc8dac045d8add222ad", + "version-string": "1.8.4-1", + "port-version": 0 + }, + { + "git-tree": "f84c9a919ea47d49acf582939c0a9ba8ac2938f9", + "version-string": "1.8.4-2", + "port-version": 0 + }, + { + "git-tree": "ebcdea29e03e637fc9ec3fc8dac045d8add222ad", + "version-string": "1.8.4-1", + "port-version": 0 + }, + { + "git-tree": "02461562e2716e368fddd855b65e60667790d3bb", + "version-string": "1.8.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/irrxml.json b/port_versions/i-/irrxml.json new file mode 100644 index 00000000000000..a5d182df852eca --- /dev/null +++ b/port_versions/i-/irrxml.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "3bce4522729dab80e9a91571a9b772ac05970974", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "548c76d57b56bcacb45677c91ea7d7fae291a153", + "version-string": "1.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/isal.json b/port_versions/i-/isal.json new file mode 100644 index 00000000000000..9423eac297e14c --- /dev/null +++ b/port_versions/i-/isal.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f9c47ffd781134319b28b1d671347fac65d5e1dc", + "version-string": "2.25.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ismrmrd.json b/port_versions/i-/ismrmrd.json new file mode 100644 index 00000000000000..3337b908bcfac3 --- /dev/null +++ b/port_versions/i-/ismrmrd.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "7cfae251706c88b4b3877e6af56df68bb24224a7", + "version-string": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "865bc5131b32b891d5935f3a89c555a741f55d1f", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "90c5328457a9cb1185c2d006e0d2b40346e60a31", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "d9b55ce6641a2a67226e2883734a397528af6bc6", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "5d01aef6016d43978ae1efa9d1d8c2d3f9f60934", + "version-string": "1.4", + "port-version": 0 + }, + { + "git-tree": "9c90d3f09c4742853e2b2f955dc50bc5bde6e033", + "version-string": "1.3.2-4", + "port-version": 0 + }, + { + "git-tree": "e31343f4e14583e026ca45c0ac19027dc726ebdf", + "version-string": "1.3.2-3", + "port-version": 0 + }, + { + "git-tree": "dfe1b6af0cbfa6117a02cc1c02f45642c1bb0094", + "version-string": "1.3.2-2", + "port-version": 0 + }, + { + "git-tree": "fba58156c09047674fdb6ca717468e8d220604e9", + "version-string": "1.3.2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/itk.json b/port_versions/i-/itk.json new file mode 100644 index 00000000000000..b6d62dd1f38ef8 --- /dev/null +++ b/port_versions/i-/itk.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "58ababb668655a11289755a8069265656a2758f4", + "version-string": "5.1.0", + "port-version": 5 + }, + { + "git-tree": "4b551e8e3eb90bd91b1ef4c8a3d7752cd68c0668", + "version-string": "5.1.0", + "port-version": 4 + }, + { + "git-tree": "a4aea76049da93ddba68eda5ccd7c2094e4264af", + "version-string": "5.1.0", + "port-version": 3 + }, + { + "git-tree": "c268e0c8812635eeb8df59808b778638292f4539", + "version-string": "5.1.0", + "port-version": 2 + }, + { + "git-tree": "7d490c687984dde84fa205416aebfd0e31564a3b", + "version-string": "5.1.0", + "port-version": 1 + }, + { + "git-tree": "0dd87e9848ef56e8569d3ef7dd7a3f4a9de85073", + "version-string": "5.1.0", + "port-version": 0 + }, + { + "git-tree": "cc6dba1e1b011c907201d3c3b01d783c178e32a3", + "version-string": "5.0.1-2", + "port-version": 0 + }, + { + "git-tree": "ccabd07264313f234ce86a6f300a0e7ac1564fa3", + "version-string": "5.0.1-1", + "port-version": 0 + }, + { + "git-tree": "0fdc3e414c5cc8e0e79220feccb35fd14fdb75be", + "version-string": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "2b6b243eed0257c1fb08e1318e427e888860e57e", + "version-string": "5.0.0-3", + "port-version": 0 + }, + { + "git-tree": "0d7fba0a8bb65a7d3f90004d26ac3220350fdaef", + "version-string": "5.0.0-2", + "port-version": 0 + }, + { + "git-tree": "7a5d963e4ead61b7a4b5d7e1d577a516748b98f8", + "version-string": "5.0.0-1", + "port-version": 0 + }, + { + "git-tree": "20be76f9d18a952ddfb4c7ceb8c1092803760335", + "version-string": "4.13.0-906736bd-3", + "port-version": 0 + }, + { + "git-tree": "2ee62fb16093a1481636bff86ee4ca1dfaab7a44", + "version-string": "4.13.0-906736bd-2", + "port-version": 0 + }, + { + "git-tree": "e0522272fa57beab857fd57b3731c97f9dc52b6d", + "version-string": "4.13.0-906736bd-1", + "port-version": 0 + }, + { + "git-tree": "1bbabee8abf1981726361ec948654719ce07c27f", + "version-string": "4.13.0-906736bd", + "port-version": 0 + }, + { + "git-tree": "217acc2e7cc7e2d7b363c033f260eefd958d00af", + "version-string": "4.13.0-2", + "port-version": 0 + }, + { + "git-tree": "46404bb7990cf052e93c320769340b4466eec9e9", + "version-string": "4.13.0-1", + "port-version": 0 + }, + { + "git-tree": "a04487ae400cb649609416dcef79ffd1c20aa36e", + "version-string": "4.13.0", + "port-version": 0 + }, + { + "git-tree": "ea15dcd3120e3b85f9677fd5ca9438ef8744b187", + "version-string": "4.11.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/itpp.json b/port_versions/i-/itpp.json new file mode 100644 index 00000000000000..d016af1d127f7c --- /dev/null +++ b/port_versions/i-/itpp.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "9a79efa802d935151cca213146c0a7102ca76940", + "version-string": "4.3.1-5", + "port-version": 0 + }, + { + "git-tree": "11ec45e6f2f25e8723a0d788d0b06c27a5c16989", + "version-string": "4.3.1-3", + "port-version": 0 + }, + { + "git-tree": "3902e0b597340ec836cc90bbc08df1eac5b62a6a", + "version-string": "4.3.1-2", + "port-version": 0 + }, + { + "git-tree": "7ff2f80a167386456bc2a5bec3ecf2a344c0fb76", + "version-string": "4.3.1-1", + "port-version": 0 + }, + { + "git-tree": "2e3ee167bd02ce3fee3e909393c9c5eabe060f06", + "version-string": "4.3.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/i-/ixwebsocket.json b/port_versions/i-/ixwebsocket.json new file mode 100644 index 00000000000000..07965b87f6b496 --- /dev/null +++ b/port_versions/i-/ixwebsocket.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "582194408bcd77d15880e2f7e7c1658c0c91310d", + "version-string": "11.0.4", + "port-version": 0 + }, + { + "git-tree": "4b25c213cbcb5f8cb7ef17ba70ac49a1a6de9a72", + "version-string": "9.6.2", + "port-version": 0 + }, + { + "git-tree": "125417e190c512c7e02b4820f3d50480770ebd4c", + "version-string": "9.1.9", + "port-version": 0 + }, + { + "git-tree": "7009199428ab10c20efc7f8b832331b1a0c8e747", + "version-string": "8.0.5", + "port-version": 0 + }, + { + "git-tree": "cf046aab784dfa34ca32fc11ab83a22d864f19a9", + "version-string": "7.9.2", + "port-version": 0 + }, + { + "git-tree": "ab69a198c1dad40bd979fe5db963525e17c70669", + "version-string": "7.4.0", + "port-version": 0 + }, + { + "git-tree": "234ca13a12b0f657cc2c7e57a40ee360c499eb84", + "version-string": "6.1.0", + "port-version": 0 + }, + { + "git-tree": "e3cd56a6479567b8deb12dc447cb6bb56f655bba", + "version-string": "5.0.4", + "port-version": 0 + }, + { + "git-tree": "8c8f4e328828a8c78a19081dd40afa57c9b5c566", + "version-string": "4.0.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/jack2.json b/port_versions/j-/jack2.json new file mode 100644 index 00000000000000..9be1fdd14b0f62 --- /dev/null +++ b/port_versions/j-/jack2.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a97592cbcb8260d6cae738bf5542f5895195c91b", + "version-string": "1.9.14", + "port-version": 0 + }, + { + "git-tree": "58530de1da4318e0265e6cc6fc8a422b7d981fee", + "version-string": "1.9.12-2", + "port-version": 0 + }, + { + "git-tree": "8124759e6e0d48f443809538774bba0adfdbfa2d", + "version-string": "1.9.12-1", + "port-version": 0 + }, + { + "git-tree": "b41c90b65c7f99bcc2b2a7aea29f98f596d8eaac", + "version-string": "1.9.12", + "port-version": 0 + }, + { + "git-tree": "f3c04cf56cfbecd5862a14f3f0dfcda1db8628f7", + "version-string": "1.9.12.2", + "port-version": 0 + }, + { + "git-tree": "cfe84a700280cc1e35c16bcf3b1a847871fac25b", + "version-string": "1.9.12.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/jaeger-client-cpp.json b/port_versions/j-/jaeger-client-cpp.json new file mode 100644 index 00000000000000..d392c766ba4981 --- /dev/null +++ b/port_versions/j-/jaeger-client-cpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "66b3f5f6f74acba54c8ab222118d0ae91a726299", + "version-string": "0.5.1-1", + "port-version": 0 + }, + { + "git-tree": "0aaed008f2209dcf4dd6b3d1f44d30320e5f4e41", + "version-string": "0.5.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/jansson.json b/port_versions/j-/jansson.json new file mode 100644 index 00000000000000..e35a31c1227a43 --- /dev/null +++ b/port_versions/j-/jansson.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "73e4996b95f57b891a1c4a85cd579297a55ac148", + "version-string": "2.13.1", + "port-version": 0 + }, + { + "git-tree": "b9abe1e8d0e3ba2909d4f38ad609efc2788aa44b", + "version-string": "2.12-1", + "port-version": 0 + }, + { + "git-tree": "2e471e8a19dcebef0b4b509d0544b6adc1492cea", + "version-string": "2.12", + "port-version": 0 + }, + { + "git-tree": "716161fc094b6f664ac4e6bb32f6618c205268ec", + "version-string": "2.11-2", + "port-version": 0 + }, + { + "git-tree": "5fa6027a192e9e5d9b2caf2f1a120591d00e0b51", + "version-string": "2.11", + "port-version": 0 + }, + { + "git-tree": "0c2aef0c66564e632b25d756b066d07103bd5e32", + "version-string": "2.10-1", + "port-version": 0 + }, + { + "git-tree": "81a840970f4c7ee50becc01b7a2f582394e5123c", + "version-string": "v2.10-1", + "port-version": 0 + }, + { + "git-tree": "a8ce624d53c0457c809d5c9d77628daacf55ebc7", + "version-string": "v2.10", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/jasper.json b/port_versions/j-/jasper.json new file mode 100644 index 00000000000000..e762ab046c532e --- /dev/null +++ b/port_versions/j-/jasper.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "042e508623cae7cb25924aff2544acf360aa9862", + "version-string": "2.0.20", + "port-version": 0 + }, + { + "git-tree": "53b10ecaa80fe182a41050e74c566a6c6b5aefba", + "version-string": "2.0.16-3", + "port-version": 0 + }, + { + "git-tree": "99e15f5937aaebd24a386d3aba62a7988d00d789", + "version-string": "2.0.16-2", + "port-version": 0 + }, + { + "git-tree": "5828058f77a0213d445c25c7f48ff0b75a612675", + "version-string": "2.0.16-1", + "port-version": 0 + }, + { + "git-tree": "7be0370602c65bf60119a0cfa2c50784679b3e07", + "version-string": "2.0.16", + "port-version": 0 + }, + { + "git-tree": "fe821bd8499cca24169a20ff586485bc1d487a5c", + "version-string": "2.0.14-1", + "port-version": 0 + }, + { + "git-tree": "4a18f214f5a8cbf718745a57a09da5b04a725918", + "version-string": "2.0.13-1", + "port-version": 0 + }, + { + "git-tree": "65939e1191cc0cbef59d94e15b7bdfaf9db20d10", + "version-string": "2.0.13", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/jbig2dec.json b/port_versions/j-/jbig2dec.json new file mode 100644 index 00000000000000..95ec9bf7adb4c7 --- /dev/null +++ b/port_versions/j-/jbig2dec.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "055013875225acf1e33c26a6c127f5d89ccb0583", + "version-string": "0.19", + "port-version": 0 + }, + { + "git-tree": "1fb2623dc417a1c907cb43de0f226f5c8314595a", + "version-string": "0.17", + "port-version": 0 + }, + { + "git-tree": "afbda476255a8de7705f284e1539fbee63c20d71", + "version-string": "0.16-1", + "port-version": 0 + }, + { + "git-tree": "3989bb1cf3350ec7f06fb55e056124809f48d17e", + "version-string": "0.16", + "port-version": 0 + }, + { + "git-tree": "5283bf24807d465b455cf2629e8fa5eac7e39c96", + "version-string": "0.13", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/jbigkit.json b/port_versions/j-/jbigkit.json new file mode 100644 index 00000000000000..0df8d2e26889d5 --- /dev/null +++ b/port_versions/j-/jbigkit.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "540956fe79520b0ffd46dea73e33d1dfe12da22a", + "version-string": "2.1-4", + "port-version": 0 + }, + { + "git-tree": "da3de318445901bae43c0997dbeb64657fbff3ed", + "version-string": "2.1-3", + "port-version": 0 + }, + { + "git-tree": "7adb6a445ffd72a81d43b0e8feb4cad44d25c964", + "version-string": "2.1-2", + "port-version": 0 + }, + { + "git-tree": "f42860e0b08002012bc6452f505457713062cef6", + "version-string": "2.1-1", + "port-version": 0 + }, + { + "git-tree": "828dbab825dafcb193e08b05cd1276e6a936b832", + "version-string": "2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/jemalloc.json b/port_versions/j-/jemalloc.json new file mode 100644 index 00000000000000..8379bf58d7dd0f --- /dev/null +++ b/port_versions/j-/jemalloc.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "4c72c8aa2b715c813c70850c504385afa6566fb1", + "version-string": "4.3.1-4", + "port-version": 0 + }, + { + "git-tree": "6ca1bb571746cc86c33cb8c6e12d1ecb1cd61519", + "version-string": "4.3.1-3", + "port-version": 0 + }, + { + "git-tree": "29287e22870cc0a7d1de3f0e48a447142de2e69b", + "version-string": "4.3.1-2", + "port-version": 0 + }, + { + "git-tree": "c891201e16769ffb710da9a9451fe1a43932d361", + "version-string": "4.3.1-1", + "port-version": 0 + }, + { + "git-tree": "8a438060232d3745e251174691a68771ba52b7cb", + "version-string": "4.3.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/jinja2cpplight.json b/port_versions/j-/jinja2cpplight.json new file mode 100644 index 00000000000000..cbbb2f3fb24ca9 --- /dev/null +++ b/port_versions/j-/jinja2cpplight.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4db482fab578e61193f3a03e4acc4086b23ae550", + "version-string": "2018-05-08", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/josuttis-jthread.json b/port_versions/j-/josuttis-jthread.json new file mode 100644 index 00000000000000..565cfdf526c618 --- /dev/null +++ b/port_versions/j-/josuttis-jthread.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "f262637ae76fc0ab9c01f475af0b7a87e552a512", + "version-string": "2020-07-21", + "port-version": 1 + }, + { + "git-tree": "17d080ed1a3c86adb3a7d75d4a42543bbc170ce5", + "version-string": "2020-07-21", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/jsmn.json b/port_versions/j-/jsmn.json new file mode 100644 index 00000000000000..1e62f26d8f1d1b --- /dev/null +++ b/port_versions/j-/jsmn.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3de21d0cde92d319d3f0638abed14af414a57cfe", + "version-string": "2019-04-27", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/json-c.json b/port_versions/j-/json-c.json new file mode 100644 index 00000000000000..1d09e5ff62da5c --- /dev/null +++ b/port_versions/j-/json-c.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "46d6f0302fe2ee6649ade0a8ef9a17a88226bc73", + "version-string": "2019-09-10", + "port-version": 1 + }, + { + "git-tree": "e3fbc03becb35cdc7f395d7525774a86e513d2ba", + "version-string": "2019-09-10", + "port-version": 0 + }, + { + "git-tree": "49ce4ed91d7d04f68582447f35b016e107c2772b", + "version-string": "2019-05-31", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/json-dto.json b/port_versions/j-/json-dto.json new file mode 100644 index 00000000000000..229b89c263f3a9 --- /dev/null +++ b/port_versions/j-/json-dto.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "752a985f24b4f8cdf068838ae1b791ea46ab7add", + "version-string": "0.2.11", + "port-version": 0 + }, + { + "git-tree": "0c24513fd9141f8cdff91adeaf1227a5de222229", + "version-string": "0.2.10", + "port-version": 0 + }, + { + "git-tree": "c73ab40f6430852ab78a07c559fb63b76a26d631", + "version-string": "0.2.9.2", + "port-version": 0 + }, + { + "git-tree": "3e7a07ec38a1d71c429e8503ffbf8bac3cfc1691", + "version-string": "0.2.9.1", + "port-version": 0 + }, + { + "git-tree": "531c3a1ef0c63e2754b66547c238fa19f6d3c030", + "version-string": "0.2.9", + "port-version": 0 + }, + { + "git-tree": "7d1ae2cb6d4dbbbdbb6c79bd98967016bbafd7da", + "version-string": "0.2.8-2", + "port-version": 0 + }, + { + "git-tree": "921ec8586dde43aa999e6022eed308266be368ac", + "version-string": "0.2.8", + "port-version": 0 + }, + { + "git-tree": "a3abc3267fed9b3eafe470e146f9ef3cb9196d81", + "version-string": "0.2.6", + "port-version": 0 + }, + { + "git-tree": "7a71ce0f2a7333f2d10da7b00067f7fd208a8762", + "version-string": "0.2.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/json-schema-validator.json b/port_versions/j-/json-schema-validator.json new file mode 100644 index 00000000000000..1b6520be1eefbb --- /dev/null +++ b/port_versions/j-/json-schema-validator.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c29f43fd54762287049c24e4e38cd89a26a1a26a", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/json-spirit.json b/port_versions/j-/json-spirit.json new file mode 100644 index 00000000000000..0460b9a9380342 --- /dev/null +++ b/port_versions/j-/json-spirit.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ab05cd4ea6726e65c8a2ab5a4c882d9e4f166418", + "version-string": "4.1.0-1", + "port-version": 0 + }, + { + "git-tree": "75c6a4525695966d71d372ed2dbd7cb1ae46b292", + "version-string": "4.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/json11.json b/port_versions/j-/json11.json new file mode 100644 index 00000000000000..4fc5c0bcbe2657 --- /dev/null +++ b/port_versions/j-/json11.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "0acd544fac745b898132e7beda2ede37b0a7d9d4", + "version-string": "2017-06-20-2", + "port-version": 0 + }, + { + "git-tree": "ece654bec0773a219162156344ca958b06e07bfa", + "version-string": "2017-06-20-1", + "port-version": 0 + }, + { + "git-tree": "cdbd42bb5745e3255b5c365b244e8b4b837bf60c", + "version-string": "2017-06-20", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/json5-parser.json b/port_versions/j-/json5-parser.json new file mode 100644 index 00000000000000..4beced40c2a5a1 --- /dev/null +++ b/port_versions/j-/json5-parser.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a08cd167ddae3c10119b6b513accf0a2fa9d76fa", + "version-string": "1.0.0", + "port-version": 2 + }, + { + "git-tree": "264a4d2a02277ed9bc306bd01abdce3a66d46b63", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d5f6bbbb7546fa2ca8e4d49ccaaaebd456bb0ecf", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/jsoncons.json b/port_versions/j-/jsoncons.json new file mode 100644 index 00000000000000..493936153503f8 --- /dev/null +++ b/port_versions/j-/jsoncons.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "7f782b51f060fe22475a5bb2ae25f91c3ef3f75a", + "version-string": "0.159.0", + "port-version": 0 + }, + { + "git-tree": "61349080fc3b6536083c4a55abcea25996157de3", + "version-string": "0.158.0", + "port-version": 0 + }, + { + "git-tree": "4084ba98deaa8a16272631915675fffbfaa209a8", + "version-string": "0.156.1", + "port-version": 0 + }, + { + "git-tree": "0b16876fd822304fa6aeaeb10b9002625ebf9b95", + "version-string": "0.155.1", + "port-version": 0 + }, + { + "git-tree": "902fbb6c0ceb1c31063507b87624e87167868cb6", + "version-string": "0.154.1", + "port-version": 0 + }, + { + "git-tree": "218c55d3f597cfc8faa60540270f3ea28b054472", + "version-string": "0.153.3", + "port-version": 0 + }, + { + "git-tree": "d7f0f80e6bf95df365deee0c5a7ea89abb61e9b2", + "version-string": "0.153.0", + "port-version": 0 + }, + { + "git-tree": "9f2f4e422039f7b3a3c8d5e56bf1cd1a9736a68a", + "version-string": "0.152.0", + "port-version": 0 + }, + { + "git-tree": "9f7ca282cd4cdf909c751dab5160b2dcd536299b", + "version-string": "0.151.0", + "port-version": 0 + }, + { + "git-tree": "e3e4d5a2e76f2acc6fdacf4b25568febdd747e0a", + "version-string": "0.150.0", + "port-version": 0 + }, + { + "git-tree": "a04adc9c55667427e32959be4a9d85f30a1d88c0", + "version-string": "0.149.0", + "port-version": 0 + }, + { + "git-tree": "b6cfa19a1ef608296cfdd98c98ff6afd2964deec", + "version-string": "0.148.0", + "port-version": 0 + }, + { + "git-tree": "e8f2f18e26a2133c627efd865b4e32ca9ef922da", + "version-string": "0.147.0", + "port-version": 0 + }, + { + "git-tree": "4997e73eafeb89ff4fafa29aae3b6a876e8393b4", + "version-string": "0.146.0", + "port-version": 0 + }, + { + "git-tree": "1c6a339ba502876ec4ee5e1f7403754d02b71f24", + "version-string": "0.144.0", + "port-version": 0 + }, + { + "git-tree": "638f198bed7182af4e744f2c4c090dd60f633853", + "version-string": "0.143.1", + "port-version": 0 + }, + { + "git-tree": "cc47387d635f6aaa174f4b7354a00642b39bd220", + "version-string": "0.140.0", + "port-version": 0 + }, + { + "git-tree": "d54ed303bc59f1032bf792e64cf0a7b641235e3d", + "version-string": "0.139.0", + "port-version": 0 + }, + { + "git-tree": "1e754a8122919350e0a9ca6f7106b047717e9b26", + "version-string": "0.136.1", + "port-version": 0 + }, + { + "git-tree": "ab4b42bf03d82d2fc730609e8160fa3cdd81fc74", + "version-string": "0.136.0", + "port-version": 0 + }, + { + "git-tree": "adeadb0581861985f15974378cf2120403fd8b47", + "version-string": "0.135.0", + "port-version": 0 + }, + { + "git-tree": "68ba70f62abec012d9133ff6b912dc4b2e76c53e", + "version-string": "0.134.0", + "port-version": 0 + }, + { + "git-tree": "cd20252f653bef48bb207431c70d9e6bca3cd9c0", + "version-string": "0.133.0", + "port-version": 0 + }, + { + "git-tree": "9f203ebb05b5fad08db586d93bf036777732063f", + "version-string": "0.132.1", + "port-version": 0 + }, + { + "git-tree": "312bda521fb06202e8c87bf1917f9b3f488e66cb", + "version-string": "0.131.2", + "port-version": 0 + }, + { + "git-tree": "79a92c2c2de09c30e3beb8b8295f1054849f3084", + "version-string": "0.125.0", + "port-version": 0 + }, + { + "git-tree": "f0ece43d031668e227755270f20ac64593e47af0", + "version-string": "v0.122.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/jsoncpp.json b/port_versions/j-/jsoncpp.json new file mode 100644 index 00000000000000..bc8b583c8fb570 --- /dev/null +++ b/port_versions/j-/jsoncpp.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "cb9fceddf47584c7fda24180c7fd87f5e83728a5", + "version-string": "1.9.4", + "port-version": 0 + }, + { + "git-tree": "0e04cc7a3ef97b0742831a1a07563f7662ffcf25", + "version-string": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "25ee221b5b782b89f82cf6b086a8d97821b68e21", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "6a441d5ff8a74682e52f59195c06b6f03a376fe8", + "version-string": "1.8.4-1", + "port-version": 0 + }, + { + "git-tree": "a3b0ef3cca8658c25638bb9eee41f59aace59c88", + "version-string": "1.8.4", + "port-version": 0 + }, + { + "git-tree": "71306c999a0b6fa75ecb0820f52ed6d50ec19cc6", + "version-string": "1.8.1-1", + "port-version": 0 + }, + { + "git-tree": "fb4b687be0b74b621e391f032e5d99fb04afa5dd", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "bef856e09751276ae210d99c248f9921f05b9c1b", + "version-string": "1.7.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/jsonnet.json b/port_versions/j-/jsonnet.json new file mode 100644 index 00000000000000..6af3ca65d649db --- /dev/null +++ b/port_versions/j-/jsonnet.json @@ -0,0 +1,149 @@ +{ + "versions": [ + { + "git-tree": "77e5fa13bd74db46bf2626d82e8b9f88805031b6", + "version-string": "0.16.0", + "port-version": 1 + }, + { + "git-tree": "4f3219678c412acbe3376a7b5c2f28b1dc258210", + "version-string": "0.16.0", + "port-version": 0 + }, + { + "git-tree": "9669063137a04a4d00597575306ccdcde3ef6266", + "version-string": "0.14.0-1", + "port-version": 0 + }, + { + "git-tree": "2992efa68b3f006c6ccd285568cdde6b3e35c491", + "version-string": "0.14.0", + "port-version": 0 + }, + { + "git-tree": "299db58d6da42d0da987860a3bb15bd58043539b", + "version-string": "0.13.0", + "port-version": 0 + }, + { + "git-tree": "19e7201afa3f874bcf1c630ec845ead556aa36a5", + "version-string": "2019-05-08-1", + "port-version": 0 + }, + { + "git-tree": "62bee9189be490390c427c986886ecfaa0386072", + "version-string": "2019-05-08", + "port-version": 0 + }, + { + "git-tree": "0791d0b850c7198468d78c71715e7726863c130c", + "version-string": "2018-11-01-3", + "port-version": 0 + }, + { + "git-tree": "4ca49920377bfcffccc5a8a428db2ba858a4d98a", + "version-string": "2018-11-01-2", + "port-version": 0 + }, + { + "git-tree": "975a0a4a693ebcd589541ecd0f3ffcd1a54085ca", + "version-string": "2018-11-01-1", + "port-version": 0 + }, + { + "git-tree": "61641c09ebb1623cf3736bbf76a32bca22c2b15f", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "6959ee2a0877f1e53465be144b744a6c5767dddd", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "56ca54558ad1826c098e261540d074bc5cfe73db", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "fe27de2e267cc01ed27d3afc8ee0232282f17924", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "0c274c8e83b59ec4018d95d8e3343f71e982e133", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "ff96b573ac990461876231131013e4d471f470c1", + "version-string": "2018-06-28", + "port-version": 0 + }, + { + "git-tree": "9f4924251ebbbc0c4c4aa72fb9f359273fc856c5", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "9b6a1381b2e987c67acf8f1c28aa8ca1bb4ebc34", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "991a041db383f56b97a4fd1e0e88a7d0254ada00", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "7321b56b12d95b3102e40b8bdb534f2fc1333db5", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "5f22d8e1d8d092de191fb376ef4910a944687990", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "da09f85ffbb9c50b2f91a79b6ba910f7e9056b4b", + "version-string": "2018-04-17", + "port-version": 0 + }, + { + "git-tree": "dcf6d631727ee785d8fa39f8237fc6b2b7d99a65", + "version-string": "2018-04-09", + "port-version": 0 + }, + { + "git-tree": "79a05b2b80c2185d90d869e3a16d3373cdcd7518", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "0e7f32e7cf3d72cd5a1d604f37c17c302335d54c", + "version-string": "2018-03-11", + "port-version": 0 + }, + { + "git-tree": "b629796a43cae85b0089324dd6954884304b4c21", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "a7a40fd67aaf72098725b8fdd4678146ac35c3ff", + "version-string": "2018-03-02", + "port-version": 0 + }, + { + "git-tree": "8337ff5d69a1c124d9d5156423e9fa2c91d19fcc", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "79a0019c87befe39c75f827c7c1152dee0de8d95", + "version-string": "2017-09-02-11cf9fa9f2fe8acbb14b096316006082564ca580", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/jwt-cpp.json b/port_versions/j-/jwt-cpp.json new file mode 100644 index 00000000000000..7289529f03f994 --- /dev/null +++ b/port_versions/j-/jwt-cpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "1e179b3f53863faa8b91a74f95cdc1c7526de2c7", + "version-string": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "75d16c5d691b192edc15c8782d3aa593a718d0c7", + "version-string": "2019-05-07-1", + "port-version": 0 + }, + { + "git-tree": "f7e3636cdd3bad87812e22b4535378c47d6dd698", + "version-string": "2019-05-07", + "port-version": 0 + } + ] +} diff --git a/port_versions/j-/jxrlib.json b/port_versions/j-/jxrlib.json new file mode 100644 index 00000000000000..4fb240ac25ae11 --- /dev/null +++ b/port_versions/j-/jxrlib.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "c24ffcc58c1c28bef405da5b56adad3a25cd441b", + "version-string": "2019.10.9", + "port-version": 2 + }, + { + "git-tree": "50c0a8d9c0ca1df6f7b707f9768bb8d26f1f8486", + "version-string": "2019.10.9-1", + "port-version": 0 + }, + { + "git-tree": "5e43604d8d9fa767e6399c00a7e7ed6e44c02b08", + "version-string": "2019.10.9", + "port-version": 0 + }, + { + "git-tree": "f50863dde2b83c89c893d98e60c388686adac061", + "version-string": "1.1-9", + "port-version": 0 + }, + { + "git-tree": "999cfe6f1c48f0c91f3af714b2c8731e662082fc", + "version-string": "1.1-8", + "port-version": 0 + }, + { + "git-tree": "b6213106728930775efb4d95fe5257c7d5a8f610", + "version-string": "1.1-7", + "port-version": 0 + }, + { + "git-tree": "f52996801e316a3b10cda7831dc081875dfd8802", + "version-string": "1.1-6", + "port-version": 0 + }, + { + "git-tree": "1816f01e0d8c0158cc575e4669b0b66683b420d0", + "version-string": "1.1-5", + "port-version": 0 + }, + { + "git-tree": "d1989568047a5c83db8769bf3848573b4fe92110", + "version-string": "1.1-4", + "port-version": 0 + }, + { + "git-tree": "22d23c08d6f9bba42cc32ea4d89e75c92d90625f", + "version-string": "1.1-3", + "port-version": 0 + }, + { + "git-tree": "ef771a30053c391dc9f468c233a08a9033c1a602", + "version-string": "1.1-2", + "port-version": 0 + }, + { + "git-tree": "c9d1bb84be8e1f6e53512c5c7e890641d22c10ee", + "version-string": "1.1-1", + "port-version": 0 + }, + { + "git-tree": "7df328498c2cd3166876bd8a73c627dc661f5e61", + "version-string": "1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kangaru.json b/port_versions/k-/kangaru.json new file mode 100644 index 00000000000000..053137de6757ac --- /dev/null +++ b/port_versions/k-/kangaru.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "0e379bfb3b7cff7b0702b1118f491397482e2544", + "version-string": "4.2.4", + "port-version": 0 + }, + { + "git-tree": "b6ba61a14ae679db5a0893855b7e80943e9e830d", + "version-string": "4.2.2", + "port-version": 0 + }, + { + "git-tree": "de81d0dc9a47d91d4e05841bd546a06d842ae2d5", + "version-string": "4.2.1", + "port-version": 0 + }, + { + "git-tree": "b86565c1e29920c2dc052bb71e2741165a15ddf4", + "version-string": "4.2.0", + "port-version": 0 + }, + { + "git-tree": "6293545a37fc8620185501a916a1fe744ce7de98", + "version-string": "4.1.3-2", + "port-version": 0 + }, + { + "git-tree": "00872c56152ae294e01b90874f2dff2a07290ad5", + "version-string": "4.1.3-1", + "port-version": 0 + }, + { + "git-tree": "1564b514470d474c56e469924cfc57169a4ca410", + "version-string": "4.1.3", + "port-version": 0 + }, + { + "git-tree": "52ec5fd90ed7acde608ba47c1d1e05a5d19b5c91", + "version-string": "4.1.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kcp.json b/port_versions/k-/kcp.json new file mode 100644 index 00000000000000..61445dee42a7a0 --- /dev/null +++ b/port_versions/k-/kcp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1755ecb14823ef655bd41fa576baebe8ba531d7f", + "version-string": "2019-09-20", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kd-soap.json b/port_versions/k-/kd-soap.json new file mode 100644 index 00000000000000..c1777ebaf1b0c9 --- /dev/null +++ b/port_versions/k-/kd-soap.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "c5e3acfc0e624bb672da3ff5681dd2612f676d1e", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "1cff130029961c385d08ce6d783b2c2aa616d65f", + "version-string": "1.8.0-2", + "port-version": 0 + }, + { + "git-tree": "44c2b9403d6761d9d24f699288850f345f8c7d51", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "066767d539d3db3147f02673a20733e3b3f42845", + "version-string": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "2d5079e62a1fe1bd8d1ec1116aad6472ae0f1058", + "version-string": "1.7.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kealib.json b/port_versions/k-/kealib.json new file mode 100644 index 00000000000000..82206c3c28c443 --- /dev/null +++ b/port_versions/k-/kealib.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "cc06088dbd4f6a3bce64af1b452b5ef2543f5b76", + "version-string": "1.4.11-3", + "port-version": 0 + }, + { + "git-tree": "aaacc98bbdefd2f709d65e4d87270cc2dacf283f", + "version-string": "1.4.11-2", + "port-version": 0 + }, + { + "git-tree": "c6d9f2cbbeb950bdac993fa9e949e236add6fb96", + "version-string": "1.4.11-1", + "port-version": 0 + }, + { + "git-tree": "11506cc9b56ac74746bb6fb945e029691be4c764", + "version-string": "1.4.11", + "port-version": 0 + }, + { + "git-tree": "2905dbf3c66f381953c34b33f92f6301154b0798", + "version-string": "1.4.7-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kenlm.json b/port_versions/k-/kenlm.json new file mode 100644 index 00000000000000..0ad8159aedcb26 --- /dev/null +++ b/port_versions/k-/kenlm.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "5fd24bb27699940f72b94a9c3cf3e77a7d645a76", + "version-string": "20200924", + "port-version": 1 + }, + { + "git-tree": "a32a36b9ae670a8b20449ec2ef9283a6fbcf1a5e", + "version-string": "20200924", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/keystone.json b/port_versions/k-/keystone.json new file mode 100644 index 00000000000000..c8918172178fed --- /dev/null +++ b/port_versions/k-/keystone.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "779d3f65bc01be0cfb50208ec50673612154023f", + "version-string": "0.9.2", + "port-version": 0 + }, + { + "git-tree": "bcc14eff2ff2ee0af4d67ed7622a3d3464512f02", + "version-string": "0.9.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kf5archive.json b/port_versions/k-/kf5archive.json new file mode 100644 index 00000000000000..4796c25011ff75 --- /dev/null +++ b/port_versions/k-/kf5archive.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "98bfda14e12e6f5468957c379b06fc2cb931ca64", + "version-string": "5.74.0", + "port-version": 1 + }, + { + "git-tree": "1a8119b36b8a6f931e840445dee55d158c28bf78", + "version-string": "5.74.0", + "port-version": 0 + }, + { + "git-tree": "ce1a9d2f4fd9dd301b6c32bb05762ece4c972621", + "version-string": "5.64.0-1", + "port-version": 0 + }, + { + "git-tree": "95fc17e33fea7bd1720697aef5a453b2caa752d1", + "version-string": "5.64.0", + "port-version": 0 + }, + { + "git-tree": "be8352a74c00581ba59413523bf8407cc85200b0", + "version-string": "5.58.0", + "port-version": 0 + }, + { + "git-tree": "436ba1ace19997c9167e67a95c88e7d28d5fdeb6", + "version-string": "5.50.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kf5completion.json b/port_versions/k-/kf5completion.json new file mode 100644 index 00000000000000..e07a670d795f3e --- /dev/null +++ b/port_versions/k-/kf5completion.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "696b8fc5814324c18e01201d06f72cacb983f858", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kf5config.json b/port_versions/k-/kf5config.json new file mode 100644 index 00000000000000..f9354ba1e0c6ac --- /dev/null +++ b/port_versions/k-/kf5config.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b6f37e63a4ee87b5b6de7224072e410f8c93258b", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kf5coreaddons.json b/port_versions/k-/kf5coreaddons.json new file mode 100644 index 00000000000000..d6330016f7cd1d --- /dev/null +++ b/port_versions/k-/kf5coreaddons.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2f1927fb52301082ec65eb107a7605e8edec49d2", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kf5crash.json b/port_versions/k-/kf5crash.json new file mode 100644 index 00000000000000..631e5cbd050d02 --- /dev/null +++ b/port_versions/k-/kf5crash.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b21008fd070821fe16a997fcc02aa09e85022324", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kf5guiaddons.json b/port_versions/k-/kf5guiaddons.json new file mode 100644 index 00000000000000..53602c731e7289 --- /dev/null +++ b/port_versions/k-/kf5guiaddons.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8bca3434ab81ca66cb57d44ed891ff5a773c92ce", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kf5holidays.json b/port_versions/k-/kf5holidays.json new file mode 100644 index 00000000000000..395114d23a245b --- /dev/null +++ b/port_versions/k-/kf5holidays.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "c668e8479d432fcb7f1d450ad1c51a6ad9dc67fb", + "version-string": "5.74.0", + "port-version": 0 + }, + { + "git-tree": "41cfbba4eec5f2bce693fa8a938019bc80b3b6e0", + "version-string": "5.64.0-1", + "port-version": 0 + }, + { + "git-tree": "9ee43cfd96333c9db6592218472ce04dfa1fa50e", + "version-string": "5.64.0", + "port-version": 0 + }, + { + "git-tree": "0e5244ad70c317ee4a0660026a5868c339d0552f", + "version-string": "5.58.0", + "port-version": 0 + }, + { + "git-tree": "e9a143880c36aa9acda4fd936f2d354a8a85a426", + "version-string": "5.50.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kf5i18n.json b/port_versions/k-/kf5i18n.json new file mode 100644 index 00000000000000..8b70233e99ea95 --- /dev/null +++ b/port_versions/k-/kf5i18n.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "729fd5fa589799c9c12afaa7fa6434c9304301f7", + "version-string": "5.64.0", + "port-version": 1 + }, + { + "git-tree": "ee5f0883d727275d01998ff635e98fd04ef6b234", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kf5itemmodels.json b/port_versions/k-/kf5itemmodels.json new file mode 100644 index 00000000000000..603e0f671a9f1e --- /dev/null +++ b/port_versions/k-/kf5itemmodels.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2ffea0df33ef54f6741e97f8353e5ee2c2484e6b", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kf5itemviews.json b/port_versions/k-/kf5itemviews.json new file mode 100644 index 00000000000000..649bf38b20f50b --- /dev/null +++ b/port_versions/k-/kf5itemviews.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "165e6d588675a123a6757b98d821014b71f63613", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kf5plotting.json b/port_versions/k-/kf5plotting.json new file mode 100644 index 00000000000000..3bb60536324c1e --- /dev/null +++ b/port_versions/k-/kf5plotting.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "25c33b06994d1c7906afd3ada835facb0a9fc2d7", + "version-string": "5.74.0", + "port-version": 0 + }, + { + "git-tree": "402cc759b0d1b9c19841bde604d792a4d0cd834c", + "version-string": "5.64.0-1", + "port-version": 0 + }, + { + "git-tree": "2adde1265a5d17da91ea5ea368fe5259ee7706c6", + "version-string": "5.64.0", + "port-version": 0 + }, + { + "git-tree": "d3f6adfb8791f605353b9cb4bffad54f266ec3c4", + "version-string": "5.58.0", + "port-version": 0 + }, + { + "git-tree": "6709af21e8a5bdeaf61cb20842ee18ef6db0a10b", + "version-string": "5.50.0", + "port-version": 0 + }, + { + "git-tree": "656c7c6e5ac92a389040967c26b0ec380b0d2965", + "version-string": "5.37.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kf5syntaxhighlighting.json b/port_versions/k-/kf5syntaxhighlighting.json new file mode 100644 index 00000000000000..d0901ac5a8d618 --- /dev/null +++ b/port_versions/k-/kf5syntaxhighlighting.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4fdddfb870b34a5a43de450af11a42822831cf87", + "version-string": "5.64.0-1", + "port-version": 0 + }, + { + "git-tree": "9e18bbbc90a4412ae9fb7e4c47c14486e2938fbc", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kf5widgetsaddons.json b/port_versions/k-/kf5widgetsaddons.json new file mode 100644 index 00000000000000..c53d61ea78a281 --- /dev/null +++ b/port_versions/k-/kf5widgetsaddons.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "40e1bd1fb0830d760f34b565cb277a9f9a5c31d7", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kf5windowsystem.json b/port_versions/k-/kf5windowsystem.json new file mode 100644 index 00000000000000..17079c14c58ddd --- /dev/null +++ b/port_versions/k-/kf5windowsystem.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "35fa4e3ec318a0000fec7537cf7368edb5e5e5fb", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kfr.json b/port_versions/k-/kfr.json new file mode 100644 index 00000000000000..29ce793140407e --- /dev/null +++ b/port_versions/k-/kfr.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "22401e7e0aafe0934b6eb6201b83283609fe5d81", + "version-string": "2020-06-15", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kinectsdk1.json b/port_versions/k-/kinectsdk1.json new file mode 100644 index 00000000000000..1d9148b1dd9779 --- /dev/null +++ b/port_versions/k-/kinectsdk1.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "6f1b6079d522449e9e015c19c96b021bef51d3f8", + "version-string": "1.8-2", + "port-version": 0 + }, + { + "git-tree": "2c8d9765b436e9982cf9b11977325cfc65ce6b1d", + "version-string": "1.8-1", + "port-version": 0 + }, + { + "git-tree": "fd2ef359a8f6063dc52c2298df16a4a5d26abf9b", + "version-string": "1.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kinectsdk2.json b/port_versions/k-/kinectsdk2.json new file mode 100644 index 00000000000000..81b70fa8570ab8 --- /dev/null +++ b/port_versions/k-/kinectsdk2.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "1a0bfd98150a26b9a24903f78f8c24843e3f079f", + "version-string": "2.0-2", + "port-version": 0 + }, + { + "git-tree": "6f7a644969c78b138f8d423677db9c948d7e2d40", + "version-string": "2.0-1", + "port-version": 0 + }, + { + "git-tree": "1bfaaf0ae762599023edaf309723e1d5dba996cc", + "version-string": "2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kissfft.json b/port_versions/k-/kissfft.json new file mode 100644 index 00000000000000..346c666935dcff --- /dev/null +++ b/port_versions/k-/kissfft.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2779164487247422fc7e98e76eb55dff08f4a48d", + "version-string": "2020-03-30", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/knet.json b/port_versions/k-/knet.json new file mode 100644 index 00000000000000..10c1c521e0cce6 --- /dev/null +++ b/port_versions/k-/knet.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "bc64fbd63896ba675dff55878783d27cccf6a1a2", + "version-string": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "125c19cb7dd60a11bb0f5d05eba693d05ed9c020", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/krabsetw.json b/port_versions/k-/krabsetw.json new file mode 100644 index 00000000000000..056f5f4db32912 --- /dev/null +++ b/port_versions/k-/krabsetw.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "f52a420a5f5f9df0d47f89b047879aac82b03eed", + "version-string": "4.1.14", + "port-version": 0 + }, + { + "git-tree": "684633395866823d815890a73ce73b341e52319a", + "version-string": "4.1.13", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/ktx.json b/port_versions/k-/ktx.json new file mode 100644 index 00000000000000..759c3823151496 --- /dev/null +++ b/port_versions/k-/ktx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "dcdc8a93a053d7251e14f8b0760a810e5b555ebb", + "version-string": "4.0.0-beta5", + "port-version": 1 + } + ] +} diff --git a/port_versions/k-/kubazip.json b/port_versions/k-/kubazip.json new file mode 100644 index 00000000000000..f3ce149182642f --- /dev/null +++ b/port_versions/k-/kubazip.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4b47acada9e962b232d5a5a1cf1c7f9adf98530a", + "version-string": "0.1.19", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kuku.json b/port_versions/k-/kuku.json new file mode 100644 index 00000000000000..aaecc00d205673 --- /dev/null +++ b/port_versions/k-/kuku.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0fc041176d953501d771e467d5621e635cd3f2a6", + "version-string": "2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/k-/kvasir-mpl.json b/port_versions/k-/kvasir-mpl.json new file mode 100644 index 00000000000000..20faadeb6aa309 --- /dev/null +++ b/port_versions/k-/kvasir-mpl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d07bf9f9e3380b5b9774152634b93bb308af0bd3", + "version-string": "2019-08-06", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lapack-reference.json b/port_versions/l-/lapack-reference.json new file mode 100644 index 00000000000000..0fd9ba4d7e79f5 --- /dev/null +++ b/port_versions/l-/lapack-reference.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "34971ac86a76f6bffefe5962980c3991abf87a58", + "version-string": "3.8.0", + "port-version": 4 + }, + { + "git-tree": "d81eed4405e974ea6afc39b96c630af14b0ceb9d", + "version-string": "3.8.0", + "port-version": 3 + }, + { + "git-tree": "91a46c2865b7c683286e30bd0e010b0b3da4cabe", + "version-string": "3.8.0", + "port-version": 2 + }, + { + "git-tree": "36ff17d1c1ce5b189f3a6f41e2773e16941cc382", + "version-string": "3.8.0", + "port-version": 1 + }, + { + "git-tree": "9eb85dd5f5f4e42cf245c3228bf4f73967bbae90", + "version-string": "3.8.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lapack.json b/port_versions/l-/lapack.json new file mode 100644 index 00000000000000..5d618ffb530d51 --- /dev/null +++ b/port_versions/l-/lapack.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "e3e10603a14f3b981ce689ba768d42a1a2ec07d4", + "version-string": "3", + "port-version": 1 + }, + { + "git-tree": "896c35b926db44f52f66d98b01f5334022920f42", + "version-string": "3", + "port-version": 0 + }, + { + "git-tree": "29cecd95e65e5355b3b29abba1bb9ad4bb9bcae2", + "version-string": "2", + "port-version": 0 + }, + { + "git-tree": "a46b6d68236ab2531fa28cb5f1c9a0905d51763e", + "version-string": "1", + "port-version": 0 + }, + { + "git-tree": "8f3d3da82ca7ed0cdaadf76cb5166210da69ef40", + "version-string": "0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lastools.json b/port_versions/l-/lastools.json new file mode 100644 index 00000000000000..b59dd6ea8cb633 --- /dev/null +++ b/port_versions/l-/lastools.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "8a301426473ec3a9afb9a013ff3d04fd1197fba4", + "version-string": "2020-05-09", + "port-version": 0 + }, + { + "git-tree": "389c49ae33a5f59de433424ee62c1de2e2beb0c3", + "version-string": "2019-07-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/laszip.json b/port_versions/l-/laszip.json new file mode 100644 index 00000000000000..439d021733cecb --- /dev/null +++ b/port_versions/l-/laszip.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "6b7b406aadbae2a288bde7f2b268a7c302bfdf67", + "version-string": "3.4.3", + "port-version": 0 + }, + { + "git-tree": "f4c242d0fcbc9db627a5b06a8b1f87903de4c6be", + "version-string": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "79a738214818957e3faab06b05e31ed9f07a5bfd", + "version-string": "3.2.2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lazy-importer.json b/port_versions/l-/lazy-importer.json new file mode 100644 index 00000000000000..a9e16238407ec0 --- /dev/null +++ b/port_versions/l-/lazy-importer.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "eee592b2e30fb35bb1ca3f2aa8e0013037ef4ccc", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lcm.json b/port_versions/l-/lcm.json new file mode 100644 index 00000000000000..fef7df868650a2 --- /dev/null +++ b/port_versions/l-/lcm.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "0b549ce3154b5c20db2e2ffaec65b3d1d80705ab", + "version-string": "1.4.0", + "port-version": 1 + }, + { + "git-tree": "2754e3e6feb115a7fbcf76f1297e5c893be7c632", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "6e396f949483e198fb3cd4f656aee186b9100cab", + "version-string": "1.3.95-1", + "port-version": 0 + }, + { + "git-tree": "93353d69838f03b235814990742c59b8c5506409", + "version-string": "1.3.95", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lcms.json b/port_versions/l-/lcms.json new file mode 100644 index 00000000000000..91b03084a2fb3a --- /dev/null +++ b/port_versions/l-/lcms.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "87ed3cf04e19a238f357a256419016aa49f88eb4", + "version-string": "2.11", + "port-version": 0 + }, + { + "git-tree": "4e242d8bd5a56e9b1fd9e661e567637a3b873d3e", + "version-string": "2.9-1", + "port-version": 0 + }, + { + "git-tree": "c081826f7e7ab6f0f77815ef977490591d4cefae", + "version-string": "2.9", + "port-version": 0 + }, + { + "git-tree": "491f74ae0cec150e607d4db92988afb65aed3abd", + "version-string": "2.8-5", + "port-version": 0 + }, + { + "git-tree": "de7e09d6231f0050332d407b5f8a8aaade48c74d", + "version-string": "2.8-4", + "port-version": 0 + }, + { + "git-tree": "ba9083b1dea6641f5fb0aec0dea313df5b2e6562", + "version-string": "2.8-3", + "port-version": 0 + }, + { + "git-tree": "02fd4bbb01ea5b216ef0bacb1c14283e274d2d35", + "version-string": "2.8-2", + "port-version": 0 + }, + { + "git-tree": "02fea392ed5fca378b02fcc2b94892d20407b45f", + "version-string": "2.8-1", + "port-version": 0 + }, + { + "git-tree": "297b72454dc0105b9f5d435afa08df98d8f76e3a", + "version-string": "2.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/leaf.json b/port_versions/l-/leaf.json new file mode 100644 index 00000000000000..13fd9940e56c2c --- /dev/null +++ b/port_versions/l-/leaf.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "276f8e1eb0a3ea4e0b0bd72dee0822660e6704f7", + "version-string": "0.2.2", + "port-version": 1 + }, + { + "git-tree": "8c2ccd63b0cd06fe4b908a159c85c689ed6cbdd1", + "version-string": "0.2.2", + "port-version": 0 + }, + { + "git-tree": "6ae9bfe2072f354c5ee5c6d94ce8c566e621638a", + "version-string": "0.2.1-2", + "port-version": 0 + }, + { + "git-tree": "e46ede61e08589959f5fb0f6c00fa84e393ee3e7", + "version-string": "0.2.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lemon.json b/port_versions/l-/lemon.json new file mode 100644 index 00000000000000..14be3b08f8d416 --- /dev/null +++ b/port_versions/l-/lemon.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1b9931e57629d344a0ea2b656008550604900452", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "90cfb8a98d43129560e5c44a55c0e82e4a9d099b", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/leptonica.json b/port_versions/l-/leptonica.json new file mode 100644 index 00000000000000..6c70c8fc8154b2 --- /dev/null +++ b/port_versions/l-/leptonica.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "27c2329af94e2199b49c1d01da4136fe0891105f", + "version-string": "1.80.0", + "port-version": 1 + }, + { + "git-tree": "9ed8135c6708327c0e5515bf2b3c175f113d3802", + "version-string": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "0ddf0c5660376a7b0ae1c641e71ed8c348f4996f", + "version-string": "1.78.0-1", + "port-version": 0 + }, + { + "git-tree": "64bbacef132cc5a87b5a490cff4d27db3455311b", + "version-string": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "78a927b8258976486692ac5badb19de106cab81c", + "version-string": "1.76.0-1", + "port-version": 0 + }, + { + "git-tree": "6030d672c4f2f06353227902a3fa0fc1129f0e6e", + "version-string": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "8157e86a51d1b004e1db007e30ae865241c75ff5", + "version-string": "1.74.4-5", + "port-version": 0 + }, + { + "git-tree": "1ffd3aac6861f39d94248c3f40736d74820f8d28", + "version-string": "1.74.4-3", + "port-version": 0 + }, + { + "git-tree": "6be9502011cb80993014849fdb2ebf2b59d0d8b3", + "version-string": "1.74.4-2", + "port-version": 0 + }, + { + "git-tree": "166acbf4ed05ce08247d3194b30684a4c5d27937", + "version-string": "1.74.4-1", + "port-version": 0 + }, + { + "git-tree": "67be31d07999377c75fda2b1208c749261294667", + "version-string": "1.74.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lerc.json b/port_versions/l-/lerc.json new file mode 100644 index 00000000000000..4ac33728ccde62 --- /dev/null +++ b/port_versions/l-/lerc.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a35292098f9e9e64fe0326963ce31ae008df173b", + "version-string": "2.2", + "port-version": 1 + }, + { + "git-tree": "cb2e6ac2ea543271ddecb5b0d78f26a736b4cc4f", + "version-string": "2.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lest.json b/port_versions/l-/lest.json new file mode 100644 index 00000000000000..e6e12edb1b01a9 --- /dev/null +++ b/port_versions/l-/lest.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "6a10bd7bfa440dac6566183f709cf0d0c9d582ca", + "version-string": "1.35.1", + "port-version": 1 + }, + { + "git-tree": "98c85d725e3d121a7686e3ed2e457aa92b27304a", + "version-string": "1.35.1", + "port-version": 0 + }, + { + "git-tree": "ce80c0bd1c7754b515f1d3a869dce08f9eb599c3", + "version-string": "1.34.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/leveldb.json b/port_versions/l-/leveldb.json new file mode 100644 index 00000000000000..7c6eafd047180e --- /dev/null +++ b/port_versions/l-/leveldb.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "38da693d53b70286fe05028daf4fa5f3418455fb", + "version-string": "1.22-1", + "port-version": 0 + }, + { + "git-tree": "adcfa1c019e553cc47661e3859255a86432fa21f", + "version-string": "1.22", + "port-version": 0 + }, + { + "git-tree": "f8a523b9f906e02780428f9ccd59454674c08009", + "version-string": "2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-3", + "port-version": 0 + }, + { + "git-tree": "bebf555777010d231e125b65fa2eb8bd0abc5e86", + "version-string": "2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-2", + "port-version": 0 + }, + { + "git-tree": "dcbccbe571362c8e2e05b4006ac37aeb71e774de", + "version-string": "2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-1", + "port-version": 0 + }, + { + "git-tree": "53d4aa791e91e34c8e511293325bbf37a23fd354", + "version-string": "2017-10-25-8b1cd3753b184341e837b30383832645135d3d73", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/levmar.json b/port_versions/l-/levmar.json new file mode 100644 index 00000000000000..78c1e74387764b --- /dev/null +++ b/port_versions/l-/levmar.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cbd0d2a467f781175f1900ca6857ddff74ab1cc5", + "version-string": "2.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libaaplus.json b/port_versions/l-/libaaplus.json new file mode 100644 index 00000000000000..763144ec891882 --- /dev/null +++ b/port_versions/l-/libaaplus.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "0d8f92d1cc3501ab9ce9cb87ab302acc29101847", + "version-string": "2.12-1", + "port-version": 0 + }, + { + "git-tree": "fe460706b267bcc1eb71839fb877328b68139d8e", + "version-string": "2.12", + "port-version": 0 + }, + { + "git-tree": "b5d63f8e711941f4088be95360ccc497fb78c528", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "4c52f9922fef1d7f2475ca5914cfcc8b3f45a2c5", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libaiff.json b/port_versions/l-/libaiff.json new file mode 100644 index 00000000000000..d8e7ee7a1644eb --- /dev/null +++ b/port_versions/l-/libaiff.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "384dd657e0debf56e8be77ca82cdb724bb4d7ba3", + "version-string": "5.0-6", + "port-version": 0 + }, + { + "git-tree": "754c432803b2b163397e8c674b3fb19f894ae401", + "version-string": "5.0-4", + "port-version": 0 + }, + { + "git-tree": "abf3ffc6b20f2975f45f2bb96fbbc66fbe4ce12c", + "version-string": "5.0-3", + "port-version": 0 + }, + { + "git-tree": "b82c7b5b64da9d96009e43d6457a54f5a6af77ab", + "version-string": "5.0-2", + "port-version": 0 + }, + { + "git-tree": "e4873a5927a048efa6b83dba6e5e693ca4742edd", + "version-string": "5.0-1", + "port-version": 0 + }, + { + "git-tree": "8296a7ba1d3e6db9a354dcf98e581541aa4d0a28", + "version-string": "5.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libarchive.json b/port_versions/l-/libarchive.json new file mode 100644 index 00000000000000..4fc0e56d01e8ab --- /dev/null +++ b/port_versions/l-/libarchive.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "5f418195172c2db767e6f0bae8ff4d07101c70e5", + "version-string": "3.4.3", + "port-version": 2 + }, + { + "git-tree": "9d686dda073b4aed34bd017aca7b9b6bc6d88547", + "version-string": "3.4.3", + "port-version": 1 + }, + { + "git-tree": "4f6c6237c726b301e105151dad0c138d72bfd7d8", + "version-string": "3.4.3", + "port-version": 0 + }, + { + "git-tree": "6c282f13aa502b3dbe66d8ab55f5b45701fbbb29", + "version-string": "3.4.1", + "port-version": 5 + }, + { + "git-tree": "9058df3358b216ab98eb67ab173a96355ba11ebf", + "version-string": "3.4.1", + "port-version": 4 + }, + { + "git-tree": "f961fd899e2e85584bd38fe14614141e6ce0063e", + "version-string": "3.4.1-3", + "port-version": 0 + }, + { + "git-tree": "ec16774888649ce1cca99db4a01a1d449b40540f", + "version-string": "3.4.1-2", + "port-version": 0 + }, + { + "git-tree": "c6abcc364aebfdef97d59a31d983a09b8fb26bea", + "version-string": "3.4.1-1", + "port-version": 0 + }, + { + "git-tree": "d3b1377981f132c3a1f3da4abd498e910f1b4870", + "version-string": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "e29238b817c0a13ef2a7d0ff15a077e2296d17cd", + "version-string": "3.4.0-2", + "port-version": 0 + }, + { + "git-tree": "7d2d26231a7380534ab2b18933c70581628a75e4", + "version-string": "3.4.0-1", + "port-version": 0 + }, + { + "git-tree": "77b4b2c67a024dee83c970a6a0b7516e9477202d", + "version-string": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "0fc368935299fa8517f24ac0700ff05ead3f5c5f", + "version-string": "3.3.3-3", + "port-version": 0 + }, + { + "git-tree": "7acc5b3a3e51c12c1e8b2e0efa356da9a0bcda63", + "version-string": "3.3.3-2", + "port-version": 0 + }, + { + "git-tree": "d03a0111f9bc772153ab9f4d0dd40162a8561838", + "version-string": "3.3.2-2", + "port-version": 0 + }, + { + "git-tree": "52a9565fb5ae357a0148920103bf581b43c62ecd", + "version-string": "3.3.2-1", + "port-version": 0 + }, + { + "git-tree": "d1b52e4ba696bda8c72372d7d73680946886bfc1", + "version-string": "3.3.2", + "port-version": 0 + }, + { + "git-tree": "fedd3aeb0669e5e1d854136f2cd43bca12eb8996", + "version-string": "3.3.1-1", + "port-version": 0 + }, + { + "git-tree": "350cdc2e0a0190bb5d2e9384a94b227823aff582", + "version-string": "3.3.1", + "port-version": 0 + }, + { + "git-tree": "43b8b580eda3407c9f8e312f4b6eabedbece8ee0", + "version-string": "3.2.2-2", + "port-version": 0 + }, + { + "git-tree": "92cdccb612cce373fa91a0e1326ec6a594e8e2fe", + "version-string": "3.2.2-1", + "port-version": 0 + }, + { + "git-tree": "a6e18abe8c5ebef4bc2ef4cdf3e5281af1897ff9", + "version-string": "3.2.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libass.json b/port_versions/l-/libass.json new file mode 100644 index 00000000000000..0956685f48170a --- /dev/null +++ b/port_versions/l-/libass.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "09bc1e4af0701ac49dfb52104d0e940a5810e03d", + "version-string": "0.15.0", + "port-version": 0 + }, + { + "git-tree": "6ad6cc00ef59edba81bb9f42a4fd9113d3eafa24", + "version-string": "0.14.0", + "port-version": 4 + }, + { + "git-tree": "18f9f85dab37b62c09449c423c3ba4fc47b53630", + "version-string": "0.14.0", + "port-version": 3 + }, + { + "git-tree": "3d55130aa81b4d28c02e5b2c74592705d74a867e", + "version-string": "0.14.0", + "port-version": 2 + }, + { + "git-tree": "8076a175222d3f868bee621055819ef002686fc9", + "version-string": "0.14.0", + "port-version": 1 + }, + { + "git-tree": "0e28653f9bb0bc5308d6267f4c3ec4d7c410c52e", + "version-string": "0.14.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libassuan.json b/port_versions/l-/libassuan.json new file mode 100644 index 00000000000000..c431aea6994644 --- /dev/null +++ b/port_versions/l-/libassuan.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4f706c770799458ae92ef15394a9f0b1bd25fdf8", + "version-string": "2.5.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libb2.json b/port_versions/l-/libb2.json new file mode 100644 index 00000000000000..3543516134be31 --- /dev/null +++ b/port_versions/l-/libb2.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "98925560fbceb14da7820146f6df113f9dae7988", + "version-string": "0.98.1", + "port-version": 4 + }, + { + "git-tree": "5c54a762a232fdd14c8b3c945715aaee5efcfa33", + "version-string": "0.98.1", + "port-version": 3 + }, + { + "git-tree": "9a6fd5bed1b925ba8b4d12372a3f6d6b48535165", + "version-string": "0.98.1-2", + "port-version": 0 + }, + { + "git-tree": "1b7b591e35ba71d91bc6e91642f8e1831c1bba3c", + "version-string": "0.98.1-1", + "port-version": 0 + }, + { + "git-tree": "a302d636d8a6122c64d1193fa45fd62d22695e50", + "version-string": "0.98.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libbf.json b/port_versions/l-/libbf.json new file mode 100644 index 00000000000000..e0833a626f12ba --- /dev/null +++ b/port_versions/l-/libbf.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "919ff0d06dfb5f74a4913cf7a8ad44c2e70035b4", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "80ea083e7792bf29d4311db15051c6efdc427b1b", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libbson.json b/port_versions/l-/libbson.json new file mode 100644 index 00000000000000..fab19ebd3948b1 --- /dev/null +++ b/port_versions/l-/libbson.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "b26ca651117f7c38660c6a08d643aba7d6248ab0", + "version-string": "1.16.1", + "port-version": 2 + }, + { + "git-tree": "3b6c45f68fc262b06caa265ed7e778cee574c6ff", + "version-string": "1.16.1", + "port-version": 1 + }, + { + "git-tree": "20b4eaa8d6accae6f1f3235f64ae7d4e7ca86f78", + "version-string": "1.16.1", + "port-version": 0 + }, + { + "git-tree": "e9b7d4072a52a483b0037b725fe525d55bcebdaa", + "version-string": "1.15.1-1", + "port-version": 0 + }, + { + "git-tree": "4ac176889fc2494f0705607d564ec3c738a486cb", + "version-string": "1.14.0-3", + "port-version": 0 + }, + { + "git-tree": "3a0163c8af23e267c5fa4f67bca9bcaf48103def", + "version-string": "1.14.0-1", + "port-version": 0 + }, + { + "git-tree": "db1904501f2c6dc18f0ad7a4b771674d93b41367", + "version-string": "1.14.0", + "port-version": 0 + }, + { + "git-tree": "f0008980e3ba6c2bcf0683a2d2f61e830f926073", + "version-string": "1.13.0", + "port-version": 0 + }, + { + "git-tree": "e76d2e6882b8521cd5d978692e8660b1cf4a9482", + "version-string": "1.9.5-1", + "port-version": 0 + }, + { + "git-tree": "6b69285fa35a4ef27f6cfa8a3ebd0fe2e018b96d", + "version-string": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "44fadb8c764ac9c964944301793e5156340fe438", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "5026e09706897d6d711f03ce0df91d0b3b164b58", + "version-string": "1.6.2-2", + "port-version": 0 + }, + { + "git-tree": "76fd7e7b37ceac98bc69b4789ce23ff21e7632b1", + "version-string": "1.6.2-1", + "port-version": 0 + }, + { + "git-tree": "1fddeaef30218075e00f612343c1122edbcbbcb7", + "version-string": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "384099567905aa38334a4a424c80ea63c09447c5", + "version-string": "1.5.1-3", + "port-version": 0 + }, + { + "git-tree": "58cc6d0210efaf247431f8376b83395a2e0a6bc1", + "version-string": "1.5.1-1", + "port-version": 0 + }, + { + "git-tree": "84d43e64b4509a9239b4cf16a0df450a6ea4e61e", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "48905010063a3aa317c9dbbf198d66acf5ae54d4", + "version-string": "1.5.0-rc6", + "port-version": 0 + }, + { + "git-tree": "d7a9f9538965b0951fda03c428b529f019153684", + "version-string": "1.4.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libcds.json b/port_versions/l-/libcds.json new file mode 100644 index 00000000000000..f4fe1dfe17fdb4 --- /dev/null +++ b/port_versions/l-/libcds.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "fbfc5cffca8fb134abcceb5763a92ea1c90ffd5f", + "version-string": "2.3.3", + "port-version": 0 + }, + { + "git-tree": "bd82edd5a919b2c2ed378d85710d97f1c992e990", + "version-string": "2.3.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libcerf.json b/port_versions/l-/libcerf.json new file mode 100644 index 00000000000000..9d0d7ead2f9f17 --- /dev/null +++ b/port_versions/l-/libcerf.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "46f542929aebafbe41f76a66e1073c94acf9936d", + "version-string": "1.13", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libconfig.json b/port_versions/l-/libconfig.json new file mode 100644 index 00000000000000..cfbe4534861fa6 --- /dev/null +++ b/port_versions/l-/libconfig.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "02e991af7253bd4ef78d90fc43680c98be8bc817", + "version-string": "1.7.2-2", + "port-version": 0 + }, + { + "git-tree": "64a4c898a9b495de1c17c09768191f8cd47d5fd2", + "version-string": "1.7.2-1", + "port-version": 0 + }, + { + "git-tree": "f5c982944db4d83e865aa8d4824e741b7391cf12", + "version-string": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "cfd89787a4b1b023d7cc87868ef11c8f8392b502", + "version-string": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "b4acdcd40d02cd596261e22dc851cb91e2667eac", + "version-string": "1.6.0-1", + "port-version": 0 + }, + { + "git-tree": "8740a09298c3e43a0bacc1037dfee67768915fe1", + "version-string": "1.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libconfuse.json b/port_versions/l-/libconfuse.json new file mode 100644 index 00000000000000..232df060c14236 --- /dev/null +++ b/port_versions/l-/libconfuse.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "66e56f1e0968508363349e1905716df75faf4ea7", + "version-string": "2019-07-14", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libcopp.json b/port_versions/l-/libcopp.json new file mode 100644 index 00000000000000..fb2994a7dc202b --- /dev/null +++ b/port_versions/l-/libcopp.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "22af9650936b7555dd45a5e211277095a37637dd", + "version-string": "1.3.4", + "port-version": 0 + }, + { + "git-tree": "ab9f0f8c9493edc67758f3e9e771d2e2ec4d341e", + "version-string": "1.3.3", + "port-version": 0 + }, + { + "git-tree": "ce0ccb93c730645d80ef4e4ee662987fed144465", + "version-string": "1.3.2", + "port-version": 0 + }, + { + "git-tree": "4ef38726cd4a72a2e4c935a8a2aced4a84d71329", + "version-string": "1.3.1", + "port-version": 1 + }, + { + "git-tree": "3c0c3beecc75e931620f9c115c0eacf090142155", + "version-string": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "9507ac1659c722b2d7c153d28f9dad84cb305678", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "d613b4838f43483102a585fde189a236747af760", + "version-string": "1.1.0-2", + "port-version": 0 + }, + { + "git-tree": "b53d096b0ac0afeeaea78ca56c8f350c1af06a69", + "version-string": "1.1.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libcrafter.json b/port_versions/l-/libcrafter.json new file mode 100644 index 00000000000000..17626b388f0f4a --- /dev/null +++ b/port_versions/l-/libcrafter.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ab60b081bd44f7a40a649a66c793373931815487", + "version-string": "0.3", + "port-version": 2 + }, + { + "git-tree": "5073c8dbf2082dfd4f612e835cd1cd0433b70ed2", + "version-string": "0.3-1", + "port-version": 0 + }, + { + "git-tree": "3fd1da7be7a740610b6bea20d0264faa2a895532", + "version-string": "0.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libcroco.json b/port_versions/l-/libcroco.json new file mode 100644 index 00000000000000..698b3aa5e5e7c7 --- /dev/null +++ b/port_versions/l-/libcroco.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b561e15c4bff9ec1fcebcf150f10aa343ce8659f", + "version-string": "0.6.13", + "port-version": 2 + }, + { + "git-tree": "c595e2d082a720cb407f972e75d1c0bc5e1de225", + "version-string": "0.6.13-1", + "port-version": 0 + }, + { + "git-tree": "d2f0dc4bbc30082cfef9426cb5e20fbc5030bbb2", + "version-string": "0.6.13", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libcuckoo.json b/port_versions/l-/libcuckoo.json new file mode 100644 index 00000000000000..22de57d1ec979f --- /dev/null +++ b/port_versions/l-/libcuckoo.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "777ec458aadd3bff96b4e601b3830c5a3e3be61c", + "version-string": "0.3", + "port-version": 0 + }, + { + "git-tree": "01352f70609af93c8330a2bda3ede238ca18eca7", + "version-string": "2018-12-24-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libdatachannel.json b/port_versions/l-/libdatachannel.json new file mode 100644 index 00000000000000..0db89af9b87447 --- /dev/null +++ b/port_versions/l-/libdatachannel.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a50b7fbf1ea5f38b6303e3491fac4de1c342337c", + "version-string": "v0.10.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libdatrie.json b/port_versions/l-/libdatrie.json new file mode 100644 index 00000000000000..e86f03c9baf83a --- /dev/null +++ b/port_versions/l-/libdatrie.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "5ce5ae0ac1e89557a8c353298a538d03967938a2", + "version-string": "0.2.10-3", + "port-version": 0 + }, + { + "git-tree": "72844c0d824f9854e37ada098e25844200459b93", + "version-string": "0.2.10-2", + "port-version": 0 + }, + { + "git-tree": "41d36379c2cd0aee1a9c3a12b87815a555ebf032", + "version-string": "0.2.10-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libde265.json b/port_versions/l-/libde265.json new file mode 100644 index 00000000000000..befc7655f7f9e4 --- /dev/null +++ b/port_versions/l-/libde265.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "857cfbdb4607f7799bc7beae422b3c244e5b8b3a", + "version-string": "1.0.8", + "port-version": 0 + }, + { + "git-tree": "6feb4dc7d349b171eea10994356ec038e8d921c6", + "version-string": "1.0.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libdisasm.json b/port_versions/l-/libdisasm.json new file mode 100644 index 00000000000000..5c83514e5dfb81 --- /dev/null +++ b/port_versions/l-/libdisasm.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "51daf85e8709cd28fab9f5ec16d87de3351e4a62", + "version-string": "0.23-7", + "port-version": 0 + }, + { + "git-tree": "6e805dc3d7bf6a4d81dc68aab02bc5e697127ee5", + "version-string": "0.23-5", + "port-version": 0 + }, + { + "git-tree": "13d15881ddf641c2458e5354ac71af2234cb3b13", + "version-string": "0.23-3", + "port-version": 0 + }, + { + "git-tree": "d0cee79f332a30a168b6cd147ba1b55d59c0d7ab", + "version-string": "0.23-2", + "port-version": 0 + }, + { + "git-tree": "ea23da682b72624869e7ff8bcac37dcd72848102", + "version-string": "0.23-1", + "port-version": 0 + }, + { + "git-tree": "e1840364282eb7b9ac20c45468d3b1a7189272e9", + "version-string": "0.23", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libdivide.json b/port_versions/l-/libdivide.json new file mode 100644 index 00000000000000..47876bfcc952b6 --- /dev/null +++ b/port_versions/l-/libdivide.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "53fa48bfa91645b304275940d4dee97249ecb715", + "version-string": "3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libdshowcapture.json b/port_versions/l-/libdshowcapture.json new file mode 100644 index 00000000000000..96c88c18a6eb8e --- /dev/null +++ b/port_versions/l-/libdshowcapture.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "0b16d08906d5a9a7b8fe8efbf43de3aa5050c24d", + "version-string": "0.6.0-1", + "port-version": 0 + }, + { + "git-tree": "9b0bebd68d07b679063b77678ca9ecdcc6aa505a", + "version-string": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libepoxy.json b/port_versions/l-/libepoxy.json new file mode 100644 index 00000000000000..4093cd2c2cfc68 --- /dev/null +++ b/port_versions/l-/libepoxy.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "5a4765be1ed914881477e17b993d7e8df3ef67f0", + "version-string": "1.5.5", + "port-version": 0 + }, + { + "git-tree": "0027cb5d966a46b33ac6a9873b6def6bfc98c404", + "version-string": "1.5.4", + "port-version": 2 + }, + { + "git-tree": "3b3c5cc282fc3e3adf4e20359820476eae3fcc6f", + "version-string": "1.5.4", + "port-version": 1 + }, + { + "git-tree": "289146deaead40e4bebe53b5ed92628b8e26edde", + "version-string": "1.5.4", + "port-version": 0 + }, + { + "git-tree": "e4fa2bd85d2ba6818fd105a3a9eeae8202b5b2ab", + "version-string": "1.5.3-4", + "port-version": 0 + }, + { + "git-tree": "86e483f3515a346d44d1e92290e8dad4b8c01597", + "version-string": "1.5.3-3", + "port-version": 0 + }, + { + "git-tree": "ce36f6d6a1aa413ea6f75ff37633c54a34175f76", + "version-string": "1.5.3-2", + "port-version": 0 + }, + { + "git-tree": "a3512df76b2b5a55c8ca9aae6c29517532b10beb", + "version-string": "1.5.3-1", + "port-version": 0 + }, + { + "git-tree": "02e32b41da1cb4451c4be8dc8f8e6553c3e0b701", + "version-string": "1.5.3", + "port-version": 0 + }, + { + "git-tree": "3f381a8bc8911ba973dddaf2ee8692203551bf3a", + "version-string": "1.4.3-2", + "port-version": 0 + }, + { + "git-tree": "8a591796e377474d9f918aed31f693e792cb8d6f", + "version-string": "1.4.3-1", + "port-version": 0 + }, + { + "git-tree": "bb7432a4884c6aa5cd3fb29049f952d8a7c6b6bf", + "version-string": "1.4.3", + "port-version": 0 + }, + { + "git-tree": "cca0df016679be0f5ae5ef2b8cb8a290b5acb528", + "version-string": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "a9a6f98f5a0becdbec83fdc14078b9e1c4f77953", + "version-string": "1.4.1-7d58fd3", + "port-version": 0 + }, + { + "git-tree": "49563ad7d1dbf40f29a1918afa1e57321a20c2bb", + "version-string": "1.4.0-2432daf-1", + "port-version": 0 + }, + { + "git-tree": "bb7e3067aa54c5168c47b47bc554a49373556d4b", + "version-string": "1.4.0-2432daf", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libevent.json b/port_versions/l-/libevent.json new file mode 100644 index 00000000000000..375fbbf4cdb590 --- /dev/null +++ b/port_versions/l-/libevent.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "27a15ae417cdf4fd4388ab02d2949632699ce004", + "version-string": "2.1.12", + "port-version": 1 + }, + { + "git-tree": "de4ba2c173271d60e7022b3bd69440255cd0addd", + "version-string": "2.1.12", + "port-version": 0 + }, + { + "git-tree": "464499eb500390a56ac7e7b3cb6d2098ab254571", + "version-string": "2.1.11-5", + "port-version": 0 + }, + { + "git-tree": "f6b41d55f20103863facc8c14fe10072dfc9cfe9", + "version-string": "2.1.11-4", + "port-version": 0 + }, + { + "git-tree": "de61461b3ddd148fcce0ad0077e3ab66c23329e8", + "version-string": "2.1.11-3", + "port-version": 0 + }, + { + "git-tree": "ce0eed106e51862b3e1810af402b9cf2ba0c2bab", + "version-string": "2.1.11-2", + "port-version": 0 + }, + { + "git-tree": "9051d76e889e64c0bacb872069d62d0ac5eb6908", + "version-string": "2.1.11-1", + "port-version": 0 + }, + { + "git-tree": "bbb054e4dc1bbbd18887fc6a6cdb35abb9c08a17", + "version-string": "2.1.11", + "port-version": 0 + }, + { + "git-tree": "995edadf6e15a320af5ae0fcc5055074a25d0781", + "version-string": "2.1.10", + "port-version": 0 + }, + { + "git-tree": "e9ff8d204f14781a34b5937907539c2dbdaeb5d8", + "version-string": "2.1.8-5", + "port-version": 0 + }, + { + "git-tree": "761a8ed40dfb0282720dc59eaa0deaf6808abfef", + "version-string": "2.1.8-4", + "port-version": 0 + }, + { + "git-tree": "a0af7d1750ef9cb40881c97231e83f52624b463e", + "version-string": "2.1.8-3", + "port-version": 0 + }, + { + "git-tree": "2723fe4e19d8a81062fd8085e5b8d1f5c3f6174c", + "version-string": "2.1.8-2", + "port-version": 0 + }, + { + "git-tree": "a7979261bd1e0cab53cabc0206ee4e78547624fd", + "version-string": "2.1.8-1", + "port-version": 0 + }, + { + "git-tree": "2f29119492b98627d121d2eae04f4073f54df321", + "version-string": "2.1.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libevhtp.json b/port_versions/l-/libevhtp.json new file mode 100644 index 00000000000000..136900f0cdc494 --- /dev/null +++ b/port_versions/l-/libevhtp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f4b43bbb672cdd75c87f028d5ae9f587070eb55b", + "version-string": "1.2.18", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libexif.json b/port_versions/l-/libexif.json new file mode 100644 index 00000000000000..645a45bd1d1c68 --- /dev/null +++ b/port_versions/l-/libexif.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "8db41ebcc42f9b3695ac489c3ea72abb738477f5", + "version-string": "0.6.22", + "port-version": 0 + }, + { + "git-tree": "0bb1af537f815434564fdf9d81e0f4c37c5528d1", + "version-string": "0.6.21-2", + "port-version": 0 + }, + { + "git-tree": "bd8c40620aa37d57b1053b61cb0e0791bb794815", + "version-string": "0.6.21-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libfabric.json b/port_versions/l-/libfabric.json new file mode 100644 index 00000000000000..d1bd0078ea2bf2 --- /dev/null +++ b/port_versions/l-/libfabric.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "e0d8ee377354809a8031228a4a491f86beb73b81", + "version-string": "1.8.1-1", + "port-version": 0 + }, + { + "git-tree": "16efcca19286ac7f238b9b937b6f298942be6f64", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "e4688d95f61fc71681a66076e38301888333306e", + "version-string": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "ce00644b7e38e53c21a80ed372c5bdb2ba7406a7", + "version-string": "1.7.1-1", + "port-version": 0 + }, + { + "git-tree": "517d32ab45f1e6e04dca65a13b5728d4152b31c8", + "version-string": "1.7.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libffi.json b/port_versions/l-/libffi.json new file mode 100644 index 00000000000000..b9525a9a390140 --- /dev/null +++ b/port_versions/l-/libffi.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "d656f226f68b97173701d07c53633a3d05702abb", + "version-string": "3.3", + "port-version": 6 + }, + { + "git-tree": "4f8c2585308caf416f03f65903a085457ca208d1", + "version-string": "3.3", + "port-version": 5 + }, + { + "git-tree": "28ef86ae6dd4ec5207d5dd4e6030860c4617bff5", + "version-string": "3.3", + "port-version": 4 + }, + { + "git-tree": "0536ee6601d1932f0095ae7e1186ad1eb6e4c26d", + "version-string": "3.3-3", + "port-version": 0 + }, + { + "git-tree": "cd9d5f067076e9a9eb5a75a1330799e4e0af39aa", + "version-string": "3.3-2", + "port-version": 0 + }, + { + "git-tree": "7a8703938620d67e36df1f9b0d62d9b9afc7316e", + "version-string": "3.3-1", + "port-version": 0 + }, + { + "git-tree": "db6bb6b657118e37bcafd82512428614b0951269", + "version-string": "3.3", + "port-version": 0 + }, + { + "git-tree": "23026e75a4069265c509b07c28e00dd7ed5aa65a", + "version-string": "3.1-7", + "port-version": 0 + }, + { + "git-tree": "6197be84fe52ef7ff6d62ac6704d16cef0cf6277", + "version-string": "3.1-6", + "port-version": 0 + }, + { + "git-tree": "091a4da2d8358d4affb92480ff13190d62a4bf34", + "version-string": "3.1-5", + "port-version": 0 + }, + { + "git-tree": "061939a0aa8a6729d7c9ada9171da358fd256241", + "version-string": "3.1-4", + "port-version": 0 + }, + { + "git-tree": "6a1dfe49f27c9e48152c49d53a505ec70c70c51d", + "version-string": "3.1-1", + "port-version": 0 + }, + { + "git-tree": "6279494b20916bd1046844275297da3775e441e5", + "version-string": "3.1", + "port-version": 0 + }, + { + "git-tree": "4cb4682d201481f924c38850a6c7f0fed59de91e", + "version-string": "3.2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libflac.json b/port_versions/l-/libflac.json new file mode 100644 index 00000000000000..8fb44f9fd1ae11 --- /dev/null +++ b/port_versions/l-/libflac.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "2e34a0ed7543005386679cd20d4a6d13988c2492", + "version-string": "1.3.3", + "port-version": 5 + }, + { + "git-tree": "18eff4682c2e1a2f5e7b3db6cde1280b48fcf7f9", + "version-string": "1.3.3", + "port-version": 4 + }, + { + "git-tree": "95e9abb7bff34d0d49d037dc0c14d262573160fc", + "version-string": "1.3.3", + "port-version": 3 + }, + { + "git-tree": "7dd246cc52ce5a5ebd36192f999d5ad7965001ac", + "version-string": "1.3.3", + "port-version": 2 + }, + { + "git-tree": "8a6195f7d6328d0e754b79056455da25f75d5aaa", + "version-string": "1.3.3-1", + "port-version": 0 + }, + { + "git-tree": "c437f05ca049637a996059f716205112af5b7915", + "version-string": "1.3.3", + "port-version": 0 + }, + { + "git-tree": "b53507f76acb93ef8b1a31ae53c15fd751472437", + "version-string": "1.3.2-6", + "port-version": 0 + }, + { + "git-tree": "18fe3baf869af9cbb7b71435d9e0893706918941", + "version-string": "1.3.2-5", + "port-version": 0 + }, + { + "git-tree": "1ec2eed2bee308586113f3bcbd41f375618b889e", + "version-string": "1.3.2-4", + "port-version": 0 + }, + { + "git-tree": "0d94ba36b1ab5ea59e21c5be30e538dc70a55a1c", + "version-string": "1.3.2-3", + "port-version": 0 + }, + { + "git-tree": "db63997400752e6af84869fd85982bd0941f7b4f", + "version-string": "1.3.2-2", + "port-version": 0 + }, + { + "git-tree": "e5f22a2a0fc5c894b8007c63adf26c8e918f1cf7", + "version-string": "1.3.2-1", + "port-version": 0 + }, + { + "git-tree": "600b8d5b38ac82b981c60ffec8ee51d5fd5967ea", + "version-string": "1.3.2", + "port-version": 0 + }, + { + "git-tree": "75f248a016f545385854e0a6f4d9e045bac9a7d7", + "version-string": "1.3.1-1", + "port-version": 0 + }, + { + "git-tree": "a09a2bdbc4de9431a0b673ec378458f45ad2fcb0", + "version-string": "1.3.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libfort.json b/port_versions/l-/libfort.json new file mode 100644 index 00000000000000..7ebfdf38b5f784 --- /dev/null +++ b/port_versions/l-/libfort.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0c816bc07eb1bf136201ff9dfeddbb6bc921ff50", + "version-string": "0.4.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libfreenect2.json b/port_versions/l-/libfreenect2.json new file mode 100644 index 00000000000000..14772f6785cc2c --- /dev/null +++ b/port_versions/l-/libfreenect2.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "84c6e844fcefbbce598025953699c7c536e1e783", + "version-string": "0.2.0", + "port-version": 5 + }, + { + "git-tree": "d6b54e2d5f02964d0ed62c141a33379221fc0c9b", + "version-string": "0.2.0-4", + "port-version": 0 + }, + { + "git-tree": "e9cb945cc85f30f50b5bf1250f8b0b2c3cf7e1e2", + "version-string": "0.2.0-3", + "port-version": 0 + }, + { + "git-tree": "aa442fbe793ad85e7551820a8e8070f269be0b36", + "version-string": "0.2.0-2", + "port-version": 0 + }, + { + "git-tree": "ea1452158c8956337d0a1e7b137202f6b916eaeb", + "version-string": "0.2.0-1", + "port-version": 0 + }, + { + "git-tree": "1b52377d6b0d38796ee2b72ffa9778eed249d397", + "version-string": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libftdi.json b/port_versions/l-/libftdi.json new file mode 100644 index 00000000000000..7aa1df4de33437 --- /dev/null +++ b/port_versions/l-/libftdi.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "f1c47411a9b3c7872cbeaf6bdc15e010662142c4", + "version-string": "0.20-1", + "port-version": 0 + }, + { + "git-tree": "bd6f4c5fecb20eed91e7e64c213d71db1986279e", + "version-string": "0.20", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libftdi1.json b/port_versions/l-/libftdi1.json new file mode 100644 index 00000000000000..bd936c8b3bfe9d --- /dev/null +++ b/port_versions/l-/libftdi1.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "9d83012d7f5b6d0c838ce11124d77303933b4008", + "version-string": "1.4-1", + "port-version": 0 + }, + { + "git-tree": "c912cf2edca72b53fe74c00463bbcd67767733c6", + "version-string": "1.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libgcrypt.json b/port_versions/l-/libgcrypt.json new file mode 100644 index 00000000000000..6624a4d98ef524 --- /dev/null +++ b/port_versions/l-/libgcrypt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4fd1f0fdf10d205488c813a331b0547e9ab9bbc0", + "version-string": "1.8.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libgd.json b/port_versions/l-/libgd.json new file mode 100644 index 00000000000000..3f72a0e89a061a --- /dev/null +++ b/port_versions/l-/libgd.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "4b7ae023feb1082b88dfef98ddf7fe214e04f150", + "version-string": "2.2.5-4", + "port-version": 0 + }, + { + "git-tree": "81a734cda6ec896face24be96a430d97f1ab383f", + "version-string": "2.2.5-3", + "port-version": 0 + }, + { + "git-tree": "8b640bf33b8ba3766d7bc6db5a72a9f8a4ceea6b", + "version-string": "2.2.5-2", + "port-version": 0 + }, + { + "git-tree": "8bd87c35f834a67249de3660145b9de5777932e7", + "version-string": "2.2.5-1", + "port-version": 0 + }, + { + "git-tree": "e190b4414238d958e52f52f1a07ddbfd647c6a1d", + "version-string": "2.2.5", + "port-version": 0 + }, + { + "git-tree": "437ce4fdf79a521c14d9db4836dc172a3c223388", + "version-string": "2.2.4-5", + "port-version": 0 + }, + { + "git-tree": "c5107eab3c45f622c47dede23056274035d1192f", + "version-string": "2.2.4-4", + "port-version": 0 + }, + { + "git-tree": "b9f2b89639ad6eca239b1e545614a218cf691766", + "version-string": "2.2.4-3", + "port-version": 0 + }, + { + "git-tree": "e6469b934beac48e9dda641f09a865c8006f9562", + "version-string": "2.2.4-2", + "port-version": 0 + }, + { + "git-tree": "abad9ed708e0800249115e7a3cdfb3ca7bdaf487", + "version-string": "2.2.4-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libgeotiff.json b/port_versions/l-/libgeotiff.json new file mode 100644 index 00000000000000..0876dcc9a40c9b --- /dev/null +++ b/port_versions/l-/libgeotiff.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "66eb337495fb9ac5d8cfdb96195b5d1c063088b6", + "version-string": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "5c9bc07e3f09de7db58e47ea3e3ff85c54dde593", + "version-string": "1.4.2-10", + "port-version": 0 + }, + { + "git-tree": "4a29215fab2e4cb7994a00425986755f813cb21b", + "version-string": "1.4.2-9", + "port-version": 0 + }, + { + "git-tree": "1d3d0ee4657ddbd958cd116171e2f6b10cd969fa", + "version-string": "1.4.2-8", + "port-version": 0 + }, + { + "git-tree": "8dd91ef0f769529195818c1bddbdab3202026d84", + "version-string": "1.4.2-7", + "port-version": 0 + }, + { + "git-tree": "b6dec27e428ea7be87335d63e9201eeb55b1c3bc", + "version-string": "1.4.2-6", + "port-version": 0 + }, + { + "git-tree": "6752971ef7e155b673d55747f372dfb94047da0d", + "version-string": "1.4.2-4", + "port-version": 0 + }, + { + "git-tree": "1a2bbf7095fa8e9c60acf1d79571397d6c122270", + "version-string": "1.4.2-3", + "port-version": 0 + }, + { + "git-tree": "407880bac7bf6a12cc71e3884ae407cd59322970", + "version-string": "1.4.2-2", + "port-version": 0 + }, + { + "git-tree": "5d1936cbae72857694e2dd2a6c1ffa66cc93a094", + "version-string": "1.4.2-1", + "port-version": 0 + }, + { + "git-tree": "0b4e7e1425df33cf2f214fbcfe6405714c85035d", + "version-string": "1.4.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libgit2.json b/port_versions/l-/libgit2.json new file mode 100644 index 00000000000000..4449341697c970 --- /dev/null +++ b/port_versions/l-/libgit2.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "23d98ed81409eaac3ae1abc9ddbc175564533d65", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "bf4720827fa1b6b32ab6f0cce542d2fd2e05575b", + "version-string": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "d5aec3ac843b213d643bb620c1474d162b53e570", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "a61d9f70f4d286c7d65dae7a9518a811af563ef6", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "68e86f8dbab0b20029f93dfb2172cb89b8276076", + "version-string": "0.99.0-1", + "port-version": 0 + }, + { + "git-tree": "575a3301cdfdefd5b797da8ade7b372670a1f892", + "version-string": "0.99.0", + "port-version": 0 + }, + { + "git-tree": "f5b45e02da0e0385ffdd79f60f2e120f58e385ba", + "version-string": "0.28.4", + "port-version": 0 + }, + { + "git-tree": "a5b0a934e56a05edb00dfe5e7283e35551fd9e2b", + "version-string": "0.28.3", + "port-version": 0 + }, + { + "git-tree": "4b227d5c4ff561b794ed0281dfd0d880b21840b3", + "version-string": "0.28.2", + "port-version": 0 + }, + { + "git-tree": "0e5dab96476580fe3aa48e1dc6c97414b8500213", + "version-string": "0.28.1", + "port-version": 0 + }, + { + "git-tree": "97c99da4462e9db2294fbc8f85d51e569f691723", + "version-string": "0.27.4-2", + "port-version": 0 + }, + { + "git-tree": "1181932c441f6853233a862b9b4a72da81c87a9f", + "version-string": "0.27.4-1", + "port-version": 0 + }, + { + "git-tree": "87c694b4537e2f4764aca9de0e52c3341157b91f", + "version-string": "0.26.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libgo.json b/port_versions/l-/libgo.json new file mode 100644 index 00000000000000..da7c1405aeb972 --- /dev/null +++ b/port_versions/l-/libgo.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "0f54bcfa9c4d0b052bddeb9d450564ee109c0e01", + "version-string": "3.1-1", + "port-version": 0 + }, + { + "git-tree": "c09269da5eea2f0f0ee8256b6019d8fed4436b31", + "version-string": "2.8-2", + "port-version": 0 + }, + { + "git-tree": "ff2963bf164d6089016a8fc518e76bc4d68833a9", + "version-string": "2.8-1", + "port-version": 0 + }, + { + "git-tree": "b7edfdb13025ab0a269350ea8e847c0bfa615797", + "version-string": "2.8", + "port-version": 0 + }, + { + "git-tree": "42030917a263420d4e322d4e559cc5b920fc3ee6", + "version-string": "2.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libgpg-error.json b/port_versions/l-/libgpg-error.json new file mode 100644 index 00000000000000..7935378c3846d4 --- /dev/null +++ b/port_versions/l-/libgpg-error.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e5779f2d8e3f5c155d4b2e0b05661a9e0032c00a", + "version-string": "1.39", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libgpod.json b/port_versions/l-/libgpod.json new file mode 100644 index 00000000000000..a9f78ea687d836 --- /dev/null +++ b/port_versions/l-/libgpod.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "1cd0507330bb60a05e40c4761afd8e687a43b44e", + "version-string": "2019-08-29", + "port-version": 2 + }, + { + "git-tree": "8b64c54ab02529265f147d29a47970ea85077798", + "version-string": "2019-08-29", + "port-version": 1 + }, + { + "git-tree": "f676c12ba18497031a92cda2b11e88d5c84410b7", + "version-string": "2019-08-29", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libgta.json b/port_versions/l-/libgta.json new file mode 100644 index 00000000000000..c90ad2e9cf8e87 --- /dev/null +++ b/port_versions/l-/libgta.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "181fc8b0e69799143f50b56df17a83f630025eb2", + "version-string": "1.0.8-1", + "port-version": 0 + }, + { + "git-tree": "61385eecc68e5cd84e58940bba1e69454e1d24ec", + "version-string": "1.0.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libguarded.json b/port_versions/l-/libguarded.json new file mode 100644 index 00000000000000..72668d2b75ae83 --- /dev/null +++ b/port_versions/l-/libguarded.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "7ccf839a39803f3527707b0bf00818d8fe58b904", + "version-string": "2019-08-27-1", + "port-version": 0 + }, + { + "git-tree": "e7d1d03c9284203b7142d2d85aae0f959d757840", + "version-string": "2019-08-27", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libharu.json b/port_versions/l-/libharu.json new file mode 100644 index 00000000000000..6b3132ff480260 --- /dev/null +++ b/port_versions/l-/libharu.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "61662ee1cfa10c3e5244a43e24eb1f47e524c293", + "version-string": "2017-08-15-9", + "port-version": 0 + }, + { + "git-tree": "b38d6f36cdf85bd9411396a0fddfc3c486b5c8f1", + "version-string": "2017-08-15-8", + "port-version": 0 + }, + { + "git-tree": "9a90855c9cd86ff0fb98524370f5c4b46bfa5381", + "version-string": "2017-08-15-d84867ebf9f-6", + "port-version": 0 + }, + { + "git-tree": "d823a13a19523ccd3dbe078b0a571dd8b55913a2", + "version-string": "2017-08-15-d84867ebf9f-5", + "port-version": 0 + }, + { + "git-tree": "d6020be6d61ba701f9759f11dd3dcfcb7ecd71cb", + "version-string": "2017-08-15-d84867ebf9f-4", + "port-version": 0 + }, + { + "git-tree": "5b0f249b1cf476632b6125e550faf540f76e5ed5", + "version-string": "2017-08-15-d84867ebf9f-3", + "port-version": 0 + }, + { + "git-tree": "237a24c4210853cc45aec929c10e243caa371cd8", + "version-string": "2017-08-15-d84867ebf9f-2", + "port-version": 0 + }, + { + "git-tree": "074de99d046605c7ed508f054c2a76aaf85711b5", + "version-string": "2017-08-15-d84867ebf9f-1", + "port-version": 0 + }, + { + "git-tree": "a4eb9f16a5fd13d0d3a328a279b7a36977ceb5f9", + "version-string": "2017-08-15-d84867ebf9f", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libhdfs3.json b/port_versions/l-/libhdfs3.json new file mode 100644 index 00000000000000..4066a10a51eaa6 --- /dev/null +++ b/port_versions/l-/libhdfs3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7073226fafe5505d37336317d3778e3b4fa5a4a5", + "version-string": "2019-11-05", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libheif.json b/port_versions/l-/libheif.json new file mode 100644 index 00000000000000..3994ae678f761f --- /dev/null +++ b/port_versions/l-/libheif.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "c36a0bd1bad8a5b97df02274ec717586ec4729c9", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "880c4de9d6c175dfb36fc07d02cc892346e68e83", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "5f42cdf0827d6fbef347a6eb29ef5cf91f4e4fd2", + "version-string": "1.7.0", + "port-version": 1 + }, + { + "git-tree": "4f57f31ba938a5f2af9aa50ab4dbdc8f9e9875ad", + "version-string": "1.7.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libhsplasma.json b/port_versions/l-/libhsplasma.json new file mode 100644 index 00000000000000..4655181e6228e4 --- /dev/null +++ b/port_versions/l-/libhsplasma.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3cc323670945b88a5da121aa2823e4ac154d964e", + "version-string": "2020.08.30", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libhydrogen.json b/port_versions/l-/libhydrogen.json new file mode 100644 index 00000000000000..fb48d4e633d2c5 --- /dev/null +++ b/port_versions/l-/libhydrogen.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b1a85fe7d99683c20079b9e91fbcf4e847b83828", + "version-string": "2019-08-11", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libiconv.json b/port_versions/l-/libiconv.json new file mode 100644 index 00000000000000..e24310b5ddf797 --- /dev/null +++ b/port_versions/l-/libiconv.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "b052109a8f7de3bcaf5d81b92952cbe9218dea6a", + "version-string": "1.16", + "port-version": 6 + }, + { + "git-tree": "afbce7db707bbe5249bcb28a1309dc0c379f3e57", + "version-string": "1.16", + "port-version": 5 + }, + { + "git-tree": "d7c3d81803bc865526fbddc51819358d2f50c70b", + "version-string": "1.16", + "port-version": 4 + }, + { + "git-tree": "5fe32d17e257fa09b878996c2361fc0cc9a8557d", + "version-string": "1.16-3", + "port-version": 0 + }, + { + "git-tree": "a9c0310704a8d9d4156907acb93cdc1e57b823ed", + "version-string": "1.16-2", + "port-version": 0 + }, + { + "git-tree": "c7804114258b2583fcdba36a5a7a0a04cb4fd6df", + "version-string": "1.16-1", + "port-version": 0 + }, + { + "git-tree": "ab0c3de2dced7cb6f5c2642dff1c9ebe768510aa", + "version-string": "1.15-6", + "port-version": 0 + }, + { + "git-tree": "6f627058300de9d0f1e91fed3e998d5ae8b1aded", + "version-string": "1.15-5", + "port-version": 0 + }, + { + "git-tree": "8649c1b4199d6c4dd17f0c145af87a4857b1ca91", + "version-string": "1.15-4", + "port-version": 0 + }, + { + "git-tree": "bdc103a737021c5d462fe00628d48f2687d6857e", + "version-string": "1.15-3", + "port-version": 0 + }, + { + "git-tree": "5fe809f5f4e837f70f2a652bb961df7e7b279c22", + "version-string": "1.15-2", + "port-version": 0 + }, + { + "git-tree": "33ed377936de571a0f9f65aad4527621c6516db5", + "version-string": "1.15-1", + "port-version": 0 + }, + { + "git-tree": "4384b716dda76065ce3db20b003316af75199b9a", + "version-string": "1.15", + "port-version": 0 + }, + { + "git-tree": "a9e49bc2ee2b7c6587c8a824b2effe9964f5cb52", + "version-string": "1.14-1", + "port-version": 0 + }, + { + "git-tree": "465bbc8b9109a82152fd8b2f3b1c3f398db3ef03", + "version-string": "1.14", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libics.json b/port_versions/l-/libics.json new file mode 100644 index 00000000000000..19d80bfd453e24 --- /dev/null +++ b/port_versions/l-/libics.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f652729b1d084f65627ccd3c5d302bf73187bb57", + "version-string": "1.6.4", + "port-version": 0 + }, + { + "git-tree": "5624c7145f9aa355fa458c5b15f9fcdf201faf21", + "version-string": "1.6.3-1", + "port-version": 0 + }, + { + "git-tree": "9e814e329f1059f8f4d7c15dec7028bbf9617109", + "version-string": "1.6.3", + "port-version": 0 + }, + { + "git-tree": "fb0e3b40eed2a58907b28223d57b7f94f27196ba", + "version-string": "1.6.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libideviceactivation.json b/port_versions/l-/libideviceactivation.json new file mode 100644 index 00000000000000..2e31cb314d4f52 --- /dev/null +++ b/port_versions/l-/libideviceactivation.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "43967cb5db0fb8ca318d04639a77ae89026605b6", + "version-string": "1.2.235", + "port-version": 0 + }, + { + "git-tree": "d3a95f16ff5d0f5e92e8be76e2b453027e575604", + "version-string": "1.2.137", + "port-version": 0 + }, + { + "git-tree": "072f67a6ea4457b5982120c0459b688ccb2776e2", + "version-string": "1.2.68-1", + "port-version": 0 + }, + { + "git-tree": "995a0daa36f0dbcf66e12903bee9c8b7fc00f32f", + "version-string": "1.2.68", + "port-version": 0 + }, + { + "git-tree": "e491adb9e3d6aaf77e73404669006604161f6c52", + "version-string": "1.0.38-2", + "port-version": 0 + }, + { + "git-tree": "6e307fdd591ebac7a67f8fd239b6c54835159fd1", + "version-string": "1.0.38-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libidn2.json b/port_versions/l-/libidn2.json new file mode 100644 index 00000000000000..cbf0a4fb2d0652 --- /dev/null +++ b/port_versions/l-/libidn2.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "6d198421acf88e8196da7f2d1389100307f92133", + "version-string": "2.3.0", + "port-version": 1 + }, + { + "git-tree": "70fb6d70d7d6adf103e7270339c9ba0e0d694f79", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "1da1380be0b16e54e7ba1ac3e8730784a11c000a", + "version-string": "2.2.0", + "port-version": 2 + }, + { + "git-tree": "54d6f84814f915ac5c7def82468c484de592e98b", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "c96569e3132e70e8514a55056bcd3855bfb33281", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "c0433fb316d494bd1c0c677e57dd90c2502ceab1", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "c65459cf683915aaa9220e1f0db5535439ce9502", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "9a8426d139ecc461160d348054344cd5f5363266", + "version-string": "2.0.5-1", + "port-version": 0 + }, + { + "git-tree": "9d7bbdb564c8353ca7780fc1edbec776d7f8a691", + "version-string": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "e7d7728b059c0ccf7479c91f91d7a3c5ac702d1b", + "version-string": "2.0.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libigl.json b/port_versions/l-/libigl.json new file mode 100644 index 00000000000000..e0509e899c4afe --- /dev/null +++ b/port_versions/l-/libigl.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b953afc0875516000dd3c3e694b0d1fc788b8e19", + "version-string": "2.2.0", + "port-version": 3 + }, + { + "git-tree": "d12ae1d471da6da7e58a58c05cd82cbd4374ca62", + "version-string": "2.2.0", + "port-version": 2 + }, + { + "git-tree": "c0371b4519f4787b8e60a0a01a4622cc4b4c4925", + "version-string": "2.2.0", + "port-version": 1 + }, + { + "git-tree": "3f26318d49690bb4825cf755f2938afd7c02677c", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "c2417ed73b6fcc0d72265da85ff542c2cfd2d036", + "version-string": "2.1.0-2", + "port-version": 0 + }, + { + "git-tree": "9f66721b3dbaf06d6b21878377418d6147bd4cbc", + "version-string": "2.1.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libilbc.json b/port_versions/l-/libilbc.json new file mode 100644 index 00000000000000..eb295e583971eb --- /dev/null +++ b/port_versions/l-/libilbc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "71c62e89d45d6ab7cfecf0027e3ba9c9fd0f4e89", + "version-string": "3.0.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libimobiledevice.json b/port_versions/l-/libimobiledevice.json new file mode 100644 index 00000000000000..1bb409b7ef1ad9 --- /dev/null +++ b/port_versions/l-/libimobiledevice.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "7af0cdbc3aa310e494be7c17efc198be75593e92", + "version-string": "1.3.6", + "port-version": 1 + }, + { + "git-tree": "7ed237d91c939961732a5c8afcd0b7b77b48dd58", + "version-string": "1.3.6", + "port-version": 0 + }, + { + "git-tree": "a7f4551d6b342316738423b1ee2bba7e1899d006", + "version-string": "1.2.185", + "port-version": 0 + }, + { + "git-tree": "2268dec3bcccfa3de7b7695e9e20b386c3e2fcf8", + "version-string": "1.2.137", + "port-version": 0 + }, + { + "git-tree": "d494fc5bad37d22dce92b29682df2033ae6f9833", + "version-string": "1.2.76", + "port-version": 0 + }, + { + "git-tree": "dbfe6e9f95c61bf8cbccf8e9896715a61636f2e4", + "version-string": "1.2.1.215-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libirecovery.json b/port_versions/l-/libirecovery.json new file mode 100644 index 00000000000000..fe8b272c55b566 --- /dev/null +++ b/port_versions/l-/libirecovery.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "9ea37c179cee88aa14450622ac673bbb7ce8eb88", + "version-string": "1.0.25-2", + "port-version": 0 + }, + { + "git-tree": "9dc6f56a654ca4ec61a2bd4cd19ade27d9e10841", + "version-string": "1.0.25-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libjpeg-turbo.json b/port_versions/l-/libjpeg-turbo.json new file mode 100644 index 00000000000000..43f6553968612c --- /dev/null +++ b/port_versions/l-/libjpeg-turbo.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "cf4b226059c3e824fc31962ba1afde783f7f1833", + "version-string": "2.0.5", + "port-version": 3 + }, + { + "git-tree": "769ce1b935b91ea1ec2f3d76cd3708dec3e1b565", + "version-string": "2.0.5", + "port-version": 2 + }, + { + "git-tree": "0cc64a738991909ff19e91167458517fec81c63d", + "version-string": "2.0.5", + "port-version": 1 + }, + { + "git-tree": "49f7653ab5a15a52511b05a3fbadc4e6126b2031", + "version-string": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "5a4d55bc4c964d84a8ed03f61a1ecd7937c4a066", + "version-string": "2.0.4", + "port-version": 0 + }, + { + "git-tree": "61a5d22ba7121fd7bbb445371b48abaf27bb650e", + "version-string": "2.0.3", + "port-version": 0 + }, + { + "git-tree": "58fb3b2fd2cca2185bfce8035019e2dc295740b5", + "version-string": "2.0.2", + "port-version": 0 + }, + { + "git-tree": "ceafc2a970c04c9c391fd3d020de793a7573e203", + "version-string": "2.0.1-1", + "port-version": 0 + }, + { + "git-tree": "f5006e3c642292f8e287c4f85d4697a170252115", + "version-string": "1.5.3-2", + "port-version": 0 + }, + { + "git-tree": "15b8e5e07bf506f4eab4fc29219c35acf110b1fa", + "version-string": "1.5.3-1", + "port-version": 0 + }, + { + "git-tree": "360a48e9c4d7cff45917c0019190043cf0e5a1a3", + "version-string": "1.5.3", + "port-version": 0 + }, + { + "git-tree": "26dcc564116a6350ce1be8e530b820434733b22e", + "version-string": "1.5.2-2", + "port-version": 0 + }, + { + "git-tree": "06b4287c029a8684485e937a28b1cd32dd2c4194", + "version-string": "1.5.2-1", + "port-version": 0 + }, + { + "git-tree": "b4016b566b7d8d51ebf7607be142fb51ea9432a0", + "version-string": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "be8bea575e46448d133a68b628f8b637d417b3fe", + "version-string": "1.5.1-1", + "port-version": 0 + }, + { + "git-tree": "9247fbac463498da5095cef9d680f3c0b3544754", + "version-string": "1.4.90-1", + "port-version": 0 + }, + { + "git-tree": "080f92f39008e2f69b00ff1f474b1ac344fbafc5", + "version-string": "1.4.90-2", + "port-version": 0 + }, + { + "git-tree": "27233b528c1e7d9e9e468521d2b58473cc0a2b37", + "version-string": "1.4.90-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libjuice.json b/port_versions/l-/libjuice.json new file mode 100644 index 00000000000000..abd1cc8361647d --- /dev/null +++ b/port_versions/l-/libjuice.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e7ef5f1f7d883e5f8a7dcb52ea5821730281e375", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "44d596ff7bfe74a699564ed6dcca46001f4ff95b", + "version-string": "0.5.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libkml.json b/port_versions/l-/libkml.json new file mode 100644 index 00000000000000..eeeb7d30939399 --- /dev/null +++ b/port_versions/l-/libkml.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "6c50197fe3bf38682b4e551e501834817990ad3e", + "version-string": "1.3.0", + "port-version": 6 + }, + { + "git-tree": "1e5d050adfd9a0b7f79674fec5f355c059d9672c", + "version-string": "1.3.0", + "port-version": 5 + }, + { + "git-tree": "7c7a760c34c4657583058b26eaec51e577ab5fd5", + "version-string": "1.3.0-4", + "port-version": 0 + }, + { + "git-tree": "a181cbd8a609bbf04ee0d78eb1d7e35db07eba2a", + "version-string": "1.3.0-3", + "port-version": 0 + }, + { + "git-tree": "4fa998e43456236b384a2837c8d5172faef37e60", + "version-string": "1.3.0-2", + "port-version": 0 + }, + { + "git-tree": "0f858c8c5a7046e08761a824310fc453e724f108", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "048c6dda3ebb7541f030b10d1b7167b758b68072", + "version-string": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/liblas.json b/port_versions/l-/liblas.json new file mode 100644 index 00000000000000..6f2e219f0444ad --- /dev/null +++ b/port_versions/l-/liblas.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "3574373c93114a9a7bac598140a5a7c875830b4c", + "version-string": "1.8.1", + "port-version": 5 + }, + { + "git-tree": "b179348675e217b5dcc7230e1570585052e0fa8b", + "version-string": "1.8.1-4", + "port-version": 0 + }, + { + "git-tree": "5cbb0bdb6c7ba1b6e6929b635e07835439cff84f", + "version-string": "1.8.1-3", + "port-version": 0 + }, + { + "git-tree": "22b7fe0952c471a8663aa391a507ea8c746622c1", + "version-string": "1.8.1-2", + "port-version": 0 + }, + { + "git-tree": "8e2902e592c4962637846be3b8e0a3f1b9a51125", + "version-string": "1.8.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/liblbfgs.json b/port_versions/l-/liblbfgs.json new file mode 100644 index 00000000000000..0b945332a104b8 --- /dev/null +++ b/port_versions/l-/liblbfgs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4529e3e615f7e8db5dc69cafeec67c56eccc81b3", + "version-string": "1.10", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/liblemon.json b/port_versions/l-/liblemon.json new file mode 100644 index 00000000000000..55bf1c44edf552 --- /dev/null +++ b/port_versions/l-/liblemon.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "7539b1a880c2328db9aacdc9c8f5475abfbd1af2", + "version-string": "2019-06-13-1", + "port-version": 0 + }, + { + "git-tree": "3f25cabf02c7a7257f79ec3578eb5a7f797419c8", + "version-string": "2019-06-13", + "port-version": 0 + }, + { + "git-tree": "b40bf74431a9cfa800bed32e3c749f909de79d56", + "version-string": "1.3.1-5", + "port-version": 0 + }, + { + "git-tree": "1af30639293df04ca201764c213c63e0249c722f", + "version-string": "1.3.1-4", + "port-version": 0 + }, + { + "git-tree": "5963376d21c03c526520f226327c151886f84725", + "version-string": "1.3.1-3", + "port-version": 0 + }, + { + "git-tree": "5dbb03bed23825b0426765fe6056f2ee5e1b88b9", + "version-string": "1.3.1-2", + "port-version": 0 + }, + { + "git-tree": "8fe17928a54d671313210fc5d87f10346f9722fe", + "version-string": "1.3.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/liblinear.json b/port_versions/l-/liblinear.json new file mode 100644 index 00000000000000..1cb52696bdabcb --- /dev/null +++ b/port_versions/l-/liblinear.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "32c7a7c42530041f778e5a00b54c43ebcc0839d9", + "version-string": "241", + "port-version": 0 + }, + { + "git-tree": "04930634ee33ea24d8c6ba641efb68fa351e72a3", + "version-string": "230", + "port-version": 0 + }, + { + "git-tree": "9493c2df9784da5bc8240c40b9ffd48ce4963f2c", + "version-string": "221", + "port-version": 0 + }, + { + "git-tree": "d16d08633b19af9b8127ddfc9dfbd76762fc483c", + "version-string": "2.20-1", + "port-version": 0 + }, + { + "git-tree": "14b47b11489ed90e06d62957ea7f4b59bd7bd5d1", + "version-string": "2.20", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/liblo.json b/port_versions/l-/liblo.json new file mode 100644 index 00000000000000..2905fd1652ee26 --- /dev/null +++ b/port_versions/l-/liblo.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "04145d21ab7fff62c0bbf2a8846bc9ddea192fe2", + "version-string": "0.31", + "port-version": 0 + }, + { + "git-tree": "955bb9b2c2c3733a393e8994f564db99fcf48eaa", + "version-string": "0.30", + "port-version": 0 + }, + { + "git-tree": "989742f420562c4ec77fcba6cb2ec8b55c5a182c", + "version-string": "0.29-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/liblsl.json b/port_versions/l-/liblsl.json new file mode 100644 index 00000000000000..7f82764116fda7 --- /dev/null +++ b/port_versions/l-/liblsl.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "1b86d81c846a0b8f0ad92ce19598e58b56096d08", + "version-string": "1.13.1", + "port-version": 0 + }, + { + "git-tree": "19cc4be860bac6d78fff411bb1dc4d95a4e13e3c", + "version-string": "1.13.0-b11-1", + "port-version": 0 + }, + { + "git-tree": "839131ef1046d5bf58423cc38c288b1a3593eaf3", + "version-string": "1.13.0-b6", + "port-version": 0 + }, + { + "git-tree": "d096418168b41c1397e02c19bde87e84f838d17c", + "version-string": "1.13.0-b4", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/liblzma.json b/port_versions/l-/liblzma.json new file mode 100644 index 00000000000000..447217eb5870c9 --- /dev/null +++ b/port_versions/l-/liblzma.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "5f491131f98307f42a98db7ad0b5455225481284", + "version-string": "5.2.5", + "port-version": 2 + }, + { + "git-tree": "8b088dc17c860297c2194e10fa84355e26fc293a", + "version-string": "5.2.5", + "port-version": 1 + }, + { + "git-tree": "e6324c3a75d4fd1aa7e4078f85592818c8934383", + "version-string": "5.2.5", + "port-version": 0 + }, + { + "git-tree": "8473055bf10e2d328c82b20b6d4077e8afd0f272", + "version-string": "5.2.4-5", + "port-version": 0 + }, + { + "git-tree": "76901b9e8ffbefe77bbea09cb4b15c762989c49e", + "version-string": "5.2.4-4", + "port-version": 0 + }, + { + "git-tree": "5f42fd04403c55903255ee26c6dcc339f96fdb00", + "version-string": "5.2.4-3", + "port-version": 0 + }, + { + "git-tree": "52e41a9999f93713955c41adefd1317d981b8f86", + "version-string": "5.2.4-2", + "port-version": 0 + }, + { + "git-tree": "ad603b071c4b2c21683b3c94363fb70386ccb89b", + "version-string": "5.2.4-1", + "port-version": 0 + }, + { + "git-tree": "2f263992faf646223d85972d976670263bb83e87", + "version-string": "5.2.4", + "port-version": 0 + }, + { + "git-tree": "31e8c795a672dd2732b5fd8d9354e95b9c03e953", + "version-string": "5.2.3-2", + "port-version": 0 + }, + { + "git-tree": "32c1e5f0a624ad03b3d84689363a2a96c2d3448b", + "version-string": "5.2.3-1", + "port-version": 0 + }, + { + "git-tree": "148f9b1c414a8cf689afbc7dbfa89f5d67195215", + "version-string": "5.2.3", + "port-version": 0 + }, + { + "git-tree": "ad0847810a01cf57bfc0e08182b15dacba3ebbba", + "version-string": "5.2.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmad.json b/port_versions/l-/libmad.json new file mode 100644 index 00000000000000..229ae83d2b425d --- /dev/null +++ b/port_versions/l-/libmad.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "c26ef39816280a812e249d0af4ba2ce58a0cf19d", + "version-string": "0.15.1-8", + "port-version": 0 + }, + { + "git-tree": "6b2336b239a812d626ac6c62ab857d5dd46b7381", + "version-string": "0.15.1-6", + "port-version": 0 + }, + { + "git-tree": "28aadf7073b547e09a2fc85945a5081a4f285c07", + "version-string": "0.15.1-5", + "port-version": 0 + }, + { + "git-tree": "ff4a50dd4fa6d6f7bd1dac496f3a2f5094878111", + "version-string": "0.15.1-4", + "port-version": 0 + }, + { + "git-tree": "b05e64321f97af083e700f35d3e3347ccb1d537b", + "version-string": "0.15.1-3", + "port-version": 0 + }, + { + "git-tree": "c35949aaadbab59dcb960d25e46028324bbaaa05", + "version-string": "0.15.1-2", + "port-version": 0 + }, + { + "git-tree": "a8c706e67ff6ac3ff9a27e76511f8b5bbc752c19", + "version-string": "0.15.1-1", + "port-version": 0 + }, + { + "git-tree": "58458427ddd0f76c199e688e2135ce93e27d2259", + "version-string": "0.15.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmagic.json b/port_versions/l-/libmagic.json new file mode 100644 index 00000000000000..8c87dda1141b23 --- /dev/null +++ b/port_versions/l-/libmagic.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "65fc18d3b2ed34a290f7774c58e480e7d06bebe3", + "version-string": "5.37", + "port-version": 2 + }, + { + "git-tree": "eb82053ea20e33eaab4ab90e63792d1368eb7f1e", + "version-string": "5.37-1", + "port-version": 0 + }, + { + "git-tree": "a74e0ff542f30cd83417dfc861fdcf1f2531b89a", + "version-string": "5.37", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmariadb.json b/port_versions/l-/libmariadb.json new file mode 100644 index 00000000000000..7f5f8fda8e67e3 --- /dev/null +++ b/port_versions/l-/libmariadb.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "a5144f1b965487813bfd011e1d7ca18877d2ec69", + "version-string": "3.1.10", + "port-version": 4 + }, + { + "git-tree": "b51ccd894eede106825f440bd76234a65c34fe88", + "version-string": "3.1.10", + "port-version": 3 + }, + { + "git-tree": "d806f8975881bc26f412c5b283bd061d50bbb1df", + "version-string": "3.1.10", + "port-version": 2 + }, + { + "git-tree": "0d47b5782124a713a3e19dd0b8007f16d845ed09", + "version-string": "3.1.10", + "port-version": 1 + }, + { + "git-tree": "be4f726dedfa256e8423910f3f2c32ceee48238a", + "version-string": "3.1.10", + "port-version": 0 + }, + { + "git-tree": "c20fd7fc8a26381830b000f405730083ca87b8d4", + "version-string": "3.1.9", + "port-version": 1 + }, + { + "git-tree": "0c9958a4a233c42a2dca962ce8376ecb864bf36e", + "version-string": "3.1.9", + "port-version": 0 + }, + { + "git-tree": "bde124d88a95f5d33f721cea21c6d540f6579583", + "version-string": "3.1.7", + "port-version": 2 + }, + { + "git-tree": "a3608e33a968664ce8e8fd1256714263cc2a8266", + "version-string": "3.1.7-1", + "port-version": 0 + }, + { + "git-tree": "23c69eec140ae4e8134cd419f30e88d963ee0f9b", + "version-string": "3.1.7", + "port-version": 0 + }, + { + "git-tree": "91d5e5e9b2998307402852742ad6c0df87be76e4", + "version-string": "3.0.10-4", + "port-version": 0 + }, + { + "git-tree": "a69dbb90a538e91339f348574a98baf60abb1114", + "version-string": "3.0.10-3", + "port-version": 0 + }, + { + "git-tree": "1c8b8c7391d1c8ba12335309859dad2783cc6f4c", + "version-string": "3.0.10-2", + "port-version": 0 + }, + { + "git-tree": "cb7218e11b728314793c9cdabe33be5a4b321f31", + "version-string": "3.0.10-1", + "port-version": 0 + }, + { + "git-tree": "92be4bccd9ff67e9edd00507aae91ef8021a059a", + "version-string": "3.0.10", + "port-version": 0 + }, + { + "git-tree": "75b8ac87d9bbe26778858dfb8a3d015edda86146", + "version-string": "3.0.2-1", + "port-version": 0 + }, + { + "git-tree": "75fe8f58ba057e113dd232cf50c393c92f414541", + "version-string": "3.0.2", + "port-version": 0 + }, + { + "git-tree": "be8d653419ccd968eee9845950b82301bfc3fa9c", + "version-string": "2.3.2-1", + "port-version": 0 + }, + { + "git-tree": "25b8760f4ff73d8113d4f9c42f20cba6f03733da", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "1528a74763684860a1766393fb6bd7dfa7a608ac", + "version-string": "2.3.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmaxminddb.json b/port_versions/l-/libmaxminddb.json new file mode 100644 index 00000000000000..d6d9a9c3eef9bc --- /dev/null +++ b/port_versions/l-/libmaxminddb.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "705c0ebe7b045c299e7222fd49afd7625e3e1aaf", + "version-string": "1.4.3", + "port-version": 0 + }, + { + "git-tree": "76800a1a88d9b1f3bb854357e6e2f5c217672cc9", + "version-string": "1.3.2-2", + "port-version": 0 + }, + { + "git-tree": "dfcdb10d9c258dcd361087cd5320465c1e101004", + "version-string": "1.3.2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmediainfo.json b/port_versions/l-/libmediainfo.json new file mode 100644 index 00000000000000..e40cf3845e93b7 --- /dev/null +++ b/port_versions/l-/libmediainfo.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e23c8e758ec10752765cf5fd0c4f86ff4fc0515c", + "version-string": "20.09", + "port-version": 0 + }, + { + "git-tree": "728e6655179fb03500a6107cebf44db5376896c7", + "version-string": "20.08", + "port-version": 0 + }, + { + "git-tree": "24d67c3e1f9ee9b8054ce5c88ead1b782b2b37cd", + "version-string": "20.03", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmesh.json b/port_versions/l-/libmesh.json new file mode 100644 index 00000000000000..f46fc134c8507f --- /dev/null +++ b/port_versions/l-/libmesh.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "eed08886ca377bad4a4ad13c6683ddf547d705f0", + "version-string": "1.5.0-1", + "port-version": 0 + }, + { + "git-tree": "34a49390d12bb52a775af55f2f3ef336b1ce75ea", + "version-string": "1.5.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmicrohttpd.json b/port_versions/l-/libmicrohttpd.json new file mode 100644 index 00000000000000..dc63982f4d9d8c --- /dev/null +++ b/port_versions/l-/libmicrohttpd.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "cac6e4ea3735af7edab56f44c788bb01c987f2cf", + "version-string": "0.9.63", + "port-version": 4 + }, + { + "git-tree": "09915820de8e9a88fc6e7d2f6b8104f74eba4255", + "version-string": "0.9.63-3", + "port-version": 0 + }, + { + "git-tree": "c7d547c67ad61a4814276ef85639f6fed0245ff2", + "version-string": "0.9.63-2", + "port-version": 0 + }, + { + "git-tree": "2312e10c3b62d9d00497f01c2d72305b8e2b49df", + "version-string": "0.9.63-1", + "port-version": 0 + }, + { + "git-tree": "ecbaccb073380108a8b0ac04950b266da324884e", + "version-string": "0.9.63", + "port-version": 0 + }, + { + "git-tree": "e9a2ee94ab122b0ef43b63abffca45e7de0ef7af", + "version-string": "0.9.55-2", + "port-version": 0 + }, + { + "git-tree": "07c9736135f392f71c47086032139bd86f06318a", + "version-string": "0.9.55-1", + "port-version": 0 + }, + { + "git-tree": "078011b1c9de2e2197a9f88f16e4c0753f22e807", + "version-string": "0.9.55", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmikmod.json b/port_versions/l-/libmikmod.json new file mode 100644 index 00000000000000..3932f070d9b841 --- /dev/null +++ b/port_versions/l-/libmikmod.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "7eb5deb666796bf91d2429c28325aa738b9e8941", + "version-string": "3.3.11.1-8", + "port-version": 0 + }, + { + "git-tree": "caef9c52f9cfd46ced189519b893a8e1ddbbfa60", + "version-string": "3.3.11.1-6", + "port-version": 0 + }, + { + "git-tree": "dc172c9f36270cc3ac3044b13c5347ade4161a41", + "version-string": "3.3.11.1-5", + "port-version": 0 + }, + { + "git-tree": "4b1f8bafd9ba033af7ed8b21792e5896e23506d6", + "version-string": "3.3.11.1-4", + "port-version": 0 + }, + { + "git-tree": "65abc8f67c4b5e9332dfe42b4d06917a8ce454e0", + "version-string": "3.3.11.1-3", + "port-version": 0 + }, + { + "git-tree": "c1469a0214fe5fc350b64b8e76a58d901e42eef8", + "version-string": "3.3.11.1-2", + "port-version": 0 + }, + { + "git-tree": "afb47de2cf016bfd0ee2908f215a347c42700295", + "version-string": "3.3.11.1-1", + "port-version": 0 + }, + { + "git-tree": "899114150e1e27cac798735ded8b64fde8091f0b", + "version-string": "3.3.11.1", + "port-version": 0 + }, + { + "git-tree": "13faef585a51d40b3ee8c4b93b5184580acc42ce", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmodbus.json b/port_versions/l-/libmodbus.json new file mode 100644 index 00000000000000..86be284b35cf4e --- /dev/null +++ b/port_versions/l-/libmodbus.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a4d3ea1104f095d0d92d4f81d595776ad6f6b21e", + "version-string": "3.1.6", + "port-version": 1 + }, + { + "git-tree": "14f8c63e6b84b9808a932fb9ebb5bfcc9fef9379", + "version-string": "3.1.6", + "port-version": 0 + }, + { + "git-tree": "8a6ed1f9d8fc54dfddc7b7ef13533986bfd69650", + "version-string": "3.1.4-3", + "port-version": 0 + }, + { + "git-tree": "4141969200fb31e385d6b3b71b5a15d9279254db", + "version-string": "3.1.4-2", + "port-version": 0 + }, + { + "git-tree": "7cb14af768b4f6dd12dd09cc5c810476df3d9634", + "version-string": "3.1.4-1", + "port-version": 0 + }, + { + "git-tree": "2bf86a64f96fc663a0fcd1b3ffbf6a38f3024a5a", + "version-string": "3.1.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmodman.json b/port_versions/l-/libmodman.json new file mode 100644 index 00000000000000..e1e4f572c60b8d --- /dev/null +++ b/port_versions/l-/libmodman.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "5ac70c470d670ed354de7816cd2bb9905a416dd4", + "version-string": "2.0.1-2", + "port-version": 0 + }, + { + "git-tree": "f8766c1199b7c29224c1b5a94d5a4468cd868d8d", + "version-string": "2.0.1-1", + "port-version": 0 + }, + { + "git-tree": "a64cff60dc77d03ed13c4d5a952b65f89ff6b038", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmodplug.json b/port_versions/l-/libmodplug.json new file mode 100644 index 00000000000000..1fcfa21d183634 --- /dev/null +++ b/port_versions/l-/libmodplug.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "0a5fabb8c35482c3d20e2f207305fd233614c59f", + "version-string": "0.8.9.0", + "port-version": 6 + }, + { + "git-tree": "3834aa81e2a7dc9b9ddcd268025f15d416d9cc90", + "version-string": "0.8.9.0-5", + "port-version": 0 + }, + { + "git-tree": "7d60a38137ff54c27753f2b9e8510c08d600db37", + "version-string": "0.8.9.0-4", + "port-version": 0 + }, + { + "git-tree": "1a7deb53e497a659aa598674fb8140fbaa056703", + "version-string": "0.8.9.0-1", + "port-version": 0 + }, + { + "git-tree": "336af40643d140ed0b62319f78a7336a68d89686", + "version-string": "0.8.9.0", + "port-version": 0 + }, + { + "git-tree": "c2eb36b37f21500fded6ac3aa2929125abdfa6f4", + "version-string": "0.8.8.5-bb25b05", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmorton.json b/port_versions/l-/libmorton.json new file mode 100644 index 00000000000000..801cbb5da486ab --- /dev/null +++ b/port_versions/l-/libmorton.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "fbd978aad91d4f85ec74e46325cf5773be1280a8", + "version-string": "0.2", + "port-version": 0 + }, + { + "git-tree": "e6824fc50e5fdec32f5e3f33bef1a46f7be0f209", + "version-string": "2018-19-07", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmpeg2.json b/port_versions/l-/libmpeg2.json new file mode 100644 index 00000000000000..b075a4aaf0a9f6 --- /dev/null +++ b/port_versions/l-/libmpeg2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "aaea63d5784de13698d5ceb11cf787036bb59412", + "version-string": "0.5.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmspack.json b/port_versions/l-/libmspack.json new file mode 100644 index 00000000000000..5e763927fa51c4 --- /dev/null +++ b/port_versions/l-/libmspack.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "88f3db0838dd22e6cfaa675e76bd95d056cc25c8", + "version-string": "0.10.1-3", + "port-version": 0 + }, + { + "git-tree": "b04763f5313c5c7e7941856bc77f5ec34933ead9", + "version-string": "0.10.1-2", + "port-version": 0 + }, + { + "git-tree": "4371cff2fcd92f3b76a4e327c4eee9404a002b07", + "version-string": "0.10.1-1", + "port-version": 0 + }, + { + "git-tree": "28a14d21a10f8a2555b220f3d40d47cbdeaacaac", + "version-string": "0.10.1", + "port-version": 0 + }, + { + "git-tree": "2bd3912befc3c55eecdca04a2aa2db069aca99a9", + "version-string": "0.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmupdf.json b/port_versions/l-/libmupdf.json new file mode 100644 index 00000000000000..0d3ff20be1926c --- /dev/null +++ b/port_versions/l-/libmupdf.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "df4714ec8c7080d91b3fc0ed0db8c91557d1bfbf", + "version-string": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "4fe8e682a3dc45c30c9681eb5936a59f1deb7b2d", + "version-string": "1.17.0", + "port-version": 0 + }, + { + "git-tree": "6d0f3ee6b915bdbcfa75947be9479eed0141f70f", + "version-string": "1.16.1-1", + "port-version": 0 + }, + { + "git-tree": "8c9e8113d3448ff213f4eb7944fd3b6e312d89cf", + "version-string": "1.16.1", + "port-version": 0 + }, + { + "git-tree": "73e9a6f5065af3ac509c6d9a228ee83118451db6", + "version-string": "1.15.0-2", + "port-version": 0 + }, + { + "git-tree": "de715c7b3f12678c527d4e9a63d8f874419fcaad", + "version-string": "1.15.0-1", + "port-version": 0 + }, + { + "git-tree": "2cbf0f1c8140edb488355c76e551d38665827f6c", + "version-string": "1.15.0", + "port-version": 0 + }, + { + "git-tree": "5d46163fa51afb7c9c5e9de15260748f968d5518", + "version-string": "1.12.0-2", + "port-version": 0 + }, + { + "git-tree": "bb8354451e9b0b707d7cbc2ee25bda8caf9390d4", + "version-string": "1.12.0-1", + "port-version": 0 + }, + { + "git-tree": "2ff9da6ae129a60ce6b3e2e7096b3e256931d14f", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "bdca9e2b648d8b3eb0df7c0e748b5ec2a9294827", + "version-string": "1.11-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libmysql.json b/port_versions/l-/libmysql.json new file mode 100644 index 00000000000000..b58553e67f2f4b --- /dev/null +++ b/port_versions/l-/libmysql.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "0ef74d8a7cfbd48a4f57f48775212ccd9cdb06fb", + "version-string": "8.0.20", + "port-version": 1 + }, + { + "git-tree": "cabaaa23c6230ffa18cbb8d6b04adbb25b2086f0", + "version-string": "8.0.20", + "port-version": 0 + }, + { + "git-tree": "278c8ed6ca036e0bcd5d7cc57141909f401fdae4", + "version-string": "8.0.4-7", + "port-version": 0 + }, + { + "git-tree": "ed400af1061cf2a7be402c2df3e070fc50e5ce0a", + "version-string": "8.0.4-6", + "port-version": 0 + }, + { + "git-tree": "95dfbbd8b2721c1975c237c16606763197f8ee1d", + "version-string": "8.0.4-5", + "port-version": 0 + }, + { + "git-tree": "7db4f9f93b2268ff2bc9e90b43142b870f82328a", + "version-string": "8.0.4-4", + "port-version": 0 + }, + { + "git-tree": "5c08788f2d1ffba12bf3afc55efecba5d3bdcff2", + "version-string": "8.0.4-3", + "port-version": 0 + }, + { + "git-tree": "fc557f43eee608a394b5c30077ebf89700cc00aa", + "version-string": "8.0.4-2", + "port-version": 0 + }, + { + "git-tree": "626218b993e9351fa745f5ec98e735ebd5dd4141", + "version-string": "8.0.4-1", + "port-version": 0 + }, + { + "git-tree": "82254867a4a6a92edc660b33950002ed6d036ef8", + "version-string": "8.0.4", + "port-version": 0 + }, + { + "git-tree": "30f1eee741d6732c1e6ccaa76f6a7376d5cb422c", + "version-string": "5.7.17-3", + "port-version": 0 + }, + { + "git-tree": "00ad577bc85a41fc265f9e3bff1082836e50b3fb", + "version-string": "5.7.17-2", + "port-version": 0 + }, + { + "git-tree": "13a36a27f9eed3bd32a71974de3ad0dbb4b83f43", + "version-string": "5.7.17-1", + "port-version": 0 + }, + { + "git-tree": "e77303faa29be5f9a63d630fa24c1d82f22cda6a", + "version-string": "5.7.17", + "port-version": 0 + }, + { + "git-tree": "bd8444042adf5f24eceafe33353340c2f0961a5b", + "version-string": "5.7.16", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libnice.json b/port_versions/l-/libnice.json new file mode 100644 index 00000000000000..8da130a656e44f --- /dev/null +++ b/port_versions/l-/libnice.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "bc6867011695c2bf8e1d0f0d5b23f1f7f519c0a8", + "version-string": "0.1.15", + "port-version": 6 + }, + { + "git-tree": "cca19eca1211ef6e97c39e5d6e9b9c9a486faa77", + "version-string": "0.1.15", + "port-version": 5 + }, + { + "git-tree": "b85e2aba892bad70efb3cf52f3c62a4d495df1e1", + "version-string": "0.1.15-4", + "port-version": 0 + }, + { + "git-tree": "e59899e82498a678d30bb7dcbbdff1698309d688", + "version-string": "0.1.15-3", + "port-version": 0 + }, + { + "git-tree": "92c5a136812ea3e6db421c7818725839bd91f455", + "version-string": "0.1.15-2", + "port-version": 0 + }, + { + "git-tree": "6d605c50e320a19aa51007fc88b94694efd26db0", + "version-string": "0.1.15-1", + "port-version": 0 + }, + { + "git-tree": "825592ca9bfd990b0fabe8dfd3e3a2f9e9f55c73", + "version-string": "0.1.15", + "port-version": 0 + }, + { + "git-tree": "efa8cc0a896aad6d52a23aa144d4436f387b5d17", + "version-string": "0.1.13-2", + "port-version": 0 + }, + { + "git-tree": "f8fd6b57f8c458dcdb060c724d63a097940e32c1", + "version-string": "0.1.13-1", + "port-version": 0 + }, + { + "git-tree": "e4477edc70a662f2c2b2727011ab8605e9699402", + "version-string": "0.1.13", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libnoise.json b/port_versions/l-/libnoise.json new file mode 100644 index 00000000000000..1f44114f12bdb2 --- /dev/null +++ b/port_versions/l-/libnoise.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "9174e744d86273338a1e3c4a341329647730e19f", + "version-string": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "e2baf140c6627726c78cdd4c993baf9c5e7714c0", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libodb-boost.json b/port_versions/l-/libodb-boost.json new file mode 100644 index 00000000000000..9370253dd48a0a --- /dev/null +++ b/port_versions/l-/libodb-boost.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "70c909cead2fcecc32b1be6da761fd8aaf74a95a", + "version-string": "2.4.0-3", + "port-version": 0 + }, + { + "git-tree": "db2bd00d414b9c42084fee42399c5166e71eae82", + "version-string": "2.4.0-2", + "port-version": 0 + }, + { + "git-tree": "01fb906b12ef56e1e67d2165befb9590192bdbb1", + "version-string": "2.4.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libodb-mysql.json b/port_versions/l-/libodb-mysql.json new file mode 100644 index 00000000000000..d6a885a1b38772 --- /dev/null +++ b/port_versions/l-/libodb-mysql.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "684fea6cb54563fb4d54b05b259ecb6b5cbd0266", + "version-string": "2.4.0-7", + "port-version": 0 + }, + { + "git-tree": "0059dc89a4e3f9fb43f4cd33bd23b9671cc46ee8", + "version-string": "2.4.0-6", + "port-version": 0 + }, + { + "git-tree": "1b63759917b575f89042574d2424019b0b57ba51", + "version-string": "2.4.0-5", + "port-version": 0 + }, + { + "git-tree": "9aba52786a2bb262ad0e319e302d123f164626cb", + "version-string": "2.4.0-4", + "port-version": 0 + }, + { + "git-tree": "98db2bcc47ffadc4f0e3d8b66f695947e6cf09e3", + "version-string": "2.4.0-3", + "port-version": 0 + }, + { + "git-tree": "e614e9df165ac4894ab89431673663edcf6a8288", + "version-string": "2.4.0-2", + "port-version": 0 + }, + { + "git-tree": "39dcee28a141543ae0f526ed377334b372765915", + "version-string": "2.4.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libodb-pgsql.json b/port_versions/l-/libodb-pgsql.json new file mode 100644 index 00000000000000..e6638b0b7dd0e6 --- /dev/null +++ b/port_versions/l-/libodb-pgsql.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "a16d0a534195ac98f6f44b21a42f626cbb5c9a6e", + "version-string": "2.4.0-3", + "port-version": 0 + }, + { + "git-tree": "80b30af8b3e67a0c8f3c1fc4357db14171a1d9b9", + "version-string": "2.4.0-2", + "port-version": 0 + }, + { + "git-tree": "a7de9420c4c437d998eaf8e0c7fd42e790977320", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "e9f72ad53526fe181e9b6dd4cf9818389cebf61e", + "version-string": "2.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libodb-sqlite.json b/port_versions/l-/libodb-sqlite.json new file mode 100644 index 00000000000000..a40556d2001d20 --- /dev/null +++ b/port_versions/l-/libodb-sqlite.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "6c3f8c74462e65898e335eef5ab9fabc0a3b222f", + "version-string": "2.4.0", + "port-version": 7 + }, + { + "git-tree": "8d9cbc5ac098865e4e03b00f74c9c4de911a8534", + "version-string": "2.4.0-6", + "port-version": 0 + }, + { + "git-tree": "94aa42972fc7500b6b3b6cdbc557b80cd6c8e30f", + "version-string": "2.4.0-5", + "port-version": 0 + }, + { + "git-tree": "d29f7f97c703027e3011c5249be707e37f137802", + "version-string": "2.4.0-4", + "port-version": 0 + }, + { + "git-tree": "32b5eae3cbc5fd1087824bc9342ab124630659aa", + "version-string": "2.4.0-3", + "port-version": 0 + }, + { + "git-tree": "f89b8cad9c1926728e690586289ef780e62752ac", + "version-string": "2.4.0-2", + "port-version": 0 + }, + { + "git-tree": "93fe00956c94f5774ba1be9667eee210d6c8bb7e", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "f285547c7717cc064b4f7cdecaccab4dc8b2ffe8", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "7e021e1f3759535edd11ceae108328ecf38c0e67", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libodb.json b/port_versions/l-/libodb.json new file mode 100644 index 00000000000000..0b0a7e292ef91d --- /dev/null +++ b/port_versions/l-/libodb.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "cc5f10b9764952399ce497cf82615ea730dace28", + "version-string": "2.4.0-6", + "port-version": 0 + }, + { + "git-tree": "fca854899c041753a10ec46716523b40d3ebc81d", + "version-string": "2.4.0-5", + "port-version": 0 + }, + { + "git-tree": "dfd9db4202c92956c43c0d74c43050ebcb02447d", + "version-string": "2.4.0-4", + "port-version": 0 + }, + { + "git-tree": "2d0bd9f1fe278f7d6d9119d7ee5b024cfd49d461", + "version-string": "2.4.0-3", + "port-version": 0 + }, + { + "git-tree": "1818a4ba7ecca999eab267c7d66b72aa772bb2d3", + "version-string": "2.4.0-2", + "port-version": 0 + }, + { + "git-tree": "eb9fb0b2eac3992a3088c51c78b89edc6a13c313", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "8c3e371ce112cc2d1af3d4ce2bb702f9d9ac07e4", + "version-string": "2.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libogg.json b/port_versions/l-/libogg.json new file mode 100644 index 00000000000000..d7987e5c8e8831 --- /dev/null +++ b/port_versions/l-/libogg.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "156d376fca62197dd916c454d1299dcee84c72dc", + "version-string": "1.3.4", + "port-version": 3 + }, + { + "git-tree": "5cd4c9f7994a1597175cf1dce9ea7865d005b9f6", + "version-string": "1.3.4", + "port-version": 2 + }, + { + "git-tree": "05a5d1e9d61ec497c7212961732df3e8075120f4", + "version-string": "1.3.4", + "port-version": 0 + }, + { + "git-tree": "934594e5ca967945c9f42956838bb5cb2c0b02c9", + "version-string": "1.3.3-4", + "port-version": 0 + }, + { + "git-tree": "b91e1eb28dd8ed7c3ba0d0eb72b3d2fc2a3718a3", + "version-string": "1.3.3-3", + "port-version": 0 + }, + { + "git-tree": "c19ad5b9b326d84e50ed12d9ed823cfa53759f07", + "version-string": "1.3.3-2", + "port-version": 0 + }, + { + "git-tree": "85f7b168b0f01fdba59859ee5d95b300f2a2d61c", + "version-string": "1.3.3-1", + "port-version": 0 + }, + { + "git-tree": "c92366a097bfce2e694fdf97ee3723faaf3405fb", + "version-string": "1.3.3", + "port-version": 0 + }, + { + "git-tree": "e9fd564351dbfbe9f9174c2b9b7017810511b5cc", + "version-string": "1.3.2-cab46b1-3", + "port-version": 0 + }, + { + "git-tree": "2d1c0316176436b6555341c4262238a0e2786cf9", + "version-string": "1.3.2-cab46b1-2", + "port-version": 0 + }, + { + "git-tree": "5fa0a031d679584a6064365674821b64b172b4ff", + "version-string": "2017-07-27-cab46b19847", + "port-version": 0 + }, + { + "git-tree": "c4efebe045b33f054f4a8e5a483b0ad222f0f181", + "version-string": "1.3.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libopenmpt.json b/port_versions/l-/libopenmpt.json new file mode 100644 index 00000000000000..d97f5018173262 --- /dev/null +++ b/port_versions/l-/libopenmpt.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a6579258d2dab9e661a439e241ff20f2427b918e", + "version-string": "2017-01-28-cf2390140", + "port-version": 1 + }, + { + "git-tree": "644dd1f6f42a3f37a65c56811e80f986d0366eac", + "version-string": "2017-01-28-cf2390140", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libopusenc.json b/port_versions/l-/libopusenc.json new file mode 100644 index 00000000000000..9fbd47b56b6013 --- /dev/null +++ b/port_versions/l-/libopusenc.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "7e66eafbd3552eda0c0243edb904fd8af36d370a", + "version-string": "0.2.1", + "port-version": 0 + }, + { + "git-tree": "eb9dbe4e3e59fed0a4092583d97295a34e1fea55", + "version-string": "0.1-1", + "port-version": 0 + }, + { + "git-tree": "4665d4d95e9dc2d1dee15ba3f11478f05f867cea", + "version-string": "0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libosip2.json b/port_versions/l-/libosip2.json new file mode 100644 index 00000000000000..6cf74c995e8fb1 --- /dev/null +++ b/port_versions/l-/libosip2.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "df0fccae350dd810e2ac0621cb9b71a820d742f0", + "version-string": "5.1.0-4", + "port-version": 0 + }, + { + "git-tree": "922079e7ac7e7ba572b31ac965b881bfb87a4299", + "version-string": "5.1.0-3", + "port-version": 0 + }, + { + "git-tree": "850eae5145dc5d783c3fdd996ab031e789ab5f10", + "version-string": "5.1.0-2", + "port-version": 0 + }, + { + "git-tree": "69555d48e12cfb89dcec6b787792a3b490a63cef", + "version-string": "5.1.0-1", + "port-version": 0 + }, + { + "git-tree": "e684a8dd9e49c43421debdc3d4ab58c21576d156", + "version-string": "5.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libosmium.json b/port_versions/l-/libosmium.json new file mode 100644 index 00000000000000..1f8a52d8e6b001 --- /dev/null +++ b/port_versions/l-/libosmium.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2ee36f73249f1102786deb5e2fea00ef8480de54", + "version-string": "2.15.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libosmscout.json b/port_versions/l-/libosmscout.json new file mode 100644 index 00000000000000..bfa3103f4c9140 --- /dev/null +++ b/port_versions/l-/libosmscout.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "18f4ae0fd674282e4c45af88d054090e8ba9a80d", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libp7-baical.json b/port_versions/l-/libp7-baical.json new file mode 100644 index 00000000000000..81d1d24ed4edfc --- /dev/null +++ b/port_versions/l-/libp7-baical.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "38136f16ec4b0eacdb76d63a639fc20b8d6ef208", + "version-string": "replaced", + "port-version": 0 + }, + { + "git-tree": "198fcfc33e120b2311bff9c9a0292967839bca7d", + "version-string": "4.4", + "port-version": 5 + }, + { + "git-tree": "32dee82c177857fed77cea3a0508d2cdc9f4b4b7", + "version-string": "4.4-4", + "port-version": 0 + }, + { + "git-tree": "d64adcfbf28a702739f8c818f26d41aadff23474", + "version-string": "4.4-3", + "port-version": 0 + }, + { + "git-tree": "98a520bd1c220d3da7df03bb0c74ed3874cc422c", + "version-string": "4.4-2", + "port-version": 0 + }, + { + "git-tree": "b6f70fc496ca9b815c82d7d355016b4c9a046d2c", + "version-string": "4.4-1", + "port-version": 0 + }, + { + "git-tree": "274d1bf0c513d6b22fada7b662da512e7a05f580", + "version-string": "4.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libp7client.json b/port_versions/l-/libp7client.json new file mode 100644 index 00000000000000..ac7bd96160bf45 --- /dev/null +++ b/port_versions/l-/libp7client.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "0a367ba74a92626d57ddcd5be0157e5dadc6e8bc", + "version-string": "5.6", + "port-version": 0 + }, + { + "git-tree": "d310ad3168168c971109718bce823d9a9dee294c", + "version-string": "5.2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libpcap.json b/port_versions/l-/libpcap.json new file mode 100644 index 00000000000000..772b0beffb5374 --- /dev/null +++ b/port_versions/l-/libpcap.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7dbf78276e1e48505930da6993e36bf381a51b3e", + "version-string": "1.9.1-2", + "port-version": 0 + }, + { + "git-tree": "cb48d35fc39b4c62b8afa571fc92be5171762fc5", + "version-string": "1.9.1-1", + "port-version": 0 + }, + { + "git-tree": "7bec975350f92d01a597ac8c0c8da759f0b35013", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "d034e2422fbdf41581cc664a315f4514759eca65", + "version-string": "1.9.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libpff.json b/port_versions/l-/libpff.json new file mode 100644 index 00000000000000..5098faa85a5424 --- /dev/null +++ b/port_versions/l-/libpff.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "3acb1ab0afd3a20d25756330e91c502263de05d3", + "version-string": "2018-07-14-1", + "port-version": 0 + }, + { + "git-tree": "50cd160a5a506c8ad9b197ea75cc30a383aeef75", + "version-string": "2018-07-14", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libplist.json b/port_versions/l-/libplist.json new file mode 100644 index 00000000000000..ad060ee201e27a --- /dev/null +++ b/port_versions/l-/libplist.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "cc421616ea793446b014a26c4132c4648372e398", + "version-string": "1.3.6", + "port-version": 0 + }, + { + "git-tree": "9952bb8c426d8ba8c52a3896c29579dc38b0a39b", + "version-string": "1.2.185", + "port-version": 0 + }, + { + "git-tree": "bd576af0c73e0f6b1fee16ef2512180feb90fee0", + "version-string": "1.2.137", + "port-version": 0 + }, + { + "git-tree": "46ed10496153147da84ac71b7e6e6c70babb9715", + "version-string": "1.2.77", + "port-version": 0 + }, + { + "git-tree": "aea913d93072a99046ad050187b3dfc3f36dc044", + "version-string": "2.0.1.197-2", + "port-version": 0 + }, + { + "git-tree": "7bce82b9f0200d4781eed1bd7f6d01b6e223f2c0", + "version-string": "2.0.1.197-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libpmemobj-cpp.json b/port_versions/l-/libpmemobj-cpp.json new file mode 100644 index 00000000000000..f2f53a032cd175 --- /dev/null +++ b/port_versions/l-/libpmemobj-cpp.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "aa560d230ac6435fd6c8a25ac2b5930a7340e5b5", + "version-string": "1.11", + "port-version": 0 + }, + { + "git-tree": "b1fed20a8c0bee0659d5f9e9d98ffe2900f27f14", + "version-string": "1.10", + "port-version": 0 + }, + { + "git-tree": "49d0c530028f16077853a67f9233b141f44d9953", + "version-string": "1.8", + "port-version": 0 + }, + { + "git-tree": "bc8d6eeba0f57c9f2db91a8099b7e536b411ea68", + "version-string": "1.7", + "port-version": 0 + }, + { + "git-tree": "0ec4238ae86168b40f268837f828fba7b94d350e", + "version-string": "1.6-1", + "port-version": 0 + }, + { + "git-tree": "d402d43e3eab3d48476bb8a0cc2af30acbab52b3", + "version-string": "1.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libpng.json b/port_versions/l-/libpng.json new file mode 100644 index 00000000000000..aeec5e1ce13eb1 --- /dev/null +++ b/port_versions/l-/libpng.json @@ -0,0 +1,159 @@ +{ + "versions": [ + { + "git-tree": "67dd33a2c4a539e58ec4898b7b908baca3840063", + "version-string": "1.6.37", + "port-version": 14 + }, + { + "git-tree": "b3f92897a2fca74b262a4908b6c11a8313a52f17", + "version-string": "1.6.37", + "port-version": 13 + }, + { + "git-tree": "45c0b06d32572819c2b92878be840601ea3d4e3e", + "version-string": "1.6.37", + "port-version": 12 + }, + { + "git-tree": "af691798dd9e4c063e9bd325846106c9fcf79ade", + "version-string": "1.6.37", + "port-version": 11 + }, + { + "git-tree": "a1efdf9093453d8142196e35224f1ed1c6d331e2", + "version-string": "1.6.37-10", + "port-version": 0 + }, + { + "git-tree": "8b1f4e329a28c08f0df6694a75fd17f0fd792529", + "version-string": "1.6.37-9", + "port-version": 0 + }, + { + "git-tree": "dd2db0068ad3ba8733f7e4e21e8da7d175444602", + "version-string": "1.6.37-8", + "port-version": 0 + }, + { + "git-tree": "96265ee74bf31f65a0b97cf40e7d355ae26501f6", + "version-string": "1.6.37-7", + "port-version": 0 + }, + { + "git-tree": "6c57de15108634e846392c8eb076c61b945d4e23", + "version-string": "1.6.37-6", + "port-version": 0 + }, + { + "git-tree": "2ef09f6c3d4033dc26dacfdbfb5377ced5eb0fd5", + "version-string": "1.6.37-5", + "port-version": 0 + }, + { + "git-tree": "76029c555a9752bf045d34074688516d8a288551", + "version-string": "1.6.37-4", + "port-version": 0 + }, + { + "git-tree": "c644902637fdb43fe3eb2d1976dca8413eba88b5", + "version-string": "1.6.37-3", + "port-version": 0 + }, + { + "git-tree": "29de190000f41b44c3f620e939c0775795314aef", + "version-string": "1.6.37-2", + "port-version": 0 + }, + { + "git-tree": "6597f42059dc022e438acfbcd9b7b82adb8fcbf8", + "version-string": "1.6.37-1", + "port-version": 0 + }, + { + "git-tree": "e29ed23bcb9450e5ceb982106520e0872e79d7ee", + "version-string": "1.6.37", + "port-version": 0 + }, + { + "git-tree": "942c7b39d4cde837b208533e00ae7e71a02ed839", + "version-string": "1.6.36-1", + "port-version": 0 + }, + { + "git-tree": "039ca782da61e869bc0c4ad1282dfbfcefc84548", + "version-string": "1.6.36", + "port-version": 0 + }, + { + "git-tree": "9fff50de368277782f381cf80014d960af80cbf2", + "version-string": "1.6.35-1", + "port-version": 0 + }, + { + "git-tree": "d7bf906dccf6db5ab10e5394cd2c9b427e2418cf", + "version-string": "1.6.35", + "port-version": 0 + }, + { + "git-tree": "312adee32614c68e98367d636de20fe824441df4", + "version-string": "1.6.34-3", + "port-version": 0 + }, + { + "git-tree": "e510c3260075c8367bfeb84d08a99ba7c1989bbf", + "version-string": "1.6.34-2", + "port-version": 0 + }, + { + "git-tree": "0fba1fa2cb102ea8f6a88ffbcc912ebe1a3b7f76", + "version-string": "1.6.34-1", + "port-version": 0 + }, + { + "git-tree": "69fcd43377398888d30f7063e238875f29af9100", + "version-string": "1.6.32-1", + "port-version": 0 + }, + { + "git-tree": "5dbc262fe376ca1a84b73d39d53ba3ae9197c55c", + "version-string": "1.6.32", + "port-version": 0 + }, + { + "git-tree": "8d12c8bb6ace218f56b466cb094c83887311672e", + "version-string": "1.6.31", + "port-version": 0 + }, + { + "git-tree": "fe6954ae00ebd7401b42b742c2d8d055e59dc77a", + "version-string": "1.6.30", + "port-version": 0 + }, + { + "git-tree": "3ef245763d894ef461b67e1c5707dcda18b9a047", + "version-string": "1.6.29-2", + "port-version": 0 + }, + { + "git-tree": "889cf0968fa6b452a5e40d0d617fab2abfbd4138", + "version-string": "1.6.29-1", + "port-version": 0 + }, + { + "git-tree": "002b460daafcb7d1ba2211fa069e49228167f291", + "version-string": "1.6.28-1", + "port-version": 0 + }, + { + "git-tree": "9179d6c8853f5bec604256162e956c505c831c26", + "version-string": "1.6.28", + "port-version": 0 + }, + { + "git-tree": "e366579b9b07cd669be3bac35d41ce9f1afbec33", + "version-string": "1.6.24-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libpopt.json b/port_versions/l-/libpopt.json new file mode 100644 index 00000000000000..10609672025158 --- /dev/null +++ b/port_versions/l-/libpopt.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "098127274eb41cbd97cdcc38028a7c2e8aafb0ba", + "version-string": "1.16-13", + "port-version": 0 + }, + { + "git-tree": "9671e84760b75528e15eb6ebb6ce4e0867be4eaf", + "version-string": "1.16-12", + "port-version": 0 + }, + { + "git-tree": "6947b074aadb48ac39aa34489f4a23269b742752", + "version-string": "1.16-11", + "port-version": 0 + }, + { + "git-tree": "18fbdea6135acf56e6ddef6bb44f850b59620ec9", + "version-string": "1.16-10~vcpkg1-1", + "port-version": 0 + }, + { + "git-tree": "9dcde5f82f4f2334821e38511495537201c28f13", + "version-string": "1.16-10~vcpkg1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libpq.json b/port_versions/l-/libpq.json new file mode 100644 index 00000000000000..fca613ba448455 --- /dev/null +++ b/port_versions/l-/libpq.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "7c4dbe4fcb780bed98e6b55ccf039b77c7a5be68", + "version-string": "12.2", + "port-version": 10 + }, + { + "git-tree": "47befe83d71de7593d85519026db28279e50eeec", + "version-string": "12.2", + "port-version": 9 + }, + { + "git-tree": "b76f1aeba6c3b1d7f85a504dab48b05bc1d8bdab", + "version-string": "12.2", + "port-version": 8 + }, + { + "git-tree": "1e1d5939056de89b7d169ff3c6fc0adf9d2c03e5", + "version-string": "12.2", + "port-version": 7 + }, + { + "git-tree": "afd0cbdeec41acebef382e50fbdd84cadab15020", + "version-string": "12.2", + "port-version": 6 + }, + { + "git-tree": "1daeec19a03882ce9104c856255e97332eb04f11", + "version-string": "12.2", + "port-version": 5 + }, + { + "git-tree": "f70a4f2726814bc49d594372f15dc283b6594752", + "version-string": "12.2", + "port-version": 4 + }, + { + "git-tree": "7162e19eb53500d28bc982037b0edf71516aee29", + "version-string": "12.2-3", + "port-version": 0 + }, + { + "git-tree": "1e16dc9605b600058afd709443a3d21490b3b1da", + "version-string": "12.2-2", + "port-version": 0 + }, + { + "git-tree": "6df96ca16ebb0194dbacc3c8843456cccf66e0d4", + "version-string": "12.2-1", + "port-version": 0 + }, + { + "git-tree": "45f8114e7a8fea7b212390b7711b32bfd2af7ba1", + "version-string": "12.2", + "port-version": 0 + }, + { + "git-tree": "da9819a2636a1a17704316d9970c43ca7458d669", + "version-string": "12.0-2", + "port-version": 0 + }, + { + "git-tree": "054ceccec54735de42889c1a3c0af3a6dc896f35", + "version-string": "12.0-1", + "port-version": 0 + }, + { + "git-tree": "72c6fe062432ebd18c8b7f6b5864ac875883be8d", + "version-string": "12.0", + "port-version": 0 + }, + { + "git-tree": "3a8aad57c213a313df0ecbf7e557b02cf33125b8", + "version-string": "9.6.3", + "port-version": 0 + }, + { + "git-tree": "2cf1e4ee41aaac60dca0c0c9fa9e6d87e6277e22", + "version-string": "9.6.1-8", + "port-version": 0 + }, + { + "git-tree": "5a23fffc8d44a9974c35c5ddf0cf43711bd62cc4", + "version-string": "9.6.1-7", + "port-version": 0 + }, + { + "git-tree": "45a481a8297b1a33bcf75ed3d5d7d47f7c2690e1", + "version-string": "9.6.1-6", + "port-version": 0 + }, + { + "git-tree": "76c1ba1e45eac604dfb67c4d51563d806e8475de", + "version-string": "9.6.1-5", + "port-version": 0 + }, + { + "git-tree": "6df4bdfc6142a40a6e4968b8f45e2408d3b6da1e", + "version-string": "9.6.1-4", + "port-version": 0 + }, + { + "git-tree": "df96330f01fbd70381667e6f8007613a23a992cf", + "version-string": "9.6.1-1", + "port-version": 0 + }, + { + "git-tree": "db584f4143e453ea6a60476a99f97bf92ad31fcb", + "version-string": "9.6.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libpqxx.json b/port_versions/l-/libpqxx.json new file mode 100644 index 00000000000000..78949dc25a36e9 --- /dev/null +++ b/port_versions/l-/libpqxx.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "8108ba3b6f2f2d5a6f27c1afb5981b778ef184d7", + "version-string": "7.3.0", + "port-version": 0 + }, + { + "git-tree": "fd09edeb322fabd08d03b8a96977513956c0cf12", + "version-string": "7.2.1", + "port-version": 0 + }, + { + "git-tree": "de40907ffeff0e6ac5a8d5595cf9847bc42909e5", + "version-string": "7.2.0", + "port-version": 0 + }, + { + "git-tree": "118a0b5c5d3e598c6d84c41e31e8fcf0f5dd1b6d", + "version-string": "6.4.7", + "port-version": 0 + }, + { + "git-tree": "81c19c9111432df27b288a8db1c8129e4d4bd4dc", + "version-string": "6.4.5-3", + "port-version": 0 + }, + { + "git-tree": "4eb9f1bc9b73899c210b95aeae0d7311bd2a1cfe", + "version-string": "6.4.5-2", + "port-version": 0 + }, + { + "git-tree": "808206ee43e5eb49584a47728b0f0f8415796a77", + "version-string": "6.4.5-1", + "port-version": 0 + }, + { + "git-tree": "4e6cd4eefe116c157f490f9fb3fbe01b623a6dc6", + "version-string": "6.4.5", + "port-version": 0 + }, + { + "git-tree": "4dd06265eec7f3f5de646e2cca37771bac754aac", + "version-string": "6.4.4", + "port-version": 0 + }, + { + "git-tree": "3b2ae07c4fe18cfb446233b8353c0e6c74f3ed4d", + "version-string": "6.4.3", + "port-version": 0 + }, + { + "git-tree": "a827676852f4b213a838a560417cab84da2d606b", + "version-string": "6.0.0-1", + "port-version": 0 + }, + { + "git-tree": "7bb15fd1bf27e843da543458585e3e9154ab65eb", + "version-string": "6.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libprotobuf-mutator.json b/port_versions/l-/libprotobuf-mutator.json new file mode 100644 index 00000000000000..38317dc4a5561c --- /dev/null +++ b/port_versions/l-/libprotobuf-mutator.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "17b7f9e9cf92d23ffee15bd262f8dccb9dca3da0", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libproxy.json b/port_versions/l-/libproxy.json new file mode 100644 index 00000000000000..0344ba5f7b13f2 --- /dev/null +++ b/port_versions/l-/libproxy.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "7f8aa36e95779e7845d82f4bad6f300dae04b58d", + "version-string": "0.4.15-2", + "port-version": 0 + }, + { + "git-tree": "4a2d0a57a331d65e2bbcd60bc44ba8ae5f899ea2", + "version-string": "0.4.15-1", + "port-version": 0 + }, + { + "git-tree": "111e746733d50753aa97e3c0029114e2969a1588", + "version-string": "0.4.15", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libqcow.json b/port_versions/l-/libqcow.json new file mode 100644 index 00000000000000..fde12dde98c0cc --- /dev/null +++ b/port_versions/l-/libqcow.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "236cb89ed2aaf88e94409fc2f91b82c6c2b4cd49", + "version-string": "20200928", + "port-version": 0 + }, + { + "git-tree": "5fb6b51258aa897f570fc5a744104b42d5a6928b", + "version-string": "20191221-1", + "port-version": 0 + }, + { + "git-tree": "1abb1a7acee09a4b535f7cacae05b09cc47d0b11", + "version-string": "20191221", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libqglviewer.json b/port_versions/l-/libqglviewer.json new file mode 100644 index 00000000000000..0b3511b5a43b78 --- /dev/null +++ b/port_versions/l-/libqglviewer.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "73dd8e7a3f427ca6033c3836fac52ca45c4218cb", + "version-string": "2.7.2-3", + "port-version": 0 + }, + { + "git-tree": "331d62689bc20089845b9eb16879da8b5476b85f", + "version-string": "2.7.2-2", + "port-version": 0 + }, + { + "git-tree": "cb9c2b1899de5a040c513c481eee7e9359a598ea", + "version-string": "2.7.2", + "port-version": 0 + }, + { + "git-tree": "b1e8df05c60f20beeb3c996adc159af5d533f74f", + "version-string": "2.7.0-2", + "port-version": 0 + }, + { + "git-tree": "1d70b2578e1cdc442d8a2b3fbf03702875c268f3", + "version-string": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "8255c4861e262210c01f427f37475015a826c616", + "version-string": "2.7.1-1", + "port-version": 0 + }, + { + "git-tree": "0cb31bfdefbf6ae0823317d39dad0d9e6becdec9", + "version-string": "2.7.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libqrencode.json b/port_versions/l-/libqrencode.json new file mode 100644 index 00000000000000..f930d7603b9ba1 --- /dev/null +++ b/port_versions/l-/libqrencode.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "21e120487f7ddca306d7ddb04c75a86f360b7a4c", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "ad8bed7843132caa59f7a67644d2499c4c7dd337", + "version-string": "4.0.2-1", + "port-version": 0 + }, + { + "git-tree": "714cb36125cba2c5400e36ba5f1888599621cae6", + "version-string": "4.0.2", + "port-version": 0 + }, + { + "git-tree": "a8e8bd9ae8291ec9b67d3693090879b49de6d5cf", + "version-string": "4.0.0-2", + "port-version": 0 + }, + { + "git-tree": "1a47e59155a501242e0466f9457f3bf6ff318965", + "version-string": "4.0.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/librabbitmq.json b/port_versions/l-/librabbitmq.json new file mode 100644 index 00000000000000..da093c5c8a481c --- /dev/null +++ b/port_versions/l-/librabbitmq.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "130a756c21f59d35c26dc147d8af8216d9bdcf7f", + "version-string": "2020-06-03", + "port-version": 0 + }, + { + "git-tree": "5ed4db4d83748fc42d9f450c06a7ec6db406cf47", + "version-string": "0.10.0", + "port-version": 0 + }, + { + "git-tree": "1764b881e5c1cc2450bb3d2d050a7f67136bac8a", + "version-string": "0.9.0-1", + "port-version": 0 + }, + { + "git-tree": "61de8718556284300f512b12fbbb12b3fd50fd24", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "a330deae7849c07c138883b55f955d5f68c9be38", + "version-string": "0.8.0-1", + "port-version": 0 + }, + { + "git-tree": "a0aafa30788495064695568747606b93cba08d13", + "version-string": "0.8.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libraqm.json b/port_versions/l-/libraqm.json new file mode 100644 index 00000000000000..d54df98fd5849c --- /dev/null +++ b/port_versions/l-/libraqm.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "fa05347d4a56f608da568ea8041d259b959e8d9d", + "version-string": "0.7.0", + "port-version": 2 + }, + { + "git-tree": "0fa14afe4457ec8bfbd44c4bd757de9bf0cd57c2", + "version-string": "0.7.0-1", + "port-version": 0 + }, + { + "git-tree": "7d016d65b12eca8cfad594fe152e39a72892e525", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "8e41b7f66f6db067d52d1ff84d05e67bcb80ca2a", + "version-string": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libraw.json b/port_versions/l-/libraw.json new file mode 100644 index 00000000000000..7dc015ca23564a --- /dev/null +++ b/port_versions/l-/libraw.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "659d20658809488ab3cfccf30d85870ce06615e0", + "version-string": "201903-3", + "port-version": 0 + }, + { + "git-tree": "b37f82b870dd4639b11ceeb26ddb1ccde42a4679", + "version-string": "201903-2", + "port-version": 0 + }, + { + "git-tree": "ecfaf7df127015101d59d1c704269e5d2c3bb89d", + "version-string": "201903-1", + "port-version": 0 + }, + { + "git-tree": "70e6e850f36b47cd653eb645b25ad7ee6118c4d9", + "version-string": "201903", + "port-version": 0 + }, + { + "git-tree": "ad76a869353855fd6ebecdab04ee13ba350d3b72", + "version-string": "0.19.2", + "port-version": 0 + }, + { + "git-tree": "d2ad440c830dea08517f1f100ba6f46daf0a2da0", + "version-string": "0.19.0-3", + "port-version": 0 + }, + { + "git-tree": "949450a33a78d4f5d18fcbf40e90c4c580e02ae9", + "version-string": "0.19.0-2", + "port-version": 0 + }, + { + "git-tree": "2b8655c3961b0c0ce42168a378f96577982dc69e", + "version-string": "0.19.0-1", + "port-version": 0 + }, + { + "git-tree": "41bb3f06069827237eac0e74b58a43aca6dde758", + "version-string": "0.19.0", + "port-version": 0 + }, + { + "git-tree": "c9796557a10c3b61e0c5b1e67147352ef69cf1a9", + "version-string": "0.18.2-5", + "port-version": 0 + }, + { + "git-tree": "96453188623ddcef2ea3eac87f427a2620f66567", + "version-string": "0.18.2-4", + "port-version": 0 + }, + { + "git-tree": "459a792ccb5cab501921910bfee9931394ec0d03", + "version-string": "0.18.2-3", + "port-version": 0 + }, + { + "git-tree": "b61061859ee19f017adce149b6fe3d66e8ac6357", + "version-string": "0.18.2-2", + "port-version": 0 + }, + { + "git-tree": "d8f368bc4ad28b5f3fec96bad6901224b85010e0", + "version-string": "0.18.2-1", + "port-version": 0 + }, + { + "git-tree": "6a952ec463eb3a164b36b20340cd235ec623250b", + "version-string": "0.18.0-1", + "port-version": 0 + }, + { + "git-tree": "4e3204e55c782c955460af2614a5585a020712bf", + "version-string": "0.17.2-2", + "port-version": 0 + }, + { + "git-tree": "1b0bdf9fe94c7f3cd47ab77a4d57b8373fa9a71c", + "version-string": "0.17.2-1", + "port-version": 0 + }, + { + "git-tree": "42c390e463452ca9f54cef721652521f74b74c2d", + "version-string": "0.17.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/librdkafka.json b/port_versions/l-/librdkafka.json new file mode 100644 index 00000000000000..75a9623f5ed3dc --- /dev/null +++ b/port_versions/l-/librdkafka.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "6cdfbfb527ed75e097d74d502fe2dcaea147d5f0", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "aab0369fb81b969656cdb4a925ce539d71ca46c6", + "version-string": "1.4.4-1", + "port-version": 0 + }, + { + "git-tree": "60cfc10dad4e9603fa9e75bb62eb9ab3ebaadc19", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "f3491a7035a4fd02f48b0458a50bc784031527b6", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "549a9c194034604a2585f9e7a9c8385739f09710", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "4938dcc9d95d7c148d74b7c3a6f2d4cf6ace74d4", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "207c65df83c090a3c525a051a7aeecb91b3e2c0f", + "version-string": "2019-06-13", + "port-version": 0 + }, + { + "git-tree": "804b6ebdddce2556f5b384749f155dda0a2ef500", + "version-string": "2019-05-27", + "port-version": 0 + }, + { + "git-tree": "04ec354f88aa3e0a00b0a0ee4ce60f7dc63cc310", + "version-string": "2019-05-07-2", + "port-version": 0 + }, + { + "git-tree": "3c34c160ac6049cee2772086d24399122843d9fa", + "version-string": "2019-05-07-1", + "port-version": 0 + }, + { + "git-tree": "a4ac6d8f4fc9135eb4ad4ee0506d4db9b7c87c0a", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "497f5acdcd83a0c6d5cde89348fa8a3f8d2bea4b", + "version-string": "2019-04-30", + "port-version": 0 + }, + { + "git-tree": "3a7fd8de68722a1780db665ba2c7213b616d187b", + "version-string": "2019-04-16", + "port-version": 0 + }, + { + "git-tree": "e86c8415085f9cd61fde2f798716650b4e3da85e", + "version-string": "v1.0.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libressl.json b/port_versions/l-/libressl.json new file mode 100644 index 00000000000000..62ab6a809d3ef2 --- /dev/null +++ b/port_versions/l-/libressl.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "3de8a5b9f15524db17ccff3c0a4c61266d8fb3b1", + "version-string": "2.9.1", + "port-version": 3 + }, + { + "git-tree": "ab54b54b22da6f0d5ac3baaa77bea574646e20b3", + "version-string": "2.9.1-2", + "port-version": 0 + }, + { + "git-tree": "924fdc5ac4fc4bcbb6ab8b8f6f0e6a4bc9883f9e", + "version-string": "2.9.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/librsvg.json b/port_versions/l-/librsvg.json new file mode 100644 index 00000000000000..8ec19294d84978 --- /dev/null +++ b/port_versions/l-/librsvg.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a2517e6695683ed935c8b0e5f4690c51fc2390cb", + "version-string": "2.40.20-2", + "port-version": 0 + }, + { + "git-tree": "dd90fd2e622de4e8736279e76a375ece643757f2", + "version-string": "2.40.20-1", + "port-version": 0 + }, + { + "git-tree": "5928d42660d73483fe91dbe34aec42b821a8a7a0", + "version-string": "2.40.20", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/librsync.json b/port_versions/l-/librsync.json new file mode 100644 index 00000000000000..2dd200a236dc84 --- /dev/null +++ b/port_versions/l-/librsync.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "ce3c47220d819e3348b72aad90254cabdf238000", + "version-string": "2020-09-16", + "port-version": 1 + }, + { + "git-tree": "cdc3163d9504b779e074d3c3e1b69f84b562dfd7", + "version-string": "2020-09-16", + "port-version": 0 + }, + { + "git-tree": "652ab88122d410248b88c2b946f7f758e10dac7c", + "version-string": "2.0.2-1", + "port-version": 0 + }, + { + "git-tree": "9a4939cc451c5db277316dbb565527100380107d", + "version-string": "2.0.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/librtmp.json b/port_versions/l-/librtmp.json new file mode 100644 index 00000000000000..63a825282a4050 --- /dev/null +++ b/port_versions/l-/librtmp.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b6470730f086d7c4e4ba3fd890ce17ec95084b41", + "version-string": "2019-11-11_1", + "port-version": 0 + }, + { + "git-tree": "ee04ac22b9026dc5cf6eb07232294b6fd97cc793", + "version-string": "2019-11-11", + "port-version": 0 + }, + { + "git-tree": "df456d424caca008855127c6e4e0a0a703981cf0", + "version-string": "2.4-2", + "port-version": 0 + }, + { + "git-tree": "98c9119c3cb3dd41a1ac4199edbb294ade7c389e", + "version-string": "2.4-1", + "port-version": 0 + }, + { + "git-tree": "5f80408a55096ad194f2017a02c4ed4defd1de84", + "version-string": "2.4", + "port-version": 0 + }, + { + "git-tree": "e6558ecdd4db2002a8893ffc802b20ac2536d135", + "version-string": "2.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/librttopo.json b/port_versions/l-/librttopo.json new file mode 100644 index 00000000000000..3c7a9332962764 --- /dev/null +++ b/port_versions/l-/librttopo.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "dfaa13a1e256dae5bf673ee6c803b30d73ce25d8", + "version-string": "1.1.0-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libsamplerate.json b/port_versions/l-/libsamplerate.json new file mode 100644 index 00000000000000..2456512f6dc855 --- /dev/null +++ b/port_versions/l-/libsamplerate.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "ec1fec464998f298385bf9afe0ac63cdbc8adda2", + "version-string": "0.1.9.0", + "port-version": 3 + }, + { + "git-tree": "f35bb6cff0cbf5236af2eaa54864d534fff63aef", + "version-string": "0.1.9.0", + "port-version": 2 + }, + { + "git-tree": "259ab515efcc872d127c39b87437c6844c244fff", + "version-string": "0.1.9.0-1", + "port-version": 0 + }, + { + "git-tree": "caf1fab092e13c22501dc1954aa48fe760cbdaff", + "version-string": "0.1.9.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libsbml.json b/port_versions/l-/libsbml.json new file mode 100644 index 00000000000000..91ef147d5509c8 --- /dev/null +++ b/port_versions/l-/libsbml.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1f88782ee0e10d3ac4f2604ffd6b9b2f78e9d946", + "version-string": "5.18.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libsigcpp-3.json b/port_versions/l-/libsigcpp-3.json new file mode 100644 index 00000000000000..2ac14dd336ea2e --- /dev/null +++ b/port_versions/l-/libsigcpp-3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6956e6da9d0cd0c772810b1ec9bc7815d44474f5", + "version-string": "3.0.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libsigcpp.json b/port_versions/l-/libsigcpp.json new file mode 100644 index 00000000000000..8b666ff86ef141 --- /dev/null +++ b/port_versions/l-/libsigcpp.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "01d944fb87f11bec271ba87fe808b5949603f32e", + "version-string": "2.10-3", + "port-version": 2 + }, + { + "git-tree": "8ddddfb7f0182c4d17b76b144324d7a0bbf481d3", + "version-string": "2.10-3", + "port-version": 1 + }, + { + "git-tree": "a1bedab09b90e7328502da90300edf3e00a4e183", + "version-string": "2.10-3", + "port-version": 0 + }, + { + "git-tree": "fd94e911289b218b668f86cbdf152be1af48363c", + "version-string": "2.10-1", + "port-version": 0 + }, + { + "git-tree": "4ca74186e4d95dc515dc47bbd4c50ae367ddb2c2", + "version-string": "2.10", + "port-version": 0 + }, + { + "git-tree": "09db64950ba3226ed91123c3d096baf28eb3b580", + "version-string": "2.99-1", + "port-version": 0 + }, + { + "git-tree": "55e6b75f3c7ff98dbf0adf649f6a9142d46638f4", + "version-string": "2.99", + "port-version": 0 + }, + { + "git-tree": "4ca74186e4d95dc515dc47bbd4c50ae367ddb2c2", + "version-string": "2.10", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libsndfile.json b/port_versions/l-/libsndfile.json new file mode 100644 index 00000000000000..070a90791f456d --- /dev/null +++ b/port_versions/l-/libsndfile.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "03a5a8afe22b95df759e1f581e3a35d27ee99540", + "version-string": "1.0.30", + "port-version": 1 + }, + { + "git-tree": "48e28a9d4f6901ba45d9e0a295728fc5e54a1602", + "version-string": "1.0.30", + "port-version": 0 + }, + { + "git-tree": "9b76392cd3ac354e204555956bb6de50a0a22962", + "version-string": "1.0.29", + "port-version": 11 + }, + { + "git-tree": "c52b8eeabd642e152b61ad429820499f356df8f0", + "version-string": "1.0.29", + "port-version": 10 + }, + { + "git-tree": "93115aed673846b5808bc19b732990e670e9b5e7", + "version-string": "1.0.29-9", + "port-version": 0 + }, + { + "git-tree": "616936e3b04a6784e03e484ad4767a2b52332e3c", + "version-string": "1.0.29-8", + "port-version": 0 + }, + { + "git-tree": "946b28852d5bde57a8ac2a198e14201f953da3cc", + "version-string": "1.0.29-6830c42-7", + "port-version": 0 + }, + { + "git-tree": "bb7ff9b145d78daf27148b251b20c4337fc67295", + "version-string": "1.0.29-6830c42-6", + "port-version": 0 + }, + { + "git-tree": "7cd55af4b383c17739c09fdc7e26780f7225683d", + "version-string": "1.0.29-6830c42-5", + "port-version": 0 + }, + { + "git-tree": "646f2bf151e08d1adb542a90cead11a0c06a39f1", + "version-string": "1.0.29-6830c42-3", + "port-version": 0 + }, + { + "git-tree": "c2ce1df1a7c1b9688760523db04dde726f8f5f9c", + "version-string": "1.0.29-6830c42-2", + "port-version": 0 + }, + { + "git-tree": "f09add28803f1a4bf103162ea85f1af1e585eca4", + "version-string": "1.0.29-6830c42-1", + "port-version": 0 + }, + { + "git-tree": "bb37fbddf9cbd3044ebbcaaf7088cdd71e7e4be3", + "version-string": "libsndfile-1.0.29-6830c42-1", + "port-version": 0 + }, + { + "git-tree": "6f934597fdee204cacd7f642e074550de88557ef", + "version-string": "libsndfile-1.0.29-6830c42", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libsodium.json b/port_versions/l-/libsodium.json new file mode 100644 index 00000000000000..5180f8086b5dc3 --- /dev/null +++ b/port_versions/l-/libsodium.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "fc00e8b0dba7ee227aa5d53860c1b5cfe92b8819", + "version-string": "1.0.18", + "port-version": 3 + }, + { + "git-tree": "0636058ca92ce65f09c8c37e1b3b797b700efe03", + "version-string": "1.0.18-2", + "port-version": 0 + }, + { + "git-tree": "e2898ade85ee58da644d6a656e6817ddee60a880", + "version-string": "1.0.18-1", + "port-version": 0 + }, + { + "git-tree": "2b9184ce5da00f74e933bde06ce0a449a44262dc", + "version-string": "1.0.18", + "port-version": 0 + }, + { + "git-tree": "ada29163107200ff0cfe9da7f44ce33b4e4c4256", + "version-string": "1.0.17-3", + "port-version": 0 + }, + { + "git-tree": "98a6bdf9e37f04a2913fcb682636a8b2611ad7ea", + "version-string": "1.0.17-2", + "port-version": 0 + }, + { + "git-tree": "a8a582fbdcba75febe53011b5387021eff5a2a06", + "version-string": "1.0.17-1", + "port-version": 0 + }, + { + "git-tree": "64450def767dc3e95ccf188f17dfed0c9a8e038b", + "version-string": "1.0.17", + "port-version": 0 + }, + { + "git-tree": "95ce0c6f586a8d1c1c1994037439f4b1abbcc049", + "version-string": "1.0.16-1", + "port-version": 0 + }, + { + "git-tree": "020c91719bd519352a2a179040b33a42c69c7812", + "version-string": "1.0.16", + "port-version": 0 + }, + { + "git-tree": "1c6410b1314332f2ff0807ee2d40708d435de501", + "version-string": "1.0.15-1", + "port-version": 0 + }, + { + "git-tree": "1ef870ed6c827c7dcc08fff97b5760e86652290c", + "version-string": "1.0.15", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libsoundio.json b/port_versions/l-/libsoundio.json new file mode 100644 index 00000000000000..57de025bfbe8ad --- /dev/null +++ b/port_versions/l-/libsoundio.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b7c77d32f74a10cb1ff43cb80c15d6a6f65d5d53", + "version-string": "2.0.0-3", + "port-version": 0 + }, + { + "git-tree": "02f84d0e95a2dad65ecd57ec588599c4a03769b6", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "0fb545db8054236021ee485fb7eae34d8c2004aa", + "version-string": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libspatialindex.json b/port_versions/l-/libspatialindex.json new file mode 100644 index 00000000000000..f68403cd103441 --- /dev/null +++ b/port_versions/l-/libspatialindex.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4313465aee191d0e9e0154f01beaf2e4e47a3e4f", + "version-string": "1.9.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libspatialite.json b/port_versions/l-/libspatialite.json new file mode 100644 index 00000000000000..3bbe9b07496dec --- /dev/null +++ b/port_versions/l-/libspatialite.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "f63638cb7e228e76cebf7e4a6c28902b4738f907", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "76f275137d1de3b27c6a68aa86f474f602ead042", + "version-string": "4.3.0a", + "port-version": 7 + }, + { + "git-tree": "57cdb2ba4a272e4b9bdc0ad0d61f8d24094a20af", + "version-string": "4.3.0a", + "port-version": 6 + }, + { + "git-tree": "3bf795ec31aa4b435e158e5191363a49861a1b52", + "version-string": "4.3.0a", + "port-version": 5 + }, + { + "git-tree": "4d6e107b36d3d4a7e4bfb2e8e8a2b6f07e009467", + "version-string": "4.3.0a-4", + "port-version": 0 + }, + { + "git-tree": "81e74e299a075afeb8d6256aa44b767bcdd3c7ed", + "version-string": "4.3.0a-3", + "port-version": 0 + }, + { + "git-tree": "ce9b2d52acc10ced1c7c3c5bd2dc8dfb8bd87a35", + "version-string": "4.3.0a-2", + "port-version": 0 + }, + { + "git-tree": "e5883f4df23942e5796219a355c0c1341066403d", + "version-string": "4.3.0a-1", + "port-version": 0 + }, + { + "git-tree": "f20ffed3d004f2e7b06f33a8a4ad9cdad9111da9", + "version-string": "4.3.0a", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libspnav.json b/port_versions/l-/libspnav.json new file mode 100644 index 00000000000000..02facf184dfb77 --- /dev/null +++ b/port_versions/l-/libspnav.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2afc1eb32f415070a057e5072132c16021cc7088", + "version-string": "0.2.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libsquish.json b/port_versions/l-/libsquish.json new file mode 100644 index 00000000000000..ab5c5df8f67d6f --- /dev/null +++ b/port_versions/l-/libsquish.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "89f022a7ab3d01ae25876f7dcaf84327f615ad87", + "version-string": "1.15-7", + "port-version": 0 + }, + { + "git-tree": "8cecde0bfe4e0877ed5c9accf43e0f3d58ad8946", + "version-string": "1.15-5", + "port-version": 0 + }, + { + "git-tree": "51fa391504a7f57fa03321ce40efb0bd83a5d5c5", + "version-string": "1.15-3", + "port-version": 0 + }, + { + "git-tree": "8d8ec8e9f11a659f457449792b8fa3907288e0ff", + "version-string": "1.15-2", + "port-version": 0 + }, + { + "git-tree": "9b3cfc2bf0f652299200b047834118b72f38fba0", + "version-string": "1.15-1", + "port-version": 0 + }, + { + "git-tree": "6b2bd544c408afd2e2deec54a6a28e306a41e7ba", + "version-string": "1.15", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libsrt.json b/port_versions/l-/libsrt.json new file mode 100644 index 00000000000000..731cf4fd101ca1 --- /dev/null +++ b/port_versions/l-/libsrt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cf78228426d0454712497d526abf031f6e6afd29", + "version-string": "1.3.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libsrtp.json b/port_versions/l-/libsrtp.json new file mode 100644 index 00000000000000..c1fd99f3b81243 --- /dev/null +++ b/port_versions/l-/libsrtp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d19c02a581a94b808483ce127d731cee188e40b4", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libssh.json b/port_versions/l-/libssh.json new file mode 100644 index 00000000000000..2aa48093dda1a2 --- /dev/null +++ b/port_versions/l-/libssh.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "a9db7620dc774257483a98c9c5309dbb7eff8263", + "version-string": "0.9.5", + "port-version": 0 + }, + { + "git-tree": "e6abfa633623458bf8c58025435c0a707bf0fb1c", + "version-string": "0.9.3-2", + "port-version": 0 + }, + { + "git-tree": "8f14c7ec09f7d0d29c691fc9b225d6a67761db7a", + "version-string": "0.9.3-1", + "port-version": 0 + }, + { + "git-tree": "0a6feb828d27c5ee860145508a17ede4e7a1e73a", + "version-string": "0.9.3", + "port-version": 0 + }, + { + "git-tree": "ee6061def32a105af072e75d61f0de95a6fdec14", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "b2fa5e9b88af986ee5c817a6b99c185132af3781", + "version-string": "0.9.3", + "port-version": 0 + }, + { + "git-tree": "10c4e4dd3e0b3d524dfb75f7295db75930fcb1e9", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "44d8f2b3b277e909d608c68049230b5f4ea5ccfa", + "version-string": "0.7.6-1", + "port-version": 0 + }, + { + "git-tree": "4145721a2592ce28523e1ece83cd3eb8fe0ed7c3", + "version-string": "0.7.6", + "port-version": 0 + }, + { + "git-tree": "cd2e1e955f2d79a9e36bb6930f01c98a18d9ca65", + "version-string": "0.7.5-4", + "port-version": 0 + }, + { + "git-tree": "f2ef7bc5dc9d0003d7647ee7b6b9a04b23596a98", + "version-string": "0.7.5-3", + "port-version": 0 + }, + { + "git-tree": "1dceea4b45e9099aebdef27ac5b6ae4a8219873d", + "version-string": "0.7.5-2", + "port-version": 0 + }, + { + "git-tree": "4efe97ee1e31efd2b6fbeb69ba6974ea40173591", + "version-string": "0.7.5-1", + "port-version": 0 + }, + { + "git-tree": "4ee8a7bd27fed40a2cce00ac57d7f98dcba69d04", + "version-string": "0.7.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libssh2.json b/port_versions/l-/libssh2.json new file mode 100644 index 00000000000000..619f5f85d7fdd4 --- /dev/null +++ b/port_versions/l-/libssh2.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "7c2f49406ae7f86a941bd7a23e7a40aad93e4c93", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "7b01f535a81d955811c5a28f542b5653ca5f6f91", + "version-string": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "f02300d8078f63e09a230bbcf52ddffbb6343fce", + "version-string": "1.8.0-4", + "port-version": 0 + }, + { + "git-tree": "249561bd3f86ac1501b87285bcaacc4eb32f228e", + "version-string": "1.8.0-3", + "port-version": 0 + }, + { + "git-tree": "d538d22f1ff306faf526f4278ad2b506c0e46b72", + "version-string": "1.8.0-2", + "port-version": 0 + }, + { + "git-tree": "148da70008292fda258fdd61abe7981fae6ff92e", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "8264f0e776ef5bed4f79edd6c6678ca31e7ed627", + "version-string": "1.8.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libstemmer.json b/port_versions/l-/libstemmer.json new file mode 100644 index 00000000000000..5d137ea55cc9bb --- /dev/null +++ b/port_versions/l-/libstemmer.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "77cdb68aa3749064891548794658a76eba09ded1", + "version-string": "2017-9-5", + "port-version": 0 + }, + { + "git-tree": "ae5e32271800728bc6b12cf1b7e0fa1791b6062b", + "version-string": "2017-9-4", + "port-version": 0 + }, + { + "git-tree": "5f60fba4e7fe72f82d33c1bc137ccfeb443ad3cf", + "version-string": "2017-9-3", + "port-version": 0 + }, + { + "git-tree": "1ee114f27983ab995d8b79e4591ab6cbd923338d", + "version-string": "2017-9-02", + "port-version": 0 + }, + { + "git-tree": "f6dc1bf3360d37b7582d005bc073543bf80bdafd", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libstk.json b/port_versions/l-/libstk.json new file mode 100644 index 00000000000000..8112992ac9b63c --- /dev/null +++ b/port_versions/l-/libstk.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "f7c24bf692c711b1f10e030b37770addb3038a0e", + "version-string": "4.6.1", + "port-version": 0 + }, + { + "git-tree": "f5d260408a60b6fe44fefb04cb689a75d44db841", + "version-string": "4.6.0-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libsvm.json b/port_versions/l-/libsvm.json new file mode 100644 index 00000000000000..d3fe0a9f594045 --- /dev/null +++ b/port_versions/l-/libsvm.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "81c8a12b8a8abcbfe0eefa7ea1643ea3118b49a2", + "version-string": "323-1", + "port-version": 0 + }, + { + "git-tree": "afb1c62cbd9fb3ac89ab71a3e32a29cf8356f410", + "version-string": "323", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libtheora.json b/port_versions/l-/libtheora.json new file mode 100644 index 00000000000000..5d651451fb93a6 --- /dev/null +++ b/port_versions/l-/libtheora.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "8a881f4b426f98ea87c67e6b5afadd57ed634a95", + "version-string": "1.2.0alpha1-20170719", + "port-version": 2 + }, + { + "git-tree": "21aea39dae9f003157b38fadb9e6fc23ccb89233", + "version-string": "1.2.0alpha1-20170719-1", + "port-version": 0 + }, + { + "git-tree": "377a16ad9325873e7889c24417eef7c0ba52ec2b", + "version-string": "1.2.0alpha1-20170719~vcpkg1-3", + "port-version": 0 + }, + { + "git-tree": "d4ad6da485400da97f2347693b47afadbdea7027", + "version-string": "1.2.0alpha1-20170719~vcpkg1-2", + "port-version": 0 + }, + { + "git-tree": "e121d8289751b5ca72afad3f9e1bd98b7f66c973", + "version-string": "1.2.0alpha1-20170719~vcpkg1-1", + "port-version": 0 + }, + { + "git-tree": "30b8d4c154cdf6a5553d03dc76a9e83dd6e94fc4", + "version-string": "1.2.0alpha1-20170719~vcpkg1", + "port-version": 0 + }, + { + "git-tree": "099587b9692d8e05ceed9ba922140bbefa763753", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libtins.json b/port_versions/l-/libtins.json new file mode 100644 index 00000000000000..02c4f48f504abd --- /dev/null +++ b/port_versions/l-/libtins.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "98c3e72c357331f07d1d0a15b22900018aa7087d", + "version-string": "4.3", + "port-version": 0 + }, + { + "git-tree": "0530780cada8626fb796739c9f65202bddedf802", + "version-string": "4.2", + "port-version": 0 + }, + { + "git-tree": "322cb23762872eddf30568997c7aee3315f70bbf", + "version-string": "4.0-3", + "port-version": 0 + }, + { + "git-tree": "35e3bc2179899cc51d030a96f43be0c1d84de3bc", + "version-string": "4.0-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libtomcrypt.json b/port_versions/l-/libtomcrypt.json new file mode 100644 index 00000000000000..53dc2d8f132cb4 --- /dev/null +++ b/port_versions/l-/libtomcrypt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bcd3ad201eea34c01ad9b03be1d3e33f4ec11c33", + "version-string": "1.18.2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libtommath.json b/port_versions/l-/libtommath.json new file mode 100644 index 00000000000000..5b7bec0167c182 --- /dev/null +++ b/port_versions/l-/libtommath.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f6af9971413dc51fb1068d59b266fbfd7105ae7a", + "version-string": "1.2.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libtorrent.json b/port_versions/l-/libtorrent.json new file mode 100644 index 00000000000000..5d8a41ba090509 --- /dev/null +++ b/port_versions/l-/libtorrent.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "ffa53a6b67da728e6ae5ec3dfc4aca172cb39ea6", + "version-string": "1.2.11", + "port-version": 0 + }, + { + "git-tree": "048ff4fa0159ffe22d102f390349665f29eda77c", + "version-string": "1.2.10", + "port-version": 2 + }, + { + "git-tree": "3fb70a259f7b677f608a7f35cabddfbe43b71334", + "version-string": "1.2.10", + "port-version": 1 + }, + { + "git-tree": "a50177eebe4a18bcd037e05793e8a1ea2257fa02", + "version-string": "1.2.10", + "port-version": 0 + }, + { + "git-tree": "c97e7e389fd4cac2c3e6d62eebef1eb941afb5cf", + "version-string": "1.2.9", + "port-version": 0 + }, + { + "git-tree": "08a529f9d83eee1d4171ee8d5b22190e7d89b50b", + "version-string": "1.2.8", + "port-version": 0 + }, + { + "git-tree": "832ba98d3d2583b7cb0faacae9bf6d470389413d", + "version-string": "1.2.7", + "port-version": 0 + }, + { + "git-tree": "599c7db35648d0ff264def4fa03cdfdfc3bc35c3", + "version-string": "1.2.6-3", + "port-version": 0 + }, + { + "git-tree": "f429887098b42d606e554578c049584dfd93afcc", + "version-string": "1.2.6-2", + "port-version": 0 + }, + { + "git-tree": "cb3e82183f720f752e18af7637cb5cb6b9376767", + "version-string": "1.2.6-1", + "port-version": 0 + }, + { + "git-tree": "2017233c53deb1d2c4f4b66c6cd76011e86c6949", + "version-string": "1.2.6", + "port-version": 0 + }, + { + "git-tree": "f426334f597b1f76d82dff416084b1bbfcf31612", + "version-string": "1.2.2-1", + "port-version": 0 + }, + { + "git-tree": "34e0f8fa3bd7c131b936fe08e436faeeeb652ac9", + "version-string": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "c0416156e06573d96d360d1642e023e1f24ba63c", + "version-string": "1.2.1-bcb26fd6", + "port-version": 0 + }, + { + "git-tree": "628211b639333049e3b90816ba5b9cd0bf6f607e", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "507902ffd3351de15c0e51df98bf3e021c1adf54", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "60a56fb69ad938f5a3d5aa1c15d97736b730c96c", + "version-string": "1.1.6-1", + "port-version": 0 + }, + { + "git-tree": "b35be1685278a99daa1bdbad121792249a4c8c49", + "version-string": "1.1.6", + "port-version": 0 + }, + { + "git-tree": "be2c22ad609c6413cd04902203a6b8801c3b112a", + "version-string": "94f4e88e05f92a1", + "port-version": 0 + }, + { + "git-tree": "cd33ab8a1e71a8de8ea0f3a67442bcd01554a536", + "version-string": "1.1.5-1", + "port-version": 0 + }, + { + "git-tree": "b0b7d1f608e3477ef6206fbcc0a6f505160fb7f6", + "version-string": "1.1.5", + "port-version": 0 + }, + { + "git-tree": "142e9e88ff53fb321688c4d2d2bd30a09aa4233a", + "version-string": "1.1.4-1", + "port-version": 0 + }, + { + "git-tree": "1a53ab73863f67de8e4fc61c63baac4cdd6fbef8", + "version-string": "1.1.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libu2f-server.json b/port_versions/l-/libu2f-server.json new file mode 100644 index 00000000000000..cdb8fd44febf57 --- /dev/null +++ b/port_versions/l-/libu2f-server.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "8238718ea369e39970b6fd6aa1277b5441ba2c0b", + "version-string": "1.1.0", + "port-version": 2 + }, + { + "git-tree": "76c485b16465b2a721d7810d68533f1bd00a15dd", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libudis86.json b/port_versions/l-/libudis86.json new file mode 100644 index 00000000000000..62fefa67deb84f --- /dev/null +++ b/port_versions/l-/libudis86.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "55fbd94b278b0b3d753a2db345afa5f20b95c350", + "version-string": "2018-01-28-56ff6c87", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libudns.json b/port_versions/l-/libudns.json new file mode 100644 index 00000000000000..417a4c59a252c2 --- /dev/null +++ b/port_versions/l-/libudns.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "5e21ce56ac3d56ad2db68602fbbb0278981823cd", + "version-string": "0.4-2", + "port-version": 0 + }, + { + "git-tree": "95609ff4740b2e3757f75f8def402ef2cdcb4f60", + "version-string": "0.4-1", + "port-version": 0 + }, + { + "git-tree": "5db768927485da93264a0909ecf33c9a5d65bf4d", + "version-string": "0.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libui.json b/port_versions/l-/libui.json new file mode 100644 index 00000000000000..4e1fa2dfacf060 --- /dev/null +++ b/port_versions/l-/libui.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c3d3ba8694ca2465c505735531cd10dfc8cf150d", + "version-string": "2018-11-03-1", + "port-version": 0 + }, + { + "git-tree": "d5a72a3408ec1931fba2e2bf7d372ae13453f781", + "version-string": "2018-11-03", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libunibreak.json b/port_versions/l-/libunibreak.json new file mode 100644 index 00000000000000..0bdecfa46ed6f3 --- /dev/null +++ b/port_versions/l-/libunibreak.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "118bde1435b5cc73170ebaa8f17a93b6ea963bcd", + "version-string": "4.3-0", + "port-version": 0 + }, + { + "git-tree": "078519b458b2adb4c722a4be78e28f527d6f05c0", + "version-string": "4.2-1-0", + "port-version": 0 + }, + { + "git-tree": "10ea1353e81f7a30e996dd52df994c63ca41ad51", + "version-string": "4.2", + "port-version": 0 + }, + { + "git-tree": "1dd59ddb7e6b80f13d3b7b3f860ad87ff4fca7ac", + "version-string": "4.1", + "port-version": 0 + }, + { + "git-tree": "d1075504f6fe43fefaaf86dc7d75e65d061e968e", + "version-string": "4.0-2", + "port-version": 0 + }, + { + "git-tree": "aaecbeb42db4d856fe568749028684b61e6dcf9c", + "version-string": "4.0-1", + "port-version": 0 + }, + { + "git-tree": "d43e8b84a909816c32a1ce720c80a9d2e34e1e50", + "version-string": "4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libusb-win32.json b/port_versions/l-/libusb-win32.json new file mode 100644 index 00000000000000..1f933b420894a2 --- /dev/null +++ b/port_versions/l-/libusb-win32.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "2c3d66659ac4c41ca0d5436e3d74b99c3f141eac", + "version-string": "1.2.6.0-6", + "port-version": 0 + }, + { + "git-tree": "2bc0f61ff1998c47aed6a40c33b542d2758f4e95", + "version-string": "1.2.6.0-4", + "port-version": 0 + }, + { + "git-tree": "7d4c55be26458c62858f3d47a4e1c8e4bd69d1ba", + "version-string": "1.2.6.0-3", + "port-version": 0 + }, + { + "git-tree": "384ba0c65077a0e475ec061810a8735af4a65906", + "version-string": "1.2.6.0-2", + "port-version": 0 + }, + { + "git-tree": "7032d68b24f2a0b88138c5f4bbb45f1ce26c369b", + "version-string": "1.2.6.0-1", + "port-version": 0 + }, + { + "git-tree": "f9d3a68a4e5d504cc968365ca89963d961aeca7f", + "version-string": "1.2.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libusb.json b/port_versions/l-/libusb.json new file mode 100644 index 00000000000000..67d06d05359470 --- /dev/null +++ b/port_versions/l-/libusb.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "43ac3831fee48a40aacc5c14480ff724e4644c4f", + "version-string": "1.0.23", + "port-version": 3 + }, + { + "git-tree": "67614c05ea30254303a26760c868353d7b52dab1", + "version-string": "1.0.23", + "port-version": 2 + }, + { + "git-tree": "ac9e13e878fa86d43cec110ff749b4d255a0492e", + "version-string": "1.0.23-1", + "port-version": 0 + }, + { + "git-tree": "ae10deafbfce775aba6087243243b29cf5e72f72", + "version-string": "1.0.23", + "port-version": 0 + }, + { + "git-tree": "aea4a1540ed2e31412ef6234597e614504038512", + "version-string": "1.0.22-4", + "port-version": 0 + }, + { + "git-tree": "e846a61cb0a87eb9768721f803e2a2ecc3bd96f1", + "version-string": "1.0.22-3", + "port-version": 0 + }, + { + "git-tree": "e0f58f53d41ca3b51d45dd6a757f8e275f00e869", + "version-string": "1.0.22-2", + "port-version": 0 + }, + { + "git-tree": "a4eadaf1a616fddfbe07957e5277dcc19a7f6b01", + "version-string": "1.0.22-1", + "port-version": 0 + }, + { + "git-tree": "b553c890bc908d17779fecba51cb34ace61924af", + "version-string": "1.0.21-fc99620", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libusbmuxd.json b/port_versions/l-/libusbmuxd.json new file mode 100644 index 00000000000000..76c8b5d4db4ead --- /dev/null +++ b/port_versions/l-/libusbmuxd.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "51dcfc0be39078d8d8d64dd51188a0ccae761667", + "version-string": "1.2.219", + "port-version": 0 + }, + { + "git-tree": "08d463bfee14e9d6d1d804bf6e59c08b7c2eb478", + "version-string": "1.2.185-1", + "port-version": 0 + }, + { + "git-tree": "14feef0b5b263e332b431eca6abd0081d00fbb5f", + "version-string": "1.2.185", + "port-version": 0 + }, + { + "git-tree": "4e6aa8c67d854c6f880c5dbdad99704e5010826b", + "version-string": "1.2.137", + "port-version": 0 + }, + { + "git-tree": "3787b01e075ba64c494b6fdc3b4b901d3a575475", + "version-string": "1.2.77-1", + "port-version": 0 + }, + { + "git-tree": "741230c70d793b4970751e08f1f3c7bcf41de43c", + "version-string": "1.2.77", + "port-version": 0 + }, + { + "git-tree": "83666e8678900251e18a0655c785d218e7335a0c", + "version-string": "1.0.107-2", + "port-version": 0 + }, + { + "git-tree": "e550cb1345e74ed0e4b9123f31bd4cf0bcd7c507", + "version-string": "1.0.107-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libuuid.json b/port_versions/l-/libuuid.json new file mode 100644 index 00000000000000..66fb9c7faffdec --- /dev/null +++ b/port_versions/l-/libuuid.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "1462e6294a414e76e18cd6b2679b5906254751bd", + "version-string": "1.0.3-7", + "port-version": 0 + }, + { + "git-tree": "c82d6cfca8bc843374f032788b24ca9987917d59", + "version-string": "1.0.3-5", + "port-version": 0 + }, + { + "git-tree": "8489335b37237e7ac5e816057def204b7eab4f47", + "version-string": "1.0.3-4", + "port-version": 0 + }, + { + "git-tree": "1c3045ac54b103b9d409cbf481e21831c3b82d8e", + "version-string": "1.0.3-3", + "port-version": 0 + }, + { + "git-tree": "d93f7e6b1dc394513378d68b035e8c1a25108ec6", + "version-string": "1.0.3-2", + "port-version": 0 + }, + { + "git-tree": "676d12c2bcbfa28651dd3fab06736ce4b791eb98", + "version-string": "1.0.3-1", + "port-version": 0 + }, + { + "git-tree": "de9f86ae646b68ebdeb7f75e7ed04a7b61213a52", + "version-string": "1.0.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libuv.json b/port_versions/l-/libuv.json new file mode 100644 index 00000000000000..2d1735e67b5713 --- /dev/null +++ b/port_versions/l-/libuv.json @@ -0,0 +1,179 @@ +{ + "versions": [ + { + "git-tree": "18afc7f0e81eb4d9c8a9d8d1f4c15a96cb4f2db1", + "version-string": "1.39.0", + "port-version": 0 + }, + { + "git-tree": "d6d62746530060b642c3beb95fc4c1e723ba106e", + "version-string": "1.34.2-1", + "port-version": 0 + }, + { + "git-tree": "a80a4518ce3cfaea4c3f948dcfdbed6d99bfcd9d", + "version-string": "1.34.2", + "port-version": 0 + }, + { + "git-tree": "c1d043984fc3caec45216f29e059e9b49864f0a0", + "version-string": "1.30.1", + "port-version": 0 + }, + { + "git-tree": "36c2715fd8a0e673fe1a982b515aecfbc0e8241c", + "version-string": "1.29.1", + "port-version": 0 + }, + { + "git-tree": "e56ec087705750b3d04e4fa3ea89d4770fb7ef01", + "version-string": "1.29.0", + "port-version": 0 + }, + { + "git-tree": "ecca1a82074e7969c561c0b53204eff4e4049f30", + "version-string": "1.28.0", + "port-version": 0 + }, + { + "git-tree": "0df2105e8c7f7f410d6b6d39ef168f9a44286de8", + "version-string": "1.27.0", + "port-version": 0 + }, + { + "git-tree": "1aea28aa46afa6fe7a78eeb5b4f1e153f7533a7e", + "version-string": "1.25.0", + "port-version": 0 + }, + { + "git-tree": "622b30d74099492dbc27e5685b2c5eaa8468ff47", + "version-string": "1.24.1", + "port-version": 0 + }, + { + "git-tree": "cfcc2b3f73c69a2bb76ba8560a4c82f165354a92", + "version-string": "1.24.0-1", + "port-version": 0 + }, + { + "git-tree": "8184f3df0e52f7da26124bc6652f7b4bfe529de5", + "version-string": "1.24.0", + "port-version": 0 + }, + { + "git-tree": "e709bfa2ac010a117aa088947520d9041cbde291", + "version-string": "1.23.2", + "port-version": 0 + }, + { + "git-tree": "35b1a6881f238ba2eada8450ffa94a0d07ed4811", + "version-string": "1.23.0", + "port-version": 0 + }, + { + "git-tree": "dd49fe4deb1475e27220ae78dd3b5199af4e7151", + "version-string": "1.22.0", + "port-version": 0 + }, + { + "git-tree": "c9f58c6e60e1a4a0dcc4c9581c0cf99f8fb18126", + "version-string": "1.21.0-1", + "port-version": 0 + }, + { + "git-tree": "fe3eff9b49e728ce7efea4dec5c0949376bbb090", + "version-string": "1.20.3-2", + "port-version": 0 + }, + { + "git-tree": "e8e454ac03ec3d48b43c1367a1cde8cee0b9e759", + "version-string": "1.20.3-1", + "port-version": 0 + }, + { + "git-tree": "438d26c6ab4c6317c98dfbfdb1361cdfbf4b17ed", + "version-string": "1.20.3", + "port-version": 0 + }, + { + "git-tree": "d2bace79e5a3a76f1cca91cb60eb7194ab0f4d3e", + "version-string": "1.20.2", + "port-version": 0 + }, + { + "git-tree": "9af0cff9d701f31dc6237a7232be6dfa0dfd1344", + "version-string": "1.20.0", + "port-version": 0 + }, + { + "git-tree": "aa4a60eec0e5f7385100e89ca1de17efc3dd3a43", + "version-string": "1.19.2", + "port-version": 0 + }, + { + "git-tree": "f592054b77e7c91a68f8f06f5f59bc6f825509a8", + "version-string": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "5d672473ea176655bdb48f96f8fa5e501111d006", + "version-string": "1.17.0", + "port-version": 0 + }, + { + "git-tree": "b81cafdf6ccb8ed8c51945c18f5ff1abd913c624", + "version-string": "1.16.1", + "port-version": 0 + }, + { + "git-tree": "740f8b73b5b354d4c1efa74643a913ba3a8d5c26", + "version-string": "1.14.1-1", + "port-version": 0 + }, + { + "git-tree": "b3ad31f693bedbe8010317e781688f0cc8b6bd3e", + "version-string": "1.14.1", + "port-version": 0 + }, + { + "git-tree": "5ab851fec59887dd72aa25a2642f1aced468b45e", + "version-string": "1.14.0", + "port-version": 0 + }, + { + "git-tree": "c52d1d0e18811e4e4bf0e2eea97af02e23c25983", + "version-string": "1.13.1", + "port-version": 0 + }, + { + "git-tree": "471e684bf0d700fec05649959a96c71788022973", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "113cac43fe19159936774b598043b03240183e19", + "version-string": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "da9ac2e308a93149d6e5a56f55b53475f585da6e", + "version-string": "1.10.1-2", + "port-version": 0 + }, + { + "git-tree": "af47c4493ef3142ae8df5d32854ec3f16b0f29d8", + "version-string": "1.10.1-1", + "port-version": 0 + }, + { + "git-tree": "851edefa4c77bf80c3ba4f2c158ef6749c56b413", + "version-string": "1.10.1", + "port-version": 0 + }, + { + "git-tree": "1dd9e80fd7be35fd1efb2fafbd52614ee48f1c0c", + "version-string": "1.9.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libvmdk.json b/port_versions/l-/libvmdk.json new file mode 100644 index 00000000000000..b64701f158ec3c --- /dev/null +++ b/port_versions/l-/libvmdk.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "6d461aee7ea9e99c29255ad611a2c03c00acd895", + "version-string": "20200926", + "port-version": 0 + }, + { + "git-tree": "81ea40207a10e3914ddb5b6320656d6e888afc90", + "version-string": "2019-12-21", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libvorbis.json b/port_versions/l-/libvorbis.json new file mode 100644 index 00000000000000..03309caf18c533 --- /dev/null +++ b/port_versions/l-/libvorbis.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "54dcb5ab354422e9518a905d501ccc22dcb69098", + "version-string": "1.3.7", + "port-version": 1 + }, + { + "git-tree": "0b0587525c2053316552dce564fe504a2a40cc91", + "version-string": "1.3.7", + "port-version": 0 + }, + { + "git-tree": "01ccede900dde05e038364bc8b5576a5bfa4dcd4", + "version-string": "1.3.6-4d963fe", + "port-version": 2 + }, + { + "git-tree": "98e70b1efd9f89e964672f3796a2ab883c4dbd68", + "version-string": "1.3.6-4d963fe", + "port-version": 0 + }, + { + "git-tree": "114e152c9adfde6f7064b80f828381df5ccac1ab", + "version-string": "1.3.6-9eadecc-3", + "port-version": 0 + }, + { + "git-tree": "3413027bb7d4da56758b4eb789ae34dfe93b4cef", + "version-string": "1.3.6-9eadecc-1", + "port-version": 0 + }, + { + "git-tree": "a58d3c6bb8aec5d8f56114e33d238365e8b79762", + "version-string": "1.3.6-112d3bd-1", + "port-version": 0 + }, + { + "git-tree": "c38d184c633057325db94f5d59c237c31354d4fd", + "version-string": "1.3.6-112d3bd", + "port-version": 0 + }, + { + "git-tree": "330bd7ab75c092e6f20d67be59abac4efca0eb30", + "version-string": "1.3.5-143caf4-3", + "port-version": 0 + }, + { + "git-tree": "cb1900cbe3690d4e461905e5b3c1a018c2a5a8a2", + "version-string": "1.3.5-143caf4-2", + "port-version": 0 + }, + { + "git-tree": "d4563b5599024b017a53f39f201430a986a2419b", + "version-string": "1.3.5-1-143caf4023a90c09a5eb685fdd46fb9b9c36b1ee", + "port-version": 0 + }, + { + "git-tree": "a707a67cdaa73df3b6212ec4a2275c83f12b47e2", + "version-string": "1.3.5-143caf4023a90c09a5eb685fdd46fb9b9c36b1ee", + "port-version": 0 + }, + { + "git-tree": "5d39ab08f2c1b122c040b6a21e5bc5f736879d31", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libvpx.json b/port_versions/l-/libvpx.json new file mode 100644 index 00000000000000..50b695a409da55 --- /dev/null +++ b/port_versions/l-/libvpx.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "7f96abd4953072c5949e4eae823b7d5af27d8f13", + "version-string": "1.9.0", + "port-version": 5 + }, + { + "git-tree": "3c7e89668781033b4904d467101c5d0de5301248", + "version-string": "1.9.0", + "port-version": 4 + }, + { + "git-tree": "ad82cc4c7e4cc8b798683a210d735f3efd8bfc86", + "version-string": "1.9.0", + "port-version": 3 + }, + { + "git-tree": "125a355662d3540d12bf52456916e170706b8e6c", + "version-string": "1.9.0", + "port-version": 2 + }, + { + "git-tree": "39027aa1b724f32029fdba4498b6970cae52afd3", + "version-string": "1.9.0", + "port-version": 1 + }, + { + "git-tree": "898abd651127839ba327275b7002d297889c0eab", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "044754fac227f1431f9cf222208d868f48e9108f", + "version-string": "1.8.1", + "port-version": 9 + }, + { + "git-tree": "fd46e8658ba18f6aa2a7407fed4e7c3fa8fdb7e4", + "version-string": "1.8.1", + "port-version": 8 + }, + { + "git-tree": "25750e6b99f1266f44f2095563c9f1d2babda515", + "version-string": "1.8.1-7", + "port-version": 0 + }, + { + "git-tree": "9d1380d8bfa24d3e4ed4a28428a66b11f2fa3d32", + "version-string": "1.8.1-6", + "port-version": 0 + }, + { + "git-tree": "96f63915aea8c90e4b15fef1b452d658a4a22469", + "version-string": "1.8.1-5", + "port-version": 0 + }, + { + "git-tree": "38ec8d72a85a78f4c6d1fb4d1f65791cc34537c9", + "version-string": "1.8.1-4", + "port-version": 0 + }, + { + "git-tree": "9bbf4957ee7545eac30f2efdefa487a72e2379ac", + "version-string": "1.8.1-3", + "port-version": 0 + }, + { + "git-tree": "07f10cda4d0f0e6394f89df316673cabfc4e1ed3", + "version-string": "1.8.1-2", + "port-version": 0 + }, + { + "git-tree": "0d156046ccd7f57c852b7ff630dd638667a38ca0", + "version-string": "1.8.1-1", + "port-version": 0 + }, + { + "git-tree": "0e3632108fbbc997646cf282e98045ff157f1e2d", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "65ced7c6fed54395cc0a28e5672e334f1b31effd", + "version-string": "1.7.0-3", + "port-version": 0 + }, + { + "git-tree": "ed554736bb2047234ff312de7a3cc069da3d0902", + "version-string": "1.7.0-2", + "port-version": 0 + }, + { + "git-tree": "8828b66284ea515eb31f33d782d5edd54332e58e", + "version-string": "1.7.0-1", + "port-version": 0 + }, + { + "git-tree": "c219b93c62ef3436e08fbfcd6f4ff136b295aebc", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "7d18d40f05225b763154aff31290ce4b071b5e69", + "version-string": "1.6.1-2", + "port-version": 0 + }, + { + "git-tree": "ae231007830162194ac4bbbee049272e4a98603c", + "version-string": "1.6.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libwandio.json b/port_versions/l-/libwandio.json new file mode 100644 index 00000000000000..3ade461e037506 --- /dev/null +++ b/port_versions/l-/libwandio.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "72e5776baa22eb1281309f6296699bde4636138b", + "version-string": "4.2.1", + "port-version": 3 + }, + { + "git-tree": "d95101a889c2fe9da380a323fd4892a8be324684", + "version-string": "4.2.1-2", + "port-version": 0 + }, + { + "git-tree": "dcdc15621d3c3ca324ba7be2861e913e33367afd", + "version-string": "4.2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libwebm.json b/port_versions/l-/libwebm.json new file mode 100644 index 00000000000000..9e06264666f0cf --- /dev/null +++ b/port_versions/l-/libwebm.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "f0a6e61554dbc2b0682711214e704f8fc04275ae", + "version-string": "1.0.0.27-5", + "port-version": 0 + }, + { + "git-tree": "ab492ea21f882355f542c09d471ef43261938b54", + "version-string": "1.0.0.27-4", + "port-version": 0 + }, + { + "git-tree": "b9392b046528c7396df4c34de4d7316bd27d6c82", + "version-string": "1.0.0.27-3", + "port-version": 0 + }, + { + "git-tree": "543e2a29c62175b1c5b4ea9f4d9aa7cda3fd497f", + "version-string": "1.0.0.27-2", + "port-version": 0 + }, + { + "git-tree": "70b9f93698dd7325b4d9bbd32cf4b2f06a53d9c7", + "version-string": "1.0.0.27-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libwebp.json b/port_versions/l-/libwebp.json new file mode 100644 index 00000000000000..4e8d19547e1337 --- /dev/null +++ b/port_versions/l-/libwebp.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "de60c0060bd08d336b79bf5676c28394e81bf1b8", + "version-string": "1.1.0", + "port-version": 1 + }, + { + "git-tree": "a05e0de81085231df86f6902aba1e0a364e2ca7b", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "5066566c98bc1913b678347c4cbae0a6aff4cf2d", + "version-string": "1.0.3-1", + "port-version": 0 + }, + { + "git-tree": "6ff3a23b154fad821db2d8236bf9d0382f0229cf", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "256b8e8b5d64cb6f66da47f1a361e5538d341023", + "version-string": "1.0.2-8", + "port-version": 0 + }, + { + "git-tree": "e346060df1b0a0a0678450a1e1bc54360a8d3c55", + "version-string": "1.0.2-7", + "port-version": 0 + }, + { + "git-tree": "0fd238a9eb84602ff73d675826c9160f2ac41719", + "version-string": "1.0.2-6", + "port-version": 0 + }, + { + "git-tree": "4e3bca81e2ee5d64a83916b1a5767eb92254dfb8", + "version-string": "1.0.2-4", + "port-version": 0 + }, + { + "git-tree": "3293ad38a00a161493070881adab3657ce52fa46", + "version-string": "1.0.2-3", + "port-version": 0 + }, + { + "git-tree": "e475e4b3c6b17dea10f1d5ebce8963e92aa8028b", + "version-string": "1.0.2-2", + "port-version": 0 + }, + { + "git-tree": "cd9eb2a1de5cbee5d08377eb3bd8bdcd1e449ffd", + "version-string": "1.0.2-1", + "port-version": 0 + }, + { + "git-tree": "0ea91cc24e12ecb8c3bdf133c11907e33b199d41", + "version-string": "0.6.1-2", + "port-version": 0 + }, + { + "git-tree": "17ed12a3c871c7132ac910da2c41e84ec85aeec6", + "version-string": "0.6.1-1", + "port-version": 0 + }, + { + "git-tree": "1a5ce7e9e8e49ee48ab6c1d502acb047908f8fe3", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "43072c98ece4301042038510225369171c5c6b93", + "version-string": "0.6.0-2", + "port-version": 0 + }, + { + "git-tree": "e5168131d94eb8327e39a94405a92e446dcf2ab1", + "version-string": "0.6.0-1", + "port-version": 0 + }, + { + "git-tree": "b3198de0a1aceb9ddb6b6d74d1052f6f50121937", + "version-string": "0.5.1-1", + "port-version": 0 + }, + { + "git-tree": "0017292c90bd4a10f430bfd01a4e6c8d89b6cd50", + "version-string": "0.5.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libwebsockets.json b/port_versions/l-/libwebsockets.json new file mode 100644 index 00000000000000..80272ebdf7f15a --- /dev/null +++ b/port_versions/l-/libwebsockets.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "ee45554228e403c2a79c3b106bf327c526effb92", + "version-string": "4.1.3", + "port-version": 1 + }, + { + "git-tree": "58f2f6ef2bd83b108484f93da75d7f3a7fbc8378", + "version-string": "4.1.3", + "port-version": 0 + }, + { + "git-tree": "e3316d8f92f09956f5907c21f84ce60a53d1f33f", + "version-string": "4.1.2", + "port-version": 0 + }, + { + "git-tree": "d105a0c2dfe071709fc192cf4dd705c36ae067a7", + "version-string": "4.0.1-1", + "port-version": 0 + }, + { + "git-tree": "5c01a101e76df3f5763d71f7a8e9cd8c8697a724", + "version-string": "4.0.1", + "port-version": 0 + }, + { + "git-tree": "a98fc993b8f11255d2b9291403a7c6b5bb7bcf57", + "version-string": "3.2.2-2", + "port-version": 0 + }, + { + "git-tree": "ce4220a9b6fc28b12539b5d423240d8d723c877d", + "version-string": "3.2.2-1", + "port-version": 0 + }, + { + "git-tree": "19e43f46d3051e515048d335177fbd3bf6601909", + "version-string": "3.2.2", + "port-version": 0 + }, + { + "git-tree": "2836ac8b9052e8f008a7c2c2c1157baf6ff41607", + "version-string": "3.2.0-2", + "port-version": 0 + }, + { + "git-tree": "92fbbc147f3ac1728b0e3256faab272205124490", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "b5dcb71a30bb038df3c963c826c32c3a73b592d6", + "version-string": "3.1.0-3", + "port-version": 0 + }, + { + "git-tree": "f30d790ceaff65b5c937822bcbfa3fa52926ceff", + "version-string": "3.1.0-2", + "port-version": 0 + }, + { + "git-tree": "277aad02b1549f660af206bd1229be0b2b3f3ffa", + "version-string": "3.1.0-1", + "port-version": 0 + }, + { + "git-tree": "eb346c5f0604817b3ab30b6321d5c9d6d518628b", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "80b4d2157064b6b4876520f120e8ea6d135a8b0d", + "version-string": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "2aa780e9d417ff43cef981606bc6911c2f751665", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "58943ac17c0e2956632be59a260dbf4aa7ce8ac5", + "version-string": "2.4.2", + "port-version": 0 + }, + { + "git-tree": "aee8631390834d6716dd4b12d3a12a0801dd5792", + "version-string": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "5ffd285b9e20d7540b52e3ed8cbc0bcb230edfa9", + "version-string": "2.0.0-4", + "port-version": 0 + }, + { + "git-tree": "48ae552f907cda9f410f1242dc22779b73aca59a", + "version-string": "2.0.0-3", + "port-version": 0 + }, + { + "git-tree": "bf1873d12212b14738279540418f67ebe15b94bc", + "version-string": "2.0.0-2", + "port-version": 0 + }, + { + "git-tree": "2b8b7f4c0718ef21f79ac7acc8b174a28366ad92", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "91d709fc61a7fe6ce48194a5dd47455e97386dfa", + "version-string": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libxdiff.json b/port_versions/l-/libxdiff.json new file mode 100644 index 00000000000000..1b310f842142bc --- /dev/null +++ b/port_versions/l-/libxdiff.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1a71b6f2278ad8edbe64b1c03e338dd733ad8aa1", + "version-string": "0.23", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libxlsxwriter.json b/port_versions/l-/libxlsxwriter.json new file mode 100644 index 00000000000000..59b302feabe8f3 --- /dev/null +++ b/port_versions/l-/libxlsxwriter.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f4f03a0a0d45dc562ef63a482b4307a3f2c858b9", + "version-string": "0.9.4", + "port-version": 0 + }, + { + "git-tree": "f8bb4a75ffc6272141ef6f87ea478644bc50d5e0", + "version-string": "0.8.9-1", + "port-version": 0 + }, + { + "git-tree": "a7f7956f07b6e244f3a191aa6d696528b30bc5e9", + "version-string": "0.8.7-1", + "port-version": 0 + }, + { + "git-tree": "e16a1c13199ffe041f5a8c548d41daaf58888a43", + "version-string": "0.8.6-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libxml2.json b/port_versions/l-/libxml2.json new file mode 100644 index 00000000000000..d2b8fcddc73084 --- /dev/null +++ b/port_versions/l-/libxml2.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "873d78549fd9c4fa3cb7f0296a1f9a50dbf9f13e", + "version-string": "2.9.10", + "port-version": 2 + }, + { + "git-tree": "4bc5ef5b5d53f7fbf01d10fcb576bdc926479efa", + "version-string": "2.9.10", + "port-version": 1 + }, + { + "git-tree": "0ccb42a07ced8162ff4e99cdff298f1a1674c114", + "version-string": "2.9.10", + "port-version": 0 + }, + { + "git-tree": "f99dba51f54953d70e894a949be18d27ab1d1bfc", + "version-string": "2.9.9", + "port-version": 8 + }, + { + "git-tree": "0f9e8932a5dc93e33dd71d64c381cfa6001a8c24", + "version-string": "2.9.9", + "port-version": 7 + }, + { + "git-tree": "77cab566cc656094555162dbef8a86067115032f", + "version-string": "2.9.9-6", + "port-version": 0 + }, + { + "git-tree": "5dd231c02d28991857ed343229090cc8400afce9", + "version-string": "2.9.9-5", + "port-version": 0 + }, + { + "git-tree": "f03c2387786d1b7d517dab0b8dd61b69e0d5c9db", + "version-string": "2.9.9-4", + "port-version": 0 + }, + { + "git-tree": "b6604793e23e526d8dd7449fefbbd6941745cda9", + "version-string": "2.9.4-5", + "port-version": 0 + }, + { + "git-tree": "6a1cfd035209c1721f49536337df8e2ecbc2a71a", + "version-string": "2.9.4-4", + "port-version": 0 + }, + { + "git-tree": "24f4e9b8e13f5fc39d0c4a52d60347694bcc98fe", + "version-string": "2.9.4-2", + "port-version": 0 + }, + { + "git-tree": "c0a9f523c5d3175f94fe44e61c63830b85a69450", + "version-string": "2.9.4-1", + "port-version": 0 + }, + { + "git-tree": "35d1dcddd0d454a9d59ca3ff6c53e4af1316f5c0", + "version-string": "2.9.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libxmlmm.json b/port_versions/l-/libxmlmm.json new file mode 100644 index 00000000000000..edcb5e529bc95f --- /dev/null +++ b/port_versions/l-/libxmlmm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7c106adf45ac07c773738acf6d6e2e359ea1b402", + "version-string": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libxmlpp.json b/port_versions/l-/libxmlpp.json new file mode 100644 index 00000000000000..0bdfeffe82817a --- /dev/null +++ b/port_versions/l-/libxmlpp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "cf3bbc6a0547601cd247497eb4778f11b16c6839", + "version-string": "2.40.1", + "port-version": 8 + }, + { + "git-tree": "9e0157583d39910ca8237ef3553eca2d8abdb0c0", + "version-string": "2.40.1", + "port-version": 7 + }, + { + "git-tree": "93c1a786e84dc682b573fad9dba7a7e9bfd25737", + "version-string": "2.40.1", + "port-version": 6 + }, + { + "git-tree": "872c6503ee79f0fa6da98e67b58ebbcc47c28761", + "version-string": "2.40.1-5", + "port-version": 0 + }, + { + "git-tree": "fd223de5c00ea896d7d4f82230bd092517e534f8", + "version-string": "2.40.1-3", + "port-version": 0 + }, + { + "git-tree": "53faf09d90a0597d2f46efce21b3f96f6042c9bf", + "version-string": "2.40.1-2", + "port-version": 0 + }, + { + "git-tree": "1b14a2048d5d9a90f646d566f8186f575e23fcde", + "version-string": "2.40.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libxmp-lite.json b/port_versions/l-/libxmp-lite.json new file mode 100644 index 00000000000000..59ffeb6796a408 --- /dev/null +++ b/port_versions/l-/libxmp-lite.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "c69ae2b0e1c4730c75d66c8f842e0d8d3e4df116", + "version-string": "4.4.1-6", + "port-version": 0 + }, + { + "git-tree": "4af756d98344e052d3bee919aec77b3a0079ccd9", + "version-string": "4.4.1-4", + "port-version": 0 + }, + { + "git-tree": "098f7f0e262147eab4c6159733d89c06804e4500", + "version-string": "4.4.1-3", + "port-version": 0 + }, + { + "git-tree": "78bb669d778cb055ad66d176ef52ada71f9cbcc4", + "version-string": "4.4.1-2", + "port-version": 0 + }, + { + "git-tree": "f480b368906fbd946b97c743f8f206ced6ff55d5", + "version-string": "4.4.1-1", + "port-version": 0 + }, + { + "git-tree": "b28380c69722d9e9887891ae8f3596d93ba4f3d4", + "version-string": "4.4.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libxslt.json b/port_versions/l-/libxslt.json new file mode 100644 index 00000000000000..66c70404c70675 --- /dev/null +++ b/port_versions/l-/libxslt.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "a737eb337f73e61e189204c657dc32332ba0adf8", + "version-string": "1.1.33", + "port-version": 8 + }, + { + "git-tree": "4101234641c52ed2895b5a14ac9d673ed6ec46e4", + "version-string": "1.1.33-7", + "port-version": 2 + }, + { + "git-tree": "8d3313527abaa2b3cd25b12abeace62abf9a2275", + "version-string": "1.1.33-7", + "port-version": 1 + }, + { + "git-tree": "8dd382a54f21621e6c6c42d8d414bdeb49bccf85", + "version-string": "1.1.33-7", + "port-version": 0 + }, + { + "git-tree": "a081ca29c4843ccbcf0721dad2547036b61bc473", + "version-string": "1.1.33-6", + "port-version": 0 + }, + { + "git-tree": "05a677b8af7ab8695c3f0828db7577cf5b143704", + "version-string": "1.1.33-5", + "port-version": 0 + }, + { + "git-tree": "bedd6b127ccd0caba7f707d9b77ab9e913155800", + "version-string": "1.1.33-4", + "port-version": 0 + }, + { + "git-tree": "92c44780d53c6bba5be535223c3a1ae3016909ad", + "version-string": "1.1.33-2", + "port-version": 0 + }, + { + "git-tree": "0d599445d03ebb53634ec4ef72ac58e2381ac4c3", + "version-string": "1.1.33-1", + "port-version": 0 + }, + { + "git-tree": "f60681527bc521ba84e58e714208a78f04549c31", + "version-string": "1.1.33", + "port-version": 0 + }, + { + "git-tree": "ea36843be676aee20d65e4051d772ad61de940af", + "version-string": "1.1.29", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libyaml.json b/port_versions/l-/libyaml.json new file mode 100644 index 00000000000000..f475c7fad72f09 --- /dev/null +++ b/port_versions/l-/libyaml.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "63a0e7b0e6194ee90c9d2e5bf3ac2c10ec04cca3", + "version-string": "0.2.5", + "port-version": 0 + }, + { + "git-tree": "b02016f410d7c0ebafcfd76aedc94d4c5254fd21", + "version-string": "0.2.2-3", + "port-version": 0 + }, + { + "git-tree": "105a145330252408eea604f2202b79b8d5bcbeaf", + "version-string": "0.2.2-2", + "port-version": 0 + }, + { + "git-tree": "ee054338d987d10829e3aad704ac976fead5ff71", + "version-string": "0.2.2-1", + "port-version": 0 + }, + { + "git-tree": "6a11377942d4a8751ca5575a05b7dd63c05f8b7e", + "version-string": "0.2.2", + "port-version": 0 + }, + { + "git-tree": "8021526fc56f0be280ecf210e4730dffef8bbbb5", + "version-string": "0.2.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libyuv.json b/port_versions/l-/libyuv.json new file mode 100644 index 00000000000000..bec719296daa57 --- /dev/null +++ b/port_versions/l-/libyuv.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "3e79a0e3d4e6d2d92532d3ad8d368e4fc46ca62f", + "version-string": "fec9121", + "port-version": 3 + }, + { + "git-tree": "ec1ac02dc0af035269269dd91dcfa794b781399e", + "version-string": "fec9121-2", + "port-version": 0 + }, + { + "git-tree": "1db720294d7d6735eb1277f189f0a3462da5152c", + "version-string": "fec9121-1", + "port-version": 0 + }, + { + "git-tree": "279d2c83a2c384169daae9317cefaabaa5434e34", + "version-string": "fec9121", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libzen.json b/port_versions/l-/libzen.json new file mode 100644 index 00000000000000..e5aef047addab9 --- /dev/null +++ b/port_versions/l-/libzen.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "53a1b657b1e2647f28f64618a7322b51ac85be93", + "version-string": "0.4.38", + "port-version": 0 + }, + { + "git-tree": "e8279550cd282d6f7e8780c9a4627f12a40184ea", + "version-string": "0.4.37", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libzip.json b/port_versions/l-/libzip.json new file mode 100644 index 00000000000000..8d957e4f4ca5db --- /dev/null +++ b/port_versions/l-/libzip.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "03badcbd43bb29fa3475d0aa990fc999dab91460", + "version-string": "1.7.3", + "port-version": 1 + }, + { + "git-tree": "1194df348661e10a8c54a416cab3435417a457eb", + "version-string": "1.7.3", + "port-version": 0 + }, + { + "git-tree": "b28e75bd37ecd22e624bdc6c2523ab23aaf26df2", + "version-string": "1.7.1", + "port-version": 1 + }, + { + "git-tree": "a74e0e4b0d8ac0b8e3769ef729aa5ec12140f3fd", + "version-string": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "3bb4b40816e28aac5d95476893573a90b4b6edec", + "version-string": "rel-1-6-1", + "port-version": 0 + }, + { + "git-tree": "cf1459354c5fb664554abde4f03644450aafb557", + "version-string": "rel-1-5-2--1", + "port-version": 0 + }, + { + "git-tree": "020d4a28fef2334dca39fa49c3b0330ee6b79adf", + "version-string": "rel-1-5-3", + "port-version": 0 + }, + { + "git-tree": "22201e83f5e8af045e256c3c5c6e6a87804adf76", + "version-string": "rel-1-5-2", + "port-version": 0 + }, + { + "git-tree": "dd2e8d335da34e931ca7719ddf752af6ac816075", + "version-string": "rel-1-5-1-vcpkg2", + "port-version": 0 + }, + { + "git-tree": "9a5affd07119505518e99c49f084f770759e7e49", + "version-string": "rel-1-5-1-vcpkg1", + "port-version": 0 + }, + { + "git-tree": "7171f8dbe10ccf419d8ea7915a30ff595e161e79", + "version-string": "rel-1-5-1", + "port-version": 0 + }, + { + "git-tree": "328884c9c47cdbc0f5a1832c29b1b4ff57c24b5b", + "version-string": "rel-1-5-0", + "port-version": 0 + }, + { + "git-tree": "dfb5b8c39a7431c8a8204403c88a20db504a5a09", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "34b232ae50d6e3e92c60773be4c482cc77e402eb", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "d543c4b3ab8b3b0863890d4dfcc62b1bd82255c9", + "version-string": "1.3.2", + "port-version": 0 + }, + { + "git-tree": "9be6646ea9b3e72b6ab907b66046386365acc3bb", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "115a10d59b6d5875dfb0eeb18dea01f14cfc207e", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "83785fac58a121127d41a7ac58da6905a3678657", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/libzippp.json b/port_versions/l-/libzippp.json new file mode 100644 index 00000000000000..f82ee71731c57f --- /dev/null +++ b/port_versions/l-/libzippp.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b599e7e8cf8101b7ad23965c00bca32c24de4b88", + "version-string": "4.0-1.7.3", + "port-version": 3 + }, + { + "git-tree": "99c1b13ef0ac377589ae37cea3323a8a448d04e1", + "version-string": "4.0-1.7.3", + "port-version": 2 + }, + { + "git-tree": "c32ec51923205fa390a0d5f5902c34edfd8186cd", + "version-string": "4.0-1.7.3", + "port-version": 1 + }, + { + "git-tree": "5c32c9de4a0ac7c50effe8a581bc141200071ed9", + "version-string": "4.0-1.7.3", + "port-version": 0 + }, + { + "git-tree": "149333ab08cac3634140b5e99581bfdd76b13754", + "version-string": "3.1-1.6.1", + "port-version": 0 + }, + { + "git-tree": "279c7fbab088703019f9032850470f233dae4f9a", + "version-string": "2019-07-22", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/licensepp.json b/port_versions/l-/licensepp.json new file mode 100644 index 00000000000000..e41fa07bd386b2 --- /dev/null +++ b/port_versions/l-/licensepp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "277b066105603c5e9948957ac4abee99a7451051", + "version-string": "2020-05-19", + "port-version": 1 + }, + { + "git-tree": "0c9e02678de842c307947014ac4b472b26afe122", + "version-string": "2020-05-19", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lilv.json b/port_versions/l-/lilv.json new file mode 100644 index 00000000000000..3964c793f1a41b --- /dev/null +++ b/port_versions/l-/lilv.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7cf6faadffa3ad04da656c4fbbdcee367b302fdb", + "version-string": "0.24.10", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/linalg.json b/port_versions/l-/linalg.json new file mode 100644 index 00000000000000..c84554de22ea9b --- /dev/null +++ b/port_versions/l-/linalg.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3691c3e21388afc6c584dfc8c212dbc2c5f7e286", + "version-string": "2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/linenoise-ng.json b/port_versions/l-/linenoise-ng.json new file mode 100644 index 00000000000000..d3ed353c05e87c --- /dev/null +++ b/port_versions/l-/linenoise-ng.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "5ae9279d3acecf2c559de7b455c79cfde6460336", + "version-string": "4754bee2d8eb3-1", + "port-version": 0 + }, + { + "git-tree": "f977dddcbb66b2c62388822f694ed1491f9e08db", + "version-string": "4754bee2d8eb3", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/live555.json b/port_versions/l-/live555.json new file mode 100644 index 00000000000000..60a6470727c981 --- /dev/null +++ b/port_versions/l-/live555.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "4bf91c8f1e61a268699d63b10f1951f1cd679a99", + "version-string": "latest-1", + "port-version": 0 + }, + { + "git-tree": "0c01290d6580e32b036086cbc41904f3779cfcee", + "version-string": "latest", + "port-version": 0 + }, + { + "git-tree": "61b213cf64ba77eb2786e705c6b17bc12faadeca", + "version-string": "2019.03.06", + "port-version": 0 + }, + { + "git-tree": "b01af9e8ef482c82cece0e702aab86dc9dfdf71b", + "version-string": "latest", + "port-version": 0 + }, + { + "git-tree": "7edd083ff7f35c87216958fe3f8616a2491f7aa3", + "version-string": "2018.08.05", + "port-version": 0 + }, + { + "git-tree": "31564cfcf28ec81553fa7f0628e52c519257c754", + "version-string": "2018.07.07-1", + "port-version": 0 + }, + { + "git-tree": "50ac47546ff0a0ad190f128237a857a1f5786e3f", + "version-string": "2018.07.07", + "port-version": 0 + }, + { + "git-tree": "ab2f4409a37935217e0a5db85ce679a8623bd7ef", + "version-string": "2018.07.01", + "port-version": 0 + }, + { + "git-tree": "53fde25d361fd0c97a6839471aef925b720c1891", + "version-string": "2018.02.28", + "port-version": 0 + }, + { + "git-tree": "eea0d7b760daa14510ad15948101905dbb24ea98", + "version-string": "2018.02.18", + "port-version": 0 + }, + { + "git-tree": "e3ecf8709660e06e789ff22d442eb159ab469eb9", + "version-string": "2018.01.29", + "port-version": 0 + }, + { + "git-tree": "450275fbeb22afe0ddf5f696d72a7a7b670ccb93", + "version-string": "2017.10.28", + "port-version": 0 + }, + { + "git-tree": "d324f940d8b95e858a0a8a59d00bd5d5f6c83cfd", + "version-string": "2017.09.12", + "port-version": 0 + }, + { + "git-tree": "232aa98521f1f1f7175a044560da742edfe4051d", + "version-string": "2017.06.04-1", + "port-version": 0 + }, + { + "git-tree": "4a61363ece685ec2c034a443119c8307fdd2092e", + "version-string": "2017.06.04", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/llgl.json b/port_versions/l-/llgl.json new file mode 100644 index 00000000000000..c6c77c05a5a19a --- /dev/null +++ b/port_versions/l-/llgl.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "097f9348e4c5bd300cd86ccc67831cd1de9f499c", + "version-string": "2019-08-15", + "port-version": 1 + }, + { + "git-tree": "6ccd0a3cd82670faa84cc7a44f937505193cd106", + "version-string": "2019-08-15", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/llvm.json b/port_versions/l-/llvm.json new file mode 100644 index 00000000000000..5385da85f49547 --- /dev/null +++ b/port_versions/l-/llvm.json @@ -0,0 +1,149 @@ +{ + "versions": [ + { + "git-tree": "0188d318ae61d867088f8717bc5ed178479f14a1", + "version-string": "11.0.0", + "port-version": 0 + }, + { + "git-tree": "ca26cd2a58caf6192c22a0d5b95ac35046a9ad9e", + "version-string": "10.0.0", + "port-version": 7 + }, + { + "git-tree": "9aafe5c2d96ae5b6a723e0a51dfcb0107b289ee4", + "version-string": "10.0.0", + "port-version": 6 + }, + { + "git-tree": "10b9b4731505e87a90a590729ea28e7f817cb8a9", + "version-string": "10.0.0", + "port-version": 5 + }, + { + "git-tree": "12832f403db82bb7945441e4976837b50b0e9fe3", + "version-string": "10.0.0-4", + "port-version": 0 + }, + { + "git-tree": "e9edfdf83fd6dbc9ab44f941f5a7bd22d2c47351", + "version-string": "10.0.0-3", + "port-version": 0 + }, + { + "git-tree": "1739a978167e567f158dcc02ed7780b88ecbdbb8", + "version-string": "10.0.0-2", + "port-version": 0 + }, + { + "git-tree": "2bd10bb953daf3a3e81ccbd2d331adbf8b56c8f2", + "version-string": "10.0.0-1", + "port-version": 0 + }, + { + "git-tree": "cacb3791efe9f762a427376c0363af20ca1e4eef", + "version-string": "10.0.0", + "port-version": 0 + }, + { + "git-tree": "479d7512d64a5aa10d5fdc8d2d87221036c7c2f5", + "version-string": "8.0.0-5", + "port-version": 0 + }, + { + "git-tree": "3d1d94c027ad10e84e0965d2027d16bc3ce652a1", + "version-string": "8.0.0-4", + "port-version": 0 + }, + { + "git-tree": "ccb5e6a94997e5c01482c057a5b44f06ce65e73e", + "version-string": "8.0.0-3", + "port-version": 0 + }, + { + "git-tree": "1b057bd5c752e6966ee1a7054bb717f139dffe07", + "version-string": "8.0.0-2", + "port-version": 0 + }, + { + "git-tree": "c187bc72549975eca1b6194dc15fc2abd2585d3f", + "version-string": "8.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d3844a1749c5d42d52c4dc216a6e7c1cac80ef38", + "version-string": "8.0.0", + "port-version": 0 + }, + { + "git-tree": "4f02f98a7e0ae5b3fcc3234a5f20d23eb39123f0", + "version-string": "7.0.0-3", + "port-version": 0 + }, + { + "git-tree": "87bf5a951226e2192e73e6cfbe33063f083fae77", + "version-string": "7.0.0-2", + "port-version": 0 + }, + { + "git-tree": "e22d89a208df80f8943070e977630abf89cbd21c", + "version-string": "7.0.0", + "port-version": 0 + }, + { + "git-tree": "1fa33d91c904bc56d3ca6d70d70316fc834cec10", + "version-string": "6.0.0-1", + "port-version": 0 + }, + { + "git-tree": "22a3db4db8681560cfd336ccde399abba92a735e", + "version-string": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "2222c1f8091fab481ffad5d070fd78f7826a9caf", + "version-string": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "684e09492b51b8216e9f7ef7f109d0cf58257e7c", + "version-string": "5.0.0-4", + "port-version": 0 + }, + { + "git-tree": "4004640ec35216a39e623905f870ed1443fde51b", + "version-string": "5.0.0-3", + "port-version": 0 + }, + { + "git-tree": "d62124a1884d8b7455abe5c5262d4c839635f184", + "version-string": "5.0.0-2", + "port-version": 0 + }, + { + "git-tree": "918d279253b0fb8246b069cdc4ccade076f5eda0", + "version-string": "5.0.0-3", + "port-version": 0 + }, + { + "git-tree": "0f7c1f977dcf1c86220e84ed949de6d5a858078b", + "version-string": "5.0.0-2", + "port-version": 0 + }, + { + "git-tree": "ed6222b25225b811bf59725af7039682ea38abfd", + "version-string": "5.0.0-1", + "port-version": 0 + }, + { + "git-tree": "aefacad2be4f246a04ea6788e2659fd98a1eb736", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d7347eeaa8eb23459b87b850e8342c32a48ec119", + "version-string": "4.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lmdb.json b/port_versions/l-/lmdb.json new file mode 100644 index 00000000000000..c9688a8e3ff4fb --- /dev/null +++ b/port_versions/l-/lmdb.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "43467ce2a21ad30b6939a72fd6917e9a97209927", + "version-string": "0.9.24", + "port-version": 0 + }, + { + "git-tree": "3bc5ea2e7aacd9ebdb567cf9bca7756147bda1f7", + "version-string": "0.9.23-3", + "port-version": 0 + }, + { + "git-tree": "b2e32cf4c4db4be02625aab64908802fad87fed2", + "version-string": "0.9.23-2", + "port-version": 0 + }, + { + "git-tree": "9c44f0cc6905c71f238d62ecb4cfaa6e85e61a20", + "version-string": "0.9.23-1", + "port-version": 0 + }, + { + "git-tree": "59e5125cffea0fdb742c0b94c3987a76b9af803f", + "version-string": "0.9.23", + "port-version": 0 + }, + { + "git-tree": "30af10fbae3e9fe693487c6e60e1dca1f8134eb9", + "version-string": "0.9.18-4", + "port-version": 0 + }, + { + "git-tree": "44f1d76b227cb18ee1ed69b58640749fbe2d64fd", + "version-string": "0.9.18-3", + "port-version": 0 + }, + { + "git-tree": "ba36e3bbc32ee3e0ecfcd24541fc1c97dc366ffc", + "version-string": "0.9.18-2", + "port-version": 0 + }, + { + "git-tree": "6198a0508824db389b0f16af52a47ae0bdebab01", + "version-string": "0.9.18-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lodepng.json b/port_versions/l-/lodepng.json new file mode 100644 index 00000000000000..f2351676710ee9 --- /dev/null +++ b/port_versions/l-/lodepng.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "b7471b62d6bfd4288987cca4eb3d37b8eb287ed1", + "version-string": "2020-03-15", + "port-version": 0 + }, + { + "git-tree": "dd2bd98b977a598c432781c7ed691a919ecc9f79", + "version-string": "2018-09-18-2", + "port-version": 0 + }, + { + "git-tree": "37ba669837d4b91c67454950280bc4b9c193f4ed", + "version-string": "2018-09-18-1", + "port-version": 0 + }, + { + "git-tree": "5d88c8a439c7e77b08eecabcbe63056c09db7f70", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "ff802d2cf29587db94c35ff5c15dc77aecdf20b2", + "version-string": "2018-06-28", + "port-version": 0 + }, + { + "git-tree": "381f29bdbe1f322988038d43b680c3022d08098a", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "d0bcfe60919ffce9f612a3d426cfef82e31c9dc3", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "692a0da2c27e69d32e0d5c18c3686138db7d837b", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "301079a8e9c4bb204ac29fe802d3b880e1cacc36", + "version-string": "2017-09-01-8a0f16afe74a6a-1", + "port-version": 0 + }, + { + "git-tree": "b8cc09ee8dce6b6faff86953091f11f3be3923b0", + "version-string": "2017-09-01-8a0f16afe74a6a", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/log4cplus.json b/port_versions/l-/log4cplus.json new file mode 100644 index 00000000000000..58781d31991de3 --- /dev/null +++ b/port_versions/l-/log4cplus.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "681e1dd7fc4ef251e55c2befa8e4872a97a81eba", + "version-string": "2.0.5", + "port-version": 1 + }, + { + "git-tree": "d70dd9f203f2050c2dc6e706b5c8c027918aa71b", + "version-string": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "d98cf43f0150c6c3aa01e1a5dbf4440272ef95b7", + "version-string": "2.0.4-1", + "port-version": 0 + }, + { + "git-tree": "c7cbfec355276cf917d924389a1e3d07a3b10f13", + "version-string": "2.0.4", + "port-version": 0 + }, + { + "git-tree": "98213e135859b8bd4611b6a93c327f3103481fa8", + "version-string": "REL_2_0_3", + "port-version": 0 + }, + { + "git-tree": "e70a06e2f944efb03f6578d2d7c491cd30f71e22", + "version-string": "REL_2_0_1", + "port-version": 0 + }, + { + "git-tree": "2e20cb61c1a03f51815c689b33c85f286e8f1b0b", + "version-string": "REL_2_0_0-RC2", + "port-version": 0 + }, + { + "git-tree": "5ecfcec9c096c4c4c4085cbc396a4e3e589e6b5e", + "version-string": "REL_1_2_1-RC2-1", + "port-version": 0 + }, + { + "git-tree": "7506fa6baeac0038729fb3f0d585310e2f01ef05", + "version-string": "REL_1_2_1-RC2", + "port-version": 0 + }, + { + "git-tree": "927571090ea155e68b9dcca88c1d6a0f2f37c68e", + "version-string": "1.1.3-RC7", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/log4cpp.json b/port_versions/l-/log4cpp.json new file mode 100644 index 00000000000000..62072ac0b6cfe0 --- /dev/null +++ b/port_versions/l-/log4cpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "191e66eab7b88de1d22bcc778717e957d6853475", + "version-string": "2.9.1", + "port-version": 3 + }, + { + "git-tree": "c4157444d4130b820f51b3040e1545a15dd3ab93", + "version-string": "2.9.1-2", + "port-version": 0 + }, + { + "git-tree": "6d29844d1ce73ee604aad20166a1ceb128148abc", + "version-string": "2.9.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/log4cxx.json b/port_versions/l-/log4cxx.json new file mode 100644 index 00000000000000..c83469cb682f4e --- /dev/null +++ b/port_versions/l-/log4cxx.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a584f921462afb2f1b269dc9a7b361b17445028b", + "version-string": "0.11.0", + "port-version": 1 + }, + { + "git-tree": "550cb06dab801272c72e2045fa9f3289b623e68b", + "version-string": "0.11.0", + "port-version": 0 + }, + { + "git-tree": "fedc13ef6cd03099e0faa16eb305257d52344bf9", + "version-string": "0.10.0-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/loguru.json b/port_versions/l-/loguru.json new file mode 100644 index 00000000000000..4ac2f12f5896fe --- /dev/null +++ b/port_versions/l-/loguru.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ef13e53a3840b20757d18f432ddc86568a5ea5ef", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "1d791f39ec9872097696c6f1e1d70bb3a7b17b52", + "version-string": "v2.1.0", + "port-version": 0 + }, + { + "git-tree": "59151390e044e7bdf8a5cf0af48f077947ec0b81", + "version-string": "v2.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lpeg.json b/port_versions/l-/lpeg.json new file mode 100644 index 00000000000000..69dda304fcc978 --- /dev/null +++ b/port_versions/l-/lpeg.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "453a5d8a428bfaf904e55a2178895e6d8a104ef9", + "version-string": "1.0.2-1", + "port-version": 0 + }, + { + "git-tree": "f5346a0c9640ea8f11b6fb81228e80063b67c907", + "version-string": "1.0.1-4", + "port-version": 0 + }, + { + "git-tree": "a4a9fc75abd7600a986df6a73627548f71787409", + "version-string": "1.0.1-3", + "port-version": 0 + }, + { + "git-tree": "fd02c13a234ce16401cd30647783d7aa647a4321", + "version-string": "1.0.1-2", + "port-version": 0 + }, + { + "git-tree": "98f39a54d2336eae4272c2da3ec683c1630e224b", + "version-string": "1.0.1-1", + "port-version": 0 + }, + { + "git-tree": "ee5d942c756ef7f339573a55fc0f40ca1efc02fb", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lua.json b/port_versions/l-/lua.json new file mode 100644 index 00000000000000..cf97ca34ac33f8 --- /dev/null +++ b/port_versions/l-/lua.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "3bf3ea5ddf8760d12d37e7a2e95cb3db3cc51b7f", + "version-string": "5.4.1", + "port-version": 0 + }, + { + "git-tree": "80fa373569847b12eeae2f949d922a6d7330767f", + "version-string": "5.3.5", + "port-version": 6 + }, + { + "git-tree": "26e8240f6861eabe097afea4506df5a281544fdd", + "version-string": "5.3.5-5", + "port-version": 0 + }, + { + "git-tree": "1085760dfc45c234153f9f2ba3df9e40f76ab7b5", + "version-string": "5.3.5-4", + "port-version": 0 + }, + { + "git-tree": "801716c2f79e532b58925eeb2cf1da0195eec878", + "version-string": "5.3.5-3", + "port-version": 0 + }, + { + "git-tree": "3ac7f2c11630d3fc8005bc15cc3317f3b4acdf42", + "version-string": "5.3.5-2", + "port-version": 0 + }, + { + "git-tree": "c14d49e5fc41394aaa96f70f439ab730c53528a1", + "version-string": "5.3.5-1", + "port-version": 0 + }, + { + "git-tree": "0dec103d8afa749b545856c0843496aa36399d39", + "version-string": "5.3.4-4", + "port-version": 0 + }, + { + "git-tree": "a9f96eec348f36ff77f624f81e8291d043bf6778", + "version-string": "5.3.4-3", + "port-version": 0 + }, + { + "git-tree": "b804624c6450ddf678b78084f0ecc4257c69c06c", + "version-string": "5.3.4-2", + "port-version": 0 + }, + { + "git-tree": "6dcd8c719a66f5dec9a93eadfe09198e5708734f", + "version-string": "5.3.4-1", + "port-version": 0 + }, + { + "git-tree": "865ab4190ef114a8fa896ea689cba49a88c2c83f", + "version-string": "5.3.4", + "port-version": 0 + }, + { + "git-tree": "448a35ae5fc94cd8ff421d24eae91c0fb0de89a9", + "version-string": "5.3.3-2", + "port-version": 0 + }, + { + "git-tree": "a2df10483ed38d8c2e1d69a25cad6aba00e46e53", + "version-string": "5.3.3-1", + "port-version": 0 + }, + { + "git-tree": "cef63a5d681fd346fcf65ea2c14930f8e71c85b6", + "version-string": "5.3.3", + "port-version": 0 + }, + { + "git-tree": "745ac34855d3bf257e9e9e756d52b384d79174b0", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/luabridge.json b/port_versions/l-/luabridge.json new file mode 100644 index 00000000000000..8a13ae002b2b2f --- /dev/null +++ b/port_versions/l-/luabridge.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "509a24ba9fa003e8052f9e9ab672532307354b46", + "version-string": "2.6", + "port-version": 0 + }, + { + "git-tree": "b2d87d659dd83a80ea93cedec212882aa404ec4c", + "version-string": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "39dd787f651311f7a68ad8f1563d357ae9504952", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "64107e1668c1e5bf43ff57264fb88158641181bc", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "fe5c621e11431bb1ef29e81fce697ce853c299fa", + "version-string": "2.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/luafilesystem.json b/port_versions/l-/luafilesystem.json new file mode 100644 index 00000000000000..ddac969a94e74b --- /dev/null +++ b/port_versions/l-/luafilesystem.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "b20a650ae45dc96ce00231ffcc6762cdf9ad4d4a", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "b2e581fc3cecbb696c89b71dee77c6b2792168ba", + "version-string": "1.7.0.2-1", + "port-version": 0 + }, + { + "git-tree": "8f0eace8ce87c40e4fbc3528520d90fdf3b1bb07", + "version-string": "1.7.0.2", + "port-version": 0 + }, + { + "git-tree": "cc6b42766491e946ec8c90fb9d42e31434a7691e", + "version-string": "1.6.3-1", + "port-version": 0 + }, + { + "git-tree": "0bfd25f614a606708754e2eac7a12a1ebadeedcd", + "version-string": "1.6.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/luajit.json b/port_versions/l-/luajit.json new file mode 100644 index 00000000000000..c4472466338cc7 --- /dev/null +++ b/port_versions/l-/luajit.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e1f7e0b77492627b8233017be73bd7b4361b2510", + "version-string": "2.0.5-3", + "port-version": 0 + }, + { + "git-tree": "7b77f1011f636ec051800a1f04906dedfb0ba80c", + "version-string": "2.0.5-2", + "port-version": 0 + }, + { + "git-tree": "c74c03aaae5f866c71ee8834d5a80d46e9a85852", + "version-string": "2.0.5-1", + "port-version": 0 + }, + { + "git-tree": "0098ef8ec8e252740baf595562665c2ffceaf6df", + "version-string": "2.0.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/luasocket.json b/port_versions/l-/luasocket.json new file mode 100644 index 00000000000000..9c8adfdc206886 --- /dev/null +++ b/port_versions/l-/luasocket.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "f5c6cb1d6373706ec11daef580be154ef47e1bca", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "cb4fa3fe24b06e50b605ddb9cf8cd5a8bc8dbfe1", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "64220c3a2b8ea025f824547042c207ec4476d624", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "5512c2711e107896ac325387471d8464b93b18dd", + "version-string": "2018-09-18-1", + "port-version": 0 + }, + { + "git-tree": "ad15f76b27536c67d625eb4f666be8c31b83c28b", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "e5872935eeaf007d23450259533f94645bb3d84a", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "6cb2f911f54970a1567a8a5346ef511825164aed", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "27ef55e98ba32a9410dd8f59d5b17576674b790d", + "version-string": "2017.05.25.5a17f79b0301f0a1b4c7f1c73388757a7e2ed309", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lv2.json b/port_versions/l-/lv2.json new file mode 100644 index 00000000000000..0f803067df8c5e --- /dev/null +++ b/port_versions/l-/lv2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4fcc1df0a11567c74dccb3fafe922a1f2686eff3", + "version-string": "1.18.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lz4.json b/port_versions/l-/lz4.json new file mode 100644 index 00000000000000..49e1d967302eb7 --- /dev/null +++ b/port_versions/l-/lz4.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "b6dfac9ea3f75a0a79736cf1ea2e0ba9bfa67086", + "version-string": "1.9.2-2", + "port-version": 0 + }, + { + "git-tree": "54c1eacd475f91e4b11447a2c1d45a18023c23a3", + "version-string": "1.9.2-1", + "port-version": 0 + }, + { + "git-tree": "757d50986c7cdc2aad60e83f62c90d9a8e89988b", + "version-string": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "bd6ef5fe877aee1d1a4cf02583cd177d9bc83308", + "version-string": "1.9.1-2", + "port-version": 0 + }, + { + "git-tree": "75863599b807bc9502aabd8c60d916c58e018d49", + "version-string": "1.9.1-1", + "port-version": 0 + }, + { + "git-tree": "6af395159c52f740c87e44de0e6214e383735ff1", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "f0ebbf5776dfabe6893f0595134706270dad5002", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "349110d4d66533a2a437e509ed323a863e8fea58", + "version-string": "1.8.3", + "port-version": 0 + }, + { + "git-tree": "069250ff6ad210fbf1eed6cf7cf4af54937a0ff6", + "version-string": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "d86db7c9a2511a1e5074035a3b691976a8911c93", + "version-string": "1.8.1.2-1", + "port-version": 0 + }, + { + "git-tree": "fb15fbe7c6ed6384ebda2e9839f78d540b6145b5", + "version-string": "1.8.1.2", + "port-version": 0 + }, + { + "git-tree": "71909a479e4d54bbb65e12b93b21f268088ba81e", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "a5aa2155adfe2571966af6db1ae73bc2c6db5291", + "version-string": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "832dc4e66bbd303fbcee642af8ca1927ef3b0ee8", + "version-string": "1.7.5", + "port-version": 0 + }, + { + "git-tree": "263a6d8657f96a86e5da840035aa3527d70233a2", + "version-string": "1.7.4.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lzfse.json b/port_versions/l-/lzfse.json new file mode 100644 index 00000000000000..8ad75ab4cbb0e5 --- /dev/null +++ b/port_versions/l-/lzfse.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f0e728a2522f00a38e81a3762d4face63389b053", + "version-string": "1.0-2", + "port-version": 0 + }, + { + "git-tree": "7f960140f07bbb08100db69d2f6a1520a65575b6", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "3a6d738fbf5009b740d1e575d5df11e907ae8bb3", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lzo.json b/port_versions/l-/lzo.json new file mode 100644 index 00000000000000..a85e5642402100 --- /dev/null +++ b/port_versions/l-/lzo.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "7d19bc8d305faffeba8990d9e6c095ee95b3108d", + "version-string": "2.10-5", + "port-version": 0 + }, + { + "git-tree": "18dd4e5315c0e0c8006cd9872700bf00ae77fb89", + "version-string": "2.10-4", + "port-version": 0 + }, + { + "git-tree": "98e1b10cdd1c281cfa9ba0ed00e975bdbab14e03", + "version-string": "2.10-3", + "port-version": 0 + }, + { + "git-tree": "b9e9fe0c84428518c68d23fd52cd5cb03d66df81", + "version-string": "2.10-2", + "port-version": 0 + }, + { + "git-tree": "3661a06c129607a43cb080621bd9c3752d5cafa2", + "version-string": "2.10-1", + "port-version": 0 + }, + { + "git-tree": "b118721246bea85e78adfe2f9eea17c78d8aa23f", + "version-string": "2.10", + "port-version": 0 + }, + { + "git-tree": "25007a9018c1b82f8f6190513f2073cec1a4b545", + "version-string": "2.09", + "port-version": 0 + } + ] +} diff --git a/port_versions/l-/lzokay.json b/port_versions/l-/lzokay.json new file mode 100644 index 00000000000000..8e5bd897c8d7cf --- /dev/null +++ b/port_versions/l-/lzokay.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "81f62a460d83d622c05245700f599c3418eed715", + "version-string": "2020-07-30", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/magic-enum.json b/port_versions/m-/magic-enum.json new file mode 100644 index 00000000000000..f4ddca33ff1d14 --- /dev/null +++ b/port_versions/m-/magic-enum.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "b216fb15c94a2693a2fe1f7fa350a8f13d11f53f", + "version-string": "0.7.1", + "port-version": 0 + }, + { + "git-tree": "22e4f23572623410198917e263553086bcdf05af", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "5969ce706dd59741d9ae9eef263775b456cbf75b", + "version-string": "0.6.6", + "port-version": 0 + }, + { + "git-tree": "6a1a5fb4e28b1c21384e01e1ab465398714724fd", + "version-string": "0.6.5", + "port-version": 0 + }, + { + "git-tree": "5d3dc2a8e966b1673ce16dffcbdff234c240e15b", + "version-string": "0.6.4", + "port-version": 0 + }, + { + "git-tree": "3e75787af06b6b5e379fc8144da8ef26438a795e", + "version-string": "0.6.3-1", + "port-version": 0 + }, + { + "git-tree": "8e70ccbe2f7a69757557e0ec507bffea76c08aff", + "version-string": "0.6.3", + "port-version": 0 + }, + { + "git-tree": "7b9bf2459f62938a8c673abdfdd4d4ab40c01140", + "version-string": "0.6.2", + "port-version": 0 + }, + { + "git-tree": "e5b6e9d9490b85a012f6f5fb53c59861a682e3b4", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "eb40f34e2c5067e78a1263fd17d37c9303ec5748", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "5cc4286c69a528902c5bbab5398c7e5aec160c90", + "version-string": "2019-06-07", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/magic-get.json b/port_versions/m-/magic-get.json new file mode 100644 index 00000000000000..6fcd5f61dfe80f --- /dev/null +++ b/port_versions/m-/magic-get.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c74c7f4f5516bdfeffc916c0e72a650d65fe61fb", + "version-string": "2019-09-02", + "port-version": 2 + }, + { + "git-tree": "d6ac6dbaa833e52f6d7d259b57d644e8467fa6e0", + "version-string": "2019-09-02-1", + "port-version": 0 + }, + { + "git-tree": "2216526ad18346c355569f8a9746db2c94aa0262", + "version-string": "2019-09-02", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/magnum-extras.json b/port_versions/m-/magnum-extras.json new file mode 100644 index 00000000000000..73eab23384f2a5 --- /dev/null +++ b/port_versions/m-/magnum-extras.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "5cf4f8d9e709a2381f87d14819ddbef910c7f19c", + "version-string": "2020.06", + "port-version": 0 + }, + { + "git-tree": "d6ff26a6621623a45fa4351573aceb0b77615b4e", + "version-string": "2019.10", + "port-version": 0 + }, + { + "git-tree": "a0585ba2eca1a9037d76ca606e37778c585274f9", + "version-string": "2019.01-2", + "port-version": 0 + }, + { + "git-tree": "4fc3ac52aa2c91d1995a29b6e2f8303b7c159582", + "version-string": "2019.01-1", + "port-version": 0 + }, + { + "git-tree": "32832d4877a3d9028fe72d4271b0d917aec99583", + "version-string": "2018.10-1", + "port-version": 0 + }, + { + "git-tree": "0fcee1c4e6030656452a2080b437f7ced15b3ba7", + "version-string": "2018.04-1", + "port-version": 0 + }, + { + "git-tree": "5b731d507a800901940c758bc3f4a5539d87388a", + "version-string": "2018.02-2", + "port-version": 0 + }, + { + "git-tree": "fcaa1a3b3fe7f2986c4701ff2134e275f547f33a", + "version-string": "2018.02-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/magnum-integration.json b/port_versions/m-/magnum-integration.json new file mode 100644 index 00000000000000..81ab6cc8e9ec93 --- /dev/null +++ b/port_versions/m-/magnum-integration.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "c76db7d967d207135ca8652f7023a29a7dbd0acc", + "version-string": "2020.06", + "port-version": 0 + }, + { + "git-tree": "1fc719443d768ee926e8bbc66a659d006c6f799c", + "version-string": "2019.10", + "port-version": 0 + }, + { + "git-tree": "5474c10ff1bedc10fc10ac6f9c268860df025062", + "version-string": "2019.01-2", + "port-version": 0 + }, + { + "git-tree": "01caa903840be2f701780f6b64974d71d4cd6278", + "version-string": "2019.01-1", + "port-version": 0 + }, + { + "git-tree": "4743bc2c4d1e86c152b264c90a21e2f27ee79172", + "version-string": "2018.10-1", + "port-version": 0 + }, + { + "git-tree": "497a1523c9ed82b07d2c3d2eadd6c311de2b3945", + "version-string": "2018.04-1", + "port-version": 0 + }, + { + "git-tree": "f621480514eb2073de1430eef091ed2d9f8c15bb", + "version-string": "2018.02-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/magnum-plugins.json b/port_versions/m-/magnum-plugins.json new file mode 100644 index 00000000000000..743464560ad668 --- /dev/null +++ b/port_versions/m-/magnum-plugins.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "bc7aca74b45fcc3c73d3b0d051e63602c270f0b4", + "version-string": "2020.06", + "port-version": 1 + }, + { + "git-tree": "e304b1601c5af2983d465dfebdb22627ff57415d", + "version-string": "2020.06", + "port-version": 0 + }, + { + "git-tree": "d9eb35936e65c09eeecbd25d95a47ecf02721fb5", + "version-string": "2019.10-2", + "port-version": 0 + }, + { + "git-tree": "8f0d46d8eb57ad3ceb3f064572eded5e08888332", + "version-string": "2019.10-1", + "port-version": 0 + }, + { + "git-tree": "e721cd18e640536d974e2442da00e677e78fb104", + "version-string": "2019.10", + "port-version": 0 + }, + { + "git-tree": "f5f2732d5185dda0c8813d4aa318dd543de4d06c", + "version-string": "2019.01-2", + "port-version": 0 + }, + { + "git-tree": "f0f226b75fae7fc5777b12c216c984a8a296ae48", + "version-string": "2019.01-1", + "port-version": 0 + }, + { + "git-tree": "b7d6885b19addc1a9f8800cce02972ed395fcd05", + "version-string": "2018.10-1", + "port-version": 0 + }, + { + "git-tree": "7c37dff60ec4814e56fc3ead712b6f1a157d1210", + "version-string": "2018.04-1", + "port-version": 0 + }, + { + "git-tree": "28aec10970796b877515c9d4a69625466cc5de31", + "version-string": "2018.02-2", + "port-version": 0 + }, + { + "git-tree": "364bb1be74111519012b68bb29813d65145bfe8a", + "version-string": "2018.02-1", + "port-version": 0 + }, + { + "git-tree": "39954a77d2b913d039d78d12780855e3b4ee9beb", + "version-string": "jan2018-1", + "port-version": 0 + }, + { + "git-tree": "4c17387a0d1ac983428c880a8becb03287a8fdcd", + "version-string": "jun2017-5", + "port-version": 0 + }, + { + "git-tree": "44787d3c100654d2bd1aac17cfb4322c879eca13", + "version-string": "jun2017-4", + "port-version": 0 + }, + { + "git-tree": "eda85e5b703cddecb4b48cb8ba498c4a6109e35f", + "version-string": "jun2017-3", + "port-version": 0 + }, + { + "git-tree": "dfae148d64586ffd4a75fbf6fc81c901452166ae", + "version-string": "jun2017-2", + "port-version": 0 + }, + { + "git-tree": "050a7a0e0c527549ef341f7e824baf51d522814c", + "version-string": "jun2017-1", + "port-version": 0 + }, + { + "git-tree": "3d29bec696bc176f6bde382887eedc025d095978", + "version-string": "jun2017", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/magnum.json b/port_versions/m-/magnum.json new file mode 100644 index 00000000000000..59800ad4f15b26 --- /dev/null +++ b/port_versions/m-/magnum.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "e7a2404e1104325d881715e65459dd3c8a450489", + "version-string": "2020.06", + "port-version": 2 + }, + { + "git-tree": "d0765f78f04d3fcc97787f34258657aca1ddf467", + "version-string": "2020.06", + "port-version": 1 + }, + { + "git-tree": "3a2d890b046287f96090033de33c562993df237b", + "version-string": "2020.06", + "port-version": 0 + }, + { + "git-tree": "aff46081bab36af8e89908a8049ffd9a83e2526b", + "version-string": "2019.10-2", + "port-version": 0 + }, + { + "git-tree": "8222d973157c75223622776c6d5c1b3693383d5c", + "version-string": "2019.01-1", + "port-version": 0 + }, + { + "git-tree": "e49e8fb82d0524872bbe45cdb6e8ec825d7f1913", + "version-string": "2018.10-1", + "port-version": 0 + }, + { + "git-tree": "bb19aa7151d59c4951c39ee59b9e2966e8b639d1", + "version-string": "2018.04-1", + "port-version": 0 + }, + { + "git-tree": "5c56adde8c0812ab4bfda2a9aad7d23d6dc5e06b", + "version-string": "2018.02-2", + "port-version": 0 + }, + { + "git-tree": "7c3b0802c78047d6ccc09e73771a758b5f9dda0a", + "version-string": "2018.02-1", + "port-version": 0 + }, + { + "git-tree": "1764a1a71207f490c2ee4256f08152c4396cdda6", + "version-string": "jan2018-1", + "port-version": 0 + }, + { + "git-tree": "c268637925501b9349249c694bc2f5c72fb897b8", + "version-string": "jun2017-6", + "port-version": 0 + }, + { + "git-tree": "f11172d75c0f1895a0880cbecfccd040b2a9ce11", + "version-string": "jun2017-5", + "port-version": 0 + }, + { + "git-tree": "6fea6b6ab8ed9c74fe27b12a71bb3498bc31648a", + "version-string": "jun2017-4", + "port-version": 0 + }, + { + "git-tree": "7aaae166bd4e6066b9cfe1e01140d8fd74947dbd", + "version-string": "jun2017-3", + "port-version": 0 + }, + { + "git-tree": "0af5087dbaf3fa8165f8fa4ff616f9fb28e1aaa9", + "version-string": "jun2017-2", + "port-version": 0 + }, + { + "git-tree": "bfc5a7c177c22b8ade6120f99486365095fe221d", + "version-string": "jun2017-1", + "port-version": 0 + }, + { + "git-tree": "4471dfe83e80cace12baeb443518e203a296a426", + "version-string": "jun2017", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mapbox-variant.json b/port_versions/m-/mapbox-variant.json new file mode 100644 index 00000000000000..5ea81adca1e144 --- /dev/null +++ b/port_versions/m-/mapbox-variant.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c81bffd9497b08091cff4be8db0d2ec378a2adc2", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "71d32704478989baa182990af172f2564fe5d3d6", + "version-string": "1.1.6-0f734f0-1", + "port-version": 0 + }, + { + "git-tree": "2cfef5bd1a4212e5843ba6ed36a0cfbab0c34503", + "version-string": "1.1.6-0f734f0", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/marble.json b/port_versions/m-/marble.json new file mode 100644 index 00000000000000..ea004fb06dbb3c --- /dev/null +++ b/port_versions/m-/marble.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6da05bd09e0eb41ee05e3269fab2283c5dab2d4c", + "version-string": "19.08.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/marl.json b/port_versions/m-/marl.json new file mode 100644 index 00000000000000..e1d008e43745f4 --- /dev/null +++ b/port_versions/m-/marl.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "1bbc3159a32ef547939ca19e4369fb3b4d87b381", + "version-string": "2020-10-10", + "port-version": 0 + }, + { + "git-tree": "b52700536625ef3dcbcfc92ce11873c80717c1f9", + "version-string": "2020-06-30", + "port-version": 0 + }, + { + "git-tree": "a257ede7bf6c1d06c6483cbeb92e1d47e8245f6b", + "version-string": "2020-05-21", + "port-version": 0 + }, + { + "git-tree": "c1cf565178b637ba3841417b04f9acfc3e68e793", + "version-string": "2019-09-13", + "port-version": 0 + }, + { + "git-tree": "af49f48eab81d7441bb9ee81e8aee29681cdd7a9", + "version-string": "2019-09-11", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mathc.json b/port_versions/m-/mathc.json new file mode 100644 index 00000000000000..39513bf33d0620 --- /dev/null +++ b/port_versions/m-/mathc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ce8f1f68bcb55109aabea4ccfb17c3a3cbde5ef2", + "version-string": "2019-09-29", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mathgl.json b/port_versions/m-/mathgl.json new file mode 100644 index 00000000000000..93e51a4fd543cc --- /dev/null +++ b/port_versions/m-/mathgl.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "73c110a8763070c78749ce041eea862716bba72a", + "version-string": "2.4.3-6", + "port-version": 0 + }, + { + "git-tree": "3e59024e040721ab61c27d837f78e9a5119a92d8", + "version-string": "2.4.3-4", + "port-version": 0 + }, + { + "git-tree": "fd2ee1a2603d27429390cc86df76336f911af7ab", + "version-string": "2.4.3-3", + "port-version": 0 + }, + { + "git-tree": "63db933f885df3e5c7fb98008f2820162ed85023", + "version-string": "2.4.3-2", + "port-version": 0 + }, + { + "git-tree": "36e575a97241ad0dc3cdf3c9d2f08d1a67826238", + "version-string": "2.4.3-1", + "port-version": 0 + }, + { + "git-tree": "cc5ee5da5e89b23de1d12406743b9cdef1820395", + "version-string": "2.4.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/matio.json b/port_versions/m-/matio.json new file mode 100644 index 00000000000000..277c30127a80b1 --- /dev/null +++ b/port_versions/m-/matio.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "90525e6933ec5814eced741e449185df46f158ea", + "version-string": "1.5.17", + "port-version": 0 + }, + { + "git-tree": "51008ed05402590cb34acdb1e14e1c5267cd7d7f", + "version-string": "1.5.16", + "port-version": 0 + }, + { + "git-tree": "772c683699f2fd843463088e14c5cca8d63e9dcd", + "version-string": "1.5.15", + "port-version": 0 + }, + { + "git-tree": "ea45bf0ddf8c87893b8b35ffe3a6699bdad7a063", + "version-string": "1.5.13-1", + "port-version": 0 + }, + { + "git-tree": "70aaab37332653f2ebb2f1afcabff825c7d43ab2", + "version-string": "1.5.13", + "port-version": 0 + }, + { + "git-tree": "773a0408bc425094dff587f0a938a177cc61a83d", + "version-string": "1.5.12", + "port-version": 0 + }, + { + "git-tree": "89e6a50f8dcccbb0c0104fec14abf6ff9ff58ed2", + "version-string": "1.5.11", + "port-version": 0 + }, + { + "git-tree": "f14dbb2ce5da2d12b12c3040f6e2250ad9eacd19", + "version-string": "1.5.10-2", + "port-version": 0 + }, + { + "git-tree": "c716967775f6374e867ac6ca2a06eddf6e739c2b", + "version-string": "1.5.10-1", + "port-version": 0 + }, + { + "git-tree": "d1b799f0093084fbc9e5c22e0cac7f8b27e36c98", + "version-string": "1.5.10", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/matplotlib-cpp.json b/port_versions/m-/matplotlib-cpp.json new file mode 100644 index 00000000000000..59fe1b2f16df65 --- /dev/null +++ b/port_versions/m-/matplotlib-cpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "fc40bac37aa51944e6e4d1b63dbaaef56651adf7", + "version-string": "2020-08-27", + "port-version": 0 + }, + { + "git-tree": "0e4ff7aa1521101bf97ec1f0a81407f9d1a92509", + "version-string": "2019-09-24", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/matroska.json b/port_versions/m-/matroska.json new file mode 100644 index 00000000000000..8fa4dce2582d4c --- /dev/null +++ b/port_versions/m-/matroska.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "621952db117431abe06ab8ec62f509ab812d239d", + "version-string": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "e61d04c623257948c14a329a193005d310f62cbe", + "version-string": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "b4727e0e08634c4abb16766c4bf43e02aea53549", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "e9b74b1491fe3e58ff8a903f2c738852b77bd829", + "version-string": "1.5.0-51648bb", + "port-version": 0 + }, + { + "git-tree": "aadf97900b05b95f724ebe0c03d234cb2e66f201", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "81ead1689968284e1ed9f375b30f74d1481d96ae", + "version-string": "1.4.9-1", + "port-version": 0 + }, + { + "git-tree": "e0941a55d608f8f0a138224d1ae1ac1f090caa55", + "version-string": "1.4.9", + "port-version": 0 + }, + { + "git-tree": "ad3b1a16b5a01ff6a6ce88b78bae98a394d84ef6", + "version-string": "1.4.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mbedtls.json b/port_versions/m-/mbedtls.json new file mode 100644 index 00000000000000..4eb92bc5958cdc --- /dev/null +++ b/port_versions/m-/mbedtls.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "8b510a700284731a6f552ff2cd874794af4032ff", + "version-string": "2.24.0", + "port-version": 1 + }, + { + "git-tree": "d5a4ee1c525b9ac5197b86bfe553a1909ce9afba", + "version-string": "2.24.0", + "port-version": 0 + }, + { + "git-tree": "a35e1a54c5d31e8ccab0117701402c9def267cdc", + "version-string": "2.16.3-1", + "port-version": 0 + }, + { + "git-tree": "7ad457ed5e067dc3b10a43c0820be065d081e242", + "version-string": "2.16.3", + "port-version": 0 + }, + { + "git-tree": "3c353cbdd327d54fe0b94e5ca8395b8c4a184f31", + "version-string": "2.16.2", + "port-version": 0 + }, + { + "git-tree": "0e219bef6b56d1650c6b21b604383861d397cad7", + "version-string": "2.15.1", + "port-version": 0 + }, + { + "git-tree": "eb1ec65bc6251b470991182e2184dc5c575169e3", + "version-string": "2.13.1", + "port-version": 0 + }, + { + "git-tree": "8576d9c7a8e92c598c0a47950f71bd4e50cbb2b3", + "version-string": "2.12.0", + "port-version": 0 + }, + { + "git-tree": "d151786b2020882f2711b617872b7f13234bd03a", + "version-string": "2.6.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mcpp.json b/port_versions/m-/mcpp.json new file mode 100644 index 00000000000000..b31f958a9fd3ca --- /dev/null +++ b/port_versions/m-/mcpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b5a0f89ae5e856ba0a4f3289230f2df88c4a028c", + "version-string": "2.7.2.14", + "port-version": 2 + }, + { + "git-tree": "c7f1674a923779970b8e0ba8da0e73f776e0f8e7", + "version-string": "2.7.2.14-1", + "port-version": 0 + }, + { + "git-tree": "848a7a4fbf7283399af7eec484ec30ce41c0603c", + "version-string": "2.7.2.14", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mdns.json b/port_versions/m-/mdns.json new file mode 100644 index 00000000000000..e937c76a90bc19 --- /dev/null +++ b/port_versions/m-/mdns.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9c60d4da58f24c63fd92500fcb516adb157cb180", + "version-string": "1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mdnsresponder.json b/port_versions/m-/mdnsresponder.json new file mode 100644 index 00000000000000..c1d0de6974e0b0 --- /dev/null +++ b/port_versions/m-/mdnsresponder.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "6e48b77ecbfe0e11101526c0ed9b7e798bf66055", + "version-string": "765.30.11", + "port-version": 3 + }, + { + "git-tree": "7f6dd0b8040f0c096665760817567b4231321cb4", + "version-string": "765.30.11-2", + "port-version": 0 + }, + { + "git-tree": "fd16474a00b14d1a53eaf6f5cc47a9b6c4ed4f2d", + "version-string": "765.30.11-1", + "port-version": 0 + }, + { + "git-tree": "1d781c8504bbe47f5c94f0b9b15b6e6429c3d8bb", + "version-string": "765.30.11", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mecab.json b/port_versions/m-/mecab.json new file mode 100644 index 00000000000000..07328d5d251b50 --- /dev/null +++ b/port_versions/m-/mecab.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "1b2b6811a11c4dfd156f3ebccb2c83660e93ce1a", + "version-string": "2019-09-25", + "port-version": 1 + }, + { + "git-tree": "27ea103fdd9a484dc2e9cb633440a6b4e89a4972", + "version-string": "1.0", + "port-version": 0 + }, + { + "git-tree": "43ff41bd626c7ac87a515a7de9fcfac94a2f6cd1", + "version-string": "0.996", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/memorymodule.json b/port_versions/m-/memorymodule.json new file mode 100644 index 00000000000000..fbacc9b506acd9 --- /dev/null +++ b/port_versions/m-/memorymodule.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "20dc022d60890deec31c30e530881cf972c15253", + "version-string": "2019-12-31", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mesa.json b/port_versions/m-/mesa.json new file mode 100644 index 00000000000000..a4b44389104f6b --- /dev/null +++ b/port_versions/m-/mesa.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9b75570d3f7a9cb58ff7c7c8479bbfb7e745d0d2", + "version-string": "20.2.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/meschach.json b/port_versions/m-/meschach.json new file mode 100644 index 00000000000000..92986789535de7 --- /dev/null +++ b/port_versions/m-/meschach.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "6eb1cef7299cd3f060fd21c526ab29a8553766c2", + "version-string": "1.2b-3", + "port-version": 0 + }, + { + "git-tree": "f2b877ed05d0f8dd99a4c38c871af615c5d43a6f", + "version-string": "1.2b-2", + "port-version": 0 + }, + { + "git-tree": "48330b77a37966bed0af28532a60ffd26ea9a07b", + "version-string": "1.2b-1", + "port-version": 0 + }, + { + "git-tree": "cf683451daf6f53d690f7a3c08f0dae046ea4607", + "version-string": "1.2b", + "port-version": 0 + }, + { + "git-tree": "0071e5670fb051a6527270adb65c32e5257c7880", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/meshoptimizer.json b/port_versions/m-/meshoptimizer.json new file mode 100644 index 00000000000000..34f55815e994cc --- /dev/null +++ b/port_versions/m-/meshoptimizer.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b1e3e0ab70cf603738e55b8725d7ec834e7abfa6", + "version-string": "0.14", + "port-version": 1 + } + ] +} diff --git a/port_versions/m-/metis.json b/port_versions/m-/metis.json new file mode 100644 index 00000000000000..7808d0f2bd0a3c --- /dev/null +++ b/port_versions/m-/metis.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "b3ad4e99935fca4e79b5df63fb7a055686b4cf42", + "version-string": "5.1.0", + "port-version": 7 + }, + { + "git-tree": "d4ddb63ce08cbf4b68b13c30dff8e15079891fc5", + "version-string": "5.1.0-6", + "port-version": 0 + }, + { + "git-tree": "3d0e6109b7ee6c387ed8aceabc60ba9ab50f553d", + "version-string": "5.1.0-5", + "port-version": 0 + }, + { + "git-tree": "2399084f267f45cfce5d4c074cce41cfb3a25e11", + "version-string": "5.1.0-4", + "port-version": 0 + }, + { + "git-tree": "f8b89081de4ab5fe76770c16da184363f5ee4635", + "version-string": "5.1.0-3", + "port-version": 0 + }, + { + "git-tree": "9953e84f10ee672b75a23782cda06c44ae7eb8e6", + "version-string": "5.1.0-2", + "port-version": 0 + }, + { + "git-tree": "b1c5112b22a2aa3be648be48a372c221630298c1", + "version-string": "5.1.0-1", + "port-version": 0 + }, + { + "git-tree": "b3a13b3bd1dc0f1c47ccabb973523784d9f4d763", + "version-string": "5.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/metrohash.json b/port_versions/m-/metrohash.json new file mode 100644 index 00000000000000..c8884e1744fced --- /dev/null +++ b/port_versions/m-/metrohash.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e322e34deeeb1ae533217d85ceea0b6ad36ec64e", + "version-string": "1.1.3-1", + "port-version": 0 + }, + { + "git-tree": "031ee83acafc765e853c3d1912456aca0213b08e", + "version-string": "1.1.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mgnlibs.json b/port_versions/m-/mgnlibs.json new file mode 100644 index 00000000000000..e0adf5cc7cc947 --- /dev/null +++ b/port_versions/m-/mgnlibs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8672ed7edb6bb28df31224f1ff62ea68bbb6abf2", + "version-string": "2019-09-29", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mhook.json b/port_versions/m-/mhook.json new file mode 100644 index 00000000000000..db9730b4f971fb --- /dev/null +++ b/port_versions/m-/mhook.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8f4768d6f5dfac779008faae0a807dd6f9c23129", + "version-string": "2.5.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/microsoft-signalr.json b/port_versions/m-/microsoft-signalr.json new file mode 100644 index 00000000000000..69a6f83d1b9c54 --- /dev/null +++ b/port_versions/m-/microsoft-signalr.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f713853a4b9a4cab2c7c26abd868b1b04fc47bec", + "version-string": "0.1.0-alpha1", + "port-version": 2 + }, + { + "git-tree": "8e2e8e6ad6f5c7b8da3d6cbb06f54278dd34e47e", + "version-string": "0.1.0-alpha1-1", + "port-version": 0 + }, + { + "git-tree": "638cf1f219fe97126a05dfd3cfc5f50edc0b85e7", + "version-string": "0.1.0-alpha1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mikktspace.json b/port_versions/m-/mikktspace.json new file mode 100644 index 00000000000000..b2b196dfade2e3 --- /dev/null +++ b/port_versions/m-/mikktspace.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "859afcd720d96f2d3eae712a4df2e87c7a0a7723", + "version-string": "2020-10-06", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/milerius-sfml-imgui.json b/port_versions/m-/milerius-sfml-imgui.json new file mode 100644 index 00000000000000..0252af96dce2a6 --- /dev/null +++ b/port_versions/m-/milerius-sfml-imgui.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a4143f10f8cf6b5d8d25626961e56fec4cb3c706", + "version-string": "1.1-2", + "port-version": 0 + }, + { + "git-tree": "af7d10ad6b2e69105dc6e7d3407b67bbad2bd8d0", + "version-string": "1.1-1", + "port-version": 0 + }, + { + "git-tree": "1a8cdb6bf3f610b40a412d89e6126af97111c581", + "version-string": "1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mimalloc.json b/port_versions/m-/mimalloc.json new file mode 100644 index 00000000000000..623a0e0b4716d1 --- /dev/null +++ b/port_versions/m-/mimalloc.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "e56e85546183d42a9831a167651bd40f9e59edb1", + "version-string": "1.6.4", + "port-version": 0 + }, + { + "git-tree": "0f579151c214f923f66b21b2b6256fda4074aad2", + "version-string": "1.6.1-1", + "port-version": 0 + }, + { + "git-tree": "551b04c2c4699cf3c1fe7709ce6d794ea38a246e", + "version-string": "1.6.1", + "port-version": 0 + }, + { + "git-tree": "3b1da2257446e7077ac7f29b249cacb74a042ad9", + "version-string": "2019-06-25-1", + "port-version": 0 + }, + { + "git-tree": "e36378e952f4cff69da7dd7f35c85e10804dd311", + "version-string": "2019-06-25", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/minc.json b/port_versions/m-/minc.json new file mode 100644 index 00000000000000..5ad61aa206ed40 --- /dev/null +++ b/port_versions/m-/minc.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "acdeaea4e9ff6ac06a4349375f57cfe0e66aa241", + "version-string": "2.4.03", + "port-version": 1 + }, + { + "git-tree": "61ca37cefb07e151ea7eb1ce1c6e19b8c2b74312", + "version-string": "2.4.03", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/minhook.json b/port_versions/m-/minhook.json new file mode 100644 index 00000000000000..f8762b2deeb980 --- /dev/null +++ b/port_versions/m-/minhook.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "6d518eb93f8f8327d4470dcb1df1e45a4e94ba32", + "version-string": "1.3.3", + "port-version": 1 + }, + { + "git-tree": "40ec69ab3b1b668f3f2b577c20cc4f2228f4d122", + "version-string": "1.3.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/minifb.json b/port_versions/m-/minifb.json new file mode 100644 index 00000000000000..2545f8115565d1 --- /dev/null +++ b/port_versions/m-/minifb.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0d292f83153e9e6a842131c237852b1a580df705", + "version-string": "2019-08-20-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/minimp3.json b/port_versions/m-/minimp3.json new file mode 100644 index 00000000000000..930bc6543399e6 --- /dev/null +++ b/port_versions/m-/minimp3.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "40803dea0d5152a008dead0dc49d928a4ec78494", + "version-string": "2020-12-25", + "port-version": 0 + }, + { + "git-tree": "9cd84af5757e5bdb6919f0edee4552c220af7ec8", + "version-string": "2019-07-24-1", + "port-version": 0 + }, + { + "git-tree": "30f0e4929b0605805e017395c903d6c76ad7fdaf", + "version-string": "2019-07-24", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/minisat-master-keying.json b/port_versions/m-/minisat-master-keying.json new file mode 100644 index 00000000000000..ebaf095e8d4b2a --- /dev/null +++ b/port_versions/m-/minisat-master-keying.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e81450d91579aa1a04809cc891ed2c43cd26e86e", + "version-string": "2.2-mod-2", + "port-version": 0 + }, + { + "git-tree": "db459cec0c867d26462d4d6dea430a824826e65c", + "version-string": "2.2-mod-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/minitrace.json b/port_versions/m-/minitrace.json new file mode 100644 index 00000000000000..67ddf7de510c52 --- /dev/null +++ b/port_versions/m-/minitrace.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b050ea8f545743febd0e79347ef3cf5d6fe92e12", + "version-string": "2019.02.06", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/miniupnpc.json b/port_versions/m-/miniupnpc.json new file mode 100644 index 00000000000000..dc595787d0b792 --- /dev/null +++ b/port_versions/m-/miniupnpc.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b3f428b80985396d6731cfccffdfcb1f399ec53d", + "version-string": "2.1-1", + "port-version": 0 + }, + { + "git-tree": "df7a69761d58babf52972591c75548178a8cdc52", + "version-string": "2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/miniz.json b/port_versions/m-/miniz.json new file mode 100644 index 00000000000000..33c2cde3de73b2 --- /dev/null +++ b/port_versions/m-/miniz.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "849d35ab99423558e72a9bfa69ae95ae11635fda", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "664a441e9faa4e4832221165387c5d0a041b43be", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "8aad9d585819424c5753e9eac81c2a8cfdcfbaab", + "version-string": "2.0.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/minizip.json b/port_versions/m-/minizip.json new file mode 100644 index 00000000000000..d12398ccbeb0a9 --- /dev/null +++ b/port_versions/m-/minizip.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "4f7a0ceea0f626741858e2f2c0438aaba542fedc", + "version-string": "1.2.11", + "port-version": 7 + }, + { + "git-tree": "d0f4e3a527b27a06d529269f3237c2421c9df9fb", + "version-string": "1.2.11-6", + "port-version": 0 + }, + { + "git-tree": "cc4fbe9ba9b90847250540e9a4c59ddc72501f29", + "version-string": "1.2.11-5", + "port-version": 0 + }, + { + "git-tree": "44373e5262a3b408fadfeb14ff9ce2b4d018515a", + "version-string": "1.2.11-4", + "port-version": 0 + }, + { + "git-tree": "5e834476ebc65f92c88b6c5aecf23459f86a74b3", + "version-string": "1.2.11-3", + "port-version": 0 + }, + { + "git-tree": "41f96494e36dd25204ba21360b423ec94ff3bd1d", + "version-string": "1.2.11-2", + "port-version": 0 + }, + { + "git-tree": "008a166d676b553946e02f3f769fa48df2276aac", + "version-string": "1.2.11-1", + "port-version": 0 + }, + { + "git-tree": "ef35aa9f1b2e49df05aebea8b2f2caafe5179625", + "version-string": "1.2.11", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mio.json b/port_versions/m-/mio.json new file mode 100644 index 00000000000000..b65624083d3439 --- /dev/null +++ b/port_versions/m-/mio.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "43906b044c359b7c123887287b1b40c0fc25b479", + "version-string": "2019-02-10", + "port-version": 0 + }, + { + "git-tree": "9931525c14c85f46eec0eb3d91bfede98935cc23", + "version-string": "2018-10-18-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mlpack.json b/port_versions/m-/mlpack.json new file mode 100644 index 00000000000000..57645a96498b13 --- /dev/null +++ b/port_versions/m-/mlpack.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "ca98fd8ae45d5ef5e77e4f2942b2dbe60a4356d4", + "version-string": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "7a0ed8cc5c940c4f081bbe541c1dc482d6e0f8c9", + "version-string": "3.2.2", + "port-version": 6 + }, + { + "git-tree": "c3ce426036ea35721079b3c43ceb73c2a4b93b0a", + "version-string": "3.2.2", + "port-version": 5 + }, + { + "git-tree": "6e19f4adf4a8de35b7fbee6c6112e30ef5c1ed37", + "version-string": "3.2.2", + "port-version": 4 + }, + { + "git-tree": "d063c084d6abe9ef0bcd0ee8be1950f671d3bf3f", + "version-string": "3.2.2-3", + "port-version": 0 + }, + { + "git-tree": "c4a0c36be6c89f033c7f507b749d452e87f13551", + "version-string": "3.2.2-2", + "port-version": 0 + }, + { + "git-tree": "2c5e235fd8ab380a77f1ded84a519cd2af37c63f", + "version-string": "3.2.2-1", + "port-version": 0 + }, + { + "git-tree": "2016657e3eb8bbe3e14b002cbc050e047eecaa70", + "version-string": "3.2.2", + "port-version": 0 + }, + { + "git-tree": "24ab84f343d9ade94180279949664aa533033932", + "version-string": "3.1.1-1", + "port-version": 0 + }, + { + "git-tree": "b9fea0ea9ea521ce93e2f57842646e5c05cf4412", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "ffe23546970ec0a34eb5631bf9e63c6aa31bc41f", + "version-string": "3.1.0-1", + "port-version": 0 + }, + { + "git-tree": "58bae883a03f4bd47032fa7ba0326069de2599eb", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "960e5d69e082757ccd17a5efd09bc6593d137e96", + "version-string": "3.0.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mman.json b/port_versions/m-/mman.json new file mode 100644 index 00000000000000..3a501005742358 --- /dev/null +++ b/port_versions/m-/mman.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "a732b3f36cfe52db33d67435daf53f1cc522db8b", + "version-string": "git-f5ff813-3", + "port-version": 0 + }, + { + "git-tree": "5e5046086737308d341c9b81c496ef536da48399", + "version-string": "git-f5ff813-2", + "port-version": 0 + }, + { + "git-tree": "70f6bf880ecf1a616b22b0f7741de62798481ba5", + "version-string": "git-f5ff813-1", + "port-version": 0 + }, + { + "git-tree": "1001ce3b03f61f9f46a552cb6c265845a9d7c600", + "version-string": "git-f5ff813", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mmloader.json b/port_versions/m-/mmloader.json new file mode 100644 index 00000000000000..ff952b9d88d27e --- /dev/null +++ b/port_versions/m-/mmloader.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e1825273819a6439f75ba1439385944a1331101c", + "version-string": "2020-05-15", + "port-version": 1 + }, + { + "git-tree": "ca830c0ba1e475c6eb4a200f2b63847916b37206", + "version-string": "2020-05-15", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mmx.json b/port_versions/m-/mmx.json new file mode 100644 index 00000000000000..d78ee021467851 --- /dev/null +++ b/port_versions/m-/mmx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "de7f696bc3b559e2376ef5cd52295776e539a4c0", + "version-string": "2019-09-29", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/modp-base64.json b/port_versions/m-/modp-base64.json new file mode 100644 index 00000000000000..48f72fef69bdf1 --- /dev/null +++ b/port_versions/m-/modp-base64.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e4f4036da7adface3f64eae79654f6adec72ef82", + "version-string": "2020-09-26", + "port-version": 0 + }, + { + "git-tree": "45e887b77a2b1d66d20497f0dce5b4a580f32c62", + "version-string": "v2.0.0", + "port-version": 0 + }, + { + "git-tree": "aa8d1be38f49d9c840359da740f9accf67494ea9", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mongo-c-driver.json b/port_versions/m-/mongo-c-driver.json new file mode 100644 index 00000000000000..e04ef7627e0880 --- /dev/null +++ b/port_versions/m-/mongo-c-driver.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "7f42fe8e15fb11c2ef5c63723edcd29a2be93062", + "version-string": "1.16.1", + "port-version": 3 + }, + { + "git-tree": "469df31b13f8873df98fc40143a9f454212f38cb", + "version-string": "1.16.1-1", + "port-version": 1 + }, + { + "git-tree": "4f05b753676be00cbeea2f5e6d0d641c3c6fd3dc", + "version-string": "1.16.1-1", + "port-version": 0 + }, + { + "git-tree": "fc77ec84f6aabb2a2a1e79072ee12cc4819f23cc", + "version-string": "1.16.1", + "port-version": 0 + }, + { + "git-tree": "cc8ec6465eb0fd121e0fd0b2d1b1db6c14c7b942", + "version-string": "1.15.1-1", + "port-version": 0 + }, + { + "git-tree": "404871eba77904251e7ef29f62ccbc811a55aefb", + "version-string": "1.14.0-5", + "port-version": 0 + }, + { + "git-tree": "a32cd2217a274276cdbc36e243086bd2e11bc694", + "version-string": "1.14.0-4", + "port-version": 0 + }, + { + "git-tree": "342d384fb6d4b9816cfea93494fed57ab97ff6e2", + "version-string": "1.14.0-3-1", + "port-version": 0 + }, + { + "git-tree": "bfd7edf6fba4f2f443f3dd904ec9e9ee9db742dc", + "version-string": "1.14.0-3", + "port-version": 0 + }, + { + "git-tree": "79b1de4563e7eb8a3b69c57bef6f005605bd2039", + "version-string": "1.14.0-2", + "port-version": 0 + }, + { + "git-tree": "4e98969ccf74f4a16f62cbf6519070e65ac3ed21", + "version-string": "1.14.0-1", + "port-version": 0 + }, + { + "git-tree": "571e6c0e6fa80616c6670c63fd49c30096ec6e64", + "version-string": "1.13.0", + "port-version": 0 + }, + { + "git-tree": "50eaf4efda03435dd8f3b15995af9081c1b1c93c", + "version-string": "1.9.5-3", + "port-version": 0 + }, + { + "git-tree": "5773958803604c06725638469d557ffb2364a6de", + "version-string": "1.9.5-2", + "port-version": 0 + }, + { + "git-tree": "040b506a233a0b231d77b1062c85718f6a7a940b", + "version-string": "1.9.5-1", + "port-version": 0 + }, + { + "git-tree": "b5a8872d91e3bcb5580f66a7d8f692f7ac79db7c", + "version-string": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "6f6a7b15ff64eef28e66b1a2b45545a1494f0a87", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "5cd8ae2b8806ca3cf808409dea186b888bbd7446", + "version-string": "1.6.2-1", + "port-version": 0 + }, + { + "git-tree": "d54ce446c688393284c8d738781954cb968b28d4", + "version-string": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "04fdc9663238bb44ffed04cb88037ef528d4469a", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "99055be3efadb1a2f594d93fc22dc8c4b0287663", + "version-string": "1.5.0-rc6", + "port-version": 0 + }, + { + "git-tree": "551d43f83ce2712ac6196b7973c74889f2224632", + "version-string": "1.4.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mongo-cxx-driver.json b/port_versions/m-/mongo-cxx-driver.json new file mode 100644 index 00000000000000..2236681be9eba4 --- /dev/null +++ b/port_versions/m-/mongo-cxx-driver.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "604e80750b83ac609caa6acca73b09307900a9cd", + "version-string": "3.4.0-5", + "port-version": 1 + }, + { + "git-tree": "e97bc71bb124f63fc4542039df254f4811322001", + "version-string": "3.4.0-5", + "port-version": 0 + }, + { + "git-tree": "9af9e5be2065850e4010aba38438db43ecec8cbf", + "version-string": "3.4.0-4", + "port-version": 0 + }, + { + "git-tree": "d287ae96f1d2c41500bceceaded6927f708d54c2", + "version-string": "3.4.0-3", + "port-version": 0 + }, + { + "git-tree": "5a6bd362d6e20ba973b7f9d3e30e59907e3f7b2c", + "version-string": "3.4.0-2", + "port-version": 0 + }, + { + "git-tree": "5b1855cfe3d2cff3abf3b87bd3cfcde7fff7419e", + "version-string": "3.4.0-1", + "port-version": 0 + }, + { + "git-tree": "c06b5d3a86074a5316faab2a8de0f836d66ec5b9", + "version-string": "3.2.0-2", + "port-version": 0 + }, + { + "git-tree": "f47a79fea0c3762e56741101863982b763c9817f", + "version-string": "3.2.0-1", + "port-version": 0 + }, + { + "git-tree": "d706dc22b38b3c140dae5a61f95a5e5df298fd5d", + "version-string": "3.1.1-3", + "port-version": 0 + }, + { + "git-tree": "7add01cf7622cda4b63e6d83a1da4997282778a9", + "version-string": "3.1.1-2", + "port-version": 0 + }, + { + "git-tree": "fd7d11526f6473efc9c14e8714113539af54cd4b", + "version-string": "3.1.1-1", + "port-version": 0 + }, + { + "git-tree": "d2d3ebed65e3e7e244fbc295422284db10e1a0f0", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "a516ad2ba1ff48252f2c319c7e65341107f51d2f", + "version-string": "3.0.3-2", + "port-version": 0 + }, + { + "git-tree": "9fbd68d8f2d7235cf74d7b44c1730239da6557fe", + "version-string": "3.0.3-1", + "port-version": 0 + }, + { + "git-tree": "510cbd1e1a837a6e42256039e42f21655110ef8c", + "version-string": "3.0.3", + "port-version": 0 + }, + { + "git-tree": "2e1310c3ecb2b8fc0b8c5e79aafb840876f8f45f", + "version-string": "3.0.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mongoose.json b/port_versions/m-/mongoose.json new file mode 100644 index 00000000000000..ddd3ddc3faf4ed --- /dev/null +++ b/port_versions/m-/mongoose.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "065f3b19bed7c1cf3bb66d777eda7f4e74818f77", + "version-string": "6.15-2", + "port-version": 0 + }, + { + "git-tree": "3e5739c01b94cd23f2b20643d13738bcfe17b453", + "version-string": "6.15-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/monkeys-audio.json b/port_versions/m-/monkeys-audio.json new file mode 100644 index 00000000000000..391e59c86e7102 --- /dev/null +++ b/port_versions/m-/monkeys-audio.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "1214c3471adf4b1257484fe2b5e93c68f2be0d2f", + "version-string": "5.70", + "port-version": 0 + }, + { + "git-tree": "d144aafa5bbed0987c741f1bde761eaf4b90af9e", + "version-string": "5.65", + "port-version": 0 + }, + { + "git-tree": "56550b410f187868315fdf13b9e389780197b511", + "version-string": "5.59", + "port-version": 0 + }, + { + "git-tree": "dcf7fc513c4fbbf553b6b5d8eaa457ed8ec8486e", + "version-string": "5.48", + "port-version": 0 + }, + { + "git-tree": "68712c31dad17b79f99908a8ed7885686281ee49", + "version-string": "5.46", + "port-version": 0 + }, + { + "git-tree": "3cce5af184c45d17c3d5292d9d925ccce59b469a", + "version-string": "5.38", + "port-version": 0 + }, + { + "git-tree": "97e3095b7ae797b1ee4253942743584221edb289", + "version-string": "5.24", + "port-version": 0 + }, + { + "git-tree": "9edf6a96cba59ac1c287e24911141e3f229f120c", + "version-string": "5.14-1", + "port-version": 0 + }, + { + "git-tree": "30872fc7b35dbb207f58bbe1604bd23bee0e8344", + "version-string": "5.14", + "port-version": 0 + }, + { + "git-tree": "4894a97d8ba72dfb2fa3f7a88f0caaa814a660e1", + "version-string": "4.8.3-1", + "port-version": 0 + }, + { + "git-tree": "d5c37550f5a0d18a7ec6ad70a3abc5f276bcd213", + "version-string": "4.8.3", + "port-version": 0 + }, + { + "git-tree": "2de4b1bef0fc62fd5a6b42652db31c9de74765a9", + "version-string": "4.3.3-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/moos-core.json b/port_versions/m-/moos-core.json new file mode 100644 index 00000000000000..82f05f4cf713cf --- /dev/null +++ b/port_versions/m-/moos-core.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "c3b7758f06ce33435ff4882aaf51095ef1e0628d", + "version-string": "10.4.0", + "port-version": 5 + }, + { + "git-tree": "da896b82d026b06f70f11fe88572fe0fc0d2f717", + "version-string": "10.4.0-4", + "port-version": 0 + }, + { + "git-tree": "dd4c155bd628c298e0b950961880d10aecf624db", + "version-string": "10.4.0-3", + "port-version": 0 + }, + { + "git-tree": "b5a2f113daa52cf346c378d5a2e68a76792c3eaf", + "version-string": "10.4.0-2", + "port-version": 0 + }, + { + "git-tree": "4c4956c790e5f87f91f98703f5d21ec0c9760a29", + "version-string": "10.4.0-1", + "port-version": 0 + }, + { + "git-tree": "d90fce4bbcdb2bb45498bc3ddf74c7bbc0daf94f", + "version-string": "10.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/moos-essential.json b/port_versions/m-/moos-essential.json new file mode 100644 index 00000000000000..4b6f069cc381f9 --- /dev/null +++ b/port_versions/m-/moos-essential.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "544617bd9ccb5e12e900533d38c8ce2bb930a3f1", + "version-string": "10.0.1-2", + "port-version": 0 + }, + { + "git-tree": "311f678c5f991107b58fa99f9ba6cdab1d80ae1d", + "version-string": "10.0.1-1", + "port-version": 0 + }, + { + "git-tree": "b96efa6e74251086a707e80106da4dc6525375ed", + "version-string": "10.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/moos-ui.json b/port_versions/m-/moos-ui.json new file mode 100644 index 00000000000000..d59a6ecfe68aad --- /dev/null +++ b/port_versions/m-/moos-ui.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "14e23eda28b53d1891f92cc006744ca67ee0c4fe", + "version-string": "10.0.1-2", + "port-version": 0 + }, + { + "git-tree": "8b36589888a73ea7f3228002fe2c1e4a44533b07", + "version-string": "10.0.1-1", + "port-version": 0 + }, + { + "git-tree": "91d33876d1c8955b42c8bbe5ea5ce47624f761c9", + "version-string": "10.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/morton-nd.json b/port_versions/m-/morton-nd.json new file mode 100644 index 00000000000000..9ae9a06d431d46 --- /dev/null +++ b/port_versions/m-/morton-nd.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "acdac4e47f9b91d7a7dd27aa9689f029fdd43895", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "1d6b2ea7c7c51d460d7b00f5db03ae3fb48af5fb", + "version-string": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mosquitto.json b/port_versions/m-/mosquitto.json new file mode 100644 index 00000000000000..bb1bfbc30f8be1 --- /dev/null +++ b/port_versions/m-/mosquitto.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "e50ddad9108597e09097e1853e116a62d650044d", + "version-string": "1.6.8", + "port-version": 3 + }, + { + "git-tree": "99c389f2871b91c86bc2ca3f2a127c95363bddf4", + "version-string": "1.6.8", + "port-version": 2 + }, + { + "git-tree": "1ea8b1f6fb8652cfebc04c0fa92effd2e1b47e31", + "version-string": "1.6.8-1", + "port-version": 0 + }, + { + "git-tree": "5f659f853beb8ec297ef9aba5847897c1389da94", + "version-string": "1.6.8", + "port-version": 0 + }, + { + "git-tree": "a5142660db930398bafb216ad44fdaa7545ece7c", + "version-string": "1.6.7-2", + "port-version": 0 + }, + { + "git-tree": "16080a7fb96159baad1b13d5c1386b8c45da44e5", + "version-string": "1.6.7-1", + "port-version": 0 + }, + { + "git-tree": "f57317cc3573eb099ff68680f9476e820dff9b49", + "version-string": "1.6.7", + "port-version": 0 + }, + { + "git-tree": "6dc527d35cebf688cab86dfcf2599198aa38e162", + "version-string": "1.6.3", + "port-version": 0 + }, + { + "git-tree": "2a77fbc864e1162ddd87de60515fcefb66e46c4a", + "version-string": "1.6.2-2", + "port-version": 0 + }, + { + "git-tree": "c2879b400e3cb39e185b0c810e2cb23b53b3888c", + "version-string": "1.5.0-3", + "port-version": 0 + }, + { + "git-tree": "507232d20b61bc97a70c7078b2508d8de8828ff4", + "version-string": "1.5.0-2", + "port-version": 0 + }, + { + "git-tree": "ee0a05d08b00b3412684185e02c73285307a7747", + "version-string": "1.5.0-1", + "port-version": 0 + }, + { + "git-tree": "333348ee5d94728bdefd630e468ca725896433fd", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "baca04d56666db4b5bc25262f6a9f4189e8f7920", + "version-string": "1.4.15", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mozjpeg.json b/port_versions/m-/mozjpeg.json new file mode 100644 index 00000000000000..aeaa17117a1dfd --- /dev/null +++ b/port_versions/m-/mozjpeg.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "edf9c537c7b19a49a2aac339e4cd4a96d6d0c774", + "version-string": "2020-06-02", + "port-version": 2 + }, + { + "git-tree": "a1b88394762d856840fe8a13fc8274e488303c25", + "version-string": "2020-06-02-1", + "port-version": 0 + }, + { + "git-tree": "4e6755ea137719b61bca9d806002dcafae5ae084", + "version-string": "2020-06-02", + "port-version": 0 + }, + { + "git-tree": "30a395bb2eccb693a50d31f5779cad9ce396c665", + "version-string": "3.2-3", + "port-version": 0 + }, + { + "git-tree": "9e67b0d7bcdfece838a0eac89848a7dfb2d66303", + "version-string": "3.2-2", + "port-version": 0 + }, + { + "git-tree": "27e1838ee3246851ec684abdbe60a582ed582c79", + "version-string": "3.2-1", + "port-version": 0 + }, + { + "git-tree": "c50ef83138dac8f509d44f80102ba57f784f4226", + "version-string": "3.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mp-units.json b/port_versions/m-/mp-units.json new file mode 100644 index 00000000000000..dc47cb0614e6a4 --- /dev/null +++ b/port_versions/m-/mp-units.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fd2c36c9ab20e2e27330592205b3e3851cab5ebc", + "version-string": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mp3lame.json b/port_versions/m-/mp3lame.json new file mode 100644 index 00000000000000..067845d8211105 --- /dev/null +++ b/port_versions/m-/mp3lame.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "ea9ad10f5f14516799474a20ee31662f7de8d52a", + "version-string": "3.100", + "port-version": 6 + }, + { + "git-tree": "6fddb425e79c5b504af2e3fef17c629bc1ef2305", + "version-string": "3.100", + "port-version": 5 + }, + { + "git-tree": "3903e277648fc5c88473f9759550e834c7a3d575", + "version-string": "3.100", + "port-version": 4 + }, + { + "git-tree": "d76fd2722d821ea56571b6a0752746d60831edf5", + "version-string": "3.100-3", + "port-version": 0 + }, + { + "git-tree": "3a83237960b5f3c8f927dcf060fa858289772545", + "version-string": "3.100-1", + "port-version": 0 + }, + { + "git-tree": "a6dd356e37318d4b893c22de3b4205cdea540e40", + "version-string": "3.100", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mpark-variant.json b/port_versions/m-/mpark-variant.json new file mode 100644 index 00000000000000..271dbd2581beab --- /dev/null +++ b/port_versions/m-/mpark-variant.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ce9cbdb149d5767262e26b62fbb9819a6459718f", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "17b8782949b828923f03a6e6c93f68b3cc6a7e21", + "version-string": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mpfr.json b/port_versions/m-/mpfr.json new file mode 100644 index 00000000000000..67ba0c0a479395 --- /dev/null +++ b/port_versions/m-/mpfr.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "7eefb0bc78d4e4422f50379f1ccd05f13c3ed8c2", + "version-string": "4.0.2-2", + "port-version": 0 + }, + { + "git-tree": "fc2c7a4c7a71980713500a219c8501e7f9662695", + "version-string": "4.0.2-1", + "port-version": 0 + }, + { + "git-tree": "ba226cf87ef03e64d62b703f670a6a3dca586f98", + "version-string": "4.0.1", + "port-version": 0 + }, + { + "git-tree": "78fc43c69a8dee26f7271682eab37876b9fc0a8b", + "version-string": "3.1.6-3", + "port-version": 0 + }, + { + "git-tree": "9f0187f4046838905689258fe4660a84ce42324b", + "version-string": "3.1.6-2", + "port-version": 0 + }, + { + "git-tree": "f9edf8950aa0bcc80bb2bafbd0383a05ae4de373", + "version-string": "3.1.6-1", + "port-version": 0 + }, + { + "git-tree": "8be5785333992cc870c9b8d6f4ebafaba9c67d41", + "version-string": "3.1.6", + "port-version": 0 + }, + { + "git-tree": "1803812dc76fc401aba673fc04a2d6c2e70949b7", + "version-string": "3.1.5-1", + "port-version": 0 + }, + { + "git-tree": "258b3bc093a74319c644a8108e86f784f6b2a132", + "version-string": "3.1.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mpg123.json b/port_versions/m-/mpg123.json new file mode 100644 index 00000000000000..7861b984ea9d9b --- /dev/null +++ b/port_versions/m-/mpg123.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "19e2118fcd63fde61be2fd29d54a7bc8699ffa75", + "version-string": "1.26.3", + "port-version": 0 + }, + { + "git-tree": "3297cd5836cd5de4143016d50277b9cbaf3ed389", + "version-string": "1.25.8", + "port-version": 14 + }, + { + "git-tree": "644c44c4b09eebff1d159e2ffb1c931baf8dd263", + "version-string": "1.25.8", + "port-version": 13 + }, + { + "git-tree": "1dd75107974e98b2b63c65efb4c34e43eaa85687", + "version-string": "1.25.8-12", + "port-version": 0 + }, + { + "git-tree": "95d9ae4a225e5db28b1b41f8214930753a60188f", + "version-string": "1.25.8-11", + "port-version": 0 + }, + { + "git-tree": "74393aadb3ce56199f6e15cc60333f7b458520fa", + "version-string": "1.25.8-10", + "port-version": 0 + }, + { + "git-tree": "9c377ff0ac2b51fc8288b218670fca992836cb06", + "version-string": "1.25.8-9", + "port-version": 0 + }, + { + "git-tree": "9cda6fa6e614889c460004cbc65e89c235c97dc2", + "version-string": "1.25.8-8", + "port-version": 0 + }, + { + "git-tree": "a3b223f112ffbcfa14cb9a800b97ee665229c0d9", + "version-string": "1.25.8-7", + "port-version": 0 + }, + { + "git-tree": "f0600d482839983a776a99ffb5a312ea1cbd9a85", + "version-string": "1.25.8-6", + "port-version": 0 + }, + { + "git-tree": "199955636cdcaf66259f2b31605fe832b3aeaa5f", + "version-string": "1.25.8-5", + "port-version": 0 + }, + { + "git-tree": "39b0708492c20ea638cb393e9645446e7a0e183c", + "version-string": "1.25.8-4", + "port-version": 0 + }, + { + "git-tree": "9f9adadc5199324cd640a1e7738dac004a5b4693", + "version-string": "1.25.8-3", + "port-version": 0 + }, + { + "git-tree": "b61754b3926664098a7998b03489b2fdd3f844df", + "version-string": "1.25.8-2", + "port-version": 0 + }, + { + "git-tree": "bae49880a90e3e612f8320eb9c43da67b7a07af5", + "version-string": "1.25.8-1", + "port-version": 0 + }, + { + "git-tree": "3a25baa6224f3c9382d9513a6212c45c4e1d9b7e", + "version-string": "1.25.8", + "port-version": 0 + }, + { + "git-tree": "5be7d55ecb13994b03c9e6ae9d02ac1c832f0be7", + "version-string": "1.24.0-1", + "port-version": 0 + }, + { + "git-tree": "d6975a387e8d79b81451caab4064a3d83cfde5d1", + "version-string": "1.23.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mpi.json b/port_versions/m-/mpi.json new file mode 100644 index 00000000000000..d4f35d8988e3e0 --- /dev/null +++ b/port_versions/m-/mpi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "71c3ebcd0d6f9b7b65d907ae5652a7fac3253775", + "version-string": "1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mpir.json b/port_versions/m-/mpir.json new file mode 100644 index 00000000000000..0dd5bbbdcbafc7 --- /dev/null +++ b/port_versions/m-/mpir.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "6d62b01b328d3537a808a6b68cdecaa44ea0d0d7", + "version-string": "3.0.0", + "port-version": 10 + }, + { + "git-tree": "d2935119930a3551330e83b03006fb2e1bb9bf79", + "version-string": "3.0.0", + "port-version": 9 + }, + { + "git-tree": "0b5171be985ebf44fd60062f87c8bbcbefb87341", + "version-string": "3.0.0-8", + "port-version": 0 + }, + { + "git-tree": "67369fe2d8b80b1181fc85919b6ca701c0f95814", + "version-string": "3.0.0-7", + "port-version": 0 + }, + { + "git-tree": "e803d79296062df889f1347ad0f5cb8d8755dea2", + "version-string": "3.0.0-6", + "port-version": 0 + }, + { + "git-tree": "92dd4a70047aa0d4070b3e114f8357b961dc769f", + "version-string": "3.0.0-5", + "port-version": 0 + }, + { + "git-tree": "b73bc9ae2196c4288e63af086c6567f706539f04", + "version-string": "3.0.0-4", + "port-version": 0 + }, + { + "git-tree": "ed60e7bc49d79da7c279a9fc6a2699ee4aaada03", + "version-string": "3.0.0-3", + "port-version": 0 + }, + { + "git-tree": "e1602241a3dd8a53f561b850338744f2bc77f04d", + "version-string": "3.0.0-2", + "port-version": 0 + }, + { + "git-tree": "ac492c30197eee13be6412686e6e301b2a61e349", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "b82fb3c0bb99b7eb487a7b6ec58f50d3dadde272", + "version-string": "2.7.2-1", + "port-version": 0 + }, + { + "git-tree": "f7f74dfba526b978eb012352d096a5531043414b", + "version-string": "2.7.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mpmcqueue.json b/port_versions/m-/mpmcqueue.json new file mode 100644 index 00000000000000..072f77820ad3a3 --- /dev/null +++ b/port_versions/m-/mpmcqueue.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5d51c7ac12930b7a4b26c5cde81d5a0c92d3c56d", + "version-string": "2019-07-26", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mqtt-cpp.json b/port_versions/m-/mqtt-cpp.json new file mode 100644 index 00000000000000..f9feb3e2c1fd95 --- /dev/null +++ b/port_versions/m-/mqtt-cpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c5342ce2999f8b7f9d1e3ae9e5aada71e7e03266", + "version-string": "7.0.1-2", + "port-version": 0 + }, + { + "git-tree": "cf4fa43060a5ca52a6478f078f64bd783d0ba6fe", + "version-string": "7.0.1-1", + "port-version": 0 + }, + { + "git-tree": "2391a0fe7129140e08a4fdf6e9c4595a50f4ae32", + "version-string": "7.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/ms-angle.json b/port_versions/m-/ms-angle.json new file mode 100644 index 00000000000000..f5fbfd41385381 --- /dev/null +++ b/port_versions/m-/ms-angle.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "ca605f2187feef6d74eabacbdf7e83216b4241e5", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "8610eb82f35617b9df9fe3a520dba4b18bdf1c6d", + "version-string": "2018-04-18-2", + "port-version": 0 + }, + { + "git-tree": "ef73a5c4513b200bcd4c5d2f7564b15042c892f7", + "version-string": "2018-04-18-1", + "port-version": 0 + }, + { + "git-tree": "c66278e6e9f1e2e1900d6a784460203d5f9367dd", + "version-string": "2018-04-18", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/ms-gsl.json b/port_versions/m-/ms-gsl.json new file mode 100644 index 00000000000000..c3c900d2abc1c4 --- /dev/null +++ b/port_versions/m-/ms-gsl.json @@ -0,0 +1,129 @@ +{ + "versions": [ + { + "git-tree": "75aed40fd77dd1c0f123fe92df90d3aef55e7466", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "654bd029ae281df6dc5594bb136ffdbe6361c588", + "version-string": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "41b5c0431c3382db1de85e96ac6a8be2ceca1125", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "a6df92e1447a5b45c16d50744ce5dcec3c54baf9", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "8b49029d61352da39803ba6b2c815bee9dbe8ec8", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "4e3de250571b05ec1201a3913c76e33ae1f3c56c", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "e4567ef1517b2928d2128ff1f7d0387412a8a6bb", + "version-string": "2019-01-18", + "port-version": 0 + }, + { + "git-tree": "df14114c8016f39ff7797093615d196ceae2f9d3", + "version-string": "2019-01-15", + "port-version": 0 + }, + { + "git-tree": "ca140e80e01466b0b727e1b039ad9c610edf32a4", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "a36e0e8665f182ac8207aaadd5827ef27f0c5f7c", + "version-string": "2018-11-08", + "port-version": 0 + }, + { + "git-tree": "0fd1e71ebef788863641483e2d41abfc83590836", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "3913836087c786a705c7a83408e21c5f1b9e17ff", + "version-string": "2018-08-03", + "port-version": 0 + }, + { + "git-tree": "4839663c44968fcbc79c3f33f2783655744f4e8a", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "0d28abf5c16ff13ba787c1457cf9db67c95ee5c6", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "13a3460cb16a6f7de12dc3d1aa9c847b334e813a", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "4e1356da34a96964fc8b612bd99a24e8e5c49e16", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "b96fbc685a0a9b3219905e2470d992c4e29e430b", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "60264df907af96b1ab69bbf46ee2ee4d9befc2bf", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "1794c9a7b6a9fd0b275259e053a7697b16778ad0", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "2367d71b3ca048ce3c66b692102f5d04b5bd14a7", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "a59106e8559519103dbace593e6f29ee272c171a", + "version-string": "2018-03-03", + "port-version": 0 + }, + { + "git-tree": "4c935e8cb82d46941eec530cf1cd0429df00e7d6", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "0864fe6ea70e6ca2459f7b546ce477443b4b0eb9", + "version-string": "20171204-9d65e74400976b3509833f49b16d401600c7317d", + "port-version": 0 + }, + { + "git-tree": "16aa60b828fbea27c553101c636030afe5230634", + "version-string": "20171104-d10ebc6555b627c9d1196076a78467e7be505987", + "port-version": 0 + }, + { + "git-tree": "d6f9c5d16d0bb6077a01971d0762ae8b98de2c27", + "version-string": "20170425-8b320e3f5d016f953e55dfc7ec8694c1349d3fe4", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/msgpack.json b/port_versions/m-/msgpack.json new file mode 100644 index 00000000000000..8f3c9618a44cf8 --- /dev/null +++ b/port_versions/m-/msgpack.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "61d9adf5fb7555558588762d38e34544c6a38e25", + "version-string": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "6fcf40eb0910b55deab3d0d658a20ca14887f45c", + "version-string": "3.2.0", + "port-version": 2 + }, + { + "git-tree": "2f4408c870bd4282eccda8dad23e71e0fef4a157", + "version-string": "3.2.0-1", + "port-version": 0 + }, + { + "git-tree": "65ea7098427ad52422df996fca814abf693d7e7f", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "d4af0641ad69926a91d7a6814dd28a69edd8df26", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "707941e4e28397a9436b66ca26762d445401898f", + "version-string": "2.1.5-1", + "port-version": 0 + }, + { + "git-tree": "3b3e664ae5942b8b824dab13ca32c0c16e83d3d8", + "version-string": "2.1.5", + "port-version": 0 + }, + { + "git-tree": "8cc54cfaa7f70798f0d63cda39d3a30ba31a57c1", + "version-string": "2.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/msgpack11.json b/port_versions/m-/msgpack11.json new file mode 100644 index 00000000000000..a5ac8ea6ced495 --- /dev/null +++ b/port_versions/m-/msgpack11.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "893e52e19e5a4b783a02f7be49825f9fa3903255", + "version-string": "0.0.10-1", + "port-version": 0 + }, + { + "git-tree": "769a1719f4cb14f87d8121d0dff78a9cd3e02c27", + "version-string": "0.0.10", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/msinttypes.json b/port_versions/m-/msinttypes.json new file mode 100644 index 00000000000000..f9e636dbde9e07 --- /dev/null +++ b/port_versions/m-/msinttypes.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1d44711d68afe966e4864bddf426de6d589b4d85", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "e86d2b33445c7e5587a85dc36294db3ea7403a54", + "version-string": "2017-06-26-f9e7c5758ed9e3b9f4b2394de1881c704dd79de0", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/msix.json b/port_versions/m-/msix.json new file mode 100644 index 00000000000000..b886d12d861062 --- /dev/null +++ b/port_versions/m-/msix.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "d99bfeedaecfb8155ed9a404e3aa683f1b1df72a", + "version-string": "1.7-2", + "port-version": 0 + }, + { + "git-tree": "15274b3d9b4eb39d86c50e085b0110a56c0a2e83", + "version-string": "1.7-1", + "port-version": 0 + }, + { + "git-tree": "22076969c0b319d74c0353f8471aa0c5791d82b2", + "version-string": "1.7", + "port-version": 0 + }, + { + "git-tree": "6c6664e346ede2ca06e6bb7629f06c58a723a813", + "version-string": "MsixCoreInstaller-preview-1", + "port-version": 0 + }, + { + "git-tree": "cf561286237c049f194fd880fdc894d490e05d7d", + "version-string": "MsixCoreInstaller-preview", + "port-version": 0 + }, + { + "git-tree": "2c5bf5801aa8d5e58017c57e7c18530984d92b75", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "4b8358cee82445bdac186cf73a8624e1bd127f17", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/msmpi.json b/port_versions/m-/msmpi.json new file mode 100644 index 00000000000000..6890386b27379a --- /dev/null +++ b/port_versions/m-/msmpi.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "ce9b3f866ae1c098455182c6e811dc63a7b3e161", + "version-string": "10.1", + "port-version": 0 + }, + { + "git-tree": "dbe3f57014dd0c3a44455e36c3bb04152e0fd049", + "version-string": "10.0-2", + "port-version": 0 + }, + { + "git-tree": "a6bf90317dc9bba22a7922c1e9c9b59739482260", + "version-string": "10.0", + "port-version": 0 + }, + { + "git-tree": "7a6ad829a0e260dc60550b37e137c502583a2ca6", + "version-string": "9.0", + "port-version": 0 + }, + { + "git-tree": "eb86867a615917b30fffe3ec96c92596ce3b478a", + "version-string": "8.1", + "port-version": 0 + }, + { + "git-tree": "f9a8531cd20b82fa1cd2cfc82b148ac89efe4d34", + "version-string": "8.0-1", + "port-version": 0 + }, + { + "git-tree": "0564ca902c6ddca7c5fe8e7967f1bdca5817b545", + "version-string": "8.0", + "port-version": 0 + }, + { + "git-tree": "27db4f2a8c22fd7b5d3d515a42b74a120d662c87", + "version-string": "7.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mstch.json b/port_versions/m-/mstch.json new file mode 100644 index 00000000000000..8519ddfd263343 --- /dev/null +++ b/port_versions/m-/mstch.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c30daa60881cea1db66414a17b0de32b3f76c5b1", + "version-string": "1.0.2-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mujs.json b/port_versions/m-/mujs.json new file mode 100644 index 00000000000000..dcbd03b3128078 --- /dev/null +++ b/port_versions/m-/mujs.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "4e3dc249bb1190e025b5189e9e8a7624b435fce5", + "version-string": "2018-07-30-1", + "port-version": 0 + }, + { + "git-tree": "4b7ceb73ca69095bf933385ff94d3f91fc05cd16", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "f37339bd35877d22035a1b62ddc32543b5036d97", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "532f5e0b181cfaf37293fd97c6b6af9e59d525f0", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "aa2059f8754535c45f996934a08f4e1f08531165", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "4bfd28eadfd41bfa38ff958a67d039a25b10e875", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "6bc683daf245fe8fb6365e108a400260d99fbf89", + "version-string": "25821e6d74fab5fcc200fe5e818362e03e114428", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/munit.json b/port_versions/m-/munit.json new file mode 100644 index 00000000000000..0af7e7542d0a66 --- /dev/null +++ b/port_versions/m-/munit.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "45b3a29080b2b88733c00de98297e431917568ab", + "version-string": "2019-04-06", + "port-version": 1 + }, + { + "git-tree": "a9d861f2feec6d07bb449863b6a73d483ad695ca", + "version-string": "2019-04-06", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/muparser.json b/port_versions/m-/muparser.json new file mode 100644 index 00000000000000..11d28ef8752728 --- /dev/null +++ b/port_versions/m-/muparser.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "88f24afa700f3c4e50ba65ab7b8a0e5ac32d2512", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "01428bed61e304d0801cfd883e62d30aff375a85", + "version-string": "2.2.6.1", + "port-version": 0 + }, + { + "git-tree": "f9eb9e8ce9f815b5fcc8387d0dae5a9a24e79257", + "version-string": "6cf2746", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/murmurhash.json b/port_versions/m-/murmurhash.json new file mode 100644 index 00000000000000..6b9205ee0049e9 --- /dev/null +++ b/port_versions/m-/murmurhash.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "fb66af217c56447fa8a7d80988f461acafae4dfa", + "version-string": "2016-01-09-3", + "port-version": 0 + }, + { + "git-tree": "715aa14d1544da8ed79381b3139de787edcc4367", + "version-string": "2016-01-09-2", + "port-version": 0 + }, + { + "git-tree": "92cff1a57727a474efdf00a70ccf941a61cdad77", + "version-string": "2016-01-09", + "port-version": 0 + } + ] +} diff --git a/port_versions/m-/mygui.json b/port_versions/m-/mygui.json new file mode 100644 index 00000000000000..afdd8bba511389 --- /dev/null +++ b/port_versions/m-/mygui.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f66dcaf503832c67a615a560fe943cd5fba00c0d", + "version-string": "2020-06-17", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nameof.json b/port_versions/n-/nameof.json new file mode 100644 index 00000000000000..a05d5ff3b97228 --- /dev/null +++ b/port_versions/n-/nameof.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "234e76946663fe1435fee7e8ad834e79e674954e", + "version-string": "0.9.4", + "port-version": 0 + }, + { + "git-tree": "18e61afbf20c1797608a21e10848bc2e23ca5086", + "version-string": "0.9.3", + "port-version": 0 + }, + { + "git-tree": "9369fbcbb3eba95b1e781c952c996e6b4e56c149", + "version-string": "0.9.2", + "port-version": 0 + }, + { + "git-tree": "574f0a08bd13d076a6d73de171189cf6e58b98d8", + "version-string": "0.9.1", + "port-version": 0 + }, + { + "git-tree": "cb3b0392b1fb1ea0fd25747a8baf493805b82e81", + "version-string": "2019-07-13", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nana.json b/port_versions/n-/nana.json new file mode 100644 index 00000000000000..e82764d4887068 --- /dev/null +++ b/port_versions/n-/nana.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "b2e006f8f4b726f268b855f855ed896c2c99ba24", + "version-string": "1.7.4", + "port-version": 1 + }, + { + "git-tree": "c32b081f24687ac8a7b25e74f4df1a2a3664c802", + "version-string": "1.7.4", + "port-version": 0 + }, + { + "git-tree": "5c9d5283547fdcf63be03e0bdeac7d97a90264db", + "version-string": "1.7.2", + "port-version": 4 + }, + { + "git-tree": "c40ea66d412698348c18f84f00112f4c91673d93", + "version-string": "1.7.2-3", + "port-version": 0 + }, + { + "git-tree": "f97940e21a1f672e96332b2da9e8930998239ab8", + "version-string": "1.7.2-2", + "port-version": 0 + }, + { + "git-tree": "09fcfc20df67fb4cad7f3b40748809e0705f3ae2", + "version-string": "1.7.2-1", + "port-version": 0 + }, + { + "git-tree": "58d5e350f5ac048f30cd36efcab3250bdd6fb400", + "version-string": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "4f1a115c56b7f09d0d01f81232949e7abd365ba0", + "version-string": "1.7.1-1", + "port-version": 0 + }, + { + "git-tree": "136b103efc7fdbe8aea12cdfd1799b9c588b947f", + "version-string": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "aa5fc7818dc2c83e4d84d5df21cc6c48c898f8b8", + "version-string": "1.6.2-1", + "port-version": 0 + }, + { + "git-tree": "7a14d9a6abc655e76399de329c9a8d45551487fb", + "version-string": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "096cd5a018a59a223f4104d517b3a3310e7840c0", + "version-string": "1.6.1", + "port-version": 0 + }, + { + "git-tree": "6bfe84f3fd811ce88a689ed04b603db607eae17c", + "version-string": "1.5.6", + "port-version": 0 + }, + { + "git-tree": "dbc71ebe00d4bc088037ee556c5359b6f9a3444c", + "version-string": "1.5.5", + "port-version": 0 + }, + { + "git-tree": "50a06c9d10ab6436e45b750f9a6f5951df50ce28", + "version-string": "1.5.4-1", + "port-version": 0 + }, + { + "git-tree": "fd6f1c61a227dbc8c1b1f0d70b8fbe1717c51c96", + "version-string": "1.5.4", + "port-version": 0 + }, + { + "git-tree": "d2e2a35ba9d363b6396efad7dc611db38e99adde", + "version-string": "1.5.3", + "port-version": 0 + }, + { + "git-tree": "e9e15dd27cc96bac986a079f61ae96b7b581c057", + "version-string": "1.5.1-hotfix-42f8985", + "port-version": 0 + }, + { + "git-tree": "5ea317633128d4c965e0e5e269b811b0b0776366", + "version-string": "1.4.1-66be23c9204c5567d1c51e6f57ba23bffa517a7c", + "port-version": 0 + }, + { + "git-tree": "bfece345f8e00ba03c9520b57c648b0a8dfa3e32", + "version-string": "1.4.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nano-signal-slot.json b/port_versions/n-/nano-signal-slot.json new file mode 100644 index 00000000000000..59f2454562649c --- /dev/null +++ b/port_versions/n-/nano-signal-slot.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c6a06a1a383f174caa5a7559cee00b0a997ff482", + "version-string": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "4bd843bc1f3401ea0a5482cd9f68be9213cdeeff", + "version-string": "2018-08-25-1", + "port-version": 0 + }, + { + "git-tree": "c5eb946c169cc6bee60f5d600b68b88551df8ace", + "version-string": "commit-25aa2aa90d450d3c7550c535c7993a9e2ed0764a", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nanobench.json b/port_versions/n-/nanobench.json new file mode 100644 index 00000000000000..5c6351f977c100 --- /dev/null +++ b/port_versions/n-/nanobench.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "92e0f95608004b243767ee74382095a2a087da58", + "version-string": "4.3.0", + "port-version": 0 + }, + { + "git-tree": "897cb151ed0a20d6d392d7109c9b37200a47adf7", + "version-string": "4.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nanodbc.json b/port_versions/n-/nanodbc.json new file mode 100644 index 00000000000000..692b2b0a42f6ed --- /dev/null +++ b/port_versions/n-/nanodbc.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "921e300d4f37f15072f30eaaf382d2d27f598ac6", + "version-string": "2.13.0", + "port-version": 0 + }, + { + "git-tree": "174e2417bc9f936e7b856fa71ed1782c8b2d479e", + "version-string": "2.13.0", + "port-version": 1 + }, + { + "git-tree": "8323483e55b9eb32dd5f7801468e3daed8dff134", + "version-string": "2.13.0", + "port-version": 0 + }, + { + "git-tree": "bf6a98594c343544352a582ea3137bd7176c5172", + "version-string": "2.12.4", + "port-version": 9 + }, + { + "git-tree": "fc64f1f3821e9e09e5fe7c2567ebce3e3cfcd788", + "version-string": "2.12.4-8", + "port-version": 0 + }, + { + "git-tree": "7a0eb636aeb71e6b1d6fb49c4d3c2069b096458c", + "version-string": "2.12.4-7", + "port-version": 0 + }, + { + "git-tree": "b10fd1beea51b05ca320573f646b22d4510e8ad9", + "version-string": "2.12.4-5", + "port-version": 0 + }, + { + "git-tree": "e7e994942f4a99c08d9f1ee37a3d6bf2213f9eaa", + "version-string": "2.12.4-4", + "port-version": 0 + }, + { + "git-tree": "ecdcb2e22a873e00e09ca5fba4df30c47e015872", + "version-string": "2.12.4-3", + "port-version": 0 + }, + { + "git-tree": "4b875f604ab78245d055490f7a26f3d005d955ce", + "version-string": "2.12.4-2", + "port-version": 0 + }, + { + "git-tree": "27ca1bf9cdb1602d324d41504a71fd9241a76022", + "version-string": "2.12.4-1", + "port-version": 0 + }, + { + "git-tree": "6a3eec1775d776d027cc4882f0868f75faa0b6e2", + "version-string": "2.12.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nanoflann.json b/port_versions/n-/nanoflann.json new file mode 100644 index 00000000000000..2f53779affe5b7 --- /dev/null +++ b/port_versions/n-/nanoflann.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d570a82d4db97264fa7c99bdbbea6f5d42d9e674", + "version-string": "1.3.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nanogui.json b/port_versions/n-/nanogui.json new file mode 100644 index 00000000000000..3c4780729ec1fc --- /dev/null +++ b/port_versions/n-/nanogui.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4d1fa22f0634b118230bfba869eff9c23ceecbc3", + "version-string": "2019-09-23", + "port-version": 1 + }, + { + "git-tree": "13a4e33a01629667f26be71ef251e5d2b9d3e56e", + "version-string": "2019-09-23", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nanomsg.json b/port_versions/n-/nanomsg.json new file mode 100644 index 00000000000000..35892464450e2b --- /dev/null +++ b/port_versions/n-/nanomsg.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "8d195243efc98f0bfed5942ebf226879fcf5d545", + "version-string": "1.1.5-2", + "port-version": 0 + }, + { + "git-tree": "6c782bdd98f7b84b83168ae9b24faf10ee84d0ec", + "version-string": "1.1.5-1", + "port-version": 0 + }, + { + "git-tree": "48963c4297fcbcc18e05d62f9443eefc38746b0f", + "version-string": "1.1.5", + "port-version": 0 + }, + { + "git-tree": "1d1b0634175bdaf6555f822931280322729edc40", + "version-string": "1.1.4", + "port-version": 0 + }, + { + "git-tree": "49c3abd02b0b5a13e78b570ea05c59c774a951ec", + "version-string": "1.1.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nanopb.json b/port_versions/n-/nanopb.json new file mode 100644 index 00000000000000..6989b9cc562ec3 --- /dev/null +++ b/port_versions/n-/nanopb.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "47f954644a0f5f22381ae3655f84b3f790e4e1e8", + "version-string": "2019-02-12-2", + "port-version": 0 + }, + { + "git-tree": "594b2fd1655940da92878956a9b86d28532c244c", + "version-string": "2019-02-12-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nanoprintf.json b/port_versions/n-/nanoprintf.json new file mode 100644 index 00000000000000..127be4ea4d4ef7 --- /dev/null +++ b/port_versions/n-/nanoprintf.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d46293c2d3548e9170ec8a0b30cef90cf9638a2c", + "version-string": "2020-05-27", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nanorange.json b/port_versions/n-/nanorange.json new file mode 100644 index 00000000000000..c345de482990e6 --- /dev/null +++ b/port_versions/n-/nanorange.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "44197d1b2631aa3de246da4cf6e9546a225bf9c2", + "version-string": "0.0.0", + "port-version": 0 + }, + { + "git-tree": "318c934bc14c90e78fa90d29c77b75590a217eea", + "version-string": "60be62", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nanort.json b/port_versions/n-/nanort.json new file mode 100644 index 00000000000000..c07b3ff82a86bf --- /dev/null +++ b/port_versions/n-/nanort.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a2635321561486b77f14251f44d1b3ce29ec1b24", + "version-string": "2019-08-20-1", + "port-version": 0 + }, + { + "git-tree": "8d866ee14452c6b244f1c5369f5e760e07bee25b", + "version-string": "2019-08-20", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nanovg.json b/port_versions/n-/nanovg.json new file mode 100644 index 00000000000000..d4db306d3f7fb8 --- /dev/null +++ b/port_versions/n-/nanovg.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "9d02e60630da5a385a4f9fbdea0f0fcffae78ff9", + "version-string": "2019-8-30-3", + "port-version": 0 + }, + { + "git-tree": "71fc878e561b3b7473846d963d36d011f54aeaf2", + "version-string": "2019-8-30-1", + "port-version": 0 + }, + { + "git-tree": "1d032662dfcd6b8ea73f27ebd3e8204aa912b8ae", + "version-string": "2019-8-30", + "port-version": 0 + }, + { + "git-tree": "d3e0874057ad73536696bb985d6a799eb27bb4d2", + "version-string": "master", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nativefiledialog.json b/port_versions/n-/nativefiledialog.json new file mode 100644 index 00000000000000..2a73212d163070 --- /dev/null +++ b/port_versions/n-/nativefiledialog.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b2e484cc447978109bcd69b2fa61920b2059d0f9", + "version-string": "2019-08-28", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nccl.json b/port_versions/n-/nccl.json new file mode 100644 index 00000000000000..f9451a0500ce3a --- /dev/null +++ b/port_versions/n-/nccl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cb9af30276eda49db198401cdefa5a15fcc9e8ce", + "version-string": "2.4.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/neargye-semver.json b/port_versions/n-/neargye-semver.json new file mode 100644 index 00000000000000..0a02048402d3b1 --- /dev/null +++ b/port_versions/n-/neargye-semver.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "eccabb2b0f4df666dbb95a7c14c3f8f1b8e57cd4", + "version-string": "0.2.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/netcdf-c.json b/port_versions/n-/netcdf-c.json new file mode 100644 index 00000000000000..45c3f61a0fc547 --- /dev/null +++ b/port_versions/n-/netcdf-c.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "725a87fc08fed5789a9a4a3308b2a80f4906a400", + "version-string": "4.7.4", + "port-version": 1 + }, + { + "git-tree": "0355e5b36c74e347af5508261ab371ac2880fbd4", + "version-string": "4.7.4", + "port-version": 0 + }, + { + "git-tree": "fd30ba70e0dc6309ad9637689e07094f30d54a8c", + "version-string": "4.7.3", + "port-version": 4 + }, + { + "git-tree": "0b90bdfb0ba48ae59c3e945c5a717030505d8f27", + "version-string": "4.7.3", + "port-version": 3 + }, + { + "git-tree": "1472b0b2292dbaa471a1e82b015a839358602d33", + "version-string": "4.7.3", + "port-version": 2 + }, + { + "git-tree": "c5e831c751d8652f07275083874d181f0c057b10", + "version-string": "4.7.3-1", + "port-version": 0 + }, + { + "git-tree": "1c02bd4421a4ebfb7a1d0222144b3cca96d567e1", + "version-string": "4.7.3", + "port-version": 0 + }, + { + "git-tree": "8f26c247a16aa9457a4d83affc46d62619c184a8", + "version-string": "4.7.0-5", + "port-version": 0 + }, + { + "git-tree": "428a9d29f9d11a5ccf9582279993c9d2e41225c2", + "version-string": "4.7.0-4", + "port-version": 0 + }, + { + "git-tree": "c08bb06832202d095ed21a34ea0bce6277b766f1", + "version-string": "4.7.0-3", + "port-version": 0 + }, + { + "git-tree": "5730f0a7087dc8bd8d946ed91280390218876a9f", + "version-string": "4.7.0-2", + "port-version": 0 + }, + { + "git-tree": "6512e94aab0f062bb9db970d305d91530fff5fc2", + "version-string": "4.7.0-1", + "port-version": 0 + }, + { + "git-tree": "82051b8ae0377af6fa6e8f4529ade1db3afe8574", + "version-string": "4.7.0", + "port-version": 0 + }, + { + "git-tree": "445a1668da32bbc514aa12d2d6e6943e47832c11", + "version-string": "4.6.2-1", + "port-version": 0 + }, + { + "git-tree": "03ef1a7242e85015e484f7e8a975ae666f4de7e5", + "version-string": "4.6.2", + "port-version": 0 + }, + { + "git-tree": "71b146b9d4cea7ec41786ddbeb3a4164f349ec47", + "version-string": "4.4.1.1-2", + "port-version": 0 + }, + { + "git-tree": "92fdfc7949185eac43f5d95c0b4b914a95491667", + "version-string": "4.4.1.1-1", + "port-version": 0 + }, + { + "git-tree": "c3cb5b4354b9057f1e7378792c4f666830de3c12", + "version-string": "4.4.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/netcdf-cxx4.json b/port_versions/n-/netcdf-cxx4.json new file mode 100644 index 00000000000000..c7ab9a16b3981a --- /dev/null +++ b/port_versions/n-/netcdf-cxx4.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "17850b6ba47c047dc7e2e55bdb6b2956521d424c", + "version-string": "4.3.1", + "port-version": 2 + }, + { + "git-tree": "be1a100ea4fa132b206c23d21515a721d933889c", + "version-string": "4.3.1", + "port-version": 1 + }, + { + "git-tree": "37f045219c6b94d0f3df5aee1fa2ff22068e6ad1", + "version-string": "4.3.1", + "port-version": 0 + }, + { + "git-tree": "64bcda2a7fb352a6d5a571097d868fabbdc80897", + "version-string": "4.3.0-5", + "port-version": 0 + }, + { + "git-tree": "6c8bc2cd8515277be4284793d118b14baa780d61", + "version-string": "4.3.0-4", + "port-version": 0 + }, + { + "git-tree": "b24f7fa7bd4bba4c2865d464d7ed9d499c1590d0", + "version-string": "4.3.0-2", + "port-version": 0 + }, + { + "git-tree": "2d5fd97c9e7ce59dc22fc0b0382629373ab659b7", + "version-string": "4.3.0-1", + "port-version": 0 + }, + { + "git-tree": "c50e548832c03140ac4af027e4b0fe8b53a0916a", + "version-string": "4.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nethost.json b/port_versions/n-/nethost.json new file mode 100644 index 00000000000000..cb9f17b53fbcfc --- /dev/null +++ b/port_versions/n-/nethost.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ca0380ac4071317e01632a0af40ffacd2ab133fd", + "version-string": "2019-12-21", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nettle.json b/port_versions/n-/nettle.json new file mode 100644 index 00000000000000..d69d95a038e42d --- /dev/null +++ b/port_versions/n-/nettle.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "c5667fa4f9c8aae21162042f6193069cdb994337", + "version-string": "3.6", + "port-version": 0 + }, + { + "git-tree": "b24ec7541d5c5a5f45da1897ec4474c552fd59ad", + "version-string": "3.5.1", + "port-version": 5 + }, + { + "git-tree": "bd9a99e9308321c37b84ccbf0093fdfd2c87c9d5", + "version-string": "3.5.1", + "port-version": 4 + }, + { + "git-tree": "8c84dbd102c06d3127eaea0652b375e60d7fcb5d", + "version-string": "3.5.1", + "port-version": 3 + }, + { + "git-tree": "f14b6678d91210fec7ab1d097386bca4abe6b36a", + "version-string": "3.5.1-2", + "port-version": 0 + }, + { + "git-tree": "cfd585b91a32289888892e76466185a72f516fbf", + "version-string": "3.5.1-1", + "port-version": 0 + }, + { + "git-tree": "c0343c7116ca511038e764ca37c8068fc2c4b0a5", + "version-string": "3.5.1 ", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/networkdirect-sdk.json b/port_versions/n-/networkdirect-sdk.json new file mode 100644 index 00000000000000..cc486c5d32a342 --- /dev/null +++ b/port_versions/n-/networkdirect-sdk.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "33dae8e97560e2d4c72ea3d0e49e59a70ee3d979", + "version-string": "2.0.1", + "port-version": 1 + }, + { + "git-tree": "27e231e5c0df7b8dd8788108c7d9cb266348c427", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nghttp2.json b/port_versions/n-/nghttp2.json new file mode 100644 index 00000000000000..06c7f4ee39aa0f --- /dev/null +++ b/port_versions/n-/nghttp2.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "c962462a3cfe855132c4b1d565bc4e3c4a67797d", + "version-string": "1.42.0", + "port-version": 0 + }, + { + "git-tree": "027507d008e249e40ba3fd600fa9323660fe87ee", + "version-string": "1.39.2-2", + "port-version": 0 + }, + { + "git-tree": "a527b3cb5a9017782ebf52f87aef5986965e1202", + "version-string": "1.39.2-1", + "port-version": 0 + }, + { + "git-tree": "5bbc6fa002786f76f0d66991b13893ff5613cdaf", + "version-string": "1.39.2", + "port-version": 0 + }, + { + "git-tree": "2ed6b0f77ad89f84a72dd18a5981d5dda4b64178", + "version-string": "1.35.0", + "port-version": 0 + }, + { + "git-tree": "34cbb731a1652ab7c86e8cc686e2a314a775161c", + "version-string": "1.34.0", + "port-version": 0 + }, + { + "git-tree": "e1f8bbfa9dd8f1a4bd88c8a8f27bf11dbae8c993", + "version-string": "1.33.0", + "port-version": 0 + }, + { + "git-tree": "ce46b9e34fffd5df74b97170a7959f38d0c5a91f", + "version-string": "1.32.1", + "port-version": 0 + }, + { + "git-tree": "b6176530018187f44542caf0d651219db32bdd49", + "version-string": "1.32.0", + "port-version": 0 + }, + { + "git-tree": "01ee825f2bce23882a2df637622ec2d41f821a78", + "version-string": "1.30.0-1", + "port-version": 0 + }, + { + "git-tree": "79969286c58d60375ea5e35327519ab3d98f5e12", + "version-string": "1.29.0-1", + "port-version": 0 + }, + { + "git-tree": "3d370d4c965034f8620c957e8a9bc18f9939b2d0", + "version-string": "1.29.0", + "port-version": 0 + }, + { + "git-tree": "b4a96ddcdea8083676c0e6c4bfa76cb6c540de6e", + "version-string": "1.28.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/ngspice.json b/port_versions/n-/ngspice.json new file mode 100644 index 00000000000000..5dcf4cb76d38a8 --- /dev/null +++ b/port_versions/n-/ngspice.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b15238b045e17d6543080e78e20071380df008f2", + "version-string": "32", + "port-version": 1 + }, + { + "git-tree": "5e33c5788e4617ced7e621a8c1a6ae99ef09e92f", + "version-string": "32", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nifticlib.json b/port_versions/n-/nifticlib.json new file mode 100644 index 00000000000000..dc15a05763ec9b --- /dev/null +++ b/port_versions/n-/nifticlib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "28adfbbaaf62ef125a255045592cd935532a6e2d", + "version-string": "2020-04-30", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nlohmann-fifo-map.json b/port_versions/n-/nlohmann-fifo-map.json new file mode 100644 index 00000000000000..11bf05e6dc8eb3 --- /dev/null +++ b/port_versions/n-/nlohmann-fifo-map.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "f9a56c0cc09fe04a1c98d9d37403c82718ba7e69", + "version-string": "2018.05.07-1", + "port-version": 0 + }, + { + "git-tree": "458c5e159dd6732ba234ed343bbb4147c77d9b4a", + "version-string": "2018.05.07", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nlohmann-json.json b/port_versions/n-/nlohmann-json.json new file mode 100644 index 00000000000000..035d248b8db4ba --- /dev/null +++ b/port_versions/n-/nlohmann-json.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "3b9a6d5f3d94db5699d4448f717ff32e4ea5722b", + "version-string": "3.9.1", + "port-version": 0 + }, + { + "git-tree": "6da342bdc3635e9aa6e8f9b428718d61a7c6ab16", + "version-string": "3.9.0", + "port-version": 0 + }, + { + "git-tree": "b7d833a0ac9950ea38908c0c72a6866de1b15af5", + "version-string": "3.8.0", + "port-version": 2 + }, + { + "git-tree": "52072ed630dd66bf5eaacff20b6f24f52e8ff39c", + "version-string": "3.8.0", + "port-version": 0 + }, + { + "git-tree": "bcf781e8f7e8eb7baddab0853dc5ef7ed59d0812", + "version-string": "3.7.3", + "port-version": 0 + }, + { + "git-tree": "09087343e4426668b9293613aab3e807691b7cd7", + "version-string": "3.7.0", + "port-version": 0 + }, + { + "git-tree": "f126a28b3648dfda2a1fdc671e515475cc87f83a", + "version-string": "3.6.1", + "port-version": 0 + }, + { + "git-tree": "c0f554a5b581f1205ee4a025ec4e830f4bce8552", + "version-string": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "ebafe7f35529cc53ac576eece15212b11df7b3b7", + "version-string": "3.5.0-5", + "port-version": 0 + }, + { + "git-tree": "4d5a5f644590ded6507ef0dc601f2a4032c5d856", + "version-string": "3.5.0", + "port-version": 0 + }, + { + "git-tree": "d9d8197f3629de42e8e7ddbfccd21d80863afadf", + "version-string": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "abcaac745f22333ed5ebee9c292f9ede285c3e18", + "version-string": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "93b56faf6101fb5ad93a03e097f7958dcb9569b0", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "94b0f101711ff48e5c4bb02c0afb246d37ea7f34", + "version-string": "3.1.2", + "port-version": 0 + }, + { + "git-tree": "93cc0cf00fa46aef2f342319d08af24ae1aeeba5", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "733e906ac0ae3fb70b2bf09ac254670487646cb0", + "version-string": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "05bd7807870d0187a8ab16434340d2cae8eb14a5", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "a2451141654e076200240c080998c24e3ec5a41c", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "99197062ac05c3a7c2f2809a09f8a5521e75da30", + "version-string": "2.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nlopt.json b/port_versions/n-/nlopt.json new file mode 100644 index 00000000000000..e6bc5fb323ec3b --- /dev/null +++ b/port_versions/n-/nlopt.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "7702c2f9e4c4ef687a026196c6a707c390e676a5", + "version-string": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "0d774cc0c2321600ce14b75bfa2c8ef5c5b27580", + "version-string": "2.6.2-1", + "port-version": 0 + }, + { + "git-tree": "e78ae190e9e90d4a4a740a7f3460be6ff6f59414", + "version-string": "2.6.2", + "port-version": 0 + }, + { + "git-tree": "87fadb54afe197118b2be5eda72d8e4b56791adf", + "version-string": "2.6.1-1", + "port-version": 0 + }, + { + "git-tree": "35004ce09f66f99ffbbbcdc38bee9fc011e7bd82", + "version-string": "2.6.1", + "port-version": 0 + }, + { + "git-tree": "1d384bf97e7ec32e3481ce3802512febf3a3f9e3", + "version-string": "2.4.2-1226c127", + "port-version": 0 + }, + { + "git-tree": "5e30ef59691386e5e8643bff42edf7461babde5b", + "version-string": "2.4.2-c43afa08d~vcpkg1-1", + "port-version": 0 + }, + { + "git-tree": "08e7b904616f32e5afdec11835fca58c04d44e96", + "version-string": "2.4.2-c43afa08d~vcpkg1", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nmap.json b/port_versions/n-/nmap.json new file mode 100644 index 00000000000000..64104cebb57b76 --- /dev/null +++ b/port_versions/n-/nmap.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "83ebdc9303a1f8917df4275921160636cdb05eef", + "version-string": "7.70-4", + "port-version": 0 + }, + { + "git-tree": "9425d0f2139b304472ddff641ff55f188fd78d9d", + "version-string": "7.70-3", + "port-version": 0 + }, + { + "git-tree": "eb2e1019f2303a847a647c4171f95c35dc68e5e6", + "version-string": "7.70-1", + "port-version": 0 + }, + { + "git-tree": "59121e9dcab8932b0b082a4ca2f733859f8b5aa1", + "version-string": "7.70", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nmslib.json b/port_versions/n-/nmslib.json new file mode 100644 index 00000000000000..edacfb3c61b81a --- /dev/null +++ b/port_versions/n-/nmslib.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "8aa3ecb4ff8364680fe15c756eb2e8a0fecbc167", + "version-string": "2.0.6", + "port-version": 0 + }, + { + "git-tree": "d420566df44d8d163d5e132c1e0d02a3e80a4d39", + "version-string": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "e049b7f165d81c0c19d3b619e5b72b5fc53c038b", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "3edf7a906a30e46cf045241413ee3bd0b5c7c49a", + "version-string": "1.7.3.6-1", + "port-version": 0 + }, + { + "git-tree": "3a8ca5525f7123c0b7cda6735c84b2362f345944", + "version-string": "1.7.3.6", + "port-version": 0 + }, + { + "git-tree": "eaddae2d1fb5769ecb38e466f45af91af7bc70db", + "version-string": "1.7.2-1", + "port-version": 0 + }, + { + "git-tree": "3dd4919058fb48e17cdc4bfde133202fe892df70", + "version-string": "1.7.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nng.json b/port_versions/n-/nng.json new file mode 100644 index 00000000000000..132bbffa702ed5 --- /dev/null +++ b/port_versions/n-/nng.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "01241e04872e4d0b9e16170276c1c9ccf88e224b", + "version-string": "1.3.2", + "port-version": 0 + }, + { + "git-tree": "afbb99af85e87fb6e03f610dc80a6e80a19797d0", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "a544fe01aab97c01531504c95e3971e1c14628a5", + "version-string": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "f76fdd861ecdb6a7ebf4de5096ebb306a7ba8a4c", + "version-string": "2019-02-27", + "port-version": 0 + }, + { + "git-tree": "2784ef733062ec85b15713930ad0d1cee2adf60d", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "607b214faa09d997339c32e793d28a76f94f5377", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nngpp.json b/port_versions/n-/nngpp.json new file mode 100644 index 00000000000000..3701dacc328ee8 --- /dev/null +++ b/port_versions/n-/nngpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "492c863329effc469c9ac7cf6d5c18b6e968df94", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "2da92692430648375467940568b83a2b6e5f80d8", + "version-string": "1.2.4", + "port-version": 0 + }, + { + "git-tree": "7a0d68d88f3e9b3a052c5dc9105179b46d453c65", + "version-string": "2019-07-25", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nonius.json b/port_versions/n-/nonius.json new file mode 100644 index 00000000000000..2b0113eabc2f20 --- /dev/null +++ b/port_versions/n-/nonius.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "57ab8e437a9552f2fc12a3854b4965912a8a1778", + "version-string": "2019-04-20-1", + "port-version": 0 + }, + { + "git-tree": "cd667cb87d2a7198714ff458271b09bf486f952e", + "version-string": "2019-04-20", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nowide.json b/port_versions/n-/nowide.json new file mode 100644 index 00000000000000..6a3ee200387116 --- /dev/null +++ b/port_versions/n-/nowide.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "cc4a994ae4c3fc2e3d1e13eb864f5748790e142c", + "version-string": "11.0.0", + "port-version": 0 + }, + { + "git-tree": "46ef025a57c54bc4b21e57d604d0d071128d1b2c", + "version-string": "10.0.1", + "port-version": 0 + }, + { + "git-tree": "1ac5f575a496306df415caf8101269b3cdbbb93f", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "46ef025a57c54bc4b21e57d604d0d071128d1b2c", + "version-string": "10.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nrf-ble-driver.json b/port_versions/n-/nrf-ble-driver.json new file mode 100644 index 00000000000000..b8b581911675dd --- /dev/null +++ b/port_versions/n-/nrf-ble-driver.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "0fe2fd730090128aa5c3b528b5c4b6374be2019b", + "version-string": "4.1.2", + "port-version": 0 + }, + { + "git-tree": "a14671fc7a7ec32d573956588243e6743d7b9d7e", + "version-string": "4.1.1-2", + "port-version": 0 + }, + { + "git-tree": "39b59b473786aabf041b5e9840562ab8234537db", + "version-string": "4.1.1-1", + "port-version": 0 + }, + { + "git-tree": "f64dc3cd51ef638f531f2189338aa6a77ac5c719", + "version-string": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "11b7d068360ac4aaa3e25b0cb56c290bf6d8030d", + "version-string": "4.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nt-wrapper.json b/port_versions/n-/nt-wrapper.json new file mode 100644 index 00000000000000..79907176fe50ad --- /dev/null +++ b/port_versions/n-/nt-wrapper.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "25fbda0e2379901e9d90c04d4c11905d37b1fc77", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nuklear.json b/port_versions/n-/nuklear.json new file mode 100644 index 00000000000000..baae5d570af8b8 --- /dev/null +++ b/port_versions/n-/nuklear.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "00b0e82f4c9c3653b96e8eeaf54f9b74800249fc", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "c6658d0664b7d65d22f822d2fd079ed3e29f47cd", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "94679a41a85959bed87053b2226a4a780fb6e0ea", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "00df015afa2dd4268ecbcb346fdff10890683d28", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "071269996aebe9efb561db4ff16509d6a32bc06a", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "35d43bca38f50eeb03519d84ffdde4ce0c4501ae", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "050ea697fc5de95489ad12fd703a6c28fb7412f3", + "version-string": "2018-07-01", + "port-version": 0 + }, + { + "git-tree": "68ef85ea4cc1d6737022bc286524552e1db0772a", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "32adcc51a37d3a0a63ede16ed107c3894e7ba175", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "87c3d85accff1d42b3714bdb78e8deab6e033b2c", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "347d020637b18d273f2870e4582dec232e42b048", + "version-string": "2018-04-17", + "port-version": 0 + }, + { + "git-tree": "4575bdbc69b8caa84888a48cfcb0f7e321d84a60", + "version-string": "2018-04-06", + "port-version": 0 + }, + { + "git-tree": "d3b713446f072376a6aaac409c2f0b64b7a9638c", + "version-string": "2018-04-05", + "port-version": 0 + }, + { + "git-tree": "9218eae2f59e9624c9c1e5b5b046a8461f764c63", + "version-string": "2018-04-02", + "port-version": 0 + }, + { + "git-tree": "731e4a8f8581fbb55b833984269784c073cac71c", + "version-string": "2018-03-27", + "port-version": 0 + }, + { + "git-tree": "ce1626db395628008daac331e198bdaf2dc0ed5e", + "version-string": "2018-03-23", + "port-version": 0 + }, + { + "git-tree": "c038f63705872ad50e9c9070aa7e1f6122f615e2", + "version-string": "2018-03-20", + "port-version": 0 + }, + { + "git-tree": "336f896b0429d341df42a9015ba2517bda7015cd", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "cb962def0d2487a2c8f86aa00ce1fa899a7953f4", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "1280a93caabaaf04284077b42a6111364061c907", + "version-string": "2018-03-02", + "port-version": 0 + }, + { + "git-tree": "cc49363bd6cf8e0d90e8c36bfbf070ad5946ff09", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "9e52d7386333d5bfeb76074dcea5b4f2bb2caaab", + "version-string": "2017-06-15-5c7194c2fe2c68c1a8212712c0b4b6195382d27d", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/numactl.json b/port_versions/n-/numactl.json new file mode 100644 index 00000000000000..8cdc077c63613c --- /dev/null +++ b/port_versions/n-/numactl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3539b8994b1dd0a661ed4a7fa69ef53feb4a1a58", + "version-string": "2.0.12", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/numcpp.json b/port_versions/n-/numcpp.json new file mode 100644 index 00000000000000..659a2810c65683 --- /dev/null +++ b/port_versions/n-/numcpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9661c913b6651de51f8e3b42be395eaece9b0475", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nuspell.json b/port_versions/n-/nuspell.json new file mode 100644 index 00000000000000..ae0281260dae66 --- /dev/null +++ b/port_versions/n-/nuspell.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "97027ba299650a7ef96081bf3a466ac76108593f", + "version-string": "4.2.0", + "port-version": 0 + }, + { + "git-tree": "5d85d2a7be0bb5e452a8e83ea6e299c988bca454", + "version-string": "4.0.1", + "port-version": 0 + }, + { + "git-tree": "dfeff74bbf8adffad877a657158769b2d0ed7b32", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "420826f3ca68d01faf4d63cf1e7d384f0181f98d", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "cf0e4e3af738fbb9a30469427346be38239338b4", + "version-string": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/n-/nvtt.json b/port_versions/n-/nvtt.json new file mode 100644 index 00000000000000..6897ea6e79179f --- /dev/null +++ b/port_versions/n-/nvtt.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "3fa6fad1d67126e06c84897f1130e6d778f9e67f", + "version-string": "2.1.2", + "port-version": 1 + }, + { + "git-tree": "bb8a9ef7ce5947aa21f6366676f43ba1b1161e31", + "version-string": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "75f9af211ab995d8c70909b533d86eaf0f71a316", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "cd381df5dc0e1e6dde164c649f954ac746be5001", + "version-string": "2.1.0-3", + "port-version": 0 + }, + { + "git-tree": "e7361642dc7e29cb4cd4cf1077d6454ac3dca040", + "version-string": "2.1.0-2", + "port-version": 0 + }, + { + "git-tree": "a2cea9a355b0bd3538c79753eb55d5e966556cb8", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "d9ed2946e1f2985a9eee0e4f48ff5f7390ea725b", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/oatpp-consul.json b/port_versions/o-/oatpp-consul.json new file mode 100644 index 00000000000000..da8cb06785e48c --- /dev/null +++ b/port_versions/o-/oatpp-consul.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "98d704ce61f927b05f93e4e4cfa45ec4265088a8", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "64c561efb1de7dbf30102f27265ad740ec9e2a8f", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "ed35eb78ecc2281bb5ace3b376c2e17ee084c0b0", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "ad14d6500f0accac6138085ef2ad0d25ece19ec0", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/oatpp-curl.json b/port_versions/o-/oatpp-curl.json new file mode 100644 index 00000000000000..9a0bfb4cdbc0fb --- /dev/null +++ b/port_versions/o-/oatpp-curl.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "547775e31752315b7f7e81c28ca31a160030b8a5", + "version-string": "1.2.0", + "port-version": 2 + }, + { + "git-tree": "1a1208107c47416e4bf3d6a028550ea6ff335ce0", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "66a25f7f3c17fc2418350c55c5195bf505d53a1b", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "d57231e326a1002ecaea8484bac9d01c19f1f278", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "4e6c1c0a5bd3d38c8d0c779c1bf89867ece30b17", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/oatpp-libressl.json b/port_versions/o-/oatpp-libressl.json new file mode 100644 index 00000000000000..c51d2a19b92fa4 --- /dev/null +++ b/port_versions/o-/oatpp-libressl.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7d4c47f40b9129f88085c5c1afe3d44c7ca22eca", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "37b836ad7df8ba18b9241d22826abc6b812b0fbb", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "76e22341b223432508a2653aa50b4862680cf557", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "6193d3209dd3e3cb7e47df70033ef5ee83e4cb4e", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/oatpp-mbedtls.json b/port_versions/o-/oatpp-mbedtls.json new file mode 100644 index 00000000000000..b45f31a9443039 --- /dev/null +++ b/port_versions/o-/oatpp-mbedtls.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "8fa1344d0bdd6282f1b93dbcbe6f32fadce4b302", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "13fc7a86135470df2df2b49ec5295f679eddad1d", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "3ff382ea5e9518aad6734964847172c4e7588576", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "0e1aaed7b2980f0a7d1ea6ce902266fb16c4d811", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/oatpp-mongo.json b/port_versions/o-/oatpp-mongo.json new file mode 100644 index 00000000000000..b3be4c09c774ba --- /dev/null +++ b/port_versions/o-/oatpp-mongo.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7333d11c63a663a7a9244639300493a8f3fdbe1e", + "version-string": "1.2.0", + "port-version": 1 + } + ] +} diff --git a/port_versions/o-/oatpp-postgresql.json b/port_versions/o-/oatpp-postgresql.json new file mode 100644 index 00000000000000..64b35ebc1f6cc5 --- /dev/null +++ b/port_versions/o-/oatpp-postgresql.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d79f2e5a875b29aabe79e495d7a5bd4f8b8284ff", + "version-string": "1.2.0", + "port-version": 1 + } + ] +} diff --git a/port_versions/o-/oatpp-sqlite.json b/port_versions/o-/oatpp-sqlite.json new file mode 100644 index 00000000000000..27f4f476a7ce83 --- /dev/null +++ b/port_versions/o-/oatpp-sqlite.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "41dc1128affe43785bb670c0c43d884d334056f3", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "f805cdb2812c52c67848644ee233c2111ebcbda9", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/oatpp-swagger.json b/port_versions/o-/oatpp-swagger.json new file mode 100644 index 00000000000000..389e1863e9a585 --- /dev/null +++ b/port_versions/o-/oatpp-swagger.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "8e041854d65d14857958f668ae92ac4e938972b7", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "855dd834339f4aa1e50f9c8ca872caa075dad5b9", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "8bc46db671a5067fe1ab4c9778572de5becf57dd", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "eca5ef7fbebf86ef41c6b2d353552e309ec50f3b", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/oatpp-websocket.json b/port_versions/o-/oatpp-websocket.json new file mode 100644 index 00000000000000..1aff3aa951f26c --- /dev/null +++ b/port_versions/o-/oatpp-websocket.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7412173d56da2869372aca7f30b9963b0ab9967f", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "b33476cc362a63d66e5c0b0c9ddb1b6fd56dd543", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "19e74128e3dfb214501272e9de1e27c6808770bb", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "7ce8c07329a45f4e7b7a7a70e34518dab85392f7", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/oatpp-zlib.json b/port_versions/o-/oatpp-zlib.json new file mode 100644 index 00000000000000..2e2feefa469a69 --- /dev/null +++ b/port_versions/o-/oatpp-zlib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4fbe8761bcf603ce1a4af48707aa6adfa86aed4f", + "version-string": "1.2.0", + "port-version": 1 + } + ] +} diff --git a/port_versions/o-/oatpp.json b/port_versions/o-/oatpp.json new file mode 100644 index 00000000000000..0b00048ab78c97 --- /dev/null +++ b/port_versions/o-/oatpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "5c36b3d62c498e43f74d403b8f8020fbc2a06611", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "6a39c4642a8f2285801c184aba4b053c59fc906b", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "9989483fc5ddf3362d2ecb9370a5ef8fa35aee92", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "e6870b958310d68bd4a426d93d0bfd81ed25ad7e", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/observer-ptr-lite.json b/port_versions/o-/observer-ptr-lite.json new file mode 100644 index 00000000000000..d5e996e9ce9e56 --- /dev/null +++ b/port_versions/o-/observer-ptr-lite.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "173708d071e8fa3482f39a722939da9c49d06517", + "version-string": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "ac66aeb37431f57708e35db3b3c8980f49e1722a", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/ocilib.json b/port_versions/o-/ocilib.json new file mode 100644 index 00000000000000..732c869b78de67 --- /dev/null +++ b/port_versions/o-/ocilib.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "a956cde150fe4a95f62c4586788dafd6587e00e6", + "version-string": "4.7.1", + "port-version": 0 + }, + { + "git-tree": "808629922b6dd43eb5cc880f24ffe88f50317d60", + "version-string": "4.6.4", + "port-version": 2 + }, + { + "git-tree": "87d8da40ebd5d638fc6871bf294d8be472b343e6", + "version-string": "4.6.4-1", + "port-version": 0 + }, + { + "git-tree": "c220b0269a63ba6f47c109eee4071616d22c50b2", + "version-string": "4.6.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/octomap.json b/port_versions/o-/octomap.json new file mode 100644 index 00000000000000..c9f30c315c0686 --- /dev/null +++ b/port_versions/o-/octomap.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "88a9ea43b36cb364195d0c67fdf38a7b1fa447f8", + "version-string": "1.9.5", + "port-version": 0 + }, + { + "git-tree": "8259971f146589d7ebb06c949ff74b45927d925a", + "version-string": "2017-03-11-8", + "port-version": 0 + }, + { + "git-tree": "206cd54e97e36be5c61c0542f4ca4f76398d3108", + "version-string": "2017-03-11-7", + "port-version": 0 + }, + { + "git-tree": "cafa997b5d9608d0a4617ce1facdee729a998ec1", + "version-string": "cefed0c1d79afafa5aeb05273cf1246b093b771c-6", + "port-version": 0 + }, + { + "git-tree": "30810136ce77a67685993f0f139002ed2eddf7b5", + "version-string": "cefed0c1d79afafa5aeb05273cf1246b093b771c-5", + "port-version": 0 + }, + { + "git-tree": "088c8028a2140dcff38f6cc7cbf2c428e0aa3e3f", + "version-string": "cefed0c1d79afafa5aeb05273cf1246b093b771c-4", + "port-version": 0 + }, + { + "git-tree": "1915d8c5572fd3f68d6d780faf5014185a43b9e9", + "version-string": "cefed0c1d79afafa5aeb05273cf1246b093b771c-3", + "port-version": 0 + }, + { + "git-tree": "864542e8a042a529d7b4df46dd77c63aaabcec57", + "version-string": "cefed0c1d79afafa5aeb05273cf1246b093b771c-2", + "port-version": 0 + }, + { + "git-tree": "10720a6a229a80379ef969a3875cc913f807a5bd", + "version-string": "cefed0c1d79afafa5aeb05273cf1246b093b771c-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/ode.json b/port_versions/o-/ode.json new file mode 100644 index 00000000000000..168e83e573cac5 --- /dev/null +++ b/port_versions/o-/ode.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b8276cb76d86e838d84606657d6f37d5cde4a814", + "version-string": "0.16.1", + "port-version": 0 + }, + { + "git-tree": "622b0c4b552b3d5a3fc6a923ca98a37cc63ef11c", + "version-string": "0.16", + "port-version": 0 + }, + { + "git-tree": "5e7e422b0fe6d25030996079c87674d79c9bfb48", + "version-string": "0.15.1-3", + "port-version": 0 + }, + { + "git-tree": "4b628152d3e7a0fffc8f1423dae943dfec093c80", + "version-string": "0.15.1-2", + "port-version": 0 + }, + { + "git-tree": "be21a2b289a50a1f25817444841b59c7a70df4e8", + "version-string": "0.15.1-1", + "port-version": 0 + }, + { + "git-tree": "72650f9d4fd9298f4e4c1025300fd176be2fcbb6", + "version-string": "0.15.1 ", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/offscale-libetcd-cpp.json b/port_versions/o-/offscale-libetcd-cpp.json new file mode 100644 index 00000000000000..cb47e97ccb6dbd --- /dev/null +++ b/port_versions/o-/offscale-libetcd-cpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4e25b14275c81e16195194a2dfd5058dd3522008", + "version-string": "2019-07-10-1", + "port-version": 0 + }, + { + "git-tree": "f6ce4c020e57d371518912ea2414baeb81527888", + "version-string": "2019-07-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/ogdf.json b/port_versions/o-/ogdf.json new file mode 100644 index 00000000000000..b9548058ba0bda --- /dev/null +++ b/port_versions/o-/ogdf.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "babb8cfc3b4ac7c02a6221a4a4640ff63c39fd6a", + "version-string": "2019-08-23", + "port-version": 1 + }, + { + "git-tree": "6f179065bf63db7033875a8bb522e6d037cdb751", + "version-string": "2019-08-23", + "port-version": 0 + }, + { + "git-tree": "b58900a9741d2363939ebb0f378e8e8e725610bc", + "version-string": "2018-03-28-2", + "port-version": 0 + }, + { + "git-tree": "4c08ba57d0c823e160bc3add9e9b96cd30825039", + "version-string": "2018-03-28-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/ogre-next.json b/port_versions/o-/ogre-next.json new file mode 100644 index 00000000000000..c8a17059ae7a48 --- /dev/null +++ b/port_versions/o-/ogre-next.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "d8a84a70373caadf837280fe2873d5d286d2c770", + "version-string": "2019-10-20-1", + "port-version": 0 + }, + { + "git-tree": "6f7835a22bfad4598f994f7016d1dcb9a3954a3f", + "version-string": "2019-10-20", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/ogre.json b/port_versions/o-/ogre.json new file mode 100644 index 00000000000000..711603b8495828 --- /dev/null +++ b/port_versions/o-/ogre.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "7bd4cd10abb70cc91306e834cb8f7831bc33c8a0", + "version-string": "1.12.9", + "port-version": 4 + }, + { + "git-tree": "f594f5caa619521664c2f11943b2ce1ee1645590", + "version-string": "1.12.9", + "port-version": 3 + }, + { + "git-tree": "4a31d2dca3d808ed64f48f9a157e7fb4a83cca98", + "version-string": "1.12.9", + "port-version": 2 + }, + { + "git-tree": "ca650c90416462819a064556574301a6d2c6aa21", + "version-string": "1.12.9", + "port-version": 1 + }, + { + "git-tree": "bd397b488f9166c200422fe3cafa3ba9daf56d4c", + "version-string": "1.12.9", + "port-version": 0 + }, + { + "git-tree": "466e96fd2e17dd2453aa31dc0bc61bdcf53e7f61", + "version-string": "1.12.7", + "port-version": 0 + }, + { + "git-tree": "0de81b4f7e0ec24966e929c2ea64e16c15e71d5e", + "version-string": "1.12.1-1", + "port-version": 0 + }, + { + "git-tree": "2f9e915cdf245817fcd9e4508fc934194818bd5f", + "version-string": "1.12.1", + "port-version": 0 + }, + { + "git-tree": "e0e4b65934450879409ea9bbbbcc4ffce49e7b57", + "version-string": "1.12.0-2", + "port-version": 0 + }, + { + "git-tree": "c6903b85111c6b46a413b55e5928a693ab212dea", + "version-string": "1.12.0-1", + "port-version": 0 + }, + { + "git-tree": "825fd8648aeb4b492767d3b6d8b25eb5c4c69d56", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "20978be943f58b70bf75eb4c7565b56065c21c07", + "version-string": "1.11.3-4", + "port-version": 0 + }, + { + "git-tree": "708233bb8a1376058f8422a71d7d0b2b8d17128c", + "version-string": "1.11.3-3", + "port-version": 0 + }, + { + "git-tree": "031a010ea0f59a2f2a4b42523725f463dec346c6", + "version-string": "1.11.3-2", + "port-version": 0 + }, + { + "git-tree": "8f41d76bd65979229a9a59229ad51c0bdd788b14", + "version-string": "1.11.3-1", + "port-version": 0 + }, + { + "git-tree": "09426d53d0c3798c05cb5028347722a2708c9e09", + "version-string": "1.11.3", + "port-version": 0 + }, + { + "git-tree": "8246cbccfc61899b4e7f95820d1a4fde4e9b5e24", + "version-string": "1.10.11", + "port-version": 0 + }, + { + "git-tree": "b33f2526b13f601b31175ba4a5bace8a3ef6e918", + "version-string": "1.10.9-2", + "port-version": 0 + }, + { + "git-tree": "b117c6b397c5e19001e715224e777a5fe5315a95", + "version-string": "1.10.9-1", + "port-version": 0 + }, + { + "git-tree": "f1852c7d76bfaefe41e4cdbd771ae96a7bc7d333", + "version-string": "1.10.9", + "port-version": 0 + }, + { + "git-tree": "d2d96e305a4c73550f9a2861a64d8421b4a930c5", + "version-string": "1.10.8", + "port-version": 0 + }, + { + "git-tree": "9716e84432ab68e13d1cf2108e72f4c94d555f15", + "version-string": "1.9.0-1", + "port-version": 0 + }, + { + "git-tree": "8e4d0e0230b411bb879c1eaa2e5295e85674fa48", + "version-string": "1.9.0 -1", + "port-version": 0 + }, + { + "git-tree": "d5e1f52186366cac7552ff9f3c6e59456e907afd", + "version-string": "1.9.0 ", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/ois.json b/port_versions/o-/ois.json new file mode 100644 index 00000000000000..620afbf81ea1e3 --- /dev/null +++ b/port_versions/o-/ois.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "def78425a0a4688d94604ff68965f64a024d1aeb", + "version-string": "1.5", + "port-version": 2 + }, + { + "git-tree": "5e43030ca42604ace55e20f855ccef73a1b45c2d", + "version-string": "1.5-1", + "port-version": 0 + }, + { + "git-tree": "803fd55fc8652405994a92c6a5b5b8237f3466a4", + "version-string": "1.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/ompl.json b/port_versions/o-/ompl.json new file mode 100644 index 00000000000000..485887ffe29d53 --- /dev/null +++ b/port_versions/o-/ompl.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "2dc123683ef75002bd7252b252cc220a7a643066", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "fae4c4200fd28f346f582aa14b46dcbcf37be57a", + "version-string": "1.5.0", + "port-version": 1 + }, + { + "git-tree": "0b0ea555b98260ea8575e34564395d0e0e3898df", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "4ef9bb0f965a35c85a0f320377ffb502c01da270", + "version-string": "1.4.2", + "port-version": 5 + }, + { + "git-tree": "076b7508477ba02b300f760c4a32691aadb05010", + "version-string": "1.4.2-4", + "port-version": 0 + }, + { + "git-tree": "1b4cc9f865b1ab9086da77c02087a26c0f50d376", + "version-string": "1.4.2-3", + "port-version": 0 + }, + { + "git-tree": "82b1e756fc863d8a8df7188b398d5d37a058c74b", + "version-string": "1.4.2-2", + "port-version": 0 + }, + { + "git-tree": "adbd669504548944ef6aaf9c0f6b9924b807464f", + "version-string": "1.4.2-1", + "port-version": 0 + }, + { + "git-tree": "eacac1ac50e50deb4b0080ef23bfb2aa7aa0ca98", + "version-string": "1.4.2-0", + "port-version": 0 + }, + { + "git-tree": "6ba1342ee4a29dde8715c2cbf86371f9eed2aae2", + "version-string": "1.4.1-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/onednn.json b/port_versions/o-/onednn.json new file mode 100644 index 00000000000000..f403b00d023b08 --- /dev/null +++ b/port_versions/o-/onednn.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c48b3b7e1da48208cce9dbd5ee231d8c087b29ac", + "version-string": "2.0", + "port-version": 1 + }, + { + "git-tree": "91e30ed4a558274451d217d52ff240a7a355b3a4", + "version-string": "2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/oniguruma.json b/port_versions/o-/oniguruma.json new file mode 100644 index 00000000000000..c0aa1cee9eb049 --- /dev/null +++ b/port_versions/o-/oniguruma.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "b634145f43e8207123e82305f0b2d2be0b8ac65f", + "version-string": "6.9.4", + "port-version": 0 + }, + { + "git-tree": "ae3515135a589053b93cfb122111bdb67cb7113a", + "version-string": "6.9.3", + "port-version": 0 + }, + { + "git-tree": "e09bba919a77b565f8559d501ee9bdbd257c2f4e", + "version-string": "6.9.2-3", + "port-version": 0 + }, + { + "git-tree": "1bb0fe2c93a8c60501aa1b30237a134bbb150494", + "version-string": "6.9.2-2", + "port-version": 0 + }, + { + "git-tree": "135c092c731e8cdd646cc7f50f963a57363c9865", + "version-string": "6.9.2-1", + "port-version": 0 + }, + { + "git-tree": "e27e05d1a0927b141f48ecee8a052151783681a7", + "version-string": "6.9.2", + "port-version": 0 + }, + { + "git-tree": "beee71c287409ecc9ff6018bd6edfc79452912cc", + "version-string": "2019-02-26", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/onnxruntime-gpu.json b/port_versions/o-/onnxruntime-gpu.json new file mode 100644 index 00000000000000..2b98c4448a0480 --- /dev/null +++ b/port_versions/o-/onnxruntime-gpu.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "36273dd148753f754c51a4835aeb29bf5aa1556e", + "version-string": "1.5.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/open62541.json b/port_versions/o-/open62541.json new file mode 100644 index 00000000000000..a8ada2e9573c0b --- /dev/null +++ b/port_versions/o-/open62541.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "3963c6ad1810891560f00a71c17f14ce53fe290e", + "version-string": "1.1.2", + "port-version": 0 + }, + { + "git-tree": "f858b0911bd2b81cddd47fa83b576b2555787ca6", + "version-string": "1.1", + "port-version": 0 + }, + { + "git-tree": "2eb2995138bed00730168b28ec94e90fe8c979bf", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "0383b80a34d3cbd2459e664be24283022eb738d5", + "version-string": "1.0", + "port-version": 0 + }, + { + "git-tree": "820b1e13b8449be8a34e1cf1234a7c144a58cae0", + "version-string": "0.3.0-4", + "port-version": 0 + }, + { + "git-tree": "5e7aa75d0e574f89f53b44433cacfc85e55e3d01", + "version-string": "0.3.0-3", + "port-version": 0 + }, + { + "git-tree": "38df95e5d48a06f31bcc088b97f2ca603d322989", + "version-string": "0.3.0-2", + "port-version": 0 + }, + { + "git-tree": "8bdf62471370d480516ac23e8d8175d6e447f571", + "version-string": "0.3.0-1", + "port-version": 0 + }, + { + "git-tree": "bdc48fbe9472027bba1680d8a5ef7cbab2db3e3b", + "version-string": "0.3.0", + "port-version": 0 + }, + { + "git-tree": "824c4cae0119d5355c3db071694b3c9ad1b0549f", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openal-soft.json b/port_versions/o-/openal-soft.json new file mode 100644 index 00000000000000..0d1df6ff1061cc --- /dev/null +++ b/port_versions/o-/openal-soft.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "ede5d5168eb854c8f50f617bdeb1c263be8937d2", + "version-string": "1.20.1", + "port-version": 5 + }, + { + "git-tree": "cd2af2f2222d1d418a30a8c8231b8e50625d4bdc", + "version-string": "1.20.1", + "port-version": 4 + }, + { + "git-tree": "04f5b87dceba12893cf9ab8a626b2a36e369510d", + "version-string": "1.20.1-2", + "port-version": 0 + }, + { + "git-tree": "f4c5448085005048843afd96d7109c13ba76136a", + "version-string": "1.20.1-1", + "port-version": 0 + }, + { + "git-tree": "169d996a067b2904d277a1264843930647d03405", + "version-string": "1.20.1", + "port-version": 0 + }, + { + "git-tree": "bad184e75c5a430716a50c6cc1c1fca10f7d1551", + "version-string": "1.20.0", + "port-version": 0 + }, + { + "git-tree": "90b3884f9a61578f049432737e0ed08d2f437bf5", + "version-string": "1.19.1-2", + "port-version": 0 + }, + { + "git-tree": "71557390481680cfc43efec2da2b3b60a1944437", + "version-string": "1.19.1-1", + "port-version": 0 + }, + { + "git-tree": "6878c7206b38adefd3adcfb5386869a34fb0de21", + "version-string": "1.19.1", + "port-version": 0 + }, + { + "git-tree": "67a646da6f1cba3ffdbdfd3b0357b4ac445042d0", + "version-string": "1.19.0", + "port-version": 0 + }, + { + "git-tree": "e099096dbbcc751226a678276edecaebcc090cbc", + "version-string": "1.18.2-2", + "port-version": 0 + }, + { + "git-tree": "870dbf8dae43eb8182a8865dd735caf59071707b", + "version-string": "1.18.2-1", + "port-version": 0 + }, + { + "git-tree": "02f2e57d4640f9ce12673e2269a30245fcff6e36", + "version-string": "1.18.1-1", + "port-version": 0 + }, + { + "git-tree": "26edf59535c43b2ff7cae4a2fba3ceff21363810", + "version-string": "1.18.1", + "port-version": 0 + }, + { + "git-tree": "cc3b6f3150c356d1e779dfb94dbdaf7bd8baca7e", + "version-string": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "9afa808e6deed3f77b1c0ad0e1c8be673added57", + "version-string": "1.17.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openblas.json b/port_versions/o-/openblas.json new file mode 100644 index 00000000000000..d59d5d75e8e381 --- /dev/null +++ b/port_versions/o-/openblas.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "1aedad4847c778ad029f805f7b371bcbbb060f09", + "version-string": "0.3.10", + "port-version": 0 + }, + { + "git-tree": "bcbba709f49cbda1a476df3a8fa7d60e69be1ae4", + "version-string": "0.3.9", + "port-version": 3 + }, + { + "git-tree": "4b08c1c07800ed652d10be301cdd1efbd8017a9d", + "version-string": "0.3.9", + "port-version": 2 + }, + { + "git-tree": "33ff321dd88e9e02917402f3ff2f6a7c325dc8f2", + "version-string": "0.3.9-1", + "port-version": 0 + }, + { + "git-tree": "b581c505da14cbdd8459a270399d8f6ca375327a", + "version-string": "0.3.7", + "port-version": 0 + }, + { + "git-tree": "893e58eb5cf3f16d44ae7272460abd543aba3eb6", + "version-string": "0.3.6-6", + "port-version": 0 + }, + { + "git-tree": "1997eb8c58ded1db584c214f736c4b27b91467ef", + "version-string": "0.3.6-5", + "port-version": 0 + }, + { + "git-tree": "b31fc385bf413eb1787a3550da4f0e037d93e768", + "version-string": "0.3.6-4", + "port-version": 0 + }, + { + "git-tree": "460d39b2636cabcb59bccb040e6169834536e80b", + "version-string": "0.3.6-2", + "port-version": 0 + }, + { + "git-tree": "e1f4d0c9f1b204c9b5c6b3c2ca8e3e10b8ace4f0", + "version-string": "0.3.6-1", + "port-version": 0 + }, + { + "git-tree": "f859a790c13a0df277b671de385a7dcbe950ba36", + "version-string": "0.3.6", + "port-version": 0 + }, + { + "git-tree": "c8a1d69932ff2870f1507d8a05375ef5215a0389", + "version-string": "0.3.5-4", + "port-version": 0 + }, + { + "git-tree": "fe4e0ea7e20a9549bcebb381f3994d0b964c9677", + "version-string": "0.3.5-3", + "port-version": 0 + }, + { + "git-tree": "7b9e69c862fa3faf117c15eabb9f992d809e3925", + "version-string": "0.3.5-2", + "port-version": 0 + }, + { + "git-tree": "e100eb2104c2f86d3e03fb9f64169bc662a8a987", + "version-string": "0.3.5-1", + "port-version": 0 + }, + { + "git-tree": "55a1bb7baa872ca0997d8a2e28b3b6555feba585", + "version-string": "0.3.5", + "port-version": 0 + }, + { + "git-tree": "d237a73b4df5d4fedb206f483b57baff9930702c", + "version-string": "0.2.20-2", + "port-version": 0 + }, + { + "git-tree": "32fb8372215ca471b787034e43e6f567bcc98e9d", + "version-string": "v0.2.20-2", + "port-version": 0 + }, + { + "git-tree": "e726d54319cbf2edef235c749ecb7faf95a1be28", + "version-string": "v0.2.20-1", + "port-version": 0 + }, + { + "git-tree": "30cb99fea4630b17721b78104d336566bb7071ef", + "version-string": "v0.2.20", + "port-version": 0 + }, + { + "git-tree": "baa8a19758f21b3c343d6ccc572677f0425320a8", + "version-string": "v0.2.19-2", + "port-version": 0 + }, + { + "git-tree": "fd9280d29695c3331686da27e31f10b7a444806d", + "version-string": "v0.2.19-1", + "port-version": 0 + }, + { + "git-tree": "21ca4d86087516df3a7796ed8ed746b5bde911c4", + "version-string": "v0.2.19", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opencascade.json b/port_versions/o-/opencascade.json new file mode 100644 index 00000000000000..8abba0291a75ed --- /dev/null +++ b/port_versions/o-/opencascade.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "dc198546c1a39fc3a26f7fae34f1ca97afa94f32", + "version-string": "7.4.0", + "port-version": 3 + }, + { + "git-tree": "646db5b2c13e7a7a45048373edc27efcfd348dd9", + "version-string": "7.4.0", + "port-version": 2 + }, + { + "git-tree": "9735f1411a8eb5954d588eb13162b3b07f35726e", + "version-string": "7.4.0", + "port-version": 1 + }, + { + "git-tree": "4ffd2ac8cc350cd08652297a4959d172c1d45d6a", + "version-string": "7.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opencc.json b/port_versions/o-/opencc.json new file mode 100644 index 00000000000000..38252a8b359e4b --- /dev/null +++ b/port_versions/o-/opencc.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "cd8da026ffad42709da43cbbc8105ed1cdd01c70", + "version-string": "2020-04-26", + "port-version": 7 + }, + { + "git-tree": "7257ac86f4aa09110b2715e6084307721410d194", + "version-string": "2020-04-26-6", + "port-version": 0 + }, + { + "git-tree": "692fcf28cdfa738d78737f7a7662e45f2c351986", + "version-string": "2020-04-26-4", + "port-version": 0 + }, + { + "git-tree": "1afb1e53661aafaf3c29cc4e9e737fc1f21b3678", + "version-string": "2020-04-26-3", + "port-version": 0 + }, + { + "git-tree": "2429812f85e03684ce1d9bfc6c0c52507883018f", + "version-string": "2020-04-26-2", + "port-version": 0 + }, + { + "git-tree": "71b9bac92955af0614db11b45379500b17ece077", + "version-string": "2020-04-26-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opencensus-cpp.json b/port_versions/o-/opencensus-cpp.json new file mode 100644 index 00000000000000..9fd0d45f608043 --- /dev/null +++ b/port_versions/o-/opencensus-cpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "761b1a467f5402007072e8f3282ec2e8801615d3", + "version-string": "0.4.0-1", + "port-version": 0 + }, + { + "git-tree": "bbdcc3676e810d04ceb42480ed9767dd375c467f", + "version-string": "0.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opencl.json b/port_versions/o-/opencl.json new file mode 100644 index 00000000000000..960118c3853a6d --- /dev/null +++ b/port_versions/o-/opencl.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "c886ba756e6871aa46eeca3d34cb9ca852fcb3e9", + "version-string": "2.2", + "port-version": 6 + }, + { + "git-tree": "0e60dc7d1ed49b1093ac144edc526a66b8f2e9f1", + "version-string": "2.2", + "port-version": 5 + }, + { + "git-tree": "b2b7c1026dd49d8540310e1e9a4c02f9c01319c2", + "version-string": "2.2", + "port-version": 4 + }, + { + "git-tree": "9860a576380ef6c492b0975715eed6e4eb619c37", + "version-string": "2.2", + "port-version": 3 + }, + { + "git-tree": "d27cc2902406fcce6098369f2ec132601f5050c7", + "version-string": "2.2-2-1", + "port-version": 0 + }, + { + "git-tree": "ada5d8051a1040716f60e762aa6bd53184d1d3b7", + "version-string": "2.2-2", + "port-version": 0 + }, + { + "git-tree": "29e052403252b1ac00345ecf3b935bca1cabd2a3", + "version-string": "2.2 (2018.08.31)", + "port-version": 0 + }, + { + "git-tree": "d53f122d6440dd37f1816452f725cfa2b27ab13a", + "version-string": "2.2 (2017.07.18)-1", + "port-version": 0 + }, + { + "git-tree": "6bdf7f756cb460776fb5277d139df4250e827373", + "version-string": "2.2 (2017.07.18)", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opencolorio-tools.json b/port_versions/o-/opencolorio-tools.json new file mode 100644 index 00000000000000..afa26a56f1f6dd --- /dev/null +++ b/port_versions/o-/opencolorio-tools.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "470dd29b1dcb2d67147fca8fae816c04151d43c9", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opencolorio.json b/port_versions/o-/opencolorio.json new file mode 100644 index 00000000000000..367a8489cf560b --- /dev/null +++ b/port_versions/o-/opencolorio.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "6f60ef16979a651554f0b59663f4180229b5c662", + "version-string": "1.1.1", + "port-version": 4 + }, + { + "git-tree": "8f51706b7a6fa82423a4c75a39be7fbb685235b5", + "version-string": "1.1.1", + "port-version": 3 + }, + { + "git-tree": "9543d1ce296e9992f57d7c5965cdb0b8f5aa13db", + "version-string": "1.1.1-2", + "port-version": 0 + }, + { + "git-tree": "437cdc74c658d98b5e9a3ac07f1466bee2ab5f65", + "version-string": "1.1.1-1", + "port-version": 0 + }, + { + "git-tree": "1640b0f385af824cc2c7cd82a4bacc874a545197", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opencsg.json b/port_versions/o-/opencsg.json new file mode 100644 index 00000000000000..56f88742174ba3 --- /dev/null +++ b/port_versions/o-/opencsg.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "cb2b61c16440cc89a39a8b4a6957a3489561cd37", + "version-string": "1.4.2-1", + "port-version": 0 + }, + { + "git-tree": "7464e63611b64970f8dc690a1636b63c85d803d9", + "version-string": "1.4.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opencv.json b/port_versions/o-/opencv.json new file mode 100644 index 00000000000000..b8834b15c9441d --- /dev/null +++ b/port_versions/o-/opencv.json @@ -0,0 +1,194 @@ +{ + "versions": [ + { + "git-tree": "ad5aa4dfbaa294ebc717c4a057ee7a5ce1dc297c", + "version-string": "4.3.0", + "port-version": 0 + }, + { + "git-tree": "8fe0aa098a9de7c6c4105d7b38bfbb2731c52cb3", + "version-string": "4.1.1-1", + "port-version": 0 + }, + { + "git-tree": "597a629e0b192db88c0b4881f736472818147cc4", + "version-string": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "9e00c878d4b3bd5bc2a91517120cf8e3a085ec98", + "version-string": "1", + "port-version": 0 + }, + { + "git-tree": "9f0b6666b344920bdcb1e0dfe7b45fc323a3b78b", + "version-string": "3.4.3-9", + "port-version": 0 + }, + { + "git-tree": "e7ee48bf98be9baa7e897b162e5a277a7b484886", + "version-string": "3.4.3-8", + "port-version": 0 + }, + { + "git-tree": "7f947c7c319c1fc0e51baa9f183b5e38aee66fb7", + "version-string": "3.4.3-7", + "port-version": 0 + }, + { + "git-tree": "d72717c0d0a5f10fff072ae3d506b47d8b91fbd5", + "version-string": "3.4.3-6", + "port-version": 0 + }, + { + "git-tree": "57b727a39f197dc5241a27454dd80fd28f1097d7", + "version-string": "3.4.3-5", + "port-version": 0 + }, + { + "git-tree": "51dfa45e0510693818c57a317c03330e6daab965", + "version-string": "3.4.3-4", + "port-version": 0 + }, + { + "git-tree": "3ebeeda6302e7b62366e0b012c784b5fd87b96bf", + "version-string": "3.4.3-3", + "port-version": 0 + }, + { + "git-tree": "ec1bb4516a69bc780256b521740808e70603339b", + "version-string": "3.4.3-2", + "port-version": 0 + }, + { + "git-tree": "6ed937b2d8d0160f22683416b994eafd0aad3d3d", + "version-string": "3.4.3-1", + "port-version": 0 + }, + { + "git-tree": "62060816447b70d6a4625374e9b24a43c07c5929", + "version-string": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "5fca2f965e8f3485718360b794d62d6ca9865762", + "version-string": "3.4.0-3", + "port-version": 0 + }, + { + "git-tree": "00efab2544a2980f754b533bb0046356d47c912a", + "version-string": "3.4.0-2", + "port-version": 0 + }, + { + "git-tree": "d54e948650790ebfc00b6de46660fcf67a028f0a", + "version-string": "3.4.0-1", + "port-version": 0 + }, + { + "git-tree": "aced93453c6f4a6e02a188d14b3a10abd64b8c0c", + "version-string": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "2da56b83268392d917bfe80bf4f92dbe4cc7ca4d", + "version-string": "3.3.1-9", + "port-version": 0 + }, + { + "git-tree": "b7378b5a511f79674d65a35d5690c53eaa9927b0", + "version-string": "3.3.1-7", + "port-version": 0 + }, + { + "git-tree": "abda556c8dece8468becafa9808db220cf9c1a7e", + "version-string": "3.3.1-6", + "port-version": 0 + }, + { + "git-tree": "4212ca0f65b852e12c91ed479570c3d7ff50a77e", + "version-string": "3.3.1-5", + "port-version": 0 + }, + { + "git-tree": "f45ed7ed71d4c5d73d951eb4023474b434b45c25", + "version-string": "3.3.1-4", + "port-version": 0 + }, + { + "git-tree": "8c862937c33055e80a6e636556957ebaa6c97d37", + "version-string": "3.3.1-3", + "port-version": 0 + }, + { + "git-tree": "9045cd52a4b6132936af20705a044afbcb2e492e", + "version-string": "3.3.1-2", + "port-version": 0 + }, + { + "git-tree": "72f403ecf0186d4c889edd7f99ef7be24f2d7fbc", + "version-string": "3.3.1-1", + "port-version": 0 + }, + { + "git-tree": "9244c1e87f7f5d99dc8a754a352a1e0a04e5108f", + "version-string": "3.3.1", + "port-version": 0 + }, + { + "git-tree": "01d7395a67c5096f4b1275ec808aacc9a8a9d049", + "version-string": "3.3.0-4", + "port-version": 0 + }, + { + "git-tree": "9a39fdafab167d2451b80d360b80cd94ce499d69", + "version-string": "3.3.0-3", + "port-version": 0 + }, + { + "git-tree": "402467d3bfeb4c7d878222607e614f4da7f53615", + "version-string": "3.3.0-2", + "port-version": 0 + }, + { + "git-tree": "39ae905c6dfbc15216cf28737103a5ea3d894637", + "version-string": "3.3.0-1", + "port-version": 0 + }, + { + "git-tree": "cc5315152c726d67f024bfb05401254d8b781b59", + "version-string": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "0ad712dac9bd91d0038feebae6726d99755e92ab", + "version-string": "3.2.0-3", + "port-version": 0 + }, + { + "git-tree": "2281757ea67a9e8fc6240163d5af7f7c843bb962", + "version-string": "3.2.0-2", + "port-version": 0 + }, + { + "git-tree": "d1afac448ed5e1785ec6b332e40fb78802740f51", + "version-string": "3.2.0-1", + "port-version": 0 + }, + { + "git-tree": "455dcfe81452d1196d2551e0537f1f12d80e0321", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "e5aeee6d973e1092b78e483aaa7512312f6b30a8", + "version-string": "3.1.0-1", + "port-version": 0 + }, + { + "git-tree": "c4233185bd5b3e80f9cbf99d772ef95261d485eb", + "version-string": "3.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opencv2.json b/port_versions/o-/opencv2.json new file mode 100644 index 00000000000000..0bef2ac8bb2867 --- /dev/null +++ b/port_versions/o-/opencv2.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "7a9db98ab98f632cba250ec9290924c4027a8f0d", + "version-string": "2.4.13.7", + "port-version": 4 + }, + { + "git-tree": "81d05f35376a5fa085bbf4442e66c60c45c905e5", + "version-string": "2.4.13.7", + "port-version": 3 + }, + { + "git-tree": "98661fc5cf307307ccf7240f18734e0880124f9b", + "version-string": "2.4.13.7", + "port-version": 2 + }, + { + "git-tree": "ce5120f5620f5a168ca7c7b64ecca47a170663fc", + "version-string": "2.4.13.7-2", + "port-version": 0 + }, + { + "git-tree": "534b08f98b05680c655eba5212376dba0c3350a4", + "version-string": "2.4.13.7-1", + "port-version": 0 + }, + { + "git-tree": "da51784b42ebbe9026147c0dd6a9f9cb54fd83ea", + "version-string": "2.4.13.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opencv3.json b/port_versions/o-/opencv3.json new file mode 100644 index 00000000000000..8c6e2165f6b6ef --- /dev/null +++ b/port_versions/o-/opencv3.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "d08b6595a75aefc70b70a366a07c2a3b1dd66e92", + "version-string": "3.4.10", + "port-version": 4 + }, + { + "git-tree": "3f9dcddaa40b8032f095dfef0850a999c50330cb", + "version-string": "3.4.10", + "port-version": 2 + }, + { + "git-tree": "200f3763e348b4035e5d0859b39277c3a2eb9efd", + "version-string": "3.4.10", + "port-version": 1 + }, + { + "git-tree": "83fb6240d968e2f8109e09726907ae9c6bdf3715", + "version-string": "3.4.10", + "port-version": 0 + }, + { + "git-tree": "25bb0e7ecdf6f547f6dd6f8fd50af34d4f27f9b3", + "version-string": "3.4.7-4", + "port-version": 0 + }, + { + "git-tree": "a805102e7801e68f879e1aed81e6a34dae97c46d", + "version-string": "3.4.7-3", + "port-version": 0 + }, + { + "git-tree": "df5779127fda5beca9a20a45bb4d5880259e0c18", + "version-string": "3.4.7-2", + "port-version": 0 + }, + { + "git-tree": "b9e85a73fcbb13e3554fcbe7cc735823fee89f40", + "version-string": "3.4.8", + "port-version": 0 + }, + { + "git-tree": "938cc15523e991a6dcfdfd7c1d70b2a0086253e2", + "version-string": "3.4.7-2", + "port-version": 0 + }, + { + "git-tree": "6e5abec3d0ec683d80f9a9f82b0d0da7234e8df9", + "version-string": "3.4.7-1", + "port-version": 0 + }, + { + "git-tree": "ea66b5ecd65cf2c3bd14687ebbeae105df7afd0e", + "version-string": "3.4.7", + "port-version": 0 + }, + { + "git-tree": "b2b21f6a9333d757a8fc04c094eaa2a332ce6593", + "version-string": "3.4.3-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opencv4.json b/port_versions/o-/opencv4.json new file mode 100644 index 00000000000000..ebb7383abcb734 --- /dev/null +++ b/port_versions/o-/opencv4.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "bda3727a0c91b614fe1b275e27ad4b68f214eebe", + "version-string": "4.3.0", + "port-version": 4 + }, + { + "git-tree": "d5c64c4075f88067d3ae8119ea7140e133627d1f", + "version-string": "4.3.0", + "port-version": 3 + }, + { + "git-tree": "f571b98de52b78113223d9b79d70d97d672fa413", + "version-string": "4.3.0", + "port-version": 2 + }, + { + "git-tree": "6f11f3e345684317176988ff5896cd31404accc5", + "version-string": "4.3.0", + "port-version": 1 + }, + { + "git-tree": "69c5f56a426c94a5ec251a57622941d693702b95", + "version-string": "4.3.0", + "port-version": 0 + }, + { + "git-tree": "443dfcaf9082fbd24d9100180379e47bbaef4a4c", + "version-string": "4.1.1-6", + "port-version": 0 + }, + { + "git-tree": "846f7bc054851874d30c1574abf54937144e3c62", + "version-string": "4.1.1-5", + "port-version": 0 + }, + { + "git-tree": "07c23c624ffbcc95062f236a0e6c71a0cd726d13", + "version-string": "4.1.1-4", + "port-version": 0 + }, + { + "git-tree": "fdf271026e2d18800bda3fc9be0b6507229b06c3", + "version-string": "4.1.1-3", + "port-version": 0 + }, + { + "git-tree": "340b91bcad046b3bfda4e84bf948d0773d0ad87a", + "version-string": "4.1.1-2", + "port-version": 0 + }, + { + "git-tree": "89816cf327fc1d562eab553f5e9580322080af7c", + "version-string": "4.1.1-1", + "port-version": 0 + }, + { + "git-tree": "47cbcb87c38cb217c649a4891bb7d544464401dd", + "version-string": "4.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opendnp3.json b/port_versions/o-/opendnp3.json new file mode 100644 index 00000000000000..58a6e13589bea1 --- /dev/null +++ b/port_versions/o-/opendnp3.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "3659f9f4ee54aa9d6d51ef3cd42f256c28c7c73e", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "2ea5a138218e4b0a3f9b08022d2c36bc1eb2aec3", + "version-string": "2.3.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openexr.json b/port_versions/o-/openexr.json new file mode 100644 index 00000000000000..c846a69c65b29d --- /dev/null +++ b/port_versions/o-/openexr.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "42bec4d0daed751ad449a504b7fa43d57eec9000", + "version-string": "2.5.0", + "port-version": 2 + }, + { + "git-tree": "57533ba228ee5000842fa8849f0e69ef4018a5c5", + "version-string": "2.5.0", + "port-version": 1 + }, + { + "git-tree": "60b80c63bd5237a5f86e789d0d396f27fe12a19c", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "95c08ccc067bd38f4c1ce7438fdbd864b313beef", + "version-string": "2.3.0-5", + "port-version": 0 + }, + { + "git-tree": "f7e2502e91aad7c1f2b39dba1e915ad13f58db1a", + "version-string": "2.3.0-4", + "port-version": 0 + }, + { + "git-tree": "5a6cd76dd7ee1ffb88a7a13b2d0dfd5a691196f4", + "version-string": "2.3.0-3", + "port-version": 0 + }, + { + "git-tree": "389ee1922f0565a4558c219545cdb96ab7945cfe", + "version-string": "2.3.0-2", + "port-version": 0 + }, + { + "git-tree": "c86b1ce581d107254d48142740f5474612af9100", + "version-string": "2.2.1-1", + "port-version": 0 + }, + { + "git-tree": "c3ed3d275793ddb0a82d68240034aa60ae9d3fb2", + "version-string": "2.2.0-4", + "port-version": 0 + }, + { + "git-tree": "7bc5c81f3dd6502d710116ebd295e5fe66c78892", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "2833ba9083b676eb7cea4143837012a9de803622", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opengl-registry.json b/port_versions/o-/opengl-registry.json new file mode 100644 index 00000000000000..ff5e8418122f2c --- /dev/null +++ b/port_versions/o-/opengl-registry.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "d23f8ad18109c3545ec5fd5e1475a312d9e656b5", + "version-string": "2020-03-25", + "port-version": 0 + }, + { + "git-tree": "736f97347ede622d5041bb031837c49e43aeecdf", + "version-string": "2020-02-03", + "port-version": 0 + }, + { + "git-tree": "3df554a594aee43ecf44aa602d5c210ffd1ab759", + "version-string": "2019-08-22", + "port-version": 0 + }, + { + "git-tree": "dcc538d711de6a8c1f8fe078c4867d67b8d4b0e3", + "version-string": "2018-06-30-1", + "port-version": 0 + }, + { + "git-tree": "487dd39ff4041c1bcd9a7688d3c6ffa416ef90d7", + "version-string": "2018-06-30", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opengl.json b/port_versions/o-/opengl.json new file mode 100644 index 00000000000000..fa603e1e6bab1d --- /dev/null +++ b/port_versions/o-/opengl.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "5868fea6f867eb1c81cf269f9cd239aecf62fe70", + "version-string": "0.0", + "port-version": 8 + }, + { + "git-tree": "82ccb670042f398518ca2c029888fb06dd9e7015", + "version-string": "0.0-7", + "port-version": 0 + }, + { + "git-tree": "783497fd4d395d5544d668861e928497ae8fc42f", + "version-string": "0.0-6", + "port-version": 0 + }, + { + "git-tree": "98c08fbdc985f6720d5f54992c5006e6d690e894", + "version-string": "0.0-5", + "port-version": 0 + }, + { + "git-tree": "aa55744a5ac9c703aebb7525f87b5f9b24a772db", + "version-string": "0.0-4", + "port-version": 0 + }, + { + "git-tree": "00ea51890fb7c03a0926ecd9f853e750cf299a6d", + "version-string": "0.0-3", + "port-version": 0 + }, + { + "git-tree": "b7a0d7a82d120a6975a9f899fd8f5d37ec6323a2", + "version-string": "0.0-2", + "port-version": 0 + }, + { + "git-tree": "415751ef6bbe340c7c17899e764729a11b1f97f8", + "version-string": "0.0-1", + "port-version": 0 + }, + { + "git-tree": "fb5a4675d10bd8b19ff623bffaebacc14f3f0758", + "version-string": "10.0.10240.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openigtlink.json b/port_versions/o-/openigtlink.json new file mode 100644 index 00000000000000..cb4c0f95aa37d3 --- /dev/null +++ b/port_versions/o-/openigtlink.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "df766287f1c9c4d379143fab2456a64ae7ae8452", + "version-string": "3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openimageio.json b/port_versions/o-/openimageio.json new file mode 100644 index 00000000000000..e3d438580672cd --- /dev/null +++ b/port_versions/o-/openimageio.json @@ -0,0 +1,129 @@ +{ + "versions": [ + { + "git-tree": "08ea57c10b4cf3c92b6c880b9ab9b8e9ae069088", + "version-string": "2.1.16.0", + "port-version": 4 + }, + { + "git-tree": "c4460db95e2f59658b13c4c26038b0e665039f1e", + "version-string": "2.1.16.0", + "port-version": 3 + }, + { + "git-tree": "4939ef90a627a3d4f4a600455ac593754fdc274f", + "version-string": "2.1.16.0", + "port-version": 2 + }, + { + "git-tree": "66fffd021262293272c336882ea24e7992122b0d", + "version-string": "2.1.16.0-1", + "port-version": 0 + }, + { + "git-tree": "da742ae190c2deecdef8daac5c312dab9a9ecf29", + "version-string": "2.1.16.0", + "port-version": 0 + }, + { + "git-tree": "a0834a3a784d5dcf93897e3c28af827cb966c822", + "version-string": "2.1.9.0", + "port-version": 0 + }, + { + "git-tree": "ac2fc1fb3286ab06ad17e0f24fa667e25c1d555f", + "version-string": "2019-10-10-1", + "port-version": 0 + }, + { + "git-tree": "4a2f086cef3bec3498a44bcae7482b32170e3cfa", + "version-string": "2019-08-08-4", + "port-version": 0 + }, + { + "git-tree": "a4500ee8d5d523635a07d1f173d3f90e21d98dcd", + "version-string": "2019-08-08-3", + "port-version": 0 + }, + { + "git-tree": "2efe4a70532ad411117e8d9309a75378187a231f", + "version-string": "2019-08-08-2", + "port-version": 0 + }, + { + "git-tree": "b626a36682552515ed19cbf7361d359deb40cf58", + "version-string": "2019-08-08-1", + "port-version": 0 + }, + { + "git-tree": "433ee11b48724f4feaa9b11b9ef55c1e763dfefb", + "version-string": "2019-08-08", + "port-version": 0 + }, + { + "git-tree": "7cbfbafcda5d9a9e3b91a17fbf3267888611a247", + "version-string": "2.0.8", + "port-version": 0 + }, + { + "git-tree": "6a035d1545e7924ae588b320188e30108172728b", + "version-string": "1.8.16", + "port-version": 0 + }, + { + "git-tree": "cf91955a653559620316e62c402bf60ea6f3c0af", + "version-string": "1.8.15-1", + "port-version": 0 + }, + { + "git-tree": "a0fe4580c5f514e2c59b1803b714cd24101c2a31", + "version-string": "1.8.15", + "port-version": 0 + }, + { + "git-tree": "40a2e5c8a01349da130320a3dcebe1c0a5ebd5d8", + "version-string": "Release-1.8.13", + "port-version": 0 + }, + { + "git-tree": "5b20b4e0c0ad93419649df8743e79778d367df38", + "version-string": "Release-1.8.12-1", + "port-version": 0 + }, + { + "git-tree": "9a00e0c0f4377a59f5d4d1f23511f62a04dae4b1", + "version-string": "Release-1.8.12", + "port-version": 0 + }, + { + "git-tree": "2c62bddf1625f43565a6de488587582dbc90d06e", + "version-string": "Release-1.9.2dev", + "port-version": 0 + }, + { + "git-tree": "2b40bcb273de6981c43c09b627aab0869ddd7372", + "version-string": "1.8.10", + "port-version": 0 + }, + { + "git-tree": "cadc393d5f52b8f92d75cea795d0b2e5b2447835", + "version-string": "1.8.9", + "port-version": 0 + }, + { + "git-tree": "48da89793efa5a47c40e6e4c538a03e4abc8a307", + "version-string": "1.7.15-2", + "port-version": 0 + }, + { + "git-tree": "5b603e44de191ba9e664156a5ae3f9acc6d59d2d", + "version-string": "1.7.15-1", + "port-version": 0 + }, + { + "git-tree": "579f5883492ff290e524c23c316126c7480656d2", + "version-string": "1.7.15", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openjpeg.json b/port_versions/o-/openjpeg.json new file mode 100644 index 00000000000000..85dc2469876b2c --- /dev/null +++ b/port_versions/o-/openjpeg.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "06e54db04d7adacfd612bbaf233f6f790599b9c1", + "version-string": "2.3.1", + "port-version": 2 + }, + { + "git-tree": "145fc569bd85cb283b0de019cebe3c3e78eb9304", + "version-string": "2.3.1-1", + "port-version": 0 + }, + { + "git-tree": "859fe9bd9f11495ac909a36cab220c392a02a261", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "8d005519176a2167a722220f85d74095ac615a6d", + "version-string": "2.3.0-1", + "port-version": 0 + }, + { + "git-tree": "bb51ad91cb5f880b1f77f579ccc691382a2ab909", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "7a68499a2d877aa8d73eda72e21a02e7333a61a7", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "bd8a02904405466e9634eec2ea096eb854911623", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "36644da812565b785649d05f7bb850cb218fe45e", + "version-string": "2.1.2-2", + "port-version": 0 + }, + { + "git-tree": "fe1817d7f5ce1a1c04a310d69867b162984a58e0", + "version-string": "2.1.2-1", + "port-version": 0 + }, + { + "git-tree": "d338ca62fe480cd8e9ade3eed8d3f1c5de2a151d", + "version-string": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "3146f21e2c422d420a0d1613fd84654374c26a2f", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openmama.json b/port_versions/o-/openmama.json new file mode 100644 index 00000000000000..a96b358a1f450e --- /dev/null +++ b/port_versions/o-/openmama.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "6945e436fdfc5307d58f84ff5c76f6a34e2a8031", + "version-string": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "e1f61617655c3cfa020faa8be6e29f154ba69792", + "version-string": "6.3.0", + "port-version": 1 + }, + { + "git-tree": "0e5068485f734c3278bd8db190c04429a8bd3354", + "version-string": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "ac2a249fccf29737a0448691f383548b8a1d136c", + "version-string": "6.2.3-1", + "port-version": 0 + }, + { + "git-tree": "9baa6992043f5396b4a03cc3c374c759d5f7fe45", + "version-string": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "de4a1266d91ff612ce90a676c2937a6b8b55f604", + "version-string": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "e9dac930a74cf102bfd275bb21a69a21b9748221", + "version-string": "6.2.1-a5a93a24d2f89a0def0145552c8cd4a53c69e2de", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openmesh.json b/port_versions/o-/openmesh.json new file mode 100644 index 00000000000000..1933e9b0403044 --- /dev/null +++ b/port_versions/o-/openmesh.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "efdc08a5f186ff804bdcca5df533835bbe27965e", + "version-string": "8.1", + "port-version": 0 + }, + { + "git-tree": "8f39b4d37ab3534d21ab651e7aa7a706c66c8a74", + "version-string": "8.0-1", + "port-version": 0 + }, + { + "git-tree": "0e9ba778560654e7b44f1039f4787d3b15be073e", + "version-string": "8.0", + "port-version": 0 + }, + { + "git-tree": "795ad45391ba09eee8931c7ce39ed0c17fdd6aad", + "version-string": "7.0", + "port-version": 0 + }, + { + "git-tree": "4afa90fd8a11c378f7b11ee6fa865639aeee9efa", + "version-string": "6.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openmpi.json b/port_versions/o-/openmpi.json new file mode 100644 index 00000000000000..67454db37b00a2 --- /dev/null +++ b/port_versions/o-/openmpi.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "54178d2df9f03298fa293753786c0ddbb1fbf2c4", + "version-string": "4.0.3", + "port-version": 3 + }, + { + "git-tree": "249a4fc77010f09a504f596c0e811bc3850de534", + "version-string": "4.0.3", + "port-version": 2 + }, + { + "git-tree": "06b1d72b704fb774c6a0b9a3143f8b82b426e3f0", + "version-string": "4.0.3", + "port-version": 0 + }, + { + "git-tree": "02332e549c9366cd4f861e3d7493bdc2903a47f1", + "version-string": "4.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openmvg.json b/port_versions/o-/openmvg.json new file mode 100644 index 00000000000000..57b9407507d8ea --- /dev/null +++ b/port_versions/o-/openmvg.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "0bc383c92d6341f46ad2250f956d0731e617d9ee", + "version-string": "1.6", + "port-version": 0 + }, + { + "git-tree": "7a202c5223ad9b49c13d1da480f4113984c78441", + "version-string": "1.5", + "port-version": 1 + }, + { + "git-tree": "e8c43d501012c1f021eed7d6e45d1aa1804046a2", + "version-string": "1.5", + "port-version": 0 + }, + { + "git-tree": "b86751c6104d3528d1b8522f3f19ab09cc875092", + "version-string": "1.4-7", + "port-version": 0 + }, + { + "git-tree": "cc17d1e033de4bbed66fe4ac093c4b190e54bb9c", + "version-string": "1.4-6", + "port-version": 0 + }, + { + "git-tree": "af39708fef0b8a19c8baf137c3b51bba4bf15c53", + "version-string": "1.4-5", + "port-version": 0 + }, + { + "git-tree": "9c97705409486136d8cf5c94309c31319ed5a97c", + "version-string": "1.4-4", + "port-version": 0 + }, + { + "git-tree": "115cc901a42e2880b356f90e4156396a791eec7e", + "version-string": "1.4-2", + "port-version": 0 + }, + { + "git-tree": "e0df1dd3785f6b246146e3e765f6e1bd3dbb7d70", + "version-string": "1.4-1", + "port-version": 0 + }, + { + "git-tree": "56c947ecbbdd9a00b3d0ea05ebb489e28dc8066d", + "version-string": "1.4-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openmvs.json b/port_versions/o-/openmvs.json new file mode 100644 index 00000000000000..2e43a35ec9d410 --- /dev/null +++ b/port_versions/o-/openmvs.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "a14a8fbedb0cb071c7f6b3d97d3c12d6c27f678e", + "version-string": "1.1", + "port-version": 4 + }, + { + "git-tree": "a3980b27c42afe4b46828474dbcb9f437a146277", + "version-string": "1.1", + "port-version": 3 + }, + { + "git-tree": "bdda2ff3955cbfb88b1c6e01c4a0e93bfc83ee99", + "version-string": "1.1", + "port-version": 2 + }, + { + "git-tree": "ed4b73a8b7ab475adbd6e9e5687a3a1b19e5ac11", + "version-string": "1.1-1", + "port-version": 0 + }, + { + "git-tree": "b8d1e61c4d3181ce856bd523cf945db5c8745e9e", + "version-string": "1.1", + "port-version": 0 + }, + { + "git-tree": "ab9674618d5be3bdee82a346d61405c197e54ea9", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "0b98e0933ecd22a0c68fdaef399787d309128b43", + "version-string": "1.0-3", + "port-version": 0 + }, + { + "git-tree": "4594f8d9f4b736d1da6f077ace0266cef786c4d0", + "version-string": "1.0-2", + "port-version": 0 + }, + { + "git-tree": "cce3cd32d0a5e1e3a593c3a81cf1fbc48338c2bc", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "49e67439d3c81dc1470f43dd03e03d2594e05f75", + "version-string": "1.0", + "port-version": 0 + }, + { + "git-tree": "241fc2e2e0d9bc0fcdef733430b237498f0ffa82", + "version-string": "0.9", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openni2.json b/port_versions/o-/openni2.json new file mode 100644 index 00000000000000..7f09cef1dee17e --- /dev/null +++ b/port_versions/o-/openni2.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "b3f6a5b9e0580c4ca1437ca2251e8d370260b6c8", + "version-string": "2.2.0.33-11", + "port-version": 0 + }, + { + "git-tree": "5a25ca5c53fa7a6f4b08fb2a593e1c8046641358", + "version-string": "2.2.0.33-10", + "port-version": 0 + }, + { + "git-tree": "bf9b3f7c83802b7d9353790a23de38200563b8ba", + "version-string": "2.2.0.33-9", + "port-version": 0 + }, + { + "git-tree": "3586a89fe1302734a60ac9d1426fe007eddcc084", + "version-string": "2.2.0.33-8", + "port-version": 0 + }, + { + "git-tree": "894a4581c583b470093bf0b436713f32270ae1ff", + "version-string": "2.2.0.33-7", + "port-version": 0 + }, + { + "git-tree": "c7f88c942735e026e4ae810efbd8606781d0f2bd", + "version-string": "2.2.0.33-4", + "port-version": 0 + }, + { + "git-tree": "a1a4539ecae1510ff8a7420786ed4a6a40973514", + "version-string": "2.2.0.33-3", + "port-version": 0 + }, + { + "git-tree": "023eccddd1b264f8eaf9107b80c24a6b42c28fac", + "version-string": "2.2.0.33-2", + "port-version": 0 + }, + { + "git-tree": "bf9a23a05a07c5f9a87fc0dd7f0014b2e340aabd", + "version-string": "2.2.0.33-1", + "port-version": 0 + }, + { + "git-tree": "92052782870efe4c166ce648b751e010e60a7dea", + "version-string": "2.2.0.33", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openscap.json b/port_versions/o-/openscap.json new file mode 100644 index 00000000000000..7949d83efb0c9f --- /dev/null +++ b/port_versions/o-/openscap.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9c249b02fd6825acc7534912b280f31b941260bd", + "version-string": "1.3.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openssl-unix.json b/port_versions/o-/openssl-unix.json new file mode 100644 index 00000000000000..97920e709e69e3 --- /dev/null +++ b/port_versions/o-/openssl-unix.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "dda72388849087e4edb2be900f5448376a6f5215", + "version-string": "1.1.1h", + "port-version": 1 + }, + { + "git-tree": "a5b077133a17a5f5462f7207d4877ca6bf841958", + "version-string": "1.1.1h", + "port-version": 0 + }, + { + "git-tree": "1cc8e80ce46c8cede6d950dce347212c6312189c", + "version-string": "1.1.1g", + "port-version": 4 + }, + { + "git-tree": "e748f5c8aed72f12c497a9221da925a7d6a7cd57", + "version-string": "1.1.1g", + "port-version": 3 + }, + { + "git-tree": "6d04f385c7123a4b2984f7787a28a5b72295b811", + "version-string": "1.1.1g", + "port-version": 2 + }, + { + "git-tree": "c54172f82c408954edffbd786e96b0b36ff9ccad", + "version-string": "1.1.1g", + "port-version": 1 + }, + { + "git-tree": "79e66433bc9077347892e042225a9205d64d283e", + "version-string": "1.1.1g", + "port-version": 0 + }, + { + "git-tree": "cd64682e77b61d0ce90a3e7d56f8df8f787b9548", + "version-string": "1.1.1d-4", + "port-version": 0 + }, + { + "git-tree": "1487efaaf621741639191e356e947a4118739035", + "version-string": "1.1.1d-3", + "port-version": 0 + }, + { + "git-tree": "b287227ab19c508b3257da5e6b7072278121b335", + "version-string": "1.1.1d-2", + "port-version": 0 + }, + { + "git-tree": "9d3d306d309bc95abfb88bbfa5fd46e473f016d2", + "version-string": "1.1.1d-1", + "port-version": 0 + }, + { + "git-tree": "d76be8657a6e5128eb8769d468524aea99635832", + "version-string": "1.0.2s-1", + "port-version": 0 + }, + { + "git-tree": "34b9a3c2530b7a4e7cbdae74181098427c076a26", + "version-string": "1.0.2s", + "port-version": 0 + }, + { + "git-tree": "68f20b0128ed20998e8f641abca309eb27ab881c", + "version-string": "1.0.2q", + "port-version": 0 + }, + { + "git-tree": "532c0cc2adbcf0800c9dad5df9c900a28672cdf6", + "version-string": "1.0.2s", + "port-version": 0 + }, + { + "git-tree": "d4a71f9592772e1e82ea73a04a1b06790297fade", + "version-string": "1.0.2q-1", + "port-version": 0 + }, + { + "git-tree": "add5af6cc06c5bb82af3f88f7665e34622cf65a5", + "version-string": "1.0.2q", + "port-version": 0 + }, + { + "git-tree": "7ae3ef68f38c470d094bde9c5f934e99dd764ee4", + "version-string": "1.0.2p-1", + "port-version": 0 + }, + { + "git-tree": "3ac5f3a46d740a87e1fa9b3245b4e6ed14a9b096", + "version-string": "1.0.2p", + "port-version": 0 + }, + { + "git-tree": "8a6c268d6cf86abad746a527d1c982d77e6957a2", + "version-string": "1.0.2o-1", + "port-version": 0 + }, + { + "git-tree": "78634dddc1ad87f08f58fcf5b0b83ba575e924eb", + "version-string": "1.0.2o", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openssl-uwp.json b/port_versions/o-/openssl-uwp.json new file mode 100644 index 00000000000000..f6dffeb926149f --- /dev/null +++ b/port_versions/o-/openssl-uwp.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "84398c4b851a28c5ca622c249d51c17d023518b7", + "version-string": "1.1.1h", + "port-version": 1 + }, + { + "git-tree": "f84d47f34d9789ef793f45431c06ed4085f43e34", + "version-string": "1.1.1h", + "port-version": 0 + }, + { + "git-tree": "e3a2926149036f4d8aa134ce92a8517702ee37c0", + "version-string": "1.1.1h", + "port-version": 1 + }, + { + "git-tree": "a69449619d734794b6385c36b3a5d00f108d9dd3", + "version-string": "1.1.1h", + "port-version": 0 + }, + { + "git-tree": "fba260d6fcf7baa0e925c0a7e551f9d6e1082dcc", + "version-string": "1.1.1g", + "port-version": 1 + }, + { + "git-tree": "87f250780a2f75d91e9ed8c0b4ba3a18669780a5", + "version-string": "1.1.1g", + "port-version": 0 + }, + { + "git-tree": "1bcb70f892ae3a4a8c221f39a5139b479a407e7f", + "version-string": "1.1.1d-1", + "port-version": 0 + }, + { + "git-tree": "fa8cdbc92010c7e9b6e30f41cb0f543e95023973", + "version-string": "1.1.1d", + "port-version": 0 + }, + { + "git-tree": "8d0505ed5d06120e35c08eb9296b19e8bb8506eb", + "version-string": "1.0.2r-1", + "port-version": 0 + }, + { + "git-tree": "677fd281086ecd5e0a6801306f2741e7718c8093", + "version-string": "1.0.2r", + "port-version": 0 + }, + { + "git-tree": "8b88b0ffaf55e0d3804807cf92c0e57f579b9c73", + "version-string": "1.0.2q-winrt-2", + "port-version": 0 + }, + { + "git-tree": "85472d04fa7e3002ccdfc7729557a9c1bd583c60", + "version-string": "1.0.2q-winrt-1", + "port-version": 0 + }, + { + "git-tree": "5596ed33ca4b2be4d1d190b963ed6f19cf45b510", + "version-string": "1.0.2q-winrt", + "port-version": 0 + }, + { + "git-tree": "8b22d47210619fd3b6a38bdc999a6f6cb7ee23b1", + "version-string": "1.0.2l-winrt", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openssl-windows.json b/port_versions/o-/openssl-windows.json new file mode 100644 index 00000000000000..2d243a981778af --- /dev/null +++ b/port_versions/o-/openssl-windows.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "526d4688d5ca8cdcbac22b8ff18f9aac10a8c695", + "version-string": "1.1.1h", + "port-version": 1 + }, + { + "git-tree": "3243016be13f2cd1c0ab38519b59f4660770acf5", + "version-string": "1.1.1h", + "port-version": 0 + }, + { + "git-tree": "22c37a71ae89dd3856bb6c81f0e59f804873acba", + "version-string": "1.1.1g", + "port-version": 1 + }, + { + "git-tree": "054a2e92258c48208eecda2bdbc32c9dcdc52dfb", + "version-string": "1.1.1g", + "port-version": 0 + }, + { + "git-tree": "3918271375b0ff99b187ef3d357b3d391bc42050", + "version-string": "1.1.1d-2", + "port-version": 0 + }, + { + "git-tree": "dfe5545ce043f440d9d4ab06e7548c495b334e36", + "version-string": "1.1.1d-1", + "port-version": 0 + }, + { + "git-tree": "aa4cf0f1e723b452cdfce53989bbf73bb4acc847", + "version-string": "1.1.1d", + "port-version": 0 + }, + { + "git-tree": "911361ba8124500e840b359ab0972887b65c69ae", + "version-string": "1.0.2s-2", + "port-version": 0 + }, + { + "git-tree": "cab1a598632203ea232d8794fe1cb0d9489c62ee", + "version-string": "1.0.2s-1", + "port-version": 0 + }, + { + "git-tree": "3c70e410a627bb3b67a34c0d8e79f784641f7dea", + "version-string": "1.0.2q-2", + "port-version": 0 + }, + { + "git-tree": "4f32bcc4a79399ed840a045165a572d7c16446f9", + "version-string": "1.0.2s-1", + "port-version": 0 + }, + { + "git-tree": "d3793cca46af28305e662afcf896e55b73396638", + "version-string": "1.0.2q-2", + "port-version": 0 + }, + { + "git-tree": "ec5d01d75cd9ab48966220fdb644a63764c30cea", + "version-string": "1.0.2q-1", + "port-version": 0 + }, + { + "git-tree": "12c1959ae6532da0ad5d6531d59eb107c9f94df8", + "version-string": "1.0.2q", + "port-version": 0 + }, + { + "git-tree": "6f75c8b4121807afd813459d36d752c019cdae8b", + "version-string": "1.0.2p-1", + "port-version": 0 + }, + { + "git-tree": "35f88f577589285a0a1cf5346fc1a2e71260eacd", + "version-string": "1.0.2p", + "port-version": 0 + }, + { + "git-tree": "508bde2de594176023af6270986da999919ab8af", + "version-string": "1.0.2o", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openssl.json b/port_versions/o-/openssl.json new file mode 100644 index 00000000000000..3dc1fae1bc301d --- /dev/null +++ b/port_versions/o-/openssl.json @@ -0,0 +1,184 @@ +{ + "versions": [ + { + "git-tree": "30228fb5d272c8554937ac94b77fb971249c7c8a", + "version-string": "1.1.1i", + "port-version": 0 + }, + { + "git-tree": "a40ca65d6233b78873ab046be9312cc119f2a3b5", + "version-string": "1.1.1h", + "port-version": 5 + }, + { + "git-tree": "bd308eddff03351b29f403399e053e130581076a", + "version-string": "1.1.1h", + "port-version": 4 + }, + { + "git-tree": "22aba6aaaafcea524467c9b42780cbc271c1946c", + "version-string": "1.1.1h", + "port-version": 3 + }, + { + "git-tree": "db43863b6d477af0975455eea302f2f3981b7579", + "version-string": "1.1.1h", + "port-version": 2 + }, + { + "git-tree": "3d5b8bfd0984b72b432b3d2fb4447dd306e41d0a", + "version-string": "1.1.1h", + "port-version": 1 + }, + { + "git-tree": "10b21b67d6f259baa92845ba0ba06ebb480fe0f7", + "version-string": "1.1.1g", + "port-version": 1 + }, + { + "git-tree": "e96ecf6eebbc0c8356771548127c077e3e7bc676", + "version-string": "1.1.1g", + "port-version": 0 + }, + { + "git-tree": "a54c371df1a58c492721227b808bef69d4c0b6bd", + "version-string": "1.1.1d", + "port-version": 0 + }, + { + "git-tree": "0848995115a67c1818f5f9f2b667083d74dda046", + "version-string": "1", + "port-version": 0 + }, + { + "git-tree": "0a8165857ba19bdc061ef32acd6b7bad442480ed", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "39d1773390a9817dd776d1d90e809d873437daa7", + "version-string": "1.0.2o-3", + "port-version": 0 + }, + { + "git-tree": "86a392547f55fe99da0105cfdb2ce012e0fa5f94", + "version-string": "1.0.2o-2", + "port-version": 0 + }, + { + "git-tree": "0ae9343f2814cfcfdef9445990d7b0c90495db52", + "version-string": "1.0.2o-1", + "port-version": 0 + }, + { + "git-tree": "74c8e8bdb3ecafc4d95aabbd076dfbb41db0a366", + "version-string": "1.0.2o", + "port-version": 0 + }, + { + "git-tree": "b0c5618831af164aab62f9b446b225fbf2b33b5e", + "version-string": "1.0.2n-3", + "port-version": 0 + }, + { + "git-tree": "f1cb0e39d975d255b9dfa2e55802cab0b9fc8355", + "version-string": "1.0.2n-2", + "port-version": 0 + }, + { + "git-tree": "cd538938214a1f0865641dfbcc9700182e1e5bd9", + "version-string": "1.0.2n-1", + "port-version": 0 + }, + { + "git-tree": "096e9e1bda009fd51e1b62a6c4b0f0808f22ca02", + "version-string": "1.0.2n", + "port-version": 0 + }, + { + "git-tree": "ae1fc122ee308f89f77bf72f6156ea48ad903e79", + "version-string": "1.0.2m", + "port-version": 0 + }, + { + "git-tree": "799259eabc46bde9958f9d285e4e3695836dec4d", + "version-string": "1.0.2l-3", + "port-version": 0 + }, + { + "git-tree": "06e68e4988301123770548bbe51a3f2a61993d0f", + "version-string": "1.0.2l-2", + "port-version": 0 + }, + { + "git-tree": "71c0ea9b022834e916b553b9239cf9e8df4af53b", + "version-string": "1.0.2l-1", + "port-version": 0 + }, + { + "git-tree": "4bbe7d4ddd39dbaa01b0d1920fa1cbf40e6eea4f", + "version-string": "1.0.21-1", + "port-version": 0 + }, + { + "git-tree": "c09f7eeae92108f42f6a7b8f887ee48152478697", + "version-string": "1.0.2k-5", + "port-version": 0 + }, + { + "git-tree": "91a923bc001d2dd39c52ed8ad976da371d47856a", + "version-string": "1.0.2k-4", + "port-version": 0 + }, + { + "git-tree": "fad4170dd59ac0c0690fee44ccae3b8f6a8e67c5", + "version-string": "1.0.2k-3", + "port-version": 0 + }, + { + "git-tree": "d78f2dceb034c24a9f19f48dda80181fc6500a3a", + "version-string": "1.0.2k-2", + "port-version": 0 + }, + { + "git-tree": "f8f125d46bd3e1a3680f33d0d7c7fcf59870efaa", + "version-string": "1.0.2k-1", + "port-version": 0 + }, + { + "git-tree": "53caaba6ea0df814d3c90589ca9d93a327adaac5", + "version-string": "1.0.2j-2", + "port-version": 0 + }, + { + "git-tree": "799207c0101ea8fb8e97b59c1855b1cae3148bd4", + "version-string": "1.0.2j-1", + "port-version": 0 + }, + { + "git-tree": "f18f7a91cacba1703f571e5c0a06c0f6b0d2a13f", + "version-string": "1.0.2j", + "port-version": 0 + }, + { + "git-tree": "c6ad91dbdec35b4d6cb404f39a5a2af454d2ea4d", + "version-string": "1.0.2h-1", + "port-version": 0 + }, + { + "git-tree": "818861b2d2b76893b113cdfef7c2bd54fae75272", + "version-string": "1.0.2j", + "port-version": 0 + }, + { + "git-tree": "12fd1375cd5c644b9eccc11415eff7e056f58d58", + "version-string": "1.0.2h-1", + "port-version": 0 + }, + { + "git-tree": "3e5163bcf41573dd2bc14130db52e77599f4131b", + "version-string": "1.0.2h", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opensubdiv.json b/port_versions/o-/opensubdiv.json new file mode 100644 index 00000000000000..d7250e40de9c0d --- /dev/null +++ b/port_versions/o-/opensubdiv.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "306ae6eba55d7f3300c17c8c7a88ea6d648e2b69", + "version-string": "3.4.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opentracing.json b/port_versions/o-/opentracing.json new file mode 100644 index 00000000000000..616b682881ca5f --- /dev/null +++ b/port_versions/o-/opentracing.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "001eac5d529c5b20dd9dbfc85879568e07d9b55d", + "version-string": "1.6.0", + "port-version": 1 + }, + { + "git-tree": "bc7c978dfc2e41bcaeaf28df8ae5087384101a9d", + "version-string": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "fe455a87f3774321c7e22f1876f0e2e83550b959", + "version-string": "1.5.1-1", + "port-version": 0 + }, + { + "git-tree": "135fbf549018b8f91055e30186090d0612ff49c9", + "version-string": "1.5.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openvdb.json b/port_versions/o-/openvdb.json new file mode 100644 index 00000000000000..8b0d616fb06f6d --- /dev/null +++ b/port_versions/o-/openvdb.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "7bd35d581cf4764e95b80e0e1a91554238a45f25", + "version-string": "7.1.0", + "port-version": 1 + }, + { + "git-tree": "0a274e31e32ac3993c6b2dba4e2d97007315a840", + "version-string": "7.1.0", + "port-version": 0 + }, + { + "git-tree": "df4b04c75b0229000dcbf86c5e69466a5886cfb5", + "version-string": "7.0.0", + "port-version": 0 + }, + { + "git-tree": "ac63c4c8ec8adadee85aa246496b12b24b8408ce", + "version-string": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "647661c86c13da536df5349a2a71c45854fde918", + "version-string": "6.1.0", + "port-version": 0 + }, + { + "git-tree": "84fd4a175b94bf4eb179a2e4f8fff9adde5a67ef", + "version-string": "6.0.0-2", + "port-version": 0 + }, + { + "git-tree": "a3a50f179c9a76bcc469a6a6ab389f8eccd0c596", + "version-string": "6.0.0-1", + "port-version": 0 + }, + { + "git-tree": "899d9cd6992a31de55e607361c9aca0b03fe7808", + "version-string": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "42649407dc4a72445e560e1b99aa4a711c6e97b5", + "version-string": "5.0.0-2", + "port-version": 0 + }, + { + "git-tree": "a2ec65a7bee38dcacaccaa309c9e2654f4f82030", + "version-string": "5.0.0-1", + "port-version": 0 + }, + { + "git-tree": "e2adacf0514dc330fdb7e00ef55d904d03cb87a6", + "version-string": "5.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openvpn3.json b/port_versions/o-/openvpn3.json new file mode 100644 index 00000000000000..8f479413901bf1 --- /dev/null +++ b/port_versions/o-/openvpn3.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "4b177cc0bde1f1f8c6ca22ab10d7ab92657c8d3f", + "version-string": "3.4.1-1", + "port-version": 0 + }, + { + "git-tree": "c677eebd904de277e0681d785e96994c63e5e287", + "version-string": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "96f4bddb5d4bbeb620b476a947a429f71e80494b", + "version-string": "2018-03-21-1", + "port-version": 0 + }, + { + "git-tree": "047ed9c907cc3114ad31e5d17a2080a75eb190df", + "version-string": "2018-03-21", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openvr.json b/port_versions/o-/openvr.json new file mode 100644 index 00000000000000..d3ffb240889563 --- /dev/null +++ b/port_versions/o-/openvr.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "8bb491d21d959c966d12a8a6068f8b8d21aa7bc6", + "version-string": "1.12.5", + "port-version": 0 + }, + { + "git-tree": "ce1dcf697426512f8e9c74eb574ae0505f5903f1", + "version-string": "1.10.30", + "port-version": 0 + }, + { + "git-tree": "b13b9ebd273df9d97f453faf554d745ed561511e", + "version-string": "1.9.16", + "port-version": 0 + }, + { + "git-tree": "3d099f986bb03d2a6fa635e8fc53389b8a2b90ed", + "version-string": "1.5.17", + "port-version": 0 + }, + { + "git-tree": "f382a7947b88d348c40ce977e09774caeb17910b", + "version-string": "1.4.18", + "port-version": 0 + }, + { + "git-tree": "3b738831157101e2165934dc028aa759f84c00a4", + "version-string": "1.1.3b", + "port-version": 0 + }, + { + "git-tree": "a9acf84e30648c01b28cc87b2ebccead439f9f28", + "version-string": "1.0.16", + "port-version": 0 + }, + { + "git-tree": "272b89aacbdae7ec5d92bfeb17a70d9825e9db34", + "version-string": "1.0.15", + "port-version": 0 + }, + { + "git-tree": "51b36f3797bf027e9d56ba9167e3ad28a4a77214", + "version-string": "1.0.14", + "port-version": 0 + }, + { + "git-tree": "a6f3214a4e92b284c359e5b428f016d90ecb30e2", + "version-string": "1.0.13", + "port-version": 0 + }, + { + "git-tree": "f3ae4945d1b8b8b3d135410a84d4faa120963172", + "version-string": "1.0.12", + "port-version": 0 + }, + { + "git-tree": "4aa4e746904db6077274cfc65a6f0c6fa65b0332", + "version-string": "1.0.9", + "port-version": 0 + }, + { + "git-tree": "2f066e65122d4d27fbdbb5016da5efa82d654706", + "version-string": "1.0.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/openxr-loader.json b/port_versions/o-/openxr-loader.json new file mode 100644 index 00000000000000..633b808254cab3 --- /dev/null +++ b/port_versions/o-/openxr-loader.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "0ba3ab397dde99a678c135d6fd91e42966bf8d88", + "version-string": "1.0.11", + "port-version": 1 + }, + { + "git-tree": "7b2841ace9b21323ca8adf567c41f91cbba1424f", + "version-string": "1.0.11", + "port-version": 0 + }, + { + "git-tree": "ab1d69229690488dfcb745a7c2bcd817e85f3277", + "version-string": "1.0.3.0", + "port-version": 0 + }, + { + "git-tree": "7d247bd93984f440e73c207532a5f190e1d1c6a5", + "version-string": "2019-09-25", + "port-version": 0 + }, + { + "git-tree": "59a19a38c4f230b5b86d24034db3af01081cfae0", + "version-string": "1.0.2-0", + "port-version": 0 + }, + { + "git-tree": "a75220fa105691b3013ea8ab10a40e8955a59b65", + "version-string": "1.0.0-2", + "port-version": 0 + }, + { + "git-tree": "a788de39d570996259910f0f03bb887918296fb4", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "43f2f047ed9717d8d948ffe8cb73e9d322c79a0e", + "version-string": "0.90.1-1", + "port-version": 0 + }, + { + "git-tree": "bd0c957e3e6bd9e47141dc58147acfc25dc28ef8", + "version-string": "0.90.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/optional-bare.json b/port_versions/o-/optional-bare.json new file mode 100644 index 00000000000000..9930bee82d8c11 --- /dev/null +++ b/port_versions/o-/optional-bare.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0b71c15d07ac746c0c5320aba788acca216c4f3c", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/optional-lite.json b/port_versions/o-/optional-lite.json new file mode 100644 index 00000000000000..6e52700bf88475 --- /dev/null +++ b/port_versions/o-/optional-lite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f95f2a06aec2297861f4a5e56dee34941a5898e9", + "version-string": "3.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opus.json b/port_versions/o-/opus.json new file mode 100644 index 00000000000000..a0c0fee1d7c830 --- /dev/null +++ b/port_versions/o-/opus.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "9aa015835678b6dec3bf2a5ee904d68a746fac0c", + "version-string": "1.3.1", + "port-version": 5 + }, + { + "git-tree": "56ed75584e87d59f3c419a9f2b8829474afee37d", + "version-string": "1.3.1", + "port-version": 4 + }, + { + "git-tree": "0701ad56534e3c18e686371a5bfc9fde2ef8f064", + "version-string": "1.3.1-3", + "port-version": 0 + }, + { + "git-tree": "2ac4d6df47768169434334ba7c9ef427e3f58a85", + "version-string": "1.3.1-2", + "port-version": 0 + }, + { + "git-tree": "bc57499bc60131c05e97c4084a2c65a39842a82a", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "e5486e84c33d611a3dfa0329581545bf84a5be12", + "version-string": "1.3-2", + "port-version": 0 + }, + { + "git-tree": "0fcf47d7d3400428df93e819bfc31bcad9d57ccc", + "version-string": "1.3-1", + "port-version": 0 + }, + { + "git-tree": "f0292b5f5b268707adaa680c46f048c4eefaaec4", + "version-string": "1.3", + "port-version": 0 + }, + { + "git-tree": "546e745df416ae092f16d7d4edab457fde66602e", + "version-string": "1.2.1-1", + "port-version": 0 + }, + { + "git-tree": "6c7f2af37077b3ee742fd2a9fb09c92735e625da", + "version-string": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "1350305e4c5b98b320515033fdae069bd246273f", + "version-string": "1.2", + "port-version": 0 + }, + { + "git-tree": "b34a853c028cce78b56af336ed90e1004409f1df", + "version-string": "1.1.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/opusfile.json b/port_versions/o-/opusfile.json new file mode 100644 index 00000000000000..8102b4f83f6cbd --- /dev/null +++ b/port_versions/o-/opusfile.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "3c2a8c76974f548268451580c5e5599c7d435dc6", + "version-string": "0.12", + "port-version": 0 + }, + { + "git-tree": "6babcac9da97faeb2c14466f0cf1b8e61d2f90f1", + "version-string": "0.11-3", + "port-version": 0 + }, + { + "git-tree": "364f3b3b74ca6bf8084cd6735cbb0577dabfe622", + "version-string": "0.11-2", + "port-version": 0 + }, + { + "git-tree": "33ee3f01ce0517204edd08658bd7b0d4280c9212", + "version-string": "0.11-1", + "port-version": 0 + }, + { + "git-tree": "375d6c02bd5d27e50e3414a1a3babb7e28252c65", + "version-string": "0.9-3", + "port-version": 0 + }, + { + "git-tree": "fa3d58a5fb67ec576bf6539ad58c18f333ae4624", + "version-string": "0.9-1", + "port-version": 0 + }, + { + "git-tree": "d5cb4cf49e0e86575af4679f7573290496667f0c", + "version-string": "0.9", + "port-version": 0 + }, + { + "git-tree": "666fb9ac0e1713dc5852501af1096752bfcc60c6", + "version-string": "0.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/orc.json b/port_versions/o-/orc.json new file mode 100644 index 00000000000000..a8d1276adc4bdb --- /dev/null +++ b/port_versions/o-/orc.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "80c6805ca7328eee7a8c27608e346274ff35baa1", + "version-string": "1.6.4", + "port-version": 1 + }, + { + "git-tree": "b44f348d787046b37705da0becdce9fb1d393778", + "version-string": "1.6.4", + "port-version": 0 + }, + { + "git-tree": "2b47da6da9cb6ecb63e13f9627cfb357dd37d64f", + "version-string": "1.5.9", + "port-version": 0 + }, + { + "git-tree": "7bbfb675224d29fdec16955f03a661f0b3e2e40c", + "version-string": "1.5.7", + "port-version": 0 + }, + { + "git-tree": "3b6d0e65e8d7e3adb2ff90a8c414b93e6589338d", + "version-string": "1.5.6-1", + "port-version": 0 + }, + { + "git-tree": "1e7103634a9e90132569389f622f5779f4ecb10e", + "version-string": "1.5.6", + "port-version": 0 + }, + { + "git-tree": "74e31baf6f2be9e22fbe0fdfa52e9da4896b7a7f", + "version-string": "1.5.5-1", + "port-version": 0 + }, + { + "git-tree": "77b88ea9af71142a497ca7f306265abb693c8ae3", + "version-string": "1.5.5", + "port-version": 0 + }, + { + "git-tree": "f94c29db60400ae93c843568ebc6b66103f46cc1", + "version-string": "1.5.2-f47e02c-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/orocos-kdl.json b/port_versions/o-/orocos-kdl.json new file mode 100644 index 00000000000000..b3da4498058f3a --- /dev/null +++ b/port_versions/o-/orocos-kdl.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "dc60323664cfc26eb992383022f99d5ec1b6c25c", + "version-string": "1.4", + "port-version": 3 + }, + { + "git-tree": "794eddc7beefc13b86d3a95cd8f9330ba0f3d308", + "version-string": "1.4-2", + "port-version": 0 + }, + { + "git-tree": "74808287d4549ec42a170a00fdd07ccb8500fc01", + "version-string": "1.4-1", + "port-version": 0 + }, + { + "git-tree": "943f8a6e33620d37b4d5e07f9b11d762c4fa75e9", + "version-string": "1.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/osg-qt.json b/port_versions/o-/osg-qt.json new file mode 100644 index 00000000000000..d930d44bdca73c --- /dev/null +++ b/port_versions/o-/osg-qt.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "0cb876c38973571d755b0c92b17c8d1359027d07", + "version-string": "Qt4", + "port-version": 3 + }, + { + "git-tree": "fc3d2878ac7ceed72a6633d32221fd073df8a8a6", + "version-string": "Qt4-2", + "port-version": 0 + }, + { + "git-tree": "da9c70e3ae172bd798892b3a9e516fb19d24c55f", + "version-string": "Qt4-1", + "port-version": 0 + }, + { + "git-tree": "c6dcd175c5c17bdd9949db02d061e890e2e6ff6c", + "version-string": "Qt4", + "port-version": 0 + }, + { + "git-tree": "66529f574a94b3b934c9a0f8bbacc5107c32a8b7", + "version-string": "3.5.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/osg.json b/port_versions/o-/osg.json new file mode 100644 index 00000000000000..5901d4ba980e8a --- /dev/null +++ b/port_versions/o-/osg.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "de60b215a6e17bc6651d212874ffdaf513bdbf16", + "version-string": "3.6.5", + "port-version": 5 + }, + { + "git-tree": "37e7493684572218bcb9e16f145ff37c5053404c", + "version-string": "3.6.5", + "port-version": 4 + }, + { + "git-tree": "65573fc9008387a848f0bda4139f5ececfba5fe6", + "version-string": "3.6.5", + "port-version": 3 + }, + { + "git-tree": "1cc4e8d2ac3089b60f68b8542d2fa0dc9ddc9bcc", + "version-string": "3.6.5", + "port-version": 2 + }, + { + "git-tree": "39ce7a138f227e9db4b2a8876e4ab81957ebca53", + "version-string": "3.6.5", + "port-version": 1 + }, + { + "git-tree": "c6ae0ac1515b93473c0b6196eed8ae598a0b225e", + "version-string": "3.6.5", + "port-version": 0 + }, + { + "git-tree": "1b9fe9007158d033032b11fa6d88c852b767fe85", + "version-string": "3.6.4-3", + "port-version": 0 + }, + { + "git-tree": "b7b667020a973457d8752ab1937dcee1a41509f7", + "version-string": "3.6.4-2", + "port-version": 0 + }, + { + "git-tree": "e3740cd3d563e4af2dbdfa75667c939a89aff0ab", + "version-string": "3.6.4-1", + "port-version": 0 + }, + { + "git-tree": "a761765a2660a67a7687f1fbe43cd5e4a9269b07", + "version-string": "3.6.4", + "port-version": 0 + }, + { + "git-tree": "0b4815f75bc681d9488985c00bee827d474713f2", + "version-string": "3.6.3-1", + "port-version": 0 + }, + { + "git-tree": "f49257272340f53a438ba78ed07b44996307abcb", + "version-string": "3.6.3", + "port-version": 0 + }, + { + "git-tree": "5552f8d9c3fe58198b8d61d2c45c723d7203877a", + "version-string": "3.6.2-2", + "port-version": 0 + }, + { + "git-tree": "785ed3f9f95e5c45b18e1b1c8730605a606c91b8", + "version-string": "3.6.2-1", + "port-version": 0 + }, + { + "git-tree": "efdfeef2b51d0d712f544337d60619495d972ae6", + "version-string": "3.6.2", + "port-version": 0 + }, + { + "git-tree": "492cb5d78bb033bc7c9ec117aad54511cf524608", + "version-string": "3.6.2-rc3", + "port-version": 0 + }, + { + "git-tree": "08e66e73223cf713b9c17c89258dc069428666eb", + "version-string": "3.5.6-3", + "port-version": 0 + }, + { + "git-tree": "4116b1cb12fdcbcca6d8afafcf571d7ff004d88f", + "version-string": "3.5.6-2", + "port-version": 0 + }, + { + "git-tree": "ab81ffa0858eb7a8ffa9b1f0b557d0ac6d636a6f", + "version-string": "3.5.6-1", + "port-version": 0 + }, + { + "git-tree": "ec9c22d15e7177c10375ea924df464d7c6f30090", + "version-string": "3.5.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/osgearth.json b/port_versions/o-/osgearth.json new file mode 100644 index 00000000000000..3a430bfc94f94a --- /dev/null +++ b/port_versions/o-/osgearth.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "168a035bd41f62a0d394f4e18fb703692603e39d", + "version-string": "3.1", + "port-version": 0 + }, + { + "git-tree": "f1cf05182323701e0a3dbc16da6ecc9e888fbb71", + "version-string": "3.0", + "port-version": 2 + }, + { + "git-tree": "af00c514bfaa904be498e223a1cacf173162cc3e", + "version-string": "3.0", + "port-version": 1 + }, + { + "git-tree": "25e742943d7c8696ac88b5e7be4d8816353e6700", + "version-string": "3.0", + "port-version": 0 + }, + { + "git-tree": "32dbb3912317bbc3b849eec2b5a15e5c437e5fbc", + "version-string": "2.10.2-1", + "port-version": 0 + }, + { + "git-tree": "b7b84ad0e73ece27e694725e6439cf6d60792532", + "version-string": "2.10.2", + "port-version": 0 + }, + { + "git-tree": "af46db2287a1d38c21d232099b347c5995121091", + "version-string": "2.10.1", + "port-version": 0 + }, + { + "git-tree": "d0be4e21f86939c2864e0a879ad81be883a543c1", + "version-string": "2.10-1", + "port-version": 0 + }, + { + "git-tree": "32abeb2b7b74cb8debe76d24219c3554ac37f450", + "version-string": "2.10", + "port-version": 0 + }, + { + "git-tree": "343ebdcf807d88b7f80fa5afc7d81abdad3baff2", + "version-string": "2.9-2", + "port-version": 0 + }, + { + "git-tree": "d4057d17f470dbd19815ad61db8f150e39169093", + "version-string": "2.9-1", + "port-version": 0 + }, + { + "git-tree": "4b9de743796c6861205b8143cfa4177ca14ac0bd", + "version-string": "2.9", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/osi.json b/port_versions/o-/osi.json new file mode 100644 index 00000000000000..f83d2f6ebcc9c1 --- /dev/null +++ b/port_versions/o-/osi.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "0430fc0a3bf8fd6e38563fb6c6b0f82d2f8159b3", + "version-string": "0.108.6", + "port-version": 0 + }, + { + "git-tree": "82fa43bb4feef6c2c529885807dd067657856010", + "version-string": "0.108.4-2", + "port-version": 0 + }, + { + "git-tree": "cd3af932853d3d11b8d244748aed5ac7584ed259", + "version-string": "0.108.4-1", + "port-version": 0 + }, + { + "git-tree": "ca6946ed50bdfee8311ddfc1c470bd4b8e42a068", + "version-string": "0.108.4", + "port-version": 0 + }, + { + "git-tree": "80fa3abcb916cde4c30c19fb479e2d1f14ed9bae", + "version-string": "0.107.9-1", + "port-version": 0 + }, + { + "git-tree": "cf84797b62ef2979a17831a57301773def920f62", + "version-string": "0.107.9-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/otl.json b/port_versions/o-/otl.json new file mode 100644 index 00000000000000..27ac12beb10f27 --- /dev/null +++ b/port_versions/o-/otl.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "a12a87bbab40a9d8c53fde4c2dc38f2f87c99c29", + "version-string": "4.0.455", + "port-version": 0 + }, + { + "git-tree": "2b864313bcf25a65f3bd526339004f99f606a5c9", + "version-string": "4.0.451-1", + "port-version": 0 + }, + { + "git-tree": "05182f799c4f8755f29a47dcd013b6c94c2f6eda", + "version-string": "4.0.451", + "port-version": 0 + }, + { + "git-tree": "5e5a6914d221bd0359c0da1a55838fd802804f49", + "version-string": "4.0.448-2", + "port-version": 0 + }, + { + "git-tree": "5d4ca7a46eef10424377102133446898cafcb047", + "version-string": "4.0.448-1", + "port-version": 0 + }, + { + "git-tree": "6f0c8b07b65f9706cb65d1265d27e167bd5f39ce", + "version-string": "4.0.448", + "port-version": 0 + }, + { + "git-tree": "cdc4e8959f9845e12ead96213c1a6ce0cf5543bd", + "version-string": "4.0.447", + "port-version": 0 + }, + { + "git-tree": "61868dd6e22818a6ea6684867b540c2f619531fe", + "version-string": "4.0.443-2", + "port-version": 0 + }, + { + "git-tree": "adfbde0aacf015a23186e73bb02f3165338804c2", + "version-string": "4.0.443", + "port-version": 0 + }, + { + "git-tree": "40ab3fcccb8ffdcfae221aadc61844c45026e248", + "version-string": "4.0.442", + "port-version": 0 + } + ] +} diff --git a/port_versions/o-/outcome.json b/port_versions/o-/outcome.json new file mode 100644 index 00000000000000..3e807b020a36bb --- /dev/null +++ b/port_versions/o-/outcome.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "33dc2e0d31074248a2313ff2eeecad075206d9bb", + "version-string": "2.1.3", + "port-version": 0 + }, + { + "git-tree": "b12b3ac86436c5ecbbfb207caa4c2ac54af02fe4", + "version-string": "2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/p-ranav-csv.json b/port_versions/p-/p-ranav-csv.json new file mode 100644 index 00000000000000..ef7ffd2a2dddef --- /dev/null +++ b/port_versions/p-/p-ranav-csv.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ab0aa66ce2b59b427451f135de81e0adaf3dd140", + "version-string": "2019-07-11", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/p-ranav-csv2.json b/port_versions/p-/p-ranav-csv2.json new file mode 100644 index 00000000000000..a1c501e1bd4209 --- /dev/null +++ b/port_versions/p-/p-ranav-csv2.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ff75758935b7af155e42fac45ca52c8861bac4b2", + "version-string": "2020-12-14", + "port-version": 0 + }, + { + "git-tree": "08ad345a64c73c64f37a2896bde759684fe4c789", + "version-string": "2020-06-02", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/paho-mqtt.json b/port_versions/p-/paho-mqtt.json new file mode 100644 index 00000000000000..c441cbd9a4fb01 --- /dev/null +++ b/port_versions/p-/paho-mqtt.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "a8ecb2168805d1f3745453512d5f82cccd7d391a", + "version-string": "1.3.8", + "port-version": 0 + }, + { + "git-tree": "800b1e512dbeee6a6cc18e33743fe85c63ecb013", + "version-string": "1.3.5", + "port-version": 0 + }, + { + "git-tree": "0eaf9c94651c4f48261f5e7c3cb5089516b9f3c4", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "ce25ea675f86656e691af45ce6d4d5c012759a03", + "version-string": "1.3.0-2", + "port-version": 0 + }, + { + "git-tree": "96b6c60f4e183b0eb2190e5d7334ce88c73ac524", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "3baa7a6e7c82084c3d60ae2bbbb1c720ddd82ea4", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "3feff9c023a2a88e7083305bd63d8e0b4d63c3bf", + "version-string": "1.2.1-1", + "port-version": 0 + }, + { + "git-tree": "d669dc057642ded3d765361cc05c18fb1736353a", + "version-string": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "147fdbe8fa696be9d1d191475f559c70803b7690", + "version-string": "1.2.0-3", + "port-version": 0 + }, + { + "git-tree": "997710c0bdf51fe179eb169930a522d9a43ad72a", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "2fd7b378d6a3427738c651308627d750f6da1988", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "38f951ced3921a6f0376322cca3c620b6ac98f4a", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "c62a448f308d0b71a2303b825dcf4c9551d8c8ff", + "version-string": "Version 1.1.0 (Paho 1.2)", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/paho-mqttpp3.json b/port_versions/p-/paho-mqttpp3.json new file mode 100644 index 00000000000000..c3b6235a659a75 --- /dev/null +++ b/port_versions/p-/paho-mqttpp3.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "93fd209433fc93b89946d48f958947c7e7fbb219", + "version-string": "1.1", + "port-version": 1 + }, + { + "git-tree": "90b86211639ed4141e7bb9118a36a886df599dae", + "version-string": "1.1", + "port-version": 0 + }, + { + "git-tree": "ce7b0c3c97c2043260328cc5fb93cff8920e594f", + "version-string": "1.0.1-3", + "port-version": 0 + }, + { + "git-tree": "791046cd99e78bab4f16a54e15508b072cbee0ae", + "version-string": "1.0.1-2", + "port-version": 0 + }, + { + "git-tree": "343024d157b785df9ac2f995c2dc14f106a229c2", + "version-string": "1.0.1-1", + "port-version": 0 + }, + { + "git-tree": "332eddefa1b8636f03c7f2523ab4eff6dbefe9bd", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/palsigslot.json b/port_versions/p-/palsigslot.json new file mode 100644 index 00000000000000..fc5487dc09a6d9 --- /dev/null +++ b/port_versions/p-/palsigslot.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e9a60795ed6d2384819646000af70ab33604184b", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pango.json b/port_versions/p-/pango.json new file mode 100644 index 00000000000000..06b8e2bc695ddb --- /dev/null +++ b/port_versions/p-/pango.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "c0585c64466afdd652539982316d65c086b3d4f6", + "version-string": "1.40.11", + "port-version": 8 + }, + { + "git-tree": "f125f60b38a1c8f42dcfedde75475050f340e7c4", + "version-string": "1.40.11-7", + "port-version": 0 + }, + { + "git-tree": "960975827bc14844d5ef6fe0ac7ce3e41bd98a68", + "version-string": "1.40.11-6", + "port-version": 0 + }, + { + "git-tree": "3b3485d29590d52ef989a7f6e9ea5c9f0679fe3e", + "version-string": "1.40.11-5", + "port-version": 0 + }, + { + "git-tree": "de337ff2b1b2ddbb2b2850b918fd46be7f8c07c8", + "version-string": "1.40.11-4", + "port-version": 0 + }, + { + "git-tree": "c51a688a50a6652b226723339cd640a710adb066", + "version-string": "1.40.11-3", + "port-version": 0 + }, + { + "git-tree": "483edb564a2faa0d7f7d2f36ff71b5e4579ee188", + "version-string": "1.40.11-2", + "port-version": 0 + }, + { + "git-tree": "2cd7bd75114718538133072d6b5202f48d0bf94c", + "version-string": "1.40.11-1", + "port-version": 0 + }, + { + "git-tree": "2e2f3f78b1b96b36d28698ceaad720b3b4ea8de9", + "version-string": "1.40.11", + "port-version": 0 + }, + { + "git-tree": "e123361021854abdc081e224abded78977e9bc40", + "version-string": "1.40.6", + "port-version": 0 + }, + { + "git-tree": "892f6d834929bf669c58a0c0dabdc9e95b74c9d3", + "version-string": "1.40.5-2", + "port-version": 0 + }, + { + "git-tree": "7c304fc57a64276ab2718fb76e9417984d76fd10", + "version-string": "1.40.5-1", + "port-version": 0 + }, + { + "git-tree": "dde3471799a18ff292a5a8ae15f4961b222b1e35", + "version-string": "1.40.4", + "port-version": 0 + }, + { + "git-tree": "0672091d0ee6c966c3006fc1086f6201902174bd", + "version-string": "1.40.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pangolin.json b/port_versions/p-/pangolin.json new file mode 100644 index 00000000000000..3f934431c95d22 --- /dev/null +++ b/port_versions/p-/pangolin.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "4632fbe85a4a6afb145b500f689fe47b99b45c71", + "version-string": "0.5", + "port-version": 11 + }, + { + "git-tree": "bfd7c7093d0563829edddc9dfa1f23b83b1fdf8a", + "version-string": "0.5", + "port-version": 10 + }, + { + "git-tree": "76ea97df4a825bdcc46b8cf1102f45c4489aea63", + "version-string": "0.5", + "port-version": 9 + }, + { + "git-tree": "036d318e411ec94818a05c272092d65e5fa17678", + "version-string": "0.5", + "port-version": 8 + }, + { + "git-tree": "63d2a2c3760c4d70254f79dca6758a9d0947dabf", + "version-string": "0.5-7", + "port-version": 0 + }, + { + "git-tree": "ffb029a5884b0fd113e70659bee58df8a62b0f94", + "version-string": "0.5-6", + "port-version": 0 + }, + { + "git-tree": "a71f3754cefb717f0c4886642b841e8b372c9d3a", + "version-string": "0.5-5", + "port-version": 0 + }, + { + "git-tree": "8c5844be14958c0e45e92e4492c6f9d242a62848", + "version-string": "0.5-4", + "port-version": 0 + }, + { + "git-tree": "10147be637612fb9c248b7cf1b31aece7bfb0370", + "version-string": "0.5-3", + "port-version": 0 + }, + { + "git-tree": "3e9bdca841923cf260b2359854aa391d8f5576d2", + "version-string": "0.5-2", + "port-version": 0 + }, + { + "git-tree": "efa74b8747dd87546d4adaea73de4b3731b33b8c", + "version-string": "0.5-1", + "port-version": 0 + }, + { + "git-tree": "d35c305c506289e68c5152ea7491ca05dd3407ca", + "version-string": "0.5", + "port-version": 0 + }, + { + "git-tree": "64d219de91106319d90396f872e00c41109894a0", + "version-string": "v0.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pangomm.json b/port_versions/p-/pangomm.json new file mode 100644 index 00000000000000..5bca77f4691273 --- /dev/null +++ b/port_versions/p-/pangomm.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "8b74ee567be2a328e81e5afa8a29563b052e846c", + "version-string": "2.40.1", + "port-version": 4 + }, + { + "git-tree": "0cb9efc04615de94124ab6163472973af23fc131", + "version-string": "2.40.1-3", + "port-version": 0 + }, + { + "git-tree": "9cfbef485a5db1c6c6448057c1efd0945b2dccaf", + "version-string": "2.40.1-2", + "port-version": 0 + }, + { + "git-tree": "0c114ef14a46d08beb29230c0b1c50eece4e3e10", + "version-string": "2.40.1-1", + "port-version": 0 + }, + { + "git-tree": "a22a011845fe1781961f52f5032a3c48568819c0", + "version-string": "2.40.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/parallel-hashmap.json b/port_versions/p-/parallel-hashmap.json new file mode 100644 index 00000000000000..5e2b10cc4fbf5e --- /dev/null +++ b/port_versions/p-/parallel-hashmap.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "2366577284edc25897d22a701976455165f98265", + "version-string": "1.32", + "port-version": 0 + }, + { + "git-tree": "58bde5c4f3118de4aa1aa84b65a410b9d9f7e721", + "version-string": "1.30", + "port-version": 0 + }, + { + "git-tree": "e17040bc5d348d6fcef6331003fcecbd62d51e3b", + "version-string": "1.27", + "port-version": 0 + }, + { + "git-tree": "e10a56dd72865dda64f1f7f51496eb265355385f", + "version-string": "1.24", + "port-version": 0 + }, + { + "git-tree": "96dea928d3d99c17e0467cbe8e943f584c63b2cf", + "version-string": "1.23", + "port-version": 0 + }, + { + "git-tree": "00784adc08a483f035f6749e103a2e498ec57521", + "version-string": "1.22", + "port-version": 0 + }, + { + "git-tree": "6339e1a753d776b89113f736eb15863e5535b9ec", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "bf69e7f2e0369879c579aa635fbc220088f98a9c", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/parallelstl.json b/port_versions/p-/parallelstl.json new file mode 100644 index 00000000000000..568501587d5404 --- /dev/null +++ b/port_versions/p-/parallelstl.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "3e50eb9397c9a91ac5423d151f77c5fb4ae1ffac", + "version-string": "20200330", + "port-version": 0 + }, + { + "git-tree": "ae022531d9957689ac989bec96d7a4ecf5eb8dff", + "version-string": "20191218", + "port-version": 0 + }, + { + "git-tree": "1928eed64c6707e81d16a91f64e82957e141bd48", + "version-string": "20190522-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/paraview.json b/port_versions/p-/paraview.json new file mode 100644 index 00000000000000..ad9e156d98d14a --- /dev/null +++ b/port_versions/p-/paraview.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "9fb60c7a190e19963cb1811d3987da1e057ba6ad", + "version-string": "5.8.0", + "port-version": 3 + }, + { + "git-tree": "7f47bdcf2ec98f5f835a914659de2c8f6ae91ce7", + "version-string": "5.8.0-2", + "port-version": 0 + }, + { + "git-tree": "8fc6cb61b9405cde851dcd1c393f845d66b6c8de", + "version-string": "5.8.0-1", + "port-version": 0 + }, + { + "git-tree": "3e6c676e29e5ce34c89894b30329f63e0dba59a2", + "version-string": "5.8.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/parmetis.json b/port_versions/p-/parmetis.json new file mode 100644 index 00000000000000..d7c010c706966b --- /dev/null +++ b/port_versions/p-/parmetis.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "3e1e3d50f531e207194d13af392a811f2af09d8b", + "version-string": "4.0.3-3", + "port-version": 0 + }, + { + "git-tree": "ea51676a5f392375e65b3d2e159edfb70adfb87b", + "version-string": "4.0.3-2", + "port-version": 0 + }, + { + "git-tree": "592aa3de34be8679271e39c65dfa68a0d8d657ef", + "version-string": "4.0.3-1", + "port-version": 0 + }, + { + "git-tree": "ba1ab39509cbcbbfa71f4bb57f5f4d6728c37d14", + "version-string": "4.0.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/parquet.json b/port_versions/p-/parquet.json new file mode 100644 index 00000000000000..85cd002bc42c0e --- /dev/null +++ b/port_versions/p-/parquet.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "f7ee13cfaf8047001763ce07b521e1a067242d31", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "4b5eeac5023c94ef97f96ec3ac1d631b47906435", + "version-string": "1.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/parson.json b/port_versions/p-/parson.json new file mode 100644 index 00000000000000..87951239a0b627 --- /dev/null +++ b/port_versions/p-/parson.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "33cc29e8ca91bd2f207c5c352345ce242251d9cb", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "60378e28a0e8e71f2036876340f6aeaa7a2bd755", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "d39981054811de128b20a9285f9ef5cbe72270eb", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "a1413d36f39161c94236ef8fbcf4758d567953d6", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "7dba904ce71df66c5f256a0756a8e5e912f94b0c", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "8750917b914a687ac5dc81472b2416c6147810c2", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "f894640f4e7e1fd57f95fb296e701cd63d28b530", + "version-string": "2018-08-03", + "port-version": 0 + }, + { + "git-tree": "2c8bdd8568b0f4f6371d537750b9399c1a5b2086", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "27152c8ea7d3eeb3227a6b863f33e543083e70a3", + "version-string": "2018-04-17", + "port-version": 0 + }, + { + "git-tree": "0d1d17c5dad5c93db253e31572f49a9ba90cc88f", + "version-string": "2018-03-23", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pbc.json b/port_versions/p-/pbc.json new file mode 100644 index 00000000000000..d9c519f0e79673 --- /dev/null +++ b/port_versions/p-/pbc.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "b34d75a16c61743f6457040420ea6af43f29c9fe", + "version-string": "0.5.14", + "port-version": 4 + }, + { + "git-tree": "a7efc53c21bc71f5281207f0cc8566a9d39e78b9", + "version-string": "0.5.14", + "port-version": 3 + }, + { + "git-tree": "efed6182b1507e10efc64eea1a574402049cd356", + "version-string": "0.5.14-2", + "port-version": 0 + }, + { + "git-tree": "424e8c9fc9c31071b0f23cd4a35f20e2c0d0cdd6", + "version-string": "0.5.14-1", + "port-version": 0 + }, + { + "git-tree": "a2299226536c5726d542821d588198f3452e61f1", + "version-string": "0.5.14", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pcg.json b/port_versions/p-/pcg.json new file mode 100644 index 00000000000000..75e9a421f464e1 --- /dev/null +++ b/port_versions/p-/pcg.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "62fbb9c1c9a45c8fae6db35ac29c66a58176d722", + "version-string": "0.98.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pcl.json b/port_versions/p-/pcl.json new file mode 100644 index 00000000000000..9c098e49b1d29f --- /dev/null +++ b/port_versions/p-/pcl.json @@ -0,0 +1,189 @@ +{ + "versions": [ + { + "git-tree": "ec0a23d0b9414a2df0dffcf2ae613bd4e99c35b1", + "version-string": "1.11.1", + "port-version": 1 + }, + { + "git-tree": "e781efb7616a58439447593e20c19a1edc92e52c", + "version-string": "1.11.1", + "port-version": 0 + }, + { + "git-tree": "a6f92a0208bb7a88a93abe587be48a7e4c7799f4", + "version-string": "1.11.0", + "port-version": 3 + }, + { + "git-tree": "3e0ef448dccdbee9887a9335ee50a0a06a9d4cfd", + "version-string": "1.11.0", + "port-version": 2 + }, + { + "git-tree": "a23465cba2e11ed2b6f8d5fb1898ab5c535293e6", + "version-string": "1.11.0", + "port-version": 1 + }, + { + "git-tree": "67b76312f4eafd6753a2d2a8b7e77da45362d975", + "version-string": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "5650e74a979ec8e2bb33217cf77f6ca04109cac7", + "version-string": "1.9.1-13", + "port-version": 0 + }, + { + "git-tree": "9b36237034c639a4088d2d4955288d0ef0ab7c5e", + "version-string": "1.9.1-12", + "port-version": 0 + }, + { + "git-tree": "cab5e960682a92ea88a1af6cac8f18209dea3809", + "version-string": "1.9.1-11", + "port-version": 0 + }, + { + "git-tree": "fc62f99694f69e5da61b69108134a0eb97ead6f4", + "version-string": "1.9.1-10", + "port-version": 0 + }, + { + "git-tree": "0ccce6a5abaf992ab5fa1b48d7d7472ca4acac7a", + "version-string": "1.9.1-9", + "port-version": 0 + }, + { + "git-tree": "113d598e53fe6e3ea5941fd5d850787d28455b34", + "version-string": "1.9.1-8", + "port-version": 0 + }, + { + "git-tree": "7a50a3ed2863cccbfe6c7de551cbb424b9a1808b", + "version-string": "1.9.1-7", + "port-version": 0 + }, + { + "git-tree": "7e6a1b006f72805cd04ff80a336fe7fd8e10fab1", + "version-string": "1.9.1-6", + "port-version": 0 + }, + { + "git-tree": "0a0a181fe1e74ae342306e9b50ccb77e70dfb23b", + "version-string": "1.9.1-5", + "port-version": 0 + }, + { + "git-tree": "42ac2ab2ca4c251f4741f958a24daf431b3a97e9", + "version-string": "1.9.1-4", + "port-version": 0 + }, + { + "git-tree": "261f836d808ebc0e8c7d151b650bf689965f8cac", + "version-string": "1.9.1-3", + "port-version": 0 + }, + { + "git-tree": "cecc155b5f5c924134ff113486c4064b1591a4bf", + "version-string": "1.9.1-2", + "port-version": 0 + }, + { + "git-tree": "8cdc7c29e8499767f1c0ce52a2c137c3bb3ca50a", + "version-string": "1.9.1-1", + "port-version": 0 + }, + { + "git-tree": "55758642f09eae88ac8f0abf7402c88e76b5e86b", + "version-string": "1.9.0-1", + "port-version": 0 + }, + { + "git-tree": "3a973a70d8b8f4ac7f9a36d1b51711c1c1faa90f", + "version-string": "1.8.1-12", + "port-version": 0 + }, + { + "git-tree": "63163e650908acd32a47d869c732445dbf7fa08d", + "version-string": "1.8.1-11", + "port-version": 0 + }, + { + "git-tree": "d651d8884fa10e4b904bd3ab4af84e69fde6c3f7", + "version-string": "1.8.1-10", + "port-version": 0 + }, + { + "git-tree": "d9f4b5f0e46f3e105971efb3bae3f35775cebf77", + "version-string": "1.8.1-9", + "port-version": 0 + }, + { + "git-tree": "562579fad1ec4848eda4173d882af91307e532e7", + "version-string": "1.8.1-8", + "port-version": 0 + }, + { + "git-tree": "017646d12ec70c9c3492ceb7eed53301b4d0927b", + "version-string": "1.8.1-7", + "port-version": 0 + }, + { + "git-tree": "ee876e855a5bf85cfe5dc8e20b3927d76230848f", + "version-string": "1.8.1-6", + "port-version": 0 + }, + { + "git-tree": "570499d781490d60f410a2b053900aa8a3f1328c", + "version-string": "1.8.1-5", + "port-version": 0 + }, + { + "git-tree": "12347707c0057eb49b5ec6d75c42899e776ff70a", + "version-string": "1.8.1-4", + "port-version": 0 + }, + { + "git-tree": "2990aea7090448711bf7b5c139efa0e6c9434895", + "version-string": "1.8.1-3", + "port-version": 0 + }, + { + "git-tree": "89f5ca02ee4f26d1126d1da58cbbb963c77f29cc", + "version-string": "1.8.1-2", + "port-version": 0 + }, + { + "git-tree": "d345990fb5e631e70f108edb72527f288e030cc5", + "version-string": "1.8.1-1", + "port-version": 0 + }, + { + "git-tree": "218e16b624181aa49c658e5331b4db7c9c85e216", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "0aebbb5cd9ad1fb4c6559ad32d86ade75a6d29d0", + "version-string": "1.8.1rc2", + "port-version": 0 + }, + { + "git-tree": "9d6765a52ac0859126813b93766eee7d6de05af0", + "version-string": "1.8.1rc1-1", + "port-version": 0 + }, + { + "git-tree": "94c863573d453941a25a57d92999af38fa8b77e9", + "version-string": "1.8.1rc1", + "port-version": 0 + }, + { + "git-tree": "0b53942b897c7a854af51e8c09253fdb50c426c8", + "version-string": "1.8.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pcre.json b/port_versions/p-/pcre.json new file mode 100644 index 00000000000000..952fc1b7a77621 --- /dev/null +++ b/port_versions/p-/pcre.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "69e232f12c4e3eab4115f0672466a6661978bea2", + "version-string": "8.44", + "port-version": 8 + }, + { + "git-tree": "bb73c18e72c449b35a3cd011490d58fe39f9ecc5", + "version-string": "8.44", + "port-version": 7 + }, + { + "git-tree": "c1c1f71db3aea57c6b7539ce269b0ac906a6c1d2", + "version-string": "8.44", + "port-version": 6 + }, + { + "git-tree": "2da92fb03a2a83d100c91ddaac08f895ded249a5", + "version-string": "8.44", + "port-version": 5 + }, + { + "git-tree": "e8c72bb6d65fb217a0781dab9c96cbb0515bc4cd", + "version-string": "8.44-4", + "port-version": 0 + }, + { + "git-tree": "60412518c0f4de43177bcb4d0169a8dad76cdd14", + "version-string": "8.44-2", + "port-version": 0 + }, + { + "git-tree": "7b0d523a0054c145bc9f03dcf61f893ae66716c8", + "version-string": "8.44-1", + "port-version": 0 + }, + { + "git-tree": "b7515f8e23e83eede9d447b13143a36e832363b4", + "version-string": "8.44", + "port-version": 0 + }, + { + "git-tree": "1c12add88c46ee3f7633632d772d700e423d34c9", + "version-string": "8.41-4", + "port-version": 0 + }, + { + "git-tree": "a7b1012ceb39e76faed73cc79ef8b961bc8e15d8", + "version-string": "8.41-3", + "port-version": 0 + }, + { + "git-tree": "83914398aa1345710569da01946b782c2f379ed8", + "version-string": "8.41-2", + "port-version": 0 + }, + { + "git-tree": "161f6ef679e99ad07b2b54a72d0f96c70b414bf8", + "version-string": "8.41-1", + "port-version": 0 + }, + { + "git-tree": "8d77e4b2b7bb5614331c1bae6011dc0e2e1928a6", + "version-string": "8.41", + "port-version": 0 + }, + { + "git-tree": "5d6b2133b1e181001856de61e5bed3944428e9f7", + "version-string": "8.40-1", + "port-version": 0 + }, + { + "git-tree": "18b83c6ee88bc58e0230d6b1f3e81dd12d4e5823", + "version-string": "8.40", + "port-version": 0 + }, + { + "git-tree": "d83a174d15520f5fe099d4cbb7a3d837d9ab380a", + "version-string": "8.38-1", + "port-version": 0 + }, + { + "git-tree": "aa3902c58f39a879f3f59253cd490d28b23923fe", + "version-string": "8.38", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pcre2.json b/port_versions/p-/pcre2.json new file mode 100644 index 00000000000000..8f30cf71f58383 --- /dev/null +++ b/port_versions/p-/pcre2.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "c0357d3b67540bd7e46f4301e5e1507ecddfaa1e", + "version-string": "10.35", + "port-version": 2 + }, + { + "git-tree": "01d66cf1c0c0d5bfc43c78aa8c6ddbc7b044a09a", + "version-string": "10.35", + "port-version": 1 + }, + { + "git-tree": "59fea9296090b695c766dbe6bc46f6e9f6a573d1", + "version-string": "10.35", + "port-version": 0 + }, + { + "git-tree": "db46c2a24cd38d705b5d4911ade5010fa71c6eec", + "version-string": "10.30-9", + "port-version": 0 + }, + { + "git-tree": "27ba1145956b6e8ed834e84fc76f3d0ed5a42f96", + "version-string": "10.30-8", + "port-version": 0 + }, + { + "git-tree": "4634f38f2dddc91a14bebec547ec4b8e7f24c587", + "version-string": "10.30-7", + "port-version": 0 + }, + { + "git-tree": "f93934968e7ad2eca3b9f881abd2f26c9137f55c", + "version-string": "10.30-6", + "port-version": 0 + }, + { + "git-tree": "f604be0d979cf6b43f2f67ba0b20692a1383fd79", + "version-string": "10.30-5", + "port-version": 0 + }, + { + "git-tree": "7b71c608a1c72c658dfdfb0739ad2d6e7f7d4f10", + "version-string": "10.30-4", + "port-version": 0 + }, + { + "git-tree": "7644adc498156f83c3421651a0a43908720bd911", + "version-string": "10.30-5", + "port-version": 0 + }, + { + "git-tree": "547d23a9c0ad367c277805f986e3d3c8195888ea", + "version-string": "10.30-4", + "port-version": 0 + }, + { + "git-tree": "746323452a40a8970c28437c52f93b8aee6d125a", + "version-string": "10.30-3", + "port-version": 0 + }, + { + "git-tree": "d5e2cf71845c8c3becc346e4081876b3815882ee", + "version-string": "10.30-2", + "port-version": 0 + }, + { + "git-tree": "58ae76c7d734a2966ba2d7be2f96c79de256aeb8", + "version-string": "10.30-1", + "port-version": 0 + }, + { + "git-tree": "b4f454c538299c5b3221442d3cb4092d12fe8466", + "version-string": "10.30", + "port-version": 0 + }, + { + "git-tree": "157535ab88b15f56f83724f3ebef48637bcc4f71", + "version-string": "10.23", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pdal-c.json b/port_versions/p-/pdal-c.json new file mode 100644 index 00000000000000..f3de324aa98eb3 --- /dev/null +++ b/port_versions/p-/pdal-c.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "12db5babd9f9ed569721106476c71ef2cd50cb13", + "version-string": "1.8-2", + "port-version": 0 + }, + { + "git-tree": "d91a09df4cf5a7fa0bfe40ed798de05330a76316", + "version-string": "1.8-1", + "port-version": 0 + }, + { + "git-tree": "0bbc662920efa9698a36ef10f2d5f7c0ffe345f0", + "version-string": "1.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pdal.json b/port_versions/p-/pdal.json new file mode 100644 index 00000000000000..0b4ac1dc2510ef --- /dev/null +++ b/port_versions/p-/pdal.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "e8b9d999c233cc564ff9eac48cf8e1d9b3094f1b", + "version-string": "1.7.1", + "port-version": 10 + }, + { + "git-tree": "e6c3776cc6d1b8a04b66ddf495798a408b1822f2", + "version-string": "1.7.1", + "port-version": 9 + }, + { + "git-tree": "d479587ff8e52f6baee283f66bf1b74e50dafc79", + "version-string": "1.7.1-8", + "port-version": 0 + }, + { + "git-tree": "7fe32fbdc6544598c4ab1dd6a0613385f45b4320", + "version-string": "1.7.1-7", + "port-version": 0 + }, + { + "git-tree": "ea9bfd9927ea126b0cde975f91e770f405196cad", + "version-string": "1.7.1-6", + "port-version": 0 + }, + { + "git-tree": "435332f746ffdf0e142178ad7897727a801c4b36", + "version-string": "1.7.1-5", + "port-version": 0 + }, + { + "git-tree": "5a2a7e54be2333fa159df0d66969c68bc251b27a", + "version-string": "1.7.1-4", + "port-version": 0 + }, + { + "git-tree": "ff855f581bbd9c963a3f30365b51ddb038063830", + "version-string": "1.7.1-3", + "port-version": 0 + }, + { + "git-tree": "656d2a1b9c0f8b6ba9a9a2715719fc6d9733d3c2", + "version-string": "1.7.1-2", + "port-version": 0 + }, + { + "git-tree": "f090f257f102532be9c66af99aef5aa938c39923", + "version-string": "1.7.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pdcurses.json b/port_versions/p-/pdcurses.json new file mode 100644 index 00000000000000..a16b170c191d15 --- /dev/null +++ b/port_versions/p-/pdcurses.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "ffec138e0a9a3b2894c8a0ecf58a14734c340025", + "version-string": "3.9", + "port-version": 0 + }, + { + "git-tree": "610c065a7fc1f98737cfb2571822c5604f544b02", + "version-string": "3.8-2", + "port-version": 0 + }, + { + "git-tree": "79ec77fc25179266ad285ef5670addcf4a793f16", + "version-string": "3.8-1", + "port-version": 0 + }, + { + "git-tree": "12343091e72a9303572e194f040e35b9a11d5223", + "version-string": "3.8", + "port-version": 0 + }, + { + "git-tree": "4bd66785a4990ff99b3396c769469605ea06ad4e", + "version-string": "3.6", + "port-version": 0 + }, + { + "git-tree": "4cce2371db93d6c7ee050226675fce0acbe874be", + "version-string": "3.4-1", + "port-version": 0 + }, + { + "git-tree": "b0e555f795330fef4b840bf0c1c3f2fe58338694", + "version-string": "3.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pdqsort.json b/port_versions/p-/pdqsort.json new file mode 100644 index 00000000000000..5a6d274f8e3fdd --- /dev/null +++ b/port_versions/p-/pdqsort.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2aee3f0b215c924e6ba8c818fb8fb5258db6db66", + "version-string": "2019-07-30", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pe-parse.json b/port_versions/p-/pe-parse.json new file mode 100644 index 00000000000000..7417efac770132 --- /dev/null +++ b/port_versions/p-/pe-parse.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b26d3371c165c5888f2aca0c7c63107fa2ea1fdc", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pegtl-2.json b/port_versions/p-/pegtl-2.json new file mode 100644 index 00000000000000..746bf066c9d60c --- /dev/null +++ b/port_versions/p-/pegtl-2.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "4791faebde499af884cdd281572c83779ba98834", + "version-string": "2.8.3", + "port-version": 0 + }, + { + "git-tree": "e62318eb75f783792c4ee2d5da4ddab2cfaf6c75", + "version-string": "2.8.1-1", + "port-version": 0 + }, + { + "git-tree": "643b531ba9850e6f6720e43bc4b785b073617b7b", + "version-string": "2.8.1", + "port-version": 0 + }, + { + "git-tree": "687cc1e20ad8b33bb084cf3c80f3e625c1ec82e6", + "version-string": "2.8.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pegtl.json b/port_versions/p-/pegtl.json new file mode 100644 index 00000000000000..f3fe7c04d6a1ae --- /dev/null +++ b/port_versions/p-/pegtl.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "d90ba3461a4253fee67f84ef2ca0232b21a4f24b", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "23d4aa0b7c206ea3d4b6d32f74bb2a62e2855151", + "version-string": "2020-12-07", + "port-version": 0 + }, + { + "git-tree": "71d6cdd8c45bb7038a9701cd37358bfbc72c86b3", + "version-string": "3.0.0-pre-70971f4", + "port-version": 0 + }, + { + "git-tree": "76f73003993b31ddc2e13017c7255eb007626e41", + "version-string": "3.0.0-pre-83b6cdc", + "port-version": 0 + }, + { + "git-tree": "422e0eb2271db37b8bff94b1f4be79f4926b6b22", + "version-string": "3.0.0-pre-9d58962", + "port-version": 0 + }, + { + "git-tree": "9d2b98a3f97d8fae3538a7fd197cac3500b4c3e4", + "version-string": "3.0.0-pre-697aaa0", + "port-version": 0 + }, + { + "git-tree": "12b421a77d442668ddb00817a79d8e0c2605bed9", + "version-string": "3.0.0-pre", + "port-version": 0 + }, + { + "git-tree": "5995adbca591660d02a6a879f88347bed8076e04", + "version-string": "2.8.0", + "port-version": 0 + }, + { + "git-tree": "b4bacb9da64ab603810c366fc43ccdf474b9ef50", + "version-string": "2.7.1", + "port-version": 0 + }, + { + "git-tree": "33cefe6764e95e43f3176a0bd498c8ce69be4fe3", + "version-string": "2.6.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pfring.json b/port_versions/p-/pfring.json new file mode 100644 index 00000000000000..358e78a9579338 --- /dev/null +++ b/port_versions/p-/pfring.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d6f178fb757726e3c9140f39ec0d74c49dded7ce", + "version-string": "2019-10-17-2", + "port-version": 0 + }, + { + "git-tree": "796da380cc6317b6035d18ba0e32b1d82031c9a4", + "version-string": "2019-10-17-1", + "port-version": 0 + }, + { + "git-tree": "9c6c563492d696e91d24df47285e89f7a62364e5", + "version-string": "2019-10-17", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pfultz2-linq.json b/port_versions/p-/pfultz2-linq.json new file mode 100644 index 00000000000000..a62e341b638700 --- /dev/null +++ b/port_versions/p-/pfultz2-linq.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "8d87cd259fa28073f259c3bf09f97870b2fa64a9", + "version-string": "2019-05-14", + "port-version": 0 + }, + { + "git-tree": "39a3f4594cebb1a3086e8c3434d0a8663693a06b", + "version-string": "2018-02-08", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/phnt.json b/port_versions/p-/phnt.json new file mode 100644 index 00000000000000..74cf0ef95336e8 --- /dev/null +++ b/port_versions/p-/phnt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fa7a8a91ecb156614e8a72657f76fd6220624525", + "version-string": "2019-05-01", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/physfs.json b/port_versions/p-/physfs.json new file mode 100644 index 00000000000000..575635f88e1ba4 --- /dev/null +++ b/port_versions/p-/physfs.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "aa1952ceb05b35ac1b2ce1a91aafcffbf7ef9c0b", + "version-string": "3.0.2-2", + "port-version": 0 + }, + { + "git-tree": "005b474f9738ed5a15bec6eccc4ebd1b3f7d0efc", + "version-string": "3.0.2-1", + "port-version": 0 + }, + { + "git-tree": "3e4a965f3a666b4a9e8413a8b4ee0965d42c7772", + "version-string": "3.0.2", + "port-version": 0 + }, + { + "git-tree": "76348c1c0ed43af112a0ca513f96baac12e82561", + "version-string": "3.0.1-1", + "port-version": 0 + }, + { + "git-tree": "71757d92b59e015c35c03d892a506e2a5621daa7", + "version-string": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "8dd48070ac9d25ba329410da800c72aae27bbc31", + "version-string": "2.0.3-2", + "port-version": 0 + }, + { + "git-tree": "611ae2d8ada47f9f42bd4104abb07e3d4c432010", + "version-string": "2.0.3-1", + "port-version": 0 + }, + { + "git-tree": "84a928be31293306727e27d915366be664739b04", + "version-string": "2.0.3", + "port-version": 0 + }, + { + "git-tree": "2258b768d0ec597d09061904dcb5e2f416ed087c", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/physx.json b/port_versions/p-/physx.json new file mode 100644 index 00000000000000..87c48b1cdfd20b --- /dev/null +++ b/port_versions/p-/physx.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "ff229b023b059806554bb8d9e6fbc2b4eb0fe139", + "version-string": "4.1.1", + "port-version": 6 + }, + { + "git-tree": "3eb98f73f888b069297777256c7b78adebf1fc5d", + "version-string": "4.1.1", + "port-version": 5 + }, + { + "git-tree": "d5a5b51f2a1220799f9bce24defb0816678660a9", + "version-string": "4.1.1", + "port-version": 4 + }, + { + "git-tree": "02023d7a7f94423771480bf417be12bd3d961a9f", + "version-string": "4.1.1-3", + "port-version": 0 + }, + { + "git-tree": "43be360a61b02e4277ecc85a7fea1a5498b97b59", + "version-string": "4.1.1-2", + "port-version": 0 + }, + { + "git-tree": "529f0e645ed48c2aacd219483bd305000d6c3796", + "version-string": "4.1.1-1", + "port-version": 0 + }, + { + "git-tree": "1eaea35e626746a82b4244166bb54d60b1902eba", + "version-string": "commit-624f2cb6c0392013d54b235d9072a49d01c3cb6c", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/picojson.json b/port_versions/p-/picojson.json new file mode 100644 index 00000000000000..c0849c0253dd6b --- /dev/null +++ b/port_versions/p-/picojson.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "2b279f9df600324345fc6752960d63a176595168", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "57494130807cb3281002e3f1f0a462294c69f618", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "e23c856810bfc133cc92d1f299728bfacef2cf41", + "version-string": "1.3.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/picosha2.json b/port_versions/p-/picosha2.json new file mode 100644 index 00000000000000..f004ba2ba0c615 --- /dev/null +++ b/port_versions/p-/picosha2.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "eb0b4d7431fa28a8d61a52f014070d664b170992", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "4d7ad8958d8a6a7ba3fd887f090705bc4880929a", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "b4a3933f7163139ca1f4fc2c7e60d78e678b7dee", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "418d30303aac2beedb77598f0fea978e8b72a002", + "version-string": "2017-09-01-c5ff159b6", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/piex.json b/port_versions/p-/piex.json new file mode 100644 index 00000000000000..141d6c65668238 --- /dev/null +++ b/port_versions/p-/piex.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "df177c4ae73fb30b438f741d2a362199a3dbc735", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "cc5c3b9f8c60c95e3f4809340c7bf9d6d20cc1bd", + "version-string": "2018-03-13-1", + "port-version": 0 + }, + { + "git-tree": "74cb5d12c4ebb7d2cf0151fceab4ca45a9ba224b", + "version-string": "2018-03-13", + "port-version": 0 + }, + { + "git-tree": "6cb3bcbe0d69da96ac9674a52600e36b0814a1ec", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "99ca546a38452b45f937a970e7c39cdab0383f4d", + "version-string": "2017-09-01-473434f2dd974978b-1", + "port-version": 0 + }, + { + "git-tree": "f9945e5452a07831d28d8774f2a2e254475b030d", + "version-string": "2017-09-01-473434f2dd974978b", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pistache.json b/port_versions/p-/pistache.json new file mode 100644 index 00000000000000..2c9491e148a03e --- /dev/null +++ b/port_versions/p-/pistache.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "63fa37bfa9925b106a2e5a66db9133e381dc499e", + "version-string": "2019-08-05", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pixel.json b/port_versions/p-/pixel.json new file mode 100644 index 00000000000000..b2d6da52c212d2 --- /dev/null +++ b/port_versions/p-/pixel.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9c2f4ccc6c5ca30c268af6a115f7933ffb972deb", + "version-string": "0.3-1", + "port-version": 0 + }, + { + "git-tree": "653dc998813165593d92fa5797cec7371e60b141", + "version-string": "0.3", + "port-version": 0 + }, + { + "git-tree": "1c1a5a5526e461a80c146d751cfadd807add018d", + "version-string": "0.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pixman.json b/port_versions/p-/pixman.json new file mode 100644 index 00000000000000..6daee6513416f1 --- /dev/null +++ b/port_versions/p-/pixman.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "3cb6610f632460553bb2ae5fe3838e15880dc7e2", + "version-string": "0.38.4", + "port-version": 2 + }, + { + "git-tree": "055b612e99d658047ab8dfde43c375ddc46a14cc", + "version-string": "0.38.4-1", + "port-version": 0 + }, + { + "git-tree": "94a39fe731a38eb8cec354603146a99f4ebbf801", + "version-string": "0.38.0-4", + "port-version": 0 + }, + { + "git-tree": "9a943134e4d25ed418074fe46bde99fda69dd0a3", + "version-string": "0.38.0-3", + "port-version": 0 + }, + { + "git-tree": "8e1d0df50ad1a7157038c30ac0df05c8c641af17", + "version-string": "0.38.0-2", + "port-version": 0 + }, + { + "git-tree": "941fe8704e7a700ea959fe3d712b4a25c5487273", + "version-string": "0.38.0-1", + "port-version": 0 + }, + { + "git-tree": "2fe5e56b972d30146a9a652699efc68fddd51f5c", + "version-string": "0.38.0", + "port-version": 0 + }, + { + "git-tree": "72621d1b5b83e9004c56e8308881113a9c1aeb30", + "version-string": "0.34.0-5", + "port-version": 0 + }, + { + "git-tree": "c43aa78219eacf1d9542206a3fe0df57ba5eb23a", + "version-string": "0.34.0-4", + "port-version": 0 + }, + { + "git-tree": "f323614f8dd54123fc4150de48d339dd8049d6c4", + "version-string": "0.34.0-3", + "port-version": 0 + }, + { + "git-tree": "b2adf28aa373451ba8fd3ab3c38963586df67a1b", + "version-string": "0.34.0-2", + "port-version": 0 + }, + { + "git-tree": "4cd65135e016a10836eaaf013fa49ca7c026076a", + "version-string": "0.34.0-1", + "port-version": 0 + }, + { + "git-tree": "e210c31fe945276abc702683a7878c804d46a497", + "version-string": "0.34.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/platform-folders.json b/port_versions/p-/platform-folders.json new file mode 100644 index 00000000000000..c2dfa76fb10a49 --- /dev/null +++ b/port_versions/p-/platform-folders.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "525005e82b0437cb956fb714916898603f37e570", + "version-string": "4.0.0", + "port-version": 6 + }, + { + "git-tree": "719eb3aa8561ce7439ae8b911d848fca330803ce", + "version-string": "4.0.0-5", + "port-version": 0 + }, + { + "git-tree": "ccefcbe17546ed50455e6e715db0afbc184f70cc", + "version-string": "4.0.0-4", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/plf-colony.json b/port_versions/p-/plf-colony.json new file mode 100644 index 00000000000000..0935962f14f0d8 --- /dev/null +++ b/port_versions/p-/plf-colony.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "0d9c2c09b2926db03ddd83cf09973d885cfc292b", + "version-string": "5.33", + "port-version": 0 + }, + { + "git-tree": "957c9c3c1849268340896febc7620f01ceada30e", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/plf-list.json b/port_versions/p-/plf-list.json new file mode 100644 index 00000000000000..e208ba999fefea --- /dev/null +++ b/port_versions/p-/plf-list.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6afb43e539d06a946299ba56ef6cbf5d72715acb", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/plf-nanotimer.json b/port_versions/p-/plf-nanotimer.json new file mode 100644 index 00000000000000..45c74b407ad30d --- /dev/null +++ b/port_versions/p-/plf-nanotimer.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "49c347d28b6f25c49e1536f411339226b58c68c3", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/plf-stack.json b/port_versions/p-/plf-stack.json new file mode 100644 index 00000000000000..c77c8d4d0f6299 --- /dev/null +++ b/port_versions/p-/plf-stack.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "67b6827a13ddf2a0438a5dd372f02c5f6d9079cf", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/plib.json b/port_versions/p-/plib.json new file mode 100644 index 00000000000000..d0da07d07f73e7 --- /dev/null +++ b/port_versions/p-/plib.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "94d884dc742498b586da39691d31cd6b22c7e236", + "version-string": "1.8.5-4", + "port-version": 0 + }, + { + "git-tree": "9f144af9dae3bd3f1e124340b2600136ba378b9f", + "version-string": "1.8.5-3", + "port-version": 0 + }, + { + "git-tree": "655b81cfce60c5d7f2a2fd9a22382890c98c2b6c", + "version-string": "1.8.5-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/plibsys.json b/port_versions/p-/plibsys.json new file mode 100644 index 00000000000000..7f3878cac2d73e --- /dev/null +++ b/port_versions/p-/plibsys.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "5f4a0abe78a0c1bd3e077d96141a1f2d541e0595", + "version-string": "0.0.4", + "port-version": 4 + }, + { + "git-tree": "65a4101fc0491a0d5b4c548e97bdc9c0b194d03d", + "version-string": "0.0.4-3", + "port-version": 0 + }, + { + "git-tree": "4db830a17a2f08dc97fb3e10bbfabe78bc4868f6", + "version-string": "0.0.4-2", + "port-version": 0 + }, + { + "git-tree": "1d1e94cf4d241171a23bdb7d7c95413834d8aed1", + "version-string": "0.0.4-1", + "port-version": 0 + }, + { + "git-tree": "2ca0683379e95642b6ee9bf7ce39d59f6b8f559a", + "version-string": "0.0.3-1", + "port-version": 0 + }, + { + "git-tree": "c8f3dce970ba90e5f1105b824ffc5cdf6d291106", + "version-string": "0.0.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/plog.json b/port_versions/p-/plog.json new file mode 100644 index 00000000000000..d7bf798a5b3b15 --- /dev/null +++ b/port_versions/p-/plog.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "4f4d184ac766682a2b337e2fb7cfaa0ebed61330", + "version-string": "1.1.5", + "port-version": 0 + }, + { + "git-tree": "593579cfa5dda0525a07480485c918e29d736dfd", + "version-string": "1.1.4", + "port-version": 0 + }, + { + "git-tree": "2959436e8c38d4c523943d7954921b23683cd5cd", + "version-string": "1.1.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/plplot.json b/port_versions/p-/plplot.json new file mode 100644 index 00000000000000..ca18d910ce0dc9 --- /dev/null +++ b/port_versions/p-/plplot.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "3a66c489f5aa8d94b9b171561bfe15b65fb71396", + "version-string": "5.13.0", + "port-version": 9 + }, + { + "git-tree": "475388874394af7ded3794fb81c2947e0633cec1", + "version-string": "5.13.0-8", + "port-version": 0 + }, + { + "git-tree": "d9f0471c3054b916312db6508c52804875a276fc", + "version-string": "5.13.0-6", + "port-version": 0 + }, + { + "git-tree": "fe938536c0fd0d4f2581f42158c0c8f6aa66e3f1", + "version-string": "5.13.0-5", + "port-version": 0 + }, + { + "git-tree": "cdbc4973a16b5c64b3174b4f1918bf21f79b95a0", + "version-string": "5.13.0-4", + "port-version": 0 + }, + { + "git-tree": "7951e7af5d06df39aed1c16a4db17081c4f5dcc1", + "version-string": "5.13.0-3", + "port-version": 0 + }, + { + "git-tree": "4e1f5467f8c7afc29ebaf410a9131aedf6c6459f", + "version-string": "5.13.0-2", + "port-version": 0 + }, + { + "git-tree": "b8b09a5d85a13e2883674b7cd8dce3ac4b360f94", + "version-string": "5.13.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/plustache.json b/port_versions/p-/plustache.json new file mode 100644 index 00000000000000..7bd232826ecffd --- /dev/null +++ b/port_versions/p-/plustache.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a2646069857f5a6e1b34f479b8fbcdac5fd5daf7", + "version-string": "0.4.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pmdk.json b/port_versions/p-/pmdk.json new file mode 100644 index 00000000000000..ab02e859f38d16 --- /dev/null +++ b/port_versions/p-/pmdk.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "f71d109fdac523675cae5c60bb81194e654de8f6", + "version-string": "1.9", + "port-version": 0 + }, + { + "git-tree": "972149a47f1ea89a77bbe84f9d462ac9d913600f", + "version-string": "1.8", + "port-version": 0 + }, + { + "git-tree": "2e96a3bf1d5202322c0e0497461a8ad16eb3f5fd", + "version-string": "1.7-1", + "port-version": 0 + }, + { + "git-tree": "4d20dd4936ae9eef8ffb62d92fb97a5aced3242c", + "version-string": "1.7", + "port-version": 0 + }, + { + "git-tree": "a1d7f8e5a74bab4bf6307044f7aea0555b6ce011", + "version-string": "2019-10-10", + "port-version": 0 + }, + { + "git-tree": "78f0727afe58396715c803add0ab7f50cd6afbf3", + "version-string": "1.6-3", + "port-version": 0 + }, + { + "git-tree": "8e76826f0034e43f5b9babea661ac2163aec500f", + "version-string": "1.6-1", + "port-version": 0 + }, + { + "git-tree": "9237ae36269293953e2bf22e184ad7bbfd7b8fb2", + "version-string": "1.6", + "port-version": 0 + }, + { + "git-tree": "658882510c2a63cc1240bcccbd010433b5eb19e1", + "version-string": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "85c180890dff1257769f242b19c60ce59dde98eb", + "version-string": "1.4.1-1", + "port-version": 0 + }, + { + "git-tree": "707df081bd35a1585d40e8e566c2a3494afa6b95", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "34cc0c8ca9158297a72c6f2a6ea9f6680e0d99a0", + "version-string": "1.4-2", + "port-version": 0 + }, + { + "git-tree": "6a13627bcd29813f895a985404c281f87217546d", + "version-string": "1.4-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pngpp.json b/port_versions/p-/pngpp.json new file mode 100644 index 00000000000000..e10941e2f054cc --- /dev/null +++ b/port_versions/p-/pngpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4c162ef0d91f9415a77e44bd02f9bd3abf3684e1", + "version-string": "0.2.10", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pngwriter.json b/port_versions/p-/pngwriter.json new file mode 100644 index 00000000000000..5f63db865bb4ab --- /dev/null +++ b/port_versions/p-/pngwriter.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "8f5f1c653f1c9935bcf922a814d553318151e06f", + "version-string": "0.7.0-2", + "port-version": 0 + }, + { + "git-tree": "1f307643b0c83ffab637227a4dd494e0864991fe", + "version-string": "0.7.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/poco.json b/port_versions/p-/poco.json new file mode 100644 index 00000000000000..2d40ac34e1020a --- /dev/null +++ b/port_versions/p-/poco.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "cfe171c7ba27d9319ec61d5972aa249df4d025b8", + "version-string": "1.10.1", + "port-version": 3 + }, + { + "git-tree": "fa9929ec29186d2a5866bf03a2dfe667cc5fd898", + "version-string": "1.10.1", + "port-version": 2 + }, + { + "git-tree": "1b170d2e7ff8af64a359070c03a7e430ce9111c2", + "version-string": "1.10.1", + "port-version": 1 + }, + { + "git-tree": "efca0938f364300ca8fe34bf92a67f8a90720c93", + "version-string": "1.10.1", + "port-version": 0 + }, + { + "git-tree": "2463e8b06eb130563218f4b93110eeb1a8e05a71", + "version-string": "1.9.2", + "port-version": 4 + }, + { + "git-tree": "058cd4d646754bf68aea068744f5e21e5442cee6", + "version-string": "1.9.2", + "port-version": 3 + }, + { + "git-tree": "3a334472d14a19eaebc6e94d6b70c720b708d234", + "version-string": "1.9.2-2", + "port-version": 0 + }, + { + "git-tree": "a42c7b13669dfb22cb2acc7ed598a3b219e46e4b", + "version-string": "1.9.2-1", + "port-version": 0 + }, + { + "git-tree": "4d6f55f64b030aeeb5924ae6916b27cc10d32670", + "version-string": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "bf5b277bc6aca291f543b0a488257e387bd97321", + "version-string": "2.0.0-pre-3", + "port-version": 0 + }, + { + "git-tree": "8a40a8529441a423559223af8c4c9bdf7e9abcc4", + "version-string": "2.0.0-pre-2", + "port-version": 0 + }, + { + "git-tree": "ac5c289cac64531de9e626955f8f0e64960175ee", + "version-string": "2.0.0-pre-1", + "port-version": 0 + }, + { + "git-tree": "f1301ee2e48db33ee285b9b1fa51e365e41b0af3", + "version-string": "2.0.0-pre", + "port-version": 0 + }, + { + "git-tree": "a4e2c0b1b847fd75419a7c6133631bf7b12c9a75", + "version-string": "1.9.0-1", + "port-version": 0 + }, + { + "git-tree": "c53eaa53cc6b0f7c1aef9470fe226313d1ca564f", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "6c05e0404dcc333e27140509ed9be3ec02d03421", + "version-string": "1.8.1-2", + "port-version": 0 + }, + { + "git-tree": "c1fcb49a097cff44a577c3910963c15399bb199c", + "version-string": "1.8.1-1", + "port-version": 0 + }, + { + "git-tree": "5125280ba28bac890cf500bb3df417f7238e7a02", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "520046b9d229154ab3a6c9db156ce588ae0625d2", + "version-string": "1.8.0.1", + "port-version": 0 + }, + { + "git-tree": "13d05f50bbfd035f3c9ad91d05f7d2a6ff1cf5ed", + "version-string": "1.7.8-2", + "port-version": 0 + }, + { + "git-tree": "47cc7722a606ca76b3844e37d8cddf77d0ab09e7", + "version-string": "1.7.8-1", + "port-version": 0 + }, + { + "git-tree": "3cbce0faeb27f2b123437085d15f9ea87ef8cf7b", + "version-string": "1.7.8", + "port-version": 0 + }, + { + "git-tree": "ca706ad255bb3d88b7d419368cc578cbc5ea8c8e", + "version-string": "1.7.6-4", + "port-version": 0 + }, + { + "git-tree": "f4c302c1ac9f3cd2a0619ad5fdf31462ab591db4", + "version-string": "1.7.6-3", + "port-version": 0 + }, + { + "git-tree": "a8881e552c32c0a71a77d3ad75f0ea1d1bdf679c", + "version-string": "1.7.6-2", + "port-version": 0 + }, + { + "git-tree": "33b5b927b5ef57b6e5f20882d36f0a74f479154d", + "version-string": "1.7.6-1", + "port-version": 0 + }, + { + "git-tree": "7c8db8567b3cb678fab656f20d26466965449712", + "version-string": "1.7.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/podofo.json b/port_versions/p-/podofo.json new file mode 100644 index 00000000000000..ceb34b0ed6976e --- /dev/null +++ b/port_versions/p-/podofo.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "8ab65ed2018a120250dafbdeadc9ef87957d2cb4", + "version-string": "0.9.6", + "port-version": 12 + }, + { + "git-tree": "d343d8239896a8620dcd804a062309b2e7b75205", + "version-string": "0.9.6-11", + "port-version": 0 + }, + { + "git-tree": "3251a5817d1c7bfd5b5f0c38f188c4401d5023ab", + "version-string": "0.9.6-9", + "port-version": 0 + }, + { + "git-tree": "1578a8300dddbd91ceaab3142f14b41491f4e099", + "version-string": "0.9.6-8", + "port-version": 0 + }, + { + "git-tree": "1ca1a8fbcfbdee75df7a36f8822f9c5b77c150b8", + "version-string": "0.9.6-7", + "port-version": 0 + }, + { + "git-tree": "8ce2354b64ebde4e7a5ed1f40541ade3faefd148", + "version-string": "0.9.6-6", + "port-version": 0 + }, + { + "git-tree": "ef7f769bde445c0ae62f7af85080f7eeeecc0d44", + "version-string": "0.9.6-5", + "port-version": 0 + }, + { + "git-tree": "1c9e392b1092734d6fa34deaccc4317a24d7867d", + "version-string": "0.9.6-3", + "port-version": 0 + }, + { + "git-tree": "7f0a9c0e63284969bee5d7fd0b79c5ce8f65f30f", + "version-string": "0.9.6-1", + "port-version": 0 + }, + { + "git-tree": "313a5f2a909755ef66774219d85a33a31dc13c8c", + "version-string": "0.9.6", + "port-version": 0 + }, + { + "git-tree": "77ef53eb66ccecbe1f24a2b6015fdf25c2ed12c6", + "version-string": "0.9.5-2", + "port-version": 0 + }, + { + "git-tree": "e86929ac51807752c0a8331a9b02bd8371835f44", + "version-string": "0.9.5-1", + "port-version": 0 + }, + { + "git-tree": "dd20fcb39c7a221402a34bd4f0aaf4ff779a6602", + "version-string": "0.9.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/poly2tri.json b/port_versions/p-/poly2tri.json new file mode 100644 index 00000000000000..c3b8cc0d9f2598 --- /dev/null +++ b/port_versions/p-/poly2tri.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "94527e6f87fb6b8d1ebe5362689b03c12f32ab64", + "version-string": "2020-07-21", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/polyclipping.json b/port_versions/p-/polyclipping.json new file mode 100644 index 00000000000000..1cb725b528d519 --- /dev/null +++ b/port_versions/p-/polyclipping.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "78ba6625af13a277933f9fabf45a755b9be3a43d", + "version-string": "6.4.2", + "port-version": 6 + }, + { + "git-tree": "0c57e2586514c74ee70e876457660ddc16984b36", + "version-string": "6.4.2", + "port-version": 5 + }, + { + "git-tree": "6638257385c48301e0df40241b00e4060b9336fb", + "version-string": "6.4.2-4", + "port-version": 0 + }, + { + "git-tree": "ebeeb41cb633f0ca508d1374ec7434309bd17028", + "version-string": "6.4.2-2", + "port-version": 0 + }, + { + "git-tree": "bd1eb98d3ae50cf2f6417b55544383fcc18435e7", + "version-string": "6.4.2-1", + "port-version": 0 + }, + { + "git-tree": "d791145197734667dabb01541241f71dd8c29bad", + "version-string": "6.4.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/polyhook2.json b/port_versions/p-/polyhook2.json new file mode 100644 index 00000000000000..715e3bbc463ea1 --- /dev/null +++ b/port_versions/p-/polyhook2.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "ed53517a6b3c746ae38fa66fc3f53e4a0995a3c7", + "version-string": "2021-01-08", + "port-version": 0 + }, + { + "git-tree": "b5584f0169f2455b61d60f8fd53c0d4e0fa2732f", + "version-string": "2020-09-22", + "port-version": 0 + }, + { + "git-tree": "5570afa11a3c704891576874a8f3c5b2f1420682", + "version-string": "2020-08-29", + "port-version": 0 + }, + { + "git-tree": "582062382c942f52c716b612b62d045300ed8d60", + "version-string": "2020-08-04", + "port-version": 0 + }, + { + "git-tree": "ea0293814778b470678a53fe04aa953bffa7e16e", + "version-string": "2020-07-01", + "port-version": 0 + }, + { + "git-tree": "cb20be3ef49ae4e063a9303cc14f500c165a1b08", + "version-string": "2020-06-02", + "port-version": 0 + }, + { + "git-tree": "fdc326330ba975c2114378381187bf180e359566", + "version-string": "2020-05-25", + "port-version": 0 + }, + { + "git-tree": "e747dc136e590035c296c2c9d20e28e6d34de4dd", + "version-string": "2020-02-17", + "port-version": 0 + }, + { + "git-tree": "02a89afa85894c3f8bcf50600367748fe277f859", + "version-string": "2020-02-03", + "port-version": 0 + }, + { + "git-tree": "a574ec9d108a30941e2f4c1cb90a3899c6a9d540", + "version-string": "2019-10-24", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/polymorphic-value.json b/port_versions/p-/polymorphic-value.json new file mode 100644 index 00000000000000..b58b955ccf4c72 --- /dev/null +++ b/port_versions/p-/polymorphic-value.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e94e16bfe381140ba157f4e9224f12c273134f56", + "version-string": "1.3.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/ponder.json b/port_versions/p-/ponder.json new file mode 100644 index 00000000000000..0377232ee8bdf7 --- /dev/null +++ b/port_versions/p-/ponder.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "2cb0155853b202ebf943fc6668096bd8aae75681", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "69a8598d2fd87136792a4cf8ec6361027864a6ac", + "version-string": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/poppler.json b/port_versions/p-/poppler.json new file mode 100644 index 00000000000000..b6de22558db717 --- /dev/null +++ b/port_versions/p-/poppler.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "acfc09df4e386e910884ee45b13e79c7ecb23d29", + "version-string": "20.12.1", + "port-version": 2 + }, + { + "git-tree": "0013a59da0ab4b64edda0dcd765fe0ed708f62fb", + "version-string": "20.12.1", + "port-version": 1 + }, + { + "git-tree": "d5e39a3713134a5c03c446550831a88757810558", + "version-string": "20.12.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/portable-snippets.json b/port_versions/p-/portable-snippets.json new file mode 100644 index 00000000000000..a45b0d5b2dd3ba --- /dev/null +++ b/port_versions/p-/portable-snippets.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fa4d8c8fa1130e0dd575f168be6d47971a1b14be", + "version-string": "2019-09-20", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/portaudio.json b/port_versions/p-/portaudio.json new file mode 100644 index 00000000000000..31f3cf32fc4dc0 --- /dev/null +++ b/port_versions/p-/portaudio.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "9e434db8e8407121b84aa66774792451540eec9d", + "version-string": "2020-02-02", + "port-version": 2 + }, + { + "git-tree": "35bf02f54208d73d88fff556a5d65f5c63af6a97", + "version-string": "2020-02-02", + "port-version": 1 + }, + { + "git-tree": "8209265130c2596af28b15b92642050ddae87da6", + "version-string": "2020-02-02", + "port-version": 0 + }, + { + "git-tree": "cb0380cfbf708cc7f0a8bdf1a0b00ac12926c909", + "version-string": "2019-11-5", + "port-version": 0 + }, + { + "git-tree": "19b309569091809457d1d8c4165b2fcf690ec298", + "version-string": "2019-09-30", + "port-version": 0 + }, + { + "git-tree": "4e98d98d274435fa25aae4c9a3d91d1d6025f499", + "version-string": "19.0.6.00-5", + "port-version": 0 + }, + { + "git-tree": "cdb33c18459ea0d4aa202be5ef3237ca35b71237", + "version-string": "19.0.6.00-4", + "port-version": 0 + }, + { + "git-tree": "7ca0d713d63eb2a144a457809f170f29c70bd6f1", + "version-string": "19.0.6.00-3", + "port-version": 0 + }, + { + "git-tree": "225f820f7dd94fe633ef57a5b727a8fc9bba6cd3", + "version-string": "19.0.6.00-2", + "port-version": 0 + }, + { + "git-tree": "e5c0610981f0ef463185623d48372e4b66eb74d6", + "version-string": "19.0.6.00-1", + "port-version": 0 + }, + { + "git-tree": "b42e5c2d3000679a6a35531a7ddba85162e96f7c", + "version-string": "19.0.6.00", + "port-version": 0 + }, + { + "git-tree": "dd52244f33f317b66a9f53776e1705916cb3ca63", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/portmidi.json b/port_versions/p-/portmidi.json new file mode 100644 index 00000000000000..240a39a25d77a6 --- /dev/null +++ b/port_versions/p-/portmidi.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "16f079de23d02226d49bd22659392d85e568528e", + "version-string": "0.234", + "port-version": 0 + }, + { + "git-tree": "e84fe90512135eb1d429ebe5b3660b95ba150acf", + "version-string": "0.217.1-4", + "port-version": 0 + }, + { + "git-tree": "81ea54a270a2ed1f23f9b73cbe18607e69237bc6", + "version-string": "0.217.1-2", + "port-version": 0 + }, + { + "git-tree": "a9037e4857e3476c24225de3468e2a25d90bb7a4", + "version-string": "0.217.1-1", + "port-version": 0 + }, + { + "git-tree": "275c19d6b87e6ee4d188524ffc631d52509a8d43", + "version-string": "0.217.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/ppconsul.json b/port_versions/p-/ppconsul.json new file mode 100644 index 00000000000000..6a9072d167a47b --- /dev/null +++ b/port_versions/p-/ppconsul.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "8d87f4681edc04101293dceede444307d3b3e4da", + "version-string": "0.5-1", + "port-version": 0 + }, + { + "git-tree": "d73d0eccdded9b4d4e17a0e06e9fdaa48fe8bd88", + "version-string": "0.5", + "port-version": 0 + }, + { + "git-tree": "b102c1f7fb7563dab481fbb4e82a63170e784608", + "version-string": "0.4-1", + "port-version": 0 + }, + { + "git-tree": "2dfb691c0d203d99ae04525884e47f1bd150ba36", + "version-string": "0.4", + "port-version": 0 + }, + { + "git-tree": "655faaaa2419231047daafa3fd94e23ad1801820", + "version-string": "0.3-1", + "port-version": 0 + }, + { + "git-tree": "3414a1308998fdd15ff0251bef046bd8f560cd4e", + "version-string": "0.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/ppmagic.json b/port_versions/p-/ppmagic.json new file mode 100644 index 00000000000000..64c75d4b7ab140 --- /dev/null +++ b/port_versions/p-/ppmagic.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0b75e26449d39ec184736dccbb705d6bf6339769", + "version-string": "2020-07-03", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pprint.json b/port_versions/p-/pprint.json new file mode 100644 index 00000000000000..f2b765f0883338 --- /dev/null +++ b/port_versions/p-/pprint.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "50e0ad722aa664d49e1591326bf0f1605c1e620c", + "version-string": "2019-07-19", + "port-version": 0 + }, + { + "git-tree": "4788b53779830e8794d2e7454ef2b1bb51f3d652", + "version-string": "2019-06-01", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pqp.json b/port_versions/p-/pqp.json new file mode 100644 index 00000000000000..d9bdf8f9493bea --- /dev/null +++ b/port_versions/p-/pqp.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "e44d9679087bf6c036f2d5c647369669f6d4d581", + "version-string": "1.3-4", + "port-version": 0 + }, + { + "git-tree": "44016a5bd4c52eb43998f5ac89ee6ec18106d48d", + "version-string": "1.3-3", + "port-version": 0 + }, + { + "git-tree": "454c261dca0f32373302769c7da05d5da2a9c29b", + "version-string": "1.3-2", + "port-version": 0 + }, + { + "git-tree": "4e0d656e7daf5517b5ef80b810232b7ce9aad9c3", + "version-string": "1.3-1", + "port-version": 0 + }, + { + "git-tree": "ad76367a1b28e284ffcf1eecd8a246e1b4246cf1", + "version-string": "1.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/proj.json b/port_versions/p-/proj.json new file mode 100644 index 00000000000000..8369cda92a6b25 --- /dev/null +++ b/port_versions/p-/proj.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "759fac2f92b6fe903300aa2a91f4fd39b6c16911", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "a5961e4930dea226aa16beb019e6ea2a9dbd5ba7", + "version-string": "4.9.3-1", + "port-version": 0 + }, + { + "git-tree": "bcf202e0b0a9b78f183a3b8c3b1cd7494c1df516", + "version-string": "4.9.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/proj4.json b/port_versions/p-/proj4.json new file mode 100644 index 00000000000000..18c20dcf60fc86 --- /dev/null +++ b/port_versions/p-/proj4.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "db5c7e1a6ca59c830b517afa4b1da4858cca572c", + "version-string": "7.2.0", + "port-version": 0 + }, + { + "git-tree": "ae4d3d842f78775ae6853f7287d352dcb2c399f0", + "version-string": "6.3.1", + "port-version": 3 + }, + { + "git-tree": "d61fd71fc884098c7b308c3e92e28aacbcf3147e", + "version-string": "6.3.1", + "port-version": 2 + }, + { + "git-tree": "1794a541f79432fd1e4ee7de8f762470d626daea", + "version-string": "6.3.1-1", + "port-version": 0 + }, + { + "git-tree": "e43c6950e99fb4c82f2075cb591b5551be990a1a", + "version-string": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "96f269885f42ae4c668c5137009caedb9babea88", + "version-string": "6.3.0-1", + "port-version": 0 + }, + { + "git-tree": "c58093d47083f58577234946c20c981a7a8acdcf", + "version-string": "6.2.1-2", + "port-version": 0 + }, + { + "git-tree": "00ae9580b4e332d34a5a927930836337f0124acb", + "version-string": "6.2.1-1", + "port-version": 0 + }, + { + "git-tree": "cf3cb44f2480efb1fba4adf514d8a161721c6abe", + "version-string": "6.2.0-1", + "port-version": 0 + }, + { + "git-tree": "c4a17eb19ce54398ddc778dec9872870108a647d", + "version-string": "6.1.1-1", + "port-version": 0 + }, + { + "git-tree": "6b4bc570952d631582e1cd0173c7ca74e4d7aa25", + "version-string": "4.9.3-5", + "port-version": 0 + }, + { + "git-tree": "2ec9b654fb4959db87d8b6a3b5f4904dabf7437d", + "version-string": "4.9.3-4", + "port-version": 0 + }, + { + "git-tree": "937e8a11cb7e6bef3438973c66c4baba626f1c90", + "version-string": "4.9.3-3", + "port-version": 0 + }, + { + "git-tree": "9525e39b44ba2dc76975e05be537797861a38df1", + "version-string": "4.9.3-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/prometheus-cpp.json b/port_versions/p-/prometheus-cpp.json new file mode 100644 index 00000000000000..d9b7bfe326ddb1 --- /dev/null +++ b/port_versions/p-/prometheus-cpp.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "c86b33f02ac3a4e3c0fa288cf033a15238f24a7a", + "version-string": "0.11.0", + "port-version": 0 + }, + { + "git-tree": "8e66ca919082f0ccf735b51100dc6c065fe96944", + "version-string": "0.10.0", + "port-version": 0 + }, + { + "git-tree": "9b66fec0d59fac266b23fcc991c85360fa35561d", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "09127f6d3d36f989e60d62c713725c0dbc9a7196", + "version-string": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "c9d3bcd59e845a9f42589674ed2c84e3b4e389f8", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "068eb8e03eb06c747321598dd011eb164d5cd316", + "version-string": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/protobuf-c.json b/port_versions/p-/protobuf-c.json new file mode 100644 index 00000000000000..cbdfc72276baa8 --- /dev/null +++ b/port_versions/p-/protobuf-c.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "7e0935e2eef085a194274de34e3ee9c39f4ba8d4", + "version-string": "1.3.2-2", + "port-version": 0 + }, + { + "git-tree": "7807e915cd2775e8cb48bb6b8ae38e90962b0b4c", + "version-string": "1.3.2-1", + "port-version": 0 + }, + { + "git-tree": "86d374ae34e700b0e30967a7e0919f405243f1aa", + "version-string": "1.3.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/protobuf.json b/port_versions/p-/protobuf.json new file mode 100644 index 00000000000000..73955134332606 --- /dev/null +++ b/port_versions/p-/protobuf.json @@ -0,0 +1,239 @@ +{ + "versions": [ + { + "git-tree": "2a90dca85ce43bc6cb008cce7d6706e319bc645b", + "version-string": "3.14.0", + "port-version": 1 + }, + { + "git-tree": "93338c61ee41788301d30fc47a06703dfe7d00cc", + "version-string": "3.14.0", + "port-version": 0 + }, + { + "git-tree": "37ec7680dc8556d8f3e885e883df0f45b65bdfd8", + "version-string": "3.13.0", + "port-version": 2 + }, + { + "git-tree": "1b77f50a4717f87f8f49d7e16bfffb967444295a", + "version-string": "3.13.0", + "port-version": 1 + }, + { + "git-tree": "616906043007ddc14c58665295ab09f90888c593", + "version-string": "3.13.0", + "port-version": 0 + }, + { + "git-tree": "70e3020fabfd633eae90121390bf12277bc72432", + "version-string": "3.12.3", + "port-version": 2 + }, + { + "git-tree": "81ca6fdb2d18485a0d88f8b5250e259633c594e6", + "version-string": "3.12.3", + "port-version": 1 + }, + { + "git-tree": "8854bf5f51e661be53a3bf060131c9055b5559a6", + "version-string": "3.12.3", + "port-version": 0 + }, + { + "git-tree": "2610c238aacb8d8008eacf4fb6eea4e757d90d8a", + "version-string": "3.12.0-2", + "port-version": 0 + }, + { + "git-tree": "7f343f48b916c64a057dd4bf5faf102825f2a01d", + "version-string": "3.12.0-1", + "port-version": 0 + }, + { + "git-tree": "8aa6377c35b7359d1ba03dd5bd756295e89d7e84", + "version-string": "3.12.0", + "port-version": 0 + }, + { + "git-tree": "501e137425a77b575aeac98f03346269eefa30f9", + "version-string": "3.11.4-1", + "port-version": 0 + }, + { + "git-tree": "518f9c3e4974e9679744b72d255e9931981235f1", + "version-string": "3.11.4", + "port-version": 0 + }, + { + "git-tree": "22119003eeae77dace6e4466a31a4cd9f7045032", + "version-string": "3.11.3", + "port-version": 0 + }, + { + "git-tree": "72d04ac11c52adfcc18143c98e8e138b1c4a1ade", + "version-string": "3.11.2", + "port-version": 0 + }, + { + "git-tree": "436e74e600349763906901e369ee4d5ea87bfed9", + "version-string": "3.11.0", + "port-version": 0 + }, + { + "git-tree": "cfd5b45bd6ad502a5deca16eff47a8dab5a9653b", + "version-string": "3.10.0", + "port-version": 0 + }, + { + "git-tree": "806a510e0911478aa8f7d325ba4667344e96603f", + "version-string": "3.9.1", + "port-version": 0 + }, + { + "git-tree": "6badf2593ecdc141d6524f5c2b74c25bc5b52238", + "version-string": "3.9.0", + "port-version": 0 + }, + { + "git-tree": "ccbde5e0c8ee8443811c46c036d2a18c4d21bf97", + "version-string": "3.8.0-1", + "port-version": 0 + }, + { + "git-tree": "04fef66a8170f29e3aab879f0ac29510e282491b", + "version-string": "3.8.0", + "port-version": 0 + }, + { + "git-tree": "d4ca0158f6e70a1e7da2026bef886c362feae3ea", + "version-string": "3.7.1", + "port-version": 0 + }, + { + "git-tree": "c653e4ba9f0095e1625e8290831b59372d61cef7", + "version-string": "3.6.1.3-1", + "port-version": 0 + }, + { + "git-tree": "6ea2a0a1e35d5ef5cfb6ce2b9dee2fb44218684d", + "version-string": "3.6.1.3", + "port-version": 0 + }, + { + "git-tree": "61c26d0adc13178cca863b9f989d1e47a59629f3", + "version-string": "3.6.1-4", + "port-version": 0 + }, + { + "git-tree": "51b9e62e8d0ac833c6dac800fb1781710d852c88", + "version-string": "3.6.1-2", + "port-version": 0 + }, + { + "git-tree": "0347f4280de1e795810f417ad5d317f3789f9f7c", + "version-string": "3.6.1-1", + "port-version": 0 + }, + { + "git-tree": "163f58d1f3cc49f32d41bdcd9e51a5a10d1aacc0", + "version-string": "3.6.0.1", + "port-version": 0 + }, + { + "git-tree": "eecff0830dd64da52db74f38dee9d8c504fec8c0", + "version-string": "3.5.1-5", + "port-version": 0 + }, + { + "git-tree": "6430dcd5b4f974c6f51112d371cf5d8281428652", + "version-string": "3.5.1-4", + "port-version": 0 + }, + { + "git-tree": "07e4aaf241ff4f9ad9c3905ff11aded7ca9a8ac8", + "version-string": "3.5.1-3", + "port-version": 0 + }, + { + "git-tree": "8e5fc1acd5bcac32236d1964ea8fa9d5627e39ba", + "version-string": "3.5.1-2", + "port-version": 0 + }, + { + "git-tree": "de08e119eaac29d792d5472cfe0e3af5b8e93fef", + "version-string": "3.5.1-1", + "port-version": 0 + }, + { + "git-tree": "74810a03dfba0b67655fca111e499ac015bb8abc", + "version-string": "3.5.1", + "port-version": 0 + }, + { + "git-tree": "57d52249caee43afee241059150b5247a14aeb4b", + "version-string": "3.5.0-1", + "port-version": 0 + }, + { + "git-tree": "b72952ad592000a034a334b685b67899634da2de", + "version-string": "3.5.0", + "port-version": 0 + }, + { + "git-tree": "4c27dbbc78fb069a2aa5d93f360ab5c4d82c17af", + "version-string": "3.4.1-2", + "port-version": 0 + }, + { + "git-tree": "8142c23c749bf4888e3fa489558738affbe9301a", + "version-string": "3.4.1-1", + "port-version": 0 + }, + { + "git-tree": "b6fd0beef65a76c6efc90b702e61d150f25b62d3", + "version-string": "3.4.0-2", + "port-version": 0 + }, + { + "git-tree": "b7f14b62708beaea299a474df7cc0f12da98f6e7", + "version-string": "3.4.0-1", + "port-version": 0 + }, + { + "git-tree": "f300a8ba1bc984904059d2c9f3f513183dcd03ee", + "version-string": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "34ac38c802bff258a9166b6e125d86cdc1833ace", + "version-string": "3.3.0-3", + "port-version": 0 + }, + { + "git-tree": "2bb3394f614b762bce334b6e02c96745de1dceae", + "version-string": "3.3.0-2", + "port-version": 0 + }, + { + "git-tree": "a9eebf56c81bdf2c5709f6ca8d099fb21b6e8565", + "version-string": "3.3.0-1", + "port-version": 0 + }, + { + "git-tree": "42ec54b658a209d537ea6120c21fe081c1e0530a", + "version-string": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "356bda3330a44573c612a81d53e53994db01fda1", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "06d9998b05218e134dd2d214b84ae72b51f63c52", + "version-string": "3.0.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/protopuf.json b/port_versions/p-/protopuf.json new file mode 100644 index 00000000000000..b27507d6605158 --- /dev/null +++ b/port_versions/p-/protopuf.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bd7a8f750bdae5bd3b872062a8319420d159bcd9", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/protozero.json b/port_versions/p-/protozero.json new file mode 100644 index 00000000000000..d29b982255cc4d --- /dev/null +++ b/port_versions/p-/protozero.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b064bd3211a8ba5ddfe33a49c84bcfa714d1bf8c", + "version-string": "1.6.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/proxygen.json b/port_versions/p-/proxygen.json new file mode 100644 index 00000000000000..326f97c3419466 --- /dev/null +++ b/port_versions/p-/proxygen.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "bfaabcaacfc585c9597b455a0853c1f4497e6e69", + "version-string": "2020.10.19.00", + "port-version": 0 + }, + { + "git-tree": "939ddfafd81b79b07cec85e0e571a6ef772b47bc", + "version-string": "2019.10.21.00", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/proxywrapper.json b/port_versions/p-/proxywrapper.json new file mode 100644 index 00000000000000..0e6297e11d0d19 --- /dev/null +++ b/port_versions/p-/proxywrapper.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "87ca17828b4bfbe4dd133d64f080a6f3ca13989f", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/ptex.json b/port_versions/p-/ptex.json new file mode 100644 index 00000000000000..3a7baab15fa27c --- /dev/null +++ b/port_versions/p-/ptex.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "e4ee03f1ba1d9c807b8baee1bd3b1089e71476ca", + "version-string": "2.3.2", + "port-version": 2 + }, + { + "git-tree": "82bc72a7cf8eaaab16d6f5ebad326be237ca368b", + "version-string": "2.3.2-1", + "port-version": 0 + }, + { + "git-tree": "6b7e21ee7ede175aca74a16c54c3dc3e8eec4bfb", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "744551b00fccf63f05cbcfc7005bdc16701bf648", + "version-string": "2.1.28-1", + "port-version": 0 + }, + { + "git-tree": "4ce33a83ea42e1a9559025625e919fbfb45416c3", + "version-string": "2.1.28", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pthread.json b/port_versions/p-/pthread.json new file mode 100644 index 00000000000000..94b596431b8518 --- /dev/null +++ b/port_versions/p-/pthread.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f26e38024e286875f1e954fb75bda82b3a3329f4", + "version-string": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pthreads.json b/port_versions/p-/pthreads.json new file mode 100644 index 00000000000000..d0fdfb87344889 --- /dev/null +++ b/port_versions/p-/pthreads.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "6251ee2f710bfb8fb8c0177c07ef8fc5d7831aec", + "version-string": "3.0.0-6", + "port-version": 0 + }, + { + "git-tree": "f70c771f0a365c12ba1f6d6b40fc6f779dcdf4e1", + "version-string": "3.0.0-5", + "port-version": 0 + }, + { + "git-tree": "22d86e14b4ca38964fcb441cc47b5e199cb1949a", + "version-string": "3.0.0-4", + "port-version": 0 + }, + { + "git-tree": "fd49e1d7b088f6b250d5b522ef97c16e6bf05a98", + "version-string": "3.0.0-3", + "port-version": 0 + }, + { + "git-tree": "ea16ace179fc176ccc3016df9c48a88445bb540b", + "version-string": "3.0.0-2", + "port-version": 0 + }, + { + "git-tree": "725ed7882a7c39657485f13e42a77449c3bc4b6d", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "34c180407a1aca47f3d612fc33f072d4ab08c67b", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "7daebe43cbe87458cd9178837c081148e2fd2012", + "version-string": "2.9.1-5", + "port-version": 0 + }, + { + "git-tree": "69e4173ea87e14526713112cb957c357ca4bdd8e", + "version-string": "2.9.1-4", + "port-version": 0 + }, + { + "git-tree": "154381dee536efbea62e2978a90945ceeff2dae5", + "version-string": "2.9.1-3", + "port-version": 0 + }, + { + "git-tree": "705c6b1e7a3d79d908716a1f9be0eb0da95f10af", + "version-string": "2.9.1-2", + "port-version": 0 + }, + { + "git-tree": "a721cdda5296f4811401d8c8ad4c9df1e841d63e", + "version-string": "2.9.1-1", + "port-version": 0 + }, + { + "git-tree": "32f89da60e527bf453f3870e2ae7df699a8a4609", + "version-string": "2.9.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pugixml.json b/port_versions/p-/pugixml.json new file mode 100644 index 00000000000000..dfa40fa5d4fc75 --- /dev/null +++ b/port_versions/p-/pugixml.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "3c0bf3af0be3a7df2f1ee8f65223b6fc49947b35", + "version-string": "1.11.1", + "port-version": 0 + }, + { + "git-tree": "b2456795dd215d7a7775984b64996f0c63ea648e", + "version-string": "1.10", + "port-version": 2 + }, + { + "git-tree": "1c0655bd501db1da226ba12180dbeb6f4645a7c3", + "version-string": "1.10-1", + "port-version": 0 + }, + { + "git-tree": "54835b7790a7ee53620c213ace1723e4c5e3e2fb", + "version-string": "1.10", + "port-version": 0 + }, + { + "git-tree": "0236ebae3c255e33c652036790e73a756175cc0e", + "version-string": "1.9-3", + "port-version": 0 + }, + { + "git-tree": "6eedd01c350f4bef43b2cfe7dfc453d865f13046", + "version-string": "1.9-2", + "port-version": 0 + }, + { + "git-tree": "c941bbc462bcab3fa94dbe6a464f5041e16a7c9a", + "version-string": "1.9-1", + "port-version": 0 + }, + { + "git-tree": "a3f8bcd5da3737d17a806dd44bd504bffc3ac8d2", + "version-string": "1.8.1-3", + "port-version": 0 + }, + { + "git-tree": "aafeef62ceacb7e3114738e843ba3d2b906af16b", + "version-string": "1.8.1-2", + "port-version": 0 + }, + { + "git-tree": "172398557141361c21be1283417b6b2c47eb183e", + "version-string": "1.8.1-1", + "port-version": 0 + }, + { + "git-tree": "d01042f4857496f4e0905565298e5412000da32a", + "version-string": "1.8.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pybind11.json b/port_versions/p-/pybind11.json new file mode 100644 index 00000000000000..ff4beb11595d31 --- /dev/null +++ b/port_versions/p-/pybind11.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "e3d883eb6e3cf9a83a34c3640d049f627d9ab1ae", + "version-string": "2.6.0", + "port-version": 3 + }, + { + "git-tree": "0b20fc25515142265062ab506efe37e01ccfcf4b", + "version-string": "2.6.0", + "port-version": 2 + }, + { + "git-tree": "4e419fd7c279712f8ac1a9efd2b99657e6cefe72", + "version-string": "2.6.0", + "port-version": 1 + }, + { + "git-tree": "7b55ce91d4263c298682c29b1046f933145d6682", + "version-string": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "355c309841bb390c372c761830fa354bee3effaf", + "version-string": "2.5.0", + "port-version": 1 + }, + { + "git-tree": "6a778e691fd5b92c830293679a0724fd812198ab", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "b3072c9585a20208b619b76fbb5dd4bcec680692", + "version-string": "2.4.3", + "port-version": 0 + }, + { + "git-tree": "e82b963fc9ba7d07c93845b6a6125a8a90840706", + "version-string": "2.3.0-1", + "port-version": 0 + }, + { + "git-tree": "a902f398114ef2400e5be0073a842a74c054cf54", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "049b57ca0877925b1f25fd75f0bb4a142d89e541", + "version-string": "2.2.4", + "port-version": 0 + }, + { + "git-tree": "457c121c6f45a093cf83055f0433bcbc32929107", + "version-string": "2.2.3-1", + "port-version": 0 + }, + { + "git-tree": "7cb65f056340c026cd2d7e3609c96d1c709a80d5", + "version-string": "2.2.3", + "port-version": 0 + }, + { + "git-tree": "1c8628b12ac199ac5fdb7d78b91ce28b38527265", + "version-string": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "9fbc58acd0bbf5f674a62de5d6bdb78647c0b3f1", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "acc84454b222e0d40b2573f691a792e76a1b8d5e", + "version-string": "2.1.0-2", + "port-version": 0 + }, + { + "git-tree": "8685415a7bb5d3b25ec970bb5cefb9dd1a36e60c", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "db6dd9f17b3c660c64d71eef6afca9eb8549d9ff", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "01b91f9136c68811bc820d0734dacf2016c18935", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "b6075b8a60804d3344c3bc49561c6ee9eea0d677", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/pystring.json b/port_versions/p-/pystring.json new file mode 100644 index 00000000000000..b29d9d27d67be7 --- /dev/null +++ b/port_versions/p-/pystring.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "33c038a18b859b695f9e1f7d4618278c9ef14e4a", + "version-string": "1.1.3-2", + "port-version": 0 + }, + { + "git-tree": "15d8cf850d28be04cc1c00fbf158324c195459e7", + "version-string": "1.1.3-1", + "port-version": 0 + }, + { + "git-tree": "73d86c61554e5db2f527b49581025d753309e8b2", + "version-string": "1.1.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/python2.json b/port_versions/p-/python2.json new file mode 100644 index 00000000000000..1e600c711bb65e --- /dev/null +++ b/port_versions/p-/python2.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "94dd5dc700302ff87a8724504676d674d3554b81", + "version-string": "2.7.15-2", + "port-version": 0 + }, + { + "git-tree": "8a92d8f29475fdbae0656cf45abf03e11589067e", + "version-string": "2.7.15-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/p-/python3.json b/port_versions/p-/python3.json new file mode 100644 index 00000000000000..fa150d4cd28587 --- /dev/null +++ b/port_versions/p-/python3.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "b2f9a57528c88d1deef5b695e56edd7a671c97c2", + "version-string": "3.9.0", + "port-version": 3 + }, + { + "git-tree": "e1133f546daac80993333e292fea51624118959e", + "version-string": "3.9.0", + "port-version": 2 + }, + { + "git-tree": "c01b95fbe2e92bdaf1948021c1e2e64eafd3414e", + "version-string": "3.9.0", + "port-version": 1 + }, + { + "git-tree": "72f075a1ba9389a9fa7ae95a14e7278595320418", + "version-string": "3.9.0", + "port-version": 0 + }, + { + "git-tree": "a27ac0326c21362d6a324236c772161ac6130ef5", + "version-string": "3.8.3", + "port-version": 2 + }, + { + "git-tree": "8b1b57fad049e601226b47d0c4ab5dcc87a89609", + "version-string": "3.8.3", + "port-version": 1 + }, + { + "git-tree": "09f94d8b34d07f3c5554079cb7dbe09f9f23e535", + "version-string": "3.8.3", + "port-version": 0 + }, + { + "git-tree": "4146575f2b9fe56a8d8a3045c6840aa65c50cff0", + "version-string": "3.7.3-3", + "port-version": 0 + }, + { + "git-tree": "b4a17d0a697e2ac67180151c420961298949f81f", + "version-string": "3.7.3-2", + "port-version": 0 + }, + { + "git-tree": "f727eb35683140c0797f501c2cb55583da8941bd", + "version-string": "3.7.3-1", + "port-version": 0 + }, + { + "git-tree": "cec4a96ca3c160ebb6f7fefa8ffcbda14e9c6d10", + "version-string": "3.7.3", + "port-version": 0 + }, + { + "git-tree": "6a772b3048f1772f64f0ab03e9d630b764fda9ac", + "version-string": "3.7.4", + "port-version": 0 + }, + { + "git-tree": "0dac13c052f353566c25e199cfd58dbece1e8621", + "version-string": "3.7.3", + "port-version": 0 + }, + { + "git-tree": "31048e50e35696fa4eaa3cecf873a2cc96cb58fb", + "version-string": "3.6.4-5", + "port-version": 0 + }, + { + "git-tree": "5c3e9101d6ceba580262b36e9bc447b9c8ec7147", + "version-string": "3.6.4-3", + "port-version": 0 + }, + { + "git-tree": "f4df1cd62f5c06326dbe13a9d74ba10568a2f802", + "version-string": "3.6.4-2", + "port-version": 0 + }, + { + "git-tree": "471de7add2ba17ab04d3ee2929a4a11a9184e285", + "version-string": "3.6.4-1", + "port-version": 0 + }, + { + "git-tree": "3cfe7c13dd795228008416d7c8f81b6d5f086e52", + "version-string": "3.6.4", + "port-version": 0 + }, + { + "git-tree": "c64e67fc66a2fa776651cc05dca980332bbaf170", + "version-string": "3.6.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qca.json b/port_versions/q-/qca.json new file mode 100644 index 00000000000000..cc9f0544e7e127 --- /dev/null +++ b/port_versions/q-/qca.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "cda65d327fffdc14a09dee0bdcdf79d3bdad9edc", + "version-string": "2.3.1", + "port-version": 2 + }, + { + "git-tree": "1644070fc7960a66d96e9c3df603b81821a36f7b", + "version-string": "2.3.1", + "port-version": 1 + }, + { + "git-tree": "9caa318891b41f75fd4771938804d51b56afd346", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "41172855edfa7a82acc81cd7b520003338ab9b0f", + "version-string": "2.2.1-1", + "port-version": 0 + }, + { + "git-tree": "113779bfd35081b1ff56ce32fc299116824b499c", + "version-string": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "899a284737474a84ce97d5ea4ef22c7a21dcee42", + "version-string": "2.2.0-4", + "port-version": 0 + }, + { + "git-tree": "cce9089b982e496a790e423e3c17292ebf78cdca", + "version-string": "2.2.0-3", + "port-version": 0 + }, + { + "git-tree": "7b8010bcdba05f02aa1c8bf9e90454715289f53b", + "version-string": "2.2.0-2", + "port-version": 0 + }, + { + "git-tree": "948d9bf03fc33ea156def505696fd7767ef7b953", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "2c8f184f9681218f6505ac00dff590e5cf51e6c0", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qcustomplot.json b/port_versions/q-/qcustomplot.json new file mode 100644 index 00000000000000..ccae06e9571136 --- /dev/null +++ b/port_versions/q-/qcustomplot.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c995c8e160e05060606844f9a0ea84b1fd5d61d3", + "version-string": "2.0.1-4", + "port-version": 0 + }, + { + "git-tree": "ef8034915adea03265b17d3c2aaa64a055d47555", + "version-string": "2.0.1-3", + "port-version": 0 + }, + { + "git-tree": "96b3f436764f5c2edf89c38bb84ce9a0d7587402", + "version-string": "2.0.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qhull.json b/port_versions/q-/qhull.json new file mode 100644 index 00000000000000..79540e865bae2b --- /dev/null +++ b/port_versions/q-/qhull.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "a126a4ddc8a30d5e50f27579acf06af3436ef6ed", + "version-string": "8.0.2", + "port-version": 0 + }, + { + "git-tree": "99b577e0925df3c88a9abcc5e2a2419ba44cb719", + "version-string": "8.0.0", + "port-version": 0 + }, + { + "git-tree": "e00559523bd9ee2c0ca68795b8b6113e0e495983", + "version-string": "7.3.2-2", + "port-version": 0 + }, + { + "git-tree": "536421b63cc012330f22b0fda37006f154a0539c", + "version-string": "7.3.2-1", + "port-version": 0 + }, + { + "git-tree": "ab01d658af2ccc2c47032fe3af45186d5c8b3795", + "version-string": "7.3.2", + "port-version": 0 + }, + { + "git-tree": "60b3b0b745477d4ab489edeaa96b353087da1c48", + "version-string": "7.2.1-3", + "port-version": 0 + }, + { + "git-tree": "9b921f8f0feebdc148c80f30d18f46aa5d18d19f", + "version-string": "7.2.1-2", + "port-version": 0 + }, + { + "git-tree": "36fe7997ac50f395f0cd4d18a3abdd5718d169a8", + "version-string": "2015.2-3", + "port-version": 0 + }, + { + "git-tree": "1e1b5fda40b57a87b1d3745c497892c900a5fb98", + "version-string": "2015.2-2", + "port-version": 0 + }, + { + "git-tree": "8478f3531d966b213c554e4c0f46d07e3bbb1c15", + "version-string": "2015.2-1", + "port-version": 0 + }, + { + "git-tree": "8998401aa6626bc4f6bdd831afaa3e9682bc3269", + "version-string": "2015.2", + "port-version": 0 + }, + { + "git-tree": "308526ae28d9f0eb0feb287ed138cf2516138b5c", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qpid-proton.json b/port_versions/q-/qpid-proton.json new file mode 100644 index 00000000000000..59d7bb6c28ff10 --- /dev/null +++ b/port_versions/q-/qpid-proton.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "287e0a8a6edf82e89f66b9163dc3c9ba8dc46b3f", + "version-string": "0.32.0", + "port-version": 0 + }, + { + "git-tree": "fe169b1ce39bcfeac6979f810d0531dfe2b637ec", + "version-string": "0.30.0", + "port-version": 0 + }, + { + "git-tree": "76dd693c85a37b8c1dfd2e34757ec1dd1072b706", + "version-string": "0.28.0", + "port-version": 0 + }, + { + "git-tree": "d45db1afae45cfe88d88c939aa7ee21db108c7e4", + "version-string": "0.24.0-2", + "port-version": 0 + }, + { + "git-tree": "9e2652873e6426cd6c95b1b64c0a89a5203a8616", + "version-string": "0.24.0-1", + "port-version": 0 + }, + { + "git-tree": "ee1a9aab6f770b0292acd2f445eb96ee686d4553", + "version-string": "0.24.0", + "port-version": 0 + }, + { + "git-tree": "0051718b92c53caca167cf177c58757168744fca", + "version-string": "0.18.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qscintilla.json b/port_versions/q-/qscintilla.json new file mode 100644 index 00000000000000..988d01c01d56e8 --- /dev/null +++ b/port_versions/q-/qscintilla.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "3279799f70de1a88e50db50b7e99dcdf1b08ac31", + "version-string": "2.11.4-2", + "port-version": 0 + }, + { + "git-tree": "3dedfdc395d12e0db28d868b62848367280fd961", + "version-string": "2.11.4-1", + "port-version": 0 + }, + { + "git-tree": "cdf1becb3cf92a3d47fc8c594b77afd1f7cc271d", + "version-string": "2.10-11", + "port-version": 0 + }, + { + "git-tree": "f1f7a6bbd1660345615c38ed8cb4632bb6e7f3a4", + "version-string": "2.10-9", + "port-version": 0 + }, + { + "git-tree": "5192cd1a0d8d4f37031bb6bc1f9ffd8921fbdc4c", + "version-string": "2.10-8", + "port-version": 0 + }, + { + "git-tree": "b9197b8a32193d2c76326960db9cbabacab70666", + "version-string": "2.10-7", + "port-version": 0 + }, + { + "git-tree": "dbdffacfeb73ed73358bf439f9386718d5875b3f", + "version-string": "2.10-5", + "port-version": 0 + }, + { + "git-tree": "bfa711aa2fd361783082c070704a7f58d54342cc", + "version-string": "2.10-4", + "port-version": 0 + }, + { + "git-tree": "d852676b5f70249a8e4a1f6a05caaa9c55a27724", + "version-string": "2.10-3", + "port-version": 0 + }, + { + "git-tree": "bc2c2467cf48ff52b0a28bb5a037c21827fee713", + "version-string": "2.10-2", + "port-version": 0 + }, + { + "git-tree": "917a492a13edc0f6ccc0b8b37691f40d5aebae40", + "version-string": "2.10-1", + "port-version": 0 + }, + { + "git-tree": "ad378f5e6429bea9c969f916fab6ed5b4ff9dac1", + "version-string": "2.10", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt-advanced-docking-system.json b/port_versions/q-/qt-advanced-docking-system.json new file mode 100644 index 00000000000000..adf54cea13f7a3 --- /dev/null +++ b/port_versions/q-/qt-advanced-docking-system.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "fbda394a196627494c8b9f50362ebf0de3bf1be6", + "version-string": "3.6.3", + "port-version": 1 + }, + { + "git-tree": "7aa1c3456d0dac65c1144b54ae721a9bf451c004", + "version-string": "3.6.3", + "port-version": 0 + }, + { + "git-tree": "c6c5b5931a1d533ac9c5351802af2f423c6d30f5", + "version-string": "3.6.1", + "port-version": 0 + }, + { + "git-tree": "a119e464d2aac3be67ecd86d71dc3dd2ca2db09a", + "version-string": "3.2.5-2", + "port-version": 0 + }, + { + "git-tree": "90d0673a8336f98da502391565b0e049929da396", + "version-string": "3.2.5-1", + "port-version": 0 + }, + { + "git-tree": "2d1947bfcb7238b79f0f651da6dc6abce691581d", + "version-string": "3.2.5", + "port-version": 0 + }, + { + "git-tree": "96e7fef0023550b6a5f39b2c0239a90504f4d904", + "version-string": "2019-08-14-1", + "port-version": 0 + }, + { + "git-tree": "ccf34e51c29d798a6d7dd618271896b234844f04", + "version-string": "2019-08-14", + "port-version": 0 + }, + { + "git-tree": "d38fb388ca2588651e9eec198b59d733b87d3345", + "version-string": "2019-08-09", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-3d.json b/port_versions/q-/qt5-3d.json new file mode 100644 index 00000000000000..06d88555848c47 --- /dev/null +++ b/port_versions/q-/qt5-3d.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "bc61aee28025498bf411411452dfdc2fa6b95588", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "1a90b0fbe534e416fefa585f1d7d36bae2567d3e", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "3e3693dbe7a3427823329d3a1a56839b34890fde", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "89d4c47835a7ba2b71d3e5e502cec0024ab81fab", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "048f75f03d5809aa35ffa3fa25d9a9af8b5717cb", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "f71f1212fd77059738c5879652d6369d7758dab3", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "c5659df032b7ca13b0f75ffe86832e2502dd3dcd", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "4fb493582f320c3aef9caa3019060bbd5a213e23", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "69cf59e8f81850e06cf5f9f4b2d1e38811039c78", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "f75dfe8395ac6901c2c6515e1e2e8f8929cd106a", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "f45fa7b26733b1e34e011d5d58e243f80cbb4c73", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "d234c728bdba94699c0278628e83196101ff3fdf", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "6e1acdf0019de567e9feae0daaf1b32700759fcc", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "254dc4e9aa6b45432113fcba6a1128d02989c243", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-activeqt.json b/port_versions/q-/qt5-activeqt.json new file mode 100644 index 00000000000000..16e4e13251bc24 --- /dev/null +++ b/port_versions/q-/qt5-activeqt.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "a5dcfeee5d586df99ace34ea105162399897ab57", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "848626d30bdabf80d6d10d870c2cd8ae796664de", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "9c278486c40441f8bbbed74a8963071502b44f60", + "version-string": "5.12.8-1", + "port-version": 0 + }, + { + "git-tree": "60c47f5c227d59eb1141b8dc19f937e5346da895", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "144bf9406cbc7514a0cf6b3371f3fc5e6ec4dbd7", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "f9659b21d54252eaa7c5e83b3e5ea0bf64731ab9", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "83bb9b45b2007fe6baafb5aff16b33c8d9e74fd2", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "5bfe587223fa998f700b85bd53b26adca3054604", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "01b450d3072744f60727da9bd5641b4133de210a", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "4be1efa7a3eae9e408ea2e6455fed495a9ff6293", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "1aef913f1e94a28d0c6250cc2798d1e063bf84db", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "bfe03760928c18378eef9e8e9eb3442cdc05397c", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "559d82462d0464a0b48e139efa872c2ac6b9b9c3", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "2e28e556e60d3f97e2b98f3dce271d37dc417503", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "665397e7945154354e8aa4e16035bc80914975b5", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-androidextras.json b/port_versions/q-/qt5-androidextras.json new file mode 100644 index 00000000000000..05f1d59f64dc1e --- /dev/null +++ b/port_versions/q-/qt5-androidextras.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "c3e13ce02aac04dcd71b42f383a69ae540995da0", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "2a9cc9f90c2bb104c9985985929bbc23a27abe11", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "7a292b76e9654d6af8b116f0846938a48f8fde28", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "dc6e21e2a4a3de4df8e5c49b8e44a03b29d05368", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-base.json b/port_versions/q-/qt5-base.json new file mode 100644 index 00000000000000..ac49a577ede427 --- /dev/null +++ b/port_versions/q-/qt5-base.json @@ -0,0 +1,264 @@ +{ + "versions": [ + { + "git-tree": "cae711e3396c229a7a1db28900446481ba7955cc", + "version-string": "5.15.1", + "port-version": 4 + }, + { + "git-tree": "9a7aaf1fcafaaf0d87ef8e645d5ac6108f9715be", + "version-string": "5.15.1", + "port-version": 3 + }, + { + "git-tree": "9ba3c3df184cf5e8aac3104856b81f2200e8beaf", + "version-string": "5.15.1", + "port-version": 2 + }, + { + "git-tree": "b3e1e04134083f0acdd5116e3e1bc8f92f801ed9", + "version-string": "5.15.1", + "port-version": 1 + }, + { + "git-tree": "93a02be94945033f1c00bf8e50d246b5f6421fc0", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "6c18edbec454d224a81bf0f97d7d2376b434714c", + "version-string": "5.15.0", + "port-version": 3 + }, + { + "git-tree": "ca022f4ead1fa1652544e608c191811b28a300c2", + "version-string": "5.15.0", + "port-version": 2 + }, + { + "git-tree": "6970207b13f556bf094bb210c884f3c5d81a1ab2", + "version-string": "5.15.0", + "port-version": 1 + }, + { + "git-tree": "6d908309ffeb9017308f4f86a115d2e37b4f029d", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "df8a22a4bc9702b791a6dac2dc8565ff5ac5f54e", + "version-string": "5.12.8-6", + "port-version": 0 + }, + { + "git-tree": "93780946a57afae4a6c623d04b25b38fc36c57dc", + "version-string": "5.12.8-5", + "port-version": 0 + }, + { + "git-tree": "bb4b314c8b0351bbd7e84cd8c921fd4253197f9b", + "version-string": "5.12.8-4", + "port-version": 0 + }, + { + "git-tree": "54e2dc2e110a25c022f6a84cf789d248eed76767", + "version-string": "5.12.8-3", + "port-version": 0 + }, + { + "git-tree": "9e9c0d58217b847c230b659b73754b545eeb2ac3", + "version-string": "5.12.8-2", + "port-version": 0 + }, + { + "git-tree": "d5eb924065c565f6e15ea0bd9694fa819356d685", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "4fb90f5ada47c6e82460b8818b56321f17bbdb12", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "73124851f4f5b8fbac7efd07f0f39e3060bc8ff5", + "version-string": "5.12.5-13", + "port-version": 0 + }, + { + "git-tree": "7ad957b725fbeb7bb4df04e2b506dcdf01ee9666", + "version-string": "5.12.5-12", + "port-version": 0 + }, + { + "git-tree": "6265272092ad14a2402fd7400d42b972c651c576", + "version-string": "5.12.5-11", + "port-version": 0 + }, + { + "git-tree": "9de154c109c638b48efef36cf3f5e1b85943bbde", + "version-string": "5.12.5-10", + "port-version": 0 + }, + { + "git-tree": "4934375ef4553d1b3e3938f2f0da82ebb836b69d", + "version-string": "5.12.5-9", + "port-version": 0 + }, + { + "git-tree": "ad7515e8eca37d71da0e394c0ed2a9cd7ea6b645", + "version-string": "5.12.5-8", + "port-version": 0 + }, + { + "git-tree": "101be351caf9f72a00b8e23c8345a1f4a90cf3ed", + "version-string": "5.12.5-7", + "port-version": 0 + }, + { + "git-tree": "1f032754d9b82773d1fb7116cde263024eb5f6c2", + "version-string": "5.12.5-3", + "port-version": 0 + }, + { + "git-tree": "2eb09c662551a52bee2ccec2e9e8198b29286a8b", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "d71d273d2d802a7c087b9633a89ef666ed015d6f", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "834347aee8c649ad501de8cf4147efa56a6c89f8", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "127e5320237ac8b4778b7543729797b0411e5a85", + "version-string": "5.12.4-6", + "port-version": 0 + }, + { + "git-tree": "1808c321a94e578194900ce0639ef648be94f8cc", + "version-string": "5.12.3-4", + "port-version": 0 + }, + { + "git-tree": "14fc9cb180c4b790bff6bf7c50e9f26b1eec30ed", + "version-string": "5.12.3-3", + "port-version": 0 + }, + { + "git-tree": "102bb89858e0ff285aebf45bee9c6f6d48043e29", + "version-string": "5.12.3-2", + "port-version": 0 + }, + { + "git-tree": "9119a85839bd1b7e47185153f9784d3561532b4f", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "961e6c7833546e6247464116980529469d7358c1", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "2d84b3819295ce27a53d2b080cf162e71b071332", + "version-string": "5.12.1-6", + "port-version": 0 + }, + { + "git-tree": "bfaa2279690732ea6eb5e2c256e906dd5c038629", + "version-string": "5.12.1-5", + "port-version": 0 + }, + { + "git-tree": "ea273b9f2d674469bee96a522858a6a46a75bc59", + "version-string": "5.12.1-4", + "port-version": 0 + }, + { + "git-tree": "3a4eabdefeed0e5531b807bd7d087e450c296a25", + "version-string": "5.12.1-3", + "port-version": 0 + }, + { + "git-tree": "e200c7182ddea2d7ea8a11efb598dd9d532cb244", + "version-string": "5.12.1-2", + "port-version": 0 + }, + { + "git-tree": "c9d72bc6f85633b1a02db8d748231c49f1c7a17d", + "version-string": "5.12.1-1", + "port-version": 0 + }, + { + "git-tree": "e328d64b318b011658827929a4f000206dfdf3e8", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "67481ad940ddd53de5f96cee7fcf7bcdf170435a", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "35b45f984cf3fb5e8bc682796773b3bbd76e0088", + "version-string": "5.11.2-1", + "port-version": 0 + }, + { + "git-tree": "7596f22751d8d746a317878aee1092c9693141c3", + "version-string": "5.11.1-5", + "port-version": 0 + }, + { + "git-tree": "e9ea6cbf821b4faca63fd00577197f417b9b2106", + "version-string": "5.11.1-2", + "port-version": 0 + }, + { + "git-tree": "dcb2e4fd2ef9598f6d5953606b39f14c81a871d7", + "version-string": "5.9.2-7", + "port-version": 0 + }, + { + "git-tree": "de8de639444f14373a2ef28699fab29f4d31cd6f", + "version-string": "5.9.2-6", + "port-version": 0 + }, + { + "git-tree": "beafd866e9788d7f57e5369ac421b9d311e20013", + "version-string": "5.9.2-5", + "port-version": 0 + }, + { + "git-tree": "fa53cf38114c7992693ee0d4b822068726f9a4c8", + "version-string": "5.9.2-4", + "port-version": 0 + }, + { + "git-tree": "ea907b7134e3d5e3880782fd3e4300ae0483f4d1", + "version-string": "5.9.2-3", + "port-version": 0 + }, + { + "git-tree": "8dbaba247102af242f393865fca86a1551c920aa", + "version-string": "5.9.2-2", + "port-version": 0 + }, + { + "git-tree": "dd826ca443556ec0a3af0d13cecc9ec4ffdd8fe3", + "version-string": "5.9.2-1", + "port-version": 0 + }, + { + "git-tree": "d27ba0f757dc9e67b96ced1a51003807d0a28fd8", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-canvas3d.json b/port_versions/q-/qt5-canvas3d.json new file mode 100644 index 00000000000000..41489f614cdbe3 --- /dev/null +++ b/port_versions/q-/qt5-canvas3d.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ab9dcd8f77c010f67ccd0177742f8f2b966814e6", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "8cdc528b607fec51d336e8055242419c4bbb18f6", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "f96fde5a5ff0fb6bb3728a01faf5f49e2173877d", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-charts.json b/port_versions/q-/qt5-charts.json new file mode 100644 index 00000000000000..1c4034f45c88f6 --- /dev/null +++ b/port_versions/q-/qt5-charts.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "7fdaac31ee19bf6044c57b38a7a2eac4e59f5612", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "4e9add84cc70580303d7bef69060b9cff187f482", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "becb0a109c41644be24804fa8bef1ebde4ac4572", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "feac1e76b4c7479e07ec7fa41e2ae288d9ecf378", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "0d2dbfc467ddf22f55adba6b25c38a33019e1882", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "20cbc59d7e2b8f7d3b5f4c921534fd31963fd699", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "858671d10d7c54d501f5b57d66f4316dae3cf4c2", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "7f24d3633b59fe70dac2e487089666bea6b81af2", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "519ac005433509c920d8f33dc17295a0a43f0278", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "7fbe5e5b5bd4351f2fa237673920dbb19ae40c33", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "fdb8256923810375165103f746d0dc103488d33f", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "b0e6783a8fcc2655bc2135870721adf766355da8", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "10a0e97ae7bf9d5da8651f4fcde3d23177338b02", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "15b9c3b580cd89f312ae95431b632340d26761fa", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-connectivity.json b/port_versions/q-/qt5-connectivity.json new file mode 100644 index 00000000000000..290056d628cb5a --- /dev/null +++ b/port_versions/q-/qt5-connectivity.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "e2bf8d45dc95302a10a9a1b07e58907ba86a2e7e", + "version-string": "5.15.1", + "port-version": 1 + }, + { + "git-tree": "2cdd2ce85e66b1d3cf7f7798001fb76d6913e9c9", + "version-string": "5.15.0", + "port-version": 1 + }, + { + "git-tree": "66458d3b3efc1f979dfd3ffc7a6113ba9ec042fe", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "6353e7435dea1b3d6183d84e596792064687833c", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "3f9d27076e32191250206f7324c53437387771f6", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "9a69b63d04a0ebf7c04187add5838fb923bd0cb7", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "a46a48768b5ad9ea7a83115e3fa17cd30ca3e36b", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "2a15360f495fa8ea1a1486b33c362ba8bd869b8b", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "0367510dd4c8b49cbd3bf91a2ff5abbb90ac5b93", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "dbbd7ec94d06153dd9076d2e6f45cfb991ef6069", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "a715cf6d2eb92ed537ef65ed2e97867a587d7600", + "version-string": "5.12.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-datavis3d.json b/port_versions/q-/qt5-datavis3d.json new file mode 100644 index 00000000000000..80936c23b47e0a --- /dev/null +++ b/port_versions/q-/qt5-datavis3d.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "9675a4b9bf484787826270cc1a6505d78efb4ba8", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "10dc0760f788939675716ef5ed7c0951cfdcaa55", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "c0271ed9ee32873c7380da8595dabac07f4aa10f", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "5ca105e3da8925266809ae7eadd44d2d05d78109", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "a9c235a67c50da1088c0e6bb31c588bd19dadd5b", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "f7c9d40286086feb6518e976009f60524cc1804c", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "2153cca32a6cfe70fddbd129d02d0825447a2a59", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "5af21e1ed292108c7ccdc9c1b68e6d1fa37ef690", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "ba43527171aaaa0df845f383b3605fcb5f5ce5aa", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "b1d3ab97c9a44294da3495b3905addde388ab1fa", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "b7fc0bff6e213faea478e6e3841990f01361153a", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "fc361535d247a2580800441e0e77eb36ff824979", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "efc93672b05e4c9805d85b837a445ed4bea609a7", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "a1a26c1e7f98214e79dca86de692e48d71555c90", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-declarative.json b/port_versions/q-/qt5-declarative.json new file mode 100644 index 00000000000000..bfd49c5e926971 --- /dev/null +++ b/port_versions/q-/qt5-declarative.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "6c526d6cad6e0813d9dfa6c21387b4b3f4d5b1bc", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "a2dbccda12ffc2314361dc80b63a5d81f8688275", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "d24aaceedb9a286f7c0a3cf0dcec2802f9c43695", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "cf4c1663652c07645e3f154c0cdaee9edc9515bc", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "5b93449fbc09f0917ec43e25b780d35462f9529d", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "69a9b785bc1c9c6020a7343c735935c7bb5a08db", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "e04d3d62b37dd397df3c41a868b9bda724262f08", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "bf496ad2be313266ce6e724190a256bf1a8e9b4f", + "version-string": "5.12.3-2", + "port-version": 0 + }, + { + "git-tree": "925dbb06740b78eed5d66c0653c2f7992e87a374", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "d5672d027f7f55de3ba7d289dfe98dd6f97dce70", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "c5234e870df1e7ff7da932098f5a6691e2d7cdf6", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "146b7f2ec8993c6848fdf84ede22c12f41f9d795", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "b3f885e341951c5964ce678dc5c0aea87365f739", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "7aa5a3f133f7c0861995e92c2d4a184d6350798a", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "b6abfd73fb05688db03a0e705c75a326e2abb82e", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-doc.json b/port_versions/q-/qt5-doc.json new file mode 100644 index 00000000000000..55cdfdf1cae752 --- /dev/null +++ b/port_versions/q-/qt5-doc.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "520ac7a71cbdbe15067e1e718e51a2100623b6d3", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "7e94ee4ef218320f62f69faa8af193d08211edd9", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "c5968ffa0746c11c1a7d3589361d30f9cea5629f", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "06c46ab15be980390deb6b5a32cfed58a0e74d37", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-gamepad.json b/port_versions/q-/qt5-gamepad.json new file mode 100644 index 00000000000000..7c7b71e0034631 --- /dev/null +++ b/port_versions/q-/qt5-gamepad.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "95329903ce4d3b26934d0503c9707d5fe3958b7e", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "7748c2540ff01eb175e413dae494875e195dbb60", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "24c8431871aa674ce21b347657934ce02d6580ac", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "c34c74f8774a3855dcd89302de33476b0c1d3bd8", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "fef77ad74f66c9702918f6a3c055e76cca731996", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "defb8f7b65a21eee3d880ebd278501bc58c4bf45", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "a6fa45451a9182978fbd96871ec87aeb7ad2074d", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "678bddee43408b62b991b77fe69b04fbaea15a43", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "5c342669d91c2e20107a1173b7fffe3346bc53b5", + "version-string": "5.12.3-2", + "port-version": 0 + }, + { + "git-tree": "d6d2287754674d446b7256f6f9336448a1e4df5d", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "2e2c603c1d2b51dbefac179e9ddb94a641fb91b4", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "3c4b085ce989278731249adf39e1ea4cab3d9e3a", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "0663b9960c527d360ff02356a48f7143384a6272", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "2695bb7fee2f5bd797282db9699288ea0fdc36a6", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "6fe38d30464018021eaa6dfe484593b42082bc49", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "4e418379bad1cbdd9802dd3e697d4f9ac69f6218", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-graphicaleffects.json b/port_versions/q-/qt5-graphicaleffects.json new file mode 100644 index 00000000000000..1979bf08dcae34 --- /dev/null +++ b/port_versions/q-/qt5-graphicaleffects.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "e905f4cbd556e9c21792772111a6d9fe55a4da16", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "367ba76601cb738680f517a876a5951b35bbd1b8", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "1acade397cfff61f42847509cf819ec614555b7e", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "bc3ca858a7f392917a9417df03d0e29514fb572f", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "a07cd94104aedf96abe6605fb10de351a1b1cd7d", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "e4b43d0873d58c1c4e10301e167dbca83979b126", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "8279e9f7555856af1cd28563d08c1467079d2546", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "8143a32817ceaf8e66f7a375b9d83732270ab342", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "20f9551fc319d90b673f7c0b252040a7c7e5d676", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "2f68a0214dfd82d79d7ba429b7497d83e99a0bca", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "2b0da997cd76c8d9a3e06bd8a445c0be088f72a1", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "4b4164eaacd512d5dd0c604f78153ab8af420fcd", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "0bd318e81579d4d747821f115231116717a66df0", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "ac55307fa4b4a9af9d59bd3e6436f547a6a1e679", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "5eee2528f6d54c4713b32cb7b0118a556a22ac3b", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-imageformats.json b/port_versions/q-/qt5-imageformats.json new file mode 100644 index 00000000000000..85643580afd90c --- /dev/null +++ b/port_versions/q-/qt5-imageformats.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "6144ff48982bb3c848ed9c5ba3a517188963411b", + "version-string": "5.15.1", + "port-version": 1 + }, + { + "git-tree": "cb235d0329a2ac6be7841bb996e258615181cdc7", + "version-string": "5.15.0", + "port-version": 2 + }, + { + "git-tree": "eac65b172ddde4ae08ce25376d47db96a04ecc9a", + "version-string": "5.15.0", + "port-version": 1 + }, + { + "git-tree": "3a28ac2c3d51f8f094fe32df3d9507d7691b6310", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "fc40636bbb3f94383065e71a5b06f283a5522594", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "1f33b86cd72616afbb1acc9b9955d59bdca9ac05", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "0daeb06e83804c9882040184a33b5a2e2c3ef7b8", + "version-string": "5.12.5-3", + "port-version": 0 + }, + { + "git-tree": "e092b3bcecf37eb12e50eab216f5129957e30b03", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "0055558f1aacde047f802d080184ba11fc4bbc36", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "a2582f793b58a2373bf1bf801fcb36f9749731b5", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "0532c51ad2b9debe84afe7374f30d00d2a573b42", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "3f08c3a43e43029308814d1e9c531915b1a368c0", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "fde1acedd22e43a51ae632d8947a799b455f42e5", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "8b58ae0155829d3935637cf1df713c7e6e98f168", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "9799c0a71ad00b709473371e6d057eaf1f330177", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "e2984be2c2e0ad47c17960f324e2abe96c96395e", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "40b02e188e97c283191549d2bdc81994027eabb8", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "e800376f4a6700949da02f9159a5a6da22a64091", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-location.json b/port_versions/q-/qt5-location.json new file mode 100644 index 00000000000000..81ab8d3a13efdc --- /dev/null +++ b/port_versions/q-/qt5-location.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "bbb37ca5fe38a40c2d36790d54469ce0572428f7", + "version-string": "5.15.1", + "port-version": 2 + }, + { + "git-tree": "0d55afe17af07acb0efc6fadd414cdcb24b39ff5", + "version-string": "5.15.1", + "port-version": 1 + }, + { + "git-tree": "137077a310c09ae74997b02638521b44b903bd5a", + "version-string": "5.15.0", + "port-version": 2 + }, + { + "git-tree": "653e5b985c529465b92e802d1e0cd3fd850e2dbb", + "version-string": "5.15.0", + "port-version": 1 + }, + { + "git-tree": "e8adac38b16922490313ee9b8b339c9d37d044a0", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "b8536d7c95724375fde00fc67d8ff801f423e198", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "3a20ac86c3d2c811dcb72af128326416d5da7d59", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "a2cd6e5e63d8ca04117d103da9d8d33d8ef53352", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "57e1682ef36b05dc45b480751f09b35b3c9664ef", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "addb2df8d2eefeadcbe9f8be76f7c367484118a1", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "4524d45ce884fc4cd5c98527e350c062ea4645aa", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "3fde0090fa6aa49edfc42e14f226cf656d8454e8", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "0285d5bfafea94ee25776f00aaa65a610b26d1d2", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "4b82275e555fbcebbb96a5ce93654aa31d8919e6", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-macextras.json b/port_versions/q-/qt5-macextras.json new file mode 100644 index 00000000000000..dcedc64014bb75 --- /dev/null +++ b/port_versions/q-/qt5-macextras.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "c7455204e0d6c6750be23240b00e58f66210c8cd", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "9305fc1c1205f523229e7ddb9087f347c6bf98a1", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "ff4c5959474470112b47abb6fd5db45060709144", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "c7e8a086635619bdab5d32b9f670569be282edff", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "46f5a714c0eaaf900b1b3df1a29ccb5f5b5ca71b", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "613ebc9af0ba4836f0ef0b452e4dc3f4569a92c5", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "0bbc86ed67ed65c6cedaa541a2be1992d51714e2", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "b04426ee1de8cb9bb8a4fcbf5d50ad293831c9c8", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "0a587d54d1335103ba8395e543e306c7803325a3", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-modularscripts.json b/port_versions/q-/qt5-modularscripts.json new file mode 100644 index 00000000000000..5599802e99f0c5 --- /dev/null +++ b/port_versions/q-/qt5-modularscripts.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "966b7ad2de03f602396f7e9569a8881eace3d585", + "version-string": "deprecated", + "port-version": 0 + }, + { + "git-tree": "c098243ef576959fd9f40d91b3e85ce1802bca42", + "version-string": "2019-04-30-1", + "port-version": 0 + }, + { + "git-tree": "e9b18f30cd85432fba7517480654a6f15cba42be", + "version-string": "2019-04-30", + "port-version": 0 + }, + { + "git-tree": "92ef35974443ff3427b0deb0198b0d1957798600", + "version-string": "2019-03-21", + "port-version": 0 + }, + { + "git-tree": "839ce6b4a433d890f341b6cf12285fda9eb08cdb", + "version-string": "2019-02-02", + "port-version": 0 + }, + { + "git-tree": "b0930e7d41ab1d5d562e03b40d17447a50f293a2", + "version-string": "2018-12-17", + "port-version": 0 + }, + { + "git-tree": "8d3a46c8482a42bdcc1cceeffcccf90a7b211d7d", + "version-string": "2018-11-01-1", + "port-version": 0 + }, + { + "git-tree": "e447e84bc2e1edd02db01fedf94163e41165a68b", + "version-string": "2018-09-10-2", + "port-version": 0 + }, + { + "git-tree": "a861097312585f9ee2d76ff24216bdc50c101e7a", + "version-string": "4", + "port-version": 0 + }, + { + "git-tree": "ef206b74d01c38f7759ca1cb04edd0d2d9e189ac", + "version-string": "3", + "port-version": 0 + }, + { + "git-tree": "722582314e23aa1cd8541d2af4ea68fe0951db2e", + "version-string": "2", + "port-version": 0 + }, + { + "git-tree": "0e836c8cbd6f4d9e80273caa0d3a9087fffa5ca5", + "version-string": "1", + "port-version": 0 + }, + { + "git-tree": "e567b8c9570a64bb748d9021e706c57a6bf96ef2", + "version-string": "0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-mqtt.json b/port_versions/q-/qt5-mqtt.json new file mode 100644 index 00000000000000..0b9486f3820cdc --- /dev/null +++ b/port_versions/q-/qt5-mqtt.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "eff74674156d29130f6bac8abc658b34d60a532f", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "8d51130b916fc02fc91437bbd511c70e775c6c25", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "00351ddaea5c1cc9f3a4aba48d58b8d41d9f24de", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "0a5a0d826d8b0f0db8f94120199899e26484900b", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "01980ce3aae3fc378dd5557e44485b2f2f7da301", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "ff87c402d8474b9981ae24815272e798f0e7e2ee", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "8ebfec6284da32590787045b9fbd140b5c8fb62e", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "c54fc115eca2df6915a75c702aa46939a8716e7a", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "8d61b7fa7fae2c4bbe0cf17f2510e5ae720b5158", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-multimedia.json b/port_versions/q-/qt5-multimedia.json new file mode 100644 index 00000000000000..136429e8be7dfd --- /dev/null +++ b/port_versions/q-/qt5-multimedia.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "5da3b21921824650376cee2f50760fe1f4866554", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "fc3270d6b441d75ef5034f0e3fa573e1a4c11ccf", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "1d8e3bddb812c956f642c05f65b53027197fb69f", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "86e38ea5fd5345990c43fcaf31a7e25a15ae8857", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "3c0034844a595933fc9513d19607ae8b4d51f934", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "4b84ecd9bedc273ecba44a09c4a35f5a7c63e45a", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "8311e87ab1c4447257564ec3fc4e247af9c43964", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "1067f1a17ea4b7d5576b6a3b2df4f666efc0f82f", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "630d04959e634f6292b44a981226ba821c3d95d4", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "ea2a149a8665f3aff48da556f924c0e9ac493241", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "c59ac61dc6d0909284b1d1b41f371ab6854fb041", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "ea042877dca8b0c496ae9215bf0062efaeef4b37", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "5e9a66c962791ff434013105ce2d54873c2bdba4", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "63abd87d8903b68faa5cb8a9cea04437c8bf76da", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-networkauth.json b/port_versions/q-/qt5-networkauth.json new file mode 100644 index 00000000000000..05ec85a8792e2e --- /dev/null +++ b/port_versions/q-/qt5-networkauth.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "0983186f99f302d7338144fb91e05a1d53c42a11", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "fc7881d390debf11b364cd9ac76afe4cb0a18edd", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "8994ba7d62fd1a8d04ddb077d06a290772d4e2dd", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "34d1a852f3c1ba1a4527728682c0469746a6e3bf", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "30e346e02ff55ccc3852ccb969410ee87824b76c", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "4553837ff3b8e2f1dfde07cce15c16cae43c56e2", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "22e1ab1286939fa49dea852a01259bdba14600bf", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "ea56d80b820dffdcb6aa5c12c6947d7b41abcfe4", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "d0804004128c691a13a91fca190555a6d6cdb392", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "a9edbbda73aeb1c93999eae03ca77b474e933424", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "f030415c10f9a327a1f0d0026de1c83e55862766", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "6af1cbd481cfaead0711430ba2c7cefd8a27b71a", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "ce5a5aa746880e641ce9d2f680b5b93525ba695a", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "2f0ce721a3b3a0145e0b442fba34004fd4f0ee30", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-purchasing.json b/port_versions/q-/qt5-purchasing.json new file mode 100644 index 00000000000000..f9f5eac3881856 --- /dev/null +++ b/port_versions/q-/qt5-purchasing.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "9789fe42c9921171381c50b4586b81fb7f1ee405", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "a88066a45c91eaf3f4b4e82f7952ad1475a37ef5", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "2c8b82b1cbb08dbaf2cb4540ea28d6575b9b92cc", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "bfd9a22dee4ae335e1eb426bf4096ebe2df929fb", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "3a29416aaccc6b188da273c2ac07d09ad462659d", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "ee1c603ade4a5dcbc09fcfb2ce0e6fa9c9aff7fb", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "1bcb4c6701dfc41b294c42d40fc872c9d2fafd25", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "0e1799020f30f41f39c36ef9767c44cc83918bcc", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "83712f2ea06411edc490cf298ee8da637fdfb7cd", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "5aa571489c43635a43b3ef4a3a86a914b006e68c", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "03bc6eed238cc6aa977cba5af90b127e8203433a", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-quickcontrols.json b/port_versions/q-/qt5-quickcontrols.json new file mode 100644 index 00000000000000..32ea3d05d30241 --- /dev/null +++ b/port_versions/q-/qt5-quickcontrols.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "ba0a7677baa9c89cb30bb792bbe990d84a46133b", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "62742d1350ad7d44e3ee6be29c5fa030883cef64", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "9988b19aeba65bbbc34bbf55fb064ef56aad9357", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "7c0adf2f65202ac6a4b1d8b3a92a524e782f9514", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "d2e2d349ba82b281d1aaa79d3b76aa5962b19ec6", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "0a1168794a5335392729e39882f8b28a73292f3f", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "23c6f45f0767716d58c6009ed97eed62f70880d3", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "c5ea26e184537f6eba0a39a1eb708c50988d3314", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "f0b318eadd961e6c1b09f92b34f3ceffe05258a7", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "2f8da6cbd12fbdb3dd4096123c5876c6c1f82698", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "8daeb80a4a00d61ecd69dcf1e08bc246a257b5d3", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "e63607858735fa3fbca80ca06cfb1d1c11650e68", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "158fc7583861ff08f860b4c36684a96dc479b313", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "88f5dda4d9123a8b58f18ccc9ebacc48ee69e602", + "version-string": "5.9.2-1", + "port-version": 0 + }, + { + "git-tree": "7cd48c2b5abb5936b040fe3a9220dadde6dd59bd", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-quickcontrols2.json b/port_versions/q-/qt5-quickcontrols2.json new file mode 100644 index 00000000000000..88f7c7afd5100a --- /dev/null +++ b/port_versions/q-/qt5-quickcontrols2.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "e89068f3afab69f11461a0bcc2153368af489051", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "f9d08f684f3a48174fb02f4ce6ae55aae906b095", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "6a4deeee9d9a81e41dee958b9ad3562e6a099c23", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "d95e7bee74808d300eaf2a6b882ae55506204622", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "afb1b1e0b10ae2029a093afecd1b3ba851162aad", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "c1b20474e08df4155b3745d69a5381b2f296c256", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "b1aa7372bc1643fdff3167b433db9d7b86fb2c05", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "d005163818908c9059fa8bd775625620ee599bcd", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "6e58b344f8789ebbe11d739e129a0fd08ab79bba", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "da8dce867a92e76be0a8d1ddd007fbf201540e6a", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "30a3f39b7a851e0549d8a348e8b754a5a9350037", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "5cbb594cae7cedd42d0669495a2312f630bd244f", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "530798ac6ddcea00ac9df84208941db63f1fe333", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "84049a65cfa313905849dcdd8f63a47fec579102", + "version-string": "5.9.2-1", + "port-version": 0 + }, + { + "git-tree": "c193b5a40619c8e8bbce4d371199367d89c774d8", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-remoteobjects.json b/port_versions/q-/qt5-remoteobjects.json new file mode 100644 index 00000000000000..e7f4a386526e3e --- /dev/null +++ b/port_versions/q-/qt5-remoteobjects.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "a8e21e36a43e286bbbd37238536e8fcf66c07ffa", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "7d29e74a85bd0f7529d7d91ccde8e76f110f5818", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "34ad67101305b735fd1bae1ea9f51834209e9a2a", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "4bcf56e3b758c8262175ca277f6fd4b618421beb", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "10829f8502c12f39b0719970e62fb3e2f7571de8", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "5b5fb528b8ae358863a51553be5af453d9fbf312", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "25f4b090864a4f9c19c2b5be0490541bb1c013e6", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "8f6c5104ac50840812708b3c37073f7c9252d9cc", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "73c22ac30c7de74d621b40169dba13bbaf67dfb0", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "29532d7b36c0970267fba7c4818922af59a5fe8f", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "102e281ccafd8b1c614b09f0b36aaeeda65e9d29", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-script.json b/port_versions/q-/qt5-script.json new file mode 100644 index 00000000000000..a4e36b676f31a8 --- /dev/null +++ b/port_versions/q-/qt5-script.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "eabe840ad61233b6f28db78f16bffdcb7fbdeddd", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "cb665849f7edbbec817631349e05c3a0b0dc89a2", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "0631f99e2331137a3067e2700f0710f33ade1c11", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "8d073b398ce015766b6df28a27cf4ea6fb22f940", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "d1547cd549f29fdf736e4f80d3af4507df836467", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "8db04321a4bbb2008214d1518944df168af15270", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "14ade779799db4d05500081ba67d971c6f5c6e46", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "a5c7384f06726bbaa76b002b0f8ffca05f0ebc44", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "4259d5f23594b05e43bee478c7061d4e44c000cd", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "3c0ce5504709c5c6e2d4b466a34b0d0ba3bef029", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "8a68433514fea9fbbca60d39a482a04223962487", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "2ed40ae8f32b048c9f9363594061e1c6a2fde6ad", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "09841c9fc65eadc8006af11b42201a68523cc3a5", + "version-string": "5.9.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-scxml.json b/port_versions/q-/qt5-scxml.json new file mode 100644 index 00000000000000..d8fa151589e0b0 --- /dev/null +++ b/port_versions/q-/qt5-scxml.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "88b3fdf6dae974fd1257b9ab6dbdb657080c2233", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "4abaa321aeffb998e695e0480c3a2284dbac77ab", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "204e4b6d12184d439962aa8c7f318a26393d1adc", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "18d79e799f3c80391c34ce458e05879ff18370c7", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "f6184783322633f3d75b146186b956e3fcbe0c15", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "647520900a1bcd8ced59dde81573157a5a28c9e5", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "6efbedba5a9b080861eea789dd4cb70358da3538", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "353480b2680af0a7bb884cce7299667d030b97e5", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "791270de8f04665a985473b036f7e4be4730dfae", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "658ca9b272f0079e9ca0656a8cd789e7f9a5872a", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "3d9036b01f4a7138d985edb69564391e4758998d", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "626f46a39f8d6be547a73fea915f73ab1fb00d11", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "844ab80b553f709005070168dd55f0e92b5a7445", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-sensors.json b/port_versions/q-/qt5-sensors.json new file mode 100644 index 00000000000000..1c8ab05081ecc4 --- /dev/null +++ b/port_versions/q-/qt5-sensors.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "670b8b13f2fb7509ceeaa96c62fe1eec4fc12450", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "daaed9ceb00ff294c10ca84e384c2d98133377e2", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "e9a694010507f83ea470d99c2b37386d76822091", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "1deacc537cf34a05cc8b74eab406f8fc6812167f", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "88d90c7ebc6840210978a7b1435f1ae43642367e", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "8c437fab96e39ab0c03a7e141580395b7eccd2db", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "5bb4708d3d2d40729408bcc5019a412d96758219", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "c07c9fcc5bca78137f28dc91cdc488c2e17baf02", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "7a35294ed1beea5a6008cda718fb62a55a3954b6", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "9ed88bbea76223088548740dc4f70e74f90fe57f", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "d3c15efaa9e1d908839fe01fc5685d220740d96f", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-serialbus.json b/port_versions/q-/qt5-serialbus.json new file mode 100644 index 00000000000000..9a8523b5a628df --- /dev/null +++ b/port_versions/q-/qt5-serialbus.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "17ee8d39cdc45e3945bc01eee50cf0d18e27f47c", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "d118103ab7de3a470fbf87a214c8645587a2f39d", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "a5a206d5dc30987299dd872a7ddcd9927c3a021d", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "01725a7cb801dab6764679e925fa62b427abb12d", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-serialport.json b/port_versions/q-/qt5-serialport.json new file mode 100644 index 00000000000000..358c8306f71c24 --- /dev/null +++ b/port_versions/q-/qt5-serialport.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "e7f00b17dc3a26603d86b756ed7edc5cea77d0c1", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "ec237949790f5a82daa49f545cd283627ebd1cbe", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "b6650cb3b8e6b4220e156da1b48ab1ab4b0ab44a", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "17aa2b761c09d08f3c6fcc1cbc630ab425b826f8", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "770014b18fc21d17ae1af2ec9ca48c4d6aec4bd3", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "7324bf20f32b8bd9c18a54e5198ad9a2f59a5052", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "1dc27964a26d58f16e191d8dd3ac3d6d70ed9078", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "909427c2a51269c3cef3801df260f65236a98411", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "904aa9f0396de49689545f5fe34e5dbe03cde9d6", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "5062e3e1e11d2a8a03783e328802fb518cfa7cd9", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "84d6d638b706c52c97abfd5f10b418dc57065684", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "95b0de657adc23a76abf3f5a185a0e48c2b1adcd", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "41f7f2ce0039a1078e91bab0bb32a0541406c613", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "9bb23039283d9129a43f3ba45c2f5e63387e4374", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-speech.json b/port_versions/q-/qt5-speech.json new file mode 100644 index 00000000000000..cd5defa87e7596 --- /dev/null +++ b/port_versions/q-/qt5-speech.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "802a16804890503cb951986fed4a7f7ea0de857d", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "6838350eb5b01c352a537d88f2cb1a593ea52f37", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "09ee28566432c49b1288aa7fa0a0865d347c20b8", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "119a0e1f76b3e98511926cc7204fe6521760d287", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "a70b9fd47035792a844e6045d5b4e97dafc74873", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "dbdc77fc978c28595863d7d90867064f436421b1", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "b76ec161abb87913ebc545fcdfd064b60b128207", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "68ba614e4372ae5d7bfdfd19e0b6c58534ef0dab", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "fa6452d57132730ccef1e9920536ee3890c4dc68", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "dc3171d75e6f3eddeddeb3e3e0ea0cd3c1b997b3", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "f604567ef44bb92c159455ae34e4d0f0a5506671", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "e3395d46d89643da5110bbc4ae971ae42adcda40", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "6dcb9686e566f8ee7272a8e14c12739706f06e77", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "29f70766d5aef50f838908104fee7b24470e95ce", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-svg.json b/port_versions/q-/qt5-svg.json new file mode 100644 index 00000000000000..ce60619734a202 --- /dev/null +++ b/port_versions/q-/qt5-svg.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "e8e8fc61228f3069fcef1a81eb448c955bce11ee", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "e67485b147021f0ceda43cad61dc1e6e92ccf3cc", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "f83a2d62509852229f61a6a480ac2a026e80ca04", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "6c9aaaa31eb626633476beb087863cbc1fe04157", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "bfc97b284f2c20489027d289ee249de8e900a7fc", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "4edc438357050e3e5e84eeeb7bd64339ad23554d", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "951e7da001ff8d894bc6d6755d6dd9f7c0738166", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "ff1a00f52b9aca17b9e060f4e3e680fbfce6f740", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "1be67d82d26748d434d76388eff9502cb0e982d0", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "1f0e7210df520062f75c7091422a01b7d203b4ff", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "5dc0d79f817b9e12df792c45345538b6a880c6d7", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "e09a9499f71933eed22c84bdc630bed3e353883a", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "9e8431ea75da30642de515fa85a2f3471833cd36", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-tools.json b/port_versions/q-/qt5-tools.json new file mode 100644 index 00000000000000..2f49c664fd6e18 --- /dev/null +++ b/port_versions/q-/qt5-tools.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "42416e080314c2a741b2b674fc22fd12932799d4", + "version-string": "5.15.1", + "port-version": 1 + }, + { + "git-tree": "40fdbf4941d716fb8294c7b6f30003e474f153a5", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "85717a003a0f218fb461ea7fb1ddf5923e1ab702", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "935399ee977b57c61b918bfdae02b154cc0ba306", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "beaac627ba3817593396391e275b523e69e1d4e4", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "9c0b9add33cb4afa6687dbacdab46a024a6c2d82", + "version-string": "5.12.5-5", + "port-version": 0 + }, + { + "git-tree": "871fd690a186b6ed44e3df2f32d4ea4ec2ea3c27", + "version-string": "5.12.5-4", + "port-version": 0 + }, + { + "git-tree": "8a673898d61a559b94f06a1623ccc75db0b7807e", + "version-string": "5.12.5-3", + "port-version": 0 + }, + { + "git-tree": "e7cfe0f3a66029443347788b1bf52eb05f62adf1", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "15dd2e6efec67638a1e3e889728d340a7fa10cf0", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "7a1b4e32377254aa33799a34454dc59c71048eed", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "2cc1cee9808bc2eb6ce640c46e4ef155256d88cb", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "8e6facc981cba1637f0d0ab35a62fbd2cd868be5", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "b3aa2dfe5f5af37842213aeef15ab16837fcd184", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "71781cfabeea164d17dafa3bebc03d6dfb6e8a59", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "d8a0cf14005e4a583e525bc422a4b5b9115295d7", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "893a9b29611e272a23ccdc583d9e537c7a9079b7", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "0d03e3ab700d1b9dce8ab5e7816be833bf4c8ac6", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "116f4016dc02c5bdfd2aab048c073e46ed602e11", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-translations.json b/port_versions/q-/qt5-translations.json new file mode 100644 index 00000000000000..7819456f2f980e --- /dev/null +++ b/port_versions/q-/qt5-translations.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "8b2da9c53ca7e6025cd00d40d718ccadfaea75b9", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "6a738d8fc7c71ddb513c3c6b9b46a7ad12733863", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "abdc12734788699ea91f6324214394ee0309f5c0", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "d4723b0b934a64ce25ec5714e12a6130e6b855d6", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-virtualkeyboard.json b/port_versions/q-/qt5-virtualkeyboard.json new file mode 100644 index 00000000000000..924fdd05ac9e4c --- /dev/null +++ b/port_versions/q-/qt5-virtualkeyboard.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "1d58303fd8236c7f075e5618074a6361738a6b58", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "128f4bbef7cf5dc99a077f0afe5d7db0d35324e2", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "a5bd2cbf0c1470dce53cd1e632e42bb3835b0e5e", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "66e17f4fb97c423f37f7aa2dae78cfec3e8fe4a3", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "978bab3c1fd725e3692fccd47b1c73548117f059", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "39bf2d3afa816c266140d66a213883fb4e697fd8", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "3707c5d363cb7cb72595cb5a4e382635fe64ae93", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "1234d87de0e93dc366bc76d6efc75d6ab37f4e9e", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "9a706b29a63439b76ff1d1b6daadc4f310962723", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "df9d910acd91e5b365de51dac93d478ba04136f9", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "d4d6c9a8641615173452fd81e0d11af92fe93364", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "017d694c676ae8abcbeb415f5b6154263e7d4e4b", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "73b6647b2dd8d08b93fac633486a7577370c2764", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "9a38e0631249720c3adb563caeabce150fab4486", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-wayland.json b/port_versions/q-/qt5-wayland.json new file mode 100644 index 00000000000000..86f434b62fddd7 --- /dev/null +++ b/port_versions/q-/qt5-wayland.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "244d21edcbcb57f8809feaadf0149d408c4d5e84", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "d63a245eaad5cf5422f82ab0da47e679424f8b9b", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "d819804cf44187370e081411a5f99600af849485", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "52aab7785e5377171522d9117618517143b74b1c", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-webchannel.json b/port_versions/q-/qt5-webchannel.json new file mode 100644 index 00000000000000..bca7938c2d3ed9 --- /dev/null +++ b/port_versions/q-/qt5-webchannel.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "9c133f361a037ee2d29a0f13528cc56e19b52b8a", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "dcf3a917962939ff0df7d11ee9d3960985b8263a", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "2fd38b01119591ad52bd2c7636aed32880780542", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "ed5df36e7f544021b554a83f1a9c4b81fdab81b0", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "48b279541b2635c95924258ce7766ba6cc33ed53", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "198c44972338fdfbe014616d54de315f80caca92", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "d1db68848d77b317227ca942715454bc038be879", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "b61dbf9266dbdc98d779935d86aeaca9c09fe845", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "b6c956030a671892b755446ec2762323159a2fa9", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "39d252c95a5b0dc81ff704932ea246a85ea27b3e", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "e94ed60db636303c6f0ace5860267c7abf1a0ef2", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-webengine.json b/port_versions/q-/qt5-webengine.json new file mode 100644 index 00000000000000..cded10178c9b84 --- /dev/null +++ b/port_versions/q-/qt5-webengine.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "9e021df8973b08f0d03caeff578567543bc2f1ad", + "version-string": "5.15.1", + "port-version": 1 + }, + { + "git-tree": "85e41560eaefb2cdb8102bf1726d67a6c6e76b1a", + "version-string": "5.15.0", + "port-version": 1 + }, + { + "git-tree": "6c8077670749344fc2e31e791d81149685b7a7d1", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "5e74a28edf936627f948ce656683c4e1f25217ca", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "792fbceaff12af645539d04b3420a384fa2a83b0", + "version-string": "5.12.7-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-webglplugin.json b/port_versions/q-/qt5-webglplugin.json new file mode 100644 index 00000000000000..701a1062b46302 --- /dev/null +++ b/port_versions/q-/qt5-webglplugin.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "dbc7e66e5d089e94e2278d8cf437e46aa1c18ad8", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "654ffaa3a07c623a58311c222d0cd3e172b0b61b", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "86159be37c81cfe1a55c28219dcb5dd5b3d6ed24", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "ae82f97a47eaf99a029c4002ff3595065c792f51", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-websockets.json b/port_versions/q-/qt5-websockets.json new file mode 100644 index 00000000000000..cb197294b2e8e1 --- /dev/null +++ b/port_versions/q-/qt5-websockets.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "b9e183d1921cbdd06d712feb0dc810901fec6352", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "f5a19676b1b6db3239b048d5b1cad7a5a9fb8791", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "3bc78c8102e24d18b9f5a0aaeeac481696202a9a", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "aa33d4a6ac44a4ef3501fe31c05d1007cd1c2387", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "9b7a16d04060df3fc6d1e14d1c25f19c862a7969", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "328d696192f6e6e52514d13534f253170529e11c", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "26d587abf239a6d37914ad0f70457b0b1e0f8c5d", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "9ee4b15384ceaa5acc59296c308ae48698c437b3", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "95a2734f619d0d54670cff1a71189f5b9c738bfe", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "6d558d0c7a0a90ee59997236a92ade88905a5099", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "93cdbcc5012048444f5cd8fcc89f62aa29172c7b", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "70de9e4b12e7feeee33c3134e351f95656f8659e", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "7762e8790ba6077c45fa1f4964880a3eac90e4c6", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-webview.json b/port_versions/q-/qt5-webview.json new file mode 100644 index 00000000000000..148616122eb8a6 --- /dev/null +++ b/port_versions/q-/qt5-webview.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "f3781e5871021354cd74e4a7baedc112c78833b9", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "3eaddb3bc343625c84cda44a466ee11e5ea8b322", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "857f9aabf7c727e56eb710f24c824af5bd92b817", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "7647cc30e5fd1d259f160a1950a1fb7f2f82a0cc", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "834ea50732eeac2f613d8581efaaf4703ff1dc1b", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "18c46e487b6d2f05a1f91d619bb9757e1c1a80d0", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "10be2612641028b88b0483ac46713fba92f5b625", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "3ede9db26a87a3caf807dc19501b4427b25ab31e", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "4f7b1b9d80d79941bc0e31a5930b7885014bd80b", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "017eec1fae618bf250db76a189134a14d58adaaf", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-winextras.json b/port_versions/q-/qt5-winextras.json new file mode 100644 index 00000000000000..6f84bc6dcd209c --- /dev/null +++ b/port_versions/q-/qt5-winextras.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "382a4b48cd76feb4c9fc84cfee66f2aa5589ecc7", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "9eee10e08d30f083b58f086e045e68a5f6f56716", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "6ead1ad0349a17b19af0cb89ce1f6c2225706870", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "eea49a6918113a3b68b14042ddffe9a9fd876616", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "1cf1011d345da4b62a3940c448dc5b5d7d4a8d05", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "598332a52e89eea8f21f872dff068fb85823fa21", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "b532def8243f6784f888dfa2fc40342355699cfb", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "e1d99ed0e8610f124869eb99ccb8b4ea43f5f652", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "57864bbe071e50ffd9d0d0c2524a444f2c38b2ca", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "3d1caef57ca3a62830cd66faed4d99291e015223", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "768451de1d8a9d6fe6040ff66ca7d8a77cdcba9f", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "4168465ea0f28742c2b6eddef361b0730efe6e43", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "1681fdc4e2fb7d7d009079b82f4989e26cf4aa1b", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "f5a940630183d0f5b478cf829a12f403e0de4506", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-x11extras.json b/port_versions/q-/qt5-x11extras.json new file mode 100644 index 00000000000000..1aacc1103a94bb --- /dev/null +++ b/port_versions/q-/qt5-x11extras.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "989effc95d136ca39434f1c9738d2856d9924643", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "71e81965723ba4104142e8d7bf5e53b4d5dabab1", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "0f0cbbc0cf4cd928a388ec7422237ee3ad0f877c", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "4c7d906ab7d33af16846e826b55494410c358c13", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5-xmlpatterns.json b/port_versions/q-/qt5-xmlpatterns.json new file mode 100644 index 00000000000000..3fb37450467514 --- /dev/null +++ b/port_versions/q-/qt5-xmlpatterns.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "c5d3ebe14a81907e6948d45eb78c07929f55084a", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "280b27c050903a666a0dd518d31673ca015cd512", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "a47e6078f537a261de3eedeb7d5df9d61680f939", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "39c8ed889a64d5204bdbef53c3b7c9ed15822298", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "c95b73443a1c10a3f21b94192a3d1a9e0e6a9fc3", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "2b6ef18aca8398475750a771a9c863214728244d", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "4f7d61c3a2359871411f186c70dbba319d3b8ddd", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "7c7b3ee1ac74a84f15e72cf2cb9fd40d9d628163", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "fa1b098185ead8fd17a2a60ff6eb17bbc258753f", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "ef5d448131c0f97d55f6e98708447b169608010f", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "04974fa68edbf8e12a6e8205f84ffc64c221c557", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "b6b12639db0a0c2fde28e0192c5f63645f13f7d9", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "8ccb46e3216afe740b5be3709ae333ede8a05ef6", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "6212f4fb0039e9d944072685a972e480c94d3950", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qt5.json b/port_versions/q-/qt5.json new file mode 100644 index 00000000000000..a9699009b94dbc --- /dev/null +++ b/port_versions/q-/qt5.json @@ -0,0 +1,169 @@ +{ + "versions": [ + { + "git-tree": "800137391209a8e9acbff74fb129f05192e159a8", + "version-string": "5.15.1", + "port-version": 1 + }, + { + "git-tree": "1cf3366aa520643907eaf281edd1209d46762838", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "da980816d56966ba3a62f940d8319ef211363f1e", + "version-string": "5.15.0", + "port-version": 2 + }, + { + "git-tree": "77f274080c535a523e638722085715dafbb00fc1", + "version-string": "5.15.0", + "port-version": 1 + }, + { + "git-tree": "27e55da03da89dcd727dabc0b906320ec31f9c14", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "044db93ec24dc19cf505969bb4bc37791bff7ae1", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "3896d169d13e7e6b0eb6969942a91e106568d1e1", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "9aafb7c18221fa0c5b44cf02a5ff1e6fa19dc5c8", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "e4055eb5c566c3b043d4740b604828054503bd8a", + "version-string": "5.12.1-2", + "port-version": 0 + }, + { + "git-tree": "2d4c09271773156bf248f17b384756de8c26906f", + "version-string": "5.12.1-1", + "port-version": 0 + }, + { + "git-tree": "7896f5609bb83bf3b925fb627eaa7159b42b8950", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "750da4a3e633dafcd60b75c720144660cfc07e27", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "4fb62f3b74a5cf05bd07e2526b0d38dd5aa8f6fe", + "version-string": "5.9.2-1", + "port-version": 0 + }, + { + "git-tree": "c54440a2fc7b7f56c1339015dbd88f195ef1c4f1", + "version-string": "5.8-6", + "port-version": 0 + }, + { + "git-tree": "7d62c038e2916d12bbb04cb3565fcf2377a717c5", + "version-string": "5.9.2-1", + "port-version": 0 + }, + { + "git-tree": "98e553c4e98e304bdea7fc602e4dd521f78de39b", + "version-string": "5.8-6", + "port-version": 0 + }, + { + "git-tree": "8ef67f83440846b3df327ad5632ab40b56a5afad", + "version-string": "5.8-5", + "port-version": 0 + }, + { + "git-tree": "fd49510b125c64b63e1177fe2c9c7ee71eab1f42", + "version-string": "5.8-4", + "port-version": 0 + }, + { + "git-tree": "ba9eae53136170ce59fb80fba94bc0017d997f76", + "version-string": "5.8-3", + "port-version": 0 + }, + { + "git-tree": "8450857e614a27d7885f65ed31a63d46e537474b", + "version-string": "5.8-2", + "port-version": 0 + }, + { + "git-tree": "d8806f8aa4a51c2afb96e5e982b61ead5d1b57b9", + "version-string": "5.8-3", + "port-version": 0 + }, + { + "git-tree": "bb2f14e92545e3bfd4b00b2a57ce632b25756aba", + "version-string": "5.8-2", + "port-version": 0 + }, + { + "git-tree": "057443d5b5d8c682cf1bd78edd3c20478479f533", + "version-string": "5.8-1", + "port-version": 0 + }, + { + "git-tree": "3d9f4415d7d6c419ea18165b1daea4a602b1ca04", + "version-string": "5.7.1-7", + "port-version": 0 + }, + { + "git-tree": "a213c34055d0653c960318382feff42c86f4f1b0", + "version-string": "5.7.1-6", + "port-version": 0 + }, + { + "git-tree": "ff901a5e6ef1fa151fad2da33289f0407c630d92", + "version-string": "5.7.1-5", + "port-version": 0 + }, + { + "git-tree": "e8694966c75688a3dea133e887487da8405182d1", + "version-string": "5.7.1-4", + "port-version": 0 + }, + { + "git-tree": "3bdfae1f98355075b40a26d0f6219561edd4edae", + "version-string": "5.7.1-3", + "port-version": 0 + }, + { + "git-tree": "8cc9d59d5a9de8271ea11b188af58ce1515f3f89", + "version-string": "5.7.1-2", + "port-version": 0 + }, + { + "git-tree": "05d0534884fc11a45bd16e405fd7ffd17dd5fb51", + "version-string": "5.7.1-1", + "port-version": 0 + }, + { + "git-tree": "5983a3a786fed2c993e63b2441f62bff58416fb9", + "version-string": "5.7.1", + "port-version": 0 + }, + { + "git-tree": "290292f1733374206d67588a3ccce9ed9c808e60", + "version-string": "5.7-1", + "port-version": 0 + }, + { + "git-tree": "42df162ea3ee0f8ec8ae23f9ef01664cd19008b4", + "version-string": "5.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qtkeychain.json b/port_versions/q-/qtkeychain.json new file mode 100644 index 00000000000000..c3f31362464cf5 --- /dev/null +++ b/port_versions/q-/qtkeychain.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "576c3e09b3b4e3dfe7ad0d8e69fe6d003da2de89", + "version-string": "0.11.1", + "port-version": 0 + }, + { + "git-tree": "9afe1a5db0e2d91f74b839a7e2c28996275ce3ad", + "version-string": "v0.9.1-1", + "port-version": 0 + }, + { + "git-tree": "891122d489d2a434d81298d41c8a881095fa57bd", + "version-string": "v0.9.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/quadtree.json b/port_versions/q-/quadtree.json new file mode 100644 index 00000000000000..f6d1cf918a388f --- /dev/null +++ b/port_versions/q-/quadtree.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c7e53493b566954c3cb3148dfbd4b43f28b9be8c", + "version-string": "2020-04-13", + "port-version": 0 + }, + { + "git-tree": "40f422891178a73ab9d7567a3dfa07ad86b4b350", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/quantlib.json b/port_versions/q-/quantlib.json new file mode 100644 index 00000000000000..4e0e8260b62992 --- /dev/null +++ b/port_versions/q-/quantlib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bc5ea971009318ab7528c34d8ef715c3e59ed96e", + "version-string": "2019-09-02", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/quaternions.json b/port_versions/q-/quaternions.json new file mode 100644 index 00000000000000..43eff793995c4f --- /dev/null +++ b/port_versions/q-/quaternions.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a8226de2b0c3e81fa54c32961d117b9a3b7b0f3b", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/quazip.json b/port_versions/q-/quazip.json new file mode 100644 index 00000000000000..e4cea0d9598199 --- /dev/null +++ b/port_versions/q-/quazip.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "27e10e01f2905c5274447470031f595c28e0eb39", + "version-string": "0.9.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/quickfast.json b/port_versions/q-/quickfast.json new file mode 100644 index 00000000000000..78aa3b4695e28a --- /dev/null +++ b/port_versions/q-/quickfast.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3a43c333af274beae43a15f7d734a4146426273c", + "version-string": "1.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/quickfix.json b/port_versions/q-/quickfix.json new file mode 100644 index 00000000000000..b4716ce41ab294 --- /dev/null +++ b/port_versions/q-/quickfix.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "bff808505ccbbce1357d1998e69fe4813e21177d", + "version-string": "1.15.1-4", + "port-version": 0 + }, + { + "git-tree": "ad83e53295095f49ece0f08d5d519068567ccfff", + "version-string": "1.15.1-3", + "port-version": 0 + }, + { + "git-tree": "5c6b4024c833ce5fe546811f4cb2e0729df397aa", + "version-string": "1.15.1-1", + "port-version": 0 + }, + { + "git-tree": "925d15651a46667fadbc93686ddc7ceb415be83d", + "version-string": "1.15.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/quill.json b/port_versions/q-/quill.json new file mode 100644 index 00000000000000..b19d265999f88d --- /dev/null +++ b/port_versions/q-/quill.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "51f728199fde5bc02ecc29588236bb509cc4bb10", + "version-string": "1.6.1", + "port-version": 0 + }, + { + "git-tree": "2f457a33724dfdd8a3ad48e6d457559bd6040488", + "version-string": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "5c355200eda32947dbe63e233b69406eba3fcfa0", + "version-string": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "6c63c3f8614d12e5da6a8ae3cbc9d8e59a52aa75", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "7d1f9b6daa3945cd3c389a4840d8e65f9b98788e", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "40607c1b4f3b15f4346acbe53e4c97efc391da76", + "version-string": "1.3.3", + "port-version": 0 + }, + { + "git-tree": "6a2872ec44a6ecdeffc0458c846d90e3c440199e", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "64771aa16a9f82ac8b0bf15c5c647edf6997b0e4", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/quirc.json b/port_versions/q-/quirc.json new file mode 100644 index 00000000000000..7d263e18ee3f2b --- /dev/null +++ b/port_versions/q-/quirc.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "c4c19ac884d1a66e0ac073ff5bd99c2db1460015", + "version-string": "1.1", + "port-version": 1 + }, + { + "git-tree": "35b57df71d33fbebe4949081547473dd75d47178", + "version-string": "1.1", + "port-version": 0 + }, + { + "git-tree": "faa4541e95a245dc7c8787abd11a51a2b78b9460", + "version-string": "1.0-4", + "port-version": 0 + }, + { + "git-tree": "58671f87f70c18d16f75c60201ae2b58df9130cb", + "version-string": "1.0-3", + "port-version": 0 + }, + { + "git-tree": "21344fcb0602bf7573425fdd302a7786a8231b2b", + "version-string": "1.0-2", + "port-version": 0 + }, + { + "git-tree": "38ed7223f4563d345edbc928eb75a3283ad73c45", + "version-string": "1.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qwt.json b/port_versions/q-/qwt.json new file mode 100644 index 00000000000000..91b6d09cd8f7d1 --- /dev/null +++ b/port_versions/q-/qwt.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "6d80586d91e987e488367b16a11aa8d8d07205d3", + "version-string": "6.1.5", + "port-version": 0 + }, + { + "git-tree": "91c181ccce8241f1a71c6793ddc1435ac3142fb4", + "version-string": "6.1.4", + "port-version": 1 + }, + { + "git-tree": "cda71f93cd57ca9d3edc1da754773a789955a1b9", + "version-string": "6.1.4", + "port-version": 0 + }, + { + "git-tree": "6ecd69df07ed81f27c1f48d3da2ebe3e96d9f259", + "version-string": "6.1.3-12", + "port-version": 0 + }, + { + "git-tree": "6d49dc220505cfcaffa15076041a04c472e8115c", + "version-string": "6.1.3-11", + "port-version": 0 + }, + { + "git-tree": "ddd6e0960a91693203fc6207e49f01afb0ada692", + "version-string": "6.1.3-10", + "port-version": 0 + }, + { + "git-tree": "6f05fe69f2fc636982176d93b3cac3b81fa5c33f", + "version-string": "6.1.3-8", + "port-version": 0 + }, + { + "git-tree": "ac74d2ab39bcf9757ee26cb45073557526664522", + "version-string": "6.1.3-7", + "port-version": 0 + }, + { + "git-tree": "2aff021b72aa5882df97653ad71022ed466e98e9", + "version-string": "6.1.3-6", + "port-version": 0 + }, + { + "git-tree": "17798c48a5317ce0ae72e4c0eb7efe32fb7c338d", + "version-string": "6.1.3-5", + "port-version": 0 + }, + { + "git-tree": "c195033ff0c6a8aa95a35d052ce779e53c8a3d9c", + "version-string": "6.1.3-4", + "port-version": 0 + }, + { + "git-tree": "070fd87f3bc8cbaf77629d017e514919171a8025", + "version-string": "6.1.3-3", + "port-version": 0 + }, + { + "git-tree": "f77d5315def0e08ba1228bdf3c5a5ed0bfe3c22c", + "version-string": "6.1.3-2", + "port-version": 0 + }, + { + "git-tree": "9e8ba5d14e18279b0f221b3ae949545b48accfbe", + "version-string": "6.1.3-1", + "port-version": 0 + }, + { + "git-tree": "22ee99e9935e79a1cef0779435ac3d3b727e649a", + "version-string": "6.1.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/q-/qwtw.json b/port_versions/q-/qwtw.json new file mode 100644 index 00000000000000..aebb038707ddb1 --- /dev/null +++ b/port_versions/q-/qwtw.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "167a4247049896bc2c098541c74322adb3b98852", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "0039de1e3ace73cba523eec21547cc14647c7179", + "version-string": "3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rabit.json b/port_versions/r-/rabit.json new file mode 100644 index 00000000000000..4ceafb613a092d --- /dev/null +++ b/port_versions/r-/rabit.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "928c08f9223593bea452e7894a8aaa4f3a5bd13b", + "version-string": "0.1-2", + "port-version": 0 + }, + { + "git-tree": "eafd7521e2bd252af293a01f56022bca6f9a6b79", + "version-string": "0.1-1", + "port-version": 0 + }, + { + "git-tree": "0586fb6dd8dc27bf2217d52502755a6f28728f79", + "version-string": "0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/ragel.json b/port_versions/r-/ragel.json new file mode 100644 index 00000000000000..34d0d0226c2fc0 --- /dev/null +++ b/port_versions/r-/ragel.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a20473ef22c6b5a89d5771504287875cd2a36c96", + "version-string": "6.10-3", + "port-version": 0 + }, + { + "git-tree": "d543dfa5aef6909e7e134dba28b33c4acc156091", + "version-string": "6.10-2", + "port-version": 0 + }, + { + "git-tree": "3bbfd5feed38f05bf3b9b092e45545e7027284f6", + "version-string": "6.10-1", + "port-version": 0 + }, + { + "git-tree": "5a98dffacb33d52e9480f37b9bb078a9c84af833", + "version-string": "6.10", + "port-version": 0 + }, + { + "git-tree": "d9ca7201afcc092b6fadcea2a4b34a650f689fb3", + "version-string": "6.9", + "port-version": 0 + }, + { + "git-tree": "c32fad8d4d537c8637c3490f0f453e81c0857c27", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rang.json b/port_versions/r-/rang.json new file mode 100644 index 00000000000000..a17eee4b6970a5 --- /dev/null +++ b/port_versions/r-/rang.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "36461b54ab5f10f52e90b8b6781b705e79985321", + "version-string": "3.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/range-v3-vs2015.json b/port_versions/r-/range-v3-vs2015.json new file mode 100644 index 00000000000000..39a257b3fb3309 --- /dev/null +++ b/port_versions/r-/range-v3-vs2015.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b135e301521d603130d2c80a01b39fbbce826518", + "version-string": "20151130-vcpkg5", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/range-v3.json b/port_versions/r-/range-v3.json new file mode 100644 index 00000000000000..98aca3d7b1325c --- /dev/null +++ b/port_versions/r-/range-v3.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "21c30a70f1f205bec39020c41ace2a5e10a215fb", + "version-string": "0.11.0", + "port-version": 0 + }, + { + "git-tree": "5a01ea8bd3b90872dfc6d235e8de0064f6f714e0", + "version-string": "0.10.0-20200708", + "port-version": 0 + }, + { + "git-tree": "a313807875154f6bf3d35bb9b8f727bfdc20d78c", + "version-string": "0.10.0-20200425", + "port-version": 0 + }, + { + "git-tree": "70092d5f7193c97ea18ed0d665a327ad838a455a", + "version-string": "0.10.0", + "port-version": 0 + }, + { + "git-tree": "1a4aa57b09d499c32d3c45032d2bad9022458214", + "version-string": "0.9.1", + "port-version": 0 + }, + { + "git-tree": "2f6eea23c83e3d6ca411767b7a6e8fea64318c39", + "version-string": "0.9.0-20190822", + "port-version": 0 + }, + { + "git-tree": "e279a826d11e361c0f311cc33452cec5c30fc296", + "version-string": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "067a01e7b00d50140b27debbb55fc653ab429dec", + "version-string": "0.4.0-20190212", + "port-version": 0 + }, + { + "git-tree": "f74fb1a256b214725b20dd6583448271a9d702e9", + "version-string": "0.4.0-20181129", + "port-version": 0 + }, + { + "git-tree": "b66f7e0af8c832bc7f358f33ac3bdafd385e73cd", + "version-string": "0.4.0-20181122", + "port-version": 0 + }, + { + "git-tree": "e64bbe004d1138d99133a6728dea08ca22ba77ba", + "version-string": "0.4.0-87a6c31", + "port-version": 0 + }, + { + "git-tree": "5f8c18fe9643edd3b732ef59331243713732bb8f", + "version-string": "0.4.0-01ccd0e", + "port-version": 0 + }, + { + "git-tree": "ba9caab1b1d04d4c08ba02e6765ad8784fddebc4", + "version-string": "0.4.0- 7f2eb04", + "port-version": 0 + }, + { + "git-tree": "ac29b501d8407345b9891a220fcdc454d6747cb0", + "version-string": "0.3.5", + "port-version": 0 + }, + { + "git-tree": "b1d636197e90f4008c7d1e452d76c4778a4476e2", + "version-string": "20151130-vcpkg5", + "port-version": 0 + }, + { + "git-tree": "0c28dbd9d9ca4de79c72d026ad1b4fc8f990cc86", + "version-string": "20151130-vcpkg4", + "port-version": 0 + }, + { + "git-tree": "43cd4438a584ba6d6e913f6caa7593193b1a8248", + "version-string": "20150729-vcpkg3", + "port-version": 0 + }, + { + "git-tree": "632521e9953eaf5d67a2d218c9559fe9b55eafae", + "version-string": "20150729-vcpkg2", + "port-version": 0 + }, + { + "git-tree": "3d2f85c0a5ebe150418478f512e093cef73287d8", + "version-string": "0.0.0-2", + "port-version": 0 + }, + { + "git-tree": "9d39a35ff17e942f23bde0c5e984678e4c708048", + "version-string": "0.0.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rapidcheck.json b/port_versions/r-/rapidcheck.json new file mode 100644 index 00000000000000..e23f4cb4129074 --- /dev/null +++ b/port_versions/r-/rapidcheck.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b6d707d1c504b3dc0b529ba674a748f700b29f61", + "version-string": "2020-08-25", + "port-version": 0 + }, + { + "git-tree": "8b1dce27654237153afd12ef75302f789eaf3e53", + "version-string": "2018-11-05-2", + "port-version": 0 + }, + { + "git-tree": "13b582c4088b5849668608f582a03c113f4927fa", + "version-string": "2018-11-05-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rapidjson.json b/port_versions/r-/rapidjson.json new file mode 100644 index 00000000000000..6e02a179059276 --- /dev/null +++ b/port_versions/r-/rapidjson.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "85e20cbcb5a3a60d6f64064055d149e2c2f01534", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "774a98d1e6f1f3ef3c209842e90c2887178ad8c8", + "version-string": "2020-02-08", + "port-version": 0 + }, + { + "git-tree": "88bad907ef9b4c572dbeca11c491ddb205ae01ef", + "version-string": "2019-06-28", + "port-version": 0 + }, + { + "git-tree": "ed6ea2be90d867ac327d6b89f8813c73e37d40b8", + "version-string": "d87b698-1", + "port-version": 0 + }, + { + "git-tree": "fa4095045d898afd3a3d64e6b1b3453a7ca99070", + "version-string": "d87b698 ", + "port-version": 0 + }, + { + "git-tree": "19a7ffcae9b4d393546e516274ad8ace062242f6", + "version-string": "1.1.0-3", + "port-version": 0 + }, + { + "git-tree": "f7425f3a260c69a9bfa207b2cae3ef6a1f57f635", + "version-string": "1.1.0-2", + "port-version": 0 + }, + { + "git-tree": "70185e740a69c90ef95e1c3cd2081d037dbc54c2", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "d59e788caf8f5d28507589447072d827f0d68fbb", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "c0d8c86470921ef424f9f779ace8d4fda9987c64", + "version-string": "1.0.2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rapidxml-ns.json b/port_versions/r-/rapidxml-ns.json new file mode 100644 index 00000000000000..0222fb65328e68 --- /dev/null +++ b/port_versions/r-/rapidxml-ns.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "9a3b56d3389af2902391bae4f837006546e7bc4a", + "version-string": "1.13.2", + "port-version": 0 + }, + { + "git-tree": "1a19b835afd20847e6bcf678cf643c1a03b0273c", + "version-string": "1.13-04674e3", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rapidxml.json b/port_versions/r-/rapidxml.json new file mode 100644 index 00000000000000..da8813a5384dfd --- /dev/null +++ b/port_versions/r-/rapidxml.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "d229da572bb02e1aeb304654a6e25ad55038ad02", + "version-string": "1.13-4", + "port-version": 0 + }, + { + "git-tree": "550b293b0b2eb29e8a23332fc4ff2500848580ca", + "version-string": "1.13-2", + "port-version": 0 + }, + { + "git-tree": "aa1373651012197cea3582b23cfb8643fb725c66", + "version-string": "1.13-1", + "port-version": 0 + }, + { + "git-tree": "d8cdb5e3c27ee26f69405eb3b39d18cc2e22b431", + "version-string": "1.13", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rappture.json b/port_versions/r-/rappture.json new file mode 100644 index 00000000000000..0ba67c263c4d50 --- /dev/null +++ b/port_versions/r-/rappture.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1bff8b135623078465252ff2d940407537851f2a", + "version-string": "1.9", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/raylib.json b/port_versions/r-/raylib.json new file mode 100644 index 00000000000000..49226f0b73b112 --- /dev/null +++ b/port_versions/r-/raylib.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "5f584abef9d068dcada1382034eac435d75fd21d", + "version-string": "3.5.0", + "port-version": 0 + }, + { + "git-tree": "6954818970e2f326a5e33549cbe19109de98c1d1", + "version-string": "3.0.0", + "port-version": 3 + }, + { + "git-tree": "e8c9cd7323bb5e8e4629e532ede10247196af12d", + "version-string": "3.0.0", + "port-version": 2 + }, + { + "git-tree": "c7a8854788c91ea219d204d55317d8d4b75db7c8", + "version-string": "3.0.0", + "port-version": 1 + }, + { + "git-tree": "447d15c991d059e33830c3decddb2f332d60aace", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "cd9aae17d2439c30649e5429a9c079a68c72a0bf", + "version-string": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "cbbc4ed87eef0f425da746c878d45eb2e858cb54", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "2d4b3cd681d973b4abcaee1b4c1568ee9c4917d5", + "version-string": "2019-04-27-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rbdl.json b/port_versions/r-/rbdl.json new file mode 100644 index 00000000000000..2091d05bbe0a1e --- /dev/null +++ b/port_versions/r-/rbdl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c2823f8341acd1e564485661989fb3780a6b4a2a", + "version-string": "2.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/re2.json b/port_versions/r-/re2.json new file mode 100644 index 00000000000000..0dad20168f12c7 --- /dev/null +++ b/port_versions/r-/re2.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "f64f9d63a95c27658c5c67753cf2ab9a9272858e", + "version-string": "2020-10-01", + "port-version": 0 + }, + { + "git-tree": "549b49be9b43c962910bb6673d1ee08f24657d35", + "version-string": "2020-06-01", + "port-version": 0 + }, + { + "git-tree": "d3b3cbd54faaf701f3843470ff1c8eba7ed71907", + "version-string": "2020-01-01", + "port-version": 0 + }, + { + "git-tree": "48c086d348333226b00d8cdf3aae00bec81c65e7", + "version-string": "2019-09-01", + "port-version": 0 + }, + { + "git-tree": "c0b3d46b2095c2593b793856dc5650742edea27a", + "version-string": "2019-08-01", + "port-version": 0 + }, + { + "git-tree": "d987b1a405803405767d5734544f0d4f19fc633b", + "version-string": "2019-05-07-2", + "port-version": 0 + }, + { + "git-tree": "2f27d70bd6316f84629ffa4b9f220f057df1a615", + "version-string": "2019-05-07-1", + "port-version": 0 + }, + { + "git-tree": "c35e47a87966d2f009fb8955147ed4030b5e690a", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "55ccf37b57d89d4403107faf75a448aea656aa11", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "3e880137385d8eadc2f5791288fcbadcc9875945", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "7046f92206ec1d0a90015907af7bb8b6f09bf234", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "8429571ddac445e6f97c72294cf864a65cb62c53", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "453a2c85bdd2af9b8ca61338ebff124efa4f40d5", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "340f35f1c87f1aac28ade26b855ba74cf60671b5", + "version-string": "2018-11-01-1", + "port-version": 0 + }, + { + "git-tree": "93733a17f5d3bc54da80a315504bc0808851f7c9", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "734134aa01681808e8d3c289d9628bb2ba9f7197", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "6bcbdf92c3aafb81457f5ae36cd3be6670a35585", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "22411be62c13838e81bf82d22dd3347f6467508f", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "595b58f86c23fe588ac5225f906b09d8261457f1", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "60a7708b885ab425a7fcbcb4206ba7164dc45bf0", + "version-string": "2018-06-28", + "port-version": 0 + }, + { + "git-tree": "6b85be0e8624d10d3875e5196de874f67d6f71c2", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "1e8f3497a6a4e685f25d5c59e71de609c345bba3", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "fe302b509d7af9b4250d046d862107e6c18bf384", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "ff0c92d032264889e208ea0eddcce8018740e061", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "fe26fedd4616c78dd914a6191be0b58ea0955188", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "b8fcfd1d060e93877ed0f8e874fcf4bda89ac2cf", + "version-string": "2017-12-01-1", + "port-version": 0 + }, + { + "git-tree": "930d6e87215aa6312db31ad18bf6623371cc0f99", + "version-string": "2017-12-01", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/readerwriterqueue.json b/port_versions/r-/readerwriterqueue.json new file mode 100644 index 00000000000000..919d3763e3e4c0 --- /dev/null +++ b/port_versions/r-/readerwriterqueue.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "067260ce5553b99cc95abbd297271e51b4db138d", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "0e75dd10dd7b379bb641faf82b804b92e036b6be", + "version-string": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "8b345740f77df51b00a522a1d797ebd1531a19b9", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "96873034cfc92d7e9c9e7d7233d8b1a33fef6e1e", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/readline-win32.json b/port_versions/r-/readline-win32.json new file mode 100644 index 00000000000000..357f27b3b5fadf --- /dev/null +++ b/port_versions/r-/readline-win32.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c548f83dcccce8ddf353d0e3710afd401a4e2304", + "version-string": "5.0-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/readline.json b/port_versions/r-/readline.json new file mode 100644 index 00000000000000..cb3915584accf5 --- /dev/null +++ b/port_versions/r-/readline.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "6c4ab7a05504e5d9de58c16a5d6e4014ad3c70cb", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "ed578a152a63b847267aa8c49898ef66090232c2", + "version-string": "5.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/readosm.json b/port_versions/r-/readosm.json new file mode 100644 index 00000000000000..21e8fa6fa68974 --- /dev/null +++ b/port_versions/r-/readosm.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "8053400c918e6eb0fbde413936493a2824ae4a65", + "version-string": "1.1.0a", + "port-version": 0 + }, + { + "git-tree": "0346e89606c0f69f67ff5a427fbc9b9c73de9ccb", + "version-string": "1.1.0", + "port-version": 3 + }, + { + "git-tree": "a89219ee6bb9a801a434608924ca4bb796c74a24", + "version-string": "1.1.0-2", + "port-version": 0 + }, + { + "git-tree": "78e08bd3f63c926782689f5d115a6f4d7a08697d", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "ec43020086ee43baa31012327acda22484cea22d", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/realsense2.json b/port_versions/r-/realsense2.json new file mode 100644 index 00000000000000..b3aa46be8c6861 --- /dev/null +++ b/port_versions/r-/realsense2.json @@ -0,0 +1,134 @@ +{ + "versions": [ + { + "git-tree": "c3d32b35fd3a11aec9bd32f3f458ea4b099816f7", + "version-string": "2.40.0", + "port-version": 0 + }, + { + "git-tree": "f48b9ba3766c9d4a9caaba9b197b6803fa5c3c8d", + "version-string": "2.39.0", + "port-version": 0 + }, + { + "git-tree": "f777a7b11740e82f55d8d9b3d7fc03f0deee742f", + "version-string": "2.38.1", + "port-version": 0 + }, + { + "git-tree": "898201ae7129a18fe36529403244d24b3a5e6814", + "version-string": "2.34.0", + "port-version": 0 + }, + { + "git-tree": "a8afd6ff21f56f7b79b08bebfe7a3f375b7e6f6b", + "version-string": "2.33.1-1", + "port-version": 0 + }, + { + "git-tree": "4da62021269d4ea6f654f33a19e85d0687b035a0", + "version-string": "2.33.1", + "port-version": 0 + }, + { + "git-tree": "83f70e361f16754d26315d9449ebd14892ac6e69", + "version-string": "2.30.0-1", + "port-version": 0 + }, + { + "git-tree": "79951c9c40032c0f478456d12792258034bff3bd", + "version-string": "2.30.0", + "port-version": 0 + }, + { + "git-tree": "b5ba3a07ac8607709e06253da477bbfa3c6a3905", + "version-string": "2.22.0-2", + "port-version": 0 + }, + { + "git-tree": "bef6fdb2889b66f6f5ae926bb1610d92b85a8e97", + "version-string": "2.22.0-1", + "port-version": 0 + }, + { + "git-tree": "f44bcdc98eda2ed8db7a722b0b020fb13de8b0f8", + "version-string": "2.22.0", + "port-version": 0 + }, + { + "git-tree": "a89c27e566b5992c19cb06182344cf4a5aadd486", + "version-string": "2.16.1-2", + "port-version": 0 + }, + { + "git-tree": "2602b74160ff2085f1b606567a21af6eb3f2da68", + "version-string": "2.16.1-1", + "port-version": 0 + }, + { + "git-tree": "0fb06200a3ca1e25ee97bee4a8e1c2cc3bd9ab2c", + "version-string": "2.16.1", + "port-version": 0 + }, + { + "git-tree": "9d940f86f0aa30932200e7c6bbf9fe2feaf024c2", + "version-string": "2.13.0", + "port-version": 0 + }, + { + "git-tree": "2e209a157f5d988af46641b5ca8a2edfbd335da4", + "version-string": "2.12.0", + "port-version": 0 + }, + { + "git-tree": "60f20778f8ee31064985f8ca427a6468ba1a4ed1", + "version-string": "2.11.1", + "port-version": 0 + }, + { + "git-tree": "bd29c956268cc5d304e2a31b3ef81547d997d631", + "version-string": "2.10.4", + "port-version": 0 + }, + { + "git-tree": "e320bdf5de8be64539e34195052048798813fffb", + "version-string": "2.10.1-1", + "port-version": 0 + }, + { + "git-tree": "eea3c22ca297a8a2add45d0bf597037a3a26af23", + "version-string": "2.10.1", + "port-version": 0 + }, + { + "git-tree": "89078d0af09a9e9a52d54a2c8832fba98a4157e5", + "version-string": "2.10.0", + "port-version": 0 + }, + { + "git-tree": "ae104e82457cdc59e68060cc501c1403638f680f", + "version-string": "2.9.1", + "port-version": 0 + }, + { + "git-tree": "4a3a709ea4c6a0fb1973018f42737c4a73c51711", + "version-string": "2.9.0", + "port-version": 0 + }, + { + "git-tree": "add5578c6b364d0c5c3f89a8c16a85dccb7756ab", + "version-string": "2.8.3", + "port-version": 0 + }, + { + "git-tree": "c0620272a0c0b41db2276833540ff26280b91aa2", + "version-string": "2.8.2", + "port-version": 0 + }, + { + "git-tree": "7e4ec18c378a996f84c806043c228cf6343fba97", + "version-string": "2.8.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/recast.json b/port_versions/r-/recast.json new file mode 100644 index 00000000000000..d4fcf997122c22 --- /dev/null +++ b/port_versions/r-/recast.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "41f8cc06fc981d330671b88e08d02de55934155c", + "version-string": "1.5.1-3", + "port-version": 0 + }, + { + "git-tree": "fad17ed7cd463c5ea88994622c032f63777e5780", + "version-string": "1.5.1-2", + "port-version": 0 + }, + { + "git-tree": "2b0758eb4e063f94e56901802b0b16142d685878", + "version-string": "1.5.1-1", + "port-version": 0 + }, + { + "git-tree": "b06a15ec9377a51c3bcbd4919c9d7256e495334a", + "version-string": "1.5.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/redis-plus-plus.json b/port_versions/r-/redis-plus-plus.json new file mode 100644 index 00000000000000..780732b1c8334d --- /dev/null +++ b/port_versions/r-/redis-plus-plus.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f4a1bafd6e609b8e012268c755d69566b8c29154", + "version-string": "1.2.1", + "port-version": 1 + }, + { + "git-tree": "a43514be68d7e26475daeaed2d3235c961e2759e", + "version-string": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "a258d5e06eb7c9cc8728692e07808a508e9e0fd0", + "version-string": "1.1.2", + "port-version": 0 + }, + { + "git-tree": "76f65d11cd45dc6e727276346eeeb5cac320d7f0", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/refl-cpp.json b/port_versions/r-/refl-cpp.json new file mode 100644 index 00000000000000..211d304dfd8a81 --- /dev/null +++ b/port_versions/r-/refl-cpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "eb6b33b43e2f278a4ad750c19fe60bd38caee781", + "version-string": "0.12.0", + "port-version": 0 + }, + { + "git-tree": "57827669f3ad3b3158c08d21e790bf48dab39c78", + "version-string": "0.9.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/refprop-headers.json b/port_versions/r-/refprop-headers.json new file mode 100644 index 00000000000000..1d21d15d9ce460 --- /dev/null +++ b/port_versions/r-/refprop-headers.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ad35ee67511cff7864369bdf20b166eaa2436468", + "version-string": "2019-04-14", + "port-version": 0 + }, + { + "git-tree": "d716c6c525f7334e51719ca947619cacf06c90e7", + "version-string": "2017-11-7-882aec454b2bc3d5323b8691736ff09c288f4ed6", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/replxx.json b/port_versions/r-/replxx.json new file mode 100644 index 00000000000000..d699718d176596 --- /dev/null +++ b/port_versions/r-/replxx.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f2a461d74082c267d369a79ba0c263285e31d746", + "version-string": "0.0.2-2", + "port-version": 0 + }, + { + "git-tree": "7191468a5bc03f1440dc5dec592b1f1e7c66f3c9", + "version-string": "0.0.2-1", + "port-version": 0 + }, + { + "git-tree": "adab8c9edc40ea88cadb12c4f48d4daf35328526", + "version-string": "0.0.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/reproc.json b/port_versions/r-/reproc.json new file mode 100644 index 00000000000000..b923e478f4f871 --- /dev/null +++ b/port_versions/r-/reproc.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "0af11f9791915f437e8d25a8c7df32684656a34d", + "version-string": "14.1.0", + "port-version": 0 + }, + { + "git-tree": "48b46ba0a0f1ad902474126ef8f04a28e3aeae2a", + "version-string": "12.0.0", + "port-version": 0 + }, + { + "git-tree": "51b6aa4072bbbcacaf8de6c25112a74193d16fc0", + "version-string": "11.0.1", + "port-version": 0 + }, + { + "git-tree": "aa6510c4c8c74137d514e1db6b8da02c101f2ab1", + "version-string": "10.0.3", + "port-version": 0 + }, + { + "git-tree": "03570aaa0c722c48d5f02ba504f7ac7b4b9651b8", + "version-string": "9.0.0", + "port-version": 0 + }, + { + "git-tree": "37e74f8a83cbcbdb5016fb7df6d8e1fc91b08cff", + "version-string": "8.0.1", + "port-version": 0 + }, + { + "git-tree": "28d841c1d8d986bffbf1cbd696ab1f3e584fef1d", + "version-string": "6.0.0-2", + "port-version": 0 + }, + { + "git-tree": "e772dc0359ef25c84c3fed842f3f18cd1ee45f6a", + "version-string": "6.0.0-1", + "port-version": 0 + }, + { + "git-tree": "f70b8a3a6f2481ccc507349949b2cf526b9da4f4", + "version-string": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "dedda182a552e6517f6ec5fd8ce63b624117aecc", + "version-string": "v1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rest-rpc.json b/port_versions/r-/rest-rpc.json new file mode 100644 index 00000000000000..15eb27d68368d9 --- /dev/null +++ b/port_versions/r-/rest-rpc.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4e7a4470abca942f238467ad7c610255ce03330d", + "version-string": "0.07", + "port-version": 1 + }, + { + "git-tree": "225daecdc5e8a142e955bff1a665cf342bec979c", + "version-string": "0.07", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/restbed.json b/port_versions/r-/restbed.json new file mode 100644 index 00000000000000..846c82f734e1b0 --- /dev/null +++ b/port_versions/r-/restbed.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "deab0777d5581a96752beb7528254f02380daf46", + "version-string": "4.7", + "port-version": 0 + }, + { + "git-tree": "898a46b0dbfebab0a5acd3eb121f3c4f209afe3b", + "version-string": "4.16-07-28-2018-2", + "port-version": 0 + }, + { + "git-tree": "0534e7b967fcd3c70bf174f9261fa695852f650f", + "version-string": "4.16-07-28-2018-1", + "port-version": 0 + }, + { + "git-tree": "b599b1c2cc2917826eea086459f67fd9d8eeb138", + "version-string": "4.16-07-28-2018", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/restclient-cpp.json b/port_versions/r-/restclient-cpp.json new file mode 100644 index 00000000000000..68b0f505a50582 --- /dev/null +++ b/port_versions/r-/restclient-cpp.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "997a41f7096c82db4bb868ade39fc8d51aee3569", + "version-string": "0.5.2", + "port-version": 0 + }, + { + "git-tree": "d2a204620305b4d18cfc6d564690648dc18ff299", + "version-string": "0.5.1-3", + "port-version": 0 + }, + { + "git-tree": "37c75c1136f56e613bd4c90cbeacc9836657a730", + "version-string": "0.5.1-2", + "port-version": 0 + }, + { + "git-tree": "1dc847e3cd1c293d01de31160de3ddacb197bcaf", + "version-string": "0.5.1-1", + "port-version": 0 + }, + { + "git-tree": "800b496ce65afb3c82c9708013aa07cef1f511e5", + "version-string": "0.5.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/restinio.json b/port_versions/r-/restinio.json new file mode 100644 index 00000000000000..955e2e8b28ba96 --- /dev/null +++ b/port_versions/r-/restinio.json @@ -0,0 +1,164 @@ +{ + "versions": [ + { + "git-tree": "2e3eb39da32552d1e5682e5d450e29046c1990ad", + "version-string": "0.6.13", + "port-version": 0 + }, + { + "git-tree": "6bdc698a7199acce5694de2915955489c909e3bb", + "version-string": "0.6.12", + "port-version": 0 + }, + { + "git-tree": "b44734d557888f63a4f4a8b3d9c70f20888a9828", + "version-string": "0.6.11", + "port-version": 0 + }, + { + "git-tree": "cc02a804151994cd22477569f7ea05ef80f90c34", + "version-string": "0.6.10", + "port-version": 0 + }, + { + "git-tree": "e15dd852d4198fdfba9793974988a1605754193a", + "version-string": "0.6.9", + "port-version": 0 + }, + { + "git-tree": "b0dad4e1e7ab8724b9e0a82d3af5ec9cc2f9644f", + "version-string": "0.6.8.1", + "port-version": 0 + }, + { + "git-tree": "36a2eea646cca11a3f17e788a246deb2741ccebb", + "version-string": "0.6.8", + "port-version": 0 + }, + { + "git-tree": "ceccc54ac89a3af9dd4d4f1e4090341558dfb79a", + "version-string": "0.6.6", + "port-version": 0 + }, + { + "git-tree": "6d9bfa58ed7236e4e6e37776862220455ca3ef10", + "version-string": "0.6.5", + "port-version": 0 + }, + { + "git-tree": "b2ec054e44db5f2076cc17f4974ced14ce862097", + "version-string": "0.6.4", + "port-version": 0 + }, + { + "git-tree": "aced26a978d69b69a3177e9b5316defe19855ed3", + "version-string": "0.6.3.1", + "port-version": 0 + }, + { + "git-tree": "dfc8757e1df97757d32716888a5921b6a50dff04", + "version-string": "0.6.3", + "port-version": 0 + }, + { + "git-tree": "9f23badb37a277db0bb87ce2d52fb37fe6e55a72", + "version-string": "0.6.2", + "port-version": 0 + }, + { + "git-tree": "c3c4d2a326faed6f2532aee9d5f978f39cb0edff", + "version-string": "0.6.1.1", + "port-version": 0 + }, + { + "git-tree": "38959983d2b44f20b10d3eef65925b0d53fcc8b5", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "d40852dac57523e02714339403d0c09f6063ba02", + "version-string": "0.6.0.1", + "port-version": 0 + }, + { + "git-tree": "0e221821b89a9fc19d3e8bce4304073fca398c06", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "56a40e054c05b4b2a7ad4bf416ee08ba6076c4a3", + "version-string": "0.5.1.1", + "port-version": 0 + }, + { + "git-tree": "8bc1795265e01e95696339bbe5e81b8a50653992", + "version-string": "0.5.1-1", + "port-version": 0 + }, + { + "git-tree": "2597289d68ba1f51991470f109aedf807c5a83fe", + "version-string": "0.5.1", + "port-version": 0 + }, + { + "git-tree": "50b811003c7fd87e828ba433e8a56e408b628617", + "version-string": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "0ce192e527402dd3047be1f47935c210f734c5cc", + "version-string": "0.4.9.1", + "port-version": 0 + }, + { + "git-tree": "7c517440efa52c744fe8eb7eebb0698b896decdf", + "version-string": "0.4.9", + "port-version": 0 + }, + { + "git-tree": "ea3acce82e9f14a264bd77a90b8f017f0b16e571", + "version-string": "0.4.8.7", + "port-version": 0 + }, + { + "git-tree": "4bd479902e98f12ae2e5958262577d91fffe7542", + "version-string": "0.4.8.6", + "port-version": 0 + }, + { + "git-tree": "1b5f7622afebaf6b7f6c85cdccfeda5f309212a3", + "version-string": "0.4.8.5", + "port-version": 0 + }, + { + "git-tree": "717ba57e09e122ae62c4afcdf4f40ef824a1bc66", + "version-string": "0.4.8.4", + "port-version": 0 + }, + { + "git-tree": "6fb14d3f6a1c023e5280ff86ce853f442a2cc0b2", + "version-string": "0.4.8", + "port-version": 0 + }, + { + "git-tree": "82cb0211d15bedd72925e143822eef110b687f13", + "version-string": "0.4.7", + "port-version": 0 + }, + { + "git-tree": "d1b2fa50f86289342cd3918d167c97e730d1b5aa", + "version-string": "0.4.6", + "port-version": 0 + }, + { + "git-tree": "cc492d3fb488efbc0789104585f3be7e718616a3", + "version-string": "0.4.5.1", + "port-version": 0 + }, + { + "git-tree": "0637d482f38fcafd74fa7cb5eb2d74dc0de89aa6", + "version-string": "0.4.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rhash.json b/port_versions/r-/rhash.json new file mode 100644 index 00000000000000..31b0b2071f00c1 --- /dev/null +++ b/port_versions/r-/rhash.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "46e3af79b0c1d8514a24cbb981fec5b68875b3e5", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "924ca26c21be0fea1995aa9ffc233c26208f6be6", + "version-string": "1.3.9", + "port-version": 0 + }, + { + "git-tree": "e44c0e8c3571d8651ab11aa4300583f57d5e2603", + "version-string": "1.3.8", + "port-version": 0 + }, + { + "git-tree": "6d57cf3b12ca8539d2667518cbe7f71c287f96bb", + "version-string": "1.3.6", + "port-version": 0 + }, + { + "git-tree": "aad477371ff57c14958f068d33efd53ff208b876", + "version-string": "1.3.5-1", + "port-version": 0 + }, + { + "git-tree": "c528c41ebe44b1c6b71ae3aecf0f525b954791bd", + "version-string": "1.3.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/riffcpp.json b/port_versions/r-/riffcpp.json new file mode 100644 index 00000000000000..dfa0501d68b213 --- /dev/null +++ b/port_versions/r-/riffcpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ed25689be7a34edbfbf89b39d877b87d0d4c8b2d", + "version-string": "2.2.4", + "port-version": 0 + }, + { + "git-tree": "9cbdad837d1ca4e47a9102b456e60e0432acb9ed", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "5bf6d7c1f64c1ac55b37b440ea2306dc91485b50", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/ring-span-lite.json b/port_versions/r-/ring-span-lite.json new file mode 100644 index 00000000000000..8e8e7a1e1a78ad --- /dev/null +++ b/port_versions/r-/ring-span-lite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b38a843aef63a57f2a0054dbab27166f95124090", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/roaring.json b/port_versions/r-/roaring.json new file mode 100644 index 00000000000000..946033e205a145 --- /dev/null +++ b/port_versions/r-/roaring.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "042f9916865df1c84ef9b48ccc9fe8802e945e94", + "version-string": "2019-03-05-2", + "port-version": 0 + }, + { + "git-tree": "40262571e8e96082262cf1b9024b8f0061fbbbfb", + "version-string": "2019-03-05-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/robin-hood-hashing.json b/port_versions/r-/robin-hood-hashing.json new file mode 100644 index 00000000000000..91f79c5d73f79c --- /dev/null +++ b/port_versions/r-/robin-hood-hashing.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "e2025e5ad11f6546769a99e68bfcec0b3f18086c", + "version-string": "3.9.1", + "port-version": 0 + }, + { + "git-tree": "c52e097f28dbb67eeab2c757c7a6829fc84f802a", + "version-string": "3.9.0", + "port-version": 0 + }, + { + "git-tree": "3a4e4b53beba4d1fbc143e5e3de205e14e87b9d1", + "version-string": "3.8.0", + "port-version": 0 + }, + { + "git-tree": "a4744c65de47959b254e09d499921e47943c1266", + "version-string": "3.7.0", + "port-version": 0 + }, + { + "git-tree": "73d8ed567c1fd22997dc35f1f7ad55d8eecfc644", + "version-string": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "a74578752d03fa762bd632714eb6ec907d5c75b3", + "version-string": "3.2.13", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/robin-map.json b/port_versions/r-/robin-map.json new file mode 100644 index 00000000000000..15d9780f83d81e --- /dev/null +++ b/port_versions/r-/robin-map.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "84f1433234bb4813feee71e4042174ec9e8d5a7a", + "version-string": "0.6.3", + "port-version": 0 + }, + { + "git-tree": "a094be09be1634a9cefe7d3cfc2152005df6ed2a", + "version-string": "0.6.2", + "port-version": 0 + }, + { + "git-tree": "309f8bcfe8d6e02aa7bcf00eb167e8bbea77cbc1", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "b6a643be513aff55126282a06b8780ad8a480790", + "version-string": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rocksdb.json b/port_versions/r-/rocksdb.json new file mode 100644 index 00000000000000..70ccfda1726775 --- /dev/null +++ b/port_versions/r-/rocksdb.json @@ -0,0 +1,149 @@ +{ + "versions": [ + { + "git-tree": "cf1be0926f4fd3d44f4c4031d1350bef2613c127", + "version-string": "6.14.6", + "port-version": 0 + }, + { + "git-tree": "51363e1c7426e485213c77f91c5e95995b7c7154", + "version-string": "6.13.3", + "port-version": 0 + }, + { + "git-tree": "37b422a46c0e5bbe64679b84020d01c829fa9df7", + "version-string": "6.11.4", + "port-version": 0 + }, + { + "git-tree": "ed0544af36bd1260b389eb7073cd7568265f4d44", + "version-string": "6.6.4-1", + "port-version": 0 + }, + { + "git-tree": "f1684686efa8c3646de01965f0d888a3e3b59f7d", + "version-string": "6.1.2-1", + "port-version": 0 + }, + { + "git-tree": "bea9d4b1232840edb1a00c3474a2567b4efcfd89", + "version-string": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "a6b711baf9294aa2ff0ace7ddafd1913a3c74136", + "version-string": "6.0.2", + "port-version": 0 + }, + { + "git-tree": "dac11baa0de21a5b1a09bbc7f30896b84bd808d4", + "version-string": "6.0.1", + "port-version": 0 + }, + { + "git-tree": "8305c38530f49755b5354f86c595778519693ba6", + "version-string": "5.18.3-1", + "port-version": 0 + }, + { + "git-tree": "45721cb4d92e5506aa87438c39be38173e99d2af", + "version-string": "5.18.3", + "port-version": 0 + }, + { + "git-tree": "6ef03abab47fc44951a5889cb31cdd72f016806b", + "version-string": "5.17.2", + "port-version": 0 + }, + { + "git-tree": "bfd9bec80f98c9bd4e026145b93f20969c4bed6a", + "version-string": "5.15.10", + "port-version": 0 + }, + { + "git-tree": "1ccb8dd59640e66faac1d61cbe3e0e9e5ee0483a", + "version-string": "5.14.2", + "port-version": 0 + }, + { + "git-tree": "f3eb8d5aa1e2757ee3740ab86e749149e6535589", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "aec7d0060e76c56cfa9cd54c2c58786293a15b31", + "version-string": "5.13.3", + "port-version": 0 + }, + { + "git-tree": "59479233a3aa1df895eaaf613e3361b1ba60aa3d", + "version-string": "5.13.1", + "port-version": 0 + }, + { + "git-tree": "d22e50f85c3d58ba00e1e35a7a10d20c8f499d3e", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "51a861b9ce2c29f88da115f00cfa2630608e167f", + "version-string": "5.12.2", + "port-version": 0 + }, + { + "git-tree": "a7f780859d3e2b6b917c93243bd554931a190fca", + "version-string": "5.11.3-3", + "port-version": 0 + }, + { + "git-tree": "911394353a7e98f25f7dba2836046477bf2d62dd", + "version-string": "5.11.3-1", + "port-version": 0 + }, + { + "git-tree": "ba578c55a11eb7b7549de04abe00679ff62eecd2", + "version-string": "5.11.3", + "port-version": 0 + }, + { + "git-tree": "710ee5ed0ccc1e3ab8f8332d8fe942dc4f259637", + "version-string": "5.10.4-3", + "port-version": 0 + }, + { + "git-tree": "71b53c3b1f53e03f4bc2c40c98a00d49283c95b1", + "version-string": "5.10.4-2", + "port-version": 0 + }, + { + "git-tree": "74e920ffb03ba032c79638b0e437d5d39c20625d", + "version-string": "5.10.4-1", + "port-version": 0 + }, + { + "git-tree": "afa1430250c6825e6e364ed2a8f930fcef2e2388", + "version-string": "5.10.4", + "port-version": 0 + }, + { + "git-tree": "302d7aee2a23541e3e2fa885a7c76d9399284f69", + "version-string": "5.10.3", + "port-version": 0 + }, + { + "git-tree": "823f7dd5479723ee2e49e2b16e56cfcd6ae33ccd", + "version-string": "2017-06-28-18c63af6ef2b9f014c404b88488ae52e6fead03c-1", + "port-version": 0 + }, + { + "git-tree": "c2c7a6786e5495a74c25f7d596f76521507d8ed8", + "version-string": "2017-06-28-18c63af6ef2b9f014c404b88488ae52e6fead03c", + "port-version": 0 + }, + { + "git-tree": "80bc2ef427c23a8a7d32cef1324c2b5bca200479", + "version-string": "5.4.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rpclib.json b/port_versions/r-/rpclib.json new file mode 100644 index 00000000000000..9cd2c8f42eb80e --- /dev/null +++ b/port_versions/r-/rpclib.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "17aa69195415335b2b7ef28ebf3dda04d9fa99a0", + "version-string": "2.2.1", + "port-version": 2 + }, + { + "git-tree": "c8862c936b4626046e8ad176e6c4ccb98a7fe9d2", + "version-string": "2.2.1-1", + "port-version": 0 + }, + { + "git-tree": "22df5f4512083bb8362c953414a9eeddffdd2b0d", + "version-string": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "eb5a52b4968cd12985dbf878cb1c54ad43bc41d5", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rply.json b/port_versions/r-/rply.json new file mode 100644 index 00000000000000..b7c0e1e4457a19 --- /dev/null +++ b/port_versions/r-/rply.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ba19464f45d20d65858ee505f02437f7a86d81e4", + "version-string": "1.1.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rs-core-lib.json b/port_versions/r-/rs-core-lib.json new file mode 100644 index 00000000000000..59616292226dc4 --- /dev/null +++ b/port_versions/r-/rs-core-lib.json @@ -0,0 +1,154 @@ +{ + "versions": [ + { + "git-tree": "a7ce454c4b0c719031a5251cd4cc74d0e0376ec5", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "58c798c1aa4450c0325bf0c2e29238aa1c35dc45", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "5eb400bafec5174122e7bcba550b73285f6a104a", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "4151c82d1e0cf58dcff920022bdebe0e31925cd5", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "e7d59e0048da1ca2bc0e5a89abbdc7f7f5efe630", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "3d3a94fc60b18fa21aeca06cf4c2082850f3ee53", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "09b8c34dd94d0d0eff0c2ccb28a0fe7908d067ae", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "f16f77c30216730bf0db13ea404d9e6d7819aad4", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "37b523b444450f2e70fdc433d07fdac87b11fbb2", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "23fa4496b1d39cbfcd4f8d42ab259679135dc2dd", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "72dd052029913817bfd6b722b9d31fa500893fc1", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "2cae29e873fa35b8d00785643b94ab7ef6caaed0", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "64230b8ec3e92ed3cdab25b214e0474f970440e7", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "fa58926cf85d29e10f0dd070277bc9bcb6529a08", + "version-string": "2018-07-03", + "port-version": 0 + }, + { + "git-tree": "4562ad16a3851b904efd340c7e0f4320165968fc", + "version-string": "2018-07-01", + "port-version": 0 + }, + { + "git-tree": "47d51cb93fb199d8250ef3f7b7c8de69e6da0525", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "6ce7f6fa8c5357a42c5a3ab57f0177368eaac381", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "4f5248863e9ae46ef4f01ca226d37d725fe8638f", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "f1d5d6a55d4ace7ef6041cedd8a90ddc7e811c32", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "6ea5b287f2a33069f461b60c16d7f2158f8de84e", + "version-string": "2018-04-12", + "port-version": 0 + }, + { + "git-tree": "39ba641821381be7d8ed7b986e98b2f10a9104d5", + "version-string": "2018-04-09", + "port-version": 0 + }, + { + "git-tree": "ce03bc199940abddafb0d5a09e8c6c803b9dff4d", + "version-string": "2018-04-06", + "port-version": 0 + }, + { + "git-tree": "255500f1b230ba6ce8d100ee0edcb5af3d4a6338", + "version-string": "2018-04-05", + "port-version": 0 + }, + { + "git-tree": "2b9d817348c033840d9c3fa66dbf3a47acd7ec9b", + "version-string": "2018-03-29", + "port-version": 0 + }, + { + "git-tree": "9e7be4a63c2e499f9155accd62943c6af8f1913c", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "69c257f9c3ce8d27ebe51979704ca1a37997bedc", + "version-string": "2018-03-11", + "port-version": 0 + }, + { + "git-tree": "71695c67eaebc2f963af47f03caecd22ee0424c8", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "603ff607c03a4d9b038ef88c90cffa98bd00ba3b", + "version-string": "2018-03-02", + "port-version": 0 + }, + { + "git-tree": "d29b421eb1cd4e85a29227700df9cbf7b440c8c9", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "ff8435c7ba0300d1a5205464aa0ee3c8faba06b7", + "version-string": "commit-1ed2dadbda3977b13e5e83cc1f3eeca76b36ebe5", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rsocket.json b/port_versions/r-/rsocket.json new file mode 100644 index 00000000000000..1ae4810432f216 --- /dev/null +++ b/port_versions/r-/rsocket.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "adbdcdcb2c77bb53a1c00f41307308cfc8e7549f", + "version-string": "2020.05.04.00-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rtabmap.json b/port_versions/r-/rtabmap.json new file mode 100644 index 00000000000000..5a4d15b968594e --- /dev/null +++ b/port_versions/r-/rtabmap.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "07422ec8ed79148e476dbb807db950ed78852ca0", + "version-string": "0.20.3", + "port-version": 1 + }, + { + "git-tree": "9cfc9dfab43f0ea8551045a9131e777f6e9a6f52", + "version-string": "0.20.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rtaudio.json b/port_versions/r-/rtaudio.json new file mode 100644 index 00000000000000..edef9c19f40d78 --- /dev/null +++ b/port_versions/r-/rtaudio.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "264f4c8d4aadd733d12dbf0d47b882c94f2e3f1f", + "version-string": "5.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rtlsdr.json b/port_versions/r-/rtlsdr.json new file mode 100644 index 00000000000000..9eb63f544e9530 --- /dev/null +++ b/port_versions/r-/rtlsdr.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "bffd64982c9671e345a72feac3889c56504117a2", + "version-string": "2020-04-16-1", + "port-version": 0 + }, + { + "git-tree": "2c9e6c9e1810e31d004c9e1658266480f285282c", + "version-string": "2020-04-16", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rtmidi.json b/port_versions/r-/rtmidi.json new file mode 100644 index 00000000000000..49e3bb2309b28d --- /dev/null +++ b/port_versions/r-/rtmidi.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "65614f322a89cff92478b3f6736d287653085a34", + "version-string": "4.0.0", + "port-version": 2 + }, + { + "git-tree": "754177ab1ad5e34ea921d96ef93bcb73515ab5a6", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "63f1f98aa3035ed36745bde36f67b5ce6f69a03f", + "version-string": "2.1.1-2", + "port-version": 0 + }, + { + "git-tree": "526fe6f5bf1e9503d15124eb29847b80567e79d4", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "7a925416479adf4622041efea76de80e0c7aa3d1", + "version-string": "2.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rttr.json b/port_versions/r-/rttr.json new file mode 100644 index 00000000000000..5b8b22f5b7d558 --- /dev/null +++ b/port_versions/r-/rttr.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "7e0d800947d2f880f3dc3c286f8ce7d3c8b4abf1", + "version-string": "0.9.6-2", + "port-version": 0 + }, + { + "git-tree": "8cdbf35d96880024cc072dbcdae83191b46b1232", + "version-string": "0.9.6-1", + "port-version": 0 + }, + { + "git-tree": "41fb753caeafab4b2b9e2ffd0b165c71da905a8a", + "version-string": "0.9.6-0", + "port-version": 0 + }, + { + "git-tree": "20b9c0553deec3117a3693c61a1b66a0136cdcb6", + "version-string": "0.9.5-3", + "port-version": 0 + }, + { + "git-tree": "144f119ad470cc8881e3f144f59e2b15f63ff898", + "version-string": "0.9.5-2", + "port-version": 0 + }, + { + "git-tree": "6d1f8eacc4a751037ff054f94c7151fd1e47b8cb", + "version-string": "0.9.5-1", + "port-version": 0 + }, + { + "git-tree": "6050483a4ffb7b8d7ff1750a353db4db8b6b6b3e", + "version-string": "0.9.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rxcpp.json b/port_versions/r-/rxcpp.json new file mode 100644 index 00000000000000..01f061a68fff0a --- /dev/null +++ b/port_versions/r-/rxcpp.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "87ea1e19430775f0ec9de9e6fb0375a53dc87d9a", + "version-string": "4.1.0-1", + "port-version": 0 + }, + { + "git-tree": "34c68751d5792b90cd79a6362eb035ca905bbbd5", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "ffd9e4d27973b553b24c101c2bfcc4ece8789d0c", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "67465573d80c508387242537928fb1a0d60aa468", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "ee4d8c82ef53d6277f208dedcc58b1e5ec33d545", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "35f5cbf753cff48d9f2fb897c1ba0eed0a0646b5", + "version-string": "2.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rxqt.json b/port_versions/r-/rxqt.json new file mode 100644 index 00000000000000..1308684cce939b --- /dev/null +++ b/port_versions/r-/rxqt.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ddf4c86333be5f5fa8c8aefab73d0fe77d89650b", + "version-string": "bb2138c", + "port-version": 0 + }, + { + "git-tree": "bca809bb768825c585bf7998949f264389482bbe", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/rxspencer.json b/port_versions/r-/rxspencer.json new file mode 100644 index 00000000000000..161dc088327574 --- /dev/null +++ b/port_versions/r-/rxspencer.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a58f09c2e2ebb27d9b40527922b98612dd7e2de1", + "version-string": "2020-01-12", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/ryml.json b/port_versions/r-/ryml.json new file mode 100644 index 00000000000000..31e44d49502f18 --- /dev/null +++ b/port_versions/r-/ryml.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ff07e4add8c6becd2fc4d57c2707cc141af1e341", + "version-string": "2020-04-12", + "port-version": 0 + } + ] +} diff --git a/port_versions/r-/ryu.json b/port_versions/r-/ryu.json new file mode 100644 index 00000000000000..afd24d4727d4e1 --- /dev/null +++ b/port_versions/r-/ryu.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ab26061ca3f9435c12bc97f8f20308042eebdb20", + "version-string": "2.0-2", + "port-version": 0 + }, + { + "git-tree": "fdfcf5ba231c6c18a036fa1168184fe24ce78585", + "version-string": "2.0-1", + "port-version": 0 + }, + { + "git-tree": "b40611dd930a092e1fe3b66b9844b09c6858a23d", + "version-string": "2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/safeint.json b/port_versions/s-/safeint.json new file mode 100644 index 00000000000000..a241062fcf3912 --- /dev/null +++ b/port_versions/s-/safeint.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "b57c51a101e68d8804f4ee8da95cc4b7bd1f4bf9", + "version-string": "3.24", + "port-version": 0 + }, + { + "git-tree": "399096d8b0fdf5da13c987feae1834e2c963385c", + "version-string": "3.23", + "port-version": 0 + }, + { + "git-tree": "5881a2ef63205a4156f419c89f82a4acd26f40c9", + "version-string": "3.21", + "port-version": 0 + }, + { + "git-tree": "f26773c60671a17516d45ae571890fa246347064", + "version-string": "3.20.0", + "port-version": 0 + }, + { + "git-tree": "4b7a78641cdaf9651c81717107a6489bda1154b6", + "version-string": "3.19.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sail.json b/port_versions/s-/sail.json new file mode 100644 index 00000000000000..86f1f99b5d3406 --- /dev/null +++ b/port_versions/s-/sail.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "d3e3d2b48fde38bfc70d3b7cec2c667866a41d48", + "version-string": "0.9.0-pre11", + "port-version": 0 + }, + { + "git-tree": "3f2c7654ea0a3c9d7a1ce81743ded2b1ef410bd9", + "version-string": "0.9.0-pre10", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sais.json b/port_versions/s-/sais.json new file mode 100644 index 00000000000000..222471a82fd616 --- /dev/null +++ b/port_versions/s-/sais.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "f47db4f08a4e813d6df367d296914ea4d4af1b30", + "version-string": "2.4.1-1", + "port-version": 0 + }, + { + "git-tree": "ff9a4a0b9505b956dc6d7fe1c2b698faf14e5dd9", + "version-string": "2.4.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sajson.json b/port_versions/s-/sajson.json new file mode 100644 index 00000000000000..f896e4fcb8a113 --- /dev/null +++ b/port_versions/s-/sajson.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "07ec451487f76976bb15a8e6dfefd0d373df6cee", + "version-string": "2018-09-21", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/scintilla.json b/port_versions/s-/scintilla.json new file mode 100644 index 00000000000000..6494ee11e5d9dd --- /dev/null +++ b/port_versions/s-/scintilla.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "1bb13f73af518651e5dafcd0767ca409d3219ac3", + "version-string": "4.4.5", + "port-version": 0 + }, + { + "git-tree": "571b2659939b588499f8d0f9845299d2ab24d86e", + "version-string": "4.2.3", + "port-version": 1 + }, + { + "git-tree": "c9779a0862cb4cb7bcc785d06dd1004360fb64f5", + "version-string": "4.2.3", + "port-version": 0 + }, + { + "git-tree": "c179bc017f6f90049bc125e9014d7ee697a15a92", + "version-string": "4.1.2", + "port-version": 0 + }, + { + "git-tree": "e6c336abc48acc5340bdbafec452c3648279d470", + "version-string": "4.0.3", + "port-version": 0 + }, + { + "git-tree": "47e1318a4424bbda8dd157b99a0386dc4849cedd", + "version-string": "3.7.6-1", + "port-version": 0 + }, + { + "git-tree": "cc80c828f85d34701656bdfe9aa40f73b0045978", + "version-string": "3.7.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sciter.json b/port_versions/s-/sciter.json new file mode 100644 index 00000000000000..2c1f7e515d394f --- /dev/null +++ b/port_versions/s-/sciter.json @@ -0,0 +1,174 @@ +{ + "versions": [ + { + "git-tree": "f705d7e1c384257717b5f2e87808a370ac8cc861", + "version-string": "4.4.3.20", + "port-version": 0 + }, + { + "git-tree": "9005f4db9f275092640bc51ecc263214be8071bc", + "version-string": "4.4.3.18", + "port-version": 0 + }, + { + "git-tree": "fef6e1b3ef0ac84368d64e52f1b86b3e11af8831", + "version-string": "4.4.3.15", + "port-version": 0 + }, + { + "git-tree": "eb8e4a15beda8ddf4f7bfd33f0924f61a89acf6c", + "version-string": "4.4.1.5", + "port-version": 0 + }, + { + "git-tree": "924e25b3c63f1a092048c215cdc4cdf131e6dce9", + "version-string": "4.4.0.7", + "port-version": 0 + }, + { + "git-tree": "b786e7e1ecefe1f7588946dc435d8bb673bafce3", + "version-string": "4.2.6.9-2", + "port-version": 0 + }, + { + "git-tree": "dabe2f0a124e78f00e82c1fc691d82d74fa392f0", + "version-string": "4.2.6.9-1", + "port-version": 0 + }, + { + "git-tree": "063d3b28e01b61d41d38e111494a7c32a54fc5c8", + "version-string": "4.2.6.9", + "port-version": 0 + }, + { + "git-tree": "e58b2ff21b865a609362e2948ae39c2d452360c9", + "version-string": "4.2.2", + "port-version": 0 + }, + { + "git-tree": "21dbffb6adfb505f59687cf8ce9e1701528c7bba", + "version-string": "4.1.11", + "port-version": 0 + }, + { + "git-tree": "898a18f94b986c9428643a478d16b3c8c97e2635", + "version-string": "4.1.10", + "port-version": 0 + }, + { + "git-tree": "c662bf4919c9848adb5e7d009ba91393e85ea146", + "version-string": "4.1.9", + "port-version": 0 + }, + { + "git-tree": "dff88a11da2e18b0ca45b3bed88d2162911a43b7", + "version-string": "4.1.8", + "port-version": 0 + }, + { + "git-tree": "bce230f6f6bf02d0a0f86ae4835d776dee0856c0", + "version-string": "4.1.7", + "port-version": 0 + }, + { + "git-tree": "a00c24fd02b1540eedff62217fd585d19a55fe1b", + "version-string": "4.1.6", + "port-version": 0 + }, + { + "git-tree": "085196fd26798b1f4f0b533761c802c73dc969c3", + "version-string": "4.1.5", + "port-version": 0 + }, + { + "git-tree": "4a35e73ab84f342af5571c60d6ba2bab91e55887", + "version-string": "4.1.4", + "port-version": 0 + }, + { + "git-tree": "d28a3143f1709b155feb09b9bec6220a8ff32f9a", + "version-string": "4.1.3", + "port-version": 0 + }, + { + "git-tree": "541318e794ee39213c16b001c3f0afa09b811e6f", + "version-string": "4.1.2", + "port-version": 0 + }, + { + "git-tree": "dde9eae36ad41c0733aa4557e20eec79deceb062", + "version-string": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "05d8b0122e069781a60571be342f46eb7bf2cd12", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "2104fcdcb0f39b5b4fb22465278741a73d33013b", + "version-string": "4.0.8", + "port-version": 0 + }, + { + "git-tree": "5b49a283cbf48a3643ca2f876088db2c67bed370", + "version-string": "4.0.7", + "port-version": 0 + }, + { + "git-tree": "7c632bbe49307f2e25ecacc8bebeecaa298b8d60", + "version-string": "4.0.6", + "port-version": 0 + }, + { + "git-tree": "9d8a3a0169b3bb982f46310617f6c42129f53cf9", + "version-string": "4.0.5", + "port-version": 0 + }, + { + "git-tree": "459bf7a67f80eb95e0b2708c65e576d5088d07f3", + "version-string": "4.0.4", + "port-version": 0 + }, + { + "git-tree": "6cccad74ff54bc3b42fb099e44370a067d8958b5", + "version-string": "4.0.3", + "port-version": 0 + }, + { + "git-tree": "37c9c9af67630a8ec551465424c291419f3fb056", + "version-string": "4.0.2-1", + "port-version": 0 + }, + { + "git-tree": "15afbb45a061d9f0399ab4d00fdfae86c6634045", + "version-string": "4.0.1.1", + "port-version": 0 + }, + { + "git-tree": "dceda802e57c2822c82d1d9904b2c935525715bc", + "version-string": "4.0.1.0", + "port-version": 0 + }, + { + "git-tree": "eab7c45d027481a09bcaa4ef6d178a8b58efa554", + "version-string": "4.0.0.9-2", + "port-version": 0 + }, + { + "git-tree": "3ea57562513042ae18b6b6fce80c0e00d3bf2163", + "version-string": "4.0.0.9-1", + "port-version": 0 + }, + { + "git-tree": "8df4fc5e20f26463e09b9db7e658c0d854486254", + "version-string": "4.0.0.9", + "port-version": 0 + }, + { + "git-tree": "c78c560b32e5a774a6bcf0a477c41eded8a7755c", + "version-string": "4.0.0.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/scnlib.json b/port_versions/s-/scnlib.json new file mode 100644 index 00000000000000..8b8f19cc3f2d01 --- /dev/null +++ b/port_versions/s-/scnlib.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c137695fe721a7e10d2c8c3cf37a49d2fa538575", + "version-string": "0.3", + "port-version": 0 + }, + { + "git-tree": "37ea5b35f293482dd02be6c6ab46ed18f1778a27", + "version-string": "0.1.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/scylla-wrapper.json b/port_versions/s-/scylla-wrapper.json new file mode 100644 index 00000000000000..48518354d5d391 --- /dev/null +++ b/port_versions/s-/scylla-wrapper.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bad125e6ef50011bc279b6b56921c2e0def820c1", + "version-string": "2018-08-26-16e6f435", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sdformat10.json b/port_versions/s-/sdformat10.json new file mode 100644 index 00000000000000..34c0288b070829 --- /dev/null +++ b/port_versions/s-/sdformat10.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "84626baa34ef0c748149347fdc5f356d66debafd", + "version-string": "10.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sdformat6.json b/port_versions/s-/sdformat6.json new file mode 100644 index 00000000000000..04e7f03d8854a5 --- /dev/null +++ b/port_versions/s-/sdformat6.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "5a9a49ae80212912ecf538b7646f233cdba24211", + "version-string": "6.2.0-1", + "port-version": 0 + }, + { + "git-tree": "0f0c5143a6b69d3c32052b6ecdc8a283cf3abe6c", + "version-string": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sdformat9.json b/port_versions/s-/sdformat9.json new file mode 100644 index 00000000000000..49c414f06cb35f --- /dev/null +++ b/port_versions/s-/sdformat9.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "54ae4ec88f43847be416ec4fbf9348a90e2c5b63", + "version-string": "9.2.0-1", + "port-version": 0 + }, + { + "git-tree": "a53671a5fb6b98d0fb9a3dcbfa67fe1bb321ac53", + "version-string": "9.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sdl1-net.json b/port_versions/s-/sdl1-net.json new file mode 100644 index 00000000000000..6acfb1248f0d3a --- /dev/null +++ b/port_versions/s-/sdl1-net.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c0e1c52d034c8805d08bc443cabbe8cd13f850c9", + "version-string": "1.2.8-3", + "port-version": 0 + }, + { + "git-tree": "15a8ce2e3b178518c46480cb3f6082b1083e3e18", + "version-string": "1.2.8-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sdl1.json b/port_versions/s-/sdl1.json new file mode 100644 index 00000000000000..f675bb28ca256a --- /dev/null +++ b/port_versions/s-/sdl1.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "3577dacfb219c514fb37b44ac83b8d9d379ec828", + "version-string": "1.2.15", + "port-version": 13 + }, + { + "git-tree": "03794252b766a260a14f3584af5004bd0c12090c", + "version-string": "1.2.15", + "port-version": 12 + }, + { + "git-tree": "71cce08b24aa037121be28974a319709e9c0e176", + "version-string": "1.2.15-11", + "port-version": 0 + }, + { + "git-tree": "1f13d2e6f240e80f47de718b6859c9abb12c89e5", + "version-string": "1.2.15-10", + "port-version": 0 + }, + { + "git-tree": "fdc874ddaf771ab4a6723cdac2353409ca2b5eb9", + "version-string": "1.2.15-9", + "port-version": 0 + }, + { + "git-tree": "f3f8bf61ba5f6afcc389c121fc1d2918ff41ad82", + "version-string": "1.2.15-8", + "port-version": 0 + }, + { + "git-tree": "609d10b833914dfa8777d25d11839518f299f89d", + "version-string": "1.2.15-7", + "port-version": 0 + }, + { + "git-tree": "340f747ec27b9f185ff2a18feb81662312ad6163", + "version-string": "1.2.15-6", + "port-version": 0 + }, + { + "git-tree": "65749f840b425f62ed85c486a2726a9d708aefe0", + "version-string": "1.2.15-5", + "port-version": 0 + }, + { + "git-tree": "ae6882c57d24d69af18a48490531ecb49c86a4c7", + "version-string": "1.2.15-4", + "port-version": 0 + }, + { + "git-tree": "fddf602560bf3f7d23e5c4c83813611d4bfea2c6", + "version-string": "1.2.15-3", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sdl2-gfx.json b/port_versions/s-/sdl2-gfx.json new file mode 100644 index 00000000000000..a3db09d1768148 --- /dev/null +++ b/port_versions/s-/sdl2-gfx.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "5a375d8ccd902fab43eae263c2f9405f7224eeda", + "version-string": "1.0.4", + "port-version": 7 + }, + { + "git-tree": "065f51ff2f0128bfddb6bca6250e159b35c9baab", + "version-string": "1.0.4-6", + "port-version": 0 + }, + { + "git-tree": "5c7b5a010cd6972363f2da19a13e607039cec88a", + "version-string": "1.0.4-5", + "port-version": 0 + }, + { + "git-tree": "9c06128ae3371bca67a52f128fa823f16a26a3ea", + "version-string": "1.0.4-4", + "port-version": 0 + }, + { + "git-tree": "0a5057ea1852480b5ed83d43a11138e6957a74a3", + "version-string": "1.0.4-2", + "port-version": 0 + }, + { + "git-tree": "b0977ac82e32bd8db7d6929855b4e8bb68b365b1", + "version-string": "1.0.4-1", + "port-version": 0 + }, + { + "git-tree": "4199cf094cb0f56cb5a6600b41c754b8356cf322", + "version-string": "1.0.4", + "port-version": 0 + }, + { + "git-tree": "b63402a07ce133a0591b417d20f482105bf08066", + "version-string": "1.0.3-3", + "port-version": 0 + }, + { + "git-tree": "602c9c6e34522d578b76fcb3dbdf6464a9821bca", + "version-string": "1.0.3-2", + "port-version": 0 + }, + { + "git-tree": "68a22e8856a24891d7b00581b9a42b5c6f9e27e5", + "version-string": "1.0.3-1", + "port-version": 0 + }, + { + "git-tree": "55c92741d93532154189eddc7eae81025dee264c", + "version-string": "1.0.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sdl2-image.json b/port_versions/s-/sdl2-image.json new file mode 100644 index 00000000000000..00a5853e6e9177 --- /dev/null +++ b/port_versions/s-/sdl2-image.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "d0a9eecd26e5ba37e9827e8cfdbb85700c313f80", + "version-string": "2.0.5", + "port-version": 1 + }, + { + "git-tree": "09228a708e3a67fd6dc9050b9fc9ac54408b2e3e", + "version-string": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "691b1216805e5c5d3fd16e1069da9956db376666", + "version-string": "2.0.4-3", + "port-version": 0 + }, + { + "git-tree": "7c762662e9982da95ab41ee1e0f0b793f125e0ef", + "version-string": "2.0.4-2", + "port-version": 0 + }, + { + "git-tree": "b6ff67887d105f44936a1629387eca169cb6d45d", + "version-string": "2.0.4-1", + "port-version": 0 + }, + { + "git-tree": "80c484e65a78d17e7704c0adf5e760e23fa8d69c", + "version-string": "2.0.4", + "port-version": 0 + }, + { + "git-tree": "d41dc5de578f53e7a35a06b2964dfc50514db03e", + "version-string": "2.0.2-3", + "port-version": 0 + }, + { + "git-tree": "a15f1003998c90155f1723f878897237a1d308ad", + "version-string": "2.0.2-1", + "port-version": 0 + }, + { + "git-tree": "aeb79a4eb6268ad638f8a8a46632d7cc6b7b4709", + "version-string": "2.0.2", + "port-version": 0 + }, + { + "git-tree": "afb28a3a8882a012dd647e7cbe86f940c31489b3", + "version-string": "2.0.1-3", + "port-version": 0 + }, + { + "git-tree": "82335433d4231ef7bf6ba7bb3823c652fa27baff", + "version-string": "2.0.1-2", + "port-version": 0 + }, + { + "git-tree": "2b9399753701f7c8d648de00fb73dc8cce2f6ee5", + "version-string": "2.0.1-1", + "port-version": 0 + }, + { + "git-tree": "edb5da7ef12fc6c18bde71930a61f61a0dc7d7cd", + "version-string": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "173e4fa5a794171877b6a2609e28d9e6bee8f11d", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sdl2-mixer.json b/port_versions/s-/sdl2-mixer.json new file mode 100644 index 00000000000000..272aa9f6a296c0 --- /dev/null +++ b/port_versions/s-/sdl2-mixer.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "86c94f099112b8e743eaf9b34d7ae88d884335d7", + "version-string": "2.0.4", + "port-version": 10 + }, + { + "git-tree": "9cef2be29fbf5ca4f9711d216eee216c2cb30b98", + "version-string": "2.0.4-9", + "port-version": 0 + }, + { + "git-tree": "c7943bc165adf8371b6804f9c0473ad49862dc84", + "version-string": "2.0.4-8", + "port-version": 0 + }, + { + "git-tree": "45a9a811bab8d05ceb471494a1d7c1e9ed8bdc08", + "version-string": "2.0.4-7", + "port-version": 0 + }, + { + "git-tree": "a036c5d27840ed31cdbba4daeae3ac54d1895898", + "version-string": "2.0.4-6", + "port-version": 0 + }, + { + "git-tree": "3bc8c3ce5e3593035900c0db3cc3dcffa8d399d9", + "version-string": "2.0.4-5", + "port-version": 0 + }, + { + "git-tree": "ade49ef26eb57d42a9d20ed7ab85eff6d7690b71", + "version-string": "2.0.4-4", + "port-version": 0 + }, + { + "git-tree": "f146238e3b8b2d3f8e4b9f6ca059a373b2ced559", + "version-string": "2.0.4-3", + "port-version": 0 + }, + { + "git-tree": "7f86961bac34938feaac4b90520e524818a0bd9b", + "version-string": "2.0.4-2", + "port-version": 0 + }, + { + "git-tree": "eec87abcedd81366edd70b7f5543507ab0acb6bb", + "version-string": "2.0.4-1", + "port-version": 0 + }, + { + "git-tree": "f0373a0ee15eb8f45a69850da0db60584ea9615b", + "version-string": "2.0.4", + "port-version": 0 + }, + { + "git-tree": "5ab5c240994f14651964f13fe13b1afac9e4bbbd", + "version-string": "2.0.2-6", + "port-version": 0 + }, + { + "git-tree": "9cdc989d2fccef05516af82671e7514f6dad0c1b", + "version-string": "2.0.2-5", + "port-version": 0 + }, + { + "git-tree": "863d40f8a9eeffe6e26e30a883175e58a5eed257", + "version-string": "2.0.2-4", + "port-version": 0 + }, + { + "git-tree": "aa134e21420bffed177e11b9d4601a90ccc0cd48", + "version-string": "2.0.2-2", + "port-version": 0 + }, + { + "git-tree": "c8ff90df1980c887c0bc89b41220ca7657b42f39", + "version-string": "2.0.2-1", + "port-version": 0 + }, + { + "git-tree": "1a8ff212de868fde8a42507c03d2e9cd7c2bea41", + "version-string": "2.0.1-3", + "port-version": 0 + }, + { + "git-tree": "c82f400ed54564b7112ea8ae5ffd6175330ed6db", + "version-string": "2.0.1-2", + "port-version": 0 + }, + { + "git-tree": "e867e0d68a70f4e176323083da4416fbc6355799", + "version-string": "2.0.1-1", + "port-version": 0 + }, + { + "git-tree": "c0d20677631a7db9e0f65de173f622666e976518", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sdl2-net.json b/port_versions/s-/sdl2-net.json new file mode 100644 index 00000000000000..ab2606bc4e6d4a --- /dev/null +++ b/port_versions/s-/sdl2-net.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "c315356fbaaafea6bbcc98aa1faa32355c5b4d9b", + "version-string": "2.0.1-8", + "port-version": 0 + }, + { + "git-tree": "ab289966dcf6d837c5b8274e8d49095c5cc9186a", + "version-string": "2.0.1-7", + "port-version": 0 + }, + { + "git-tree": "be10b502afcaa42b2e82ea7c5c1a21a3e889bf9b", + "version-string": "2.0.1-6", + "port-version": 0 + }, + { + "git-tree": "16ad4ad807ad672818ceda635b8ced44cdf59e30", + "version-string": "2.0.1-5", + "port-version": 0 + }, + { + "git-tree": "b9ca8129b5a86757c8a813f652a01e61a79f2ded", + "version-string": "2.0.1-4", + "port-version": 0 + }, + { + "git-tree": "207d5cbf9edb9c31dd4aff8539e8aece515db4f3", + "version-string": "2.0.1-3", + "port-version": 0 + }, + { + "git-tree": "4a7e5537e8b19fef689e488ab5ca861260a2ff8a", + "version-string": "2.0.1-2", + "port-version": 0 + }, + { + "git-tree": "2605c7ba1ef533eb740ec996522daf9a3791bcdc", + "version-string": "2.0.1-1", + "port-version": 0 + }, + { + "git-tree": "c8cfd2be3ec7f13f029ac8bfa29c87c2aa45ef71", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sdl2-ttf.json b/port_versions/s-/sdl2-ttf.json new file mode 100644 index 00000000000000..4a42056dd1730a --- /dev/null +++ b/port_versions/s-/sdl2-ttf.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "669c213867cc020c758a2154f8d9fdb468f4c824", + "version-string": "2.0.15-3", + "port-version": 0 + }, + { + "git-tree": "74a840d700fd6e64c180446bf4d117c06f09681d", + "version-string": "2.0.15-2", + "port-version": 0 + }, + { + "git-tree": "4ffd44bf567f529552c2368bec0a93e67f050688", + "version-string": "2.0.15-1", + "port-version": 0 + }, + { + "git-tree": "d58f7a0a2d4e03effcd1072cd93bc1e7f52aa59f", + "version-string": "2.0.15", + "port-version": 0 + }, + { + "git-tree": "cd147ea3a6b7e21ebf0d33e304625de0216ec31e", + "version-string": "2.0.14-4", + "port-version": 0 + }, + { + "git-tree": "d43da97f40ddabd4477b7b8abfb499815a1e3cdf", + "version-string": "2.0.14-3", + "port-version": 0 + }, + { + "git-tree": "1559671d1e1503582f4ff5056c6c61a5553dc854", + "version-string": "2.0.14-2", + "port-version": 0 + }, + { + "git-tree": "1f77b18bd32dc1b3821d605b783acd0279bcaeab", + "version-string": "2.0.14-1", + "port-version": 0 + }, + { + "git-tree": "11bc4b4b4652236f59aad3b9c093423f6c1c3c51", + "version-string": "2.0.14", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sdl2.json b/port_versions/s-/sdl2.json new file mode 100644 index 00000000000000..7559dc6ac67c64 --- /dev/null +++ b/port_versions/s-/sdl2.json @@ -0,0 +1,154 @@ +{ + "versions": [ + { + "git-tree": "10ed256500fea4cd6cc5d3e6c6b5f2e9e364d78b", + "version-string": "2.0.14", + "port-version": 0 + }, + { + "git-tree": "03be064c4db47e35d6d3b14db1522fca24a95702", + "version-string": "2.0.12", + "port-version": 8 + }, + { + "git-tree": "c41be8645323fbd4e5f2c0b6a12f728c50d86505", + "version-string": "2.0.12", + "port-version": 7 + }, + { + "git-tree": "4e1b3d02d4b5530f4472f72bcfd67946a0f44b7b", + "version-string": "2.0.12", + "port-version": 6 + }, + { + "git-tree": "a42de3e4c0965b404bdd893a1ddec7db71b1a67e", + "version-string": "2.0.12", + "port-version": 5 + }, + { + "git-tree": "3d19d21d34537e6b242543a20a88a818d2a1fcff", + "version-string": "2.0.12", + "port-version": 4 + }, + { + "git-tree": "7efdf99f704e39b70d5e2bd8e210e9d359408ea2", + "version-string": "2.0.12", + "port-version": 3 + }, + { + "git-tree": "63f66f6a8bc20c52bb3f62831c4c96941fc5c775", + "version-string": "2.0.12-1", + "port-version": 0 + }, + { + "git-tree": "7ee9cda8491293e3c8d29fe9f11f9ea80b73db48", + "version-string": "2.0.12", + "port-version": 0 + }, + { + "git-tree": "be4965d2eb29d7425ec71f9729fe1215817977f2", + "version-string": "2.0.10-3", + "port-version": 0 + }, + { + "git-tree": "803ae2aa1eee508d8462e24d51ed319c593dc092", + "version-string": "2.0.10-2", + "port-version": 0 + }, + { + "git-tree": "640cc9c4d32c5abebe31811569db362dcc6c7ee2", + "version-string": "2.0.10-1", + "port-version": 0 + }, + { + "git-tree": "3436b282c25708bb31fd71a6f8fec365f8e75589", + "version-string": "2.0.9-4", + "port-version": 0 + }, + { + "git-tree": "dd31251d55b88f407efe4f67a85dd21bc026bc33", + "version-string": "2.0.9-3", + "port-version": 0 + }, + { + "git-tree": "c79ee660829e4e86ff633c9f5a9f08f0449db9bd", + "version-string": "2.0.9-2", + "port-version": 0 + }, + { + "git-tree": "da9765973085dbe1d56676d7b9956e06dbe71923", + "version-string": "2.0.9-1", + "port-version": 0 + }, + { + "git-tree": "07c207585512ac07014d6ddf4f3111a911046857", + "version-string": "2.0.8-3", + "port-version": 0 + }, + { + "git-tree": "dbaeb2f90779ac060a4b09a31f5be3be6b627723", + "version-string": "2.0.8-1", + "port-version": 0 + }, + { + "git-tree": "d057dbc3ec0b3e0c1791e0f0a6d7b86b4abb424e", + "version-string": "2.0.8", + "port-version": 0 + }, + { + "git-tree": "2b3048ecd70acc5049510fb63cd4d2492bd2108b", + "version-string": "2.0.7-4", + "port-version": 0 + }, + { + "git-tree": "571895fe23d6b47aea73c8b198256470186b4f5f", + "version-string": "2.0.7-3", + "port-version": 0 + }, + { + "git-tree": "0ceaa04a7a0813ad03dbd15f0422baa2d500abef", + "version-string": "2.0.7-2", + "port-version": 0 + }, + { + "git-tree": "605f6a7fc0fdead58934eb313fbda7b5fe78edd6", + "version-string": "2.0.7-1", + "port-version": 0 + }, + { + "git-tree": "2783dc0b9e81b011404f7a5f3c983b477afa22d7", + "version-string": "2.0.6-1", + "port-version": 0 + }, + { + "git-tree": "7b5a268171f98980db5d6bb430a1d8339d059272", + "version-string": "2.0.5-4", + "port-version": 0 + }, + { + "git-tree": "86e0cfab20b3825d0f0646564ee4a03c8ec77e00", + "version-string": "2.0.5-3", + "port-version": 0 + }, + { + "git-tree": "f86d02ec2ec0258c1fd29b298fc7dd8e3cb454ff", + "version-string": "2.0.5-2", + "port-version": 0 + }, + { + "git-tree": "ecac677f814682be15113d5ecaaf124fd03be096", + "version-string": "2.0.5-1", + "port-version": 0 + }, + { + "git-tree": "aa48f94a9fd1b99f3d012a0fc7148852851b1ff8", + "version-string": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "dceaf9c444f142790c0989fb2ab06af0bba387cf", + "version-string": "2.0.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sdl2pp.json b/port_versions/s-/sdl2pp.json new file mode 100644 index 00000000000000..68737cae399ca0 --- /dev/null +++ b/port_versions/s-/sdl2pp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d05210be37ddf262ae6599c41c16bb6204a232df", + "version-string": "0.16.1", + "port-version": 0 + }, + { + "git-tree": "0ed8fecb9caeb8edf3ff07e3b9da96118c7de41a", + "version-string": "0.16.0-2", + "port-version": 0 + }, + { + "git-tree": "109cd46df152c0ddf593cad5e967c7dda1e34291", + "version-string": "0.16.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/seal.json b/port_versions/s-/seal.json new file mode 100644 index 00000000000000..d15dc33bc34698 --- /dev/null +++ b/port_versions/s-/seal.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "df71d4b4ab6cc7c95c3c5eaec90cc413d508b1ea", + "version-string": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "c5900a15e801b55ed11f7946dfd0d47bee8d7759", + "version-string": "3.5.9", + "port-version": 0 + }, + { + "git-tree": "d307566b16720508f20801167b8f33b903184c8f", + "version-string": "3.4.5-1", + "port-version": 0 + }, + { + "git-tree": "003b9fd92728880b46305221ed65badb249e830b", + "version-string": "3.4.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/secp256k1.json b/port_versions/s-/secp256k1.json new file mode 100644 index 00000000000000..65306ac22fdae4 --- /dev/null +++ b/port_versions/s-/secp256k1.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "2ed3df183a68fa41ed68c2c4442804627946eb39", + "version-string": "2017-19-10", + "port-version": 3 + }, + { + "git-tree": "dce0d7645d36fe02662ee1074266120e79db8930", + "version-string": "2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4-2", + "port-version": 0 + }, + { + "git-tree": "e4bede6515b28cbd5b7245e381ee0412bbb09e5e", + "version-string": "2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4-1", + "port-version": 0 + }, + { + "git-tree": "d27ced801856bdd1c72b467fdbdb7c0ddda9a166", + "version-string": "2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4", + "port-version": 0 + }, + { + "git-tree": "db0eada2cf78deecfcfab3a2e4c536fe45f1d3cb", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/selene.json b/port_versions/s-/selene.json new file mode 100644 index 00000000000000..7931daf9e94bac --- /dev/null +++ b/port_versions/s-/selene.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "3e7996d3fb4faf8d14f4ea4ab7f963e66fac121e", + "version-string": "0.3.1", + "port-version": 3 + }, + { + "git-tree": "9fa6ff057040fa251942f23651868168d43446a4", + "version-string": "0.3.1-2", + "port-version": 0 + }, + { + "git-tree": "ff97ba2cff1ec7fc779959d7330fd0cfa99e6e52", + "version-string": "0.3.1-1", + "port-version": 0 + }, + { + "git-tree": "30684724a88015393d11483be380743aa2cde1c0", + "version-string": "0.3.1", + "port-version": 0 + }, + { + "git-tree": "b0fafe6b02b6f6ffde4b8cc554edba29e1615967", + "version-string": "0.2-1", + "port-version": 0 + }, + { + "git-tree": "b7062a564e08c020cbc2d47d2f0cba9e1ed41794", + "version-string": "0.1.1", + "port-version": 0 + }, + { + "git-tree": "f8c99c926a99ce5775a9a5b6009ea64ef21e555f", + "version-string": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sentencepiece.json b/port_versions/s-/sentencepiece.json new file mode 100644 index 00000000000000..08fc471893e362 --- /dev/null +++ b/port_versions/s-/sentencepiece.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "90b2ef495290ecbf5894d437a1d03d3735d9bf4d", + "version-string": "v0.1.82", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sentry-native.json b/port_versions/s-/sentry-native.json new file mode 100644 index 00000000000000..2af81af9206b5d --- /dev/null +++ b/port_versions/s-/sentry-native.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "9d2965fd3424545a9f822802de092c6e514080b9", + "version-string": "0.4.4", + "port-version": 1 + }, + { + "git-tree": "3e2b606857ae33216ec3e14e7b80c2b1fa5ef511", + "version-string": "0.4.4", + "port-version": 0 + }, + { + "git-tree": "1eb6b849deb546b084b493c1806f0ea9880eb3ac", + "version-string": "0.4.3", + "port-version": 1 + }, + { + "git-tree": "10b40eac7593c3edf66c08291e1bb1f3c92a62b9", + "version-string": "0.4.3", + "port-version": 0 + }, + { + "git-tree": "17fd741fb07bae8b24aa587d2ce17392cdd45489", + "version-string": "0.4.2", + "port-version": 2 + }, + { + "git-tree": "be1fb8778b50c546c918cc1d96ac5eae5b15e667", + "version-string": "0.4.1", + "port-version": 2 + }, + { + "git-tree": "9f7b29180b158e7c587d91ffcc6794998eb60ac6", + "version-string": "0.4.0", + "port-version": 2 + }, + { + "git-tree": "cbe2dcfc1a0934425fe5304b34788e2e8a852802", + "version-string": "0.4.0", + "port-version": 1 + }, + { + "git-tree": "a61672e8d77d8ca155044e13c82468b7df1dba31", + "version-string": "0.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/septag-sx.json b/port_versions/s-/septag-sx.json new file mode 100644 index 00000000000000..a47a2c6359690f --- /dev/null +++ b/port_versions/s-/septag-sx.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "cad2dce33d7fcb4c68d19e7500c528fbf9a0dee3", + "version-string": "2019-05-07-2", + "port-version": 0 + }, + { + "git-tree": "7581a8464abb2e98f0d2936156f47eb45a1799c7", + "version-string": "2019-05-07-1", + "port-version": 0 + }, + { + "git-tree": "b3ce911c8e33a6b93f67b77676b8b52ebafc9d8d", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "b9e21c1d4135ab98fcecc9970d8520afb9b39743", + "version-string": "2019-04-27", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/seqan.json b/port_versions/s-/seqan.json new file mode 100644 index 00000000000000..7171aa895b7f6e --- /dev/null +++ b/port_versions/s-/seqan.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e4536d4ddc67fb220b162eae9ab38e284ae05243", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "0e40efd3ef1b468430de54bb23b1d496c44c87d9", + "version-string": "2.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/serd.json b/port_versions/s-/serd.json new file mode 100644 index 00000000000000..5db30a5c662758 --- /dev/null +++ b/port_versions/s-/serd.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0061d58cfde2c694571f97e44a35075f92975a7d", + "version-string": "0.30.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sf2cute.json b/port_versions/s-/sf2cute.json new file mode 100644 index 00000000000000..56c8bfdb27b35e --- /dev/null +++ b/port_versions/s-/sf2cute.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "3e4e8518680f2bc5d3a5442eea14eefb7f73444e", + "version-string": "0.2.0-1", + "port-version": 0 + }, + { + "git-tree": "a8fa1664670d78a9668bd04309bfdded1aca3ea8", + "version-string": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sfgui.json b/port_versions/s-/sfgui.json new file mode 100644 index 00000000000000..46d5205e229265 --- /dev/null +++ b/port_versions/s-/sfgui.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "3ea13b41076aa915571ec9e65719a5088b70fd44", + "version-string": "0.4.0-3", + "port-version": 0 + }, + { + "git-tree": "3edb59e7642886f579328f0809e846fffe8c411e", + "version-string": "0.4.0-2", + "port-version": 0 + }, + { + "git-tree": "525e3b1cdfc5d3c713dc3020e0be24369fe781fb", + "version-string": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "9ec5d853db22c662ade21094f88fc2ae7da99fd2", + "version-string": "0.3.2-2", + "port-version": 0 + }, + { + "git-tree": "404fc9f3c4602cc2d93290d45a7c4ae4620f114a", + "version-string": "0.3.2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sfml.json b/port_versions/s-/sfml.json new file mode 100644 index 00000000000000..5481e9129fe7e3 --- /dev/null +++ b/port_versions/s-/sfml.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "abdf117d96cbb4dd259ec37277311109151bfcdb", + "version-string": "2.5.1", + "port-version": 9 + }, + { + "git-tree": "853d1a145c4aff18f9ebfacdc5ab25356725edcb", + "version-string": "2.5.1", + "port-version": 8 + }, + { + "git-tree": "e348793b1c312fea0819defd83c978ca0c541b92", + "version-string": "2.5.1-7", + "port-version": 0 + }, + { + "git-tree": "58f7fb0a2e9a92113146e519b7309671de694a82", + "version-string": "2.5.1-6", + "port-version": 0 + }, + { + "git-tree": "dfe454cc2eb309097440bc25b4d85a0003f3eded", + "version-string": "2.5.1-5", + "port-version": 0 + }, + { + "git-tree": "c43dd54a7dbd59dd3531d9817c7dd53009603448", + "version-string": "2.5.1-4", + "port-version": 0 + }, + { + "git-tree": "94d045ddc214ad5bd30f95b2692d9a6dcc8a55f1", + "version-string": "2.5.1-3", + "port-version": 0 + }, + { + "git-tree": "1ac74dbff3556179f9c51fbd68295abf4725cd26", + "version-string": "2.5.1-2", + "port-version": 0 + }, + { + "git-tree": "6a0417010a1aede4ffded5d16d47d74dea924272", + "version-string": "2.5.1-1", + "port-version": 0 + }, + { + "git-tree": "cbd65a448eee418c75a45b437122ffc020ad9c73", + "version-string": "2.5.1", + "port-version": 0 + }, + { + "git-tree": "9d01a101ce4f0af9c76fc932859b90dd181a0fb7", + "version-string": "2.5.0-2", + "port-version": 0 + }, + { + "git-tree": "434d3fece6c4b020afcf3d41c7ad3914385c8392", + "version-string": "2.5.0-1", + "port-version": 0 + }, + { + "git-tree": "4aee81707005bf0c8a349f3381cf4f97c1c96377", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "fb48b12d62222c96fafa28a64b807cf435135dd6", + "version-string": "2.4.2-3", + "port-version": 0 + }, + { + "git-tree": "32495d8ac072763c37cb0c49629689dff7bcc771", + "version-string": "2.4.2-2", + "port-version": 0 + }, + { + "git-tree": "18676b3a3b757ee391848131342d592f7578a243", + "version-string": "2.4.2-1", + "port-version": 0 + }, + { + "git-tree": "3418a74aa71ed06a5ceb48e5ebc7e7ff4ef3bfce", + "version-string": "2.4.2", + "port-version": 0 + }, + { + "git-tree": "4ccb85b8ee769b87dea9ff49ba7552aa15931474", + "version-string": "2.4.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sfsexp.json b/port_versions/s-/sfsexp.json new file mode 100644 index 00000000000000..a1d9a06c05081e --- /dev/null +++ b/port_versions/s-/sfsexp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1e71d8f85094713149a3f09368f02c69e3f5f952", + "version-string": "1.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/shaderc.json b/port_versions/s-/shaderc.json new file mode 100644 index 00000000000000..9b544a10573a44 --- /dev/null +++ b/port_versions/s-/shaderc.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "0622fa62b4192278be6dc612e9328e3c3a96ff50", + "version-string": "2019-06-26-1", + "port-version": 0 + }, + { + "git-tree": "7a32ce3f1d1705c1082c0f8a069333fc63ea969d", + "version-string": "2019-06-26", + "port-version": 0 + }, + { + "git-tree": "492c026b1d4eae22d2d27534821be83eeaf91452", + "version-string": "12fb656ab20ea9aa06e7084a74e5ff832b7ce2da-2", + "port-version": 0 + }, + { + "git-tree": "26dae9c17ea4392110945830fa0eff2340bd2c96", + "version-string": "12fb656ab20ea9aa06e7084a74e5ff832b7ce2da-1", + "port-version": 0 + }, + { + "git-tree": "c9c37a5711b5fc1c744b29df9cc22a38d7ba2957", + "version-string": "12fb656ab20ea9aa06e7084a74e5ff832b7ce2da", + "port-version": 0 + }, + { + "git-tree": "036b647c98ff6f8676756f49098fc027b5fbfe60", + "version-string": "2df47b51d83ad83cbc2e7f8ff2b56776293e8958-1", + "port-version": 0 + }, + { + "git-tree": "d0d9b33f7be3844aaf19665f1a4d16c8db3f65f1", + "version-string": "2df47b51d83ad83cbc2e7f8ff2b56776293e8958", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/shaderwriter.json b/port_versions/s-/shaderwriter.json new file mode 100644 index 00000000000000..332cf86581ceca --- /dev/null +++ b/port_versions/s-/shaderwriter.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f65600030bc48b3b5c3317f4af7affbfa3e2d818", + "version-string": "2020-10-15", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/shapelib.json b/port_versions/s-/shapelib.json new file mode 100644 index 00000000000000..acf2babc49f391 --- /dev/null +++ b/port_versions/s-/shapelib.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "8f8ae7fafd81e822e81a86f16ae6b5cdf7109d0e", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "e653c09eb6dfc19a9b54b77cdeb89e4ccb4dfccc", + "version-string": "1.4.1-2", + "port-version": 0 + }, + { + "git-tree": "4a6d9c64f555e0f032b5b4b50e12f4193b661fd6", + "version-string": "1.4.1-1", + "port-version": 0 + }, + { + "git-tree": "c1a5fc63f7b1bc5014826b00600cebceb0a2f7dc", + "version-string": "1.4.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/shiva-sfml.json b/port_versions/s-/shiva-sfml.json new file mode 100644 index 00000000000000..64c4d69b05aae9 --- /dev/null +++ b/port_versions/s-/shiva-sfml.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "ae1f4def605cd3f0212bf4ca1902450f45ecfa97", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "19d1dd168c798fb97fcd5cdb48630a1f4304bc61", + "version-string": "1.0", + "port-version": 0 + }, + { + "git-tree": "65c6a55f8edb28019e6b09cc50940ce63d9b8bd0", + "version-string": "0.9", + "port-version": 0 + }, + { + "git-tree": "04e24201129ef3c860a41b28e5b9bd1336e73a76", + "version-string": "0.7.2", + "port-version": 0 + }, + { + "git-tree": "12af86c8e186c3d7572603dfd39f18b9fb141c27", + "version-string": "0.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/shiva.json b/port_versions/s-/shiva.json new file mode 100644 index 00000000000000..515c1eb93b843b --- /dev/null +++ b/port_versions/s-/shiva.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "012f601b9fa99d1f7ea32a3df809599863bbfa5b", + "version-string": "1.0-3", + "port-version": 0 + }, + { + "git-tree": "bf030396c323fa52c93b2c8d45a5e699de83cd24", + "version-string": "1.0-2", + "port-version": 0 + }, + { + "git-tree": "54d402ddc00e5af4a6087bd5464fad1b75e10558", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "903943c93948e7b38d2a29d1507f88820d19ab47", + "version-string": "1.0", + "port-version": 0 + }, + { + "git-tree": "6f473076f1186ad7ab2c93031a4447f4f6ea85fd", + "version-string": "0.9", + "port-version": 0 + }, + { + "git-tree": "8df530f314232043532935cee19687cd4c4985aa", + "version-string": "0.7.2", + "port-version": 0 + }, + { + "git-tree": "b9ae660e925434f359284fcdf7f5c0c32904471c", + "version-string": "0.7", + "port-version": 0 + }, + { + "git-tree": "fcd76753d8382f91db81e9b768408931640045b1", + "version-string": "0.6", + "port-version": 0 + }, + { + "git-tree": "9d2b4125a3bd79fbab80fefa12ab3628875c20da", + "version-string": "0.3", + "port-version": 0 + }, + { + "git-tree": "40bac513282c377219e3192b78a25b931b92c085", + "version-string": "0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/shogun.json b/port_versions/s-/shogun.json new file mode 100644 index 00000000000000..51b8fa203bab7a --- /dev/null +++ b/port_versions/s-/shogun.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "c92d5a2ff87b2ffe3a78987e5c483abb537a0a21", + "version-string": "6.1.4", + "port-version": 4 + }, + { + "git-tree": "ab9a1a3260f20287848c12e673c0add58872b135", + "version-string": "6.1.4", + "port-version": 3 + }, + { + "git-tree": "4194ff455159af7503fc6c4d1d3c23fdee9cb1d8", + "version-string": "6.1.4", + "port-version": 2 + }, + { + "git-tree": "59b91118466283503dc6fc3e5706f51e641792be", + "version-string": "6.1.4-1", + "port-version": 0 + }, + { + "git-tree": "a38429e6e13b9509825dd0d9a90505e2b702c6f8", + "version-string": "6.1.4", + "port-version": 0 + }, + { + "git-tree": "7680bcc8036f8a9d9f2b415005990273c4368dcc", + "version-string": "6.1.3-3", + "port-version": 0 + }, + { + "git-tree": "f719e0810eec4ead80974ecc24cbc16e3052e182", + "version-string": "6.1.3-4", + "port-version": 0 + }, + { + "git-tree": "bdd8983cc6713fd980f1238bcd355c48f73c448c", + "version-string": "6.1.3-3", + "port-version": 0 + }, + { + "git-tree": "bc0ab59cdb60cee111585d32ebd68b7a54f20cac", + "version-string": "6.1.3-2", + "port-version": 0 + }, + { + "git-tree": "2128617e72276fe5b5b29eaef1586bffe0c879f6", + "version-string": "6.1.3-1", + "port-version": 0 + }, + { + "git-tree": "bb940abd3c3b26b525bb6ba2626332c83b132ed6", + "version-string": "6.1.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/signalrclient.json b/port_versions/s-/signalrclient.json new file mode 100644 index 00000000000000..fadf04de6ab4bb --- /dev/null +++ b/port_versions/s-/signalrclient.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "dbe638f959b879da354861fb39b3d4dbb179ea7d", + "version-string": "1.0.0-beta1-9", + "port-version": 0 + }, + { + "git-tree": "134ed01f4047d9dcb077f5f0bf06d07b374fe7b1", + "version-string": "1.0.0-beta1-8", + "port-version": 0 + }, + { + "git-tree": "5523151914bd255b4f7be195cbf2c9c29ef9a202", + "version-string": "1.0.0-beta1-7", + "port-version": 0 + }, + { + "git-tree": "d52c9b80ed5f478a1e9a1937ec5f80f2d9185da0", + "version-string": "1.0.0-beta1-6", + "port-version": 0 + }, + { + "git-tree": "8b2ff00922990bda0b92c1f75b47647070d7244e", + "version-string": "1.0.0-beta1-5", + "port-version": 0 + }, + { + "git-tree": "55b8af0164609db8a0d3bed45af8673d0395b800", + "version-string": "1.0.0-beta1-4", + "port-version": 0 + }, + { + "git-tree": "85cf956236c59b0edb2116a898f8ba719404be17", + "version-string": "1.0.0-beta1-3", + "port-version": 0 + }, + { + "git-tree": "0df276aa0e11332e37369b97f897c3802ca82037", + "version-string": "1.0.0-beta1-2", + "port-version": 0 + }, + { + "git-tree": "1b1e1f65de977aa3f5c06d8244c3686a73c26602", + "version-string": "1.0.0-beta1-1", + "port-version": 0 + }, + { + "git-tree": "021d82e87e6a17746f4be98a2088543c7bb20df8", + "version-string": "1.0.0-beta1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sigslot.json b/port_versions/s-/sigslot.json new file mode 100644 index 00000000000000..e7bf3ece3b6e5f --- /dev/null +++ b/port_versions/s-/sigslot.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "df12d3b00d8fc713d4d3f064d30df850fa0ddbb0", + "version-string": "1.0.0-3", + "port-version": 0 + }, + { + "git-tree": "90b917faf426db7b759c3e80786b4fdfd881d3bf", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "28463f405d745e5bac80fc9dea9805d227e7c4d4", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/simage.json b/port_versions/s-/simage.json new file mode 100644 index 00000000000000..9f0b909c935411 --- /dev/null +++ b/port_versions/s-/simage.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d73e98a3ac5a4ed61f96dce0e08628170ea803ad", + "version-string": "1.8.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/simde.json b/port_versions/s-/simde.json new file mode 100644 index 00000000000000..c837501adf5fe9 --- /dev/null +++ b/port_versions/s-/simde.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "49aade0bf4faf46635d58a453e71399f2d6c7412", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "3da136304f40e2ac9bee37de8554353b3651ccfd", + "version-string": "2019-06-05", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/simdjson.json b/port_versions/s-/simdjson.json new file mode 100644 index 00000000000000..ac9877add8a669 --- /dev/null +++ b/port_versions/s-/simdjson.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "cdf5909a4b7e7cddaa771495214d9b55c70fde08", + "version-string": "0.7.1", + "port-version": 0 + }, + { + "git-tree": "0b4a10f989059441e8f92a3c553bd0a8ba86a7ff", + "version-string": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "1b45c660ecb7574d541a2ac0e78360d1b2ca595b", + "version-string": "0.4.6", + "port-version": 0 + }, + { + "git-tree": "ecc37ff07b739241fbd962877fb0379b184f440c", + "version-string": "2020-05-26", + "port-version": 0 + }, + { + "git-tree": "bb9f45685c89d1db322dfff6a16c446f3ab9819e", + "version-string": "2019-12-27-1", + "port-version": 0 + }, + { + "git-tree": "653474d2fe6a3f3ad09e0f135551f2405448d201", + "version-string": "2019-12-27", + "port-version": 0 + }, + { + "git-tree": "4ad6668cb38e1d27f7b6427258ab4a9302ce970f", + "version-string": "2019-08-05", + "port-version": 0 + }, + { + "git-tree": "a7b21eb23fec6f5c0791ae8de24b7b6fcb48f36b", + "version-string": "2019-03-09", + "port-version": 0 + }, + { + "git-tree": "2b1d97af21d173a979dab9a5042a4524f23d214b", + "version-string": "2019-03-05", + "port-version": 0 + }, + { + "git-tree": "eb81ea8251ab69cc375b8fe1c1c3313c7a114108", + "version-string": "2019-03-03", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/simple-fft.json b/port_versions/s-/simple-fft.json new file mode 100644 index 00000000000000..fbaffe5d8c533d --- /dev/null +++ b/port_versions/s-/simple-fft.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b15ee04ff2954c699af23a3a292a1d016f285ce7", + "version-string": "2020-06-14", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/simpleini.json b/port_versions/s-/simpleini.json new file mode 100644 index 00000000000000..1a4ce25a200eda --- /dev/null +++ b/port_versions/s-/simpleini.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7c5b51650f86a58145cdcfd417d11cb6194f86c5", + "version-string": "2018-08-31-4", + "port-version": 0 + }, + { + "git-tree": "a763ce6729f427163521a78e860742a62f82e75d", + "version-string": "2018-08-31-3", + "port-version": 0 + }, + { + "git-tree": "b0d7d38cc1713a26f6e420cf7717e1c704064f5d", + "version-string": "2018-08-31-2", + "port-version": 0 + }, + { + "git-tree": "f65355da9ff4035912588c352359e367f0f5a03e", + "version-string": "2018-08-31-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/skia.json b/port_versions/s-/skia.json new file mode 100644 index 00000000000000..f3ab3630a30d47 --- /dev/null +++ b/port_versions/s-/skia.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "eea166718304da2660d795937fe2528dbd2909cc", + "version-string": "2020-05-18", + "port-version": 4 + }, + { + "git-tree": "d04414d54594483de831191613388c6b5aa978e9", + "version-string": "2020-05-18", + "port-version": 3 + }, + { + "git-tree": "177d57db9d882f100d003747bc7bb8a7b15fb93f", + "version-string": "2020-05-18", + "port-version": 2 + }, + { + "git-tree": "df6c0878878778539f84b01d1c80279e9c37fea7", + "version-string": "2020-05-18-1", + "port-version": 0 + }, + { + "git-tree": "ab86d01c431953c24ed509e461d68737de25d240", + "version-string": "2020-02-15-1", + "port-version": 0 + }, + { + "git-tree": "d2f0ed461eec9c568c14edb26029b9212610c28c", + "version-string": "2020-02-15", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/skyr-url.json b/port_versions/s-/skyr-url.json new file mode 100644 index 00000000000000..5e6542f6d9edfb --- /dev/null +++ b/port_versions/s-/skyr-url.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "f5e980fa829d4bd732381378c07ab88cb7b2c969", + "version-string": "1.13.0", + "port-version": 0 + }, + { + "git-tree": "05cd6beca4ffc47cdd618838be06f0ae979a56b9", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "c05be5836d2f25969eaaf145126836c6e18011b4", + "version-string": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "e5f5bd252f928a1a81b2befe404617906c9b487a", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "8676d5dfc85f85f5fde6e3f223818d1a89d44fc1", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "c780902451f439d276d13dc4360e5eedac8b0acc", + "version-string": "1.7.5", + "port-version": 0 + }, + { + "git-tree": "ade89e045541cc0b8c35393f14a6344dea2c0f6b", + "version-string": "1.7.3", + "port-version": 0 + }, + { + "git-tree": "66ddce862691ffe1f339a607eaaeb9dac247e5de", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "77fa2480eb705b8818e404d7bc87c94c4e51a858", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "e336acb4ff76d32d20792c7250dd5c3f0116bccd", + "version-string": "1.4.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/slikenet.json b/port_versions/s-/slikenet.json new file mode 100644 index 00000000000000..5bb738ff0f3c0e --- /dev/null +++ b/port_versions/s-/slikenet.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "fd99081ecbebc7fe7639cc9a61899ff6fb977d04", + "version-string": "2019-10-22-2", + "port-version": 0 + }, + { + "git-tree": "12e751ed18fc9b232f37ba1bfeba3ed07b6c35f2", + "version-string": "2019-10-22_1", + "port-version": 0 + }, + { + "git-tree": "2da918efefed1fe179a81a840e74f5a3167201a9", + "version-string": "2019-10-22", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sltbench.json b/port_versions/s-/sltbench.json new file mode 100644 index 00000000000000..134e696fe8afe5 --- /dev/null +++ b/port_versions/s-/sltbench.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7d051973310c2bd8ed3e9d90f53a9179fd651359", + "version-string": "2.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/smpeg2.json b/port_versions/s-/smpeg2.json new file mode 100644 index 00000000000000..8e9223d0a53bd8 --- /dev/null +++ b/port_versions/s-/smpeg2.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "11b7150cc88a598a42ce1467849d1138fb0540aa", + "version-string": "2.0.0-6", + "port-version": 0 + }, + { + "git-tree": "bd65cb2504c2c8212d11ccb603ce21d6aee9279b", + "version-string": "2.0.0-5", + "port-version": 0 + }, + { + "git-tree": "9b7899c89d213403142449e133911b5d03687d12", + "version-string": "2.0.0-3", + "port-version": 0 + }, + { + "git-tree": "b4a1d9ecf0315d3c311279b789aa9c9dbec1d483", + "version-string": "2.0.0-2", + "port-version": 0 + }, + { + "git-tree": "f2c913e246b0fc3ae49132f8a58b82e9443f25d2", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "b458b862ee758d38e46e5537eb557a1602f88cd6", + "version-string": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/snappy.json b/port_versions/s-/snappy.json new file mode 100644 index 00000000000000..39e9e0047c5223 --- /dev/null +++ b/port_versions/s-/snappy.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "2d47bf3d6ebccc84da5b32fadd900cf9b4b21fb7", + "version-string": "1.1.8", + "port-version": 0 + }, + { + "git-tree": "ea3027d934db1c7fee2243ea840152e503191f00", + "version-string": "1.1.7-2", + "port-version": 0 + }, + { + "git-tree": "646c81e0905949d49e7a1798d769a64345075060", + "version-string": "1.1.7-1", + "port-version": 0 + }, + { + "git-tree": "4650713df2896afa9f710048bcc3a9f95a1fc081", + "version-string": "1.1.7", + "port-version": 0 + }, + { + "git-tree": "fdab2eba86df0a616391163b40b420ffbd5c09ef", + "version-string": "1.1.6-be6dc3d", + "port-version": 0 + }, + { + "git-tree": "92e5482a901b1c3ba9c2a557029c475d263c817f", + "version-string": "1.1.4-1", + "port-version": 0 + }, + { + "git-tree": "c221837526a4596ce67d3023a28db60f80d4f0e7", + "version-string": "1.1.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sndfile.json b/port_versions/s-/sndfile.json new file mode 100644 index 00000000000000..e46076f7409f72 --- /dev/null +++ b/port_versions/s-/sndfile.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b4f6b73847fa1f16e3d628d0663354df7d579ffd", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "85b7063e42522e840546050452584d7383c2e08e", + "version-string": "deprecated", + "port-version": 0 + }, + { + "git-tree": "2de89cec678149407bcf4a661cd5eb882c9823aa", + "version-string": "1.0.29-cebfdf2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/snowhouse.json b/port_versions/s-/snowhouse.json new file mode 100644 index 00000000000000..90f1b7fa68f09f --- /dev/null +++ b/port_versions/s-/snowhouse.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "c259e9c0f2dbd8f9b73871032ee553973636403e", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "74b2306427376ac85f557edc031006de7b053b76", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "e3ecad8455cc7469e4e2b6ee8a7a4ae6330a0241", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "8bd3fe38212e48daaf2e5f04018df991dfe57bac", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "9a94f0e34a171c57fb889fb3497f4f9bf90fd4b8", + "version-string": "3.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/so5extra.json b/port_versions/s-/so5extra.json new file mode 100644 index 00000000000000..cbff1806325f4e --- /dev/null +++ b/port_versions/s-/so5extra.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "393e65540e9e66bdb66333aed31160795f91e220", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "4d16fab10ac993df2762eecbc259d2d271452f8f", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "c7fbd7717e208729612acdeb8b5a6adff0059d7d", + "version-string": "1.3.1.1", + "port-version": 0 + }, + { + "git-tree": "065c9b9262c5b976ecf6bce41d79cf95ac3e86d8", + "version-string": "1.3.1-2", + "port-version": 0 + }, + { + "git-tree": "c793dac8c213991621f6c89998c46dda73793308", + "version-string": "1.3.1-1", + "port-version": 0 + }, + { + "git-tree": "c0a80d0bb4b4afbb6b3f483b59679f92d86044e8", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "48bfd4cd03f3e57f9a10fc287c17107693c78476", + "version-string": "1.2.3-1", + "port-version": 0 + }, + { + "git-tree": "6070cc886493132054392b5f6713028cc616987c", + "version-string": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "d16c42dbab9ebafa1771d7d8f2d9bd62d6f35879", + "version-string": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "f7f7091c288b26e9543a8f20a0a11428bb0e153c", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sobjectizer.json b/port_versions/s-/sobjectizer.json new file mode 100644 index 00000000000000..fd9ca67da36a45 --- /dev/null +++ b/port_versions/s-/sobjectizer.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "3a4674e0a7170bdc14b397ea830b758aed3fc9e6", + "version-string": "5.7.2.1", + "port-version": 0 + }, + { + "git-tree": "71f7e3c7e25f43845a696ef45946c9c665100a92", + "version-string": "5.7.2", + "port-version": 0 + }, + { + "git-tree": "b4c2521b9be395373819121da5812356ff90729e", + "version-string": "5.7.1", + "port-version": 0 + }, + { + "git-tree": "36e4e63072b63db642d7db3994d1262d8b3c94a7", + "version-string": "5.7.0.1", + "port-version": 0 + }, + { + "git-tree": "3bd7e59bc656b165ce07d6c0a34bb4fe82518ca6", + "version-string": "5.7.0", + "port-version": 0 + }, + { + "git-tree": "adcbf58ac4118f7a45f6efb6967ab4e42507c185", + "version-string": "5.6.1-1", + "port-version": 0 + }, + { + "git-tree": "b27a9d9b57a89ee06f3f69ae2afc629a18bc51ef", + "version-string": "5.6.1", + "port-version": 0 + }, + { + "git-tree": "cd26e5bfb0e9dc9a1066d61e502c6538a4df4edf", + "version-string": "5.6.0.2", + "port-version": 0 + }, + { + "git-tree": "24699630443716cf72575b26199884c2cfe557e8", + "version-string": "5.5.24.4-1", + "port-version": 0 + }, + { + "git-tree": "f008bc897573418cf02ff3b43e3c43c7eb184307", + "version-string": "5.5.24.4", + "port-version": 0 + }, + { + "git-tree": "324c76f38492f7c1276d417c52392323c9e30f80", + "version-string": "5.5.24.3", + "port-version": 0 + }, + { + "git-tree": "a58eb37943832980d4c17d8e8d63fdca20cfc56f", + "version-string": "5.5.24.2", + "port-version": 0 + }, + { + "git-tree": "f97f5d2f13c962ec970fa7e2e799770ab240909e", + "version-string": "5.5.24.1", + "port-version": 0 + }, + { + "git-tree": "667e56993a88d1fc828313bf277b1ae04d14b7df", + "version-string": "5.5.24", + "port-version": 0 + }, + { + "git-tree": "524df252c3c564c7b2c055e6cd916c19d3d194dc", + "version-string": "5.5.23", + "port-version": 0 + }, + { + "git-tree": "76a8176577a73c64cbef6d392b77aa43fbc5ba17", + "version-string": "5.5.22.1", + "port-version": 0 + }, + { + "git-tree": "6dd61010769190456350589ef8883ec20956aa1f", + "version-string": "5.5.22", + "port-version": 0 + }, + { + "git-tree": "f957b85c55881582b257dc431d26ed73db258e42", + "version-string": "5.5.21", + "port-version": 0 + }, + { + "git-tree": "9ea4b550f525a64d5a29f237fa7b99b2e4502ad2", + "version-string": "5.5.20", + "port-version": 0 + }, + { + "git-tree": "0dfb8d49a267df83b74017919f5b5a058b432658", + "version-string": "5.5.20-beta1-201712061845", + "port-version": 0 + }, + { + "git-tree": "cfd7432f2cf52e4552142d841b55bf1351ac08c4", + "version-string": "5.5.19.2-1", + "port-version": 0 + }, + { + "git-tree": "5aef09e1967491303966590c31b05ef26db4979e", + "version-string": "5.5.19.2", + "port-version": 0 + }, + { + "git-tree": "93dab1c80b148b0b8cd68509f042304f864b0e30", + "version-string": "5.5.19-2", + "port-version": 0 + }, + { + "git-tree": "480fbf10a62b8e92ed7c0c8b5936552aed89bdec", + "version-string": "5.5.19", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/soci.json b/port_versions/s-/soci.json new file mode 100644 index 00000000000000..28f2679480c341 --- /dev/null +++ b/port_versions/s-/soci.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "f5e3d0da7cc2c6387fdd6b5e6ab13e1315e181c7", + "version-string": "4.0.1", + "port-version": 0 + }, + { + "git-tree": "e686550286c39a5e874ffffc22325d8148898e0e", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d7296ebafd0d9d2c57ebc2b8d020aeb0d9dd63ac", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "4188993df67564e79b0a05d18355dc001dbde40d", + "version-string": "3.2.3-4", + "port-version": 0 + }, + { + "git-tree": "fb8d74db8028ce82aefbc434b66170bb4e192150", + "version-string": "3.2.3-3", + "port-version": 0 + }, + { + "git-tree": "053e8f1e7febcfccde48da1f25b07d7eb3dcc1e2", + "version-string": "3.2.3-2", + "port-version": 0 + }, + { + "git-tree": "45798e07dcfb277f62d0cef758e598505741b6d0", + "version-string": "3.2.3-1", + "port-version": 0 + }, + { + "git-tree": "03d76021f0d9daf65db82c9f2d4a924499956cb6", + "version-string": "2016.10.22-1", + "port-version": 0 + }, + { + "git-tree": "cb8646fb74db3c51b1f357de930c34fbe0dcf521", + "version-string": "2016.10.22", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/socket-io-client.json b/port_versions/s-/socket-io-client.json new file mode 100644 index 00000000000000..478d1ca54a033e --- /dev/null +++ b/port_versions/s-/socket-io-client.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "72d40d2e1c52ff3be1a8ac23f9f45baeed8cbe58", + "version-string": "1.6.1-1", + "port-version": 0 + }, + { + "git-tree": "d5c8e34cc7b106133ce63b2f5fdcb9c9b3a38a8a", + "version-string": "1.6.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sockpp.json b/port_versions/s-/sockpp.json new file mode 100644 index 00000000000000..6c1914647a87d5 --- /dev/null +++ b/port_versions/s-/sockpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "259ad7f13a8184478a6a94922385f06ff5a7a00b", + "version-string": "0.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/soem.json b/port_versions/s-/soem.json new file mode 100644 index 00000000000000..bcdf0b6c387736 --- /dev/null +++ b/port_versions/s-/soem.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "629ce214f8cc2718e87c5130d2bdce15490bf20e", + "version-string": "1.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/soil.json b/port_versions/s-/soil.json new file mode 100644 index 00000000000000..729b490c715b1d --- /dev/null +++ b/port_versions/s-/soil.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4d137f0a640e2e1628d22a6a57018582f4e472a4", + "version-string": "2008.07.07-2", + "port-version": 0 + }, + { + "git-tree": "7dd6497a9ff2cdff03dbc340721248520feb838e", + "version-string": "2008.07.07-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/soil2.json b/port_versions/s-/soil2.json new file mode 100644 index 00000000000000..42b85e330d9987 --- /dev/null +++ b/port_versions/s-/soil2.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "79c6e11f43a4805471a2644ae07ad6e593e68646", + "version-string": "release-1.11-1", + "port-version": 0 + }, + { + "git-tree": "35a68dbcac1981363bcd8063f95824d69040a9c5", + "version-string": "release-1.11", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sokol.json b/port_versions/s-/sokol.json new file mode 100644 index 00000000000000..b90bd2943418ec --- /dev/null +++ b/port_versions/s-/sokol.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5f96d00b385a476fa3a663833eca5055a07e3ec8", + "version-string": "2019-09-09", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sol2.json b/port_versions/s-/sol2.json new file mode 100644 index 00000000000000..674ac70ceffa1c --- /dev/null +++ b/port_versions/s-/sol2.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "6effd490f0dc787aec07e064241407658ace41ce", + "version-string": "3.2.2", + "port-version": 0 + }, + { + "git-tree": "9502998e1c595718d83adf07ea860908e5e2e15c", + "version-string": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "029ac93b1620f70349a0e3f57a1191f5ddbd8ec3", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "8240f267b16f344994b1ce3da03a14fda6908e9e", + "version-string": "3.0.3-2", + "port-version": 0 + }, + { + "git-tree": "9e0e54152f08f6b7a637f9c15a689701f903c2d5", + "version-string": "3.0.3-1", + "port-version": 0 + }, + { + "git-tree": "524786c812705e461c55028c488f5a6330f33f7c", + "version-string": "3.0.3", + "port-version": 0 + }, + { + "git-tree": "0cc6d31b03d6dc191ebba1daabaad50d41365081", + "version-string": "3.0.2", + "port-version": 0 + }, + { + "git-tree": "84a35f873e2ffc4a0644c3441c506830060693fd", + "version-string": "2.20.6", + "port-version": 0 + }, + { + "git-tree": "3e2492a7eaa269579e03581e382b832cf1de0e82", + "version-string": "2.20.4", + "port-version": 0 + }, + { + "git-tree": "a675b97fa55ff48245ac9363b32d098e5db181d5", + "version-string": "2.20.3-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/solid3.json b/port_versions/s-/solid3.json new file mode 100644 index 00000000000000..2b86fccd088edf --- /dev/null +++ b/port_versions/s-/solid3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6b6536f4343a96d0fc5ccebfa8c2c4c680841848", + "version-string": "3.5.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sophus.json b/port_versions/s-/sophus.json new file mode 100644 index 00000000000000..d4d1283e43e0d7 --- /dev/null +++ b/port_versions/s-/sophus.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "079947ab617bc50fc9c45b4a88a152c94c31ec58", + "version-string": "1.0.0-6", + "port-version": 0 + }, + { + "git-tree": "16e0370b4c7e0852f9e761a0c2afaa4f417483ef", + "version-string": "1.0.0-3", + "port-version": 0 + }, + { + "git-tree": "5ff47b0fd3b1a3587cb75fa053898691059bda85", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "643b186b3cf0f2e3285871b82574c4772feeb2b5", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/soqt.json b/port_versions/s-/soqt.json new file mode 100644 index 00000000000000..1577a71fba42d6 --- /dev/null +++ b/port_versions/s-/soqt.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "db68c2677166ab693a6cef1084993f5da6af87e6", + "version-string": "1.6.0", + "port-version": 2 + }, + { + "git-tree": "0ecc0996dd0501ee5d44a9c8aaf1dddd9b4feb96", + "version-string": "1.6.0-1", + "port-version": 0 + }, + { + "git-tree": "52b1a5fb3755bba1ea0d77f3fa4d8e683f91180a", + "version-string": "1.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sord.json b/port_versions/s-/sord.json new file mode 100644 index 00000000000000..9f06f1b3bdeb68 --- /dev/null +++ b/port_versions/s-/sord.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f32a79763d994652ab17ffbe7de03b08bd1b4e14", + "version-string": "0.16.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/soundtouch.json b/port_versions/s-/soundtouch.json new file mode 100644 index 00000000000000..027ed355a9abfe --- /dev/null +++ b/port_versions/s-/soundtouch.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "c70fc01038afbb6850538b0a4789b91c83113a8d", + "version-string": "2.0.0-6", + "port-version": 0 + }, + { + "git-tree": "b21b499471e77eb459e8f30d66851c708f80d299", + "version-string": "2.0.0-4", + "port-version": 0 + }, + { + "git-tree": "1058dc04da4ed63879c85e43ee4c5ed91126c520", + "version-string": "2.0.0-3", + "port-version": 0 + }, + { + "git-tree": "2f9fb4b6aec6439f9fa8059732a034ed3b518a1c", + "version-string": "2.0.0-2", + "port-version": 0 + }, + { + "git-tree": "33cf4799b0670ee9e26144ee253c1eaa7bffa095", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "7678f3ece15a57a5a267ffd122199f9e6c0f0b87", + "version-string": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "5160323b001496be8efa3b6ccc326f9e41de4101", + "version-string": "2.0.0.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/soxr.json b/port_versions/s-/soxr.json new file mode 100644 index 00000000000000..906ba69adc4a66 --- /dev/null +++ b/port_versions/s-/soxr.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ab77ab3c75baa2a8d004321ce5ce237319c90f9e", + "version-string": "0.1.3", + "port-version": 3 + }, + { + "git-tree": "db67ea0f8064cd50b4c033a1cd4b3944e3143fe5", + "version-string": "0.1.3-2", + "port-version": 0 + }, + { + "git-tree": "3e4aad7a9166adff172617dba401ab2f35f6515d", + "version-string": "0.1.3.", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/spaceland.json b/port_versions/s-/spaceland.json new file mode 100644 index 00000000000000..0b942ddb7468e6 --- /dev/null +++ b/port_versions/s-/spaceland.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "9640c7fea7a143c3c5616886eefa2144efe9e6ed", + "version-string": "7.8.2-4", + "port-version": 0 + }, + { + "git-tree": "9227f189889812ef42ab56c378d8e6349f02631a", + "version-string": "7.8.2-3", + "port-version": 0 + }, + { + "git-tree": "7b1ac25ddd07ec7ed19f23e0327173950d043316", + "version-string": "7.8.2-2", + "port-version": 0 + }, + { + "git-tree": "feafc4d590858ac618c171c539f3e02757fb4ac9", + "version-string": "7.8.2-1", + "port-version": 0 + }, + { + "git-tree": "a8c50a7cece782a01b3465f49fb372c68bd540ac", + "version-string": "7.8.2-0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/span-lite.json b/port_versions/s-/span-lite.json new file mode 100644 index 00000000000000..1de3d322ba076f --- /dev/null +++ b/port_versions/s-/span-lite.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "3a97b03dacd5b7fdcec06275cf87a4df933d58a0", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "78d9193abb1aae1c64acb8573b14c30cbefbc96f", + "version-string": "0.8.1", + "port-version": 0 + }, + { + "git-tree": "d6e3e5ba4f7a59956496cd2c9d58f94982ce417f", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "5c10c90494e5784113231e80cf3dce72c2da19ca", + "version-string": "0.5.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sparsehash.json b/port_versions/s-/sparsehash.json new file mode 100644 index 00000000000000..d3778e74c2b3c8 --- /dev/null +++ b/port_versions/s-/sparsehash.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "09caa54b75727ae88898c390e6146433af01a47e", + "version-string": "2.0.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sparsepp.json b/port_versions/s-/sparsepp.json new file mode 100644 index 00000000000000..970ae76d2140f2 --- /dev/null +++ b/port_versions/s-/sparsepp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4eb97e554a87e43fca8664e8a50de2e96b5d89a3", + "version-string": "1.22-1", + "port-version": 0 + }, + { + "git-tree": "7a2aba5eb3e3313d1ca77213ffca62bba0d2f9ef", + "version-string": "1.22", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/spatialite-tools.json b/port_versions/s-/spatialite-tools.json new file mode 100644 index 00000000000000..5c968071ed6cc7 --- /dev/null +++ b/port_versions/s-/spatialite-tools.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "2a9685999c784265e25e4f2bde708a724721e906", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "de163c8fccab535db7c559fad289f492050c5292", + "version-string": "4.3.0", + "port-version": 7 + }, + { + "git-tree": "d43abce1d0acddfaa4309f22f635708c02b71a4c", + "version-string": "4.3.0", + "port-version": 6 + }, + { + "git-tree": "23cd3b937f595278fa3d7df6f780ce9756db1768", + "version-string": "4.3.0", + "port-version": 5 + }, + { + "git-tree": "34f7d0f85acb618f11b7735be391e605b0cdefbf", + "version-string": "4.3.0", + "port-version": 4 + }, + { + "git-tree": "a3a3434bfff7b3fb4dac3cf6ef8e82b8b3388f8e", + "version-string": "4.3.0", + "port-version": 3 + }, + { + "git-tree": "690d48e030e0507dc2d9e1a1fd7c56260c7fa869", + "version-string": "4.3.0-2", + "port-version": 0 + }, + { + "git-tree": "a63f075c0face000744d43dd52dc9bea06056baf", + "version-string": "4.3.0-1", + "port-version": 0 + }, + { + "git-tree": "31139dd5d9fb6c1f4708329188faf693f776ef59", + "version-string": "4.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/spdk-dpdk.json b/port_versions/s-/spdk-dpdk.json new file mode 100644 index 00000000000000..dd03ef3e10275e --- /dev/null +++ b/port_versions/s-/spdk-dpdk.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "42582bec709b8c669cb6d6fb685be93eab83ac16", + "version-string": "20181124", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/spdk-ipsec.json b/port_versions/s-/spdk-ipsec.json new file mode 100644 index 00000000000000..83d09372df77a0 --- /dev/null +++ b/port_versions/s-/spdk-ipsec.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7588e57c159ab0bdf5dec13b27382fd43973e995", + "version-string": "20180711", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/spdk-isal.json b/port_versions/s-/spdk-isal.json new file mode 100644 index 00000000000000..17ff0b01bbfbe3 --- /dev/null +++ b/port_versions/s-/spdk-isal.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "965daf98d6079c34b5b0ca3386e4ad6df1b0006d", + "version-string": "20181006", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/spdk.json b/port_versions/s-/spdk.json new file mode 100644 index 00000000000000..390d54399e6134 --- /dev/null +++ b/port_versions/s-/spdk.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "5c375362bcf50097d43af5e5e3480c8b0eb2ce7c", + "version-string": "19.01.1", + "port-version": 1 + }, + { + "git-tree": "02374f7f479809e431a26004d04b4a49f8396b69", + "version-string": "19.01.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/spdlog.json b/port_versions/s-/spdlog.json new file mode 100644 index 00000000000000..21871983255659 --- /dev/null +++ b/port_versions/s-/spdlog.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "51a19e55194fc03004bf1584612eb50cce1b4ec2", + "version-string": "1.8.0", + "port-version": 1 + }, + { + "git-tree": "5d706dc22de47010d9e137d34e92d63d76ba3eba", + "version-string": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "8681d8488a1699de3682f36106f0f229b452081b", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "b8711f4a9f15b256185cced73d6b656f4500c746", + "version-string": "1.6.1", + "port-version": 0 + }, + { + "git-tree": "1fccb6fdc2d17730b65feef637fa7bf4822008d2", + "version-string": "1.4.2-1", + "port-version": 0 + }, + { + "git-tree": "eef82a539bfbe485e8eb1a99969ef3817d4c7553", + "version-string": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "260f52a9cdc938a521b912742b3991743e3534a4", + "version-string": "1.3.1-2", + "port-version": 0 + }, + { + "git-tree": "db9983811c0001b8da998de6f6d79e999de368fe", + "version-string": "1.3.1-1", + "port-version": 0 + }, + { + "git-tree": "897ba633d34cfbd22dd140cc4d776d8ffc93a199", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "7206c06e9a437bbf24fc9fc001d1527218d06112", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "99937dc3778fc4979835e0471400999e8f3dc337", + "version-string": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "377345f97d2dadeb0cbeb0749068fb42f1b1430e", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "146dbdbead8391d5f1cccb971ab031d8e19ef904", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "d4ce520f28fd048a673935904346d4c6d45b9e42", + "version-string": "1.x-2018-07.04", + "port-version": 0 + }, + { + "git-tree": "003c2badc6005f42787ad92ff5542b14eb9d4531", + "version-string": "0.17.0", + "port-version": 0 + }, + { + "git-tree": "c78dae39d5eae622c5dfcb2df5af50de269e2f02", + "version-string": "0.16.3", + "port-version": 0 + }, + { + "git-tree": "907e9a1c35ba7cd380e2525bfd6b1b7ed86f98b5", + "version-string": "0.14.0-1", + "port-version": 0 + }, + { + "git-tree": "9ad4d0e629d61ea19329477d15eb2399e302f5ac", + "version-string": "0.14.0", + "port-version": 0 + }, + { + "git-tree": "ab60a7dc0cb3c775eb5d3bc918fee73c9dce11e4", + "version-string": "0.13.0", + "port-version": 0 + }, + { + "git-tree": "b4983276d089ae80e8a39e7b2afb7bbc656c0a23", + "version-string": "0.12.0", + "port-version": 0 + }, + { + "git-tree": "911f75365832b0049c89e199159a4f5470f70e91", + "version-string": "0.11.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/spectra.json b/port_versions/s-/spectra.json new file mode 100644 index 00000000000000..edabb0c5341484 --- /dev/null +++ b/port_versions/s-/spectra.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b33cdb035b8b412b662a052b66437743330fccde", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "f48c7452a08ecf1bea2f38c71e9a483bf9a0dd2a", + "version-string": "0.8.1", + "port-version": 0 + }, + { + "git-tree": "6b079989ac49d63d8a3743945e11946f91a82986", + "version-string": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "8a8ee4c7cf71687209c57fbd44a4086cccfdadb8", + "version-string": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/speex.json b/port_versions/s-/speex.json new file mode 100644 index 00000000000000..a177e0f96ab5ed --- /dev/null +++ b/port_versions/s-/speex.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "ee8363b22602ef2b0f74d4d43de88ed32457c4ba", + "version-string": "1.2.0", + "port-version": 7 + }, + { + "git-tree": "3cee82112765f15b171e6cd1c82d8b6dfdae8d0e", + "version-string": "1.2.0", + "port-version": 6 + }, + { + "git-tree": "374b39093074f2df35ddc5d149b6be0f341dd512", + "version-string": "1.2.0-4", + "port-version": 0 + }, + { + "git-tree": "cf094b8180941583f404a7d7a448a8e19680d3e3", + "version-string": "1.2.0-3", + "port-version": 0 + }, + { + "git-tree": "69ef4e65fe6345c928392beab80b47a93654bbb4", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "2ee5d2b6a00e5189df97b91e2add1e06a730193c", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "1e2b2cbc8fb9e7557b5e5e54e8421fded8616ae7", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "95a26111514fae470f4b23b0c0e63441ee0a8b1b", + "version-string": "Speex-1.2.0", + "port-version": 0 + }, + { + "git-tree": "425d2c37fa67478fda173254b059df04db437d83", + "version-string": "2017-06-28-cae5026cfd88782c7051af6e685059223578b7e9", + "port-version": 0 + }, + { + "git-tree": "194d58d3ef9d94580d5bf822978a41c6cab80722", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/speexdsp.json b/port_versions/s-/speexdsp.json new file mode 100644 index 00000000000000..64c6eb054e0362 --- /dev/null +++ b/port_versions/s-/speexdsp.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "dfc87aa20568189fc2493e46eeb6067c97fdc9b0", + "version-string": "1.2.0", + "port-version": 5 + }, + { + "git-tree": "ca958f5770fabc81d240e68617f3558999f31ad7", + "version-string": "1.2.0", + "port-version": 4 + }, + { + "git-tree": "a06bfcea7728a1af4eeafd5c5f4034bbb26381e1", + "version-string": "1.2.0", + "port-version": 3 + }, + { + "git-tree": "5f7f0b5ce2fcb3d90a3b85bf95210b85c9603ffc", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "40c62be17e1bba790096f1db8a924d8daba84a7a", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "aa0b0a538cebf52e67bfcfbadec37fbaaf223984", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "06d78c315a496a62173afd0e5fe305535a63a7e8", + "version-string": "1.2rc3-3", + "port-version": 0 + }, + { + "git-tree": "5afdec828830e90351f63384e7fcdd910af19022", + "version-string": "1.2rc3-2", + "port-version": 0 + }, + { + "git-tree": "d296cb76a6c32d89bba68417d85374740a2ae9f9", + "version-string": "1.2rc3-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/spirit-po.json b/port_versions/s-/spirit-po.json new file mode 100644 index 00000000000000..889ea76b543389 --- /dev/null +++ b/port_versions/s-/spirit-po.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "f209e0daa09e721fae054ff377284190bab3b28e", + "version-string": "1.1.2-1", + "port-version": 0 + }, + { + "git-tree": "5e5ee266c348865906d2fe0b1553f21337900e53", + "version-string": "1.1.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/spirv-cross.json b/port_versions/s-/spirv-cross.json new file mode 100644 index 00000000000000..ce65931c8119ad --- /dev/null +++ b/port_versions/s-/spirv-cross.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b1d5c5737acb40490b9cf38a538ecc91d588be03", + "version-string": "2020-02-26", + "port-version": 0 + }, + { + "git-tree": "6b4c03fbcb1adde9c953afa8f70035cae8915b96", + "version-string": "2019-07-26", + "port-version": 0 + }, + { + "git-tree": "9749070aff35d31ba7de68fbc8c49187b44f10de", + "version-string": "2019-05-09", + "port-version": 0 + }, + { + "git-tree": "75662d186acd7ab7861aeb256b12395f5df17333", + "version-string": "2018-08-07-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/spirv-headers.json b/port_versions/s-/spirv-headers.json new file mode 100644 index 00000000000000..b2553fbfc2dd7e --- /dev/null +++ b/port_versions/s-/spirv-headers.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "24a883021f92092b645b516dde1489ea0f8e2665", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "025e9b9b71501caa96c75b7c919b6c6daab73cb1", + "version-string": "2019-05-05", + "port-version": 0 + }, + { + "git-tree": "58c395fae8b89546e625d981f4c8f8087a5abdee", + "version-string": "2019-03-05", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/spirv-tools.json b/port_versions/s-/spirv-tools.json new file mode 100644 index 00000000000000..7eb0d22b56888e --- /dev/null +++ b/port_versions/s-/spirv-tools.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "f6e770ef4164d3a7a518eca97aa2e3fdbe2f79cb", + "version-string": "2020.1-1", + "port-version": 0 + }, + { + "git-tree": "8a6c4c9a48f26d68e40e6b105df010d97bcca409", + "version-string": "2020.1", + "port-version": 0 + }, + { + "git-tree": "e3af2cb591f10b81a71167e06ff1664e7293de4c", + "version-string": "2019.3-dev-1", + "port-version": 0 + }, + { + "git-tree": "ee08bc090eb757988a120c276958405654f62c47", + "version-string": "2019.3-dev", + "port-version": 0 + }, + { + "git-tree": "87dc00322d704d6b1d5aa96675a2961f30eaf272", + "version-string": "2018.1-2", + "port-version": 0 + }, + { + "git-tree": "449d428a1e5f72bfe0f6dd6301acb4eff42c4914", + "version-string": "2018.1-1", + "port-version": 0 + }, + { + "git-tree": "5e7104cf0de22ea79eea13fcdfd382ec4b410cc5", + "version-string": "2018.1-2", + "port-version": 0 + }, + { + "git-tree": "7da2389f31edd51df50898bfafcd3c06cafdc753", + "version-string": "2018.1-1", + "port-version": 0 + }, + { + "git-tree": "bfd7e1260250c2962d2cbb83b046c215b3f1819e", + "version-string": "2017.1-dev-7e2d26c77b606b21af839b37fd21381c4a669f23-1", + "port-version": 0 + }, + { + "git-tree": "95ca59204c696bc720395fff8cd9ba437830f245", + "version-string": "v2017.1-dev-7e2d26c77b606b21af839b37fd21381c4a669f23-1", + "port-version": 0 + }, + { + "git-tree": "c3bf7f00fc51622609dfe50b2c1e935fd445ee5b", + "version-string": "v2017.1-dev-7e2d26c77b606b21af839b37fd21381c4a669f23", + "port-version": 0 + }, + { + "git-tree": "948fc208102d720d6c30e4d33f4198f7ed69930b", + "version-string": "1.1-f72189c249ba143c6a89a4cf1e7d53337b2ddd40", + "port-version": 0 + }, + { + "git-tree": "e1f3ce2c02993b52b4ff21144099c2e96fa3f8cc", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sprout.json b/port_versions/s-/sprout.json new file mode 100644 index 00000000000000..32c8a901d02d11 --- /dev/null +++ b/port_versions/s-/sprout.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0b87b120bf0e49a1b22400f1fc4a0f5922b5c472", + "version-string": "2019-06-20", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/spscqueue.json b/port_versions/s-/spscqueue.json new file mode 100644 index 00000000000000..6dcddf8fc14626 --- /dev/null +++ b/port_versions/s-/spscqueue.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "6b3bbf0099c235e22836e7df07d5bb10b6fac73c", + "version-string": "1.0", + "port-version": 0 + }, + { + "git-tree": "f15b77710f3bc8d905af2dd7270431bf7b5be662", + "version-string": "2019-07-26", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sqlcipher.json b/port_versions/s-/sqlcipher.json new file mode 100644 index 00000000000000..b916922cfa9f6f --- /dev/null +++ b/port_versions/s-/sqlcipher.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f62dcc2e9971dc127655e7c400d28b0df2b299f4", + "version-string": "4.4.1", + "port-version": 0 + }, + { + "git-tree": "9b02456fa2a4adc830b0c19a6ed96a658e8209ea", + "version-string": "4.4.0", + "port-version": 1 + }, + { + "git-tree": "f51dce0a57ce49a36ff5ac1604d03f9d90485b3b", + "version-string": "4.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sqlite-modern-cpp.json b/port_versions/s-/sqlite-modern-cpp.json new file mode 100644 index 00000000000000..07b0d70fdb02cf --- /dev/null +++ b/port_versions/s-/sqlite-modern-cpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "76f96eb36e0647e5dabef65acc033bf563621704", + "version-string": "3.2-936cd0c8", + "port-version": 0 + }, + { + "git-tree": "d9fd80b107981361275ac559c4ac594bc4e89ed6", + "version-string": "3.2-e2248fa", + "port-version": 0 + }, + { + "git-tree": "9ae5896ff029a777756032e946747a56829f5c9e", + "version-string": "3.2", + "port-version": 0 + }, + { + "git-tree": "dbe4e8503d0ff5ded9adaee95d4d9c62baf55396", + "version-string": "2.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sqlite-orm.json b/port_versions/s-/sqlite-orm.json new file mode 100644 index 00000000000000..371fee92ce3b54 --- /dev/null +++ b/port_versions/s-/sqlite-orm.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "62e09e58648e190b5e5a6c2bd15da05dffad439b", + "version-string": "1.6", + "port-version": 0 + }, + { + "git-tree": "bd64b4ad149ed87a0605e2a5cacd490bc57ee959", + "version-string": "1.5", + "port-version": 2 + }, + { + "git-tree": "19a9253782d0a5d339d8b4f6ad3521ce0ba98efe", + "version-string": "1.5", + "port-version": 1 + }, + { + "git-tree": "3b2e209ef23a7f97469d9892228e7303ad6526f8", + "version-string": "1.5", + "port-version": 0 + }, + { + "git-tree": "c7f3bc361519b9ef0d9bd9d6b4c26856efec1e2a", + "version-string": "1.4", + "port-version": 0 + }, + { + "git-tree": "4d69881dfedcee477473fa98099247595d2123df", + "version-string": "1.3-1", + "port-version": 0 + }, + { + "git-tree": "defb5cf6e40fcbbae6781fce08834eaf1e31f38b", + "version-string": "1.3", + "port-version": 0 + }, + { + "git-tree": "c0372ae1219186bcc7b8d2f018f35d1a07932173", + "version-string": "1.2", + "port-version": 0 + }, + { + "git-tree": "add3e0d6142238e191ecd5f9f1c0b514f68576ba", + "version-string": "1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sqlite3.json b/port_versions/s-/sqlite3.json new file mode 100644 index 00000000000000..2c41708578c584 --- /dev/null +++ b/port_versions/s-/sqlite3.json @@ -0,0 +1,169 @@ +{ + "versions": [ + { + "git-tree": "34f1a969f91790b20ff5bd583f25adac17c4d9c2", + "version-string": "3.33.0", + "port-version": 0 + }, + { + "git-tree": "b746e84b3267fb52e18a050d4258fd5f2f37f51a", + "version-string": "3.32.3", + "port-version": 1 + }, + { + "git-tree": "6d2665d7dd329e28ca92368a94eb124e7e522298", + "version-string": "3.32.3", + "port-version": 0 + }, + { + "git-tree": "166dd530c2d4ed7545969644d2eb8b7d963af970", + "version-string": "3.32.1", + "port-version": 0 + }, + { + "git-tree": "76f84ca7f9fec081e9f8e660cdc865cdaabf595b", + "version-string": "3.32.0-0", + "port-version": 0 + }, + { + "git-tree": "8dc6e278240fe3dff5a6ce8a6b78353b42248f25", + "version-string": "3.31.1-1", + "port-version": 0 + }, + { + "git-tree": "1f7763d978c7912f26e382e595c97e096564da46", + "version-string": "3.31.1", + "port-version": 0 + }, + { + "git-tree": "91b98085d16476b4a61b334c055ff12442a81db1", + "version-string": "3.30.1-2", + "port-version": 0 + }, + { + "git-tree": "2dc9c3314f3a5117e1bd5e6ac7bdd7f178b0bddd", + "version-string": "3.30.1-1", + "port-version": 0 + }, + { + "git-tree": "0ad6efba3a0336f7458922b3055bc3b9cfbc495e", + "version-string": "3.30.1", + "port-version": 0 + }, + { + "git-tree": "4d1da4a892ebbdb58c133232505a70b99b172b99", + "version-string": "3.29.0-1", + "port-version": 0 + }, + { + "git-tree": "41d88769efb523e0e479257d20e3378a2b4997d9", + "version-string": "3.28.0-2", + "port-version": 0 + }, + { + "git-tree": "03ea8afe8cbfe7a0c69226f8098e849347bc2a99", + "version-string": "3.28.0-1", + "port-version": 0 + }, + { + "git-tree": "d89981ed362b8145ba1681c0f6d3ccd95881c018", + "version-string": "3.28.0", + "port-version": 0 + }, + { + "git-tree": "f33a8198a23d9f6d25b2face36241acc186ba99f", + "version-string": "3.27.2", + "port-version": 0 + }, + { + "git-tree": "d4e3d7513ca40b8b3e6ac6840480d5ac28b7ec3c", + "version-string": "3.26.0", + "port-version": 0 + }, + { + "git-tree": "196b59d9b150eaba5ae4ec9de1faae78e7df4777", + "version-string": "3.25.2", + "port-version": 0 + }, + { + "git-tree": "67fa5412207dc3da0c25c90af48fc8083d9e4a5f", + "version-string": "3.24.0-2", + "port-version": 0 + }, + { + "git-tree": "f1c756ce35266ebf09d79f22a1170ed84b321b4f", + "version-string": "3.24.0-1", + "port-version": 0 + }, + { + "git-tree": "361f5ea299697f67aeabf2efe5590c2e39c07dba", + "version-string": "3.24.0", + "port-version": 0 + }, + { + "git-tree": "fbea37e4b80fc2c0aa0088ac6ab2783fa48094a2", + "version-string": "3.23.1-1", + "port-version": 0 + }, + { + "git-tree": "e55c89a98b137558a135a3f32c3c9cdc2d44bf45", + "version-string": "3.23.1", + "port-version": 0 + }, + { + "git-tree": "c8d3f33a2cbcf093965e4ef1ce356cb5c3afa2b3", + "version-string": "3.23.0", + "port-version": 0 + }, + { + "git-tree": "0a1d5de977ac865f14855ab0857b1dcc16ce2f9b", + "version-string": "3.21.0-1", + "port-version": 0 + }, + { + "git-tree": "c6cb29ddf98979af881d8e97c567ba8a2c9757eb", + "version-string": "3.21.0", + "port-version": 0 + }, + { + "git-tree": "54eab08218d5e036289c98dc986a998916929189", + "version-string": "3.20.1", + "port-version": 0 + }, + { + "git-tree": "d62849d8b740964f99497711f88e019d3c8d31fb", + "version-string": "3.19.1-2", + "port-version": 0 + }, + { + "git-tree": "d529c4933bf08cab95b867087cbfad0d463cdc79", + "version-string": "3.19.1-1", + "port-version": 0 + }, + { + "git-tree": "cbaade15e1aaf69d98cca346ec05b9a1c60ca489", + "version-string": "3.18.0-1", + "port-version": 0 + }, + { + "git-tree": "1636685797b2b321510c6d199914e7e07c4af4a1", + "version-string": "3.17.0", + "port-version": 0 + }, + { + "git-tree": "395237456b611ecb1103bb64b06b5f3afbea580a", + "version-string": "3.15.0", + "port-version": 0 + }, + { + "git-tree": "b90b01f6b71910d19c34f77a4441236257548303", + "version-string": "3.15.0 (3150000)", + "port-version": 0 + }, + { + "git-tree": "9ed0e5e9d67f3c14a426e055f5441a03afa89f02", + "version-string": "3120200", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sqlitecpp.json b/port_versions/s-/sqlitecpp.json new file mode 100644 index 00000000000000..8ad9ced317cb2c --- /dev/null +++ b/port_versions/s-/sqlitecpp.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "95b41ad9727bd341deba2739968a3d7173c0fb9b", + "version-string": "3.1.1", + "port-version": 1 + }, + { + "git-tree": "6b714b3d6494c54a9994c49ac0696bc3e74ab68e", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "bbe7298559e28fea4ba44639d10eb975ae25a439", + "version-string": "3.0.0", + "port-version": 2 + }, + { + "git-tree": "90d0c9d7b4c791961e4f96a9ef11133d245f601f", + "version-string": "3.0.0", + "port-version": 1 + }, + { + "git-tree": "4cf1a9a90e4e1587cdecc689bcee7c537ca68854", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "efcb81c9002c119d01ba12b49289fa24c1dbfa9f", + "version-string": "2.3.0-1", + "port-version": 0 + }, + { + "git-tree": "619f4b5a616fb70f4b8a17b599286841efdd6ebc", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "95c6e95b54a5dd42497884c8d06e48289b9860d5", + "version-string": "2.2-2", + "port-version": 0 + }, + { + "git-tree": "10de4316894879046e8356bfc02a1707268fdb13", + "version-string": "2.2-1", + "port-version": 0 + }, + { + "git-tree": "0ad16d6133fae87e84442122f7380897793bf6e8", + "version-string": "2.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sqlpp11-connector-mysql.json b/port_versions/s-/sqlpp11-connector-mysql.json new file mode 100644 index 00000000000000..87a2496b2e1eca --- /dev/null +++ b/port_versions/s-/sqlpp11-connector-mysql.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "7a94d2413e27ed320a9ad41acf4e447b060cb5d4", + "version-string": "0.29-1", + "port-version": 0 + }, + { + "git-tree": "33e5b3964f305b06759a8b8decada4a8aa82bd33", + "version-string": "0.29", + "port-version": 0 + }, + { + "git-tree": "3c7b1571fda0274cb08ffd5647e2ec0a738c95c2", + "version-string": "0.26", + "port-version": 0 + }, + { + "git-tree": "22930952e58cd22b323f248fa301cc8f2966b770", + "version-string": "0.25-2", + "port-version": 0 + }, + { + "git-tree": "4da57b5610d50d9888cc212b6f9e7a47056f764a", + "version-string": "0.25-1", + "port-version": 0 + }, + { + "git-tree": "722767948f7a745fe2e09a835075fc63c776df1f", + "version-string": "0.25", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sqlpp11-connector-sqlite3.json b/port_versions/s-/sqlpp11-connector-sqlite3.json new file mode 100644 index 00000000000000..8b2983240efa2d --- /dev/null +++ b/port_versions/s-/sqlpp11-connector-sqlite3.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "5adcee3bd02dde26fc1ca6272162cc5005b0cadd", + "version-string": "0.30", + "port-version": 0 + }, + { + "git-tree": "9be15890e4d2a274c563bea77964459802159bf3", + "version-string": "0.29-2", + "port-version": 0 + }, + { + "git-tree": "44103550881a1581212124d45782480a9ed5cd44", + "version-string": "0.29-1", + "port-version": 0 + }, + { + "git-tree": "4e7baff1998bf263042f99cdb2abae94fc9c91c3", + "version-string": "0.29", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sqlpp11.json b/port_versions/s-/sqlpp11.json new file mode 100644 index 00000000000000..59b681f1056575 --- /dev/null +++ b/port_versions/s-/sqlpp11.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "96028362edb1da213edd2423d2c128e08ac6988d", + "version-string": "0.60", + "port-version": 0 + }, + { + "git-tree": "44ea18d7420266e2ad58a70271e5b245b1df39ff", + "version-string": "0.59", + "port-version": 0 + }, + { + "git-tree": "4498eb2c19d26e1f55e12caf432aee24549e6551", + "version-string": "0.58-3", + "port-version": 0 + }, + { + "git-tree": "70b65aef4e7e6bfe62fb8666665f5f73c9aead11", + "version-string": "0.58-2", + "port-version": 0 + }, + { + "git-tree": "0522191e6b44a1d85dc38e604d0ff354b314f393", + "version-string": "0.58-1", + "port-version": 0 + }, + { + "git-tree": "2ce6e5634663f291d8debf2493e983797bca5abd", + "version-string": "0.58", + "port-version": 0 + }, + { + "git-tree": "3481de23b7ccd787ea7cc1d890b2c234fab74dec", + "version-string": "0.57-1", + "port-version": 0 + }, + { + "git-tree": "ec276851839e0916bf7459ed47ba53229e400d2c", + "version-string": "0.57", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sratom.json b/port_versions/s-/sratom.json new file mode 100644 index 00000000000000..cd4f8572c23fd9 --- /dev/null +++ b/port_versions/s-/sratom.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "182f7bca04bba50becb7f719b0403033ffd1a9da", + "version-string": "0.6.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/status-value-lite.json b/port_versions/s-/status-value-lite.json new file mode 100644 index 00000000000000..28330797bb80e2 --- /dev/null +++ b/port_versions/s-/status-value-lite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0c2c7909015007afa15da14789dec8c16b5284ba", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/stb.json b/port_versions/s-/stb.json new file mode 100644 index 00000000000000..0ede63d298e70b --- /dev/null +++ b/port_versions/s-/stb.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "079dbaa8fb1658d6508be38e224c79aeb99a0c46", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "023e715efdbf18f7028830bd9868fa05bc87f3e9", + "version-string": "2020-02-08-1", + "port-version": 0 + }, + { + "git-tree": "ba3772d1e9ebeda7ec28ac410bc40e5153f809d8", + "version-string": "2020-02-08", + "port-version": 0 + }, + { + "git-tree": "e8a0602db6140131007458fba1ecddedc3a6a792", + "version-string": "2019-08-17", + "port-version": 0 + }, + { + "git-tree": "aa84a1e6ad3df3a959f0480671fc37cfe205af5d", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "05d070e21ee5b47278c1b753bc3cbe469bc00a58", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "f7784037a32059d057135a8a2a25816ed596fe5e", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "633a4baa57514c29074a3144ccdf205225f9df21", + "version-string": "2018-03-02", + "port-version": 0 + }, + { + "git-tree": "8a2260d6e01360de6477d3359144fa63d02a45bf", + "version-string": "20170724-9d9f75e", + "port-version": 0 + }, + { + "git-tree": "58fe3328d2d641baad386d937ba8923b4b313f8a", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/stlab.json b/port_versions/s-/stlab.json new file mode 100644 index 00000000000000..2daad767d46ed7 --- /dev/null +++ b/port_versions/s-/stlab.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "8c11accbf5dec18cf90ddcc4d437c87a770a7c99", + "version-string": "1.5.2-1", + "port-version": 0 + }, + { + "git-tree": "fde6f6435cd41a3b62a25fd53b319173d4c5ef85", + "version-string": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "15813431ef523a9c76a089cc47c08b170efc2e34", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "4a9ef07d6a9f5fa994dcde91d96ac7f173c5c6d7", + "version-string": "1.4.1-1", + "port-version": 0 + }, + { + "git-tree": "af6282ed0f85fcc00ad592e1aa52393342d24ccd", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "b5080fae004c245ad6037a3cb7581bf2a948719b", + "version-string": "1.3.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/stormlib.json b/port_versions/s-/stormlib.json new file mode 100644 index 00000000000000..56da6a183c6096 --- /dev/null +++ b/port_versions/s-/stormlib.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "8c3dfecaec0cd4f296d1153e9b97a11be97e7677", + "version-string": "2019-05-10", + "port-version": 2 + }, + { + "git-tree": "2fb4b4db8b34d553cddbb58ca5123f991c222f4a", + "version-string": "2019-05-10-1", + "port-version": 0 + }, + { + "git-tree": "01817e565311edb8c029a349b5d19e1c906af9ca", + "version-string": "2019-05-10", + "port-version": 0 + }, + { + "git-tree": "fd9a3c1da904a4ada61b3ce116db2a32fa34ff85", + "version-string": "9.22", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/strict-variant.json b/port_versions/s-/strict-variant.json new file mode 100644 index 00000000000000..f5a617b2a70c5b --- /dev/null +++ b/port_versions/s-/strict-variant.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b289adfc580c77e7b542c709060fa80c26c78849", + "version-string": "0.5", + "port-version": 0 + }, + { + "git-tree": "c25b09dcc4e7638984fadbe2bb6b96c0b9a2bb0f", + "version-string": "v0.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/string-theory.json b/port_versions/s-/string-theory.json new file mode 100644 index 00000000000000..32ab0d11742be3 --- /dev/null +++ b/port_versions/s-/string-theory.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "021ea7daa5d0f6d63bfa2617811a68639e7f5964", + "version-string": "3.4", + "port-version": 0 + }, + { + "git-tree": "37e244cbce12ef477bf3320125a2d5063b81612b", + "version-string": "3.3", + "port-version": 0 + }, + { + "git-tree": "b921f9c73727bcde64c8de913b2138e07f907c6e", + "version-string": "3.2", + "port-version": 0 + }, + { + "git-tree": "88c18697cc50e200307fb05c21bae6bcda33c029", + "version-string": "3.1", + "port-version": 0 + }, + { + "git-tree": "04b3368d3a326ef3cd41217a01dbaaaefa1ee5cb", + "version-string": "3.0", + "port-version": 0 + }, + { + "git-tree": "33a0913f00547a5b5ca23b5293b676e5ba878bc7", + "version-string": "2.3", + "port-version": 0 + }, + { + "git-tree": "a561b3d689bcf262d6f61dd72577811023c17bea", + "version-string": "2.2", + "port-version": 0 + }, + { + "git-tree": "7bc1b3624966ed9338fe2431857ff617fa3a853b", + "version-string": "2.1-1", + "port-version": 0 + }, + { + "git-tree": "e3916b3b152b1f35681b12dc220bf905e470747d", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "d256807923c140edf9726259de352ec874125970", + "version-string": "1.7", + "port-version": 0 + }, + { + "git-tree": "e8536fad5cda700a238dfc496a2cae46405ec1d2", + "version-string": "1.6-1", + "port-version": 0 + }, + { + "git-tree": "51b5047362c5d2777271a9fe43ad0d5fc5f5137a", + "version-string": "1.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/string-view-lite.json b/port_versions/s-/string-view-lite.json new file mode 100644 index 00000000000000..beecd7c0927667 --- /dev/null +++ b/port_versions/s-/string-view-lite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d669e1a64927f0a008ed1e4e6179760f8696ca77", + "version-string": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/strtk.json b/port_versions/s-/strtk.json new file mode 100644 index 00000000000000..6b27690d97325a --- /dev/null +++ b/port_versions/s-/strtk.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "15e912afd73f5656dfaae90459274f72ff3b7fee", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "24e3bf58a4726a390ec8c6aef7f1dd45b0d7274e", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "b568d33cd1eef6b6a4d92453b5696bc3695b9ccc", + "version-string": "2018.09.30-b887974", + "port-version": 0 + }, + { + "git-tree": "d90d3c81ce26b81b32d7a715029af1f1ecf728e2", + "version-string": "2018.05.07-48c9554", + "port-version": 0 + }, + { + "git-tree": "b3d734474a1bb342f3aae211c823b0d16057014e", + "version-string": "2018.01.01-5579ed1", + "port-version": 0 + }, + { + "git-tree": "8671cd8c7b9dafa896470a769ca95f220b2d9ea0", + "version-string": "2017.01.02-1e2960f", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/stx.json b/port_versions/s-/stx.json new file mode 100644 index 00000000000000..7e89caf2bc1d95 --- /dev/null +++ b/port_versions/s-/stx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3f6ca6895772efc8d75945a015596c0be4e4cc9b", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/stxxl.json b/port_versions/s-/stxxl.json new file mode 100644 index 00000000000000..86abe39a737ecd --- /dev/null +++ b/port_versions/s-/stxxl.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "22aadda93429299d04a2c8424c20a70f577da220", + "version-string": "2018-11-15-2", + "port-version": 0 + }, + { + "git-tree": "7e39c1496c7f611b72d4a4095145f5b6fc255290", + "version-string": "2018-11-15-1", + "port-version": 0 + }, + { + "git-tree": "7b1241069c28618798afeb293ae3460b1dcc2e8c", + "version-string": "2018-11-15", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/suitesparse.json b/port_versions/s-/suitesparse.json new file mode 100644 index 00000000000000..c449b468544b75 --- /dev/null +++ b/port_versions/s-/suitesparse.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "cafd2cb5688d179f1ca502ae8e1ce421db1c7ef5", + "version-string": "5.8.0", + "port-version": 0 + }, + { + "git-tree": "4b26da95eb39ba08f61e95b79eb063ffeb2b29d0", + "version-string": "5.4.0", + "port-version": 7 + }, + { + "git-tree": "21200a3ce988e5552e3ccd320c8cdce53ad005d0", + "version-string": "5.4.0-6", + "port-version": 0 + }, + { + "git-tree": "da536485afcf8957ab864ab6f2710f3116fc6555", + "version-string": "5.4.0-5", + "port-version": 0 + }, + { + "git-tree": "cce5dd4a0b13689da30d52f8f83c4899a492904b", + "version-string": "5.4.0-4", + "port-version": 0 + }, + { + "git-tree": "d7a63cefefa5ba8d6224d08a94ce04e64f8e693c", + "version-string": "5.4.0-3", + "port-version": 0 + }, + { + "git-tree": "9063ac73727625e21e107e2040643473ea5c87a3", + "version-string": "5.4.0-1", + "port-version": 0 + }, + { + "git-tree": "ac00b6bef93043be11c8c32f3a27d566b27d47d2", + "version-string": "5.1.2-2", + "port-version": 0 + }, + { + "git-tree": "1526c78f79decd88ef7716b4487a6021985cc701", + "version-string": "5.1.2-1", + "port-version": 0 + }, + { + "git-tree": "c904ad6e925a0d784163184871b1dafd9cf4a3ca", + "version-string": "5.1.2", + "port-version": 0 + }, + { + "git-tree": "545f4e56cba8ff110f072f2a3f60ac6b0ee00fa3", + "version-string": "4.5.5-4", + "port-version": 0 + }, + { + "git-tree": "533e98f1d340df9f38cc4c896366858e2493f537", + "version-string": "4.5.5-3", + "port-version": 0 + }, + { + "git-tree": "9be9e04e6f6f8acc276e8148f7a66d752b246c90", + "version-string": "4.5.5-2", + "port-version": 0 + }, + { + "git-tree": "0aba17066c23d8eb10159dce54841831e3f827de", + "version-string": "4.5.5-1", + "port-version": 0 + }, + { + "git-tree": "f64098e673c45f5ab77f620a2ab9568ffc567e08", + "version-string": "4.5.5", + "port-version": 0 + }, + { + "git-tree": "062fc552839e4573a7cca2729fd6ef475f9117a8", + "version-string": "4.5.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sundials.json b/port_versions/s-/sundials.json new file mode 100644 index 00000000000000..88fb5475ae00f0 --- /dev/null +++ b/port_versions/s-/sundials.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "8d36ea64574b793b164d015845c69e6278168ba5", + "version-string": "5.5.0", + "port-version": 0 + }, + { + "git-tree": "7df9768e7cec20e90a9ac0805fa170f766482423", + "version-string": "3.1.1-2", + "port-version": 0 + }, + { + "git-tree": "a60da1bb580c64d896a0b4d7a2c0270db6e472f6", + "version-string": "3.1.1-1", + "port-version": 0 + }, + { + "git-tree": "e4f5f1be94f60a1380586c6624615799575819b0", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "e17e4df2810e374d8c49f0f6b47592aefe4f4883", + "version-string": "2.7.0-1", + "port-version": 0 + }, + { + "git-tree": "80a580d6f4b408fa2615e502a7f3175cbe35da85", + "version-string": "2.7.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/superlu.json b/port_versions/s-/superlu.json new file mode 100644 index 00000000000000..0318f9a64655d0 --- /dev/null +++ b/port_versions/s-/superlu.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1899f59286e7b43ea4501c3bb20754ae728d1040", + "version-string": "2020-01-07", + "port-version": 2 + }, + { + "git-tree": "544d6373d779c00f07cbcb040b20d582af3451bf", + "version-string": "2020-01-07", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/symengine.json b/port_versions/s-/symengine.json new file mode 100644 index 00000000000000..ef1fa5c75dc9c6 --- /dev/null +++ b/port_versions/s-/symengine.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3d7345924811530e7b9a5e0b3ae588bbb32be2b1", + "version-string": "2020-05-25", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/systemc.json b/port_versions/s-/systemc.json new file mode 100644 index 00000000000000..9c323a672c5d1b --- /dev/null +++ b/port_versions/s-/systemc.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9f6eda0d5b4ce0d9f620cae19df91a526ae18803", + "version-string": "2.3.3-4", + "port-version": 0 + }, + { + "git-tree": "3e415ae679fc332603789c486008ab1beb1b5013", + "version-string": "2.3.3-3", + "port-version": 0 + }, + { + "git-tree": "5ee424aafb5f3972e3f05ffaa4edc707a0e77972", + "version-string": "2.3.3-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/szip.json b/port_versions/s-/szip.json new file mode 100644 index 00000000000000..5bb734831d2f7f --- /dev/null +++ b/port_versions/s-/szip.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "bcd8fca84e0acd4d6be162e857379ef3b74fe213", + "version-string": "2.1.1-6", + "port-version": 0 + }, + { + "git-tree": "0fdd9b2647a90ef7c51b40e3e011a7bb471e9704", + "version-string": "2.1.1-5", + "port-version": 0 + }, + { + "git-tree": "df1816819840845cd1622e64efadccf6f046c07b", + "version-string": "2.1.1-4", + "port-version": 0 + }, + { + "git-tree": "6ba9c13d6b35ae61f8b21c3f3851d362ea4265ad", + "version-string": "2.1.1-3", + "port-version": 0 + }, + { + "git-tree": "69ce1d38b34a26484b01cf099684fc99e9230411", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "42c92537d0bd3c826fe9fb3110b59eef48ac8765", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "e45d8445d7ef74a676d505f9840007d4f43e45aa", + "version-string": "2.1-2", + "port-version": 0 + }, + { + "git-tree": "b5bfe4ce51d2ccee6cbdd204ded01f895383cf5a", + "version-string": "2.1-1", + "port-version": 0 + }, + { + "git-tree": "0ab09228ece8ae41edb37b838309b04de5d5558a", + "version-string": "2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tabulate.json b/port_versions/t-/tabulate.json new file mode 100644 index 00000000000000..b930dcf2b8cf28 --- /dev/null +++ b/port_versions/t-/tabulate.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f59225353a31f7ebaa180e0d35a59122b31ce1b9", + "version-string": "2019-01-06", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tacopie.json b/port_versions/t-/tacopie.json new file mode 100644 index 00000000000000..714a31e133cbd9 --- /dev/null +++ b/port_versions/t-/tacopie.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "4338494afcc9385f4e4fb804faaef19e96c11843", + "version-string": "3.2.0-2", + "port-version": 0 + }, + { + "git-tree": "041ec46b9970f1dc145922fb8464e42745d8c1f4", + "version-string": "3.2.0-1", + "port-version": 0 + }, + { + "git-tree": "c0d6f171dd1efc86648f3ad550cd6e3c296bdd66", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "2efc5937a28a36241c6dbbd12c158c798350ca87", + "version-string": "2.4.1-2", + "port-version": 0 + }, + { + "git-tree": "d46e43e6499a88f4e97a216fcabc5c241698abce", + "version-string": "2.4.1-1", + "port-version": 0 + }, + { + "git-tree": "cd6622abf966b470548a6c040727ac9bdfb56776", + "version-string": "2.4.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/taglib.json b/port_versions/t-/taglib.json new file mode 100644 index 00000000000000..ed661250233474 --- /dev/null +++ b/port_versions/t-/taglib.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "8aee2b399d4cd5af999057cbbe5e9476272b5a24", + "version-string": "1.11.1-20190531", + "port-version": 0 + }, + { + "git-tree": "1536cc4e68e0475f6bb39840b00e2ad1bf706a4b", + "version-string": "1.11.1-4", + "port-version": 0 + }, + { + "git-tree": "1d504937079a18b634d51c9163638585b5e01673", + "version-string": "1.11.1-3", + "port-version": 0 + }, + { + "git-tree": "c639d618a869c31af336dec64e15caa558c35f3a", + "version-string": "1.11.1-2", + "port-version": 0 + }, + { + "git-tree": "7de52deaa0423999b20037cd86b1d2371a5ba695", + "version-string": "1.11.1-1", + "port-version": 0 + }, + { + "git-tree": "3b06be936f4fbafe554cbd0679a1772ab7a3c500", + "version-string": "1.11.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/taocpp-json.json b/port_versions/t-/taocpp-json.json new file mode 100644 index 00000000000000..8cecc7cd72dad4 --- /dev/null +++ b/port_versions/t-/taocpp-json.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "1f514b2100e6f510ec9fe39625c67e050f0910e0", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "e90cd293087f49812acd65105f83db565d0b71a2", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "dccd7a3e684a35f08501928c40b1409b8a6fb2d8", + "version-string": "2019-05-08", + "port-version": 0 + }, + { + "git-tree": "e41d989a56709ec651f6cfd5e9f411e1fad1837e", + "version-string": "2019-04-29-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tap-windows6.json b/port_versions/t-/tap-windows6.json new file mode 100644 index 00000000000000..7efe428b18c06e --- /dev/null +++ b/port_versions/t-/tap-windows6.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "56eae8063d4c595d6002e0a499258d853a55ff22", + "version-string": "9.21.2-0e30f5c", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/taskflow.json b/port_versions/t-/taskflow.json new file mode 100644 index 00000000000000..31c01f999800c7 --- /dev/null +++ b/port_versions/t-/taskflow.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "efe56bba7e13bcf283b57fed39637a7e4789c1da", + "version-string": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "a757e3e8ff0b8654adb5e83b5046e6c48db0a11a", + "version-string": "2.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tbb.json b/port_versions/t-/tbb.json new file mode 100644 index 00000000000000..366fa1e7e58db4 --- /dev/null +++ b/port_versions/t-/tbb.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "eb2f60732524f07ea5effc9aeda3472fd0bbe243", + "version-string": "2020_U3", + "port-version": 3 + }, + { + "git-tree": "b6023798ef507fce8294092ad4553bb5348f068c", + "version-string": "2020_U3", + "port-version": 2 + }, + { + "git-tree": "d795bc6f63678ed12f824a83c3a0ba983245f2a5", + "version-string": "2020_U3", + "port-version": 1 + }, + { + "git-tree": "ed3d3cb6f7f9c57e588c951cfc372d109fe94c72", + "version-string": "2020_U3", + "port-version": 0 + }, + { + "git-tree": "fee70f775ec6d3d85ad7d063e440c44131a5aff0", + "version-string": "2020_U1-1", + "port-version": 0 + }, + { + "git-tree": "254c2b642dbaffe8159e6b171870a152136fd895", + "version-string": "2020_U1", + "port-version": 0 + }, + { + "git-tree": "2a3a3ec00a38b5210b84706bdf6e9f9198932df8", + "version-string": "2019_U8-3", + "port-version": 0 + }, + { + "git-tree": "3df7c14ae10efa35004598fd1ab26759dfa2495a", + "version-string": "2019_U8-2", + "port-version": 0 + }, + { + "git-tree": "7d9bbd62941ff78ce498dbe1514c012294551b0f", + "version-string": "2019_U8-1", + "port-version": 0 + }, + { + "git-tree": "3be5c111cb01595f1b786724e6d53fd0d8df7e92", + "version-string": "2019_U8", + "port-version": 0 + }, + { + "git-tree": "84476373f30fe5c294d86d0e4904168d6e10a8c6", + "version-string": "2019_U7-1", + "port-version": 0 + }, + { + "git-tree": "09d7aa7cbe0bc605aed30d4e11efff20af43f44c", + "version-string": "2019_U7", + "port-version": 0 + }, + { + "git-tree": "f1ee9ee541cf6c5cf4117dc1a78d0f4053f14381", + "version-string": "2019_U6", + "port-version": 0 + }, + { + "git-tree": "081c7eeeac7269465725d973e5ea5a934f9fe52a", + "version-string": "2019_U5-1", + "port-version": 0 + }, + { + "git-tree": "9c71768e787576e1d103c52fe1f31f8d30177a30", + "version-string": "2019_U5", + "port-version": 0 + }, + { + "git-tree": "86cdf7b32996ab69085cd6b1fb607b5db18c92e4", + "version-string": "2019_U4", + "port-version": 0 + }, + { + "git-tree": "ebc7fd9372ca32501cd8d4d54d3b673b867ee998", + "version-string": "2019_U3-1", + "port-version": 0 + }, + { + "git-tree": "c1f5eeb5837d6de7d55854b2e67a5b20c69efaa5", + "version-string": "2019_U3", + "port-version": 0 + }, + { + "git-tree": "b625ba0fd4c2a286182200a610caaaae771fe21c", + "version-string": "2018_U6", + "port-version": 0 + }, + { + "git-tree": "6c64f0b42d21206d32dec975c851f6693c01e990", + "version-string": "2018_U5-4", + "port-version": 0 + }, + { + "git-tree": "23d6ae1013a0c5f71c3b75ea9ad8b7baf9b12621", + "version-string": "2018_U5", + "port-version": 0 + }, + { + "git-tree": "f07d8515b953defb8e6bc1ab47e4ca7ef305fe7e", + "version-string": "2018_U4", + "port-version": 0 + }, + { + "git-tree": "161e4caf0d0df0acd7e2af898ccc08f928b8ed75", + "version-string": "2018_U3", + "port-version": 0 + }, + { + "git-tree": "6c874b672fe0b06acdf355ce21fc2af828ec0968", + "version-string": "2018_U2", + "port-version": 0 + }, + { + "git-tree": "e467e977fa3b05a3d3acc2b0c425602bf85bc5c2", + "version-string": "2017_U7", + "port-version": 0 + }, + { + "git-tree": "7f43f366643b48868e18ae1f996f000781077bb8", + "version-string": "2017_U6", + "port-version": 0 + }, + { + "git-tree": "651994f9b2b55094af6de6f888e4e1824937b064", + "version-string": "20160916", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tcl.json b/port_versions/t-/tcl.json new file mode 100644 index 00000000000000..1cff326b2e58cf --- /dev/null +++ b/port_versions/t-/tcl.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "91acff42f01d650b56bc6a8377bca8c93f9e7408", + "version-string": "core-9-0-a1", + "port-version": 1 + }, + { + "git-tree": "914cf3e943b2379dad1a63f05c3f0e9f107b7b1d", + "version-string": "core-9-0-a1", + "port-version": 0 + }, + { + "git-tree": "65c61411b419e4a62f80d85b0f9c16db30188c71", + "version-string": "8.6.10-3", + "port-version": 0 + }, + { + "git-tree": "7a6e3e3fb3cd7abff045319ea6693fb35bf00d7c", + "version-string": "8.6.10-2", + "port-version": 0 + }, + { + "git-tree": "7d0a483ed75781d1e21412e915556bdfabc54c94", + "version-string": "8.6.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tclap.json b/port_versions/t-/tclap.json new file mode 100644 index 00000000000000..a0a4dc9b546fab --- /dev/null +++ b/port_versions/t-/tclap.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "c0fc7c229a3d40cbeb66f7f67856aa3115a70d3f", + "version-string": "1.2.2-3", + "port-version": 0 + }, + { + "git-tree": "06ddf23b9a537e96cddb73f94d11aeba12ef672b", + "version-string": "1.2.2-2", + "port-version": 0 + }, + { + "git-tree": "10dcbe9e96648b48d0d113b7a2bb31c5ba8f60fc", + "version-string": "1.2.2-1", + "port-version": 0 + }, + { + "git-tree": "b805b384cfdfb9445d4d3ce0b0f9a5e178c37a82", + "version-string": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "d06901860103a9fbd9f6a45fad64c147a1d2e77d", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/teemo.json b/port_versions/t-/teemo.json new file mode 100644 index 00000000000000..92279f6d595788 --- /dev/null +++ b/port_versions/t-/teemo.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "d51932720b4cbcb753d076b0045d96153522e441", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "3d64b8c8b74b31a51e95ca6b63f3ad0483ec503c", + "version-string": "1.3", + "port-version": 0 + }, + { + "git-tree": "f70967e8b6fea7249c22f345105dfc609e5424c5", + "version-string": "1.2-1", + "port-version": 0 + }, + { + "git-tree": "07ddcf388fb99941d7e334818cf360cd20e019b6", + "version-string": "1.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/telnetpp.json b/port_versions/t-/telnetpp.json new file mode 100644 index 00000000000000..1ef742424fec16 --- /dev/null +++ b/port_versions/t-/telnetpp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "904e2801ba11dae44b62c252e4b6193b50e63fd2", + "version-string": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "d7db43baec43a10c0b48d9d86e1331d4da573f2d", + "version-string": "2.0-4", + "port-version": 0 + }, + { + "git-tree": "a326437fbff54619f8e88842303a9fe65f3d0a7a", + "version-string": "2.0-3", + "port-version": 0 + }, + { + "git-tree": "20acece0d3d048018b9e5b4e01c98b6a0026fd36", + "version-string": "2.0-2", + "port-version": 0 + }, + { + "git-tree": "c66573d58de425381ca8545a8cff430038685ae0", + "version-string": "2.0", + "port-version": 0 + }, + { + "git-tree": "70fa20ea4cf3ea35101b93f70b9722a207bda47f", + "version-string": "1.2.4-1", + "port-version": 0 + }, + { + "git-tree": "362984ae95ea46793ce363484c0a1368512661e4", + "version-string": "1.2.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tensorflow-cc.json b/port_versions/t-/tensorflow-cc.json new file mode 100644 index 00000000000000..380be804e6f29a --- /dev/null +++ b/port_versions/t-/tensorflow-cc.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "08a9ef525187b9b3656a686f2e83100643b7389e", + "version-string": "2.3.1", + "port-version": 2 + }, + { + "git-tree": "e8e712585868d830d75a2dc44667f54b1e8b8f69", + "version-string": "2.3.1", + "port-version": 1 + }, + { + "git-tree": "36fd69f219de177654a21efcc341d286d94ec4a1", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "3927154bb7bb6c3ac2e0d83d6bcac3e497a95d89", + "version-string": "1.14", + "port-version": 5 + }, + { + "git-tree": "7df6c1b207429c2a84c9d2c0486df7cd38bfc577", + "version-string": "1.14", + "port-version": 4 + }, + { + "git-tree": "65c22db79a292ba22ff3c4061cddd1af041482ab", + "version-string": "1.14-3", + "port-version": 0 + }, + { + "git-tree": "f6b80dc3e816c9fba20dea66bbe13731695dc165", + "version-string": "1.14-2", + "port-version": 0 + }, + { + "git-tree": "ce0cd570ec1d1011da0d0ffea3935bf4798e4ab6", + "version-string": "1.14-1", + "port-version": 0 + }, + { + "git-tree": "c2f2869ce42ce47880f959ab91ae8bde30fc15db", + "version-string": "1.14", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tensorflow-common.json b/port_versions/t-/tensorflow-common.json new file mode 100644 index 00000000000000..2797aeb38c4d1d --- /dev/null +++ b/port_versions/t-/tensorflow-common.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "68686e3bd8a7304f0a9dbc090e2757ed2186a2a6", + "version-string": "2.3.1", + "port-version": 1 + }, + { + "git-tree": "433699fdeee59265f52aea4a4574ea7dbe06f210", + "version-string": "2.3.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tensorflow.json b/port_versions/t-/tensorflow.json new file mode 100644 index 00000000000000..b0c96ce5aa9f8b --- /dev/null +++ b/port_versions/t-/tensorflow.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b6ac5c291afa1274c50ac9e1ff3010da0fbb6e36", + "version-string": "2.3.1", + "port-version": 1 + }, + { + "git-tree": "6792c934dd6fb9c4623682646f4ed522fb51b376", + "version-string": "2.3.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/termcolor.json b/port_versions/t-/termcolor.json new file mode 100644 index 00000000000000..447b7fb0dde169 --- /dev/null +++ b/port_versions/t-/termcolor.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0f9f8a1daeb0ba36dc2333e9d7a99a8da3cf0a78", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tesseract.json b/port_versions/t-/tesseract.json new file mode 100644 index 00000000000000..f6cec1d56e89dd --- /dev/null +++ b/port_versions/t-/tesseract.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "118674017f17f5289563c3b07f4fe5403d508151", + "version-string": "4.1.1", + "port-version": 5 + }, + { + "git-tree": "15c020ecaf34ec7674885763ce7d0f16542307ec", + "version-string": "4.1.1", + "port-version": 3 + }, + { + "git-tree": "4b03ddec4f4b912ccdcf1d1b727c4bbc8cfee314", + "version-string": "4.1.1", + "port-version": 2 + }, + { + "git-tree": "8e17c6bb13f4a44a318d6a4196fa183a8229afe6", + "version-string": "4.1.1", + "port-version": 1 + }, + { + "git-tree": "d0ecae1f157ef7b6dc63e6e00166eca1bd04f8b6", + "version-string": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "04a14f45042b5898562ce306cd4c7c411e06bf0a", + "version-string": "4.1.0-4", + "port-version": 0 + }, + { + "git-tree": "a408194911c08fb09c534d735487b86a25995afa", + "version-string": "4.1.0-3", + "port-version": 0 + }, + { + "git-tree": "b0e61221d6c2f9c10d25bcb8b3850c1d948dc987", + "version-string": "4.1.0-2", + "port-version": 0 + }, + { + "git-tree": "406806e8c72da240d1db401528fe1dff2712ceba", + "version-string": "4.1.0-1", + "port-version": 0 + }, + { + "git-tree": "7cca35bf76ccf8943e2750b6a349a08e89fbab4b", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "9f45589be21f2e066766f153985998450ec45fd2", + "version-string": "4.0.0-3", + "port-version": 0 + }, + { + "git-tree": "650995bca73866bc9c95b49c76e14c503093d153", + "version-string": "4.0.0-2", + "port-version": 0 + }, + { + "git-tree": "13f77fbe57914579e8012e009b05c32d7bfd5151", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "f4598ea017b630bc00b528c68225b23de2497bb2", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "eaca2565907fbff8eb754dd414d66f95512cafd4", + "version-string": "3.05.02", + "port-version": 0 + }, + { + "git-tree": "8494e5ba71cdc94ea643b87248f3a57df484a580", + "version-string": "3.05.01-3", + "port-version": 0 + }, + { + "git-tree": "7035a128db5e3b1a04ce062e617d89cebdcf375c", + "version-string": "3.05.01-2", + "port-version": 0 + }, + { + "git-tree": "b637acdf1c59c43d8ce52af5be2db477f5f71bce", + "version-string": "3.05.01-1", + "port-version": 0 + }, + { + "git-tree": "cbcc234e5adb2932d4c09235d4c2daccc19bf8e7", + "version-string": "3.05.01", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tfhe.json b/port_versions/t-/tfhe.json new file mode 100644 index 00000000000000..6f952afd33463c --- /dev/null +++ b/port_versions/t-/tfhe.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ee11a6e5e9e756c531b78822f6465a4b43dc048e", + "version-string": "1.0.1-1", + "port-version": 0 + }, + { + "git-tree": "71d55349c7e885618b88ee5177148a1b2987efea", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tgbot-cpp.json b/port_versions/t-/tgbot-cpp.json new file mode 100644 index 00000000000000..b62f1d0a4ae414 --- /dev/null +++ b/port_versions/t-/tgbot-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ba88bbcbff36bc2411806249543cd4046d938ebd", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tgc.json b/port_versions/t-/tgc.json new file mode 100644 index 00000000000000..ad9806f121d44d --- /dev/null +++ b/port_versions/t-/tgc.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b69aab3ec83aa87c6b297a75b4f02ee68d512921", + "version-string": "2019-08-11-1", + "port-version": 0 + }, + { + "git-tree": "939c552ff1e070a1cf4266549feff1b53092406b", + "version-string": "2019-08-11", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tgui.json b/port_versions/t-/tgui.json new file mode 100644 index 00000000000000..505b34bda1bb9a --- /dev/null +++ b/port_versions/t-/tgui.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "5ea44912cb8584751e303f69d686e3126c028300", + "version-string": "0.8.8", + "port-version": 0 + }, + { + "git-tree": "94508215d2c969394075af7ddc3f83dd27b1f3e0", + "version-string": "0.8.7", + "port-version": 0 + }, + { + "git-tree": "00af98576fb601d023460940b43977c0ab2318ae", + "version-string": "0.8.6", + "port-version": 0 + }, + { + "git-tree": "25fa98f6a66831f6d8f0f1f9edfbfe2ad46784c5", + "version-string": "0.8.5", + "port-version": 0 + }, + { + "git-tree": "0e099724bbc7dbbdfb027f2856bd966ab00a5b2f", + "version-string": "0.8.4-2", + "port-version": 0 + }, + { + "git-tree": "096f622bb82a2eda41de17d1fdaf31ab8a4a8d80", + "version-string": "0.8.4-1", + "port-version": 0 + }, + { + "git-tree": "32c249b470589dbebad9c60c1429252fd4218c7a", + "version-string": "0.8.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/theia.json b/port_versions/t-/theia.json new file mode 100644 index 00000000000000..ab84a7a4889a04 --- /dev/null +++ b/port_versions/t-/theia.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "6d74e7de2d80d5f3675b381e39c5fedd34493531", + "version-string": "0.8", + "port-version": 3 + }, + { + "git-tree": "881d1dad1876ac1ac89588a95070e7dcc21cff9c", + "version-string": "0.8-2", + "port-version": 0 + }, + { + "git-tree": "d6f6a07f80be40dcc23b7f887728bf89acbfa293", + "version-string": "0.8", + "port-version": 0 + }, + { + "git-tree": "98ef85c66ffddd9807fd365c050a3fd998732ff1", + "version-string": "0.7-d15154a-4", + "port-version": 0 + }, + { + "git-tree": "20c5d5f1ca4c02020d4143c58baf183fd524d22e", + "version-string": "0.7-d15154a-3", + "port-version": 0 + }, + { + "git-tree": "8922734aad943c5ca6551fba2ba55eb08dd530c4", + "version-string": "0.7-d15154a-2", + "port-version": 0 + }, + { + "git-tree": "c24f13e44f8ab6f0188fe80d263bfd2b5fa3c83f", + "version-string": "0.7-d15154a-1", + "port-version": 0 + }, + { + "git-tree": "ab972b58b4222c8efedd2caa93b84c15e445de6b", + "version-string": "0.7-d15154a", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/think-cell-range.json b/port_versions/t-/think-cell-range.json new file mode 100644 index 00000000000000..80ca3c39e7d6fd --- /dev/null +++ b/port_versions/t-/think-cell-range.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "b1c80aab0470d03d5f336f15283beec17f3a3bfc", + "version-string": "498839d-1", + "port-version": 0 + }, + { + "git-tree": "f92db27a90b9e9cccab9e26070636e2cd2e7a288", + "version-string": "498839d", + "port-version": 0 + }, + { + "git-tree": "93a8c61b8b35fc8509a7332f010ba0aa0fbc1849", + "version-string": "e2d3018", + "port-version": 0 + }, + { + "git-tree": "4d19aa5a142294b7d0758dded27e46a7337a3c2c", + "version-string": "1d785d9", + "port-version": 0 + }, + { + "git-tree": "db13bfd7913485c6c164215bbb3da8f9c474abc4", + "version-string": "61e184a", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/thor.json b/port_versions/t-/thor.json new file mode 100644 index 00000000000000..d110348ab32cfe --- /dev/null +++ b/port_versions/t-/thor.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "99d8374185d4ab57f61811b3d65a2c542a8ad42e", + "version-string": "2.0-3", + "port-version": 0 + }, + { + "git-tree": "8940c531632de6e5b799a9f591547f9ad574e66d", + "version-string": "2.0-2", + "port-version": 0 + }, + { + "git-tree": "c9295a4a677858845acd87b0507d50e8a3916759", + "version-string": "2.0-1", + "port-version": 0 + }, + { + "git-tree": "7737d43763434bb569e377979d5b2deaf5d3886c", + "version-string": "v2.0-1", + "port-version": 0 + }, + { + "git-tree": "4ab767e31876f9932a3407d489eb88ca6ef74fac", + "version-string": "v2.0", + "port-version": 0 + }, + { + "git-tree": "e8016d5b3303689bd19a8642b240462f44a7f0d6", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/threadpool.json b/port_versions/t-/threadpool.json new file mode 100644 index 00000000000000..3090b34f37816b --- /dev/null +++ b/port_versions/t-/threadpool.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4a34cd691a72f01753a152d484648d8bd885dfb8", + "version-string": "0.2.5", + "port-version": 1 + } + ] +} diff --git a/port_versions/t-/thrift.json b/port_versions/t-/thrift.json new file mode 100644 index 00000000000000..ae23598c521e15 --- /dev/null +++ b/port_versions/t-/thrift.json @@ -0,0 +1,239 @@ +{ + "versions": [ + { + "git-tree": "752af13152a5b5c98e64bc1beeec974befbbb5b9", + "version-string": "0.13.0", + "port-version": 0 + }, + { + "git-tree": "6b57f152f3f668077869adf0aebca5195d506cf8", + "version-string": "2020-02-08", + "port-version": 0 + }, + { + "git-tree": "104d954ed2ece17264b398271baab11e10e712b7", + "version-string": "2019-05-07-4", + "port-version": 0 + }, + { + "git-tree": "b6806b8af63b0feea5eb9b4936b5f5ba2c526746", + "version-string": "2019-05-07-3", + "port-version": 0 + }, + { + "git-tree": "04220d3e24deb51f65908368a389c4ffdbe0bc13", + "version-string": "2019-05-07-2", + "port-version": 0 + }, + { + "git-tree": "9c2222ba168c79df5c5552c15b2c152259fba6dd", + "version-string": "2019-05-07-1", + "port-version": 0 + }, + { + "git-tree": "653ca1ea020cec47dd1062f5a5b7dc3f192e93f4", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "e13ba4ac62022169ba8f18a2437cbf55757aa89f", + "version-string": "2019-04-19-1", + "port-version": 0 + }, + { + "git-tree": "095c603f9384cf77cee98bdb7ff76be40e2a44f7", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "57b5fb7a3bd45ca90653df53d20a6ea50e377827", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "2a40141c6142826e37657ba2c326e2fc1d32b1ea", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "2c8021c0da070f1ce3d3d0296a0057cb97ba4d91", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "d9022a3f71fec558bfe4883a7ce457c44d09891f", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "afbf7d7c2168568a30598e1686bff3a69eed040f", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "713f22569cdc21b1ae7fef92a3ff61b2dc4c1300", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "91c35b354b054278f58d4a143131134484540c88", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "6f37256dacb292b01431b7f49bb73ce71b3d12c2", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "916494f6bf8cf490a990c06f80f48847c81697ef", + "version-string": "2018-08-03", + "port-version": 0 + }, + { + "git-tree": "f1f854af9606471689c4c7758d50b2ef5fda0ed4", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "28adb1df1f26bde81084751c9de0af6a49e99d5d", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "36e96a8ccbc95a6a4f5be1c0e5bb448fe88f77ff", + "version-string": "2018-07-03", + "port-version": 0 + }, + { + "git-tree": "c13cef67c0079fb2c97c07c1a12edb662090780c", + "version-string": "2018-06-28", + "port-version": 0 + }, + { + "git-tree": "3498e893f813218ea509e2c24b5c36f25f42edca", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "c25252ab47bf10bb34d7e4c0be3e5e6bef146ca7", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "c02c4b6e41c648f7f4f38a07ab08962b972ddb8a", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "c28c3d884a80d5d85fd5e6ff0b5c52e65b1f9553", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "75c1cde8ecf44ebed82ce7596e555ed2d551ef1d", + "version-string": "2018-04-17", + "port-version": 0 + }, + { + "git-tree": "3f577c81f89c2055d7c161929dbcccf80876c9c8", + "version-string": "2018-04-09", + "port-version": 0 + }, + { + "git-tree": "979e0bd6c6cf52c8217c2fdefd46592efebd0d5f", + "version-string": "2018-04-06", + "port-version": 0 + }, + { + "git-tree": "508a2cbc4f09ccb816d70d0227cb94401ac91142", + "version-string": "2018-04-05", + "port-version": 0 + }, + { + "git-tree": "a49647e7e6e4996bc8a32d1fc8c75fa6fe760ba3", + "version-string": "2018-04-02", + "port-version": 0 + }, + { + "git-tree": "a380bdd29434cae93500476a399123f1405ec193", + "version-string": "2018-03-30", + "port-version": 0 + }, + { + "git-tree": "f53bf793f59991866e37b1b895ce222dcec94643", + "version-string": "2018-03-29", + "port-version": 0 + }, + { + "git-tree": "3d8ae89e575cc0e45eaa5c72c9401ed9bd447a16", + "version-string": "2018-03-23", + "port-version": 0 + }, + { + "git-tree": "6cb148aa10cd786cf68c569313a5aea4bafea1b9", + "version-string": "2018-03-20", + "port-version": 0 + }, + { + "git-tree": "f45ffb6b0a6d36eea43aa6a4f0a38fb066571a6c", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "dad9a3624875382b976d58e6592921425d35bfe2", + "version-string": "2018-03-14", + "port-version": 0 + }, + { + "git-tree": "1c47e9c390f9bfdc3ba36b6ea74fbcba8634e510", + "version-string": "2018-03-13", + "port-version": 0 + }, + { + "git-tree": "7f411195ca4ceb0cb5f9c3f507729db736cae59a", + "version-string": "2018-03-11", + "port-version": 0 + }, + { + "git-tree": "73f191264b1e3ac829f59d51f2fded4e071aebcd", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "4f89b3aad1ffeb25e5705475cdc69651b924ba4f", + "version-string": "2018-03-02", + "port-version": 0 + }, + { + "git-tree": "e409def7a1a6599f0f39c272c940ffe53d3ca6b1", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "98f395cf2fd0fa49669e923fa2daab919b2807a6", + "version-string": "20172805-72ca60debae1d9fb35d9f0085118873669006d7f-2", + "port-version": 0 + }, + { + "git-tree": "e77c1a6c2c292c1faf5fbe4ad1875d6478d1a981", + "version-string": "20172805-72ca60debae1d9fb35d9f0085118873669006d7f-1", + "port-version": 0 + }, + { + "git-tree": "b861282e3a4d6083badda4963b1adba1ad71485c", + "version-string": "20172805-72ca60debae1d9fb35d9f0085118873669006d7f", + "port-version": 0 + }, + { + "git-tree": "365cca923c49c2d81c09ce5f419bcf8a8b8201ab", + "version-string": "latest", + "port-version": 0 + }, + { + "git-tree": "4b88a19730cf146bb096cf4d4ffd18e621cabb5f", + "version-string": "0.10.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tidy-html5.json b/port_versions/t-/tidy-html5.json new file mode 100644 index 00000000000000..7b192ae1468a74 --- /dev/null +++ b/port_versions/t-/tidy-html5.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "b050c4d466a093f1322998c0c2c356698954bc40", + "version-string": "5.7.28-2", + "port-version": 0 + }, + { + "git-tree": "3bf8e46176d46eb4f2257eae9125e0f3b7d4e14d", + "version-string": "5.7.28-1", + "port-version": 0 + }, + { + "git-tree": "2fd4ec0db75ada0702deee02df23d08760decd1e", + "version-string": "5.7.28", + "port-version": 0 + }, + { + "git-tree": "d044424f994b97e93466cc4d0f8e5de145452cd9", + "version-string": "5.6.0-1", + "port-version": 0 + }, + { + "git-tree": "81b0263817c84a34e56920ba932f10ad23c07427", + "version-string": "5.6.0", + "port-version": 0 + }, + { + "git-tree": "954df61d2f7aac784611519277c395fc9e26007f", + "version-string": "5.4.0-2", + "port-version": 0 + }, + { + "git-tree": "9536522198412a2c1a5dae3522e4ec50add7b9c4", + "version-string": "5.4.0-1", + "port-version": 0 + }, + { + "git-tree": "f67593b0a7ff5dba6d5aa76743d9ac64f6a02d09", + "version-string": "5.4.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tiff.json b/port_versions/t-/tiff.json new file mode 100644 index 00000000000000..0a4bb5b3c50226 --- /dev/null +++ b/port_versions/t-/tiff.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "c2beac2991ae6df4dfeaf0a3b158092a78128214", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "e5df73e6c5b448c0ea2ee340b7c661a082258d30", + "version-string": "4.0.10-9", + "port-version": 0 + }, + { + "git-tree": "153be71da50b833194c064817f9306ebd7c5805b", + "version-string": "4.0.10-8", + "port-version": 0 + }, + { + "git-tree": "f09f45c8eea424b9fa710d138eb4a64bc832f5db", + "version-string": "4.0.10-7", + "port-version": 0 + }, + { + "git-tree": "5ec448310ac13771453e8857a86056e777a4883a", + "version-string": "4.0.10-6", + "port-version": 0 + }, + { + "git-tree": "d9db8910654080beb48043345bb1c2f4719da3ab", + "version-string": "4.0.10-4", + "port-version": 0 + }, + { + "git-tree": "33c4988d8babe92fd70a6b7e678ce1e3e0854b67", + "version-string": "4.0.10-3", + "port-version": 0 + }, + { + "git-tree": "30257e641841d0d8565e578f2f3a9266c8b8ad29", + "version-string": "4.0.10-2", + "port-version": 0 + }, + { + "git-tree": "11475b04dbdc067e7f9cf4f61fcc1000ed1b4faf", + "version-string": "4.0.10-1", + "port-version": 0 + }, + { + "git-tree": "481049cb905d331999b8bfb8cec7ebade22fe929", + "version-string": "4.0.10", + "port-version": 0 + }, + { + "git-tree": "65d279c98eb2b0dd92a8b2797b2aa992b38b27bc", + "version-string": "4.0.9-6", + "port-version": 0 + }, + { + "git-tree": "b5b1f2a0232d639564d4be206b31e73ce0b3dbd6", + "version-string": "4.0.9-5", + "port-version": 0 + }, + { + "git-tree": "3cbbcd0a6249276fdc5e6f554ef0f6e9b7145993", + "version-string": "4.0.9-4", + "port-version": 0 + }, + { + "git-tree": "71d484d55a6de4253fc5e4636dd8c9306ea135a2", + "version-string": "4.0.9", + "port-version": 0 + }, + { + "git-tree": "7f19440a20d0e54d202fbbaea95daae7a7e74b26", + "version-string": "4.0.8-1", + "port-version": 0 + }, + { + "git-tree": "88291d9174e7b5039f8f62ac364ec349ecdda5ba", + "version-string": "4.0.8", + "port-version": 0 + }, + { + "git-tree": "eaede4321e13e90676fe642e677e130abed069cd", + "version-string": "4.0.7", + "port-version": 0 + }, + { + "git-tree": "a3db04f188ed15291a02d0a622d4a9024be46dea", + "version-string": "4.0.6-3", + "port-version": 0 + }, + { + "git-tree": "b128eaa0d0139a80ab0d231c2e7467f2e6a14ed5", + "version-string": "4.0.6-2", + "port-version": 0 + }, + { + "git-tree": "b23a4634f78d758ca29842dcaff150a0a54b7569", + "version-string": "4.0.6-1", + "port-version": 0 + }, + { + "git-tree": "c858ee0ac04243cac961f01d43203811473af097", + "version-string": "4.0.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinkerforge.json b/port_versions/t-/tinkerforge.json new file mode 100644 index 00000000000000..e34cd1cf1335a2 --- /dev/null +++ b/port_versions/t-/tinkerforge.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "89d1c3d2cdeef8dfd9d9a36a12461d1994094de0", + "version-string": "2.1.25", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tiny-aes-c.json b/port_versions/t-/tiny-aes-c.json new file mode 100644 index 00000000000000..44e769d773091a --- /dev/null +++ b/port_versions/t-/tiny-aes-c.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b5a8d85f99c004b3a88f910e02cf53411fed45d8", + "version-string": "2019-07-31", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tiny-bignum-c.json b/port_versions/t-/tiny-bignum-c.json new file mode 100644 index 00000000000000..69ddcf56f88cda --- /dev/null +++ b/port_versions/t-/tiny-bignum-c.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "46dd3471154a21dd430e36e7d0ab56c33f76211e", + "version-string": "2019-07-31", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tiny-dnn.json b/port_versions/t-/tiny-dnn.json new file mode 100644 index 00000000000000..e0921f437d8a0d --- /dev/null +++ b/port_versions/t-/tiny-dnn.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "7640751d4d50df9abb088cd6de1b397694fd6478", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "7ce0972fcf1195fcc78e85347f0a8a305288fe5d", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "54c13f7ee646474c05e3411978ba113fc322bdc8", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "0abe0d97368c4d70cb357be5d9132f6406b99ec2", + "version-string": "2018-03-13", + "port-version": 0 + }, + { + "git-tree": "d84835f4a8edd50245c4ecaf06ff4d94dba4e756", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "17e1512471c9602c2fda04a13a2dec518badea9b", + "version-string": "2018-02-25-1", + "port-version": 0 + }, + { + "git-tree": "b18098bb81ed7fa78d1e4666a9ee20f94ee0e414", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "1ae1c19dfdceaf3c61345faa9e7310474e6a5d4f", + "version-string": "2017-10-09-dd906fed8c8aff8dc837657c42f9d55f8b793b0e", + "port-version": 0 + }, + { + "git-tree": "caa13d590bc77e01e7c9f3d04cc88f13e622dc92", + "version-string": "1.10.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tiny-process-library.json b/port_versions/t-/tiny-process-library.json new file mode 100644 index 00000000000000..b407472f3fdd0c --- /dev/null +++ b/port_versions/t-/tiny-process-library.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "79863f6d064fb7200c1202261335bd5a131133c0", + "version-string": "2.0.4", + "port-version": 0 + }, + { + "git-tree": "aa30c69208d36bbc0afe7b89d1c4c64734abc5f1", + "version-string": "2018-12-06", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tiny-regex-c.json b/port_versions/t-/tiny-regex-c.json new file mode 100644 index 00000000000000..65f062c723c947 --- /dev/null +++ b/port_versions/t-/tiny-regex-c.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1086a34a4532ba8a47cd1d5514f9fddd83e52961", + "version-string": "2019-07-31", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinycthread.json b/port_versions/t-/tinycthread.json new file mode 100644 index 00000000000000..2adeeac578df6f --- /dev/null +++ b/port_versions/t-/tinycthread.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3957c392b150baa9436be2c25fa65af28dab3ee2", + "version-string": "2019-08-06", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinydir.json b/port_versions/t-/tinydir.json new file mode 100644 index 00000000000000..6ac26f83acf4f7 --- /dev/null +++ b/port_versions/t-/tinydir.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "713b509a8613d83a0b9a472896995f5b17e6c530", + "version-string": "1.2.4", + "port-version": 0 + }, + { + "git-tree": "b483622e9f12fa9cb9004c22345936c10b69e4ed", + "version-string": "1.2.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinyexif.json b/port_versions/t-/tinyexif.json new file mode 100644 index 00000000000000..a6777c6ebd29e8 --- /dev/null +++ b/port_versions/t-/tinyexif.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "c74a09bb37bbdd9e5228c6b694ec84bbd59d6d62", + "version-string": "1.0.2-6", + "port-version": 0 + }, + { + "git-tree": "13552361e2583e58e1ece1fb6c135210b55a05de", + "version-string": "1.0.2-5", + "port-version": 0 + }, + { + "git-tree": "379f4d84c35c48ae6082c253fbf7e55f20eb6a7b", + "version-string": "1.0.2-4", + "port-version": 0 + }, + { + "git-tree": "887df694ce2c251fa2512446462bc1172d729d57", + "version-string": "1.0.2-2", + "port-version": 0 + }, + { + "git-tree": "ea5f90f1bf0f572376a97cf9a2ae73b8bf430d16", + "version-string": "1.0.2-1", + "port-version": 0 + }, + { + "git-tree": "667ae1a1faae3c288e60a747d646b16b5dbef0c6", + "version-string": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "88573f93e85a2b6da6951c35dfec04ef776bf1a7", + "version-string": "1.0.1-2", + "port-version": 0 + }, + { + "git-tree": "e73c4a7d1bd5db6ab9f72116cd76fa651d9e49b2", + "version-string": "1.0.1-1", + "port-version": 0 + }, + { + "git-tree": "dc639206f6251a246e0612f94e752df4b0799365", + "version-string": "1.0.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinyexpr.json b/port_versions/t-/tinyexpr.json new file mode 100644 index 00000000000000..90007821bc7e7d --- /dev/null +++ b/port_versions/t-/tinyexpr.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4f78e1f22bf3575efef5cab61cd1c7d70049c12c", + "version-string": "2020-09-25", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinyexr.json b/port_versions/t-/tinyexr.json new file mode 100644 index 00000000000000..1c45ea800cd771 --- /dev/null +++ b/port_versions/t-/tinyexr.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b230e702351b9e07a6128a062e21ef06957a58ef", + "version-string": "2020-03-15", + "port-version": 0 + }, + { + "git-tree": "37e94fe2a31418c5ac6423809560c0403db5bdf6", + "version-string": "0.9.5-d16ea6-1", + "port-version": 0 + }, + { + "git-tree": "1e0e5f215e5c6d44b105fd40ea3f97e756117f36", + "version-string": "0.9.5-d16ea6", + "port-version": 0 + }, + { + "git-tree": "d56a748b8e2c277780b361b5929851e6121e08bb", + "version-string": "v0.9.5-d16ea6", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinyfiledialogs.json b/port_versions/t-/tinyfiledialogs.json new file mode 100644 index 00000000000000..eaa56f77cb101c --- /dev/null +++ b/port_versions/t-/tinyfiledialogs.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "8cafa08c2b7e1d04e3a4e8bbc15271c33d9699e3", + "version-string": "3.6.3", + "port-version": 0 + }, + { + "git-tree": "6c827ed90c6566a072a8b47ec203967c6e41373f", + "version-string": "3.4.3-3", + "port-version": 0 + }, + { + "git-tree": "c358c59409ce238e78e198a7dbcbc5e57990b34e", + "version-string": "3.4.3-2", + "port-version": 0 + }, + { + "git-tree": "ac6afa97ea32c47a54bb835c75a591b4bdbfde83", + "version-string": "3.4.3-1", + "port-version": 0 + }, + { + "git-tree": "ba928d50fd41270c1e08fdb5e704cce8526322c5", + "version-string": "3.4.3", + "port-version": 0 + }, + { + "git-tree": "2d1d4d29940d1e2811b954a4f760ab1a45ab192e", + "version-string": "3.3.8-1", + "port-version": 0 + }, + { + "git-tree": "666560338697f023ad854de15934b06fc2a267a4", + "version-string": "3.3.8", + "port-version": 0 + }, + { + "git-tree": "05d3a918d0228e759114d76965b30331dec18d5b", + "version-string": "3.3.7-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinygltf.json b/port_versions/t-/tinygltf.json new file mode 100644 index 00000000000000..199f789396750b --- /dev/null +++ b/port_versions/t-/tinygltf.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a81aa48035ba08138ce76fff8d000052332604ae", + "version-string": "2020-07-28", + "port-version": 0 + }, + { + "git-tree": "ae04ec7cf00c7368ba9dbaf354d144701f2557b9", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinynpy.json b/port_versions/t-/tinynpy.json new file mode 100644 index 00000000000000..0d58d4baa57db4 --- /dev/null +++ b/port_versions/t-/tinynpy.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1aaad761b70ba86a1c925f1180afa3d10ca9e8b4", + "version-string": "1.0.0-3", + "port-version": 0 + }, + { + "git-tree": "7f268addfa76deee0c15483680cb528fc773c0d5", + "version-string": "1.0.0-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinyobjloader.json b/port_versions/t-/tinyobjloader.json new file mode 100644 index 00000000000000..ef53cfb9614935 --- /dev/null +++ b/port_versions/t-/tinyobjloader.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "2114ea39f1654e929f31def392889f0aee7fb3de", + "version-string": "2.0.0-rc2", + "port-version": 0 + }, + { + "git-tree": "7ecc2fc7f1aa6fd35690a36992fcbcfb8c3cf128", + "version-string": "1.0.7-1", + "port-version": 0 + }, + { + "git-tree": "6176a3339d4b5fef85e48dc96582a78234c0250f", + "version-string": "1.0.7", + "port-version": 0 + }, + { + "git-tree": "169e183ff3aa1d70236dd5c5418f6a3c4f8e4904", + "version-string": "1.4.1-1", + "port-version": 0 + }, + { + "git-tree": "3a346255f98d5b6b2de7871c6ce6ad488bee3214", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "16a81e4715b9c75b776fa66a9a5243b1c4af978f", + "version-string": "1.2.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinyply.json b/port_versions/t-/tinyply.json new file mode 100644 index 00000000000000..b5c295d6f59a3d --- /dev/null +++ b/port_versions/t-/tinyply.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "461112c3d4ddfe5ddb6cb05765454f3c457873f4", + "version-string": "2020-05-22", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinyspline.json b/port_versions/t-/tinyspline.json new file mode 100644 index 00000000000000..952a43b5e984d0 --- /dev/null +++ b/port_versions/t-/tinyspline.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b75d189b7025f885588d489e83cd5b97eee35a5b", + "version-string": "0.2.0-3", + "port-version": 0 + }, + { + "git-tree": "2e56a97916e5a864927ebe5e35494f74606f3e5f", + "version-string": "0.2.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinythread.json b/port_versions/t-/tinythread.json new file mode 100644 index 00000000000000..6181db6171bf4d --- /dev/null +++ b/port_versions/t-/tinythread.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "fcf55a788b7bc0d3067c726c3224bc5a3fc3c304", + "version-string": "1.1-3", + "port-version": 0 + }, + { + "git-tree": "eac4d7ebe29132433acacd434cf3fdc10fb45b57", + "version-string": "1.1-2", + "port-version": 0 + }, + { + "git-tree": "7931f656d35d75f38241ce9450bd443c80a24a24", + "version-string": "1.1-1", + "port-version": 0 + }, + { + "git-tree": "5220b67433a6b813c60f9ff38d214e5202220d2a", + "version-string": "1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinytoml.json b/port_versions/t-/tinytoml.json new file mode 100644 index 00000000000000..300473cc9b55dd --- /dev/null +++ b/port_versions/t-/tinytoml.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "787ecedb400a621f68e63a6000aee5d0a4890a55", + "version-string": "20180219-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinyutf8.json b/port_versions/t-/tinyutf8.json new file mode 100644 index 00000000000000..3eb83bdf44f05b --- /dev/null +++ b/port_versions/t-/tinyutf8.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "da8a71ca817c591c31df0c318f199c0056cbcc2c", + "version-string": "4.0.2", + "port-version": 0 + }, + { + "git-tree": "20298c1e28b52e0a273de4ff4f7466f9479bf7e3", + "version-string": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "c41cbfc3a39f1530b2c81a0190c332f17de561f7", + "version-string": "3", + "port-version": 0 + }, + { + "git-tree": "5dae61ac4b4d8c72a263c2e506dc72baaa8f07ad", + "version-string": "2.2", + "port-version": 0 + }, + { + "git-tree": "02205d527ea12507d26d3b831f0071e77a990f60", + "version-string": "2.1.1-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinyxml.json b/port_versions/t-/tinyxml.json new file mode 100644 index 00000000000000..601a618dfea05f --- /dev/null +++ b/port_versions/t-/tinyxml.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "3c0dd9fb8a99d226d863eba951e54d40449c3c84", + "version-string": "2.6.2-7", + "port-version": 0 + }, + { + "git-tree": "cec0727a2f6469b38be27c65a099b5a2a1f15479", + "version-string": "2.6.2-5", + "port-version": 0 + }, + { + "git-tree": "ecd45d0f90319e1038b023c72139eb5fa88fca5f", + "version-string": "2.6.2-4", + "port-version": 0 + }, + { + "git-tree": "63fff417215bce1c362be10d9a0c82649b83cbb8", + "version-string": "2.6.2-3", + "port-version": 0 + }, + { + "git-tree": "55fa76efb6610496376ca33fd3842ddb9f464a40", + "version-string": "2.6.2-2", + "port-version": 0 + }, + { + "git-tree": "2eee11cd59e0749a9e209ea087bfd28d3eb44bc9", + "version-string": "2.6.2-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tinyxml2.json b/port_versions/t-/tinyxml2.json new file mode 100644 index 00000000000000..15bddec91edd6e --- /dev/null +++ b/port_versions/t-/tinyxml2.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "5bc723c583463d1e50ff6dcf0131328759371eeb", + "version-string": "8.0.0-1", + "port-version": 0 + }, + { + "git-tree": "fee03c61d547a2afac222f6e9ccd9e266a068531", + "version-string": "8.0.0", + "port-version": 0 + }, + { + "git-tree": "7294b585da5d53fb20b5f00767c86af62821a91e", + "version-string": "7.1.0", + "port-version": 0 + }, + { + "git-tree": "3b793c2a1b8911f98c358d4f86b86f3394b9d10a", + "version-string": "7.0.1-2", + "port-version": 0 + }, + { + "git-tree": "ca5b2e3f1a1e071088a8cf6b2fb58476a1171ca1", + "version-string": "7.0.1-1", + "port-version": 0 + }, + { + "git-tree": "e3134ebc61721ea449ac15ab47b2b33363722b9d", + "version-string": "7.0.1", + "port-version": 0 + }, + { + "git-tree": "5e7b3d1960e7e830397f6960d8952cfd536f1341", + "version-string": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "34a39f88bdbfe177229b575c910e3f193098f870", + "version-string": "6.0.0-2", + "port-version": 0 + }, + { + "git-tree": "583670cefca3baa80fffa6ecf06e8abc891161c8", + "version-string": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "bf9714823b0580f1f637928445d8f8553a79467f", + "version-string": "5.0.1-1", + "port-version": 0 + }, + { + "git-tree": "62be736bc18bb970c8fd34ea78766fc507f78fff", + "version-string": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "d422b09579699139da110a843e70650587a425b9", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "02bbf6dbd7a928d06d631b75fa7b6b6c7c6d10e6", + "version-string": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tl-expected.json b/port_versions/t-/tl-expected.json new file mode 100644 index 00000000000000..43f134c657a1ea --- /dev/null +++ b/port_versions/t-/tl-expected.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "3b51d7b17e6db2b606e1d070d6e8f32c07c1a903", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "f157847fd14ac0cb91c069cb604d55bb8489a7b2", + "version-string": "0.3-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tl-function-ref.json b/port_versions/t-/tl-function-ref.json new file mode 100644 index 00000000000000..5de1d679e328e9 --- /dev/null +++ b/port_versions/t-/tl-function-ref.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "848facd0f73b670581bf3e66e96dfeeb3248428c", + "version-string": "1.0.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tl-optional.json b/port_versions/t-/tl-optional.json new file mode 100644 index 00000000000000..7c0ed2a18630fc --- /dev/null +++ b/port_versions/t-/tl-optional.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "543d9b23441ec80d00a537705e03e4fb45af0334", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "2eda278bab2086fae9d050179170e456c285cc7a", + "version-string": "0.5-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tlx.json b/port_versions/t-/tlx.json new file mode 100644 index 00000000000000..95d1f149ec901f --- /dev/null +++ b/port_versions/t-/tlx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ccbe4ed982fe5878feba3a77569688cf7af552a2", + "version-string": "0.5.20191212", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tmx.json b/port_versions/t-/tmx.json new file mode 100644 index 00000000000000..d08e772367a28a --- /dev/null +++ b/port_versions/t-/tmx.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "400a9748b46a05c705aa53ea5cd7147f0f95e6c7", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "01cf76bb0b88eca86f82b728b15f4ffd0212a2f9", + "version-string": "1.0.0", + "port-version": 2 + }, + { + "git-tree": "8190e20f8693bc362fe2cc6f30045a2e4c09b68d", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "08641f22fac86c1ed2e6ab437cd02c55f17c7ba8", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tmxlite.json b/port_versions/t-/tmxlite.json new file mode 100644 index 00000000000000..7f85fdeb88ce9e --- /dev/null +++ b/port_versions/t-/tmxlite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ebc24944bd55409160b5fa863f69d59877e2d1a8", + "version-string": "2019-03-05", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tmxparser.json b/port_versions/t-/tmxparser.json new file mode 100644 index 00000000000000..ad20779c633072 --- /dev/null +++ b/port_versions/t-/tmxparser.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "481cfb5fee00fa7787dabbec0e77cbf884645816", + "version-string": "2.1.0-4", + "port-version": 0 + }, + { + "git-tree": "59309efb7ad883a7fd1ddce95369c38c29c60c5e", + "version-string": "2.1.0-3", + "port-version": 0 + }, + { + "git-tree": "ca0cbad617693d3827c4fa352ec258bdb7813a84", + "version-string": "2.1.0-2", + "port-version": 0 + }, + { + "git-tree": "b6d412fc324a32ff333da49af59ed329a3afe891", + "version-string": "2.1.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/toml11.json b/port_versions/t-/toml11.json new file mode 100644 index 00000000000000..ed419f9bf858ff --- /dev/null +++ b/port_versions/t-/toml11.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "5e58833d3ad983b69e8e0510e1bd3f27df685fbf", + "version-string": "3.5.0", + "port-version": 1 + }, + { + "git-tree": "399772251a31bf6487c66d9847e21f7d9c53a363", + "version-string": "3.5.0", + "port-version": 0 + }, + { + "git-tree": "252b0cd5152f074ab0f768f10e7fe06d894dcbc3", + "version-string": "3.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tomlplusplus.json b/port_versions/t-/tomlplusplus.json new file mode 100644 index 00000000000000..4c39543f3cf730 --- /dev/null +++ b/port_versions/t-/tomlplusplus.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "68e42fded6663929a501cfa1a276df3a0e369ebd", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "8c6d8b1ddce9806229e0779d55bce0cb40b4ea61", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "0930fd6f40db58c9f92441ba8d7b807e510e99f5", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "d69ba5f3477ce1a9f88812dfaeb3ba03d85d5cc8", + "version-string": "1.3.0-3", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tool-meson.json b/port_versions/t-/tool-meson.json new file mode 100644 index 00000000000000..f340d2836eb10b --- /dev/null +++ b/port_versions/t-/tool-meson.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "3e9b57e374c062aa7a2b863b4c6a5d4e971da7c1", + "version-string": "0.56.02", + "port-version": 0 + }, + { + "git-tree": "4612ac2ee155a026179060815646ab2fdaf67b3d", + "version-string": "0.56.01", + "port-version": 0 + }, + { + "git-tree": "57142be41cf432aa01a5ce5a9cff2c76706e82fa", + "version-string": "0.56.0", + "port-version": 0 + }, + { + "git-tree": "cefcbe950142097d62086832eed79b13afd2c834", + "version-string": "0.55.3", + "port-version": 0 + }, + { + "git-tree": "3bb6fd2111e6ca07c66160e3e76f094f759495b4", + "version-string": "0.55.1", + "port-version": 0 + }, + { + "git-tree": "8fabbf44b36be3b82e8f44f2821b9a6e65a0bd5f", + "version-string": "0.54.2", + "port-version": 0 + }, + { + "git-tree": "f375fa55ef0db19c1672c9262c967bde3c2e0b8b", + "version-string": "0.53.2", + "port-version": 0 + }, + { + "git-tree": "1b2d58beb93c17eff9b667f688603bc74d93955f", + "version-string": "0.52.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/torch-th.json b/port_versions/t-/torch-th.json new file mode 100644 index 00000000000000..207291d1776dce --- /dev/null +++ b/port_versions/t-/torch-th.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "803c42d38d110be4bdde22843088fca604e1879e", + "version-string": "2019-04-19-2", + "port-version": 0 + }, + { + "git-tree": "f7e9fc59ddbad9443851f833a4adc15e35759514", + "version-string": "2019-04-19-1", + "port-version": 0 + }, + { + "git-tree": "11619659a6fa2607cdf4740ce9244400887ec731", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "3514e7f730af6b116fd9c36e5574f5c40a3975e6", + "version-string": "2018-07-03", + "port-version": 0 + }, + { + "git-tree": "8805d0261fb08fd4a8c1bc6c54ba968dbf73bc56", + "version-string": "20180131-89ede3ba90c906a8ec6b9a0f4bef188ba5bb2fd8-2", + "port-version": 0 + }, + { + "git-tree": "3b82020d1919842abf4d057c09f49e0d20650b7f", + "version-string": "20180131-89ede3ba90c906a8ec6b9a0f4bef188ba5bb2fd8-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/trantor.json b/port_versions/t-/trantor.json new file mode 100644 index 00000000000000..fc225ffc3bdbcb --- /dev/null +++ b/port_versions/t-/trantor.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "0df63258899007bb9f8fa2027ab3f0b3a3807251", + "version-string": "1.1.1", + "port-version": 0 + }, + { + "git-tree": "e39967f29deb43f37701d77882c1d658fe2e391f", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "6c6225b9201bb9784d6fb68e3fe846045b905516", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "738983e46a09641de4d697a809337e7bfdd68028", + "version-string": "v1.0.0-rc16", + "port-version": 0 + }, + { + "git-tree": "cfaba5da60a7c96d1bfa830ccd29312798536a75", + "version-string": "v1.0.0-rc14", + "port-version": 0 + }, + { + "git-tree": "dae412af1c79df67956645f1bd2cd006a818d5a9", + "version-string": "v1.0.0-rc13", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tre.json b/port_versions/t-/tre.json new file mode 100644 index 00000000000000..28acc8238b358b --- /dev/null +++ b/port_versions/t-/tre.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7a1459b0be7679facdc6a9afc15b1531c5f61440", + "version-string": "0.8.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/treehopper.json b/port_versions/t-/treehopper.json new file mode 100644 index 00000000000000..2328d72fe57a42 --- /dev/null +++ b/port_versions/t-/treehopper.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "a9746b7358065513f7f3ab827ab3c1c3723f194b", + "version-string": "1.11.3-4", + "port-version": 0 + }, + { + "git-tree": "996413bba31b377767d5555458473dd2585310ca", + "version-string": "1.11.3-3", + "port-version": 0 + }, + { + "git-tree": "b8241d626198df0f3bc23bc62fd3d5df630b21dc", + "version-string": "1.11.3-2", + "port-version": 0 + }, + { + "git-tree": "69830c42e71a773f3dab648803e29197b4575581", + "version-string": "1.11.3-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/triangle.json b/port_versions/t-/triangle.json new file mode 100644 index 00000000000000..7d87168ae462a5 --- /dev/null +++ b/port_versions/t-/triangle.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "818fe01f95013b057c24f63f037a102f58bcab4e", + "version-string": "1.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/trompeloeil.json b/port_versions/t-/trompeloeil.json new file mode 100644 index 00000000000000..79b164edcfc16e --- /dev/null +++ b/port_versions/t-/trompeloeil.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "494fa9278d6ca20444defeab2b2557998ec2d1d3", + "version-string": "38", + "port-version": 0 + }, + { + "git-tree": "79c2939e301583f87a67e5247bbec3b46db0fc23", + "version-string": "36", + "port-version": 0 + }, + { + "git-tree": "c6c74144cc6cbfee2bb85191513da247b004d580", + "version-string": "34-1", + "port-version": 0 + }, + { + "git-tree": "de744a8552bc4f544d7e9c3b2801b427e40728a5", + "version-string": "34", + "port-version": 0 + }, + { + "git-tree": "e4e95d160cde07e97131b787b8dbb9196d4d0d7f", + "version-string": "33", + "port-version": 0 + }, + { + "git-tree": "c7bbc1f9e769e3cd71dbc4598187fad06bd034d1", + "version-string": "32-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tsl-hopscotch-map.json b/port_versions/t-/tsl-hopscotch-map.json new file mode 100644 index 00000000000000..db60c32b9edd59 --- /dev/null +++ b/port_versions/t-/tsl-hopscotch-map.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "1f942fa0f46b5b793d8314e690a3b3c95152b2d8", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "66ae67fdaeb784ab28ca692d98b2cafd92b36bcc", + "version-string": "2.2.1-1", + "port-version": 0 + }, + { + "git-tree": "3fdf6ba5a965eb688274310167ad001c26baef43", + "version-string": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "be1cdaa5fb6494977cae2bbf9f781cb1a15fb30c", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tsl-ordered-map.json b/port_versions/t-/tsl-ordered-map.json new file mode 100644 index 00000000000000..26e07d0ce8f397 --- /dev/null +++ b/port_versions/t-/tsl-ordered-map.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "cdcfcb2f8f7444f23580a8784abfb42164fa9da0", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "63e5a2ada4c48a92fac0a0e896303c68a386a503", + "version-string": "0.8.1-1", + "port-version": 0 + }, + { + "git-tree": "fa66dade6f2c6ed4984b9db0d0fce3f91300f698", + "version-string": "0.8.1", + "port-version": 0 + }, + { + "git-tree": "edc83c82e8689adb067229a5a68f2976241e228e", + "version-string": "0.8.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tsl-sparse-map.json b/port_versions/t-/tsl-sparse-map.json new file mode 100644 index 00000000000000..2fd6de4058170a --- /dev/null +++ b/port_versions/t-/tsl-sparse-map.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "00b67cecc2ffedf1fcbbc3fdbb388e4a26a6ee72", + "version-string": "0.6.2", + "port-version": 0 + }, + { + "git-tree": "3ad636e35c26fec19c0630edbf7356dacbc2ab69", + "version-string": "0.6.1-1", + "port-version": 0 + }, + { + "git-tree": "b98d474cbe239ee5bd656d9dc36556c32dced2e1", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "d3befa681ab03334678476b107f4567b43e8b58e", + "version-string": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/turbobase64.json b/port_versions/t-/turbobase64.json new file mode 100644 index 00000000000000..f2d69c9669f560 --- /dev/null +++ b/port_versions/t-/turbobase64.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9520744942677bb6c18947e3a62d0750eae4f2dd", + "version-string": "2020-01-12", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/tweeny.json b/port_versions/t-/tweeny.json new file mode 100644 index 00000000000000..9e42e88f1bd72b --- /dev/null +++ b/port_versions/t-/tweeny.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4156972279f81599c3698722eac76c32d6f69d16", + "version-string": "3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/type-lite.json b/port_versions/t-/type-lite.json new file mode 100644 index 00000000000000..6ad8b7cc7b67b0 --- /dev/null +++ b/port_versions/t-/type-lite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "944df768435d61dedc05e968fce4ed1acaf295d4", + "version-string": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/t-/type-safe.json b/port_versions/t-/type-safe.json new file mode 100644 index 00000000000000..086a78c3a4f9b7 --- /dev/null +++ b/port_versions/t-/type-safe.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b8a081a46706947bbef195669f57707aa2a9d393", + "version-string": "0.2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/uchardet.json b/port_versions/u-/uchardet.json new file mode 100644 index 00000000000000..40dc30d1b7657b --- /dev/null +++ b/port_versions/u-/uchardet.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1e9bdf5a783f1453fd1a4330f42e7e0ca1f07eb7", + "version-string": "2020-04-26", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/umock-c.json b/port_versions/u-/umock-c.json new file mode 100644 index 00000000000000..d9fc76fd5c8da5 --- /dev/null +++ b/port_versions/u-/umock-c.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "10a9af0e9e3e4d0a7ab3a5819943e4d609677c1a", + "version-string": "2020-06-17-1", + "port-version": 0 + }, + { + "git-tree": "97a7fdde215f5c129ca102a68bd6c31fb05dc625", + "version-string": "2020-02-04.1", + "port-version": 0 + }, + { + "git-tree": "b3247368a3dd68037fa1f77de94e14e234cf16aa", + "version-string": "2020-01-22", + "port-version": 0 + }, + { + "git-tree": "27141636977218c8c9e394370759e07e001c9503", + "version-string": "2019-11-27.1", + "port-version": 0 + }, + { + "git-tree": "413299817381e00342581ecd2ad6badb98b4546c", + "version-string": "2019-10-07.2", + "port-version": 0 + }, + { + "git-tree": "043b06d9b9c58987c224353e26f03b208f5a7eed", + "version-string": "2019-07-01-LTS-1", + "port-version": 0 + }, + { + "git-tree": "76d07d1bbf56cb4c3c9ccc57cc95cc0f4a82cd2f", + "version-string": "2019-10-07.1", + "port-version": 0 + }, + { + "git-tree": "4dab55f47de9332734363419362ba25949921308", + "version-string": "2019-08-20.1", + "port-version": 0 + }, + { + "git-tree": "dea5476a79d9d42c9ea126d914d3c7f73aa1c173", + "version-string": "2019-05-16.1", + "port-version": 0 + }, + { + "git-tree": "8c524063e559683d4e74003302b2548dfbc3a157", + "version-string": "2019-05-16", + "port-version": 0 + }, + { + "git-tree": "99d6f1960217643a28d932f7c4c3e32e60b9f4cb", + "version-string": "2019-04-11-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/unicorn-lib.json b/port_versions/u-/unicorn-lib.json new file mode 100644 index 00000000000000..87c3daf48267cd --- /dev/null +++ b/port_versions/u-/unicorn-lib.json @@ -0,0 +1,129 @@ +{ + "versions": [ + { + "git-tree": "f011cbffdfdd9b295141b51bb3da0a40af0d3848", + "version-string": "2020-03-02", + "port-version": 0 + }, + { + "git-tree": "99b5a76cb6656c322be61438bd3fb568b93c0662", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "4313216ef3c4e82e1b2583643107c78cec2697f9", + "version-string": "2019-05-07-1", + "port-version": 0 + }, + { + "git-tree": "b36a4797d7f9c7e11b2636c76ad4b9d50abff0cb", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "63c249cf6334b886da805ac9966cc23279df6372", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "c536466afc253d5ea2f70d364d81fa6368c8ec2c", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "8107f600cafb184e039c89bd7dd123d4f3c2a7eb", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "902cd4216e687393979d541731e7ad8ea85b3453", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "acbdb8ce191b20574f01f380130a9c348cbdab61", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "71f1531ca89563a3ce39b78dbba5c3b156ea5d3c", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "fa02ffbeae1a2f9746b5096a3c796a9a9c2022e4", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "badf12d70902be7bb79d1501b1e32ccb15d6e75c", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "a86865469457e64c2278b043b5d0f890738470ee", + "version-string": "2018-08-03", + "port-version": 0 + }, + { + "git-tree": "f8417eb840797542d3a8652cb6bac33b1d80874e", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "2e7f0f543fe8bae291a3d6c7a4a3cc06dcb7f5db", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "d4d1c350a20ca7486330194e6c657c7846f115cc", + "version-string": "2018-07-03", + "port-version": 0 + }, + { + "git-tree": "9e775a827003998ee6c9286a071ad1315c288208", + "version-string": "2018-07-01", + "port-version": 0 + }, + { + "git-tree": "590d714833176916ec22a27db7c17c6a17d55d7c", + "version-string": "2018-06-15-1", + "port-version": 0 + }, + { + "git-tree": "55199f2938f2a6c3743c51c02533b4d7cecb3c8f", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "9c00100d7434bed2cb71d2ada632e0bb75c4c2ef", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "ec220eed95b8834c476f35a600c44b6f121e96cb", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "e0bfe76472c0fe9bce01b6e0742ca5dcaf5e753a", + "version-string": "2018-04-09", + "port-version": 0 + }, + { + "git-tree": "30afb55857df84fd893baa83129fccbaa0ae4744", + "version-string": "2018-03-13", + "port-version": 0 + }, + { + "git-tree": "4bca78ae2cceb310fa3154f57b3979b99c5415c9", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "a5a1e277eed7550c648b086df2dbc9b0648793bb", + "version-string": "commit-3ffa7fe69a1d0c37fb52a4af61380c5fd84fa5aa", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/unicorn.json b/port_versions/u-/unicorn.json new file mode 100644 index 00000000000000..aed2e3317d0daa --- /dev/null +++ b/port_versions/u-/unicorn.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "c7f12f98aceb87089db977ee201850fef601bc64", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "31a907864df76e8932f426716a80ff724b54105a", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "4720065ce96f98f710dcbacab77132b91fca2e4f", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "04f55544280b5c863e4d7be28cc897513d881040", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "35c254963e255eadbdb7fb7f56e4d5800ed8a42f", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "5911bd529b3fcf0b111c0f0295f858ea158cd06b", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "2722a4a810ff8a728e33a012d75f89dd0e1e4fa0", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "cc4ae6b44e08595fd9f6435de8b7477042da87b6", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "8edb59c4ad41d0589025ad5361eceb0b0ccd489b", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "a4bf9d56075e78b77a63e240bdde4532a3c11384", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "cba285e2d625219dfb27417fd6bae6f800cf9361", + "version-string": "2018-08-03", + "port-version": 0 + }, + { + "git-tree": "99d2393d278d2d7dbf30afc201d7402c77e9b41a", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "197deb6b4b77ca75ff0a5559706521e70c6e1070", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "a8e3ebf866df1a75abe50e258c718db619c13fdb", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "2cc04604e40dbf7ba45931b94270a4f691e4067b", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "c0b2c5feb3edaecca5d4e40483cdd0382b2c127c", + "version-string": "2018-03-20", + "port-version": 0 + }, + { + "git-tree": "978314718a46c525617e4eeb603ebc96980dc9ce", + "version-string": "2018-03-13", + "port-version": 0 + }, + { + "git-tree": "613750b60244da7e9d82ca52c5be5f3913f1fb4f", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "cd4f8b1da7af37253ccb7b0e734daeac6a2671cf", + "version-string": "2017-12-06-bc34c36eaeca0f4fc672015d24ce3efbcc81d6e4-1", + "port-version": 0 + }, + { + "git-tree": "00b865d068d2c07d961d79091f616c21def5c7a6", + "version-string": "2017-12-06-bc34c36eaeca0f4fc672015d24ce3efbcc81d6e4", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/units.json b/port_versions/u-/units.json new file mode 100644 index 00000000000000..57f7754e5564c6 --- /dev/null +++ b/port_versions/u-/units.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "2db2d9f6afa63b919c6112b56d39b4609370fa4e", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "68e4b015ee77987c65b8910ba99a7e0f7743834f", + "version-string": "2.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/unittest-cpp.json b/port_versions/u-/unittest-cpp.json new file mode 100644 index 00000000000000..f4ac48856a8c14 --- /dev/null +++ b/port_versions/u-/unittest-cpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "3ba07fcecec6bf9298a04b064411601043d98bd7", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "62ec45caeac82376e4c17f5dc26203ee200dcf5b", + "version-string": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/unixodbc.json b/port_versions/u-/unixodbc.json new file mode 100644 index 00000000000000..26c23273cb220a --- /dev/null +++ b/port_versions/u-/unixodbc.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "10efe80ac302d39b15d3e8bd3755ff0386e413f6", + "version-string": "2.3.7", + "port-version": 2 + }, + { + "git-tree": "b1b94bd8dac657022fb207c178bf2dfe9f4ed142", + "version-string": "2.3.7-1", + "port-version": 0 + }, + { + "git-tree": "b1a93ce9bd8db0445efd70df850284fdffc8eab1", + "version-string": "2.3.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/unqlite.json b/port_versions/u-/unqlite.json new file mode 100644 index 00000000000000..fd9a76687c3f47 --- /dev/null +++ b/port_versions/u-/unqlite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b038e5ea1a126a574fa130e8b533ca3d91fe9be8", + "version-string": "1.1.9", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/unrar.json b/port_versions/u-/unrar.json new file mode 100644 index 00000000000000..21effa3baf0561 --- /dev/null +++ b/port_versions/u-/unrar.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "30b1a0167a19316d64249e79132098e02a8a4d3f", + "version-string": "5.8.1", + "port-version": 0 + }, + { + "git-tree": "09938307e07a99e000a97043d642ac0e5b474379", + "version-string": "5.5.8-3", + "port-version": 0 + }, + { + "git-tree": "cd368ad57e441a0f52e37141f9264c276ea10da2", + "version-string": "5.5.8-2", + "port-version": 0 + }, + { + "git-tree": "144bf8e9b8aa66775cbd660489dc3fa7b677536c", + "version-string": "5.5.8-1", + "port-version": 0 + }, + { + "git-tree": "7220d8fd974a4da131d8b028a1bf6fc94b206c7c", + "version-string": "5.5.8", + "port-version": 0 + }, + { + "git-tree": "e6ea834b2c450f0df212a6b3ff7b830958a0dc05", + "version-string": "5.5.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/upb.json b/port_versions/u-/upb.json new file mode 100644 index 00000000000000..2de347e6650b7a --- /dev/null +++ b/port_versions/u-/upb.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f62deabc33313987277b9c9b6fec1498d87f9164", + "version-string": "2020-08-19", + "port-version": 0 + }, + { + "git-tree": "fd13a503a4514b6e1d7b8d130346a4d85c3a2bbe", + "version-string": "2019-10-21-2", + "port-version": 0 + }, + { + "git-tree": "099be2dabf498c93d8b84781d2edc7a681134460", + "version-string": "2019-10-21-1", + "port-version": 0 + }, + { + "git-tree": "7b5e3926c6987d30a92a8feea782a03e2ca69540", + "version-string": "2019-10-21", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/urdfdom-headers.json b/port_versions/u-/urdfdom-headers.json new file mode 100644 index 00000000000000..96dfb0ea263de6 --- /dev/null +++ b/port_versions/u-/urdfdom-headers.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "5dd339affc1eeaab090a5052621566424cee912e", + "version-string": "1.0.5", + "port-version": 1 + }, + { + "git-tree": "1e778111ef229d80dbff478b4807b5cfdf273a19", + "version-string": "1.0.5", + "port-version": 0 + }, + { + "git-tree": "c32a3e45b98f2a90770bd907152b061f50c76cda", + "version-string": "1.0.4-1", + "port-version": 0 + }, + { + "git-tree": "4830c030ecb6400e15e07d3c78b6b84143a201cb", + "version-string": "1.0.4", + "port-version": 0 + }, + { + "git-tree": "1a3d49fb253e7fe125764d8f668c2ead9632f15a", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "409aae792651465f223a827e5afc443227f90708", + "version-string": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "1ec61fa534279a9903753795626c76422ab5b685", + "version-string": "1.0.0-2", + "port-version": 0 + }, + { + "git-tree": "f4ac1d1d403f9e9a16ed7721bfa583edde47eb89", + "version-string": "1.0.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/urdfdom.json b/port_versions/u-/urdfdom.json new file mode 100644 index 00000000000000..0d9abef580ba8d --- /dev/null +++ b/port_versions/u-/urdfdom.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "c8509aadcb49f4193730203193f79f32d4176400", + "version-string": "1.0.4", + "port-version": 3 + }, + { + "git-tree": "31ee31e52dcb55cdb49ed1d1c19f9f7f270a7254", + "version-string": "1.0.4", + "port-version": 2 + }, + { + "git-tree": "d42a81b1878307be5db68396998302640cdc83a4", + "version-string": "1.0.4-1", + "port-version": 0 + }, + { + "git-tree": "5fe19f849e38fa140a56ea0f8df1cd9929be7701", + "version-string": "1.0.4", + "port-version": 0 + }, + { + "git-tree": "49530dffb2f4a5fdc0dd18d68e4f794d933200dc", + "version-string": "1.0.3-2", + "port-version": 0 + }, + { + "git-tree": "d597bd0264bf4fda4412787ad874b3fbf2d18b71", + "version-string": "1.0.3-1", + "port-version": 0 + }, + { + "git-tree": "8c5c5f6c4c4dea770456c640416a21772700736b", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "b9a7c0503e330b910154b25f3b292f12f2cf9e1c", + "version-string": "1.0.0-3", + "port-version": 0 + }, + { + "git-tree": "234a1dc439db09b6c7aa432826b856cc4a80bbea", + "version-string": "1.0.0-2", + "port-version": 0 + }, + { + "git-tree": "3b307ece0038babee7ae7f57863ece85e0a2efc4", + "version-string": "1.0.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/uriparser.json b/port_versions/u-/uriparser.json new file mode 100644 index 00000000000000..1d85b48277dee9 --- /dev/null +++ b/port_versions/u-/uriparser.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "85975d0874cda87d367d337f4c7dddf8e7f37bce", + "version-string": "0.9.4", + "port-version": 0 + }, + { + "git-tree": "32d9c6931155cfe07e608e1a4efaa0608cf553ca", + "version-string": "0.9.3-5", + "port-version": 0 + }, + { + "git-tree": "994b2799ead42490e0863a2d69274e96c6970d2b", + "version-string": "0.9.3-4", + "port-version": 0 + }, + { + "git-tree": "10533ff2c23565ca43f3c92d91ffcebdbb30743f", + "version-string": "0.9.2-1", + "port-version": 0 + }, + { + "git-tree": "4c7f7e0dd4e0c31d2127605824bc901591d9c755", + "version-string": "0.9.2", + "port-version": 0 + }, + { + "git-tree": "a1dbc774ea20d9de8d0eebd05d046e243e2a6599", + "version-string": "0.9.1", + "port-version": 0 + }, + { + "git-tree": "18e86afd3b031421df6ff85789182484a24d4dcd", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "675c6f8de89f716b45d1b9717ca2f113dfbea11b", + "version-string": "0.8.6", + "port-version": 0 + }, + { + "git-tree": "ccc14a03828e2a44e051ce755636ec38dffe36a1", + "version-string": "0.8.5", + "port-version": 0 + }, + { + "git-tree": "f57d2556ce70b0c42fb19f029c18074bb477e364", + "version-string": "0.8.4-1", + "port-version": 0 + }, + { + "git-tree": "b43a8e9dc8bf76654f9674feb75ab0b4d80bb1fc", + "version-string": "0.8.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/usbmuxd.json b/port_versions/u-/usbmuxd.json new file mode 100644 index 00000000000000..5e7bb417d2066f --- /dev/null +++ b/port_versions/u-/usbmuxd.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "d48f5f4611e4a59ccafc8c4dbb9ec1db1344994c", + "version-string": "1.2.235", + "port-version": 0 + }, + { + "git-tree": "b2b448b3015c6f16e719e82b58b9688b9bdc1529", + "version-string": "1.2.76-1", + "port-version": 0 + }, + { + "git-tree": "161f454b21df94db56abf4e7c768e190ebc25c69", + "version-string": "1.2.76", + "port-version": 0 + }, + { + "git-tree": "9c64faa8028f7a93c5b2afb4f163172a1c6a84d0", + "version-string": "1.1.1.133-3", + "port-version": 0 + }, + { + "git-tree": "3944c4682d2ef1fa94208423b5ea1930104c62c7", + "version-string": "1.1.1.133-2", + "port-version": 0 + }, + { + "git-tree": "270968b945e6c6e7b7fefe1aab69de72c382314a", + "version-string": "1.1.1.133-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/usd.json b/port_versions/u-/usd.json new file mode 100644 index 00000000000000..0c0d12a5d8b96a --- /dev/null +++ b/port_versions/u-/usd.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "31c9d55a54024d0bc130a9f8547d1c64d4a3aed4", + "version-string": "20.08", + "port-version": 0 + }, + { + "git-tree": "d0333a8dfc5842771b29038bd329b7d739b78cf0", + "version-string": "20.02-1", + "port-version": 0 + }, + { + "git-tree": "b06a9070475f30356cf7c8a428d3a7e94f2f64b7", + "version-string": "20.02", + "port-version": 0 + }, + { + "git-tree": "066df97d046736bf9a67838771d29f9e4941a3e2", + "version-string": "0.8.4-2", + "port-version": 0 + }, + { + "git-tree": "1561cdb122277a64391d434a0e4ba2d4a8fbfb0c", + "version-string": "0.8.4-1", + "port-version": 0 + }, + { + "git-tree": "e70b57bd851013def127438095532163283dd9bf", + "version-string": "0.8.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/usockets.json b/port_versions/u-/usockets.json new file mode 100644 index 00000000000000..6f6a6186cc8b41 --- /dev/null +++ b/port_versions/u-/usockets.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "2234660f66ba0960924aebfc3be037cf22e9e222", + "version-string": "0.6.0", + "port-version": 1 + }, + { + "git-tree": "fc6c3af3946135134def8a0214cb6c11f4971c14", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "bd03cde2afb4229fd57e9fc6177faced3a33c0d7", + "version-string": "0.3.5-1", + "port-version": 0 + }, + { + "git-tree": "63f88c5f7f8dd4cb31a49886ea8090697fb96fa7", + "version-string": "0.3.5", + "port-version": 0 + }, + { + "git-tree": "15645d45b602253ba4c5c4a30a906618762c9fb5", + "version-string": "0.3.4", + "port-version": 0 + }, + { + "git-tree": "a5184d00dc9f80b6756927ec40d36f7788b184e5", + "version-string": "0.3.1", + "port-version": 0 + }, + { + "git-tree": "9b1a68de4cc3d303cb5014640ebce11de82c2656", + "version-string": "0.1.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/usrsctp.json b/port_versions/u-/usrsctp.json new file mode 100644 index 00000000000000..dd87fe247d2251 --- /dev/null +++ b/port_versions/u-/usrsctp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a2a0f34f91d797a31af55376db7524f3aed863dc", + "version-string": "0db9691", + "port-version": 0 + }, + { + "git-tree": "6538abf90af559609a691084fa9511d8a5ffd7c8", + "version-string": "35c1d97020a-2", + "port-version": 0 + }, + { + "git-tree": "87b02ee3b63e6dcdf1f54488b3fc71b4783de64b", + "version-string": "35c1d97020a", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/utf8h.json b/port_versions/u-/utf8h.json new file mode 100644 index 00000000000000..9d5df795cda3cb --- /dev/null +++ b/port_versions/u-/utf8h.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "721728b5f4b4695d5cec09fc53b59d4f879142a9", + "version-string": "2020-06-14", + "port-version": 0 + }, + { + "git-tree": "b55bd1bf86330d4edad00a9e0d7948d76001662a", + "version-string": "841cb2deb8eb806e73fff0e1f43a11fca4f5da45", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/utf8proc.json b/port_versions/u-/utf8proc.json new file mode 100644 index 00000000000000..3c2983307ce655 --- /dev/null +++ b/port_versions/u-/utf8proc.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "2b0e7ac6367f7dbe8fc0e6fea7d0ad81cbbedba6", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "e8c336658d5284ea88431618fae16a657a648ca5", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "108dfa954a0c81224fcab22b3d59c37ff366b746", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "60222749d54910e32e55111480e0b1555b812704", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "8c22e89cbf969cc313fc307c26bd771ba63fb3e5", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/utfcpp.json b/port_versions/u-/utfcpp.json new file mode 100644 index 00000000000000..ff117c4c62bb9c --- /dev/null +++ b/port_versions/u-/utfcpp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "1af9d7ac0523916f6119657b78719d84939215d5", + "version-string": "3.1.2", + "port-version": 1 + }, + { + "git-tree": "97ac42955403db1c459a0eba774f42a21ae36500", + "version-string": "3.1.2", + "port-version": 0 + }, + { + "git-tree": "fc1f86ceffb5c9a19505f94bc569aa36c175c34e", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "caf151f807fb0cb80fb32019a2f1eaad1aa14aa2", + "version-string": "3.1", + "port-version": 0 + }, + { + "git-tree": "1ff975d308df8582ad3762e4f9fe29a34c4a36da", + "version-string": "2.3.5-1", + "port-version": 0 + }, + { + "git-tree": "bc1bee3ff65568ba53b00710610c8b919d0b709f", + "version-string": "2.3.5", + "port-version": 0 + }, + { + "git-tree": "82f0769018f869b64f477ba570da87f82f07567a", + "version-string": "2.3.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/utfz.json b/port_versions/u-/utfz.json new file mode 100644 index 00000000000000..5a6a9e40dbfed6 --- /dev/null +++ b/port_versions/u-/utfz.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b1c36a09a7ddb7b39b5136e2c2be1dc7974bea1a", + "version-string": "1.2-1", + "port-version": 0 + }, + { + "git-tree": "ea0fd5fe0538d3752557ed44ad7c5c1f42dd0bed", + "version-string": "1.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/uthenticode.json b/port_versions/u-/uthenticode.json new file mode 100644 index 00000000000000..bc6b140be56311 --- /dev/null +++ b/port_versions/u-/uthenticode.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "be0c3da6f7d93aa3a5252b03adc09ffa8105eaf8", + "version-string": "1.0.4", + "port-version": 0 + }, + { + "git-tree": "bd7038ef6ae3b827eb29153032a1cd5f421ef946", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "3f802914f39e2a9bf0fa62dfb2c40016ae7b24da", + "version-string": "1.0.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/uvatlas.json b/port_versions/u-/uvatlas.json new file mode 100644 index 00000000000000..65fab78a5d5c21 --- /dev/null +++ b/port_versions/u-/uvatlas.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "59eed2711b70ec9a4dfd37c851d7a7810ea83b3e", + "version-string": "jan2021", + "port-version": 0 + }, + { + "git-tree": "dd1382270a525ef33048d64a106c49546562a53d", + "version-string": "dec2020b", + "port-version": 0 + }, + { + "git-tree": "1175583439365ae25392a3e9e4c6da1d3978f2c9", + "version-string": "aug2020", + "port-version": 0 + }, + { + "git-tree": "a1a1a75c096b4910525550c6696b4f738f28bcab", + "version-string": "dec2019", + "port-version": 0 + }, + { + "git-tree": "06224f3faf46d9b003dcfbeb13b7af2e2899454e", + "version-string": "apr2019", + "port-version": 0 + }, + { + "git-tree": "c60a8bc0a57c9a43f5c39724b46fcae285b83200", + "version-string": "sept2016-1", + "port-version": 0 + }, + { + "git-tree": "5fb184c6516b1101c2dd4f782092efb52e438fd4", + "version-string": "sept2016", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/uvw.json b/port_versions/u-/uvw.json new file mode 100644 index 00000000000000..9d2629a517328c --- /dev/null +++ b/port_versions/u-/uvw.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "b41eff8a3d196467693d35957280cad3be6a7f4b", + "version-string": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "83f140fc0183ab8a09b588d9ac3772e65abdb5ca", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "e425bc596d3b5863436c698b2d40fa293e1d2e68", + "version-string": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "3f47107a2a703b67df631f50ed54fa12ffc755cc", + "version-string": "1.17.0_libuv-v1.29-1", + "port-version": 0 + }, + { + "git-tree": "e8da0f3cd9024396f4b5ce44a67e2f09ebc16b2e", + "version-string": "1.17.0_libuv-v1.29", + "port-version": 0 + }, + { + "git-tree": "66a436732bb4280ad5933b6343ef43f7203dd946", + "version-string": "1.15.0", + "port-version": 0 + }, + { + "git-tree": "ef9a1c6f4bac4f2743e75e632f3f8cc5b47f5bd2", + "version-string": "1.11.3", + "port-version": 0 + }, + { + "git-tree": "29ac18a5b517fcf9646244a995acae6cf3d3ba04", + "version-string": "1.11.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/u-/uwebsockets.json b/port_versions/u-/uwebsockets.json new file mode 100644 index 00000000000000..1e8d802af8ea9c --- /dev/null +++ b/port_versions/u-/uwebsockets.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "ac495f3a5f075ad4d93f1b627095e4dae7a4c517", + "version-string": "18.13.0", + "port-version": 0 + }, + { + "git-tree": "a310a5de44a417623e7afed31bab6e01887cee04", + "version-string": "18.1.0", + "port-version": 0 + }, + { + "git-tree": "dfbf505aa6e0ab7a1b6fcd8d1f906fa3ce5de168", + "version-string": "0.17.2", + "port-version": 0 + }, + { + "git-tree": "31690049a4f739ed00b31b1966af67011bc3577f", + "version-string": "0.17.1", + "port-version": 0 + }, + { + "git-tree": "931935c748775314fdb4f10c2e7f04cfaa387dcf", + "version-string": "0.17.0a4", + "port-version": 0 + }, + { + "git-tree": "0b3cdb75c1acbb69c5aba75f1c21da582895aa01", + "version-string": "0.16.5", + "port-version": 0 + }, + { + "git-tree": "e16889160563f63d0df0be76618401e5f7d95eff", + "version-string": "0.15.7", + "port-version": 0 + }, + { + "git-tree": "e0da883b380e732013d371d31a05e69a9e8050b3", + "version-string": "0.15.6", + "port-version": 0 + }, + { + "git-tree": "06d6722fe506c02c6a5f40bc297a5fcc03af70ac", + "version-string": "0.14.8-2", + "port-version": 0 + }, + { + "git-tree": "c902e3467333ed832fc8a0af842d8b9959a7dca0", + "version-string": "0.14.8-1", + "port-version": 0 + }, + { + "git-tree": "5043ece96c0b36dd5c00c16a5162d557982c4769", + "version-string": "0.14.7-1", + "port-version": 0 + }, + { + "git-tree": "14c0cb3950291eb2f6508ef510bcac8d1933069e", + "version-string": "0.14.6-1", + "port-version": 0 + }, + { + "git-tree": "ab7a6cb5fdbc9cc31fb68004991c760f130189e9", + "version-string": "0.14.5-1", + "port-version": 0 + }, + { + "git-tree": "08ed77b02323f5487eedb3bc602b3ca9b58ff3bd", + "version-string": "0.14.4-1", + "port-version": 0 + }, + { + "git-tree": "8034fc9856c548dccf9720eadf74f57b8ac6f584", + "version-string": "0.14.4", + "port-version": 0 + }, + { + "git-tree": "7d94d32ce3fdb453f81f121d7d6373e4c541d65b", + "version-string": "0.14.3", + "port-version": 0 + }, + { + "git-tree": "cef7419a11e080f05329355c10df27ffb0411eb0", + "version-string": "0.14.2", + "port-version": 0 + }, + { + "git-tree": "2d405891816e761238c01484f80f78df3cfcc34b", + "version-string": "0.14.1", + "port-version": 0 + }, + { + "git-tree": "b795f24351bd58f1a1ab09f5ad7a9659f5d9ca61", + "version-string": "0.14.0alpha5", + "port-version": 0 + }, + { + "git-tree": "b646316f1dd25d839c7bd04899dae5eda60e4eac", + "version-string": "0.13.0-2", + "port-version": 0 + }, + { + "git-tree": "86113ed7669c9b2442ed1edee66c97833c4b185b", + "version-string": "0.13.0-1", + "port-version": 0 + }, + { + "git-tree": "0de1e1df58df0d58ae061f3dc1b50b092d1345bc", + "version-string": "0.12.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/v-hacd.json b/port_versions/v-/v-hacd.json new file mode 100644 index 00000000000000..0275c6dfc7e8f0 --- /dev/null +++ b/port_versions/v-/v-hacd.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "5a11f826da2ca5189f1b29e90299569e2ca94712", + "version-string": "3.2.0", + "port-version": 1 + }, + { + "git-tree": "2d22776410edea5f74d200a49acaead40c597a2b", + "version-string": "3.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/v8.json b/port_versions/v-/v8.json new file mode 100644 index 00000000000000..827273bc245a24 --- /dev/null +++ b/port_versions/v-/v8.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "06594ed228d75261805f473207a1db1757f974fe", + "version-string": "8.6.395.17", + "port-version": 0 + }, + { + "git-tree": "e95b4a567b4ae19b4d206499a0ea57673b789dfa", + "version-string": "8.3.110.13", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/valijson.json b/port_versions/v-/valijson.json new file mode 100644 index 00000000000000..630d411240206a --- /dev/null +++ b/port_versions/v-/valijson.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "56fb4ee7adbd616e60bc4a24eedd2755f25de001", + "version-string": "2018-11-17-1", + "port-version": 0 + }, + { + "git-tree": "1d49596abb0ed41095b901d5e01b45631190babf", + "version-string": "2018-11-17", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/value-ptr-lite.json b/port_versions/v-/value-ptr-lite.json new file mode 100644 index 00000000000000..75cbf942d04ed9 --- /dev/null +++ b/port_versions/v-/value-ptr-lite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c678a31c0e75e1cf5b53dc2f6ed0eecc156d9133", + "version-string": "0.2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/variant-lite.json b/port_versions/v-/variant-lite.json new file mode 100644 index 00000000000000..434e36f8845149 --- /dev/null +++ b/port_versions/v-/variant-lite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6d5d7208789ae75c456134c11e719adf8c2eb5bf", + "version-string": "1.2.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vc.json b/port_versions/v-/vc.json new file mode 100644 index 00000000000000..07bdc23f08355a --- /dev/null +++ b/port_versions/v-/vc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "62edb04d91a2e37739c935e832dfa75f311089f8", + "version-string": "1.4.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vcglib.json b/port_versions/v-/vcglib.json new file mode 100644 index 00000000000000..737e3e658205c7 --- /dev/null +++ b/port_versions/v-/vcglib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "18b77419728670df6316365979f59919168b9ee2", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vcpkg-gfortran.json b/port_versions/v-/vcpkg-gfortran.json new file mode 100644 index 00000000000000..6caa3a2610e3e2 --- /dev/null +++ b/port_versions/v-/vcpkg-gfortran.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b8fe480cd1e0e1ac8779b8552a1c6a999ec67e39", + "version-string": "3", + "port-version": 0 + }, + { + "git-tree": "038b37d853a6d2e337b46a2f78f2e4efff28a3ec", + "version-string": "1", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vectorclass.json b/port_versions/v-/vectorclass.json new file mode 100644 index 00000000000000..c0206893fa6656 --- /dev/null +++ b/port_versions/v-/vectorclass.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7b73ec26a0a35beecf8061f14a53ee961347dd67", + "version-string": "2.00.01", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/visit-struct.json b/port_versions/v-/visit-struct.json new file mode 100644 index 00000000000000..24d13c83f1d5e0 --- /dev/null +++ b/port_versions/v-/visit-struct.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "3e024a1126ec62c4f17e2a2d2a6a6367e24d45de", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "da5810a31388ed03f9edd48ac57e1a2f3bda0b3a", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vlfeat.json b/port_versions/v-/vlfeat.json new file mode 100644 index 00000000000000..d51d334252da18 --- /dev/null +++ b/port_versions/v-/vlfeat.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "be0ba46516781391acfb5a54ab75e085fa53e3a7", + "version-string": "2020-07-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vlpp.json b/port_versions/v-/vlpp.json new file mode 100644 index 00000000000000..2981835bd6f533 --- /dev/null +++ b/port_versions/v-/vlpp.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "4463f001a84efe965dfea0530a6f71f753923103", + "version-string": "0.11.0.0", + "port-version": 0 + }, + { + "git-tree": "343c41f71bfca5afff34af1c97b44eeea168dcde", + "version-string": "0.10.0.0", + "port-version": 0 + }, + { + "git-tree": "80f1a08b5e3ca2193dd41cdab728e71873e2416f", + "version-string": "0.9.3.1-2", + "port-version": 0 + }, + { + "git-tree": "d28c80be18f5f6880453ff17576b44404480f4ab", + "version-string": "0.9.3.1-1", + "port-version": 0 + }, + { + "git-tree": "7420d44961c40c2bc8b55437b519adc0c9c619be", + "version-string": "0.9.3.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/volk.json b/port_versions/v-/volk.json new file mode 100644 index 00000000000000..736c802dc2ed22 --- /dev/null +++ b/port_versions/v-/volk.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "9e40bb5aadc282b6738223dbddbe61fc2db964f9", + "version-string": "2019-09-26", + "port-version": 0 + }, + { + "git-tree": "abfe3c79ce18403d5fe7df4229a47b003daeb402", + "version-string": "2019-09-03", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vs-yasm.json b/port_versions/v-/vs-yasm.json new file mode 100644 index 00000000000000..71ca133ddabb9b --- /dev/null +++ b/port_versions/v-/vs-yasm.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "578afbadfc6dd06f3e83fc3d40dbbcfe98a392ae", + "version-string": "0.5.0", + "port-version": 1 + }, + { + "git-tree": "43b6bd5dbc482d483cad9c7d9533363331260fa0", + "version-string": "0.5.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vtk-dicom.json b/port_versions/v-/vtk-dicom.json new file mode 100644 index 00000000000000..1cc5b2b4f8e20e --- /dev/null +++ b/port_versions/v-/vtk-dicom.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "1364bedaaf40e2604fd87cfde2791a944343c5e6", + "version-string": "0.8.12-1", + "port-version": 0 + }, + { + "git-tree": "9c7bb5875a0b19aea0e90807a7bd73f0abcb2df8", + "version-string": "0.8.12", + "port-version": 0 + }, + { + "git-tree": "19cc97581b85e51c2cf8a49027f6339cfe327d63", + "version-string": "0.8.10", + "port-version": 0 + }, + { + "git-tree": "bfb499db66349de87a1e1c8d95e5faa4600831ce", + "version-string": "0.8.9", + "port-version": 0 + }, + { + "git-tree": "a23d580465da08cd79a90171c065b66bcae3b63a", + "version-string": "0.8.8-alpha-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vtk-m.json b/port_versions/v-/vtk-m.json new file mode 100644 index 00000000000000..88cc6fdc2aa073 --- /dev/null +++ b/port_versions/v-/vtk-m.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "38b6b6e37b4b027d7fb92207edbe8e8b97631faf", + "version-string": "1.5.0", + "port-version": 1 + }, + { + "git-tree": "c590ac5dbaf44350c96c1a40639976783110f105", + "version-string": "1.5.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vtk.json b/port_versions/v-/vtk.json new file mode 100644 index 00000000000000..5457ab3f3482ce --- /dev/null +++ b/port_versions/v-/vtk.json @@ -0,0 +1,214 @@ +{ + "versions": [ + { + "git-tree": "6f325c609afb0c171d6d70c965e041f8c7288bd3", + "version-string": "9.0.1", + "port-version": 3 + }, + { + "git-tree": "ec9e66154404b5fdfcacbcc288e7fcd2e37cf900", + "version-string": "9.0.1", + "port-version": 2 + }, + { + "git-tree": "214c9c52a24d9906a7877b6bafdeda7fa0bd2d95", + "version-string": "9.0.1", + "port-version": 1 + }, + { + "git-tree": "589b0babbd041378286258810e20ee9bb4fb7ee8", + "version-string": "9.0.1", + "port-version": 0 + }, + { + "git-tree": "a4e9b96bb147319bd38a8c3e73476191694fda73", + "version-string": "9.0-4", + "port-version": 0 + }, + { + "git-tree": "73fef0a6ed35993d939ee36eed91e10f5c9d2db5", + "version-string": "9.0-3", + "port-version": 0 + }, + { + "git-tree": "33a60763631e4cf1dc162c27b1e27fd027469817", + "version-string": "9.0-2", + "port-version": 0 + }, + { + "git-tree": "a0f552402c5b729ad123ad1038edcedf4932d527", + "version-string": "9.0-1", + "port-version": 0 + }, + { + "git-tree": "6f8f44f36d2fae151a5833573d38e4c5fef0e23f", + "version-string": "9.0", + "port-version": 0 + }, + { + "git-tree": "0a98bca46edc170ca302cc7545d0daf191d4a8e3", + "version-string": "8.2.0-13", + "port-version": 0 + }, + { + "git-tree": "7244954c35575e99b2a08cb7bd97c8b216d5d714", + "version-string": "8.2.0-12", + "port-version": 0 + }, + { + "git-tree": "82d66db2e30c07a8d86fa06ce15fbecc7fcbaa46", + "version-string": "8.2.0-11", + "port-version": 0 + }, + { + "git-tree": "c86b6b71ac054b399a9fcee6f8c54c9aa1c2eade", + "version-string": "8.2.0-10", + "port-version": 0 + }, + { + "git-tree": "5625094c802d33b17cb259f07708bd4cbdbf9385", + "version-string": "8.2.0-9", + "port-version": 0 + }, + { + "git-tree": "6dbb7fe4994b8116313792b3744ee7363e019ade", + "version-string": "8.2.0-8", + "port-version": 0 + }, + { + "git-tree": "a4b9d6db0526781199bb665777b16f41c93966fb", + "version-string": "8.2.0-7", + "port-version": 0 + }, + { + "git-tree": "3d5806c30c47012a6d760bec34740a331fb7b681", + "version-string": "8.2.0-6", + "port-version": 0 + }, + { + "git-tree": "3fc0c0f115d80e4082074accc6e5f4582e39cb94", + "version-string": "8.2.0-5", + "port-version": 0 + }, + { + "git-tree": "90b95379d8ee03b935fb4d78e89725a5304424b7", + "version-string": "8.2.0-4", + "port-version": 0 + }, + { + "git-tree": "ff19ef450a40b99b13fa968e1fc235c04eca5f2b", + "version-string": "8.2.0-2", + "port-version": 0 + }, + { + "git-tree": "8e9924e45a2f03d9ed81e265ef14a35df43c4a66", + "version-string": "8.2.0-1", + "port-version": 0 + }, + { + "git-tree": "ed8be48dd2e94e1e4fa8a9c2b6ec4f1768fd9003", + "version-string": "8.1.0-7", + "port-version": 0 + }, + { + "git-tree": "d5e2b52df97ad323d0c49ebf778623a893594a6c", + "version-string": "8.1.0-6", + "port-version": 0 + }, + { + "git-tree": "b5aa3f784cdcae68b8fe9eb6f66fed80e5c469f7", + "version-string": "8.1.0-5", + "port-version": 0 + }, + { + "git-tree": "dcb50c51f3dd0dd305f94e15f7f9aed2b0d5f5fd", + "version-string": "8.1.0-3", + "port-version": 0 + }, + { + "git-tree": "bbb19208f0fa9504a9361a6dbc6e30675ddf019a", + "version-string": "8.1.0-2", + "port-version": 0 + }, + { + "git-tree": "fa8155fdeb16f9863103989641a525460a5ff186", + "version-string": "8.1.0-1", + "port-version": 0 + }, + { + "git-tree": "82401171f8160381845c756f008513c1bc70a669", + "version-string": "8.1.0", + "port-version": 0 + }, + { + "git-tree": "26515433bee5ab9596dd581c44229c6ad3256392", + "version-string": "8.0.1-6", + "port-version": 0 + }, + { + "git-tree": "8132de1fe3a3fa065b050d8a52dbb0b8e5cafdba", + "version-string": "8.0.1-5", + "port-version": 0 + }, + { + "git-tree": "1a7fda25b9fc315bf4e5bd164739169c7146e0fc", + "version-string": "8.0.1-4", + "port-version": 0 + }, + { + "git-tree": "f203efaf7a5061f69b1aa0f229f24e1067fac0c0", + "version-string": "8.0.1-3", + "port-version": 0 + }, + { + "git-tree": "2d948665c853eb6b451431510da3c2f4f094ad23", + "version-string": "8.0.1-2", + "port-version": 0 + }, + { + "git-tree": "0ce2644dc2345ea552966caef2ff80a81fcae2b3", + "version-string": "8.0.1-1", + "port-version": 0 + }, + { + "git-tree": "8f5a6713961b0a5a247637d28d8483ef1962b8f6", + "version-string": "8.0.1", + "port-version": 0 + }, + { + "git-tree": "a621ebe05e8a27394435b08e0e8bc908894e51db", + "version-string": "8.0.0-3", + "port-version": 0 + }, + { + "git-tree": "a7c2f75d10fd65f60e4fbad7f9bd75e7e5b89c71", + "version-string": "8.0.0-2", + "port-version": 0 + }, + { + "git-tree": "0e149d3927589a95767139ba103187615a75db44", + "version-string": "8.0.0-1", + "port-version": 0 + }, + { + "git-tree": "3c40d8a6fc276c32efb353508035d01cdb55af76", + "version-string": "8.0.0", + "port-version": 0 + }, + { + "git-tree": "fdb07b54be26757cfec7483f09924ffa14bff591", + "version-string": "7.1.1-1", + "port-version": 0 + }, + { + "git-tree": "6eb26cb520be79ac7f7277679dc04780f30a74f8", + "version-string": "7.1.1", + "port-version": 0 + }, + { + "git-tree": "b93adc665c1a6245a14ee6cbb2ba8d266149da52", + "version-string": "7.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vulkan-headers.json b/port_versions/v-/vulkan-headers.json new file mode 100644 index 00000000000000..8d1ded0558ef22 --- /dev/null +++ b/port_versions/v-/vulkan-headers.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2bfc0cee813eec4db22084402370b7e40556027e", + "version-string": "1.2.157", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vulkan-hpp.json b/port_versions/v-/vulkan-hpp.json new file mode 100644 index 00000000000000..10e13b64492294 --- /dev/null +++ b/port_versions/v-/vulkan-hpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "2480b7c83826a22adba9e5fbad769ab547285818", + "version-string": "2019-05-11-1", + "port-version": 0 + }, + { + "git-tree": "f03225bb8e8b8ec20a1b79d113abc3195ed7edd1", + "version-string": "2019-05-11", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vulkan-memory-allocator.json b/port_versions/v-/vulkan-memory-allocator.json new file mode 100644 index 00000000000000..b91cbac4912f3e --- /dev/null +++ b/port_versions/v-/vulkan-memory-allocator.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "dd2f676035a767641141490caae2ac057ed59e83", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "950361a10091dcbcb4f27d1ce5494a9b43b10974", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "403ce21ef2b7da4544a4a37a6079aa1efa0880eb", + "version-string": "2.1.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vulkan.json b/port_versions/v-/vulkan.json new file mode 100644 index 00000000000000..bf92c5612f1fff --- /dev/null +++ b/port_versions/v-/vulkan.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "50baea2e993e948b8477929a7f600da93991224b", + "version-string": "1.1.82.1-1", + "port-version": 0 + }, + { + "git-tree": "7c914e2fbbea69fe95f83236d1b1ccfd9739e735", + "version-string": "1.1.82.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/v-/vxl.json b/port_versions/v-/vxl.json new file mode 100644 index 00000000000000..975c3e59e67a7e --- /dev/null +++ b/port_versions/v-/vxl.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "fefdd1e45140fa292b0f597ae2ef658731f95b18", + "version-string": "2.0.2", + "port-version": 2 + }, + { + "git-tree": "ee7fcf9f131d14db523eabd68494601deba24361", + "version-string": "2.0.2", + "port-version": 1 + }, + { + "git-tree": "a3673fb476501793910afb7f06dc644f93679228", + "version-string": "2.0.2", + "port-version": 0 + }, + { + "git-tree": "f0836e2cd5a5cf43dd5ea707237c74ac9b4ae557", + "version-string": "v1.18.0-4", + "port-version": 0 + }, + { + "git-tree": "b9c00596aced831c75a0c4f9589f305645f15182", + "version-string": "v1.18.0-3", + "port-version": 0 + }, + { + "git-tree": "9c69d40cd32f205a40bf91855ca095c86a545d63", + "version-string": "v1.18.0-2", + "port-version": 0 + }, + { + "git-tree": "1e5ac28eb237d1700182e37c98db7e8cb553b01a", + "version-string": "v1.18.0-1", + "port-version": 0 + }, + { + "git-tree": "c9490f087a76c77dd9e4ba23d3c8bb6ba5d1a250", + "version-string": "20180414-7a130cf-1", + "port-version": 0 + }, + { + "git-tree": "495a0bcaa231545503d242682e0e712dba8901d2", + "version-string": "20180414-7a130cf", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wampcc.json b/port_versions/w-/wampcc.json new file mode 100644 index 00000000000000..c69fa1dbb9decc --- /dev/null +++ b/port_versions/w-/wampcc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "dcbe9ebb2b68fdff8c45c54666ae1259452f19ac", + "version-string": "2019-09-04", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wangle.json b/port_versions/w-/wangle.json new file mode 100644 index 00000000000000..1b2e88f0d18b62 --- /dev/null +++ b/port_versions/w-/wangle.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "ec02b3b7d30905067fdd9af8ae6e11652ea78a00", + "version-string": "2020.10.19.00", + "port-version": 1 + }, + { + "git-tree": "fafb0d5c1d9c5d4a5f0846714db0c3bbbbffd267", + "version-string": "2020.10.19.00", + "port-version": 0 + }, + { + "git-tree": "2277163e50d2d5cfc8b74ce9032965d70bd1f134", + "version-string": "2020.02.03.00", + "port-version": 0 + }, + { + "git-tree": "2954be0887c3aa2e750d3afa0cefe8162af66de3", + "version-string": "2019.07.08.00-1", + "port-version": 0 + }, + { + "git-tree": "fd79e9cdaf16199e85ffbc98250c5b25b71c218a", + "version-string": "2019.07.08.00", + "port-version": 0 + }, + { + "git-tree": "68050b130029711b455993b38b0d626aa186beb0", + "version-string": "2019.05.20.00-1", + "port-version": 0 + }, + { + "git-tree": "972517c03b24adb04e30e9388e01ce263217b658", + "version-string": "2019.05.20.00", + "port-version": 0 + }, + { + "git-tree": "da452ce0924f2333b3c17f0409e2241a8da7233f", + "version-string": "2019.05.13.00", + "port-version": 0 + }, + { + "git-tree": "f5c4821138b5af49291e95f0da1e29bba9546bb2", + "version-string": "2019.04.22.00-1", + "port-version": 0 + }, + { + "git-tree": "eb477dc273b8907036117b6757839d665fa7cb9f", + "version-string": "2019.01.07.00-2", + "port-version": 0 + }, + { + "git-tree": "00bf6dff4056455e8e76727991b8a463713caa43", + "version-string": "2019.01.07.00-1", + "port-version": 0 + }, + { + "git-tree": "86b32175a89a917fc83425235d0255dcae0e8a7a", + "version-string": "2019.01.07.00", + "port-version": 0 + }, + { + "git-tree": "746b445212be5203b3afc0758a0545b3ae02ba15", + "version-string": "2018.11.05.00", + "port-version": 0 + }, + { + "git-tree": "54cf65ed5bb94085c606565bfcb499e535ec21d8", + "version-string": "2018.10.29.00", + "port-version": 0 + }, + { + "git-tree": "082f089f7d764a48dd18b1016cdc9acba45520d8", + "version-string": "2018.10.22.00", + "port-version": 0 + }, + { + "git-tree": "6ecccce862a45c0408dde14ea7fcf47258aa275f", + "version-string": "2018.07.30.00-2", + "port-version": 0 + }, + { + "git-tree": "6815607656294646b71b3a0163db3a48248176b0", + "version-string": "v2018.07.30.00-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wavelib.json b/port_versions/w-/wavelib.json new file mode 100644 index 00000000000000..d1a7abbc9ce1f1 --- /dev/null +++ b/port_versions/w-/wavelib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "66193d7de35196ebf71e6f34ba2f3bad0ee6288c", + "version-string": "2020-05-29", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wavpack.json b/port_versions/w-/wavpack.json new file mode 100644 index 00000000000000..28ee22579c9134 --- /dev/null +++ b/port_versions/w-/wavpack.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "ab00fac3cf38ba1104e6365183fe6f7bef09f46d", + "version-string": "5.3.0", + "port-version": 0 + }, + { + "git-tree": "bd620d16a01ecde17323db2154a80ebb853e8846", + "version-string": "5.2.0", + "port-version": 3 + }, + { + "git-tree": "826907414aaece4ac4d8805257854606c8b06a5f", + "version-string": "5.2.0", + "port-version": 1 + }, + { + "git-tree": "3dbc3902cdc5287d7e82e6ec3edcc9debe0674e9", + "version-string": "5.2.0", + "port-version": 0 + }, + { + "git-tree": "620b352213995ac2178ccf37a719d8bb967af15c", + "version-string": "5.1.0-3", + "port-version": 0 + }, + { + "git-tree": "8e4f15ac424d642972445dd66d0eeb7133d24423", + "version-string": "5.1.0-2", + "port-version": 0 + }, + { + "git-tree": "bdbedb1d1b7a724f3d70ccb1b953fefc5ce91ab3", + "version-string": "5.1.0-00d9a4a-1", + "port-version": 0 + }, + { + "git-tree": "fc15c5e9549323ad4b173b21fa1e0dd119dce421", + "version-string": "5.1.0-00d9a4a", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/websocketpp.json b/port_versions/w-/websocketpp.json new file mode 100644 index 00000000000000..9577f7fa8ad95f --- /dev/null +++ b/port_versions/w-/websocketpp.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "c717c6c7fe929ef1c9cc7b2250e78700326940c4", + "version-string": "0.8.2", + "port-version": 0 + }, + { + "git-tree": "205093262ed381aa06023fad1d850ed8f88e92ae", + "version-string": "0.8.1-1", + "port-version": 0 + }, + { + "git-tree": "47ae4fd5f1cecfcc42b06b65ace2b997da878dd2", + "version-string": "0.8.1", + "port-version": 0 + }, + { + "git-tree": "3f19ec351c4e5aaa325bca3f13c219c560f91059", + "version-string": "0.7.0-1", + "port-version": 0 + }, + { + "git-tree": "a37e0218e6ac2bc59e3f96182ccfb2498993b547", + "version-string": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wepoll.json b/port_versions/w-/wepoll.json new file mode 100644 index 00000000000000..1dc840347d1009 --- /dev/null +++ b/port_versions/w-/wepoll.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "35d772a24598836d3b2dffa94f152d2f143117b8", + "version-string": "1.5.8", + "port-version": 1 + }, + { + "git-tree": "7565b0e7471e1c2e21def0f3896c631ea67f32f9", + "version-string": "1.5.8", + "port-version": 0 + }, + { + "git-tree": "79bb992640d13521d2ce704029d725a1f248e19d", + "version-string": "1.5.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wg21-sg14.json b/port_versions/w-/wg21-sg14.json new file mode 100644 index 00000000000000..0f311423bf5791 --- /dev/null +++ b/port_versions/w-/wg21-sg14.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c8bc3803aac36c5ce3937ecb2a79bd10e697710e", + "version-string": "2019-08-13", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wil.json b/port_versions/w-/wil.json new file mode 100644 index 00000000000000..76614119d1b8c1 --- /dev/null +++ b/port_versions/w-/wil.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "48d7b90ae1c7d5f223caad5330a293463f470860", + "version-string": "2020-05-19", + "port-version": 1 + }, + { + "git-tree": "c592af57ce68d842a099b9533eb6a0b8f4aeddbe", + "version-string": "2020-05-19", + "port-version": 0 + }, + { + "git-tree": "6fc902885dd7217f576fd9d15a4e719e2a362416", + "version-string": "2019-11-07", + "port-version": 0 + }, + { + "git-tree": "e327535dff44b80591354a3ca152b451f2fc1391", + "version-string": "2019-07-16", + "port-version": 0 + }, + { + "git-tree": "2d4beb5a5c638983e5ea15da718adab37c1e11f4", + "version-string": "2019-07-09", + "port-version": 0 + }, + { + "git-tree": "5b69bc45e3d32c13cbafdf88fc70e455fa847473", + "version-string": "2019-06-10", + "port-version": 0 + }, + { + "git-tree": "f11a4f76cd1ad0ace37036a8e9468a3ce061ce22", + "version-string": "2019-05-08", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wildmidi.json b/port_versions/w-/wildmidi.json new file mode 100644 index 00000000000000..a1cc370fe5cdda --- /dev/null +++ b/port_versions/w-/wildmidi.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "9bd12fa743e95153d652d59113ac56c28b2ccabe", + "version-string": "0.4.3-1", + "port-version": 0 + }, + { + "git-tree": "7b3ee64538e5a84355d5b896fb7924791e1cdd8e", + "version-string": "0.4.3", + "port-version": 0 + }, + { + "git-tree": "0b6d7fe5db1e6e9345946624afcf636bec59059e", + "version-string": "0.4.1-1", + "port-version": 0 + }, + { + "git-tree": "613584f9eed46bb8c2f57f5d9df8082ff80481d1", + "version-string": "0.4.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wincrypt.json b/port_versions/w-/wincrypt.json new file mode 100644 index 00000000000000..56395acf062430 --- /dev/null +++ b/port_versions/w-/wincrypt.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "536c7b54d3100704557b0d8ff0fcc9218de5ff4f", + "version-string": "0.0-2", + "port-version": 0 + }, + { + "git-tree": "493f9c0902cac9246275123e4ff7cd403dbc96bf", + "version-string": "0.0-1", + "port-version": 0 + }, + { + "git-tree": "16fa21f99639e638bc5c8a57e992b33c5c1ad910", + "version-string": "0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/winpcap.json b/port_versions/w-/winpcap.json new file mode 100644 index 00000000000000..0461dec07bfb0a --- /dev/null +++ b/port_versions/w-/winpcap.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "c30934172813869e2864463acb7b83cd8f4b2ee6", + "version-string": "4.1.3", + "port-version": 4 + }, + { + "git-tree": "b3e75100dc98cd912247d1a5eff621c8d5555550", + "version-string": "4.1.3-3", + "port-version": 0 + }, + { + "git-tree": "2bd18cf8b182b233103acf0243c47406aa40d935", + "version-string": "4.1.3-2", + "port-version": 0 + }, + { + "git-tree": "dd8af2fa94978477cea3e0f64fe41e01c487c6da", + "version-string": "4.1.3-1", + "port-version": 0 + }, + { + "git-tree": "1c722067bbff3822db6d4df7c2b7cd16a9717406", + "version-string": "4.1.3", + "port-version": 0 + }, + { + "git-tree": "05bd2e490fc9ccb90b4655c773ce545a284c88a8", + "version-string": "4.1.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/winreg.json b/port_versions/w-/winreg.json new file mode 100644 index 00000000000000..1d82fbaa6b8d07 --- /dev/null +++ b/port_versions/w-/winreg.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "e8afef56a008634916bc97eb11ae79ba02c695c8", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "aa109abb93ccccb6e16c83b7e7e323377094b49b", + "version-string": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "2929abc521658db78cfb040189b3f9cab861e5b6", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "a2a38e076c6733520ed2bc4486bb7c5ffa2b7cab", + "version-string": "2.2.3", + "port-version": 0 + }, + { + "git-tree": "4b4b7fde7bb3dc5fcd3087cbaa8cb9e9864254e7", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "49452133f986be20d1d7719e33863c2369e1c899", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "6319c821321e937278e2ffe232f1e401ca6f2674", + "version-string": "1.2.1-1", + "port-version": 0 + }, + { + "git-tree": "8a41891db9540f656840ad027a57d5131f96facb", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/winsock2.json b/port_versions/w-/winsock2.json new file mode 100644 index 00000000000000..428c9e50bf399c --- /dev/null +++ b/port_versions/w-/winsock2.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "31860d5a7d293703921a71466ed1f2bd656e1488", + "version-string": "0.0-2", + "port-version": 0 + }, + { + "git-tree": "c6ee8d7649cfffa7dc31659b73afd9295bd7aebb", + "version-string": "0.0-1", + "port-version": 0 + }, + { + "git-tree": "b00cb3d81560e2d75b50990c0cbc8dc0124b1887", + "version-string": "0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wintoast.json b/port_versions/w-/wintoast.json new file mode 100644 index 00000000000000..b613784cb57d9e --- /dev/null +++ b/port_versions/w-/wintoast.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "44d6b242712ba6b9750b69ad5eac5c934c647d32", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/woff2.json b/port_versions/w-/woff2.json new file mode 100644 index 00000000000000..b6bdca1a07c60a --- /dev/null +++ b/port_versions/w-/woff2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c39668ee425b3e9bb5ead506876f144656acf359", + "version-string": "1.0.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wordnet.json b/port_versions/w-/wordnet.json new file mode 100644 index 00000000000000..3788bce9c7b81d --- /dev/null +++ b/port_versions/w-/wordnet.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bcfbc2d3ca45c84d875af3b123aa83c3b85b554c", + "version-string": "3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wpilib.json b/port_versions/w-/wpilib.json new file mode 100644 index 00000000000000..c362183b3e6fc1 --- /dev/null +++ b/port_versions/w-/wpilib.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "bbc7d5d8824b67d66409ff21f43ee414aa41261b", + "version-string": "2020.3.2", + "port-version": 0 + }, + { + "git-tree": "aed7298e10c4894c12237b259ba2aceb0a30b235", + "version-string": "2020.1.1", + "port-version": 0 + }, + { + "git-tree": "9ab923d9d075c23d6a329951c73a3f335c237b50", + "version-string": "2019.6.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wren.json b/port_versions/w-/wren.json new file mode 100644 index 00000000000000..9e47cdd2a8e76f --- /dev/null +++ b/port_versions/w-/wren.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7cfd07176f4a552daec20b501b155da34acb7e63", + "version-string": "2019-07-01", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wt.json b/port_versions/w-/wt.json new file mode 100644 index 00000000000000..6a42741687a5f5 --- /dev/null +++ b/port_versions/w-/wt.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "4e770dbe450a78c88a5d607926eaf854e15cd546", + "version-string": "4.5.0", + "port-version": 0 + }, + { + "git-tree": "4d0eb851ee2773cd7f529f5c2d91d5ca81929982", + "version-string": "4.4.0", + "port-version": 0 + }, + { + "git-tree": "6dd6103fe267d4e998e3d1ad46a647b25842eef0", + "version-string": "4.2.2", + "port-version": 0 + }, + { + "git-tree": "db8b3a3d40de1196e90c0bd8b73d26e4b441035c", + "version-string": "4.2.1", + "port-version": 0 + }, + { + "git-tree": "31991957952fe3e68aa37474500be965ddf270d8", + "version-string": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "7053d949f20f0b28c8086ec6398b5bce082ee943", + "version-string": "4.0.5-1", + "port-version": 0 + }, + { + "git-tree": "16e676ad9f4ecda601ed0d9165329b4f2a1bdca3", + "version-string": "4.0.5", + "port-version": 0 + }, + { + "git-tree": "a009101b74c6894462278f0d7b08575cd93e4a9a", + "version-string": "4.0.5-1", + "port-version": 0 + }, + { + "git-tree": "8171b0d999ac2b8c6bc9168e6bd7539f7187faed", + "version-string": "4.0.5", + "port-version": 0 + }, + { + "git-tree": "6f635befc383f6070f5b8c6e0acbcc9bffd6073d", + "version-string": "4.0.4-2", + "port-version": 0 + }, + { + "git-tree": "3efde70d1bf7a0c29533e963d10348cdba7d377d", + "version-string": "4.0.4", + "port-version": 0 + }, + { + "git-tree": "7856d96209a218eef8cd14bc6638aacea98ac38f", + "version-string": "4.0.3-1", + "port-version": 0 + }, + { + "git-tree": "7b1413ad25b7f205829a643e853bf8e85695e724", + "version-string": "4.0.3", + "port-version": 0 + }, + { + "git-tree": "db37461817f2d452fa3d11a9e5d463f9bec73b94", + "version-string": "4.0.2", + "port-version": 0 + }, + { + "git-tree": "47e23dd5394f3bf7ef2c370ebb631efea170c4d3", + "version-string": "3.3.7-4", + "port-version": 0 + }, + { + "git-tree": "8f878a7ff834d47df1f29ab593e727b2300fd5dd", + "version-string": "3.3.7-2", + "port-version": 0 + }, + { + "git-tree": "67b260cc1dd9a3264f22e139881f87b4f09bb04d", + "version-string": "3.3.7-1", + "port-version": 0 + }, + { + "git-tree": "296f517371615021ecb35c5ea2f7dda9378ec619", + "version-string": "3.3.7", + "port-version": 0 + }, + { + "git-tree": "a3fdf30ecd67280bee07f78377b3c6f8a7a872d6", + "version-string": "3.3.6-3", + "port-version": 0 + }, + { + "git-tree": "87c3e4d46de0c6a6151c30bcb4fd6d38733adfa6", + "version-string": "3.3.6-2", + "port-version": 0 + }, + { + "git-tree": "931ee43ee612664d319c58baed5f6156187e215d", + "version-string": "3.3.6", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wtl.json b/port_versions/w-/wtl.json new file mode 100644 index 00000000000000..b5b2f6ab9e8595 --- /dev/null +++ b/port_versions/w-/wtl.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "f8a86cb0f5713c783df17553cf443c164d81c10d", + "version-string": "10.0.10320", + "port-version": 0 + }, + { + "git-tree": "5187fbf86b894cd0a33a5822cf8ccf1a887c43ad", + "version-string": "10.0.10077", + "port-version": 0 + }, + { + "git-tree": "3bfe893603b89b7987c50f6a356e73e0f2a8fc4e", + "version-string": "10.0-10", + "port-version": 0 + }, + { + "git-tree": "9c4cfe6f5523f328f7f05f22b93c9862bd8dd508", + "version-string": "10.0-8", + "port-version": 0 + }, + { + "git-tree": "d3cdc3475f2424a751293b2465662f69ff0bcc8c", + "version-string": "10.0-6", + "port-version": 0 + }, + { + "git-tree": "3fc488b73c9de9e7030d0e4b4e60b687c3f2e9c7", + "version-string": "10.0-5", + "port-version": 0 + }, + { + "git-tree": "24d83a98898eca91b9041870ff9a8359565937cc", + "version-string": "10.0-4", + "port-version": 0 + }, + { + "git-tree": "53d2cbf49fdeb5761cfca5dfbec9d36ef1c13589", + "version-string": "10.0-3", + "port-version": 0 + }, + { + "git-tree": "be779f61afe7eb786039a90db7dbc2f2aab9a42f", + "version-string": "10.0-2", + "port-version": 0 + }, + { + "git-tree": "32663304c4b16c1ae66040cc77960aec22972cc4", + "version-string": "10.0-1", + "port-version": 0 + }, + { + "git-tree": "9fc5058744d0ca053bd2931f9ddd8add2d0eef85", + "version-string": "10.0", + "port-version": 0 + }, + { + "git-tree": "3503c1a3a4ffd26af61fba2e5f435fc8e4347f71", + "version-string": "9.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wxchartdir.json b/port_versions/w-/wxchartdir.json new file mode 100644 index 00000000000000..b6c2c5cf796a56 --- /dev/null +++ b/port_versions/w-/wxchartdir.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c9d334a5412996c85e1d57bf6067ba1934e7f038", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/w-/wxwidgets.json b/port_versions/w-/wxwidgets.json new file mode 100644 index 00000000000000..f0d1ac56791983 --- /dev/null +++ b/port_versions/w-/wxwidgets.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "ae942a1e9b501be783a788278accf92d99d34434", + "version-string": "3.1.4", + "port-version": 3 + }, + { + "git-tree": "c5c7866cbe8c7efd8c04a7ba451363f1cca9e97e", + "version-string": "3.1.4", + "port-version": 2 + }, + { + "git-tree": "ead99ab45dcf532da7a67839b57bc9aef9eb9aae", + "version-string": "3.1.4", + "port-version": 1 + }, + { + "git-tree": "1582e6521c2b4420dc6754f7277e78ccc229b0a0", + "version-string": "3.1.4", + "port-version": 0 + }, + { + "git-tree": "f358bcf7702e827672db1e5fb6eebcceafe5b68c", + "version-string": "3.1.3", + "port-version": 2 + }, + { + "git-tree": "c9402d5284eb6d2f03acebbfe12bc518fc4dbc4a", + "version-string": "3.1.3-1", + "port-version": 0 + }, + { + "git-tree": "d701c487884d8f797a7ac6e440c6f3840163c061", + "version-string": "3.1.3", + "port-version": 0 + }, + { + "git-tree": "35379747bbddeccbdb430abc7593bb240be9df7a", + "version-string": "3.1.2-2", + "port-version": 0 + }, + { + "git-tree": "73c33ddd4d6ef1920501ef76d285068bad20b13d", + "version-string": "3.1.2-1", + "port-version": 0 + }, + { + "git-tree": "3e144b7505c1bcb519381ddaa6dfa8511edea25f", + "version-string": "3.1.2", + "port-version": 0 + }, + { + "git-tree": "40b9a7dab12b726d0144681e628693e68c96d948", + "version-string": "3.1.1-2", + "port-version": 0 + }, + { + "git-tree": "cbfc4140ce1853c106a9a0b9befc18dee5774a8b", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "daa9d32fea34f06daa98e25e0894a05a918b8253", + "version-string": "3.1.0-1", + "port-version": 0 + }, + { + "git-tree": "61a43b951fcc5e5d8649720fa802b375c6a5d7b1", + "version-string": "3.1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/x-plane.json b/port_versions/x-/x-plane.json new file mode 100644 index 00000000000000..46907fbe4942c4 --- /dev/null +++ b/port_versions/x-/x-plane.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "abc8034ffafdac8f5840bc31600af7854c24f6b9", + "version-string": "3.0.3", + "port-version": 0 + }, + { + "git-tree": "c28b0d771ae48824125648c09f232412f244aa51", + "version-string": "3.0.1-1", + "port-version": 0 + }, + { + "git-tree": "573c83f59cd44d68507b338478ec21ef78a9aac5", + "version-string": "3.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/x264.json b/port_versions/x-/x264.json new file mode 100644 index 00000000000000..e71a19f169377b --- /dev/null +++ b/port_versions/x-/x264.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "5e7b1b08a47363a45799c196a1a8442e9b02f882", + "version-string": "157-303c484ec828ed0", + "port-version": 14 + }, + { + "git-tree": "82f8b056e53aadf48703644888b9ee22b2a82135", + "version-string": "157-303c484ec828ed0", + "port-version": 13 + }, + { + "git-tree": "8a82e9fbc0a80ecf18dbfb3e67d8156f06e139cb", + "version-string": "157-303c484ec828ed0", + "port-version": 12 + }, + { + "git-tree": "47ad6a70d927bc3dc18fd5bed7d1150ecba72da6", + "version-string": "157-303c484ec828ed0", + "port-version": 11 + }, + { + "git-tree": "0758a26633c68c643f0be2e87ca6bd782c9a2ab9", + "version-string": "157-303c484ec828ed0", + "port-version": 10 + }, + { + "git-tree": "a666cc1c4eaaf6537a54f61cfa1be5c5b1924d8a", + "version-string": "157-303c484ec828ed0", + "port-version": 9 + }, + { + "git-tree": "d7f65d40c7db59664cea553434c6f4e592f13b94", + "version-string": "157-303c484ec828ed0-8", + "port-version": 0 + }, + { + "git-tree": "f4c96056083e748fb3f6b2e8a9c99b2cf68a310e", + "version-string": "157-303c484ec828ed0-7", + "port-version": 0 + }, + { + "git-tree": "f3a55052177912fa46d995287c48ba7cb35b5686", + "version-string": "157-303c484ec828ed0-6", + "port-version": 0 + }, + { + "git-tree": "f121a02d368b2f424537799641911729b42b708c", + "version-string": "157-303c484ec828ed0-4", + "port-version": 0 + }, + { + "git-tree": "94abc602fea54151621f5254f51ab38a7da1af43", + "version-string": "157-303c484ec828ed0-3", + "port-version": 0 + }, + { + "git-tree": "0bbaa0904af0642daf938bd19a80eb962fd78d5c", + "version-string": "157-303c484ec828ed0-2", + "port-version": 0 + }, + { + "git-tree": "0e3c7fbd7d63411bf37cfa707ea629d6930709ed", + "version-string": "157-303c484ec828ed0-1", + "port-version": 0 + }, + { + "git-tree": "4a8db18f5c6608b95b66d2bef765e6252d497c34", + "version-string": "157-303c484ec828ed0", + "port-version": 0 + }, + { + "git-tree": "6c5270d915c2d4c669749614d062a5b5ce2595e4", + "version-string": "152-e9a5903edf8ca59-1", + "port-version": 0 + }, + { + "git-tree": "0cf1dc24412ac6816f8d45b2eb96debd3dc9f116", + "version-string": "152-e9a5903edf8ca59", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/x265.json b/port_versions/x-/x265.json new file mode 100644 index 00000000000000..f40e2500f77828 --- /dev/null +++ b/port_versions/x-/x265.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "6323296cab664ff847a474065dd4ba983c742781", + "version-string": "3.4", + "port-version": 2 + }, + { + "git-tree": "9dcbd561136f877ea90a21d6416b9a83ffadf331", + "version-string": "3.4", + "port-version": 1 + }, + { + "git-tree": "0aa27c05994fc03948def72785fbf82202abe568", + "version-string": "3.4", + "port-version": 0 + }, + { + "git-tree": "874d7a8fa2d4fa5bbb7e5e4dda1b5d2cd3466e9b", + "version-string": "3.2", + "port-version": 5 + }, + { + "git-tree": "6451554d5de4d6a5b74488b48e49aaebfae180b5", + "version-string": "3.2-4", + "port-version": 0 + }, + { + "git-tree": "89d345fedc36e30eca8cc975d0a75dd5eaf31149", + "version-string": "3.2-3", + "port-version": 0 + }, + { + "git-tree": "a498e3895c78dd93c1ca869e6121868e0b710925", + "version-string": "3.2-1", + "port-version": 0 + }, + { + "git-tree": "595f8b44993620cc1859e056472bfe0e4f502ab3", + "version-string": "3.0-2", + "port-version": 0 + }, + { + "git-tree": "cca6bdc27cbab86bd831df220828798a3a4e5593", + "version-string": "3.0-1", + "port-version": 0 + }, + { + "git-tree": "1140f2914a8bee5950f877b54126aa5ee228cbdf", + "version-string": "2.9-2", + "port-version": 0 + }, + { + "git-tree": "2c978e438b969ba9a47bde43e1e5e0ade18ae416", + "version-string": "2.9-1", + "port-version": 0 + }, + { + "git-tree": "4e7554949366cd448f10222b0ab3f16815836b2d", + "version-string": "2.7-1", + "port-version": 0 + }, + { + "git-tree": "b08cebd92d975257d78f5fd8d1e5d19fd15989c8", + "version-string": "2.7", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xalan-c.json b/port_versions/x-/xalan-c.json new file mode 100644 index 00000000000000..1b37324b848158 --- /dev/null +++ b/port_versions/x-/xalan-c.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "d5b33ff9e962fb546720b74e8535bda0567d7df1", + "version-string": "1.11-12", + "port-version": 0 + }, + { + "git-tree": "97fb3746c8ebf9f9bd87782ab3cf84eba90aeb83", + "version-string": "1.11-11", + "port-version": 0 + }, + { + "git-tree": "74729610eea7106a46b3620b5ebc6c4520fab075", + "version-string": "1.11-10", + "port-version": 0 + }, + { + "git-tree": "a1752665d23be5d78b08f8405334a306f40684c3", + "version-string": "1.11-9", + "port-version": 0 + }, + { + "git-tree": "5f6d1828f570deb8d760ca13b233bb2b2e839eac", + "version-string": "1.11-8", + "port-version": 0 + }, + { + "git-tree": "bbf5c7bcfb65ae96bdb8968c5326bd5df861ad59", + "version-string": "1.11-7", + "port-version": 0 + }, + { + "git-tree": "0e3a3f9eae5312f4ff68f4ef4d5e98bfd93fdb3b", + "version-string": "1.11-6", + "port-version": 0 + }, + { + "git-tree": "9b8d53b6e5a25b4af86b98a3d2f4aa2f4a3f2c24", + "version-string": "1.11-5", + "port-version": 0 + }, + { + "git-tree": "32d12ebd36c253f8de4a2167163f1c51e197b9cc", + "version-string": "1.11-4", + "port-version": 0 + }, + { + "git-tree": "ddab669382fa6e94c7fc5d49fa76cf7253a6fe87", + "version-string": "1.11-3", + "port-version": 0 + }, + { + "git-tree": "5f53f51056f1fb299353fd2a09f653898a2e0f05", + "version-string": "1.11-1", + "port-version": 0 + }, + { + "git-tree": "a1077e77eebd5e59bd3f81ea56671630e690a735", + "version-string": "1.11", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xbyak.json b/port_versions/x-/xbyak.json new file mode 100644 index 00000000000000..8306213cef81f4 --- /dev/null +++ b/port_versions/x-/xbyak.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "71447e4379e27bf5e16479edd03019e71ae36bb8", + "version-string": "5.991", + "port-version": 0 + }, + { + "git-tree": "9aa7b5691fe742129eac6572fd46cc1a4a6bd140", + "version-string": "5.97", + "port-version": 0 + }, + { + "git-tree": "dda17683a29ac77b3d831821323b153559be9b02", + "version-string": "5.93", + "port-version": 0 + }, + { + "git-tree": "c2f9338feb87c082f8611b2cacfc7b971b7b032a", + "version-string": "5.911", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xerces-c.json b/port_versions/x-/xerces-c.json new file mode 100644 index 00000000000000..4f04f744d21937 --- /dev/null +++ b/port_versions/x-/xerces-c.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "37d7c50f22be9c769e1c37f9bf12238ceb16b095", + "version-string": "3.2.3-1", + "port-version": 0 + }, + { + "git-tree": "86986ffb0f543c258e674c119a4a1171f2402c97", + "version-string": "3.2.3", + "port-version": 0 + }, + { + "git-tree": "5c599e54644454c85d931660c03a261e6f0c3524", + "version-string": "3.2.2-13", + "port-version": 0 + }, + { + "git-tree": "26c51d5500d35c20f769dea9e2406a79584f9494", + "version-string": "3.2.2-12", + "port-version": 0 + }, + { + "git-tree": "75afb4372109c7f71aa83cc121abc13cf2ce9f06", + "version-string": "3.2.2-11", + "port-version": 0 + }, + { + "git-tree": "5edee8dff70dec5ed5f084f1fd840828bb8728a8", + "version-string": "3.2.2-10", + "port-version": 0 + }, + { + "git-tree": "132a2839c7465e4b32a9cd085778301da5300d6c", + "version-string": "3.2.2-9", + "port-version": 0 + }, + { + "git-tree": "f8c771fa722a18c879a05d180fc684076a86c40f", + "version-string": "3.2.2-8", + "port-version": 0 + }, + { + "git-tree": "49115ebe6647037a00a5386bbdfb95dd01d3db02", + "version-string": "3.2.2-7", + "port-version": 0 + }, + { + "git-tree": "6971a3c6a659208aa6fa8bd6c5a22fbf7d3fcb42", + "version-string": "3.2.2-6", + "port-version": 0 + }, + { + "git-tree": "d0a6105bff0b5c98b7159043e8ab4788bfd2a850", + "version-string": "3.2.2-5", + "port-version": 0 + }, + { + "git-tree": "1497c28acbecdd80b2dd58bd477686af4757e2d6", + "version-string": "3.2.2-4", + "port-version": 0 + }, + { + "git-tree": "b65b09e4a8d8231e03be84856d37a872165c0737", + "version-string": "3.1.4-3", + "port-version": 0 + }, + { + "git-tree": "cf3af53bfe2b423716f22b01c8343cbad80ebeb9", + "version-string": "3.1.4-2", + "port-version": 0 + }, + { + "git-tree": "59585ff08d3d615e32914a03fcd6aa41d864ca9f", + "version-string": "3.1.4-1", + "port-version": 0 + }, + { + "git-tree": "d770dd0d8f954710fb98f304978b399069d848d0", + "version-string": "3.1.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xeus.json b/port_versions/x-/xeus.json new file mode 100644 index 00000000000000..bb5815f8e4583d --- /dev/null +++ b/port_versions/x-/xeus.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "f35bb72c2cb6dfb85ca82106b31428762f82fc1c", + "version-string": "0.24.3", + "port-version": 0 + }, + { + "git-tree": "c8677407719fbe8f6af6098c9d8e852f6744055d", + "version-string": "0.24.1", + "port-version": 1 + }, + { + "git-tree": "92bafcc9dcf4397b9b27fd8952dfaff5b7fae983", + "version-string": "0.24.1", + "port-version": 0 + }, + { + "git-tree": "7c91b19434d04cc9e1b4422227f8e79eb799640c", + "version-string": "0.20.0-1", + "port-version": 0 + }, + { + "git-tree": "02d88d7707c16eef35b80bde734111e47d375358", + "version-string": "0.20.0", + "port-version": 0 + }, + { + "git-tree": "895d4235a808ff3f2de3bf46eb73e8bf8225b5fd", + "version-string": "0.19.2", + "port-version": 0 + }, + { + "git-tree": "9b5ed8e4edc9cb4c16ae15ff9572298f1d1275af", + "version-string": "0.19.1-1", + "port-version": 0 + }, + { + "git-tree": "4244370d9a5573057c4107566c03eb76649c4618", + "version-string": "2019-02-13-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xframe.json b/port_versions/x-/xframe.json new file mode 100644 index 00000000000000..36c86466382708 --- /dev/null +++ b/port_versions/x-/xframe.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e46a9d8a02694ec336be6e73997faf69b5422525", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xlnt.json b/port_versions/x-/xlnt.json new file mode 100644 index 00000000000000..86bfbeea18bfca --- /dev/null +++ b/port_versions/x-/xlnt.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "1f17fd4b98bd2f8a5f0d02aa8db2cd7b1ed1552f", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "3e755c8cd46b12f97c62350e2fbc75fb2eab51b9", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "b47b4241845ee18c0f3049f2442291b564ced080", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "58ae07ca16d0bece2bf1f88a57dc6064ad3ac4a9", + "version-string": "1.3.0-2", + "port-version": 0 + }, + { + "git-tree": "94040da1f8bc4a343855b6b59b73b5c5967afb96", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "798acc113ec6cb163b134bf93b3d4b90ddc512c0", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "2b67fab90447364aeb9ca2e0777546f30d651e20", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "feb9a83dc9d07501aff7adf420ab34e65b6f8789", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "8c4beafb55c6c40edcc86a9564a736f21814e122", + "version-string": "0.9.4-1", + "port-version": 0 + }, + { + "git-tree": "ef8eabcd06ad1da0172e1659a6776e6659b753d1", + "version-string": "0.9.4", + "port-version": 0 + }, + { + "git-tree": "b37ab66705e287ab8e288842e2e5015d37dceaf5", + "version-string": "0.9.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xmlsec.json b/port_versions/x-/xmlsec.json new file mode 100644 index 00000000000000..e17cb47c221189 --- /dev/null +++ b/port_versions/x-/xmlsec.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "9f0df3480ea9d16e5857f7d6815ff6fb3107b05f", + "version-string": "1.2.31", + "port-version": 0 + }, + { + "git-tree": "a80d7faba040539c72252349094de99721f95f8c", + "version-string": "1.2.30", + "port-version": 1 + }, + { + "git-tree": "3666525c286be5b8527050e479ae70c167a673fa", + "version-string": "1.2.30", + "port-version": 0 + }, + { + "git-tree": "ca8056619a12dee092a64b76f4f84975f74836aa", + "version-string": "1.2.29-2", + "port-version": 0 + }, + { + "git-tree": "46bd9d1a728ff3828e5cee3b74eec25104db1750", + "version-string": "1.2.29-1", + "port-version": 0 + }, + { + "git-tree": "e11af619a6f2b5ce3b2e645d3e03a0b83e97055b", + "version-string": "1.2.29", + "port-version": 0 + }, + { + "git-tree": "fec89fad8c0730ede93564437939aff871edc532", + "version-string": "1.2.28", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xmsh.json b/port_versions/x-/xmsh.json new file mode 100644 index 00000000000000..c0a06127307b42 --- /dev/null +++ b/port_versions/x-/xmsh.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c31519998bc1ccf0233cd893b16363e354721db4", + "version-string": "0.5.2-1", + "port-version": 0 + }, + { + "git-tree": "9b63868a331d72d2b31003cee7d19519c951c56e", + "version-string": "0.5.2", + "port-version": 0 + }, + { + "git-tree": "3ff1ec8086702823e870bfe3a2a5996db64178c6", + "version-string": "0.4.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xorstr.json b/port_versions/x-/xorstr.json new file mode 100644 index 00000000000000..5b1e65a14c6ed2 --- /dev/null +++ b/port_versions/x-/xorstr.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "7a37997c7a1c699a78241cd445521f7704be6b76", + "version-string": "2020-02-11", + "port-version": 0 + }, + { + "git-tree": "d9501e51b6623da0d917986c4ec2eb8f782dec08", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xproperty.json b/port_versions/x-/xproperty.json new file mode 100644 index 00000000000000..88c2e2b13cff46 --- /dev/null +++ b/port_versions/x-/xproperty.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "da04206a148f3886f504922d68ee7bb6931bfb35", + "version-string": "0.8.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xsimd.json b/port_versions/x-/xsimd.json new file mode 100644 index 00000000000000..6bbca358e3b7fd --- /dev/null +++ b/port_versions/x-/xsimd.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "6a90c6aea234c06968da8f6c48ea73ae7d95d28e", + "version-string": "7.4.9", + "port-version": 0 + }, + { + "git-tree": "0fd573b8bacc1ecb86f0217b5e56b3014728f580", + "version-string": "7.4.8", + "port-version": 0 + }, + { + "git-tree": "3e6166e2e3002cd05d19f31b75d6f30b8fc522ec", + "version-string": "7.4.6", + "port-version": 0 + }, + { + "git-tree": "1081676020f0420bbd55208e78e3a76e6c2636bf", + "version-string": "7.4.5", + "port-version": 0 + }, + { + "git-tree": "4ade533d73c09e276c9852aa6cbfc6a402a93a23", + "version-string": "7.2.5", + "port-version": 0 + }, + { + "git-tree": "97f76318034ad8cb1e78df717819307c1c0090de", + "version-string": "7.2.3-2", + "port-version": 0 + }, + { + "git-tree": "883ca27572ae59ed8e9b7c9c5873d05496c323cd", + "version-string": "7.2.3-1", + "port-version": 0 + }, + { + "git-tree": "e5c8d8cce44724c0925f0bda642c0ede4553753c", + "version-string": "7.2.3", + "port-version": 0 + }, + { + "git-tree": "d63d66240daca30beda311fb07787ee74e687007", + "version-string": "7.2.2", + "port-version": 0 + }, + { + "git-tree": "f76bd91bf4c4dbe6d201c1c0107dc7e3f100465f", + "version-string": "7.2.1", + "port-version": 0 + }, + { + "git-tree": "265a525d8ac1a3b179deab85f56fb7444331781b", + "version-string": "7.1.3", + "port-version": 0 + }, + { + "git-tree": "f7d40283b43d177d46727d1408706600ad8a60ef", + "version-string": "7.1.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xtensor-blas.json b/port_versions/x-/xtensor-blas.json new file mode 100644 index 00000000000000..e4318e0e401ea1 --- /dev/null +++ b/port_versions/x-/xtensor-blas.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "be4b0910ad2f14c7560353e570cd97f2c2919247", + "version-string": "0.17.2", + "port-version": 0 + }, + { + "git-tree": "ff6131a47ff421212e20baab9aafdd77e2501bf7", + "version-string": "0.17.1", + "port-version": 0 + }, + { + "git-tree": "012849d033ed76bfbb71a6ec743da3cce732cf02", + "version-string": "0.16.1", + "port-version": 0 + }, + { + "git-tree": "1d02d6755400f753c5aedb5f598c47a6f993ab29", + "version-string": "0.15.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xtensor-fftw.json b/port_versions/x-/xtensor-fftw.json new file mode 100644 index 00000000000000..daff4e651db5a5 --- /dev/null +++ b/port_versions/x-/xtensor-fftw.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "507af996ff26bc000fd73761de24f58be61507bd", + "version-string": "2019-11-30", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xtensor-io.json b/port_versions/x-/xtensor-io.json new file mode 100644 index 00000000000000..47bb3eacc7d9ca --- /dev/null +++ b/port_versions/x-/xtensor-io.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "3320a5f7436e8ecde84b90eb918806fbf034cafa", + "version-string": "0.9.0", + "port-version": 1 + }, + { + "git-tree": "3bda5e38afd906085b050f73b25428a3a0b95214", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "8379808fda37d8184db586840bba04f85b265037", + "version-string": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xtensor.json b/port_versions/x-/xtensor.json new file mode 100644 index 00000000000000..b7712c308b0fd1 --- /dev/null +++ b/port_versions/x-/xtensor.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "5566727b83f68936619a2bf8872c1148a30c5c61", + "version-string": "0.21.9", + "port-version": 0 + }, + { + "git-tree": "3285cac5db5564b88bc032dc1afb06289d2953a8", + "version-string": "0.21.6", + "port-version": 0 + }, + { + "git-tree": "b6ce0d2b0f98d7536e49b6b72c2023526793f6d9", + "version-string": "0.21.3", + "port-version": 0 + }, + { + "git-tree": "30539e9c1585d5c2b0abbb61660feba31c7d5a43", + "version-string": "0.21.2", + "port-version": 0 + }, + { + "git-tree": "650d534643542577628e56467f28f426756a0ea3", + "version-string": "0.20.8", + "port-version": 0 + }, + { + "git-tree": "18f7fb322b2fc323bcab74894a44e80416fbec67", + "version-string": "0.20.7-2", + "port-version": 0 + }, + { + "git-tree": "8cea19d9df7a2ee5484c00708b6b64c33f5ab1a9", + "version-string": "0.20.7-1", + "port-version": 0 + }, + { + "git-tree": "fcc53ee2ed4665630b68f28b82a6f1c30e1febea", + "version-string": "0.20.7", + "port-version": 0 + }, + { + "git-tree": "1be4c2f3cf4ac4773a5f995b474ff263053eebe0", + "version-string": "0.20.5", + "port-version": 0 + }, + { + "git-tree": "6df88ca11371ca5624fd23851e75be148618d7ef", + "version-string": "0.19.3", + "port-version": 0 + }, + { + "git-tree": "be639cb43ae34308a3970da60d73c856d8e3708e", + "version-string": "2019-01-20", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xtl.json b/port_versions/x-/xtl.json new file mode 100644 index 00000000000000..5f252b87d5c45c --- /dev/null +++ b/port_versions/x-/xtl.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "f0cc60a9db2ec13e64cda97ae85bb344a8cd3e10", + "version-string": "0.6.21", + "port-version": 0 + }, + { + "git-tree": "c6682c073b48d7675bb3d236c1ddf339090f6154", + "version-string": "0.6.18", + "port-version": 0 + }, + { + "git-tree": "f69d466cce3089a9d295643d474b379e589c601a", + "version-string": "0.6.11", + "port-version": 0 + }, + { + "git-tree": "5d3095cf508a30f18a0c24256a103f5b0fec3922", + "version-string": "0.6.10", + "port-version": 0 + }, + { + "git-tree": "bc1cbe58845705fc01b35bac4a7bab3a2ee7b85b", + "version-string": "0.6.5", + "port-version": 0 + }, + { + "git-tree": "bead179c1b17b511804cafcf9cffb575393f7b6b", + "version-string": "0.6.4", + "port-version": 0 + }, + { + "git-tree": "a9b12447e8db53c110404d730a692201e53ee5c7", + "version-string": "0.5.4", + "port-version": 0 + }, + { + "git-tree": "238cce967e8f6dd4b92e507f3f1b4b7bd7c45947", + "version-string": "0.5.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/x-/xxhash.json b/port_versions/x-/xxhash.json new file mode 100644 index 00000000000000..6859d02fac9fef --- /dev/null +++ b/port_versions/x-/xxhash.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "b0513b38c64783f4c9fe001b995f62a10f2e6d8c", + "version-string": "0.8.0", + "port-version": 1 + }, + { + "git-tree": "bf43ef4c3cf428cfc5c89e07008321caec66e923", + "version-string": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "318c3d88579895b6b288694282494bb6ab366de2", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "bab43952d557d7d33f36c79cb2644035eb7a939d", + "version-string": "0.6.4-1", + "port-version": 0 + }, + { + "git-tree": "313f9b028310d91dea6bbed71ef881640dc59891", + "version-string": "0.6.4", + "port-version": 0 + }, + { + "git-tree": "bf8862a937ee1da793008dd671553e183e3a4e0f", + "version-string": "0.6.3-1", + "port-version": 0 + }, + { + "git-tree": "882693b8deea7d882395c29b0649008940ad7999", + "version-string": "0.6.3", + "port-version": 0 + }, + { + "git-tree": "21ced86901edd80f5dd31cdadda0017c86785095", + "version-string": "0.6.2", + "port-version": 0 + } + ] +} diff --git a/port_versions/y-/yajl.json b/port_versions/y-/yajl.json new file mode 100644 index 00000000000000..c1761ec586170e --- /dev/null +++ b/port_versions/y-/yajl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b91fee2584125e4f7eb17d16127db70c035164b1", + "version-string": "2.1.0-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/y-/yaml-cpp.json b/port_versions/y-/yaml-cpp.json new file mode 100644 index 00000000000000..433f4172c2ed6a --- /dev/null +++ b/port_versions/y-/yaml-cpp.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "fabfdd85c28d751aa769d2e743bf0e9ccd8dd178", + "version-string": "0.6.3", + "port-version": 0 + }, + { + "git-tree": "613f6450df1c2032c3fa499dad4575658f37ca39", + "version-string": "0.6.2-3", + "port-version": 0 + }, + { + "git-tree": "61de23b286e94be1f49a2a20940268a17f666086", + "version-string": "0.6.2-2", + "port-version": 0 + }, + { + "git-tree": "325fd2b8906df2b997bdcc3abc5380330b0a5046", + "version-string": "0.6.2-1", + "port-version": 0 + }, + { + "git-tree": "9f2b057c9ed2c4a241ece16c273610acb4eeb8d2", + "version-string": "0.6.2", + "port-version": 0 + }, + { + "git-tree": "893c537e8a1fbd42b543c5e8c644339e197d097e", + "version-string": "0.6.2-1", + "port-version": 0 + }, + { + "git-tree": "9f2b057c9ed2c4a241ece16c273610acb4eeb8d2", + "version-string": "0.6.2", + "port-version": 0 + }, + { + "git-tree": "d9a93b9108e8f74bf8232dbe2511e87ebf75ac46", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "1581988165a4a8f71eeea887ffe7505e6165cfc9", + "version-string": "0.5.4-rc-2", + "port-version": 0 + }, + { + "git-tree": "097af6135482212eedae5d402a7e0b49f9338d24", + "version-string": "0.5.4-rc-1", + "port-version": 0 + }, + { + "git-tree": "ee3bb4553a4e53a1ac419d77b1739910d68126fd", + "version-string": "0.5.4 candidate", + "port-version": 0 + } + ] +} diff --git a/port_versions/y-/yara.json b/port_versions/y-/yara.json new file mode 100644 index 00000000000000..87eb7642538be1 --- /dev/null +++ b/port_versions/y-/yara.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "05877091cce367e06a5d4e06ed69484d92e420d0", + "version-string": "4.0.2", + "port-version": 0 + }, + { + "git-tree": "fe271e17f4744b14d0ac8ae068a37886c76938fc", + "version-string": "3.10.0-1", + "port-version": 0 + }, + { + "git-tree": "a5d7d9a3390fb13e5e0bfae561d7f5b60166933c", + "version-string": "3.10.0", + "port-version": 0 + }, + { + "git-tree": "04ff93911dfd06d230c3655f3f543edb7791124f", + "version-string": "e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9-2", + "port-version": 0 + }, + { + "git-tree": "da59de45fdc6d82326d9bb2a63a7d7f6cfa24ffe", + "version-string": "e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9-1", + "port-version": 0 + }, + { + "git-tree": "8bbd51b411776d044599cee9fb3962b0745d8b1f", + "version-string": "e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9", + "port-version": 0 + } + ] +} diff --git a/port_versions/y-/yas.json b/port_versions/y-/yas.json new file mode 100644 index 00000000000000..6baadfd3375516 --- /dev/null +++ b/port_versions/y-/yas.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1976b779d7006fcca2cbe8315c3cd88fd18badd0", + "version-string": "7.0.5", + "port-version": 0 + }, + { + "git-tree": "d347f65f39f0dc3042d2c4bf7c86d323aa6626b2", + "version-string": "7.0.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/y-/yasm-tool-helper.json b/port_versions/y-/yasm-tool-helper.json new file mode 100644 index 00000000000000..9c3fb6af811d82 --- /dev/null +++ b/port_versions/y-/yasm-tool-helper.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cd72a3cb256fdf68ad6b78a64613744ca2bc1d1f", + "version-string": "2020-10-12", + "port-version": 0 + } + ] +} diff --git a/port_versions/y-/yasm-tool.json b/port_versions/y-/yasm-tool.json new file mode 100644 index 00000000000000..e71e3e578ee8ca --- /dev/null +++ b/port_versions/y-/yasm-tool.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "40cca1c50553ac0d87c91af9c0125d8f3e6e8a09", + "version-string": "2020-10-12", + "port-version": 0 + } + ] +} diff --git a/port_versions/y-/yasm.json b/port_versions/y-/yasm.json new file mode 100644 index 00000000000000..4bf20e559ecf51 --- /dev/null +++ b/port_versions/y-/yasm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "252cc74ece532436f42df78cfb8aaa3c2735673c", + "version-string": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/y-/yato.json b/port_versions/y-/yato.json new file mode 100644 index 00000000000000..05742337206016 --- /dev/null +++ b/port_versions/y-/yato.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "4ff4647e49ec1e98b49e1bc9d6b8cf236bce7831", + "version-string": "1.0-2", + "port-version": 0 + }, + { + "git-tree": "f370a9928149b5b81594432b71f2d543e1a39b47", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "b5b20aecce47d074e3b998157b84007474a83241", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/y-/yoga.json b/port_versions/y-/yoga.json new file mode 100644 index 00000000000000..76e397efee0ac0 --- /dev/null +++ b/port_versions/y-/yoga.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "3052ea42237961392cbc1fab6d07160337919cdd", + "version-string": "1.18.0-1", + "port-version": 0 + }, + { + "git-tree": "5746ab64a20bcac47d870203c8be47945839b47e", + "version-string": "1.16.0-1", + "port-version": 0 + }, + { + "git-tree": "fb9b2a38a9239128eda8bdb4212a5c5f1089923d", + "version-string": "1.14.0-1", + "port-version": 0 + }, + { + "git-tree": "2ea74a02f9d32dadbc8f4ec525e954c6ec885df9", + "version-string": "1.14.0", + "port-version": 0 + }, + { + "git-tree": "6c231ebc718ef28685f4ce22ecbe371605e21d69", + "version-string": "1.12.0-pre.3", + "port-version": 0 + }, + { + "git-tree": "5c1e13a787f95f5d478e2ad7e0d1669bf5b65be1", + "version-string": "1.13.0", + "port-version": 0 + }, + { + "git-tree": "a0b6613df15131ac3bf78b6a3882aa928f929a43", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "a677828a2b738dd166f65bbbde053c460292e3e7", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "b5842dca227152db9acbd686bb7e59db89fa0a14", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "712f3e192b3988c31125ab03e52c5d2598e930da", + "version-string": "1.7.0-1", + "port-version": 0 + }, + { + "git-tree": "2617d24dc94ded5216ab1c61277284732f1c8177", + "version-string": "1.7.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/z3.json b/port_versions/z-/z3.json new file mode 100644 index 00000000000000..5c4f5cf21516d5 --- /dev/null +++ b/port_versions/z-/z3.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "7081291c8d70cea0a783c78fa8f27219cad7b77c", + "version-string": "4.8.9", + "port-version": 0 + }, + { + "git-tree": "6555488e80a528c2470ceaf03c4c89c7afe02e2e", + "version-string": "4.8.8", + "port-version": 0 + }, + { + "git-tree": "400c779fbbcb32b7a2438b0bf59edfebc21a10bb", + "version-string": "4.8.6", + "port-version": 0 + }, + { + "git-tree": "f9c69bb54bb81b18f317dd2967b52634a7944a04", + "version-string": "4.8.5-1", + "port-version": 0 + }, + { + "git-tree": "5ed567eda111af09f639a9a81f5577c4739a2010", + "version-string": "4.8.5", + "port-version": 0 + }, + { + "git-tree": "9151b0fe33bb47860dff2049e0e86233cee2e57a", + "version-string": "4.8.4-1", + "port-version": 0 + }, + { + "git-tree": "fe89bbe59ac13cb35531d231cacb629f5d140241", + "version-string": "4.8.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/z85.json b/port_versions/z-/z85.json new file mode 100644 index 00000000000000..06a71818efb5da --- /dev/null +++ b/port_versions/z-/z85.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b56d7eb36e5f53164b2f3dba37327a68fc98d378", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/zeromq.json b/port_versions/z-/zeromq.json new file mode 100644 index 00000000000000..b71eb71f6e4b8e --- /dev/null +++ b/port_versions/z-/zeromq.json @@ -0,0 +1,174 @@ +{ + "versions": [ + { + "git-tree": "8b2b16bcbcdd4854b2bebbafb27fc9c511ad4c07", + "version-string": "2019-09-20", + "port-version": 2 + }, + { + "git-tree": "aa4a6c2a6f555fe546e2f8f1bdc5f608abb23826", + "version-string": "2019-09-20", + "port-version": 1 + }, + { + "git-tree": "711b57c71c897ffe55b412b9e06d9f7aa906cb30", + "version-string": "2019-09-20", + "port-version": 0 + }, + { + "git-tree": "ef8e2ddef1e9d99cefa55a6ed7b31bcfd4e45459", + "version-string": "2019-07-09-1", + "port-version": 0 + }, + { + "git-tree": "56d2fd5a500eb7c5bb356c2f57d116721233ee37", + "version-string": "2019-07-09", + "port-version": 0 + }, + { + "git-tree": "75faa79980735e0923648ef7d4c8313922744108", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "d941ab6cd82d6afc9c4bb063f0c91d0d804c5ec9", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "c2c1c74284b70fafa1f506224bd68fec842cc58a", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "6ee8da90743523d60d6e0d1db349bbbfca395133", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "024abc1aebe0758601e8034fb6ea7f149734089d", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "27e7b1ee5e44ff3bcac05a4f31849ebdcc890040", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "cac85f13f476d04a63d433eefa86cb942bb94cbd", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "0f8b5598e91519d9ea3c63f9ee227a53aefa4166", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "c983f0ccc772fb2e1c6e5b6a9cf374d3b25d0c75", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "5e95c42e21675fad6e1c17468a8aab7a83e9e9ed", + "version-string": "2018-07-01", + "port-version": 0 + }, + { + "git-tree": "d07ee4d15a4a952b8263531318fe01aa7b3f373e", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "b63c5a345cee07afc4de7664973ab3ae913a68c3", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "d3adab928e512bf541e570e61c92ae4b87a22246", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "1278b7e3c3b7be5a9f0857ee67ecdc66572b4d1c", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "aae2a5f333ebb9b3be312c209c31c109fd8f3ac5", + "version-string": "2018-04-17", + "port-version": 0 + }, + { + "git-tree": "a2b20a4888a762b3f88e9ecc4f5c8dfc6a331ae2", + "version-string": "2018-04-05-1", + "port-version": 0 + }, + { + "git-tree": "ea6c8a7a5a5d3e947111cb65ed1c2b212ac16841", + "version-string": "2018-04-05", + "port-version": 0 + }, + { + "git-tree": "605ba6226dee060b0d7997d03dfc45ea15888899", + "version-string": "2018-03-29", + "port-version": 0 + }, + { + "git-tree": "b16ca9f02276e6943cd3febd5ce0d0c7350192db", + "version-string": "2018-03-27", + "port-version": 0 + }, + { + "git-tree": "15c0de06b7bf53a3bd9d2437c5419212da768233", + "version-string": "2018-03-23", + "port-version": 0 + }, + { + "git-tree": "3bb3f4c4f2699ee016384a53c2ad98c0bc4a135f", + "version-string": "2018-03-20", + "port-version": 0 + }, + { + "git-tree": "b2e2d84972349c244af76eb036c7a51c5641f542", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "adc5178758d6f76415ed144843bc41f854e97c5c", + "version-string": "2018-03-14", + "port-version": 0 + }, + { + "git-tree": "7785608ea2fcbaccb02686c429a9486c5bbd6740", + "version-string": "20170908-18498f620f0f6d4076981ea16eb5760fe4d28dc2-2", + "port-version": 0 + }, + { + "git-tree": "68b255bcf82e79f475e858b14b516d19a1578f07", + "version-string": "20170908-18498f620f0f6d4076981ea16eb5760fe4d28dc2-1", + "port-version": 0 + }, + { + "git-tree": "6c3b61de8093c3f32eaeaaae6af922b62caae353", + "version-string": "20170908-18498f620f0f6d4076981ea16eb5760fe4d28dc2", + "port-version": 0 + }, + { + "git-tree": "c3ddc1b59840067e81cceccbee42b04b0078ac5f", + "version-string": "4.2.2", + "port-version": 0 + }, + { + "git-tree": "ee57eeb0e7c57bbd14a7ee07fb0270eedb18d14e", + "version-string": "4.2.0", + "port-version": 0 + }, + { + "git-tree": "835d0f3ec8c1ea55b992fb57a7ecc25ffd7c22be", + "version-string": "4.2.x.1a02b1b3f2", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/zfp.json b/port_versions/z-/zfp.json new file mode 100644 index 00000000000000..22f59a9ea70f20 --- /dev/null +++ b/port_versions/z-/zfp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "bb74f3eda84b0d0a5426601889ae3bacb68e6b6f", + "version-string": "0.5.5-2", + "port-version": 0 + }, + { + "git-tree": "8826139df2d4dd3ed9d61aca249865ee3f209753", + "version-string": "0.5.5-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/zkpp.json b/port_versions/z-/zkpp.json new file mode 100644 index 00000000000000..4ff16665f7d6a2 --- /dev/null +++ b/port_versions/z-/zkpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "36ee3997fc686a009718566997f969892ae134bd", + "version-string": "0.2.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/zlib.json b/port_versions/z-/zlib.json new file mode 100644 index 00000000000000..006dd7c417dfa7 --- /dev/null +++ b/port_versions/z-/zlib.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "827111046e37c98153d9d82bb6fa4183b6d728e4", + "version-string": "1.2.11", + "port-version": 9 + }, + { + "git-tree": "068430e3e24fa228c302c808ba99f8a48d126557", + "version-string": "1.2.11", + "port-version": 8 + }, + { + "git-tree": "6a24abc8d789ceacc8aaf7c81e2a3faf1f037d14", + "version-string": "1.2.11", + "port-version": 7 + }, + { + "git-tree": "0efe4e4647fa585e6ac34a250df2d9989825bb90", + "version-string": "1.2.11-6", + "port-version": 0 + }, + { + "git-tree": "548fc3e95e4755b329cdd40cde7d83a409182469", + "version-string": "1.2.11-5", + "port-version": 0 + }, + { + "git-tree": "568cdfb5144c8de58daac62bace38cf7d5040e4a", + "version-string": "1.2.11-3", + "port-version": 0 + }, + { + "git-tree": "6ada5449a413aa717545457cb6e674d1590f1573", + "version-string": "1.2.11-2", + "port-version": 0 + }, + { + "git-tree": "51525f628e33dc6aa8fd00db8a7b53bc2f392da4", + "version-string": "1.2.11-1", + "port-version": 0 + }, + { + "git-tree": "356c8b9d736b19e30f83d7ef735d21e0c063c6ca", + "version-string": "1.2.11", + "port-version": 0 + }, + { + "git-tree": "a516e5ee220c8250f21821077d0e3dd517f02631", + "version-string": "1.2.10", + "port-version": 0 + }, + { + "git-tree": "3309ec82cd96d752ff890c441cb20ef49b52bf94", + "version-string": "1.2.8", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/zookeeper.json b/port_versions/z-/zookeeper.json new file mode 100644 index 00000000000000..fb188c1fe83975 --- /dev/null +++ b/port_versions/z-/zookeeper.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e9a48341219262a6519a4d1403db84e328426a08", + "version-string": "3.5.5-1", + "port-version": 0 + }, + { + "git-tree": "5cb5036ecf90b95cacb6ff1c071e180faf1337b0", + "version-string": "3.5.5", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/zopfli.json b/port_versions/z-/zopfli.json new file mode 100644 index 00000000000000..28ae8360e07319 --- /dev/null +++ b/port_versions/z-/zopfli.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "27c5f23197d8f38f23f64810b6a0ced0158b66cb", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "190a3b27e6c9bde1731b207a98852782f8c139b2", + "version-string": "2019-01-19-1", + "port-version": 0 + }, + { + "git-tree": "a734b694b16814ddd397ef451b3da942e5952ae2", + "version-string": "2019-01-19", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/zserge-webview.json b/port_versions/z-/zserge-webview.json new file mode 100644 index 00000000000000..873ace071dc298 --- /dev/null +++ b/port_versions/z-/zserge-webview.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "91f16a7320fcf8432fca4c071e0a9c1817f56cbd", + "version-string": "2019-04-27-2", + "port-version": 0 + }, + { + "git-tree": "106ea28ccc426c18a277e84f725c91d469985d32", + "version-string": "2019-04-27-1", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/zstd.json b/port_versions/z-/zstd.json new file mode 100644 index 00000000000000..a4417103611d4b --- /dev/null +++ b/port_versions/z-/zstd.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "b592e9dd5ab7aa6c1b46e0d23e0d31093edd73ca", + "version-string": "1.4.5", + "port-version": 1 + }, + { + "git-tree": "f54acbd978ca51777ce06122fdc5d69c25265b5c", + "version-string": "1.4.4", + "port-version": 3 + }, + { + "git-tree": "6ab50055bdc3d4ead6bbd553651f9f0c7cbd6f94", + "version-string": "1.4.4", + "port-version": 2 + }, + { + "git-tree": "3ba4b114d0f04692783b2590e604283e7e7f042b", + "version-string": "1.4.4-1", + "port-version": 0 + }, + { + "git-tree": "33e39327c2c70618754051fd73f72a0267298ab9", + "version-string": "1.4.4", + "port-version": 0 + }, + { + "git-tree": "f02ec97c7e6df39cc9a46b702dcfd422707fe870", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "23e41fd77fbadcb4052c4eecb114352fa18a23c0", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "96feb17d2d1ef2509eebb9b1284d160118463bf6", + "version-string": "1.3.7-2", + "port-version": 0 + }, + { + "git-tree": "6f6e87428ee4fa34b6eb5c8c063fe62f3047c813", + "version-string": "1.3.7-1", + "port-version": 0 + }, + { + "git-tree": "735aba46d7ed2c20f8d30f841a0ab68ab9bf28e7", + "version-string": "1.3.4", + "port-version": 0 + }, + { + "git-tree": "89c93fcd82e1fb5764d313e7c498e05bac20fcd7", + "version-string": "1.3.3", + "port-version": 0 + }, + { + "git-tree": "46a00bf089292b0381b9e67e9e9f56daa1704d10", + "version-string": "1.3.1-1", + "port-version": 0 + }, + { + "git-tree": "6c78658a31bfe05da6e32da1f2786d7355bcc15e", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "c4e2736515da855d2b6976192c53f4d9d21fd2b5", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "84ea38bb014aee1a9cecd0a251208ea5233c0311", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "6e4431618021d7578990d7cecd406ba49ffa0a18", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/zstr.json b/port_versions/z-/zstr.json new file mode 100644 index 00000000000000..4e6aff72c37d41 --- /dev/null +++ b/port_versions/z-/zstr.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "9e180d152b886a9b45cc03c36fadaee8968d79d1", + "version-string": "1.0.4", + "port-version": 0 + }, + { + "git-tree": "ecfa65565472759dcfe5da572db74531cef69da4", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/zxing-cpp.json b/port_versions/z-/zxing-cpp.json new file mode 100644 index 00000000000000..3a1eca92071425 --- /dev/null +++ b/port_versions/z-/zxing-cpp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "d7761651d4c426d0322f52d5508b5beb66af6c9d", + "version-string": "3.3.3", + "port-version": 8 + }, + { + "git-tree": "a4b0e8ce0773a272e37b3b0ef4dcf4771d620f24", + "version-string": "3.3.3-7", + "port-version": 0 + }, + { + "git-tree": "460ac7317e61f434d938631a2de82c55b2c2324e", + "version-string": "3.3.3-6", + "port-version": 0 + }, + { + "git-tree": "544d28892fc3c90fad8ae125c172e58923e1ca0a", + "version-string": "3.3.3-5", + "port-version": 0 + }, + { + "git-tree": "78241ab4164a882ef3b2d26e0a97ffa2f04f96f6", + "version-string": "3.3.3-4", + "port-version": 0 + }, + { + "git-tree": "155c05375b047a53d88b7f91da9e592548468bb3", + "version-string": "3.3.3-3", + "port-version": 0 + }, + { + "git-tree": "2649920bf4a7c4fcccf19d84130e36856023cc89", + "version-string": "3.3.3-2", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/zydis.json b/port_versions/z-/zydis.json new file mode 100644 index 00000000000000..9c7204fdb81ba5 --- /dev/null +++ b/port_versions/z-/zydis.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a27e395ffb6b0c8329228b3df9c3af8fd19c1b44", + "version-string": "3.1.0-1", + "port-version": 0 + }, + { + "git-tree": "1b0270a633fe432a70244f2f810bdb59c90d2bc8", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "e089469cf7e5a019171b1cc8507ab402b1e713e8", + "version-string": "2.0.3", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/zyre.json b/port_versions/z-/zyre.json new file mode 100644 index 00000000000000..0819d9508aa85f --- /dev/null +++ b/port_versions/z-/zyre.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b3300f003099d2e0597453a90fa1df903b6b5c56", + "version-string": "2019-07-07-1", + "port-version": 0 + }, + { + "git-tree": "40277e20c025cb75ce978df03921b79354d54b6f", + "version-string": "2019-07-07", + "port-version": 0 + } + ] +} diff --git a/port_versions/z-/zziplib.json b/port_versions/z-/zziplib.json new file mode 100644 index 00000000000000..017e3328862c0e --- /dev/null +++ b/port_versions/z-/zziplib.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "7cdcdf231074be830e74ba4c498b9b34ba50b94a", + "version-string": "0.13.71", + "port-version": 1 + }, + { + "git-tree": "46d8c438267ece7a8e8ca0079896b25e579a845d", + "version-string": "0.13.71", + "port-version": 0 + }, + { + "git-tree": "333d5e69b5cbabfaa3546c82fe02625e2697a492", + "version-string": "0.13.69-4", + "port-version": 0 + }, + { + "git-tree": "42ebb18a0e56352eb30235bca393c9e4b1a57b6a", + "version-string": "0.13.69-3", + "port-version": 0 + }, + { + "git-tree": "695c2d19cae510498c778f638937d493f804af27", + "version-string": "0.13.69-2", + "port-version": 0 + }, + { + "git-tree": "96e1bf5cd31519fda79a3a1158ac8fab9d380138", + "version-string": "0.13.69-1", + "port-version": 0 + }, + { + "git-tree": "40d5420caade60bef0ac6c8fcccf631d25c98204", + "version-string": "0.13.69", + "port-version": 0 + }, + { + "git-tree": "08fd5cd576cb00754f7836c1253c50106f5c922b", + "version-string": "0.13.62-1", + "port-version": 0 + }, + { + "git-tree": "bdb83205c616c6605de6a805a465663a88e91323", + "version-string": "0.13.62", + "port-version": 0 + } + ] +} From 97520ca480bc390529b3cabb5899bf26b8a0cf04 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 14 Jan 2021 19:50:31 -0800 Subject: [PATCH 0486/1694] [vcpkg registries] Add git registries (#15054) * [vcpkg registries] Add git registries support * Add git registries support to the registries module of vcpkg. * add e2e tests for git registries * fix vcpkg.cmake for registries * fix CRs, remove a thing * better error messages * Billy CRs * fix Robert's CR comment * I learned about `-c` today * format * fix baseline.json * failing to find baseline is technically not a bug --- .../end-to-end-tests-dir/registries.ps1 | 184 ++++++++++++- .../end-to-end-tests-dir/versions.ps1 | 2 +- .../end-to-end-tests-prelude.ps1 | 23 +- scripts/azure-pipelines/end-to-end-tests.ps1 | 2 + scripts/buildsystems/vcpkg.cmake | 10 + scripts/e2e_ports/port_versions/baseline.json | 4 +- toolsrc/CMakeLists.txt | 2 +- toolsrc/include/vcpkg/base/files.h | 57 +++++ toolsrc/include/vcpkg/base/system.h | 2 + toolsrc/include/vcpkg/vcpkgpaths.h | 10 + toolsrc/src/vcpkg/base/system.cpp | 9 + toolsrc/src/vcpkg/install.cpp | 10 +- toolsrc/src/vcpkg/registries.cpp | 241 ++++++++++++++++-- toolsrc/src/vcpkg/vcpkgpaths.cpp | 159 ++++++++++++ 14 files changed, 678 insertions(+), 37 deletions(-) diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 index b985a61f56d841..777c0901fc1612 100644 --- a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 @@ -1,13 +1,187 @@ . "$PSScriptRoot/../end-to-end-tests-prelude.ps1" -$commonArgs += @("--x-builtin-port-versions-dir=$PSScriptRoot/../../e2e_ports/port_versions") +$builtinRegistryArgs = $commonArgs + @("--x-builtin-port-versions-dir=$PSScriptRoot/../../e2e_ports/port_versions") -Run-Vcpkg install @commonArgs 'vcpkg-internal-e2e-test-port' +Run-Vcpkg install @builtinRegistryArgs 'vcpkg-internal-e2e-test-port' Throw-IfNotFailed -Run-Vcpkg install @commonArgs --feature-flags=registries 'vcpkg-internal-e2e-test-port' -Throw-IfFailed +# We should not look into the port_versions directory unless we have a baseline, +# even if we pass the registries feature flag +Run-Vcpkg install @builtinRegistryArgs --feature-flags=registries 'vcpkg-internal-e2e-test-port' +Throw-IfNotFailed -Run-Vcpkg install @commonArgs --feature-flags=registries 'zlib' +Run-Vcpkg install @builtinRegistryArgs --feature-flags=registries 'zlib' Throw-IfFailed + +# Test git and filesystem registries +Refresh-TestRoot +$filesystemRegistry = "$TestingRoot/filesystem-registry" +$gitRegistryUpstream = "$TestingRoot/git-registry-upstream" + +# build a filesystem registry +New-Item -Path $filesystemRegistry -ItemType Directory +$filesystemRegistry = (Get-Item $filesystemRegistry).FullName + +Copy-Item -Recurse ` + -LiteralPath "$PSScriptRoot/../../e2e_ports/vcpkg-internal-e2e-test-port" ` + -Destination "$filesystemRegistry" +New-Item ` + -Path "$filesystemRegistry/port_versions" ` + -ItemType Directory +Copy-Item ` + -LiteralPath "$PSScriptRoot/../../e2e_ports/port_versions/baseline.json" ` + -Destination "$filesystemRegistry/port_versions/baseline.json" +New-Item ` + -Path "$filesystemRegistry/port_versions/v-" ` + -ItemType Directory + +$vcpkgInternalE2eTestPortJson = @{ + "versions" = @( + @{ + "version-string" = "1.0.0"; + "path" = "$/vcpkg-internal-e2e-test-port" + } + ) +} +New-Item ` + -Path "$filesystemRegistry/port_versions/v-/vcpkg-internal-e2e-test-port.json" ` + -ItemType File ` + -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgInternalE2eTestPortJson) + + +# build a git registry +New-Item -Path $gitRegistryUpstream -ItemType Directory +$gitRegistryUpstream = (Get-Item $gitRegistryUpstream).FullName + +Push-Location $gitRegistryUpstream +try +{ + $gitConfigOptions = @( + '-c', 'user.name=Nobody', + '-c', 'user.email=nobody@example.com', + '-c', 'core.autocrlf=false' + ) + + $CurrentTest = 'git init .' + git @gitConfigOptions init . + Throw-IfFailed + Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/port_versions" -Destination . + Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/vcpkg-internal-e2e-test-port" -Destination . + + $CurrentTest = 'git add -A' + git @gitConfigOptions add -A + Throw-IfFailed + $CurrentTest = 'git commit' + git @gitConfigOptions commit -m 'initial commit' + Throw-IfFailed +} +finally +{ + Pop-Location +} + +# actually test the registries +$vcpkgJson = @{ + "name" = "manifest-test"; + "version-string" = "1.0.0"; + "dependencies" = @( + "vcpkg-internal-e2e-test-port" + ) +} + +$manifestDir = "$TestingRoot/builtin-registry-test-manifest-dir" + +New-Item -Path $manifestDir -ItemType Directory +$manifestDir = (Get-Item $manifestDir).FullName + +Push-Location $manifestDir + +try +{ + $vcpkgJsonWithBaseline = $vcpkgJson.Clone() + $vcpkgJsonWithBaseline['$x-default-baseline'] = 'default' + + New-Item -Path 'vcpkg.json' -ItemType File ` + -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgJson) + + Run-Vcpkg install @builtinRegistryArgs '--feature-flags=registries,manifests' + Throw-IfNotFailed + + New-Item -Path 'vcpkg.json' -ItemType File -Force ` + -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgJsonWithBaseline) + + Run-Vcpkg install @builtinRegistryArgs '--feature-flags=registries,manifests' + Throw-IfFailed +} +finally +{ + Pop-Location +} + + +# test the filesystem registry +$manifestDir = "$TestingRoot/filesystem-registry-test-manifest-dir" + +New-Item -Path $manifestDir -ItemType Directory +$manifestDir = (Get-Item $manifestDir).FullName + +Push-Location $manifestDir +try +{ + New-Item -Path 'vcpkg.json' -ItemType File ` + -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgJson) + + $vcpkgConfigurationJson = @{ + "default-registry" = $null; + "registries" = @( + @{ + "kind" = "filesystem"; + "path" = $filesystemRegistry; + "packages" = @( "vcpkg-internal-e2e-test-port" ) + } + ) + } + New-Item -Path 'vcpkg-configuration.json' -ItemType File ` + -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgConfigurationJson) + + Run-Vcpkg install @builtinRegistryArgs '--feature-flags=registries,manifests' + Throw-IfFailed +} +finally +{ + Pop-Location +} + +# test the git registry +$manifestDir = "$TestingRoot/git-registry-test-manifest-dir" + +New-Item -Path $manifestDir -ItemType Directory +$manifestDir = (Get-Item $manifestDir).FullName + +Push-Location $manifestDir +try +{ + New-Item -Path 'vcpkg.json' -ItemType File ` + -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgJson) + + $vcpkgConfigurationJson = @{ + "default-registry" = $null; + "registries" = @( + @{ + "kind" = "git"; + "repository" = $gitRegistryUpstream; + "packages" = @( "vcpkg-internal-e2e-test-port" ) + } + ) + } + New-Item -Path 'vcpkg-configuration.json' -ItemType File ` + -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgConfigurationJson) + + Run-Vcpkg install @builtinRegistryArgs '--feature-flags=registries,manifests' + Throw-IfFailed +} +finally +{ + Pop-Location +} diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 index 5d61b2101d6c73..f5f9de20b1be89 100644 --- a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 @@ -69,7 +69,7 @@ Throw-IfNotFailed git fetch https://github.com/vicroms/test-registries $CurrentTest = "default baseline" -./vcpkg $commonArgs "--feature-flags=versions" install ` +./vcpkg $commonArgs --debug "--feature-flags=versions" install ` "--x-manifest-root=scripts/testing/version-files/default-baseline-2" ` "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions" Throw-IfFailed diff --git a/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 b/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 index 1e340eff730025..deadb210c13e48 100644 --- a/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 @@ -12,10 +12,19 @@ $commonArgs = @( "--x-buildtrees-root=$buildtreesRoot", "--x-install-root=$installRoot", "--x-packages-root=$packagesRoot", - "--overlay-ports=scripts/e2e_ports/overlays" + "--overlay-ports=$PSScriptRoot/../e2e_ports/overlays" ) $Script:CurrentTest = 'unassigned' +if ($IsWindows) +{ + $VcpkgExe = Get-Item './vcpkg.exe' +} +else +{ + $VcpkgExe = Get-Item './vcpkg' +} + function Refresh-TestRoot { Remove-Item -Recurse -Force $TestingRoot -ErrorAction SilentlyContinue mkdir $TestingRoot | Out-Null @@ -59,17 +68,9 @@ function Run-Vcpkg { [Parameter(ValueFromRemainingArguments)] [string[]]$TestArgs ) - - if ($IsWindows) { - $vcpkgName = 'vcpkg.exe' - } else { - $vcpkgName = 'vcpkg' - } - - $Script:CurrentTest = "./$vcpkgName $($testArgs -join ' ')" + $Script:CurrentTest = "vcpkg $($testArgs -join ' ')" Write-Host $Script:CurrentTest - & "./$vcpkgName" @testArgs | Tee-Object -Variable 'ConsoleOutput' - return $ConsoleOutput + & $VcpkgExe @testArgs } Refresh-TestRoot diff --git a/scripts/azure-pipelines/end-to-end-tests.ps1 b/scripts/azure-pipelines/end-to-end-tests.ps1 index 029120d5460e1d..3c9dd067f89713 100644 --- a/scripts/azure-pipelines/end-to-end-tests.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests.ps1 @@ -32,6 +32,8 @@ Param( $ErrorActionPreference = "Stop" +$WorkingRoot = (Get-Item $WorkingRoot).FullName + $AllTests = Get-ChildItem $PSScriptRoot/end-to-end-tests-dir/*.ps1 if ($Filter -ne $Null) { $AllTests = $AllTests | ? { $_.Name -match $Filter } diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index bc54afb709ec47..e13c3333b285d3 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -384,6 +384,11 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT _CMAKE_IN_TRY_COMPILE endforeach() endif() + if(DEFINED VCPKG_FEATURE_FLAGS OR DEFINED CACHE{VCPKG_FEATURE_FLAGS}) + list(JOIN VCPKG_FEATURE_FLAGS "," _VCPKG_FEATURE_FLAGS) + set(_VCPKG_FEATURE_FLAGS "--feature-flags=${_VCPKG_FEATURE_FLAGS}") + endif() + foreach(feature IN LISTS VCPKG_MANIFEST_FEATURES) list(APPEND _VCPKG_ADDITIONAL_MANIFEST_PARAMS "--x-feature=${feature}") endforeach() @@ -405,6 +410,7 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT _CMAKE_IN_TRY_COMPILE "--x-wait-for-lock" "--x-manifest-root=${_VCPKG_MANIFEST_DIR}" "--x-install-root=${_VCPKG_INSTALLED_DIR}" + "${_VCPKG_FEATURE_FLAGS}" ${_VCPKG_ADDITIONAL_MANIFEST_PARAMS} ${VCPKG_INSTALL_OPTIONS} OUTPUT_VARIABLE _VCPKG_MANIFEST_INSTALL_LOGTEXT @@ -422,6 +428,10 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT _CMAKE_IN_TRY_COMPILE set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${_VCPKG_MANIFEST_DIR}/vcpkg.json" "${_VCPKG_INSTALLED_DIR}/vcpkg/status") + if(EXISTS "${_VCPKG_MANIFEST_DIR}/vcpkg-configuration.json") + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS + "${_VCPKG_MANIFEST_DIR}/vcpkg-configuration.json") + endif() else() message(STATUS "Running vcpkg install - failed") _vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${_VCPKG_MANIFEST_INSTALL_LOGFILE}") diff --git a/scripts/e2e_ports/port_versions/baseline.json b/scripts/e2e_ports/port_versions/baseline.json index 98e63d8b5ed518..2413f8afc60ad5 100644 --- a/scripts/e2e_ports/port_versions/baseline.json +++ b/scripts/e2e_ports/port_versions/baseline.json @@ -1,3 +1,5 @@ { - "vcpkg-internal-e2e-test-port": { "baseline": "1.0.0" } + "default": { + "vcpkg-internal-e2e-test-port": { "baseline": "1.0.0" } + } } diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt index 317d000cc1b778..69d3cd0379fe21 100644 --- a/toolsrc/CMakeLists.txt +++ b/toolsrc/CMakeLists.txt @@ -185,7 +185,7 @@ endif() # === Target: tls12-download === -set(TLS12_DOWNLOAD_SOURCES src/tls12-download.c) +set(TLS12_DOWNLOAD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/tls12-download.c) if(WIN32) add_executable(tls12-download ${TLS12_DOWNLOAD_SOURCES}) set_property(TARGET tls12-download PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded") diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h index e1628eaf0bbc16..dd1b3a6c615f25 100644 --- a/toolsrc/include/vcpkg/base/files.h +++ b/toolsrc/include/vcpkg/base/files.h @@ -125,6 +125,12 @@ namespace fs #endif + inline bool operator==(SystemHandle lhs, SystemHandle rhs) noexcept + { + return lhs.system_handle == rhs.system_handle; + } + inline bool operator!=(SystemHandle lhs, SystemHandle rhs) noexcept { return !(lhs == rhs); } + inline bool is_symlink(file_status s) noexcept { #if defined(_WIN32) @@ -266,4 +272,55 @@ namespace vcpkg::Files #if defined(_WIN32) fs::path win32_fix_path_case(const fs::path& source); #endif // _WIN32 + + struct ExclusiveFileLock + { + enum class Wait + { + Yes, + No, + }; + + ExclusiveFileLock() = default; + ExclusiveFileLock(ExclusiveFileLock&& other) + : fs_(other.fs_), handle_(std::exchange(handle_, fs::SystemHandle{})) + { + } + ExclusiveFileLock& operator=(ExclusiveFileLock&& other) + { + if (this == &other) return *this; + + clear(); + fs_ = other.fs_; + handle_ = std::exchange(other.handle_, fs::SystemHandle{}); + return *this; + } + + ExclusiveFileLock(Wait wait, Filesystem& fs, const fs::path& path_, std::error_code& ec) : fs_(&fs) + { + switch (wait) + { + case Wait::Yes: handle_ = fs_->take_exclusive_file_lock(path_, ec); break; + case Wait::No: handle_ = fs_->try_take_exclusive_file_lock(path_, ec); break; + } + } + ~ExclusiveFileLock() { clear(); } + + explicit operator bool() const { return handle_.is_valid(); } + bool has_lock() const { return handle_.is_valid(); } + + void clear() + { + if (fs_ && handle_.is_valid()) + { + std::error_code ignore; + fs_->unlock_file_lock(std::exchange(handle_, fs::SystemHandle{}), ignore); + } + } + + private: + fs::SystemHandle handle_; + Filesystem* fs_; + }; + } diff --git a/toolsrc/include/vcpkg/base/system.h b/toolsrc/include/vcpkg/base/system.h index 8e45f6538a1994..da14fa4bbc62c2 100644 --- a/toolsrc/include/vcpkg/base/system.h +++ b/toolsrc/include/vcpkg/base/system.h @@ -20,6 +20,8 @@ namespace vcpkg::System Optional get_registry_string(void* base_hkey, StringView subkey, StringView valuename); + long get_process_id(); + enum class CPUArchitecture { X86, diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index a175d51e219c1b..36447b9f37b69a 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -124,6 +124,16 @@ namespace vcpkg ExpectedS>> git_get_local_port_treeish_map() const; + // Git manipulation for remote registries + // runs `git fetch {uri} {treeish}`, and returns the hash of FETCH_HEAD. + // If `treeish` is empty, then just runs `git fetch {uri}` + ExpectedS git_fetch_from_remote_registry(StringView uri, StringView treeish = {}) const; + ExpectedS git_show_from_remote_registry(StringView hash, + const fs::path& relative_path_to_file) const; + ExpectedS git_find_object_id_for_remote_registry_path(StringView hash, + const fs::path& relative_path_to_file) const; + ExpectedS git_checkout_object_from_remote_registry(StringView tree) const; + Optional get_manifest() const; Optional get_manifest_path() const; const Configuration& get_configuration() const; diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp index 9429752be4eccd..c400815befe405 100644 --- a/toolsrc/src/vcpkg/base/system.cpp +++ b/toolsrc/src/vcpkg/base/system.cpp @@ -10,6 +10,15 @@ using namespace vcpkg::System; namespace vcpkg { + long System::get_process_id() + { +#ifdef _WIN32 + return ::_getpid(); +#else + return ::getpid(); +#endif + } + Optional System::to_cpu_architecture(StringView arch) { if (Strings::case_insensitive_ascii_equals(arch, "x86")) return CPUArchitecture::X86; diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index 51c7b8289fed93..80b4eae3ae9a4c 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include @@ -844,15 +845,18 @@ namespace vcpkg::Install features.erase(core_it); } - if (args.versions_enabled()) + if (args.versions_enabled() || args.registries_enabled()) { - auto verprovider = PortFileProvider::make_versioned_portfile_provider(paths); - auto baseprovider = PortFileProvider::make_baseline_provider(paths); if (auto p_baseline = manifest_scf.core_paragraph->extra_info.get("$x-default-baseline")) { paths.get_configuration().registry_set.experimental_set_builtin_registry_baseline( p_baseline->string()); } + } + if (args.versions_enabled()) + { + auto verprovider = PortFileProvider::make_versioned_portfile_provider(paths); + auto baseprovider = PortFileProvider::make_baseline_provider(paths); auto oprovider = PortFileProvider::make_overlay_provider(paths, args.overlay_ports); auto install_plan = diff --git a/toolsrc/src/vcpkg/registries.cpp b/toolsrc/src/vcpkg/registries.cpp index 7f84b507517627..b9afa089bef1b1 100644 --- a/toolsrc/src/vcpkg/registries.cpp +++ b/toolsrc/src/vcpkg/registries.cpp @@ -25,10 +25,13 @@ namespace // when `BuiltinRegistryEntry` is using a port versions file for a port, // it uses this as it's underlying type; // when `BuiltinRegistryEntry` is using a port tree, it uses the scfl - struct GitRegistryEntry + struct GitRegistryEntry final : RegistryEntry { explicit GitRegistryEntry(std::string&& port_name) : port_name(port_name) { } + View get_port_versions() const override { return port_versions; } + ExpectedS get_path_to_version(const VcpkgPaths&, const VersionT& version) const override; + std::string port_name; // these two map port versions to git trees @@ -37,6 +40,67 @@ namespace std::vector git_trees; }; + struct GitRegistry final : RegistryImplementation + { + GitRegistry(std::string&& repo, std::string&& baseline) + : m_repo(std::move(repo)), m_baseline_identifier(std::move(baseline)) + { + } + + std::unique_ptr get_port_entry(const VcpkgPaths&, StringView) const override; + + void get_all_port_names(std::vector&, const VcpkgPaths&) const override; + + Optional get_baseline_version(const VcpkgPaths&, StringView) const override; + + StringView get_commit_of_repo(const VcpkgPaths& paths) const + { + return m_commit.get([this, &paths]() -> std::string { + auto maybe_hash = paths.git_fetch_from_remote_registry(m_repo); + if (!maybe_hash.has_value()) + { + Checks::exit_with_message(VCPKG_LINE_INFO, + "Error: Failed to fetch from remote registry `%s`: %s", + m_repo, + maybe_hash.error()); + } + return std::move(*maybe_hash.get()); + }); + } + + fs::path get_versions_tree_path(const VcpkgPaths& paths) const + { + return m_versions_tree.get([this, &paths]() -> fs::path { + auto maybe_tree = paths.git_find_object_id_for_remote_registry_path(get_commit_of_repo(paths), + fs::u8path("port_versions")); + if (!maybe_tree) + { + Checks::exit_with_message( + VCPKG_LINE_INFO, + "Error: could not find the git tree for `port_versions` in repo `%s` at commit `%s`: %s", + m_repo, + get_commit_of_repo(paths), + maybe_tree.error()); + } + auto maybe_path = paths.git_checkout_object_from_remote_registry(*maybe_tree.get()); + if (!maybe_path) + { + Checks::exit_with_message(VCPKG_LINE_INFO, + "Error: failed to check out `port_versions` from repo %s: %s", + m_repo, + maybe_path.error()); + } + return std::move(*maybe_path.get()); + }); + } + + std::string m_repo; + DelayedInit m_commit; // TODO: eventually this should end up in the vcpkg-lock.json file + DelayedInit m_versions_tree; + std::string m_baseline_identifier; + DelayedInit m_baseline; + }; + struct BuiltinRegistryEntry final : RegistryEntry { explicit BuiltinRegistryEntry(std::unique_ptr&& entry) @@ -195,8 +259,7 @@ namespace std::unique_ptr BuiltinRegistry::get_port_entry(const VcpkgPaths& paths, StringView port_name) const { auto versions_path = paths.builtin_port_versions / relative_path_to_versions(port_name); - if ((paths.get_feature_flags().registries || paths.get_feature_flags().versions) && - paths.get_filesystem().exists(versions_path)) + if (!m_baseline_identifier.empty() && paths.get_filesystem().exists(versions_path)) { auto maybe_version_entries = load_versions_file(paths.get_filesystem(), VersionDbType::Git, paths.builtin_port_versions, port_name); @@ -247,6 +310,7 @@ namespace ExpectedS try_parse_builtin_baseline(const VcpkgPaths& paths, StringView baseline_identifier) { + if (baseline_identifier.size() == 0) return Baseline{}; auto path_to_baseline = paths.builtin_port_versions / fs::u8path("baseline.json"); auto res_baseline = load_baseline_versions(paths, path_to_baseline, baseline_identifier); @@ -261,15 +325,10 @@ namespace return std::move(*p); } - if (baseline_identifier.size() == 0) - { - return {{}, expected_left_tag}; - } - if (baseline_identifier == "default") { - return Strings::format("Couldn't find explicitly specified baseline `\"default\"` in the baseline file.", - baseline_identifier); + return Strings::format("Couldn't find explicitly specified baseline `\"default\"` in baseline file: %s", + fs::u8string(path_to_baseline)); } // attempt to check out the baseline: @@ -305,6 +364,7 @@ namespace } Optional BuiltinRegistry::get_baseline_version(const VcpkgPaths& paths, StringView port_name) const { + Debug::print("Baseline version: \"", m_baseline_identifier, "\"\n"); if (!m_baseline_identifier.empty()) { const auto& baseline = m_baseline.get( @@ -318,7 +378,7 @@ namespace } else { - // fall back to using the ports directory version + // if a baseline is not specified, use the ports directory version auto maybe_scf = Paragraphs::try_load_port(paths.get_filesystem(), paths.builtin_ports_directory() / fs::u8path(port_name)); if (auto pscf = maybe_scf.get()) @@ -333,8 +393,7 @@ namespace void BuiltinRegistry::get_all_port_names(std::vector& out, const VcpkgPaths& paths) const { - if ((paths.get_feature_flags().registries || paths.get_feature_flags().versions) && - paths.get_filesystem().exists(paths.builtin_port_versions)) + if (!m_baseline_identifier.empty() && paths.get_filesystem().exists(paths.builtin_port_versions)) { load_all_port_names_from_port_versions(out, paths, paths.builtin_port_versions); } @@ -415,6 +474,118 @@ namespace } // } FilesystemRegistry::RegistryImplementation + // { GitRegistry::RegistryImplementation + std::unique_ptr GitRegistry::get_port_entry(const VcpkgPaths& paths, StringView port_name) const + { + auto port_versions = get_versions_tree_path(paths); + auto maybe_version_entries = + load_versions_file(paths.get_filesystem(), VersionDbType::Git, port_versions, port_name); + Checks::check_exit( + VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: %s", maybe_version_entries.error()); + auto version_entries = std::move(maybe_version_entries).value_or_exit(VCPKG_LINE_INFO); + + auto res = std::make_unique(port_name.to_string()); + for (auto&& version_entry : version_entries) + { + res->port_versions.push_back(version_entry.version); + res->git_trees.push_back(version_entry.git_tree); + } + return res; + } + + Optional GitRegistry::get_baseline_version(const VcpkgPaths& paths, StringView port_name) const + { + const auto& baseline = m_baseline.get([this, &paths]() -> Baseline { + auto baseline_file = get_versions_tree_path(paths) / fs::u8path("baseline.json"); + + auto res_baseline = load_baseline_versions(paths, baseline_file, m_baseline_identifier); + + if (!res_baseline.has_value()) + { + Checks::exit_with_message(VCPKG_LINE_INFO, res_baseline.error()); + } + auto opt_baseline = res_baseline.get(); + if (auto p = opt_baseline->get()) + { + return std::move(*p); + } + + if (m_baseline_identifier.empty()) + { + return {}; + } + + if (m_baseline_identifier == "default") + { + Checks::exit_with_message( + VCPKG_LINE_INFO, + "Couldn't find explicitly specified baseline `\"default\"` in the baseline file.", + m_baseline_identifier); + } + + // attempt to check out the baseline: + auto explicit_hash = paths.git_fetch_from_remote_registry(m_repo, m_baseline_identifier); + if (!explicit_hash.has_value()) + { + Checks::exit_with_message( + VCPKG_LINE_INFO, + "Error: Couldn't find explicitly specified baseline `\"%s\"` in the baseline file for repo %s, " + "and that commit doesn't exist.\n%s", + m_baseline_identifier, + m_repo, + explicit_hash.error()); + } + auto path_to_baseline = fs::u8path("port_versions") / fs::u8path("baseline.json"); + auto maybe_contents = paths.git_show_from_remote_registry(*explicit_hash.get(), path_to_baseline); + if (!maybe_contents.has_value()) + { + Checks::exit_with_message( + VCPKG_LINE_INFO, + "Error: Couldn't find explicitly specified baseline `\"%s\"` in the baseline file for repo %s, " + "and the baseline file doesn't exist at that commit.\n%s\n", + m_baseline_identifier, + m_repo, + maybe_contents.error()); + } + + auto contents = maybe_contents.get(); + res_baseline = parse_baseline_versions(*contents, {}); + if (!res_baseline.has_value()) + { + Checks::exit_with_message(VCPKG_LINE_INFO, res_baseline.error()); + } + opt_baseline = res_baseline.get(); + if (auto p = opt_baseline->get()) + { + return std::move(*p); + } + else + { + Checks::exit_with_message( + VCPKG_LINE_INFO, + "Couldn't find explicitly specified baseline `\"%s\"` in the baseline file for repo %s, " + "and the `\"default\"` baseline does not exist at that commit.", + m_baseline_identifier, + m_repo); + } + }); + + auto it = baseline.find(port_name); + if (it != baseline.end()) + { + return it->second; + } + + return nullopt; + } + + void GitRegistry::get_all_port_names(std::vector& out, const VcpkgPaths& paths) const + { + auto versions_path = get_versions_tree_path(paths); + load_all_port_names_from_port_versions(out, paths, versions_path); + } + // } GitRegistry::RegistryImplementation + // } RegistryImplementation // { RegistryEntry @@ -464,6 +635,20 @@ namespace } // } FilesystemRegistryEntry::RegistryEntry + // { GitRegistryEntry::RegistryEntry + ExpectedS GitRegistryEntry::get_path_to_version(const VcpkgPaths& paths, const VersionT& version) const + { + auto it = std::find(port_versions.begin(), port_versions.end(), version); + if (it == port_versions.end()) + { + return Strings::concat("Error: No version entry for ", port_name, " at version ", version, "."); + } + + const auto& git_tree = git_trees[it - port_versions.begin()]; + return paths.git_checkout_object_from_remote_registry(git_tree); + } + // } GitRegistryEntry::RegistryEntry + // } RegistryEntry } @@ -601,9 +786,11 @@ namespace constexpr static StringLiteral KIND = "kind"; constexpr static StringLiteral BASELINE = "baseline"; constexpr static StringLiteral PATH = "path"; + constexpr static StringLiteral REPO = "repository"; constexpr static StringLiteral KIND_BUILTIN = "builtin"; constexpr static StringLiteral KIND_FILESYSTEM = "filesystem"; + constexpr static StringLiteral KIND_GIT = "git"; virtual StringView type_name() const override { return "a registry"; } virtual View valid_fields() const override; @@ -620,8 +807,10 @@ namespace constexpr StringLiteral RegistryImplDeserializer::KIND; constexpr StringLiteral RegistryImplDeserializer::BASELINE; constexpr StringLiteral RegistryImplDeserializer::PATH; + constexpr StringLiteral RegistryImplDeserializer::REPO; constexpr StringLiteral RegistryImplDeserializer::KIND_BUILTIN; constexpr StringLiteral RegistryImplDeserializer::KIND_FILESYSTEM; + constexpr StringLiteral RegistryImplDeserializer::KIND_GIT; struct RegistryDeserializer final : Json::IDeserializer { @@ -640,7 +829,7 @@ namespace View RegistryImplDeserializer::valid_fields() const { - static const StringView t[] = {KIND, BASELINE, PATH}; + static const StringView t[] = {KIND, BASELINE, PATH, REPO}; return t; } View valid_builtin_fields() @@ -662,6 +851,16 @@ namespace }; return t; } + View valid_git_fields() + { + static const StringView t[] = { + RegistryImplDeserializer::KIND, + RegistryImplDeserializer::BASELINE, + RegistryImplDeserializer::REPO, + RegistryDeserializer::PACKAGES, + }; + return t; + } Optional> RegistryImplDeserializer::visit_null(Json::Reader&) { @@ -695,9 +894,19 @@ namespace res = std::make_unique(config_directory / path, std::move(baseline)); } + else if (kind == KIND_GIT) + { + r.check_for_unexpected_fields(obj, valid_git_fields(), "a git registry"); + + std::string repo; + Json::StringDeserializer repo_des{"a git repository URL"}; + r.required_object_field("a git registry", obj, REPO, repo, repo_des); + + res = std::make_unique(std::move(repo), std::move(baseline)); + } else { - StringLiteral valid_kinds[] = {KIND_BUILTIN, KIND_FILESYSTEM}; + StringLiteral valid_kinds[] = {KIND_BUILTIN, KIND_FILESYSTEM, KIND_GIT}; r.add_generic_error(type_name(), "Field \"kind\" did not have an expected value (expected one of: \"", Strings::join("\", \"", valid_kinds), @@ -716,6 +925,7 @@ namespace RegistryImplDeserializer::KIND, RegistryImplDeserializer::BASELINE, RegistryImplDeserializer::PATH, + RegistryImplDeserializer::REPO, PACKAGES, }; return t; @@ -853,6 +1063,7 @@ namespace } else if (maybe_contents.error() == std::errc::no_such_file_or_directory) { + Debug::print("Failed to find baseline.json\n"); return {nullopt, expected_left_tag}; } else diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 1c65cd17001281..afd7247655f272 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -202,6 +202,11 @@ namespace vcpkg , m_env_cache(ff_settings.compiler_tracking) , m_ff_settings(ff_settings) { + const auto& cache_root = + System::get_platform_cache_home().value_or_exit(VCPKG_LINE_INFO) / fs::u8path("vcpkg"); + registries_work_tree_dir = cache_root / fs::u8path("registries") / fs::u8path("git"); + registries_dot_git_dir = registries_work_tree_dir / fs::u8path(".git"); + registries_git_trees = cache_root / fs::u8path("registries") / fs::u8path("git-trees"); } Lazy> available_triplets; @@ -224,6 +229,10 @@ namespace vcpkg Configuration m_config; FeatureFlagSettings m_ff_settings; + + fs::path registries_work_tree_dir; + fs::path registries_dot_git_dir; + fs::path registries_git_trees; }; } @@ -726,6 +735,156 @@ If you wish to silence this error and use classic mode, you can: return destination; } + ExpectedS VcpkgPaths::git_fetch_from_remote_registry(StringView repo, StringView treeish) const + { + auto& fs = get_filesystem(); + + auto work_tree = m_pimpl->registries_work_tree_dir; + fs.create_directories(work_tree, VCPKG_LINE_INFO); + auto dot_git_dir = m_pimpl->registries_dot_git_dir; + + System::CmdLineBuilder init_registries_git_dir = + git_cmd_builder(*this, dot_git_dir, work_tree).string_arg("init"); + auto init_output = System::cmd_execute_and_capture_output(init_registries_git_dir); + if (init_output.exit_code != 0) + { + return {Strings::format("Error: Failed to initialize local repository %s.\n%s\n", + fs::u8string(work_tree), + init_output.output), + expected_right_tag}; + } + + auto lock_file = work_tree / fs::u8path(".vcpkg-lock"); + + std::error_code ec; + auto guard = Files::ExclusiveFileLock(Files::ExclusiveFileLock::Wait::Yes, fs, lock_file, ec); + + System::CmdLineBuilder fetch_git_ref = + git_cmd_builder(*this, dot_git_dir, work_tree).string_arg("fetch").string_arg("--").string_arg(repo); + if (treeish.size() != 0) + { + fetch_git_ref.string_arg(treeish); + } + + auto fetch_output = System::cmd_execute_and_capture_output(fetch_git_ref); + if (fetch_output.exit_code != 0) + { + return {Strings::format("Error: Failed to fetch %s%s from repository %s.\n%s\n", + treeish.size() != 0 ? "ref " : "", + treeish, + repo, + fetch_output.output), + expected_right_tag}; + } + + System::CmdLineBuilder get_fetch_head = + git_cmd_builder(*this, dot_git_dir, work_tree).string_arg("rev-parse").string_arg("FETCH_HEAD"); + auto fetch_head_output = System::cmd_execute_and_capture_output(get_fetch_head); + if (fetch_head_output.exit_code != 0) + { + return {Strings::format("Error: Failed to rev-parse FETCH_HEAD.\n%s\n", fetch_head_output.output), + expected_right_tag}; + } + return {Strings::trim(fetch_head_output.output).to_string(), expected_left_tag}; + } + // returns an error if there was an unexpected error; returns nullopt if the file doesn't exist at the specified + // hash + ExpectedS VcpkgPaths::git_show_from_remote_registry(StringView hash, + const fs::path& relative_path) const + { + auto revision = Strings::format("%s:%s", hash, fs::generic_u8string(relative_path)); + System::CmdLineBuilder git_show = + git_cmd_builder(*this, m_pimpl->registries_dot_git_dir, m_pimpl->registries_work_tree_dir) + .string_arg("show") + .string_arg(revision); + + auto git_show_output = System::cmd_execute_and_capture_output(git_show); + if (git_show_output.exit_code != 0) + { + return {git_show_output.output, expected_right_tag}; + } + return {git_show_output.output, expected_left_tag}; + } + ExpectedS VcpkgPaths::git_find_object_id_for_remote_registry_path(StringView hash, + const fs::path& relative_path) const + { + auto revision = Strings::format("%s:%s", hash, fs::generic_u8string(relative_path)); + System::CmdLineBuilder git_rev_parse = + git_cmd_builder(*this, m_pimpl->registries_dot_git_dir, m_pimpl->registries_work_tree_dir) + .string_arg("rev-parse") + .string_arg(revision); + + auto git_rev_parse_output = System::cmd_execute_and_capture_output(git_rev_parse); + if (git_rev_parse_output.exit_code != 0) + { + return {git_rev_parse_output.output, expected_right_tag}; + } + return {Strings::trim(git_rev_parse_output.output).to_string(), expected_left_tag}; + } + ExpectedS VcpkgPaths::git_checkout_object_from_remote_registry(StringView object) const + { + auto& fs = get_filesystem(); + fs.create_directories(m_pimpl->registries_git_trees, VCPKG_LINE_INFO); + + auto git_tree_final = m_pimpl->registries_git_trees / fs::u8path(object); + if (fs.exists(git_tree_final)) + { + return std::move(git_tree_final); + } + + auto pid = System::get_process_id(); + + fs::path git_tree_temp = fs::u8path(Strings::format("%s.tmp%ld", fs::u8string(git_tree_final), pid)); + fs::path git_tree_temp_tar = fs::u8path(Strings::format("%s.tmp%ld.tar", fs::u8string(git_tree_final), pid)); + fs.remove_all(git_tree_temp, VCPKG_LINE_INFO); + fs.create_directory(git_tree_temp, VCPKG_LINE_INFO); + + auto dot_git_dir = m_pimpl->registries_dot_git_dir; + System::CmdLineBuilder git_archive = git_cmd_builder(*this, dot_git_dir, m_pimpl->registries_work_tree_dir) + .string_arg("archive") + .string_arg("--format") + .string_arg("tar") + .string_arg(object) + .string_arg("--output") + .path_arg(git_tree_temp_tar); + auto git_archive_output = System::cmd_execute_and_capture_output(git_archive); + if (git_archive_output.exit_code != 0) + { + return {Strings::format("git archive failed with message:\n%s", git_archive_output.output), + expected_right_tag}; + } + + auto untar = System::CmdLineBuilder{get_tool_exe(Tools::CMAKE)} + .string_arg("-E") + .string_arg("tar") + .string_arg("xf") + .path_arg(git_tree_temp_tar); + + auto untar_output = System::cmd_execute_and_capture_output(untar, System::InWorkingDirectory{git_tree_temp}); + if (untar_output.exit_code != 0) + { + return {Strings::format("cmake's untar failed with message:\n%s", untar_output.output), expected_right_tag}; + } + + std::error_code ec; + fs.rename(git_tree_temp, git_tree_final, ec); + + if (fs.exists(git_tree_final)) + { + return git_tree_final; + } + if (ec) + { + return { + Strings::format("rename to %s failed with message:\n%s", fs::u8string(git_tree_final), ec.message()), + expected_right_tag}; + } + else + { + return {"Unknown error", expected_right_tag}; + } + } + Optional VcpkgPaths::get_manifest() const { if (auto p = m_pimpl->m_manifest_doc.get()) From a322db6f07094a49852820053702057f1432748d Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 14 Jan 2021 21:29:15 -0800 Subject: [PATCH 0487/1694] [vcpkg] Add CI check for version files and update maintainer's guideline (#15655) * Add CI check using dummy version files * Fix ci test * Update maintainer's guideline * Point CI check to actual version files * Remove --git-verify-trees * Fix typo * Fix more typoes * Even more typos * Even more typos --- docs/maintainers/maintainer-guide.md | 31 +++++++++++++++++++ .../windows/azure-pipelines.yml | 8 +++++ 2 files changed, 39 insertions(+) diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md index 734bcc5d9fe935..6ceb519125b46e 100644 --- a/docs/maintainers/maintainer-guide.md +++ b/docs/maintainers/maintainer-guide.md @@ -204,6 +204,37 @@ For Example: See our [manifest files document](manifest-files.md#port-version) for a full explanation of our conventions. +### Update the version files in `port_versions/` of any modified ports + +Vcpkg uses a set of metadata files to power its versioning feature. +These files are located in the following locations: +* `${VCPKG_ROOT}/port_versions/baseline.json`, (this file is common to all ports) and +* `${VCPKG_ROOT}/port_versions/${first-letter-of-portname}-/${portname}.json` (one per port). + +For example, for `zlib` the relevant files are: +* `${VCPKG_ROOT}/port_versions/baseline.json` +* `${VCPKG_ROOT}/port_versions/z-/zlib.json` + +We expect that each time you update a port, you also update its version files. + +**The recommended method to update these files is to run the `x-add-version` command, e.g.:** + +``` +vcpkg x-add-version zlib +``` + +If you're updating multiple ports at the same time, instead you can run: + +``` +vcpkg x-add-version --all +``` + +To update the files for all modified ports at once. + +_NOTE: These commands require you to have committed your changes to the ports before running them. The reason is that the Git SHA of the port directory is required in these version files. But don't worry, the `x-add-version` command will warn you if you have local changes that haven't been committed._ + +See our [versioning specification](https://github.com/vicroms/vcpkg/blob/versioning-spec/docs/specifications/versioning.md) and [registries specification](https://github.com/strega-nil/vcpkg/blob/git-registries/docs/specifications/registries-2.md) to learn how vcpkg interacts with these files. + ## Patching ### Prefer options over patching diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index c78c3d9ee8d0c2..a7fb6408bda22c 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -51,6 +51,14 @@ jobs: filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1' arguments: '-Triplet ${{ parameters.triplet }} -WorkingRoot ${{ variables.WORKING_ROOT }}' pwsh: true + - task: PowerShell@2 + displayName: 'Validate version files' + condition: eq('${{ parameters.triplet }}', 'x86-windows') + inputs: + targetType: inline + script: | + ./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose + pwsh: true - task: PowerShell@2 displayName: '*** Test Modified Ports and Prepare Test Logs ***' inputs: From 55265f69c5f9cde08196c9d25669270e612e7f6a Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 14 Jan 2021 22:43:13 -0800 Subject: [PATCH 0488/1694] Reorder CI checks (#15662) * Reorder CI checks * Modify error message on local port changes * Modify error message on local port changes - pt.2 --- .../windows/azure-pipelines.yml | 30 +++++++++---------- .../src/vcpkg/commands.civerifyversions.cpp | 11 ++++--- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index a7fb6408bda22c..d97490093007c7 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -25,6 +25,21 @@ jobs: # Note: D: is the Azure machines' temporary disk. - script: .\bootstrap-vcpkg.bat displayName: 'Build vcpkg' + - task: PowerShell@2 + displayName: 'Run vcpkg end-to-end tests' + condition: eq('${{ parameters.triplet }}', 'x86-windows') + inputs: + filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1' + arguments: '-Triplet ${{ parameters.triplet }} -WorkingRoot ${{ variables.WORKING_ROOT }}' + pwsh: true + - task: PowerShell@2 + displayName: 'Validate version files' + condition: eq('${{ parameters.triplet }}', 'x86-windows') + inputs: + targetType: inline + script: | + ./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose + pwsh: true - task: CmdLine@2 displayName: "Build vcpkg with CMake, with older VS, and Run Tests" condition: eq('${{ parameters.triplet }}', 'x86-windows') @@ -44,21 +59,6 @@ jobs: cmake -G "Visual Studio 16 2019" -A Win32 -T v141 -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=OFF -B build.x86.vs2017 -S toolsrc cmake --build build.x86.vs2017 failOnStderr: true - - task: PowerShell@2 - displayName: 'Run vcpkg end-to-end tests' - condition: eq('${{ parameters.triplet }}', 'x86-windows') - inputs: - filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1' - arguments: '-Triplet ${{ parameters.triplet }} -WorkingRoot ${{ variables.WORKING_ROOT }}' - pwsh: true - - task: PowerShell@2 - displayName: 'Validate version files' - condition: eq('${{ parameters.triplet }}', 'x86-windows') - inputs: - targetType: inline - script: | - ./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose - pwsh: true - task: PowerShell@2 displayName: '*** Test Modified Ports and Prepare Test Logs ***' inputs: diff --git a/toolsrc/src/vcpkg/commands.civerifyversions.cpp b/toolsrc/src/vcpkg/commands.civerifyversions.cpp index 7f142e279bcf4e..82a98aa9d64f4c 100644 --- a/toolsrc/src/vcpkg/commands.civerifyversions.cpp +++ b/toolsrc/src/vcpkg/commands.civerifyversions.cpp @@ -229,11 +229,10 @@ namespace vcpkg::Commands::CIVerifyVersions return { Strings::format("Error: While reading versions for port %s from file: %s\n" " File declares version `%s` with SHA: %s\n" - " But local port with the same verion has a differint SHA: %s\n" - " This may be caused by locally commited changes to the port.\n" - " Run:\n\n" - " vcpkg x-add-version %s --overwrite-version\n\n" - " to overwrite the declared version's SHA.", + " But local port with the same verion has a different SHA: %s\n" + " Please update the port's version fields and then run:\n\n" + " vcpkg x-add-version %s\n\n" + " to add a new version.", port_name, fs::u8string(versions_file_path), top_entry.first.versiont, @@ -402,7 +401,7 @@ namespace vcpkg::Commands::CIVerifyVersions } System::print2(System::Color::error, "\nTo attempt to resolve all erros at once, run:\n\n" - " vcpkg x-add-version --all --overwrite-versions\n\n"); + " vcpkg x-add-version --all\n\n"); Checks::exit_fail(VCPKG_LINE_INFO); } Checks::exit_success(VCPKG_LINE_INFO); From 1d28335882f304f4d232db73566aaecf16d0c9e3 Mon Sep 17 00:00:00 2001 From: pastdue <30942300+past-due@users.noreply.github.com> Date: Fri, 15 Jan 2021 02:19:19 -0500 Subject: [PATCH 0489/1694] [physfs] Enable arm64 for non-Windows targets (#15637) * [physfs] Enable arm64 for non-Windows targets * Update version files Co-authored-by: Victor Romero --- port_versions/baseline.json | 6309 +++++++++++++++++++++++++++++++++- port_versions/p-/physfs.json | 5 + ports/physfs/CONTROL | 6 - ports/physfs/portfile.cmake | 4 +- ports/physfs/vcpkg.json | 11 + 5 files changed, 6327 insertions(+), 8 deletions(-) delete mode 100644 ports/physfs/CONTROL create mode 100644 ports/physfs/vcpkg.json diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 3f68b84d6c4e62..d304104c5dd36d 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -1 +1,6308 @@ -{"default": {"3fd": {"baseline": "2.6.3", "port-version": 0}, "7zip": {"baseline": "19.00", "port-version": 2}, "abseil": {"baseline": "2020-09-23", "port-version": 1}, "absent": {"baseline": "0.3.1", "port-version": 0}, "ace": {"baseline": "6.5.12", "port-version": 1}, "activemq-cpp": {"baseline": "3.9.5-3", "port-version": 0}, "ade": {"baseline": "0.1.1f", "port-version": 0}, "aixlog": {"baseline": "1.4.0", "port-version": 0}, "akali": {"baseline": "1.42", "port-version": 1}, "alac": {"baseline": "2017-11-03-c38887c5-1", "port-version": 0}, "alac-decoder": {"baseline": "0.2", "port-version": 4}, "alembic": {"baseline": "1.7.16", "port-version": 0}, "aliyun-oss-c-sdk": {"baseline": "3.10.0", "port-version": 0}, "allegro5": {"baseline": "5.2.6.0", "port-version": 0}, "ampl-asl": {"baseline": "2020-11-11", "port-version": 0}, "ampl-mp": {"baseline": "2020-11-11", "port-version": 0}, "amqpcpp": {"baseline": "4.1.7", "port-version": 0}, "anax": {"baseline": "2.1.0-6", "port-version": 0}, "angelscript": {"baseline": "2.34.0", "port-version": 0}, "angle": {"baseline": "2020-05-15-1", "port-version": 0}, "antlr4": {"baseline": "4.8", "port-version": 1}, "any-lite": {"baseline": "0.2.0", "port-version": 0}, "anyrpc": {"baseline": "2020-01-13", "port-version": 2}, "apr": {"baseline": "1.7.0", "port-version": 3}, "apr-util": {"baseline": "1.6.1", "port-version": 3}, "arb": {"baseline": "2.18.1", "port-version": 0}, "arcus": {"baseline": "4.8.0", "port-version": 0}, "argagg": {"baseline": "0.4.6", "port-version": 0}, "argh": {"baseline": "2018-12-18-2", "port-version": 0}, "argparse": {"baseline": "2.1", "port-version": 0}, "args": {"baseline": "2020-09-14", "port-version": 0}, "argtable2": {"baseline": "2.13", "port-version": 8}, "argtable3": {"baseline": "3.1.5", "port-version": 0}, "argumentum": {"baseline": "0.3.1", "port-version": 0}, "armadillo": {"baseline": "10.1.0", "port-version": 0}, "arrayfire": {"baseline": "3.7.3", "port-version": 3}, "arrow": {"baseline": "1.0.1", "port-version": 2}, "ashes": {"baseline": "2020-10-21", "port-version": 0}, "asio": {"baseline": "1.18.0", "port-version": 0}, "asiosdk": {"baseline": "2.3.3-1", "port-version": 0}, "asmjit": {"baseline": "2020-09-14", "port-version": 0}, "assimp": {"baseline": "5.0.1", "port-version": 4}, "asynch": {"baseline": "2019-09-21-1", "port-version": 0}, "asyncplusplus": {"baseline": "1.1", "port-version": 0}, "atk": {"baseline": "2.24.0-5", "port-version": 2}, "atkmm": {"baseline": "2.24.2", "port-version": 5}, "atlmfc": {"baseline": "0", "port-version": 0}, "aubio": {"baseline": "0.4.9", "port-version": 3}, "audiofile": {"baseline": "1.0.7", "port-version": 0}, "aurora": {"baseline": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", "port-version": 0}, "autobahn": {"baseline": "20.8.1", "port-version": 0}, "avisynthplus": {"baseline": "3.6.1", "port-version": 0}, "avro-c": {"baseline": "1.9.2-1", "port-version": 0}, "avro-cpp": {"baseline": "1.9.2", "port-version": 0}, "aws-c-common": {"baseline": "0.4.56", "port-version": 0}, "aws-c-event-stream": {"baseline": "0.1.6", "port-version": 0}, "aws-checksums": {"baseline": "0.1.9", "port-version": 0}, "aws-lambda-cpp": {"baseline": "0.2.6", "port-version": 0}, "aws-sdk-cpp": {"baseline": "1.8.83", "port-version": 4}, "azmq": {"baseline": "2020-03-03", "port-version": 0}, "azure-c-shared-utility": {"baseline": "2020-12-09", "port-version": 0}, "azure-iot-sdk-c": {"baseline": "2020-12-09", "port-version": 0}, "azure-kinect-sensor-sdk": {"baseline": "1.4.0-alpha.0", "port-version": 6}, "azure-macro-utils-c": {"baseline": "2020-06-17", "port-version": 2}, "azure-storage-cpp": {"baseline": "7.5.0", "port-version": 0}, "azure-uamqp-c": {"baseline": "2020-12-09", "port-version": 0}, "azure-uhttp-c": {"baseline": "2020-12-09", "port-version": 0}, "azure-umqtt-c": {"baseline": "2020-12-09", "port-version": 0}, "basisu": {"baseline": "1.11-4", "port-version": 0}, "bcg729": {"baseline": "1.1.1", "port-version": 0}, "bde": {"baseline": "3.2.0.0", "port-version": 2}, "bdwgc": {"baseline": "8.0.4-1", "port-version": 0}, "beast": {"baseline": "0", "port-version": 0}, "behaviortree-cpp": {"baseline": "3.5.1", "port-version": 2}, "benchmark": {"baseline": "1.5.2", "port-version": 0}, "bento4": {"baseline": "1.5.1-628", "port-version": 0}, "berkeleydb": {"baseline": "4.8.30", "port-version": 5}, "bfgroup-lyra": {"baseline": "1.5", "port-version": 0}, "bigint": {"baseline": "2010.04.30", "port-version": 6}, "binn": {"baseline": "3.0", "port-version": 0}, "bitmagic": {"baseline": "6.4.0", "port-version": 0}, "bitserializer": {"baseline": "0.10", "port-version": 0}, "bitserializer-cpprestjson": {"baseline": "alias", "port-version": 0}, "bitserializer-pugixml": {"baseline": "alias", "port-version": 0}, "bitserializer-rapidjson": {"baseline": "alias", "port-version": 0}, "bitserializer-rapidyaml": {"baseline": "alias", "port-version": 0}, "bitsery": {"baseline": "5.2.1", "port-version": 0}, "blas": {"baseline": "1", "port-version": 0}, "blaze": {"baseline": "3.8", "port-version": 1}, "blend2d": {"baseline": "beta_2020-08-24", "port-version": 0}, "blitz": {"baseline": "2020-03-25", "port-version": 0}, "blosc": {"baseline": "1.18.1-1", "port-version": 0}, "bond": {"baseline": "9.0.3", "port-version": 0}, "boolinq": {"baseline": "2019-07-22", "port-version": 0}, "boost": {"baseline": "1.75.0", "port-version": 0}, "boost-accumulators": {"baseline": "1.75.0", "port-version": 0}, "boost-algorithm": {"baseline": "1.75.0", "port-version": 0}, "boost-align": {"baseline": "1.75.0", "port-version": 0}, "boost-any": {"baseline": "1.75.0", "port-version": 0}, "boost-array": {"baseline": "1.75.0", "port-version": 0}, "boost-asio": {"baseline": "1.75.0", "port-version": 1}, "boost-assert": {"baseline": "1.75.0", "port-version": 0}, "boost-assign": {"baseline": "1.75.0", "port-version": 0}, "boost-atomic": {"baseline": "1.75.0", "port-version": 0}, "boost-beast": {"baseline": "1.75.0", "port-version": 0}, "boost-bimap": {"baseline": "1.75.0", "port-version": 0}, "boost-bind": {"baseline": "1.75.0", "port-version": 0}, "boost-build": {"baseline": "1.75.0.beta1", "port-version": 1}, "boost-callable-traits": {"baseline": "1.75.0", "port-version": 0}, "boost-chrono": {"baseline": "1.75.0", "port-version": 0}, "boost-circular-buffer": {"baseline": "1.75.0", "port-version": 0}, "boost-compatibility": {"baseline": "1.75.0", "port-version": 0}, "boost-compute": {"baseline": "1.75.0", "port-version": 0}, "boost-concept-check": {"baseline": "1.75.0", "port-version": 0}, "boost-config": {"baseline": "1.75.0", "port-version": 0}, "boost-container": {"baseline": "1.75.0", "port-version": 0}, "boost-container-hash": {"baseline": "1.75.0", "port-version": 0}, "boost-context": {"baseline": "1.75.0", "port-version": 0}, "boost-contract": {"baseline": "1.75.0", "port-version": 0}, "boost-conversion": {"baseline": "1.75.0", "port-version": 0}, "boost-convert": {"baseline": "1.75.0", "port-version": 0}, "boost-core": {"baseline": "1.75.0", "port-version": 0}, "boost-coroutine": {"baseline": "1.75.0", "port-version": 0}, "boost-coroutine2": {"baseline": "1.75.0", "port-version": 0}, "boost-crc": {"baseline": "1.75.0", "port-version": 0}, "boost-date-time": {"baseline": "1.75.0", "port-version": 0}, "boost-detail": {"baseline": "1.75.0", "port-version": 0}, "boost-di": {"baseline": "1.2.0", "port-version": 0}, "boost-dll": {"baseline": "1.75.0", "port-version": 0}, "boost-dynamic-bitset": {"baseline": "1.75.0", "port-version": 0}, "boost-endian": {"baseline": "1.75.0", "port-version": 0}, "boost-exception": {"baseline": "1.75.0", "port-version": 0}, "boost-fiber": {"baseline": "1.75.0", "port-version": 0}, "boost-filesystem": {"baseline": "1.75.0", "port-version": 0}, "boost-flyweight": {"baseline": "1.75.0", "port-version": 0}, "boost-foreach": {"baseline": "1.75.0", "port-version": 0}, "boost-format": {"baseline": "1.75.0", "port-version": 0}, "boost-function": {"baseline": "1.75.0", "port-version": 0}, "boost-function-types": {"baseline": "1.75.0", "port-version": 0}, "boost-functional": {"baseline": "1.75.0", "port-version": 0}, "boost-fusion": {"baseline": "1.75.0", "port-version": 0}, "boost-geometry": {"baseline": "1.75.0", "port-version": 0}, "boost-gil": {"baseline": "1.75.0", "port-version": 0}, "boost-graph": {"baseline": "1.75.0", "port-version": 0}, "boost-graph-parallel": {"baseline": "1.75.0", "port-version": 0}, "boost-hana": {"baseline": "1.75.0", "port-version": 0}, "boost-heap": {"baseline": "1.75.0", "port-version": 0}, "boost-histogram": {"baseline": "1.75.0", "port-version": 0}, "boost-hof": {"baseline": "1.75.0", "port-version": 0}, "boost-icl": {"baseline": "1.75.0", "port-version": 0}, "boost-integer": {"baseline": "1.75.0", "port-version": 0}, "boost-interprocess": {"baseline": "1.75.0", "port-version": 0}, "boost-interval": {"baseline": "1.75.0", "port-version": 0}, "boost-intrusive": {"baseline": "1.75.0", "port-version": 0}, "boost-io": {"baseline": "1.75.0", "port-version": 0}, "boost-iostreams": {"baseline": "1.75.0", "port-version": 0}, "boost-iterator": {"baseline": "1.75.0", "port-version": 0}, "boost-json": {"baseline": "1.75.0", "port-version": 0}, "boost-lambda": {"baseline": "1.75.0", "port-version": 0}, "boost-leaf": {"baseline": "1.75.0", "port-version": 0}, "boost-lexical-cast": {"baseline": "1.75.0", "port-version": 0}, "boost-local-function": {"baseline": "1.75.0", "port-version": 0}, "boost-locale": {"baseline": "1.75.0", "port-version": 0}, "boost-lockfree": {"baseline": "1.75.0", "port-version": 0}, "boost-log": {"baseline": "1.75.0", "port-version": 0}, "boost-logic": {"baseline": "1.75.0", "port-version": 0}, "boost-math": {"baseline": "1.75.0", "port-version": 0}, "boost-metaparse": {"baseline": "1.75.0", "port-version": 0}, "boost-modular-build-helper": {"baseline": "1.75.0", "port-version": 2}, "boost-move": {"baseline": "1.75.0", "port-version": 0}, "boost-mp11": {"baseline": "1.75.0", "port-version": 0}, "boost-mpi": {"baseline": "1.75.0", "port-version": 0}, "boost-mpl": {"baseline": "1.75.0", "port-version": 0}, "boost-msm": {"baseline": "1.75.0", "port-version": 0}, "boost-multi-array": {"baseline": "1.75.0", "port-version": 0}, "boost-multi-index": {"baseline": "1.75.0", "port-version": 0}, "boost-multiprecision": {"baseline": "1.75.0", "port-version": 0}, "boost-nowide": {"baseline": "1.75.0", "port-version": 0}, "boost-numeric-conversion": {"baseline": "1.75.0", "port-version": 0}, "boost-odeint": {"baseline": "1.75.0", "port-version": 0}, "boost-optional": {"baseline": "1.75.0", "port-version": 0}, "boost-outcome": {"baseline": "1.75.0", "port-version": 0}, "boost-parameter": {"baseline": "1.75.0", "port-version": 0}, "boost-parameter-python": {"baseline": "1.75.0", "port-version": 0}, "boost-pfr": {"baseline": "1.75.0", "port-version": 0}, "boost-phoenix": {"baseline": "1.75.0", "port-version": 0}, "boost-poly-collection": {"baseline": "1.75.0", "port-version": 0}, "boost-polygon": {"baseline": "1.75.0", "port-version": 0}, "boost-pool": {"baseline": "1.75.0", "port-version": 0}, "boost-predef": {"baseline": "1.75.0", "port-version": 0}, "boost-preprocessor": {"baseline": "1.75.0", "port-version": 0}, "boost-process": {"baseline": "1.75.0", "port-version": 0}, "boost-program-options": {"baseline": "1.75.0", "port-version": 0}, "boost-property-map": {"baseline": "1.75.0", "port-version": 0}, "boost-property-tree": {"baseline": "1.75.0", "port-version": 0}, "boost-proto": {"baseline": "1.75.0", "port-version": 0}, "boost-ptr-container": {"baseline": "1.75.0", "port-version": 0}, "boost-python": {"baseline": "1.75.0", "port-version": 1}, "boost-qvm": {"baseline": "1.75.0", "port-version": 0}, "boost-random": {"baseline": "1.75.0", "port-version": 0}, "boost-range": {"baseline": "1.75.0", "port-version": 0}, "boost-ratio": {"baseline": "1.75.0", "port-version": 0}, "boost-rational": {"baseline": "1.75.0", "port-version": 0}, "boost-regex": {"baseline": "1.75.0", "port-version": 0}, "boost-safe-numerics": {"baseline": "1.75.0", "port-version": 0}, "boost-scope-exit": {"baseline": "1.75.0", "port-version": 0}, "boost-serialization": {"baseline": "1.75.0", "port-version": 0}, "boost-signals2": {"baseline": "1.75.0", "port-version": 0}, "boost-smart-ptr": {"baseline": "1.75.0", "port-version": 0}, "boost-sort": {"baseline": "1.75.0", "port-version": 0}, "boost-spirit": {"baseline": "1.75.0", "port-version": 0}, "boost-stacktrace": {"baseline": "1.75.0", "port-version": 0}, "boost-statechart": {"baseline": "1.75.0", "port-version": 0}, "boost-static-assert": {"baseline": "1.75.0", "port-version": 0}, "boost-static-string": {"baseline": "1.75.0", "port-version": 0}, "boost-stl-interfaces": {"baseline": "1.75.0", "port-version": 0}, "boost-system": {"baseline": "1.75.0", "port-version": 0}, "boost-test": {"baseline": "1.75.0", "port-version": 0}, "boost-thread": {"baseline": "1.75.0", "port-version": 0}, "boost-throw-exception": {"baseline": "1.75.0", "port-version": 0}, "boost-timer": {"baseline": "1.75.0", "port-version": 0}, "boost-tokenizer": {"baseline": "1.75.0", "port-version": 0}, "boost-tti": {"baseline": "1.75.0", "port-version": 0}, "boost-tuple": {"baseline": "1.75.0", "port-version": 0}, "boost-type-erasure": {"baseline": "1.75.0", "port-version": 0}, "boost-type-index": {"baseline": "1.75.0", "port-version": 0}, "boost-type-traits": {"baseline": "1.75.0", "port-version": 0}, "boost-typeof": {"baseline": "1.75.0", "port-version": 0}, "boost-ublas": {"baseline": "1.75.0", "port-version": 0}, "boost-uninstall": {"baseline": "1.75.0", "port-version": 0}, "boost-units": {"baseline": "1.75.0", "port-version": 0}, "boost-unordered": {"baseline": "1.75.0", "port-version": 0}, "boost-utility": {"baseline": "1.75.0", "port-version": 0}, "boost-uuid": {"baseline": "1.75.0", "port-version": 0}, "boost-variant": {"baseline": "1.75.0", "port-version": 0}, "boost-variant2": {"baseline": "1.75.0", "port-version": 0}, "boost-vcpkg-helpers": {"baseline": "7", "port-version": 2}, "boost-vmd": {"baseline": "1.75.0", "port-version": 0}, "boost-wave": {"baseline": "1.75.0", "port-version": 0}, "boost-winapi": {"baseline": "1.75.0", "port-version": 0}, "boost-xpressive": {"baseline": "1.75.0", "port-version": 0}, "boost-yap": {"baseline": "1.75.0", "port-version": 0}, "boringssl": {"baseline": "2020-04-07", "port-version": 2}, "botan": {"baseline": "2.16.0", "port-version": 0}, "box2d": {"baseline": "2.4.0", "port-version": 0}, "breakpad": {"baseline": "2020-09-14", "port-version": 1}, "brigand": {"baseline": "1.3.0", "port-version": 0}, "brotli": {"baseline": "1.0.9", "port-version": 0}, "brpc": {"baseline": "0.9.7", "port-version": 0}, "brunocodutra-metal": {"baseline": "2.1.1", "port-version": 0}, "brynet": {"baseline": "1.0.7", "port-version": 0}, "bullet3": {"baseline": "2.89-1", "port-version": 0}, "bustache": {"baseline": "1.1.0", "port-version": 0}, "butteraugli": {"baseline": "2019-05-08-1", "port-version": 0}, "byte-lite": {"baseline": "0.2.0", "port-version": 0}, "bzip2": {"baseline": "1.0.8", "port-version": 1}, "c-ares": {"baseline": "1.17.1", "port-version": 0}, "c4core": {"baseline": "2020-04-12", "port-version": 0}, "caf": {"baseline": "0.17.6", "port-version": 1}, "caffe2": {"baseline": "0.8.1-3", "port-version": 0}, "cairo": {"baseline": "1.16.0", "port-version": 8}, "cairomm": {"baseline": "1.15.3", "port-version": 5}, "camport3": {"baseline": "1.5.3", "port-version": 0}, "capnproto": {"baseline": "0.8.0", "port-version": 1}, "capstone": {"baseline": "4.0.2", "port-version": 1}, "cartographer": {"baseline": "1.0.0-3", "port-version": 0}, "casclib": {"baseline": "1.50b-1", "port-version": 0}, "catch": {"baseline": "alias", "port-version": 0}, "catch-classic": {"baseline": "1.12.2", "port-version": 0}, "catch2": {"baseline": "2.13.1", "port-version": 0}, "cccapstone": {"baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1", "port-version": 0}, "ccd": {"baseline": "2.1-4", "port-version": 0}, "ccfits": {"baseline": "2.5", "port-version": 6}, "cctz": {"baseline": "2.3-2", "port-version": 0}, "celero": {"baseline": "2.6.0-1", "port-version": 0}, "cello": {"baseline": "2019-07-23", "port-version": 0}, "cereal": {"baseline": "1.3.0", "port-version": 0}, "ceres": {"baseline": "2.0.0", "port-version": 2}, "cfitsio": {"baseline": "3.49", "port-version": 0}, "cgal": {"baseline": "5.1.1", "port-version": 0}, "cgicc": {"baseline": "3.2.19-4", "port-version": 0}, "cgl": {"baseline": "0.60.2-2", "port-version": 0}, "cgltf": {"baseline": "1.8", "port-version": 0}, "cgns": {"baseline": "3.4.0-1", "port-version": 0}, "chaiscript": {"baseline": "6.1.0-1", "port-version": 0}, "chakracore": {"baseline": "1.11.22", "port-version": 1}, "charls": {"baseline": "2.1.0-1", "port-version": 0}, "chartdir": {"baseline": "6.3.1", "port-version": 2}, "check": {"baseline": "0.15.2", "port-version": 0}, "chipmunk": {"baseline": "7.0.3", "port-version": 1}, "chmlib": {"baseline": "0.40-4", "port-version": 0}, "chromium-base": {"baseline": "86.0.4199.1", "port-version": 1}, "cimg": {"baseline": "2.9.4", "port-version": 0}, "cityhash": {"baseline": "2013-01-08", "port-version": 0}, "civetweb": {"baseline": "1.13", "port-version": 1}, "cjson": {"baseline": "2019-11-30-1", "port-version": 0}, "clapack": {"baseline": "3.2.1", "port-version": 16}, "clara": {"baseline": "1.1.5", "port-version": 0}, "clblas": {"baseline": "2.12-4", "port-version": 0}, "clblast": {"baseline": "1.5.1", "port-version": 0}, "clfft": {"baseline": "2.12.2-2", "port-version": 0}, "cli": {"baseline": "1.2.1", "port-version": 0}, "cli11": {"baseline": "1.9.1", "port-version": 0}, "clickhouse-cpp": {"baseline": "2019-05-22", "port-version": 0}, "clipp": {"baseline": "2019-04-30", "port-version": 0}, "clockutils": {"baseline": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-3", "port-version": 0}, "clp": {"baseline": "1.17.6", "port-version": 0}, "clrng": {"baseline": "2020-12-01", "port-version": 0}, "clue": {"baseline": "1.0.0-alpha.7", "port-version": 0}, "cmark": {"baseline": "0.29.0", "port-version": 0}, "cmcstl2": {"baseline": "2019-07-20", "port-version": 0}, "cmocka": {"baseline": "2020-08-01", "port-version": 0}, "cnl": {"baseline": "2019-06-23", "port-version": 0}, "coin": {"baseline": "4.0.0", "port-version": 2}, "coinutils": {"baseline": "2.11.4", "port-version": 0}, "collada-dom": {"baseline": "2.5.0-3", "port-version": 0}, "colmap": {"baseline": "3.6", "port-version": 0}, "comms": {"baseline": "3.1.3", "port-version": 1}, "comms-ublox": {"baseline": "0.20.0", "port-version": 1}, "commsdsl": {"baseline": "3.6.0", "port-version": 1}, "concurrentqueue": {"baseline": "1.0.2", "port-version": 0}, "console-bridge": {"baseline": "1.0.1", "port-version": 1}, "constexpr": {"baseline": "1.0-1", "port-version": 0}, "constexpr-contracts": {"baseline": "2020-08-09", "port-version": 0}, "coolprop": {"baseline": "6.4.1", "port-version": 0}, "coroutine": {"baseline": "1.5.0", "port-version": 1}, "corrade": {"baseline": "2020.06", "port-version": 0}, "cpp-base64": {"baseline": "2019-06-19", "port-version": 0}, "cpp-httplib": {"baseline": "0.7.18", "port-version": 0}, "cpp-netlib": {"baseline": "0.13.0", "port-version": 4}, "cpp-peglib": {"baseline": "0.1.0", "port-version": 0}, "cpp-redis": {"baseline": "4.3.1-2", "port-version": 0}, "cpp-taskflow": {"baseline": "2.6.0", "port-version": 0}, "cppad": {"baseline": "20200000.3", "port-version": 0}, "cppcms": {"baseline": "1.2.1", "port-version": 2}, "cppcodec": {"baseline": "0.2", "port-version": 0}, "cppcoro": {"baseline": "2020-2-28-1", "port-version": 0}, "cppfs": {"baseline": "1.3.0", "port-version": 0}, "cppgraphqlgen": {"baseline": "2020-12-07", "port-version": 1}, "cppitertools": {"baseline": "2.0", "port-version": 0}, "cppkafka": {"baseline": "0.3.1-2", "port-version": 0}, "cppmicroservices": {"baseline": "3.4.0", "port-version": 2}, "cpprestsdk": {"baseline": "2.10.17", "port-version": 0}, "cpptoml": {"baseline": "v0.1.1", "port-version": 0}, "cppunit": {"baseline": "1.15.1", "port-version": 0}, "cpputest": {"baseline": "2019-9-16-1", "port-version": 0}, "cppwinrt": {"baseline": "windows-sdk", "port-version": 0}, "cppzmq": {"baseline": "4.7.1", "port-version": 1}, "cpr": {"baseline": "1.5.2", "port-version": 0}, "cpu-features": {"baseline": "0.4.1", "port-version": 0}, "cpuid": {"baseline": "0.4.1-1", "port-version": 0}, "cpuinfo": {"baseline": "2019-07-28-1", "port-version": 0}, "cr": {"baseline": "2020-04-26", "port-version": 0}, "crashpad": {"baseline": "2020-03-18", "port-version": 0}, "crashrpt": {"baseline": "1.4.3", "port-version": 0}, "crc32c": {"baseline": "1.1.1", "port-version": 0}, "crfsuite": {"baseline": "2019-07-21", "port-version": 0}, "croncpp": {"baseline": "2020-09-04", "port-version": 1}, "crossguid": {"baseline": "0.2.2-2018-06-16-1", "port-version": 0}, "crow": {"baseline": "0.1-1", "port-version": 0}, "cryptopp": {"baseline": "8.2.0-2", "port-version": 0}, "cspice": {"baseline": "66", "port-version": 3}, "ctbignum": {"baseline": "2019-08-02", "port-version": 0}, "ctemplate": {"baseline": "2020-09-14", "port-version": 0}, "ctp": {"baseline": "6.3.15_20190220_se", "port-version": 1}, "ctre": {"baseline": "2.10", "port-version": 0}, "cub": {"baseline": "1.8.0-1", "port-version": 0}, "cuda": {"baseline": "10.1", "port-version": 5}, "cudnn": {"baseline": "7.6", "port-version": 4}, "cunit": {"baseline": "2.1.3-6", "port-version": 0}, "curl": {"baseline": "7.74.0", "port-version": 2}, "curlpp": {"baseline": "2018-06-15-3", "port-version": 0}, "cute-headers": {"baseline": "2019-09-20", "port-version": 0}, "cutelyst2": {"baseline": "2.12.0", "port-version": 0}, "cwalk": {"baseline": "1.2.5", "port-version": 0}, "cxxopts": {"baseline": "2.2.1", "port-version": 0}, "czmq": {"baseline": "2019-06-10-4", "port-version": 0}, "d3dx12": {"baseline": "may2020", "port-version": 0}, "darknet": {"baseline": "2020-08-30", "port-version": 2}, "darts-clone": {"baseline": "1767ab87cffe-1", "port-version": 0}, "dartsim": {"baseline": "6.9.4", "port-version": 0}, "dataframe": {"baseline": "1.12.0", "port-version": 0}, "date": {"baseline": "3.0.0", "port-version": 1}, "dbg-macro": {"baseline": "2019-07-11", "port-version": 0}, "dbghelp": {"baseline": "0.0", "port-version": 0}, "dbow2": {"baseline": "2019-08-05", "port-version": 0}, "dbow3": {"baseline": "1.0.0", "port-version": 0}, "dcmtk": {"baseline": "3.6.5+_20191213", "port-version": 0}, "debug-assert": {"baseline": "1.3.3", "port-version": 0}, "decimal-for-cpp": {"baseline": "1.16", "port-version": 1}, "detours": {"baseline": "4.0.1-1", "port-version": 0}, "devicenameresolver": {"baseline": "2016-06-26-0850d88fa6-1", "port-version": 0}, "devil": {"baseline": "1.8.0", "port-version": 7}, "dimcli": {"baseline": "5.0.2", "port-version": 0}, "directx-headers": {"baseline": "1.0.1", "port-version": 0}, "directxmath": {"baseline": "jan2021", "port-version": 0}, "directxmesh": {"baseline": "jan2021", "port-version": 0}, "directxsdk": {"baseline": "jun10", "port-version": 0}, "directxtex": {"baseline": "jan2021", "port-version": 0}, "directxtk": {"baseline": "jan2021", "port-version": 0}, "directxtk12": {"baseline": "jan2021", "port-version": 0}, "dirent": {"baseline": "1.23.2", "port-version": 0}, "discord-game-sdk": {"baseline": "2.5.6-1", "port-version": 0}, "discord-rpc": {"baseline": "3.4.0", "port-version": 0}, "discount": {"baseline": "2.2.6", "port-version": 0}, "distorm": {"baseline": "3.4.1", "port-version": 0}, "dlfcn-win32": {"baseline": "1.1.1-4", "port-version": 0}, "dlib": {"baseline": "19.21", "port-version": 4}, "dmlc": {"baseline": "2019-08-12-4", "port-version": 0}, "docopt": {"baseline": "2018-11-01", "port-version": 0}, "doctest": {"baseline": "2.4.0", "port-version": 0}, "double-conversion": {"baseline": "3.1.5", "port-version": 0}, "dpdk": {"baseline": "19.02", "port-version": 0}, "draco": {"baseline": "1.3.6", "port-version": 0}, "drlibs": {"baseline": "2019-08-12", "port-version": 0}, "drogon": {"baseline": "1.1.0", "port-version": 0}, "dtl": {"baseline": "1.19", "port-version": 0}, "duckx": {"baseline": "1.0.0", "port-version": 0}, "duilib": {"baseline": "2019-4-28-2", "port-version": 0}, "duktape": {"baseline": "2.5.0", "port-version": 1}, "dx": {"baseline": "1.0.1-1", "port-version": 0}, "dxut": {"baseline": "11.14-3", "port-version": 0}, "eabase": {"baseline": "2.09.12-1", "port-version": 0}, "eastl": {"baseline": "3.17.03", "port-version": 0}, "easycl": {"baseline": "0.3", "port-version": 0}, "easyhook": {"baseline": "2.7.6789.0", "port-version": 0}, "easyloggingpp": {"baseline": "9.96.7-1", "port-version": 0}, "eathread": {"baseline": "1.32.09-1", "port-version": 0}, "ebml": {"baseline": "1.4.0", "port-version": 0}, "ecm": {"baseline": "5.74.0", "port-version": 0}, "ecos": {"baseline": "2.0.7", "port-version": 0}, "ecsutil": {"baseline": "1.0.7.15", "port-version": 0}, "edlib": {"baseline": "1.2.6", "port-version": 0}, "effolkronium-random": {"baseline": "1.3.1", "port-version": 0}, "efsw": {"baseline": "2020-06-08", "port-version": 1}, "egl-registry": {"baseline": "2020-02-20", "port-version": 0}, "eigen3": {"baseline": "3.3.9", "port-version": 0}, "elfio": {"baseline": "3.8", "port-version": 0}, "elfutils": {"baseline": "0.182", "port-version": 0}, "embree2": {"baseline": "2.17.7", "port-version": 0}, "embree3": {"baseline": "3.11.0", "port-version": 1}, "enet": {"baseline": "1.3.16", "port-version": 0}, "ensmallen": {"baseline": "2.14.2", "port-version": 0}, "entityx": {"baseline": "1.3.0-2", "port-version": 0}, "entt": {"baseline": "3.6.0", "port-version": 0}, "epsilon": {"baseline": "0.9.2-4", "port-version": 0}, "esaxx": {"baseline": "ca7cb332011ec37", "port-version": 0}, "evpp": {"baseline": "0.7.0", "port-version": 4}, "exiv2": {"baseline": "0.27.3", "port-version": 4}, "expat": {"baseline": "2020-08-18", "port-version": 0}, "expected-lite": {"baseline": "0.3.0", "port-version": 0}, "exprtk": {"baseline": "2020-09-14", "port-version": 0}, "ezc3d": {"baseline": "1.3.7", "port-version": 0}, "faad2": {"baseline": "2.9.1", "port-version": 2}, "fadbad": {"baseline": "2.1.0", "port-version": 0}, "faiss": {"baseline": "1.6.4", "port-version": 0}, "fann": {"baseline": "2.2.0-1", "port-version": 0}, "farmhash": {"baseline": "1.1", "port-version": 2}, "fast-cpp-csv-parser": {"baseline": "2019-08-14", "port-version": 0}, "fastcdr": {"baseline": "1.0.15", "port-version": 0}, "fastcgi": {"baseline": "2020-09-11", "port-version": 0}, "fastfeat": {"baseline": "391d5e9-1", "port-version": 0}, "fastlz": {"baseline": "1.0-3", "port-version": 0}, "fastrtps": {"baseline": "2.0.1", "port-version": 0}, "fbthrift": {"baseline": "2020.10.19.00", "port-version": 0}, "fcl": {"baseline": "0.6.1", "port-version": 0}, "fdk-aac": {"baseline": "2018-07-08-2", "port-version": 0}, "fdlibm": {"baseline": "5.3-4", "port-version": 0}, "ffmpeg": {"baseline": "4.3.1", "port-version": 9}, "ffnvcodec": {"baseline": "10.0.26.0", "port-version": 0}, "fftw3": {"baseline": "3.3.8-7", "port-version": 0}, "fftwpp": {"baseline": "2019-12-19", "port-version": 0}, "field3d": {"baseline": "1.7.3", "port-version": 1}, "fixed-string": {"baseline": "0.1.0", "port-version": 0}, "fizz": {"baseline": "2020.10.19.00", "port-version": 0}, "flann": {"baseline": "2019-04-07", "port-version": 1}, "flashlight-cuda": {"baseline": "20201201", "port-version": 0}, "flatbuffers": {"baseline": "1.12.0", "port-version": 0}, "flint": {"baseline": "2.5.2-4", "port-version": 0}, "fltk": {"baseline": "1.3.5", "port-version": 3}, "fluidlite": {"baseline": "2020-08-27", "port-version": 0}, "fluidsynth": {"baseline": "2.1.4", "port-version": 0}, "fmem": {"baseline": "c-libs-2ccee3d2fb", "port-version": 0}, "fmi4cpp": {"baseline": "0.7.0-2", "port-version": 0}, "fmilib": {"baseline": "2.0.3", "port-version": 3}, "fmt": {"baseline": "7.1.3", "port-version": 0}, "folly": {"baseline": "2020.10.19.00", "port-version": 0}, "font-chef": {"baseline": "1.0.1", "port-version": 0}, "fontconfig": {"baseline": "2.13.1", "port-version": 3}, "foonathan-memory": {"baseline": "2019-07-21-1", "port-version": 0}, "forest": {"baseline": "12.1.0", "port-version": 0}, "forge": {"baseline": "1.0.5", "port-version": 0}, "fplus": {"baseline": "0.2.3-p0", "port-version": 0}, "freeglut": {"baseline": "3.2.1-4", "port-version": 0}, "freeimage": {"baseline": "3.18.0", "port-version": 18}, "freeopcua": {"baseline": "20190125-3", "port-version": 0}, "freerdp": {"baseline": "2.2.0", "port-version": 0}, "freetds": {"baseline": "1.2.11", "port-version": 1}, "freetype": {"baseline": "2.10.4", "port-version": 0}, "freetype-gl": {"baseline": "2020-09-14", "port-version": 0}, "freexl": {"baseline": "1.0.4", "port-version": 11}, "fribidi": {"baseline": "1.0.10", "port-version": 1}, "frozen": {"baseline": "1.0.0", "port-version": 0}, "fruit": {"baseline": "3.6.0", "port-version": 0}, "ftgl": {"baseline": "2.4.0-2", "port-version": 0}, "function2": {"baseline": "4.1.0", "port-version": 0}, "fuzzylite": {"baseline": "6.0", "port-version": 3}, "g2o": {"baseline": "2020-02-07", "port-version": 1}, "g3log": {"baseline": "2019-07-29", "port-version": 0}, "gainput": {"baseline": "1.0.0-3", "port-version": 0}, "gamedev-framework": {"baseline": "0.18.1", "port-version": 0}, "gamma": {"baseline": "gamma-2018-01-27", "port-version": 2}, "gasol": {"baseline": "2018-01-04", "port-version": 0}, "gaussianlib": {"baseline": "2019-08-04", "port-version": 0}, "gcem": {"baseline": "1.13.1", "port-version": 0}, "gdal": {"baseline": "3.1.3", "port-version": 1}, "gdcm": {"baseline": "3.0.7", "port-version": 0}, "gdcm2": {"baseline": "deprecated", "port-version": 0}, "gdk-pixbuf": {"baseline": "2.36.9-5", "port-version": 7}, "genann": {"baseline": "2019-07-10", "port-version": 0}, "geogram": {"baseline": "1.7.5", "port-version": 2}, "geographiclib": {"baseline": "1.51", "port-version": 0}, "geos": {"baseline": "3.8.1", "port-version": 1}, "geotrans": {"baseline": "3.8", "port-version": 0}, "getdns": {"baseline": "1.6.0", "port-version": 0}, "getopt": {"baseline": "0", "port-version": 0}, "getopt-win32": {"baseline": "0.1", "port-version": 0}, "gettext": {"baseline": "0.21", "port-version": 0}, "gettimeofday": {"baseline": "2017-10-14-3", "port-version": 0}, "gflags": {"baseline": "2.2.2-1", "port-version": 0}, "gherkin-c": {"baseline": "2019-10-07-1", "port-version": 0}, "giflib": {"baseline": "5.1.4-6", "port-version": 0}, "gl2ps": {"baseline": "1.4.0-3", "port-version": 0}, "gl3w": {"baseline": "2018-05-31-2", "port-version": 0}, "glad": {"baseline": "0.1.33-1", "port-version": 0}, "glbinding": {"baseline": "3.1.0", "port-version": 3}, "glew": {"baseline": "2.1.0", "port-version": 9}, "glfw3": {"baseline": "3.3.2", "port-version": 0}, "gli": {"baseline": "dd17acf-1", "port-version": 0}, "glib": {"baseline": "2.52.3", "port-version": 25}, "glibmm": {"baseline": "2.52.1", "port-version": 14}, "glm": {"baseline": "0.9.9.8", "port-version": 0}, "globjects": {"baseline": "1.1.0-3", "port-version": 0}, "glog": {"baseline": "0.4.0-3", "port-version": 0}, "gloo": {"baseline": "20201203", "port-version": 0}, "glslang": {"baseline": "2019-03-05-1", "port-version": 0}, "glui": {"baseline": "2019-11-30", "port-version": 0}, "gmime": {"baseline": "3.2.6", "port-version": 1}, "gmmlib": {"baseline": "20.3.1", "port-version": 0}, "gmp": {"baseline": "6.2.1-2", "port-version": 0}, "google-cloud-cpp": {"baseline": "1.22.0", "port-version": 0}, "google-cloud-cpp-common": {"baseline": "alias", "port-version": 0}, "google-cloud-cpp-spanner": {"baseline": "alias", "port-version": 0}, "googleapis": {"baseline": "alias", "port-version": 0}, "gperf": {"baseline": "3.1-1", "port-version": 0}, "gperftools": {"baseline": "2019-09-02", "port-version": 0}, "gpgme": {"baseline": "1.14.0", "port-version": 0}, "gppanel": {"baseline": "2020-05-20", "port-version": 0}, "graphicsmagick": {"baseline": "1.3.36", "port-version": 0}, "graphite2": {"baseline": "1.3.14", "port-version": 0}, "graphqlparser": {"baseline": "0.7.0-1", "port-version": 0}, "greatest": {"baseline": "1.4.2", "port-version": 0}, "grpc": {"baseline": "1.33.1", "port-version": 2}, "grppi": {"baseline": "0.4.0", "port-version": 0}, "gsl": {"baseline": "2.6", "port-version": 0}, "gsl-lite": {"baseline": "0.37.0", "port-version": 0}, "gsoap": {"baseline": "2.8.105", "port-version": 0}, "gtest": {"baseline": "1.10.0", "port-version": 2}, "gtk": {"baseline": "3.22.19-4", "port-version": 0}, "gtkmm": {"baseline": "3.22.2", "port-version": 5}, "gts": {"baseline": "0.7.6-3", "port-version": 0}, "guetzli": {"baseline": "2020-09-14", "port-version": 0}, "gumbo": {"baseline": "0.10.1-3", "port-version": 0}, "gzip-hpp": {"baseline": "0.1.0", "port-version": 0}, "h3": {"baseline": "3.6.3", "port-version": 0}, "h5py-lzf": {"baseline": "2019-12-04", "port-version": 0}, "halide": {"baseline": "10.0.0", "port-version": 0}, "harfbuzz": {"baseline": "2.7.2", "port-version": 1}, "hayai": {"baseline": "2019-08-10", "port-version": 0}, "hdf5": {"baseline": "1.12.0", "port-version": 0}, "healpix": {"baseline": "1.12.10", "port-version": 7}, "hedley": {"baseline": "14", "port-version": 0}, "hffix": {"baseline": "1.0.0", "port-version": 0}, "hfsm2": {"baseline": "beta7", "port-version": 0}, "hidapi": {"baseline": "0.10.1", "port-version": 0}, "highfive": {"baseline": "2.2.2", "port-version": 1}, "hiredis": {"baseline": "1.0.0", "port-version": 0}, "hpx": {"baseline": "1.5.1", "port-version": 1}, "http-parser": {"baseline": "2.9.4", "port-version": 0}, "hungarian": {"baseline": "v0.1.3", "port-version": 0}, "hunspell": {"baseline": "1.7.0", "port-version": 2}, "hwloc": {"baseline": "2.2.0", "port-version": 0}, "hyperscan": {"baseline": "5.3.0", "port-version": 1}, "hypre": {"baseline": "2.19.0", "port-version": 0}, "icu": {"baseline": "67.1", "port-version": 7}, "ideviceinstaller": {"baseline": "1.1.2.23-1", "port-version": 0}, "idevicerestore": {"baseline": "1.0.12-4", "port-version": 0}, "if97": {"baseline": "2.1.2", "port-version": 0}, "igloo": {"baseline": "1.1.1", "port-version": 0}, "ignition-cmake0": {"baseline": "0.6.2-2", "port-version": 0}, "ignition-cmake2": {"baseline": "2.5.0", "port-version": 0}, "ignition-common1": {"baseline": "1.1.1-1", "port-version": 0}, "ignition-common3": {"baseline": "3.9.0", "port-version": 0}, "ignition-fuel-tools1": {"baseline": "1.2.0-2", "port-version": 0}, "ignition-math4": {"baseline": "4.0.0-1", "port-version": 0}, "ignition-math6": {"baseline": "6.6.0", "port-version": 0}, "ignition-modularscripts": {"baseline": "2020-11-23", "port-version": 0}, "ignition-msgs1": {"baseline": "1.0.0", "port-version": 3}, "ignition-msgs5": {"baseline": "5.3.0", "port-version": 2}, "ignition-msgs6": {"baseline": "6.0.0", "port-version": 1}, "ignition-plugin1": {"baseline": "1.1.0", "port-version": 0}, "ignition-transport4": {"baseline": "4.0.0-2", "port-version": 0}, "ignition-transport8": {"baseline": "8.1.0", "port-version": 0}, "ignition-transport9": {"baseline": "9.0.0", "port-version": 0}, "ijg-libjpeg": {"baseline": "9d", "port-version": 0}, "ilmbase": {"baseline": "2.3.0", "port-version": 0}, "imgui": {"baseline": "1.79", "port-version": 4}, "imgui-sfml": {"baseline": "2.1-2", "port-version": 0}, "immer": {"baseline": "2019-06-07", "port-version": 0}, "implot": {"baseline": "0.8", "port-version": 0}, "indicators": {"baseline": "2020-10-30", "port-version": 0}, "infoware": {"baseline": "0.5.5", "port-version": 1}, "inih": {"baseline": "51", "port-version": 0}, "iniparser": {"baseline": "2020-04-06", "port-version": 0}, "inja": {"baseline": "3.0.0", "port-version": 0}, "intel-ipsec": {"baseline": "0.52-1", "port-version": 0}, "intel-mkl": {"baseline": "2020.0.0", "port-version": 0}, "intelrdfpmathlib": {"baseline": "20U2-1", "port-version": 0}, "io2d": {"baseline": "2020-09-14", "port-version": 1}, "irrlicht": {"baseline": "1.8.4-10", "port-version": 0}, "irrxml": {"baseline": "0", "port-version": 0}, "isal": {"baseline": "2.25.0", "port-version": 0}, "ismrmrd": {"baseline": "1.4.2", "port-version": 0}, "itk": {"baseline": "5.1.0", "port-version": 5}, "itpp": {"baseline": "4.3.1-5", "port-version": 0}, "ixwebsocket": {"baseline": "11.0.4", "port-version": 0}, "jack2": {"baseline": "1.9.14", "port-version": 0}, "jaeger-client-cpp": {"baseline": "0.5.1-1", "port-version": 0}, "jansson": {"baseline": "2.13.1", "port-version": 0}, "jasper": {"baseline": "2.0.20", "port-version": 0}, "jbig2dec": {"baseline": "0.19", "port-version": 0}, "jbigkit": {"baseline": "2.1-4", "port-version": 0}, "jemalloc": {"baseline": "4.3.1-4", "port-version": 0}, "jinja2cpplight": {"baseline": "2018-05-08", "port-version": 0}, "josuttis-jthread": {"baseline": "2020-07-21", "port-version": 1}, "jsmn": {"baseline": "2019-04-27", "port-version": 0}, "json-c": {"baseline": "2019-09-10", "port-version": 1}, "json-dto": {"baseline": "0.2.11", "port-version": 0}, "json-schema-validator": {"baseline": "2.1.0", "port-version": 0}, "json-spirit": {"baseline": "4.1.0-1", "port-version": 0}, "json11": {"baseline": "2017-06-20-2", "port-version": 0}, "json5-parser": {"baseline": "1.0.0", "port-version": 2}, "jsoncons": {"baseline": "0.159.0", "port-version": 0}, "jsoncpp": {"baseline": "1.9.4", "port-version": 0}, "jsonnet": {"baseline": "0.16.0", "port-version": 1}, "jwt-cpp": {"baseline": "0.4.0", "port-version": 0}, "jxrlib": {"baseline": "2019.10.9", "port-version": 2}, "kangaru": {"baseline": "4.2.4", "port-version": 0}, "kcp": {"baseline": "2019-09-20", "port-version": 0}, "kd-soap": {"baseline": "1.9.0", "port-version": 0}, "kealib": {"baseline": "1.4.11-3", "port-version": 0}, "kenlm": {"baseline": "20200924", "port-version": 1}, "keystone": {"baseline": "0.9.2", "port-version": 0}, "kf5archive": {"baseline": "5.74.0", "port-version": 1}, "kf5completion": {"baseline": "5.64.0", "port-version": 0}, "kf5config": {"baseline": "5.64.0", "port-version": 0}, "kf5coreaddons": {"baseline": "5.64.0", "port-version": 0}, "kf5crash": {"baseline": "5.64.0", "port-version": 0}, "kf5guiaddons": {"baseline": "5.64.0", "port-version": 0}, "kf5holidays": {"baseline": "5.74.0", "port-version": 0}, "kf5i18n": {"baseline": "5.64.0", "port-version": 1}, "kf5itemmodels": {"baseline": "5.64.0", "port-version": 0}, "kf5itemviews": {"baseline": "5.64.0", "port-version": 0}, "kf5plotting": {"baseline": "5.74.0", "port-version": 0}, "kf5syntaxhighlighting": {"baseline": "5.64.0-1", "port-version": 0}, "kf5widgetsaddons": {"baseline": "5.64.0", "port-version": 0}, "kf5windowsystem": {"baseline": "5.64.0", "port-version": 0}, "kfr": {"baseline": "2020-06-15", "port-version": 0}, "kinectsdk1": {"baseline": "1.8-2", "port-version": 0}, "kinectsdk2": {"baseline": "2.0-2", "port-version": 0}, "kissfft": {"baseline": "2020-03-30", "port-version": 0}, "knet": {"baseline": "1.0.1", "port-version": 1}, "krabsetw": {"baseline": "4.1.14", "port-version": 0}, "ktx": {"baseline": "4.0.0-beta5", "port-version": 1}, "kubazip": {"baseline": "0.1.19", "port-version": 0}, "kuku": {"baseline": "2.0", "port-version": 0}, "kvasir-mpl": {"baseline": "2019-08-06", "port-version": 0}, "lapack": {"baseline": "3", "port-version": 1}, "lapack-reference": {"baseline": "3.8.0", "port-version": 4}, "lastools": {"baseline": "2020-05-09", "port-version": 0}, "laszip": {"baseline": "3.4.3", "port-version": 0}, "lazy-importer": {"baseline": "2019-08-10", "port-version": 0}, "lcm": {"baseline": "1.4.0", "port-version": 1}, "lcms": {"baseline": "2.11", "port-version": 0}, "leaf": {"baseline": "0.2.2", "port-version": 1}, "lemon": {"baseline": "0", "port-version": 0}, "leptonica": {"baseline": "1.80.0", "port-version": 1}, "lerc": {"baseline": "2.2", "port-version": 1}, "lest": {"baseline": "1.35.1", "port-version": 1}, "leveldb": {"baseline": "1.22-1", "port-version": 0}, "levmar": {"baseline": "2.6", "port-version": 0}, "libaaplus": {"baseline": "2.12-1", "port-version": 0}, "libaiff": {"baseline": "5.0-6", "port-version": 0}, "libarchive": {"baseline": "3.4.3", "port-version": 2}, "libass": {"baseline": "0.15.0", "port-version": 0}, "libassuan": {"baseline": "2.5.3", "port-version": 0}, "libb2": {"baseline": "0.98.1", "port-version": 4}, "libbf": {"baseline": "1.0.0-1", "port-version": 0}, "libbson": {"baseline": "1.16.1", "port-version": 2}, "libcds": {"baseline": "2.3.3", "port-version": 0}, "libcerf": {"baseline": "1.13", "port-version": 0}, "libconfig": {"baseline": "1.7.2-2", "port-version": 0}, "libconfuse": {"baseline": "2019-07-14", "port-version": 0}, "libcopp": {"baseline": "1.3.4", "port-version": 0}, "libcrafter": {"baseline": "0.3", "port-version": 2}, "libcroco": {"baseline": "0.6.13", "port-version": 2}, "libcuckoo": {"baseline": "0.3", "port-version": 0}, "libdatachannel": {"baseline": "v0.10.1", "port-version": 0}, "libdatrie": {"baseline": "0.2.10-3", "port-version": 0}, "libde265": {"baseline": "1.0.8", "port-version": 0}, "libdisasm": {"baseline": "0.23-7", "port-version": 0}, "libdivide": {"baseline": "3.0", "port-version": 0}, "libdshowcapture": {"baseline": "0.6.0-1", "port-version": 0}, "libepoxy": {"baseline": "1.5.5", "port-version": 0}, "libevent": {"baseline": "2.1.12", "port-version": 1}, "libevhtp": {"baseline": "1.2.18", "port-version": 0}, "libexif": {"baseline": "0.6.22", "port-version": 0}, "libfabric": {"baseline": "1.8.1-1", "port-version": 0}, "libffi": {"baseline": "3.3", "port-version": 6}, "libflac": {"baseline": "1.3.3", "port-version": 5}, "libfort": {"baseline": "0.4.1", "port-version": 0}, "libfreenect2": {"baseline": "0.2.0", "port-version": 5}, "libftdi": {"baseline": "0.20-1", "port-version": 0}, "libftdi1": {"baseline": "1.4-1", "port-version": 0}, "libgcrypt": {"baseline": "1.8.6", "port-version": 0}, "libgd": {"baseline": "2.2.5-4", "port-version": 0}, "libgeotiff": {"baseline": "1.6.0", "port-version": 0}, "libgit2": {"baseline": "1.1.0", "port-version": 0}, "libgo": {"baseline": "3.1-1", "port-version": 0}, "libgpg-error": {"baseline": "1.39", "port-version": 0}, "libgpod": {"baseline": "2019-08-29", "port-version": 2}, "libgta": {"baseline": "1.0.8-1", "port-version": 0}, "libguarded": {"baseline": "2019-08-27-1", "port-version": 0}, "libharu": {"baseline": "2017-08-15-9", "port-version": 0}, "libhdfs3": {"baseline": "2019-11-05", "port-version": 0}, "libheif": {"baseline": "1.10.0", "port-version": 0}, "libhsplasma": {"baseline": "2020.08.30", "port-version": 0}, "libhydrogen": {"baseline": "2019-08-11", "port-version": 0}, "libiconv": {"baseline": "1.16", "port-version": 6}, "libics": {"baseline": "1.6.4", "port-version": 0}, "libideviceactivation": {"baseline": "1.2.235", "port-version": 0}, "libidn2": {"baseline": "2.3.0", "port-version": 1}, "libigl": {"baseline": "2.2.0", "port-version": 3}, "libilbc": {"baseline": "3.0.3", "port-version": 0}, "libimobiledevice": {"baseline": "1.3.6", "port-version": 1}, "libirecovery": {"baseline": "1.0.25-2", "port-version": 0}, "libjpeg-turbo": {"baseline": "2.0.5", "port-version": 3}, "libjuice": {"baseline": "0.6.0", "port-version": 0}, "libkml": {"baseline": "1.3.0", "port-version": 6}, "liblas": {"baseline": "1.8.1", "port-version": 5}, "liblbfgs": {"baseline": "1.10", "port-version": 0}, "liblemon": {"baseline": "2019-06-13-1", "port-version": 0}, "liblinear": {"baseline": "241", "port-version": 0}, "liblo": {"baseline": "0.31", "port-version": 0}, "liblsl": {"baseline": "1.13.1", "port-version": 0}, "liblzma": {"baseline": "5.2.5", "port-version": 2}, "libmad": {"baseline": "0.15.1-8", "port-version": 0}, "libmagic": {"baseline": "5.37", "port-version": 2}, "libmariadb": {"baseline": "3.1.10", "port-version": 4}, "libmaxminddb": {"baseline": "1.4.3", "port-version": 0}, "libmediainfo": {"baseline": "20.09", "port-version": 0}, "libmesh": {"baseline": "1.5.0-1", "port-version": 0}, "libmicrohttpd": {"baseline": "0.9.63", "port-version": 4}, "libmikmod": {"baseline": "3.3.11.1-8", "port-version": 0}, "libmodbus": {"baseline": "3.1.6", "port-version": 1}, "libmodman": {"baseline": "2.0.1-2", "port-version": 0}, "libmodplug": {"baseline": "0.8.9.0", "port-version": 6}, "libmorton": {"baseline": "0.2", "port-version": 0}, "libmpeg2": {"baseline": "0.5.1", "port-version": 0}, "libmspack": {"baseline": "0.10.1-3", "port-version": 0}, "libmupdf": {"baseline": "1.18.0", "port-version": 0}, "libmysql": {"baseline": "8.0.20", "port-version": 1}, "libnice": {"baseline": "0.1.15", "port-version": 6}, "libnoise": {"baseline": "1.0.0", "port-version": 1}, "libodb": {"baseline": "2.4.0-6", "port-version": 0}, "libodb-boost": {"baseline": "2.4.0-3", "port-version": 0}, "libodb-mysql": {"baseline": "2.4.0-7", "port-version": 0}, "libodb-pgsql": {"baseline": "2.4.0-3", "port-version": 0}, "libodb-sqlite": {"baseline": "2.4.0", "port-version": 7}, "libogg": {"baseline": "1.3.4", "port-version": 3}, "libopenmpt": {"baseline": "2017-01-28-cf2390140", "port-version": 1}, "libopusenc": {"baseline": "0.2.1", "port-version": 0}, "libosip2": {"baseline": "5.1.0-4", "port-version": 0}, "libosmium": {"baseline": "2.15.5", "port-version": 0}, "libosmscout": {"baseline": "1.1.1", "port-version": 0}, "libp7-baical": {"baseline": "replaced", "port-version": 0}, "libp7client": {"baseline": "5.6", "port-version": 0}, "libpcap": {"baseline": "1.9.1-2", "port-version": 0}, "libpff": {"baseline": "2018-07-14-1", "port-version": 0}, "libplist": {"baseline": "1.3.6", "port-version": 0}, "libpmemobj-cpp": {"baseline": "1.11", "port-version": 0}, "libpng": {"baseline": "1.6.37", "port-version": 14}, "libpopt": {"baseline": "1.16-13", "port-version": 0}, "libpq": {"baseline": "12.2", "port-version": 10}, "libpqxx": {"baseline": "7.3.0", "port-version": 0}, "libprotobuf-mutator": {"baseline": "1.0", "port-version": 0}, "libproxy": {"baseline": "0.4.15-2", "port-version": 0}, "libqcow": {"baseline": "20200928", "port-version": 0}, "libqglviewer": {"baseline": "2.7.2-3", "port-version": 0}, "libqrencode": {"baseline": "4.1.0", "port-version": 0}, "librabbitmq": {"baseline": "2020-06-03", "port-version": 0}, "libraqm": {"baseline": "0.7.0", "port-version": 2}, "libraw": {"baseline": "201903-3", "port-version": 0}, "librdkafka": {"baseline": "1.5.0", "port-version": 0}, "libressl": {"baseline": "2.9.1", "port-version": 3}, "librsvg": {"baseline": "2.40.20-2", "port-version": 0}, "librsync": {"baseline": "2020-09-16", "port-version": 1}, "librtmp": {"baseline": "2019-11-11_1", "port-version": 0}, "librttopo": {"baseline": "1.1.0-2", "port-version": 0}, "libsamplerate": {"baseline": "0.1.9.0", "port-version": 3}, "libsbml": {"baseline": "5.18.0", "port-version": 0}, "libsigcpp": {"baseline": "2.10-3", "port-version": 2}, "libsigcpp-3": {"baseline": "3.0.3", "port-version": 0}, "libsndfile": {"baseline": "1.0.30", "port-version": 1}, "libsodium": {"baseline": "1.0.18", "port-version": 3}, "libsoundio": {"baseline": "2.0.0-3", "port-version": 0}, "libspatialindex": {"baseline": "1.9.0", "port-version": 0}, "libspatialite": {"baseline": "5.0.0", "port-version": 0}, "libspnav": {"baseline": "0.2.3", "port-version": 0}, "libsquish": {"baseline": "1.15-7", "port-version": 0}, "libsrt": {"baseline": "1.3.4", "port-version": 0}, "libsrtp": {"baseline": "2.2.0", "port-version": 0}, "libssh": {"baseline": "0.9.5", "port-version": 0}, "libssh2": {"baseline": "1.9.0", "port-version": 0}, "libstemmer": {"baseline": "2017-9-5", "port-version": 0}, "libstk": {"baseline": "4.6.1", "port-version": 0}, "libsvm": {"baseline": "323-1", "port-version": 0}, "libtheora": {"baseline": "1.2.0alpha1-20170719", "port-version": 2}, "libtins": {"baseline": "4.3", "port-version": 0}, "libtomcrypt": {"baseline": "1.18.2-1", "port-version": 0}, "libtommath": {"baseline": "1.2.0-1", "port-version": 0}, "libtorrent": {"baseline": "1.2.11", "port-version": 0}, "libu2f-server": {"baseline": "1.1.0", "port-version": 2}, "libudis86": {"baseline": "2018-01-28-56ff6c87", "port-version": 0}, "libudns": {"baseline": "0.4-2", "port-version": 0}, "libui": {"baseline": "2018-11-03-1", "port-version": 0}, "libunibreak": {"baseline": "4.3-0", "port-version": 0}, "libusb": {"baseline": "1.0.23", "port-version": 3}, "libusb-win32": {"baseline": "1.2.6.0-6", "port-version": 0}, "libusbmuxd": {"baseline": "1.2.219", "port-version": 0}, "libuuid": {"baseline": "1.0.3-7", "port-version": 0}, "libuv": {"baseline": "1.39.0", "port-version": 0}, "libvmdk": {"baseline": "20200926", "port-version": 0}, "libvorbis": {"baseline": "1.3.7", "port-version": 1}, "libvpx": {"baseline": "1.9.0", "port-version": 5}, "libwandio": {"baseline": "4.2.1", "port-version": 3}, "libwebm": {"baseline": "1.0.0.27-5", "port-version": 0}, "libwebp": {"baseline": "1.1.0", "port-version": 1}, "libwebsockets": {"baseline": "4.1.3", "port-version": 1}, "libxdiff": {"baseline": "0.23", "port-version": 0}, "libxlsxwriter": {"baseline": "0.9.4", "port-version": 0}, "libxml2": {"baseline": "2.9.10", "port-version": 2}, "libxmlmm": {"baseline": "0.6.0", "port-version": 0}, "libxmlpp": {"baseline": "2.40.1", "port-version": 8}, "libxmp-lite": {"baseline": "4.4.1-6", "port-version": 0}, "libxslt": {"baseline": "1.1.33", "port-version": 8}, "libyaml": {"baseline": "0.2.5", "port-version": 0}, "libyuv": {"baseline": "fec9121", "port-version": 3}, "libzen": {"baseline": "0.4.38", "port-version": 0}, "libzip": {"baseline": "1.7.3", "port-version": 1}, "libzippp": {"baseline": "4.0-1.7.3", "port-version": 3}, "licensepp": {"baseline": "2020-05-19", "port-version": 1}, "lilv": {"baseline": "0.24.10", "port-version": 0}, "linalg": {"baseline": "2.1", "port-version": 0}, "linenoise-ng": {"baseline": "4754bee2d8eb3-1", "port-version": 0}, "live555": {"baseline": "latest-1", "port-version": 0}, "llgl": {"baseline": "2019-08-15", "port-version": 1}, "llvm": {"baseline": "11.0.0", "port-version": 0}, "lmdb": {"baseline": "0.9.24", "port-version": 0}, "lodepng": {"baseline": "2020-03-15", "port-version": 0}, "log4cplus": {"baseline": "2.0.5", "port-version": 1}, "log4cpp": {"baseline": "2.9.1", "port-version": 3}, "log4cxx": {"baseline": "0.11.0", "port-version": 1}, "loguru": {"baseline": "2.1.0-1", "port-version": 0}, "lpeg": {"baseline": "1.0.2-1", "port-version": 0}, "lua": {"baseline": "5.4.1", "port-version": 0}, "luabridge": {"baseline": "2.6", "port-version": 0}, "luafilesystem": {"baseline": "1.8.0-1", "port-version": 0}, "luajit": {"baseline": "2.0.5-3", "port-version": 0}, "luasocket": {"baseline": "2020-09-14", "port-version": 0}, "lv2": {"baseline": "1.18.0", "port-version": 0}, "lz4": {"baseline": "1.9.2-2", "port-version": 0}, "lzfse": {"baseline": "1.0-2", "port-version": 0}, "lzo": {"baseline": "2.10-5", "port-version": 0}, "lzokay": {"baseline": "2020-07-30", "port-version": 0}, "magic-enum": {"baseline": "0.7.1", "port-version": 0}, "magic-get": {"baseline": "2019-09-02", "port-version": 2}, "magnum": {"baseline": "2020.06", "port-version": 2}, "magnum-extras": {"baseline": "2020.06", "port-version": 0}, "magnum-integration": {"baseline": "2020.06", "port-version": 0}, "magnum-plugins": {"baseline": "2020.06", "port-version": 1}, "mapbox-variant": {"baseline": "1.2.0", "port-version": 0}, "marble": {"baseline": "19.08.2", "port-version": 0}, "marl": {"baseline": "2020-10-10", "port-version": 0}, "mathc": {"baseline": "2019-09-29", "port-version": 0}, "mathgl": {"baseline": "2.4.3-6", "port-version": 0}, "matio": {"baseline": "1.5.17", "port-version": 0}, "matplotlib-cpp": {"baseline": "2020-08-27", "port-version": 0}, "matroska": {"baseline": "1.6.2", "port-version": 0}, "mbedtls": {"baseline": "2.24.0", "port-version": 1}, "mcpp": {"baseline": "2.7.2.14", "port-version": 2}, "mdns": {"baseline": "1.1", "port-version": 0}, "mdnsresponder": {"baseline": "765.30.11", "port-version": 3}, "mecab": {"baseline": "2019-09-25", "port-version": 1}, "memorymodule": {"baseline": "2019-12-31", "port-version": 0}, "mesa": {"baseline": "20.2.2", "port-version": 0}, "meschach": {"baseline": "1.2b-3", "port-version": 0}, "meshoptimizer": {"baseline": "0.14", "port-version": 1}, "metis": {"baseline": "5.1.0", "port-version": 7}, "metrohash": {"baseline": "1.1.3-1", "port-version": 0}, "mgnlibs": {"baseline": "2019-09-29", "port-version": 0}, "mhook": {"baseline": "2.5.1-1", "port-version": 0}, "microsoft-signalr": {"baseline": "0.1.0-alpha1", "port-version": 2}, "mikktspace": {"baseline": "2020-10-06", "port-version": 0}, "milerius-sfml-imgui": {"baseline": "1.1-2", "port-version": 0}, "mimalloc": {"baseline": "1.6.4", "port-version": 0}, "minc": {"baseline": "2.4.03", "port-version": 1}, "minhook": {"baseline": "1.3.3", "port-version": 1}, "minifb": {"baseline": "2019-08-20-1", "port-version": 0}, "minimp3": {"baseline": "2020-12-25", "port-version": 0}, "minisat-master-keying": {"baseline": "2.2-mod-2", "port-version": 0}, "minitrace": {"baseline": "2019.02.06", "port-version": 0}, "miniupnpc": {"baseline": "2.1-1", "port-version": 0}, "miniz": {"baseline": "2.1.0-1", "port-version": 0}, "minizip": {"baseline": "1.2.11", "port-version": 7}, "mio": {"baseline": "2019-02-10", "port-version": 0}, "mlpack": {"baseline": "3.4.1", "port-version": 0}, "mman": {"baseline": "git-f5ff813-3", "port-version": 0}, "mmloader": {"baseline": "2020-05-15", "port-version": 1}, "mmx": {"baseline": "2019-09-29", "port-version": 0}, "modp-base64": {"baseline": "2020-09-26", "port-version": 0}, "mongo-c-driver": {"baseline": "1.16.1", "port-version": 3}, "mongo-cxx-driver": {"baseline": "3.4.0-5", "port-version": 1}, "mongoose": {"baseline": "6.15-2", "port-version": 0}, "monkeys-audio": {"baseline": "5.70", "port-version": 0}, "moos-core": {"baseline": "10.4.0", "port-version": 5}, "moos-essential": {"baseline": "10.0.1-2", "port-version": 0}, "moos-ui": {"baseline": "10.0.1-2", "port-version": 0}, "morton-nd": {"baseline": "3.0.0", "port-version": 0}, "mosquitto": {"baseline": "1.6.8", "port-version": 3}, "mozjpeg": {"baseline": "2020-06-02", "port-version": 2}, "mp-units": {"baseline": "0.6.0", "port-version": 0}, "mp3lame": {"baseline": "3.100", "port-version": 6}, "mpark-variant": {"baseline": "1.4.0", "port-version": 0}, "mpfr": {"baseline": "4.0.2-2", "port-version": 0}, "mpg123": {"baseline": "1.26.3", "port-version": 0}, "mpi": {"baseline": "1", "port-version": 0}, "mpir": {"baseline": "3.0.0", "port-version": 10}, "mpmcqueue": {"baseline": "2019-07-26", "port-version": 0}, "mqtt-cpp": {"baseline": "7.0.1-2", "port-version": 0}, "ms-angle": {"baseline": "alias", "port-version": 0}, "ms-gsl": {"baseline": "3.1.0", "port-version": 0}, "msgpack": {"baseline": "3.3.0", "port-version": 0}, "msgpack11": {"baseline": "0.0.10-1", "port-version": 0}, "msinttypes": {"baseline": "2018-02-25", "port-version": 0}, "msix": {"baseline": "1.7-2", "port-version": 0}, "msmpi": {"baseline": "10.1", "port-version": 0}, "mstch": {"baseline": "1.0.2-2", "port-version": 0}, "mujs": {"baseline": "2018-07-30-1", "port-version": 0}, "munit": {"baseline": "2019-04-06", "port-version": 1}, "muparser": {"baseline": "2.3.2", "port-version": 0}, "murmurhash": {"baseline": "2016-01-09-3", "port-version": 0}, "mygui": {"baseline": "2020-06-17", "port-version": 0}, "nameof": {"baseline": "0.9.4", "port-version": 0}, "nana": {"baseline": "1.7.4", "port-version": 1}, "nano-signal-slot": {"baseline": "2.0.1", "port-version": 0}, "nanobench": {"baseline": "4.3.0", "port-version": 0}, "nanodbc": {"baseline": "2.13.0", "port-version": 0}, "nanoflann": {"baseline": "1.3.1", "port-version": 0}, "nanogui": {"baseline": "2019-09-23", "port-version": 1}, "nanomsg": {"baseline": "1.1.5-2", "port-version": 0}, "nanopb": {"baseline": "2019-02-12-2", "port-version": 0}, "nanoprintf": {"baseline": "2020-05-27", "port-version": 0}, "nanorange": {"baseline": "0.0.0", "port-version": 0}, "nanort": {"baseline": "2019-08-20-1", "port-version": 0}, "nanovg": {"baseline": "2019-8-30-3", "port-version": 0}, "nativefiledialog": {"baseline": "2019-08-28", "port-version": 0}, "nccl": {"baseline": "2.4.6", "port-version": 0}, "neargye-semver": {"baseline": "0.2.2", "port-version": 0}, "netcdf-c": {"baseline": "4.7.4", "port-version": 1}, "netcdf-cxx4": {"baseline": "4.3.1", "port-version": 2}, "nethost": {"baseline": "2019-12-21", "port-version": 0}, "nettle": {"baseline": "3.6", "port-version": 0}, "networkdirect-sdk": {"baseline": "2.0.1", "port-version": 1}, "nghttp2": {"baseline": "1.42.0", "port-version": 0}, "ngspice": {"baseline": "32", "port-version": 1}, "nifticlib": {"baseline": "2020-04-30", "port-version": 0}, "nlohmann-fifo-map": {"baseline": "2018.05.07-1", "port-version": 0}, "nlohmann-json": {"baseline": "3.9.1", "port-version": 0}, "nlopt": {"baseline": "2.7.0", "port-version": 0}, "nmap": {"baseline": "7.70-4", "port-version": 0}, "nmslib": {"baseline": "2.0.6", "port-version": 0}, "nng": {"baseline": "1.3.2", "port-version": 0}, "nngpp": {"baseline": "1.3.0", "port-version": 0}, "nonius": {"baseline": "2019-04-20-1", "port-version": 0}, "nowide": {"baseline": "11.0.0", "port-version": 0}, "nrf-ble-driver": {"baseline": "4.1.2", "port-version": 0}, "nt-wrapper": {"baseline": "2019-08-10", "port-version": 0}, "nuklear": {"baseline": "2020-09-14", "port-version": 0}, "numactl": {"baseline": "2.0.12", "port-version": 0}, "numcpp": {"baseline": "2.1.0", "port-version": 0}, "nuspell": {"baseline": "4.2.0", "port-version": 0}, "nvtt": {"baseline": "2.1.2", "port-version": 1}, "oatpp": {"baseline": "1.2.0", "port-version": 1}, "oatpp-consul": {"baseline": "1.2.0", "port-version": 1}, "oatpp-curl": {"baseline": "1.2.0", "port-version": 2}, "oatpp-libressl": {"baseline": "1.2.0", "port-version": 1}, "oatpp-mbedtls": {"baseline": "1.2.0", "port-version": 1}, "oatpp-mongo": {"baseline": "1.2.0", "port-version": 1}, "oatpp-postgresql": {"baseline": "1.2.0", "port-version": 1}, "oatpp-sqlite": {"baseline": "1.2.0", "port-version": 1}, "oatpp-swagger": {"baseline": "1.2.0", "port-version": 1}, "oatpp-websocket": {"baseline": "1.2.0", "port-version": 1}, "oatpp-zlib": {"baseline": "1.2.0", "port-version": 1}, "observer-ptr-lite": {"baseline": "0.4.0", "port-version": 0}, "ocilib": {"baseline": "4.7.1", "port-version": 0}, "octomap": {"baseline": "1.9.5", "port-version": 0}, "ode": {"baseline": "0.16.1", "port-version": 0}, "offscale-libetcd-cpp": {"baseline": "2019-07-10-1", "port-version": 0}, "ogdf": {"baseline": "2019-08-23", "port-version": 1}, "ogre": {"baseline": "1.12.9", "port-version": 4}, "ogre-next": {"baseline": "2019-10-20-1", "port-version": 0}, "ois": {"baseline": "1.5", "port-version": 2}, "ompl": {"baseline": "1.5.1", "port-version": 0}, "onednn": {"baseline": "2.0", "port-version": 1}, "oniguruma": {"baseline": "6.9.4", "port-version": 0}, "onnxruntime-gpu": {"baseline": "1.5.1", "port-version": 0}, "open62541": {"baseline": "1.1.2", "port-version": 0}, "openal-soft": {"baseline": "1.20.1", "port-version": 5}, "openblas": {"baseline": "0.3.10", "port-version": 0}, "opencascade": {"baseline": "7.4.0", "port-version": 3}, "opencc": {"baseline": "2020-04-26", "port-version": 7}, "opencensus-cpp": {"baseline": "0.4.0-1", "port-version": 0}, "opencl": {"baseline": "2.2", "port-version": 6}, "opencolorio": {"baseline": "1.1.1", "port-version": 4}, "opencolorio-tools": {"baseline": "1.1.1", "port-version": 0}, "opencsg": {"baseline": "1.4.2-1", "port-version": 0}, "opencv": {"baseline": "4.3.0", "port-version": 0}, "opencv2": {"baseline": "2.4.13.7", "port-version": 4}, "opencv3": {"baseline": "3.4.10", "port-version": 4}, "opencv4": {"baseline": "4.3.0", "port-version": 4}, "opendnp3": {"baseline": "3.1.0", "port-version": 0}, "openexr": {"baseline": "2.5.0", "port-version": 2}, "opengl": {"baseline": "0.0", "port-version": 8}, "opengl-registry": {"baseline": "2020-03-25", "port-version": 0}, "openigtlink": {"baseline": "3.0", "port-version": 0}, "openimageio": {"baseline": "2.1.16.0", "port-version": 4}, "openjpeg": {"baseline": "2.3.1", "port-version": 2}, "openmama": {"baseline": "6.3.1", "port-version": 0}, "openmesh": {"baseline": "8.1", "port-version": 0}, "openmpi": {"baseline": "4.0.3", "port-version": 3}, "openmvg": {"baseline": "1.6", "port-version": 0}, "openmvs": {"baseline": "1.1", "port-version": 4}, "openni2": {"baseline": "2.2.0.33-11", "port-version": 0}, "openscap": {"baseline": "1.3.1", "port-version": 0}, "openssl": {"baseline": "1.1.1i", "port-version": 0}, "openssl-unix": {"baseline": "1.1.1h", "port-version": 1}, "openssl-uwp": {"baseline": "1.1.1h", "port-version": 1}, "openssl-windows": {"baseline": "1.1.1h", "port-version": 1}, "opensubdiv": {"baseline": "3.4.3", "port-version": 0}, "opentracing": {"baseline": "1.6.0", "port-version": 1}, "openvdb": {"baseline": "7.1.0", "port-version": 1}, "openvpn3": {"baseline": "3.4.1-1", "port-version": 0}, "openvr": {"baseline": "1.12.5", "port-version": 0}, "openxr-loader": {"baseline": "1.0.11", "port-version": 1}, "optional-bare": {"baseline": "1.1.0", "port-version": 0}, "optional-lite": {"baseline": "3.2.0", "port-version": 0}, "opus": {"baseline": "1.3.1", "port-version": 5}, "opusfile": {"baseline": "0.12", "port-version": 0}, "orc": {"baseline": "1.6.4", "port-version": 1}, "orocos-kdl": {"baseline": "1.4", "port-version": 3}, "osg": {"baseline": "3.6.5", "port-version": 5}, "osg-qt": {"baseline": "Qt4", "port-version": 3}, "osgearth": {"baseline": "3.1", "port-version": 0}, "osi": {"baseline": "0.108.6", "port-version": 0}, "otl": {"baseline": "4.0.455", "port-version": 0}, "outcome": {"baseline": "2.1.3", "port-version": 0}, "p-ranav-csv": {"baseline": "2019-07-11", "port-version": 0}, "p-ranav-csv2": {"baseline": "2020-12-14", "port-version": 0}, "paho-mqtt": {"baseline": "1.3.8", "port-version": 0}, "paho-mqttpp3": {"baseline": "1.1", "port-version": 1}, "palsigslot": {"baseline": "1.2.0", "port-version": 0}, "pango": {"baseline": "1.40.11", "port-version": 8}, "pangolin": {"baseline": "0.5", "port-version": 11}, "pangomm": {"baseline": "2.40.1", "port-version": 4}, "parallel-hashmap": {"baseline": "1.32", "port-version": 0}, "parallelstl": {"baseline": "20200330", "port-version": 0}, "paraview": {"baseline": "5.8.0", "port-version": 3}, "parmetis": {"baseline": "4.0.3-3", "port-version": 0}, "parquet": {"baseline": "0", "port-version": 0}, "parson": {"baseline": "2020-09-14", "port-version": 0}, "pbc": {"baseline": "0.5.14", "port-version": 4}, "pcg": {"baseline": "0.98.1", "port-version": 0}, "pcl": {"baseline": "1.11.1", "port-version": 1}, "pcre": {"baseline": "8.44", "port-version": 8}, "pcre2": {"baseline": "10.35", "port-version": 2}, "pdal": {"baseline": "1.7.1", "port-version": 10}, "pdal-c": {"baseline": "1.8-2", "port-version": 0}, "pdcurses": {"baseline": "3.9", "port-version": 0}, "pdqsort": {"baseline": "2019-07-30", "port-version": 0}, "pe-parse": {"baseline": "1.2.0", "port-version": 0}, "pegtl": {"baseline": "3.1.0", "port-version": 0}, "pegtl-2": {"baseline": "2.8.3", "port-version": 0}, "pfring": {"baseline": "2019-10-17-2", "port-version": 0}, "pfultz2-linq": {"baseline": "2019-05-14", "port-version": 0}, "phnt": {"baseline": "2019-05-01", "port-version": 0}, "physfs": {"baseline": "3.0.2-2", "port-version": 0}, "physx": {"baseline": "4.1.1", "port-version": 6}, "picojson": {"baseline": "1.3.0-1", "port-version": 0}, "picosha2": {"baseline": "2018-07-30", "port-version": 0}, "piex": {"baseline": "2019-07-11", "port-version": 0}, "pistache": {"baseline": "2019-08-05", "port-version": 0}, "pixel": {"baseline": "0.3-1", "port-version": 0}, "pixman": {"baseline": "0.38.4", "port-version": 2}, "platform-folders": {"baseline": "4.0.0", "port-version": 6}, "plf-colony": {"baseline": "5.33", "port-version": 0}, "plf-list": {"baseline": "2019-08-10", "port-version": 0}, "plf-nanotimer": {"baseline": "2019-08-10", "port-version": 0}, "plf-stack": {"baseline": "2019-08-10", "port-version": 0}, "plib": {"baseline": "1.8.5-4", "port-version": 0}, "plibsys": {"baseline": "0.0.4", "port-version": 4}, "plog": {"baseline": "1.1.5", "port-version": 0}, "plplot": {"baseline": "5.13.0", "port-version": 9}, "plustache": {"baseline": "0.4.0-1", "port-version": 0}, "pmdk": {"baseline": "1.9", "port-version": 0}, "pngpp": {"baseline": "0.2.10", "port-version": 0}, "pngwriter": {"baseline": "0.7.0-2", "port-version": 0}, "poco": {"baseline": "1.10.1", "port-version": 3}, "podofo": {"baseline": "0.9.6", "port-version": 12}, "poly2tri": {"baseline": "2020-07-21", "port-version": 0}, "polyclipping": {"baseline": "6.4.2", "port-version": 6}, "polyhook2": {"baseline": "2021-01-08", "port-version": 0}, "polymorphic-value": {"baseline": "1.3.0-1", "port-version": 0}, "ponder": {"baseline": "3.0.0-1", "port-version": 0}, "poppler": {"baseline": "20.12.1", "port-version": 2}, "portable-snippets": {"baseline": "2019-09-20", "port-version": 0}, "portaudio": {"baseline": "2020-02-02", "port-version": 2}, "portmidi": {"baseline": "0.234", "port-version": 0}, "ppconsul": {"baseline": "0.5-1", "port-version": 0}, "ppmagic": {"baseline": "2020-07-03", "port-version": 0}, "pprint": {"baseline": "2019-07-19", "port-version": 0}, "pqp": {"baseline": "1.3-4", "port-version": 0}, "proj": {"baseline": "0", "port-version": 0}, "proj4": {"baseline": "7.2.0", "port-version": 0}, "prometheus-cpp": {"baseline": "0.11.0", "port-version": 0}, "protobuf": {"baseline": "3.14.0", "port-version": 1}, "protobuf-c": {"baseline": "1.3.2-2", "port-version": 0}, "protopuf": {"baseline": "1.0.0", "port-version": 0}, "protozero": {"baseline": "1.6.8", "port-version": 0}, "proxygen": {"baseline": "2020.10.19.00", "port-version": 0}, "proxywrapper": {"baseline": "1.0.0", "port-version": 0}, "ptex": {"baseline": "2.3.2", "port-version": 2}, "pthread": {"baseline": "3.0.0", "port-version": 0}, "pthreads": {"baseline": "3.0.0-6", "port-version": 0}, "pugixml": {"baseline": "1.11.1", "port-version": 0}, "pybind11": {"baseline": "2.6.0", "port-version": 3}, "pystring": {"baseline": "1.1.3-2", "port-version": 0}, "python2": {"baseline": "2.7.15-2", "port-version": 0}, "python3": {"baseline": "3.9.0", "port-version": 3}, "qca": {"baseline": "2.3.1", "port-version": 2}, "qcustomplot": {"baseline": "2.0.1-4", "port-version": 0}, "qhull": {"baseline": "8.0.2", "port-version": 0}, "qpid-proton": {"baseline": "0.32.0", "port-version": 0}, "qscintilla": {"baseline": "2.11.4-2", "port-version": 0}, "qt-advanced-docking-system": {"baseline": "3.6.3", "port-version": 1}, "qt5": {"baseline": "5.15.1", "port-version": 1}, "qt5-3d": {"baseline": "5.15.1", "port-version": 0}, "qt5-activeqt": {"baseline": "5.15.1", "port-version": 0}, "qt5-androidextras": {"baseline": "5.15.1", "port-version": 0}, "qt5-base": {"baseline": "5.15.1", "port-version": 4}, "qt5-canvas3d": {"baseline": "0", "port-version": 0}, "qt5-charts": {"baseline": "5.15.1", "port-version": 0}, "qt5-connectivity": {"baseline": "5.15.1", "port-version": 1}, "qt5-datavis3d": {"baseline": "5.15.1", "port-version": 0}, "qt5-declarative": {"baseline": "5.15.1", "port-version": 0}, "qt5-doc": {"baseline": "5.15.1", "port-version": 0}, "qt5-gamepad": {"baseline": "5.15.1", "port-version": 0}, "qt5-graphicaleffects": {"baseline": "5.15.1", "port-version": 0}, "qt5-imageformats": {"baseline": "5.15.1", "port-version": 1}, "qt5-location": {"baseline": "5.15.1", "port-version": 2}, "qt5-macextras": {"baseline": "5.15.1", "port-version": 0}, "qt5-modularscripts": {"baseline": "deprecated", "port-version": 0}, "qt5-mqtt": {"baseline": "5.15.1", "port-version": 0}, "qt5-multimedia": {"baseline": "5.15.1", "port-version": 0}, "qt5-networkauth": {"baseline": "5.15.1", "port-version": 0}, "qt5-purchasing": {"baseline": "5.15.1", "port-version": 0}, "qt5-quickcontrols": {"baseline": "5.15.1", "port-version": 0}, "qt5-quickcontrols2": {"baseline": "5.15.1", "port-version": 0}, "qt5-remoteobjects": {"baseline": "5.15.1", "port-version": 0}, "qt5-script": {"baseline": "5.15.1", "port-version": 0}, "qt5-scxml": {"baseline": "5.15.1", "port-version": 0}, "qt5-sensors": {"baseline": "5.15.1", "port-version": 0}, "qt5-serialbus": {"baseline": "5.15.1", "port-version": 0}, "qt5-serialport": {"baseline": "5.15.1", "port-version": 0}, "qt5-speech": {"baseline": "5.15.1", "port-version": 0}, "qt5-svg": {"baseline": "5.15.1", "port-version": 0}, "qt5-tools": {"baseline": "5.15.1", "port-version": 1}, "qt5-translations": {"baseline": "5.15.1", "port-version": 0}, "qt5-virtualkeyboard": {"baseline": "5.15.1", "port-version": 0}, "qt5-wayland": {"baseline": "5.15.1", "port-version": 0}, "qt5-webchannel": {"baseline": "5.15.1", "port-version": 0}, "qt5-webengine": {"baseline": "5.15.1", "port-version": 1}, "qt5-webglplugin": {"baseline": "5.15.1", "port-version": 0}, "qt5-websockets": {"baseline": "5.15.1", "port-version": 0}, "qt5-webview": {"baseline": "5.15.1", "port-version": 0}, "qt5-winextras": {"baseline": "5.15.1", "port-version": 0}, "qt5-x11extras": {"baseline": "5.15.1", "port-version": 0}, "qt5-xmlpatterns": {"baseline": "5.15.1", "port-version": 0}, "qtkeychain": {"baseline": "0.11.1", "port-version": 0}, "quadtree": {"baseline": "2020-04-13", "port-version": 0}, "quantlib": {"baseline": "2019-09-02", "port-version": 0}, "quaternions": {"baseline": "1.0.0", "port-version": 0}, "quazip": {"baseline": "0.9.1", "port-version": 0}, "quickfast": {"baseline": "1.5", "port-version": 0}, "quickfix": {"baseline": "1.15.1-4", "port-version": 0}, "quill": {"baseline": "1.6.1", "port-version": 0}, "quirc": {"baseline": "1.1", "port-version": 1}, "qwt": {"baseline": "6.1.5", "port-version": 0}, "qwtw": {"baseline": "3.1.0", "port-version": 0}, "rabit": {"baseline": "0.1-2", "port-version": 0}, "ragel": {"baseline": "6.10-3", "port-version": 0}, "rang": {"baseline": "3.1.0", "port-version": 0}, "range-v3": {"baseline": "0.11.0", "port-version": 0}, "range-v3-vs2015": {"baseline": "20151130-vcpkg5", "port-version": 0}, "rapidcheck": {"baseline": "2020-08-25", "port-version": 0}, "rapidjson": {"baseline": "2020-09-14", "port-version": 0}, "rapidxml": {"baseline": "1.13-4", "port-version": 0}, "rapidxml-ns": {"baseline": "1.13.2", "port-version": 0}, "rappture": {"baseline": "1.9", "port-version": 0}, "raylib": {"baseline": "3.5.0", "port-version": 0}, "rbdl": {"baseline": "2.6.0", "port-version": 0}, "re2": {"baseline": "2020-10-01", "port-version": 0}, "readerwriterqueue": {"baseline": "1.0.3", "port-version": 0}, "readline": {"baseline": "0", "port-version": 0}, "readline-win32": {"baseline": "5.0-2", "port-version": 0}, "readosm": {"baseline": "1.1.0a", "port-version": 0}, "realsense2": {"baseline": "2.40.0", "port-version": 0}, "recast": {"baseline": "1.5.1-3", "port-version": 0}, "redis-plus-plus": {"baseline": "1.2.1", "port-version": 1}, "refl-cpp": {"baseline": "0.12.0", "port-version": 0}, "refprop-headers": {"baseline": "2019-04-14", "port-version": 0}, "replxx": {"baseline": "0.0.2-2", "port-version": 0}, "reproc": {"baseline": "14.1.0", "port-version": 0}, "rest-rpc": {"baseline": "0.07", "port-version": 1}, "restbed": {"baseline": "4.7", "port-version": 0}, "restclient-cpp": {"baseline": "0.5.2", "port-version": 0}, "restinio": {"baseline": "0.6.13", "port-version": 0}, "rhash": {"baseline": "1.4.0", "port-version": 0}, "riffcpp": {"baseline": "2.2.4", "port-version": 0}, "ring-span-lite": {"baseline": "0.3.0", "port-version": 0}, "roaring": {"baseline": "2019-03-05-2", "port-version": 0}, "robin-hood-hashing": {"baseline": "3.9.1", "port-version": 0}, "robin-map": {"baseline": "0.6.3", "port-version": 0}, "rocksdb": {"baseline": "6.14.6", "port-version": 0}, "rpclib": {"baseline": "2.2.1", "port-version": 2}, "rply": {"baseline": "1.1.4", "port-version": 0}, "rs-core-lib": {"baseline": "2020-09-14", "port-version": 0}, "rsocket": {"baseline": "2020.05.04.00-1", "port-version": 0}, "rtabmap": {"baseline": "0.20.3", "port-version": 1}, "rtaudio": {"baseline": "5.1.0", "port-version": 0}, "rtlsdr": {"baseline": "2020-04-16-1", "port-version": 0}, "rtmidi": {"baseline": "4.0.0", "port-version": 2}, "rttr": {"baseline": "0.9.6-2", "port-version": 0}, "rxcpp": {"baseline": "4.1.0-1", "port-version": 0}, "rxqt": {"baseline": "bb2138c", "port-version": 0}, "rxspencer": {"baseline": "2020-01-12", "port-version": 0}, "ryml": {"baseline": "2020-04-12", "port-version": 0}, "ryu": {"baseline": "2.0-2", "port-version": 0}, "safeint": {"baseline": "3.24", "port-version": 0}, "sail": {"baseline": "0.9.0-pre11", "port-version": 0}, "sais": {"baseline": "2.4.1-1", "port-version": 0}, "sajson": {"baseline": "2018-09-21", "port-version": 0}, "scintilla": {"baseline": "4.4.5", "port-version": 0}, "sciter": {"baseline": "4.4.3.20", "port-version": 0}, "scnlib": {"baseline": "0.3", "port-version": 0}, "scylla-wrapper": {"baseline": "2018-08-26-16e6f435", "port-version": 0}, "sdformat10": {"baseline": "10.0.0", "port-version": 0}, "sdformat6": {"baseline": "6.2.0-1", "port-version": 0}, "sdformat9": {"baseline": "9.2.0-1", "port-version": 0}, "sdl1": {"baseline": "1.2.15", "port-version": 13}, "sdl1-net": {"baseline": "1.2.8-3", "port-version": 0}, "sdl2": {"baseline": "2.0.14", "port-version": 0}, "sdl2-gfx": {"baseline": "1.0.4", "port-version": 7}, "sdl2-image": {"baseline": "2.0.5", "port-version": 1}, "sdl2-mixer": {"baseline": "2.0.4", "port-version": 10}, "sdl2-net": {"baseline": "2.0.1-8", "port-version": 0}, "sdl2-ttf": {"baseline": "2.0.15-3", "port-version": 0}, "sdl2pp": {"baseline": "0.16.1", "port-version": 0}, "seal": {"baseline": "3.6.0", "port-version": 0}, "secp256k1": {"baseline": "2017-19-10", "port-version": 3}, "selene": {"baseline": "0.3.1", "port-version": 3}, "sentencepiece": {"baseline": "v0.1.82", "port-version": 0}, "sentry-native": {"baseline": "0.4.4", "port-version": 1}, "septag-sx": {"baseline": "2019-05-07-2", "port-version": 0}, "seqan": {"baseline": "2.4.0-1", "port-version": 0}, "serd": {"baseline": "0.30.4", "port-version": 0}, "sf2cute": {"baseline": "0.2.0-1", "port-version": 0}, "sfgui": {"baseline": "0.4.0-3", "port-version": 0}, "sfml": {"baseline": "2.5.1", "port-version": 9}, "sfsexp": {"baseline": "1.3", "port-version": 0}, "shaderc": {"baseline": "2019-06-26-1", "port-version": 0}, "shaderwriter": {"baseline": "2020-10-15", "port-version": 0}, "shapelib": {"baseline": "1.5.0", "port-version": 0}, "shiva": {"baseline": "1.0-3", "port-version": 0}, "shiva-sfml": {"baseline": "1.0-1", "port-version": 0}, "shogun": {"baseline": "6.1.4", "port-version": 4}, "signalrclient": {"baseline": "1.0.0-beta1-9", "port-version": 0}, "sigslot": {"baseline": "1.0.0-3", "port-version": 0}, "simage": {"baseline": "1.8.0", "port-version": 0}, "simde": {"baseline": "0.7.0", "port-version": 0}, "simdjson": {"baseline": "0.7.1", "port-version": 0}, "simple-fft": {"baseline": "2020-06-14", "port-version": 0}, "simpleini": {"baseline": "2018-08-31-4", "port-version": 0}, "skia": {"baseline": "2020-05-18", "port-version": 4}, "skyr-url": {"baseline": "1.13.0", "port-version": 0}, "slikenet": {"baseline": "2019-10-22-2", "port-version": 0}, "sltbench": {"baseline": "2.4.0", "port-version": 0}, "smpeg2": {"baseline": "2.0.0-6", "port-version": 0}, "snappy": {"baseline": "1.1.8", "port-version": 0}, "sndfile": {"baseline": "0", "port-version": 0}, "snowhouse": {"baseline": "5.0.0", "port-version": 0}, "so5extra": {"baseline": "1.4.1", "port-version": 0}, "sobjectizer": {"baseline": "5.7.2.1", "port-version": 0}, "soci": {"baseline": "4.0.1", "port-version": 0}, "socket-io-client": {"baseline": "1.6.1-1", "port-version": 0}, "sockpp": {"baseline": "0.7", "port-version": 0}, "soem": {"baseline": "1.4.0", "port-version": 0}, "soil": {"baseline": "2008.07.07-2", "port-version": 0}, "soil2": {"baseline": "release-1.11-1", "port-version": 0}, "sokol": {"baseline": "2019-09-09", "port-version": 0}, "sol2": {"baseline": "3.2.2", "port-version": 0}, "solid3": {"baseline": "3.5.8", "port-version": 0}, "sophus": {"baseline": "1.0.0-6", "port-version": 0}, "soqt": {"baseline": "1.6.0", "port-version": 2}, "sord": {"baseline": "0.16.4", "port-version": 0}, "soundtouch": {"baseline": "2.0.0-6", "port-version": 0}, "soxr": {"baseline": "0.1.3", "port-version": 3}, "spaceland": {"baseline": "7.8.2-4", "port-version": 0}, "span-lite": {"baseline": "0.9.0", "port-version": 0}, "sparsehash": {"baseline": "2.0.3", "port-version": 0}, "sparsepp": {"baseline": "1.22-1", "port-version": 0}, "spatialite-tools": {"baseline": "5.0.0", "port-version": 0}, "spdk": {"baseline": "19.01.1", "port-version": 1}, "spdk-dpdk": {"baseline": "20181124", "port-version": 0}, "spdk-ipsec": {"baseline": "20180711", "port-version": 0}, "spdk-isal": {"baseline": "20181006", "port-version": 0}, "spdlog": {"baseline": "1.8.0", "port-version": 1}, "spectra": {"baseline": "0.9.0", "port-version": 0}, "speex": {"baseline": "1.2.0", "port-version": 7}, "speexdsp": {"baseline": "1.2.0", "port-version": 5}, "spirit-po": {"baseline": "1.1.2-1", "port-version": 0}, "spirv-cross": {"baseline": "2020-02-26", "port-version": 0}, "spirv-headers": {"baseline": "1.5.1", "port-version": 0}, "spirv-tools": {"baseline": "2020.1-1", "port-version": 0}, "sprout": {"baseline": "2019-06-20", "port-version": 0}, "spscqueue": {"baseline": "1.0", "port-version": 0}, "sqlcipher": {"baseline": "4.4.1", "port-version": 0}, "sqlite-modern-cpp": {"baseline": "3.2-936cd0c8", "port-version": 0}, "sqlite-orm": {"baseline": "1.6", "port-version": 0}, "sqlite3": {"baseline": "3.33.0", "port-version": 0}, "sqlitecpp": {"baseline": "3.1.1", "port-version": 1}, "sqlpp11": {"baseline": "0.60", "port-version": 0}, "sqlpp11-connector-mysql": {"baseline": "0.29-1", "port-version": 0}, "sqlpp11-connector-sqlite3": {"baseline": "0.30", "port-version": 0}, "sratom": {"baseline": "0.6.4", "port-version": 0}, "status-value-lite": {"baseline": "1.1.0", "port-version": 0}, "stb": {"baseline": "2020-09-14", "port-version": 0}, "stlab": {"baseline": "1.5.2-1", "port-version": 0}, "stormlib": {"baseline": "2019-05-10", "port-version": 2}, "strict-variant": {"baseline": "0.5", "port-version": 0}, "string-theory": {"baseline": "3.4", "port-version": 0}, "string-view-lite": {"baseline": "1.3.0", "port-version": 0}, "strtk": {"baseline": "2020-09-14", "port-version": 0}, "stx": {"baseline": "1.0.1", "port-version": 0}, "stxxl": {"baseline": "2018-11-15-2", "port-version": 0}, "suitesparse": {"baseline": "5.8.0", "port-version": 0}, "sundials": {"baseline": "5.5.0", "port-version": 0}, "superlu": {"baseline": "2020-01-07", "port-version": 2}, "symengine": {"baseline": "2020-05-25", "port-version": 0}, "systemc": {"baseline": "2.3.3-4", "port-version": 0}, "szip": {"baseline": "2.1.1-6", "port-version": 0}, "tabulate": {"baseline": "2019-01-06", "port-version": 0}, "tacopie": {"baseline": "3.2.0-2", "port-version": 0}, "taglib": {"baseline": "1.11.1-20190531", "port-version": 0}, "taocpp-json": {"baseline": "2020-09-14", "port-version": 0}, "tap-windows6": {"baseline": "9.21.2-0e30f5c", "port-version": 0}, "taskflow": {"baseline": "2.7.0", "port-version": 0}, "tbb": {"baseline": "2020_U3", "port-version": 3}, "tcl": {"baseline": "core-9-0-a1", "port-version": 1}, "tclap": {"baseline": "1.2.2-3", "port-version": 0}, "teemo": {"baseline": "2.1", "port-version": 0}, "telnetpp": {"baseline": "2.1.2", "port-version": 0}, "tensorflow": {"baseline": "2.3.1", "port-version": 1}, "tensorflow-cc": {"baseline": "2.3.1", "port-version": 2}, "tensorflow-common": {"baseline": "2.3.1", "port-version": 1}, "termcolor": {"baseline": "1.0.1", "port-version": 0}, "tesseract": {"baseline": "4.1.1", "port-version": 5}, "tfhe": {"baseline": "1.0.1-1", "port-version": 0}, "tgbot-cpp": {"baseline": "1.2.1", "port-version": 0}, "tgc": {"baseline": "2019-08-11-1", "port-version": 0}, "tgui": {"baseline": "0.8.8", "port-version": 0}, "theia": {"baseline": "0.8", "port-version": 3}, "think-cell-range": {"baseline": "498839d-1", "port-version": 0}, "thor": {"baseline": "2.0-3", "port-version": 0}, "threadpool": {"baseline": "0.2.5", "port-version": 1}, "thrift": {"baseline": "0.13.0", "port-version": 0}, "tidy-html5": {"baseline": "5.7.28-2", "port-version": 0}, "tiff": {"baseline": "4.1.0", "port-version": 0}, "tinkerforge": {"baseline": "2.1.25", "port-version": 0}, "tiny-aes-c": {"baseline": "2019-07-31", "port-version": 0}, "tiny-bignum-c": {"baseline": "2019-07-31", "port-version": 0}, "tiny-dnn": {"baseline": "2018-10-25", "port-version": 0}, "tiny-process-library": {"baseline": "2.0.4", "port-version": 0}, "tiny-regex-c": {"baseline": "2019-07-31", "port-version": 0}, "tinycthread": {"baseline": "2019-08-06", "port-version": 0}, "tinydir": {"baseline": "1.2.4", "port-version": 0}, "tinyexif": {"baseline": "1.0.2-6", "port-version": 0}, "tinyexpr": {"baseline": "2020-09-25", "port-version": 0}, "tinyexr": {"baseline": "2020-03-15", "port-version": 0}, "tinyfiledialogs": {"baseline": "3.6.3", "port-version": 0}, "tinygltf": {"baseline": "2020-07-28", "port-version": 0}, "tinynpy": {"baseline": "1.0.0-3", "port-version": 0}, "tinyobjloader": {"baseline": "2.0.0-rc2", "port-version": 0}, "tinyply": {"baseline": "2020-05-22", "port-version": 0}, "tinyspline": {"baseline": "0.2.0-3", "port-version": 0}, "tinythread": {"baseline": "1.1-3", "port-version": 0}, "tinytoml": {"baseline": "20180219-1", "port-version": 0}, "tinyutf8": {"baseline": "4.0.2", "port-version": 0}, "tinyxml": {"baseline": "2.6.2-7", "port-version": 0}, "tinyxml2": {"baseline": "8.0.0-1", "port-version": 0}, "tl-expected": {"baseline": "1.0.0-1", "port-version": 0}, "tl-function-ref": {"baseline": "1.0.0-1", "port-version": 0}, "tl-optional": {"baseline": "1.0.0-1", "port-version": 0}, "tlx": {"baseline": "0.5.20191212", "port-version": 0}, "tmx": {"baseline": "1.1.0", "port-version": 0}, "tmxlite": {"baseline": "2019-03-05", "port-version": 0}, "tmxparser": {"baseline": "2.1.0-4", "port-version": 0}, "toml11": {"baseline": "3.5.0", "port-version": 1}, "tomlplusplus": {"baseline": "2.3.0", "port-version": 0}, "tool-meson": {"baseline": "0.56.02", "port-version": 0}, "torch-th": {"baseline": "2019-04-19-2", "port-version": 0}, "trantor": {"baseline": "1.1.1", "port-version": 0}, "tre": {"baseline": "0.8.0-1", "port-version": 0}, "treehopper": {"baseline": "1.11.3-4", "port-version": 0}, "triangle": {"baseline": "1.6", "port-version": 0}, "trompeloeil": {"baseline": "38", "port-version": 0}, "tsl-hopscotch-map": {"baseline": "2.3.0", "port-version": 0}, "tsl-ordered-map": {"baseline": "1.0.0", "port-version": 0}, "tsl-sparse-map": {"baseline": "0.6.2", "port-version": 0}, "turbobase64": {"baseline": "2020-01-12", "port-version": 0}, "tweeny": {"baseline": "3.0", "port-version": 0}, "type-lite": {"baseline": "0.1.0", "port-version": 0}, "type-safe": {"baseline": "0.2.1", "port-version": 0}, "uchardet": {"baseline": "2020-04-26", "port-version": 0}, "umock-c": {"baseline": "2020-06-17-1", "port-version": 0}, "unicorn": {"baseline": "2020-09-14", "port-version": 0}, "unicorn-lib": {"baseline": "2020-03-02", "port-version": 0}, "units": {"baseline": "2.3.1", "port-version": 0}, "unittest-cpp": {"baseline": "2.0.0-1", "port-version": 0}, "unixodbc": {"baseline": "2.3.7", "port-version": 2}, "unqlite": {"baseline": "1.1.9", "port-version": 0}, "unrar": {"baseline": "5.8.1", "port-version": 0}, "upb": {"baseline": "2020-08-19", "port-version": 0}, "urdfdom": {"baseline": "1.0.4", "port-version": 3}, "urdfdom-headers": {"baseline": "1.0.5", "port-version": 1}, "uriparser": {"baseline": "0.9.4", "port-version": 0}, "usbmuxd": {"baseline": "1.2.235", "port-version": 0}, "usd": {"baseline": "20.08", "port-version": 0}, "usockets": {"baseline": "0.6.0", "port-version": 1}, "usrsctp": {"baseline": "0db9691", "port-version": 0}, "utf8h": {"baseline": "2020-06-14", "port-version": 0}, "utf8proc": {"baseline": "2.5.0", "port-version": 0}, "utfcpp": {"baseline": "3.1.2", "port-version": 1}, "utfz": {"baseline": "1.2-1", "port-version": 0}, "uthenticode": {"baseline": "1.0.4", "port-version": 0}, "uvatlas": {"baseline": "jan2021", "port-version": 0}, "uvw": {"baseline": "2.7.0", "port-version": 0}, "uwebsockets": {"baseline": "18.13.0", "port-version": 0}, "v-hacd": {"baseline": "3.2.0", "port-version": 1}, "v8": {"baseline": "8.6.395.17", "port-version": 0}, "valijson": {"baseline": "2018-11-17-1", "port-version": 0}, "value-ptr-lite": {"baseline": "0.2.1", "port-version": 0}, "variant-lite": {"baseline": "1.2.2", "port-version": 0}, "vc": {"baseline": "1.4.1", "port-version": 0}, "vcglib": {"baseline": "1.0.1", "port-version": 0}, "vcpkg-gfortran": {"baseline": "3", "port-version": 0}, "vectorclass": {"baseline": "2.00.01", "port-version": 0}, "visit-struct": {"baseline": "1.0-1", "port-version": 0}, "vlfeat": {"baseline": "2020-07-10", "port-version": 0}, "vlpp": {"baseline": "0.11.0.0", "port-version": 0}, "volk": {"baseline": "2019-09-26", "port-version": 0}, "vs-yasm": {"baseline": "0.5.0", "port-version": 1}, "vtk": {"baseline": "9.0.1", "port-version": 3}, "vtk-dicom": {"baseline": "0.8.12-1", "port-version": 0}, "vtk-m": {"baseline": "1.5.0", "port-version": 1}, "vulkan": {"baseline": "1.1.82.1-1", "port-version": 0}, "vulkan-headers": {"baseline": "1.2.157", "port-version": 0}, "vulkan-hpp": {"baseline": "2019-05-11-1", "port-version": 0}, "vulkan-memory-allocator": {"baseline": "2.3.0", "port-version": 0}, "vxl": {"baseline": "2.0.2", "port-version": 2}, "wampcc": {"baseline": "2019-09-04", "port-version": 0}, "wangle": {"baseline": "2020.10.19.00", "port-version": 1}, "wavelib": {"baseline": "2020-05-29", "port-version": 0}, "wavpack": {"baseline": "5.3.0", "port-version": 0}, "websocketpp": {"baseline": "0.8.2", "port-version": 0}, "wepoll": {"baseline": "1.5.8", "port-version": 1}, "wg21-sg14": {"baseline": "2019-08-13", "port-version": 0}, "wil": {"baseline": "2020-05-19", "port-version": 1}, "wildmidi": {"baseline": "0.4.3-1", "port-version": 0}, "wincrypt": {"baseline": "0.0-2", "port-version": 0}, "winpcap": {"baseline": "4.1.3", "port-version": 4}, "winreg": {"baseline": "3.1.0", "port-version": 0}, "winsock2": {"baseline": "0.0-2", "port-version": 0}, "wintoast": {"baseline": "1.2.0", "port-version": 0}, "woff2": {"baseline": "1.0.2", "port-version": 0}, "wordnet": {"baseline": "3.0", "port-version": 0}, "wpilib": {"baseline": "2020.3.2", "port-version": 0}, "wren": {"baseline": "2019-07-01", "port-version": 0}, "wt": {"baseline": "4.5.0", "port-version": 0}, "wtl": {"baseline": "10.0.10320", "port-version": 0}, "wxchartdir": {"baseline": "1.0.0", "port-version": 0}, "wxwidgets": {"baseline": "3.1.4", "port-version": 3}, "x-plane": {"baseline": "3.0.3", "port-version": 0}, "x264": {"baseline": "157-303c484ec828ed0", "port-version": 14}, "x265": {"baseline": "3.4", "port-version": 2}, "xalan-c": {"baseline": "1.11-12", "port-version": 0}, "xbyak": {"baseline": "5.991", "port-version": 0}, "xerces-c": {"baseline": "3.2.3-1", "port-version": 0}, "xeus": {"baseline": "0.24.3", "port-version": 0}, "xframe": {"baseline": "0.3.0", "port-version": 0}, "xlnt": {"baseline": "1.5.0", "port-version": 0}, "xmlsec": {"baseline": "1.2.31", "port-version": 0}, "xmsh": {"baseline": "0.5.2-1", "port-version": 0}, "xorstr": {"baseline": "2020-02-11", "port-version": 0}, "xproperty": {"baseline": "0.8.1", "port-version": 0}, "xsimd": {"baseline": "7.4.9", "port-version": 0}, "xtensor": {"baseline": "0.21.9", "port-version": 0}, "xtensor-blas": {"baseline": "0.17.2", "port-version": 0}, "xtensor-fftw": {"baseline": "2019-11-30", "port-version": 0}, "xtensor-io": {"baseline": "0.9.0", "port-version": 1}, "xtl": {"baseline": "0.6.21", "port-version": 0}, "xxhash": {"baseline": "0.8.0", "port-version": 1}, "yajl": {"baseline": "2.1.0-1", "port-version": 0}, "yaml-cpp": {"baseline": "0.6.3", "port-version": 0}, "yara": {"baseline": "4.0.2", "port-version": 0}, "yas": {"baseline": "7.0.5", "port-version": 0}, "yasm": {"baseline": "1.3.0", "port-version": 0}, "yasm-tool": {"baseline": "2020-10-12", "port-version": 0}, "yasm-tool-helper": {"baseline": "2020-10-12", "port-version": 0}, "yato": {"baseline": "1.0-2", "port-version": 0}, "yoga": {"baseline": "1.18.0-1", "port-version": 0}, "z3": {"baseline": "4.8.9", "port-version": 0}, "z85": {"baseline": "1.0", "port-version": 0}, "zeromq": {"baseline": "2019-09-20", "port-version": 2}, "zfp": {"baseline": "0.5.5-2", "port-version": 0}, "zkpp": {"baseline": "0.2.3", "port-version": 0}, "zlib": {"baseline": "1.2.11", "port-version": 9}, "zookeeper": {"baseline": "3.5.5-1", "port-version": 0}, "zopfli": {"baseline": "1.0.3", "port-version": 0}, "zserge-webview": {"baseline": "2019-04-27-2", "port-version": 0}, "zstd": {"baseline": "1.4.5", "port-version": 1}, "zstr": {"baseline": "1.0.4", "port-version": 0}, "zxing-cpp": {"baseline": "3.3.3", "port-version": 8}, "zydis": {"baseline": "3.1.0-1", "port-version": 0}, "zyre": {"baseline": "2019-07-07-1", "port-version": 0}, "zziplib": {"baseline": "0.13.71", "port-version": 1}}} \ No newline at end of file +{ + "default": { + "3fd": { + "baseline": "2.6.3", + "port-version": 0 + }, + "7zip": { + "baseline": "19.00", + "port-version": 2 + }, + "abseil": { + "baseline": "2020-09-23", + "port-version": 1 + }, + "absent": { + "baseline": "0.3.1", + "port-version": 0 + }, + "ace": { + "baseline": "6.5.12", + "port-version": 1 + }, + "activemq-cpp": { + "baseline": "3.9.5-3", + "port-version": 0 + }, + "ade": { + "baseline": "0.1.1f", + "port-version": 0 + }, + "aixlog": { + "baseline": "1.4.0", + "port-version": 0 + }, + "akali": { + "baseline": "1.42", + "port-version": 1 + }, + "alac": { + "baseline": "2017-11-03-c38887c5-1", + "port-version": 0 + }, + "alac-decoder": { + "baseline": "0.2", + "port-version": 4 + }, + "alembic": { + "baseline": "1.7.16", + "port-version": 0 + }, + "aliyun-oss-c-sdk": { + "baseline": "3.10.0", + "port-version": 0 + }, + "allegro5": { + "baseline": "5.2.6.0", + "port-version": 0 + }, + "ampl-asl": { + "baseline": "2020-11-11", + "port-version": 0 + }, + "ampl-mp": { + "baseline": "2020-11-11", + "port-version": 0 + }, + "amqpcpp": { + "baseline": "4.1.7", + "port-version": 0 + }, + "anax": { + "baseline": "2.1.0-6", + "port-version": 0 + }, + "angelscript": { + "baseline": "2.34.0", + "port-version": 0 + }, + "angle": { + "baseline": "2020-05-15-1", + "port-version": 0 + }, + "antlr4": { + "baseline": "4.8", + "port-version": 1 + }, + "any-lite": { + "baseline": "0.2.0", + "port-version": 0 + }, + "anyrpc": { + "baseline": "2020-01-13", + "port-version": 2 + }, + "apr": { + "baseline": "1.7.0", + "port-version": 3 + }, + "apr-util": { + "baseline": "1.6.1", + "port-version": 3 + }, + "arb": { + "baseline": "2.18.1", + "port-version": 0 + }, + "arcus": { + "baseline": "4.8.0", + "port-version": 0 + }, + "argagg": { + "baseline": "0.4.6", + "port-version": 0 + }, + "argh": { + "baseline": "2018-12-18-2", + "port-version": 0 + }, + "argparse": { + "baseline": "2.1", + "port-version": 0 + }, + "args": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "argtable2": { + "baseline": "2.13", + "port-version": 8 + }, + "argtable3": { + "baseline": "3.1.5", + "port-version": 0 + }, + "argumentum": { + "baseline": "0.3.1", + "port-version": 0 + }, + "armadillo": { + "baseline": "10.1.0", + "port-version": 0 + }, + "arrayfire": { + "baseline": "3.7.3", + "port-version": 3 + }, + "arrow": { + "baseline": "1.0.1", + "port-version": 2 + }, + "ashes": { + "baseline": "2020-10-21", + "port-version": 0 + }, + "asio": { + "baseline": "1.18.0", + "port-version": 0 + }, + "asiosdk": { + "baseline": "2.3.3-1", + "port-version": 0 + }, + "asmjit": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "assimp": { + "baseline": "5.0.1", + "port-version": 4 + }, + "asynch": { + "baseline": "2019-09-21-1", + "port-version": 0 + }, + "asyncplusplus": { + "baseline": "1.1", + "port-version": 0 + }, + "atk": { + "baseline": "2.24.0-5", + "port-version": 2 + }, + "atkmm": { + "baseline": "2.24.2", + "port-version": 5 + }, + "atlmfc": { + "baseline": "0", + "port-version": 0 + }, + "aubio": { + "baseline": "0.4.9", + "port-version": 3 + }, + "audiofile": { + "baseline": "1.0.7", + "port-version": 0 + }, + "aurora": { + "baseline": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", + "port-version": 0 + }, + "autobahn": { + "baseline": "20.8.1", + "port-version": 0 + }, + "avisynthplus": { + "baseline": "3.6.1", + "port-version": 0 + }, + "avro-c": { + "baseline": "1.9.2-1", + "port-version": 0 + }, + "avro-cpp": { + "baseline": "1.9.2", + "port-version": 0 + }, + "aws-c-common": { + "baseline": "0.4.56", + "port-version": 0 + }, + "aws-c-event-stream": { + "baseline": "0.1.6", + "port-version": 0 + }, + "aws-checksums": { + "baseline": "0.1.9", + "port-version": 0 + }, + "aws-lambda-cpp": { + "baseline": "0.2.6", + "port-version": 0 + }, + "aws-sdk-cpp": { + "baseline": "1.8.83", + "port-version": 4 + }, + "azmq": { + "baseline": "2020-03-03", + "port-version": 0 + }, + "azure-c-shared-utility": { + "baseline": "2020-12-09", + "port-version": 0 + }, + "azure-iot-sdk-c": { + "baseline": "2020-12-09", + "port-version": 0 + }, + "azure-kinect-sensor-sdk": { + "baseline": "1.4.0-alpha.0", + "port-version": 6 + }, + "azure-macro-utils-c": { + "baseline": "2020-06-17", + "port-version": 2 + }, + "azure-storage-cpp": { + "baseline": "7.5.0", + "port-version": 0 + }, + "azure-uamqp-c": { + "baseline": "2020-12-09", + "port-version": 0 + }, + "azure-uhttp-c": { + "baseline": "2020-12-09", + "port-version": 0 + }, + "azure-umqtt-c": { + "baseline": "2020-12-09", + "port-version": 0 + }, + "basisu": { + "baseline": "1.11-4", + "port-version": 0 + }, + "bcg729": { + "baseline": "1.1.1", + "port-version": 0 + }, + "bde": { + "baseline": "3.2.0.0", + "port-version": 2 + }, + "bdwgc": { + "baseline": "8.0.4-1", + "port-version": 0 + }, + "beast": { + "baseline": "0", + "port-version": 0 + }, + "behaviortree-cpp": { + "baseline": "3.5.1", + "port-version": 2 + }, + "benchmark": { + "baseline": "1.5.2", + "port-version": 0 + }, + "bento4": { + "baseline": "1.5.1-628", + "port-version": 0 + }, + "berkeleydb": { + "baseline": "4.8.30", + "port-version": 5 + }, + "bfgroup-lyra": { + "baseline": "1.5", + "port-version": 0 + }, + "bigint": { + "baseline": "2010.04.30", + "port-version": 6 + }, + "binn": { + "baseline": "3.0", + "port-version": 0 + }, + "bitmagic": { + "baseline": "6.4.0", + "port-version": 0 + }, + "bitserializer": { + "baseline": "0.10", + "port-version": 0 + }, + "bitserializer-cpprestjson": { + "baseline": "alias", + "port-version": 0 + }, + "bitserializer-pugixml": { + "baseline": "alias", + "port-version": 0 + }, + "bitserializer-rapidjson": { + "baseline": "alias", + "port-version": 0 + }, + "bitserializer-rapidyaml": { + "baseline": "alias", + "port-version": 0 + }, + "bitsery": { + "baseline": "5.2.1", + "port-version": 0 + }, + "blas": { + "baseline": "1", + "port-version": 0 + }, + "blaze": { + "baseline": "3.8", + "port-version": 1 + }, + "blend2d": { + "baseline": "beta_2020-08-24", + "port-version": 0 + }, + "blitz": { + "baseline": "2020-03-25", + "port-version": 0 + }, + "blosc": { + "baseline": "1.18.1-1", + "port-version": 0 + }, + "bond": { + "baseline": "9.0.3", + "port-version": 0 + }, + "boolinq": { + "baseline": "2019-07-22", + "port-version": 0 + }, + "boost": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-accumulators": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-algorithm": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-align": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-any": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-array": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-asio": { + "baseline": "1.75.0", + "port-version": 1 + }, + "boost-assert": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-assign": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-atomic": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-beast": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-bimap": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-bind": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-build": { + "baseline": "1.75.0.beta1", + "port-version": 1 + }, + "boost-callable-traits": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-chrono": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-circular-buffer": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-compatibility": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-compute": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-concept-check": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-config": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-container": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-container-hash": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-context": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-contract": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-conversion": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-convert": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-core": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-coroutine": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-coroutine2": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-crc": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-date-time": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-detail": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-di": { + "baseline": "1.2.0", + "port-version": 0 + }, + "boost-dll": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-dynamic-bitset": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-endian": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-exception": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-fiber": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-filesystem": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-flyweight": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-foreach": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-format": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-function": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-function-types": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-functional": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-fusion": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-geometry": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-gil": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-graph": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-graph-parallel": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-hana": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-heap": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-histogram": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-hof": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-icl": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-integer": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-interprocess": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-interval": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-intrusive": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-io": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-iostreams": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-iterator": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-json": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-lambda": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-leaf": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-lexical-cast": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-local-function": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-locale": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-lockfree": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-log": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-logic": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-math": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-metaparse": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-modular-build-helper": { + "baseline": "1.75.0", + "port-version": 2 + }, + "boost-move": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-mp11": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-mpi": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-mpl": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-msm": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-multi-array": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-multi-index": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-multiprecision": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-nowide": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-numeric-conversion": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-odeint": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-optional": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-outcome": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-parameter": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-parameter-python": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-pfr": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-phoenix": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-poly-collection": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-polygon": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-pool": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-predef": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-preprocessor": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-process": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-program-options": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-property-map": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-property-tree": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-proto": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-ptr-container": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-python": { + "baseline": "1.75.0", + "port-version": 1 + }, + "boost-qvm": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-random": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-range": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-ratio": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-rational": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-regex": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-safe-numerics": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-scope-exit": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-serialization": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-signals2": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-smart-ptr": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-sort": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-spirit": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-stacktrace": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-statechart": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-static-assert": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-static-string": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-stl-interfaces": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-system": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-test": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-thread": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-throw-exception": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-timer": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-tokenizer": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-tti": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-tuple": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-type-erasure": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-type-index": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-type-traits": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-typeof": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-ublas": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-uninstall": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-units": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-unordered": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-utility": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-uuid": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-variant": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-variant2": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-vcpkg-helpers": { + "baseline": "7", + "port-version": 2 + }, + "boost-vmd": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-wave": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-winapi": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-xpressive": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boost-yap": { + "baseline": "1.75.0", + "port-version": 0 + }, + "boringssl": { + "baseline": "2020-04-07", + "port-version": 2 + }, + "botan": { + "baseline": "2.16.0", + "port-version": 0 + }, + "box2d": { + "baseline": "2.4.0", + "port-version": 0 + }, + "breakpad": { + "baseline": "2020-09-14", + "port-version": 1 + }, + "brigand": { + "baseline": "1.3.0", + "port-version": 0 + }, + "brotli": { + "baseline": "1.0.9", + "port-version": 0 + }, + "brpc": { + "baseline": "0.9.7", + "port-version": 0 + }, + "brunocodutra-metal": { + "baseline": "2.1.1", + "port-version": 0 + }, + "brynet": { + "baseline": "1.0.7", + "port-version": 0 + }, + "bullet3": { + "baseline": "2.89-1", + "port-version": 0 + }, + "bustache": { + "baseline": "1.1.0", + "port-version": 0 + }, + "butteraugli": { + "baseline": "2019-05-08-1", + "port-version": 0 + }, + "byte-lite": { + "baseline": "0.2.0", + "port-version": 0 + }, + "bzip2": { + "baseline": "1.0.8", + "port-version": 1 + }, + "c-ares": { + "baseline": "1.17.1", + "port-version": 0 + }, + "c4core": { + "baseline": "2020-04-12", + "port-version": 0 + }, + "caf": { + "baseline": "0.17.6", + "port-version": 1 + }, + "caffe2": { + "baseline": "0.8.1-3", + "port-version": 0 + }, + "cairo": { + "baseline": "1.16.0", + "port-version": 8 + }, + "cairomm": { + "baseline": "1.15.3", + "port-version": 5 + }, + "camport3": { + "baseline": "1.5.3", + "port-version": 0 + }, + "capnproto": { + "baseline": "0.8.0", + "port-version": 1 + }, + "capstone": { + "baseline": "4.0.2", + "port-version": 1 + }, + "cartographer": { + "baseline": "1.0.0-3", + "port-version": 0 + }, + "casclib": { + "baseline": "1.50b-1", + "port-version": 0 + }, + "catch": { + "baseline": "alias", + "port-version": 0 + }, + "catch-classic": { + "baseline": "1.12.2", + "port-version": 0 + }, + "catch2": { + "baseline": "2.13.1", + "port-version": 0 + }, + "cccapstone": { + "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1", + "port-version": 0 + }, + "ccd": { + "baseline": "2.1-4", + "port-version": 0 + }, + "ccfits": { + "baseline": "2.5", + "port-version": 6 + }, + "cctz": { + "baseline": "2.3-2", + "port-version": 0 + }, + "celero": { + "baseline": "2.6.0-1", + "port-version": 0 + }, + "cello": { + "baseline": "2019-07-23", + "port-version": 0 + }, + "cereal": { + "baseline": "1.3.0", + "port-version": 0 + }, + "ceres": { + "baseline": "2.0.0", + "port-version": 2 + }, + "cfitsio": { + "baseline": "3.49", + "port-version": 0 + }, + "cgal": { + "baseline": "5.1.1", + "port-version": 0 + }, + "cgicc": { + "baseline": "3.2.19-4", + "port-version": 0 + }, + "cgl": { + "baseline": "0.60.2-2", + "port-version": 0 + }, + "cgltf": { + "baseline": "1.8", + "port-version": 0 + }, + "cgns": { + "baseline": "3.4.0-1", + "port-version": 0 + }, + "chaiscript": { + "baseline": "6.1.0-1", + "port-version": 0 + }, + "chakracore": { + "baseline": "1.11.22", + "port-version": 1 + }, + "charls": { + "baseline": "2.1.0-1", + "port-version": 0 + }, + "chartdir": { + "baseline": "6.3.1", + "port-version": 2 + }, + "check": { + "baseline": "0.15.2", + "port-version": 0 + }, + "chipmunk": { + "baseline": "7.0.3", + "port-version": 1 + }, + "chmlib": { + "baseline": "0.40-4", + "port-version": 0 + }, + "chromium-base": { + "baseline": "86.0.4199.1", + "port-version": 1 + }, + "cimg": { + "baseline": "2.9.4", + "port-version": 0 + }, + "cityhash": { + "baseline": "2013-01-08", + "port-version": 0 + }, + "civetweb": { + "baseline": "1.13", + "port-version": 1 + }, + "cjson": { + "baseline": "2019-11-30-1", + "port-version": 0 + }, + "clapack": { + "baseline": "3.2.1", + "port-version": 16 + }, + "clara": { + "baseline": "1.1.5", + "port-version": 0 + }, + "clblas": { + "baseline": "2.12-4", + "port-version": 0 + }, + "clblast": { + "baseline": "1.5.1", + "port-version": 0 + }, + "clfft": { + "baseline": "2.12.2-2", + "port-version": 0 + }, + "cli": { + "baseline": "1.2.1", + "port-version": 0 + }, + "cli11": { + "baseline": "1.9.1", + "port-version": 0 + }, + "clickhouse-cpp": { + "baseline": "2019-05-22", + "port-version": 0 + }, + "clipp": { + "baseline": "2019-04-30", + "port-version": 0 + }, + "clockutils": { + "baseline": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-3", + "port-version": 0 + }, + "clp": { + "baseline": "1.17.6", + "port-version": 0 + }, + "clrng": { + "baseline": "2020-12-01", + "port-version": 0 + }, + "clue": { + "baseline": "1.0.0-alpha.7", + "port-version": 0 + }, + "cmark": { + "baseline": "0.29.0", + "port-version": 0 + }, + "cmcstl2": { + "baseline": "2019-07-20", + "port-version": 0 + }, + "cmocka": { + "baseline": "2020-08-01", + "port-version": 0 + }, + "cnl": { + "baseline": "2019-06-23", + "port-version": 0 + }, + "coin": { + "baseline": "4.0.0", + "port-version": 2 + }, + "coinutils": { + "baseline": "2.11.4", + "port-version": 0 + }, + "collada-dom": { + "baseline": "2.5.0-3", + "port-version": 0 + }, + "colmap": { + "baseline": "3.6", + "port-version": 0 + }, + "comms": { + "baseline": "3.1.3", + "port-version": 1 + }, + "comms-ublox": { + "baseline": "0.20.0", + "port-version": 1 + }, + "commsdsl": { + "baseline": "3.6.0", + "port-version": 1 + }, + "concurrentqueue": { + "baseline": "1.0.2", + "port-version": 0 + }, + "console-bridge": { + "baseline": "1.0.1", + "port-version": 1 + }, + "constexpr": { + "baseline": "1.0-1", + "port-version": 0 + }, + "constexpr-contracts": { + "baseline": "2020-08-09", + "port-version": 0 + }, + "coolprop": { + "baseline": "6.4.1", + "port-version": 0 + }, + "coroutine": { + "baseline": "1.5.0", + "port-version": 1 + }, + "corrade": { + "baseline": "2020.06", + "port-version": 0 + }, + "cpp-base64": { + "baseline": "2019-06-19", + "port-version": 0 + }, + "cpp-httplib": { + "baseline": "0.7.18", + "port-version": 0 + }, + "cpp-netlib": { + "baseline": "0.13.0", + "port-version": 4 + }, + "cpp-peglib": { + "baseline": "0.1.0", + "port-version": 0 + }, + "cpp-redis": { + "baseline": "4.3.1-2", + "port-version": 0 + }, + "cpp-taskflow": { + "baseline": "2.6.0", + "port-version": 0 + }, + "cppad": { + "baseline": "20200000.3", + "port-version": 0 + }, + "cppcms": { + "baseline": "1.2.1", + "port-version": 2 + }, + "cppcodec": { + "baseline": "0.2", + "port-version": 0 + }, + "cppcoro": { + "baseline": "2020-2-28-1", + "port-version": 0 + }, + "cppfs": { + "baseline": "1.3.0", + "port-version": 0 + }, + "cppgraphqlgen": { + "baseline": "2020-12-07", + "port-version": 1 + }, + "cppitertools": { + "baseline": "2.0", + "port-version": 0 + }, + "cppkafka": { + "baseline": "0.3.1-2", + "port-version": 0 + }, + "cppmicroservices": { + "baseline": "3.4.0", + "port-version": 2 + }, + "cpprestsdk": { + "baseline": "2.10.17", + "port-version": 0 + }, + "cpptoml": { + "baseline": "v0.1.1", + "port-version": 0 + }, + "cppunit": { + "baseline": "1.15.1", + "port-version": 0 + }, + "cpputest": { + "baseline": "2019-9-16-1", + "port-version": 0 + }, + "cppwinrt": { + "baseline": "windows-sdk", + "port-version": 0 + }, + "cppzmq": { + "baseline": "4.7.1", + "port-version": 1 + }, + "cpr": { + "baseline": "1.5.2", + "port-version": 0 + }, + "cpu-features": { + "baseline": "0.4.1", + "port-version": 0 + }, + "cpuid": { + "baseline": "0.4.1-1", + "port-version": 0 + }, + "cpuinfo": { + "baseline": "2019-07-28-1", + "port-version": 0 + }, + "cr": { + "baseline": "2020-04-26", + "port-version": 0 + }, + "crashpad": { + "baseline": "2020-03-18", + "port-version": 0 + }, + "crashrpt": { + "baseline": "1.4.3", + "port-version": 0 + }, + "crc32c": { + "baseline": "1.1.1", + "port-version": 0 + }, + "crfsuite": { + "baseline": "2019-07-21", + "port-version": 0 + }, + "croncpp": { + "baseline": "2020-09-04", + "port-version": 1 + }, + "crossguid": { + "baseline": "0.2.2-2018-06-16-1", + "port-version": 0 + }, + "crow": { + "baseline": "0.1-1", + "port-version": 0 + }, + "cryptopp": { + "baseline": "8.2.0-2", + "port-version": 0 + }, + "cspice": { + "baseline": "66", + "port-version": 3 + }, + "ctbignum": { + "baseline": "2019-08-02", + "port-version": 0 + }, + "ctemplate": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "ctp": { + "baseline": "6.3.15_20190220_se", + "port-version": 1 + }, + "ctre": { + "baseline": "2.10", + "port-version": 0 + }, + "cub": { + "baseline": "1.8.0-1", + "port-version": 0 + }, + "cuda": { + "baseline": "10.1", + "port-version": 5 + }, + "cudnn": { + "baseline": "7.6", + "port-version": 4 + }, + "cunit": { + "baseline": "2.1.3-6", + "port-version": 0 + }, + "curl": { + "baseline": "7.74.0", + "port-version": 2 + }, + "curlpp": { + "baseline": "2018-06-15-3", + "port-version": 0 + }, + "cute-headers": { + "baseline": "2019-09-20", + "port-version": 0 + }, + "cutelyst2": { + "baseline": "2.12.0", + "port-version": 0 + }, + "cwalk": { + "baseline": "1.2.5", + "port-version": 0 + }, + "cxxopts": { + "baseline": "2.2.1", + "port-version": 0 + }, + "czmq": { + "baseline": "2019-06-10-4", + "port-version": 0 + }, + "d3dx12": { + "baseline": "may2020", + "port-version": 0 + }, + "darknet": { + "baseline": "2020-08-30", + "port-version": 2 + }, + "darts-clone": { + "baseline": "1767ab87cffe-1", + "port-version": 0 + }, + "dartsim": { + "baseline": "6.9.4", + "port-version": 0 + }, + "dataframe": { + "baseline": "1.12.0", + "port-version": 0 + }, + "date": { + "baseline": "3.0.0", + "port-version": 1 + }, + "dbg-macro": { + "baseline": "2019-07-11", + "port-version": 0 + }, + "dbghelp": { + "baseline": "0.0", + "port-version": 0 + }, + "dbow2": { + "baseline": "2019-08-05", + "port-version": 0 + }, + "dbow3": { + "baseline": "1.0.0", + "port-version": 0 + }, + "dcmtk": { + "baseline": "3.6.5+_20191213", + "port-version": 0 + }, + "debug-assert": { + "baseline": "1.3.3", + "port-version": 0 + }, + "decimal-for-cpp": { + "baseline": "1.16", + "port-version": 1 + }, + "detours": { + "baseline": "4.0.1-1", + "port-version": 0 + }, + "devicenameresolver": { + "baseline": "2016-06-26-0850d88fa6-1", + "port-version": 0 + }, + "devil": { + "baseline": "1.8.0", + "port-version": 7 + }, + "dimcli": { + "baseline": "5.0.2", + "port-version": 0 + }, + "directx-headers": { + "baseline": "1.0.1", + "port-version": 0 + }, + "directxmath": { + "baseline": "jan2021", + "port-version": 0 + }, + "directxmesh": { + "baseline": "jan2021", + "port-version": 0 + }, + "directxsdk": { + "baseline": "jun10", + "port-version": 0 + }, + "directxtex": { + "baseline": "jan2021", + "port-version": 0 + }, + "directxtk": { + "baseline": "jan2021", + "port-version": 0 + }, + "directxtk12": { + "baseline": "jan2021", + "port-version": 0 + }, + "dirent": { + "baseline": "1.23.2", + "port-version": 0 + }, + "discord-game-sdk": { + "baseline": "2.5.6-1", + "port-version": 0 + }, + "discord-rpc": { + "baseline": "3.4.0", + "port-version": 0 + }, + "discount": { + "baseline": "2.2.6", + "port-version": 0 + }, + "distorm": { + "baseline": "3.4.1", + "port-version": 0 + }, + "dlfcn-win32": { + "baseline": "1.1.1-4", + "port-version": 0 + }, + "dlib": { + "baseline": "19.21", + "port-version": 4 + }, + "dmlc": { + "baseline": "2019-08-12-4", + "port-version": 0 + }, + "docopt": { + "baseline": "2018-11-01", + "port-version": 0 + }, + "doctest": { + "baseline": "2.4.0", + "port-version": 0 + }, + "double-conversion": { + "baseline": "3.1.5", + "port-version": 0 + }, + "dpdk": { + "baseline": "19.02", + "port-version": 0 + }, + "draco": { + "baseline": "1.3.6", + "port-version": 0 + }, + "drlibs": { + "baseline": "2019-08-12", + "port-version": 0 + }, + "drogon": { + "baseline": "1.1.0", + "port-version": 0 + }, + "dtl": { + "baseline": "1.19", + "port-version": 0 + }, + "duckx": { + "baseline": "1.0.0", + "port-version": 0 + }, + "duilib": { + "baseline": "2019-4-28-2", + "port-version": 0 + }, + "duktape": { + "baseline": "2.5.0", + "port-version": 1 + }, + "dx": { + "baseline": "1.0.1-1", + "port-version": 0 + }, + "dxut": { + "baseline": "11.14-3", + "port-version": 0 + }, + "eabase": { + "baseline": "2.09.12-1", + "port-version": 0 + }, + "eastl": { + "baseline": "3.17.03", + "port-version": 0 + }, + "easycl": { + "baseline": "0.3", + "port-version": 0 + }, + "easyhook": { + "baseline": "2.7.6789.0", + "port-version": 0 + }, + "easyloggingpp": { + "baseline": "9.96.7-1", + "port-version": 0 + }, + "eathread": { + "baseline": "1.32.09-1", + "port-version": 0 + }, + "ebml": { + "baseline": "1.4.0", + "port-version": 0 + }, + "ecm": { + "baseline": "5.74.0", + "port-version": 0 + }, + "ecos": { + "baseline": "2.0.7", + "port-version": 0 + }, + "ecsutil": { + "baseline": "1.0.7.15", + "port-version": 0 + }, + "edlib": { + "baseline": "1.2.6", + "port-version": 0 + }, + "effolkronium-random": { + "baseline": "1.3.1", + "port-version": 0 + }, + "efsw": { + "baseline": "2020-06-08", + "port-version": 1 + }, + "egl-registry": { + "baseline": "2020-02-20", + "port-version": 0 + }, + "eigen3": { + "baseline": "3.3.9", + "port-version": 0 + }, + "elfio": { + "baseline": "3.8", + "port-version": 0 + }, + "elfutils": { + "baseline": "0.182", + "port-version": 0 + }, + "embree2": { + "baseline": "2.17.7", + "port-version": 0 + }, + "embree3": { + "baseline": "3.11.0", + "port-version": 1 + }, + "enet": { + "baseline": "1.3.16", + "port-version": 0 + }, + "ensmallen": { + "baseline": "2.14.2", + "port-version": 0 + }, + "entityx": { + "baseline": "1.3.0-2", + "port-version": 0 + }, + "entt": { + "baseline": "3.6.0", + "port-version": 0 + }, + "epsilon": { + "baseline": "0.9.2-4", + "port-version": 0 + }, + "esaxx": { + "baseline": "ca7cb332011ec37", + "port-version": 0 + }, + "evpp": { + "baseline": "0.7.0", + "port-version": 4 + }, + "exiv2": { + "baseline": "0.27.3", + "port-version": 4 + }, + "expat": { + "baseline": "2020-08-18", + "port-version": 0 + }, + "expected-lite": { + "baseline": "0.3.0", + "port-version": 0 + }, + "exprtk": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "ezc3d": { + "baseline": "1.3.7", + "port-version": 0 + }, + "faad2": { + "baseline": "2.9.1", + "port-version": 2 + }, + "fadbad": { + "baseline": "2.1.0", + "port-version": 0 + }, + "faiss": { + "baseline": "1.6.4", + "port-version": 0 + }, + "fann": { + "baseline": "2.2.0-1", + "port-version": 0 + }, + "farmhash": { + "baseline": "1.1", + "port-version": 2 + }, + "fast-cpp-csv-parser": { + "baseline": "2019-08-14", + "port-version": 0 + }, + "fastcdr": { + "baseline": "1.0.15", + "port-version": 0 + }, + "fastcgi": { + "baseline": "2020-09-11", + "port-version": 0 + }, + "fastfeat": { + "baseline": "391d5e9-1", + "port-version": 0 + }, + "fastlz": { + "baseline": "1.0-3", + "port-version": 0 + }, + "fastrtps": { + "baseline": "2.0.1", + "port-version": 0 + }, + "fbthrift": { + "baseline": "2020.10.19.00", + "port-version": 0 + }, + "fcl": { + "baseline": "0.6.1", + "port-version": 0 + }, + "fdk-aac": { + "baseline": "2018-07-08-2", + "port-version": 0 + }, + "fdlibm": { + "baseline": "5.3-4", + "port-version": 0 + }, + "ffmpeg": { + "baseline": "4.3.1", + "port-version": 9 + }, + "ffnvcodec": { + "baseline": "10.0.26.0", + "port-version": 0 + }, + "fftw3": { + "baseline": "3.3.8-7", + "port-version": 0 + }, + "fftwpp": { + "baseline": "2019-12-19", + "port-version": 0 + }, + "field3d": { + "baseline": "1.7.3", + "port-version": 1 + }, + "fixed-string": { + "baseline": "0.1.0", + "port-version": 0 + }, + "fizz": { + "baseline": "2020.10.19.00", + "port-version": 0 + }, + "flann": { + "baseline": "2019-04-07", + "port-version": 1 + }, + "flashlight-cuda": { + "baseline": "20201201", + "port-version": 0 + }, + "flatbuffers": { + "baseline": "1.12.0", + "port-version": 0 + }, + "flint": { + "baseline": "2.5.2-4", + "port-version": 0 + }, + "fltk": { + "baseline": "1.3.5", + "port-version": 3 + }, + "fluidlite": { + "baseline": "2020-08-27", + "port-version": 0 + }, + "fluidsynth": { + "baseline": "2.1.4", + "port-version": 0 + }, + "fmem": { + "baseline": "c-libs-2ccee3d2fb", + "port-version": 0 + }, + "fmi4cpp": { + "baseline": "0.7.0-2", + "port-version": 0 + }, + "fmilib": { + "baseline": "2.0.3", + "port-version": 3 + }, + "fmt": { + "baseline": "7.1.3", + "port-version": 0 + }, + "folly": { + "baseline": "2020.10.19.00", + "port-version": 0 + }, + "font-chef": { + "baseline": "1.0.1", + "port-version": 0 + }, + "fontconfig": { + "baseline": "2.13.1", + "port-version": 3 + }, + "foonathan-memory": { + "baseline": "2019-07-21-1", + "port-version": 0 + }, + "forest": { + "baseline": "12.1.0", + "port-version": 0 + }, + "forge": { + "baseline": "1.0.5", + "port-version": 0 + }, + "fplus": { + "baseline": "0.2.3-p0", + "port-version": 0 + }, + "freeglut": { + "baseline": "3.2.1-4", + "port-version": 0 + }, + "freeimage": { + "baseline": "3.18.0", + "port-version": 18 + }, + "freeopcua": { + "baseline": "20190125-3", + "port-version": 0 + }, + "freerdp": { + "baseline": "2.2.0", + "port-version": 0 + }, + "freetds": { + "baseline": "1.2.11", + "port-version": 1 + }, + "freetype": { + "baseline": "2.10.4", + "port-version": 0 + }, + "freetype-gl": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "freexl": { + "baseline": "1.0.4", + "port-version": 11 + }, + "fribidi": { + "baseline": "1.0.10", + "port-version": 1 + }, + "frozen": { + "baseline": "1.0.0", + "port-version": 0 + }, + "fruit": { + "baseline": "3.6.0", + "port-version": 0 + }, + "ftgl": { + "baseline": "2.4.0-2", + "port-version": 0 + }, + "function2": { + "baseline": "4.1.0", + "port-version": 0 + }, + "fuzzylite": { + "baseline": "6.0", + "port-version": 3 + }, + "g2o": { + "baseline": "2020-02-07", + "port-version": 1 + }, + "g3log": { + "baseline": "2019-07-29", + "port-version": 0 + }, + "gainput": { + "baseline": "1.0.0-3", + "port-version": 0 + }, + "gamedev-framework": { + "baseline": "0.18.1", + "port-version": 0 + }, + "gamma": { + "baseline": "gamma-2018-01-27", + "port-version": 2 + }, + "gasol": { + "baseline": "2018-01-04", + "port-version": 0 + }, + "gaussianlib": { + "baseline": "2019-08-04", + "port-version": 0 + }, + "gcem": { + "baseline": "1.13.1", + "port-version": 0 + }, + "gdal": { + "baseline": "3.1.3", + "port-version": 1 + }, + "gdcm": { + "baseline": "3.0.7", + "port-version": 0 + }, + "gdcm2": { + "baseline": "deprecated", + "port-version": 0 + }, + "gdk-pixbuf": { + "baseline": "2.36.9-5", + "port-version": 7 + }, + "genann": { + "baseline": "2019-07-10", + "port-version": 0 + }, + "geogram": { + "baseline": "1.7.5", + "port-version": 2 + }, + "geographiclib": { + "baseline": "1.51", + "port-version": 0 + }, + "geos": { + "baseline": "3.8.1", + "port-version": 1 + }, + "geotrans": { + "baseline": "3.8", + "port-version": 0 + }, + "getdns": { + "baseline": "1.6.0", + "port-version": 0 + }, + "getopt": { + "baseline": "0", + "port-version": 0 + }, + "getopt-win32": { + "baseline": "0.1", + "port-version": 0 + }, + "gettext": { + "baseline": "0.21", + "port-version": 0 + }, + "gettimeofday": { + "baseline": "2017-10-14-3", + "port-version": 0 + }, + "gflags": { + "baseline": "2.2.2-1", + "port-version": 0 + }, + "gherkin-c": { + "baseline": "2019-10-07-1", + "port-version": 0 + }, + "giflib": { + "baseline": "5.1.4-6", + "port-version": 0 + }, + "gl2ps": { + "baseline": "1.4.0-3", + "port-version": 0 + }, + "gl3w": { + "baseline": "2018-05-31-2", + "port-version": 0 + }, + "glad": { + "baseline": "0.1.33-1", + "port-version": 0 + }, + "glbinding": { + "baseline": "3.1.0", + "port-version": 3 + }, + "glew": { + "baseline": "2.1.0", + "port-version": 9 + }, + "glfw3": { + "baseline": "3.3.2", + "port-version": 0 + }, + "gli": { + "baseline": "dd17acf-1", + "port-version": 0 + }, + "glib": { + "baseline": "2.52.3", + "port-version": 25 + }, + "glibmm": { + "baseline": "2.52.1", + "port-version": 14 + }, + "glm": { + "baseline": "0.9.9.8", + "port-version": 0 + }, + "globjects": { + "baseline": "1.1.0-3", + "port-version": 0 + }, + "glog": { + "baseline": "0.4.0-3", + "port-version": 0 + }, + "gloo": { + "baseline": "20201203", + "port-version": 0 + }, + "glslang": { + "baseline": "2019-03-05-1", + "port-version": 0 + }, + "glui": { + "baseline": "2019-11-30", + "port-version": 0 + }, + "gmime": { + "baseline": "3.2.6", + "port-version": 1 + }, + "gmmlib": { + "baseline": "20.3.1", + "port-version": 0 + }, + "gmp": { + "baseline": "6.2.1-2", + "port-version": 0 + }, + "google-cloud-cpp": { + "baseline": "1.22.0", + "port-version": 0 + }, + "google-cloud-cpp-common": { + "baseline": "alias", + "port-version": 0 + }, + "google-cloud-cpp-spanner": { + "baseline": "alias", + "port-version": 0 + }, + "googleapis": { + "baseline": "alias", + "port-version": 0 + }, + "gperf": { + "baseline": "3.1-1", + "port-version": 0 + }, + "gperftools": { + "baseline": "2019-09-02", + "port-version": 0 + }, + "gpgme": { + "baseline": "1.14.0", + "port-version": 0 + }, + "gppanel": { + "baseline": "2020-05-20", + "port-version": 0 + }, + "graphicsmagick": { + "baseline": "1.3.36", + "port-version": 0 + }, + "graphite2": { + "baseline": "1.3.14", + "port-version": 0 + }, + "graphqlparser": { + "baseline": "0.7.0-1", + "port-version": 0 + }, + "greatest": { + "baseline": "1.4.2", + "port-version": 0 + }, + "grpc": { + "baseline": "1.33.1", + "port-version": 2 + }, + "grppi": { + "baseline": "0.4.0", + "port-version": 0 + }, + "gsl": { + "baseline": "2.6", + "port-version": 0 + }, + "gsl-lite": { + "baseline": "0.37.0", + "port-version": 0 + }, + "gsoap": { + "baseline": "2.8.105", + "port-version": 0 + }, + "gtest": { + "baseline": "1.10.0", + "port-version": 2 + }, + "gtk": { + "baseline": "3.22.19-4", + "port-version": 0 + }, + "gtkmm": { + "baseline": "3.22.2", + "port-version": 5 + }, + "gts": { + "baseline": "0.7.6-3", + "port-version": 0 + }, + "guetzli": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "gumbo": { + "baseline": "0.10.1-3", + "port-version": 0 + }, + "gzip-hpp": { + "baseline": "0.1.0", + "port-version": 0 + }, + "h3": { + "baseline": "3.6.3", + "port-version": 0 + }, + "h5py-lzf": { + "baseline": "2019-12-04", + "port-version": 0 + }, + "halide": { + "baseline": "10.0.0", + "port-version": 0 + }, + "harfbuzz": { + "baseline": "2.7.2", + "port-version": 1 + }, + "hayai": { + "baseline": "2019-08-10", + "port-version": 0 + }, + "hdf5": { + "baseline": "1.12.0", + "port-version": 0 + }, + "healpix": { + "baseline": "1.12.10", + "port-version": 7 + }, + "hedley": { + "baseline": "14", + "port-version": 0 + }, + "hffix": { + "baseline": "1.0.0", + "port-version": 0 + }, + "hfsm2": { + "baseline": "beta7", + "port-version": 0 + }, + "hidapi": { + "baseline": "0.10.1", + "port-version": 0 + }, + "highfive": { + "baseline": "2.2.2", + "port-version": 1 + }, + "hiredis": { + "baseline": "1.0.0", + "port-version": 0 + }, + "hpx": { + "baseline": "1.5.1", + "port-version": 1 + }, + "http-parser": { + "baseline": "2.9.4", + "port-version": 0 + }, + "hungarian": { + "baseline": "v0.1.3", + "port-version": 0 + }, + "hunspell": { + "baseline": "1.7.0", + "port-version": 2 + }, + "hwloc": { + "baseline": "2.2.0", + "port-version": 0 + }, + "hyperscan": { + "baseline": "5.3.0", + "port-version": 1 + }, + "hypre": { + "baseline": "2.19.0", + "port-version": 0 + }, + "icu": { + "baseline": "67.1", + "port-version": 7 + }, + "ideviceinstaller": { + "baseline": "1.1.2.23-1", + "port-version": 0 + }, + "idevicerestore": { + "baseline": "1.0.12-4", + "port-version": 0 + }, + "if97": { + "baseline": "2.1.2", + "port-version": 0 + }, + "igloo": { + "baseline": "1.1.1", + "port-version": 0 + }, + "ignition-cmake0": { + "baseline": "0.6.2-2", + "port-version": 0 + }, + "ignition-cmake2": { + "baseline": "2.5.0", + "port-version": 0 + }, + "ignition-common1": { + "baseline": "1.1.1-1", + "port-version": 0 + }, + "ignition-common3": { + "baseline": "3.9.0", + "port-version": 0 + }, + "ignition-fuel-tools1": { + "baseline": "1.2.0-2", + "port-version": 0 + }, + "ignition-math4": { + "baseline": "4.0.0-1", + "port-version": 0 + }, + "ignition-math6": { + "baseline": "6.6.0", + "port-version": 0 + }, + "ignition-modularscripts": { + "baseline": "2020-11-23", + "port-version": 0 + }, + "ignition-msgs1": { + "baseline": "1.0.0", + "port-version": 3 + }, + "ignition-msgs5": { + "baseline": "5.3.0", + "port-version": 2 + }, + "ignition-msgs6": { + "baseline": "6.0.0", + "port-version": 1 + }, + "ignition-plugin1": { + "baseline": "1.1.0", + "port-version": 0 + }, + "ignition-transport4": { + "baseline": "4.0.0-2", + "port-version": 0 + }, + "ignition-transport8": { + "baseline": "8.1.0", + "port-version": 0 + }, + "ignition-transport9": { + "baseline": "9.0.0", + "port-version": 0 + }, + "ijg-libjpeg": { + "baseline": "9d", + "port-version": 0 + }, + "ilmbase": { + "baseline": "2.3.0", + "port-version": 0 + }, + "imgui": { + "baseline": "1.79", + "port-version": 4 + }, + "imgui-sfml": { + "baseline": "2.1-2", + "port-version": 0 + }, + "immer": { + "baseline": "2019-06-07", + "port-version": 0 + }, + "implot": { + "baseline": "0.8", + "port-version": 0 + }, + "indicators": { + "baseline": "2020-10-30", + "port-version": 0 + }, + "infoware": { + "baseline": "0.5.5", + "port-version": 1 + }, + "inih": { + "baseline": "51", + "port-version": 0 + }, + "iniparser": { + "baseline": "2020-04-06", + "port-version": 0 + }, + "inja": { + "baseline": "3.0.0", + "port-version": 0 + }, + "intel-ipsec": { + "baseline": "0.52-1", + "port-version": 0 + }, + "intel-mkl": { + "baseline": "2020.0.0", + "port-version": 0 + }, + "intelrdfpmathlib": { + "baseline": "20U2-1", + "port-version": 0 + }, + "io2d": { + "baseline": "2020-09-14", + "port-version": 1 + }, + "irrlicht": { + "baseline": "1.8.4-10", + "port-version": 0 + }, + "irrxml": { + "baseline": "0", + "port-version": 0 + }, + "isal": { + "baseline": "2.25.0", + "port-version": 0 + }, + "ismrmrd": { + "baseline": "1.4.2", + "port-version": 0 + }, + "itk": { + "baseline": "5.1.0", + "port-version": 5 + }, + "itpp": { + "baseline": "4.3.1-5", + "port-version": 0 + }, + "ixwebsocket": { + "baseline": "11.0.4", + "port-version": 0 + }, + "jack2": { + "baseline": "1.9.14", + "port-version": 0 + }, + "jaeger-client-cpp": { + "baseline": "0.5.1-1", + "port-version": 0 + }, + "jansson": { + "baseline": "2.13.1", + "port-version": 0 + }, + "jasper": { + "baseline": "2.0.20", + "port-version": 0 + }, + "jbig2dec": { + "baseline": "0.19", + "port-version": 0 + }, + "jbigkit": { + "baseline": "2.1-4", + "port-version": 0 + }, + "jemalloc": { + "baseline": "4.3.1-4", + "port-version": 0 + }, + "jinja2cpplight": { + "baseline": "2018-05-08", + "port-version": 0 + }, + "josuttis-jthread": { + "baseline": "2020-07-21", + "port-version": 1 + }, + "jsmn": { + "baseline": "2019-04-27", + "port-version": 0 + }, + "json-c": { + "baseline": "2019-09-10", + "port-version": 1 + }, + "json-dto": { + "baseline": "0.2.11", + "port-version": 0 + }, + "json-schema-validator": { + "baseline": "2.1.0", + "port-version": 0 + }, + "json-spirit": { + "baseline": "4.1.0-1", + "port-version": 0 + }, + "json11": { + "baseline": "2017-06-20-2", + "port-version": 0 + }, + "json5-parser": { + "baseline": "1.0.0", + "port-version": 2 + }, + "jsoncons": { + "baseline": "0.159.0", + "port-version": 0 + }, + "jsoncpp": { + "baseline": "1.9.4", + "port-version": 0 + }, + "jsonnet": { + "baseline": "0.16.0", + "port-version": 1 + }, + "jwt-cpp": { + "baseline": "0.4.0", + "port-version": 0 + }, + "jxrlib": { + "baseline": "2019.10.9", + "port-version": 2 + }, + "kangaru": { + "baseline": "4.2.4", + "port-version": 0 + }, + "kcp": { + "baseline": "2019-09-20", + "port-version": 0 + }, + "kd-soap": { + "baseline": "1.9.0", + "port-version": 0 + }, + "kealib": { + "baseline": "1.4.11-3", + "port-version": 0 + }, + "kenlm": { + "baseline": "20200924", + "port-version": 1 + }, + "keystone": { + "baseline": "0.9.2", + "port-version": 0 + }, + "kf5archive": { + "baseline": "5.74.0", + "port-version": 1 + }, + "kf5completion": { + "baseline": "5.64.0", + "port-version": 0 + }, + "kf5config": { + "baseline": "5.64.0", + "port-version": 0 + }, + "kf5coreaddons": { + "baseline": "5.64.0", + "port-version": 0 + }, + "kf5crash": { + "baseline": "5.64.0", + "port-version": 0 + }, + "kf5guiaddons": { + "baseline": "5.64.0", + "port-version": 0 + }, + "kf5holidays": { + "baseline": "5.74.0", + "port-version": 0 + }, + "kf5i18n": { + "baseline": "5.64.0", + "port-version": 1 + }, + "kf5itemmodels": { + "baseline": "5.64.0", + "port-version": 0 + }, + "kf5itemviews": { + "baseline": "5.64.0", + "port-version": 0 + }, + "kf5plotting": { + "baseline": "5.74.0", + "port-version": 0 + }, + "kf5syntaxhighlighting": { + "baseline": "5.64.0-1", + "port-version": 0 + }, + "kf5widgetsaddons": { + "baseline": "5.64.0", + "port-version": 0 + }, + "kf5windowsystem": { + "baseline": "5.64.0", + "port-version": 0 + }, + "kfr": { + "baseline": "2020-06-15", + "port-version": 0 + }, + "kinectsdk1": { + "baseline": "1.8-2", + "port-version": 0 + }, + "kinectsdk2": { + "baseline": "2.0-2", + "port-version": 0 + }, + "kissfft": { + "baseline": "2020-03-30", + "port-version": 0 + }, + "knet": { + "baseline": "1.0.1", + "port-version": 1 + }, + "krabsetw": { + "baseline": "4.1.14", + "port-version": 0 + }, + "ktx": { + "baseline": "4.0.0-beta5", + "port-version": 1 + }, + "kubazip": { + "baseline": "0.1.19", + "port-version": 0 + }, + "kuku": { + "baseline": "2.0", + "port-version": 0 + }, + "kvasir-mpl": { + "baseline": "2019-08-06", + "port-version": 0 + }, + "lapack": { + "baseline": "3", + "port-version": 1 + }, + "lapack-reference": { + "baseline": "3.8.0", + "port-version": 4 + }, + "lastools": { + "baseline": "2020-05-09", + "port-version": 0 + }, + "laszip": { + "baseline": "3.4.3", + "port-version": 0 + }, + "lazy-importer": { + "baseline": "2019-08-10", + "port-version": 0 + }, + "lcm": { + "baseline": "1.4.0", + "port-version": 1 + }, + "lcms": { + "baseline": "2.11", + "port-version": 0 + }, + "leaf": { + "baseline": "0.2.2", + "port-version": 1 + }, + "lemon": { + "baseline": "0", + "port-version": 0 + }, + "leptonica": { + "baseline": "1.80.0", + "port-version": 1 + }, + "lerc": { + "baseline": "2.2", + "port-version": 1 + }, + "lest": { + "baseline": "1.35.1", + "port-version": 1 + }, + "leveldb": { + "baseline": "1.22-1", + "port-version": 0 + }, + "levmar": { + "baseline": "2.6", + "port-version": 0 + }, + "libaaplus": { + "baseline": "2.12-1", + "port-version": 0 + }, + "libaiff": { + "baseline": "5.0-6", + "port-version": 0 + }, + "libarchive": { + "baseline": "3.4.3", + "port-version": 2 + }, + "libass": { + "baseline": "0.15.0", + "port-version": 0 + }, + "libassuan": { + "baseline": "2.5.3", + "port-version": 0 + }, + "libb2": { + "baseline": "0.98.1", + "port-version": 4 + }, + "libbf": { + "baseline": "1.0.0-1", + "port-version": 0 + }, + "libbson": { + "baseline": "1.16.1", + "port-version": 2 + }, + "libcds": { + "baseline": "2.3.3", + "port-version": 0 + }, + "libcerf": { + "baseline": "1.13", + "port-version": 0 + }, + "libconfig": { + "baseline": "1.7.2-2", + "port-version": 0 + }, + "libconfuse": { + "baseline": "2019-07-14", + "port-version": 0 + }, + "libcopp": { + "baseline": "1.3.4", + "port-version": 0 + }, + "libcrafter": { + "baseline": "0.3", + "port-version": 2 + }, + "libcroco": { + "baseline": "0.6.13", + "port-version": 2 + }, + "libcuckoo": { + "baseline": "0.3", + "port-version": 0 + }, + "libdatachannel": { + "baseline": "v0.10.1", + "port-version": 0 + }, + "libdatrie": { + "baseline": "0.2.10-3", + "port-version": 0 + }, + "libde265": { + "baseline": "1.0.8", + "port-version": 0 + }, + "libdisasm": { + "baseline": "0.23-7", + "port-version": 0 + }, + "libdivide": { + "baseline": "3.0", + "port-version": 0 + }, + "libdshowcapture": { + "baseline": "0.6.0-1", + "port-version": 0 + }, + "libepoxy": { + "baseline": "1.5.5", + "port-version": 0 + }, + "libevent": { + "baseline": "2.1.12", + "port-version": 1 + }, + "libevhtp": { + "baseline": "1.2.18", + "port-version": 0 + }, + "libexif": { + "baseline": "0.6.22", + "port-version": 0 + }, + "libfabric": { + "baseline": "1.8.1-1", + "port-version": 0 + }, + "libffi": { + "baseline": "3.3", + "port-version": 6 + }, + "libflac": { + "baseline": "1.3.3", + "port-version": 5 + }, + "libfort": { + "baseline": "0.4.1", + "port-version": 0 + }, + "libfreenect2": { + "baseline": "0.2.0", + "port-version": 5 + }, + "libftdi": { + "baseline": "0.20-1", + "port-version": 0 + }, + "libftdi1": { + "baseline": "1.4-1", + "port-version": 0 + }, + "libgcrypt": { + "baseline": "1.8.6", + "port-version": 0 + }, + "libgd": { + "baseline": "2.2.5-4", + "port-version": 0 + }, + "libgeotiff": { + "baseline": "1.6.0", + "port-version": 0 + }, + "libgit2": { + "baseline": "1.1.0", + "port-version": 0 + }, + "libgo": { + "baseline": "3.1-1", + "port-version": 0 + }, + "libgpg-error": { + "baseline": "1.39", + "port-version": 0 + }, + "libgpod": { + "baseline": "2019-08-29", + "port-version": 2 + }, + "libgta": { + "baseline": "1.0.8-1", + "port-version": 0 + }, + "libguarded": { + "baseline": "2019-08-27-1", + "port-version": 0 + }, + "libharu": { + "baseline": "2017-08-15-9", + "port-version": 0 + }, + "libhdfs3": { + "baseline": "2019-11-05", + "port-version": 0 + }, + "libheif": { + "baseline": "1.10.0", + "port-version": 0 + }, + "libhsplasma": { + "baseline": "2020.08.30", + "port-version": 0 + }, + "libhydrogen": { + "baseline": "2019-08-11", + "port-version": 0 + }, + "libiconv": { + "baseline": "1.16", + "port-version": 6 + }, + "libics": { + "baseline": "1.6.4", + "port-version": 0 + }, + "libideviceactivation": { + "baseline": "1.2.235", + "port-version": 0 + }, + "libidn2": { + "baseline": "2.3.0", + "port-version": 1 + }, + "libigl": { + "baseline": "2.2.0", + "port-version": 3 + }, + "libilbc": { + "baseline": "3.0.3", + "port-version": 0 + }, + "libimobiledevice": { + "baseline": "1.3.6", + "port-version": 1 + }, + "libirecovery": { + "baseline": "1.0.25-2", + "port-version": 0 + }, + "libjpeg-turbo": { + "baseline": "2.0.5", + "port-version": 3 + }, + "libjuice": { + "baseline": "0.6.0", + "port-version": 0 + }, + "libkml": { + "baseline": "1.3.0", + "port-version": 6 + }, + "liblas": { + "baseline": "1.8.1", + "port-version": 5 + }, + "liblbfgs": { + "baseline": "1.10", + "port-version": 0 + }, + "liblemon": { + "baseline": "2019-06-13-1", + "port-version": 0 + }, + "liblinear": { + "baseline": "241", + "port-version": 0 + }, + "liblo": { + "baseline": "0.31", + "port-version": 0 + }, + "liblsl": { + "baseline": "1.13.1", + "port-version": 0 + }, + "liblzma": { + "baseline": "5.2.5", + "port-version": 2 + }, + "libmad": { + "baseline": "0.15.1-8", + "port-version": 0 + }, + "libmagic": { + "baseline": "5.37", + "port-version": 2 + }, + "libmariadb": { + "baseline": "3.1.10", + "port-version": 4 + }, + "libmaxminddb": { + "baseline": "1.4.3", + "port-version": 0 + }, + "libmediainfo": { + "baseline": "20.09", + "port-version": 0 + }, + "libmesh": { + "baseline": "1.5.0-1", + "port-version": 0 + }, + "libmicrohttpd": { + "baseline": "0.9.63", + "port-version": 4 + }, + "libmikmod": { + "baseline": "3.3.11.1-8", + "port-version": 0 + }, + "libmodbus": { + "baseline": "3.1.6", + "port-version": 1 + }, + "libmodman": { + "baseline": "2.0.1-2", + "port-version": 0 + }, + "libmodplug": { + "baseline": "0.8.9.0", + "port-version": 6 + }, + "libmorton": { + "baseline": "0.2", + "port-version": 0 + }, + "libmpeg2": { + "baseline": "0.5.1", + "port-version": 0 + }, + "libmspack": { + "baseline": "0.10.1-3", + "port-version": 0 + }, + "libmupdf": { + "baseline": "1.18.0", + "port-version": 0 + }, + "libmysql": { + "baseline": "8.0.20", + "port-version": 1 + }, + "libnice": { + "baseline": "0.1.15", + "port-version": 6 + }, + "libnoise": { + "baseline": "1.0.0", + "port-version": 1 + }, + "libodb": { + "baseline": "2.4.0-6", + "port-version": 0 + }, + "libodb-boost": { + "baseline": "2.4.0-3", + "port-version": 0 + }, + "libodb-mysql": { + "baseline": "2.4.0-7", + "port-version": 0 + }, + "libodb-pgsql": { + "baseline": "2.4.0-3", + "port-version": 0 + }, + "libodb-sqlite": { + "baseline": "2.4.0", + "port-version": 7 + }, + "libogg": { + "baseline": "1.3.4", + "port-version": 3 + }, + "libopenmpt": { + "baseline": "2017-01-28-cf2390140", + "port-version": 1 + }, + "libopusenc": { + "baseline": "0.2.1", + "port-version": 0 + }, + "libosip2": { + "baseline": "5.1.0-4", + "port-version": 0 + }, + "libosmium": { + "baseline": "2.15.5", + "port-version": 0 + }, + "libosmscout": { + "baseline": "1.1.1", + "port-version": 0 + }, + "libp7-baical": { + "baseline": "replaced", + "port-version": 0 + }, + "libp7client": { + "baseline": "5.6", + "port-version": 0 + }, + "libpcap": { + "baseline": "1.9.1-2", + "port-version": 0 + }, + "libpff": { + "baseline": "2018-07-14-1", + "port-version": 0 + }, + "libplist": { + "baseline": "1.3.6", + "port-version": 0 + }, + "libpmemobj-cpp": { + "baseline": "1.11", + "port-version": 0 + }, + "libpng": { + "baseline": "1.6.37", + "port-version": 14 + }, + "libpopt": { + "baseline": "1.16-13", + "port-version": 0 + }, + "libpq": { + "baseline": "12.2", + "port-version": 10 + }, + "libpqxx": { + "baseline": "7.3.0", + "port-version": 0 + }, + "libprotobuf-mutator": { + "baseline": "1.0", + "port-version": 0 + }, + "libproxy": { + "baseline": "0.4.15-2", + "port-version": 0 + }, + "libqcow": { + "baseline": "20200928", + "port-version": 0 + }, + "libqglviewer": { + "baseline": "2.7.2-3", + "port-version": 0 + }, + "libqrencode": { + "baseline": "4.1.0", + "port-version": 0 + }, + "librabbitmq": { + "baseline": "2020-06-03", + "port-version": 0 + }, + "libraqm": { + "baseline": "0.7.0", + "port-version": 2 + }, + "libraw": { + "baseline": "201903-3", + "port-version": 0 + }, + "librdkafka": { + "baseline": "1.5.0", + "port-version": 0 + }, + "libressl": { + "baseline": "2.9.1", + "port-version": 3 + }, + "librsvg": { + "baseline": "2.40.20-2", + "port-version": 0 + }, + "librsync": { + "baseline": "2020-09-16", + "port-version": 1 + }, + "librtmp": { + "baseline": "2019-11-11_1", + "port-version": 0 + }, + "librttopo": { + "baseline": "1.1.0-2", + "port-version": 0 + }, + "libsamplerate": { + "baseline": "0.1.9.0", + "port-version": 3 + }, + "libsbml": { + "baseline": "5.18.0", + "port-version": 0 + }, + "libsigcpp": { + "baseline": "2.10-3", + "port-version": 2 + }, + "libsigcpp-3": { + "baseline": "3.0.3", + "port-version": 0 + }, + "libsndfile": { + "baseline": "1.0.30", + "port-version": 1 + }, + "libsodium": { + "baseline": "1.0.18", + "port-version": 3 + }, + "libsoundio": { + "baseline": "2.0.0-3", + "port-version": 0 + }, + "libspatialindex": { + "baseline": "1.9.0", + "port-version": 0 + }, + "libspatialite": { + "baseline": "5.0.0", + "port-version": 0 + }, + "libspnav": { + "baseline": "0.2.3", + "port-version": 0 + }, + "libsquish": { + "baseline": "1.15-7", + "port-version": 0 + }, + "libsrt": { + "baseline": "1.3.4", + "port-version": 0 + }, + "libsrtp": { + "baseline": "2.2.0", + "port-version": 0 + }, + "libssh": { + "baseline": "0.9.5", + "port-version": 0 + }, + "libssh2": { + "baseline": "1.9.0", + "port-version": 0 + }, + "libstemmer": { + "baseline": "2017-9-5", + "port-version": 0 + }, + "libstk": { + "baseline": "4.6.1", + "port-version": 0 + }, + "libsvm": { + "baseline": "323-1", + "port-version": 0 + }, + "libtheora": { + "baseline": "1.2.0alpha1-20170719", + "port-version": 2 + }, + "libtins": { + "baseline": "4.3", + "port-version": 0 + }, + "libtomcrypt": { + "baseline": "1.18.2-1", + "port-version": 0 + }, + "libtommath": { + "baseline": "1.2.0-1", + "port-version": 0 + }, + "libtorrent": { + "baseline": "1.2.11", + "port-version": 0 + }, + "libu2f-server": { + "baseline": "1.1.0", + "port-version": 2 + }, + "libudis86": { + "baseline": "2018-01-28-56ff6c87", + "port-version": 0 + }, + "libudns": { + "baseline": "0.4-2", + "port-version": 0 + }, + "libui": { + "baseline": "2018-11-03-1", + "port-version": 0 + }, + "libunibreak": { + "baseline": "4.3-0", + "port-version": 0 + }, + "libusb": { + "baseline": "1.0.23", + "port-version": 3 + }, + "libusb-win32": { + "baseline": "1.2.6.0-6", + "port-version": 0 + }, + "libusbmuxd": { + "baseline": "1.2.219", + "port-version": 0 + }, + "libuuid": { + "baseline": "1.0.3-7", + "port-version": 0 + }, + "libuv": { + "baseline": "1.39.0", + "port-version": 0 + }, + "libvmdk": { + "baseline": "20200926", + "port-version": 0 + }, + "libvorbis": { + "baseline": "1.3.7", + "port-version": 1 + }, + "libvpx": { + "baseline": "1.9.0", + "port-version": 5 + }, + "libwandio": { + "baseline": "4.2.1", + "port-version": 3 + }, + "libwebm": { + "baseline": "1.0.0.27-5", + "port-version": 0 + }, + "libwebp": { + "baseline": "1.1.0", + "port-version": 1 + }, + "libwebsockets": { + "baseline": "4.1.3", + "port-version": 1 + }, + "libxdiff": { + "baseline": "0.23", + "port-version": 0 + }, + "libxlsxwriter": { + "baseline": "0.9.4", + "port-version": 0 + }, + "libxml2": { + "baseline": "2.9.10", + "port-version": 2 + }, + "libxmlmm": { + "baseline": "0.6.0", + "port-version": 0 + }, + "libxmlpp": { + "baseline": "2.40.1", + "port-version": 8 + }, + "libxmp-lite": { + "baseline": "4.4.1-6", + "port-version": 0 + }, + "libxslt": { + "baseline": "1.1.33", + "port-version": 8 + }, + "libyaml": { + "baseline": "0.2.5", + "port-version": 0 + }, + "libyuv": { + "baseline": "fec9121", + "port-version": 3 + }, + "libzen": { + "baseline": "0.4.38", + "port-version": 0 + }, + "libzip": { + "baseline": "1.7.3", + "port-version": 1 + }, + "libzippp": { + "baseline": "4.0-1.7.3", + "port-version": 3 + }, + "licensepp": { + "baseline": "2020-05-19", + "port-version": 1 + }, + "lilv": { + "baseline": "0.24.10", + "port-version": 0 + }, + "linalg": { + "baseline": "2.1", + "port-version": 0 + }, + "linenoise-ng": { + "baseline": "4754bee2d8eb3-1", + "port-version": 0 + }, + "live555": { + "baseline": "latest-1", + "port-version": 0 + }, + "llgl": { + "baseline": "2019-08-15", + "port-version": 1 + }, + "llvm": { + "baseline": "11.0.0", + "port-version": 0 + }, + "lmdb": { + "baseline": "0.9.24", + "port-version": 0 + }, + "lodepng": { + "baseline": "2020-03-15", + "port-version": 0 + }, + "log4cplus": { + "baseline": "2.0.5", + "port-version": 1 + }, + "log4cpp": { + "baseline": "2.9.1", + "port-version": 3 + }, + "log4cxx": { + "baseline": "0.11.0", + "port-version": 1 + }, + "loguru": { + "baseline": "2.1.0-1", + "port-version": 0 + }, + "lpeg": { + "baseline": "1.0.2-1", + "port-version": 0 + }, + "lua": { + "baseline": "5.4.1", + "port-version": 0 + }, + "luabridge": { + "baseline": "2.6", + "port-version": 0 + }, + "luafilesystem": { + "baseline": "1.8.0-1", + "port-version": 0 + }, + "luajit": { + "baseline": "2.0.5-3", + "port-version": 0 + }, + "luasocket": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "lv2": { + "baseline": "1.18.0", + "port-version": 0 + }, + "lz4": { + "baseline": "1.9.2-2", + "port-version": 0 + }, + "lzfse": { + "baseline": "1.0-2", + "port-version": 0 + }, + "lzo": { + "baseline": "2.10-5", + "port-version": 0 + }, + "lzokay": { + "baseline": "2020-07-30", + "port-version": 0 + }, + "magic-enum": { + "baseline": "0.7.1", + "port-version": 0 + }, + "magic-get": { + "baseline": "2019-09-02", + "port-version": 2 + }, + "magnum": { + "baseline": "2020.06", + "port-version": 2 + }, + "magnum-extras": { + "baseline": "2020.06", + "port-version": 0 + }, + "magnum-integration": { + "baseline": "2020.06", + "port-version": 0 + }, + "magnum-plugins": { + "baseline": "2020.06", + "port-version": 1 + }, + "mapbox-variant": { + "baseline": "1.2.0", + "port-version": 0 + }, + "marble": { + "baseline": "19.08.2", + "port-version": 0 + }, + "marl": { + "baseline": "2020-10-10", + "port-version": 0 + }, + "mathc": { + "baseline": "2019-09-29", + "port-version": 0 + }, + "mathgl": { + "baseline": "2.4.3-6", + "port-version": 0 + }, + "matio": { + "baseline": "1.5.17", + "port-version": 0 + }, + "matplotlib-cpp": { + "baseline": "2020-08-27", + "port-version": 0 + }, + "matroska": { + "baseline": "1.6.2", + "port-version": 0 + }, + "mbedtls": { + "baseline": "2.24.0", + "port-version": 1 + }, + "mcpp": { + "baseline": "2.7.2.14", + "port-version": 2 + }, + "mdns": { + "baseline": "1.1", + "port-version": 0 + }, + "mdnsresponder": { + "baseline": "765.30.11", + "port-version": 3 + }, + "mecab": { + "baseline": "2019-09-25", + "port-version": 1 + }, + "memorymodule": { + "baseline": "2019-12-31", + "port-version": 0 + }, + "mesa": { + "baseline": "20.2.2", + "port-version": 0 + }, + "meschach": { + "baseline": "1.2b-3", + "port-version": 0 + }, + "meshoptimizer": { + "baseline": "0.14", + "port-version": 1 + }, + "metis": { + "baseline": "5.1.0", + "port-version": 7 + }, + "metrohash": { + "baseline": "1.1.3-1", + "port-version": 0 + }, + "mgnlibs": { + "baseline": "2019-09-29", + "port-version": 0 + }, + "mhook": { + "baseline": "2.5.1-1", + "port-version": 0 + }, + "microsoft-signalr": { + "baseline": "0.1.0-alpha1", + "port-version": 2 + }, + "mikktspace": { + "baseline": "2020-10-06", + "port-version": 0 + }, + "milerius-sfml-imgui": { + "baseline": "1.1-2", + "port-version": 0 + }, + "mimalloc": { + "baseline": "1.6.4", + "port-version": 0 + }, + "minc": { + "baseline": "2.4.03", + "port-version": 1 + }, + "minhook": { + "baseline": "1.3.3", + "port-version": 1 + }, + "minifb": { + "baseline": "2019-08-20-1", + "port-version": 0 + }, + "minimp3": { + "baseline": "2020-12-25", + "port-version": 0 + }, + "minisat-master-keying": { + "baseline": "2.2-mod-2", + "port-version": 0 + }, + "minitrace": { + "baseline": "2019.02.06", + "port-version": 0 + }, + "miniupnpc": { + "baseline": "2.1-1", + "port-version": 0 + }, + "miniz": { + "baseline": "2.1.0-1", + "port-version": 0 + }, + "minizip": { + "baseline": "1.2.11", + "port-version": 7 + }, + "mio": { + "baseline": "2019-02-10", + "port-version": 0 + }, + "mlpack": { + "baseline": "3.4.1", + "port-version": 0 + }, + "mman": { + "baseline": "git-f5ff813-3", + "port-version": 0 + }, + "mmloader": { + "baseline": "2020-05-15", + "port-version": 1 + }, + "mmx": { + "baseline": "2019-09-29", + "port-version": 0 + }, + "modp-base64": { + "baseline": "2020-09-26", + "port-version": 0 + }, + "mongo-c-driver": { + "baseline": "1.16.1", + "port-version": 3 + }, + "mongo-cxx-driver": { + "baseline": "3.4.0-5", + "port-version": 1 + }, + "mongoose": { + "baseline": "6.15-2", + "port-version": 0 + }, + "monkeys-audio": { + "baseline": "5.70", + "port-version": 0 + }, + "moos-core": { + "baseline": "10.4.0", + "port-version": 5 + }, + "moos-essential": { + "baseline": "10.0.1-2", + "port-version": 0 + }, + "moos-ui": { + "baseline": "10.0.1-2", + "port-version": 0 + }, + "morton-nd": { + "baseline": "3.0.0", + "port-version": 0 + }, + "mosquitto": { + "baseline": "1.6.8", + "port-version": 3 + }, + "mozjpeg": { + "baseline": "2020-06-02", + "port-version": 2 + }, + "mp-units": { + "baseline": "0.6.0", + "port-version": 0 + }, + "mp3lame": { + "baseline": "3.100", + "port-version": 6 + }, + "mpark-variant": { + "baseline": "1.4.0", + "port-version": 0 + }, + "mpfr": { + "baseline": "4.0.2-2", + "port-version": 0 + }, + "mpg123": { + "baseline": "1.26.3", + "port-version": 0 + }, + "mpi": { + "baseline": "1", + "port-version": 0 + }, + "mpir": { + "baseline": "3.0.0", + "port-version": 10 + }, + "mpmcqueue": { + "baseline": "2019-07-26", + "port-version": 0 + }, + "mqtt-cpp": { + "baseline": "7.0.1-2", + "port-version": 0 + }, + "ms-angle": { + "baseline": "alias", + "port-version": 0 + }, + "ms-gsl": { + "baseline": "3.1.0", + "port-version": 0 + }, + "msgpack": { + "baseline": "3.3.0", + "port-version": 0 + }, + "msgpack11": { + "baseline": "0.0.10-1", + "port-version": 0 + }, + "msinttypes": { + "baseline": "2018-02-25", + "port-version": 0 + }, + "msix": { + "baseline": "1.7-2", + "port-version": 0 + }, + "msmpi": { + "baseline": "10.1", + "port-version": 0 + }, + "mstch": { + "baseline": "1.0.2-2", + "port-version": 0 + }, + "mujs": { + "baseline": "2018-07-30-1", + "port-version": 0 + }, + "munit": { + "baseline": "2019-04-06", + "port-version": 1 + }, + "muparser": { + "baseline": "2.3.2", + "port-version": 0 + }, + "murmurhash": { + "baseline": "2016-01-09-3", + "port-version": 0 + }, + "mygui": { + "baseline": "2020-06-17", + "port-version": 0 + }, + "nameof": { + "baseline": "0.9.4", + "port-version": 0 + }, + "nana": { + "baseline": "1.7.4", + "port-version": 1 + }, + "nano-signal-slot": { + "baseline": "2.0.1", + "port-version": 0 + }, + "nanobench": { + "baseline": "4.3.0", + "port-version": 0 + }, + "nanodbc": { + "baseline": "2.13.0", + "port-version": 0 + }, + "nanoflann": { + "baseline": "1.3.1", + "port-version": 0 + }, + "nanogui": { + "baseline": "2019-09-23", + "port-version": 1 + }, + "nanomsg": { + "baseline": "1.1.5-2", + "port-version": 0 + }, + "nanopb": { + "baseline": "2019-02-12-2", + "port-version": 0 + }, + "nanoprintf": { + "baseline": "2020-05-27", + "port-version": 0 + }, + "nanorange": { + "baseline": "0.0.0", + "port-version": 0 + }, + "nanort": { + "baseline": "2019-08-20-1", + "port-version": 0 + }, + "nanovg": { + "baseline": "2019-8-30-3", + "port-version": 0 + }, + "nativefiledialog": { + "baseline": "2019-08-28", + "port-version": 0 + }, + "nccl": { + "baseline": "2.4.6", + "port-version": 0 + }, + "neargye-semver": { + "baseline": "0.2.2", + "port-version": 0 + }, + "netcdf-c": { + "baseline": "4.7.4", + "port-version": 1 + }, + "netcdf-cxx4": { + "baseline": "4.3.1", + "port-version": 2 + }, + "nethost": { + "baseline": "2019-12-21", + "port-version": 0 + }, + "nettle": { + "baseline": "3.6", + "port-version": 0 + }, + "networkdirect-sdk": { + "baseline": "2.0.1", + "port-version": 1 + }, + "nghttp2": { + "baseline": "1.42.0", + "port-version": 0 + }, + "ngspice": { + "baseline": "32", + "port-version": 1 + }, + "nifticlib": { + "baseline": "2020-04-30", + "port-version": 0 + }, + "nlohmann-fifo-map": { + "baseline": "2018.05.07-1", + "port-version": 0 + }, + "nlohmann-json": { + "baseline": "3.9.1", + "port-version": 0 + }, + "nlopt": { + "baseline": "2.7.0", + "port-version": 0 + }, + "nmap": { + "baseline": "7.70-4", + "port-version": 0 + }, + "nmslib": { + "baseline": "2.0.6", + "port-version": 0 + }, + "nng": { + "baseline": "1.3.2", + "port-version": 0 + }, + "nngpp": { + "baseline": "1.3.0", + "port-version": 0 + }, + "nonius": { + "baseline": "2019-04-20-1", + "port-version": 0 + }, + "nowide": { + "baseline": "11.0.0", + "port-version": 0 + }, + "nrf-ble-driver": { + "baseline": "4.1.2", + "port-version": 0 + }, + "nt-wrapper": { + "baseline": "2019-08-10", + "port-version": 0 + }, + "nuklear": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "numactl": { + "baseline": "2.0.12", + "port-version": 0 + }, + "numcpp": { + "baseline": "2.1.0", + "port-version": 0 + }, + "nuspell": { + "baseline": "4.2.0", + "port-version": 0 + }, + "nvtt": { + "baseline": "2.1.2", + "port-version": 1 + }, + "oatpp": { + "baseline": "1.2.0", + "port-version": 1 + }, + "oatpp-consul": { + "baseline": "1.2.0", + "port-version": 1 + }, + "oatpp-curl": { + "baseline": "1.2.0", + "port-version": 2 + }, + "oatpp-libressl": { + "baseline": "1.2.0", + "port-version": 1 + }, + "oatpp-mbedtls": { + "baseline": "1.2.0", + "port-version": 1 + }, + "oatpp-mongo": { + "baseline": "1.2.0", + "port-version": 1 + }, + "oatpp-postgresql": { + "baseline": "1.2.0", + "port-version": 1 + }, + "oatpp-sqlite": { + "baseline": "1.2.0", + "port-version": 1 + }, + "oatpp-swagger": { + "baseline": "1.2.0", + "port-version": 1 + }, + "oatpp-websocket": { + "baseline": "1.2.0", + "port-version": 1 + }, + "oatpp-zlib": { + "baseline": "1.2.0", + "port-version": 1 + }, + "observer-ptr-lite": { + "baseline": "0.4.0", + "port-version": 0 + }, + "ocilib": { + "baseline": "4.7.1", + "port-version": 0 + }, + "octomap": { + "baseline": "1.9.5", + "port-version": 0 + }, + "ode": { + "baseline": "0.16.1", + "port-version": 0 + }, + "offscale-libetcd-cpp": { + "baseline": "2019-07-10-1", + "port-version": 0 + }, + "ogdf": { + "baseline": "2019-08-23", + "port-version": 1 + }, + "ogre": { + "baseline": "1.12.9", + "port-version": 4 + }, + "ogre-next": { + "baseline": "2019-10-20-1", + "port-version": 0 + }, + "ois": { + "baseline": "1.5", + "port-version": 2 + }, + "ompl": { + "baseline": "1.5.1", + "port-version": 0 + }, + "onednn": { + "baseline": "2.0", + "port-version": 1 + }, + "oniguruma": { + "baseline": "6.9.4", + "port-version": 0 + }, + "onnxruntime-gpu": { + "baseline": "1.5.1", + "port-version": 0 + }, + "open62541": { + "baseline": "1.1.2", + "port-version": 0 + }, + "openal-soft": { + "baseline": "1.20.1", + "port-version": 5 + }, + "openblas": { + "baseline": "0.3.10", + "port-version": 0 + }, + "opencascade": { + "baseline": "7.4.0", + "port-version": 3 + }, + "opencc": { + "baseline": "2020-04-26", + "port-version": 7 + }, + "opencensus-cpp": { + "baseline": "0.4.0-1", + "port-version": 0 + }, + "opencl": { + "baseline": "2.2", + "port-version": 6 + }, + "opencolorio": { + "baseline": "1.1.1", + "port-version": 4 + }, + "opencolorio-tools": { + "baseline": "1.1.1", + "port-version": 0 + }, + "opencsg": { + "baseline": "1.4.2-1", + "port-version": 0 + }, + "opencv": { + "baseline": "4.3.0", + "port-version": 0 + }, + "opencv2": { + "baseline": "2.4.13.7", + "port-version": 4 + }, + "opencv3": { + "baseline": "3.4.10", + "port-version": 4 + }, + "opencv4": { + "baseline": "4.3.0", + "port-version": 4 + }, + "opendnp3": { + "baseline": "3.1.0", + "port-version": 0 + }, + "openexr": { + "baseline": "2.5.0", + "port-version": 2 + }, + "opengl": { + "baseline": "0.0", + "port-version": 8 + }, + "opengl-registry": { + "baseline": "2020-03-25", + "port-version": 0 + }, + "openigtlink": { + "baseline": "3.0", + "port-version": 0 + }, + "openimageio": { + "baseline": "2.1.16.0", + "port-version": 4 + }, + "openjpeg": { + "baseline": "2.3.1", + "port-version": 2 + }, + "openmama": { + "baseline": "6.3.1", + "port-version": 0 + }, + "openmesh": { + "baseline": "8.1", + "port-version": 0 + }, + "openmpi": { + "baseline": "4.0.3", + "port-version": 3 + }, + "openmvg": { + "baseline": "1.6", + "port-version": 0 + }, + "openmvs": { + "baseline": "1.1", + "port-version": 4 + }, + "openni2": { + "baseline": "2.2.0.33-11", + "port-version": 0 + }, + "openscap": { + "baseline": "1.3.1", + "port-version": 0 + }, + "openssl": { + "baseline": "1.1.1i", + "port-version": 0 + }, + "openssl-unix": { + "baseline": "1.1.1h", + "port-version": 1 + }, + "openssl-uwp": { + "baseline": "1.1.1h", + "port-version": 1 + }, + "openssl-windows": { + "baseline": "1.1.1h", + "port-version": 1 + }, + "opensubdiv": { + "baseline": "3.4.3", + "port-version": 0 + }, + "opentracing": { + "baseline": "1.6.0", + "port-version": 1 + }, + "openvdb": { + "baseline": "7.1.0", + "port-version": 1 + }, + "openvpn3": { + "baseline": "3.4.1-1", + "port-version": 0 + }, + "openvr": { + "baseline": "1.12.5", + "port-version": 0 + }, + "openxr-loader": { + "baseline": "1.0.11", + "port-version": 1 + }, + "optional-bare": { + "baseline": "1.1.0", + "port-version": 0 + }, + "optional-lite": { + "baseline": "3.2.0", + "port-version": 0 + }, + "opus": { + "baseline": "1.3.1", + "port-version": 5 + }, + "opusfile": { + "baseline": "0.12", + "port-version": 0 + }, + "orc": { + "baseline": "1.6.4", + "port-version": 1 + }, + "orocos-kdl": { + "baseline": "1.4", + "port-version": 3 + }, + "osg": { + "baseline": "3.6.5", + "port-version": 5 + }, + "osg-qt": { + "baseline": "Qt4", + "port-version": 3 + }, + "osgearth": { + "baseline": "3.1", + "port-version": 0 + }, + "osi": { + "baseline": "0.108.6", + "port-version": 0 + }, + "otl": { + "baseline": "4.0.455", + "port-version": 0 + }, + "outcome": { + "baseline": "2.1.3", + "port-version": 0 + }, + "p-ranav-csv": { + "baseline": "2019-07-11", + "port-version": 0 + }, + "p-ranav-csv2": { + "baseline": "2020-12-14", + "port-version": 0 + }, + "paho-mqtt": { + "baseline": "1.3.8", + "port-version": 0 + }, + "paho-mqttpp3": { + "baseline": "1.1", + "port-version": 1 + }, + "palsigslot": { + "baseline": "1.2.0", + "port-version": 0 + }, + "pango": { + "baseline": "1.40.11", + "port-version": 8 + }, + "pangolin": { + "baseline": "0.5", + "port-version": 11 + }, + "pangomm": { + "baseline": "2.40.1", + "port-version": 4 + }, + "parallel-hashmap": { + "baseline": "1.32", + "port-version": 0 + }, + "parallelstl": { + "baseline": "20200330", + "port-version": 0 + }, + "paraview": { + "baseline": "5.8.0", + "port-version": 3 + }, + "parmetis": { + "baseline": "4.0.3-3", + "port-version": 0 + }, + "parquet": { + "baseline": "0", + "port-version": 0 + }, + "parson": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "pbc": { + "baseline": "0.5.14", + "port-version": 4 + }, + "pcg": { + "baseline": "0.98.1", + "port-version": 0 + }, + "pcl": { + "baseline": "1.11.1", + "port-version": 1 + }, + "pcre": { + "baseline": "8.44", + "port-version": 8 + }, + "pcre2": { + "baseline": "10.35", + "port-version": 2 + }, + "pdal": { + "baseline": "1.7.1", + "port-version": 10 + }, + "pdal-c": { + "baseline": "1.8-2", + "port-version": 0 + }, + "pdcurses": { + "baseline": "3.9", + "port-version": 0 + }, + "pdqsort": { + "baseline": "2019-07-30", + "port-version": 0 + }, + "pe-parse": { + "baseline": "1.2.0", + "port-version": 0 + }, + "pegtl": { + "baseline": "3.1.0", + "port-version": 0 + }, + "pegtl-2": { + "baseline": "2.8.3", + "port-version": 0 + }, + "pfring": { + "baseline": "2019-10-17-2", + "port-version": 0 + }, + "pfultz2-linq": { + "baseline": "2019-05-14", + "port-version": 0 + }, + "phnt": { + "baseline": "2019-05-01", + "port-version": 0 + }, + "physfs": { + "baseline": "3.0.2", + "port-version": 3 + }, + "physx": { + "baseline": "4.1.1", + "port-version": 6 + }, + "picojson": { + "baseline": "1.3.0-1", + "port-version": 0 + }, + "picosha2": { + "baseline": "2018-07-30", + "port-version": 0 + }, + "piex": { + "baseline": "2019-07-11", + "port-version": 0 + }, + "pistache": { + "baseline": "2019-08-05", + "port-version": 0 + }, + "pixel": { + "baseline": "0.3-1", + "port-version": 0 + }, + "pixman": { + "baseline": "0.38.4", + "port-version": 2 + }, + "platform-folders": { + "baseline": "4.0.0", + "port-version": 6 + }, + "plf-colony": { + "baseline": "5.33", + "port-version": 0 + }, + "plf-list": { + "baseline": "2019-08-10", + "port-version": 0 + }, + "plf-nanotimer": { + "baseline": "2019-08-10", + "port-version": 0 + }, + "plf-stack": { + "baseline": "2019-08-10", + "port-version": 0 + }, + "plib": { + "baseline": "1.8.5-4", + "port-version": 0 + }, + "plibsys": { + "baseline": "0.0.4", + "port-version": 4 + }, + "plog": { + "baseline": "1.1.5", + "port-version": 0 + }, + "plplot": { + "baseline": "5.13.0", + "port-version": 9 + }, + "plustache": { + "baseline": "0.4.0-1", + "port-version": 0 + }, + "pmdk": { + "baseline": "1.9", + "port-version": 0 + }, + "pngpp": { + "baseline": "0.2.10", + "port-version": 0 + }, + "pngwriter": { + "baseline": "0.7.0-2", + "port-version": 0 + }, + "poco": { + "baseline": "1.10.1", + "port-version": 3 + }, + "podofo": { + "baseline": "0.9.6", + "port-version": 12 + }, + "poly2tri": { + "baseline": "2020-07-21", + "port-version": 0 + }, + "polyclipping": { + "baseline": "6.4.2", + "port-version": 6 + }, + "polyhook2": { + "baseline": "2021-01-08", + "port-version": 0 + }, + "polymorphic-value": { + "baseline": "1.3.0-1", + "port-version": 0 + }, + "ponder": { + "baseline": "3.0.0-1", + "port-version": 0 + }, + "poppler": { + "baseline": "20.12.1", + "port-version": 2 + }, + "portable-snippets": { + "baseline": "2019-09-20", + "port-version": 0 + }, + "portaudio": { + "baseline": "2020-02-02", + "port-version": 2 + }, + "portmidi": { + "baseline": "0.234", + "port-version": 0 + }, + "ppconsul": { + "baseline": "0.5-1", + "port-version": 0 + }, + "ppmagic": { + "baseline": "2020-07-03", + "port-version": 0 + }, + "pprint": { + "baseline": "2019-07-19", + "port-version": 0 + }, + "pqp": { + "baseline": "1.3-4", + "port-version": 0 + }, + "proj": { + "baseline": "0", + "port-version": 0 + }, + "proj4": { + "baseline": "7.2.0", + "port-version": 0 + }, + "prometheus-cpp": { + "baseline": "0.11.0", + "port-version": 0 + }, + "protobuf": { + "baseline": "3.14.0", + "port-version": 1 + }, + "protobuf-c": { + "baseline": "1.3.2-2", + "port-version": 0 + }, + "protopuf": { + "baseline": "1.0.0", + "port-version": 0 + }, + "protozero": { + "baseline": "1.6.8", + "port-version": 0 + }, + "proxygen": { + "baseline": "2020.10.19.00", + "port-version": 0 + }, + "proxywrapper": { + "baseline": "1.0.0", + "port-version": 0 + }, + "ptex": { + "baseline": "2.3.2", + "port-version": 2 + }, + "pthread": { + "baseline": "3.0.0", + "port-version": 0 + }, + "pthreads": { + "baseline": "3.0.0-6", + "port-version": 0 + }, + "pugixml": { + "baseline": "1.11.1", + "port-version": 0 + }, + "pybind11": { + "baseline": "2.6.0", + "port-version": 3 + }, + "pystring": { + "baseline": "1.1.3-2", + "port-version": 0 + }, + "python2": { + "baseline": "2.7.15-2", + "port-version": 0 + }, + "python3": { + "baseline": "3.9.0", + "port-version": 3 + }, + "qca": { + "baseline": "2.3.1", + "port-version": 2 + }, + "qcustomplot": { + "baseline": "2.0.1-4", + "port-version": 0 + }, + "qhull": { + "baseline": "8.0.2", + "port-version": 0 + }, + "qpid-proton": { + "baseline": "0.32.0", + "port-version": 0 + }, + "qscintilla": { + "baseline": "2.11.4-2", + "port-version": 0 + }, + "qt-advanced-docking-system": { + "baseline": "3.6.3", + "port-version": 1 + }, + "qt5": { + "baseline": "5.15.1", + "port-version": 1 + }, + "qt5-3d": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-activeqt": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-androidextras": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-base": { + "baseline": "5.15.1", + "port-version": 4 + }, + "qt5-canvas3d": { + "baseline": "0", + "port-version": 0 + }, + "qt5-charts": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-connectivity": { + "baseline": "5.15.1", + "port-version": 1 + }, + "qt5-datavis3d": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-declarative": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-doc": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-gamepad": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-graphicaleffects": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-imageformats": { + "baseline": "5.15.1", + "port-version": 1 + }, + "qt5-location": { + "baseline": "5.15.1", + "port-version": 2 + }, + "qt5-macextras": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-modularscripts": { + "baseline": "deprecated", + "port-version": 0 + }, + "qt5-mqtt": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-multimedia": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-networkauth": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-purchasing": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-quickcontrols": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-quickcontrols2": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-remoteobjects": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-script": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-scxml": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-sensors": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-serialbus": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-serialport": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-speech": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-svg": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-tools": { + "baseline": "5.15.1", + "port-version": 1 + }, + "qt5-translations": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-virtualkeyboard": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-wayland": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-webchannel": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-webengine": { + "baseline": "5.15.1", + "port-version": 1 + }, + "qt5-webglplugin": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-websockets": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-webview": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-winextras": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-x11extras": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qt5-xmlpatterns": { + "baseline": "5.15.1", + "port-version": 0 + }, + "qtkeychain": { + "baseline": "0.11.1", + "port-version": 0 + }, + "quadtree": { + "baseline": "2020-04-13", + "port-version": 0 + }, + "quantlib": { + "baseline": "2019-09-02", + "port-version": 0 + }, + "quaternions": { + "baseline": "1.0.0", + "port-version": 0 + }, + "quazip": { + "baseline": "0.9.1", + "port-version": 0 + }, + "quickfast": { + "baseline": "1.5", + "port-version": 0 + }, + "quickfix": { + "baseline": "1.15.1-4", + "port-version": 0 + }, + "quill": { + "baseline": "1.6.1", + "port-version": 0 + }, + "quirc": { + "baseline": "1.1", + "port-version": 1 + }, + "qwt": { + "baseline": "6.1.5", + "port-version": 0 + }, + "qwtw": { + "baseline": "3.1.0", + "port-version": 0 + }, + "rabit": { + "baseline": "0.1-2", + "port-version": 0 + }, + "ragel": { + "baseline": "6.10-3", + "port-version": 0 + }, + "rang": { + "baseline": "3.1.0", + "port-version": 0 + }, + "range-v3": { + "baseline": "0.11.0", + "port-version": 0 + }, + "range-v3-vs2015": { + "baseline": "20151130-vcpkg5", + "port-version": 0 + }, + "rapidcheck": { + "baseline": "2020-08-25", + "port-version": 0 + }, + "rapidjson": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "rapidxml": { + "baseline": "1.13-4", + "port-version": 0 + }, + "rapidxml-ns": { + "baseline": "1.13.2", + "port-version": 0 + }, + "rappture": { + "baseline": "1.9", + "port-version": 0 + }, + "raylib": { + "baseline": "3.5.0", + "port-version": 0 + }, + "rbdl": { + "baseline": "2.6.0", + "port-version": 0 + }, + "re2": { + "baseline": "2020-10-01", + "port-version": 0 + }, + "readerwriterqueue": { + "baseline": "1.0.3", + "port-version": 0 + }, + "readline": { + "baseline": "0", + "port-version": 0 + }, + "readline-win32": { + "baseline": "5.0-2", + "port-version": 0 + }, + "readosm": { + "baseline": "1.1.0a", + "port-version": 0 + }, + "realsense2": { + "baseline": "2.40.0", + "port-version": 0 + }, + "recast": { + "baseline": "1.5.1-3", + "port-version": 0 + }, + "redis-plus-plus": { + "baseline": "1.2.1", + "port-version": 1 + }, + "refl-cpp": { + "baseline": "0.12.0", + "port-version": 0 + }, + "refprop-headers": { + "baseline": "2019-04-14", + "port-version": 0 + }, + "replxx": { + "baseline": "0.0.2-2", + "port-version": 0 + }, + "reproc": { + "baseline": "14.1.0", + "port-version": 0 + }, + "rest-rpc": { + "baseline": "0.07", + "port-version": 1 + }, + "restbed": { + "baseline": "4.7", + "port-version": 0 + }, + "restclient-cpp": { + "baseline": "0.5.2", + "port-version": 0 + }, + "restinio": { + "baseline": "0.6.13", + "port-version": 0 + }, + "rhash": { + "baseline": "1.4.0", + "port-version": 0 + }, + "riffcpp": { + "baseline": "2.2.4", + "port-version": 0 + }, + "ring-span-lite": { + "baseline": "0.3.0", + "port-version": 0 + }, + "roaring": { + "baseline": "2019-03-05-2", + "port-version": 0 + }, + "robin-hood-hashing": { + "baseline": "3.9.1", + "port-version": 0 + }, + "robin-map": { + "baseline": "0.6.3", + "port-version": 0 + }, + "rocksdb": { + "baseline": "6.14.6", + "port-version": 0 + }, + "rpclib": { + "baseline": "2.2.1", + "port-version": 2 + }, + "rply": { + "baseline": "1.1.4", + "port-version": 0 + }, + "rs-core-lib": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "rsocket": { + "baseline": "2020.05.04.00-1", + "port-version": 0 + }, + "rtabmap": { + "baseline": "0.20.3", + "port-version": 1 + }, + "rtaudio": { + "baseline": "5.1.0", + "port-version": 0 + }, + "rtlsdr": { + "baseline": "2020-04-16-1", + "port-version": 0 + }, + "rtmidi": { + "baseline": "4.0.0", + "port-version": 2 + }, + "rttr": { + "baseline": "0.9.6-2", + "port-version": 0 + }, + "rxcpp": { + "baseline": "4.1.0-1", + "port-version": 0 + }, + "rxqt": { + "baseline": "bb2138c", + "port-version": 0 + }, + "rxspencer": { + "baseline": "2020-01-12", + "port-version": 0 + }, + "ryml": { + "baseline": "2020-04-12", + "port-version": 0 + }, + "ryu": { + "baseline": "2.0-2", + "port-version": 0 + }, + "safeint": { + "baseline": "3.24", + "port-version": 0 + }, + "sail": { + "baseline": "0.9.0-pre11", + "port-version": 0 + }, + "sais": { + "baseline": "2.4.1-1", + "port-version": 0 + }, + "sajson": { + "baseline": "2018-09-21", + "port-version": 0 + }, + "scintilla": { + "baseline": "4.4.5", + "port-version": 0 + }, + "sciter": { + "baseline": "4.4.3.20", + "port-version": 0 + }, + "scnlib": { + "baseline": "0.3", + "port-version": 0 + }, + "scylla-wrapper": { + "baseline": "2018-08-26-16e6f435", + "port-version": 0 + }, + "sdformat10": { + "baseline": "10.0.0", + "port-version": 0 + }, + "sdformat6": { + "baseline": "6.2.0-1", + "port-version": 0 + }, + "sdformat9": { + "baseline": "9.2.0-1", + "port-version": 0 + }, + "sdl1": { + "baseline": "1.2.15", + "port-version": 13 + }, + "sdl1-net": { + "baseline": "1.2.8-3", + "port-version": 0 + }, + "sdl2": { + "baseline": "2.0.14", + "port-version": 0 + }, + "sdl2-gfx": { + "baseline": "1.0.4", + "port-version": 7 + }, + "sdl2-image": { + "baseline": "2.0.5", + "port-version": 1 + }, + "sdl2-mixer": { + "baseline": "2.0.4", + "port-version": 10 + }, + "sdl2-net": { + "baseline": "2.0.1-8", + "port-version": 0 + }, + "sdl2-ttf": { + "baseline": "2.0.15-3", + "port-version": 0 + }, + "sdl2pp": { + "baseline": "0.16.1", + "port-version": 0 + }, + "seal": { + "baseline": "3.6.0", + "port-version": 0 + }, + "secp256k1": { + "baseline": "2017-19-10", + "port-version": 3 + }, + "selene": { + "baseline": "0.3.1", + "port-version": 3 + }, + "sentencepiece": { + "baseline": "v0.1.82", + "port-version": 0 + }, + "sentry-native": { + "baseline": "0.4.4", + "port-version": 1 + }, + "septag-sx": { + "baseline": "2019-05-07-2", + "port-version": 0 + }, + "seqan": { + "baseline": "2.4.0-1", + "port-version": 0 + }, + "serd": { + "baseline": "0.30.4", + "port-version": 0 + }, + "sf2cute": { + "baseline": "0.2.0-1", + "port-version": 0 + }, + "sfgui": { + "baseline": "0.4.0-3", + "port-version": 0 + }, + "sfml": { + "baseline": "2.5.1", + "port-version": 9 + }, + "sfsexp": { + "baseline": "1.3", + "port-version": 0 + }, + "shaderc": { + "baseline": "2019-06-26-1", + "port-version": 0 + }, + "shaderwriter": { + "baseline": "2020-10-15", + "port-version": 0 + }, + "shapelib": { + "baseline": "1.5.0", + "port-version": 0 + }, + "shiva": { + "baseline": "1.0-3", + "port-version": 0 + }, + "shiva-sfml": { + "baseline": "1.0-1", + "port-version": 0 + }, + "shogun": { + "baseline": "6.1.4", + "port-version": 4 + }, + "signalrclient": { + "baseline": "1.0.0-beta1-9", + "port-version": 0 + }, + "sigslot": { + "baseline": "1.0.0-3", + "port-version": 0 + }, + "simage": { + "baseline": "1.8.0", + "port-version": 0 + }, + "simde": { + "baseline": "0.7.0", + "port-version": 0 + }, + "simdjson": { + "baseline": "0.7.1", + "port-version": 0 + }, + "simple-fft": { + "baseline": "2020-06-14", + "port-version": 0 + }, + "simpleini": { + "baseline": "2018-08-31-4", + "port-version": 0 + }, + "skia": { + "baseline": "2020-05-18", + "port-version": 4 + }, + "skyr-url": { + "baseline": "1.13.0", + "port-version": 0 + }, + "slikenet": { + "baseline": "2019-10-22-2", + "port-version": 0 + }, + "sltbench": { + "baseline": "2.4.0", + "port-version": 0 + }, + "smpeg2": { + "baseline": "2.0.0-6", + "port-version": 0 + }, + "snappy": { + "baseline": "1.1.8", + "port-version": 0 + }, + "sndfile": { + "baseline": "0", + "port-version": 0 + }, + "snowhouse": { + "baseline": "5.0.0", + "port-version": 0 + }, + "so5extra": { + "baseline": "1.4.1", + "port-version": 0 + }, + "sobjectizer": { + "baseline": "5.7.2.1", + "port-version": 0 + }, + "soci": { + "baseline": "4.0.1", + "port-version": 0 + }, + "socket-io-client": { + "baseline": "1.6.1-1", + "port-version": 0 + }, + "sockpp": { + "baseline": "0.7", + "port-version": 0 + }, + "soem": { + "baseline": "1.4.0", + "port-version": 0 + }, + "soil": { + "baseline": "2008.07.07-2", + "port-version": 0 + }, + "soil2": { + "baseline": "release-1.11-1", + "port-version": 0 + }, + "sokol": { + "baseline": "2019-09-09", + "port-version": 0 + }, + "sol2": { + "baseline": "3.2.2", + "port-version": 0 + }, + "solid3": { + "baseline": "3.5.8", + "port-version": 0 + }, + "sophus": { + "baseline": "1.0.0-6", + "port-version": 0 + }, + "soqt": { + "baseline": "1.6.0", + "port-version": 2 + }, + "sord": { + "baseline": "0.16.4", + "port-version": 0 + }, + "soundtouch": { + "baseline": "2.0.0-6", + "port-version": 0 + }, + "soxr": { + "baseline": "0.1.3", + "port-version": 3 + }, + "spaceland": { + "baseline": "7.8.2-4", + "port-version": 0 + }, + "span-lite": { + "baseline": "0.9.0", + "port-version": 0 + }, + "sparsehash": { + "baseline": "2.0.3", + "port-version": 0 + }, + "sparsepp": { + "baseline": "1.22-1", + "port-version": 0 + }, + "spatialite-tools": { + "baseline": "5.0.0", + "port-version": 0 + }, + "spdk": { + "baseline": "19.01.1", + "port-version": 1 + }, + "spdk-dpdk": { + "baseline": "20181124", + "port-version": 0 + }, + "spdk-ipsec": { + "baseline": "20180711", + "port-version": 0 + }, + "spdk-isal": { + "baseline": "20181006", + "port-version": 0 + }, + "spdlog": { + "baseline": "1.8.0", + "port-version": 1 + }, + "spectra": { + "baseline": "0.9.0", + "port-version": 0 + }, + "speex": { + "baseline": "1.2.0", + "port-version": 7 + }, + "speexdsp": { + "baseline": "1.2.0", + "port-version": 5 + }, + "spirit-po": { + "baseline": "1.1.2-1", + "port-version": 0 + }, + "spirv-cross": { + "baseline": "2020-02-26", + "port-version": 0 + }, + "spirv-headers": { + "baseline": "1.5.1", + "port-version": 0 + }, + "spirv-tools": { + "baseline": "2020.1-1", + "port-version": 0 + }, + "sprout": { + "baseline": "2019-06-20", + "port-version": 0 + }, + "spscqueue": { + "baseline": "1.0", + "port-version": 0 + }, + "sqlcipher": { + "baseline": "4.4.1", + "port-version": 0 + }, + "sqlite-modern-cpp": { + "baseline": "3.2-936cd0c8", + "port-version": 0 + }, + "sqlite-orm": { + "baseline": "1.6", + "port-version": 0 + }, + "sqlite3": { + "baseline": "3.33.0", + "port-version": 0 + }, + "sqlitecpp": { + "baseline": "3.1.1", + "port-version": 1 + }, + "sqlpp11": { + "baseline": "0.60", + "port-version": 0 + }, + "sqlpp11-connector-mysql": { + "baseline": "0.29-1", + "port-version": 0 + }, + "sqlpp11-connector-sqlite3": { + "baseline": "0.30", + "port-version": 0 + }, + "sratom": { + "baseline": "0.6.4", + "port-version": 0 + }, + "status-value-lite": { + "baseline": "1.1.0", + "port-version": 0 + }, + "stb": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "stlab": { + "baseline": "1.5.2-1", + "port-version": 0 + }, + "stormlib": { + "baseline": "2019-05-10", + "port-version": 2 + }, + "strict-variant": { + "baseline": "0.5", + "port-version": 0 + }, + "string-theory": { + "baseline": "3.4", + "port-version": 0 + }, + "string-view-lite": { + "baseline": "1.3.0", + "port-version": 0 + }, + "strtk": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "stx": { + "baseline": "1.0.1", + "port-version": 0 + }, + "stxxl": { + "baseline": "2018-11-15-2", + "port-version": 0 + }, + "suitesparse": { + "baseline": "5.8.0", + "port-version": 0 + }, + "sundials": { + "baseline": "5.5.0", + "port-version": 0 + }, + "superlu": { + "baseline": "2020-01-07", + "port-version": 2 + }, + "symengine": { + "baseline": "2020-05-25", + "port-version": 0 + }, + "systemc": { + "baseline": "2.3.3-4", + "port-version": 0 + }, + "szip": { + "baseline": "2.1.1-6", + "port-version": 0 + }, + "tabulate": { + "baseline": "2019-01-06", + "port-version": 0 + }, + "tacopie": { + "baseline": "3.2.0-2", + "port-version": 0 + }, + "taglib": { + "baseline": "1.11.1-20190531", + "port-version": 0 + }, + "taocpp-json": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "tap-windows6": { + "baseline": "9.21.2-0e30f5c", + "port-version": 0 + }, + "taskflow": { + "baseline": "2.7.0", + "port-version": 0 + }, + "tbb": { + "baseline": "2020_U3", + "port-version": 3 + }, + "tcl": { + "baseline": "core-9-0-a1", + "port-version": 1 + }, + "tclap": { + "baseline": "1.2.2-3", + "port-version": 0 + }, + "teemo": { + "baseline": "2.1", + "port-version": 0 + }, + "telnetpp": { + "baseline": "2.1.2", + "port-version": 0 + }, + "tensorflow": { + "baseline": "2.3.1", + "port-version": 1 + }, + "tensorflow-cc": { + "baseline": "2.3.1", + "port-version": 2 + }, + "tensorflow-common": { + "baseline": "2.3.1", + "port-version": 1 + }, + "termcolor": { + "baseline": "1.0.1", + "port-version": 0 + }, + "tesseract": { + "baseline": "4.1.1", + "port-version": 5 + }, + "tfhe": { + "baseline": "1.0.1-1", + "port-version": 0 + }, + "tgbot-cpp": { + "baseline": "1.2.1", + "port-version": 0 + }, + "tgc": { + "baseline": "2019-08-11-1", + "port-version": 0 + }, + "tgui": { + "baseline": "0.8.8", + "port-version": 0 + }, + "theia": { + "baseline": "0.8", + "port-version": 3 + }, + "think-cell-range": { + "baseline": "498839d-1", + "port-version": 0 + }, + "thor": { + "baseline": "2.0-3", + "port-version": 0 + }, + "threadpool": { + "baseline": "0.2.5", + "port-version": 1 + }, + "thrift": { + "baseline": "0.13.0", + "port-version": 0 + }, + "tidy-html5": { + "baseline": "5.7.28-2", + "port-version": 0 + }, + "tiff": { + "baseline": "4.1.0", + "port-version": 0 + }, + "tinkerforge": { + "baseline": "2.1.25", + "port-version": 0 + }, + "tiny-aes-c": { + "baseline": "2019-07-31", + "port-version": 0 + }, + "tiny-bignum-c": { + "baseline": "2019-07-31", + "port-version": 0 + }, + "tiny-dnn": { + "baseline": "2018-10-25", + "port-version": 0 + }, + "tiny-process-library": { + "baseline": "2.0.4", + "port-version": 0 + }, + "tiny-regex-c": { + "baseline": "2019-07-31", + "port-version": 0 + }, + "tinycthread": { + "baseline": "2019-08-06", + "port-version": 0 + }, + "tinydir": { + "baseline": "1.2.4", + "port-version": 0 + }, + "tinyexif": { + "baseline": "1.0.2-6", + "port-version": 0 + }, + "tinyexpr": { + "baseline": "2020-09-25", + "port-version": 0 + }, + "tinyexr": { + "baseline": "2020-03-15", + "port-version": 0 + }, + "tinyfiledialogs": { + "baseline": "3.6.3", + "port-version": 0 + }, + "tinygltf": { + "baseline": "2020-07-28", + "port-version": 0 + }, + "tinynpy": { + "baseline": "1.0.0-3", + "port-version": 0 + }, + "tinyobjloader": { + "baseline": "2.0.0-rc2", + "port-version": 0 + }, + "tinyply": { + "baseline": "2020-05-22", + "port-version": 0 + }, + "tinyspline": { + "baseline": "0.2.0-3", + "port-version": 0 + }, + "tinythread": { + "baseline": "1.1-3", + "port-version": 0 + }, + "tinytoml": { + "baseline": "20180219-1", + "port-version": 0 + }, + "tinyutf8": { + "baseline": "4.0.2", + "port-version": 0 + }, + "tinyxml": { + "baseline": "2.6.2-7", + "port-version": 0 + }, + "tinyxml2": { + "baseline": "8.0.0-1", + "port-version": 0 + }, + "tl-expected": { + "baseline": "1.0.0-1", + "port-version": 0 + }, + "tl-function-ref": { + "baseline": "1.0.0-1", + "port-version": 0 + }, + "tl-optional": { + "baseline": "1.0.0-1", + "port-version": 0 + }, + "tlx": { + "baseline": "0.5.20191212", + "port-version": 0 + }, + "tmx": { + "baseline": "1.1.0", + "port-version": 0 + }, + "tmxlite": { + "baseline": "2019-03-05", + "port-version": 0 + }, + "tmxparser": { + "baseline": "2.1.0-4", + "port-version": 0 + }, + "toml11": { + "baseline": "3.5.0", + "port-version": 1 + }, + "tomlplusplus": { + "baseline": "2.3.0", + "port-version": 0 + }, + "tool-meson": { + "baseline": "0.56.02", + "port-version": 0 + }, + "torch-th": { + "baseline": "2019-04-19-2", + "port-version": 0 + }, + "trantor": { + "baseline": "1.1.1", + "port-version": 0 + }, + "tre": { + "baseline": "0.8.0-1", + "port-version": 0 + }, + "treehopper": { + "baseline": "1.11.3-4", + "port-version": 0 + }, + "triangle": { + "baseline": "1.6", + "port-version": 0 + }, + "trompeloeil": { + "baseline": "38", + "port-version": 0 + }, + "tsl-hopscotch-map": { + "baseline": "2.3.0", + "port-version": 0 + }, + "tsl-ordered-map": { + "baseline": "1.0.0", + "port-version": 0 + }, + "tsl-sparse-map": { + "baseline": "0.6.2", + "port-version": 0 + }, + "turbobase64": { + "baseline": "2020-01-12", + "port-version": 0 + }, + "tweeny": { + "baseline": "3.0", + "port-version": 0 + }, + "type-lite": { + "baseline": "0.1.0", + "port-version": 0 + }, + "type-safe": { + "baseline": "0.2.1", + "port-version": 0 + }, + "uchardet": { + "baseline": "2020-04-26", + "port-version": 0 + }, + "umock-c": { + "baseline": "2020-06-17-1", + "port-version": 0 + }, + "unicorn": { + "baseline": "2020-09-14", + "port-version": 0 + }, + "unicorn-lib": { + "baseline": "2020-03-02", + "port-version": 0 + }, + "units": { + "baseline": "2.3.1", + "port-version": 0 + }, + "unittest-cpp": { + "baseline": "2.0.0-1", + "port-version": 0 + }, + "unixodbc": { + "baseline": "2.3.7", + "port-version": 2 + }, + "unqlite": { + "baseline": "1.1.9", + "port-version": 0 + }, + "unrar": { + "baseline": "5.8.1", + "port-version": 0 + }, + "upb": { + "baseline": "2020-08-19", + "port-version": 0 + }, + "urdfdom": { + "baseline": "1.0.4", + "port-version": 3 + }, + "urdfdom-headers": { + "baseline": "1.0.5", + "port-version": 1 + }, + "uriparser": { + "baseline": "0.9.4", + "port-version": 0 + }, + "usbmuxd": { + "baseline": "1.2.235", + "port-version": 0 + }, + "usd": { + "baseline": "20.08", + "port-version": 0 + }, + "usockets": { + "baseline": "0.6.0", + "port-version": 1 + }, + "usrsctp": { + "baseline": "0db9691", + "port-version": 0 + }, + "utf8h": { + "baseline": "2020-06-14", + "port-version": 0 + }, + "utf8proc": { + "baseline": "2.5.0", + "port-version": 0 + }, + "utfcpp": { + "baseline": "3.1.2", + "port-version": 1 + }, + "utfz": { + "baseline": "1.2-1", + "port-version": 0 + }, + "uthenticode": { + "baseline": "1.0.4", + "port-version": 0 + }, + "uvatlas": { + "baseline": "jan2021", + "port-version": 0 + }, + "uvw": { + "baseline": "2.7.0", + "port-version": 0 + }, + "uwebsockets": { + "baseline": "18.13.0", + "port-version": 0 + }, + "v-hacd": { + "baseline": "3.2.0", + "port-version": 1 + }, + "v8": { + "baseline": "8.6.395.17", + "port-version": 0 + }, + "valijson": { + "baseline": "2018-11-17-1", + "port-version": 0 + }, + "value-ptr-lite": { + "baseline": "0.2.1", + "port-version": 0 + }, + "variant-lite": { + "baseline": "1.2.2", + "port-version": 0 + }, + "vc": { + "baseline": "1.4.1", + "port-version": 0 + }, + "vcglib": { + "baseline": "1.0.1", + "port-version": 0 + }, + "vcpkg-gfortran": { + "baseline": "3", + "port-version": 0 + }, + "vectorclass": { + "baseline": "2.00.01", + "port-version": 0 + }, + "visit-struct": { + "baseline": "1.0-1", + "port-version": 0 + }, + "vlfeat": { + "baseline": "2020-07-10", + "port-version": 0 + }, + "vlpp": { + "baseline": "0.11.0.0", + "port-version": 0 + }, + "volk": { + "baseline": "2019-09-26", + "port-version": 0 + }, + "vs-yasm": { + "baseline": "0.5.0", + "port-version": 1 + }, + "vtk": { + "baseline": "9.0.1", + "port-version": 3 + }, + "vtk-dicom": { + "baseline": "0.8.12-1", + "port-version": 0 + }, + "vtk-m": { + "baseline": "1.5.0", + "port-version": 1 + }, + "vulkan": { + "baseline": "1.1.82.1-1", + "port-version": 0 + }, + "vulkan-headers": { + "baseline": "1.2.157", + "port-version": 0 + }, + "vulkan-hpp": { + "baseline": "2019-05-11-1", + "port-version": 0 + }, + "vulkan-memory-allocator": { + "baseline": "2.3.0", + "port-version": 0 + }, + "vxl": { + "baseline": "2.0.2", + "port-version": 2 + }, + "wampcc": { + "baseline": "2019-09-04", + "port-version": 0 + }, + "wangle": { + "baseline": "2020.10.19.00", + "port-version": 1 + }, + "wavelib": { + "baseline": "2020-05-29", + "port-version": 0 + }, + "wavpack": { + "baseline": "5.3.0", + "port-version": 0 + }, + "websocketpp": { + "baseline": "0.8.2", + "port-version": 0 + }, + "wepoll": { + "baseline": "1.5.8", + "port-version": 1 + }, + "wg21-sg14": { + "baseline": "2019-08-13", + "port-version": 0 + }, + "wil": { + "baseline": "2020-05-19", + "port-version": 1 + }, + "wildmidi": { + "baseline": "0.4.3-1", + "port-version": 0 + }, + "wincrypt": { + "baseline": "0.0-2", + "port-version": 0 + }, + "winpcap": { + "baseline": "4.1.3", + "port-version": 4 + }, + "winreg": { + "baseline": "3.1.0", + "port-version": 0 + }, + "winsock2": { + "baseline": "0.0-2", + "port-version": 0 + }, + "wintoast": { + "baseline": "1.2.0", + "port-version": 0 + }, + "woff2": { + "baseline": "1.0.2", + "port-version": 0 + }, + "wordnet": { + "baseline": "3.0", + "port-version": 0 + }, + "wpilib": { + "baseline": "2020.3.2", + "port-version": 0 + }, + "wren": { + "baseline": "2019-07-01", + "port-version": 0 + }, + "wt": { + "baseline": "4.5.0", + "port-version": 0 + }, + "wtl": { + "baseline": "10.0.10320", + "port-version": 0 + }, + "wxchartdir": { + "baseline": "1.0.0", + "port-version": 0 + }, + "wxwidgets": { + "baseline": "3.1.4", + "port-version": 3 + }, + "x-plane": { + "baseline": "3.0.3", + "port-version": 0 + }, + "x264": { + "baseline": "157-303c484ec828ed0", + "port-version": 14 + }, + "x265": { + "baseline": "3.4", + "port-version": 2 + }, + "xalan-c": { + "baseline": "1.11-12", + "port-version": 0 + }, + "xbyak": { + "baseline": "5.991", + "port-version": 0 + }, + "xerces-c": { + "baseline": "3.2.3-1", + "port-version": 0 + }, + "xeus": { + "baseline": "0.24.3", + "port-version": 0 + }, + "xframe": { + "baseline": "0.3.0", + "port-version": 0 + }, + "xlnt": { + "baseline": "1.5.0", + "port-version": 0 + }, + "xmlsec": { + "baseline": "1.2.31", + "port-version": 0 + }, + "xmsh": { + "baseline": "0.5.2-1", + "port-version": 0 + }, + "xorstr": { + "baseline": "2020-02-11", + "port-version": 0 + }, + "xproperty": { + "baseline": "0.8.1", + "port-version": 0 + }, + "xsimd": { + "baseline": "7.4.9", + "port-version": 0 + }, + "xtensor": { + "baseline": "0.21.9", + "port-version": 0 + }, + "xtensor-blas": { + "baseline": "0.17.2", + "port-version": 0 + }, + "xtensor-fftw": { + "baseline": "2019-11-30", + "port-version": 0 + }, + "xtensor-io": { + "baseline": "0.9.0", + "port-version": 1 + }, + "xtl": { + "baseline": "0.6.21", + "port-version": 0 + }, + "xxhash": { + "baseline": "0.8.0", + "port-version": 1 + }, + "yajl": { + "baseline": "2.1.0-1", + "port-version": 0 + }, + "yaml-cpp": { + "baseline": "0.6.3", + "port-version": 0 + }, + "yara": { + "baseline": "4.0.2", + "port-version": 0 + }, + "yas": { + "baseline": "7.0.5", + "port-version": 0 + }, + "yasm": { + "baseline": "1.3.0", + "port-version": 0 + }, + "yasm-tool": { + "baseline": "2020-10-12", + "port-version": 0 + }, + "yasm-tool-helper": { + "baseline": "2020-10-12", + "port-version": 0 + }, + "yato": { + "baseline": "1.0-2", + "port-version": 0 + }, + "yoga": { + "baseline": "1.18.0-1", + "port-version": 0 + }, + "z3": { + "baseline": "4.8.9", + "port-version": 0 + }, + "z85": { + "baseline": "1.0", + "port-version": 0 + }, + "zeromq": { + "baseline": "2019-09-20", + "port-version": 2 + }, + "zfp": { + "baseline": "0.5.5-2", + "port-version": 0 + }, + "zkpp": { + "baseline": "0.2.3", + "port-version": 0 + }, + "zlib": { + "baseline": "1.2.11", + "port-version": 9 + }, + "zookeeper": { + "baseline": "3.5.5-1", + "port-version": 0 + }, + "zopfli": { + "baseline": "1.0.3", + "port-version": 0 + }, + "zserge-webview": { + "baseline": "2019-04-27-2", + "port-version": 0 + }, + "zstd": { + "baseline": "1.4.5", + "port-version": 1 + }, + "zstr": { + "baseline": "1.0.4", + "port-version": 0 + }, + "zxing-cpp": { + "baseline": "3.3.3", + "port-version": 8 + }, + "zydis": { + "baseline": "3.1.0-1", + "port-version": 0 + }, + "zyre": { + "baseline": "2019-07-07-1", + "port-version": 0 + }, + "zziplib": { + "baseline": "0.13.71", + "port-version": 1 + } + } +} diff --git a/port_versions/p-/physfs.json b/port_versions/p-/physfs.json index 575635f88e1ba4..2eb7ea138d6b00 100644 --- a/port_versions/p-/physfs.json +++ b/port_versions/p-/physfs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e46ccc22c717ad69bb6b6730669da403c86178d5", + "version-string": "3.0.2", + "port-version": 3 + }, { "git-tree": "aa1952ceb05b35ac1b2ce1a91aafcffbf7ef9c0b", "version-string": "3.0.2-2", diff --git a/ports/physfs/CONTROL b/ports/physfs/CONTROL deleted file mode 100644 index de52b6a4cd12f0..00000000000000 --- a/ports/physfs/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: physfs -Version: 3.0.2-2 -Homepage: https://icculus.org/physfs/ -Description: a library to provide abstract access to various archives -Build-Depends: zlib -Supports: !arm64 diff --git a/ports/physfs/portfile.cmake b/ports/physfs/portfile.cmake index 86d56b4fa7540c..18080f5e626b46 100644 --- a/ports/physfs/portfile.cmake +++ b/ports/physfs/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_fail_port_install(ON_ARCH "arm64") +if(VCPKG_TARGET_IS_WINDOWS AND ${VCPKG_TARGET_ARCHITECTURE} MATCHES "arm64") + message(FATAL_ERROR "Architecture 'arm64' not supported on target 'Windows' by physfs!\n") +endif() set(PHYSFS_VERSION 3.0.2) vcpkg_download_distfile(ARCHIVE diff --git a/ports/physfs/vcpkg.json b/ports/physfs/vcpkg.json new file mode 100644 index 00000000000000..7eb40b2a719dc7 --- /dev/null +++ b/ports/physfs/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "physfs", + "version-string": "3.0.2", + "port-version": 3, + "description": "a library to provide abstract access to various archives", + "homepage": "https://icculus.org/physfs/", + "supports": "!(arm64 & windows)", + "dependencies": [ + "zlib" + ] +} From 30abd9f835a1c97c1c28ef573a5b57cdbba53a05 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Fri, 15 Jan 2021 00:04:28 -0800 Subject: [PATCH 0490/1694] [vcpkg] Format JSON output of `x-add-version` to minimize diffs (#15664) * Fix output json file format * Add instructions to fix missing versions file --- toolsrc/src/vcpkg/commands.add-version.cpp | 6 ++++-- toolsrc/src/vcpkg/commands.civerifyversions.cpp | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/toolsrc/src/vcpkg/commands.add-version.cpp b/toolsrc/src/vcpkg/commands.add-version.cpp index 9d7a74465eb77c..fc288eb13874cb 100644 --- a/toolsrc/src/vcpkg/commands.add-version.cpp +++ b/toolsrc/src/vcpkg/commands.add-version.cpp @@ -97,7 +97,8 @@ namespace } std::error_code ec; - fs.write_contents(output_path, Json::stringify(serialize_baseline(baseline_map), {}), ec); + fs.write_contents( + output_path, Json::stringify(serialize_baseline(baseline_map), Json::JsonStyle::with_spaces(2)), ec); if (ec) { System::printf( @@ -127,7 +128,8 @@ namespace std::error_code ec; fs.create_directories(output_path.parent_path(), VCPKG_LINE_INFO); - fs.write_contents(output_path, Json::stringify(serialize_versions(versions), {}), ec); + fs.write_contents( + output_path, Json::stringify(serialize_versions(versions), Json::JsonStyle::with_spaces(2)), ec); if (ec) { System::printf( diff --git a/toolsrc/src/vcpkg/commands.civerifyversions.cpp b/toolsrc/src/vcpkg/commands.civerifyversions.cpp index 82a98aa9d64f4c..84aab9c019dd86 100644 --- a/toolsrc/src/vcpkg/commands.civerifyversions.cpp +++ b/toolsrc/src/vcpkg/commands.civerifyversions.cpp @@ -373,9 +373,13 @@ namespace vcpkg::Commands::CIVerifyVersions { System::printf(System::Color::error, "FAIL: %s\n", port_name); errors.emplace(Strings::format("Error: While validating port %s.\n" - " Missing expected versions file at: %s", + " Missing expected versions file at: %s\n" + " Run:\n\n" + " vcpkg x-add-version %s\n\n" + " to create the versions file.", port_name, - fs::u8string(versions_file_path))); + fs::u8string(versions_file_path), + port_name)); continue; } From b1bfabee65ced7c8a6365cd8866d434f0bac6056 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Fri, 15 Jan 2021 12:35:48 -0800 Subject: [PATCH 0491/1694] [vcpkg] Add initial versioning documentation (#15565) * [vcpkg] Improve efficiency and tests of versioning * [vcpkg] Add initial versioning documentation and rename x-default-baseline to builtin-baseline * [vcpkg] Enable metrics for builtin-baseline & overrides * [vcpkg] Address PR comments * [vcpkg] Add support for syntax in version>= * [vcpkg] Remove port-version from dependency syntax * [vcpkg] Address CR comment * [vcpkg] Minor docs fixup --- docs/users/manifests.md | 50 +++- docs/users/versioning.md | 85 +++++++ .../end-to-end-tests-dir/registries.ps1 | 37 +-- .../end-to-end-tests-dir/versions.ps1 | 45 +++- .../end-to-end-tests-prelude.ps1 | 4 + scripts/generatePortVersionsDb.py | 2 +- .../default-baseline-1/vcpkg.json | 2 +- .../default-baseline-2/vcpkg.json | 4 +- .../port_versions/z-/zlib.json | 14 ++ .../without-default-baseline-2/vcpkg.json | 7 + scripts/vcpkg.schema.json | 13 +- toolsrc/include/vcpkg/base/expected.h | 9 +- toolsrc/include/vcpkg/base/files.h | 33 +-- toolsrc/include/vcpkg/base/json.h | 4 +- toolsrc/include/vcpkg/base/jsonreader.h | 2 +- toolsrc/include/vcpkg/sourceparagraph.h | 1 + toolsrc/include/vcpkg/vcpkgpaths.h | 15 +- toolsrc/include/vcpkg/versions.h | 3 +- toolsrc/src/vcpkg-test/dependencies.cpp | 27 +- toolsrc/src/vcpkg-test/manifests.cpp | 108 +++++--- toolsrc/src/vcpkg/base/json.cpp | 5 + .../src/vcpkg/commands.civerifyversions.cpp | 2 +- toolsrc/src/vcpkg/help.cpp | 65 ++++- toolsrc/src/vcpkg/install.cpp | 22 +- toolsrc/src/vcpkg/paragraphs.cpp | 9 +- toolsrc/src/vcpkg/registries.cpp | 63 ++--- toolsrc/src/vcpkg/sourceparagraph.cpp | 125 ++++++---- toolsrc/src/vcpkg/vcpkgpaths.cpp | 232 +++++++++++------- 28 files changed, 676 insertions(+), 312 deletions(-) create mode 100644 docs/users/versioning.md create mode 100644 scripts/testing/version-files/without-default-baseline-2/port_versions/z-/zlib.json create mode 100644 scripts/testing/version-files/without-default-baseline-2/vcpkg.json diff --git a/docs/users/manifests.md b/docs/users/manifests.md index 427d336c340caf..e1bc0c58b6dc85 100644 --- a/docs/users/manifests.md +++ b/docs/users/manifests.md @@ -64,6 +64,12 @@ Additionally, the `"port-version"` field is used by registries of packages, as a way to version "the package gotten from `vcpkg install`" differently from the upstream package version. You shouldn't need to worry about this at all. +#### Additional version fields + +**Experimental behind the `versions` feature flag** + +See [versioning.md](versioning.md#version%20schemes) for additional version types. + ### `"description"` This is where you describe your project. Give it a good description to help in searching for it! @@ -71,6 +77,14 @@ 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"` + +**Experimental behind the `versions` feature flag** + +This field indicates the commit of vcpkg which provides global minimum version information for your manifest. It is required for top-level manifest files using versioning. + +See also [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, @@ -131,6 +145,16 @@ The common identifiers are: although one can define their own. +#### `"version>="` + +**Experimental behind the `versions` feature flag** + +A minimum version constraint on the dependency. + +This field specifies the minimum version of the dependency using a '#' suffix to denote port-version if non-zero. + +See also [versioning](versioning.md#constraints) for more semantic details. + #### Example: ```json @@ -151,6 +175,26 @@ although one can define their own. } ``` +### `"overrides"` + +**Experimental behind the `versions` feature flag** + +This field enables version resolution to be ignored for certain dependencies and to use specific versions instead. + +See also [versioning](versioning.md#overrides) for more semantic details. + +#### Example: + +```json +{ + "overrides": [ + { + "name": "arrow", "version": "1.2.3", "port-version": 7 + } + ] +} +``` + ### `"supports"` If your project doesn't support common platforms, you can tell your users this with the `"supports"` field. @@ -180,8 +224,9 @@ and that's the `"default-features"` field, which is an array of feature names. "name": "libdb", "description": [ "An example database library.", - "Optionally uses one of CBOR, JSON, or CSV as a backend." + "Optionally can build with CBOR, JSON, or CSV as backends." ], + "$default-features-explanation": "Users using this library transitively will get all backends automatically", "default-features": [ "cbor", "csv", "json" ], "features": { "cbor": { @@ -189,8 +234,7 @@ and that's the `"default-features"` field, which is an array of feature names. "dependencies": [ { "$explanation": [ - "This is currently how you tell vcpkg that the cbor feature depends on the json feature of this package", - "We're looking into making this easier" + "This is how you tell vcpkg that the cbor feature depends on the json feature of this package" ], "name": "libdb", "default-features": false, diff --git a/docs/users/versioning.md b/docs/users/versioning.md new file mode 100644 index 00000000000000..86840422be7d45 --- /dev/null +++ b/docs/users/versioning.md @@ -0,0 +1,85 @@ +# Versioning + +**This feature is experimental and requires `--feature-flags=versions`** + +Versioning allows you to deterministically control the precise revisions of dependencies used by +your project from within your manifest file. + +## Version schemes + +### Schemes +Versions in vcpkg come in four primary flavors: + +#### version +A dot-separated sequence of numbers (1.2.3.4) + +#### version-date +A date (2021-01-01.5) + +#### version-semver +A Semantic Version 2.0 (2.1.0-rc2) + +See https://semver.org/ for a full specification. + +#### version-string +An exact, incomparable version (Vista) + +### Port Versions +Each version additionally has a "port-version" which is a nonnegative integer. When rendered as text, the +port version (if nonzero) is added as a suffix to the primary version text separated by a hash (#). +Port-versions are sorted lexographically after the primary version text, for example: + + 1.0.0 < 1.0.0#1 < 1.0.1 < 1.0.1#5 < 2.0.0 + +## Constraints + +Manifests can place three kinds of constraints upon the versions used: + +### builtin-baseline +The baseline references a commit within the vcpkg repository that +establishes a minimum version on every dependency in the graph. If +no other constraints are specified (directly or transitively), +then the version from the baseline of the top level manifest will +be used. + +You can get the current commit of your vcpkg instance either by adding an empty `"builtin-baseline"` field, installing, and examining the error message or by running `git rev-parse HEAD` in the root of the vcpkg instance. + +Baselines provide stability and ease of development for top-level manifest files. They are not considered from ports consumed as a dependency. If a minimum version constraint is required during transitive version resolution, the port should use `version>=`. + +### version>= +Within the "dependencies" field, each dependency can have a +minimum constraint listed. These minimum constraints will be used +when transitively depending upon this library. A minimum +port-version can additionally be specified with a '#' suffix. + +This constraint must refer to an existing, valid version (including port-version). + +### overrides +When used as the top-level manifest (such as when running `vcpkg +install` in the directory), overrides allow a manifest to +short-circuit dependency resolution and specify exactly the +version to use. These can be used to handle version conflicts, +such as with `version-string` dependencies. + +Overrides are not considered from ports consumed as a dependency. + +## Example top-level manifest: +```json +{ + "name": "example", + "version": "1.0", + "builtin-baseline": "a14a6bcb27287e3ec138dba1b948a0cdbc337a3a", + "dependencies": [ + { "name": "zlib", "version>=": "1.2.11#8" }, + "rapidjson" + ], + "overrides": [ + { "name": "rapidjson", "version": "2020-09-14" } + ] +} +``` +See also the [manifest documentation](manifests.md) for more syntax information. + +## Original Specification + +See also the [original specification](https://github.com/vicroms/vcpkg/blob/versioning-spec/docs/specifications/versioning.md) diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 index 777c0901fc1612..ef7023c8525fb3 100644 --- a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 @@ -14,12 +14,13 @@ Throw-IfNotFailed Run-Vcpkg install @builtinRegistryArgs --feature-flags=registries 'zlib' Throw-IfFailed -# Test git and filesystem registries +Write-Trace "Test git and filesystem registries" Refresh-TestRoot $filesystemRegistry = "$TestingRoot/filesystem-registry" $gitRegistryUpstream = "$TestingRoot/git-registry-upstream" # build a filesystem registry +Write-Trace "build a filesystem registry" New-Item -Path $filesystemRegistry -ItemType Directory $filesystemRegistry = (Get-Item $filesystemRegistry).FullName @@ -51,6 +52,7 @@ New-Item ` # build a git registry +Write-Trace "build a git registry" New-Item -Path $gitRegistryUpstream -ItemType Directory $gitRegistryUpstream = (Get-Item $gitRegistryUpstream).FullName @@ -82,6 +84,7 @@ finally } # actually test the registries +Write-Trace "actually test the registries" $vcpkgJson = @{ "name" = "manifest-test"; "version-string" = "1.0.0"; @@ -90,37 +93,8 @@ $vcpkgJson = @{ ) } -$manifestDir = "$TestingRoot/builtin-registry-test-manifest-dir" - -New-Item -Path $manifestDir -ItemType Directory -$manifestDir = (Get-Item $manifestDir).FullName - -Push-Location $manifestDir - -try -{ - $vcpkgJsonWithBaseline = $vcpkgJson.Clone() - $vcpkgJsonWithBaseline['$x-default-baseline'] = 'default' - - New-Item -Path 'vcpkg.json' -ItemType File ` - -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgJson) - - Run-Vcpkg install @builtinRegistryArgs '--feature-flags=registries,manifests' - Throw-IfNotFailed - - New-Item -Path 'vcpkg.json' -ItemType File -Force ` - -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgJsonWithBaseline) - - Run-Vcpkg install @builtinRegistryArgs '--feature-flags=registries,manifests' - Throw-IfFailed -} -finally -{ - Pop-Location -} - - # test the filesystem registry +Write-Trace "test the filesystem registry" $manifestDir = "$TestingRoot/filesystem-registry-test-manifest-dir" New-Item -Path $manifestDir -ItemType Directory @@ -154,6 +128,7 @@ finally } # test the git registry +Write-Trace "test the git registry" $manifestDir = "$TestingRoot/git-registry-test-manifest-dir" New-Item -Path $manifestDir -ItemType Directory diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 index f5f9de20b1be89..11550d7bd72ae8 100644 --- a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 @@ -59,17 +59,40 @@ Throw-IfFailed Throw-IfFailed $CurrentTest = "default baseline" -$out = ./vcpkg $commonArgs "--feature-flags=versions" install --x-manifest-root=scripts/testing/version-files/default-baseline-1 +$out = ./vcpkg $commonArgs "--feature-flags=versions" install --x-manifest-root=scripts/testing/version-files/default-baseline-1 2>&1 | Out-String Throw-IfNotFailed -# if ($out -notmatch "Error: while checking out baseline" -or $out -notmatch " does not exist in ") -# { -# $out -# throw "Expected to fail due to missing baseline" -# } +if ($out -notmatch ".*Error: while checking out baseline.*") +{ + $out + throw "Expected to fail due to missing baseline" +} git fetch https://github.com/vicroms/test-registries -$CurrentTest = "default baseline" -./vcpkg $commonArgs --debug "--feature-flags=versions" install ` - "--x-manifest-root=scripts/testing/version-files/default-baseline-2" ` - "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions" -Throw-IfFailed +foreach ($opt_registries in @("",",registries")) +{ + Write-Trace "testing baselines: $opt_registries" + Refresh-TestRoot + $CurrentTest = "without default baseline 2 -- enabling versions should not change behavior" + Remove-Item -Recurse $buildtreesRoot/versioning -ErrorAction SilentlyContinue + ./vcpkg $commonArgs "--feature-flags=versions$opt_registries" install ` + "--dry-run" ` + "--x-manifest-root=scripts/testing/version-files/without-default-baseline-2" ` + "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions" + Throw-IfFailed + Require-FileNotExists $buildtreesRoot/versioning + + $CurrentTest = "default baseline 2" + ./vcpkg $commonArgs "--feature-flags=versions$opt_registries" install ` + "--dry-run" ` + "--x-manifest-root=scripts/testing/version-files/default-baseline-2" ` + "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions" + Throw-IfFailed + Require-FileExists $buildtreesRoot/versioning + + $CurrentTest = "using version features fails without flag" + ./vcpkg $commonArgs "--feature-flags=-versions$opt_registries" install ` + "--dry-run" ` + "--x-manifest-root=scripts/testing/version-files/default-baseline-2" ` + "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions" + Throw-IfNotFailed +} \ No newline at end of file diff --git a/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 b/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 index deadb210c13e48..29718bf76498f1 100644 --- a/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 @@ -63,6 +63,10 @@ function Throw-IfNotFailed { } } +function Write-Trace ([string]$text) { + Write-Host (@($MyInvocation.ScriptName, ":", $MyInvocation.ScriptLineNumber, ": ", $text) -join "") +} + function Run-Vcpkg { Param( [Parameter(ValueFromRemainingArguments)] diff --git a/scripts/generatePortVersionsDb.py b/scripts/generatePortVersionsDb.py index 3b7de69421c428..3be4a939e478d7 100644 --- a/scripts/generatePortVersionsDb.py +++ b/scripts/generatePortVersionsDb.py @@ -35,7 +35,7 @@ def generate_port_versions_file(port_name): env = os.environ.copy() env['GIT_OPTIONAL_LOCKS'] = '0' output = subprocess.run( - [os.path.join(SCRIPT_DIRECTORY, '../vcpkg.exe'), + [os.path.join(SCRIPT_DIRECTORY, '../vcpkg'), 'x-history', port_name, '--x-json', f'--output={output_file_path}'], capture_output=True, encoding='utf-8', env=env) if output.returncode != 0: diff --git a/scripts/testing/version-files/default-baseline-1/vcpkg.json b/scripts/testing/version-files/default-baseline-1/vcpkg.json index f6d902393d3271..51e65c82ca1942 100644 --- a/scripts/testing/version-files/default-baseline-1/vcpkg.json +++ b/scripts/testing/version-files/default-baseline-1/vcpkg.json @@ -1,7 +1,7 @@ { "name": "default-baseline-test", "version-string": "0", - "$x-default-baseline": "fca18ba3572f8aebe3b8158c359db62a7e26134e", + "builtin-baseline": "fca18ba3572f8aebe3b8158c359db62a7e26134e", "dependencies": [ "zlib" ] diff --git a/scripts/testing/version-files/default-baseline-2/vcpkg.json b/scripts/testing/version-files/default-baseline-2/vcpkg.json index af353c09d7116b..f540ccba0ba4f6 100644 --- a/scripts/testing/version-files/default-baseline-2/vcpkg.json +++ b/scripts/testing/version-files/default-baseline-2/vcpkg.json @@ -1,7 +1,7 @@ { - "name": "default-baseline-test", + "name": "default-baseline-test-2", "version-string": "0", - "$x-default-baseline": "16002d9c2318dec4c69e02d9af8c0e11dca0d4c6", + "builtin-baseline": "16002d9c2318dec4c69e02d9af8c0e11dca0d4c6", "dependencies": [ "zlib" ] diff --git a/scripts/testing/version-files/without-default-baseline-2/port_versions/z-/zlib.json b/scripts/testing/version-files/without-default-baseline-2/port_versions/z-/zlib.json new file mode 100644 index 00000000000000..f5ee7cb9dc66d6 --- /dev/null +++ b/scripts/testing/version-files/without-default-baseline-2/port_versions/z-/zlib.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "7bb2b2f3783303a4dd41163553fe4cc103dc9262", + "version-string": "1.2.11", + "port-version": 9 + }, + { + "git-tree": "4927735fa9baca564ebddf6e6880de344b20d7a8", + "version-string": "1.2.11", + "port-version": 8 + } + ] +} \ No newline at end of file diff --git a/scripts/testing/version-files/without-default-baseline-2/vcpkg.json b/scripts/testing/version-files/without-default-baseline-2/vcpkg.json new file mode 100644 index 00000000000000..839418fb71ecbf --- /dev/null +++ b/scripts/testing/version-files/without-default-baseline-2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "without-default-baseline-test-2", + "version-string": "0", + "dependencies": [ + "zlib" + ] +} \ No newline at end of file diff --git a/scripts/vcpkg.schema.json b/scripts/vcpkg.schema.json index 9df3620869354b..c485aa4158d189 100644 --- a/scripts/vcpkg.schema.json +++ b/scripts/vcpkg.schema.json @@ -136,12 +136,9 @@ "$ref": "#/definitions/platform-expression" }, "version>=": { - "description": "Minimum required port version", - "$ref": "#/definitions/version-text" - }, - "port-version": { - "description": "Minimum port revision (defaults to 0)", - "$ref": "#/definitions/port-version" + "description": "Minimum required version", + "type": "string", + "pattern": "^[^#]+(#\\d+)?$" } }, "patternProperties": { @@ -256,6 +253,10 @@ "description": "An SPDX license expression at version 3.9.", "type": "string" }, + "builtin-baseline": { + "description": "A vcpkg repository commit for version control.", + "type": "string" + }, "dependencies": { "description": "Dependencies that are always required.", "type": "array", diff --git a/toolsrc/include/vcpkg/base/expected.h b/toolsrc/include/vcpkg/base/expected.h index 13e7b4bcbf61d3..20c23f07730780 100644 --- a/toolsrc/include/vcpkg/base/expected.h +++ b/toolsrc/include/vcpkg/base/expected.h @@ -226,11 +226,10 @@ namespace vcpkg void exit_if_error(const LineInfo& line_info) const { // This is used for quick value_or_exit() calls, so always put line_info in the error message. - Checks::check_exit(line_info, - !m_s.has_error(), - "Failed at [%s] with message:\n%s", - line_info.to_string(), - m_s.to_string()); + if (m_s.has_error()) + { + Checks::exit_with_message(line_info, "Failed at [%s] with message:\n%s", line_info, m_s.to_string()); + } } ErrorHolder m_s; diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h index dd1b3a6c615f25..5f2e96e91eba79 100644 --- a/toolsrc/include/vcpkg/base/files.h +++ b/toolsrc/include/vcpkg/base/files.h @@ -282,45 +282,34 @@ namespace vcpkg::Files }; ExclusiveFileLock() = default; - ExclusiveFileLock(ExclusiveFileLock&& other) - : fs_(other.fs_), handle_(std::exchange(handle_, fs::SystemHandle{})) - { - } - ExclusiveFileLock& operator=(ExclusiveFileLock&& other) - { - if (this == &other) return *this; - - clear(); - fs_ = other.fs_; - handle_ = std::exchange(other.handle_, fs::SystemHandle{}); - return *this; - } + ExclusiveFileLock(ExclusiveFileLock&&) = delete; + ExclusiveFileLock& operator=(ExclusiveFileLock&&) = delete; - ExclusiveFileLock(Wait wait, Filesystem& fs, const fs::path& path_, std::error_code& ec) : fs_(&fs) + ExclusiveFileLock(Wait wait, Filesystem& fs, const fs::path& path_, std::error_code& ec) : m_fs(&fs) { switch (wait) { - case Wait::Yes: handle_ = fs_->take_exclusive_file_lock(path_, ec); break; - case Wait::No: handle_ = fs_->try_take_exclusive_file_lock(path_, ec); break; + case Wait::Yes: m_handle = m_fs->take_exclusive_file_lock(path_, ec); break; + case Wait::No: m_handle = m_fs->try_take_exclusive_file_lock(path_, ec); break; } } ~ExclusiveFileLock() { clear(); } - explicit operator bool() const { return handle_.is_valid(); } - bool has_lock() const { return handle_.is_valid(); } + explicit operator bool() const { return m_handle.is_valid(); } + bool has_lock() const { return m_handle.is_valid(); } void clear() { - if (fs_ && handle_.is_valid()) + if (m_fs && m_handle.is_valid()) { std::error_code ignore; - fs_->unlock_file_lock(std::exchange(handle_, fs::SystemHandle{}), ignore); + m_fs->unlock_file_lock(std::exchange(m_handle, fs::SystemHandle{}), ignore); } } private: - fs::SystemHandle handle_; - Filesystem* fs_; + Filesystem* m_fs; + fs::SystemHandle m_handle; }; } diff --git a/toolsrc/include/vcpkg/base/json.h b/toolsrc/include/vcpkg/base/json.h index e7f3076f78d319..31696b757eb5a3 100644 --- a/toolsrc/include/vcpkg/base/json.h +++ b/toolsrc/include/vcpkg/base/json.h @@ -291,7 +291,9 @@ namespace vcpkg::Json ExpectedT, std::unique_ptr> parse_file( const Files::Filesystem&, const fs::path&, std::error_code& ec) noexcept; ExpectedT, std::unique_ptr> parse( - StringView text, const fs::path& filepath = {}) noexcept; + StringView text, const fs::path& filepath) noexcept; + ExpectedT, std::unique_ptr> parse(StringView text, + StringView origin = {}) noexcept; std::pair parse_file(vcpkg::LineInfo linfo, const Files::Filesystem&, const fs::path&) noexcept; std::string stringify(const Value&, JsonStyle style); diff --git a/toolsrc/include/vcpkg/base/jsonreader.h b/toolsrc/include/vcpkg/base/jsonreader.h index da086fa028cf9f..4aca02998a9af2 100644 --- a/toolsrc/include/vcpkg/base/jsonreader.h +++ b/toolsrc/include/vcpkg/base/jsonreader.h @@ -278,7 +278,7 @@ namespace vcpkg::Json struct NaturalNumberDeserializer final : IDeserializer { - virtual StringView type_name() const override { return "a natural number"; } + virtual StringView type_name() const override { return "a nonnegative integer"; } virtual Optional visit_integer(Reader&, int64_t value) override { diff --git a/toolsrc/include/vcpkg/sourceparagraph.h b/toolsrc/include/vcpkg/sourceparagraph.h index f2dd0798b9df3d..52ce5398083b9b 100644 --- a/toolsrc/include/vcpkg/sourceparagraph.h +++ b/toolsrc/include/vcpkg/sourceparagraph.h @@ -69,6 +69,7 @@ namespace vcpkg std::vector overrides; std::vector default_features; std::string license; // SPDX license expression + Optional builtin_baseline; Type type; PlatformExpression::Expr supports_expression; diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index 36447b9f37b69a..d36ebfb7cff2b4 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -118,8 +118,12 @@ namespace vcpkg const std::string& get_tool_version(const std::string& tool) const; // Git manipulation in the vcpkg directory - fs::path git_checkout_baseline(Files::Filesystem& filesystem, StringView commit_sha) const; - fs::path git_checkout_port(Files::Filesystem& filesystem, StringView port_name, StringView git_tree) const; + ExpectedS get_current_git_sha() const; + std::string get_current_git_sha_message() const; + ExpectedS git_checkout_baseline(StringView commit_sha) const; + ExpectedS git_checkout_port(StringView port_name, + StringView git_tree, + const fs::path& dot_git_dir) const; ExpectedS git_show(const std::string& treeish, const fs::path& dot_git_dir) const; ExpectedS>> git_get_local_port_treeish_map() const; @@ -168,12 +172,5 @@ namespace vcpkg const fs::path& destination, const fs::path& dot_git_dir, const fs::path& work_tree); - - static void git_checkout_object(const VcpkgPaths& paths, - StringView git_object, - const fs::path& local_repo, - const fs::path& destination, - const fs::path& dot_git_dir, - const fs::path& work_tree); }; } diff --git a/toolsrc/include/vcpkg/versions.h b/toolsrc/include/vcpkg/versions.h index 19b5546eaf2c10..b26c90dfbaf6be 100644 --- a/toolsrc/include/vcpkg/versions.h +++ b/toolsrc/include/vcpkg/versions.h @@ -81,8 +81,7 @@ namespace vcpkg::Versions enum class Type { None, - Minimum, - Exact + Minimum }; }; } diff --git a/toolsrc/src/vcpkg-test/dependencies.cpp b/toolsrc/src/vcpkg-test/dependencies.cpp index 2831ea5a1abb2c..8f936abc38e17f 100644 --- a/toolsrc/src/vcpkg-test/dependencies.cpp +++ b/toolsrc/src/vcpkg-test/dependencies.cpp @@ -196,7 +196,7 @@ struct MockOverlayProvider : PortFileProvider::IOverlayProvider, Util::ResourceB static const MockOverlayProvider s_empty_mock_overlay; -ExpectedS create_versioned_install_plan( +static ExpectedS create_versioned_install_plan( const PortFileProvider::IVersionedPortfileProvider& provider, const PortFileProvider::IBaselineProvider& bprovider, const CMakeVars::CMakeVarProvider& var_provider, @@ -335,7 +335,7 @@ TEST_CASE ("basic version install scheme baseline missing success", "[versionpla bp, var_provider, { - Dependency{"a", {}, {}, {Constraint::Type::Exact, "2"}}, + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2"}}, }, {}, toplevel_spec())); @@ -375,7 +375,7 @@ TEST_CASE ("version string baseline agree", "[versionplan]") MockCMakeVarProvider var_provider; auto install_plan = create_versioned_install_plan( - vp, bp, var_provider, {Dependency{"a", {}, {}, {Constraint::Type::Exact, "2"}}}, {}, toplevel_spec()); + vp, bp, var_provider, {Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2"}}}, {}, toplevel_spec()); REQUIRE(install_plan.has_value()); } @@ -396,7 +396,7 @@ TEST_CASE ("version install scheme baseline conflict", "[versionplan]") bp, var_provider, { - Dependency{"a", {}, {}, {Constraint::Type::Exact, "3"}}, + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "3"}}, }, {}, toplevel_spec()); @@ -421,7 +421,7 @@ TEST_CASE ("version install string port version", "[versionplan]") bp, var_provider, { - Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 1}}, + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2", 1}}, }, {}, toplevel_spec())); @@ -447,7 +447,7 @@ TEST_CASE ("version install string port version 2", "[versionplan]") bp, var_provider, { - Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 0}}, + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2", 0}}, }, {}, toplevel_spec())); @@ -463,10 +463,10 @@ TEST_CASE ("version install transitive string", "[versionplan]") MockVersionedPortfileProvider vp; vp.emplace("a", {"2", 0}).source_control_file->core_paragraph->dependencies = { - Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Exact, "1"}}, + Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "1"}}, }; vp.emplace("a", {"2", 1}).source_control_file->core_paragraph->dependencies = { - Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Exact, "2"}}, + Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "2"}}, }; vp.emplace("b", {"1", 0}); vp.emplace("b", {"2", 0}); @@ -478,7 +478,7 @@ TEST_CASE ("version install transitive string", "[versionplan]") bp, var_provider, { - Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 1}}, + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2", 1}}, }, {}, toplevel_spec())); @@ -1006,7 +1006,7 @@ TEST_CASE ("version install scheme change in port version", "[versionplan]") { MockVersionedPortfileProvider vp; vp.emplace("a", {"2", 0}).source_control_file->core_paragraph->dependencies = { - Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Exact, "1"}}, + Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "1"}}, }; vp.emplace("a", {"2", 1}).source_control_file->core_paragraph->dependencies = { Dependency{"b", {}, {}, DependencyConstraint{Constraint::Type::Minimum, "1", 1}}, @@ -1026,7 +1026,7 @@ TEST_CASE ("version install scheme change in port version", "[versionplan]") bp, var_provider, { - Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 1}}, + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2", 1}}, }, {}, toplevel_spec())); @@ -1045,7 +1045,7 @@ TEST_CASE ("version install scheme change in port version", "[versionplan]") bp, var_provider, { - Dependency{"a", {}, {}, {Constraint::Type::Exact, "2", 0}}, + Dependency{"a", {}, {}, {Constraint::Type::Minimum, "2", 0}}, }, {}, toplevel_spec())); @@ -1305,7 +1305,8 @@ TEST_CASE ("version install transitive overrides", "[versionplan]") MockVersionedPortfileProvider vp; vp.emplace("b", {"1", 0}, Scheme::Relaxed) - .source_control_file->core_paragraph->dependencies.push_back({"c", {}, {}, {Constraint::Type::Exact, "2", 1}}); + .source_control_file->core_paragraph->dependencies.push_back( + {"c", {}, {}, {Constraint::Type::Minimum, "2", 1}}); vp.emplace("b", {"2", 0}, Scheme::Relaxed); vp.emplace("c", {"1", 0}, Scheme::String); vp.emplace("c", {"2", 1}, Scheme::String); diff --git a/toolsrc/src/vcpkg-test/manifests.cpp b/toolsrc/src/vcpkg-test/manifests.cpp index 39e4700750dcc8..0af9f4f968a409 100644 --- a/toolsrc/src/vcpkg-test/manifests.cpp +++ b/toolsrc/src/vcpkg-test/manifests.cpp @@ -62,6 +62,7 @@ TEST_CASE ("manifest construct minimum", "[manifests]") REQUIRE(pgh.core_paragraph->maintainers.empty()); REQUIRE(pgh.core_paragraph->description.empty()); REQUIRE(pgh.core_paragraph->dependencies.empty()); + REQUIRE(!pgh.core_paragraph->builtin_baseline.has_value()); REQUIRE(!pgh.check_against_feature_flags({}, feature_flags_without_versioning)); } @@ -157,19 +158,31 @@ TEST_CASE ("manifest versioning", "[manifests]") } } -TEST_CASE ("manifest constraints error hash", "[manifests]") +TEST_CASE ("manifest constraints hash", "[manifests]") { + auto p = unwrap(test_parse_manifest(R"json({ + "name": "zlib", + "version-string": "abcd", + "dependencies": [ + { + "name": "d", + "version>=": "2018-09-01#1" + } + ] +})json")); + REQUIRE(p->core_paragraph->dependencies.at(0).constraint.value == "2018-09-01"); + REQUIRE(p->core_paragraph->dependencies.at(0).constraint.port_version == 1); + test_parse_manifest(R"json({ "name": "zlib", "version-string": "abcd", "dependencies": [ { - "name": "b", - "version=": "5#1" + "name": "d", + "version>=": "2018-09-01#0" } ] -} -)json", +})json", true); test_parse_manifest(R"json({ @@ -178,7 +191,20 @@ TEST_CASE ("manifest constraints error hash", "[manifests]") "dependencies": [ { "name": "d", - "version>=": "2018-09-01#1" + "version>=": "2018-09-01#-1" + } + ] +})json", + true); + + test_parse_manifest(R"json({ + "name": "zlib", + "version-string": "abcd", + "dependencies": [ + { + "name": "d", + "version>=": "2018-09-01", + "port-version": 1 } ] })json", @@ -238,13 +264,9 @@ TEST_CASE ("manifest constraints", "[manifests]") std::string raw = R"json({ "name": "zlib", "version-string": "abcd", + "builtin-baseline": "089fa4de7dca22c67dcab631f618d5cd0697c8d4", "dependencies": [ "a", - { - "name": "b", - "port-version": 12, - "version=": "5" - }, { "$extra": null, "name": "c" @@ -263,32 +285,17 @@ TEST_CASE ("manifest constraints", "[manifests]") REQUIRE(pgh.check_against_feature_flags({}, feature_flags_without_versioning)); REQUIRE(!pgh.check_against_feature_flags({}, feature_flags_with_versioning)); REQUIRE(Json::stringify(serialize_manifest(pgh), Json::JsonStyle::with_spaces(4)) == raw); - REQUIRE(pgh.core_paragraph->dependencies.size() == 4); + REQUIRE(pgh.core_paragraph->dependencies.size() == 3); REQUIRE(pgh.core_paragraph->dependencies[0].name == "a"); REQUIRE(pgh.core_paragraph->dependencies[0].constraint == DependencyConstraint{Versions::Constraint::Type::None, "", 0}); - REQUIRE(pgh.core_paragraph->dependencies[1].name == "b"); + REQUIRE(pgh.core_paragraph->dependencies[1].name == "c"); REQUIRE(pgh.core_paragraph->dependencies[1].constraint == - DependencyConstraint{Versions::Constraint::Type::Exact, "5", 12}); - REQUIRE(pgh.core_paragraph->dependencies[2].name == "c"); - REQUIRE(pgh.core_paragraph->dependencies[2].constraint == DependencyConstraint{Versions::Constraint::Type::None, "", 0}); - REQUIRE(pgh.core_paragraph->dependencies[3].name == "d"); - REQUIRE(pgh.core_paragraph->dependencies[3].constraint == + REQUIRE(pgh.core_paragraph->dependencies[2].name == "d"); + REQUIRE(pgh.core_paragraph->dependencies[2].constraint == DependencyConstraint{Versions::Constraint::Type::Minimum, "2018-09-01", 0}); - - test_parse_manifest(R"json({ - "name": "zlib", - "version-string": "abcd", - "dependencies": [ - { - "name": "d", - "version=": "2018-09-01", - "version>=": "2018-09-01" - } - ] - })json", - true); + REQUIRE(pgh.core_paragraph->builtin_baseline == "089fa4de7dca22c67dcab631f618d5cd0697c8d4"); test_parse_manifest(R"json({ "name": "zlib", @@ -303,6 +310,45 @@ TEST_CASE ("manifest constraints", "[manifests]") true); } +TEST_CASE ("manifest builtin-baseline", "[manifests]") +{ + SECTION ("valid baseline") + { + std::string raw = R"json({ + "name": "zlib", + "version-string": "abcd", + "builtin-baseline": "089fa4de7dca22c67dcab631f618d5cd0697c8d4" +} +)json"; + auto m_pgh = test_parse_manifest(raw); + + REQUIRE(m_pgh.has_value()); + auto& pgh = **m_pgh.get(); + REQUIRE(pgh.check_against_feature_flags({}, feature_flags_without_versioning)); + REQUIRE(!pgh.check_against_feature_flags({}, feature_flags_with_versioning)); + REQUIRE(pgh.core_paragraph->builtin_baseline.value_or("does not have a value") == + "089fa4de7dca22c67dcab631f618d5cd0697c8d4"); + } + + SECTION ("empty baseline") + { + std::string raw = R"json({ + "name": "zlib", + "version-string": "abcd", + "builtin-baseline": "" +} +)json"; + + auto m_pgh = test_parse_manifest(raw); + + REQUIRE(m_pgh.has_value()); + auto& pgh = **m_pgh.get(); + REQUIRE(pgh.check_against_feature_flags({}, feature_flags_without_versioning)); + REQUIRE(!pgh.check_against_feature_flags({}, feature_flags_with_versioning)); + REQUIRE(pgh.core_paragraph->builtin_baseline.value_or("does not have a value") == ""); + } +} + TEST_CASE ("manifest overrides", "[manifests]") { std::tuple data[] = { diff --git a/toolsrc/src/vcpkg/base/json.cpp b/toolsrc/src/vcpkg/base/json.cpp index 4a784235e089f2..d99fa73925d9b5 100644 --- a/toolsrc/src/vcpkg/base/json.cpp +++ b/toolsrc/src/vcpkg/base/json.cpp @@ -1064,6 +1064,11 @@ namespace vcpkg::Json { return Parser::parse(json, fs::generic_u8string(filepath)); } + ExpectedT, std::unique_ptr> parse(StringView json, + StringView origin) noexcept + { + return Parser::parse(json, origin); + } // } auto parse() namespace diff --git a/toolsrc/src/vcpkg/commands.civerifyversions.cpp b/toolsrc/src/vcpkg/commands.civerifyversions.cpp index 84aab9c019dd86..71ced9f76a477d 100644 --- a/toolsrc/src/vcpkg/commands.civerifyversions.cpp +++ b/toolsrc/src/vcpkg/commands.civerifyversions.cpp @@ -404,7 +404,7 @@ namespace vcpkg::Commands::CIVerifyVersions System::printf(System::Color::error, "%s\n", error); } System::print2(System::Color::error, - "\nTo attempt to resolve all erros at once, run:\n\n" + "\nTo attempt to resolve all errors at once, run:\n\n" " vcpkg x-add-version --all\n\n"); Checks::exit_fail(VCPKG_LINE_INFO); } diff --git a/toolsrc/src/vcpkg/help.cpp b/toolsrc/src/vcpkg/help.cpp index ded6592fbe90be..0556b4fa064e03 100644 --- a/toolsrc/src/vcpkg/help.cpp +++ b/toolsrc/src/vcpkg/help.cpp @@ -47,7 +47,69 @@ namespace vcpkg::Help nullptr, }; - static constexpr std::array topics = {{ + static void help_topic_versioning(const VcpkgPaths&) + { + HelpTableFormatter tbl; + tbl.text("Versioning allows you to deterministically control the precise revisions of dependencies used by " + "your project from within your manifest file."); + tbl.blank(); + tbl.blank(); + tbl.text("** This feature is experimental and requires `--feature-flags=versions` **"); + tbl.blank(); + tbl.blank(); + tbl.header("Versions in vcpkg come in four primary flavors"); + tbl.format("version", "A dot-separated sequence of numbers (1.2.3.4)"); + tbl.format("version-date", "A date (2021-01-01.5)"); + tbl.format("version-semver", "A Semantic Version 2.0 (2.1.0-rc2)"); + tbl.format("version-string", "An exact, incomparable version (Vista)"); + tbl.blank(); + tbl.text("Each version additionally has a \"port-version\" which is a nonnegative integer. When rendered as " + "text, the port version (if nonzero) is added as a suffix to the primary version text separated by a " + "hash (#). Port-versions are sorted lexographically after the primary version text, for example:"); + tbl.blank(); + tbl.blank(); + tbl.text(" 1.0.0 < 1.0.0#1 < 1.0.1 < 1.0.1#5 < 2.0.0"); + tbl.blank(); + tbl.blank(); + tbl.header("Manifests can place three kinds of constraints upon the versions used"); + tbl.format("builtin-baseline", + "The baseline references a commit within the vcpkg repository that establishes a minimum version on " + "every dependency in the graph. If no other constraints are specified (directly or transitively), " + "then the version from the baseline of the top level manifest will be used. Baselines of transitive " + "dependencies are ignored."); + tbl.blank(); + tbl.format("version>=", + "Within the \"dependencies\" field, each dependency can have a minimum constraint listed. These " + "minimum constraints will be used when transitively depending upon this library. A minimum " + "port-version can additionally be specified with a '#' suffix."); + tbl.blank(); + tbl.format( + "overrides", + "When used as the top-level manifest (such as when running `vcpkg install` in the directory), overrides " + "allow a manifest to short-circuit dependency resolution and specify exactly the version to use. These can " + "be used to handle version conflicts, such as with `version-string` dependencies. They will not be " + "considered when transitively depended upon."); + tbl.blank(); + tbl.text("Example manifest:"); + tbl.blank(); + tbl.text(R"({ + "name": "example", + "version": "1.0", + "builtin-baseline": "a14a6bcb27287e3ec138dba1b948a0cdbc337a3a", + "dependencies": [ + { "name": "zlib", "version>=": "1.2.11#8" }, + "rapidjson" + ], + "overrides": [ + { "name": "rapidjson", "version": "2020-09-14" } + ] +})"); + System::print2(tbl.m_str, + "\nExtended documentation is available at " + "https://github.com/Microsoft/vcpkg/tree/master/docs/users/versioning.md\n"); + } + + static constexpr std::array topics = {{ {"binarycaching", help_topic_binary_caching}, {"create", command_topic_fn}, {"depend-info", command_topic_fn}, @@ -63,6 +125,7 @@ namespace vcpkg::Help {"search", command_topic_fn}, {"topics", help_topics}, {"triplet", help_topic_valid_triplet}, + {"versioning", help_topic_versioning}, }}; static void help_topics(const VcpkgPaths&) diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index 80b4eae3ae9a4c..e86a78a764b464 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -847,10 +848,25 @@ namespace vcpkg::Install if (args.versions_enabled() || args.registries_enabled()) { - if (auto p_baseline = manifest_scf.core_paragraph->extra_info.get("$x-default-baseline")) + if (!manifest_scf.core_paragraph->overrides.empty()) { - paths.get_configuration().registry_set.experimental_set_builtin_registry_baseline( - p_baseline->string()); + Metrics::g_metrics.lock()->track_property("manifest_overrides", "defined"); + } + if (auto p_baseline = manifest_scf.core_paragraph->builtin_baseline.get()) + { + Metrics::g_metrics.lock()->track_property("manifest_baseline", "defined"); + if (p_baseline->size() != 40 || !std::all_of(p_baseline->begin(), p_baseline->end(), [](char ch) { + return (ch >= 'a' || ch <= 'f') || Parse::ParserBase::is_ascii_digit(ch); + })) + { + Checks::exit_with_message( + VCPKG_LINE_INFO, + "Error: the top-level builtin-baseline (%s) was not a valid commit sha: " + "expected 40 lowercase hexadecimal characters.\n%s\n", + *p_baseline, + paths.get_current_git_sha_message()); + } + paths.get_configuration().registry_set.experimental_set_builtin_registry_baseline(*p_baseline); } } if (args.versions_enabled()) diff --git a/toolsrc/src/vcpkg/paragraphs.cpp b/toolsrc/src/vcpkg/paragraphs.cpp index 32103c76b9e6f6..2d28c49d705d6c 100644 --- a/toolsrc/src/vcpkg/paragraphs.cpp +++ b/toolsrc/src/vcpkg/paragraphs.cpp @@ -373,7 +373,14 @@ namespace vcpkg::Paragraphs auto error_info = std::make_unique(); error_info->name = fs::u8string(path.filename()); - error_info->error = "Failed to find either a CONTROL file or vcpkg.json file."; + if (fs.exists(path)) + { + error_info->error = "Failed to find either a CONTROL file or vcpkg.json file."; + } + else + { + error_info->error = "The port directory (" + fs::u8string(path) + ") does not exist"; + } return error_info; } diff --git a/toolsrc/src/vcpkg/registries.cpp b/toolsrc/src/vcpkg/registries.cpp index b9afa089bef1b1..934e6537a095d5 100644 --- a/toolsrc/src/vcpkg/registries.cpp +++ b/toolsrc/src/vcpkg/registries.cpp @@ -186,17 +186,6 @@ namespace DelayedInit m_baseline; }; - ExpectedS get_git_baseline_json_path(const VcpkgPaths& paths, StringView baseline_commit_sha) - { - auto baseline_path = paths.git_checkout_baseline(paths.get_filesystem(), baseline_commit_sha); - if (paths.get_filesystem().exists(baseline_path)) - { - return std::move(baseline_path); - } - return {Strings::concat("Error: Baseline database file does not exist: ", fs::u8string(baseline_path)), - expected_right_tag}; - } - struct VersionDbEntry { VersionT version; @@ -224,7 +213,7 @@ namespace // returns nullopt if the baseline is valid, but doesn't contain the specified baseline, // or (equivalently) if the baseline does not exist. - ExpectedS> parse_baseline_versions(StringView contents, StringView baseline); + ExpectedS> parse_baseline_versions(StringView contents, StringView baseline, StringView origin); ExpectedS> load_baseline_versions(const VcpkgPaths& paths, const fs::path& path_to_baseline, StringView identifier = {}); @@ -327,18 +316,20 @@ namespace if (baseline_identifier == "default") { - return Strings::format("Couldn't find explicitly specified baseline `\"default\"` in baseline file: %s", - fs::u8string(path_to_baseline)); + return Strings::format( + "Error: Couldn't find explicitly specified baseline `\"default\"` in baseline file: %s", + fs::u8string(path_to_baseline)); } // attempt to check out the baseline: - auto maybe_path = get_git_baseline_json_path(paths, baseline_identifier); + auto maybe_path = paths.git_checkout_baseline(baseline_identifier); if (!maybe_path.has_value()) { - return Strings::format("Couldn't find explicitly specified baseline `\"%s\"` in the baseline file, " - "and there was no baseline at that commit or the commit didn't exist.\n%s", + return Strings::format("Error: Couldn't find explicitly specified baseline `\"%s\"` in the baseline file, " + "and there was no baseline at that commit or the commit didn't exist.\n%s\n%s", baseline_identifier, - maybe_path.error()); + maybe_path.error(), + paths.get_current_git_sha_message()); } res_baseline = load_baseline_versions(paths, *maybe_path.get()); @@ -352,7 +343,7 @@ namespace return std::move(*p); } - return Strings::format("Couldn't find explicitly specified baseline `\"%s\"` in the baseline " + return Strings::format("Error: Couldn't find explicitly specified baseline `\"%s\"` in the baseline " "file, and the `\"default\"` baseline does not exist at that commit.", baseline_identifier); } @@ -549,7 +540,7 @@ namespace } auto contents = maybe_contents.get(); - res_baseline = parse_baseline_versions(*contents, {}); + res_baseline = parse_baseline_versions(*contents, "default", fs::u8string(path_to_baseline)); if (!res_baseline.has_value()) { Checks::exit_with_message(VCPKG_LINE_INFO, res_baseline.error()); @@ -599,12 +590,22 @@ namespace auto it = std::find(git_entry->port_versions.begin(), git_entry->port_versions.end(), version); if (it == git_entry->port_versions.end()) { - return Strings::concat( - "Error: No version entry for ", git_entry->port_name, " at version ", version, "."); + return { + Strings::concat("Error: No version entry for ", + git_entry->port_name, + " at version ", + version, + ". This may be fixed by updating vcpkg to the latest master via `git " + "pull`.\nAvailable versions:\n", + Strings::join("", + git_entry->port_versions, + [](const VersionT& v) { return Strings::concat(" ", v, "\n"); }), + "\nSee `vcpkg help versioning` for more information."), + expected_right_tag}; } const auto& git_tree = git_entry->git_trees[it - git_entry->port_versions.begin()]; - return paths.git_checkout_port(paths.get_filesystem(), git_entry->port_name, git_tree); + return paths.git_checkout_port(git_entry->port_name, git_tree, paths.root / fs::u8path(".git")); } if (scfl_version == version) @@ -1014,19 +1015,20 @@ namespace return db_entries; } - ExpectedS> parse_baseline_versions(StringView contents, StringView baseline) + ExpectedS> parse_baseline_versions(StringView contents, StringView baseline, StringView origin) { - auto maybe_value = Json::parse(contents); + auto maybe_value = Json::parse(contents, origin); if (!maybe_value.has_value()) { - return Strings::format("Error: failed to parse baseline file: %s", maybe_value.error()->format()); + return Strings::format( + "Error: failed to parse baseline file: %s\n%s", origin, maybe_value.error()->format()); } auto& value = *maybe_value.get(); if (!value.first.is_object()) { - return std::string("Error: baseline does not have a top-level object."); + return Strings::concat("Error: baseline does not have a top-level object: ", origin); } auto real_baseline = baseline.size() == 0 ? "default" : baseline; @@ -1047,8 +1049,7 @@ namespace } else { - Checks::exit_with_message( - VCPKG_LINE_INFO, "Error: failed to parse baseline:\n%s", Strings::join("\n", r.errors())); + return Strings::format("Error: failed to parse baseline: %s\n%s", origin, Strings::join("\n", r.errors())); } } @@ -1059,7 +1060,7 @@ namespace auto maybe_contents = paths.get_filesystem().read_contents(path_to_baseline); if (auto contents = maybe_contents.get()) { - return parse_baseline_versions(*contents, baseline); + return parse_baseline_versions(*contents, baseline, fs::u8string(path_to_baseline)); } else if (maybe_contents.error() == std::errc::no_such_file_or_directory) { @@ -1143,7 +1144,7 @@ namespace vcpkg if (!default_registry_is_builtin || registries_.size() != 0) { System::print2(System::Color::warning, - "Warning: when using the registries feature, one should not use `\"$x-default-baseline\"` " + "Warning: when using the registries feature, one should not use `\"builtin-baseline\"` " "to set the baseline.\n", " Instead, use the \"baseline\" field of the registry.\n"); } diff --git a/toolsrc/src/vcpkg/sourceparagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp index c4ae3e85569eeb..61cc7f8264d542 100644 --- a/toolsrc/src/vcpkg/sourceparagraph.cpp +++ b/toolsrc/src/vcpkg/sourceparagraph.cpp @@ -430,8 +430,6 @@ namespace vcpkg constexpr static StringLiteral FEATURES = "features"; constexpr static StringLiteral DEFAULT_FEATURES = "default-features"; constexpr static StringLiteral PLATFORM = "platform"; - constexpr static StringLiteral PORT_VERSION = "port-version"; - constexpr static StringLiteral VERSION_EQ = "version="; constexpr static StringLiteral VERSION_GE = "version>="; virtual Span valid_fields() const override @@ -441,8 +439,6 @@ namespace vcpkg FEATURES, DEFAULT_FEATURES, PLATFORM, - PORT_VERSION, - VERSION_EQ, VERSION_GE, }; @@ -488,33 +484,34 @@ namespace vcpkg r.optional_object_field(obj, PLATFORM, dep.platform, PlatformExprDeserializer::instance); - static auto version_deserializer = make_version_deserializer("a version"); + static Json::StringDeserializer version_deserializer("a version"); - auto has_eq_constraint = - r.optional_object_field(obj, VERSION_EQ, dep.constraint.value, *version_deserializer); auto has_ge_constraint = - r.optional_object_field(obj, VERSION_GE, dep.constraint.value, *version_deserializer); - auto has_port_ver = r.optional_object_field( - obj, PORT_VERSION, dep.constraint.port_version, Json::NaturalNumberDeserializer::instance); + r.optional_object_field(obj, VERSION_GE, dep.constraint.value, version_deserializer); - if (has_eq_constraint) + if (has_ge_constraint) { - dep.constraint.type = Versions::Constraint::Type::Exact; - if (has_ge_constraint) + dep.constraint.type = Versions::Constraint::Type::Minimum; + auto h = dep.constraint.value.find('#'); + if (h != std::string::npos) { - r.add_generic_error(type_name(), "cannot have both exact and minimum constraints simultaneously"); + auto opt = Strings::strto(dep.constraint.value.c_str() + h + 1); + auto v = opt.get(); + if (v && *v > 0) + { + dep.constraint.port_version = *v; + } + else + { + r.add_generic_error(type_name(), + "embedded port-version ('#') in the primary " + "constraint (\"", + VERSION_GE, + "\") must be a positive integer"); + } + dep.constraint.value.erase(h); } } - else if (has_ge_constraint) - { - dep.constraint.type = Versions::Constraint::Type::Minimum; - } - else if (has_port_ver) // does not have a primary constraint - { - r.add_generic_error( - type_name(), - "\"port-version\" cannot be used without a primary constraint (\"version=\" or \"version>=\")"); - } return dep; } @@ -540,9 +537,7 @@ namespace vcpkg constexpr StringLiteral DependencyDeserializer::FEATURES; constexpr StringLiteral DependencyDeserializer::DEFAULT_FEATURES; constexpr StringLiteral DependencyDeserializer::PLATFORM; - constexpr StringLiteral DependencyDeserializer::VERSION_EQ; constexpr StringLiteral DependencyDeserializer::VERSION_GE; - constexpr StringLiteral DependencyDeserializer::PORT_VERSION; struct DependencyOverrideDeserializer : Json::IDeserializer { @@ -860,6 +855,21 @@ namespace vcpkg }; LicenseExpressionDeserializer LicenseExpressionDeserializer::instance; + struct BaselineCommitDeserializer final : Json::IDeserializer + { + virtual StringView type_name() const override { return "a vcpkg repository commit"; } + + virtual Optional visit_string(Json::Reader&, StringView s) override + { + // We allow non-sha strings here to allow the core vcpkg code to provide better error + // messages including the current git commit + return s.to_string(); + } + + static BaselineCommitDeserializer instance; + }; + BaselineCommitDeserializer BaselineCommitDeserializer::instance; + struct ManifestDeserializer : Json::IDeserializer> { virtual StringView type_name() const override { return "a manifest"; } @@ -876,6 +886,7 @@ namespace vcpkg constexpr static StringLiteral DEFAULT_FEATURES = "default-features"; constexpr static StringLiteral SUPPORTS = "supports"; constexpr static StringLiteral OVERRIDES = "overrides"; + constexpr static StringLiteral BUILTIN_BASELINE = "builtin-baseline"; virtual Span valid_fields() const override { @@ -892,6 +903,7 @@ namespace vcpkg DEFAULT_FEATURES, SUPPORTS, OVERRIDES, + BUILTIN_BASELINE, }; static const auto t = Util::Vectors::concat(schemed_deserializer_fields(), u); @@ -917,9 +929,9 @@ namespace vcpkg static Json::StringDeserializer url_deserializer{"a url"}; - constexpr static StringView type_name = "vcpkg.json"; + constexpr static StringView inner_type_name = "vcpkg.json"; DependencyOverrideDeserializer::visit_impl( - type_name, r, obj, spgh->name, spgh->version, spgh->version_scheme, spgh->port_version); + inner_type_name, r, obj, spgh->name, spgh->version, spgh->version_scheme, spgh->port_version); r.optional_object_field(obj, MAINTAINERS, spgh->maintainers, Json::ParagraphDeserializer::instance); r.optional_object_field(obj, DESCRIPTION, spgh->description, Json::ParagraphDeserializer::instance); @@ -933,8 +945,12 @@ namespace vcpkg if (obj.contains(DEV_DEPENDENCIES)) { - System::print2(System::Color::error, DEV_DEPENDENCIES, " are not yet supported"); - Checks::exit_fail(VCPKG_LINE_INFO); + r.add_generic_error(type_name(), DEV_DEPENDENCIES, " are not yet supported"); + } + std::string baseline; + if (r.optional_object_field(obj, BUILTIN_BASELINE, baseline, BaselineCommitDeserializer::instance)) + { + spgh->builtin_baseline = std::move(baseline); } r.optional_object_field(obj, SUPPORTS, spgh->supports_expression, PlatformExprDeserializer::instance); @@ -1007,6 +1023,7 @@ namespace vcpkg Optional SourceControlFile::check_against_feature_flags(const fs::path& origin, const FeatureFlagSettings& flags) const { + static constexpr StringLiteral s_extended_help = "See `vcpkg help versioning` for more information."; if (!flags.versions) { auto check_deps = [&](View deps) -> Optional { @@ -1014,11 +1031,12 @@ namespace vcpkg { if (dep.constraint.type != Versions::Constraint::Type::None) { - return Strings::concat(fs::u8string(origin), - " was rejected because it uses constraints and the `", - VcpkgCmdArguments::VERSIONS_FEATURE, - "` feature flag is disabled.\nThis can be fixed by removing uses of " - "\"version>=\" and \"version=\"."); + return Strings::concat( + fs::u8string(origin), + " was rejected because it uses constraints and the `", + VcpkgCmdArguments::VERSIONS_FEATURE, + "` feature flag is disabled.\nThis can be fixed by removing uses of \"version>=\".\n", + s_extended_help); } } return nullopt; @@ -1036,7 +1054,18 @@ namespace vcpkg return Strings::concat(fs::u8string(origin), " was rejected because it uses overrides and the `", VcpkgCmdArguments::VERSIONS_FEATURE, - "` feature flag is disabled.\nThis can be fixed by removing \"overrides\"."); + "` feature flag is disabled.\nThis can be fixed by removing \"overrides\".\n", + s_extended_help); + } + + if (core_paragraph->builtin_baseline.has_value()) + { + return Strings::concat( + fs::u8string(origin), + " was rejected because it uses builtin-baseline and the `", + VcpkgCmdArguments::VERSIONS_FEATURE, + "` feature flag is disabled.\nThis can be fixed by removing \"builtin-baseline\".\n", + s_extended_help); } } return nullopt; @@ -1242,19 +1271,14 @@ namespace vcpkg serialize_optional_array(dep_obj, DependencyDeserializer::FEATURES, features_copy); serialize_optional_string(dep_obj, DependencyDeserializer::PLATFORM, to_string(dep.platform)); - if (dep.constraint.port_version != 0) - { - dep_obj.insert(DependencyDeserializer::PORT_VERSION, - Json::Value::integer(dep.constraint.port_version)); - } - - if (dep.constraint.type == Versions::Constraint::Type::Exact) - { - dep_obj.insert(DependencyDeserializer::VERSION_EQ, Json::Value::string(dep.constraint.value)); - } - else if (dep.constraint.type == Versions::Constraint::Type::Minimum) + if (dep.constraint.type == Versions::Constraint::Type::Minimum) { - dep_obj.insert(DependencyDeserializer::VERSION_GE, Json::Value::string(dep.constraint.value)); + auto s = dep.constraint.value; + if (dep.constraint.port_version != 0) + { + Strings::append(s, '#', dep.constraint.port_version); + } + dep_obj.insert(DependencyDeserializer::VERSION_GE, Json::Value::string(std::move(s))); } } }; @@ -1294,6 +1318,11 @@ namespace vcpkg serialize_optional_string(obj, ManifestDeserializer::LICENSE, scf.core_paragraph->license); serialize_optional_string( obj, ManifestDeserializer::SUPPORTS, to_string(scf.core_paragraph->supports_expression)); + if (scf.core_paragraph->builtin_baseline.has_value()) + { + obj.insert(ManifestDeserializer::BUILTIN_BASELINE, + Json::Value::string(scf.core_paragraph->builtin_baseline.value_or_exit(VCPKG_LINE_INFO))); + } if (!scf.core_paragraph->dependencies.empty() || debug) { diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index afd7247655f272..7926e7a5fbd09e 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -554,6 +554,33 @@ If you wish to silence this error and use classic mode, you can: } } + ExpectedS VcpkgPaths::get_current_git_sha() const + { + auto cmd = git_cmd_builder(*this, this->root / fs::u8path(".git"), this->root); + cmd.string_arg("rev-parse").string_arg("HEAD"); + auto output = System::cmd_execute_and_capture_output(cmd); + if (output.exit_code != 0) + { + return {std::move(output.output), expected_right_tag}; + } + else + { + return {Strings::trim(std::move(output.output)), expected_left_tag}; + } + } + std::string VcpkgPaths::get_current_git_sha_message() const + { + auto maybe_cur_sha = get_current_git_sha(); + if (auto p_sha = maybe_cur_sha.get()) + { + return Strings::concat("The current commit is \"", *p_sha, '"'); + } + else + { + return Strings::concat("Failed to determine the current commit:\n", maybe_cur_sha.error()); + } + } + ExpectedS VcpkgPaths::git_show(const std::string& treeish, const fs::path& dot_git_dir) const { // All git commands are run with: --git-dir={dot_git_dir} --work-tree={work_tree_temp} @@ -620,119 +647,148 @@ If you wish to silence this error and use classic mode, you can: return ret; } - void VcpkgPaths::git_checkout_object(const VcpkgPaths& paths, - StringView git_object, - const fs::path& local_repo, - const fs::path& destination, - const fs::path& dot_git_dir, - const fs::path& work_tree) - { - Files::Filesystem& fs = paths.get_filesystem(); - fs.remove_all(work_tree, VCPKG_LINE_INFO); - fs.remove_all(destination, VCPKG_LINE_INFO); - - if (!fs.exists(dot_git_dir)) - { - // All git commands are run with: --git-dir={dot_git_dir} --work-tree={work_tree_temp} - // git clone --no-checkout --local {vcpkg_root} {dot_git_dir} - System::CmdLineBuilder clone_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree) - .string_arg("clone") - .string_arg("--no-checkout") - .string_arg("--local") - .string_arg("--no-hardlinks") - .path_arg(local_repo) - .path_arg(dot_git_dir); - const auto clone_output = System::cmd_execute_and_capture_output(clone_cmd_builder); - Checks::check_exit(VCPKG_LINE_INFO, - clone_output.exit_code == 0, - "Failed to clone temporary vcpkg instance.\n%s\n", - clone_output.output); - } - else - { - System::CmdLineBuilder fetch_cmd_builder = - git_cmd_builder(paths, dot_git_dir, work_tree).string_arg("fetch"); - const auto fetch_output = System::cmd_execute_and_capture_output(fetch_cmd_builder); - Checks::check_exit(VCPKG_LINE_INFO, - fetch_output.exit_code == 0, - "Failed to update refs on temporary vcpkg repository.\n%s\n", - fetch_output.output); - } - - if (!fs.exists(work_tree)) - { - fs.create_directories(work_tree, VCPKG_LINE_INFO); - } - - // git checkout {tree_object} . - System::CmdLineBuilder checkout_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree) - .string_arg("checkout") - .string_arg(git_object) - .string_arg("."); - const auto checkout_output = System::cmd_execute_and_capture_output(checkout_cmd_builder); - Checks::check_exit(VCPKG_LINE_INFO, checkout_output.exit_code == 0, "Failed to checkout %s", git_object); - - const auto& containing_folder = destination.parent_path(); - if (!fs.exists(containing_folder)) - { - fs.create_directories(containing_folder, VCPKG_LINE_INFO); - } - - std::error_code ec; - fs.rename_or_copy(work_tree, destination, ".tmp", ec); - fs.remove_all(work_tree, VCPKG_LINE_INFO); - if (ec) - { - System::printf(System::Color::error, - "Error: Couldn't move checked out files from %s to destination %s", - fs::u8string(work_tree), - fs::u8string(destination)); - Checks::exit_fail(VCPKG_LINE_INFO); - } - } - - fs::path VcpkgPaths::git_checkout_baseline(Files::Filesystem& fs, StringView commit_sha) const + ExpectedS VcpkgPaths::git_checkout_baseline(StringView commit_sha) const { + Files::Filesystem& fs = get_filesystem(); const fs::path destination_parent = this->baselines_output / fs::u8path(commit_sha); - const fs::path destination = destination_parent / fs::u8path("baseline.json"); + fs::path destination = destination_parent / fs::u8path("baseline.json"); if (!fs.exists(destination)) { + const fs::path destination_tmp = destination_parent / fs::u8path("baseline.json.tmp"); auto treeish = Strings::concat(commit_sha, ":port_versions/baseline.json"); auto maybe_contents = git_show(treeish, this->root / fs::u8path(".git")); if (auto contents = maybe_contents.get()) { - fs.create_directories(destination_parent, VCPKG_LINE_INFO); - fs.write_contents(destination, *contents, VCPKG_LINE_INFO); + std::error_code ec; + fs.create_directories(destination_parent, ec); + if (ec) + { + return {Strings::format( + "Error: while checking out baseline %s\nError: while creating directories %s: %s", + commit_sha, + fs::u8string(destination_parent), + ec.message()), + expected_right_tag}; + } + fs.write_contents(destination_tmp, *contents, ec); + if (ec) + { + return {Strings::format("Error: while checking out baseline %s\nError: while writing %s: %s", + commit_sha, + fs::u8string(destination_tmp), + ec.message()), + expected_right_tag}; + } + fs.rename(destination_tmp, destination, ec); + if (ec) + { + return {Strings::format("Error: while checking out baseline %s\nError: while renaming %s to %s: %s", + commit_sha, + fs::u8string(destination_tmp), + fs::u8string(destination), + ec.message()), + expected_right_tag}; + } } else { - Checks::exit_with_message( - VCPKG_LINE_INFO, "Error: while checking out baseline '%s':\n%s", treeish, maybe_contents.error()); + return {Strings::format("Error: while checking out baseline '%s':\n%s\nThis may be fixed by updating " + "vcpkg to the latest master via `git pull`.", + treeish, + maybe_contents.error()), + expected_right_tag}; } } return destination; } - fs::path VcpkgPaths::git_checkout_port(Files::Filesystem& fs, StringView port_name, StringView git_tree) const + ExpectedS VcpkgPaths::git_checkout_port(StringView port_name, + StringView git_tree, + const fs::path& dot_git_dir) const { - /* Clone a new vcpkg repository instance using the local instance as base. - * - * The `--git-dir` directory will store all the Git metadata files, - * and the `--work-tree` is the directory where files will be checked out. + /* Check out a git tree into the versioned port recipes folder * * Since we are checking a git tree object, all files will be checked out to the root of `work-tree`. * Because of that, it makes sense to use the git hash as the name for the directory. */ - const fs::path& local_repo = this->root; - fs::path destination = this->versions_output / fs::u8path(git_tree) / fs::u8path(port_name); + Files::Filesystem& fs = get_filesystem(); + fs::path destination = this->versions_output / fs::u8path(port_name) / fs::u8path(git_tree); + if (fs.exists(destination)) + { + return destination; + } - if (!fs.exists(destination / "CONTROL") && !fs.exists(destination / "vcpkg.json")) + const fs::path destination_tmp = + this->versions_output / fs::u8path(port_name) / fs::u8path(Strings::concat(git_tree, ".tmp")); + const fs::path destination_tar = + this->versions_output / fs::u8path(port_name) / fs::u8path(Strings::concat(git_tree, ".tar")); +#define PRELUDE "Error: while checking out port ", port_name, " with git tree ", git_tree, "\n" + std::error_code ec; + fs::path failure_point; + fs.remove_all(destination_tmp, ec, failure_point); + if (ec) { - git_checkout_object( - *this, git_tree, local_repo, destination, this->versions_dot_git_dir, this->versions_work_tree); + return {Strings::concat(PRELUDE, "Error: while removing ", fs::u8string(failure_point), ": ", ec.message()), + expected_right_tag}; } + fs.create_directories(destination_tmp, ec); + if (ec) + { + return { + Strings::concat( + PRELUDE, "Error: while creating directories ", fs::u8string(destination_tmp), ": ", ec.message()), + expected_right_tag}; + } + + System::CmdLineBuilder tar_cmd_builder = git_cmd_builder(*this, dot_git_dir, dot_git_dir) + .string_arg("archive") + .string_arg(git_tree) + .string_arg("-o") + .path_arg(destination_tar); + const auto tar_output = System::cmd_execute_and_capture_output(tar_cmd_builder); + if (tar_output.exit_code != 0) + { + return {Strings::concat(PRELUDE, "Error: Failed to tar port directory\n", tar_output.output), + expected_right_tag}; + } + + System::CmdLineBuilder extract_cmd_builder; + extract_cmd_builder.path_arg(this->get_tool_exe(Tools::CMAKE)) + .string_arg("-E") + .string_arg("tar") + .string_arg("xf") + .path_arg(destination_tar); + + const auto extract_output = + System::cmd_execute_and_capture_output(extract_cmd_builder, System::InWorkingDirectory{destination_tmp}); + if (extract_output.exit_code != 0) + { + return {Strings::concat(PRELUDE, "Error: Failed to extract port directory\n", extract_output.output), + expected_right_tag}; + } + fs.remove(destination_tar, ec); + if (ec) + { + return { + Strings::concat(PRELUDE, "Error: while removing ", fs::u8string(destination_tar), ": ", ec.message()), + expected_right_tag}; + } + fs.rename(destination_tmp, destination, ec); + if (ec) + { + return {Strings::concat(PRELUDE, + "Error: while renaming ", + fs::u8string(destination_tmp), + " to ", + fs::u8string(destination), + ": ", + ec.message()), + expected_right_tag}; + } + return destination; +#undef PRELUDE } ExpectedS VcpkgPaths::git_fetch_from_remote_registry(StringView repo, StringView treeish) const @@ -757,7 +813,7 @@ If you wish to silence this error and use classic mode, you can: auto lock_file = work_tree / fs::u8path(".vcpkg-lock"); std::error_code ec; - auto guard = Files::ExclusiveFileLock(Files::ExclusiveFileLock::Wait::Yes, fs, lock_file, ec); + Files::ExclusiveFileLock guard(Files::ExclusiveFileLock::Wait::Yes, fs, lock_file, ec); System::CmdLineBuilder fetch_git_ref = git_cmd_builder(*this, dot_git_dir, work_tree).string_arg("fetch").string_arg("--").string_arg(repo); From 641a0dd56cb1a68188742d1d13afc55d608f5d0d Mon Sep 17 00:00:00 2001 From: Maxime GIMENO Date: Fri, 15 Jan 2021 22:12:42 +0100 Subject: [PATCH 0492/1694] [CGAL] Upgrade to 5.2 (#15047) * UPgrade to 5.2-beta1 * Upgrade to 5.2 * Merge from master Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- port_versions/baseline.json | 2 +- port_versions/c-/cgal.json | 5 +++++ ports/cgal/CONTROL | 2 +- ports/cgal/portfile.cmake | 6 +++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index d304104c5dd36d..0f246916c6b6fe 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -1117,7 +1117,7 @@ "port-version": 0 }, "cgal": { - "baseline": "5.1.1", + "baseline": "5.2", "port-version": 0 }, "cgicc": { diff --git a/port_versions/c-/cgal.json b/port_versions/c-/cgal.json index 0052d73fd88654..ed0be54bc31f4f 100644 --- a/port_versions/c-/cgal.json +++ b/port_versions/c-/cgal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1673f680f59b2c8c848a28c8e664b68b2ec182d7", + "version-string": "5.2", + "port-version": 0 + }, { "git-tree": "1618e4fdb8df228e557d622d97e766059e02a97a", "version-string": "5.1.1", diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index 07a07942aec238..ee652aea0a4e36 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,5 +1,5 @@ Source: cgal -Version: 5.1.1 +Version: 5.2 Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-ptr-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision, boost-interval Homepage: https://github.com/CGAL/cgal 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. diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 300b2a3d3f9fd4..8e306608e1f532 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF v5.1.1 - SHA512 e1a56332269d1386afb6ffea51193800235292094ba160f138532246f6c2232ef104df319b4e8b0540953cb682a6687426b8b108a330604cbfcb6c119b01d97a + REF v5.2 + SHA512 09f46c531365697968a9d9521eb9f3b5af5da9971be7fa86db990199f046c5a16dec821ca8a8ce1a2619b3ec44634e7426e39e997e8df783aa13552bc3d86064 HEAD_REF master ) @@ -48,7 +48,7 @@ file(INSTALL ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_ file( COPY ${SOURCE_PATH}/Installation/LICENSE.BSL - ${SOURCE_PATH}/Installation/LICENSE.FREE_USE + ${SOURCE_PATH}/Installation/LICENSE.RFL ${SOURCE_PATH}/Installation/LICENSE.GPL ${SOURCE_PATH}/Installation/LICENSE.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} From 1f1693c4fea81cfbb0c0ce6170d63672d4b5eea4 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Fri, 15 Jan 2021 13:54:39 -0800 Subject: [PATCH 0493/1694] [vcpkg] Remove versions feature flag check in all places except inputs (#15676) --- toolsrc/src/vcpkg/install.cpp | 108 +++++++++++++--------------------- 1 file changed, 40 insertions(+), 68 deletions(-) diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index e86a78a764b464..cf50d6a8460f88 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -846,82 +846,54 @@ namespace vcpkg::Install features.erase(core_it); } - if (args.versions_enabled() || args.registries_enabled()) + if (!manifest_scf.core_paragraph->overrides.empty()) { - if (!manifest_scf.core_paragraph->overrides.empty()) - { - Metrics::g_metrics.lock()->track_property("manifest_overrides", "defined"); - } - if (auto p_baseline = manifest_scf.core_paragraph->builtin_baseline.get()) - { - Metrics::g_metrics.lock()->track_property("manifest_baseline", "defined"); - if (p_baseline->size() != 40 || !std::all_of(p_baseline->begin(), p_baseline->end(), [](char ch) { - return (ch >= 'a' || ch <= 'f') || Parse::ParserBase::is_ascii_digit(ch); - })) - { - Checks::exit_with_message( - VCPKG_LINE_INFO, - "Error: the top-level builtin-baseline (%s) was not a valid commit sha: " - "expected 40 lowercase hexadecimal characters.\n%s\n", - *p_baseline, - paths.get_current_git_sha_message()); - } - paths.get_configuration().registry_set.experimental_set_builtin_registry_baseline(*p_baseline); - } + Metrics::g_metrics.lock()->track_property("manifest_overrides", "defined"); } - if (args.versions_enabled()) + if (auto p_baseline = manifest_scf.core_paragraph->builtin_baseline.get()) { - auto verprovider = PortFileProvider::make_versioned_portfile_provider(paths); - auto baseprovider = PortFileProvider::make_baseline_provider(paths); - auto oprovider = PortFileProvider::make_overlay_provider(paths, args.overlay_ports); - - auto install_plan = - Dependencies::create_versioned_install_plan(*verprovider, - *baseprovider, - *oprovider, - var_provider, - manifest_scf.core_paragraph->dependencies, - manifest_scf.core_paragraph->overrides, - {manifest_scf.core_paragraph->name, default_triplet}) - .value_or_exit(VCPKG_LINE_INFO); - - for (InstallPlanAction& action : install_plan.install_actions) + Metrics::g_metrics.lock()->track_property("manifest_baseline", "defined"); + if (p_baseline->size() != 40 || !std::all_of(p_baseline->begin(), p_baseline->end(), [](char ch) { + return (ch >= 'a' || ch <= 'f') || Parse::ParserBase::is_ascii_digit(ch); + })) { - action.build_options = install_plan_options; - action.build_options.use_head_version = Build::UseHeadVersion::NO; - action.build_options.editable = Build::Editable::NO; + Checks::exit_with_message(VCPKG_LINE_INFO, + "Error: the top-level builtin-baseline (%s) was not a valid commit sha: " + "expected 40 lowercase hexadecimal characters.\n%s\n", + *p_baseline, + paths.get_current_git_sha_message()); } - - Commands::SetInstalled::perform_and_exit_ex(args, - paths, - provider, - *binaryprovider, - var_provider, - std::move(install_plan), - dry_run ? Commands::DryRun::Yes : Commands::DryRun::No, - pkgsconfig); + paths.get_configuration().registry_set.experimental_set_builtin_registry_baseline(*p_baseline); } - else - { - auto specs = resolve_deps_as_top_level(manifest_scf, default_triplet, features, var_provider); - auto install_plan = Dependencies::create_feature_install_plan(provider, var_provider, specs, {}); - - for (InstallPlanAction& action : install_plan.install_actions) - { - action.build_options = install_plan_options; - action.build_options.use_head_version = Build::UseHeadVersion::NO; - action.build_options.editable = Build::Editable::NO; - } - - Commands::SetInstalled::perform_and_exit_ex(args, - paths, - provider, - *binaryprovider, + auto verprovider = PortFileProvider::make_versioned_portfile_provider(paths); + auto baseprovider = PortFileProvider::make_baseline_provider(paths); + auto oprovider = PortFileProvider::make_overlay_provider(paths, args.overlay_ports); + + auto install_plan = + Dependencies::create_versioned_install_plan(*verprovider, + *baseprovider, + *oprovider, var_provider, - std::move(install_plan), - dry_run ? Commands::DryRun::Yes : Commands::DryRun::No, - pkgsconfig); + manifest_scf.core_paragraph->dependencies, + manifest_scf.core_paragraph->overrides, + {manifest_scf.core_paragraph->name, default_triplet}) + .value_or_exit(VCPKG_LINE_INFO); + + for (InstallPlanAction& action : install_plan.install_actions) + { + action.build_options = install_plan_options; + action.build_options.use_head_version = Build::UseHeadVersion::NO; + action.build_options.editable = Build::Editable::NO; } + + Commands::SetInstalled::perform_and_exit_ex(args, + paths, + provider, + *binaryprovider, + var_provider, + std::move(install_plan), + dry_run ? Commands::DryRun::Yes : Commands::DryRun::No, + pkgsconfig); } const std::vector specs = Util::fmap(args.command_arguments, [&](auto&& arg) { From 45d0a39a5091b9ac85669f58362b286188c734bf Mon Sep 17 00:00:00 2001 From: Twice Date: Sat, 16 Jan 2021 07:20:45 +0800 Subject: [PATCH 0494/1694] [gtest] Add a patch to fix build error in GCC 11 (#15661) * [gtest] Add a patch to fix build error in GCC 11 * [gtest] Bump port version to 3 * [gtest] Update version files --- port_versions/baseline.json | 2 +- port_versions/g-/gtest.json | 5 +++++ ports/gtest/CONTROL | 2 +- ports/gtest/fix-build-failure-in-gcc-11.patch | 22 +++++++++++++++++++ ports/gtest/portfile.cmake | 1 + 5 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 ports/gtest/fix-build-failure-in-gcc-11.patch diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 0f246916c6b6fe..c4e06c2fef4f4d 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -2270,7 +2270,7 @@ }, "gtest": { "baseline": "1.10.0", - "port-version": 2 + "port-version": 3 }, "gtk": { "baseline": "3.22.19-4", diff --git a/port_versions/g-/gtest.json b/port_versions/g-/gtest.json index 4497553b1a09b2..7cc621d82a1e5a 100644 --- a/port_versions/g-/gtest.json +++ b/port_versions/g-/gtest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e94f8c09a8fa6ed7fc618734d412878d83069bfb", + "version-string": "1.10.0", + "port-version": 3 + }, { "git-tree": "88de073e86bcae80206fca0ff4f4f8e6c165f43a", "version-string": "1.10.0", diff --git a/ports/gtest/CONTROL b/ports/gtest/CONTROL index 724569341ca899..c483eda237cd41 100644 --- a/ports/gtest/CONTROL +++ b/ports/gtest/CONTROL @@ -1,5 +1,5 @@ Source: gtest Version: 1.10.0 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/google/googletest Description: GoogleTest and GoogleMock testing frameworks. diff --git a/ports/gtest/fix-build-failure-in-gcc-11.patch b/ports/gtest/fix-build-failure-in-gcc-11.patch new file mode 100644 index 00000000000000..b0369892e9fc6d --- /dev/null +++ b/ports/gtest/fix-build-failure-in-gcc-11.patch @@ -0,0 +1,22 @@ +diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc +index da09a1cf..43cbd78a 100644 +--- a/googletest/src/gtest-death-test.cc ++++ b/googletest/src/gtest-death-test.cc +@@ -1288,7 +1288,7 @@ static void StackLowerThanAddress(const void* ptr, + // making comparison result unpredictable. + GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_ + static void StackLowerThanAddress(const void* ptr, bool* result) { +- int dummy; ++ int dummy = 0; + *result = (&dummy < ptr); + } + +@@ -1296,7 +1296,7 @@ static void StackLowerThanAddress(const void* ptr, bool* result) { + GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ + GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_ + static bool StackGrowsDown() { +- int dummy; ++ int dummy = 0; + bool result; + StackLowerThanAddress(&dummy, &result); + return result; diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index 30e9dfb20f146b..4cb45954e291c0 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( PATCHES 0002-Fix-z7-override.patch fix-main-lib-path.patch + fix-build-failure-in-gcc-11.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT) From 60384c2224fc01a90bf74aea53022399a4cc1930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 15 Jan 2021 15:22:01 -0800 Subject: [PATCH 0495/1694] [qt5] Remove dependency qt5 feature mysqlplugin when building x86 (#15597) * [qt5] Remove dependency qt5 feature mysqlplugin * Update ports/qt5/CONTROL * Update ports/qt5/CONTROL * [qt5] update baseline --- port_versions/baseline.json | 2 +- port_versions/q-/qt5.json | 5 +++++ ports/qt5/CONTROL | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index c4e06c2fef4f4d..0d7dc02a5e6e17 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4702,7 +4702,7 @@ }, "qt5": { "baseline": "5.15.1", - "port-version": 1 + "port-version": 2 }, "qt5-3d": { "baseline": "5.15.1", diff --git a/port_versions/q-/qt5.json b/port_versions/q-/qt5.json index a9699009b94dbc..4b97cb92d8aecf 100644 --- a/port_versions/q-/qt5.json +++ b/port_versions/q-/qt5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c44bc778ae3e400ff6f777d6f6bb68c24a81fed", + "version-string": "5.15.1", + "port-version": 2 + }, { "git-tree": "800137391209a8e9acbff74fb129f05192e159a8", "version-string": "5.15.1", diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index b881ffd1767dc9..aa4a394a0a2237 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,9 +1,9 @@ Source: qt5 Version: 5.15.1 -Port-Version: 1 +Port-Version: 2 Homepage: https://www.qt.io/ Description: Qt5 Application Framework -Build-Depends: qt5-base[core,mysqlplugin] +Build-Depends: qt5-base[core] Default-Features: essentials Feature: essentials From 3976d021a4810b8ae6a5abfed575dc066228444a Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Fri, 15 Jan 2021 15:24:06 -0800 Subject: [PATCH 0496/1694] =?UTF-8?q?directxtex,=20directxmesh,=20directxt?= =?UTF-8?q?k,=20uvatlas=20ports=20updated=20to=20fix=20cach=E2=80=A6=20(#1?= =?UTF-8?q?5639)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * directxtex, directxmesh, directxtk, uvatlas ports updated to fix cache-collision issues * Updated ports to jan2021b * update baseline Co-authored-by: JackBoosY --- port_versions/baseline.json | 10 +++++----- port_versions/d-/directxmesh.json | 5 +++++ port_versions/d-/directxtex.json | 5 +++++ port_versions/d-/directxtk.json | 5 +++++ port_versions/d-/directxtk12.json | 5 +++++ port_versions/u-/uvatlas.json | 5 +++++ ports/directxmesh/CONTROL | 2 +- ports/directxmesh/portfile.cmake | 13 ++++++++----- ports/directxtex/CONTROL | 2 +- ports/directxtex/portfile.cmake | 30 ++++++++++++++++++------------ ports/directxtk/CONTROL | 2 +- ports/directxtk/portfile.cmake | 21 +++++++++++++-------- ports/directxtk12/CONTROL | 2 +- ports/directxtk12/portfile.cmake | 21 +++++++++++++-------- ports/uvatlas/CONTROL | 2 +- ports/uvatlas/portfile.cmake | 13 ++++++++----- 16 files changed, 95 insertions(+), 48 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 0d7dc02a5e6e17..9d7d99eb3a3377 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -1585,7 +1585,7 @@ "port-version": 0 }, "directxmesh": { - "baseline": "jan2021", + "baseline": "jan2021b", "port-version": 0 }, "directxsdk": { @@ -1593,15 +1593,15 @@ "port-version": 0 }, "directxtex": { - "baseline": "jan2021", + "baseline": "jan2021b", "port-version": 0 }, "directxtk": { - "baseline": "jan2021", + "baseline": "jan2021b", "port-version": 0 }, "directxtk12": { - "baseline": "jan2021", + "baseline": "jan2021b", "port-version": 0 }, "dirent": { @@ -5941,7 +5941,7 @@ "port-version": 0 }, "uvatlas": { - "baseline": "jan2021", + "baseline": "jan2021b", "port-version": 0 }, "uvw": { diff --git a/port_versions/d-/directxmesh.json b/port_versions/d-/directxmesh.json index c8725cb7042b58..81ec782609ac45 100644 --- a/port_versions/d-/directxmesh.json +++ b/port_versions/d-/directxmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d476e8f15e28c928fc9de9898951a9eeeb5b2ae", + "version-string": "jan2021b", + "port-version": 0 + }, { "git-tree": "05b2c430ee01c88129da70cf887321d662be4e35", "version-string": "jan2021", diff --git a/port_versions/d-/directxtex.json b/port_versions/d-/directxtex.json index 70548d6f7b247f..07195843cf186c 100644 --- a/port_versions/d-/directxtex.json +++ b/port_versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ddb9174d08513e8ad6a9ffc4cedc024fc1b6f68d", + "version-string": "jan2021b", + "port-version": 0 + }, { "git-tree": "8bd2114b5c801b2dd0119df1cdf292c706e6c710", "version-string": "jan2021", diff --git a/port_versions/d-/directxtk.json b/port_versions/d-/directxtk.json index c6060bf3d4b733..314211fc1c335b 100644 --- a/port_versions/d-/directxtk.json +++ b/port_versions/d-/directxtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d27a700ccc7ce75a1f7d79665795a042d6bd5df5", + "version-string": "jan2021b", + "port-version": 0 + }, { "git-tree": "ec32976b82af8176471254162dd09194e254f7b2", "version-string": "jan2021", diff --git a/port_versions/d-/directxtk12.json b/port_versions/d-/directxtk12.json index d19fd9689d263d..ce15f05f07c866 100644 --- a/port_versions/d-/directxtk12.json +++ b/port_versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f5b3546a9e14c89e73ebe317d01c00833f6345f", + "version-string": "jan2021b", + "port-version": 0 + }, { "git-tree": "33e0b497c7aed981580b9e651a57f202fa8cc2bc", "version-string": "jan2021", diff --git a/port_versions/u-/uvatlas.json b/port_versions/u-/uvatlas.json index 65fab78a5d5c21..1e8f87686b09e5 100644 --- a/port_versions/u-/uvatlas.json +++ b/port_versions/u-/uvatlas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ec0056d64ec3888a78610302a348cb5bf65cd78", + "version-string": "jan2021b", + "port-version": 0 + }, { "git-tree": "59eed2711b70ec9a4dfd37c851d7a7810ea83b3e", "version-string": "jan2021", diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL index dd19d931aced38..9acc00503d656a 100644 --- a/ports/directxmesh/CONTROL +++ b/ports/directxmesh/CONTROL @@ -1,5 +1,5 @@ Source: directxmesh -Version: jan2021 +Version: jan2021b Homepage: https://walbourn.github.io/directxmesh Description: DirectXMesh geometry processing library Build-Depends: directxmath(linux), directx-headers(linux) diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 9c7d27a70c1f4c..f88841682c826e 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF jan2021 - SHA512 2e3950571703e48de083900e5f4ff94a6f882071969e48dd200ecbf7d8357f3131f647ba6ad97e7dcdbd3e051edad99521661738e7af73ca6f89e8715cd29f9c + REF jan2021b + SHA512 dab353d5033c32cf5667b95820cf3048e4773fa3fed16d24b25a515fbf4b6f6792ab5955dc9bb790c911b4cae1af1166aa0fdc4f5a639b3f4c3c81a2451a9a40 HEAD_REF master ) @@ -42,17 +42,20 @@ if((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) ) elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) - vcpkg_download_distfile(meshconvert + vcpkg_download_distfile( + MESHCONVERT_EXE URLS "https://github.com/Microsoft/DirectXMesh/releases/download/jan2021/meshconvert.exe" - FILENAME "meshconvert.exe" + FILENAME "meshconvert-jan2021.exe" SHA512 7df51baa495859aab418d194fd885cf37945ec2927122c18718b3a1a7d7ceb08c6853d084d74bf2bf2bc9ace47a351fd6b8d03706507f4966111ec1cb83f43a2 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/") file(INSTALL - ${DOWNLOADS}/meshconvert.exe + ${MESHCONVERT_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/) + + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL index e2611ffd5d4021..45a107c97552ce 100644 --- a/ports/directxtex/CONTROL +++ b/ports/directxtex/CONTROL @@ -1,5 +1,5 @@ Source: directxtex -Version: jan2021 +Version: jan2021b Homepage: https://walbourn.github.io/directxtex Description: DirectXTex texture processing library Build-Depends: directxmath(linux), directx-headers(linux) diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 9df396562f19e8..c3b0ebbd0aafad 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -5,10 +5,9 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF jan2021 - SHA512 f48f05aea811b2ce04f7e82837ed8da9cd3452d0f582d933dbd8878acdc94d8dfb123fa85f5d483a9cd688d3a129d765514069c6c83c58eb1880f6e5661d61e8 + REF jan2021b + SHA512 bd327d0629bbae199f1b3fd80c0470b15edf221f204a4958b4e47b2b1a155b5c0e0af1cc1c39229d582363798f82efa91a3f63ec118fdb0e9255098a576b98ef HEAD_REF master - FILE_DISAMBIGUATOR 1 ) if("openexr" IN_LIST FEATURES) @@ -69,31 +68,38 @@ if((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) ) elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) - vcpkg_download_distfile(texassemble + vcpkg_download_distfile( + TEXASSEMBLE_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/jan2021/texassemble.exe" - FILENAME "texassemble.exe" + FILENAME "texassemble-jan2021.exe" SHA512 0def8873358234ea4cd16acd59cb1dda2a8ad132f362502d643caed43e9aef19f9c7e7248494093cbd61e7501a9b44f545d3fbd5f50972ebcee3d01598a7c3b7 ) - vcpkg_download_distfile(texconv + vcpkg_download_distfile( + TEXCONV_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/jan2021/texconv.exe" - FILENAME "texconv.exe" + FILENAME "texconv-jan2021.exe" SHA512 77559db65406ad0343901ff22f7647c4f270674f7b0c31b12d8dc26c718f410708ebe95bdc0ddba4049fa6cefd52ff856174530fc4170f9e725b30aacb78249c ) - vcpkg_download_distfile(texdiag + vcpkg_download_distfile( + TEXDIAG_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/jan2021/texdiag.exe" - FILENAME "texdiag.exe" + FILENAME "texdiag-jan2021.exe" SHA512 1b9e733050b5f92af86a9a2f415205acbff62f0708e491a3846d7b6e480a9c57086eff636be163d42a40a6d34dafc622cc53940797e7f6f77e739f3a66365f57 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/") file(INSTALL - ${DOWNLOADS}/texassemble.exe - ${DOWNLOADS}/texconv.exe - ${DOWNLOADS}/texdiag.exe + ${TEXASSEMBLE_EXE} + ${TEXCONV_EXE} + ${TEXDIAG_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtex/) + + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL index 21b673e6ac65db..7224fef51e56f4 100644 --- a/ports/directxtk/CONTROL +++ b/ports/directxtk/CONTROL @@ -1,5 +1,5 @@ Source: directxtk -Version: jan2021 +Version: jan2021b Homepage: https://walbourn.github.io/directxtk Description: A collection of helper classes for writing DirectX 11.x code in C++. Supports: windows diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index b9f1944b72b5d4..f5541789bb0b9f 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF jan2021 - SHA512 c0e8df3ef3a276169c219798978eb948947ba63f49fd08be914eee87ed4bb05a4e33e3a4d1c06c4e932f5ad8fa50a14e0b53a9b9f6f749aa15174f343a17555c + REF jan2021b + SHA512 87cac6f3ea9e16b5b2d195fd363d5da45d99a08b4bb7be8261a7347ec0e316604acc130129cabc24d635be77ec2487341eca1c5f46238d3ce27fbde1a2e817d1 HEAD_REF master ) @@ -45,24 +45,29 @@ if(NOT VCPKG_TARGET_IS_UWP) ) elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) - vcpkg_download_distfile(makespritefont + vcpkg_download_distfile( + MAKESPRITEFONT_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/jan2021/MakeSpriteFont.exe" - FILENAME "makespritefont.exe" + FILENAME "makespritefont-jan2021.exe" SHA512 0cca19694fd3625c5130a85456f7bf1dabc8c5f893223c19da134a0c4d64de853f7871644365dcec86012543f3a59a96bfabd9e51947648f6d82480602116fc4 ) - vcpkg_download_distfile(xwbtool + vcpkg_download_distfile( + XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/jan2021/XWBTool.exe" - FILENAME "xwbtool.exe" + FILENAME "xwbtool-jan2021.exe" SHA512 91c9d0da90697ba3e0ebe4afcc4c8e084045b76b26e94d7acd4fd87e5965b52dd61d26038f5eb749a3f6de07940bf6e3af8e9f19d820bf904fbdb2752b78fce9 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") file(INSTALL - ${DOWNLOADS}/makespritefont.exe - ${DOWNLOADS}/xwbtool.exe + ${MAKESPRITEFONT_EXE} + ${XWBTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk/) + + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL index fd7e367a349838..73b28d2c264f48 100644 --- a/ports/directxtk12/CONTROL +++ b/ports/directxtk12/CONTROL @@ -1,5 +1,5 @@ Source: directxtk12 -Version: jan2021 +Version: jan2021b Homepage: https://walbourn.github.io/directx-tool-kit-for-directx-12 Description: A collection of helper classes for writing DirectX 12 code in C++. Supports: windows diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 99fcea0e86ebef..ac32f2bce088d8 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF jan2021 - SHA512 a6938194bc8857fe0076cb21f000aaa4ab4e207342e07f76ecea9d3f064c1b0c220a5f410c2e1184f37d98b54ef2f4852a6bc7cb13a029885bd3c39cb3f1a727 + REF jan2021b + SHA512 19e017f11fb6cd25a10fbf2597d1a0fe133a339781f5b1b333eb52224fcf5869c5e5bb5a3f3a2f57ffad527076e6780cccccfbae09c48abfce3010be688b87b5 HEAD_REF master ) @@ -20,24 +20,29 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) - vcpkg_download_distfile(makespritefont + vcpkg_download_distfile( + MAKESPRITEFONT_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jan2021/MakeSpriteFont.exe" - FILENAME "makespritefont.exe" + FILENAME "makespritefont-jan2021.exe" SHA512 0cca19694fd3625c5130a85456f7bf1dabc8c5f893223c19da134a0c4d64de853f7871644365dcec86012543f3a59a96bfabd9e51947648f6d82480602116fc4 ) - vcpkg_download_distfile(xwbtool + vcpkg_download_distfile( + XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jan2021/XWBTool.exe" - FILENAME "xwbtool.exe" + FILENAME "xwbtool-jan2021.exe" SHA512 91c9d0da90697ba3e0ebe4afcc4c8e084045b76b26e94d7acd4fd87e5965b52dd61d26038f5eb749a3f6de07940bf6e3af8e9f19d820bf904fbdb2752b78fce9 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") file(INSTALL - ${DOWNLOADS}/makespritefont.exe - ${DOWNLOADS}/xwbtool.exe + ${MAKESPRITEFONT_EXE} + ${XWBTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk12/) + + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/uvatlas/CONTROL b/ports/uvatlas/CONTROL index a65d710e2f13f5..938b93f7c2e59e 100644 --- a/ports/uvatlas/CONTROL +++ b/ports/uvatlas/CONTROL @@ -1,5 +1,5 @@ Source: uvatlas -Version: jan2021 +Version: jan2021b Homepage: https://github.com/Microsoft/UVAtlas Description: UVAtlas isochart texture atlas Build-Depends: directxmesh(!(uwp|linux)), directxtex(!(uwp|linux)), directxmath(linux), directx-headers(linux) diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index 14f7a5eed3a2a6..42f5043ab7ce76 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF jan2021 - SHA512 a0248f31626a0835c9aaf7ed9cabfc5771e34257b8e8e4a3139dca69d7242d79fbb7883071379cd9202edecef3a518d6cf9e7ef9b0338afd384bf2c9830878d3 + REF jan2021b + SHA512 6ed43dbe4ea33857ed96a2c05a4618ae935eb9bc0778118af6c791f794c2ad843fe1b52a2aa484914f8aaf3534a282ab80af95350eab2c340bb6b401dc9743b0 HEAD_REF master ) @@ -36,17 +36,20 @@ if((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) ) elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) - vcpkg_download_distfile(uvatlastool + vcpkg_download_distfile( + UVATLASTOOL_EXE URLS "https://github.com/Microsoft/UVAtlas/releases/download/jan2021/uvatlastool.exe" - FILENAME "uvatlastool.exe" + FILENAME "uvatlastool-jan2021.exe" SHA512 8727510f3ec41c2fa7ed75100b8c0f4daa41e93a1b812e5ec3c265dc87c3f48651da37a18af5d8b57a0aa096c42232b58a50a00c036ec7c04dcae4767a2691f9 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/") file(INSTALL - ${DOWNLOADS}/uvatlastool.exe + ${UVATLASTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/) + + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") From e7e2d11538db5ac6346059acac06d50f5398160c Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Fri, 15 Jan 2021 18:32:04 -0800 Subject: [PATCH 0497/1694] [vcpkg] Rewriting CmdLineBuilder/Command (3/n) (#15673) Rename CmdLineBuilder to Command, since it's no longer a builder but an actual data type --- toolsrc/include/vcpkg/base/system.process.h | 60 +++++++------- toolsrc/include/vcpkg/build.h | 4 +- toolsrc/include/vcpkg/buildenvironment.h | 6 +- toolsrc/src/vcpkg-test/system.cpp | 4 +- toolsrc/src/vcpkg/archives.cpp | 8 +- toolsrc/src/vcpkg/base/downloads.cpp | 8 +- toolsrc/src/vcpkg/base/system.process.cpp | 28 +++---- toolsrc/src/vcpkg/binarycaching.cpp | 26 +++---- toolsrc/src/vcpkg/build.cpp | 4 +- toolsrc/src/vcpkg/buildenvironment.cpp | 6 +- toolsrc/src/vcpkg/commands.contact.cpp | 2 +- toolsrc/src/vcpkg/commands.edit.cpp | 10 +-- toolsrc/src/vcpkg/commands.env.cpp | 2 +- toolsrc/src/vcpkg/commands.integrate.cpp | 4 +- toolsrc/src/vcpkg/commands.porthistory.cpp | 14 ++-- toolsrc/src/vcpkg/commands.portsdiff.cpp | 6 +- toolsrc/src/vcpkg/export.chocolatey.cpp | 2 +- toolsrc/src/vcpkg/export.cpp | 4 +- toolsrc/src/vcpkg/export.ifw.cpp | 12 ++- toolsrc/src/vcpkg/export.prefab.cpp | 12 ++- toolsrc/src/vcpkg/metrics.cpp | 10 +-- toolsrc/src/vcpkg/postbuildlint.cpp | 8 +- toolsrc/src/vcpkg/tools.cpp | 16 ++-- toolsrc/src/vcpkg/vcpkgpaths.cpp | 86 ++++++++++----------- toolsrc/src/vcpkg/visualstudio.cpp | 2 +- 25 files changed, 165 insertions(+), 179 deletions(-) diff --git a/toolsrc/include/vcpkg/base/system.process.h b/toolsrc/include/vcpkg/base/system.process.h index 68d4da4e4b504b..5b6f8cd55892fd 100644 --- a/toolsrc/include/vcpkg/base/system.process.h +++ b/toolsrc/include/vcpkg/base/system.process.h @@ -20,26 +20,26 @@ namespace vcpkg::System std::string s; }; - struct CmdLineBuilder + struct Command { - CmdLineBuilder() = default; - explicit CmdLineBuilder(const fs::path& p) { path_arg(p); } - explicit CmdLineBuilder(StringView s) { string_arg(s); } - explicit CmdLineBuilder(const std::string& s) { string_arg(s); } - explicit CmdLineBuilder(const char* s) { string_arg({s, ::strlen(s)}); } - - CmdLineBuilder& path_arg(const fs::path& p) & { return string_arg(fs::u8string(p)); } - CmdLineBuilder& string_arg(StringView s) &; - CmdLineBuilder& raw_arg(StringView s) & + Command() = default; + explicit Command(const fs::path& p) { path_arg(p); } + explicit Command(StringView s) { string_arg(s); } + explicit Command(const std::string& s) { string_arg(s); } + explicit Command(const char* s) { string_arg({s, ::strlen(s)}); } + + Command& path_arg(const fs::path& p) & { return string_arg(fs::u8string(p)); } + Command& string_arg(StringView s) &; + Command& raw_arg(StringView s) & { buf.push_back(' '); buf.append(s.data(), s.size()); return *this; } - CmdLineBuilder&& path_arg(const fs::path& p) && { return std::move(path_arg(p)); } - CmdLineBuilder&& string_arg(StringView s) && { return std::move(string_arg(s)); }; - CmdLineBuilder&& raw_arg(StringView s) && { return std::move(raw_arg(s)); } + Command&& path_arg(const fs::path& p) && { return std::move(path_arg(p)); } + Command&& string_arg(StringView s) && { return std::move(string_arg(s)); }; + Command&& raw_arg(StringView s) && { return std::move(raw_arg(s)); } std::string&& extract() && { return std::move(buf); } StringView command_line() const { return buf; } @@ -51,17 +51,17 @@ namespace vcpkg::System std::string buf; }; - struct CmdLineBuilderMapLess + struct CommandLess { - bool operator()(const CmdLineBuilder& lhs, const CmdLineBuilder& rhs) const + bool operator()(const Command& lhs, const Command& rhs) const { return lhs.command_line() < rhs.command_line(); } }; - CmdLineBuilder make_basic_cmake_cmd(const fs::path& cmake_tool_path, - const fs::path& cmake_script, - const std::vector& pass_variables); + Command make_basic_cmake_cmd(const fs::path& cmake_tool_path, + const fs::path& cmake_script, + const std::vector& pass_variables); fs::path get_exe_path_of_current_process(); @@ -87,48 +87,48 @@ namespace vcpkg::System const fs::path& working_directory; }; - int cmd_execute(const CmdLineBuilder& cmd_line, InWorkingDirectory wd, const Environment& env = {}); - inline int cmd_execute(const CmdLineBuilder& cmd_line, const Environment& env = {}) + int cmd_execute(const Command& cmd_line, InWorkingDirectory wd, const Environment& env = {}); + inline int cmd_execute(const Command& cmd_line, const Environment& env = {}) { return cmd_execute(cmd_line, InWorkingDirectory{fs::path()}, env); } - int cmd_execute_clean(const CmdLineBuilder& cmd_line, InWorkingDirectory wd); - inline int cmd_execute_clean(const CmdLineBuilder& cmd_line) + int cmd_execute_clean(const Command& cmd_line, InWorkingDirectory wd); + inline int cmd_execute_clean(const Command& cmd_line) { return cmd_execute_clean(cmd_line, InWorkingDirectory{fs::path()}); } #if defined(_WIN32) - Environment cmd_execute_modify_env(const CmdLineBuilder& cmd_line, const Environment& env = {}); + Environment cmd_execute_modify_env(const Command& cmd_line, const Environment& env = {}); - void cmd_execute_background(const CmdLineBuilder& cmd_line); + void cmd_execute_background(const Command& cmd_line); #endif - ExitCodeAndOutput cmd_execute_and_capture_output(const CmdLineBuilder& cmd_line, + ExitCodeAndOutput cmd_execute_and_capture_output(const Command& cmd_line, InWorkingDirectory wd, const Environment& env = {}); - inline ExitCodeAndOutput cmd_execute_and_capture_output(const CmdLineBuilder& cmd_line, const Environment& env = {}) + inline ExitCodeAndOutput cmd_execute_and_capture_output(const Command& cmd_line, const Environment& env = {}) { return cmd_execute_and_capture_output(cmd_line, InWorkingDirectory{fs::path()}, env); } - int cmd_execute_and_stream_lines(const CmdLineBuilder& cmd_line, + int cmd_execute_and_stream_lines(const Command& cmd_line, InWorkingDirectory wd, std::function per_line_cb, const Environment& env = {}); - inline int cmd_execute_and_stream_lines(const CmdLineBuilder& cmd_line, + inline int cmd_execute_and_stream_lines(const Command& cmd_line, std::function per_line_cb, const Environment& env = {}) { return cmd_execute_and_stream_lines(cmd_line, InWorkingDirectory{fs::path()}, std::move(per_line_cb), env); } - int cmd_execute_and_stream_data(const CmdLineBuilder& cmd_line, + int cmd_execute_and_stream_data(const Command& cmd_line, InWorkingDirectory wd, std::function data_cb, const Environment& env = {}); - inline int cmd_execute_and_stream_data(const CmdLineBuilder& cmd_line, + inline int cmd_execute_and_stream_data(const Command& cmd_line, std::function data_cb, const Environment& env = {}) { diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index 0659eedcd12661..e873f0ea272ca6 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -232,7 +232,7 @@ namespace vcpkg::Build const VcpkgPaths& m_paths; }; - System::CmdLineBuilder make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset); + System::Command make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset); struct ExtendedBuildResult { @@ -369,7 +369,7 @@ namespace vcpkg::Build struct EnvMapEntry { std::unordered_map env_map; - Cache cmd_cache; + Cache cmd_cache; }; Cache, EnvMapEntry> envs; diff --git a/toolsrc/include/vcpkg/buildenvironment.h b/toolsrc/include/vcpkg/buildenvironment.h index 54977232051458..b7ffb164f11a1d 100644 --- a/toolsrc/include/vcpkg/buildenvironment.h +++ b/toolsrc/include/vcpkg/buildenvironment.h @@ -9,7 +9,7 @@ namespace vcpkg { - System::CmdLineBuilder make_cmake_cmd(const VcpkgPaths& paths, - const fs::path& cmake_script, - std::vector&& pass_variables); + System::Command make_cmake_cmd(const VcpkgPaths& paths, + const fs::path& cmake_script, + std::vector&& pass_variables); } diff --git a/toolsrc/src/vcpkg-test/system.cpp b/toolsrc/src/vcpkg-test/system.cpp index 7ebc621f0e9242..4c8b533bcf690a 100644 --- a/toolsrc/src/vcpkg-test/system.cpp +++ b/toolsrc/src/vcpkg-test/system.cpp @@ -127,9 +127,9 @@ TEST_CASE ("guess_visual_studio_prompt", "[system]") TEST_CASE ("cmdlinebuilder", "[system]") { - using vcpkg::System::CmdLineBuilder; + using vcpkg::System::Command; - CmdLineBuilder cmd; + Command cmd; cmd.path_arg(fs::u8path("relative/path.exe")); cmd.string_arg("abc"); cmd.string_arg("hello world!"); diff --git a/toolsrc/src/vcpkg/archives.cpp b/toolsrc/src/vcpkg/archives.cpp index 25449cd63d5677..c0b743af43a9d4 100644 --- a/toolsrc/src/vcpkg/archives.cpp +++ b/toolsrc/src/vcpkg/archives.cpp @@ -44,7 +44,7 @@ namespace vcpkg::Archives const std::string nugetid = match[1]; const std::string version = match[2]; - const auto code_and_output = System::cmd_execute_and_capture_output(System::CmdLineBuilder{nuget_exe} + const auto code_and_output = System::cmd_execute_and_capture_output(System::Command{nuget_exe} .string_arg("install") .string_arg(nugetid) .string_arg("-Version") @@ -74,7 +74,7 @@ namespace vcpkg::Archives recursion_limiter_sevenzip = true; const auto seven_zip = paths.get_tool_exe(Tools::SEVEN_ZIP); const auto code_and_output = System::cmd_execute_and_capture_output( - System::CmdLineBuilder{seven_zip} + System::Command{seven_zip} .string_arg("x") .path_arg(archive) .string_arg(Strings::format("-o%s", fs::u8string(to_path_partial))) @@ -89,13 +89,13 @@ namespace vcpkg::Archives #else if (ext == ".gz" && ext.extension() != ".tar") { - const auto code = System::cmd_execute(System::CmdLineBuilder{"tar"}.string_arg("xzf").path_arg(archive), + const auto code = System::cmd_execute(System::Command{"tar"}.string_arg("xzf").path_arg(archive), System::InWorkingDirectory{to_path_partial}); Checks::check_exit(VCPKG_LINE_INFO, code == 0, "tar failed while extracting %s", fs::u8string(archive)); } else if (ext == ".zip") { - const auto code = System::cmd_execute(System::CmdLineBuilder{"unzip"}.string_arg("-qqo").path_arg(archive), + const auto code = System::cmd_execute(System::Command{"unzip"}.string_arg("-qqo").path_arg(archive), System::InWorkingDirectory{to_path_partial}); Checks::check_exit(VCPKG_LINE_INFO, code == 0, "unzip failed while extracting %s", fs::u8string(archive)); } diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp index e5b91f61cda0f9..ab4aeb49ffba1e 100644 --- a/toolsrc/src/vcpkg/base/downloads.cpp +++ b/toolsrc/src/vcpkg/base/downloads.cpp @@ -220,7 +220,7 @@ namespace vcpkg::Downloads { static constexpr StringLiteral guid_marker = "8a1db05f-a65d-419b-aa72-037fb4d0672e"; - System::CmdLineBuilder cmd; + System::Command cmd; cmd.string_arg("curl") .string_arg("--head") .string_arg("--location") @@ -260,7 +260,7 @@ namespace vcpkg::Downloads { static constexpr StringLiteral guid_marker = "8a1db05f-a65d-419b-aa72-037fb4d0672e"; - System::CmdLineBuilder cmd; + System::Command cmd; cmd.string_arg("curl") .string_arg("--location") .string_arg("-w") @@ -298,7 +298,7 @@ namespace vcpkg::Downloads { static constexpr StringLiteral guid_marker = "9a1db05f-a65d-419b-aa72-037fb4d0672e"; - System::CmdLineBuilder cmd; + System::Command cmd; cmd.string_arg("curl").string_arg("-X").string_arg("PUT"); cmd.string_arg("-w").string_arg(Strings::concat("\\n", guid_marker, "%{http_code}")); cmd.string_arg(url); @@ -443,7 +443,7 @@ namespace vcpkg::Downloads } } #endif - System::CmdLineBuilder cmd; + System::Command cmd; cmd.string_arg("curl") .string_arg("--fail") .string_arg("-L") diff --git a/toolsrc/src/vcpkg/base/system.process.cpp b/toolsrc/src/vcpkg/base/system.process.cpp index e4218b7162fa39..22726e42aceefc 100644 --- a/toolsrc/src/vcpkg/base/system.process.cpp +++ b/toolsrc/src/vcpkg/base/system.process.cpp @@ -184,11 +184,11 @@ namespace vcpkg } System::CMakeVariable::CMakeVariable(std::string var) : s(std::move(var)) { } - System::CmdLineBuilder System::make_basic_cmake_cmd(const fs::path& cmake_tool_path, - const fs::path& cmake_script, - const std::vector& pass_variables) + System::Command System::make_basic_cmake_cmd(const fs::path& cmake_tool_path, + const fs::path& cmake_script, + const std::vector& pass_variables) { - System::CmdLineBuilder cmd{cmake_tool_path}; + System::Command cmd{cmake_tool_path}; for (auto&& var : pass_variables) { cmd.string_arg(var.s); @@ -197,7 +197,7 @@ namespace vcpkg return cmd; } - System::CmdLineBuilder& System::CmdLineBuilder::string_arg(StringView s) & + System::Command& System::Command::string_arg(StringView s) & { if (!buf.empty()) buf.push_back(' '); if (Strings::find_first_of(s, " \t\n\r\"\\,;&`^|'") != s.end()) @@ -383,7 +383,7 @@ namespace vcpkg return clean_env; } - int System::cmd_execute_clean(const CmdLineBuilder& cmd_line, InWorkingDirectory wd) + int System::cmd_execute_clean(const Command& cmd_line, InWorkingDirectory wd) { return cmd_execute(cmd_line, wd, get_clean_environment()); } @@ -564,7 +564,7 @@ namespace vcpkg #endif #if defined(_WIN32) - void System::cmd_execute_background(const CmdLineBuilder& cmd_line) + void System::cmd_execute_background(const Command& cmd_line) { auto timer = Chrono::ElapsedTimer::create_started(); @@ -581,7 +581,7 @@ namespace vcpkg Debug::print("cmd_execute_background() took ", static_cast(timer.microseconds()), " us\n"); } - Environment System::cmd_execute_modify_env(const CmdLineBuilder& cmd_line, const Environment& env) + Environment System::cmd_execute_modify_env(const Command& cmd_line, const Environment& env) { static StringLiteral magic_string = "cdARN4xjKueKScMy9C6H"; @@ -623,7 +623,7 @@ namespace vcpkg } #endif - int System::cmd_execute(const CmdLineBuilder& cmd_line, System::InWorkingDirectory wd, const Environment& env) + int System::cmd_execute(const Command& cmd_line, System::InWorkingDirectory wd, const Environment& env) { auto timer = Chrono::ElapsedTimer::create_started(); #if defined(_WIN32) @@ -651,7 +651,7 @@ namespace vcpkg } else { - real_command_line = System::CmdLineBuilder("cd") + real_command_line = System::Command("cd") .path_arg(wd.working_directory) .raw_arg("&&") .raw_arg(cmd_line.command_line()) @@ -667,7 +667,7 @@ namespace vcpkg return exit_code; } - int System::cmd_execute_and_stream_lines(const CmdLineBuilder& cmd_line, + int System::cmd_execute_and_stream_lines(const Command& cmd_line, System::InWorkingDirectory wd, std::function per_line_cb, const Environment& env) @@ -696,7 +696,7 @@ namespace vcpkg return rc; } - int System::cmd_execute_and_stream_data(const CmdLineBuilder& cmd_line, + int System::cmd_execute_and_stream_data(const Command& cmd_line, System::InWorkingDirectory wd, std::function data_cb, const Environment& env) @@ -724,7 +724,7 @@ namespace vcpkg } else { - actual_cmd_line = System::CmdLineBuilder("cd") + actual_cmd_line = System::Command("cd") .path_arg(wd.working_directory) .raw_arg("&&") .raw_arg(cmd_line.command_line()) @@ -763,7 +763,7 @@ namespace vcpkg return exit_code; } - ExitCodeAndOutput System::cmd_execute_and_capture_output(const CmdLineBuilder& cmd_line, + ExitCodeAndOutput System::cmd_execute_and_capture_output(const Command& cmd_line, System::InWorkingDirectory wd, const Environment& env) { diff --git a/toolsrc/src/vcpkg/binarycaching.cpp b/toolsrc/src/vcpkg/binarycaching.cpp index d3e464f77d5c87..58d0584c42f787 100644 --- a/toolsrc/src/vcpkg/binarycaching.cpp +++ b/toolsrc/src/vcpkg/binarycaching.cpp @@ -59,7 +59,7 @@ namespace const fs::path& dst, const fs::path& archive_path) { - System::CmdLineBuilder cmd; + System::Command cmd; #if defined(_WIN32) auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP); cmd.path_arg(seven_zip_exe) @@ -96,13 +96,11 @@ namespace #if defined(_WIN32) auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP); - System::cmd_execute_and_capture_output(System::CmdLineBuilder{seven_zip_exe} - .string_arg("a") - .path_arg(destination) - .path_arg(source / fs::u8path("*")), - System::get_clean_environment()); + System::cmd_execute_and_capture_output( + System::Command{seven_zip_exe}.string_arg("a").path_arg(destination).path_arg(source / fs::u8path("*")), + System::get_clean_environment()); #else - System::cmd_execute_clean(System::CmdLineBuilder{"zip"} + System::cmd_execute_clean(System::Command{"zip"} .string_arg("--quiet") .string_arg("-y") .string_arg("-r") @@ -420,7 +418,7 @@ namespace { } - int run_nuget_commandline(const System::CmdLineBuilder& cmdline) + int run_nuget_commandline(const System::Command& cmdline) { if (m_interactive) { @@ -516,12 +514,12 @@ namespace }; const auto& nuget_exe = paths.get_tool_exe("nuget"); - std::vector cmdlines; + std::vector cmdlines; if (!m_read_sources.empty()) { // First check using all sources - System::CmdLineBuilder cmdline; + System::Command cmdline; #ifndef _WIN32 cmdline.path_arg(paths.get_tool_exe(Tools::MONO)); #endif @@ -551,7 +549,7 @@ namespace for (auto&& cfg : m_read_configs) { // Then check using each config - System::CmdLineBuilder cmdline; + System::Command cmdline; #ifndef _WIN32 cmdline.path_arg(paths.get_tool_exe(Tools::MONO)); #endif @@ -642,7 +640,7 @@ namespace nuspec_path, generate_nuspec(paths, action, nuget_ref), VCPKG_LINE_INFO); const auto& nuget_exe = paths.get_tool_exe("nuget"); - System::CmdLineBuilder cmdline; + System::Command cmdline; #ifndef _WIN32 cmdline.path_arg(paths.get_tool_exe(Tools::MONO)); #endif @@ -666,7 +664,7 @@ namespace auto nupkg_path = paths.buildtrees / nuget_ref.nupkg_filename(); for (auto&& write_src : m_write_sources) { - System::CmdLineBuilder cmd; + System::Command cmd; #ifndef _WIN32 cmd.path_arg(paths.get_tool_exe(Tools::MONO)); #endif @@ -695,7 +693,7 @@ namespace } for (auto&& write_cfg : m_write_configs) { - System::CmdLineBuilder cmd; + System::Command cmd; #ifndef _WIN32 cmd.path_arg(paths.get_tool_exe(Tools::MONO)); #endif diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 29514b2b27ee7d..733de9d8b1f598 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -439,7 +439,7 @@ namespace vcpkg::Build }); } - System::CmdLineBuilder make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset) + System::Command make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset) { if (!pre_build_info.using_vcvars()) return {}; @@ -452,7 +452,7 @@ namespace vcpkg::Build const auto arch = to_vcvarsall_toolchain(pre_build_info.target_architecture, toolset); const auto target = to_vcvarsall_target(pre_build_info.cmake_system_name); - return System::CmdLineBuilder{"cmd"}.string_arg("/c").raw_arg( + return System::Command{"cmd"}.string_arg("/c").raw_arg( Strings::format(R"("%s" %s %s %s %s 2>&1 && pass_variables) + System::Command make_cmake_cmd(const VcpkgPaths& paths, + const fs::path& cmake_script, + std::vector&& pass_variables) { auto local_variables = std::move(pass_variables); local_variables.emplace_back("VCPKG_ROOT_DIR", paths.root); diff --git a/toolsrc/src/vcpkg/commands.contact.cpp b/toolsrc/src/vcpkg/commands.contact.cpp index 68519c7e7e57f6..830dba90882fcd 100644 --- a/toolsrc/src/vcpkg/commands.contact.cpp +++ b/toolsrc/src/vcpkg/commands.contact.cpp @@ -45,7 +45,7 @@ namespace vcpkg::Commands::Contact } #if defined(_WIN32) - System::cmd_execute(System::CmdLineBuilder("start").string_arg("https://aka.ms/NPS_vcpkg")); + System::cmd_execute(System::Command("start").string_arg("https://aka.ms/NPS_vcpkg")); System::print2("Default browser launched to https://aka.ms/NPS_vcpkg; thank you for your feedback!\n"); #else System::print2("Please navigate to https://aka.ms/NPS_vcpkg in your preferred browser. Thank you for your " diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp index 86e0b7e3289bb9..c8455bb923f817 100644 --- a/toolsrc/src/vcpkg/commands.edit.cpp +++ b/toolsrc/src/vcpkg/commands.edit.cpp @@ -219,14 +219,14 @@ namespace vcpkg::Commands::Edit candidate_paths.push_back(fs::path{"/usr/share/code/bin/code"}); candidate_paths.push_back(fs::path{"/usr/bin/code"}); - if (System::cmd_execute(System::CmdLineBuilder("command").string_arg("-v").string_arg("xdg-mime")) == 0) + if (System::cmd_execute(System::Command("command").string_arg("-v").string_arg("xdg-mime")) == 0) { auto mime_qry = - System::CmdLineBuilder("xdg-mime").string_arg("query").string_arg("default").string_arg("text/plain"); + System::Command("xdg-mime").string_arg("query").string_arg("default").string_arg("text/plain"); auto execute_result = System::cmd_execute_and_capture_output(mime_qry); if (execute_result.exit_code == 0 && !execute_result.output.empty()) { - mime_qry = System::CmdLineBuilder("command").string_arg("-v").string_arg( + mime_qry = System::Command("command").string_arg("-v").string_arg( execute_result.output.substr(0, execute_result.output.find('.'))); execute_result = System::cmd_execute_and_capture_output(mime_qry); if (execute_result.exit_code == 0 && !execute_result.output.empty()) @@ -255,7 +255,7 @@ namespace vcpkg::Commands::Edit const fs::path env_editor = *it; const std::vector arguments = create_editor_arguments(paths, options, ports); const auto args_as_string = Strings::join(" ", arguments); - auto cmd_line = System::CmdLineBuilder(env_editor).raw_arg(args_as_string).string_arg("-n"); + auto cmd_line = System::Command(env_editor).raw_arg(args_as_string).string_arg("-n"); auto editor_exe = fs::u8string(env_editor.filename()); @@ -264,7 +264,7 @@ namespace vcpkg::Commands::Edit { // note that we are invoking cmd silently but Code.exe is relaunched from there System::cmd_execute_background( - System::CmdLineBuilder("cmd").string_arg("/c").string_arg(cmd_line.command_line()).raw_arg("NuGet Package Manager->Package Manager Console const fs::path script_path = paths.scripts / "addPoshVcpkgToPowershellProfile.ps1"; const auto& ps = paths.get_tool_exe("powershell-core"); - auto cmd = System::CmdLineBuilder(ps) + auto cmd = System::Command(ps) .string_arg("-NoProfile") .string_arg("-ExecutionPolicy") .string_arg("Bypass") diff --git a/toolsrc/src/vcpkg/commands.porthistory.cpp b/toolsrc/src/vcpkg/commands.porthistory.cpp index a2938242f55330..7d7fcf3d565e11 100644 --- a/toolsrc/src/vcpkg/commands.porthistory.cpp +++ b/toolsrc/src/vcpkg/commands.porthistory.cpp @@ -31,11 +31,11 @@ namespace vcpkg::Commands::PortHistory const System::ExitCodeAndOutput run_git_command_inner(const VcpkgPaths& paths, const fs::path& dot_git_directory, const fs::path& working_directory, - const System::CmdLineBuilder& cmd) + const System::Command& cmd) { const fs::path& git_exe = paths.get_tool_exe(Tools::GIT); - auto full_cmd = System::CmdLineBuilder(git_exe) + auto full_cmd = System::Command(git_exe) .string_arg(Strings::concat("--git-dir=", fs::u8string(dot_git_directory))) .string_arg(Strings::concat("--work-tree=", fs::u8string(working_directory))) .raw_arg(cmd.command_line()); @@ -44,7 +44,7 @@ namespace vcpkg::Commands::PortHistory return output; } - const System::ExitCodeAndOutput run_git_command(const VcpkgPaths& paths, const System::CmdLineBuilder& cmd) + const System::ExitCodeAndOutput run_git_command(const VcpkgPaths& paths, const System::Command& cmd) { const fs::path& work_dir = paths.root; const fs::path dot_git_dir = paths.root / ".git"; @@ -89,7 +89,7 @@ namespace vcpkg::Commands::PortHistory const std::string& port_name) { auto rev_parse_cmd = - System::CmdLineBuilder("rev-parse").string_arg(Strings::concat(commit_id, ":ports/", port_name)); + System::Command("rev-parse").string_arg(Strings::concat(commit_id, ":ports/", port_name)); auto rev_parse_output = run_git_command(paths, rev_parse_cmd); if (rev_parse_output.exit_code == 0) { @@ -97,7 +97,7 @@ namespace vcpkg::Commands::PortHistory const auto git_tree = Strings::trim(std::move(rev_parse_output.output)); // Do we have a manifest file? - auto manifest_cmd = System::CmdLineBuilder("show").string_arg(Strings::concat(git_tree, ":vcpkg.json")); + auto manifest_cmd = System::Command("show").string_arg(Strings::concat(git_tree, ":vcpkg.json")); auto manifest_output = run_git_command(paths, manifest_cmd); if (manifest_output.exit_code == 0) { @@ -105,7 +105,7 @@ namespace vcpkg::Commands::PortHistory manifest_output.output, git_tree, commit_id, commit_date, port_name, true); } - auto cmd = System::CmdLineBuilder("show").string_arg(Strings::concat(git_tree, ":CONTROL")); + auto cmd = System::Command("show").string_arg(Strings::concat(git_tree, ":CONTROL")); auto control_output = run_git_command(paths, cmd); if (control_output.exit_code == 0) @@ -121,7 +121,7 @@ namespace vcpkg::Commands::PortHistory std::vector read_versions_from_log(const VcpkgPaths& paths, const std::string& port_name) { // log --format="%H %cd" --date=short --left-only -- ports/{port_name}/. - System::CmdLineBuilder builder; + System::Command builder; builder.string_arg("log"); builder.string_arg("--format=%H %cd"); builder.string_arg("--date=short"); diff --git a/toolsrc/src/vcpkg/commands.portsdiff.cpp b/toolsrc/src/vcpkg/commands.portsdiff.cpp index 2de30355b67667..38a1c91cba52f4 100644 --- a/toolsrc/src/vcpkg/commands.portsdiff.cpp +++ b/toolsrc/src/vcpkg/commands.portsdiff.cpp @@ -91,7 +91,7 @@ namespace vcpkg::Commands::PortsDiff const auto checkout_this_dir = Strings::format(R"(.\%s)", ports_dir_name_as_string); // Must be relative to the root of the repository - auto cmd = System::CmdLineBuilder(git_exe) + auto cmd = System::Command(git_exe) .string_arg(Strings::format("--git-dir=%s", fs::u8string(dot_git_dir))) .string_arg(Strings::format("--work-tree=%s", fs::u8string(temp_checkout_path))) .string_arg("checkout") @@ -102,7 +102,7 @@ namespace vcpkg::Commands::PortsDiff .string_arg(checkout_this_dir) .string_arg(".vcpkg-root"); System::cmd_execute_and_capture_output(cmd, System::get_clean_environment()); - System::cmd_execute_and_capture_output(System::CmdLineBuilder(git_exe).string_arg("reset"), + System::cmd_execute_and_capture_output(System::Command(git_exe).string_arg("reset"), System::get_clean_environment()); const auto ports_at_commit = Paragraphs::load_overlay_ports(paths, temp_checkout_path / ports_dir_name_as_string); @@ -120,7 +120,7 @@ namespace vcpkg::Commands::PortsDiff { static const std::string VALID_COMMIT_OUTPUT = "commit\n"; - auto cmd = System::CmdLineBuilder(git_exe).string_arg("cat-file").string_arg("-t").string_arg(git_commit_id); + auto cmd = System::Command(git_exe).string_arg("cat-file").string_arg("-t").string_arg(git_commit_id); const System::ExitCodeAndOutput output = System::cmd_execute_and_capture_output(cmd); Checks::check_exit( VCPKG_LINE_INFO, output.output == VALID_COMMIT_OUTPUT, "Invalid commit id %s", git_commit_id); diff --git a/toolsrc/src/vcpkg/export.chocolatey.cpp b/toolsrc/src/vcpkg/export.chocolatey.cpp index 13df2c909f0bfb..a01394b3669344 100644 --- a/toolsrc/src/vcpkg/export.chocolatey.cpp +++ b/toolsrc/src/vcpkg/export.chocolatey.cpp @@ -216,7 +216,7 @@ if (Test-Path $installedDir) const fs::path chocolatey_uninstall_file_path = per_package_dir_path / "tools" / "chocolateyUninstall.ps1"; fs.write_contents(chocolatey_uninstall_file_path, chocolatey_uninstall_content, VCPKG_LINE_INFO); - auto cmd_line = System::CmdLineBuilder(nuget_exe) + auto cmd_line = System::Command(nuget_exe) .string_arg("pack") .string_arg("-OutputDirectory") .path_arg(exported_dir_path) diff --git a/toolsrc/src/vcpkg/export.cpp b/toolsrc/src/vcpkg/export.cpp index de09efaff5e843..7bf36842267513 100644 --- a/toolsrc/src/vcpkg/export.cpp +++ b/toolsrc/src/vcpkg/export.cpp @@ -162,7 +162,7 @@ namespace vcpkg::Export fs.write_contents(nuspec_file_path, nuspec_file_content, VCPKG_LINE_INFO); // -NoDefaultExcludes is needed for ".vcpkg-root" - System::CmdLineBuilder cmd; + System::Command cmd; #ifndef _WIN32 cmd.path_arg(paths.get_tool_exe(Tools::MONO)); #endif @@ -223,7 +223,7 @@ namespace vcpkg::Export Strings::format("%s.%s", exported_dir_filename, format.extension()); const fs::path exported_archive_path = (output_dir / exported_archive_filename); - System::CmdLineBuilder cmd; + System::Command cmd; cmd.path_arg(cmake_exe) .string_arg("-E") .string_arg("tar") diff --git a/toolsrc/src/vcpkg/export.ifw.cpp b/toolsrc/src/vcpkg/export.ifw.cpp index a2582d213e8e49..74b06f524460fe 100644 --- a/toolsrc/src/vcpkg/export.ifw.cpp +++ b/toolsrc/src/vcpkg/export.ifw.cpp @@ -370,10 +370,8 @@ namespace vcpkg::Export::IFW fs::generic_u8string(repository_dir), failure_point.string()); - auto cmd_line = System::CmdLineBuilder(repogen_exe) - .string_arg("--packages") - .path_arg(packages_dir) - .path_arg(repository_dir); + auto cmd_line = + System::Command(repogen_exe).string_arg("--packages").path_arg(packages_dir).path_arg(repository_dir); const int exit_code = System::cmd_execute_and_capture_output(cmd_line, System::get_clean_environment()).exit_code; @@ -393,12 +391,12 @@ namespace vcpkg::Export::IFW System::printf("Generating installer %s...\n", fs::generic_u8string(installer_file)); - System::CmdLineBuilder cmd_line; + System::Command cmd_line; std::string ifw_repo_url = ifw_options.maybe_repository_url.value_or(""); if (!ifw_repo_url.empty()) { - cmd_line = System::CmdLineBuilder(binarycreator_exe) + cmd_line = System::Command(binarycreator_exe) .string_arg("--online-only") .string_arg("--config") .path_arg(config_file) @@ -408,7 +406,7 @@ namespace vcpkg::Export::IFW } else { - cmd_line = System::CmdLineBuilder(binarycreator_exe) + cmd_line = System::Command(binarycreator_exe) .string_arg("--config") .path_arg(config_file) .string_arg("--packages") diff --git a/toolsrc/src/vcpkg/export.prefab.cpp b/toolsrc/src/vcpkg/export.prefab.cpp index 9a625157c54e2d..24b16656eda856 100644 --- a/toolsrc/src/vcpkg/export.prefab.cpp +++ b/toolsrc/src/vcpkg/export.prefab.cpp @@ -206,14 +206,12 @@ namespace vcpkg::Export::Prefab #if defined(_WIN32) auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP); - System::cmd_execute_and_capture_output(System::CmdLineBuilder(seven_zip_exe) - .string_arg("a") - .path_arg(destination) - .path_arg(source / fs::u8path("*")), - System::get_clean_environment()); + System::cmd_execute_and_capture_output( + System::Command(seven_zip_exe).string_arg("a").path_arg(destination).path_arg(source / fs::u8path("*")), + System::get_clean_environment()); #else System::cmd_execute_clean( - System::CmdLineBuilder{"zip"}.string_arg("--quiet").string_arg("-r").path_arg(destination).string_arg("*"), + System::Command{"zip"}.string_arg("--quiet").string_arg("-r").path_arg(destination).string_arg("*"), System::InWorkingDirectory{source}); #endif } @@ -224,7 +222,7 @@ namespace vcpkg::Export::Prefab { System::print2("\n[DEBUG] Installing POM and AAR file to ~/.m2\n\n"); } - auto cmd_line = System::CmdLineBuilder(Tools::MAVEN); + auto cmd_line = System::Command(Tools::MAVEN); if (!prefab_options.enable_debug) { cmd_line.string_arg("-q"); diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index 587e48d0b12ba2..e0a4e5017e213d 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -257,7 +257,7 @@ namespace vcpkg::Metrics return "{}"; } - auto getmac = System::cmd_execute_and_capture_output(System::CmdLineBuilder("getmac")); + auto getmac = System::cmd_execute_and_capture_output(System::Command("getmac")); if (getmac.exit_code != 0) return "0"; @@ -474,14 +474,14 @@ namespace vcpkg::Metrics if (ec) return; #if defined(_WIN32) - System::CmdLineBuilder builder; + System::Command builder; builder.path_arg(temp_folder_path_exe); builder.string_arg("x-upload-metrics"); builder.path_arg(vcpkg_metrics_txt_path); System::cmd_execute_background(builder); #else // TODO: convert to cmd_execute_background or something. - auto curl = System::CmdLineBuilder("curl") + auto curl = System::Command("curl") .string_arg("https://dc.services.visualstudio.com/v2/track") .string_arg("-H") .string_arg("Content-Type: application/json") @@ -492,8 +492,8 @@ namespace vcpkg::Metrics .string_arg(Strings::concat("@", fs::u8string(vcpkg_metrics_txt_path))) .raw_arg(">/dev/null") .raw_arg("2>&1"); - auto remove = System::CmdLineBuilder("rm").path_arg(vcpkg_metrics_txt_path); - System::CmdLineBuilder cmd_line; + auto remove = System::Command("rm").path_arg(vcpkg_metrics_txt_path); + System::Command cmd_line; cmd_line.raw_arg("(").raw_arg(curl.command_line()).raw_arg(";").raw_arg(remove.command_line()).raw_arg(") &"); System::cmd_execute_clean(cmd_line); #endif diff --git a/toolsrc/src/vcpkg/postbuildlint.cpp b/toolsrc/src/vcpkg/postbuildlint.cpp index 5248a025a0cf1b..29f6a9b3222908 100644 --- a/toolsrc/src/vcpkg/postbuildlint.cpp +++ b/toolsrc/src/vcpkg/postbuildlint.cpp @@ -390,7 +390,7 @@ namespace vcpkg::PostBuildLint std::vector dlls_with_no_exports; for (const fs::path& dll : dlls) { - auto cmd_line = System::CmdLineBuilder(dumpbin_exe).string_arg("/exports").path_arg(dll); + auto cmd_line = System::Command(dumpbin_exe).string_arg("/exports").path_arg(dll); System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line); Checks::check_exit( VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line.command_line()); @@ -428,7 +428,7 @@ namespace vcpkg::PostBuildLint std::vector dlls_with_improper_uwp_bit; for (const fs::path& dll : dlls) { - auto cmd_line = System::CmdLineBuilder(dumpbin_exe).string_arg("/headers").path_arg(dll); + auto cmd_line = System::Command(dumpbin_exe).string_arg("/headers").path_arg(dll); System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line); Checks::check_exit( VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line.command_line()); @@ -720,7 +720,7 @@ namespace vcpkg::PostBuildLint for (const fs::path& lib : libs) { - auto cmd_line = System::CmdLineBuilder(dumpbin_exe).string_arg("/directives").path_arg(lib); + auto cmd_line = System::Command(dumpbin_exe).string_arg("/directives").path_arg(lib); System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line); Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, @@ -774,7 +774,7 @@ namespace vcpkg::PostBuildLint for (const fs::path& dll : dlls) { - auto cmd_line = System::CmdLineBuilder(dumpbin_exe).string_arg("/dependents").path_arg(dll); + auto cmd_line = System::Command(dumpbin_exe).string_arg("/dependents").path_arg(dll); System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line); Checks::check_exit( VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line.command_line()); diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index 55476f2683e273..f51ea361977744 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -297,7 +297,7 @@ namespace vcpkg } virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { - auto cmd = System::CmdLineBuilder(path_to_exe).string_arg("--version"); + auto cmd = System::Command(path_to_exe).string_arg("--version"); auto rc = System::cmd_execute_and_capture_output(cmd); if (rc.exit_code != 0) { @@ -326,7 +326,7 @@ CMake suite maintained and supported by Kitware (kitware.com/cmake). virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { - auto cmd = System::CmdLineBuilder(path_to_exe).string_arg("--version"); + auto cmd = System::Command(path_to_exe).string_arg("--version"); auto rc = System::cmd_execute_and_capture_output(cmd); if (rc.exit_code != 0) { @@ -352,7 +352,7 @@ CMake suite maintained and supported by Kitware (kitware.com/cmake). virtual ExpectedS get_version(const VcpkgPaths& paths, const fs::path& path_to_exe) const override { - System::CmdLineBuilder cmd; + System::Command cmd; #ifndef _WIN32 cmd.path_arg(paths.get_tool_exe(Tools::MONO)); #else @@ -414,7 +414,7 @@ Type 'NuGet help ' for help on a specific command. virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { - auto cmd = System::CmdLineBuilder(path_to_exe).string_arg("--version"); + auto cmd = System::Command(path_to_exe).string_arg("--version"); auto rc = System::cmd_execute_and_capture_output(cmd); if (rc.exit_code != 0) { @@ -443,8 +443,7 @@ git version 2.17.1.windows.2 virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { - auto rc = - System::cmd_execute_and_capture_output(System::CmdLineBuilder(path_to_exe).string_arg("--version")); + auto rc = System::cmd_execute_and_capture_output(System::Command(path_to_exe).string_arg("--version")); if (rc.exit_code != 0) { return {Strings::concat( @@ -485,7 +484,7 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50 virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { - auto cmd = System::CmdLineBuilder(path_to_exe).string_arg("--framework-version"); + auto cmd = System::Command(path_to_exe).string_arg("--framework-version"); auto rc = System::cmd_execute_and_capture_output(cmd); if (rc.exit_code != 0) { @@ -512,8 +511,7 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50 virtual ExpectedS get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override { - auto rc = - System::cmd_execute_and_capture_output(System::CmdLineBuilder(path_to_exe).string_arg("--version")); + auto rc = System::cmd_execute_and_capture_output(System::Command(path_to_exe).string_arg("--version")); if (rc.exit_code != 0) { return {Strings::concat( diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 7926e7a5fbd09e..9c0a62d278351a 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -70,11 +70,9 @@ namespace return result; } - System::CmdLineBuilder git_cmd_builder(const VcpkgPaths& paths, - const fs::path& dot_git_dir, - const fs::path& work_tree) + System::Command git_cmd_builder(const VcpkgPaths& paths, const fs::path& dot_git_dir, const fs::path& work_tree) { - return System::CmdLineBuilder() + return System::Command() .path_arg(paths.get_tool_exe(Tools::GIT)) .string_arg(Strings::concat("--git-dir=", fs::u8string(dot_git_dir))) .string_arg(Strings::concat("--work-tree=", fs::u8string(work_tree))); @@ -506,13 +504,13 @@ If you wish to silence this error and use classic mode, you can: // All git commands are run with: --git-dir={dot_git_dir} --work-tree={work_tree_temp} // git clone --no-checkout --local --no-hardlinks {vcpkg_root} {dot_git_dir} // note that `--no-hardlinks` is added because otherwise, git fails to clone in some cases - System::CmdLineBuilder clone_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree) - .string_arg("clone") - .string_arg("--no-checkout") - .string_arg("--local") - .string_arg("--no-hardlinks") - .path_arg(local_repo) - .path_arg(dot_git_dir); + System::Command clone_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree) + .string_arg("clone") + .string_arg("--no-checkout") + .string_arg("--local") + .string_arg("--no-hardlinks") + .path_arg(local_repo) + .path_arg(dot_git_dir); const auto clone_output = System::cmd_execute_and_capture_output(clone_cmd_builder); Checks::check_exit(VCPKG_LINE_INFO, clone_output.exit_code == 0, @@ -520,11 +518,11 @@ If you wish to silence this error and use classic mode, you can: clone_output.output); // git checkout {commit-sha} -- {subpath} - System::CmdLineBuilder checkout_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree) - .string_arg("checkout") - .string_arg(commit_sha) - .string_arg("--") - .path_arg(subpath); + System::Command checkout_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree) + .string_arg("checkout") + .string_arg(commit_sha) + .string_arg("--") + .path_arg(subpath); const auto checkout_output = System::cmd_execute_and_capture_output(checkout_cmd_builder); Checks::check_exit(VCPKG_LINE_INFO, checkout_output.exit_code == 0, @@ -585,7 +583,7 @@ If you wish to silence this error and use classic mode, you can: { // All git commands are run with: --git-dir={dot_git_dir} --work-tree={work_tree_temp} // git clone --no-checkout --local {vcpkg_root} {dot_git_dir} - System::CmdLineBuilder showcmd = + System::Command showcmd = git_cmd_builder(*this, dot_git_dir, dot_git_dir).string_arg("show").string_arg(treeish); auto output = System::cmd_execute_and_capture_output(showcmd); @@ -741,11 +739,11 @@ If you wish to silence this error and use classic mode, you can: expected_right_tag}; } - System::CmdLineBuilder tar_cmd_builder = git_cmd_builder(*this, dot_git_dir, dot_git_dir) - .string_arg("archive") - .string_arg(git_tree) - .string_arg("-o") - .path_arg(destination_tar); + auto tar_cmd_builder = git_cmd_builder(*this, dot_git_dir, dot_git_dir) + .string_arg("archive") + .string_arg(git_tree) + .string_arg("-o") + .path_arg(destination_tar); const auto tar_output = System::cmd_execute_and_capture_output(tar_cmd_builder); if (tar_output.exit_code != 0) { @@ -753,12 +751,11 @@ If you wish to silence this error and use classic mode, you can: expected_right_tag}; } - System::CmdLineBuilder extract_cmd_builder; - extract_cmd_builder.path_arg(this->get_tool_exe(Tools::CMAKE)) - .string_arg("-E") - .string_arg("tar") - .string_arg("xf") - .path_arg(destination_tar); + auto extract_cmd_builder = System::Command{this->get_tool_exe(Tools::CMAKE)} + .string_arg("-E") + .string_arg("tar") + .string_arg("xf") + .path_arg(destination_tar); const auto extract_output = System::cmd_execute_and_capture_output(extract_cmd_builder, System::InWorkingDirectory{destination_tmp}); @@ -799,8 +796,7 @@ If you wish to silence this error and use classic mode, you can: fs.create_directories(work_tree, VCPKG_LINE_INFO); auto dot_git_dir = m_pimpl->registries_dot_git_dir; - System::CmdLineBuilder init_registries_git_dir = - git_cmd_builder(*this, dot_git_dir, work_tree).string_arg("init"); + System::Command init_registries_git_dir = git_cmd_builder(*this, dot_git_dir, work_tree).string_arg("init"); auto init_output = System::cmd_execute_and_capture_output(init_registries_git_dir); if (init_output.exit_code != 0) { @@ -815,7 +811,7 @@ If you wish to silence this error and use classic mode, you can: std::error_code ec; Files::ExclusiveFileLock guard(Files::ExclusiveFileLock::Wait::Yes, fs, lock_file, ec); - System::CmdLineBuilder fetch_git_ref = + System::Command fetch_git_ref = git_cmd_builder(*this, dot_git_dir, work_tree).string_arg("fetch").string_arg("--").string_arg(repo); if (treeish.size() != 0) { @@ -833,7 +829,7 @@ If you wish to silence this error and use classic mode, you can: expected_right_tag}; } - System::CmdLineBuilder get_fetch_head = + System::Command get_fetch_head = git_cmd_builder(*this, dot_git_dir, work_tree).string_arg("rev-parse").string_arg("FETCH_HEAD"); auto fetch_head_output = System::cmd_execute_and_capture_output(get_fetch_head); if (fetch_head_output.exit_code != 0) @@ -849,7 +845,7 @@ If you wish to silence this error and use classic mode, you can: const fs::path& relative_path) const { auto revision = Strings::format("%s:%s", hash, fs::generic_u8string(relative_path)); - System::CmdLineBuilder git_show = + System::Command git_show = git_cmd_builder(*this, m_pimpl->registries_dot_git_dir, m_pimpl->registries_work_tree_dir) .string_arg("show") .string_arg(revision); @@ -865,7 +861,7 @@ If you wish to silence this error and use classic mode, you can: const fs::path& relative_path) const { auto revision = Strings::format("%s:%s", hash, fs::generic_u8string(relative_path)); - System::CmdLineBuilder git_rev_parse = + System::Command git_rev_parse = git_cmd_builder(*this, m_pimpl->registries_dot_git_dir, m_pimpl->registries_work_tree_dir) .string_arg("rev-parse") .string_arg(revision); @@ -896,13 +892,13 @@ If you wish to silence this error and use classic mode, you can: fs.create_directory(git_tree_temp, VCPKG_LINE_INFO); auto dot_git_dir = m_pimpl->registries_dot_git_dir; - System::CmdLineBuilder git_archive = git_cmd_builder(*this, dot_git_dir, m_pimpl->registries_work_tree_dir) - .string_arg("archive") - .string_arg("--format") - .string_arg("tar") - .string_arg(object) - .string_arg("--output") - .path_arg(git_tree_temp_tar); + System::Command git_archive = git_cmd_builder(*this, dot_git_dir, m_pimpl->registries_work_tree_dir) + .string_arg("archive") + .string_arg("--format") + .string_arg("tar") + .string_arg(object) + .string_arg("--output") + .path_arg(git_tree_temp_tar); auto git_archive_output = System::cmd_execute_and_capture_output(git_archive); if (git_archive_output.exit_code != 0) { @@ -910,11 +906,9 @@ If you wish to silence this error and use classic mode, you can: expected_right_tag}; } - auto untar = System::CmdLineBuilder{get_tool_exe(Tools::CMAKE)} - .string_arg("-E") - .string_arg("tar") - .string_arg("xf") - .path_arg(git_tree_temp_tar); + auto untar = + System::Command{get_tool_exe(Tools::CMAKE)}.string_arg("-E").string_arg("tar").string_arg("xf").path_arg( + git_tree_temp_tar); auto untar_output = System::cmd_execute_and_capture_output(untar, System::InWorkingDirectory{git_tree_temp}); if (untar_output.exit_code != 0) diff --git a/toolsrc/src/vcpkg/visualstudio.cpp b/toolsrc/src/vcpkg/visualstudio.cpp index f55f8e6bc0bdf9..559d6035ce7f00 100644 --- a/toolsrc/src/vcpkg/visualstudio.cpp +++ b/toolsrc/src/vcpkg/visualstudio.cpp @@ -84,7 +84,7 @@ namespace vcpkg::VisualStudio const fs::path vswhere_exe = program_files_32_bit / "Microsoft Visual Studio" / "Installer" / "vswhere.exe"; if (fs.exists(vswhere_exe)) { - const auto code_and_output = System::cmd_execute_and_capture_output(System::CmdLineBuilder(vswhere_exe) + const auto code_and_output = System::cmd_execute_and_capture_output(System::Command(vswhere_exe) .string_arg("-all") .string_arg("-prerelease") .string_arg("-legacy") From 23b2fa1d5ba812107b8cb586187c3a8ee37f0199 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Sat, 16 Jan 2021 15:54:44 -0800 Subject: [PATCH 0498/1694] [vcpkg-ci] Move version validation after CI build passes (#15686) --- .../azure-pipelines/windows/azure-pipelines.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index d97490093007c7..3c180f7ebe50f8 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -32,14 +32,6 @@ jobs: filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1' arguments: '-Triplet ${{ parameters.triplet }} -WorkingRoot ${{ variables.WORKING_ROOT }}' pwsh: true - - task: PowerShell@2 - displayName: 'Validate version files' - condition: eq('${{ parameters.triplet }}', 'x86-windows') - inputs: - targetType: inline - script: | - ./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose - pwsh: true - task: CmdLine@2 displayName: "Build vcpkg with CMake, with older VS, and Run Tests" condition: eq('${{ parameters.triplet }}', 'x86-windows') @@ -66,6 +58,14 @@ jobs: filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -UseEnvironmentSasToken -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' pwsh: true + - task: PowerShell@2 + displayName: 'Validate version files' + condition: eq('${{ parameters.triplet }}', 'x86-windows') + inputs: + targetType: inline + script: | + ./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose + pwsh: true - task: PowerShell@2 displayName: 'Report on Disk Space After Build' condition: always() From 9a0886bdade0d69dc28b2598c97e8bac69656df3 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Sat, 16 Jan 2021 16:38:46 -0800 Subject: [PATCH 0499/1694] [vcpkg] RFC: Versioning (#11758) * Initial commit of Versioning Specification * Add image for algorith example * Add image file * Address some PR comments * Apply suggestions from code review Co-authored-by: Yehezkel Bernat Co-authored-by: Miro Knejp Co-authored-by: Rachel Lu * Update spec * Modify how baseline versions work * Add implementation details spec * WIP: Update specs to reflect latest discussions * Maybe fix formatting on GitHub preview * Apply suggestions from code review Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Update spec * Update spec, match implementation * Delete unnecessary files Co-authored-by: Yehezkel Bernat Co-authored-by: Miro Knejp Co-authored-by: Rachel Lu Co-authored-by: Billy Robert O'Neal III Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> --- docs/specifications/versioning.md | 353 ++++++++++++++++++++++++++++++ 1 file changed, 353 insertions(+) create mode 100644 docs/specifications/versioning.md diff --git a/docs/specifications/versioning.md b/docs/specifications/versioning.md new file mode 100644 index 00000000000000..7cbf89aec5ad5f --- /dev/null +++ b/docs/specifications/versioning.md @@ -0,0 +1,353 @@ +# Versioning Specification + +## Glossary +Some of the terms used in this document have similar meaning when discussed by the community, and because of that, they can cause confusion and ambiguity. To solve this issue, we will assign specific meaning to these terms and try to keep a consistent usage through the document. + +**Library**: A piece of software (source code, binary files, documentation, license, etc.) that is intended to be reused by other software. + +**Package**: A package can contain a library, collection of libraries, build scripts, software tools, or other components necessary for their use. The goal of vcpkg is to facilitate the installation of these packages in the user's environment. + +**Port**: A vcpkg specific term, a port contains: + +* Metadata about a package: package version, supported features, dependencies, etc. +* Instructions to acquire, build if necessary, and install the package. + +## 1 Enabling package versioning +On launch, the versioning feature will be disabled by default. Users can enable this feature by setting the `versions` feature flag. + +Example: +``` +vcpkg --feature-flags=versions install +``` + +### 1.1 Proposed experience +This feature requires the use of manifests to declare project dependencies. To allow versioning, the following features are added to manifests: + +* Ability to declare a package's versioning scheme. +* Ability to declare version constraints on dependencies. +* Ability for a top-level manifest to override all other version constraints. +* Ability to declare a baseline for all versions. + +Example: A manifeset (`vcpkg.json`) using versioning features. +```json +{ + "name": "versions-test", + "version": "1.0.0", + "dependencies": ["fmt", {"name": "zlib", "version>=": "1.2.11"}], + "$x-default-baseline": "9fd3bd594f41afb8747e20f6ac9619f26f333cbe" +} +``` + +The example above shows some new manifest properties: +* `"version"`: Declares a version using a dot-separated versioning scheme (`1.0.0`). +* `"version>="`: Declares a minimum version constraint on package `zlib`. +* `"$x-default-baseline"`: Declares a baseline version for all packages. + +All these new features are described in more detail in this document. + +## 2 Specifying package versions +Through the years, C++ software authors have adopted multiple versioning schemes and practices that sometimes conflict between each other. On vcpkg, the most recurrent versioning schemes found are: +* Semantic versions +* Dates +* Repository commits +* Arbitrary strings + +For vcpkg to achieve wide adoption and compatibility with existing projects, it is important that we respect the versioning schemes used by each of the packages contained in our ports catalog. + +### 2.1 Port versions +Package versioning information is divided in two parts: a version string and a port version. +Port versions are a concept exclusive to vcpkg, they do not form part of a package’s upstream. But allow for versioning of the vcpkg ports themselves. + +Packages can also include the port version as part of a version constraint by using the “port-version” property on their dependencies. + +#### `port-version` + +An integer value that increases each time a vcpkg-specific change is made to the port. + +The rules for port versions are: +* Start at 0 for the original version of the port, +* increase by 1 each time a vcpkg-specific change is made to the port that does not increase the version of the package, +* and reset to 0 each time the version of the package is updated. + +Defaults to 0 if omitted. + +### 2.2 Package versions +Versions are an important part of a package’s upstream metadata. 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. + +Each versioning scheme defines their own rules on what is a valid version string and more importantly the rules for how to sort versions using the same scheme. + +The versioning schemes understood by vcpkg are: + +Manifest property | Versioning scheme +------------------|------------------------------------ +`version` | For dot-separated numeric versions +`version-semver` | For SemVer compliant versions +`version-date` | For dates in the format YYYY-MM-DD +`version-string` | For arbitrary strings + +A manifest must contain only one version declaration. + +#### `version` +Accepts version strings that follow a relaxed, dot-separated-, semver-like scheme. + +The version is logically composed of dot-separated (`.`) numeric sections. Each section must contain an integer positive number with no leading zeroes. + +The regex pattern for this versioning scheme is: `(0|[1-9]\d*)(\.(0|[1-9]\d*))*` + +_Sorting behavior_: When comparing two versions, each section is compared from left to right by their numeric value, until the first difference is found. A version with the smallest set of sections takes precedence over another with a larger set of sections, given that all their preceding sections compare equally. + +Example: +`0` < `0.1` < `0.1.0` < `1` < `1.0.0` < `1.0.1` < `1.1`< `2.0.0` + +#### `version-semver` +Accepts version strings that follow semantic versioning conventions as described in the [semantic versioning specification](https://semver.org/#semantic-versioning-specification-semver). + +_Sorting behavior_: Strings are sorted following the rules described in the semantic versioning specification. + +Example: +`1.0.0-1` < `1.0.0-alpha` < `1.0.0-beta` < `1.0.0` < `1.0.1` < `1.1.0` + +#### `version-date` + +Accepts version strings that can be parsed to a date following the ISO-8601 format `YYYY-MM-DD`. Disambiguation identifiers are allowed in the form of dot-separated-, positive-, integer-numbers with no leading zeroes. + +The regex pattern for this versioning scheme is: `\d{4}-\d{2}-\d{2}(\.(0|[1-9]\d*))*`. + +_Sorting behavior_: Strings are sorted first by their date part, then by numeric comparison of their disambiguation identifiers. Disambiguation identifiers follow the rules of the relaxed (version) scheme. + +Examples: +`2020-01-01` < `2020-01-01.1` < `2020-02-01.1.2` < `2020-02-01.1.3` < `2020-02-01` + +#### `version-string` +For packages using version strings that do not fit any of the other schemes, it accepts most arbitrary strings, but some special characters like `#` are disallowed. + +_Sorting behavior_: No sorting is attempted on the version string itself. However, if the strings match exactly, the port versions can be compared and sorted. + +Examples: +`apple` <> `orange` <> `orange.2` <> `orange2` +`watermelon` (`port-version`: 0) < `watermelon` (`port-version`: 1) + +##### Example: Manifests using different versioning schemes +```json +{ + "name": "openssl", + "version": "1.1.1", + "port-version": 0 +} +``` +```json +{ + "name": "bzip2", + "version-semver": "1.0.8", +} +``` +```json +{ + "name": "abseil", + "version-date": "2020-03-03", + "port-version": 8 +} +``` +```json +{ + "name": "d3dx12", + "version-string": "may2020", + "port-version": 0 +} +``` + +## 3 Specifying dependency versions + +### 3.1 On manifest files +Manifest files help users specify complex versioned dependency graphs in a declarative manner. In this document we define a top-level manifest as the manifest file written by a user to declare their project’s dependencies. This is opposed to a port’s manifest file, which is used by port’s to declare the dependencies of the package it contains. + +There are three mechanisms you can use in your manifest files to control which versions of your packages are installed: **version constraints, registry baselines and overrides**. + +#### Version constraints +Specifying a version constraint is the most direct way to control which version of a package is installed, in vcpkg you can declare minimum version constraints using the syntax `"version>=": "1.0.0"`. + +#### Registry baseline +Baselines are used to set lower boundaries on package versions. A baseline effectively adds a minimum version constraint on all the packages declared in it. + +But what is a baseline? + +In the main registry, the baseline is a file located in `${VCPKG_ROOT}/port_versions/baseline.json`. This file contains a version declaration for each package in vcpkg. The format of this file is the following: + +```json +{ + "default": [ + { + ... + "fmt": { "version-semver": "7.1.2", "port-version": 0}, + ... + } + ] +} +``` + +The baseline file is tracked under source control. For any given revision of the registry, the versions declared in the baseline file must match the current versions of the ports in the registry at that revision. + +Old revisions of vcpkg that do not contain a baseline file can still work with versioning. As a fallback, if no baseline is available at a given revision, vcpkg will use its local baseline file. If a local baseline file does not exist, the local version of the port will be used as the baseline version. + +Baselines define a minimum version constraint an all packages contained in it. + +For example, if the baseline contains the entry: +``` +“fmt”: { “version-semver”: “7.1.2”, “port-version”: 0 } +``` + +A minimum version constraint will be added to `fmt` so that vcpkg won’t install a version lower than `7.1.2` with port version `0`. + +#### Overrides +Declaring an override forces vcpkg to ignore all other constraints, both top-level and transitive constraints, and use the version specified in the override. This is useful for pinning exact versions and for resolving version conflicts. + +## 4 Version constraints + +### 4.1 Declaring a baseline +For the initial implementation, the method to declare a baseline is to set the `“$x-default-baseline”` property. + +The use of `“$x-default-baseline”` is temporary and will very likely change in the future, as we work on implementing custom registries. + +#### `$x-default-baseline` +Accepts a Git commit ID. Vcpkg will try to find a baseline file in the given commit ID and use that to set the baseline versions (lower bound versions) of all declared dependencies. + +When resolving version constraints for a package, vcpkg will look for a baseline version: +* First by looking at the baseline file in the given commit ID. +* If the given commit ID does not contain a baseline file, vcpkg will fallback to use the local baseline file instead. +* If there’s no local baseline file, vcpkg will use the version currently available in the ports directory. + +_NOTE: If a baseline file is found, but it does not contain an entry for the package, the vcpkg invocation will fail._ + +Example: +```json +{ + "name": "project", + "version": "1.0.0", + "dependencies": ["zlib", "fmt"], + "$x-default-baseline":"9fd3bd594f41afb8747e20f6ac9619f26f333cbe" +} +``` + +Baselines can be used without any other version constraints to obtain behavior close to using “classic” mode. + +### 4.2 Declaring minimum version constraints +A minimum version requirement puts a lower boundary on the versions that can be used to satisfy a dependency. This means that any version that is newer than the requirement is valid (including major version changes). + +Vcpkg will use the oldest identified version that can satisfy all the version requirements in a build graph. Using a minimum version approach has the following advantages: +* Is predictable and easy to understand. +* User controls when upgrades happen, as in, no upgrades are performed automatically when a new version is released. +* Avoids using a SAT solver. + +Minimum version requirements are expressed by using the `"version>="` property in the dependencies list. + +Example: +```json +{ + "name": "project", + "version-semver": "1.0.0", + "dependencies": [ + { "name": "zlib", "version>=": "1.2" }, + { "name": "rapidjson", "version>=": "2020-02-01" } + ] +} +``` + +### 4.3 Declaring port version constraints +To be consistent with the minimum version approach, vcpkg uses the lowest available port version that matches the package version. There are many scenarios where a higher port version is desirable, e.g.: support for new platforms, fixing installation issues, among others. + +As part of the dependency object a port version can be specified. An error will be emitted if a non-existent port-version for the given package version is requested. + +Example: +```json +{ + "name": "project", + "version-semver": "1.0.0", + "dependencies": [ + { "name": "zlib", "version>=": "1.2" }, + { "name": "rapidjson", "version=": "2020-02-01", "port-version": 2 } + ] +} +``` + +### 4.4 Declaring overrides +Overrides are declared as an array of package version declarations. + +For an override to take effect, the overridden package must form part of the dependency graph. That means that a dependency must be declared either by the top-level manifest or be part of a transitive dependency. + +Example: +```json +{ + "name": "project", + "version": "1.0.0", + "dependencies": ["cpprestsdk"], + "overrides": [{"name":"zlib", "version-semver":"1.2.10"}], + "$x-default-baseline":"9fd3bd594f41afb8747e20f6ac9619f26f333cbe" +} +``` + +In the previous example, `zlib` is not a direct dependency of the project but it is a dependency for `cpprestsdk`, so the override takes effect forcing `zlib` to version `1.2.10`. + +## 5 Design considerations + +### 5.1 Constraint resolution +Given a manifest with a set of versioned dependencies, vcpkg will attempt to calculate a package installation plan that satisfies all the constraints. Constraints can be declared in the top-level manifest but can also be added transitively by indirect dependencies. + +Vcpkg roughly follows the steps below to compute an installation plan, the installation plan will either contain a valid set of package versions, or a list of version conflicts. + +* Add all top-level constraints to the plan. +* Recursively add transitive constraints to the plan. +* Each time a constraint is added for a package, also add it’s baseline version as a minimum constraint. +* Each time a constraint is added: + * If an override exists for the package, select the version in the override. + * Otherwise: + * If there is no previous version selected. + * Select the minimal version that satisfies the constraint. + * If there is a previous version selected: + * If the versioning scheme of the new constraint does not match that of the previously selected version: + * Add a version conflict. + * If the constraint’s version is not comparable to the previously selected version. For example, comparing “version-string: apple” to “version-string: orange”: + * Add a version conflict. + * If the constraints version is higher than the previously selected version: + * Select the highest version. + * Otherwise, keep the previous selection. +* Review the plan: + * If there are no conflicts, install the selected packages. + * Otherwise, report the conflicts to the user. + +### 5.2 Acquiring port versions +Although the concept of package versions has always been present in vcpkg, the concept of version constraints has been not. + +With the introduction of versioning constraints, it is now possible that a package depends on a port version that does not match the one available locally. This raises a problem as vcpkg needs to know how to acquire the port files for the requested version. + +To solve this problem, a new set of metadata needs to be introduced. This specification proposes a that a new “port_versions” folder is added as part of a registry. In the main vcpkg registry, this means a new root level port_versions directory. + +The port_versions directory, from here on referred as the versions database, will contain JSON files for each one of the ports available in the registry. Each file will list all the versions available for a package and contain a Git tree-ish object that vcpkg can check out to obtain that version’s portfiles. + +As part of the versioning implementation, a generator for these database files will be implemented. The generator will extract from our repository’s Git history, all the versions of each port that had been available at any moment in time and compile them into these database files. + +Example: generated `zlib.json` +```json +{ + "versions": [ + { + "git-tree": "2dfc991c739ab9f2605c2ad91a58a7982eb15687", + "version-string": "1.2.11", + "port-version": 9 + }, + { “$truncated for brevity” }, + { + "git-tree": "a516e5ee220c8250f21821077d0e3dd517f02631", + "version-string": "1.2.10", + "port-version": 0 + }, + { + "git-tree": "3309ec82cd96d752ff890c441cb20ef49b52bf94", + "version-string": "1.2.8", + "port-version": 0 + } + ] +} +``` + +For each port, its corresponding versions file should be located in `port_versions/{first letter of port name}-/{port name}.json`. For example, zlib’s version file will be located in `port_versions/z-/zlib.json`. +Aside from port version files, the current baseline file is located in `port_versions/baseline.json`. From 4ba2bedddabef440ca8aeb7b1883498185055042 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Sun, 17 Jan 2021 04:26:38 +0100 Subject: [PATCH 0500/1694] [libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (#15089) * [tesseract] add missing reference for downstream projects * [tesseract] restore ci, fix many regressions that are uncovered by that * Update ports/opencv2/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [opencv] fix regressions on uwp, accept failure on arm64 for now * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [opencv4] allow failures on all arm windows targets, both win32 and uwp * adopts hints from #15180 * [libarchive] bump control version * [libarchive] use vcpkg-cmake-wrapper instead of a custom libarchiveConfig, since it is vcpkg-provided and not port-provided * enable features to be visible in parent scope * apply documentation fix from CI * [libarchive] remove unnecessary lines in portfile * fix regressions * Update ports/gdcm/CONTROL * use more compact logic syntax * add new versions to baseline Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- .gitignore | 2 + docs/maintainers/vcpkg_check_features.md | 40 ++++++++--------- port_versions/baseline.json | 18 ++++---- port_versions/d-/dmlc.json | 5 +++ port_versions/g-/gdcm.json | 5 +++ port_versions/l-/libarchive.json | 5 +++ port_versions/o-/opencv.json | 5 +++ port_versions/o-/opencv2.json | 5 +++ port_versions/o-/opencv3.json | 5 +++ port_versions/o-/opencv4.json | 5 +++ port_versions/t-/tesseract.json | 5 +++ ports/dmlc/CONTROL | 6 +-- ports/gdcm/CONTROL | 3 +- ports/libarchive/CONTROL | 2 +- ports/libarchive/portfile.cmake | 14 ++---- ...per.cmake => vcpkg-cmake-wrapper.cmake.in} | 37 ++++++++++++---- ports/opencv/CONTROL | 7 ++- ports/opencv2/CONTROL | 4 +- ports/opencv3/CONTROL | 10 +++-- ports/opencv3/portfile.cmake | 8 ++-- ...006-fix-vtk9.patch => 0008-fix-vtk9.patch} | 0 ports/opencv4/CONTROL | 10 +++-- ports/opencv4/portfile.cmake | 24 ++++++++-- ports/tesseract/CONTROL | 3 +- ports/tesseract/portfile.cmake | 7 +-- scripts/ci.baseline.txt | 9 +--- scripts/cmake/vcpkg_check_features.cmake | 44 ++++++++++--------- scripts/test_ports/vcpkg-ci-opencv/CONTROL | 4 +- scripts/test_ports/vcpkg-ci-paraview/CONTROL | 4 +- 29 files changed, 188 insertions(+), 108 deletions(-) rename ports/libarchive/{vcpkg-cmake-wrapper.cmake => vcpkg-cmake-wrapper.cmake.in} (80%) rename ports/opencv4/{0006-fix-vtk9.patch => 0008-fix-vtk9.patch} (100%) diff --git a/.gitignore b/.gitignore index ed388f4a1c7a48..92dd2182f875b7 100644 --- a/.gitignore +++ b/.gitignore @@ -316,6 +316,7 @@ __pycache__/ ############################################################ # vcpkg - End ############################################################ +vcpkg.disable-metrics archives .DS_Store prefab/ @@ -325,3 +326,4 @@ prefab/ # Codespaces ################### pythonenv3.8/ +.venv/ diff --git a/docs/maintainers/vcpkg_check_features.md b/docs/maintainers/vcpkg_check_features.md index fcf313bfdc6b0b..6024c2a0219b8c 100644 --- a/docs/maintainers/vcpkg_check_features.md +++ b/docs/maintainers/vcpkg_check_features.md @@ -4,7 +4,7 @@ Check if one or more features are a part of a package installation. ## Usage ```cmake vcpkg_check_features( - OUT_FEATURE_OPTIONS + OUT_FEATURE_OPTIONS [FEATURES [ ] @@ -15,27 +15,27 @@ vcpkg_check_features( ...] ) ``` -`vcpkg_check_features()` accepts these parameters: +`vcpkg_check_features()` accepts these parameters: -* `OUT_FEATURE_OPTIONS`: - An output variable, the function will clear the variable passed to `OUT_FEATURE_OPTIONS` +* `OUT_FEATURE_OPTIONS`: + An output variable, the function will clear the variable passed to `OUT_FEATURE_OPTIONS` and then set it to contain a list of option definitions (`-D=ON|OFF`). - + This should be set to `FEATURE_OPTIONS` by convention. - -* `FEATURES`: - A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs. - For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: - + +* `FEATURES`: + A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs. + For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: + * `-D=ON`, if a feature is specified for installation, - * `-D=OFF`, otherwise. + * `-D=OFF`, otherwise. + +* `INVERTED_FEATURES`: + A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs, uses reversed logic from `FEATURES`. + For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: -* `INVERTED_FEATURES`: - A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs, uses reversed logic from `FEATURES`. - For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: - * `-D=OFF`, if a feature is specified for installation, - * `-D=ON`, otherwise. + * `-D=ON`, otherwise. ## Notes @@ -44,8 +44,8 @@ The `FEATURES` name parameter can be omitted if no `INVERTED_FEATURES` are used. At least one (`FEATURE_NAME`, `OPTION_NAME`) pair must be passed to the function call. -Arguments passed to `FEATURES` and `INVERTED_FEATURES` are not validated to prevent duplication. -If the same (`FEATURE_NAME`, `OPTION_NAME`) pair is passed to both lists, +Arguments passed to `FEATURES` and `INVERTED_FEATURES` are not validated to prevent duplication. +If the same (`FEATURE_NAME`, `OPTION_NAME`) pair is passed to both lists, two conflicting definitions are added to `OUT_FEATURE_OPTIONS`. @@ -113,7 +113,7 @@ vcpkg_configure_cmake( # Expands to "-DWITH_CUDA=ON; -DBUILD_CUDA=ON; -DBUILD_GPU=ON" ${FEATURE_OPTIONS} ) -``` +``` ### Example 4: Use regular and inverted features @@ -135,7 +135,7 @@ vcpkg_configure_cmake( # Expands to "-DWITH_TBB=ON; -DROCKSDB_IGNORE_PACKAGE_TBB=OFF" ${FEATURE_OPTIONS} ) -``` +``` ## Examples in portfiles diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 9d7d99eb3a3377..c577ec1eef343b 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -1633,8 +1633,8 @@ "port-version": 4 }, "dmlc": { - "baseline": "2019-08-12-4", - "port-version": 0 + "baseline": "2019-08-12", + "port-version": 5 }, "docopt": { "baseline": "2018-11-01", @@ -2066,7 +2066,7 @@ }, "gdcm": { "baseline": "3.0.7", - "port-version": 0 + "port-version": 1 }, "gdcm2": { "baseline": "deprecated", @@ -2814,7 +2814,7 @@ }, "libarchive": { "baseline": "3.4.3", - "port-version": 2 + "port-version": 3 }, "libass": { "baseline": "0.15.0", @@ -4190,19 +4190,19 @@ }, "opencv": { "baseline": "4.3.0", - "port-version": 0 + "port-version": 1 }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 4 + "port-version": 5 }, "opencv3": { "baseline": "3.4.10", - "port-version": 4 + "port-version": 5 }, "opencv4": { "baseline": "4.3.0", - "port-version": 4 + "port-version": 5 }, "opendnp3": { "baseline": "3.1.0", @@ -5626,7 +5626,7 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 5 + "port-version": 6 }, "tfhe": { "baseline": "1.0.1-1", diff --git a/port_versions/d-/dmlc.json b/port_versions/d-/dmlc.json index ad9766a0c8b79f..9a0daad884339f 100644 --- a/port_versions/d-/dmlc.json +++ b/port_versions/d-/dmlc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "162f71aa6f31426d3e8cbbb2614c8bba689e7bbc", + "version-string": "2019-08-12", + "port-version": 5 + }, { "git-tree": "679cba8e39c453c95a626180449c68a0aa41f724", "version-string": "2019-08-12-4", diff --git a/port_versions/g-/gdcm.json b/port_versions/g-/gdcm.json index 5c3ab5d3271059..e9ff1e45fd7359 100644 --- a/port_versions/g-/gdcm.json +++ b/port_versions/g-/gdcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "151374d525077e7d8229b4ad2bf8f1630f36fbb5", + "version-string": "3.0.7", + "port-version": 1 + }, { "git-tree": "cc2b78ff93cde95d5d9a4c9c9b4b2a393a7195a2", "version-string": "3.0.7", diff --git a/port_versions/l-/libarchive.json b/port_versions/l-/libarchive.json index 4fc0e56d01e8ab..ebb09268797a46 100644 --- a/port_versions/l-/libarchive.json +++ b/port_versions/l-/libarchive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "114dd98b5e7865923e2e06a1ffad5661b0aec246", + "version-string": "3.4.3", + "port-version": 3 + }, { "git-tree": "5f418195172c2db767e6f0bae8ff4d07101c70e5", "version-string": "3.4.3", diff --git a/port_versions/o-/opencv.json b/port_versions/o-/opencv.json index b8834b15c9441d..856e8045c01449 100644 --- a/port_versions/o-/opencv.json +++ b/port_versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6732874b9a119e4de4e9afdc72469c967348b21b", + "version-string": "4.3.0", + "port-version": 1 + }, { "git-tree": "ad5aa4dfbaa294ebc717c4a057ee7a5ce1dc297c", "version-string": "4.3.0", diff --git a/port_versions/o-/opencv2.json b/port_versions/o-/opencv2.json index 0bef2ac8bb2867..11fd9d437cbf5a 100644 --- a/port_versions/o-/opencv2.json +++ b/port_versions/o-/opencv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50a5602ecab15fd1c36f0619a5fdbd4792eb1b23", + "version-string": "2.4.13.7", + "port-version": 5 + }, { "git-tree": "7a9db98ab98f632cba250ec9290924c4027a8f0d", "version-string": "2.4.13.7", diff --git a/port_versions/o-/opencv3.json b/port_versions/o-/opencv3.json index 8c6e2165f6b6ef..31859a5aa8ee6f 100644 --- a/port_versions/o-/opencv3.json +++ b/port_versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a761625dd5d17548aaa9611295ace23ca8bc27fc", + "version-string": "3.4.10", + "port-version": 5 + }, { "git-tree": "d08b6595a75aefc70b70a366a07c2a3b1dd66e92", "version-string": "3.4.10", diff --git a/port_versions/o-/opencv4.json b/port_versions/o-/opencv4.json index ebb7383abcb734..b326830fb5f9d0 100644 --- a/port_versions/o-/opencv4.json +++ b/port_versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6fbdfab1e9ac01652b51f2251715c2be05a6567", + "version-string": "4.3.0", + "port-version": 5 + }, { "git-tree": "bda3727a0c91b614fe1b275e27ad4b68f214eebe", "version-string": "4.3.0", diff --git a/port_versions/t-/tesseract.json b/port_versions/t-/tesseract.json index f6cec1d56e89dd..6c8124580f28a6 100644 --- a/port_versions/t-/tesseract.json +++ b/port_versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46aa8d12c08674f4518e9b74b32826bbb380cac9", + "version-string": "4.1.1", + "port-version": 6 + }, { "git-tree": "118674017f17f5289563c3b07f4fe5403d508151", "version-string": "4.1.1", diff --git a/ports/dmlc/CONTROL b/ports/dmlc/CONTROL index 8bf079c7f2c4d4..7021ffdcd01347 100644 --- a/ports/dmlc/CONTROL +++ b/ports/dmlc/CONTROL @@ -1,9 +1,9 @@ Source: dmlc -Version: 2019-08-12-4 +Version: 2019-08-12 +Port-Version: 5 Homepage: https://github.com/dmlc/dmlc-core Description: DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries. -Default-Features: openmp Supports: !uwp Feature: openmp -Description: Build with openmp \ No newline at end of file +Description: Build with openmp diff --git a/ports/gdcm/CONTROL b/ports/gdcm/CONTROL index 67d3a00503a50b..a08a2a5cfa2169 100644 --- a/ports/gdcm/CONTROL +++ b/ports/gdcm/CONTROL @@ -1,6 +1,7 @@ Source: gdcm Version: 3.0.7 +Port-Version: 1 Homepage: https://github.com/malaterre/GDCM Description: Grassroots DICOM library Build-Depends: zlib, expat, openjpeg -Supports: !uwp \ No newline at end of file +Supports: !uwp&!(windows&(arm|arm64)) diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index e15f1da44e99cd..a16b6179e27b2f 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,6 +1,6 @@ Source: libarchive Version: 3.4.3 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/libarchive/libarchive Description: Library for reading and writing streaming archives Build-Depends: zlib diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index df7b6ce779d59f..4e6a5fd852d892 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -64,19 +64,13 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() + vcpkg_copy_pdbs() -foreach(_feature IN LISTS FEATURE_OPTIONS) - string(REPLACE "-D" "" _feature "${_feature}") - string(REPLACE "=" ";" _feature "${_feature}") - string(REPLACE "ON" "1" _feature "${_feature}") - string(REPLACE "OFF" "0" _feature "${_feature}") - list(GET _feature 0 _feature_name) - list(GET _feature 1 _feature_status) - set(${_feature_name} ${_feature_status}) -endforeach() -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + foreach(HEADER ${CURRENT_PACKAGES_DIR}/include/archive.h ${CURRENT_PACKAGES_DIR}/include/archive_entry.h) file(READ ${HEADER} CONTENTS) string(REPLACE "(!defined LIBARCHIVE_STATIC)" "0" CONTENTS "${CONTENTS}") diff --git a/ports/libarchive/vcpkg-cmake-wrapper.cmake b/ports/libarchive/vcpkg-cmake-wrapper.cmake.in similarity index 80% rename from ports/libarchive/vcpkg-cmake-wrapper.cmake rename to ports/libarchive/vcpkg-cmake-wrapper.cmake.in index 006dde98dd5d87..2e0ef0f9c9a23f 100644 --- a/ports/libarchive/vcpkg-cmake-wrapper.cmake +++ b/ports/libarchive/vcpkg-cmake-wrapper.cmake.in @@ -1,29 +1,50 @@ _find_package(${ARGS}) +include(CMakeFindDependencyMacro) + +if(@ENABLE_ZLIB@) + find_dependency(ZLIB) +endif() +if(@ENABLE_BZip2@) + find_dependency(BZip2) +endif() +if(@ENABLE_LIBXML2@) + find_dependency(LibXml2) +endif() +if(@ENABLE_LZ4@) + find_dependency(lz4) +endif() +if(@ENABLE_LZMA@) + find_dependency(LibLZMA) +endif() +if(@ENABLE_ZSTD@) + find_dependency(zstd) +endif() +if(@ENABLE_OPENSSL@) + find_dependency(OpenSSL) +endif() +if(@ENABLE_LZO@) + find_library(LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) + find_library(LZO_LIBRARY_RELEASE NAMES lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) +endif() + if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") if(@ENABLE_ZLIB@) - find_package(ZLIB REQUIRED) list(APPEND LibArchive_LIBRARIES ZLIB::ZLIB) endif() if(@ENABLE_BZip2@) - find_package(BZip2 REQUIRED) list(APPEND LibArchive_LIBRARIES BZip2::BZip2) endif() if(@ENABLE_LIBXML2@) - find_package(LibXml2 REQUIRED) list(APPEND LibArchive_LIBRARIES LibXml2::LibXml2) endif() if(@ENABLE_LZ4@) - find_package(lz4 REQUIRED) list(APPEND LibArchive_LIBRARIES lz4::lz4) endif() if(@ENABLE_LZMA@) - find_package(LibLZMA REQUIRED) list(APPEND LibArchive_LIBRARIES LibLZMA::LibLZMA) endif() if(@ENABLE_LZO@) - find_library(LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) - find_library(LZO_LIBRARY_RELEASE NAMES lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) if(LZO_LIBRARY_RELEASE) list(APPEND LibArchive_LIBRARIES optimized ${LZO_LIBRARY_RELEASE}) endif() @@ -32,7 +53,6 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") endif() endif() if(@ENABLE_ZSTD@) - find_package(zstd CONFIG REQUIRED) if(TARGET zstd::libzstd_shared) list(APPEND LibArchive_LIBRARIES zstd::libzstd_shared) else(TARGET zstd::libzstd_shared) @@ -40,7 +60,6 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") endif(TARGET zstd::libzstd_shared) endif() if(@ENABLE_OPENSSL@) - find_package(OpenSSL REQUIRED) list(APPEND LibArchive_LIBRARIES OpenSSL::Crypto) endif() diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 768d8fda7d9ee4..7b0e0cfe9da564 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,9 +1,10 @@ Source: opencv Version: 4.3.0 +Port-Version: 1 Homepage: https://github.com/opencv/opencv Description: Computer vision library Build-Depends: opencv4[core] -Default-Features: dnn, jpeg, opengl, png, tiff, webp +Default-Features: dnn, jpeg, png, tiff, webp Feature: nonfree Build-Depends: opencv4[core,nonfree] @@ -53,6 +54,10 @@ Feature: jpeg Build-Depends: opencv4[core,jpeg] Description: JPEG support for opencv +Feature: lapack +Build-Depends: opencv4[core,lapack] +Description: LAPACK support for opencv + Feature: openexr Build-Depends: opencv4[core,openexr] Description: OpenEXR support for opencv diff --git a/ports/opencv2/CONTROL b/ports/opencv2/CONTROL index 1e9f57cdbb96ed..266a77f40e9854 100644 --- a/ports/opencv2/CONTROL +++ b/ports/opencv2/CONTROL @@ -1,9 +1,9 @@ Source: opencv2 Version: 2.4.13.7 -Port-Version: 4 +Port-Version: 5 Build-Depends: zlib Description: computer vision library, version 2 -Default-Features: eigen, jpeg, opengl, png, tiff +Default-Features: eigen, jpeg, png, tiff Feature: cuda Build-Depends: cuda diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL index e48c5dc1ddb3da..9067dab1882a44 100644 --- a/ports/opencv3/CONTROL +++ b/ports/opencv3/CONTROL @@ -1,10 +1,10 @@ Source: opencv3 Version: 3.4.10 -Port-Version: 4 +Port-Version: 5 Build-Depends: zlib Homepage: https://github.com/opencv/opencv Description: computer vision library -Default-Features: dnn, jpeg, opengl, png, tiff, webp +Default-Features: dnn, jpeg, png, tiff, webp Feature: nonfree Description: allow nonfree and unredistributable libraries @@ -14,7 +14,7 @@ Build-Depends: protobuf Description: opencv_flann module Feature: contrib -Build-Depends: opencv3[dnn], hdf5 (!uwp), tesseract (!uwp) +Build-Depends: opencv3[dnn], hdf5 (!uwp&!(windows&(arm|arm64))), tesseract (!uwp&!(windows&(arm|arm64))) Description: opencv_contrib module Feature: cuda @@ -52,6 +52,10 @@ Feature: jpeg Build-Depends: libjpeg-turbo Description: JPEG support for opencv +Feature: lapack +Build-Depends: blas, lapack +Description: LAPACK support for opencv + Feature: openexr Build-Depends: openexr Description: OpenEXR support for opencv diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index e194e0e9aceeab..eff881a240efde 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -38,6 +38,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "halide" WITH_HALIDE "jasper" WITH_JASPER "jpeg" WITH_JPEG + "lapack" WITH_LAPACK "nonfree" OPENCV_ENABLE_NONFREE "openexr" WITH_OPENEXR "opengl" WITH_OPENGL @@ -314,8 +315,6 @@ vcpkg_configure_cmake( -DWITH_OPENCLAMDBLAS=OFF -DWITH_TBB=${WITH_TBB} -DWITH_OPENJPEG=OFF - ###### WITH PROPERTIES explicitly disabled, they have problems with libraries if already installed by user and that are "involuntarily" found during install - -DWITH_LAPACK=OFF ###### BUILD_options (mainly modules which require additional libraries) -DBUILD_opencv_ovis=${BUILD_opencv_ovis} -DBUILD_opencv_dnn=${BUILD_opencv_dnn} @@ -374,11 +373,14 @@ find_dependency(Tesseract)") if("eigen" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(Eigen3 CONFIG)") endif() + if("lapack" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(LAPACK)") + endif() if("openexr" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)") endif() if(WITH_OPENMP) - string(APPEND DEPS_STRING "\nfind_dependency(OpenMP CONFIG)") + string(APPEND DEPS_STRING "\nfind_dependency(OpenMP)") endif() if(BUILD_opencv_ovis) string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)") diff --git a/ports/opencv4/0006-fix-vtk9.patch b/ports/opencv4/0008-fix-vtk9.patch similarity index 100% rename from ports/opencv4/0006-fix-vtk9.patch rename to ports/opencv4/0008-fix-vtk9.patch diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL index 1a688290040fff..baebc1c59cf635 100644 --- a/ports/opencv4/CONTROL +++ b/ports/opencv4/CONTROL @@ -1,10 +1,10 @@ Source: opencv4 Version: 4.3.0 -Port-Version: 4 +Port-Version: 5 Build-Depends: zlib Homepage: https://github.com/opencv/opencv Description: computer vision library -Default-Features: dnn, jpeg, opengl, png, tiff, webp +Default-Features: dnn, jpeg, png, tiff, webp Feature: nonfree Description: allow nonfree and unredistributable libraries @@ -14,7 +14,7 @@ Build-Depends: ade Description: graph api Feature: contrib -Build-Depends: hdf5 (!uwp), tesseract (!uwp) +Build-Depends: hdf5 (!uwp&!(windows&(arm|arm64))), tesseract (!uwp&!(windows&(arm|arm64))) Description: opencv_contrib module Feature: cuda @@ -52,6 +52,10 @@ Feature: jpeg Build-Depends: libjpeg-turbo Description: JPEG support for opencv +Feature: lapack +Build-Depends: blas, lapack +Description: LAPACK support for opencv + Feature: openexr Build-Depends: openexr Description: OpenEXR support for opencv diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 23c9184e7d5487..007ce8a26db024 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -19,8 +19,8 @@ vcpkg_from_github( 0002-install-options.patch 0003-force-package-requirements.patch 0004-fix-policy-CMP0057.patch - 0006-fix-vtk9.patch 0006-jpeg2000_getref.patch + 0008-fix-vtk9.patch 0009-fix-uwp.patch 0010-fix-interface_link_libraries.patch # Remove this patch when the next update ) @@ -42,6 +42,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "halide" WITH_HALIDE "jasper" WITH_JASPER "jpeg" WITH_JPEG + "lapack" WITH_LAPACK "nonfree" OPENCV_ENABLE_NONFREE "openexr" WITH_OPENEXR "opengl" WITH_OPENGL @@ -65,6 +66,19 @@ if("dnn" IN_LIST FEATURES) endif() endif() +#OpenCV on arm on windows platform (non UWP) has serious problems right now. Disabling this module is not enough (remember to put the definition in vcpkg_configure_cmake) +#set(BUILD_opencv_surface_matching ON) +#if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") +# set(BUILD_opencv_surface_matching OFF) +# message(WARNING "The surface_matching module cannot be enabled on ARM architectures") +#endif() + +set(BUILD_opencv_gapi ON) +if(VCPKG_TARGET_IS_UWP) + set(BUILD_opencv_gapi OFF) + message(WARNING "The gapi module cannot be enabled on UWP platform") +endif() + set(WITH_IPP OFF) if("ipp" IN_LIST FEATURES) set(WITH_IPP ON) @@ -346,13 +360,12 @@ vcpkg_configure_cmake( -DWITH_PROTOBUF=${BUILD_opencv_dnn} -DWITH_TBB=${WITH_TBB} -DWITH_OPENJPEG=OFF - ###### WITH PROPERTIES explicitly disabled, they have problems with libraries if already installed by user and that are "involuntarily" found during install - -DWITH_LAPACK=OFF ###### BUILD_options (mainly modules which require additional libraries) -DBUILD_opencv_ovis=${BUILD_opencv_ovis} -DBUILD_opencv_dnn=${BUILD_opencv_dnn} ###### The following modules are disabled for UWP -DBUILD_opencv_quality=${BUILD_opencv_quality} + -DBUILD_opencv_gapi=${DBUILD_opencv_gapi} ###### The following module is disabled because it's broken #https://github.com/opencv/opencv_contrib/issues/2307 -DBUILD_opencv_rgbd=OFF ###### Additional build flags @@ -411,8 +424,11 @@ find_dependency(Tesseract)") if("openexr" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)") endif() + if("lapack" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(LAPACK)") + endif() if(WITH_OPENMP) - string(APPEND DEPS_STRING "\nfind_dependency(OpenMP CONFIG)") + string(APPEND DEPS_STRING "\nfind_dependency(OpenMP)") endif() if(BUILD_opencv_ovis) string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)") diff --git a/ports/tesseract/CONTROL b/ports/tesseract/CONTROL index 530abc04dc7cea..021496d324392a 100644 --- a/ports/tesseract/CONTROL +++ b/ports/tesseract/CONTROL @@ -1,9 +1,10 @@ Source: tesseract Version: 4.1.1 -Port-Version: 5 +Port-Version: 6 Homepage: https://github.com/tesseract-ocr/tesseract Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google. Build-Depends: leptonica, libarchive +Supports: !(windows&(arm|arm64)) Feature: training-tools Description: build training tools diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index d08e319071dd3d..e5e09e4d0c5d08 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -42,12 +42,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) file(READ ${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake TESSERACT_CONFIG) string(REPLACE "find_package(Leptonica REQUIRED)" "find_package(Leptonica REQUIRED) -find_package(OpenSSL REQUIRED) -find_package(ZLIB REQUIRED) -find_package(BZip2 REQUIRED) -find_package(LibXml2 REQUIRED) -find_package(zstd REQUIRED) -find_package(LibLZMA REQUIRED)" TESSERACT_CONFIG "${TESSERACT_CONFIG}") +find_package(LibArchive REQUIRED)" TESSERACT_CONFIG "${TESSERACT_CONFIG}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake "${TESSERACT_CONFIG}") vcpkg_copy_tools(TOOL_NAMES tesseract AUTO_CLEAN) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c8f6c14d8bc973..95241f5e70cc9e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -365,8 +365,6 @@ gasol:arm64-windows=fail gasol:arm-uwp=fail gasol:x64-uwp=fail gdal:x64-windows-static-md=fail -gdcm:arm64-windows=fail -gdcm:x64-linux = skip geos:arm-uwp=fail geos:x64-uwp=fail @@ -1140,6 +1138,8 @@ opencv3:x64-windows = skip opencv3:x64-windows-static = skip opencv3:x64-windows-static-md=skip opencv3:x86-windows = skip +opencv4:arm64-windows = fail +opencv4:arm-uwp = fail opendnp3:x64-uwp=fail opendnp3:arm-uwp=fail openexr:arm64-windows=fail @@ -1567,11 +1567,6 @@ teemo:arm64-windows=fail teemo:x64-osx=fail telnetpp:arm-uwp=fail telnetpp:x64-uwp=fail -tesseract:x64-windows=fail -tesseract:x64-windows-static=fail -tesseract:x64-windows-static-md=fail -tesseract:x86-windows=fail -tesseract:arm64-windows=fail tfhe:x86-windows=fail tfhe:x64-windows=fail tfhe:x64-windows-static=fail diff --git a/scripts/cmake/vcpkg_check_features.cmake b/scripts/cmake/vcpkg_check_features.cmake index c22903eaaf7764..be4e1265c69bf8 100644 --- a/scripts/cmake/vcpkg_check_features.cmake +++ b/scripts/cmake/vcpkg_check_features.cmake @@ -5,7 +5,7 @@ Check if one or more features are a part of a package installation. ## Usage ```cmake vcpkg_check_features( - OUT_FEATURE_OPTIONS + OUT_FEATURE_OPTIONS [FEATURES [ ] @@ -16,27 +16,27 @@ vcpkg_check_features( ...] ) ``` -`vcpkg_check_features()` accepts these parameters: +`vcpkg_check_features()` accepts these parameters: -* `OUT_FEATURE_OPTIONS`: - An output variable, the function will clear the variable passed to `OUT_FEATURE_OPTIONS` +* `OUT_FEATURE_OPTIONS`: + An output variable, the function will clear the variable passed to `OUT_FEATURE_OPTIONS` and then set it to contain a list of option definitions (`-D=ON|OFF`). - + This should be set to `FEATURE_OPTIONS` by convention. - -* `FEATURES`: - A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs. - For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: - + +* `FEATURES`: + A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs. + For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: + * `-D=ON`, if a feature is specified for installation, - * `-D=OFF`, otherwise. + * `-D=OFF`, otherwise. + +* `INVERTED_FEATURES`: + A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs, uses reversed logic from `FEATURES`. + For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: -* `INVERTED_FEATURES`: - A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs, uses reversed logic from `FEATURES`. - For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: - * `-D=OFF`, if a feature is specified for installation, - * `-D=ON`, otherwise. + * `-D=ON`, otherwise. ## Notes @@ -45,8 +45,8 @@ The `FEATURES` name parameter can be omitted if no `INVERTED_FEATURES` are used. At least one (`FEATURE_NAME`, `OPTION_NAME`) pair must be passed to the function call. -Arguments passed to `FEATURES` and `INVERTED_FEATURES` are not validated to prevent duplication. -If the same (`FEATURE_NAME`, `OPTION_NAME`) pair is passed to both lists, +Arguments passed to `FEATURES` and `INVERTED_FEATURES` are not validated to prevent duplication. +If the same (`FEATURE_NAME`, `OPTION_NAME`) pair is passed to both lists, two conflicting definitions are added to `OUT_FEATURE_OPTIONS`. @@ -114,7 +114,7 @@ vcpkg_configure_cmake( # Expands to "-DWITH_CUDA=ON; -DBUILD_CUDA=ON; -DBUILD_GPU=ON" ${FEATURE_OPTIONS} ) -``` +``` ### Example 4: Use regular and inverted features @@ -136,7 +136,7 @@ vcpkg_configure_cmake( # Expands to "-DWITH_TBB=ON; -DROCKSDB_IGNORE_PACKAGE_TBB=OFF" ${FEATURE_OPTIONS} ) -``` +``` ## Examples in portfiles @@ -172,8 +172,10 @@ function(vcpkg_check_features) set(_vcf_FEATURE_VARIABLE ${_vcf_ARG}) if(${_vcf_FEATURE_NAME} IN_LIST FEATURES) list(APPEND _vcf_FEATURE_OPTIONS "-D${_vcf_FEATURE_VARIABLE}=${_set_if}") + set(${_vcf_FEATURE_VARIABLE} "${_set_if}" PARENT_SCOPE) else() list(APPEND _vcf_FEATURE_OPTIONS "-D${_vcf_FEATURE_VARIABLE}=${_set_else}") + set(${_vcf_FEATURE_VARIABLE} "${_set_else}" PARENT_SCOPE) endif() set(_vcf_IS_FEATURE_NAME_ARG ON) endif() @@ -185,7 +187,7 @@ function(vcpkg_check_features) if (DEFINED _vcf_FEATURES OR DEFINED _vcf_INVERTED_FEATURES) _check_features(_vcf_FEATURES ON OFF) _check_features(_vcf_INVERTED_FEATURES OFF ON) - else() + else() # Skip arguments that correspond to OUT_FEATURE_OPTIONS and its value. list(SUBLIST ARGN 2 -1 _vcf_ARGN) _check_features(_vcf_ARGN ON OFF) diff --git a/scripts/test_ports/vcpkg-ci-opencv/CONTROL b/scripts/test_ports/vcpkg-ci-opencv/CONTROL index 3456988cf41908..46e451828aad6e 100644 --- a/scripts/test_ports/vcpkg-ci-opencv/CONTROL +++ b/scripts/test_ports/vcpkg-ci-opencv/CONTROL @@ -1,6 +1,6 @@ Source: vcpkg-ci-opencv Version: 1 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/microsoft/vcpkg Description: Port to force features of certain ports within CI -Build-Depends: opencv[nonfree,ade,contrib,dnn,eigen,ffmpeg,gdcm,ipp,jasper,jpeg,openexr,opengl,openmp,png,qt,sfm,tiff,vtk] +Build-Depends: opencv[core,nonfree,ade,contrib,dnn,eigen,ffmpeg,gdcm,ipp,jasper,jpeg,lapack,openexr,opengl,openmp,png,qt,sfm,tiff,vtk,webp](!uwp&!(windows&(arm|arm64))), opencv[core,nonfree,ade,contrib,dnn,eigen,ffmpeg,jpeg,png,tiff,webp](uwp|(windows&(arm|arm64))) diff --git a/scripts/test_ports/vcpkg-ci-paraview/CONTROL b/scripts/test_ports/vcpkg-ci-paraview/CONTROL index d4816dbf383660..1377508422d025 100644 --- a/scripts/test_ports/vcpkg-ci-paraview/CONTROL +++ b/scripts/test_ports/vcpkg-ci-paraview/CONTROL @@ -1,6 +1,6 @@ Source: vcpkg-ci-paraview Version: 1 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/microsoft/vcpkg Description: Port to force features of certain ports within CI -Build-Depends: paraview[vtkm, tools] +Build-Depends: paraview[core,vtkm,tools](!(x86&windows)), paraview[core,tools](x86&windows) From 800ed7b68a05e27065be16d4f782550cff328331 Mon Sep 17 00:00:00 2001 From: Haeri Date: Sun, 17 Jan 2021 04:33:51 +0100 Subject: [PATCH 0501/1694] [msdfgen] New port (#15427) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * initial * format * Update ports/msdfgen/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/msdfgen/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * using vcpkg_copy_tools * Compromise between renameing and UWP * added feature "tools" * forgot a check * Update ports/msdfgen/portfile.cmake * Update port_versions * Add msdfgen.json in port_versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: NancyLi1013 --- port_versions/baseline.json | 4 +++ port_versions/m-/msdfgen.json | 9 +++++++ ports/msdfgen/compatibility.patch | 15 +++++++++++ ports/msdfgen/portfile.cmake | 44 +++++++++++++++++++++++++++++++ ports/msdfgen/vcpkg.json | 14 ++++++++++ 5 files changed, 86 insertions(+) create mode 100644 port_versions/m-/msdfgen.json create mode 100644 ports/msdfgen/compatibility.patch create mode 100644 ports/msdfgen/portfile.cmake create mode 100644 ports/msdfgen/vcpkg.json diff --git a/port_versions/baseline.json b/port_versions/baseline.json index c577ec1eef343b..4c76f975e67944 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -3848,6 +3848,10 @@ "baseline": "3.1.0", "port-version": 0 }, + "msdfgen": { + "baseline": "1.8", + "port-version": 0 + }, "msgpack": { "baseline": "3.3.0", "port-version": 0 diff --git a/port_versions/m-/msdfgen.json b/port_versions/m-/msdfgen.json new file mode 100644 index 00000000000000..1ae233d43bdb91 --- /dev/null +++ b/port_versions/m-/msdfgen.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8b15da4b26ea13caeba60337d49e6d5ec17c3e11", + "version-string": "1.8", + "port-version": 0 + } + ] +} diff --git a/ports/msdfgen/compatibility.patch b/ports/msdfgen/compatibility.patch new file mode 100644 index 00000000000000..f1662549a79243 --- /dev/null +++ b/ports/msdfgen/compatibility.patch @@ -0,0 +1,15 @@ +diff --git a/ext/import-font.cpp b/ext/import-font.cpp +index 8f23620..ed26f54 100644 +--- a/ext/import-font.cpp ++++ b/ext/import-font.cpp +@@ -7,10 +7,6 @@ + #include FT_FREETYPE_H + #include FT_OUTLINE_H + +-#ifdef _WIN32 +- #pragma comment(lib, "freetype.lib") +-#endif +- + namespace msdfgen { + + #define REQUIRE(cond) { if (!(cond)) return false; } diff --git a/ports/msdfgen/portfile.cmake b/ports/msdfgen/portfile.cmake new file mode 100644 index 00000000000000..cfe688c44d2bf3 --- /dev/null +++ b/ports/msdfgen/portfile.cmake @@ -0,0 +1,44 @@ +# No symbols are exported in msdfgen source +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Chlumsky/msdfgen + REF 9af250c7d6780a41dcaf536c05e3e1987a1bdcd7 + SHA512 6b1dadd386aedf1e2de927dc83fe1f7fd7e053b0e9829ea0609a193ab8d9f92ecf08d2a6225b76a4f7bf9344b2935f38bbd00c4cc0c6627c1d95f67d2db728fe + HEAD_REF master + PATCHES + compatibility.patch +) + +set(BUILD_TOOLS OFF) +if ("tools" IN_LIST FEATURES) + if (VCPKG_TARGET_IS_UWP) + message("Tools couldn't be built on UWP, disable it automatically.") + else() + set(BUILD_TOOLS ON) + endif() +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DMSDFGEN_BUILD_MSDFGEN_STANDALONE=${BUILD_TOOLS} +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/msdfgen) + +# move exe to tools +if(BUILD_TOOLS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_copy_tools(TOOL_NAMES msdfgen AUTO_CLEAN) +endif() + + +# cleanup +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# license +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/msdfgen/vcpkg.json b/ports/msdfgen/vcpkg.json new file mode 100644 index 00000000000000..5c8d9628c72c0a --- /dev/null +++ b/ports/msdfgen/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "msdfgen", + "version-string": "1.8", + "description": "Multi-channel signed distance field generator", + "homepage": "https://github.com/Chlumsky/msdfgen", + "dependencies": [ + "freetype" + ], + "features": { + "tools": { + "description": "Generates an executable inside the tools folder. Not supported on UWP." + } + } +} From ce145a024b2b996d90f1121dc15685d54f2895f7 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 16 Jan 2021 22:39:12 -0500 Subject: [PATCH 0502/1694] [openimageio] Bump to 2.2.10.0. (#15509) * [openimageio] Bump to 2.2.10.0. * Update port_versions Co-authored-by: NancyLi1013 --- port_versions/baseline.json | 4 +- port_versions/o-/openimageio.json | 5 + ports/openimageio/CONTROL | 5 +- ports/openimageio/fix-dependency.patch | 219 ++++++++++++++----------- ports/openimageio/fix-dependfmt.patch | 13 -- ports/openimageio/fix-libheif.patch | 26 --- ports/openimageio/fix-tools-path.patch | 13 -- ports/openimageio/portfile.cmake | 27 ++- 8 files changed, 149 insertions(+), 163 deletions(-) delete mode 100644 ports/openimageio/fix-dependfmt.patch delete mode 100644 ports/openimageio/fix-libheif.patch delete mode 100644 ports/openimageio/fix-tools-path.patch diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 4c76f975e67944..2faec6881515bd 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4229,8 +4229,8 @@ "port-version": 0 }, "openimageio": { - "baseline": "2.1.16.0", - "port-version": 4 + "baseline": "2.2.10.0", + "port-version": 0 }, "openjpeg": { "baseline": "2.3.1", diff --git a/port_versions/o-/openimageio.json b/port_versions/o-/openimageio.json index e3d438580672cd..8f05fd703a464e 100644 --- a/port_versions/o-/openimageio.json +++ b/port_versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3b1e2083feeb5968429f3349acaa46fa71f3054", + "version-string": "2.2.10.0", + "port-version": 0 + }, { "git-tree": "08ea57c10b4cf3c92b6c880b9ab9b8e9ae069088", "version-string": "2.1.16.0", diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL index 94973a0a775b57..a5694dc1edb74c 100644 --- a/ports/openimageio/CONTROL +++ b/ports/openimageio/CONTROL @@ -1,9 +1,8 @@ Source: openimageio -Version: 2.1.16.0 -Port-Version: 4 +Version: 2.2.10.0 Homepage: https://github.com/OpenImageIO/oiio Description: A library for reading and writing images, and a bunch of related classes, utilities, and application -Build-Depends: libjpeg-turbo, tiff, libpng, libheif, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random, robin-map, boost-stacktrace, fmt +Build-Depends: boost-algorithm, boost-asio, boost-config, boost-filesystem, boost-foreach, boost-random, boost-regex, boost-smart-ptr, boost-stacktrace, boost-static-assert, boost-system, boost-thread, boost-type-traits, fmt, libheif, libjpeg-turbo, libpng, openexr, robin-map, tiff, zlib Feature: libraw Build-Depends: libraw diff --git a/ports/openimageio/fix-dependency.patch b/ports/openimageio/fix-dependency.patch index 3dc3a16d01d625..d594570f271b9f 100644 --- a/ports/openimageio/fix-dependency.patch +++ b/ports/openimageio/fix-dependency.patch @@ -1,97 +1,122 @@ -diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake -index 2f4f7ce..16035df 100644 ---- a/src/cmake/externalpackages.cmake -+++ b/src/cmake/externalpackages.cmake -@@ -169,10 +169,17 @@ checked_find_package (PNG REQUIRED) - checked_find_package (TIFF 3.0 REQUIRED) - - # IlmBase & OpenEXR -+find_package (Threads) -+if (CMAKE_USE_PTHREADS_INIT) -+ set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT}) -+endif () - checked_find_package (OpenEXR 2.0 REQUIRED) - # We use Imath so commonly, may as well include it everywhere. --include_directories ("${OPENEXR_INCLUDES}" "${ILMBASE_INCLUDES}" -- "${ILMBASE_INCLUDES}/OpenEXR") -+set(ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_PTHREADS} CACHE STRING "The libraries needed to use IlmBase") -+set(OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${ILMBASE_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR") -+set(ILMBASE_INCLUDE_DIR ${OPENEXR_INCLUDE_DIR}) -+set(ILMBASE_FOUND TRUE) -+include_directories ("${OPENEXR_INCLUDE_DIR}") - if (CMAKE_COMPILER_IS_CLANG AND OPENEXR_VERSION VERSION_LESS 2.3) - # clang C++ >= 11 doesn't like 'register' keyword in old exr headers - add_compile_options (-Wno-deprecated-register) -@@ -217,7 +224,7 @@ checked_find_package (HDF5 - ISDEPOF Field3D) - checked_find_package (OpenColorIO - DEFINITIONS -DUSE_OCIO=1 -DUSE_OPENCOLORIO=1) --checked_find_package (OpenCV -+checked_find_package (OpenCV CONFIG - DEFINITIONS -DUSE_OPENCV=1) - - # Intel TBB -@@ -226,19 +233,23 @@ checked_find_package (TBB 2017 - ISDEPOF OpenVDB) - - checked_find_package (DCMTK 3.6.1) # For DICOM images --checked_find_package (FFmpeg 2.6) -+checked_find_package (FFMPEG) - checked_find_package (Field3D - DEPS HDF5 - DEFINITIONS -DUSE_FIELD3D=1) - checked_find_package (GIF 4) - checked_find_package (Libheif 1.3) # For HEIF/HEIC format - checked_find_package (LibRaw) --checked_find_package (OpenJpeg) -+checked_find_package (OpenJPEG CONFIG) - checked_find_package (OpenVDB 5.0 - DEPS TBB - DEFINITIONS -DUSE_OPENVDB=1) --checked_find_package (PTex) --checked_find_package (Webp) -+checked_find_package (ptex CONFIG) -+set(PTEX_FOUND ${ptex_FOUND}) -+set(PTEX_LIBRARIES Ptex::Ptex) -+checked_find_package (Webp CONFIG) -+set(WEBP_FOUND ${Webp_FOUND}) -+set(WEBP_LIBRARY WebP::webp WebP::webpdemux WebP::webpdecoder) - - option (USE_R3DSDK "Enable R3DSDK (RED camera) support" OFF) - checked_find_package (R3DSDK) # RED camera -@@ -254,7 +265,9 @@ if (OPENGL_FOUND) - list (APPEND qt5_modules OpenGL) - endif () - option (USE_QT "Use Qt if found" ON) -+if (USE_QT) - checked_find_package (Qt5 COMPONENTS ${qt5_modules}) -+endif() - if (USE_QT AND NOT Qt5_FOUND AND APPLE) - message (STATUS " If you think you installed qt5 with Homebrew and it still doesn't work,") - message (STATUS " try: export PATH=/usr/local/opt/qt5/bin:$PATH") -diff --git a/src/jpeg2000.imageio/CMakeLists.txt b/src/jpeg2000.imageio/CMakeLists.txt -index 7bc6adb..0ac8937 100644 ---- a/src/jpeg2000.imageio/CMakeLists.txt -+++ b/src/jpeg2000.imageio/CMakeLists.txt -@@ -3,7 +3,7 @@ - # https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md - - if (OPENJPEG_FOUND) -- if (${OPENJPEG_VERSION} VERSION_LESS 2.0) -+ if (0) - # Old OpenJpeg 1.5. Remove this eventually. - # - # For reasons I don't understand, OpenJPEG 1.5 fails imageinout_test -diff --git a/src/raw.imageio/CMakeLists.txt b/src/raw.imageio/CMakeLists.txt -index 81a0ff5..23326a0 100644 ---- a/src/raw.imageio/CMakeLists.txt -+++ b/src/raw.imageio/CMakeLists.txt -@@ -5,7 +5,7 @@ - if (LIBRAW_FOUND) - add_oiio_plugin (rawinput.cpp - INCLUDE_DIRS ${LibRaw_INCLUDE_DIR} -- LINK_LIBRARIES ${LibRaw_r_LIBRARIES} -+ LINK_LIBRARIES ${LibRaw_LIBRARIES} - DEFINITIONS "-DUSE_LIBRAW=1") - else () - message (WARNING "Raw plugin will not be built") +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index e7261af3..195f46cb 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -102,7 +102,6 @@ if (MSVC AND NOT LINKSTATIC) + add_definitions (-DOPENEXR_DLL) # Is this needed for new versions? + endif () + +- + # JPEG -- prefer Turbo-JPEG to regular libjpeg + checked_find_package (JPEGTurbo + DEFINITIONS -DUSE_JPEG_TURBO=1 +@@ -145,7 +144,7 @@ checked_find_package (HDF5 + ISDEPOF Field3D) + checked_find_package (OpenColorIO + DEFINITIONS -DUSE_OCIO=1 -DUSE_OPENCOLORIO=1) +-checked_find_package (OpenCV ++checked_find_package (OpenCV CONFIG + DEFINITIONS -DUSE_OPENCV=1) + + # Intel TBB +@@ -155,7 +154,7 @@ checked_find_package (TBB 2017 + ISDEPOF OpenVDB) + + checked_find_package (DCMTK VERSION_MIN 3.6.1) # For DICOM images +-checked_find_package (FFmpeg VERSION_MIN 2.6) ++checked_find_package (FFMPEG) + checked_find_package (Field3D + DEPS HDF5 + DEFINITIONS -DUSE_FIELD3D=1) +@@ -163,18 +162,25 @@ checked_find_package (GIF + VERSION_MIN 4 + RECOMMEND_MIN 5.0 + RECOMMEND_MIN_REASON "for stability and thread safety") +-checked_find_package (Libheif VERSION_MIN 1.3) # For HEIF/HEIC format +-checked_find_package (LibRaw ++checked_find_package (libheif CONFIG) # For HEIF/HEIC format ++checked_find_package (LibRaw CONFIG + RECOMMEND_MIN 0.18 + RECOMMEND_MIN_REASON "for ACES support and better camera metadata" +- PRINT LibRaw_r_LIBRARIES ) +-checked_find_package (OpenJpeg VERSION_MIN 2.0) ++ PRINT LibRaw_LIBRARIES ) ++checked_find_package (OpenJPEG CONFIG) + checked_find_package (OpenVDB + VERSION_MIN 5.0 + DEPS TBB + DEFINITIONS -DUSE_OPENVDB=1) +-checked_find_package (PTex) +-checked_find_package (WebP) ++checked_find_package (ptex CONFIG) ++set(PTEX_FOUND ${ptex_FOUND}) ++set(PTEX_LIBRARIES Ptex::Ptex) ++checked_find_package (WebP CONFIG) ++if(WebP_FOUND) ++ set(WEBP_FOUND TRUE) ++ add_library(WebP::WebP ALIAS WebP::webp) ++ add_library(WebP::WebPDemux ALIAS WebP::webpdemux) ++endif() + + option (USE_R3DSDK "Enable R3DSDK (RED camera) support" OFF) + checked_find_package (R3DSDK) # RED camera +@@ -287,5 +293,7 @@ macro (find_or_download_fmt) + checked_find_package (fmt REQUIRED) + endmacro() + +-find_or_download_fmt() ++find_package(fmt CONFIG REQUIRED) ++get_property(FMT_INCLUDES TARGET fmt::fmt PROPERTY INTERFACE_INCLUDE_DIRECTORIES) ++checked_find_package (fmt CONFIG REQUIRED) + include_directories (${FMT_INCLUDES}) +diff --git a/src/ffmpeg.imageio/CMakeLists.txt b/src/ffmpeg.imageio/CMakeLists.txt +index 6cf07636..8e77b1ed 100644 +--- a/src/ffmpeg.imageio/CMakeLists.txt ++++ b/src/ffmpeg.imageio/CMakeLists.txt +@@ -11,7 +11,7 @@ if (NOT MSVC) + PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations") + endif() + +-if (FFmpeg_FOUND) ++if (FFMPEG_FOUND) + add_oiio_plugin (ffmpeginput.cpp + INCLUDE_DIRS ${FFMPEG_INCLUDES} + LINK_LIBRARIES ${FFMPEG_LIBRARIES} +diff --git a/src/field3d.imageio/CMakeLists.txt b/src/field3d.imageio/CMakeLists.txt +index a9e54e3f..00fac073 100644 +--- a/src/field3d.imageio/CMakeLists.txt ++++ b/src/field3d.imageio/CMakeLists.txt +@@ -10,6 +10,6 @@ if (Field3D_FOUND) + add_oiio_plugin (field3dinput.cpp field3doutput.cpp + INCLUDE_DIRS ${FIELD3D_INCLUDES} + LINK_LIBRARIES Field3D::Field3D +- # ${HDF5_LIBRARIES} ++ ${HDF5_LIBRARIES} + ${SZIP_LIBRARY}) + endif() +diff --git a/src/heif.imageio/CMakeLists.txt b/src/heif.imageio/CMakeLists.txt +index fed80015..884d1312 100644 +--- a/src/heif.imageio/CMakeLists.txt ++++ b/src/heif.imageio/CMakeLists.txt +@@ -4,7 +4,7 @@ + + if (Libheif_FOUND) + add_oiio_plugin (heifinput.cpp heifoutput.cpp +- LINK_LIBRARIES Libheif::Libheif ++ LINK_LIBRARIES heif + DEFINITIONS "-DUSE_HEIF=1") + else () + message (WARNING "heif plugin will not be built") +diff --git a/src/raw.imageio/CMakeLists.txt b/src/raw.imageio/CMakeLists.txt +index 81a0ff54..23326a0a 100644 +--- a/src/raw.imageio/CMakeLists.txt ++++ b/src/raw.imageio/CMakeLists.txt +@@ -5,7 +5,7 @@ + if (LIBRAW_FOUND) + add_oiio_plugin (rawinput.cpp + INCLUDE_DIRS ${LibRaw_INCLUDE_DIR} +- LINK_LIBRARIES ${LibRaw_r_LIBRARIES} ++ LINK_LIBRARIES ${LibRaw_LIBRARIES} + DEFINITIONS "-DUSE_LIBRAW=1") + else () + message (WARNING "Raw plugin will not be built") diff --git a/ports/openimageio/fix-dependfmt.patch b/ports/openimageio/fix-dependfmt.patch deleted file mode 100644 index f0791f85ed1751..00000000000000 --- a/ports/openimageio/fix-dependfmt.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake -index 4f1dfaf..1a17d1e 100644 ---- a/src/cmake/externalpackages.cmake -+++ b/src/cmake/externalpackages.cmake -@@ -385,5 +385,7 @@ macro (find_or_download_fmt) - checked_find_package (fmt REQUIRED) - endmacro() - --find_or_download_fmt() -+find_package(fmt CONFIG REQUIRED) -+get_property(FMT_INCLUDES TARGET fmt::fmt PROPERTY INTERFACE_INCLUDE_DIRECTORIES) -+checked_find_package (fmt CONFIG REQUIRED) - include_directories (${FMT_INCLUDES}) diff --git a/ports/openimageio/fix-libheif.patch b/ports/openimageio/fix-libheif.patch deleted file mode 100644 index 2d73832f269d50..00000000000000 --- a/ports/openimageio/fix-libheif.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake -index 1a17d1e..2ba4264 100644 ---- a/src/cmake/externalpackages.cmake -+++ b/src/cmake/externalpackages.cmake -@@ -259,7 +259,7 @@ checked_find_package (Field3D - DEPS HDF5 - DEFINITIONS -DUSE_FIELD3D=1) - checked_find_package (GIF 4) --checked_find_package (Libheif 1.3) # For HEIF/HEIC format -+checked_find_package (libheif CONFIG) # For HEIF/HEIC format - checked_find_package (LibRaw) - checked_find_package (OpenJPEG CONFIG) - checked_find_package (OpenVDB 5.0 -diff --git a/src/heif.imageio/CMakeLists.txt b/src/heif.imageio/CMakeLists.txt -index cb5e5f9..f773fd5 100644 ---- a/src/heif.imageio/CMakeLists.txt -+++ b/src/heif.imageio/CMakeLists.txt -@@ -5,7 +5,7 @@ - if (LIBHEIF_FOUND) - add_oiio_plugin (heifinput.cpp heifoutput.cpp - INCLUDE_DIRS ${LIBHEIF_INCLUDES} -- LINK_LIBRARIES ${LIBHEIF_LIBRARIES} -+ LINK_LIBRARIES heif - DEFINITIONS "-DUSE_HEIF=1") - else () - message (WARNING "heif plugin will not be built") diff --git a/ports/openimageio/fix-tools-path.patch b/ports/openimageio/fix-tools-path.patch deleted file mode 100644 index b7bf3753bd10f7..00000000000000 --- a/ports/openimageio/fix-tools-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/cmake/oiio_macros.cmake b/src/cmake/oiio_macros.cmake -index 9e54f67..d9c9437 100644 ---- a/src/cmake/oiio_macros.cmake -+++ b/src/cmake/oiio_macros.cmake -@@ -142,7 +142,7 @@ macro (fancy_add_executable) - target_link_libraries (${_target_NAME} PRIVATE ${_target_LINK_LIBRARIES}) - endif () - set_target_properties (${_target_NAME} PROPERTIES FOLDER "Tools") -- install_targets (${_target_NAME}) -+ install(TARGETS ${_target_NAME} RUNTIME DESTINATION tools/openimageio) - else () - message (STATUS "${ColorRed}Disabling ${_target_NAME} ${ColorReset}") - endif () diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 9b640c6f8f3a3a..55d6c021702bce 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -1,16 +1,20 @@ +if("field3d" IN_LIST FEATURES) + vcpkg_fail_port_install( + ON_TARGET WINDOWS UWP + MESSAGE "The field3d feature is not supported on Windows" + ) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio - REF e028a5264bd229e128b37a4362f7eb9c73ea82cc #2.1.16.0 - SHA512 be5741e139c3c1d2fe62d6706833e9b158b6b00e1a57d141626f28cd3653f63e587b76de676b6b45d1a2330a0e71ebb2f1d00c108b68509cc418b6026424cfda + REF 5167b11277fffcd9fe18fe4dc35b3eb2669d8c44 # 2.2.10 + SHA512 d5812cf93bbaf8a384e8ee9f443db95a92320b4c35959a528dff40eac405355d1dec924a975bef7f367d3a2179ded0a15b4be9737d37521719739958bb7f3123 HEAD_REF master PATCHES + fix-config-cmake.patch fix-dependency.patch fix_static_build.patch - fix-tools-path.patch - fix-config-cmake.patch - fix-dependfmt.patch - fix-libheif.patch # Remove this patch on the next update ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") @@ -58,8 +62,10 @@ vcpkg_configure_cmake( -DUSE_QT=OFF -DUSE_PTEX=OFF -DLINKSTATIC=${LINKSTATIC} - -DBUILD_MISSING_PYBIND11=OFF + -DBUILD_MISSING_FMT=OFF + -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_DEPS=OFF + -DSTOP_ON_WARNING=OFF -DVERBOSE=ON ) @@ -69,8 +75,11 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OpenImageIO TARGET_PATH share/OpenImageIO) -if ("tools" IN_LIST FEATURES) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openimageio) +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES iconvert idiff igrep iinfo maketx oiiotool + AUTO_CLEAN + ) endif() # Clean From 61e4952e4b22cb3e5840f57662d57bc648914894 Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Sat, 16 Jan 2021 21:42:15 -0600 Subject: [PATCH 0503/1694] [flashlight-cpu] New port (#15514) * [flashlight-cpu] New port * Update ports/flashlight-cpu/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/flashlight-cpu/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/flashlight-cpu/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update commits and port versions, comments * Update ports/flashlight-cpu/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Tweaks to feature options for CUDA port * Update ports/flashlight-cuda/portfile.cmake * Update ports/flashlight-cuda/vcpkg.json * one more commit bump * Update port_versions * Add flashlight-cpu.json in port_versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 --- port_versions/baseline.json | 6 +- port_versions/f-/flashlight-cpu.json | 9 +++ port_versions/f-/flashlight-cuda.json | 5 ++ ports/flashlight-cpu/portfile.cmake | 71 +++++++++++++++++++++++ ports/flashlight-cpu/vcpkg.json | 81 +++++++++++++++++++++++++++ ports/flashlight-cuda/portfile.cmake | 18 ++++-- ports/flashlight-cuda/vcpkg.json | 2 +- 7 files changed, 185 insertions(+), 7 deletions(-) create mode 100644 port_versions/f-/flashlight-cpu.json create mode 100644 ports/flashlight-cpu/portfile.cmake create mode 100644 ports/flashlight-cpu/vcpkg.json diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 2faec6881515bd..49289eaacf3bc9 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -1904,8 +1904,12 @@ "baseline": "2019-04-07", "port-version": 1 }, + "flashlight-cpu": { + "baseline": "20210111", + "port-version": 0 + }, "flashlight-cuda": { - "baseline": "20201201", + "baseline": "20210111", "port-version": 0 }, "flatbuffers": { diff --git a/port_versions/f-/flashlight-cpu.json b/port_versions/f-/flashlight-cpu.json new file mode 100644 index 00000000000000..bc688ab5789746 --- /dev/null +++ b/port_versions/f-/flashlight-cpu.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d4a7e9f779d4cce7cc5fe65b83411fca53306f62", + "version-string": "20210111", + "port-version": 0 + } + ] +} diff --git a/port_versions/f-/flashlight-cuda.json b/port_versions/f-/flashlight-cuda.json index 987e28af3317a0..71400ff3c4cea3 100644 --- a/port_versions/f-/flashlight-cuda.json +++ b/port_versions/f-/flashlight-cuda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4308769591bc2d877cb5a2e829e7dfd64086c54", + "version-string": "20210111", + "port-version": 0 + }, { "git-tree": "2f4a40c0f613e3c43752f0a818667dcc4b932d28", "version-string": "20201201", diff --git a/ports/flashlight-cpu/portfile.cmake b/ports/flashlight-cpu/portfile.cmake new file mode 100644 index 00000000000000..221a0ef7defc3d --- /dev/null +++ b/ports/flashlight-cpu/portfile.cmake @@ -0,0 +1,71 @@ +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/flashlight-cuda") + message(FATAL_ERROR "flashlight-cuda is installed; only one Flashlight " + "backend package can be installed at once. Uninstall and try again:" + "\n vcpkg remove flashlight-cuda\n") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebookresearch/flashlight + REF 81c4d8d5ea57e9ceaa6db3b17f0861491fd31383 + SHA512 988da269be81f7b4897d72e52683259f4223029b5012150958b9b21c7103fe49a2458ffa5623ed53c125a98f7294541af46cd68b17e9213269e5a2aecfaabb67 + HEAD_REF master +) + +# Default flags +set(FL_DEFAULT_VCPKG_CMAKE_FLAGS + -DFL_BUILD_TESTS=OFF + -DFL_BUILD_EXAMPLES=OFF + -DFL_BACKEND=CPU # this port is CPU-backend only + -DFL_BUILD_STANDALONE=OFF + -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT} # for CMake configs/targets +) + +# Determine which components to build via specified feature +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + lib FL_BUILD_LIBRARIES + fl FL_BUILD_CORE + asr FL_BUILD_APP_ASR + imgclass FL_BUILD_APP_IMGCLASS + lm FL_BUILD_APP_LM +) + +# Build and install +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} + ${FEATURE_OPTIONS} +) +vcpkg_install_cmake() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Binaries/tools +set(FLASHLIGHT_TOOLS "") +if ("imgclass" IN_LIST FEATURES) + list(APPEND FLASHLIGHT_TOOLS fl_img_imagenet_resnet34) +endif() +if ("asr" IN_LIST FEATURES) + list(APPEND FLASHLIGHT_TOOLS + fl_asr_train + fl_asr_test + fl_asr_decode + fl_asr_align + fl_asr_voice_activity_detection_ctc + ) +endif() +if ("lm" IN_LIST FEATURES) + list(APPEND FLASHLIGHT_TOOLS fl_lm_train fl_lm_dictionary_builder) +endif() +list(LENGTH FLASHLIGHT_TOOLS NUM_TOOLS) +if (NUM_TOOLS GREATER 0) + vcpkg_copy_tools(TOOL_NAMES ${FLASHLIGHT_TOOLS} AUTO_CLEAN) +endif() + +# Copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/flashlight-cpu/vcpkg.json b/ports/flashlight-cpu/vcpkg.json new file mode 100644 index 00000000000000..fcce9f0a504c63 --- /dev/null +++ b/ports/flashlight-cpu/vcpkg.json @@ -0,0 +1,81 @@ +{ + "name": "flashlight-cpu", + "version-string": "20210111", + "description": "A C++ standalone library for machine learning. CPU backend.", + "homepage": "https://github.com/facebookresearch/flashlight", + "supports": "!(windows | osx)", + "default-features": [ + "fl" + ], + "features": { + "asr": { + "description": "flashlight asr app", + "dependencies": [ + { + "name": "flashlight-cpu", + "features": [ + "fl", + "lib" + ] + }, + "gflags", + "libsndfile" + ] + }, + "fl": { + "description": "flashlight core autograd and neural net library", + "dependencies": [ + { + "name": "arrayfire", + "features": [ + "cpu" + ] + }, + "cereal", + { + "name": "gloo", + "features": [ + "mpi" + ] + }, + "onednn", + "openmpi", + "stb" + ] + }, + "imgclass": { + "description": "flashlight image classification app", + "dependencies": [ + { + "name": "flashlight-cpu", + "features": [ + "fl", + "lib" + ] + }, + "gflags" + ] + }, + "lib": { + "description": "flashlight libraries", + "dependencies": [ + "fftw3", + "intel-mkl", + "kenlm" + ] + }, + "lm": { + "description": "flashlight lm app", + "dependencies": [ + { + "name": "flashlight-cpu", + "features": [ + "fl", + "lib" + ] + }, + "gflags" + ] + } + } +} diff --git a/ports/flashlight-cuda/portfile.cmake b/ports/flashlight-cuda/portfile.cmake index 1904394302d854..b21f393dac203a 100644 --- a/ports/flashlight-cuda/portfile.cmake +++ b/ports/flashlight-cuda/portfile.cmake @@ -1,8 +1,14 @@ +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/flashlight-cpu") + message(FATAL_ERROR "flashlight-cpu is installed; only one Flashlight " + "backend package can be installed at once. Uninstall and try again:" + "\n vcpkg remove flashlight-cpu\n") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookresearch/flashlight - REF 0948e97dbff23d474500a5f55bcf59d3b3589cf4 - SHA512 89c2efdebc6688a38f9fc3ebb8442c8fe2ad3d51c0e60c5dd8e7ca283715e07f48083543f09eed0db9929d86b765a898d9b3960a9b6f9844b20260f94cf71fdf + REF 81c4d8d5ea57e9ceaa6db3b17f0861491fd31383 + SHA512 988da269be81f7b4897d72e52683259f4223029b5012150958b9b21c7103fe49a2458ffa5623ed53c125a98f7294541af46cd68b17e9213269e5a2aecfaabb67 HEAD_REF master ) @@ -18,8 +24,8 @@ set(FL_DEFAULT_VCPKG_CMAKE_FLAGS # Determine which components to build via specified feature vcpkg_check_features( - OUT_FEATURE_OPTIONS FL_FEATURE_OPTIONS - FEATURES + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES lib FL_BUILD_LIBRARIES fl FL_BUILD_CORE asr FL_BUILD_APP_ASR @@ -31,7 +37,9 @@ vcpkg_check_features( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} ${FL_FEATURE_OPTIONS} + OPTIONS + ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} + ${FEATURE_OPTIONS} ) vcpkg_install_cmake() diff --git a/ports/flashlight-cuda/vcpkg.json b/ports/flashlight-cuda/vcpkg.json index b4e10e3c492eef..ca24ddc72c4994 100644 --- a/ports/flashlight-cuda/vcpkg.json +++ b/ports/flashlight-cuda/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flashlight-cuda", - "version-string": "20201201", + "version-string": "20210111", "description": "A C++ standalone library for machine learning. CUDA backend.", "homepage": "https://github.com/facebookresearch/flashlight", "supports": "!(windows | osx)", From fe6628c96f0b9faeedd7c346802212936d12fda7 Mon Sep 17 00:00:00 2001 From: emexal-company <60569989+emexal-company@users.noreply.github.com> Date: Sun, 17 Jan 2021 04:43:54 +0100 Subject: [PATCH 0504/1694] [SOCI] Add support for soci-mysql connector (#15577) * Add support for soci-mysql connector * Better fix to support soci-mysql connector * SOCI Port-Version, mysql options * Do not add the options several times * Remove extra parenthesis * [soci] Correct cmake config file name * update baseline Co-authored-by: JackBoosY --- port_versions/baseline.json | 2 +- port_versions/s-/soci.json | 5 +++++ ports/soci/CONTROL | 5 +++++ ports/soci/portfile.cmake | 10 ++++++++-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 49289eaacf3bc9..966db71725ead8 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -5342,7 +5342,7 @@ }, "soci": { "baseline": "4.0.1", - "port-version": 0 + "port-version": 1 }, "socket-io-client": { "baseline": "1.6.1-1", diff --git a/port_versions/s-/soci.json b/port_versions/s-/soci.json index 28f2679480c341..c5e60bc5399cf5 100644 --- a/port_versions/s-/soci.json +++ b/port_versions/s-/soci.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3715b7475ac7a9dd45c1d46c0f72b7c84f67c09", + "version-string": "4.0.1", + "port-version": 1 + }, { "git-tree": "f5e3d0da7cc2c6387fdd6b5e6ab13e1315e181c7", "version-string": "4.0.1", diff --git a/ports/soci/CONTROL b/ports/soci/CONTROL index f60240ee6ec18a..0a6a291bbe7521 100644 --- a/ports/soci/CONTROL +++ b/ports/soci/CONTROL @@ -1,5 +1,6 @@ Source: soci Version: 4.0.1 +Port-Version: 1 Homepage: https://github.com/SOCI/soci Description: SOCI database access library @@ -17,3 +18,7 @@ Description: Build postgresql backend Feature: odbc Description: Build odbc backend + +Feature: mysql +Build-Depends: libmysql +Description: Build mysql backend diff --git a/ports/soci/portfile.cmake b/ports/soci/portfile.cmake index bed98237a12ddc..fcf9204a9113da 100644 --- a/ports/soci/portfile.cmake +++ b/ports/soci/portfile.cmake @@ -23,6 +23,10 @@ foreach(_feature IN LISTS ALL_FEATURES) else() list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=OFF") endif() + + if(_feature MATCHES "mysql") + set(MYSQL_OPT -DMYSQL_INCLUDE_DIR="${CURRENT_INSTALLED_DIR}/include/mysql") + endif() endforeach() vcpkg_configure_cmake( @@ -37,14 +41,16 @@ vcpkg_configure_cmake( -DSOCI_SHARED=${SOCI_DYNAMIC} ${_COMPONENT_FLAGS} - -DWITH_MYSQL=OFF + ${MYSQL_OPT} -DWITH_ORACLE=OFF -DWITH_FIREBIRD=OFF -DWITH_DB2=OFF ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/SOCI) +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +# Correct the config file name +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCI.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCI-config.cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) From 5c8c3b5b31b2ff0310342b52a88065cc67fe5459 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 17 Jan 2021 04:45:51 +0100 Subject: [PATCH 0505/1694] =?UTF-8?q?[ignition-fuel-tools4]=20Add=20new=20?= =?UTF-8?q?port=20=F0=9F=A4=96=20(#15581)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add ignition-fuel-tools4 port * update port_versions --- port_versions/baseline.json | 4 ++++ port_versions/i-/ignition-fuel-tools4.json | 9 +++++++++ ports/ignition-fuel-tools4/CONTROL | 5 +++++ ports/ignition-fuel-tools4/portfile.cmake | 7 +++++++ 4 files changed, 25 insertions(+) create mode 100644 port_versions/i-/ignition-fuel-tools4.json create mode 100644 ports/ignition-fuel-tools4/CONTROL create mode 100644 ports/ignition-fuel-tools4/portfile.cmake diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 966db71725ead8..4a6f55419191ae 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -2420,6 +2420,10 @@ "baseline": "1.2.0-2", "port-version": 0 }, + "ignition-fuel-tools4": { + "baseline": "4.3.0", + "port-version": 0 + }, "ignition-math4": { "baseline": "4.0.0-1", "port-version": 0 diff --git a/port_versions/i-/ignition-fuel-tools4.json b/port_versions/i-/ignition-fuel-tools4.json new file mode 100644 index 00000000000000..6d8911aa6d47b2 --- /dev/null +++ b/port_versions/i-/ignition-fuel-tools4.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f151bec5a2340e8531307d7b205f8d78f56a7513", + "version-string": "4.3.0", + "port-version": 0 + } + ] +} diff --git a/ports/ignition-fuel-tools4/CONTROL b/ports/ignition-fuel-tools4/CONTROL new file mode 100644 index 00000000000000..af6e66d7603d26 --- /dev/null +++ b/ports/ignition-fuel-tools4/CONTROL @@ -0,0 +1,5 @@ +Source: ignition-fuel-tools4 +Version: 4.3.0 +Homepage: https://ignitionrobotics.org/libs/fuel_tools +Build-Depends: curl, ignition-cmake2, ignition-common3, ignition-modularscripts, ignition-msgs5, libyaml, libzip, jsoncpp, tinyxml2 +Description: Tools for using fuel API to download robot models diff --git a/ports/ignition-fuel-tools4/portfile.cmake b/ports/ignition-fuel-tools4/portfile.cmake new file mode 100644 index 00000000000000..3e88cbcc204e81 --- /dev/null +++ b/ports/ignition-fuel-tools4/portfile.cmake @@ -0,0 +1,7 @@ +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 + ) From adf653357cf3328e78963712b8a6d812c4f33803 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 17 Jan 2021 04:53:05 +0100 Subject: [PATCH 0506/1694] [vcpkg_build_make] remove libtool artifacts (#15622) --- scripts/cmake/vcpkg_build_make.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index a8b4a56943e419..5ebfe21f70a887 100755 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -238,6 +238,12 @@ function(vcpkg_build_make) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}_tmp") endif() + # Remove libtool files since they contain absolute paths and are not necessary. + file(GLOB_RECURSE LIBTOOL_FILES "${CURRENT_PACKAGES_DIR}/**/*.la") + if(LIBTOOL_FILES) + file(REMOVE ${LIBTOOL_FILES}) + endif() + if (CMAKE_HOST_WIN32) set(ENV{PATH} "${PATH_GLOBAL}") endif() From f6ca5af272da8ccd7318ae9c2d53947688bd24e4 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 16 Jan 2021 22:57:12 -0500 Subject: [PATCH 0507/1694] [openal-soft] Fix issue with cmake config. (#15634) * [openal-soft] Fix issue with cmake config. * update baseline Co-authored-by: JackBoosY --- port_versions/baseline.json | 2 +- port_versions/o-/openal-soft.json | 5 +++++ ports/openal-soft/CONTROL | 2 +- ports/openal-soft/portfile.cmake | 6 +++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 4a6f55419191ae..df567cfb6f2b94 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4166,7 +4166,7 @@ }, "openal-soft": { "baseline": "1.20.1", - "port-version": 5 + "port-version": 6 }, "openblas": { "baseline": "0.3.10", diff --git a/port_versions/o-/openal-soft.json b/port_versions/o-/openal-soft.json index 0d1df6ff1061cc..ac101a679a1137 100644 --- a/port_versions/o-/openal-soft.json +++ b/port_versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d67d0e5d79043433b022177e902f397c4c285f4c", + "version-string": "1.20.1", + "port-version": 6 + }, { "git-tree": "ede5d5168eb854c8f50f617bdeb1c263be8937d2", "version-string": "1.20.1", diff --git a/ports/openal-soft/CONTROL b/ports/openal-soft/CONTROL index a139fb9e8085a8..4bb4f27d3fb45e 100644 --- a/ports/openal-soft/CONTROL +++ b/ports/openal-soft/CONTROL @@ -1,6 +1,6 @@ Source: openal-soft Version: 1.20.1 -Port-Version: 5 +Port-Version: 6 Homepage: https://github.com/kcat/openal-soft Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API. Supports: !uwp diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index 31ebc6bae143ad..d66507f27fee0b 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -54,9 +54,9 @@ vcpkg_configure_cmake( -DALSOFT_BACKEND_JACK=OFF -DALSOFT_BACKEND_OPENSL=OFF -DALSOFT_BACKEND_WAVE=ON - -DALSOFT_REQUIRE_WINMM=${ALSOFT_REQUIRE_WINDOWS} - -DALSOFT_REQUIRE_DSOUND=${ALSOFT_REQUIRE_WINDOWS} - -DALSOFT_REQUIRE_MMDEVAPI=${ALSOFT_REQUIRE_WINDOWS} + -DALSOFT_BACKEND_WINMM=OFF + -DALSOFT_BACKEND_DSOUND=OFF + -DALSOFT_REQUIRE_WASAPI=${ALSOFT_REQUIRE_WINDOWS} -DALSOFT_CPUEXT_NEON=OFF -DCMAKE_DISABLE_FIND_PACKAGE_WindowsSDK=ON ) From 0cb4541faf87e10536cc287e0bf2bd3fd91edab5 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sun, 17 Jan 2021 05:03:04 +0100 Subject: [PATCH 0508/1694] [glslang] Provide glslang-default-resource-limits library. (#15624) * [glslang] Provide glslang-default-resource-limits library. * [glslang] Use Port-Version field. Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update port_versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 --- port_versions/baseline.json | 4 ++-- port_versions/g-/glslang.json | 5 +++++ ports/glslang/CMakeLists-targets.patch | 13 +++++++++++++ ports/glslang/CONTROL | 5 +++-- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index df567cfb6f2b94..c00de41a85c2df 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -2185,8 +2185,8 @@ "port-version": 0 }, "glslang": { - "baseline": "2019-03-05-1", - "port-version": 0 + "baseline": "2019-03-05", + "port-version": 2 }, "glui": { "baseline": "2019-11-30", diff --git a/port_versions/g-/glslang.json b/port_versions/g-/glslang.json index 13cdce3ef537e2..b9dfb0d7b5fb6a 100644 --- a/port_versions/g-/glslang.json +++ b/port_versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29f2d736c8273c412c4fcf0fd50da379d1ec9a0b", + "version-string": "2019-03-05", + "port-version": 2 + }, { "git-tree": "02b23c6369ff2b1aed2e57bceeb184b544d388e2", "version-string": "2019-03-05-1", diff --git a/ports/glslang/CMakeLists-targets.patch b/ports/glslang/CMakeLists-targets.patch index 36e923d9262b1f..53cf5bf8f08671 100644 --- a/ports/glslang/CMakeLists-targets.patch +++ b/ports/glslang/CMakeLists-targets.patch @@ -106,3 +106,16 @@ index f918d7a..329800f 100644 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) else() +diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt +index 5cea53d9..43e45534 100644 +--- a/StandAlone/CMakeLists.txt ++++ b/StandAlone/CMakeLists.txt +@@ -46,7 +46,7 @@ if(ENABLE_GLSLANG_INSTALL) + install(TARGETS spirv-remap + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + +- if(BUILD_SHARED_LIBS) ++ if(BUILD_SHARED_LIBS OR TRUE) + install(TARGETS glslang-default-resource-limits + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() diff --git a/ports/glslang/CONTROL b/ports/glslang/CONTROL index 06f8f810fc4b88..f0b38f4d232417 100644 --- a/ports/glslang/CONTROL +++ b/ports/glslang/CONTROL @@ -1,4 +1,5 @@ Source: glslang -Version: 2019-03-05-1 +Version: 2019-03-05 +Port-Version: 2 Homepage: https://github.com/KhronosGroup/glslang -Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator \ No newline at end of file +Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator From 2cd85f66086c3a0b4451da20ce2a5b8019471b39 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 17 Jan 2021 05:08:35 +0100 Subject: [PATCH 0509/1694] [vcpkg_acquire_msys] add findutils as a dependency to libtool (#15611) --- scripts/cmake/vcpkg_acquire_msys.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index ac48d177718f62..9b15a76c72e2ff 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -185,7 +185,7 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) msys_package( URL "https://repo.msys2.org/msys/x86_64/libtool-2.4.6-9-x86_64.pkg.tar.xz" SHA512 b309799e5a9d248ef66eaf11a0bd21bf4e8b9bd5c677c627ec83fa760ce9f0b54ddf1b62cbb436e641fbbde71e3b61cb71ff541d866f8ca7717a3a0dbeb00ebf - DEPS grep sed coreutils file + DEPS grep sed coreutils file findutils ) msys_package( URL "https://repo.msys2.org/msys/x86_64/file-5.39-1-x86_64.pkg.tar.zst" From 35ca1a78c05a875320834bf3a8ffa930379656e2 Mon Sep 17 00:00:00 2001 From: Maxim Marshev <67420634+marshevms@users.noreply.github.com> Date: Sun, 17 Jan 2021 08:11:41 +0400 Subject: [PATCH 0510/1694] delete linux from fail port from tomlplusplus (#15609) * delete linux * Update ports/tomlplusplus/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update port_versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 --- port_versions/baseline.json | 2 +- port_versions/t-/tomlplusplus.json | 5 +++++ ports/tomlplusplus/CONTROL | 3 ++- ports/tomlplusplus/portfile.cmake | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index c00de41a85c2df..250f6157cf862c 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -5806,7 +5806,7 @@ }, "tomlplusplus": { "baseline": "2.3.0", - "port-version": 0 + "port-version": 1 }, "tool-meson": { "baseline": "0.56.02", diff --git a/port_versions/t-/tomlplusplus.json b/port_versions/t-/tomlplusplus.json index 4c39543f3cf730..1a7dba67f5c050 100644 --- a/port_versions/t-/tomlplusplus.json +++ b/port_versions/t-/tomlplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ea8a3d5b0f08bd4933f8caba3acc4992bfeab7a", + "version-string": "2.3.0", + "port-version": 1 + }, { "git-tree": "68e42fded6663929a501cfa1a276df3a0e369ebd", "version-string": "2.3.0", diff --git a/ports/tomlplusplus/CONTROL b/ports/tomlplusplus/CONTROL index b196607e6f00e5..3ffba523352c2c 100644 --- a/ports/tomlplusplus/CONTROL +++ b/ports/tomlplusplus/CONTROL @@ -1,5 +1,6 @@ Source: tomlplusplus Version: 2.3.0 +Port-Version: 1 Homepage: https://marzer.github.io/tomlplusplus/ Description: Header-only TOML config file parser and serializer for modern C++. -Supports: !(arm|uwp|linux|osx) +Supports: !(arm|uwp|osx) diff --git a/ports/tomlplusplus/portfile.cmake b/ports/tomlplusplus/portfile.cmake index 974bc99a06526f..5edaf68cd2d76e 100644 --- a/ports/tomlplusplus/portfile.cmake +++ b/ports/tomlplusplus/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "linux" "osx" "uwp") +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "osx" "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH From df6179a48ea0bc4e51fec2d409537ea7e121b920 Mon Sep 17 00:00:00 2001 From: Alessandro Arcangeli Date: Tue, 19 Jan 2021 09:45:07 +0100 Subject: [PATCH 0511/1694] fix wrong path in specifications/manifests.md (#15688) --- docs/specifications/manifests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/specifications/manifests.md b/docs/specifications/manifests.md index 350cfd0c7df514..bc4e1d7cca4ad3 100644 --- a/docs/specifications/manifests.md +++ b/docs/specifications/manifests.md @@ -236,7 +236,7 @@ And finally, to configure and build: ```sh $ cd example -$ cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystem/vcpkg.cmake +$ cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake ... configuring and installing... $ cmake --build build ``` From b0f4c6abd53015e131f2e26cafe8ea68d36f85ae Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Tue, 19 Jan 2021 00:46:00 -0800 Subject: [PATCH 0512/1694] [pegtl] Update to 3.2.0 release (#15700) * [pegtl] Update to 3.2.0 release * Run x-add-version pegtl --- port_versions/baseline.json | 2 +- port_versions/p-/pegtl.json | 5 +++++ ports/pegtl/CONTROL | 2 +- ports/pegtl/portfile.cmake | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 250f6157cf862c..90249ca75059ee 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4457,7 +4457,7 @@ "port-version": 0 }, "pegtl": { - "baseline": "3.1.0", + "baseline": "3.2.0", "port-version": 0 }, "pegtl-2": { diff --git a/port_versions/p-/pegtl.json b/port_versions/p-/pegtl.json index f3fe7c04d6a1ae..2ffb8a0f9ad4a5 100644 --- a/port_versions/p-/pegtl.json +++ b/port_versions/p-/pegtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9d21ac506ea50664bb2c18b94f02faf3067fbc1", + "version-string": "3.2.0", + "port-version": 0 + }, { "git-tree": "d90ba3461a4253fee67f84ef2ca0232b21a4f24b", "version-string": "3.1.0", diff --git a/ports/pegtl/CONTROL b/ports/pegtl/CONTROL index 5330daf1aa546e..06f75c201155b0 100644 --- a/ports/pegtl/CONTROL +++ b/ports/pegtl/CONTROL @@ -1,4 +1,4 @@ Source: pegtl -Version: 3.1.0 +Version: 3.2.0 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 diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake index 470ca9930cb9d5..265f596c4f2675 100644 --- a/ports/pegtl/portfile.cmake +++ b/ports/pegtl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taocpp/pegtl - REF 3.1.0 - SHA512 b142d60fab4e3ba39cefbf3569add33400f759e4539714f1164cd10ea869e312b2cd8bfa23dca9f012f8ae8574c84263f471950d6480d42c61be0057b67d4dfc + REF 3.2.0 + SHA512 3ec457e37d87d95f3a89c550abbf611a1ce094c2f05f6d23086e70079a9cabddb4c75e9121e764ad1768845a39e62ab49ca658ffed0f09d0e9a0e36501a162ae HEAD_REF master ) From f5bf7a092b9ea47a635941de5ceff5b5ac334012 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 19 Jan 2021 03:47:24 -0500 Subject: [PATCH 0513/1694] [google-cloud-cpp] update to v1.23.0 (#15669) * [google-cloud-cpp] update to v1.23.0 * Fix versions --- port_versions/baseline.json | 2 +- port_versions/g-/google-cloud-cpp.json | 5 +++++ ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 90249ca75059ee..6839f0f3aa0e08 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -2205,7 +2205,7 @@ "port-version": 0 }, "google-cloud-cpp": { - "baseline": "1.22.0", + "baseline": "1.23.0", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/port_versions/g-/google-cloud-cpp.json b/port_versions/g-/google-cloud-cpp.json index 178cb1928b0132..3f4e71bcfa2f2b 100644 --- a/port_versions/g-/google-cloud-cpp.json +++ b/port_versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab2377218e8992e8aedf8fed757edb90cc390817", + "version-string": "1.23.0", + "port-version": 0 + }, { "git-tree": "85ed59dd339159f0600765d49cb7e1e723e67fec", "version-string": "1.22.0", diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 344b39d5ee4d21..4f6ce69108f101 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.22.0 - SHA512 bf5554009d4dddef8782fa7a6ea9790e47169c1558dda4b2bd3caf83efe25c7b04d5d6b7b4dbbc3540790b243b7c9496ebc79f07e21a310c83e952c3596f0536 + REF v1.23.0 + SHA512 66c8bc6a878dbe23be0dd8fbe2580b725a2e5dab1b132a53f3454a32ec0cce706bdeae8b08b1922acc892f7983df5bc076e3d16993d5d0c1bda75e8a1195c882 HEAD_REF master ) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index ddc2b1ac8e50b3..a99b539c32e006 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version-string": "1.22.0", + "version-string": "1.23.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "supports": "!uwp", From bb550ab7f5e08900f527750ce70097dbaaa625c3 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 20 Jan 2021 02:36:36 +0800 Subject: [PATCH 0514/1694] [vcpkg baseline] Disable spatialite-tools on linux and osx (#15746) * [vcpkg baseline] Disable spatialite-tools on linux and osx * Update the order --- scripts/ci.baseline.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 95241f5e70cc9e..8177e7e624468c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1519,6 +1519,8 @@ soundtouch:x64-windows-static-md=fail spaceland:arm64-windows=fail spaceland:arm-uwp=fail spaceland:x64-uwp=fail +spatialite-tools:x64-linux=fail +spatialite-tools:x64-osx=fail spdk:x64-linux=fail spdk-dpdk:arm64-windows=fail spdk-dpdk:arm-uwp=fail From 9d8e43d8ba3abf1df93693eccc514124900bdd03 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 20 Jan 2021 02:55:29 +0800 Subject: [PATCH 0515/1694] [usockets] Update uSockets to the latest version (#15743) * [uSockets] Update uSockets to the latest version * Update port_versions * Update portfile.cmake * update baseline Co-authored-by: NancyLi1013 --- port_versions/baseline.json | 4 ++-- port_versions/u-/usockets.json | 5 +++++ ports/usockets/CONTROL | 4 ++-- ports/usockets/portfile.cmake | 6 +++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 6839f0f3aa0e08..8d593ad052af89 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -5925,8 +5925,8 @@ "port-version": 0 }, "usockets": { - "baseline": "0.6.0", - "port-version": 1 + "baseline": "2021-1-19", + "port-version": 0 }, "usrsctp": { "baseline": "0db9691", diff --git a/port_versions/u-/usockets.json b/port_versions/u-/usockets.json index 6f6a6186cc8b41..6f95a32907d74d 100644 --- a/port_versions/u-/usockets.json +++ b/port_versions/u-/usockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5975b2b9c3d03c5a2d02cf19eaa35e5370e7ebad", + "version-string": "2021-1-19", + "port-version": 0 + }, { "git-tree": "2234660f66ba0960924aebfc3be037cf22e9e222", "version-string": "0.6.0", diff --git a/ports/usockets/CONTROL b/ports/usockets/CONTROL index e8dc13ac68ca08..94279f0c1809b7 100644 --- a/ports/usockets/CONTROL +++ b/ports/usockets/CONTROL @@ -1,7 +1,7 @@ Source: usockets -Version: 0.6.0 -Port-Version: 1 +Version: 2021-1-19 Build-Depends:libuv +Homepage: https://github.com/uNetworking/uSockets Description: Miniscule cross-platform eventing, networking & crypto for async applications Feature: ssl diff --git a/ports/usockets/portfile.cmake b/ports/usockets/portfile.cmake index 9eb3c7a57ef816..42b8c84e9ceeeb 100644 --- a/ports/usockets/portfile.cmake +++ b/ports/usockets/portfile.cmake @@ -5,8 +5,8 @@ EndIF () vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uSockets - REF 0a81a97aa2182cbf55a38bc18196ef6c535c3981 # v0.6.0 - SHA512 244f8111a5e42d7b12094d6d5e3ddd4848b71477f74d023874cdb70799aa4c86322608a4483ff3e1a4029db9c51c06462460f9f89456692c75fbad754e2c3384 + REF 7683672d87067cd75b854f4e36b9820f4809a4be # 2021-1-19 + SHA512 0dbedc5e90af9a92e6597e801116b57fd99dcd5a8488e3b5ddce83bbcd1852d30f2c8954dc1991a807d32f00bdb62e654498687fec344d295f299ccf3920a1ca HEAD_REF master ) @@ -35,4 +35,4 @@ vcpkg_install_cmake() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() From 6efd7690f5167cc6711f46806c37ffbbb85ed763 Mon Sep 17 00:00:00 2001 From: tiqac <77594046+tiqac@users.noreply.github.com> Date: Wed, 20 Jan 2021 04:56:14 +1000 Subject: [PATCH 0516/1694] [phnt] Update to 2020-12-21 (#15722) * [phnt] Update to 2020-12-21 * Run x-add-version * version-string -> version-date * Run x-add-version --- port_versions/baseline.json | 2 +- port_versions/p-/phnt.json | 5 +++++ ports/phnt/CONTROL | 4 ---- ports/phnt/portfile.cmake | 9 +++------ ports/phnt/vcpkg.json | 6 ++++++ 5 files changed, 15 insertions(+), 11 deletions(-) delete mode 100644 ports/phnt/CONTROL create mode 100644 ports/phnt/vcpkg.json diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 8d593ad052af89..b8659a2d930f5e 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4473,7 +4473,7 @@ "port-version": 0 }, "phnt": { - "baseline": "2019-05-01", + "baseline": "2020-12-21", "port-version": 0 }, "physfs": { diff --git a/port_versions/p-/phnt.json b/port_versions/p-/phnt.json index 74cf0ef95336e8..b5239bae979756 100644 --- a/port_versions/p-/phnt.json +++ b/port_versions/p-/phnt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93f6534bed52cf8dfda970f4ddc5b51352eac5bd", + "version-date": "2020-12-21", + "port-version": 0 + }, { "git-tree": "fa7a8a91ecb156614e8a72657f76fd6220624525", "version-string": "2019-05-01", diff --git a/ports/phnt/CONTROL b/ports/phnt/CONTROL deleted file mode 100644 index c563c0d3413959..00000000000000 --- a/ports/phnt/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: phnt -Version: 2019-05-01 -Homepage: https://github.com/processhacker/phnt -Description: Windows Native API header files \ No newline at end of file diff --git a/ports/phnt/portfile.cmake b/ports/phnt/portfile.cmake index a75aab70d91876..78f6a86c292c54 100644 --- a/ports/phnt/portfile.cmake +++ b/ports/phnt/portfile.cmake @@ -1,15 +1,12 @@ -#header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO processhacker/phnt - REF 33cfd75a2be59bbde3aa4db3399a9e6bab66ae6a - SHA512 90a1b38d27e35e7706e66dae0f4e151b50f5b74fbedf15ad165beece6a94b8a87263e16e1e0b891a324091c3769fd2ff2f541e11691b322413e575e6f08dc746 + REF 3f19efe9fd402378c7cd12fe1c0aacd154c8cd3c + SHA512 88f1f5ab1f2c8b3100e47f43cee7bdcb412ef9f688e3840ddc8a78d8b75b4baf714aadc27829e0ea95d97a22031019d25f9916d09bb63cea37304e9c9c08285a HEAD_REF master ) -# Install headers file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h) file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/phnt RENAME copyright) \ No newline at end of file +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) \ No newline at end of file diff --git a/ports/phnt/vcpkg.json b/ports/phnt/vcpkg.json new file mode 100644 index 00000000000000..cc10293aa754d7 --- /dev/null +++ b/ports/phnt/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "phnt", + "version-date": "2020-12-21", + "description": "Windows Native API header files", + "homepage": "https://github.com/processhacker/phnt" +} From 7284dc7773296f75b2b7773e4a0f69686e559b2d Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 19 Jan 2021 20:09:54 +0100 Subject: [PATCH 0517/1694] [sdformat9] Update to 9.4.0 (#15720) * Update sdformat9 to 9.4.0 * Update port_versions for sdformat9 9.4.0 --- port_versions/baseline.json | 2 +- port_versions/s-/sdformat9.json | 5 + ports/sdformat9/CONTROL | 4 +- ports/sdformat9/fix-dependency-urdfdom.patch | 6 +- ports/sdformat9/portfile.cmake | 5 +- ports/sdformat9/respect-build-testing.patch | 182 ------------------- 6 files changed, 13 insertions(+), 191 deletions(-) delete mode 100644 ports/sdformat9/respect-build-testing.patch diff --git a/port_versions/baseline.json b/port_versions/baseline.json index b8659a2d930f5e..754b44fab90ec9 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -5165,7 +5165,7 @@ "port-version": 0 }, "sdformat9": { - "baseline": "9.2.0-1", + "baseline": "9.4.0", "port-version": 0 }, "sdl1": { diff --git a/port_versions/s-/sdformat9.json b/port_versions/s-/sdformat9.json index 49c414f06cb35f..40b840e897d7a8 100644 --- a/port_versions/s-/sdformat9.json +++ b/port_versions/s-/sdformat9.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "750aebae0f740736affd93087026e0e344d81af2", + "version-string": "9.4.0", + "port-version": 0 + }, { "git-tree": "54ae4ec88f43847be416ec4fbf9348a90e2c5b63", "version-string": "9.2.0-1", diff --git a/ports/sdformat9/CONTROL b/ports/sdformat9/CONTROL index d9fba0d8f44a03..a83ec79bb12b1d 100644 --- a/ports/sdformat9/CONTROL +++ b/ports/sdformat9/CONTROL @@ -1,6 +1,6 @@ Source: sdformat9 -Version: 9.2.0-1 +Version: 9.4.0 Homepage: http://sdformat.org/ Build-Depends: ignition-math6, urdfdom, tinyxml Description: Simulation Description Format (SDF) parser and description files. -Supports: !(linux|uwp) \ No newline at end of file +Supports: !(linux|uwp) diff --git a/ports/sdformat9/fix-dependency-urdfdom.patch b/ports/sdformat9/fix-dependency-urdfdom.patch index d2b1a5947508ac..d9016c6de39f30 100644 --- a/ports/sdformat9/fix-dependency-urdfdom.patch +++ b/ports/sdformat9/fix-dependency-urdfdom.patch @@ -12,6 +12,6 @@ index 965f1ec..cf2acf4 100644 - if (NOT URDF_FOUND) + if (NOT urdfdom_FOUND) - if (NOT DEFINED USE_INTERNAL_URDF) - message(STATUS "Couldn't find urdfdom >= 1.0, using internal copy") - set(USE_INTERNAL_URDF true) + find_package(urdfdom) + if (urdfdom_FOUND) + set(URDF_INCLUDE_DIRS ${urdfdom_INCLUDE_DIRS}) diff --git a/ports/sdformat9/portfile.cmake b/ports/sdformat9/portfile.cmake index c1567efbcf1661..b8807e0fe0c4f3 100644 --- a/ports/sdformat9/portfile.cmake +++ b/ports/sdformat9/portfile.cmake @@ -3,11 +3,10 @@ vcpkg_fail_port_install(ON_TARGET "linux" "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osrf/sdformat - REF sdformat9_9.2.0 - SHA512 6fc7d0ce46d9a7d1cae4fd905ebe6a07bb4ba98faa267be92a32b3409d6d82a99d5082485008a15484f7b5be2c347b5b24bc472fb1a4be5eb8b678b105cae6af + REF sdformat9_9.4.0 + SHA512 b7ed458a5a9ba5b5dcf457d3e0c9de0bca3d514a6870aa977a00a84f8a3b8d1bd21f3b437c0651af7f0cc9b9c6c8b905c968525194605b334ab62280b9d55b0e HEAD_REF sdf9 PATCHES - respect-build-testing.patch # Backport of https://github.com/osrf/sdformat/pull/269 fix-dependency-urdfdom.patch ) diff --git a/ports/sdformat9/respect-build-testing.patch b/ports/sdformat9/respect-build-testing.patch deleted file mode 100644 index 8509b91ea7641c..00000000000000 --- a/ports/sdformat9/respect-build-testing.patch +++ /dev/null @@ -1,182 +0,0 @@ -From f31b1d65e0cc550d37ff9f67a01af055534282d0 Mon Sep 17 00:00:00 2001 -From: Silvio -Date: Sat, 2 May 2020 12:39:02 +0200 -Subject: [PATCH] If defined observe the CMake variable BUILD_TESTING - -For backward compatibility if it is not defined compile the tests - -Signed-off-by: Silvio ---- - CMakeLists.txt | 10 +++- - src/CMakeLists.txt | 136 +++++++++++++++++++++++---------------------- - 2 files changed, 78 insertions(+), 68 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c0b934f9..38a71649 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -265,7 +265,15 @@ else (build_errors) - - link_directories(${PROJECT_BINARY_DIR}/src) - -- add_subdirectory(test) -+ if (NOT DEFINED BUILD_TESTING OR BUILD_TESTING) -+ set(BUILD_SDF_TEST TRUE) -+ else() -+ set(BUILD_SDF_TEST FALSE) -+ endif() -+ -+ if (BUILD_SDF_TEST) -+ add_subdirectory(test) -+ endif() - add_subdirectory(src) - add_subdirectory(include/sdf) - add_subdirectory(sdf) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7dbb9536..c283a00a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -91,74 +91,76 @@ else() - include_directories(${URDF_INCLUDE_DIRS}) - endif() - --set (gtest_sources -- Actor_TEST.cc -- AirPressure_TEST.cc -- Altimeter_TEST.cc -- Atmosphere_TEST.cc -- Box_TEST.cc -- Camera_TEST.cc -- Collision_TEST.cc -- Console_TEST.cc -- Cylinder_TEST.cc -- Element_TEST.cc -- Error_TEST.cc -- Exception_TEST.cc -- Frame_TEST.cc -- Filesystem_TEST.cc -- Geometry_TEST.cc -- Gui_TEST.cc -- Imu_TEST.cc -- Joint_TEST.cc -- JointAxis_TEST.cc -- Lidar_TEST.cc -- Light_TEST.cc -- Link_TEST.cc -- Magnetometer_TEST.cc -- Material_TEST.cc -- Mesh_TEST.cc -- Model_TEST.cc -- Noise_TEST.cc -- parser_urdf_TEST.cc -- Param_TEST.cc -- parser_TEST.cc -- Pbr_TEST.cc -- Physics_TEST.cc -- Plane_TEST.cc -- Root_TEST.cc -- Scene_TEST.cc -- SemanticPose_TEST.cc -- SDF_TEST.cc -- Sensor_TEST.cc -- Sphere_TEST.cc -- Surface_TEST.cc -- Types_TEST.cc -- Visual_TEST.cc -- World_TEST.cc --) -- --# Build this test file only if Ignition Tools is installed. --if (IGNITION-TOOLS_BINARY_DIRS) -- set (gtest_sources ${gtest_sources} -- ign_TEST.cc -+if (BUILD_SDF_TEST) -+ set (gtest_sources -+ Actor_TEST.cc -+ AirPressure_TEST.cc -+ Altimeter_TEST.cc -+ Atmosphere_TEST.cc -+ Box_TEST.cc -+ Camera_TEST.cc -+ Collision_TEST.cc -+ Console_TEST.cc -+ Cylinder_TEST.cc -+ Element_TEST.cc -+ Error_TEST.cc -+ Exception_TEST.cc -+ Frame_TEST.cc -+ Filesystem_TEST.cc -+ Geometry_TEST.cc -+ Gui_TEST.cc -+ Imu_TEST.cc -+ Joint_TEST.cc -+ JointAxis_TEST.cc -+ Lidar_TEST.cc -+ Light_TEST.cc -+ Link_TEST.cc -+ Magnetometer_TEST.cc -+ Material_TEST.cc -+ Mesh_TEST.cc -+ Model_TEST.cc -+ Noise_TEST.cc -+ parser_urdf_TEST.cc -+ Param_TEST.cc -+ parser_TEST.cc -+ Pbr_TEST.cc -+ Physics_TEST.cc -+ Plane_TEST.cc -+ Root_TEST.cc -+ Scene_TEST.cc -+ SemanticPose_TEST.cc -+ SDF_TEST.cc -+ Sensor_TEST.cc -+ Sphere_TEST.cc -+ Surface_TEST.cc -+ Types_TEST.cc -+ Visual_TEST.cc -+ World_TEST.cc - ) --endif() -- --sdf_build_tests(${gtest_sources}) -- --if (NOT WIN32) -- set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Utils.cc) -- sdf_build_tests(Utils_TEST.cc) --endif() -- --if (NOT WIN32) -- set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS FrameSemantics.cc) -- sdf_build_tests(FrameSemantics_TEST.cc) --endif() -- --if (NOT WIN32) -- set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Converter.cc) -- sdf_build_tests(Converter_TEST.cc) -+ -+ # Build this test file only if Ignition Tools is installed. -+ if (IGNITION-TOOLS_BINARY_DIRS) -+ set (gtest_sources ${gtest_sources} -+ ign_TEST.cc -+ ) -+ endif() -+ -+ sdf_build_tests(${gtest_sources}) -+ -+ if (NOT WIN32) -+ set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Utils.cc) -+ sdf_build_tests(Utils_TEST.cc) -+ endif() -+ -+ if (NOT WIN32) -+ set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS FrameSemantics.cc) -+ sdf_build_tests(FrameSemantics_TEST.cc) -+ endif() -+ -+ if (NOT WIN32) -+ set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Converter.cc) -+ sdf_build_tests(Converter_TEST.cc) -+ endif() - endif() - - sdf_add_library(${sdf_target} ${sources}) From 55e08a6d0748f6b6ee6ad41d08bd572e6e8e9add Mon Sep 17 00:00:00 2001 From: Rodion Malinovsky Date: Tue, 19 Jan 2021 21:45:40 +0200 Subject: [PATCH 0518/1694] [xlnt] Prevent macro redefinition (#15645) --- port_versions/baseline.json | 2 +- port_versions/x-/xlnt.json | 5 +++++ ports/xlnt/CONTROL | 1 + ports/xlnt/static-linking-for-windows.patch | 11 +++++++---- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 754b44fab90ec9..36195eafa3fc7b 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -6174,7 +6174,7 @@ }, "xlnt": { "baseline": "1.5.0", - "port-version": 0 + "port-version": 1 }, "xmlsec": { "baseline": "1.2.31", diff --git a/port_versions/x-/xlnt.json b/port_versions/x-/xlnt.json index 86bfbeea18bfca..e078174a4fb35f 100644 --- a/port_versions/x-/xlnt.json +++ b/port_versions/x-/xlnt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e9127d56c2d772d64454b5aef80f93689f70242", + "version-string": "1.5.0", + "port-version": 1 + }, { "git-tree": "1f17fd4b98bd2f8a5f0d02aa8db2cd7b1ed1552f", "version-string": "1.5.0", diff --git a/ports/xlnt/CONTROL b/ports/xlnt/CONTROL index 3e03a5a4ffae17..88ebdddf61f106 100644 --- a/ports/xlnt/CONTROL +++ b/ports/xlnt/CONTROL @@ -1,4 +1,5 @@ Source: xlnt Version: 1.5.0 +Port-Version: 1 Homepage: https://github.com/tfussell/xlnt Description: Cross-platform user-friendly xlsx library for C++14 diff --git a/ports/xlnt/static-linking-for-windows.patch b/ports/xlnt/static-linking-for-windows.patch index 9f27197242d95f..603286cf9d75a9 100644 --- a/ports/xlnt/static-linking-for-windows.patch +++ b/ports/xlnt/static-linking-for-windows.patch @@ -1,13 +1,16 @@ diff --git a/include/xlnt/xlnt.hpp b/include/xlnt/xlnt.hpp -index 01fe4981..9cefa6e0 100644 +index fdd33c38..0d21128f 100644 --- a/include/xlnt/xlnt.hpp +++ b/include/xlnt/xlnt.hpp -@@ -22,7 +22,7 @@ - // @author: see AUTHORS file +@@ -23,6 +23,11 @@ #pragma once -- + ++// Patched by vcpkg to handle static non-cmake builds ++#ifndef XLNT_STATIC +#define XLNT_STATIC ++#endif ++ #include // cell From ece3efb8949d96c8b5a7b96f00754c200b16da1d Mon Sep 17 00:00:00 2001 From: ZeeWanderer Date: Tue, 19 Jan 2021 21:48:50 +0200 Subject: [PATCH 0519/1694] [blend2d] Update to beta_2021-01-02 (#15672) * [blend2d] Update to beta_2021-01-02 * [blend2d] update port_versions --- port_versions/b-/blend2d.json | 5 +++++ port_versions/baseline.json | 2 +- ports/blend2d/portfile.cmake | 12 ++++++------ ports/blend2d/vcpkg.json | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/port_versions/b-/blend2d.json b/port_versions/b-/blend2d.json index 209b23d55100af..ded3c7350df349 100644 --- a/port_versions/b-/blend2d.json +++ b/port_versions/b-/blend2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0258280297a10b5f45243914233bb9299274a224", + "version-string": "beta_2021-01-02", + "port-version": 0 + }, { "git-tree": "7772d070a8aa7b0b06508ae45bb3c22e9bbe774f", "version-string": "beta_2020-08-24", diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 36195eafa3fc7b..efcb6008c0612e 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -357,7 +357,7 @@ "port-version": 1 }, "blend2d": { - "baseline": "beta_2020-08-24", + "baseline": "beta_2021-01-02", "port-version": 0 }, "blitz": { diff --git a/ports/blend2d/portfile.cmake b/ports/blend2d/portfile.cmake index 99edda698bbfdf..5adb2f99f95146 100644 --- a/ports/blend2d/portfile.cmake +++ b/ports/blend2d/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_ARCH "wasm32" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO blend2d/blend2d - REF 960fe2fa6c93b1026a10e3db15e06db77d6817a3 - SHA512 232546d17de7f7f2f6a67ba2d88d1fca30ac6d9199216f98294e1bd0ec4e9dd33cc78a262f89da3ba1f433e9efbecded5866ddbc20f150c6a804c02687650270 + REF a48108b7efde01ab7e11d1110db9d5a87cc2fbe6 + SHA512 30c790950166eb1f729394cf2594b3ec57d64e24c89e2a3a46b74310efb085b66c211e1cd4061fb80cb4582bd66d37c1d0bce844ab3b09f3978d03230044c0f3 HEAD_REF master ) @@ -21,8 +21,8 @@ if(NOT BLEND2D_BUILD_NO_JIT) vcpkg_from_github( OUT_SOURCE_PATH ASMJIT_SOURCE_PATH REPO asmjit/asmjit - REF 8f25116f2bea8f5e0604dae867be817e3f12bac1 - SHA512 708ddb7bcd73e76e6485330f8935d64bbe27d526807fb877234303032247dc900751963c935d2a391fddb133eea6ae4300ade061d9202ed7f767e388e379abc8 + REF 70e80b18a5cc05d566e6c90dde200472c9325113 + SHA512 d3040cca0e34f70eaf498d872b94e2e32e79f1122d6fd1e7c37ab1b7c12ede948d1555229ad75a0335434ead6fc807a8c949175cd81d7b98408df5bbdf9a38f1 HEAD_REF master ) @@ -44,14 +44,14 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if(BLEND2D_STATIC) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() - # Handle copyright configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/blend2d/vcpkg.json b/ports/blend2d/vcpkg.json index 4e763f59532345..d04ddc4f2a32f0 100644 --- a/ports/blend2d/vcpkg.json +++ b/ports/blend2d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "blend2d", - "version-string": "beta_2020-08-24", + "version-string": "beta_2021-01-02", "description": "Beta 2D Vector Graphics Powered by a JIT Compiler", "homepage": "https://github.com/blend2d/blend2d", "documentation": "https://blend2d.com/doc/index.html", From e11f4df4a7a20cd36f19b60b0d7dec3a690fc7bd Mon Sep 17 00:00:00 2001 From: pastdue <30942300+past-due@users.noreply.github.com> Date: Tue, 19 Jan 2021 15:00:59 -0500 Subject: [PATCH 0520/1694] [physfs] Fix arm64-windows (#15684) --- port_versions/baseline.json | 2 +- port_versions/p-/physfs.json | 5 +++++ ports/physfs/fix-lzmasdk-arm64-windows.patch | 20 ++++++++++++++++++++ ports/physfs/portfile.cmake | 5 ++--- ports/physfs/vcpkg.json | 3 +-- scripts/ci.baseline.txt | 1 - 6 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 ports/physfs/fix-lzmasdk-arm64-windows.patch diff --git a/port_versions/baseline.json b/port_versions/baseline.json index efcb6008c0612e..fe6e0f26f6a3ab 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4478,7 +4478,7 @@ }, "physfs": { "baseline": "3.0.2", - "port-version": 3 + "port-version": 4 }, "physx": { "baseline": "4.1.1", diff --git a/port_versions/p-/physfs.json b/port_versions/p-/physfs.json index 2eb7ea138d6b00..3a3b9371c109c8 100644 --- a/port_versions/p-/physfs.json +++ b/port_versions/p-/physfs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bef97b95b7c30545c4ec9d0a55f672c3a6e3325f", + "version-string": "3.0.2", + "port-version": 4 + }, { "git-tree": "e46ccc22c717ad69bb6b6730669da403c86178d5", "version-string": "3.0.2", diff --git a/ports/physfs/fix-lzmasdk-arm64-windows.patch b/ports/physfs/fix-lzmasdk-arm64-windows.patch new file mode 100644 index 00000000000000..0fad2b58007f69 --- /dev/null +++ b/ports/physfs/fix-lzmasdk-arm64-windows.patch @@ -0,0 +1,20 @@ +diff --git a/src/physfs_lzmasdk.h b/src/physfs_lzmasdk.h +--- a/src/physfs_lzmasdk.h ++++ b/src/physfs_lzmasdk.h +@@ -506,6 +506,7 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and CPU supports unaligned mem + #endif + + #if defined(MY_CPU_AMD64) \ ++ || defined(_M_ARM64) \ + || defined(_M_IA64) \ + || defined(__AARCH64EL__) \ + || defined(__AARCH64EB__) +@@ -531,6 +532,8 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and CPU supports unaligned mem + + #if defined(_WIN32) && defined(_M_ARM) + #define MY_CPU_ARM_LE ++#elif defined(_WIN64) && defined(_M_ARM64) ++#define MY_CPU_ARM_LE + #endif + + #if defined(_WIN32) && defined(_M_IA64) diff --git a/ports/physfs/portfile.cmake b/ports/physfs/portfile.cmake index 18080f5e626b46..2ce216e4d79f67 100644 --- a/ports/physfs/portfile.cmake +++ b/ports/physfs/portfile.cmake @@ -1,6 +1,3 @@ -if(VCPKG_TARGET_IS_WINDOWS AND ${VCPKG_TARGET_ARCHITECTURE} MATCHES "arm64") - message(FATAL_ERROR "Architecture 'arm64' not supported on target 'Windows' by physfs!\n") -endif() set(PHYSFS_VERSION 3.0.2) vcpkg_download_distfile(ARCHIVE @@ -14,6 +11,8 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${PHYSFS_VERSION} + PATCHES + "fix-lzmasdk-arm64-windows.patch" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PHYSFS_STATIC) diff --git a/ports/physfs/vcpkg.json b/ports/physfs/vcpkg.json index 7eb40b2a719dc7..0c0dfceb9d360e 100644 --- a/ports/physfs/vcpkg.json +++ b/ports/physfs/vcpkg.json @@ -1,10 +1,9 @@ { "name": "physfs", "version-string": "3.0.2", - "port-version": 3, + "port-version": 4, "description": "a library to provide abstract access to various archives", "homepage": "https://icculus.org/physfs/", - "supports": "!(arm64 & windows)", "dependencies": [ "zlib" ] diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8177e7e624468c..3ad110d803bae7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1234,7 +1234,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 -physfs:arm64-windows=fail physx:arm64-windows=fail piex:x64-osx=fail pistache:arm64-windows=fail From 6155ed003bcf55f6461347b021ed7b4a831dee95 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 19 Jan 2021 12:05:08 -0800 Subject: [PATCH 0521/1694] [simage] Fix optional dependencies (#15683) * [simage] Fix optional dependencies * [simage] Add to versions db --- port_versions/baseline.json | 2 +- port_versions/s-/simage.json | 5 +++++ ports/simage/CONTROL | 3 ++- ports/simage/portfile.cmake | 18 +++++++++++++++++- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index fe6e0f26f6a3ab..66d71ff5f35ec4 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -5286,7 +5286,7 @@ }, "simage": { "baseline": "1.8.0", - "port-version": 0 + "port-version": 1 }, "simde": { "baseline": "0.7.0", diff --git a/port_versions/s-/simage.json b/port_versions/s-/simage.json index 9f0b909c935411..e245aca0bee948 100644 --- a/port_versions/s-/simage.json +++ b/port_versions/s-/simage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7efea762708b2fa21ac7919656bfcdfccbd84339", + "version-string": "1.8.0", + "port-version": 1 + }, { "git-tree": "d73e98a3ac5a4ed61f96dce0e08628170ea803ad", "version-string": "1.8.0", diff --git a/ports/simage/CONTROL b/ports/simage/CONTROL index f88751b8db1425..e25840834342e1 100644 --- a/ports/simage/CONTROL +++ b/ports/simage/CONTROL @@ -1,5 +1,6 @@ Source: simage Version: 1.8.0 +Port-Version: 1 Description: Image file format library abstraction layer -Build-Depends: giflib (linux|uwp), libjpeg-turbo (linux|uwp), libpng (linux|uwp), libsndfile (linux|uwp), tiff (linux|uwp), libvorbis (linux|uwp) +Build-Depends: giflib (!windows&!osx), libjpeg-turbo (!windows&!osx), libpng (!windows&!osx), libsndfile, tiff (!windows&!osx), libvorbis, zlib (!windows&!osx) Homepage: https://github.com/coin3d/simage diff --git a/ports/simage/portfile.cmake b/ports/simage/portfile.cmake index 59fbf4557f1d4f..6b890c8a5c75b3 100644 --- a/ports/simage/portfile.cmake +++ b/ports/simage/portfile.cmake @@ -20,7 +20,15 @@ else() set(SIMAGE_BUILD_SHARED_LIBS ON) endif() -if(VCPKG_TARGET_IS_UWP) +set(OSX_OR_WINDOWS OFF) +if((VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) OR VCPKG_TARGET_IS_OSX) + set(OSX_OR_WINDOWS ON) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) + set(SIMAGE_USE_AVIENC ON) + set(SIMAGE_USE_GDIPLUS ON) +else() set(SIMAGE_USE_AVIENC OFF) set(SIMAGE_USE_GDIPLUS OFF) endif() @@ -32,6 +40,14 @@ vcpkg_configure_cmake( -DSIMAGE_BUILD_SHARED_LIBS=${SIMAGE_BUILD_SHARED_LIBS} -DSIMAGE_USE_AVIENC=${SIMAGE_USE_AVIENC} -DSIMAGE_USE_GDIPLUS=${SIMAGE_USE_GDIPLUS} + -DCMAKE_DISABLE_FIND_PACKAGE_FLAC=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${OSX_OR_WINDOWS} + -DCMAKE_DISABLE_FIND_PACKAGE_GIF=${OSX_OR_WINDOWS} + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${OSX_OR_WINDOWS} + -DCMAKE_DISABLE_FIND_PACKAGE_PNG=${OSX_OR_WINDOWS} + -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=${OSX_OR_WINDOWS} ) vcpkg_install_cmake() From cf554a4737fd0c0e9175bf048f6052c20871cb3f Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Wed, 20 Jan 2021 00:28:30 +0100 Subject: [PATCH 0522/1694] Librealsense2 android build (#15608) * [realsense2] options for android build * bump port version * update baseline Co-authored-by: JackBoosY --- port_versions/baseline.json | 2 +- port_versions/r-/realsense2.json | 5 +++++ ports/realsense2/CONTROL | 1 + ports/realsense2/portfile.cmake | 6 ++++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 66d71ff5f35ec4..974688fc449207 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4998,7 +4998,7 @@ }, "realsense2": { "baseline": "2.40.0", - "port-version": 0 + "port-version": 1 }, "recast": { "baseline": "1.5.1-3", diff --git a/port_versions/r-/realsense2.json b/port_versions/r-/realsense2.json index b3aa46be8c6861..71d781a592db43 100644 --- a/port_versions/r-/realsense2.json +++ b/port_versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a17b91ddec89be9345ca08ba098ffec3ee4618d", + "version-string": "2.40.0", + "port-version": 1 + }, { "git-tree": "c3d32b35fd3a11aec9bd32f3f458ea4b099816f7", "version-string": "2.40.0", diff --git a/ports/realsense2/CONTROL b/ports/realsense2/CONTROL index 3b422832672601..84af14d20d79e8 100644 --- a/ports/realsense2/CONTROL +++ b/ports/realsense2/CONTROL @@ -1,5 +1,6 @@ Source: realsense2 Version: 2.40.0 +Port-Version: 1 Homepage: https://github.com/IntelRealSense/librealsense Description: Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300). Build-Depends: libusb(linux) diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index fc218d2795750a..d7208ec1bb514f 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -26,6 +26,11 @@ if(("openni2" IN_LIST FEATURES) AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")) set(BUILD_OPENNI2_BINDINGS ON) endif() +set(PLATFORM_OPTIONS) +if (VCPKG_TARGET_IS_ANDROID) + list(APPEND PLATFORM_OPTIONS -DFORCE_RSUSB_BACKEND=ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -36,6 +41,7 @@ vcpkg_configure_cmake( -DBUILD_WITH_STATIC_CRT=${BUILD_CRT_LINKAGE} -DBUILD_OPENNI2_BINDINGS=${BUILD_OPENNI2_BINDINGS} -DOPENNI2_DIR=${CURRENT_INSTALLED_DIR}/include/openni2 + ${PLATFORM_OPTIONS} OPTIONS_RELEASE -DBUILD_EXAMPLES=${BUILD_TOOLS} -DBUILD_GRAPHICAL_EXAMPLES=${BUILD_TOOLS} From 2cd171ae1e94e205fc43f6e1afcad6cda9c15651 Mon Sep 17 00:00:00 2001 From: miheer vaidya Date: Tue, 19 Jan 2021 16:29:30 -0700 Subject: [PATCH 0523/1694] [libconfig] shlwapi is not available on linux (#15613) * shlwapi is not available on linux This fixes error while building for `x64-linux-dynamic`. * Update control version * Update port_versions Co-authored-by: Billy Robert O'Neal III Co-authored-by: NancyLi1013 --- port_versions/baseline.json | 4 ++-- port_versions/l-/libconfig.json | 5 +++++ ports/libconfig/CMakeLists.txt | 5 ++++- ports/libconfig/CONTROL | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 974688fc449207..9858b50491a2f1 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -2853,8 +2853,8 @@ "port-version": 0 }, "libconfig": { - "baseline": "1.7.2-2", - "port-version": 0 + "baseline": "1.7.2", + "port-version": 3 }, "libconfuse": { "baseline": "2019-07-14", diff --git a/port_versions/l-/libconfig.json b/port_versions/l-/libconfig.json index cfbe4534861fa6..45a6c7df81463f 100644 --- a/port_versions/l-/libconfig.json +++ b/port_versions/l-/libconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c82b5fbc0a37ebd11ecb4f87b9d63df2552805e7", + "version-string": "1.7.2", + "port-version": 3 + }, { "git-tree": "02e991af7253bd4ef78d90fc43680c98be8bc817", "version-string": "1.7.2-2", diff --git a/ports/libconfig/CMakeLists.txt b/ports/libconfig/CMakeLists.txt index fe70cb9dd49b91..53ca6f4e0d09ac 100644 --- a/ports/libconfig/CMakeLists.txt +++ b/ports/libconfig/CMakeLists.txt @@ -37,7 +37,10 @@ else() target_compile_definitions(libconfig++ PUBLIC -DLIBCONFIGXX_STATIC) endif() -target_link_libraries(libconfig shlwapi) +if (WIN32) + # Linux doesn't have shlwapi + target_link_libraries(libconfig shlwapi) +endif() target_link_libraries(libconfig++ PRIVATE libconfig) install( diff --git a/ports/libconfig/CONTROL b/ports/libconfig/CONTROL index b6b5eb74b6bed3..f3a6342401edf4 100644 --- a/ports/libconfig/CONTROL +++ b/ports/libconfig/CONTROL @@ -1,4 +1,5 @@ Source: libconfig -Version: 1.7.2-2 +Version: 1.7.2 +Port-Version: 3 Homepage: https://github.com/hyperrealm/libconfig Description: C/C++ library for processing configuration files From 88114748420885713a852c42e91f4e05cac2adc0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 20 Jan 2021 00:29:51 +0100 Subject: [PATCH 0524/1694] [graphene] Add new port (#15754) * [graphene] add new port * add version info --- port_versions/baseline.json | 4 +++ port_versions/g-/graphene.json | 9 +++++ ports/graphene/CONTROL | 7 ++++ ports/graphene/portfile.cmake | 63 ++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+) create mode 100644 port_versions/g-/graphene.json create mode 100644 ports/graphene/CONTROL create mode 100644 ports/graphene/portfile.cmake diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 9858b50491a2f1..d0d199d4df061e 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -2236,6 +2236,10 @@ "baseline": "2020-05-20", "port-version": 0 }, + "graphene": { + "baseline": "1.10.2", + "port-version": 0 + }, "graphicsmagick": { "baseline": "1.3.36", "port-version": 0 diff --git a/port_versions/g-/graphene.json b/port_versions/g-/graphene.json new file mode 100644 index 00000000000000..3ebae9736547c3 --- /dev/null +++ b/port_versions/g-/graphene.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "002959491c215c722047465a93b05d078d743864", + "version-string": "1.10.2", + "port-version": 0 + } + ] +} diff --git a/ports/graphene/CONTROL b/ports/graphene/CONTROL new file mode 100644 index 00000000000000..d4796f804e79ba --- /dev/null +++ b/ports/graphene/CONTROL @@ -0,0 +1,7 @@ +Source: graphene +Version: 1.10.2 +Port-Version: 0 +Homepage: https://www.gtk.org/ +Description: A thin layer of types for graphic libraries. +Build-Depends: glib, gettext +Supports: !(arm&windows) \ No newline at end of file diff --git a/ports/graphene/portfile.cmake b/ports/graphene/portfile.cmake new file mode 100644 index 00000000000000..46c254676bf4e9 --- /dev/null +++ b/ports/graphene/portfile.cmake @@ -0,0 +1,63 @@ + +set(VERSION 1.10.2) + +vcpkg_download_distfile(ARCHIVE + URLS "https://download.gnome.org/sources/graphene/1.10/graphene-${VERSION}.tar.xz" + FILENAME "graphene-${VERSION}.tar.xz" + SHA512 a8a8ef1e4ccffee2313a18b9b8dda06c7ede6d49fdde8578694500634e3c90278fd30af7d88938d5ecb08c519cc3e09d21fe69d0f21cb766e056ceedbb3eafb0 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dgtk_doc=false + -Dgobject_types=true + -Dintrospection=false + -Dtests=false + -Dinstalled_tests=false + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' +) + +vcpkg_install_meson() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) + +# option('gtk_doc', type: 'boolean', + # value: false, + # description: 'Enable generating the API reference (depends on GTK-Doc)') +# option('gobject_types', type: 'boolean', + # value: true, + # description: 'Enable GObject types (depends on GObject)') +# option('introspection', type: 'boolean', + # value: true, + # description: 'Enable GObject Introspection (depends on GObject)') +# option('gcc_vector', type: 'boolean', + # value: true, + # description: 'Enable GCC vector fast paths (requires GCC)') +# option('sse2', type: 'boolean', + # value: true, + # description: 'Enable SSE2 fast paths (requires SSE2 or later)') +# option('arm_neon', type: 'boolean', + # value: true, + # description: 'Enable ARM NEON fast paths (requires ARM)') +# option('tests', type: 'boolean', + # value: true, + # description: 'Build the test suite (requires GObject)') +# option('installed_tests', type: 'boolean', + # value: true, + # description: 'Install tests') + + From e46ca54ec3a6fdb91719db7950f2b2267ca1c8cf Mon Sep 17 00:00:00 2001 From: tiqac <77594046+tiqac@users.noreply.github.com> Date: Wed, 20 Jan 2021 09:37:18 +1000 Subject: [PATCH 0525/1694] [xorstr] Update to 2020-11-29 (#15721) * [xorstr] Update to 2020-11-29 * Run x-add-version * version-string -> version-date * Run x-add-version --- port_versions/baseline.json | 2 +- port_versions/x-/xorstr.json | 5 +++++ ports/xorstr/CONTROL | 4 ---- ports/xorstr/portfile.cmake | 7 ++----- ports/xorstr/vcpkg.json | 6 ++++++ 5 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 ports/xorstr/CONTROL create mode 100644 ports/xorstr/vcpkg.json diff --git a/port_versions/baseline.json b/port_versions/baseline.json index d0d199d4df061e..9c9fe6ca84fb34 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -6189,7 +6189,7 @@ "port-version": 0 }, "xorstr": { - "baseline": "2020-02-11", + "baseline": "2020-11-29", "port-version": 0 }, "xproperty": { diff --git a/port_versions/x-/xorstr.json b/port_versions/x-/xorstr.json index 5b1e65a14c6ed2..591e44ee464562 100644 --- a/port_versions/x-/xorstr.json +++ b/port_versions/x-/xorstr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a02da6c23263a76324be04c21a28f11cc4cfca1", + "version-date": "2020-11-29", + "port-version": 0 + }, { "git-tree": "7a37997c7a1c699a78241cd445521f7704be6b76", "version-string": "2020-02-11", diff --git a/ports/xorstr/CONTROL b/ports/xorstr/CONTROL deleted file mode 100644 index fe40c1c728397f..00000000000000 --- a/ports/xorstr/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: xorstr -Version: 2020-02-11 -Description: Heavily vectorized c++17 compile time string encryption -Homepage: https://github.com/JustasMasiulis/xorstr diff --git a/ports/xorstr/portfile.cmake b/ports/xorstr/portfile.cmake index 0fbe6f2dbaf0ac..3a227fcbe7be49 100644 --- a/ports/xorstr/portfile.cmake +++ b/ports/xorstr/portfile.cmake @@ -1,14 +1,11 @@ -# header-only library - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JustasMasiulis/xorstr - REF a774b984f5b5f15d39ba0a8623cd3c70c05d6007 - SHA512 339fe945e39d27dfc9a9f42bbf4ef008405934668784ee4b661ee9dd04ab0a0bea442c07e7315d1746edd047a6bb7aca7d382314a48fc593633d811cf67bdb2d + REF 42464c4fc1c32cb0d15f3656b30bfb38d9b65fc7 + SHA512 e8d6ed2ed64bbd11ca304b6c8a6c2dd14544cedc8b8f7364ef8c34af374ebee76bfddd97258b7ff024f6d9929800158d1b3897d64c2b74d8c6f6f105d2844a1c HEAD_REF master ) file(COPY ${SOURCE_PATH}/include/xorstr.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) -# Handle copyright configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/xorstr/vcpkg.json b/ports/xorstr/vcpkg.json new file mode 100644 index 00000000000000..05ce8862e66c93 --- /dev/null +++ b/ports/xorstr/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "xorstr", + "version-date": "2020-11-29", + "description": "Heavily vectorized c++17 compile time string encryption", + "homepage": "https://github.com/JustasMasiulis/xorstr" +} From 38ce1d9360d40b2e2b98934546122ece6ccde414 Mon Sep 17 00:00:00 2001 From: "Matwey V. Kornilov" Date: Wed, 20 Jan 2021 02:38:55 +0300 Subject: [PATCH 0526/1694] [libusb] Update to 1.0.24 (#15692) --- port_versions/baseline.json | 2 +- port_versions/l-/libusb.json | 5 +++++ ports/libusb/CONTROL | 2 +- ports/libusb/portfile.cmake | 8 ++++---- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 9c9fe6ca84fb34..f5d11532cfbb16 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -3401,7 +3401,7 @@ "port-version": 0 }, "libusb": { - "baseline": "1.0.23", + "baseline": "1.0.24", "port-version": 3 }, "libusb-win32": { diff --git a/port_versions/l-/libusb.json b/port_versions/l-/libusb.json index 67d06d05359470..0d31a85f1a31a0 100644 --- a/port_versions/l-/libusb.json +++ b/port_versions/l-/libusb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "419808531bfc5a58d7581dc700a2560a3ab7265e", + "version-string": "1.0.24", + "port-version": 3 + }, { "git-tree": "43ac3831fee48a40aacc5c14480ff724e4644c4f", "version-string": "1.0.23", diff --git a/ports/libusb/CONTROL b/ports/libusb/CONTROL index c2a9653317e2db..0d57f8300455ca 100644 --- a/ports/libusb/CONTROL +++ b/ports/libusb/CONTROL @@ -1,5 +1,5 @@ Source: libusb -Version: 1.0.23 +Version: 1.0.24 Port-Version: 3 Homepage: https://github.com/libusb/libusb Description: a cross-platform library to access USB devices diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake index c8d49f1c8e06fc..f6f972ae5ed2e9 100644 --- a/ports/libusb/portfile.cmake +++ b/ports/libusb/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libusb/libusb - REF e782eeb2514266f6738e242cdcb18e3ae1ed06fa # v1.0.23 - SHA512 27cfff4bbf64d5ec5014acac0871ace74b6af76141bd951309206f4806e3e3f2c7ed32416f5b55fd18d033ca5494052eb2e50ed3cc0be10839be2bd4168a9d4c + REF c6a35c56016ea2ab2f19115d2ea1e85e0edae155 # v1.0.24 + SHA512 985c020d9ae6f7135e3bfee68dddcf70921481db3d10e420f55d5ee9534f7fe7be6a2a31ee73a3b282b649fcc36da4fed848e0bd0410c20eaf1deb9a8e3086e8 HEAD_REF master ) @@ -39,9 +39,9 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() endif() - # The README file in the archive is a symlink to README.md + # The README.md file in the archive is a symlink to README # which causes issues with the windows MSBUILD process - file(REMOVE ${SOURCE_PATH}/README) + file(REMOVE ${SOURCE_PATH}/README.md) vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} From 9021983d213c83fef5e8e0e55d1fb462ad63bdc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=8C=E8=8D=89=E9=85=B8=E9=85=AF?= <17663689+kotori2@users.noreply.github.com> Date: Wed, 20 Jan 2021 08:00:17 +0800 Subject: [PATCH 0527/1694] Fix libmariadb compiling on ARM64 (#15699) --- port_versions/baseline.json | 2 +- port_versions/l-/libmariadb.json | 5 +++++ ports/libmariadb/CONTROL | 2 +- ports/libmariadb/arm64.patch | 15 +++++++++++++++ ports/libmariadb/portfile.cmake | 3 ++- 5 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 ports/libmariadb/arm64.patch diff --git a/port_versions/baseline.json b/port_versions/baseline.json index f5d11532cfbb16..bd2acea3ca8ca0 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -3086,7 +3086,7 @@ }, "libmariadb": { "baseline": "3.1.10", - "port-version": 4 + "port-version": 5 }, "libmaxminddb": { "baseline": "1.4.3", diff --git a/port_versions/l-/libmariadb.json b/port_versions/l-/libmariadb.json index 7f5f8fda8e67e3..294844bea93eaf 100644 --- a/port_versions/l-/libmariadb.json +++ b/port_versions/l-/libmariadb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "674b0c8bcc3ee3276a0bce8afd72b99c5013f4a0", + "version-string": "3.1.10", + "port-version": 5 + }, { "git-tree": "a5144f1b965487813bfd011e1d7ca18877d2ec69", "version-string": "3.1.10", diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL index d7aa3061ed353d..413a2e9af8d982 100644 --- a/ports/libmariadb/CONTROL +++ b/ports/libmariadb/CONTROL @@ -1,6 +1,6 @@ Source: libmariadb Version: 3.1.10 -Port-Version: 4 +Port-Version: 5 Homepage: https://github.com/MariaDB/mariadb-connector-c Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases Default-Features: zlib, openssl diff --git a/ports/libmariadb/arm64.patch b/ports/libmariadb/arm64.patch new file mode 100644 index 00000000000000..4d8e9ac8d0c89e --- /dev/null +++ b/ports/libmariadb/arm64.patch @@ -0,0 +1,15 @@ +diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt +index 640a35bea..6c8d93250 100755 +--- a/libmariadb/CMakeLists.txt ++++ b/libmariadb/CMakeLists.txt +@@ -410,10 +410,6 @@ TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) + + SIGN_TARGET(libmariadb) + +-IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) +- SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") +-ENDIF() +- + IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR + CMAKE_SYSTEM_NAME MATCHES "kFreeBSD" OR + CMAKE_SYSTEM_NAME MATCHES "GNU") diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index baa78d94e7ac5b..cf538deaa56d4d 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -5,10 +5,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO MariaDB/mariadb-connector-c - REF 159540fe8c8f30b281748fe8a1b79e8b17993a67 # v3.1.10 + REF 159540fe8c8f30b281748fe8a1b79e8b17993a67 # v3.1.10 SHA512 3e154f5dc4b5051607c7ebc0691a50c0699d60e4414660cf8f65689081ff78ef6b135667761ba8ac4163b469a3b55158c6b48c6fc0a0cc09381452aad157e4ad HEAD_REF 3.1 PATCHES + arm64.patch md.patch disable-test-build.patch fix-InstallPath.patch From c55bc07bde2e6bb8119d570beb156fca8ef526d5 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 19 Jan 2021 21:14:50 -0300 Subject: [PATCH 0528/1694] [aws-sdk-cpp] Update aws cpp sdk (#15760) * Update AWS C++ SDK version * Update AWS C++ SDK version * Update AWS C++ SDK version Co-authored-by: Ahmed Yarub Hani Al Nuaimi --- port_versions/a-/aws-sdk-cpp.json | 5 +++++ port_versions/baseline.json | 4 ++-- ports/aws-sdk-cpp/CONTROL | 4 ++-- ports/aws-sdk-cpp/portfile.cmake | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/port_versions/a-/aws-sdk-cpp.json b/port_versions/a-/aws-sdk-cpp.json index a8ac33f4b97fea..91b3621492fc57 100644 --- a/port_versions/a-/aws-sdk-cpp.json +++ b/port_versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1091bd9bd625aab8f19bc9d32499bd888788c613", + "version-string": "1.8.126", + "port-version": 5 + }, { "git-tree": "1474856fe6fdeb8feab5068959e189bc9f6c0327", "version-string": "1.8.83", diff --git a/port_versions/baseline.json b/port_versions/baseline.json index bd2acea3ca8ca0..4050d57219ea44 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -233,8 +233,8 @@ "port-version": 0 }, "aws-sdk-cpp": { - "baseline": "1.8.83", - "port-version": 4 + "baseline": "1.8.126", + "port-version": 5 }, "azmq": { "baseline": "2020-03-03", diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index 1b46d7d3664fb3..199f79bb936408 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,6 +1,6 @@ Source: aws-sdk-cpp -Version: 1.8.83 -Port-Version: 4 +Version: 1.8.126 +Port-Version: 5 Homepage: https://github.com/aws/aws-sdk-cpp Description: AWS SDK for C++ Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream, zlib diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 26f7bb8afb4f6a..f9d66a54f64a0c 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp - REF e98e5732ec7319051f162f7314ae361c85d0a8c9 # 1.8.83 - SHA512 da540db60551be833ea0315dd93241f9740ab953ed5657c1c7a8c401ae52a4e75b116758420b0a8a4ebb79358dff8377f5e052b180b36f0af27a36003f28bd56 + REF b11ed430fa6a574cc842532192dfeb9bb09e62b4 # 1.8.126 + SHA512 39e71f85d977b183df6f0d6d61a028db33573026f6abb8856f35e0e71398e2749db6dbdd033818a2c045ec42076fb23cdbae92608117db0a08ca88a05c825683 HEAD_REF master PATCHES patch-relocatable-rpath.patch From 6ba9d671a04509e90607b19638dd074952aa51a1 Mon Sep 17 00:00:00 2001 From: Be Date: Wed, 20 Jan 2021 00:21:37 +0000 Subject: [PATCH 0529/1694] [libopusenc] fix macOS and Linux build (#15671) --- port_versions/baseline.json | 2 +- port_versions/l-/libopusenc.json | 5 +++++ ports/libopusenc/CMakeLists.txt | 4 +++- ports/libopusenc/CONTROL | 6 ------ ports/libopusenc/vcpkg.json | 11 +++++++++++ 5 files changed, 20 insertions(+), 8 deletions(-) delete mode 100644 ports/libopusenc/CONTROL create mode 100644 ports/libopusenc/vcpkg.json diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 4050d57219ea44..509fa9658ae164 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -3178,7 +3178,7 @@ }, "libopusenc": { "baseline": "0.2.1", - "port-version": 0 + "port-version": 1 }, "libosip2": { "baseline": "5.1.0-4", diff --git a/port_versions/l-/libopusenc.json b/port_versions/l-/libopusenc.json index 9fbd47b56b6013..e40c0de5b05e37 100644 --- a/port_versions/l-/libopusenc.json +++ b/port_versions/l-/libopusenc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "132909a5cb3c33e038cf9728427910fce455591d", + "version-string": "0.2.1", + "port-version": 1 + }, { "git-tree": "7e66eafbd3552eda0c0243edb904fd8af36d370a", "version-string": "0.2.1", diff --git a/ports/libopusenc/CMakeLists.txt b/ports/libopusenc/CMakeLists.txt index 4ab1a4e9d76ade..442d19a6d230f1 100644 --- a/ports/libopusenc/CMakeLists.txt +++ b/ports/libopusenc/CMakeLists.txt @@ -1,7 +1,9 @@ cmake_minimum_required(VERSION 3.4) project(libopusenc C) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267 /wd4244 /wd4996 /wd4101 /wd4018") +if(MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267 /wd4244 /wd4996 /wd4101 /wd4018") +endif() find_path(OPUS_INCLUDE_DIR opus.h PATH_SUFFIXES opus) find_library(OPUS_LIBRARY opus) diff --git a/ports/libopusenc/CONTROL b/ports/libopusenc/CONTROL deleted file mode 100644 index 7e52b1353a0c06..00000000000000 --- a/ports/libopusenc/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libopusenc -Version: 0.2.1 -Homepage: https://github.com/xiph/libopusenc -Description: Library for encoding .opus audio files and live streams. -Build-Depends: opus -Supports: !uwp \ No newline at end of file diff --git a/ports/libopusenc/vcpkg.json b/ports/libopusenc/vcpkg.json new file mode 100644 index 00000000000000..0ce806c812bad4 --- /dev/null +++ b/ports/libopusenc/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libopusenc", + "version-string": "0.2.1", + "port-version": 1, + "description": "Library for encoding .opus audio files and live streams.", + "homepage": "https://github.com/xiph/libopusenc", + "supports": "!uwp", + "dependencies": [ + "opus" + ] +} From 187540145ae7dc47df3a34dcc495f935cb630bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 19 Jan 2021 16:28:52 -0800 Subject: [PATCH 0530/1694] [podofo] Fix feature crypto (#15666) * [podofo] Fix feature crypto * update baseline --- port_versions/baseline.json | 2 +- port_versions/p-/podofo.json | 5 +++++ ports/podofo/0005-fix-crypto.patch | 29 +++++++++++++++++++++++++++++ ports/podofo/CONTROL | 2 +- ports/podofo/portfile.cmake | 1 + 5 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 ports/podofo/0005-fix-crypto.patch diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 509fa9658ae164..511f9541ab4500 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4570,7 +4570,7 @@ }, "podofo": { "baseline": "0.9.6", - "port-version": 12 + "port-version": 13 }, "poly2tri": { "baseline": "2020-07-21", diff --git a/port_versions/p-/podofo.json b/port_versions/p-/podofo.json index ceb34b0ed6976e..42c72581c73fb6 100644 --- a/port_versions/p-/podofo.json +++ b/port_versions/p-/podofo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69967a79faa43c4d15f5fc533f44b3d095813d63", + "version-string": "0.9.6", + "port-version": 13 + }, { "git-tree": "8ab65ed2018a120250dafbdeadc9ef87957d2cb4", "version-string": "0.9.6", diff --git a/ports/podofo/0005-fix-crypto.patch b/ports/podofo/0005-fix-crypto.patch new file mode 100644 index 00000000000000..a873ee4c9efa19 --- /dev/null +++ b/ports/podofo/0005-fix-crypto.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f23dd5a..fd9e8ed 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -315,11 +315,12 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) + FIND_PACKAGE(ZLIB REQUIRED) + MESSAGE("Found zlib headers in ${ZLIB_INCLUDE_DIR}, library at ${ZLIB_LIBRARIES}") + +-FIND_PACKAGE(LIBCRYPTO) ++FIND_PACKAGE(OpenSSL) + +-IF(LIBCRYPTO_FOUND) ++IF(OpenSSL_FOUND) + SET(PODOFO_HAVE_OPENSSL TRUE) +- INCLUDE_DIRECTORIES(${LIBCRYPTO_INCLUDE_DIR}) ++ LIST(APPEND OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) ++ ADD_DEFINITIONS(-DPODOFO_HAVE_OPENSSL_1_1) + MESSAGE("Found OpenSSL's libCrypto headers in ${LIBCRYPTO_INCLUDE_DIR}, library at ${LIBCRYPTO_LIBRARIES}") + ELSE(LIBCRYPTO_FOUND) + MESSAGE("OpenSSL's libCrypto not found. Encryption support will be disabled") +@@ -396,8 +397,6 @@ ENDIF(CppUnit_FOUND) + + ENDIF(NOT PODOFO_BUILD_LIB_ONLY) + +-FIND_PACKAGE(OpenSSL) +- + FIND_PACKAGE(FREETYPE REQUIRED) + MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIR}") + diff --git a/ports/podofo/CONTROL b/ports/podofo/CONTROL index 933f7363fc410d..80171a235842f9 100644 --- a/ports/podofo/CONTROL +++ b/ports/podofo/CONTROL @@ -1,6 +1,6 @@ Source: podofo Version: 0.9.6 -Port-Version: 12 +Port-Version: 13 Homepage: https://sourceforge.net/projects/podofo/ Description: PoDoFo is a library to work with the PDF file format Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openssl, freetype diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake index 36bd2c48e4cd50..8bde0930ee078b 100644 --- a/ports/podofo/portfile.cmake +++ b/ports/podofo/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_sourceforge( 0002-HAVE_UNISTD_H.patch freetype.patch ${ADDITIONAL_PATCH} + 0005-fix-crypto.patch ) set(PODOFO_NO_FONTMANAGER ON) From 48c2ec90b9f9fa15e587d52123c1517b2470ab1b Mon Sep 17 00:00:00 2001 From: pastdue <30942300+past-due@users.noreply.github.com> Date: Tue, 19 Jan 2021 22:40:30 -0500 Subject: [PATCH 0531/1694] [vcpkg baseline][vcpkg_configure_make] Fix arm64-windows, arm-uwp (#15740) * [vcpkg_configure_make] Fix arm64-windows * [vcpkg_configure_make] Fix arm-uwp --- scripts/cmake/vcpkg_configure_make.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index e7af4713c8b616..122281f42dace2 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -392,8 +392,13 @@ function(vcpkg_configure_make) list(APPEND _csc_OPTIONS gl_cv_double_slash_root=yes ac_cv_func_memmove=yes) #list(APPEND _csc_OPTIONS lt_cv_deplibs_check_method=pass_all) # Just ignore libtool checks - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + if(VCPKG_TARGET_ARCHITECTURE MATCHES "^[Aa][Rr][Mm]64$") list(APPEND _csc_OPTIONS gl_cv_host_cpu_c_abi=no) + # Currently needed for arm64 because objdump yields: "unrecognised machine type (0xaa64) in Import Library Format archive" + list(APPEND _csc_OPTIONS lt_cv_deplibs_check_method=pass_all) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^[Aa][Rr][Mm]$") + # Currently needed for arm because objdump yields: "unrecognised machine type (0x1c4) in Import Library Format archive" + list(APPEND _csc_OPTIONS lt_cv_deplibs_check_method=pass_all) endif() else() string(REPLACE " " "\ " _VCPKG_PREFIX ${CURRENT_INSTALLED_DIR}) From f8588dc77da70ceda92c7eba9c5f77aa72719dc9 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Tue, 19 Jan 2021 19:42:00 -0800 Subject: [PATCH 0532/1694] [vcpkg] fix edit command on windows (#15767) * [vcpkg] fix edit command on windows * format --- toolsrc/src/vcpkg/commands.edit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp index c8455bb923f817..720f6b14d68eaa 100644 --- a/toolsrc/src/vcpkg/commands.edit.cpp +++ b/toolsrc/src/vcpkg/commands.edit.cpp @@ -263,8 +263,8 @@ namespace vcpkg::Commands::Edit if (editor_exe == "Code.exe" || editor_exe == "Code - Insiders.exe") { // note that we are invoking cmd silently but Code.exe is relaunched from there - System::cmd_execute_background( - System::Command("cmd").string_arg("/c").string_arg(cmd_line.command_line()).raw_arg(" Date: Wed, 20 Jan 2021 13:40:57 +0800 Subject: [PATCH 0533/1694] [vcpkg baseline][spatialite-tools] fix linux osx build falied (#15768) * fix linux osx build falied * Update ci.baseline.txt * update baseline Co-authored-by: JackBoosY --- port_versions/baseline.json | 2 +- port_versions/s-/spatialite-tools.json | 5 +++ ports/spatialite-tools/CONTROL | 1 + ports/spatialite-tools/fix-makefiles.patch | 52 ++++++++++++++++++++++ scripts/ci.baseline.txt | 2 - 5 files changed, 59 insertions(+), 3 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 511f9541ab4500..7585d297abca02 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -5422,7 +5422,7 @@ }, "spatialite-tools": { "baseline": "5.0.0", - "port-version": 0 + "port-version": 1 }, "spdk": { "baseline": "19.01.1", diff --git a/port_versions/s-/spatialite-tools.json b/port_versions/s-/spatialite-tools.json index 5c968071ed6cc7..6f85784d923b50 100644 --- a/port_versions/s-/spatialite-tools.json +++ b/port_versions/s-/spatialite-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3d595427bd0b0cf8ddaadc45e400b5c1f9c1ccc", + "version-string": "5.0.0", + "port-version": 1 + }, { "git-tree": "2a9685999c784265e25e4f2bde708a724721e906", "version-string": "5.0.0", diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL index a698cc8b92c0fd..e3a430d4b3065a 100644 --- a/ports/spatialite-tools/CONTROL +++ b/ports/spatialite-tools/CONTROL @@ -1,5 +1,6 @@ Source: spatialite-tools Version: 5.0.0 +Port-Version: 1 Homepage: https://www.gaia-gis.it/fossil/spatialite-tools/index Description: Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries) Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat, librttopo \ No newline at end of file diff --git a/ports/spatialite-tools/fix-makefiles.patch b/ports/spatialite-tools/fix-makefiles.patch index a5a579686bbd7f..3acc32b748bcc5 100644 --- a/ports/spatialite-tools/fix-makefiles.patch +++ b/ports/spatialite-tools/fix-makefiles.patch @@ -135,3 +135,55 @@ index 4f4a9538e..d9efecf7b 100644 /D_LARGE_FILE=1 /D_FILE_OFFSET_BITS=64 /D_LARGEFILE_SOURCE=1 #OPTFLAGS= /nologo /Zi /MD /Fdspatialite.pdb +diff --git a/Makefile.am b/Makefile.am +index 75ac806..d680b74 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -39,7 +39,7 @@ bin_PROGRAMS = spatialite \ + spatialite_dem + endif + +-AM_CPPFLAGS = @CFLAGS@ @CPPFLAGS@ @LIBXML2_CFLAGS@ ++AM_CPPFLAGS = @CFLAGS@ @CPPFLAGS@ @LIBXML2_CFLAGS@ @RTTOPO_CFLAGS@ + AM_CPPFLAGS += -I$(top_srcdir) + + spatialite_SOURCES = shell.c +@@ -65,27 +65,27 @@ spatialite_osm_overpass_SOURCES = spatialite_osm_overpass.c + spatialite_dem_SOURCES = spatialite_dem.c + + spatialite_osm_map_LDADD = @LIBSPATIALITE_LIBS@ \ +- @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ ++ @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@ + spatialite_osm_overpass_LDADD = @LIBSPATIALITE_LIBS@ \ +- @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ ++ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@ + spatialite_osm_raw_LDADD = @LIBSPATIALITE_LIBS@ \ +- @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ ++ @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@ + spatialite_osm_net_LDADD = @LIBSPATIALITE_LIBS@ \ +- @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ ++ @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@ + spatialite_gml_LDADD = @LIBSPATIALITE_LIBS@ \ +- @LIBFREEXL_LIBS@ \ ++ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@ \ + -lexpat +-spatialite_dem_LDADD = @LIBSPATIALITE_LIBS@ ++spatialite_dem_LDADD = @LIBSPATIALITE_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@ + spatialite_LDADD = @LIBSPATIALITE_LIBS@ \ + @LIBFREEXL_LIBS@ \ +- @READLINE_LIBS@ ++ @READLINE_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@ + spatialite_xml_validator_LDADD = @LIBXML2_LIBS@ +-spatialite_xml_load_LDADD = @LIBSPATIALITE_LIBS@ \ ++spatialite_xml_load_LDADD = @LIBSPATIALITE_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@\ + -lexpat +-spatialite_xml_collapse_LDADD = @LIBSPATIALITE_LIBS@ +-spatialite_xml_print_LADD = @LIBSPATIALIATE_LIBS@ ++spatialite_xml_collapse_LDADD = @LIBSPATIALITE_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@ ++spatialite_xml_print_LADD = @LIBSPATIALITE_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@ + LDADD = @LIBSPATIALITE_LIBS@ \ +- @LIBFREEXL_LIBS@ ++ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@ + + EXTRA_DIST = makefile.vc nmake.opt makefile64.vc nmake64.opt \ + config-msvc.h \ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3ad110d803bae7..9397501405a4e5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1518,8 +1518,6 @@ soundtouch:x64-windows-static-md=fail spaceland:arm64-windows=fail spaceland:arm-uwp=fail spaceland:x64-uwp=fail -spatialite-tools:x64-linux=fail -spatialite-tools:x64-osx=fail spdk:x64-linux=fail spdk-dpdk:arm64-windows=fail spdk-dpdk:arm-uwp=fail From aae81fb97e2434429f79f0a3f7c0daddb83eff9a Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Tue, 19 Jan 2021 22:11:26 -0800 Subject: [PATCH 0534/1694] [opencolorio] Install OpenColorIOConfig.cmake and change version scheme to semver (#15764) Co-authored-by: Robert Schumacher --- port_versions/baseline.json | 2 +- port_versions/o-/opencolorio.json | 5 +++++ ports/opencolorio/CONTROL | 6 ------ ports/opencolorio/portfile.cmake | 21 +++++++++++++++------ ports/opencolorio/vcpkg.json | 29 +++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+), 13 deletions(-) delete mode 100644 ports/opencolorio/CONTROL create mode 100644 ports/opencolorio/vcpkg.json diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 7585d297abca02..55ad5a2dc96c99 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4194,7 +4194,7 @@ }, "opencolorio": { "baseline": "1.1.1", - "port-version": 4 + "port-version": 5 }, "opencolorio-tools": { "baseline": "1.1.1", diff --git a/port_versions/o-/opencolorio.json b/port_versions/o-/opencolorio.json index 367a8489cf560b..f4d3afa7d92236 100644 --- a/port_versions/o-/opencolorio.json +++ b/port_versions/o-/opencolorio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c011ef89b247b0bc54a08016fe23793defd398a5", + "version-semver": "1.1.1", + "port-version": 5 + }, { "git-tree": "6f60ef16979a651554f0b59663f4180229b5c662", "version-string": "1.1.1", diff --git a/ports/opencolorio/CONTROL b/ports/opencolorio/CONTROL deleted file mode 100644 index 9380823b2e671c..00000000000000 --- a/ports/opencolorio/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: opencolorio -Version: 1.1.1 -Port-Version: 4 -Homepage: https://opencolorio.org/ -Description: OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats. -Build-Depends: glew[core], freeglut[core], lcms[core], yaml-cpp[core], tinyxml[core] \ No newline at end of file diff --git a/ports/opencolorio/portfile.cmake b/ports/opencolorio/portfile.cmake index 6d970d3a6724c6..dcbac39b20f5a1 100644 --- a/ports/opencolorio/portfile.cmake +++ b/ports/opencolorio/portfile.cmake @@ -51,14 +51,23 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake") vcpkg_copy_pdbs() -# Clean redundant files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(READ "${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake" _contents) +string(REPLACE + [=[get_filename_component(OpenColorIO_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)]=] + [=[get_filename_component(OpenColorIO_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(OpenColorIO_DIR "${OpenColorIO_DIR}" PATH) +get_filename_component(OpenColorIO_DIR "${OpenColorIO_DIR}" PATH)]=] + _contents + "${_contents}") +string(REPLACE "/cmake/OpenColorIO.cmake" "/share/opencolorio/OpenColorIO.cmake" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencolorio/OpenColorIOConfig.cmake" "${_contents}") -# CMake Configs leftovers -file(REMOVE - ${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake +# Clean redundant files +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/debug/OpenColorIOConfig.cmake + ${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake ) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/opencolorio/vcpkg.json b/ports/opencolorio/vcpkg.json new file mode 100644 index 00000000000000..e942e139e6c883 --- /dev/null +++ b/ports/opencolorio/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "opencolorio", + "version-semver": "1.1.1", + "port-version": 5, + "description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.", + "homepage": "https://opencolorio.org/", + "dependencies": [ + { + "name": "freeglut", + "default-features": false + }, + { + "name": "glew", + "default-features": false + }, + { + "name": "lcms", + "default-features": false + }, + { + "name": "tinyxml", + "default-features": false + }, + { + "name": "yaml-cpp", + "default-features": false + } + ] +} From 4efae0365da0fb88bf8ad2471e6ddb63b3b8c95f Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 20 Jan 2021 14:12:23 +0800 Subject: [PATCH 0535/1694] [reproc] update to 14.2.1 (#15751) * [reproc] Update to 14.2.1 * Update port_version * Update version * [reproc] update to 14.2.1 --- port_versions/baseline.json | 2 +- port_versions/r-/reproc.json | 5 +++++ ports/reproc/CONTROL | 2 +- ports/reproc/portfile.cmake | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 55ad5a2dc96c99..b6a3666b35b32c 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -5025,7 +5025,7 @@ "port-version": 0 }, "reproc": { - "baseline": "14.1.0", + "baseline": "14.2.1", "port-version": 0 }, "rest-rpc": { diff --git a/port_versions/r-/reproc.json b/port_versions/r-/reproc.json index b923e478f4f871..b294755b4c3280 100644 --- a/port_versions/r-/reproc.json +++ b/port_versions/r-/reproc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f42086781fc869cc35be1abd9b64641c27028f7", + "version-string": "14.2.1", + "port-version": 0 + }, { "git-tree": "0af11f9791915f437e8d25a8c7df32684656a34d", "version-string": "14.1.0", diff --git a/ports/reproc/CONTROL b/ports/reproc/CONTROL index b5efa370786f95..550e629be2722a 100644 --- a/ports/reproc/CONTROL +++ b/ports/reproc/CONTROL @@ -1,4 +1,4 @@ Source: reproc -Version: 14.1.0 +Version: 14.2.1 Description: Cross-platform (C99/C++11) process library Homepage: https://github.com/DaanDeMeyer/reproc diff --git a/ports/reproc/portfile.cmake b/ports/reproc/portfile.cmake index 36f92227e26c1c..8d6c0370682875 100644 --- a/ports/reproc/portfile.cmake +++ b/ports/reproc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DaanDeMeyer/reproc - REF 4bfa5fe500288a0bcd9134533b87dbf8183fd158 # v14.1.0 - SHA512 258046b6b76e8513aa35e6e6a1a5245c9d91eadd0aaa6fe41869080d1b74669350eca86e7025581252327a01c2687d77991721d08554b505d2025e063ae4cc88 + REF 8f70f97af263dd3f41bdc07f6f04e92436b1b55a # v14.2.1 + SHA512 98bc8cb8aac5da83407ce23911b97840180d0d6f0321ac68ab035717ab84dcf312f886477cd393e0ac322993a3d1acaa3bfdabb4fe8131916df53658d5a59adf HEAD_REF master ) From 7f37d0262fca997066925ca9924fcdbc893040c5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 20 Jan 2021 07:16:21 +0100 Subject: [PATCH 0536/1694] [libsass/sassc] add new port/tool (#15752) * add libsass and sassc * add version information --- port_versions/baseline.json | 8 ++++++ port_versions/l-/libsass.json | 9 ++++++ port_versions/s-/sassc.json | 9 ++++++ ports/libsass/CONTROL | 7 +++++ ports/libsass/portfile.cmake | 22 +++++++++++++++ ports/libsass/remove_compiler_flags.patch | 24 ++++++++++++++++ ports/sassc/CONTROL | 6 ++++ ports/sassc/portfile.cmake | 34 +++++++++++++++++++++++ ports/sassc/remove_compiler_flags.patch | 12 ++++++++ 9 files changed, 131 insertions(+) create mode 100644 port_versions/l-/libsass.json create mode 100644 port_versions/s-/sassc.json create mode 100644 ports/libsass/CONTROL create mode 100644 ports/libsass/portfile.cmake create mode 100644 ports/libsass/remove_compiler_flags.patch create mode 100644 ports/sassc/CONTROL create mode 100644 ports/sassc/portfile.cmake create mode 100644 ports/sassc/remove_compiler_flags.patch diff --git a/port_versions/baseline.json b/port_versions/baseline.json index b6a3666b35b32c..c44dd4772bb839 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -3292,6 +3292,10 @@ "baseline": "0.1.9.0", "port-version": 3 }, + "libsass": { + "baseline": "3.6.4", + "port-version": 0 + }, "libsbml": { "baseline": "5.18.0", "port-version": 0 @@ -5144,6 +5148,10 @@ "baseline": "2018-09-21", "port-version": 0 }, + "sassc": { + "baseline": "3.6.1", + "port-version": 0 + }, "scintilla": { "baseline": "4.4.5", "port-version": 0 diff --git a/port_versions/l-/libsass.json b/port_versions/l-/libsass.json new file mode 100644 index 00000000000000..8927f4d2c8b01d --- /dev/null +++ b/port_versions/l-/libsass.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "87bcd6907b761946cefe3ff059952f6649ce335c", + "version-string": "3.6.4", + "port-version": 0 + } + ] +} diff --git a/port_versions/s-/sassc.json b/port_versions/s-/sassc.json new file mode 100644 index 00000000000000..8e36e7defdc1cc --- /dev/null +++ b/port_versions/s-/sassc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3c48d56954b3fc0cdefc34c3a2797840a95a976b", + "version-string": "3.6.1", + "port-version": 0 + } + ] +} diff --git a/ports/libsass/CONTROL b/ports/libsass/CONTROL new file mode 100644 index 00000000000000..e29f5b9279e201 --- /dev/null +++ b/ports/libsass/CONTROL @@ -0,0 +1,7 @@ +Source: libsass +Version: 3.6.4 +Port-Version: 0 +Description: LibSass - Sass compiler written in C++ +Homepage: https://github.com/sass/libsass +Supports: !uwp + diff --git a/ports/libsass/portfile.cmake b/ports/libsass/portfile.cmake new file mode 100644 index 00000000000000..09b2282371fc74 --- /dev/null +++ b/ports/libsass/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sass/libsass + REF 8d312a1c91bb7dd22883ebdfc829003f75a82396 # 3.6.4 + SHA512 41e532c081804c889c3e7f9169bd90d7fc944d13817d5e3a4f8c19608ebb630db2b2b0e9c61a59a2446076f4093d5ec4cb4f767aa06fa0bf0f0687094e1a2913 + HEAD_REF master + PATCHES remove_compiler_flags.patch +) + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + +) +vcpkg_install_make(MAKEFILE GNUmakefile) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libsass/remove_compiler_flags.patch b/ports/libsass/remove_compiler_flags.patch new file mode 100644 index 00000000000000..8a697ee4b4f5a9 --- /dev/null +++ b/ports/libsass/remove_compiler_flags.patch @@ -0,0 +1,24 @@ +diff --git a/GNUmakefile.am b/GNUmakefile.am +index 06a1d0c1e..6e7a15485 100644 +--- a/GNUmakefile.am ++++ b/GNUmakefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -I script + +-AM_COPT = -Wall -O2 ++AM_COPT = + AM_COVLDFLAGS = + + if ENABLE_COVERAGE +diff --git a/src/GNUmakefile.am b/src/GNUmakefile.am +index 9b0e6a99b..00404a017 100644 +--- a/src/GNUmakefile.am ++++ b/src/GNUmakefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -I script + +-AM_COPT = -Wall -O2 ++AM_COPT = + AM_COVLDFLAGS = + + if ENABLE_COVERAGE diff --git a/ports/sassc/CONTROL b/ports/sassc/CONTROL new file mode 100644 index 00000000000000..b2fc8e63f7baa4 --- /dev/null +++ b/ports/sassc/CONTROL @@ -0,0 +1,6 @@ +Source: sassc +Version: 3.6.1 +Port-Version: 0 +Description: SassC is a wrapper around libsass (http://github.com/sass/libsass) used to generate a useful command-line application that can be installed and packaged for several operating systems. +Homepage: https://github.com/sass/sassc +Build-Depends: libsass, getopt diff --git a/ports/sassc/portfile.cmake b/ports/sassc/portfile.cmake new file mode 100644 index 00000000000000..764873d043e629 --- /dev/null +++ b/ports/sassc/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sass/sassc + REF 46748216ba0b60545e814c07846ca10c9fefc5b6 # 3.6.1 + SHA512 98c5943ec485251fd5e3f41bcfe80dbbc6e2f334d4b6947895d3821b30009c40fb7cb944403304cede70360a5dd0ac103262644ef37a56e0fa76163657fbcc32 + HEAD_REF master + PATCHES remove_compiler_flags.patch +) + +find_library(LIBSASS_DEBUG sass PATHS "${CURRENT_INSTALLED_DIR}/debug/lib/" NO_DEFAULT_PATH) +find_library(LIBSASS_RELEASE sass PATHS "${CURRENT_INSTALLED_DIR}/lib/" NO_DEFAULT_PATH) +if(VCPKG_TARGET_IS_WINDOWS) + set(ENV{LIBS} "$ENV{LIBS} -lgetopt") +endif() +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + --with-libsass-include='${CURRENT_INSTALLED_DIR}/include' + OPTIONS_DEBUG + --with-libsass-lib='${LIBSASS_DEBUG}' + OPTIONS_RELEASE + --with-libsass-lib='${LIBSASS_RELEASE}' +) +vcpkg_install_make(MAKEFILE GNUmakefile) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) \ No newline at end of file diff --git a/ports/sassc/remove_compiler_flags.patch b/ports/sassc/remove_compiler_flags.patch new file mode 100644 index 00000000000000..c5f644276bbdf1 --- /dev/null +++ b/ports/sassc/remove_compiler_flags.patch @@ -0,0 +1,12 @@ +diff --git a/GNUmakefile.am b/GNUmakefile.am +index 58e8aecd1..da6a7db98 100644 +--- a/GNUmakefile.am ++++ b/GNUmakefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -I script + +-AM_COPT = -Wall -O2 ++AM_COPT = + AM_COVLDFLAGS = + + if ENABLE_COVERAGE From ea1b20348a084ee56deddf02aaaec4c0c2e8cfa0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 20 Jan 2021 07:30:34 +0100 Subject: [PATCH 0537/1694] [libjepg-turbo] Fix *.pc files (#15735) * [libjpeg-turbo] fix pkgconfig * add version info * Update ports/libjpeg-turbo/portfile.cmake * update baseline Co-authored-by: JackBoosY --- port_versions/baseline.json | 2 +- port_versions/l-/libjpeg-turbo.json | 5 +++++ ports/libjpeg-turbo/CONTROL | 2 +- ports/libjpeg-turbo/portfile.cmake | 7 +++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index c44dd4772bb839..8f547b82333fde 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -3038,7 +3038,7 @@ }, "libjpeg-turbo": { "baseline": "2.0.5", - "port-version": 3 + "port-version": 4 }, "libjuice": { "baseline": "0.6.0", diff --git a/port_versions/l-/libjpeg-turbo.json b/port_versions/l-/libjpeg-turbo.json index 43f6553968612c..46272052c51405 100644 --- a/port_versions/l-/libjpeg-turbo.json +++ b/port_versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c5889f679a9404504230cb568df8f1f1263cbba", + "version-string": "2.0.5", + "port-version": 4 + }, { "git-tree": "cf4b226059c3e824fc31962ba1afde783f7f1833", "version-string": "2.0.5", diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index 581b62dd6c05ac..1e5ad60c6f5f33 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,6 +1,6 @@ Source: libjpeg-turbo Version: 2.0.5 -Port-Version: 3 +Port-Version: 4 Homepage: https://github.com/libjpeg-turbo/libjpeg-turbo 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. diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index b218a5f9702c39..208d3ff6d40a73 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -72,6 +72,13 @@ else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() endif() +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libjpeg.pc") +if(EXISTS "${_file}" AND VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${_file}" "-ljpeg" "-ljpegd") +endif() + +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) From f7dc92dc4445d985f54d5b7ef405d5766158a770 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Tue, 19 Jan 2021 22:31:14 -0800 Subject: [PATCH 0538/1694] [cppgraphqlgen] Update to 3.5.0 release (#15701) * [cppgraphqlgen] Update to 3.5.0 release * Run vcpkg x-add-version cppgraphqlgen * Replace deprecated function in portfile.cmake * Regenerate hash after sync/bootstrap * [cppgraphqlgen] Switch to manifest and change version schema to semver Co-authored-by: Robert Schumacher --- port_versions/baseline.json | 4 ++-- port_versions/c-/cppgraphqlgen.json | 5 +++++ ports/cppgraphqlgen/CONTROL | 6 ------ ports/cppgraphqlgen/portfile.cmake | 8 +++++--- ports/cppgraphqlgen/vcpkg.json | 11 +++++++++++ 5 files changed, 23 insertions(+), 11 deletions(-) delete mode 100644 ports/cppgraphqlgen/CONTROL create mode 100644 ports/cppgraphqlgen/vcpkg.json diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 8f547b82333fde..d5126885e678ce 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -1353,8 +1353,8 @@ "port-version": 0 }, "cppgraphqlgen": { - "baseline": "2020-12-07", - "port-version": 1 + "baseline": "3.5.0", + "port-version": 0 }, "cppitertools": { "baseline": "2.0", diff --git a/port_versions/c-/cppgraphqlgen.json b/port_versions/c-/cppgraphqlgen.json index 62aa232729c9c9..6d36e382ce35a7 100644 --- a/port_versions/c-/cppgraphqlgen.json +++ b/port_versions/c-/cppgraphqlgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96ba69c23cf51b45ff8fe1206a3c134b11eed8b7", + "version-semver": "3.5.0", + "port-version": 0 + }, { "git-tree": "2aab4f37ff7fc5961bfd7b91197c03d7ceb13a4a", "version-string": "2020-12-07", diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL deleted file mode 100644 index ed84a7ac3fbbbc..00000000000000 --- a/ports/cppgraphqlgen/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: cppgraphqlgen -Version: 2020-12-07 -Port-Version: 1 -Build-Depends: boost-program-options, pegtl, rapidjson -Description: C++ GraphQL schema service generator -Homepage: https://github.com/microsoft/cppgraphqlgen diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 5cdc17faabdf67..7b7ca7953ddee5 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 fb4a589c84c102d867e7bfb03884d40f7776315b - SHA512 88fedd83b49ae25f2165cff8e3a5e3e46ed853312658924f08b3192c790e92583dc8b8f7a88f39ec17798bd7d986143a78633a89d3867400539c4d315015e29b + REF v3.5.0 + SHA512 88f5dde9093899e506d12eabfb8016fe277f12c6b121d5804a0f233bce727a80cad27616295a86807e2f48d14ffdd61bb1697c9c61e4dad025f88f4900ca1453 HEAD_REF main ) @@ -26,7 +26,9 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen) +vcpkg_copy_tools( + TOOL_NAMES schemagen + SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen) vcpkg_copy_pdbs() diff --git a/ports/cppgraphqlgen/vcpkg.json b/ports/cppgraphqlgen/vcpkg.json new file mode 100644 index 00000000000000..65664e51c0f0be --- /dev/null +++ b/ports/cppgraphqlgen/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "cppgraphqlgen", + "version-semver": "3.5.0", + "description": "C++ GraphQL schema service generator", + "homepage": "https://github.com/microsoft/cppgraphqlgen", + "dependencies": [ + "boost-program-options", + "pegtl", + "rapidjson" + ] +} From 73f15420aad4b0a63439bf3e1dca67659399f73d Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 20 Jan 2021 12:07:41 -0800 Subject: [PATCH 0539/1694] [vcpkg] Add vcpkg_minimum_required as a replacement for VERSION.txt. (#15638) --- .gitignore | 1 + docs/maintainers/portfile-functions.md | 1 + docs/maintainers/vcpkg_minimum_required.md | 15 ++++ .../backcompat-helpers.ps1 | 8 +- .../end-to-end-tests-dir/binarycaching.ps1 | 5 ++ .../vcpkg-minimum-required.ps1 | 22 +++++ scripts/azure-pipelines/end-to-end-tests.ps1 | 5 ++ .../azure-pipelines/linux/azure-pipelines.yml | 7 ++ .../azure-pipelines/osx/azure-pipelines.yml | 2 + scripts/bootstrap.ps1 | 3 +- scripts/cmake/vcpkg_minimum_required.cmake | 49 +++++++++++ .../portfile.cmake | 2 + .../vcpkg-requires-current-date/vcpkg.json | 6 ++ .../vcpkg-requires-future-date/portfile.cmake | 2 + .../vcpkg-requires-future-date/vcpkg.json | 6 ++ .../vcpkg-requires-old-date/portfile.cmake | 2 + .../vcpkg-requires-old-date/vcpkg.json | 6 ++ scripts/ports.cmake | 14 +-- toolsrc/CMakeLists.txt | 10 ++- toolsrc/VERSION.txt | 1 - toolsrc/include/pch.h | 1 + toolsrc/include/vcpkg/base/basic_checks.h | 41 +++++++++ toolsrc/include/vcpkg/base/checks.h | 51 +++++------ toolsrc/include/vcpkg/base/cstringview.h | 14 +-- toolsrc/include/vcpkg/base/enums.h | 3 +- toolsrc/include/vcpkg/base/expected.h | 5 +- toolsrc/include/vcpkg/base/fwd/lineinfo.h | 6 -- toolsrc/include/vcpkg/base/json.h | 2 +- toolsrc/include/vcpkg/base/lineinfo.h | 16 +--- toolsrc/include/vcpkg/base/optional.h | 12 ++- toolsrc/include/vcpkg/base/stringview.h | 16 +--- toolsrc/include/vcpkg/base/system.debug.h | 6 -- toolsrc/include/vcpkg/commands.version.h | 5 +- toolsrc/src/vcpkg-fuzz/main.cpp | 2 +- toolsrc/src/vcpkg.cpp | 6 -- toolsrc/src/vcpkg/archives.cpp | 2 +- toolsrc/src/vcpkg/base/checks.cpp | 54 +++++++++--- toolsrc/src/vcpkg/base/downloads.cpp | 2 +- toolsrc/src/vcpkg/base/files.cpp | 86 +++++++++++++------ toolsrc/src/vcpkg/base/hash.cpp | 2 +- toolsrc/src/vcpkg/base/machinetype.cpp | 2 +- toolsrc/src/vcpkg/base/strings.cpp | 37 +++++--- toolsrc/src/vcpkg/base/stringview.cpp | 64 +------------- toolsrc/src/vcpkg/base/system.cpp | 2 +- toolsrc/src/vcpkg/binaryparagraph.cpp | 10 +-- toolsrc/src/vcpkg/build.cpp | 78 ++++++++++------- toolsrc/src/vcpkg/commands.buildexternal.cpp | 2 +- toolsrc/src/vcpkg/commands.ci.cpp | 2 +- toolsrc/src/vcpkg/commands.create.cpp | 5 +- toolsrc/src/vcpkg/commands.edit.cpp | 2 +- .../src/vcpkg/commands.format-manifest.cpp | 8 +- toolsrc/src/vcpkg/commands.info.cpp | 2 +- toolsrc/src/vcpkg/commands.integrate.cpp | 2 +- toolsrc/src/vcpkg/commands.version.cpp | 64 +++----------- toolsrc/src/vcpkg/dependencies.cpp | 40 +++++---- toolsrc/src/vcpkg/export.chocolatey.cpp | 2 + toolsrc/src/vcpkg/export.cpp | 2 +- toolsrc/src/vcpkg/export.prefab.cpp | 27 +++--- toolsrc/src/vcpkg/install.cpp | 18 ++-- toolsrc/src/vcpkg/platform-expression.cpp | 6 +- toolsrc/src/vcpkg/portfileprovider.cpp | 26 +++--- toolsrc/src/vcpkg/registries.cpp | 36 ++++---- toolsrc/src/vcpkg/remove.cpp | 6 +- toolsrc/src/vcpkg/statusparagraph.cpp | 3 +- toolsrc/src/vcpkg/tools.cpp | 35 ++++---- toolsrc/src/vcpkg/vcpkglib.cpp | 10 ++- toolsrc/src/vcpkg/vcpkgpaths.cpp | 29 +++---- toolsrc/src/vcpkg/visualstudio.cpp | 9 +- toolsrc/windows-bootstrap/vcpkg.vcxproj | 11 +-- 69 files changed, 579 insertions(+), 460 deletions(-) create mode 100644 docs/maintainers/vcpkg_minimum_required.md create mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/vcpkg-minimum-required.ps1 create mode 100644 scripts/cmake/vcpkg_minimum_required.cmake create mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake create mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json create mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake create mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json create mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake create mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json delete mode 100644 toolsrc/VERSION.txt create mode 100644 toolsrc/include/vcpkg/base/basic_checks.h delete mode 100644 toolsrc/include/vcpkg/base/fwd/lineinfo.h diff --git a/.gitignore b/.gitignore index 92dd2182f875b7..6b77e62bab5c98 100644 --- a/.gitignore +++ b/.gitignore @@ -327,3 +327,4 @@ prefab/ ################### pythonenv3.8/ .venv/ + diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index e94d47e190c83d..4849a0ba70aa7a 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -53,5 +53,6 @@ - [vcpkg\_install\_nmake](vcpkg_install_nmake.md) - [vcpkg\_install\_qmake](vcpkg_install_qmake.md) - [vcpkg\_internal\_get\_cmake\_vars](vcpkg_internal_get_cmake_vars.md) +- [vcpkg\_minimum\_required](vcpkg_minimum_required.md) - [vcpkg\_prettify\_command](vcpkg_prettify_command.md) - [vcpkg\_replace\_string](vcpkg_replace_string.md) diff --git a/docs/maintainers/vcpkg_minimum_required.md b/docs/maintainers/vcpkg_minimum_required.md new file mode 100644 index 00000000000000..d97073b63db6f8 --- /dev/null +++ b/docs/maintainers/vcpkg_minimum_required.md @@ -0,0 +1,15 @@ +# vcpkg_minimum_required + +Asserts that the version of the vcpkg program being used to build a port is later than the supplied date, inclusive. + +## Usage +```cmake +vcpkg_minimum_required(VERSION 2021-01-13) +``` + +## Parameters +### VERSION +The date-version to check against. + +## Source +[scripts/cmake/vcpkg_minimum_required.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_minimum_required.cmake) diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1 index 5b6b1c10f1fa38..704b5275239e66 100644 --- a/scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1 @@ -6,18 +6,16 @@ foreach ($backcompatFeaturePort in $backcompatFeaturePorts) { $succeedArgs = $commonArgs + @('install',$backcompatFeaturePort,'--no-binarycaching') $failArgs = $succeedArgs + @('--x-prohibit-backcompat-features') $CurrentTest = "Should fail: ./vcpkg $($failArgs -join ' ')" - Write-Host $CurrentTest - ./vcpkg @failArgs + Run-Vcpkg @failArgs if ($LastExitCode -ne 0) { - Write-Host "... failed (this is good!)" + Write-Host "... failed (this is good!)." } else { throw $CurrentTest } # Install failed when prohibiting backcompat features, so it should succeed if we allow them $CurrentTest = "Should succeeed: ./vcpkg $($succeedArgs -join ' ')" - Write-Host $CurrentTest - ./vcpkg @succeedArgs + Run-Vcpkg @succeedArgs if ($LastExitCode -ne 0) { throw $CurrentTest } else { diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1 index 2b7e84fbd94748..e4ee6e69848c51 100644 --- a/scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1 @@ -1,3 +1,8 @@ +if ($IsLinux) { + # The tests below need a mono installation not currently available on the Linux agents. + return +} + . $PSScriptRoot/../end-to-end-tests-prelude.ps1 # Test simple installation diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/vcpkg-minimum-required.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/vcpkg-minimum-required.ps1 new file mode 100644 index 00000000000000..8f512ae7a8fd06 --- /dev/null +++ b/scripts/azure-pipelines/end-to-end-tests-dir/vcpkg-minimum-required.ps1 @@ -0,0 +1,22 @@ +. $PSScriptRoot/../end-to-end-tests-prelude.ps1 + +$successCases = @('vcpkg-requires-current-date', 'vcpkg-requires-old-date') +foreach ($successCase in $successCases) { + $CurrentTest = "Should succeeed: ./vcpkg install $successCase" + Write-Host $CurrentTest + Run-Vcpkg install $successCase @commonArgs + if ($LastExitCode -ne 0) { + throw $CurrentTest + } else { + Write-Host "... succeeded." + } +} + +$CurrentTest = "Should fail: ./vcpkg install vcpkg-requires-future-date" +Write-Host $CurrentTest +Run-Vcpkg install vcpkg-requires-future-date @commonArgs +if ($LastExitCode -ne 0) { + Write-Host "... failed (this is good!)." +} else { + throw $CurrentTest +} diff --git a/scripts/azure-pipelines/end-to-end-tests.ps1 b/scripts/azure-pipelines/end-to-end-tests.ps1 index 3c9dd067f89713..8858b362e7d573 100644 --- a/scripts/azure-pipelines/end-to-end-tests.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests.ps1 @@ -32,6 +32,10 @@ Param( $ErrorActionPreference = "Stop" +if (-Not (Test-Path $WorkingRoot)) { + New-Item -Path $WorkingRoot -ItemType Directory +} + $WorkingRoot = (Get-Item $WorkingRoot).FullName $AllTests = Get-ChildItem $PSScriptRoot/end-to-end-tests-dir/*.ps1 @@ -47,4 +51,5 @@ $AllTests | % { $n += 1 } +Write-Host "[end-to-end-tests.ps1] All tests passed." $LASTEXITCODE = 0 diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 018203a6a9c3c6..40089bc24f0574 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -36,12 +36,19 @@ jobs: arguments: '-buildTests' - bash: toolsrc/build.rel/vcpkg-test displayName: 'Run vcpkg tests' + - task: PowerShell@2 + displayName: 'Run vcpkg end-to-end tests' + inputs: + filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1' + arguments: '-Triplet x64-linux -WorkingRoot ${{ variables.WORKING_ROOT }}' + pwsh: true - task: PowerShell@2 displayName: '*** Test Modified Ports and Prepare Test Logs ***' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -UseEnvironmentSasToken -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + pwsh: true - bash: | df -h displayName: 'Report on Disk Space After Build' diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index c0e1c3a260613a..fa0d0e05666d7d 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -38,12 +38,14 @@ jobs: inputs: filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1' arguments: '-Triplet x64-osx -WorkingRoot ${{ variables.WORKING_ROOT }}' + pwsh: true - task: PowerShell@2 displayName: '*** Test Modified Ports and Prepare Test Logs ***' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' arguments: '-Triplet x64-osx -BuildReason $(Build.Reason) -BinarySourceStub "$(BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + pwsh: true - bash: | df -h displayName: 'Report on Disk Space After Build' diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 018ba3f992aa97..b4c6295c089161 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -369,7 +369,8 @@ else } $arguments = ( -"`"/p:VCPKG_VERSION=-unknownhash`"", +"`"/p:VCPKG_VERSION=unknownhash`"", +"`"/p:VCPKG_BASE_VERSION=2021-01-13`"", # Note: This duplicate date version will be short lived. See https://github.com/microsoft/vcpkg/pull/15474 "/p:Configuration=Release", "/p:Platform=$platform", "/p:PlatformToolset=$platformToolset", diff --git a/scripts/cmake/vcpkg_minimum_required.cmake b/scripts/cmake/vcpkg_minimum_required.cmake new file mode 100644 index 00000000000000..202935b8902914 --- /dev/null +++ b/scripts/cmake/vcpkg_minimum_required.cmake @@ -0,0 +1,49 @@ +#[===[.md: +# vcpkg_minimum_required + +Asserts that the version of the vcpkg program being used to build a port is later than the supplied date, inclusive. + +## Usage +```cmake +vcpkg_minimum_required(VERSION 2021-01-13) +``` + +## Parameters +### VERSION +The date-version to check against. +#]===] + +function(vcpkg_minimum_required) + cmake_parse_arguments(PARSE_ARGV 0 _vcpkg "" "VERSION" "") + if (NOT DEFINED VCPKG_BASE_VERSION) + message(FATAL_ERROR + "Your vcpkg executable is outdated and is not compatible with the current CMake scripts. " + "Please re-acquire vcpkg by running bootstrap-vcpkg." + ) + endif() + + set(_vcpkg_date_regex "^[12][0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]$") + if (NOT VCPKG_BASE_VERSION MATCHES "${_vcpkg_date_regex}") + message(FATAL_ERROR + "vcpkg internal failure; \${VCPKG_BASE_VERSION} (${VCPKG_BASE_VERSION}) was not a valid date." + ) + endif() + + if (NOT _vcpkg_VERSION MATCHES "${_vcpkg_date_regex}") + message(FATAL_ERROR + "VERSION parameter to vcpkg_minimum_required was not a valid date. " + "Comparing with vcpkg tool version ${_vcpkg_matched_base_version}" + ) + endif() + + string(REPLACE "-" "." _VCPKG_BASE_VERSION_as_dotted "${VCPKG_BASE_VERSION}") + string(REPLACE "-" "." _vcpkg_VERSION_as_dotted "${_vcpkg_VERSION}") + + if (_VCPKG_BASE_VERSION_as_dotted VERSION_LESS _vcpkg_VERSION_as_dotted) + message(FATAL_ERROR + "Your vcpkg executable is from ${VCPKG_BASE_VERSION} which is older than required by the caller " + "of vcpkg_minimum_required (${_vcpkg_VERSION}). " + "Please re-acquire vcpkg by running bootstrap-vcpkg." + ) + endif() +endfunction() diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake new file mode 100644 index 00000000000000..68dc779a84b889 --- /dev/null +++ b/scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake @@ -0,0 +1,2 @@ +vcpkg_minimum_required(VERSION ${VCPKG_BASE_VERSION}) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json new file mode 100644 index 00000000000000..48debf1e764c48 --- /dev/null +++ b/scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "vcpkg-requires-current-date", + "version-string": "1.0.0", + "description": "A test port that verifies that vcpkg_minimum_required is inclusive by using the current base version value.", + "homepage": "" +} diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake new file mode 100644 index 00000000000000..b68e53e95c2006 --- /dev/null +++ b/scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake @@ -0,0 +1,2 @@ +vcpkg_minimum_required(VERSION 2999-12-31) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json new file mode 100644 index 00000000000000..f60901998ffb25 --- /dev/null +++ b/scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "vcpkg-requires-future-date", + "version-string": "1.0.0", + "description": "A test port that requires a vcpkg version from an impossibly far future.", + "homepage": "" +} diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake new file mode 100644 index 00000000000000..5a4fbf42138db1 --- /dev/null +++ b/scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake @@ -0,0 +1,2 @@ +vcpkg_minimum_required(VERSION 2020-01-12) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json new file mode 100644 index 00000000000000..31e6fb62ff9531 --- /dev/null +++ b/scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "vcpkg-requires-old-date", + "version-string": "1.0.0", + "description": "A test port that requires a vcpkg version from before vcpkg_minimum_required's introduction.", + "homepage": "" +} diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 723d7e1df72677..9e1ba6b320e153 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -13,21 +13,13 @@ else() set(_VCPKG_BACKCOMPAT_MESSAGE_LEVEL "WARNING") endif() -if((NOT DEFINED VCPKG_ROOT_DIR) - OR (NOT DEFINED DOWNLOADS) - OR (NOT DEFINED _VCPKG_INSTALLED_DIR) - OR (NOT DEFINED PACKAGES_DIR) - OR (NOT DEFINED BUILDTREES_DIR)) - message(FATAL_ERROR [[ - Your vcpkg executable is outdated and is not compatible with the current CMake scripts. - Please re-build vcpkg by running bootstrap-vcpkg. - ]]) -endif() +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) +include(vcpkg_minimum_required) +vcpkg_minimum_required(VERSION 2021-01-13) file(TO_CMAKE_PATH ${BUILDTREES_DIR} BUILDTREES_DIR) file(TO_CMAKE_PATH ${PACKAGES_DIR} PACKAGES_DIR) -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) set(CURRENT_INSTALLED_DIR ${_VCPKG_INSTALLED_DIR}/${TARGET_TRIPLET} CACHE PATH "Location to install final packages") set(SCRIPTS ${CMAKE_CURRENT_LIST_DIR} CACHE PATH "Location to stored scripts") diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt index 69d3cd0379fe21..24ab12818d5602 100644 --- a/toolsrc/CMakeLists.txt +++ b/toolsrc/CMakeLists.txt @@ -77,10 +77,12 @@ if (VCPKG_EMBED_GIT_SHA) endif() endif() -if (VCPKG_VERSION STREQUAL "") - set(VCPKG_VERSION "nohash") +if (NOT DEFINED VCPKG_VERSION OR VCPKG_VERSION STREQUAL "") + set(VCPKG_VERSION "unknownhash") endif() +set(VCPKG_BASE_VERSION "2021-01-13") + set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD 17) @@ -115,7 +117,9 @@ target_include_directories(vcpkglib PUBLIC include) vcpkg_target_add_warning_options(vcpkglib) target_compile_definitions(vcpkglib PUBLIC VCPKG_USE_STD_FILESYSTEM=$ - VCPKG_VERSION=${VCPKG_VERSION}) + VCPKG_VERSION=${VCPKG_VERSION} + VCPKG_BASE_VERSION=${VCPKG_BASE_VERSION} + ) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) diff --git a/toolsrc/VERSION.txt b/toolsrc/VERSION.txt deleted file mode 100644 index 26725b3876e669..00000000000000 --- a/toolsrc/VERSION.txt +++ /dev/null @@ -1 +0,0 @@ -"2020.11.12" diff --git a/toolsrc/include/pch.h b/toolsrc/include/pch.h index c8ca1ea7c22f5d..b22c0a1404bd0a 100644 --- a/toolsrc/include/pch.h +++ b/toolsrc/include/pch.h @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/toolsrc/include/vcpkg/base/basic_checks.h b/toolsrc/include/vcpkg/base/basic_checks.h new file mode 100644 index 00000000000000..2ea71459937ca3 --- /dev/null +++ b/toolsrc/include/vcpkg/base/basic_checks.h @@ -0,0 +1,41 @@ +#pragma once + +#include +#include + +namespace vcpkg::Checks +{ + void register_global_shutdown_handler(void (*func)()); + + // Note: for internal use + [[noreturn]] void final_cleanup_and_exit(const int exit_code); + + // Indicate that an internal error has occurred and exit the tool. This should be used when invariants have been + // broken. + [[noreturn]] void unreachable(const LineInfo& line_info); + + [[noreturn]] void exit_with_code(const LineInfo& line_info, const int exit_code); + + // Exit the tool without an error message. + [[noreturn]] void exit_fail(const LineInfo& line_info); + + // Exit the tool successfully. + [[noreturn]] void exit_success(const LineInfo& line_info); + + // Display an error message to the user and exit the tool. + [[noreturn]] void exit_with_message(const LineInfo& line_info, StringView error_message); + + // If expression is false, call exit_fail. + void check_exit(const LineInfo& line_info, bool expression); + + // if expression is false, call exit_with_message. + void check_exit(const LineInfo& line_info, bool expression, StringView error_message); + + // Display a message indicating that vcpkg should be upgraded and exit. + [[noreturn]] void exit_maybe_upgrade(const LineInfo& line_info); + [[noreturn]] void exit_maybe_upgrade(const LineInfo& line_info, StringView error_message); + + // Check the indicated condition and call exit_maybe_upgrade if it is false. + void check_maybe_upgrade(const LineInfo& line_info, bool condition); + void check_maybe_upgrade(const LineInfo& line_info, bool condition, StringView error_message); +} diff --git a/toolsrc/include/vcpkg/base/checks.h b/toolsrc/include/vcpkg/base/checks.h index da836a3478d7d6..f360fcb36fae1f 100644 --- a/toolsrc/include/vcpkg/base/checks.h +++ b/toolsrc/include/vcpkg/base/checks.h @@ -1,29 +1,11 @@ #pragma once -#include +#include #include namespace vcpkg::Checks { - void register_global_shutdown_handler(void (*func)()); - - // Note: for internal use - [[noreturn]] void final_cleanup_and_exit(const int exit_code); - - // Indicate that an internal error has occurred and exit the tool. This should be used when invariants have been - // broken. - [[noreturn]] void unreachable(const LineInfo& line_info); - - [[noreturn]] void exit_with_code(const LineInfo& line_info, const int exit_code); - - // Exit the tool without an error message. - [[noreturn]] inline void exit_fail(const LineInfo& line_info) { exit_with_code(line_info, EXIT_FAILURE); } - - // Exit the tool successfully. - [[noreturn]] inline void exit_success(const LineInfo& line_info) { exit_with_code(line_info, EXIT_SUCCESS); } - - // Display an error message to the user and exit the tool. - [[noreturn]] void exit_with_message(const LineInfo& line_info, StringView error_message); + // Additional convenience overloads on top of basic_checks.h that do formatting. template // Display an error message to the user and exit the tool. @@ -36,10 +18,6 @@ namespace vcpkg::Checks Strings::format(error_message_template, error_message_arg1, error_message_args...)); } - void check_exit(const LineInfo& line_info, bool expression); - - void check_exit(const LineInfo& line_info, bool expression, StringView error_message); - template void check_exit(const LineInfo& line_info, Conditional&& expression, @@ -54,4 +32,29 @@ namespace vcpkg::Checks Strings::format(error_message_template, error_message_arg1, error_message_args...)); } } + + template + [[noreturn]] void exit_maybe_upgrade(const LineInfo& line_info, + const char* error_message_template, + const Arg1& error_message_arg1, + const Args&... error_message_args) + { + exit_maybe_upgrade(line_info, + Strings::format(error_message_template, error_message_arg1, error_message_args...)); + } + + template + void check_maybe_upgrade(const LineInfo& line_info, + Conditional&& expression, + const char* error_message_template, + const Arg1& error_message_arg1, + const Args&... error_message_args) + { + if (!expression) + { + // Only create the string if the expression is false + exit_maybe_upgrade(line_info, + Strings::format(error_message_template, error_message_arg1, error_message_args...)); + } + } } diff --git a/toolsrc/include/vcpkg/base/cstringview.h b/toolsrc/include/vcpkg/base/cstringview.h index 7d46ecf2e4cda3..94c806ae46dc5c 100644 --- a/toolsrc/include/vcpkg/base/cstringview.h +++ b/toolsrc/include/vcpkg/base/cstringview.h @@ -22,17 +22,17 @@ namespace vcpkg namespace details { - inline bool vcpkg_strcmp(const char* l, const char* r) { return strcmp(l, r) == 0; } + inline bool strequal(const char* l, const char* r) { return strcmp(l, r) == 0; } } inline bool operator==(const CStringView& l, const CStringView& r) { - return details::vcpkg_strcmp(l.c_str(), r.c_str()); + return details::strequal(l.c_str(), r.c_str()); } - inline bool operator==(const char* l, const CStringView& r) { return details::vcpkg_strcmp(l, r.c_str()); } + inline bool operator==(const char* l, const CStringView& r) { return details::strequal(l, r.c_str()); } - inline bool operator==(const CStringView& r, const char* l) { return details::vcpkg_strcmp(l, r.c_str()); } + inline bool operator==(const CStringView& r, const char* l) { return details::strequal(l, r.c_str()); } inline bool operator==(const std::string& l, const CStringView& r) { return l == r.c_str(); } @@ -41,12 +41,12 @@ namespace vcpkg // notequals inline bool operator!=(const CStringView& l, const CStringView& r) { - return !details::vcpkg_strcmp(l.c_str(), r.c_str()); + return !details::strequal(l.c_str(), r.c_str()); } - inline bool operator!=(const char* l, const CStringView& r) { return !details::vcpkg_strcmp(l, r.c_str()); } + inline bool operator!=(const char* l, const CStringView& r) { return !details::strequal(l, r.c_str()); } - inline bool operator!=(const CStringView& r, const char* l) { return !details::vcpkg_strcmp(l, r.c_str()); } + inline bool operator!=(const CStringView& r, const char* l) { return !details::strequal(l, r.c_str()); } inline bool operator!=(const CStringView& r, const std::string& l) { return l != r.c_str(); } diff --git a/toolsrc/include/vcpkg/base/enums.h b/toolsrc/include/vcpkg/base/enums.h index 4b77b3f6fedfff..1edd6dd8f79f26 100644 --- a/toolsrc/include/vcpkg/base/enums.h +++ b/toolsrc/include/vcpkg/base/enums.h @@ -1,8 +1,7 @@ #pragma once -#include - #include +#include namespace vcpkg::Enums { diff --git a/toolsrc/include/vcpkg/base/expected.h b/toolsrc/include/vcpkg/base/expected.h index 20c23f07730780..13e70057d3d690 100644 --- a/toolsrc/include/vcpkg/base/expected.h +++ b/toolsrc/include/vcpkg/base/expected.h @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -225,10 +226,10 @@ namespace vcpkg private: void exit_if_error(const LineInfo& line_info) const { - // This is used for quick value_or_exit() calls, so always put line_info in the error message. if (m_s.has_error()) { - Checks::exit_with_message(line_info, "Failed at [%s] with message:\n%s", line_info, m_s.to_string()); + System::print2(System::Color::error, m_s.to_string(), "\n"); + Checks::unreachable(line_info); } } diff --git a/toolsrc/include/vcpkg/base/fwd/lineinfo.h b/toolsrc/include/vcpkg/base/fwd/lineinfo.h deleted file mode 100644 index 0d65da5cc97657..00000000000000 --- a/toolsrc/include/vcpkg/base/fwd/lineinfo.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -namespace vcpkg -{ - struct LineInfo; -} diff --git a/toolsrc/include/vcpkg/base/json.h b/toolsrc/include/vcpkg/base/json.h index 31696b757eb5a3..5321308a347546 100644 --- a/toolsrc/include/vcpkg/base/json.h +++ b/toolsrc/include/vcpkg/base/json.h @@ -56,7 +56,7 @@ namespace vcpkg::Json { case Newline::Lf: return "\n"; case Newline::CrLf: return "\r\n"; - default: Checks::exit_fail(VCPKG_LINE_INFO); + default: Checks::unreachable(VCPKG_LINE_INFO); } } diff --git a/toolsrc/include/vcpkg/base/lineinfo.h b/toolsrc/include/vcpkg/base/lineinfo.h index b90b6fac3e4b75..68fca2e0e8fe11 100644 --- a/toolsrc/include/vcpkg/base/lineinfo.h +++ b/toolsrc/include/vcpkg/base/lineinfo.h @@ -1,21 +1,13 @@ #pragma once -#include - namespace vcpkg { struct LineInfo { - constexpr LineInfo() noexcept : m_line_number(0), m_file_name("") { } - constexpr LineInfo(const int lineno, const char* filename) : m_line_number(lineno), m_file_name(filename) { } - - std::string to_string() const; - void to_string(std::string& out) const; - - private: - int m_line_number; - const char* m_file_name; + int line_number; + const char* file_name; }; } -#define VCPKG_LINE_INFO vcpkg::LineInfo(__LINE__, __FILE__) +#define VCPKG_LINE_INFO \ + vcpkg::LineInfo { __LINE__, __FILE__ } diff --git a/toolsrc/include/vcpkg/base/optional.h b/toolsrc/include/vcpkg/base/optional.h index c46c2e6f8608f3..c66f891c73a25b 100644 --- a/toolsrc/include/vcpkg/base/optional.h +++ b/toolsrc/include/vcpkg/base/optional.h @@ -1,8 +1,9 @@ #pragma once -#include #include +#include +#include #include #include @@ -217,9 +218,6 @@ namespace vcpkg private: const T* m_t; }; - - // Note: implemented in checks.cpp to cut the header dependency - void exit_if_null(bool b, const LineInfo& line_info); } template @@ -237,19 +235,19 @@ namespace vcpkg T&& value_or_exit(const LineInfo& line_info) && { - details::exit_if_null(this->m_base.has_value(), line_info); + Checks::check_exit(line_info, this->m_base.has_value(), "Value was null"); return std::move(this->m_base.value()); } T& value_or_exit(const LineInfo& line_info) & { - details::exit_if_null(this->m_base.has_value(), line_info); + Checks::check_exit(line_info, this->m_base.has_value(), "Value was null"); return this->m_base.value(); } const T& value_or_exit(const LineInfo& line_info) const& { - details::exit_if_null(this->m_base.has_value(), line_info); + Checks::check_exit(line_info, this->m_base.has_value(), "Value was null"); return this->m_base.value(); } diff --git a/toolsrc/include/vcpkg/base/stringview.h b/toolsrc/include/vcpkg/base/stringview.h index aba27f9d138010..c6e0c6350680ba 100644 --- a/toolsrc/include/vcpkg/base/stringview.h +++ b/toolsrc/include/vcpkg/base/stringview.h @@ -2,28 +2,16 @@ #include -#include +#include +#include #include #include -#include namespace vcpkg { struct StringView { - static std::vector find_all_enclosed(const StringView& input, - const std::string& left_delim, - const std::string& right_delim) noexcept; - - static StringView find_exactly_one_enclosed(const StringView& input, - const std::string& left_tag, - const std::string& right_tag) noexcept; - - static Optional find_at_most_one_enclosed(const StringView& input, - const std::string& left_tag, - const std::string& right_tag) noexcept; - constexpr StringView() = default; StringView(const std::string& s) noexcept; // Implicit by design diff --git a/toolsrc/include/vcpkg/base/system.debug.h b/toolsrc/include/vcpkg/base/system.debug.h index d541b970ae3ced..898052a012f39f 100644 --- a/toolsrc/include/vcpkg/base/system.debug.h +++ b/toolsrc/include/vcpkg/base/system.debug.h @@ -10,12 +10,6 @@ namespace vcpkg::Debug { extern std::atomic g_debugging; - template - void print(System::Color c, const Args&... args) - { - if (g_debugging) System::print2(c, "[DEBUG] ", args...); - } - template void print(const Args&... args) { diff --git a/toolsrc/include/vcpkg/commands.version.h b/toolsrc/include/vcpkg/commands.version.h index 4b05881ba7db05..6deb5167dad226 100644 --- a/toolsrc/include/vcpkg/commands.version.h +++ b/toolsrc/include/vcpkg/commands.version.h @@ -4,9 +4,8 @@ namespace vcpkg::Commands::Version { - const char* base_version(); - const char* version(); - void warn_if_vcpkg_version_mismatch(const VcpkgPaths& paths); + const char* base_version() noexcept; + const char* version() noexcept; void perform_and_exit(const VcpkgCmdArguments& args, Files::Filesystem& fs); struct VersionCommand : BasicCommand diff --git a/toolsrc/src/vcpkg-fuzz/main.cpp b/toolsrc/src/vcpkg-fuzz/main.cpp index 85ce742f8d562a..bbbf71708625f9 100644 --- a/toolsrc/src/vcpkg-fuzz/main.cpp +++ b/toolsrc/src/vcpkg-fuzz/main.cpp @@ -189,6 +189,6 @@ int main(int argc, char** argv) case FuzzKind::JsonParser: fuzz_json_and_exit(text); case FuzzKind::Utf8Decoder: fuzz_utf8_and_exit(text); case FuzzKind::PlatformExpr: fuzz_platform_expr_and_exit(text); - default: Checks::exit_fail(VCPKG_LINE_INFO); + default: Checks::unreachable(VCPKG_LINE_INFO); } } diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index 783cb04292d24f..250bca52a1137e 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -79,12 +79,6 @@ static void inner(vcpkg::Files::Filesystem& fs, const VcpkgCmdArguments& args) paths.track_feature_flag_metrics(); fs.current_path(paths.root, VCPKG_LINE_INFO); - if ((args.command == "install" || args.command == "remove" || args.command == "export" || - args.command == "update") && - !args.output_json()) - { - Commands::Version::warn_if_vcpkg_version_mismatch(paths); - } if (const auto command_function = find_command(Commands::get_available_paths_commands())) { diff --git a/toolsrc/src/vcpkg/archives.cpp b/toolsrc/src/vcpkg/archives.cpp index c0b743af43a9d4..5008b3223c3e42 100644 --- a/toolsrc/src/vcpkg/archives.cpp +++ b/toolsrc/src/vcpkg/archives.cpp @@ -101,7 +101,7 @@ namespace vcpkg::Archives } else { - Checks::exit_with_message(VCPKG_LINE_INFO, "Unexpected archive extension: %s", fs::u8string(ext)); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, "Unexpected archive extension: %s", fs::u8string(ext)); } #endif diff --git a/toolsrc/src/vcpkg/base/checks.cpp b/toolsrc/src/vcpkg/base/checks.cpp index c0075e33f546a9..e3ab22dae4db14 100644 --- a/toolsrc/src/vcpkg/base/checks.cpp +++ b/toolsrc/src/vcpkg/base/checks.cpp @@ -2,9 +2,12 @@ #include #include +#include + namespace vcpkg { static void (*g_shutdown_handler)() = nullptr; + void Checks::register_global_shutdown_handler(void (*func)()) { if (g_shutdown_handler) @@ -21,7 +24,7 @@ namespace vcpkg #if defined(_WIN32) ::TerminateProcess(::GetCurrentProcess(), exit_code); #else - std::terminate(); + std::abort(); #endif } @@ -37,8 +40,10 @@ namespace vcpkg [[noreturn]] void Checks::unreachable(const LineInfo& line_info) { - System::print2(System::Color::error, "Error: Unreachable code was reached\n"); - System::print2(System::Color::error, line_info, '\n'); // Always print line_info here + System::printf(System::Color::error, + "Error: Unreachable code was reached\n%s(%d)\n", + line_info.file_name, + line_info.line_number); #ifndef NDEBUG std::abort(); #else @@ -48,10 +53,14 @@ namespace vcpkg [[noreturn]] void Checks::exit_with_code(const LineInfo& line_info, const int exit_code) { - Debug::print(System::Color::error, line_info, '\n'); + Debug::print(Strings::format("%s(%d)\n", line_info.file_name, line_info.line_number)); final_cleanup_and_exit(exit_code); } + [[noreturn]] void Checks::exit_fail(const LineInfo& line_info) { exit_with_code(line_info, EXIT_FAILURE); } + + [[noreturn]] void Checks::exit_success(const LineInfo& line_info) { exit_with_code(line_info, EXIT_SUCCESS); } + [[noreturn]] void Checks::exit_with_message(const LineInfo& line_info, StringView error_message) { System::print2(System::Color::error, error_message, '\n'); @@ -74,19 +83,38 @@ namespace vcpkg } } - std::string LineInfo::to_string() const + static void display_upgrade_message() + { + System::print2(System::Color::error, + "Note: Updating vcpkg by rerunning bootstrap-vcpkg may resolve this failure.\n"); + } + + [[noreturn]] void Checks::exit_maybe_upgrade(const LineInfo& line_info) + { + display_upgrade_message(); + exit_fail(line_info); + } + + [[noreturn]] void Checks::exit_maybe_upgrade(const LineInfo& line_info, StringView error_message) { - std::string ret; - this->to_string(ret); - return ret; + System::print2(System::Color::error, error_message, '\n'); + display_upgrade_message(); + exit_fail(line_info); } - void LineInfo::to_string(std::string& out) const + + void Checks::check_maybe_upgrade(const LineInfo& line_info, bool expression) { - out += m_file_name; - Strings::append(out, '(', m_line_number, ')'); + if (!expression) + { + exit_maybe_upgrade(line_info); + } } - namespace details + + void Checks::check_maybe_upgrade(const LineInfo& line_info, bool expression, StringView error_message) { - void exit_if_null(bool b, const LineInfo& line_info) { Checks::check_exit(line_info, b, "Value was null"); } + if (!expression) + { + exit_maybe_upgrade(line_info, error_message); + } } } diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp index ab4aeb49ffba1e..9fd3351d0e8ff6 100644 --- a/toolsrc/src/vcpkg/base/downloads.cpp +++ b/toolsrc/src/vcpkg/base/downloads.cpp @@ -462,6 +462,6 @@ namespace vcpkg::Downloads fs.rename(download_path_part_path, download_path, VCPKG_LINE_INFO); return url; } - Checks::exit_with_message(VCPKG_LINE_INFO, "Failed to download from mirror set:\n%s", errors); + Checks::exit_with_message(VCPKG_LINE_INFO, Strings::concat("Failed to download from mirror set:\n", errors)); } } diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp index afd30bf850ab6a..3d66d56291cc9c 100644 --- a/toolsrc/src/vcpkg/base/files.cpp +++ b/toolsrc/src/vcpkg/base/files.cpp @@ -459,39 +459,52 @@ namespace vcpkg::Files { auto maybe_contents = this->read_contents(path); if (auto p = maybe_contents.get()) + { return std::move(*p); - else - Checks::exit_with_message( - linfo, "error reading file: %s: %s", fs::u8string(path), maybe_contents.error().message()); + } + + Checks::exit_with_message( + linfo, "error reading file: %s: %s", fs::u8string(path), maybe_contents.error().message()); } void Filesystem::write_contents(const fs::path& path, const std::string& data, LineInfo linfo) { std::error_code ec; this->write_contents(path, data, ec); - if (ec) Checks::exit_with_message(linfo, "error writing file: %s: %s", fs::u8string(path), ec.message()); + if (ec) + { + Checks::exit_with_message(linfo, "error writing file: %s: %s", fs::u8string(path), ec.message()); + } } void Filesystem::write_contents_and_dirs(const fs::path& path, const std::string& data, LineInfo linfo) { std::error_code ec; this->write_contents_and_dirs(path, data, ec); if (ec) + { Checks::exit_with_message( linfo, "error writing file and creating directories: %s: %s", fs::u8string(path), ec.message()); + } } void Filesystem::rename(const fs::path& oldpath, const fs::path& newpath, LineInfo linfo) { std::error_code ec; this->rename(oldpath, newpath, ec); if (ec) + { Checks::exit_with_message( linfo, "error renaming file: %s: %s: %s", fs::u8string(oldpath), fs::u8string(newpath), ec.message()); + } } bool Filesystem::remove(const fs::path& path, LineInfo linfo) { std::error_code ec; auto r = this->remove(path, ec); - if (ec) Checks::exit_with_message(linfo, "error removing file: %s: %s", fs::u8string(path), ec.message()); + if (ec) + { + Checks::exit_with_message(linfo, "error removing file: %s: %s", fs::u8string(path), ec.message()); + } + return r; } @@ -562,15 +575,20 @@ namespace vcpkg::Files std::error_code ec; this->copy_file(oldpath, newpath, opts, ec); if (ec) + { vcpkg::Checks::exit_with_message( li, "error copying file from %s to %s: %s", fs::u8string(oldpath), fs::u8string(newpath), ec.message()); + } } fs::file_status Filesystem::status(vcpkg::LineInfo li, const fs::path& p) const noexcept { std::error_code ec; auto result = this->status(p, ec); - if (ec) vcpkg::Checks::exit_with_message(li, "error getting status of path %s: %s", p.string(), ec.message()); + if (ec) + { + vcpkg::Checks::exit_with_message(li, "error getting status of path %s: %s", p.string(), ec.message()); + } return result; } @@ -585,7 +603,10 @@ namespace vcpkg::Files { std::error_code ec; auto result = this->symlink_status(p, ec); - if (ec) vcpkg::Checks::exit_with_message(li, "error getting status of path %s: %s", p.string(), ec.message()); + if (ec) + { + vcpkg::Checks::exit_with_message(li, "error getting status of path %s: %s", p.string(), ec.message()); + } return result; } @@ -600,7 +621,10 @@ namespace vcpkg::Files { std::error_code ec; this->write_lines(path, lines, ec); - if (ec) Checks::exit_with_message(linfo, "error writing lines: %s: %s", fs::u8string(path), ec.message()); + if (ec) + { + Checks::exit_with_message(linfo, "error writing lines: %s: %s", fs::u8string(path), ec.message()); + } } void Filesystem::remove_all(const fs::path& path, LineInfo li) @@ -657,17 +681,23 @@ namespace vcpkg::Files { std::error_code ec; const auto result = this->absolute(path, ec); - if (ec) Checks::exit_with_message(li, "Error getting absolute path of %s: %s", path.string(), ec.message()); + if (ec) + { + Checks::exit_with_message(li, "Error getting absolute path of %s: %s", path.string(), ec.message()); + } + return result; } fs::path Filesystem::canonical(LineInfo li, const fs::path& path) const { std::error_code ec; - const auto result = this->canonical(path, ec); + if (ec) + { + Checks::exit_with_message(li, "Error getting canonicalization of %s: %s", path.string(), ec.message()); + } - if (ec) Checks::exit_with_message(li, "Error getting canonicalization of %s: %s", path.string(), ec.message()); return result; } fs::path Filesystem::canonical(const fs::path& path, ignore_errors_t) const @@ -679,15 +709,21 @@ namespace vcpkg::Files { std::error_code ec; const auto result = this->current_path(ec); + if (ec) + { + Checks::exit_with_message(li, "Error getting current path: %s", ec.message()); + } - if (ec) Checks::exit_with_message(li, "Error getting current path: %s", ec.message()); return result; } void Filesystem::current_path(const fs::path& path, LineInfo li) { std::error_code ec; this->current_path(path, ec); - if (ec) Checks::exit_with_message(li, "Error setting current path: %s", ec.message()); + if (ec) + { + Checks::exit_with_message(li, "Error setting current path: %s", ec.message()); + } } struct RealFilesystem final : Filesystem @@ -712,7 +748,6 @@ namespace vcpkg::Files std::string output; output.resize(static_cast(length)); file_stream.read(&output[0], length); - file_stream.close(); return output; } @@ -734,7 +769,6 @@ namespace vcpkg::Files output.push_back(line); } - file_stream.close(); return output; } @@ -813,22 +847,24 @@ namespace vcpkg::Files std::error_code& ec) override { std::fstream output(file_path, std::ios_base::out | std::ios_base::binary | std::ios_base::trunc); - if (!output) - { - ec.assign(errno, std::generic_category()); - return; - } - for (const std::string& line : lines) + auto first = lines.begin(); + const auto last = lines.end(); + for (;;) { - output << line << "\n"; if (!output) { - output.close(); - ec.assign(errno, std::generic_category()); + ec.assign(static_cast(std::errc::io_error), std::generic_category()); return; } + + if (first == last) + { + return; + } + + output << *first << "\n"; + ++first; } - output.close(); } virtual void rename(const fs::path& oldpath, const fs::path& newpath, std::error_code& ec) override { diff --git a/toolsrc/src/vcpkg/base/hash.cpp b/toolsrc/src/vcpkg/base/hash.cpp index 0070a5f72647c3..825489d6df58be 100644 --- a/toolsrc/src/vcpkg/base/hash.cpp +++ b/toolsrc/src/vcpkg/base/hash.cpp @@ -122,7 +122,7 @@ namespace vcpkg::Hash case Algorithm::Sha1: alg_handle = sha1_alg_handle; break; case Algorithm::Sha256: alg_handle = sha256_alg_handle; break; case Algorithm::Sha512: alg_handle = sha512_alg_handle; break; - default: Checks::exit_with_message(VCPKG_LINE_INFO, "Unknown algorithm"); + default: Checks::unreachable(VCPKG_LINE_INFO); } clear(); diff --git a/toolsrc/src/vcpkg/base/machinetype.cpp b/toolsrc/src/vcpkg/base/machinetype.cpp index 243fa70864537a..9b34d4b188c44b 100644 --- a/toolsrc/src/vcpkg/base/machinetype.cpp +++ b/toolsrc/src/vcpkg/base/machinetype.cpp @@ -33,7 +33,7 @@ namespace vcpkg case MachineType::SH5: case MachineType::THUMB: case MachineType::WCEMIPSV2: return t; - default: Checks::exit_with_message(VCPKG_LINE_INFO, "Unknown machine type code 0x%hx", value); + default: Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, "Unknown machine type code 0x%hx", value); } } } diff --git a/toolsrc/src/vcpkg/base/strings.cpp b/toolsrc/src/vcpkg/base/strings.cpp index d8377e39445382..89b3b46de9bc2a 100644 --- a/toolsrc/src/vcpkg/base/strings.cpp +++ b/toolsrc/src/vcpkg/base/strings.cpp @@ -2,6 +2,15 @@ #include #include +#include +#include +#include + +#include +#include +#include +#include + namespace vcpkg::Strings::details { // To disambiguate between two overloads @@ -237,26 +246,26 @@ std::vector Strings::find_all_enclosed(StringView input, StringView StringView Strings::find_exactly_one_enclosed(StringView input, StringView left_tag, StringView right_tag) { std::vector result = find_all_enclosed(input, left_tag, right_tag); - Checks::check_exit(VCPKG_LINE_INFO, - result.size() == 1, - "Found %d sets of %s.*%s but expected exactly 1, in block:\n%s", - result.size(), - left_tag, - right_tag, - input); + Checks::check_maybe_upgrade(VCPKG_LINE_INFO, + result.size() == 1, + "Found %d sets of %s.*%s but expected exactly 1, in block:\n%s", + result.size(), + left_tag, + right_tag, + input); return result.front(); } Optional Strings::find_at_most_one_enclosed(StringView input, StringView left_tag, StringView right_tag) { std::vector result = find_all_enclosed(input, left_tag, right_tag); - Checks::check_exit(VCPKG_LINE_INFO, - result.size() <= 1, - "Found %d sets of %s.*%s but expected at most 1, in block:\n%s", - result.size(), - left_tag, - right_tag, - input); + Checks::check_maybe_upgrade(VCPKG_LINE_INFO, + result.size() <= 1, + "Found %d sets of %s.*%s but expected at most 1, in block:\n%s", + result.size(), + left_tag, + right_tag, + input); if (result.empty()) { diff --git a/toolsrc/src/vcpkg/base/stringview.cpp b/toolsrc/src/vcpkg/base/stringview.cpp index 3b980a1955f46c..fd7f787a155d8c 100644 --- a/toolsrc/src/vcpkg/base/stringview.cpp +++ b/toolsrc/src/vcpkg/base/stringview.cpp @@ -2,73 +2,11 @@ #include #include +#include #include namespace vcpkg { - std::vector StringView::find_all_enclosed(const StringView& input, - const std::string& left_delim, - const std::string& right_delim) noexcept - { - auto it_left = input.begin(); - auto it_right = input.begin(); - - std::vector output; - - while (true) - { - it_left = std::search(it_right, input.end(), left_delim.cbegin(), left_delim.cend()); - if (it_left == input.end()) break; - - it_left += left_delim.length(); - - it_right = std::search(it_left, input.end(), right_delim.cbegin(), right_delim.cend()); - if (it_right == input.end()) break; - - output.emplace_back(it_left, it_right); - - ++it_right; - } - - return output; - } - - StringView StringView::find_exactly_one_enclosed(const StringView& input, - const std::string& left_tag, - const std::string& right_tag) noexcept - { - std::vector result = find_all_enclosed(input, left_tag, right_tag); - Checks::check_exit(VCPKG_LINE_INFO, - result.size() == 1, - "Found %d sets of %s.*%s but expected exactly 1, in block:\n%s", - result.size(), - left_tag, - right_tag, - input); - return result.front(); - } - - Optional StringView::find_at_most_one_enclosed(const StringView& input, - const std::string& left_tag, - const std::string& right_tag) noexcept - { - std::vector result = find_all_enclosed(input, left_tag, right_tag); - Checks::check_exit(VCPKG_LINE_INFO, - result.size() <= 1, - "Found %d sets of %s.*%s but expected at most 1, in block:\n%s", - result.size(), - left_tag, - right_tag, - input); - - if (result.empty()) - { - return nullopt; - } - - return result.front(); - } - StringView::StringView(const std::string& s) noexcept : m_ptr(s.data()), m_size(s.size()) { } std::string StringView::to_string() const { return std::string(m_ptr, m_size); } diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp index c400815befe405..687f6fa9c81cbd 100644 --- a/toolsrc/src/vcpkg/base/system.cpp +++ b/toolsrc/src/vcpkg/base/system.cpp @@ -39,7 +39,7 @@ namespace vcpkg case CPUArchitecture::ARM: return "arm"; case CPUArchitecture::ARM64: return "arm64"; case CPUArchitecture::S390X: return "s390x"; - default: Checks::exit_with_message(VCPKG_LINE_INFO, "unexpected vcpkg::System::CPUArchitecture"); + default: Checks::unreachable(VCPKG_LINE_INFO); } } diff --git a/toolsrc/src/vcpkg/binaryparagraph.cpp b/toolsrc/src/vcpkg/binaryparagraph.cpp index 4d3bcbc973ac8b..f8608122306bcb 100644 --- a/toolsrc/src/vcpkg/binaryparagraph.cpp +++ b/toolsrc/src/vcpkg/binaryparagraph.cpp @@ -242,23 +242,23 @@ namespace vcpkg out_str.substr(initial_end), "vcpkg::serialize(const BinaryParagraph&, std::string&)"); if (!parsed_paragraph.has_value()) { - Checks::exit_with_message(VCPKG_LINE_INFO, - R"([sanity check] Failed to parse a serialized binary paragraph. + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, + R"([sanity check] Failed to parse a serialized binary paragraph. Please open an issue at https://github.com/microsoft/vcpkg, with the following output: Error: %s === Serialized BinaryParagraph === %s )", - parsed_paragraph.error(), - my_paragraph); + parsed_paragraph.error(), + my_paragraph); } auto binary_paragraph = BinaryParagraph(*parsed_paragraph.get()); if (binary_paragraph != pgh) { const auto& join_str = R"(", ")"; - Checks::exit_with_message( + Checks::exit_maybe_upgrade( VCPKG_LINE_INFO, R"([sanity check] The serialized binary paragraph was different from the original binary paragraph. Please open an issue at https://github.com/microsoft/vcpkg, with the following output: diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 733de9d8b1f598..8bbb5f2dee68ae 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -104,11 +104,12 @@ namespace vcpkg::Build const PackageSpec& spec = full_spec.package_spec; const SourceControlFile& scf = *scfl.source_control_file; - Checks::check_exit(VCPKG_LINE_INFO, - spec.name() == scf.core_paragraph->name, - "The Source field inside the CONTROL file does not match the port directory: '%s' != '%s'", - scf.core_paragraph->name, - spec.name()); + Checks::check_maybe_upgrade( + VCPKG_LINE_INFO, + spec.name() == scf.core_paragraph->name, + Strings::format("The Source field inside the CONTROL file does not match the port directory: '%s' != '%s'", + scf.core_paragraph->name, + spec.name())); compute_all_abis(paths, action_plan, var_provider, status_db); @@ -181,7 +182,7 @@ namespace vcpkg::Build const auto port_name = spec.package_spec.name(); const auto* scfl = provider.get_control_file(port_name).get(); - Checks::check_exit(VCPKG_LINE_INFO, scfl != nullptr, "Error: Couldn't find port '%s'", port_name); + Checks::check_maybe_upgrade(VCPKG_LINE_INFO, scfl != nullptr, "Error: Couldn't find port '%s'", port_name); ASSUME(scfl != nullptr); return perform_ex(args, @@ -298,13 +299,13 @@ namespace vcpkg::Build if (cmake_system_name == "Windows") return ""; if (cmake_system_name == "WindowsStore") return "store"; - Checks::exit_with_message(VCPKG_LINE_INFO, "Unsupported vcvarsall target %s", cmake_system_name); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, "Unsupported vcvarsall target %s", cmake_system_name); } static CStringView to_vcvarsall_toolchain(const std::string& target_architecture, const Toolset& toolset) { auto maybe_target_arch = System::to_cpu_architecture(target_architecture); - Checks::check_exit( + Checks::check_maybe_upgrade( VCPKG_LINE_INFO, maybe_target_arch.has_value(), "Invalid architecture string: %s", target_architecture); auto target_arch = maybe_target_arch.value_or_exit(VCPKG_LINE_INFO); auto host_architectures = System::get_supported_host_architectures(); @@ -317,12 +318,12 @@ namespace vcpkg::Build if (it != toolset.supported_architectures.end()) return it->name; } - Checks::exit_with_message(VCPKG_LINE_INFO, - "Unsupported toolchain combination. Target was: %s but supported ones were:\n%s", - target_architecture, - Strings::join(",", toolset.supported_architectures, [](const ToolsetArchOption& t) { - return t.name.c_str(); - })); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, + "Unsupported toolchain combination. Target was: %s but supported ones were:\n%s", + target_architecture, + Strings::join(",", toolset.supported_architectures, [](const ToolsetArchOption& t) { + return t.name.c_str(); + })); } #if defined(_WIN32) @@ -515,11 +516,12 @@ namespace vcpkg::Build Util::Vectors::append(&out_vars, std::initializer_list{ {"CMD", "BUILD"}, + {"DOWNLOADS", paths.downloads}, {"TARGET_TRIPLET", triplet.canonical_name()}, {"TARGET_TRIPLET_FILE", fs::u8string(paths.get_triplet_file_path(triplet))}, - {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()}, - {"DOWNLOADS", paths.downloads}, + {"VCPKG_BASE_VERSION", Commands::Version::base_version()}, {"VCPKG_CONCURRENCY", std::to_string(get_concurrency())}, + {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()}, }); if (!System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value()) { @@ -626,14 +628,14 @@ namespace vcpkg::Build } std::vector variables{ - {"PORT", scf.core_paragraph->name}, + {"ALL_FEATURES", all_features}, {"CURRENT_PORT_DIR", scfl.source_location}, + {"FEATURES", Strings::join(";", action.feature_list)}, + {"PORT", scf.core_paragraph->name}, {"VCPKG_USE_HEAD_VERSION", Util::Enum::to_bool(action.build_options.use_head_version) ? "1" : "0"}, - {"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(action.build_options.allow_downloads) ? "1" : "0"}, {"_VCPKG_DOWNLOAD_TOOL", to_string(action.build_options.download_tool)}, {"_VCPKG_EDITABLE", Util::Enum::to_bool(action.build_options.editable) ? "1" : "0"}, - {"FEATURES", Strings::join(";", action.feature_list)}, - {"ALL_FEATURES", all_features}, + {"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(action.build_options.allow_downloads) ? "1" : "0"}, }; for (auto cmake_arg : args.cmake_args) @@ -726,10 +728,11 @@ namespace vcpkg::Build } else { - Checks::exit_with_message(VCPKG_LINE_INFO, - "Unable to determine toolchain to use for triplet %s with CMAKE_SYSTEM_NAME %s", - triplet, - cmake_system_name); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, + "Unable to determine toolchain to use for triplet %s with CMAKE_SYSTEM_NAME %s; " + "maybe you meant to use VCPKG_CHAINLOAD_TOOLCHAIN_FILE?", + triplet, + cmake_system_name); } } @@ -1061,13 +1064,11 @@ namespace vcpkg::Build auto status_it = status_db.find(pspec); if (status_it == status_db.end()) { - Checks::exit_with_message( + Checks::exit_maybe_upgrade( VCPKG_LINE_INFO, "Failed to find dependency abi for %s -> %s", action.spec, pspec); } - else - { - dependency_abis.emplace_back(AbiEntry{pspec.name(), status_it->get()->package.abi}); - } + + dependency_abis.emplace_back(AbiEntry{pspec.name(), status_it->get()->package.abi}); } else { @@ -1248,9 +1249,13 @@ namespace vcpkg::Build auto crtlinkage = to_linkage_type(crt_linkage_as_string); if (const auto p = crtlinkage.get()) + { build_info.crt_linkage = *p; + } else + { Checks::exit_with_message(VCPKG_LINE_INFO, "Invalid crt linkage type: [%s]", crt_linkage_as_string); + } } { @@ -1258,11 +1263,16 @@ namespace vcpkg::Build parser.required_field(BuildInfoRequiredField::LIBRARY_LINKAGE, library_linkage_as_string); auto liblinkage = to_linkage_type(library_linkage_as_string); if (const auto p = liblinkage.get()) + { build_info.library_linkage = *p; + } else + { Checks::exit_with_message( VCPKG_LINE_INFO, "Invalid library linkage type: [%s]", library_linkage_as_string); + } } + std::string version = parser.optional_field("Version"); if (!version.empty()) build_info.version = std::move(version); @@ -1276,7 +1286,7 @@ namespace vcpkg::Build else if (setting == "disabled") policies.emplace(policy, false); else - Checks::exit_with_message( + Checks::exit_maybe_upgrade( VCPKG_LINE_INFO, "Unknown setting for policy '%s': %s", to_string(policy), setting); } @@ -1294,7 +1304,7 @@ namespace vcpkg::Build BuildInfo read_build_info(const Files::Filesystem& fs, const fs::path& filepath) { const ExpectedS pghs = Paragraphs::get_single_paragraph(fs, filepath); - Checks::check_exit( + Checks::check_maybe_upgrade( VCPKG_LINE_INFO, pghs.get() != nullptr, "Invalid BUILD_INFO file for package: %s", pghs.error()); return inner_create_buildinfo(*pghs.get()); } @@ -1394,16 +1404,22 @@ namespace vcpkg::Build else if (Strings::case_insensitive_ascii_equals(variable_value, "1") || Strings::case_insensitive_ascii_equals(variable_value, "on") || Strings::case_insensitive_ascii_equals(variable_value, "true")) + { load_vcvars_env = true; + } else if (Strings::case_insensitive_ascii_equals(variable_value, "0") || Strings::case_insensitive_ascii_equals(variable_value, "off") || Strings::case_insensitive_ascii_equals(variable_value, "false")) + { load_vcvars_env = false; + } else + { Checks::exit_with_message(VCPKG_LINE_INFO, "Unknown boolean setting for VCPKG_LOAD_VCVARS_ENV: %s. Valid " "settings are '', '1', '0', 'ON', 'OFF', 'TRUE', and 'FALSE'.", variable_value); + } break; } } diff --git a/toolsrc/src/vcpkg/commands.buildexternal.cpp b/toolsrc/src/vcpkg/commands.buildexternal.cpp index cbf9c6ec1bdf00..65b1ec8230b2ae 100644 --- a/toolsrc/src/vcpkg/commands.buildexternal.cpp +++ b/toolsrc/src/vcpkg/commands.buildexternal.cpp @@ -33,7 +33,7 @@ namespace vcpkg::Commands::BuildExternal PortFileProvider::PathsPortFileProvider provider(paths, overlays); auto maybe_scfl = provider.get_control_file(spec.package_spec.name()); - Checks::check_exit( + Checks::check_maybe_upgrade( VCPKG_LINE_INFO, maybe_scfl.has_value(), "could not load control file for %s", spec.package_spec.name()); Build::Command::perform_and_exit_ex(args, diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp index 8927c038fa5def..efe705e3d75cf2 100644 --- a/toolsrc/src/vcpkg/commands.ci.cpp +++ b/toolsrc/src/vcpkg/commands.ci.cpp @@ -220,7 +220,7 @@ namespace vcpkg::Commands::CI message_block = Strings::format("", to_string(test.result)); break; case BuildResult::SUCCEEDED: result_string = "Pass"; break; - default: Checks::exit_fail(VCPKG_LINE_INFO); break; + default: Checks::unreachable(VCPKG_LINE_INFO); } std::string traits_block; diff --git a/toolsrc/src/vcpkg/commands.create.cpp b/toolsrc/src/vcpkg/commands.create.cpp index 44c2c55ab9b789..6ef5163cbf8a81 100644 --- a/toolsrc/src/vcpkg/commands.create.cpp +++ b/toolsrc/src/vcpkg/commands.create.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include #include @@ -37,8 +38,10 @@ namespace vcpkg::Commands::Create std::vector cmake_args{ {"CMD", "CREATE"}, {"PORT", port_name}, + {"PORT_PATH", fs::generic_u8string(paths.builtin_ports_directory() / fs::u8path(port_name))}, {"URL", url}, - {"PORT_PATH", fs::generic_u8string(paths.builtin_ports_directory() / fs::u8path(port_name))}}; + {"VCPKG_BASE_VERSION", Commands::Version::base_version()}, + }; if (args.command_arguments.size() >= 3) { diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp index 720f6b14d68eaa..e761b3cf4cb638 100644 --- a/toolsrc/src/vcpkg/commands.edit.cpp +++ b/toolsrc/src/vcpkg/commands.edit.cpp @@ -161,7 +161,7 @@ namespace vcpkg::Commands::Edit for (auto&& port_name : ports) { const fs::path portpath = paths.builtin_ports_directory() / port_name; - Checks::check_exit( + Checks::check_maybe_upgrade( VCPKG_LINE_INFO, fs.is_directory(portpath), R"(Could not find port named "%s")", port_name); } diff --git a/toolsrc/src/vcpkg/commands.format-manifest.cpp b/toolsrc/src/vcpkg/commands.format-manifest.cpp index 64d491a84f0b4c..0e7394c25f95d2 100644 --- a/toolsrc/src/vcpkg/commands.format-manifest.cpp +++ b/toolsrc/src/vcpkg/commands.format-manifest.cpp @@ -120,18 +120,18 @@ Please open an issue at https://github.com/microsoft/vcpkg, with the following o Error:)", data.scf.core_paragraph->name); print_error_message(check.error()); - Checks::exit_with_message(VCPKG_LINE_INFO, - R"( + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, + R"( === Serialized manifest file === %s )", - Json::stringify(res, {})); + Json::stringify(res, {})); } auto check_scf = std::move(check).value_or_exit(VCPKG_LINE_INFO); if (*check_scf != data.scf) { - Checks::exit_with_message( + Checks::exit_maybe_upgrade( VCPKG_LINE_INFO, R"([correctness check] The serialized manifest SCF was different from the original SCF. Please open an issue at https://github.com/microsoft/vcpkg, with the following output: diff --git a/toolsrc/src/vcpkg/commands.info.cpp b/toolsrc/src/vcpkg/commands.info.cpp index 71db6a8f4dad47..dbf089534278c2 100644 --- a/toolsrc/src/vcpkg/commands.info.cpp +++ b/toolsrc/src/vcpkg/commands.info.cpp @@ -37,7 +37,7 @@ namespace vcpkg::Commands::Info const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE); if (!args.output_json()) { - Checks::exit_with_message( + Checks::exit_maybe_upgrade( VCPKG_LINE_INFO, "This command currently requires --%s", VcpkgCmdArguments::JSON_SWITCH); } diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp index e804046981ce7d..8258de1fe71177 100644 --- a/toolsrc/src/vcpkg/commands.integrate.cpp +++ b/toolsrc/src/vcpkg/commands.integrate.cpp @@ -597,7 +597,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console } #endif - Checks::exit_with_message(VCPKG_LINE_INFO, "Unknown parameter %s for integrate", args.command_arguments[0]); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, "Unknown parameter %s for integrate", args.command_arguments[0]); } void IntegrateCommand::perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) const diff --git a/toolsrc/src/vcpkg/commands.version.cpp b/toolsrc/src/vcpkg/commands.version.cpp index e9ce4286d53fa2..5ee8e270e8a55c 100644 --- a/toolsrc/src/vcpkg/commands.version.cpp +++ b/toolsrc/src/vcpkg/commands.version.cpp @@ -15,69 +15,25 @@ #define VCPKG_VERSION_AS_STRING MACRO_TO_STRING(VCPKG_VERSION) +#if !defined(VCPKG_BASE_VERSION) +#error VCPKG_BASE_VERSION must be defined +#endif + +#define VCPKG_BASE_VERSION_AS_STRING MACRO_TO_STRING(VCPKG_BASE_VERSION) + namespace vcpkg::Commands::Version { - const char* base_version() - { - return -#include "../VERSION.txt" - ; - } + const char* base_version() noexcept { return VCPKG_BASE_VERSION_AS_STRING; } - const char* version() + const char* version() noexcept { - return -#include "../VERSION.txt" - "-" VCPKG_VERSION_AS_STRING + return VCPKG_BASE_VERSION_AS_STRING "-" VCPKG_VERSION_AS_STRING #ifndef NDEBUG - "-debug" + "-debug" #endif ; } - static int scan3(const char* input, const char* pattern, int* a, int* b, int* c) - { -#if defined(_WIN32) - return sscanf_s(input, pattern, a, b, c); -#else - return sscanf(input, pattern, a, b, c); -#endif - } - - void warn_if_vcpkg_version_mismatch(const VcpkgPaths& paths) - { - auto version_file = paths.get_filesystem().read_contents(paths.root / "toolsrc" / "VERSION.txt"); - if (const auto version_contents = version_file.get()) - { - int maj1, min1, rev1; - const auto num1 = scan3(version_contents->c_str(), "\"%d.%d.%d\"", &maj1, &min1, &rev1); - - int maj2, min2, rev2; - const auto num2 = scan3(Version::version(), "%d.%d.%d-", &maj2, &min2, &rev2); - - if (num1 == 3 && num2 == 3) - { - if (maj1 != maj2 || min1 != min2 || rev1 != rev2) - { -#if defined(_WIN32) - auto bootstrap = ".\\bootstrap-vcpkg.bat"; -#else - auto bootstrap = "./bootstrap-vcpkg.sh"; -#endif - System::printf(System::Color::warning, - "Warning: Different source is available for vcpkg (%d.%d.%d -> %d.%d.%d). Use " - "%s to update.\n", - maj2, - min2, - rev2, - maj1, - min1, - rev1, - bootstrap); - } - } - } - } const CommandStructure COMMAND_STRUCTURE = { create_example_string("version"), 0, diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index d71fb387f45ea4..68415b9aad6c89 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -197,13 +197,16 @@ namespace vcpkg::Dependencies static auto vcpkg_remove_cmd = "./vcpkg"; #endif if (!m_scfl) - Checks::exit_with_message( + { + Checks::exit_maybe_upgrade( VCPKG_LINE_INFO, "Error: while loading control file for %s: %s.\nPlease run \"%s remove %s\" and re-attempt.", m_spec, m_scfl.error(), vcpkg_remove_cmd, m_spec); + } + return *m_scfl.get(); } @@ -258,7 +261,7 @@ namespace vcpkg::Dependencies { const SourceControlFileLocation* scfl = m_port_provider.get_control_file(spec.name()).get(); - Checks::check_exit( + Checks::check_maybe_upgrade( VCPKG_LINE_INFO, scfl, "Error: Cannot find definition for package `%s`.", spec.name()); return m_graph @@ -296,7 +299,7 @@ namespace vcpkg::Dependencies const Cluster& find_or_exit(const PackageSpec& spec, LineInfo linfo) const { auto it = m_graph.find(spec); - Checks::check_exit(linfo, it != m_graph.end(), "Failed to locate spec in graph"); + Checks::check_maybe_upgrade(linfo, it != m_graph.end(), "Failed to locate spec in graph"); return it->second; } @@ -697,11 +700,11 @@ namespace vcpkg::Dependencies { auto maybe_scfl = port_provider.get_control_file(spec.package_spec.name()); - Checks::check_exit(VCPKG_LINE_INFO, - maybe_scfl.has_value(), - "Error: while loading port `%s`: %s", - spec.package_spec.name(), - maybe_scfl.error()); + Checks::check_maybe_upgrade(VCPKG_LINE_INFO, + maybe_scfl.has_value(), + "Error: while loading port `%s`: %s", + spec.package_spec.name(), + maybe_scfl.error()); const SourceControlFileLocation* scfl = maybe_scfl.get(); @@ -790,11 +793,11 @@ namespace vcpkg::Dependencies { auto maybe_paragraph = clust.get_scfl_or_exit().source_control_file->find_feature(spec.feature()); - Checks::check_exit(VCPKG_LINE_INFO, - maybe_paragraph.has_value(), - "Package %s does not have a %s feature", - spec.name(), - spec.feature()); + Checks::check_maybe_upgrade(VCPKG_LINE_INFO, + maybe_paragraph.has_value(), + "Package %s does not have a %s feature", + spec.name(), + spec.feature()); paragraph_depends = &maybe_paragraph.value_or_exit(VCPKG_LINE_INFO).dependencies; } @@ -1024,11 +1027,12 @@ namespace vcpkg::Dependencies for (auto&& dep : deps) { auto p_installed = graph->get(dep).m_installed.get(); - Checks::check_exit(VCPKG_LINE_INFO, - p_installed, - "Error: database corrupted. Package %s is installed but dependency %s is not.", - ipv.spec(), - dep); + Checks::check_maybe_upgrade( + VCPKG_LINE_INFO, + p_installed, + "Error: database corrupted. Package %s is installed but dependency %s is not.", + ipv.spec(), + dep); p_installed->remove_edges.emplace(ipv.spec()); } } diff --git a/toolsrc/src/vcpkg/export.chocolatey.cpp b/toolsrc/src/vcpkg/export.chocolatey.cpp index a01394b3669344..875982ed67f7d8 100644 --- a/toolsrc/src/vcpkg/export.chocolatey.cpp +++ b/toolsrc/src/vcpkg/export.chocolatey.cpp @@ -26,6 +26,7 @@ namespace vcpkg::Export::Chocolatey { Checks::exit_with_message(VCPKG_LINE_INFO, "Cannot find desired dependency version."); } + std::string nuspec_dependency = Strings::replace_all(CONTENT_TEMPLATE, "@PACKAGE_ID@", depend); Strings::inplace_replace_all(nuspec_dependency, "@PACKAGE_VERSION@", found->second); nuspec_dependencies += nuspec_dependency; @@ -62,6 +63,7 @@ namespace vcpkg::Export::Chocolatey { Checks::exit_with_message(VCPKG_LINE_INFO, "Cannot find desired package version."); } + std::string nuspec_file_content = Strings::replace_all(CONTENT_TEMPLATE, "@PACKAGE_ID@", binary_paragraph.spec.name()); Strings::inplace_replace_all(nuspec_file_content, "@PACKAGE_VERSION@", package_version->second); diff --git a/toolsrc/src/vcpkg/export.cpp b/toolsrc/src/vcpkg/export.cpp index 7bf36842267513..1f202a9d54a4eb 100644 --- a/toolsrc/src/vcpkg/export.cpp +++ b/toolsrc/src/vcpkg/export.cpp @@ -616,7 +616,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console { if (paths.manifest_mode_enabled()) { - Checks::exit_with_message( + Checks::exit_maybe_upgrade( VCPKG_LINE_INFO, "vcpkg export does not support manifest mode, in order to allow for future design considerations. You " "may use export in classic mode by running vcpkg outside of a manifest-based project."); diff --git a/toolsrc/src/vcpkg/export.prefab.cpp b/toolsrc/src/vcpkg/export.prefab.cpp index 24b16656eda856..852a499814a51f 100644 --- a/toolsrc/src/vcpkg/export.prefab.cpp +++ b/toolsrc/src/vcpkg/export.prefab.cpp @@ -257,7 +257,8 @@ namespace vcpkg::Export::Prefab { auto build_info = build_info_from_triplet(paths, provider, default_triplet); - Checks::check_exit(VCPKG_LINE_INFO, is_supported(*build_info), "Currenty supported on android triplets"); + Checks::check_maybe_upgrade( + VCPKG_LINE_INFO, is_supported(*build_info), "Currenty supported on android triplets"); } std::vector available_triplets = paths.get_available_triplets(); @@ -312,25 +313,25 @@ namespace vcpkg::Export::Prefab const fs::path ndk_location = android_ndk_home.value_or_exit(VCPKG_LINE_INFO); - Checks::check_exit(VCPKG_LINE_INFO, - utils.exists(ndk_location), - "Error: ANDROID_NDK_HOME Directory does not exists %s", - fs::generic_u8string(ndk_location)); + Checks::check_maybe_upgrade(VCPKG_LINE_INFO, + utils.exists(ndk_location), + "Error: ANDROID_NDK_HOME Directory does not exists %s", + fs::generic_u8string(ndk_location)); const fs::path source_properties_location = ndk_location / "source.properties"; - Checks::check_exit(VCPKG_LINE_INFO, - utils.exists(ndk_location), - "Error: source.properties missing in ANDROID_NDK_HOME directory %s", - fs::generic_u8string(source_properties_location)); + Checks::check_maybe_upgrade(VCPKG_LINE_INFO, + utils.exists(ndk_location), + "Error: source.properties missing in ANDROID_NDK_HOME directory %s", + fs::generic_u8string(source_properties_location)); std::string content = utils.read_contents(source_properties_location, VCPKG_LINE_INFO); Optional version_opt = find_ndk_version(content); - Checks::check_exit(VCPKG_LINE_INFO, - version_opt.has_value(), - "Error: NDK version missing %s", - fs::generic_u8string(source_properties_location)); + Checks::check_maybe_upgrade(VCPKG_LINE_INFO, + version_opt.has_value(), + "Error: NDK version missing %s", + fs::generic_u8string(source_properties_location)); NdkVersion version = to_version(version_opt.value_or_exit(VCPKG_LINE_INFO)).value_or_exit(VCPKG_LINE_INFO); diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index cf50d6a8460f88..59212d65189423 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -51,8 +51,9 @@ namespace vcpkg::Install { auto& fs = paths.get_filesystem(); auto source_dir = paths.package_dir(spec); - Checks::check_exit( - VCPKG_LINE_INFO, fs.exists(source_dir), "Source directory %s does not exist", fs::u8string(source_dir)); + Checks::check_exit(VCPKG_LINE_INFO, + fs.exists(source_dir), + Strings::concat("Source directory ", fs::u8string(source_dir), "does not exist")); auto files = fs.get_files_recursive(source_dir); install_files_and_write_listfile(fs, source_dir, files, destination_dir); } @@ -857,12 +858,13 @@ namespace vcpkg::Install return (ch >= 'a' || ch <= 'f') || Parse::ParserBase::is_ascii_digit(ch); })) { - Checks::exit_with_message(VCPKG_LINE_INFO, - "Error: the top-level builtin-baseline (%s) was not a valid commit sha: " - "expected 40 lowercase hexadecimal characters.\n%s\n", - *p_baseline, - paths.get_current_git_sha_message()); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, + "Error: the top-level builtin-baseline (%s) was not a valid commit sha: " + "expected 40 lowercase hexadecimal characters.\n%s\n", + *p_baseline, + paths.get_current_git_sha_message()); } + paths.get_configuration().registry_set.experimental_set_builtin_registry_baseline(*p_baseline); } auto verprovider = PortFileProvider::make_versioned_portfile_provider(paths); @@ -1079,7 +1081,7 @@ namespace vcpkg::Install message_block = Strings::format("", to_string(code)); break; case BuildResult::SUCCEEDED: result_string = "Pass"; break; - default: Checks::exit_fail(VCPKG_LINE_INFO); + default: Checks::unreachable(VCPKG_LINE_INFO); } return Strings::format(R"(%s)" diff --git a/toolsrc/src/vcpkg/platform-expression.cpp b/toolsrc/src/vcpkg/platform-expression.cpp index 78627eb9c0416f..034ee6bd5e5a63 100644 --- a/toolsrc/src/vcpkg/platform-expression.cpp +++ b/toolsrc/src/vcpkg/platform-expression.cpp @@ -398,11 +398,7 @@ namespace vcpkg::PlatformExpression case Identifier::wasm32: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "wasm32"); case Identifier::static_link: return true_if_exists_and_equal("VCPKG_LIBRARY_LINKAGE", "static"); - default: - Checks::exit_with_message( - VCPKG_LINE_INFO, - "vcpkg bug: string2identifier returned a value that we don't recognize: %d\n", - static_cast(id)); + default: Checks::unreachable(VCPKG_LINE_INFO); } } else if (expr.kind == ExprKind::op_not) diff --git a/toolsrc/src/vcpkg/portfileprovider.cpp b/toolsrc/src/vcpkg/portfileprovider.cpp index f455c8233edf6c..d2a37c4b3ca619 100644 --- a/toolsrc/src/vcpkg/portfileprovider.cpp +++ b/toolsrc/src/vcpkg/portfileprovider.cpp @@ -112,7 +112,7 @@ namespace vcpkg::PortFileProvider else { print_error_message(maybe_scf.error()); - Checks::exit_with_message( + Checks::exit_maybe_upgrade( VCPKG_LINE_INFO, "Error: Failed to load port %s from %s", spec, fs::u8string(ports_dir)); } @@ -130,16 +130,16 @@ namespace vcpkg::PortFileProvider { return std::make_unique(std::move(ports_spec), scf->to_versiont()); } - Checks::exit_with_message(VCPKG_LINE_INFO, - "Error: Failed to load port from %s: names did not match: '%s' != '%s'", - fs::u8string(ports_spec), - spec, - scf->core_paragraph->name); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, + "Error: Failed to load port from %s: names did not match: '%s' != '%s'", + fs::u8string(ports_spec), + spec, + scf->core_paragraph->name); } else { print_error_message(found_scf.error()); - Checks::exit_with_message( + Checks::exit_maybe_upgrade( VCPKG_LINE_INFO, "Error: Failed to load port %s from %s", spec, fs::u8string(ports_dir)); } } @@ -271,7 +271,7 @@ namespace vcpkg::PortFileProvider else { print_error_message(maybe_scf.error()); - Checks::exit_with_message( + Checks::exit_maybe_upgrade( VCPKG_LINE_INFO, "Error: Failed to load port from %s", fs::u8string(ports_dir)); } continue; @@ -345,7 +345,7 @@ namespace vcpkg::PortFileProvider auto entry = try_load_registry_port_and_baseline(paths, port_name.to_string()); if (!entry.first) { - Checks::exit_with_message( + Checks::exit_maybe_upgrade( VCPKG_LINE_INFO, "Error: Could not find a definition for port %s", port_name); } auto it = m_entry_cache.emplace(port_name.to_string(), std::move(entry.first)); @@ -436,10 +436,10 @@ namespace vcpkg::PortFileProvider else { print_error_message(maybe_scf.error()); - Checks::exit_with_message(VCPKG_LINE_INFO, - "Error: Failed to load port %s from %s", - port_name, - fs::u8string(maybe_overlay->path)); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, + "Error: Failed to load port %s from %s", + port_name, + fs::u8string(maybe_overlay->path)); } } it = m_overlay_cache.emplace(std::move(s_port_name), std::move(v)).first; diff --git a/toolsrc/src/vcpkg/registries.cpp b/toolsrc/src/vcpkg/registries.cpp index 934e6537a095d5..1e5b9ee7991f1f 100644 --- a/toolsrc/src/vcpkg/registries.cpp +++ b/toolsrc/src/vcpkg/registries.cpp @@ -234,7 +234,7 @@ namespace auto port_name = filename.substr(0, filename.size() - 5); if (!Json::PackageNameDeserializer::is_package_name(port_name)) { - Checks::exit_with_message( + Checks::exit_maybe_upgrade( VCPKG_LINE_INFO, "Error: found invalid port version file name: `%s`.", fs::u8string(file)); } out.push_back(std::move(port_name)); @@ -252,8 +252,8 @@ namespace { auto maybe_version_entries = load_versions_file(paths.get_filesystem(), VersionDbType::Git, paths.builtin_port_versions, port_name); - Checks::check_exit( - VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: %s", maybe_version_entries.error()); + Checks::check_maybe_upgrade( + VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: " + maybe_version_entries.error()); auto version_entries = std::move(maybe_version_entries).value_or_exit(VCPKG_LINE_INFO); auto res = @@ -278,7 +278,7 @@ namespace auto maybe_error = scf->check_against_feature_flags(port_directory, paths.get_feature_flags()); if (maybe_error) { - Checks::exit_with_message(VCPKG_LINE_INFO, "Parsing manifest failed: %s", *maybe_error.get()); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, "Parsing manifest failed: %s", *maybe_error.get()); } if (scf->core_paragraph->name == port_name) @@ -286,11 +286,11 @@ namespace return std::make_unique( std::make_unique(std::move(scf), std::move(port_directory))); } - Checks::exit_with_message(VCPKG_LINE_INFO, - "Error: Failed to load port from %s: names did not match: '%s' != '%s'", - fs::u8string(port_directory), - port_name, - scf->core_paragraph->name); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, + "Error: Failed to load port from %s: names did not match: '%s' != '%s'", + fs::u8string(port_directory), + port_name, + scf->core_paragraph->name); } } @@ -416,14 +416,14 @@ namespace return {}; } - Checks::exit_with_message( + Checks::exit_maybe_upgrade( VCPKG_LINE_INFO, "Error: could not find explicitly specified baseline `\"%s\"` in baseline file `%s`.", baseline_identifier, fs::u8string(path_to_baseline)); } - Checks::exit_with_message(VCPKG_LINE_INFO, res_baseline.error()); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, res_baseline.error()); } Optional FilesystemRegistry::get_baseline_version(const VcpkgPaths& paths, StringView port_name) const { @@ -446,8 +446,8 @@ namespace { auto maybe_version_entries = load_versions_file( paths.get_filesystem(), VersionDbType::Filesystem, m_path / port_versions_dir, port_name, m_path); - Checks::check_exit( - VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: %s", maybe_version_entries.error()); + Checks::check_maybe_upgrade( + VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: " + maybe_version_entries.error()); auto version_entries = std::move(maybe_version_entries).value_or_exit(VCPKG_LINE_INFO); auto res = std::make_unique(port_name.to_string()); @@ -471,8 +471,8 @@ namespace auto port_versions = get_versions_tree_path(paths); auto maybe_version_entries = load_versions_file(paths.get_filesystem(), VersionDbType::Git, port_versions, port_name); - Checks::check_exit( - VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: %s", maybe_version_entries.error()); + Checks::check_maybe_upgrade( + VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: " + maybe_version_entries.error()); auto version_entries = std::move(maybe_version_entries).value_or_exit(VCPKG_LINE_INFO); auto res = std::make_unique(port_name.to_string()); @@ -493,7 +493,7 @@ namespace if (!res_baseline.has_value()) { - Checks::exit_with_message(VCPKG_LINE_INFO, res_baseline.error()); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, res_baseline.error()); } auto opt_baseline = res_baseline.get(); if (auto p = opt_baseline->get()) @@ -552,7 +552,7 @@ namespace } else { - Checks::exit_with_message( + Checks::exit_maybe_upgrade( VCPKG_LINE_INFO, "Couldn't find explicitly specified baseline `\"%s\"` in the baseline file for repo %s, " "and the `\"default\"` baseline does not exist at that commit.", @@ -893,7 +893,7 @@ namespace fs::path path; r.required_object_field("a filesystem registry", obj, PATH, path, Json::PathDeserializer::instance); - res = std::make_unique(config_directory / path, std::move(baseline)); + res = std::make_unique(Files::combine(config_directory, path), std::move(baseline)); } else if (kind == KIND_GIT) { diff --git a/toolsrc/src/vcpkg/remove.cpp b/toolsrc/src/vcpkg/remove.cpp index 0db35d51fdda52..e066917478fd1e 100644 --- a/toolsrc/src/vcpkg/remove.cpp +++ b/toolsrc/src/vcpkg/remove.cpp @@ -218,9 +218,9 @@ namespace vcpkg::Remove { if (paths.manifest_mode_enabled()) { - Checks::exit_with_message(VCPKG_LINE_INFO, - "vcpkg remove does not support manifest mode. In order to remove dependencies, " - "you will need to edit your manifest (vcpkg.json)."); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, + "vcpkg remove does not support manifest mode. In order to remove dependencies, " + "you will need to edit your manifest (vcpkg.json)."); } const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE); diff --git a/toolsrc/src/vcpkg/statusparagraph.cpp b/toolsrc/src/vcpkg/statusparagraph.cpp index ba4b6f9bdb586e..ff3700d4b6262f 100644 --- a/toolsrc/src/vcpkg/statusparagraph.cpp +++ b/toolsrc/src/vcpkg/statusparagraph.cpp @@ -27,7 +27,8 @@ namespace vcpkg : want(Want::ERROR_STATE), state(InstallState::ERROR_STATE) { auto status_it = fields.find(BinaryParagraphRequiredField::STATUS); - Checks::check_exit(VCPKG_LINE_INFO, status_it != fields.end(), "Expected 'Status' field in status paragraph"); + Checks::check_maybe_upgrade( + VCPKG_LINE_INFO, status_it != fields.end(), "Expected 'Status' field in status paragraph"); std::string status_field = std::move(status_it->second.first); fields.erase(status_it); diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index f51ea361977744..eaef5a6b9d3c5f 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -103,15 +103,14 @@ namespace vcpkg } const std::string tool_data = - StringView::find_exactly_one_enclosed(XML, match_tool_entry[0], "").to_string(); + Strings::find_exactly_one_enclosed(XML, match_tool_entry[0].str(), "").to_string(); const std::string version_as_string = - StringView::find_exactly_one_enclosed(tool_data, "", "").to_string(); + Strings::find_exactly_one_enclosed(tool_data, "", "").to_string(); const std::string exe_relative_path = - StringView::find_exactly_one_enclosed(tool_data, "", "").to_string(); - const std::string url = StringView::find_exactly_one_enclosed(tool_data, "", "").to_string(); - const std::string sha512 = - StringView::find_exactly_one_enclosed(tool_data, "", "").to_string(); - auto archive_name = StringView::find_at_most_one_enclosed(tool_data, "", ""); + Strings::find_exactly_one_enclosed(tool_data, "", "").to_string(); + const std::string url = Strings::find_exactly_one_enclosed(tool_data, "", "").to_string(); + const std::string sha512 = Strings::find_exactly_one_enclosed(tool_data, "", "").to_string(); + auto archive_name = Strings::find_at_most_one_enclosed(tool_data, "", ""); const Optional> version = parse_version_string(version_as_string); Checks::check_exit(VCPKG_LINE_INFO, @@ -185,13 +184,13 @@ namespace vcpkg { const std::array& version = tool_data.version; const std::string version_as_string = Strings::format("%d.%d.%d", version[0], version[1], version[2]); - Checks::check_exit(VCPKG_LINE_INFO, - !tool_data.url.empty(), - "A suitable version of %s was not found (required v%s) and unable to automatically " - "download a portable one. Please install a newer version of %s.", - tool_name, - version_as_string, - tool_name); + Checks::check_maybe_upgrade(VCPKG_LINE_INFO, + !tool_data.url.empty(), + "A suitable version of %s was not found (required v%s) and unable to automatically " + "download a portable one. Please install a newer version of %s.", + tool_name, + version_as_string, + tool_name); System::printf("A suitable version of %s was not found (required v%s). Downloading portable %s v%s...\n", tool_name, version_as_string, @@ -271,7 +270,7 @@ namespace vcpkg return fetch_tool(paths, tool, *tool_data); } - Checks::exit_with_message(VCPKG_LINE_INFO, maybe_tool_data.error()); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, maybe_tool_data.error()); } struct CMakeProvider : ToolProvider @@ -311,7 +310,7 @@ cmake version 3.10.2 CMake suite maintained and supported by Kitware (kitware.com/cmake). */ - return {StringView::find_exactly_one_enclosed(rc.output, "cmake version ", "\n").to_string(), + return {Strings::find_exactly_one_enclosed(rc.output, "cmake version ", "\n").to_string(), expected_left_tag}; } }; @@ -385,7 +384,7 @@ Type 'NuGet help ' for help on a specific command. [[[List of available commands follows]]] */ - return {StringView::find_exactly_one_enclosed(rc.output, "NuGet Version: ", "\n").to_string(), + return {Strings::find_exactly_one_enclosed(rc.output, "NuGet Version: ", "\n").to_string(), expected_left_tag}; } }; @@ -602,7 +601,7 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50 return {fetch_tool(paths, tool, *p_tool_data), p_tool_data->sha512}; } - Checks::exit_with_message(VCPKG_LINE_INFO, "Unknown or unavailable tool: %s", tool); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, "Unknown or unavailable tool: %s", tool); }); } diff --git a/toolsrc/src/vcpkg/vcpkglib.cpp b/toolsrc/src/vcpkg/vcpkglib.cpp index d1e29c78bd4bb3..5b8e4b439078c0 100644 --- a/toolsrc/src/vcpkg/vcpkglib.cpp +++ b/toolsrc/src/vcpkg/vcpkglib.cpp @@ -188,10 +188,12 @@ namespace vcpkg } for (auto&& ipv : ipv_map) - Checks::check_exit(VCPKG_LINE_INFO, - ipv.second.core != nullptr, - "Database is corrupted: package %s has features but no core paragraph.", - ipv.first); + { + Checks::check_maybe_upgrade(VCPKG_LINE_INFO, + ipv.second.core != nullptr, + "Database is corrupted: package %s has features but no core paragraph.", + ipv.first); + } return Util::fmap(ipv_map, [](auto&& p) -> InstalledPackageView { return std::move(p.second); }); } diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 9c0a62d278351a..1d347ea94322dc 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -119,18 +119,18 @@ namespace vcpkg auto manifest_opt = Json::parse_file(fs, manifest_path, ec); if (ec) { - Checks::exit_with_message(VCPKG_LINE_INFO, - "Failed to load manifest from directory %s: %s", - fs::u8string(manifest_dir), - ec.message()); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, + "Failed to load manifest from directory %s: %s", + fs::u8string(manifest_dir), + ec.message()); } if (!manifest_opt.has_value()) { - Checks::exit_with_message(VCPKG_LINE_INFO, - "Failed to parse manifest at %s:\n%s", - fs::u8string(manifest_path), - manifest_opt.error()->format()); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, + "Failed to parse manifest at %s:\n%s", + fs::u8string(manifest_path), + manifest_opt.error()->format()); } auto manifest_value = std::move(manifest_opt).value_or_exit(VCPKG_LINE_INFO); @@ -158,16 +158,15 @@ namespace vcpkg const fs::path& manifest_dir) { fs::path config_dir; - - if (!manifest_dir.empty()) + if (manifest_dir.empty()) { - // manifest mode - config_dir = manifest_dir; + // classic mode + config_dir = vcpkg_root; } else { - // classic mode - config_dir = vcpkg_root; + // manifest mode + config_dir = manifest_dir; } auto path_to_config = config_dir / fs::u8path("vcpkg-configuration.json"); @@ -979,7 +978,7 @@ If you wish to silence this error and use classic mode, you can: } #if !defined(_WIN32) - Checks::exit_with_message(VCPKG_LINE_INFO, "Cannot build windows triplets from non-windows."); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, "Cannot build windows triplets from non-windows."); #else const std::vector& vs_toolsets = m_pimpl->toolsets.get_lazy( [this]() { return VisualStudio::find_toolset_instances_preferred_first(*this); }); diff --git a/toolsrc/src/vcpkg/visualstudio.cpp b/toolsrc/src/vcpkg/visualstudio.cpp index 559d6035ce7f00..b1b2891919a85f 100644 --- a/toolsrc/src/vcpkg/visualstudio.cpp +++ b/toolsrc/src/vcpkg/visualstudio.cpp @@ -1,6 +1,7 @@ #if defined(_WIN32) #include +#include #include #include #include @@ -98,11 +99,11 @@ namespace vcpkg::VisualStudio code_and_output.output); const auto instance_entries = - StringView::find_all_enclosed(code_and_output.output, "", ""); + Strings::find_all_enclosed(code_and_output.output, "", ""); for (const StringView& instance : instance_entries) { auto maybe_is_prerelease = - StringView::find_at_most_one_enclosed(instance, "", ""); + Strings::find_at_most_one_enclosed(instance, "", ""); VisualStudioInstance::ReleaseType release_type = VisualStudioInstance::ReleaseType::LEGACY; if (const auto p = maybe_is_prerelease.get()) @@ -117,9 +118,9 @@ namespace vcpkg::VisualStudio } instances.emplace_back( - StringView::find_exactly_one_enclosed(instance, "", "") + Strings::find_exactly_one_enclosed(instance, "", "") .to_string(), - StringView::find_exactly_one_enclosed(instance, "", "") + Strings::find_exactly_one_enclosed(instance, "", "") .to_string(), release_type); } diff --git a/toolsrc/windows-bootstrap/vcpkg.vcxproj b/toolsrc/windows-bootstrap/vcpkg.vcxproj index 7aa1535988e135..9cac2ea0dc40f8 100644 --- a/toolsrc/windows-bootstrap/vcpkg.vcxproj +++ b/toolsrc/windows-bootstrap/vcpkg.vcxproj @@ -96,7 +96,7 @@ Disabled true ..\include - VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions) + VCPKG_VERSION=$(VCPKG_VERSION);VCPKG_BASE_VERSION=$(VCPKG_BASE_VERSION);_MBCS;%(PreprocessorDefinitions) /std:c++latest %(AdditionalOptions) true false @@ -114,7 +114,7 @@ Disabled true ..\include - VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions) + VCPKG_VERSION=$(VCPKG_VERSION);VCPKG_BASE_VERSION=$(VCPKG_BASE_VERSION);_MBCS;%(PreprocessorDefinitions) /std:c++latest %(AdditionalOptions) true false @@ -134,7 +134,7 @@ true true ..\include - VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions) + VCPKG_VERSION=$(VCPKG_VERSION);VCPKG_BASE_VERSION=$(VCPKG_BASE_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions) _MBCS;NDEBUG;%(PreprocessorDefinitions) /std:c++latest %(AdditionalOptions) true @@ -156,7 +156,7 @@ true true ..\include - VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions) + VCPKG_VERSION=$(VCPKG_VERSION);VCPKG_BASE_VERSION=$(VCPKG_BASE_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions) _MBCS;NDEBUG;%(PreprocessorDefinitions) /std:c++latest %(AdditionalOptions) true @@ -368,9 +368,6 @@ - - - From 6072328e2249c9a378250ba3ffad1bb8d07e5971 Mon Sep 17 00:00:00 2001 From: David Millard Date: Wed, 20 Jan 2021 15:51:57 -0500 Subject: [PATCH 0540/1694] [pagmo2] Add new port (#15682) * [pagmo2] Add new port * Disable C4701 * Disable /MD override for all static builds * Add pagmo2 port_version info * Find TBB when finding pagmo * Fixup pagmo2 port version * Change /Md patch to if(0) * Fix port_version for pagmo2 * Use vcpkg.json; use version * Reformat vcpkg.json * Fix port_versions for pagmo2 --- port_versions/baseline.json | 4 +++ port_versions/p-/pagmo2.json | 9 +++++++ ports/pagmo2/disable-C4701.patch | 13 ++++++++++ ports/pagmo2/disable-md-override.patch | 20 ++++++++++++++ ports/pagmo2/find-tbb.patch | 12 +++++++++ ports/pagmo2/portfile.cmake | 36 ++++++++++++++++++++++++++ ports/pagmo2/vcpkg.json | 21 +++++++++++++++ 7 files changed, 115 insertions(+) create mode 100644 port_versions/p-/pagmo2.json create mode 100644 ports/pagmo2/disable-C4701.patch create mode 100644 ports/pagmo2/disable-md-override.patch create mode 100644 ports/pagmo2/find-tbb.patch create mode 100644 ports/pagmo2/portfile.cmake create mode 100644 ports/pagmo2/vcpkg.json diff --git a/port_versions/baseline.json b/port_versions/baseline.json index d5126885e678ce..883f2d5e8c4d9c 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4376,6 +4376,10 @@ "baseline": "2020-12-14", "port-version": 0 }, + "pagmo2": { + "baseline": "2.16.1", + "port-version": 0 + }, "paho-mqtt": { "baseline": "1.3.8", "port-version": 0 diff --git a/port_versions/p-/pagmo2.json b/port_versions/p-/pagmo2.json new file mode 100644 index 00000000000000..c149fd0f0b4199 --- /dev/null +++ b/port_versions/p-/pagmo2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ea29ee58051fba73e950597ca2b0109dd6df0dec", + "version": "2.16.1", + "port-version": 0 + } + ] +} diff --git a/ports/pagmo2/disable-C4701.patch b/ports/pagmo2/disable-C4701.patch new file mode 100644 index 00000000000000..05ed75bd2dc005 --- /dev/null +++ b/ports/pagmo2/disable-C4701.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96653ba..1afaafa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -80,7 +80,7 @@ endif() + if(YACMA_COMPILER_IS_MSVC) + # Disable the idiotic minmax macros on MSVC, some annoying warnings, + # enable the bigobj option and the WIN32_LEAN_AND_MEAN definition. +- list(APPEND PAGMO_CXX_FLAGS_DEBUG "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/bigobj" "-DWIN32_LEAN_AND_MEAN") ++ list(APPEND PAGMO_CXX_FLAGS_DEBUG "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/wd4701" "/bigobj" "-DWIN32_LEAN_AND_MEAN") + list(APPEND PAGMO_CXX_FLAGS_RELEASE "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/bigobj" "-DWIN32_LEAN_AND_MEAN") + # Enable strict conformance mode, if supported. + set(CMAKE_REQUIRED_QUIET TRUE) diff --git a/ports/pagmo2/disable-md-override.patch b/ports/pagmo2/disable-md-override.patch new file mode 100644 index 00000000000000..a5e09d3fa3bb11 --- /dev/null +++ b/ports/pagmo2/disable-md-override.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96653ba..549d9d4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,6 +141,7 @@ endif() + # Boost setup. + include(PagmoFindBoost) + ++if(0) + # Explanation: on MSVC, when building static libraries, it is good practice to link + # to the static runtime. CMake, however, is hard-coded to link to the dynamic runtime. + # Hence we hackishly replace the /MD flag with /MT. This is the approach suggested +@@ -161,6 +162,7 @@ if(YACMA_COMPILER_IS_MSVC AND PAGMO_BUILD_STATIC_LIBRARY) + endif() + endforeach() + endif() ++endif() + + # List of source files. + set(PAGMO_SRC_FILES diff --git a/ports/pagmo2/find-tbb.patch b/ports/pagmo2/find-tbb.patch new file mode 100644 index 00000000000000..8781910f8aae5c --- /dev/null +++ b/ports/pagmo2/find-tbb.patch @@ -0,0 +1,12 @@ +diff --git a/pagmo-config.cmake.in b/pagmo-config.cmake.in +index 9553fc8..cb5e90b 100644 +--- a/pagmo-config.cmake.in ++++ b/pagmo-config.cmake.in +@@ -8,6 +8,7 @@ set(THREADS_PREFER_PTHREAD_FLAG YES) + find_package(Threads REQUIRED) + unset(THREADS_PREFER_PTHREAD_FLAG) + include(PagmoFindBoost) ++find_package(TBB REQUIRED) + @_PAGMO_CONFIG_OPTIONAL_DEPS@ + # Restore original module path. + set(CMAKE_MODULE_PATH "${_PAGMO_CONFIG_OLD_MODULE_PATH}") diff --git a/ports/pagmo2/portfile.cmake b/ports/pagmo2/portfile.cmake new file mode 100644 index 00000000000000..a709a2fb6a61e5 --- /dev/null +++ b/ports/pagmo2/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO esa/pagmo2 + REF v2.16.1 + SHA512 dac85a8525316e827df809d187d40f14dc20db7119796b7384d7855f83ba37e0bb595f6d8199053aac857460816929dd599c9d43802f2ed920a6f42dd2f16a03 + HEAD_REF master + PATCHES + "disable-C4701.patch" + "disable-md-override.patch" + "find-tbb.patch" +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + nlopt PAGMO_WITH_NLOPT +) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAGMO_BUILD_STATIC_LIBRARY) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DPAGMO_WITH_EIGEN3=ON + -DPAGMO_BUILD_STATIC_LIBRARY=${PAGMO_BUILD_STATIC_LIBRARY} +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/pagmo) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/COPYING.lgpl3 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/ports/pagmo2/vcpkg.json b/ports/pagmo2/vcpkg.json new file mode 100644 index 00000000000000..4e491b4969ef1f --- /dev/null +++ b/ports/pagmo2/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "pagmo2", + "version": "2.16.1", + "description": "A C++ platform to perform parallel computations of optimisation tasks (global and local) via the asynchronous generalized island model.", + "homepage": "https://esa.github.io/pagmo2/", + "dependencies": [ + "boost-any", + "boost-graph", + "boost-serialization", + "eigen3", + "tbb" + ], + "features": { + "nlopt": { + "description": "Enable the NLopt wrappers", + "dependencies": [ + "nlopt" + ] + } + } +} From ea0d69032965428e0a62d4e06ab0adf4a239b7fe Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 20 Jan 2021 21:55:41 +0100 Subject: [PATCH 0541/1694] [qt5] Update to 5.15.2 (#14678) * [qt5] Update to 5.15.2 (mqtt currently missing git tag) * deactivate update of ports * update version * reduce port version * fix typo * fix patch for linux missing pthread * fix qt5-tools * fix qt5-webengine * add xcb-util to linux provisioning script * fix version numbers * fix other typo * remove new hashes file * fix latest version info * switch to vcpkg_from_git adjust vcpkg_from_git to handle tags. add OUT_REF for vcpkg_from_git to enable scriptable update of ports * regenerate docs * [vcpkg_from_git] new options TAG and OUT_REF - TAG github tag to checkout - OUT_REF github commit id related to tag or ref (useable for automatic updates of ports if used with a version tag) * Apply suggestions from code review Co-authored-by: Robert Schumacher * additional changes due to CR * regenerate docs * Remove 'Port-Version:0' from qt5-location Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * add all those versions * fix versions Co-authored-by: Billy Robert O'Neal III Co-authored-by: Robert Schumacher Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> --- port_versions/baseline.json | 92 +++++++++---------- port_versions/q-/qt5-3d.json | 5 + port_versions/q-/qt5-activeqt.json | 5 + port_versions/q-/qt5-androidextras.json | 5 + port_versions/q-/qt5-base.json | 5 + port_versions/q-/qt5-charts.json | 5 + port_versions/q-/qt5-connectivity.json | 5 + port_versions/q-/qt5-datavis3d.json | 5 + port_versions/q-/qt5-declarative.json | 5 + port_versions/q-/qt5-doc.json | 5 + port_versions/q-/qt5-gamepad.json | 5 + port_versions/q-/qt5-graphicaleffects.json | 5 + port_versions/q-/qt5-imageformats.json | 5 + port_versions/q-/qt5-location.json | 5 + port_versions/q-/qt5-macextras.json | 5 + port_versions/q-/qt5-mqtt.json | 5 + port_versions/q-/qt5-multimedia.json | 5 + port_versions/q-/qt5-networkauth.json | 5 + port_versions/q-/qt5-purchasing.json | 5 + port_versions/q-/qt5-quickcontrols.json | 5 + port_versions/q-/qt5-quickcontrols2.json | 5 + port_versions/q-/qt5-remoteobjects.json | 5 + port_versions/q-/qt5-script.json | 5 + port_versions/q-/qt5-scxml.json | 5 + port_versions/q-/qt5-sensors.json | 5 + port_versions/q-/qt5-serialbus.json | 5 + port_versions/q-/qt5-serialport.json | 5 + port_versions/q-/qt5-speech.json | 5 + port_versions/q-/qt5-svg.json | 5 + port_versions/q-/qt5-tools.json | 5 + port_versions/q-/qt5-translations.json | 5 + port_versions/q-/qt5-virtualkeyboard.json | 5 + port_versions/q-/qt5-wayland.json | 5 + port_versions/q-/qt5-webchannel.json | 5 + port_versions/q-/qt5-webengine.json | 5 + port_versions/q-/qt5-webglplugin.json | 5 + port_versions/q-/qt5-websockets.json | 5 + port_versions/q-/qt5-webview.json | 5 + port_versions/q-/qt5-winextras.json | 5 + port_versions/q-/qt5-x11extras.json | 5 + port_versions/q-/qt5-xmlpatterns.json | 5 + port_versions/q-/qt5.json | 5 + ports/qt5-3d/CONTROL | 2 +- ports/qt5-activeqt/CONTROL | 2 +- ports/qt5-androidextras/CONTROL | 2 +- ports/qt5-base/cmake/qt_port_hashes.cmake | 84 ++++++++--------- .../cmake/qt_port_hashes_latest.cmake | 84 ++++++++--------- ports/qt5-base/patches/zstdd.patch | 6 +- ports/qt5-base/vcpkg.json | 6 +- ports/qt5-charts/CONTROL | 2 +- ports/qt5-connectivity/CONTROL | 2 +- ports/qt5-datavis3d/CONTROL | 2 +- ports/qt5-declarative/CONTROL | 2 +- ports/qt5-doc/CONTROL | 2 +- ports/qt5-gamepad/CONTROL | 2 +- ports/qt5-graphicaleffects/CONTROL | 2 +- ports/qt5-imageformats/CONTROL | 10 +- ports/qt5-location/CONTROL | 9 +- ports/qt5-location/portfile.cmake | 2 +- .../rename_third_party_libs_conflicts.patch | 68 -------------- ports/qt5-macextras/CONTROL | 2 +- ports/qt5-mqtt/CONTROL | 2 +- ports/qt5-mqtt/portfile.cmake | 17 +++- ports/qt5-multimedia/CONTROL | 2 +- ports/qt5-networkauth/CONTROL | 2 +- ports/qt5-purchasing/CONTROL | 2 +- ports/qt5-quickcontrols/CONTROL | 2 +- ports/qt5-quickcontrols2/CONTROL | 2 +- ports/qt5-remoteobjects/CONTROL | 2 +- ports/qt5-script/CONTROL | 2 +- ports/qt5-scxml/CONTROL | 2 +- ports/qt5-sensors/CONTROL | 2 +- ports/qt5-serialbus/CONTROL | 2 +- ports/qt5-serialport/CONTROL | 2 +- ports/qt5-speech/CONTROL | 2 +- ports/qt5-svg/CONTROL | 2 +- ports/qt5-tools/CONTROL | 4 +- ports/qt5-tools/assistant.patch | 28 ------ ports/qt5-tools/portfile.cmake | 1 - ports/qt5-translations/CONTROL | 2 +- ports/qt5-virtualkeyboard/CONTROL | 2 +- ports/qt5-wayland/CONTROL | 2 +- ports/qt5-webchannel/CONTROL | 2 +- ports/qt5-webengine/CONTROL | 2 +- ports/qt5-webengine/build_1.patch | 12 +++ ports/qt5-webengine/build_2.patch | 29 ++++++ ports/qt5-webengine/build_3.patch | 17 ++++ ports/qt5-webengine/portfile.cmake | 5 +- ports/qt5-webglplugin/CONTROL | 2 +- ports/qt5-websockets/CONTROL | 2 +- ports/qt5-webview/CONTROL | 2 +- ports/qt5-winextras/CONTROL | 2 +- ports/qt5-x11extras/CONTROL | 2 +- ports/qt5-xmlpatterns/CONTROL | 2 +- ports/qt5/CONTROL | 5 +- 95 files changed, 466 insertions(+), 290 deletions(-) delete mode 100644 ports/qt5-location/rename_third_party_libs_conflicts.patch delete mode 100644 ports/qt5-tools/assistant.patch create mode 100644 ports/qt5-webengine/build_1.patch create mode 100644 ports/qt5-webengine/build_2.patch create mode 100644 ports/qt5-webengine/build_3.patch diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 883f2d5e8c4d9c..d5f4d1e2b1e27d 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4725,67 +4725,67 @@ "port-version": 1 }, "qt5": { - "baseline": "5.15.1", - "port-version": 2 + "baseline": "5.15.2", + "port-version": 0 }, "qt5-3d": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-activeqt": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-androidextras": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-base": { - "baseline": "5.15.1", - "port-version": 4 + "baseline": "5.15.2", + "port-version": 1 }, "qt5-canvas3d": { "baseline": "0", "port-version": 0 }, "qt5-charts": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-connectivity": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 1 }, "qt5-datavis3d": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-declarative": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-doc": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-gamepad": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-graphicaleffects": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-imageformats": { - "baseline": "5.15.1", - "port-version": 1 + "baseline": "5.15.2", + "port-version": 0 }, "qt5-location": { - "baseline": "5.15.1", - "port-version": 2 + "baseline": "5.15.2", + "port-version": 0 }, "qt5-macextras": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-modularscripts": { @@ -4793,107 +4793,107 @@ "port-version": 0 }, "qt5-mqtt": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-multimedia": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-networkauth": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-purchasing": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-quickcontrols": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-quickcontrols2": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-remoteobjects": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-script": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-scxml": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-sensors": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-serialbus": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-serialport": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-speech": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-svg": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-tools": { - "baseline": "5.15.1", - "port-version": 1 + "baseline": "5.15.2", + "port-version": 0 }, "qt5-translations": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-virtualkeyboard": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-wayland": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-webchannel": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-webengine": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 1 }, "qt5-webglplugin": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-websockets": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-webview": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-winextras": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-x11extras": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qt5-xmlpatterns": { - "baseline": "5.15.1", + "baseline": "5.15.2", "port-version": 0 }, "qtkeychain": { diff --git a/port_versions/q-/qt5-3d.json b/port_versions/q-/qt5-3d.json index 06d88555848c47..d29595cbe01ae1 100644 --- a/port_versions/q-/qt5-3d.json +++ b/port_versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9a8b7a2360c554409f283143edf9202bebe6a3b", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "bc61aee28025498bf411411452dfdc2fa6b95588", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-activeqt.json b/port_versions/q-/qt5-activeqt.json index 16e4e13251bc24..b91938ebcbdd8d 100644 --- a/port_versions/q-/qt5-activeqt.json +++ b/port_versions/q-/qt5-activeqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4485e0c45b055c36a8c8f2977dfc34b627ef89f7", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "a5dcfeee5d586df99ace34ea105162399897ab57", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-androidextras.json b/port_versions/q-/qt5-androidextras.json index 05f1d59f64dc1e..e8cf8ef427893e 100644 --- a/port_versions/q-/qt5-androidextras.json +++ b/port_versions/q-/qt5-androidextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f94e5bbf1abb42df664f41fbbf652d8527058b57", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "c3e13ce02aac04dcd71b42f383a69ae540995da0", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-base.json b/port_versions/q-/qt5-base.json index ac49a577ede427..f46a54f1a0e217 100644 --- a/port_versions/q-/qt5-base.json +++ b/port_versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ab7ac474099d1ae4d91748acc50330801ed6aed", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "cae711e3396c229a7a1db28900446481ba7955cc", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-charts.json b/port_versions/q-/qt5-charts.json index 1c4034f45c88f6..ffd72c6c1ba4a5 100644 --- a/port_versions/q-/qt5-charts.json +++ b/port_versions/q-/qt5-charts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9ad7200153301c998c296ce7f33968057c0ed55", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "7fdaac31ee19bf6044c57b38a7a2eac4e59f5612", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-connectivity.json b/port_versions/q-/qt5-connectivity.json index 290056d628cb5a..8848ab4e72937a 100644 --- a/port_versions/q-/qt5-connectivity.json +++ b/port_versions/q-/qt5-connectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8ee9769027623f431202ff66a23a044dd3e75ba", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "e2bf8d45dc95302a10a9a1b07e58907ba86a2e7e", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-datavis3d.json b/port_versions/q-/qt5-datavis3d.json index 80936c23b47e0a..f28b5ea55256cd 100644 --- a/port_versions/q-/qt5-datavis3d.json +++ b/port_versions/q-/qt5-datavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a85ea3d22e31e21a063a9a9f1c88c53e8fe85a13", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "9675a4b9bf484787826270cc1a6505d78efb4ba8", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-declarative.json b/port_versions/q-/qt5-declarative.json index bfd49c5e926971..59d37772cd6340 100644 --- a/port_versions/q-/qt5-declarative.json +++ b/port_versions/q-/qt5-declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b07a27c5aa8905b158c0f72f2b9e7977391191c1", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "6c526d6cad6e0813d9dfa6c21387b4b3f4d5b1bc", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-doc.json b/port_versions/q-/qt5-doc.json index 55cdfdf1cae752..adf06ce103c4f7 100644 --- a/port_versions/q-/qt5-doc.json +++ b/port_versions/q-/qt5-doc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "223f161f59f60470ce059257c42646d4664b1bda", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "520ac7a71cbdbe15067e1e718e51a2100623b6d3", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-gamepad.json b/port_versions/q-/qt5-gamepad.json index 7c7b71e0034631..37cbfa1f5e56ea 100644 --- a/port_versions/q-/qt5-gamepad.json +++ b/port_versions/q-/qt5-gamepad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c59f1d686877d4dc3944d5b1f6c9544b9e3fc3a5", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "95329903ce4d3b26934d0503c9707d5fe3958b7e", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-graphicaleffects.json b/port_versions/q-/qt5-graphicaleffects.json index 1979bf08dcae34..5735323e298354 100644 --- a/port_versions/q-/qt5-graphicaleffects.json +++ b/port_versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0d59c9b5c88380e1eb89cd7f47b31299ca2367b", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "e905f4cbd556e9c21792772111a6d9fe55a4da16", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-imageformats.json b/port_versions/q-/qt5-imageformats.json index 85643580afd90c..fc2df298118d0f 100644 --- a/port_versions/q-/qt5-imageformats.json +++ b/port_versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75366d3ba0a38fc7be899ea1a67c74e6adb379e1", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "6144ff48982bb3c848ed9c5ba3a517188963411b", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-location.json b/port_versions/q-/qt5-location.json index 81ab8d3a13efdc..d5b452a076d6c7 100644 --- a/port_versions/q-/qt5-location.json +++ b/port_versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94f99955ff8d1ce62723d2af72d47a138aabb5d0", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "bbb37ca5fe38a40c2d36790d54469ce0572428f7", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-macextras.json b/port_versions/q-/qt5-macextras.json index dcedc64014bb75..3ab418304ffc5c 100644 --- a/port_versions/q-/qt5-macextras.json +++ b/port_versions/q-/qt5-macextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fe45da1cf6d2e8b42bed80c7a362d7d9869f12b", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "c7455204e0d6c6750be23240b00e58f66210c8cd", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-mqtt.json b/port_versions/q-/qt5-mqtt.json index 0b9486f3820cdc..c4a29965ffbd1e 100644 --- a/port_versions/q-/qt5-mqtt.json +++ b/port_versions/q-/qt5-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af160578b6f6fe501b01817d6d171d123a4841d1", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "eff74674156d29130f6bac8abc658b34d60a532f", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-multimedia.json b/port_versions/q-/qt5-multimedia.json index 136429e8be7dfd..e61f949645440c 100644 --- a/port_versions/q-/qt5-multimedia.json +++ b/port_versions/q-/qt5-multimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0aa2bee3cad289370d921410781cb478405528f7", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "5da3b21921824650376cee2f50760fe1f4866554", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-networkauth.json b/port_versions/q-/qt5-networkauth.json index 05ec85a8792e2e..36b71d5d2fecbb 100644 --- a/port_versions/q-/qt5-networkauth.json +++ b/port_versions/q-/qt5-networkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f462d1340451f187f9f581eb33d48bb02325199e", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "0983186f99f302d7338144fb91e05a1d53c42a11", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-purchasing.json b/port_versions/q-/qt5-purchasing.json index f9f5eac3881856..04a38d85ff403c 100644 --- a/port_versions/q-/qt5-purchasing.json +++ b/port_versions/q-/qt5-purchasing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8cd09b86f4f66c28354c005ddc5c7050b3ab51e", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "9789fe42c9921171381c50b4586b81fb7f1ee405", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-quickcontrols.json b/port_versions/q-/qt5-quickcontrols.json index 32ea3d05d30241..29c91f3553fec2 100644 --- a/port_versions/q-/qt5-quickcontrols.json +++ b/port_versions/q-/qt5-quickcontrols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7a753736c9da0675d2c65b5f2fd0ba55243ed98", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "ba0a7677baa9c89cb30bb792bbe990d84a46133b", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-quickcontrols2.json b/port_versions/q-/qt5-quickcontrols2.json index 88f7c7afd5100a..5ff4a19dd3c657 100644 --- a/port_versions/q-/qt5-quickcontrols2.json +++ b/port_versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55332e79db24457e25edd53505c1ada54b6c8ff6", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "e89068f3afab69f11461a0bcc2153368af489051", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-remoteobjects.json b/port_versions/q-/qt5-remoteobjects.json index e7f4a386526e3e..3bfac4e7421d4d 100644 --- a/port_versions/q-/qt5-remoteobjects.json +++ b/port_versions/q-/qt5-remoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56d2cccdc3153966bbdd95194d45ee1c3a6afaae", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "a8e21e36a43e286bbbd37238536e8fcf66c07ffa", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-script.json b/port_versions/q-/qt5-script.json index a4e36b676f31a8..9f2873aed30f04 100644 --- a/port_versions/q-/qt5-script.json +++ b/port_versions/q-/qt5-script.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e91ef09f428cef704bf255193747433972c73087", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "eabe840ad61233b6f28db78f16bffdcb7fbdeddd", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-scxml.json b/port_versions/q-/qt5-scxml.json index d8fa151589e0b0..069c9f4ed40881 100644 --- a/port_versions/q-/qt5-scxml.json +++ b/port_versions/q-/qt5-scxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78995a7e46afeac5fb6e5e5dfdc40a327f7dd9fe", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "88b3fdf6dae974fd1257b9ab6dbdb657080c2233", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-sensors.json b/port_versions/q-/qt5-sensors.json index 1c8ab05081ecc4..dd3fc27db88fee 100644 --- a/port_versions/q-/qt5-sensors.json +++ b/port_versions/q-/qt5-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21bce9a3ac2033ea3baf1c238c1f185be101a845", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "670b8b13f2fb7509ceeaa96c62fe1eec4fc12450", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-serialbus.json b/port_versions/q-/qt5-serialbus.json index 9a8523b5a628df..7d7fd46bb3635a 100644 --- a/port_versions/q-/qt5-serialbus.json +++ b/port_versions/q-/qt5-serialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e47e507727344b2a2bf750e759b05c3cafeb086", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "17ee8d39cdc45e3945bc01eee50cf0d18e27f47c", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-serialport.json b/port_versions/q-/qt5-serialport.json index 358c8306f71c24..f37aede66fdcd5 100644 --- a/port_versions/q-/qt5-serialport.json +++ b/port_versions/q-/qt5-serialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "316f45b69eb023ba69d08d8de7a6debbf84bb603", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "e7f00b17dc3a26603d86b756ed7edc5cea77d0c1", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-speech.json b/port_versions/q-/qt5-speech.json index cd5defa87e7596..3a4201ad852325 100644 --- a/port_versions/q-/qt5-speech.json +++ b/port_versions/q-/qt5-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21ea7868e82bc4457836c8a0b7ca918c47b8e804", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "802a16804890503cb951986fed4a7f7ea0de857d", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-svg.json b/port_versions/q-/qt5-svg.json index ce60619734a202..012188db57d814 100644 --- a/port_versions/q-/qt5-svg.json +++ b/port_versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4cdec015d18a0bf66a77ea27006346f0fe382c64", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "e8e8fc61228f3069fcef1a81eb448c955bce11ee", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-tools.json b/port_versions/q-/qt5-tools.json index 2f49c664fd6e18..4ad9f0945c58d0 100644 --- a/port_versions/q-/qt5-tools.json +++ b/port_versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de5a3def8c0cc8ae0055876f169e73562de14e4b", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "42416e080314c2a741b2b674fc22fd12932799d4", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-translations.json b/port_versions/q-/qt5-translations.json index 7819456f2f980e..981f17598884d9 100644 --- a/port_versions/q-/qt5-translations.json +++ b/port_versions/q-/qt5-translations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "008afea16ec68c49b890f4ed8316ad3abfbcb71a", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "8b2da9c53ca7e6025cd00d40d718ccadfaea75b9", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-virtualkeyboard.json b/port_versions/q-/qt5-virtualkeyboard.json index 924fdd05ac9e4c..7c32344871bef8 100644 --- a/port_versions/q-/qt5-virtualkeyboard.json +++ b/port_versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2693e87e70cccf2d3e7eab86266fb4d6531cc32d", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "1d58303fd8236c7f075e5618074a6361738a6b58", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-wayland.json b/port_versions/q-/qt5-wayland.json index 86f434b62fddd7..f9bfb9c789f915 100644 --- a/port_versions/q-/qt5-wayland.json +++ b/port_versions/q-/qt5-wayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d35832bb03e8a61250192130ec88cd32ad432c48", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "244d21edcbcb57f8809feaadf0149d408c4d5e84", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-webchannel.json b/port_versions/q-/qt5-webchannel.json index bca7938c2d3ed9..2b33f12b2737e7 100644 --- a/port_versions/q-/qt5-webchannel.json +++ b/port_versions/q-/qt5-webchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8fed15c2b941a90c62729ed0ec87d09a65088f6", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "9c133f361a037ee2d29a0f13528cc56e19b52b8a", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-webengine.json b/port_versions/q-/qt5-webengine.json index cded10178c9b84..08757c6e6ac42c 100644 --- a/port_versions/q-/qt5-webengine.json +++ b/port_versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f8f6defb09c499cfe581195f03e88951431d73c", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "9e021df8973b08f0d03caeff578567543bc2f1ad", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-webglplugin.json b/port_versions/q-/qt5-webglplugin.json index 701a1062b46302..545843f53a6adf 100644 --- a/port_versions/q-/qt5-webglplugin.json +++ b/port_versions/q-/qt5-webglplugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0b9c3cfc7387db1f1ca1e1a31a92a445e0bfa0d", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "dbc7e66e5d089e94e2278d8cf437e46aa1c18ad8", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-websockets.json b/port_versions/q-/qt5-websockets.json index cb197294b2e8e1..3680d79fc90596 100644 --- a/port_versions/q-/qt5-websockets.json +++ b/port_versions/q-/qt5-websockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dda1270f825f0a962a46a2320eb0c07ab3792fe3", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "b9e183d1921cbdd06d712feb0dc810901fec6352", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-webview.json b/port_versions/q-/qt5-webview.json index 148616122eb8a6..561b2644eb888b 100644 --- a/port_versions/q-/qt5-webview.json +++ b/port_versions/q-/qt5-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5299a2103e3367847b319980eea5db59b4ad0a58", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "f3781e5871021354cd74e4a7baedc112c78833b9", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-winextras.json b/port_versions/q-/qt5-winextras.json index 6f84bc6dcd209c..2a958fe7e67eb4 100644 --- a/port_versions/q-/qt5-winextras.json +++ b/port_versions/q-/qt5-winextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74a7ae6df8a4a7074f5defa9b74ec25140f91c6b", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "382a4b48cd76feb4c9fc84cfee66f2aa5589ecc7", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-x11extras.json b/port_versions/q-/qt5-x11extras.json index 1aacc1103a94bb..0b10d99efa1d76 100644 --- a/port_versions/q-/qt5-x11extras.json +++ b/port_versions/q-/qt5-x11extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "912abfb778fa66e9010962b68182e0366e54edb9", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "989effc95d136ca39434f1c9738d2856d9924643", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5-xmlpatterns.json b/port_versions/q-/qt5-xmlpatterns.json index 3fb37450467514..9279cfd46966b7 100644 --- a/port_versions/q-/qt5-xmlpatterns.json +++ b/port_versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afd90dc7576c45b74602e2d632e15bea59bfe38b", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "c5d3ebe14a81907e6948d45eb78c07929f55084a", "version-string": "5.15.1", diff --git a/port_versions/q-/qt5.json b/port_versions/q-/qt5.json index 4b97cb92d8aecf..3e6689853331e8 100644 --- a/port_versions/q-/qt5.json +++ b/port_versions/q-/qt5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ab863fc125546487759d6672f0e459da27f5f41", + "version-string": "5.15.2", + "port-version": 0 + }, { "git-tree": "6c44bc778ae3e400ff6f777d6f6bb68c24a81fed", "version-string": "5.15.1", diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL index 716610b1d6fc25..7868a6595c2c04 100644 --- a/ports/qt5-3d/CONTROL +++ b/ports/qt5-3d/CONTROL @@ -1,4 +1,4 @@ Source: qt5-3d -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering Build-Depends: qt5-base[core], qt5-declarative, qt5-imageformats, qt5-gamepad, assimp diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL index 9850ac538e2567..5008e6afeca78c 100644 --- a/ports/qt5-activeqt/CONTROL +++ b/ports/qt5-activeqt/CONTROL @@ -1,5 +1,5 @@ Source: qt5-activeqt -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 ActiveQt Module - ActiveX components Build-Depends: qt5-base[core], qt5-declarative Supports: windows \ No newline at end of file diff --git a/ports/qt5-androidextras/CONTROL b/ports/qt5-androidextras/CONTROL index 78713c309b1fec..4b2fff7eec020e 100644 --- a/ports/qt5-androidextras/CONTROL +++ b/ports/qt5-androidextras/CONTROL @@ -1,5 +1,5 @@ Source: qt5-androidextras -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 androidextras Module; Build-Depends: qt5-base[core] Supports: android \ No newline at end of file diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake index da9e0ddc2c7481..c52196078e19ed 100644 --- a/ports/qt5-base/cmake/qt_port_hashes.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -1,55 +1,55 @@ #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 1) +set(QT_PATCH_VER 2) 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 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4) -set(QT_HASH_qt5-3d 5d35f39bd3cb65a4b7490fd3d57a4f62b3ccaad25c7963613d67641927bdc9d895fb436d049de5485a9e8e067c716951e376349cbfc3996af6765adda73d51d5) -set(QT_HASH_qt5-activeqt d272a6b9748ce25635c1631290670c6372f803c05ead4a8607b00e5ca777eee355b579d4040a1ab619c3f72879518e9557ea91af1cd02ce5d49f2bcb7fd1c305) -set(QT_HASH_qt5-charts 7e644d4a674f175745646f8b541c8cfd972853fdf3a3ee5d0f7c23f035ae81cef0671292535fe65b1c276e4c54c7a48db1a1d2f9be97834513d154eea1666f3c) -set(QT_HASH_qt5-connectivity ad7bad604c466461bcc7bfd889ecbb36e010c89ea1ecf7736f8b0ad49e682a1800cd2507b8d8c0b582c424b176f8179aeec85a6b0fc4ed933f8b6032e935d39a) -set(QT_HASH_qt5-datavis3d 3f11cddebd29aa90ce62fa19f9ab33026393bf95525bea7c4514e04acef23db9dbfdf000aa885aa2f823b1cd6ca99ac2a1f8afaabe67ee13785d5e4650aa4c97) -set(QT_HASH_qt5-declarative 193ec706b764330a2ae00614b13482b7586642f9cfd32458e8c975daa07ba25f0f9887de0918c4034f52f613b860677c09c46a3b7d07d4229446cfc0805bcccd) -set(QT_HASH_qt5-gamepad f74933f9e28d0db03d30743e7d75c7a1ba28fa03d97aa894b5cbc306a2d501c27ec40eb84c6b999a6e5ed01b3126bfa992a3a3ca28246310edfe1f2fc12c1d88) -set(QT_HASH_qt5-graphicaleffects 651f8d96199b6324726fcf97eebf16a3ee40e5a9523a3c03255ca4201228b8d02314d5dd9722f59d44f09b4ff8dd722fb276b9af7f65728693a2c4ee62f781c1) -set(QT_HASH_qt5-imageformats 90da1c76b16dc5ea4ba99372208e3b10619efc4d131686ac6ab4a963ab0177ff9eee9155af564d72052f4ae1c21f06431ab66aa4e55b3c864f015b63ad75c107) -set(QT_HASH_qt5-location b79383b60107bc4d8fcc9b4a087db57597d0b928248806fef9dfeaa8ce3347ce96b388cbce1a7bcaf3287d380f7c269c44e8ec25966112c041aa298313854106) -set(QT_HASH_qt5-macextras 6671d21edba0691833d45eaf7474b20be55088252fff70f8617f953366834bc5915712c00e53288dce1d97ab7f0080f4fb7547594034bd627d010d01906e20e9) -set(QT_HASH_qt5-mqtt 6ea203318d0c4c6441f23a2648e0a3879b72426579ad3d6af7895c50cc80214010b2aba5a2103bb69df8299cb84ae7b1a0fd88d4cfe6d70b1cfc5694332b81d4) -set(QT_HASH_qt5-multimedia 9c063dc481c91a94ba151fa96166d04a83e1cdcdb66c5fa80c038bd973c87b928c3d90d1c8add7c3ec29c4dc7dceff9e8cf288ce980f95d199f37e90593104d9) -set(QT_HASH_qt5-networkauth 2c22acf4842f2e26c514ea48bd4e21f466571c1993b811495c1eb9fe22ea66a687ca882c9ed09b38c00a9a6616b13d44021e0d9a65020f4ab9495d6e8c64d282) -set(QT_HASH_qt5-purchasing 5e112f449d1db2851cfbaf5b84feaba6f1243abb4c4ace3a7e2d23859b410305e0e4799c1d109553266d21a647d85688442f4ee0878434eff0e4c870a90536da) -set(QT_HASH_qt5-quickcontrols 71e6ee040bc76dc1576d31ff2c1d687e115f4c6dc63307e64c8173c2441835923375ee6b7f5473b3ec8c586f34e04b061b9a9e16b7f34b4075cfa0278599d2ce) # deprecated -set(QT_HASH_qt5-quickcontrols2 ecb75619e80b737e3ae214f65a5175d933f8dc7832eb4eccd469fc1cb1eb85ef5c47f81563165da2d75abf15d7c47b868e68ab758d95183371b4ef64e7c52a39) -set(QT_HASH_qt5-remoteobjects be7d1803957295b4900d96bc1c4bbb50bb54a0ef750a5b713ce318636040954b765c546e4ab9c95880f4c03894e5cd56ab5238504bb5c44fc4a3c277611ab997) -set(QT_HASH_qt5-script f97bdf0a3a402f2658d23c92d2f0d916bda68b63f1f140f90cb99176e969736758d50cbdc36c5a4b135b08cb74c117dd92c29bcbb41b1a28189af9180604b8ba) # deprecated -set(QT_HASH_qt5-scxml 893c3b247578c330db9b828e28e4df83b0e966bb469f1f453569e0226a8181b642c37f2198ff4194bec7997daee9578bebaaa7166bf1be8b67693edd0fbac082) -set(QT_HASH_qt5-sensors ef0757125a6c5b89e206661d1d0e0674b673a81e1a0be1de9de2fdcd701fd507b0b47e1b67be013cbebbf846f593e37e4ef2941dcec4b78028019820d1fe7c3b) -set(QT_HASH_qt5-serialport 5d2e9742d1c5f784375b3d0bf05e227abf1f358f4ba60e66044378b60ac256dda2ab5ecced07c68ca8d93fe894617050821654200e1faa12f4cca112a4fbd2a4) -set(QT_HASH_qt5-speech 0e2c82ea72b5bff5b36f3d833d80dec68b39f3b9c3ca4d9c9fa29f0419a45dfb19ac59fb105136c551f6bbe60ad32af0f4aaa6abafb5bc61bc5d85ecb94b326f) -set(QT_HASH_qt5-svg c0289bbce4682eef9cd87811ad11a4ce2141cb89bd026f9cc595123e6b4ebbe9e81a91b54bcf25fbf4225bc66e8a5e4f49e4fabde43e9da066583f22aab4f35f) -set(QT_HASH_qt5-tools 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951) -set(QT_HASH_qt5-virtualkeyboard f369eb0c313aa5a932cacca44f93732f8a7b8de4bf46df294c40b7c7dd436d5da5012680420306b57347aa38a10d78231199093a10e2b8a272429536a327962e) -set(QT_HASH_qt5-webchannel 01f37630ce7aa32726831b4a4d5e52e861269e33efd89246770e8a2a5536be976601d055c95f99d45699ea918ac4ce465b9ffab725f39841ddc5d320817c7523) -set(QT_HASH_qt5-websockets 5929f972b7e8aa40dbbd0a1157065bd11e81621cc880d1dfc55e4228800215d16cd301319a204413e7fee7ec57c4e5a70229ad2d3c1d3ac69f38bd39ce4b3713) -set(QT_HASH_qt5-webview 1da9cca184e66b02eef911e372d0f18466b989cc5c53d0a93e268857e1ca64a2f75bf20dfd1451060e6dbf4c7d248ba376112b7775e45ffa7d556712870478b1) -set(QT_HASH_qt5-winextras 67a7d8e8053516a1ce2e725a591533b9d195ee5868973458e2139dab91131900d921644a3dd1a44d1a5fdcbf474de85728de11f250bb9a5bfb40bf8eb94176b2) -set(QT_HASH_qt5-xmlpatterns f76b2063f88a14754b1ba7e417b9a4936b1cf371bf35c6382a31f9ec01513894313faacb41a43fe6b97c0b0dbb7d4f578877b159ef1321cd1a2cd9b1d36bcdb3) # deprecated +set(QT_HASH_qt5-base a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9) +set(QT_HASH_qt5-3d 38da6886b887f6d315dcb17192322efe184950716fdd0030df6c7d7c454ea43dc0250a201285da27683ce29768da6be41d4168e4f63c20adb0b5f26ae0934c1b) +set(QT_HASH_qt5-activeqt a2286a6736d14cf9b0dbf20af5ee8c23f94f57b6d4c0be41853e67109d87fd78dbf8f14eef2ce4b8d9ff2244af7ef139829ad7674d9ec9669434028961e65ec7) +set(QT_HASH_qt5-charts d16fc085a7e98078cf616cde07d57c5f04cd41e9687a26d42edf9042b4c95a837371b6b9616e7176c536d742aa9b5fc15bf3393f9f2e814ce942189ac151e65f) +set(QT_HASH_qt5-connectivity a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c) +set(QT_HASH_qt5-datavis3d 340b5ce1b1c2d8849b665e7bc84430fdf48e443fc149530ee132f325067f57d35594a23e3a8b920e1928ca5c429dcacfa098dadcbde63d4993f748c436af4cc3) +set(QT_HASH_qt5-declarative a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3) +set(QT_HASH_qt5-gamepad 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1) +set(QT_HASH_qt5-graphicaleffects 1620a4daa6f2afc13b84752fa92f6d603aea1f7c796a239691b271a455d6887bba87a9a07edbfe008045f051c3e71fc6e22fc337d146c1793e923cfeb20e897d) +set(QT_HASH_qt5-imageformats 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e) +set(QT_HASH_qt5-location 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f) +set(QT_HASH_qt5-macextras 21e807a587da716615a447207abda2c3eb409111a0eb6f844c8f1281ccc842a7c2e8759c1d7ce62cc3bad3325b4570a0bae1fbe4e5592e905788dde8898c6cb0) +set(QT_HASH_qt5-mqtt 91efd3b1ebef3c95473c018bcacd0772e613b38c) # Git commit ID +set(QT_HASH_qt5-multimedia be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd) +set(QT_HASH_qt5-networkauth 94843a74ae188eb0eff9559be6b246f61f87104479f6f52fe943b31a9263461a7051d967072d9061124b2bd056d7265645892104653c93dfcf68b11521f1c33d) +set(QT_HASH_qt5-purchasing 1a40fd3ca149f9c8fc98a45562b37fc97c7addc513d40f50997576648d441d379179370c6491a003982feafe96736047a8faf09caf36eaeea5a97553f75d1255) +set(QT_HASH_qt5-quickcontrols 52839e7442f4b6b5cbbb741d29ce28e9d2d9f5573499363d17252b166c1f318f37a19ecf1bf17f5cf6940bc29cc2987180b740ce036d924ff329dee9c37823a2) # deprecated +set(QT_HASH_qt5-quickcontrols2 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f) +set(QT_HASH_qt5-remoteobjects 1cce1b6128f283fe8930e1e58b9620459c50b203a39607e9bcde8423930da08e5c70e7effaf64d2690f463cc7b37cfc67fb6c0ac89e27df3a57007aee1d5233d) +set(QT_HASH_qt5-script 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32) # deprecated +set(QT_HASH_qt5-scxml 2a4719af94baefe7f0ca5a23239d07a05285a1698b052d17bb87bc221bbbc8bc25a70ff06d70d41ed7ac6a7e6646be9c516d8187c9098da1158c08e27a4b0bb8) +set(QT_HASH_qt5-sensors d0a34e0718cc727b1256601bc5f9a2975532d728fdf0cb7678824c7d36aa5049d9c2886053821ec93a238120441c980027306ac633677617867c7aee40bb560b) +set(QT_HASH_qt5-serialport 353cc5f708367d646bd312f7d675b417bad4df44356f1dfc8b6ce846a86fd6d5955ec4d26f943e50f4a7b94cc6389fe658959e90bbb5ab3cdaefed0efe6ae72b) +set(QT_HASH_qt5-speech 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05) +set(QT_HASH_qt5-svg 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730) +set(QT_HASH_qt5-tools 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b) +set(QT_HASH_qt5-virtualkeyboard 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016) +set(QT_HASH_qt5-webchannel 7ac5e372695616863d247c5a61e5763a3934b58165e35c43da5ef1797d80005aa3d6eb258931ae7ee2b1f6a6fa743635ac4678c9cfe375cefa76e74cc81d095b) +set(QT_HASH_qt5-websockets 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4) +set(QT_HASH_qt5-webview 11502597d5e3a9b8a3a90025b56c086a3412743019384558617c397a8ad4a0f646b406a4fbeb31ca45e6e573d1fb06cd5b22b8c0179695d06cc3d492289a1c85) +set(QT_HASH_qt5-winextras 6555a42d4bbeb46b394f573b6ed7926ec21cf6024de3c5f43000373bf0a2f4544f19866e2c9469da2d60b5dd99fb046765be5d3f8d5025169e319795bbf66d9e) +set(QT_HASH_qt5-xmlpatterns 5cdf51878f8bb42db57110acc0c3985a95af098da44e5dda505e0716fef5afc780419058158f7a8f9a0fe3fed83fd64abd856b4dbcdca20efa5e985fa85cc348) # deprecated ##TODO -set(QT_HASH_qt5-doc 2a1cf07ae648bf36f3127f1c4c3f0330a34b5183ec76431dfd20cf41ae3ce06e6cfead25e84f29059acce864d9328f1b8f8725aafcff9b0fe17e8245c1a7c7da) -set(QT_HASH_qt5-x11extras 59155fc97da3f7571da37dd63bed79f61580fa4df7d4886df51520ea6fe8e01e7c09f0aa9caaeaa986c0e5eac11d4479c99c892da4d075c6369b535fd505b084) -set(QT_HASH_qt5-androidextras 2da8a8e46c1d33926c0ee57061b1aef07182cb7c4b1bfed11b8032742a62d09a2a75d69741ba5ac26e11d5d544a415c84fb17255c14f1e1ae68d193f635200ea) -#set(QT_HASH_qt5-canvas3d 0) deprectaed -set(QT_HASH_qt5-translations 8e9fe7614c9aa9c557db1bfd6a0ceae90b45e5d28e0cd715fd4ad962b9fbfa722549d6c2a13d82deebd7d3fab7e68cc7affd207beb75629de0d01a5522035581) -set(QT_HASH_qt5-serialbus cd7e0d721aa46a59239f44c6b0122509aba2237e0e62ea5399b4d4924601a9def989dd8b5d17fdcc46b41491d582d82b46c7efdfb9277ac1f06da7f1e2a1a859) -set(QT_HASH_qt5-webengine 651520fcf89681b06c57f1992223f06ecbe3750a88ffae7a94a339503957e09d327ee1ae7e4bce88bfb09131b3b9c9abfc44f7bccb9c50d286181eaf306991a4) -set(QT_HASH_qt5-webglplugin e1feae14ba911f635ee5b45569e7f8dc8db4fdf1ca0d583f84d10de89976b7728285edbf050273293327c0f8afaf0fec8dff8370e1bf6771d47ae611be8a0224) -set(QT_HASH_qt5-wayland d6619f35b3ab163372a0d49a2221c487d5936b6d9ebeb92a7fd41521c424d550eea7c5c584e07f15bde1ec5ece1bd5774845eb9956ce793e546197ffdb28d594) +set(QT_HASH_qt5-doc ce2c003b37829da102f243ca271548cff0597b4b667109ca9533971a490b8b20eb3183af6e0b209ad58964f2be2e757f83933a3f8c484dd0814750e24d1a244e) +set(QT_HASH_qt5-x11extras beaefc865299f4e7c637baa96eb3a69adbe1a41fc7735b46cfec0768c9243391600e69078630fffb4aceba106b7512fd802e745abc38ddab5253233301c93ed9) +set(QT_HASH_qt5-androidextras cacd9252f313595d21eb6a94ffabbd5fff476af82aa619b4edfc77a9f405f52bd1b89da97c8f7dadf8c403035a243205a25a2f85250ebc0590bf68f914cdbf3a) +#set(QT_HASH_qt5-canvas3d 0) deprecated +set(QT_HASH_qt5-translations 483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe) +set(QT_HASH_qt5-serialbus c4793f5425ca0191435d75a8fd95a623cc847d41b8722421c0bf0fdfddda1a158fd2a00f5d997f00de4fcb271a158f3273d636ef2553ccd6b90b4d072b1eb55b) +set(QT_HASH_qt5-webengine de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756) +set(QT_HASH_qt5-webglplugin 14b9a0c08472121165eba82f3c81518be7b19484b7bee7887df9751edc6e2e7e76d06f961b180427014beb71c725d343e9f196f37690e2d207511f7639bd2627) +set(QT_HASH_qt5-wayland e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qt5-base/cmake/qt_port_hashes_latest.cmake b/ports/qt5-base/cmake/qt_port_hashes_latest.cmake index da9e0ddc2c7481..c52196078e19ed 100644 --- a/ports/qt5-base/cmake/qt_port_hashes_latest.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes_latest.cmake @@ -1,55 +1,55 @@ #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 1) +set(QT_PATCH_VER 2) 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 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4) -set(QT_HASH_qt5-3d 5d35f39bd3cb65a4b7490fd3d57a4f62b3ccaad25c7963613d67641927bdc9d895fb436d049de5485a9e8e067c716951e376349cbfc3996af6765adda73d51d5) -set(QT_HASH_qt5-activeqt d272a6b9748ce25635c1631290670c6372f803c05ead4a8607b00e5ca777eee355b579d4040a1ab619c3f72879518e9557ea91af1cd02ce5d49f2bcb7fd1c305) -set(QT_HASH_qt5-charts 7e644d4a674f175745646f8b541c8cfd972853fdf3a3ee5d0f7c23f035ae81cef0671292535fe65b1c276e4c54c7a48db1a1d2f9be97834513d154eea1666f3c) -set(QT_HASH_qt5-connectivity ad7bad604c466461bcc7bfd889ecbb36e010c89ea1ecf7736f8b0ad49e682a1800cd2507b8d8c0b582c424b176f8179aeec85a6b0fc4ed933f8b6032e935d39a) -set(QT_HASH_qt5-datavis3d 3f11cddebd29aa90ce62fa19f9ab33026393bf95525bea7c4514e04acef23db9dbfdf000aa885aa2f823b1cd6ca99ac2a1f8afaabe67ee13785d5e4650aa4c97) -set(QT_HASH_qt5-declarative 193ec706b764330a2ae00614b13482b7586642f9cfd32458e8c975daa07ba25f0f9887de0918c4034f52f613b860677c09c46a3b7d07d4229446cfc0805bcccd) -set(QT_HASH_qt5-gamepad f74933f9e28d0db03d30743e7d75c7a1ba28fa03d97aa894b5cbc306a2d501c27ec40eb84c6b999a6e5ed01b3126bfa992a3a3ca28246310edfe1f2fc12c1d88) -set(QT_HASH_qt5-graphicaleffects 651f8d96199b6324726fcf97eebf16a3ee40e5a9523a3c03255ca4201228b8d02314d5dd9722f59d44f09b4ff8dd722fb276b9af7f65728693a2c4ee62f781c1) -set(QT_HASH_qt5-imageformats 90da1c76b16dc5ea4ba99372208e3b10619efc4d131686ac6ab4a963ab0177ff9eee9155af564d72052f4ae1c21f06431ab66aa4e55b3c864f015b63ad75c107) -set(QT_HASH_qt5-location b79383b60107bc4d8fcc9b4a087db57597d0b928248806fef9dfeaa8ce3347ce96b388cbce1a7bcaf3287d380f7c269c44e8ec25966112c041aa298313854106) -set(QT_HASH_qt5-macextras 6671d21edba0691833d45eaf7474b20be55088252fff70f8617f953366834bc5915712c00e53288dce1d97ab7f0080f4fb7547594034bd627d010d01906e20e9) -set(QT_HASH_qt5-mqtt 6ea203318d0c4c6441f23a2648e0a3879b72426579ad3d6af7895c50cc80214010b2aba5a2103bb69df8299cb84ae7b1a0fd88d4cfe6d70b1cfc5694332b81d4) -set(QT_HASH_qt5-multimedia 9c063dc481c91a94ba151fa96166d04a83e1cdcdb66c5fa80c038bd973c87b928c3d90d1c8add7c3ec29c4dc7dceff9e8cf288ce980f95d199f37e90593104d9) -set(QT_HASH_qt5-networkauth 2c22acf4842f2e26c514ea48bd4e21f466571c1993b811495c1eb9fe22ea66a687ca882c9ed09b38c00a9a6616b13d44021e0d9a65020f4ab9495d6e8c64d282) -set(QT_HASH_qt5-purchasing 5e112f449d1db2851cfbaf5b84feaba6f1243abb4c4ace3a7e2d23859b410305e0e4799c1d109553266d21a647d85688442f4ee0878434eff0e4c870a90536da) -set(QT_HASH_qt5-quickcontrols 71e6ee040bc76dc1576d31ff2c1d687e115f4c6dc63307e64c8173c2441835923375ee6b7f5473b3ec8c586f34e04b061b9a9e16b7f34b4075cfa0278599d2ce) # deprecated -set(QT_HASH_qt5-quickcontrols2 ecb75619e80b737e3ae214f65a5175d933f8dc7832eb4eccd469fc1cb1eb85ef5c47f81563165da2d75abf15d7c47b868e68ab758d95183371b4ef64e7c52a39) -set(QT_HASH_qt5-remoteobjects be7d1803957295b4900d96bc1c4bbb50bb54a0ef750a5b713ce318636040954b765c546e4ab9c95880f4c03894e5cd56ab5238504bb5c44fc4a3c277611ab997) -set(QT_HASH_qt5-script f97bdf0a3a402f2658d23c92d2f0d916bda68b63f1f140f90cb99176e969736758d50cbdc36c5a4b135b08cb74c117dd92c29bcbb41b1a28189af9180604b8ba) # deprecated -set(QT_HASH_qt5-scxml 893c3b247578c330db9b828e28e4df83b0e966bb469f1f453569e0226a8181b642c37f2198ff4194bec7997daee9578bebaaa7166bf1be8b67693edd0fbac082) -set(QT_HASH_qt5-sensors ef0757125a6c5b89e206661d1d0e0674b673a81e1a0be1de9de2fdcd701fd507b0b47e1b67be013cbebbf846f593e37e4ef2941dcec4b78028019820d1fe7c3b) -set(QT_HASH_qt5-serialport 5d2e9742d1c5f784375b3d0bf05e227abf1f358f4ba60e66044378b60ac256dda2ab5ecced07c68ca8d93fe894617050821654200e1faa12f4cca112a4fbd2a4) -set(QT_HASH_qt5-speech 0e2c82ea72b5bff5b36f3d833d80dec68b39f3b9c3ca4d9c9fa29f0419a45dfb19ac59fb105136c551f6bbe60ad32af0f4aaa6abafb5bc61bc5d85ecb94b326f) -set(QT_HASH_qt5-svg c0289bbce4682eef9cd87811ad11a4ce2141cb89bd026f9cc595123e6b4ebbe9e81a91b54bcf25fbf4225bc66e8a5e4f49e4fabde43e9da066583f22aab4f35f) -set(QT_HASH_qt5-tools 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951) -set(QT_HASH_qt5-virtualkeyboard f369eb0c313aa5a932cacca44f93732f8a7b8de4bf46df294c40b7c7dd436d5da5012680420306b57347aa38a10d78231199093a10e2b8a272429536a327962e) -set(QT_HASH_qt5-webchannel 01f37630ce7aa32726831b4a4d5e52e861269e33efd89246770e8a2a5536be976601d055c95f99d45699ea918ac4ce465b9ffab725f39841ddc5d320817c7523) -set(QT_HASH_qt5-websockets 5929f972b7e8aa40dbbd0a1157065bd11e81621cc880d1dfc55e4228800215d16cd301319a204413e7fee7ec57c4e5a70229ad2d3c1d3ac69f38bd39ce4b3713) -set(QT_HASH_qt5-webview 1da9cca184e66b02eef911e372d0f18466b989cc5c53d0a93e268857e1ca64a2f75bf20dfd1451060e6dbf4c7d248ba376112b7775e45ffa7d556712870478b1) -set(QT_HASH_qt5-winextras 67a7d8e8053516a1ce2e725a591533b9d195ee5868973458e2139dab91131900d921644a3dd1a44d1a5fdcbf474de85728de11f250bb9a5bfb40bf8eb94176b2) -set(QT_HASH_qt5-xmlpatterns f76b2063f88a14754b1ba7e417b9a4936b1cf371bf35c6382a31f9ec01513894313faacb41a43fe6b97c0b0dbb7d4f578877b159ef1321cd1a2cd9b1d36bcdb3) # deprecated +set(QT_HASH_qt5-base a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9) +set(QT_HASH_qt5-3d 38da6886b887f6d315dcb17192322efe184950716fdd0030df6c7d7c454ea43dc0250a201285da27683ce29768da6be41d4168e4f63c20adb0b5f26ae0934c1b) +set(QT_HASH_qt5-activeqt a2286a6736d14cf9b0dbf20af5ee8c23f94f57b6d4c0be41853e67109d87fd78dbf8f14eef2ce4b8d9ff2244af7ef139829ad7674d9ec9669434028961e65ec7) +set(QT_HASH_qt5-charts d16fc085a7e98078cf616cde07d57c5f04cd41e9687a26d42edf9042b4c95a837371b6b9616e7176c536d742aa9b5fc15bf3393f9f2e814ce942189ac151e65f) +set(QT_HASH_qt5-connectivity a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c) +set(QT_HASH_qt5-datavis3d 340b5ce1b1c2d8849b665e7bc84430fdf48e443fc149530ee132f325067f57d35594a23e3a8b920e1928ca5c429dcacfa098dadcbde63d4993f748c436af4cc3) +set(QT_HASH_qt5-declarative a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3) +set(QT_HASH_qt5-gamepad 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1) +set(QT_HASH_qt5-graphicaleffects 1620a4daa6f2afc13b84752fa92f6d603aea1f7c796a239691b271a455d6887bba87a9a07edbfe008045f051c3e71fc6e22fc337d146c1793e923cfeb20e897d) +set(QT_HASH_qt5-imageformats 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e) +set(QT_HASH_qt5-location 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f) +set(QT_HASH_qt5-macextras 21e807a587da716615a447207abda2c3eb409111a0eb6f844c8f1281ccc842a7c2e8759c1d7ce62cc3bad3325b4570a0bae1fbe4e5592e905788dde8898c6cb0) +set(QT_HASH_qt5-mqtt 91efd3b1ebef3c95473c018bcacd0772e613b38c) # Git commit ID +set(QT_HASH_qt5-multimedia be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd) +set(QT_HASH_qt5-networkauth 94843a74ae188eb0eff9559be6b246f61f87104479f6f52fe943b31a9263461a7051d967072d9061124b2bd056d7265645892104653c93dfcf68b11521f1c33d) +set(QT_HASH_qt5-purchasing 1a40fd3ca149f9c8fc98a45562b37fc97c7addc513d40f50997576648d441d379179370c6491a003982feafe96736047a8faf09caf36eaeea5a97553f75d1255) +set(QT_HASH_qt5-quickcontrols 52839e7442f4b6b5cbbb741d29ce28e9d2d9f5573499363d17252b166c1f318f37a19ecf1bf17f5cf6940bc29cc2987180b740ce036d924ff329dee9c37823a2) # deprecated +set(QT_HASH_qt5-quickcontrols2 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f) +set(QT_HASH_qt5-remoteobjects 1cce1b6128f283fe8930e1e58b9620459c50b203a39607e9bcde8423930da08e5c70e7effaf64d2690f463cc7b37cfc67fb6c0ac89e27df3a57007aee1d5233d) +set(QT_HASH_qt5-script 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32) # deprecated +set(QT_HASH_qt5-scxml 2a4719af94baefe7f0ca5a23239d07a05285a1698b052d17bb87bc221bbbc8bc25a70ff06d70d41ed7ac6a7e6646be9c516d8187c9098da1158c08e27a4b0bb8) +set(QT_HASH_qt5-sensors d0a34e0718cc727b1256601bc5f9a2975532d728fdf0cb7678824c7d36aa5049d9c2886053821ec93a238120441c980027306ac633677617867c7aee40bb560b) +set(QT_HASH_qt5-serialport 353cc5f708367d646bd312f7d675b417bad4df44356f1dfc8b6ce846a86fd6d5955ec4d26f943e50f4a7b94cc6389fe658959e90bbb5ab3cdaefed0efe6ae72b) +set(QT_HASH_qt5-speech 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05) +set(QT_HASH_qt5-svg 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730) +set(QT_HASH_qt5-tools 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b) +set(QT_HASH_qt5-virtualkeyboard 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016) +set(QT_HASH_qt5-webchannel 7ac5e372695616863d247c5a61e5763a3934b58165e35c43da5ef1797d80005aa3d6eb258931ae7ee2b1f6a6fa743635ac4678c9cfe375cefa76e74cc81d095b) +set(QT_HASH_qt5-websockets 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4) +set(QT_HASH_qt5-webview 11502597d5e3a9b8a3a90025b56c086a3412743019384558617c397a8ad4a0f646b406a4fbeb31ca45e6e573d1fb06cd5b22b8c0179695d06cc3d492289a1c85) +set(QT_HASH_qt5-winextras 6555a42d4bbeb46b394f573b6ed7926ec21cf6024de3c5f43000373bf0a2f4544f19866e2c9469da2d60b5dd99fb046765be5d3f8d5025169e319795bbf66d9e) +set(QT_HASH_qt5-xmlpatterns 5cdf51878f8bb42db57110acc0c3985a95af098da44e5dda505e0716fef5afc780419058158f7a8f9a0fe3fed83fd64abd856b4dbcdca20efa5e985fa85cc348) # deprecated ##TODO -set(QT_HASH_qt5-doc 2a1cf07ae648bf36f3127f1c4c3f0330a34b5183ec76431dfd20cf41ae3ce06e6cfead25e84f29059acce864d9328f1b8f8725aafcff9b0fe17e8245c1a7c7da) -set(QT_HASH_qt5-x11extras 59155fc97da3f7571da37dd63bed79f61580fa4df7d4886df51520ea6fe8e01e7c09f0aa9caaeaa986c0e5eac11d4479c99c892da4d075c6369b535fd505b084) -set(QT_HASH_qt5-androidextras 2da8a8e46c1d33926c0ee57061b1aef07182cb7c4b1bfed11b8032742a62d09a2a75d69741ba5ac26e11d5d544a415c84fb17255c14f1e1ae68d193f635200ea) -#set(QT_HASH_qt5-canvas3d 0) deprectaed -set(QT_HASH_qt5-translations 8e9fe7614c9aa9c557db1bfd6a0ceae90b45e5d28e0cd715fd4ad962b9fbfa722549d6c2a13d82deebd7d3fab7e68cc7affd207beb75629de0d01a5522035581) -set(QT_HASH_qt5-serialbus cd7e0d721aa46a59239f44c6b0122509aba2237e0e62ea5399b4d4924601a9def989dd8b5d17fdcc46b41491d582d82b46c7efdfb9277ac1f06da7f1e2a1a859) -set(QT_HASH_qt5-webengine 651520fcf89681b06c57f1992223f06ecbe3750a88ffae7a94a339503957e09d327ee1ae7e4bce88bfb09131b3b9c9abfc44f7bccb9c50d286181eaf306991a4) -set(QT_HASH_qt5-webglplugin e1feae14ba911f635ee5b45569e7f8dc8db4fdf1ca0d583f84d10de89976b7728285edbf050273293327c0f8afaf0fec8dff8370e1bf6771d47ae611be8a0224) -set(QT_HASH_qt5-wayland d6619f35b3ab163372a0d49a2221c487d5936b6d9ebeb92a7fd41521c424d550eea7c5c584e07f15bde1ec5ece1bd5774845eb9956ce793e546197ffdb28d594) +set(QT_HASH_qt5-doc ce2c003b37829da102f243ca271548cff0597b4b667109ca9533971a490b8b20eb3183af6e0b209ad58964f2be2e757f83933a3f8c484dd0814750e24d1a244e) +set(QT_HASH_qt5-x11extras beaefc865299f4e7c637baa96eb3a69adbe1a41fc7735b46cfec0768c9243391600e69078630fffb4aceba106b7512fd802e745abc38ddab5253233301c93ed9) +set(QT_HASH_qt5-androidextras cacd9252f313595d21eb6a94ffabbd5fff476af82aa619b4edfc77a9f405f52bd1b89da97c8f7dadf8c403035a243205a25a2f85250ebc0590bf68f914cdbf3a) +#set(QT_HASH_qt5-canvas3d 0) deprecated +set(QT_HASH_qt5-translations 483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe) +set(QT_HASH_qt5-serialbus c4793f5425ca0191435d75a8fd95a623cc847d41b8722421c0bf0fdfddda1a158fd2a00f5d997f00de4fcb271a158f3273d636ef2553ccd6b90b4d072b1eb55b) +set(QT_HASH_qt5-webengine de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756) +set(QT_HASH_qt5-webglplugin 14b9a0c08472121165eba82f3c81518be7b19484b7bee7887df9751edc6e2e7e76d06f961b180427014beb71c725d343e9f196f37690e2d207511f7639bd2627) +set(QT_HASH_qt5-wayland e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qt5-base/patches/zstdd.patch b/ports/qt5-base/patches/zstdd.patch index 1b334e4e0ec012..9d10890c0f752d 100644 --- a/ports/qt5-base/patches/zstdd.patch +++ b/ports/qt5-base/patches/zstdd.patch @@ -2,13 +2,15 @@ diff --git a/configure.json b/configure.json index 50d69b740..7149e6803 100644 --- a/configure.json +++ b/configure.json -@@ -182,7 +182,8 @@ +@@ -182,7 +182,10 @@ }, "sources": [ { "type": "pkgConfig", "args": "libzstd >= 1.3" }, - "-lzstd" + "-lzstd", -+ "-lzstdd" ++ "-lzstdd", ++ "-lzstd -pthread", ++ "-lzstdd -pthread" ] }, "dbus": { diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 16827c1321e3a1..53f4d774681f43 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", - "version-string": "5.15.1", - "port-version": 4, + "version-string": "5.15.2", + "port-version": 1, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ @@ -32,7 +32,7 @@ ], "features": { "latest": { - "description": "Build latest qt version (5.15.1) instead of LTS (latest and LTS are currently the same)" + "description": "Build latest qt version (5.15.2) instead of LTS (latest and LTS are currently the same)" }, "mysqlplugin": { "description": "Build the sql plugin for connecting to mysql databases", diff --git a/ports/qt5-charts/CONTROL b/ports/qt5-charts/CONTROL index 371fc5416c2904..e2187c0c98c246 100644 --- a/ports/qt5-charts/CONTROL +++ b/ports/qt5-charts/CONTROL @@ -1,4 +1,4 @@ Source: qt5-charts -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models Build-Depends: qt5-base[core], qt5-declarative, qt5-multimedia diff --git a/ports/qt5-connectivity/CONTROL b/ports/qt5-connectivity/CONTROL index 58dcb18ebf4b63..3fea5453c16534 100644 --- a/ports/qt5-connectivity/CONTROL +++ b/ports/qt5-connectivity/CONTROL @@ -1,5 +1,5 @@ Source: qt5-connectivity -Version: 5.15.1 +Version: 5.15.2 Port-Version: 1 Description: Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware Build-Depends: qt5-base[core] diff --git a/ports/qt5-datavis3d/CONTROL b/ports/qt5-datavis3d/CONTROL index 78f6c955294a9c..dd2ead5302d029 100644 --- a/ports/qt5-datavis3d/CONTROL +++ b/ports/qt5-datavis3d/CONTROL @@ -1,4 +1,4 @@ Source: qt5-datavis3d -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations Build-Depends: qt5-base[core], qt5-declarative, qt5-multimedia diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL index 1ebcaaf0c27312..6814190e380a73 100644 --- a/ports/qt5-declarative/CONTROL +++ b/ports/qt5-declarative/CONTROL @@ -1,4 +1,4 @@ Source: qt5-declarative -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol. Build-Depends: qt5-base[core], qt5-imageformats, qt5-svg diff --git a/ports/qt5-doc/CONTROL b/ports/qt5-doc/CONTROL index b92a09b57faf99..0db178bcccdbf9 100644 --- a/ports/qt5-doc/CONTROL +++ b/ports/qt5-doc/CONTROL @@ -1,5 +1,5 @@ Source: qt5-doc -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 doc Module; Build-Depends: qt5-base[core], qt5-declarative, qt5-quickcontrols2, qt5-tools Supports: linux \ No newline at end of file diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL index e756c46c50ebb6..df716aa56664e4 100644 --- a/ports/qt5-gamepad/CONTROL +++ b/ports/qt5-gamepad/CONTROL @@ -1,4 +1,4 @@ Source: qt5-gamepad -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL index 04d01303db76e9..9ebde4866b8976 100644 --- a/ports/qt5-graphicaleffects/CONTROL +++ b/ports/qt5-graphicaleffects/CONTROL @@ -1,4 +1,4 @@ Source: qt5-graphicaleffects -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 GraphicalEffects Module. Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL index dda1424db55605..1d978f1bc4a48d 100644 --- a/ports/qt5-imageformats/CONTROL +++ b/ports/qt5-imageformats/CONTROL @@ -1,5 +1,5 @@ -Source: qt5-imageformats -Version: 5.15.1 -Port-Version: 1 -Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP -Build-Depends: qt5-base[core], tiff, libwebp, jasper +Source: qt5-imageformats +Version: 5.15.2 +Port-Version: 0 +Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP +Build-Depends: qt5-base[core], tiff, libwebp, jasper diff --git a/ports/qt5-location/CONTROL b/ports/qt5-location/CONTROL index 470d25e3df8df0..e123c56b9bdb1d 100644 --- a/ports/qt5-location/CONTROL +++ b/ports/qt5-location/CONTROL @@ -1,5 +1,4 @@ -Source: qt5-location -Version: 5.15.1 -Port-Version: 2 -Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application. -Build-Depends: qt5-base[core], qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport +Source: qt5-location +Version: 5.15.2 +Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application. +Build-Depends: qt5-base[core], qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake index 6855151bd36522..c8d591b2da5e63 100644 --- a/ports/qt5-location/portfile.cmake +++ b/ports/qt5-location/portfile.cmake @@ -1,3 +1,3 @@ message(STATUS "${PORT} has a spurious failure in which it is unable to create a parent directory! Just retry.") include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(PATCHES rename_third_party_libs_conflicts.patch) +qt_submodule_installation() diff --git a/ports/qt5-location/rename_third_party_libs_conflicts.patch b/ports/qt5-location/rename_third_party_libs_conflicts.patch deleted file mode 100644 index 786cea1ba73752..00000000000000 --- a/ports/qt5-location/rename_third_party_libs_conflicts.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/src/3rdparty/clip2tri/clip2tri.pro b/src/3rdparty/clip2tri/clip2tri.pro -index 802c040..4059a63 100644 ---- a/src/3rdparty/clip2tri/clip2tri.pro -+++ b/src/3rdparty/clip2tri/clip2tri.pro -@@ -1,4 +1,4 @@ --TARGET = clip2tri -+TARGET = qt_clip2tri - - CONFIG += staticlib exceptions warn_off optimize_full - -@@ -18,5 +18,5 @@ gcc { - HEADERS += clip2tri.h - SOURCES += clip2tri.cpp - --LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() -lclipper$$qtPlatformTargetSuffix() -+LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_poly2tri$$qtPlatformTargetSuffix() -lqt_clipper$$qtPlatformTargetSuffix() - -diff --git a/src/3rdparty/clipper/clipper.pro b/src/3rdparty/clipper/clipper.pro -index 874d55c..a518d24 100644 ---- a/src/3rdparty/clipper/clipper.pro -+++ b/src/3rdparty/clipper/clipper.pro -@@ -1,4 +1,4 @@ --TARGET = clipper -+TARGET = qt_clipper - - CONFIG += staticlib exceptions warn_off optimize_full - -diff --git a/src/3rdparty/poly2tri/poly2tri.pro b/src/3rdparty/poly2tri/poly2tri.pro -index 76f2779..6c5f769 100644 ---- a/src/3rdparty/poly2tri/poly2tri.pro -+++ b/src/3rdparty/poly2tri/poly2tri.pro -@@ -1,4 +1,4 @@ --TARGET = poly2tri -+TARGET = qt_poly2tri - - CONFIG += staticlib warn_off optimize_full - -diff --git a/src/location/declarativemaps/declarativemaps.pri b/src/location/declarativemaps/declarativemaps.pri -index e2a922f..12199ee 100644 ---- a/src/location/declarativemaps/declarativemaps.pri -+++ b/src/location/declarativemaps/declarativemaps.pri -@@ -68,5 +68,5 @@ SOURCES += \ - declarativemaps/qquickgeomapgesturearea.cpp - - load(qt_build_paths) --LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() -lclip2tri$$qtPlatformTargetSuffix() -+LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_poly2tri$$qtPlatformTargetSuffix() -lqt_clip2tri$$qtPlatformTargetSuffix() - -diff --git a/src/location/location.pro b/src/location/location.pro -index 1b541b9..b0e2c3f 100644 ---- a/src/location/location.pro -+++ b/src/location/location.pro -@@ -45,4 +45,4 @@ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS - - load(qt_module) - --LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lclip2tri$$qtPlatformTargetSuffix() -+LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_clip2tri$$qtPlatformTargetSuffix() -diff --git a/src/positioning/positioning.pro b/src/positioning/positioning.pro -index 6535090..db49921 100644 ---- a/src/positioning/positioning.pro -+++ b/src/positioning/positioning.pro -@@ -95,4 +95,4 @@ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS - - load(qt_module) - --LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lclip2tri$$qtPlatformTargetSuffix() -+LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_clip2tri$$qtPlatformTargetSuffix() diff --git a/ports/qt5-macextras/CONTROL b/ports/qt5-macextras/CONTROL index 50dfca3cf2f8f3..7bceef25c27c34 100644 --- a/ports/qt5-macextras/CONTROL +++ b/ports/qt5-macextras/CONTROL @@ -1,5 +1,5 @@ Source: qt5-macextras -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Mac Extras Module. Provides platform-specific APIs for mac. Build-Depends: qt5-base[core] Supports: osx \ No newline at end of file diff --git a/ports/qt5-mqtt/CONTROL b/ports/qt5-mqtt/CONTROL index 1c8f922f9f80ad..eeb831a9f81366 100644 --- a/ports/qt5-mqtt/CONTROL +++ b/ports/qt5-mqtt/CONTROL @@ -1,4 +1,4 @@ Source: qt5-mqtt -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 MQTT module. Build-Depends: qt5-base[core] diff --git a/ports/qt5-mqtt/portfile.cmake b/ports/qt5-mqtt/portfile.cmake index 571496ff60687f..77ef1144b18865 100644 --- a/ports/qt5-mqtt/portfile.cmake +++ b/ports/qt5-mqtt/portfile.cmake @@ -1,15 +1,22 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) #qt_submodule_installation() No binary package for this port. if(QT_UPDATE_VERSION) - set(QT_HASH_qt5-mqtt 1) # TO get an SHA512 error if the variable is set. + set(UPDATE_PORT_GIT_OPTIONS X_OUT_REF NEW_REF) # TO get an SHA512 error if the variable is set. endif() -vcpkg_from_github( + +vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH - REPO qt/qtmqtt - REF v${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER} - SHA512 ${QT_HASH_${PORT}} + URL git://code.qt.io/qt/qtmqtt.git + TAG v${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER} + REF ${QT_HASH_${PORT}} + ${UPDATE_PORT_GIT_OPTIONS} + PATCHES ${_qis_PATCHES} ) +if(NEW_REF) + message(STATUS "New qtmqtt ref: ${NEW_REF}") +endif() + # qt module builds from a git repository require a .git entry to invoke syncqt file(WRITE "${SOURCE_PATH}/.git" "repocontent") diff --git a/ports/qt5-multimedia/CONTROL b/ports/qt5-multimedia/CONTROL index fea820ce9cfdce..d45446bbb92246 100644 --- a/ports/qt5-multimedia/CONTROL +++ b/ports/qt5-multimedia/CONTROL @@ -1,4 +1,4 @@ Source: qt5-multimedia -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL index 23f64046187d9b..91d61337851394 100644 --- a/ports/qt5-networkauth/CONTROL +++ b/ports/qt5-networkauth/CONTROL @@ -1,4 +1,4 @@ Source: qt5-networkauth -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Network Authorization Module Build-Depends: qt5-base[core] diff --git a/ports/qt5-purchasing/CONTROL b/ports/qt5-purchasing/CONTROL index 10adb866591a7c..65b4d32566b405 100644 --- a/ports/qt5-purchasing/CONTROL +++ b/ports/qt5-purchasing/CONTROL @@ -1,4 +1,4 @@ Source: qt5-purchasing -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications. Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-quickcontrols/CONTROL b/ports/qt5-quickcontrols/CONTROL index 551adc3cdaa0a6..27cfa45df8c02b 100644 --- a/ports/qt5-quickcontrols/CONTROL +++ b/ports/qt5-quickcontrols/CONTROL @@ -1,4 +1,4 @@ Source: qt5-quickcontrols -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 QuickControls Module. Build-Depends: qt5-base[core], qt5-declarative, qt5-graphicaleffects diff --git a/ports/qt5-quickcontrols2/CONTROL b/ports/qt5-quickcontrols2/CONTROL index b46d81f230bad0..1b7e231fc16d9d 100644 --- a/ports/qt5-quickcontrols2/CONTROL +++ b/ports/qt5-quickcontrols2/CONTROL @@ -1,4 +1,4 @@ Source: qt5-quickcontrols2 -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 QuickControls2 Module. Build-Depends: qt5-base[core], qt5-declarative, qt5-imageformats diff --git a/ports/qt5-remoteobjects/CONTROL b/ports/qt5-remoteobjects/CONTROL index f813fdecf45047..aa2e51a738c0d6 100644 --- a/ports/qt5-remoteobjects/CONTROL +++ b/ports/qt5-remoteobjects/CONTROL @@ -1,4 +1,4 @@ Source: qt5-remoteobjects -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices. Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL index c5a1cece5c725d..a17dbcdfb0d71b 100644 --- a/ports/qt5-script/CONTROL +++ b/ports/qt5-script/CONTROL @@ -1,4 +1,4 @@ Source: qt5-script -Version: 5.15.1 +Version: 5.15.2 Build-Depends: qt5-base[core], qt5-tools Description:Qt5 Script Module. diff --git a/ports/qt5-scxml/CONTROL b/ports/qt5-scxml/CONTROL index 9be17dc24c02d0..f330eadd455043 100644 --- a/ports/qt5-scxml/CONTROL +++ b/ports/qt5-scxml/CONTROL @@ -1,4 +1,4 @@ Source: qt5-scxml -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-sensors/CONTROL b/ports/qt5-sensors/CONTROL index ec36c2d3f85653..4f3f1b402dc1c8 100644 --- a/ports/qt5-sensors/CONTROL +++ b/ports/qt5-sensors/CONTROL @@ -1,4 +1,4 @@ Source: qt5-sensors -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition. Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-serialbus/CONTROL b/ports/qt5-serialbus/CONTROL index ef7472d8352691..b05504825364f6 100644 --- a/ports/qt5-serialbus/CONTROL +++ b/ports/qt5-serialbus/CONTROL @@ -1,4 +1,4 @@ Source: qt5-serialbus -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Serialbus Module; Build-Depends: qt5-base[core], qt5-serialport diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL index 8c1c6a2ea7f14f..a353df783343a1 100644 --- a/ports/qt5-serialport/CONTROL +++ b/ports/qt5-serialport/CONTROL @@ -1,4 +1,4 @@ Source: qt5-serialport -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Serial Port - provides access to hardware and virtual serial ports Build-Depends: qt5-base[core] diff --git a/ports/qt5-speech/CONTROL b/ports/qt5-speech/CONTROL index 152d0341c16591..58238879e99b7c 100644 --- a/ports/qt5-speech/CONTROL +++ b/ports/qt5-speech/CONTROL @@ -1,4 +1,4 @@ Source: qt5-speech -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Speech Module Build-Depends: qt5-base[core], atlmfc (windows), qt5-declarative, qt5-multimedia diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL index 094b3835d052f5..4e9fa8fcc3f5ba 100644 --- a/ports/qt5-svg/CONTROL +++ b/ports/qt5-svg/CONTROL @@ -1,4 +1,4 @@ Source: qt5-svg -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files Build-Depends: qt5-base[core] diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL index 523a608cedb0a8..bb503e7b90d673 100644 --- a/ports/qt5-tools/CONTROL +++ b/ports/qt5-tools/CONTROL @@ -1,5 +1,5 @@ Source: qt5-tools -Version: 5.15.1 -Port-Version: 1 +Version: 5.15.2 +Port-Version: 0 Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications Build-Depends: qt5-base[core], qt5-declarative, qt5-activeqt (windows) diff --git a/ports/qt5-tools/assistant.patch b/ports/qt5-tools/assistant.patch deleted file mode 100644 index b92325a23bdf33..00000000000000 --- a/ports/qt5-tools/assistant.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6db2b442dd14eb068bba52e4f7223139ea29a558 Mon Sep 17 00:00:00 2001 -From: Jarek Kobus -Date: Mon, 7 Sep 2020 14:37:33 +0200 -Subject: [PATCH] Fix static build of assistant - -Fixes: QTBUG-86477 -Pick-to: 5.15 -Change-Id: Ifb77fb38b4b182a996666c6b69d8357458add0c4 -Reviewed-by: Kai Koehne ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index 8c75a8cd8..24d0b9c6b 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -9,7 +9,7 @@ qtHaveModule(widgets) { - SUBDIRS = designer \ - pixeltool - -- !static|contains(QT_PLUGINS, qtsqlite): SUBDIRS += assistant -+ !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant - - linguist.depends = designer - } --- -2.16.3 diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake index 7b0b32ac2cf8cc..c166ed7f5701c1 100644 --- a/ports/qt5-tools/portfile.cmake +++ b/ports/qt5-tools/portfile.cmake @@ -1,7 +1,6 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) qt_submodule_installation(PATCHES - assistant.patch icudt-debug-suffix.patch # https://bugreports.qt.io/browse/QTBUG-87677 ) diff --git a/ports/qt5-translations/CONTROL b/ports/qt5-translations/CONTROL index 486e0c8347d0d2..37e37728faca32 100644 --- a/ports/qt5-translations/CONTROL +++ b/ports/qt5-translations/CONTROL @@ -1,4 +1,4 @@ Source: qt5-translations -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 translations module Build-Depends: qt5-base[core], qt5-tools diff --git a/ports/qt5-virtualkeyboard/CONTROL b/ports/qt5-virtualkeyboard/CONTROL index 162017e1eac187..716ec162e71aa1 100644 --- a/ports/qt5-virtualkeyboard/CONTROL +++ b/ports/qt5-virtualkeyboard/CONTROL @@ -1,4 +1,4 @@ Source: qt5-virtualkeyboard -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes Build-Depends: qt5-svg, qt5-quickcontrols, qt5-multimedia, qt5-quickcontrols diff --git a/ports/qt5-wayland/CONTROL b/ports/qt5-wayland/CONTROL index 77804049c98390..84f8cd621c685d 100644 --- a/ports/qt5-wayland/CONTROL +++ b/ports/qt5-wayland/CONTROL @@ -1,4 +1,4 @@ Source: qt5-wayland -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 wayland Module; Build-Depends: qt5-base[core] diff --git a/ports/qt5-webchannel/CONTROL b/ports/qt5-webchannel/CONTROL index 585ea3df7be026..f20ef3e59ee0f1 100644 --- a/ports/qt5-webchannel/CONTROL +++ b/ports/qt5-webchannel/CONTROL @@ -1,4 +1,4 @@ Source: qt5-webchannel -Version: 5.15.1 +Version: 5.15.2 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. Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-webengine/CONTROL b/ports/qt5-webengine/CONTROL index bfc1e1dbde5221..929a7ad64d489d 100644 --- a/ports/qt5-webengine/CONTROL +++ b/ports/qt5-webengine/CONTROL @@ -1,5 +1,5 @@ Source: qt5-webengine -Version: 5.15.1 +Version: 5.15.2 Port-Version: 1 Description: Qt5 webengine Module; Build-Depends: qt5-base[core], qt5-declarative, qt5-location, qt5-quickcontrols, qt5-quickcontrols2, qt5-tools, qt5-webchannel, atlmfc (windows), ffmpeg[core] (!windows) diff --git a/ports/qt5-webengine/build_1.patch b/ports/qt5-webengine/build_1.patch new file mode 100644 index 00000000000000..dfa3ea721f2718 --- /dev/null +++ b/ports/qt5-webengine/build_1.patch @@ -0,0 +1,12 @@ +diff --git a/src/3rdparty/chromium/third_party/angle/BUILD.gn b/src/3rdparty/chromium/third_party/angle/BUILD.gn +index ad7675f4e..4a43479d9 100644 +--- a/src/3rdparty/chromium/third_party/angle/BUILD.gn ++++ b/src/3rdparty/chromium/third_party/angle/BUILD.gn +@@ -126,7 +126,6 @@ config("extra_warnings") { + # Enable more default warnings on Windows. + if (is_win) { + cflags += [ +- "/we4244", # Conversion: possible loss of data. + "/we4456", # Variable shadowing. + "/we4458", # declaration hides class member. + "/we4715", # not all control paths return a value diff --git a/ports/qt5-webengine/build_2.patch b/ports/qt5-webengine/build_2.patch new file mode 100644 index 00000000000000..7a4622516d846f --- /dev/null +++ b/ports/qt5-webengine/build_2.patch @@ -0,0 +1,29 @@ +diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h +index 59dbfad04..134357395 100644 +--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h ++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h +@@ -74,7 +74,7 @@ class CircularQueue { + return queue_->Get(pos_); + } + +- const T* operator->() const { ++ T* operator->() const { + #if PERFETTO_DCHECK_IS_ON() + PERFETTO_DCHECK(generation_ == queue_->generation()); + #endif +@@ -82,13 +82,13 @@ class CircularQueue { + } + + T& operator*() { return *(operator->()); } +- const T& operator*() const { return *(operator->()); } ++ T& operator*() const { return *(operator->()); } + + value_type& operator[](difference_type i) { + return *(*this + i); + } + +- const value_type& operator[](difference_type i) const { ++ value_type& operator[](difference_type i) const { + return *(*this + i); + } + diff --git a/ports/qt5-webengine/build_3.patch b/ports/qt5-webengine/build_3.patch new file mode 100644 index 00000000000000..a86c5dec4641b4 --- /dev/null +++ b/ports/qt5-webengine/build_3.patch @@ -0,0 +1,17 @@ +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h +index 78c316e04..fdb0312e0 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h +@@ -138,9 +138,9 @@ class LABColorSpace { + clamp(lab.Z(), -128.0f, 128.0f)}; + + return { +- invf((v.X() + 16.0f) / 116.0f + (v.Y() * 0.002f)) * kIlluminantD50.X(), +- invf((v.X() + 16.0f) / 116.0f) * kIlluminantD50.Y(), +- invf((v.X() + 16.0f) / 116.0f - (v.Z() * 0.005f)) * kIlluminantD50.Z()}; ++ (float)(invf((v.X() + 16.0f) / 116.0f + (v.Y() * 0.002f)) * kIlluminantD50.X()), ++ (float)(invf((v.X() + 16.0f) / 116.0f) * kIlluminantD50.Y()), ++ (float)(invf((v.X() + 16.0f) / 116.0f - (v.Z() * 0.005f)) * kIlluminantD50.Z())}; + } + + private: diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index aac884be306897..797d5fedb46793 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -37,7 +37,10 @@ vcpkg_add_to_path(PREPEND "${GPERF_DIR}") vcpkg_add_to_path(PREPEND "${NINJA_DIR}") set(PATCHES common.pri.patch - gl.patch) + gl.patch + build_1.patch + build_2.patch + build_3.patch) if(NOT VCPKG_TARGET_IS_WINDOWS) list(APPEND CORE_OPTIONS "BUILD_OPTIONS" "-webengine-system-libwebp" "-webengine-system-ffmpeg" "-webengine-system-icu") diff --git a/ports/qt5-webglplugin/CONTROL b/ports/qt5-webglplugin/CONTROL index 4350bd3215af34..8a1603abf215cf 100644 --- a/ports/qt5-webglplugin/CONTROL +++ b/ports/qt5-webglplugin/CONTROL @@ -1,4 +1,4 @@ Source: qt5-webglplugin -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 webglplugin Module; Build-Depends: qt5-base[core] diff --git a/ports/qt5-websockets/CONTROL b/ports/qt5-websockets/CONTROL index cc13ea0d53aea3..54ae79c5784952 100644 --- a/ports/qt5-websockets/CONTROL +++ b/ports/qt5-websockets/CONTROL @@ -1,4 +1,4 @@ Source: qt5-websockets -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455 Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-webview/CONTROL b/ports/qt5-webview/CONTROL index 68e9e50b892807..22e292d0e52c61 100644 --- a/ports/qt5-webview/CONTROL +++ b/ports/qt5-webview/CONTROL @@ -1,4 +1,4 @@ Source: qt5-webview -Version: 5.15.1 +Version: 5.15.2 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. Build-Depends: qt5-declarative diff --git a/ports/qt5-winextras/CONTROL b/ports/qt5-winextras/CONTROL index c05bedfd094673..ab0c4fb30a0fe1 100644 --- a/ports/qt5-winextras/CONTROL +++ b/ports/qt5-winextras/CONTROL @@ -1,5 +1,5 @@ Source: qt5-winextras -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows. Build-Depends: qt5-base[core], atlmfc (windows), qt5-declarative, qt5-multimedia Supports: windows diff --git a/ports/qt5-x11extras/CONTROL b/ports/qt5-x11extras/CONTROL index 760ae05c886b60..7c3f174c9a113b 100644 --- a/ports/qt5-x11extras/CONTROL +++ b/ports/qt5-x11extras/CONTROL @@ -1,4 +1,4 @@ Source: qt5-x11extras -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 x11extras Module; Build-Depends: qt5-base[core] diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL index ea22383a5997ea..8b533502e53ef4 100644 --- a/ports/qt5-xmlpatterns/CONTROL +++ b/ports/qt5-xmlpatterns/CONTROL @@ -1,4 +1,4 @@ Source: qt5-xmlpatterns -Version: 5.15.1 +Version: 5.15.2 Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index aa4a394a0a2237..085cfa17e097ca 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,6 +1,5 @@ Source: qt5 -Version: 5.15.1 -Port-Version: 2 +Version: 5.15.2 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Build-Depends: qt5-base[core] @@ -12,7 +11,7 @@ Description: Build the essential qt modules Feature: latest Build-Depends: qt5-base[core, latest] -Description: Build latest qt version (5.15.1) instead of LTS (Currently latest==LTS) +Description: Build latest qt version (5.15.2) instead of LTS (Currently latest==LTS) Feature: all Build-Depends: qt5[3d, webchannel, websockets, extras, xmlpatterns, sensors, serialport, speech, svg, tools, virtualkeyboard, networkauth, purchasing, quickcontrols, quickcontrols2, script, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, imageformats, location, multimedia, mqtt, webglplugin, webview, serialbus, translations, doc, remoteobjects, connectivity], qt5[core,webengine,mysqlplugin] (!static), qt5[core,wayland] (!windows) From 3c56e4fe6d93cf25dbd1df6dcfe89a751528a9c3 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Wed, 20 Jan 2021 13:03:02 -0800 Subject: [PATCH 0542/1694] [sfml] Install usage and change version scheme to relaxed (#15718) --- port_versions/baseline.json | 2 +- port_versions/s-/sfml.json | 5 +++++ ports/sfml/CONTROL | 6 ------ ports/sfml/portfile.cmake | 3 ++- ports/sfml/usage | 8 ++++---- ports/sfml/vcpkg.json | 15 +++++++++++++++ 6 files changed, 27 insertions(+), 12 deletions(-) delete mode 100644 ports/sfml/CONTROL create mode 100644 ports/sfml/vcpkg.json diff --git a/port_versions/baseline.json b/port_versions/baseline.json index d5f4d1e2b1e27d..30c6d3c70b4bee 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -5262,7 +5262,7 @@ }, "sfml": { "baseline": "2.5.1", - "port-version": 9 + "port-version": 10 }, "sfsexp": { "baseline": "1.3", diff --git a/port_versions/s-/sfml.json b/port_versions/s-/sfml.json index 5481e9129fe7e3..d14e2ee1aba4b3 100644 --- a/port_versions/s-/sfml.json +++ b/port_versions/s-/sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02d4e2c1c253e1ef48dd9c37d24bec0a47a716ff", + "version": "2.5.1", + "port-version": 10 + }, { "git-tree": "abdf117d96cbb4dd259ec37277311109151bfcdb", "version-string": "2.5.1", diff --git a/ports/sfml/CONTROL b/ports/sfml/CONTROL deleted file mode 100644 index d126e395edfef1..00000000000000 --- a/ports/sfml/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: sfml -Version: 2.5.1 -Port-Version: 9 -Homepage: https://github.com/sfml/sfml -Description: Simple and fast multimedia library -Build-Depends: freetype, libflac, libogg, libvorbis, openal-soft, stb diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index 0a028db194019b..f832303a78f684 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -56,4 +56,5 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${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 +configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage COPYONLY) +configure_file(${SOURCE_PATH}/license.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/sfml/usage b/ports/sfml/usage index 5b0f68d1a73953..784d1173a47f97 100644 --- a/ports/sfml/usage +++ b/ports/sfml/usage @@ -1,7 +1,7 @@ The package sfml provides CMake targets: find_package(SFML COMPONENTS system window graphics CONFIG REQUIRED) - # Windows - target_link_libraries(main PRIVATE FLAC OpenAL OpenGL Vorbis) - # Linux/MacOS - target_link_libraries(main PRIVATE X11 FLAC UDev OpenAL) + target_link_libraries(main PRIVATE sfml-system sfml-network sfml-graphics sfml-window) + + # If you want SFML to provide an implementation of main(): + target_link_libraries(main PRIVATE sfml-main) diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json new file mode 100644 index 00000000000000..64c7f53581cd54 --- /dev/null +++ b/ports/sfml/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "sfml", + "version": "2.5.1", + "port-version": 10, + "description": "Simple and fast multimedia library", + "homepage": "https://github.com/sfml/sfml", + "dependencies": [ + "freetype", + "libflac", + "libogg", + "libvorbis", + "openal-soft", + "stb" + ] +} From 7978f13b9ab2bd7adb58025746e5b6a45d4160f0 Mon Sep 17 00:00:00 2001 From: ankurverma85 <31362771+ankurverma85@users.noreply.github.com> Date: Wed, 20 Jan 2021 16:22:09 -0800 Subject: [PATCH 0543/1694] [osg] fix x64-windows-static-md builds (#15374) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Trim out dependencies * Fix static compilation * Update ports/osg/CONTROL Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * update baseline Co-authored-by: ankurv Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: JackBoosY --- port_versions/baseline.json | 2 +- port_versions/o-/osg.json | 5 ++++ ports/osg/CONTROL | 4 +-- ports/osg/osgdb_zip_nozip.patch | 52 +++++++++++++++++++++++++++++++++ ports/osg/portfile.cmake | 1 + 5 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 ports/osg/osgdb_zip_nozip.patch diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 30c6d3c70b4bee..c2685e0d3e646e 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4346,7 +4346,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 5 + "port-version": 6 }, "osg-qt": { "baseline": "Qt4", diff --git a/port_versions/o-/osg.json b/port_versions/o-/osg.json index 5901d4ba980e8a..973c0de20fbfab 100644 --- a/port_versions/o-/osg.json +++ b/port_versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b787269fae66af2447354c4e76ce0883c8d93b9", + "version-string": "3.6.5", + "port-version": 6 + }, { "git-tree": "de60b215a6e17bc6651d212874ffdaf513bdbf16", "version-string": "3.6.5", diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index 854c181a942a35..8d453c36c7901f 100644 --- a/ports/osg/CONTROL +++ b/ports/osg/CONTROL @@ -1,9 +1,9 @@ Source: osg Version: 3.6.5 -Port-Version: 5 +Port-Version: 6 Homepage: https://github.com/openscenegraph/OpenSceneGraph Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit. -Build-Depends: zlib, fontconfig, freeglut (windows), expat (windows), openimageio (osx) +Build-Depends: zlib, fontconfig (!windows), expat (windows), openimageio (osx) Feature: collada Description: Support for Collada (.dae) files diff --git a/ports/osg/osgdb_zip_nozip.patch b/ports/osg/osgdb_zip_nozip.patch new file mode 100644 index 00000000000000..a16deca974d68f --- /dev/null +++ b/ports/osg/osgdb_zip_nozip.patch @@ -0,0 +1,52 @@ +From bee432e701c541f9a86bd051b795c3e056e36646 Mon Sep 17 00:00:00 2001 +From: Ankur Verma +Date: Sun, 16 Aug 2020 14:36:31 -0700 +Subject: [PATCH] osg + +--- + src/osgPlugins/zip/unzip.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/osgPlugins/zip/unzip.cpp b/src/osgPlugins/zip/unzip.cpp +index 0bec28f0c..74e7b2413 100644 +--- a/src/osgPlugins/zip/unzip.cpp ++++ b/src/osgPlugins/zip/unzip.cpp +@@ -1742,8 +1742,8 @@ int inflate_blocks_free(inflate_blocks_statef *s, z_streamp z) + + + +-extern const char inflate_copyright[] = +- " inflate 1.1.3 Copyright 1995-1998 Mark Adler "; ++//extern const char inflate_copyright[] = ++// " inflate 1.1.3 Copyright 1995-1998 Mark Adler "; + // If you use the zlib library in a product, an acknowledgment is welcome + // in the documentation of your product. If for some reason you cannot + // include such an acknowledgment, I would appreciate that you keep this +-- +2.26.2 + +From 24d4036036884b350bd6c519b64626faa2c7e660 Mon Sep 17 00:00:00 2001 +From: Ankur Verma +Date: Thu, 20 Aug 2020 23:16:12 -0700 +Subject: [PATCH] Symbol clashes + +--- + src/osgPlugins/zip/unzip.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/osgPlugins/zip/unzip.cpp b/src/osgPlugins/zip/unzip.cpp +index 74e7b2413..f5169c6f4 100644 +--- a/src/osgPlugins/zip/unzip.cpp ++++ b/src/osgPlugins/zip/unzip.cpp +@@ -213,7 +213,7 @@ DWORD GetFilePosU(HANDLE hfout) + return ftell(hfout); + } + +-bool FileExists(const TCHAR *fn) ++static bool FileExists(const TCHAR *fn) + { struct stat st; + int res=stat(fn,&st); + return (res==0); +-- +2.26.2 + diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 14fe4216822ee9..eaa94c2ddf7e30 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( fix-nvtt.patch use-boost-asio.patch fix-dependency-coin.patch + osgdb_zip_nozip.patch # This is fix symbol clashes with other libs when built in static-lib mode ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") From f48c77dfce4d0276a780c5f675fda6ce98542d5a Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 20 Jan 2021 19:23:41 -0800 Subject: [PATCH 0544/1694] [crfsuite] change /include/x.h => /include/crfsuite/x.h (#15785) This caused conflicts with many ports; in particular params.h conflicted with tesseract. crfsuite:/include/cqdb.h crfsuite:/include/crf1d.h crfsuite:/include/crfsuite.h crfsuite:/include/crfsuite.hpp crfsuite:/include/crfsuite_api.hpp crfsuite:/include/crfsuite_internal.h crfsuite:/include/iwa.h crfsuite:/include/logging.h crfsuite:/include/option.h crfsuite:/include/os.h crfsuite:/include/params.h *** crfsuite:/include/quark.h crfsuite:/include/readdata.h crfsuite:/include/rumavl.h crfsuite:/include/vecmath.h --- port_versions/baseline.json | 2 +- port_versions/c-/crfsuite.json | 5 +++ ports/crfsuite/CMakeLists.txt | 58 +++++++++++++++++++--------------- ports/crfsuite/CONTROL | 5 --- ports/crfsuite/portfile.cmake | 19 +++++------ ports/crfsuite/vcpkg.json | 11 +++++++ scripts/ci.baseline.txt | 2 -- 7 files changed, 57 insertions(+), 45 deletions(-) delete mode 100644 ports/crfsuite/CONTROL create mode 100644 ports/crfsuite/vcpkg.json diff --git a/port_versions/baseline.json b/port_versions/baseline.json index c2685e0d3e646e..1cb2af9c71e60e 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -1426,7 +1426,7 @@ }, "crfsuite": { "baseline": "2019-07-21", - "port-version": 0 + "port-version": 1 }, "croncpp": { "baseline": "2020-09-04", diff --git a/port_versions/c-/crfsuite.json b/port_versions/c-/crfsuite.json index a05123c187fb2e..60419940740417 100644 --- a/port_versions/c-/crfsuite.json +++ b/port_versions/c-/crfsuite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65bc9733064d028bb4f2960d824862263f74bfde", + "version-date": "2019-07-21", + "port-version": 1 + }, { "git-tree": "779f57b3fd1e0e2a15df5baf4488ef149f7f0cfd", "version-string": "2019-07-21", diff --git a/ports/crfsuite/CMakeLists.txt b/ports/crfsuite/CMakeLists.txt index 81ede0ba5310f8..05dfa88d06a267 100644 --- a/ports/crfsuite/CMakeLists.txt +++ b/ports/crfsuite/CMakeLists.txt @@ -1,33 +1,33 @@ -cmake_minimum_required(VERSION 3.12 FATAL_ERROR) +cmake_minimum_required(VERSION 3.19 FATAL_ERROR) PROJECT(crfsuite) - + file(GLOB SOURCE_FILE_CQDB - "lib/cqdb/src/*.c" + "lib/cqdb/src/*.c" ) file(GLOB HEADERS_FILE_CQDB - "lib/cqdb/include/*.h" + "lib/cqdb/include/*.h" ) file(GLOB SOURCE_FILE_CRF - "lib/crf/src/*.c" + "lib/crf/src/*.c" ) file(GLOB HEADERS_FILE_CRF - "lib/crf/src/*.h" + "lib/crf/src/*.h" ) file(GLOB SOURCE_FILE_FRONTEND - "frontend/*.c" + "frontend/*.c" ) file(GLOB HEADERS_FILE_FRONTEND - "frontend/*.h" + "frontend/*.h" ) file(GLOB SOURCE_FILE - "swig/*.cpp" - "frontend/*.c" + "swig/*.cpp" + "frontend/*.c" ) file(GLOB HEADERS_FILE - "include/*.h" - "include/*.hpp" - "frontend/*.h" + "include/*.h" + "include/*.hpp" + "frontend/*.h" ) find_library(LBFGS_LIBRARY lbfgs) @@ -36,15 +36,13 @@ include_directories(lib/cqdb/include/) include_directories(include/) include_directories(win32/liblbfgs/) - -add_library (cqdb STATIC ${SOURCE_FILE_CQDB} ${HEADERS_FILE_CQDB}) -add_library (crf STATIC ${SOURCE_FILE_CRF} ${HEADERS_FILE_CRF}) -add_library (crfsuite STATIC ${SOURCE_FILE} ${HEADERS_FILE}) +add_library(cqdb STATIC ${SOURCE_FILE_CQDB} ${HEADERS_FILE_CQDB}) +add_library(crf STATIC ${SOURCE_FILE_CRF} ${HEADERS_FILE_CRF}) +add_library(crfsuite STATIC ${SOURCE_FILE} ${HEADERS_FILE}) target_link_libraries(crf PUBLIC cqdb ${LBFGS_LIBRARY}) target_link_libraries(crfsuite PUBLIC crf) - install(TARGETS cqdb crf crfsuite RUNTIME DESTINATION bin ARCHIVE DESTINATION lib @@ -52,14 +50,22 @@ install(TARGETS cqdb crf crfsuite ) if (WIN32) -add_executable(frontend ${SOURCE_FILE_FRONTEND} ${HEADERS_FILE_FRONTEND}) -target_link_libraries(frontend PUBLIC crf) -install(TARGETS frontend - RUNTIME DESTINATION tools - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) + add_executable(frontend ${SOURCE_FILE_FRONTEND} ${HEADERS_FILE_FRONTEND}) + target_link_libraries(frontend PUBLIC crf) + install(TARGETS frontend + RUNTIME DESTINATION tools + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + ) endif() -install(FILES ${HEADERS_FILE} ${HEADERS_FILE_CQDB} ${HEADERS_FILE_CRF} ${HEADERS_FILE_FRONTEND} DESTINATION include) \ No newline at end of file +install( + FILES + ${HEADERS_FILE} + ${HEADERS_FILE_CQDB} + ${HEADERS_FILE_CRF} + ${HEADERS_FILE_FRONTEND} + DESTINATION + include/crfsuite + ) diff --git a/ports/crfsuite/CONTROL b/ports/crfsuite/CONTROL deleted file mode 100644 index 30a2615514ea46..00000000000000 --- a/ports/crfsuite/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: crfsuite -Version: 2019-07-21 -Homepage: http://www.chokkan.org/software/crfsuite/ -Build-Depends: liblbfgs -Description: CRFSuite is an implementation of Conditional Random Fields (CRFs) for labeling sequential data. \ No newline at end of file diff --git a/ports/crfsuite/portfile.cmake b/ports/crfsuite/portfile.cmake index debdde3568a303..19b2399bed3e21 100644 --- a/ports/crfsuite/portfile.cmake +++ b/ports/crfsuite/portfile.cmake @@ -1,7 +1,4 @@ -if (VCPKG_TARGET_TRIPLET STREQUAL "x64-uwp" OR VCPKG_TARGET_TRIPLET STREQUAL "arm-uwp") - message(FATAL_ERROR "crfsuite does not support on this platform") -endif() - +vcpkg_fail_port_install(ON_TARGET uwp) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -9,23 +6,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chokkan/crfsuite REF 5d1bd3b803bb26582ed5cc274d6b5af6cc7f9cae - SHA512 e7f329f96fb0dc0e347b3e7a3e26b23ceb45e6fae7b59ace05633a24d58a31665826ebc5280e5a864f50598772791e4b5b3e7da7f46994655cbe03806f823f73 + SHA512 e7f329f96fb0dc0e347b3e7a3e26b23ceb45e6fae7b59ace05633a24d58a31665826ebc5280e5a864f50598772791e4b5b3e7da7f46994655cbe03806f823f73 HEAD_REF master ) -list(REMOVE_ITEM SOURCE_FILE ${SOURCE_PATH}/win32/liblbfgs/lbfgs.lib) -list(REMOVE_ITEM SOURCE_FILE ${SOURCE_PATH}/win32/liblbfgs/lbfgs_debug.lib) +list(REMOVE_ITEM SOURCE_FILE "${SOURCE_PATH}/win32/liblbfgs/lbfgs.lib") +list(REMOVE_ITEM SOURCE_FILE "${SOURCE_PATH}/win32/liblbfgs/lbfgs_debug.lib") -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} + SOURCE_PATH "${SOURCE_PATH}" PREFIX_NINJA ) vcpkg_install_cmake() 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/crfsuite RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/crfsuite/vcpkg.json b/ports/crfsuite/vcpkg.json new file mode 100644 index 00000000000000..aa62f95bf1b0ba --- /dev/null +++ b/ports/crfsuite/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "crfsuite", + "version-date": "2019-07-21", + "port-version": 1, + "description": "CRFSuite is an implementation of Conditional Random Fields (CRFs) for labeling sequential data.", + "homepage": "http://www.chokkan.org/software/crfsuite/", + "supports": "!uwp", + "dependencies": [ + "liblbfgs" + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9397501405a4e5..3cf0de85aa81fb 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -155,8 +155,6 @@ crashpad:arm-uwp=fail crashpad:x64-linux=fail crashpad:x64-uwp=fail crashpad:x86-windows=fail -crfsuite:arm-uwp=fail -crfsuite:x64-uwp=fail crossguid:x64-osx=fail ctemplate:arm64-windows=fail ctemplate:arm-uwp=fail From d8c8ad7e4a99ba20d5e6b55022c9017414a7f8c9 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 21 Jan 2021 08:58:11 -0800 Subject: [PATCH 0545/1694] [osgearth] Make all find_packages required in effort to make this port less "flaky", and turn on in CI. (#15777) --- port_versions/baseline.json | 2 +- port_versions/o-/osgearth.json | 5 ++ ports/osgearth/CONTROL | 5 -- .../make-all-find-packages-required.patch | 84 +++++++++++++++++++ ports/osgearth/portfile.cmake | 7 +- ports/osgearth/vcpkg.json | 25 ++++++ scripts/ci.baseline.txt | 6 -- toolsrc/src/vcpkg/platform-expression.cpp | 3 + 8 files changed, 123 insertions(+), 14 deletions(-) delete mode 100644 ports/osgearth/CONTROL create mode 100644 ports/osgearth/make-all-find-packages-required.patch create mode 100644 ports/osgearth/vcpkg.json diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 1cb2af9c71e60e..f45c801d233d49 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4354,7 +4354,7 @@ }, "osgearth": { "baseline": "3.1", - "port-version": 0 + "port-version": 1 }, "osi": { "baseline": "0.108.6", diff --git a/port_versions/o-/osgearth.json b/port_versions/o-/osgearth.json index 3a430bfc94f94a..13b6b3fece1b9c 100644 --- a/port_versions/o-/osgearth.json +++ b/port_versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d194c647fcf69fe345c13ae7b6da3451e4bbddb6", + "version": "3.1", + "port-version": 1 + }, { "git-tree": "168a035bd41f62a0d394f4e18fb703692603e39d", "version-string": "3.1", diff --git a/ports/osgearth/CONTROL b/ports/osgearth/CONTROL deleted file mode 100644 index c6d7b7a13cb5ae..00000000000000 --- a/ports/osgearth/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: osgearth -Version: 3.1 -Homepage: https://github.com/gwaldron/osgearth -Description: osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping. -Build-Depends: osg[plugins] \ No newline at end of file diff --git a/ports/osgearth/make-all-find-packages-required.patch b/ports/osgearth/make-all-find-packages-required.patch new file mode 100644 index 00000000000000..f5ea6793f72114 --- /dev/null +++ b/ports/osgearth/make-all-find-packages-required.patch @@ -0,0 +1,84 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 049e37e..c78bd16 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -121,9 +121,9 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit + + # Mobile/GLES: + IF (OSGEARTH_USE_GLES) +- find_package(OpenGLES) ++ find_package(OpenGLES REQUIRED) + ELSE () +- find_package(OpenGL) ++ find_package(OpenGL REQUIRED) + ENDIF (OSGEARTH_USE_GLES) + + # required +@@ -132,28 +132,28 @@ find_package(CURL REQUIRED) + find_package(GDAL REQUIRED) + + # optional +-find_package(GEOS) +-find_package(Sqlite3) +-find_package(Draco) +-find_package(BASISU) +-find_package(GLEW) +-find_package(Protobuf) +-find_package(WEBP) ++find_package(GEOS REQUIRED) ++find_package(Sqlite3 REQUIRED) ++find_package(Draco REQUIRED) ++find_package(BASISU REQUIRED) ++find_package(GLEW REQUIRED) ++find_package(Protobuf REQUIRED) ++find_package(WEBP REQUIRED) + + if(OSGEARTH_ENABLE_PROFILING) +- find_package(Tracy) ++ find_package(Tracy REQUIRED) + endif() + + if(OSGEARTH_BUILD_ZIP_PLUGIN) +- find_package(LIBZIP) ++ find_package(LIBZIP REQUIRED) + endif() + + if(OSGEARTH_BUILD_TRITON_NODEKIT) +- find_package(Triton QUIET) ++ find_package(Triton QUIET REQUIRED) + endif() + + if(OSGEARTH_BUILD_SILVERLINING_NODEKIT) +- find_package(SilverLining QUIET) ++ find_package(SilverLining QUIET REQUIRED) + endif() + + # Sqlite enables the MBTiles format: +@@ -182,18 +182,18 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile + # Duktape is the JavaScript interpreter + SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape") + IF (WITH_EXTERNAL_DUKTAPE) +- find_package(Duktape) ++ find_package(Duktape REQUIRED) + ENDIF (WITH_EXTERNAL_DUKTAPE) + + # Whether to install shaders (glsl files). +-# If true, shaders install into a resources folder. If false, they are inlined in the ++# If true, shaders install into a resources folder. If false, they are inlined in the + # code and you cannot tweak them after install. + OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Make INSTALL" OFF) + + # TinyXML is an XML parsing library + SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML") + IF (WITH_EXTERNAL_TINYXML) +- find_package(TinyXML) ++ find_package(TinyXML REQUIRED) + ENDIF (WITH_EXTERNAL_TINYXML) + + # postfix settings for various configs +@@ -272,4 +272,4 @@ ADD_SUBDIRECTORY(src) + + if (OSGEARTH_BUILD_DOCS) + ADD_SUBDIRECTORY(docs) +-endif() ++endif() diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 7f8f9be1e3ff10..57d42b523151f8 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -11,8 +11,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth REF 342fcadf4c8892ba84841cb5b4162bdc51519e3c #version 3.1 - SHA512 03378a918306846d2144e545785c783b01e33fa2dd5c77d16d390a275217b6ce7a3a743c35ae99a497b272a7516b055442c0a891bd312cce727a5538b40364f5 + SHA512 03378a918306846d2144e545785c783b01e33fa2dd5c77d16d390a275217b6ce7a3a743c35ae99a497b272a7516b055442c0a891bd312cce727a5538b40364f5 HEAD_REF master + PATCHES + make-all-find-packages-required.patch ) vcpkg_configure_cmake( @@ -25,6 +27,7 @@ vcpkg_configure_cmake( -DOSGEARTH_BUILD_PROCEDURAL_NODEKIT=OFF -DOSGEARTH_BUILD_TRITON_NODEKIT=OFF -DOSGEARTH_BUILD_SILVERLINING_NODEKIT=OFF + -DWITH_EXTERNAL_TINYXML=ON ) vcpkg_install_cmake() @@ -64,4 +67,4 @@ file(REMOVE_RECURSE ${OSGEARTH_DEBUG_TOOLS}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/${OSG_PLUGINS_SUBDIR}) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json new file mode 100644 index 00000000000000..7d7a220150a688 --- /dev/null +++ b/ports/osgearth/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "osgearth", + "version": "3.1", + "port-version": 1, + "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping.", + "homepage": "https://github.com/gwaldron/osgearth", + "supports": "!(x86 | wasm32) & !staticcrt", + "dependencies": [ + "basisu", + "draco", + "geos", + "glew", + "libwebp", + "libzip", + "opengl", + { + "name": "osg", + "features": [ + "plugins" + ] + }, + "protobuf", + "sqlite3" + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3cf0de85aa81fb..f4d376c7b3dce1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1199,12 +1199,6 @@ opusfile:arm-uwp=fail opusfile:x64-uwp=fail orocos-kdl:arm-uwp=fail orocos-kdl:x64-uwp=fail -osgearth:x64-linux=fail -osgearth:x64-osx=fail -osgearth:x64-windows-static=fail -osgearth:x64-windows-static-md=fail -osgearth:x64-windows=fail -osgearth:x86-windows=fail paho-mqtt:arm-uwp=fail paho-mqtt:x64-uwp=fail pangomm:x64-osx=fail diff --git a/toolsrc/src/vcpkg/platform-expression.cpp b/toolsrc/src/vcpkg/platform-expression.cpp index 034ee6bd5e5a63..a6177c85f61a46 100644 --- a/toolsrc/src/vcpkg/platform-expression.cpp +++ b/toolsrc/src/vcpkg/platform-expression.cpp @@ -32,6 +32,7 @@ namespace vcpkg::PlatformExpression ios, static_link, + static_crt, }; static Identifier string2identifier(StringView name) @@ -51,6 +52,7 @@ namespace vcpkg::PlatformExpression {"emscripten", Identifier::emscripten}, {"ios", Identifier::ios}, {"static", Identifier::static_link}, + {"staticcrt", Identifier::static_link}, }; auto id_pair = id_map.find(name); @@ -398,6 +400,7 @@ namespace vcpkg::PlatformExpression case Identifier::wasm32: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "wasm32"); case Identifier::static_link: return true_if_exists_and_equal("VCPKG_LIBRARY_LINKAGE", "static"); + case Identifier::static_crt: return true_if_exists_and_equal("VCPKG_CRT_LINKAGE", "static"); default: Checks::unreachable(VCPKG_LINE_INFO); } } From 1f8a0a683bdf08e873baa186534e785f7b8befa2 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 21 Jan 2021 09:53:22 -0800 Subject: [PATCH 0546/1694] [vcpkg] Rename `port_versions` to `versions` (#15784) --- docs/maintainers/maintainer-guide.md | 10 ++--- docs/specifications/versioning.md | 10 ++--- .../end-to-end-tests-dir/registries.ps1 | 16 +++---- .../end-to-end-tests-dir/versions.ps1 | 14 +++--- .../{port_versions => versions}/baseline.json | 0 .../v-/vcpkg-internal-e2e-test-port.json | 0 scripts/generateBaseline.py | 2 +- scripts/generatePortVersionsDb.py | 10 ++--- .../{port_versions => versions}/z-/zlib.json | 0 .../{port_versions => versions}/baseline.json | 0 .../{port_versions => versions}/c-/cat.json | 0 .../{port_versions => versions}/d-/dog.json | 0 .../{port_versions => versions}/d-/duck.json | 0 .../{port_versions => versions}/m-/mouse.json | 0 .../baseline.json | 0 .../c-/cat.json | 0 .../d-/dog.json | 0 .../f-/fish.json | 0 .../m-/mouse.json | 0 .../{port_versions => versions}/z-/zlib.json | 0 test.cmake | 1 - toolsrc/include/vcpkg/vcpkgcmdarguments.h | 4 +- toolsrc/include/vcpkg/vcpkgpaths.h | 2 +- toolsrc/src/vcpkg-test/arguments.cpp | 8 ++-- toolsrc/src/vcpkg/commands.add-version.cpp | 8 ++-- .../src/vcpkg/commands.civerifyversions.cpp | 6 +-- toolsrc/src/vcpkg/registries.cpp | 44 +++++++++---------- toolsrc/src/vcpkg/vcpkgcmdarguments.cpp | 6 +-- toolsrc/src/vcpkg/vcpkgpaths.cpp | 6 +-- {port_versions => versions}/3-/3fd.json | 0 {port_versions => versions}/7-/7zip.json | 0 {port_versions => versions}/a-/abseil.json | 0 {port_versions => versions}/a-/absent.json | 0 {port_versions => versions}/a-/ace.json | 0 .../a-/activemq-cpp.json | 0 {port_versions => versions}/a-/ade.json | 0 {port_versions => versions}/a-/aixlog.json | 0 {port_versions => versions}/a-/akali.json | 0 .../a-/alac-decoder.json | 0 {port_versions => versions}/a-/alac.json | 0 {port_versions => versions}/a-/alembic.json | 0 .../a-/aliyun-oss-c-sdk.json | 0 {port_versions => versions}/a-/allegro5.json | 0 {port_versions => versions}/a-/ampl-asl.json | 0 {port_versions => versions}/a-/ampl-mp.json | 0 {port_versions => versions}/a-/amqpcpp.json | 0 {port_versions => versions}/a-/anax.json | 0 .../a-/angelscript.json | 0 {port_versions => versions}/a-/angle.json | 0 {port_versions => versions}/a-/antlr4.json | 0 {port_versions => versions}/a-/any-lite.json | 0 {port_versions => versions}/a-/anyrpc.json | 0 {port_versions => versions}/a-/apr-util.json | 0 {port_versions => versions}/a-/apr.json | 0 {port_versions => versions}/a-/arb.json | 0 {port_versions => versions}/a-/arcus.json | 0 {port_versions => versions}/a-/argagg.json | 0 {port_versions => versions}/a-/argh.json | 0 {port_versions => versions}/a-/argparse.json | 0 {port_versions => versions}/a-/args.json | 0 {port_versions => versions}/a-/argtable2.json | 0 {port_versions => versions}/a-/argtable3.json | 0 .../a-/argumentum.json | 0 {port_versions => versions}/a-/armadillo.json | 0 {port_versions => versions}/a-/arrayfire.json | 0 {port_versions => versions}/a-/arrow.json | 0 {port_versions => versions}/a-/ashes.json | 0 {port_versions => versions}/a-/asio.json | 0 {port_versions => versions}/a-/asiosdk.json | 0 {port_versions => versions}/a-/asmjit.json | 0 {port_versions => versions}/a-/assimp.json | 0 {port_versions => versions}/a-/asynch.json | 0 .../a-/asyncplusplus.json | 0 {port_versions => versions}/a-/atk.json | 0 {port_versions => versions}/a-/atkmm.json | 0 {port_versions => versions}/a-/atlmfc.json | 0 {port_versions => versions}/a-/aubio.json | 0 {port_versions => versions}/a-/audiofile.json | 0 {port_versions => versions}/a-/aurora.json | 0 {port_versions => versions}/a-/autobahn.json | 0 .../a-/avisynthplus.json | 0 {port_versions => versions}/a-/avro-c.json | 0 {port_versions => versions}/a-/avro-cpp.json | 0 .../a-/aws-c-common.json | 0 .../a-/aws-c-event-stream.json | 0 .../a-/aws-checksums.json | 0 .../a-/aws-lambda-cpp.json | 0 .../a-/aws-sdk-cpp.json | 0 {port_versions => versions}/a-/azmq.json | 0 .../a-/azure-c-shared-utility.json | 0 .../a-/azure-iot-sdk-c.json | 0 .../a-/azure-kinect-sensor-sdk.json | 0 .../a-/azure-macro-utils-c.json | 0 .../a-/azure-storage-cpp.json | 0 .../a-/azure-uamqp-c.json | 0 .../a-/azure-uhttp-c.json | 0 .../a-/azure-umqtt-c.json | 0 {port_versions => versions}/b-/basisu.json | 0 {port_versions => versions}/b-/bcg729.json | 0 {port_versions => versions}/b-/bde.json | 0 {port_versions => versions}/b-/bdwgc.json | 0 {port_versions => versions}/b-/beast.json | 0 .../b-/behaviortree-cpp.json | 0 {port_versions => versions}/b-/benchmark.json | 0 {port_versions => versions}/b-/bento4.json | 0 .../b-/berkeleydb.json | 0 .../b-/bfgroup-lyra.json | 0 {port_versions => versions}/b-/bigint.json | 0 {port_versions => versions}/b-/binn.json | 0 {port_versions => versions}/b-/bitmagic.json | 0 .../b-/bitserializer-cpprestjson.json | 0 .../b-/bitserializer-pugixml.json | 0 .../b-/bitserializer-rapidjson.json | 0 .../b-/bitserializer-rapidyaml.json | 0 .../b-/bitserializer.json | 0 {port_versions => versions}/b-/bitsery.json | 0 {port_versions => versions}/b-/blas.json | 0 {port_versions => versions}/b-/blaze.json | 0 {port_versions => versions}/b-/blend2d.json | 0 {port_versions => versions}/b-/blitz.json | 0 {port_versions => versions}/b-/blosc.json | 0 {port_versions => versions}/b-/bond.json | 0 {port_versions => versions}/b-/boolinq.json | 0 .../b-/boost-accumulators.json | 0 .../b-/boost-algorithm.json | 0 .../b-/boost-align.json | 0 {port_versions => versions}/b-/boost-any.json | 0 .../b-/boost-array.json | 0 .../b-/boost-asio.json | 0 .../b-/boost-assert.json | 0 .../b-/boost-assign.json | 0 .../b-/boost-atomic.json | 0 .../b-/boost-beast.json | 0 .../b-/boost-bimap.json | 0 .../b-/boost-bind.json | 0 .../b-/boost-build.json | 0 .../b-/boost-callable-traits.json | 0 .../b-/boost-chrono.json | 0 .../b-/boost-circular-buffer.json | 0 .../b-/boost-compatibility.json | 0 .../b-/boost-compute.json | 0 .../b-/boost-concept-check.json | 0 .../b-/boost-config.json | 0 .../b-/boost-container-hash.json | 0 .../b-/boost-container.json | 0 .../b-/boost-context.json | 0 .../b-/boost-contract.json | 0 .../b-/boost-conversion.json | 0 .../b-/boost-convert.json | 0 .../b-/boost-core.json | 0 .../b-/boost-coroutine.json | 0 .../b-/boost-coroutine2.json | 0 {port_versions => versions}/b-/boost-crc.json | 0 .../b-/boost-date-time.json | 0 .../b-/boost-detail.json | 0 {port_versions => versions}/b-/boost-di.json | 0 {port_versions => versions}/b-/boost-dll.json | 0 .../b-/boost-dynamic-bitset.json | 0 .../b-/boost-endian.json | 0 .../b-/boost-exception.json | 0 .../b-/boost-fiber.json | 0 .../b-/boost-filesystem.json | 0 .../b-/boost-flyweight.json | 0 .../b-/boost-foreach.json | 0 .../b-/boost-format.json | 0 .../b-/boost-function-types.json | 0 .../b-/boost-function.json | 0 .../b-/boost-functional.json | 0 .../b-/boost-fusion.json | 0 .../b-/boost-geometry.json | 0 {port_versions => versions}/b-/boost-gil.json | 0 .../b-/boost-graph-parallel.json | 0 .../b-/boost-graph.json | 0 .../b-/boost-hana.json | 0 .../b-/boost-heap.json | 0 .../b-/boost-histogram.json | 0 {port_versions => versions}/b-/boost-hof.json | 0 {port_versions => versions}/b-/boost-icl.json | 0 .../b-/boost-integer.json | 0 .../b-/boost-interprocess.json | 0 .../b-/boost-interval.json | 0 .../b-/boost-intrusive.json | 0 {port_versions => versions}/b-/boost-io.json | 0 .../b-/boost-iostreams.json | 0 .../b-/boost-iterator.json | 0 .../b-/boost-json.json | 0 .../b-/boost-lambda.json | 0 .../b-/boost-leaf.json | 0 .../b-/boost-lexical-cast.json | 0 .../b-/boost-local-function.json | 0 .../b-/boost-locale.json | 0 .../b-/boost-lockfree.json | 0 {port_versions => versions}/b-/boost-log.json | 0 .../b-/boost-logic.json | 0 .../b-/boost-math.json | 0 .../b-/boost-metaparse.json | 0 .../b-/boost-modular-build-helper.json | 0 .../b-/boost-move.json | 0 .../b-/boost-mp11.json | 0 {port_versions => versions}/b-/boost-mpi.json | 0 {port_versions => versions}/b-/boost-mpl.json | 0 {port_versions => versions}/b-/boost-msm.json | 0 .../b-/boost-multi-array.json | 0 .../b-/boost-multi-index.json | 0 .../b-/boost-multiprecision.json | 0 .../b-/boost-nowide.json | 0 .../b-/boost-numeric-conversion.json | 0 .../b-/boost-odeint.json | 0 .../b-/boost-optional.json | 0 .../b-/boost-outcome.json | 0 .../b-/boost-parameter-python.json | 0 .../b-/boost-parameter.json | 0 {port_versions => versions}/b-/boost-pfr.json | 0 .../b-/boost-phoenix.json | 0 .../b-/boost-poly-collection.json | 0 .../b-/boost-polygon.json | 0 .../b-/boost-pool.json | 0 .../b-/boost-predef.json | 0 .../b-/boost-preprocessor.json | 0 .../b-/boost-process.json | 0 .../b-/boost-program-options.json | 0 .../b-/boost-property-map.json | 0 .../b-/boost-property-tree.json | 0 .../b-/boost-proto.json | 0 .../b-/boost-ptr-container.json | 0 .../b-/boost-python.json | 0 {port_versions => versions}/b-/boost-qvm.json | 0 .../b-/boost-random.json | 0 .../b-/boost-range.json | 0 .../b-/boost-ratio.json | 0 .../b-/boost-rational.json | 0 .../b-/boost-regex.json | 0 .../b-/boost-safe-numerics.json | 0 .../b-/boost-scope-exit.json | 0 .../b-/boost-serialization.json | 0 .../b-/boost-signals2.json | 0 .../b-/boost-smart-ptr.json | 0 .../b-/boost-sort.json | 0 .../b-/boost-spirit.json | 0 .../b-/boost-stacktrace.json | 0 .../b-/boost-statechart.json | 0 .../b-/boost-static-assert.json | 0 .../b-/boost-static-string.json | 0 .../b-/boost-stl-interfaces.json | 0 .../b-/boost-system.json | 0 .../b-/boost-test.json | 0 .../b-/boost-thread.json | 0 .../b-/boost-throw-exception.json | 0 .../b-/boost-timer.json | 0 .../b-/boost-tokenizer.json | 0 {port_versions => versions}/b-/boost-tti.json | 0 .../b-/boost-tuple.json | 0 .../b-/boost-type-erasure.json | 0 .../b-/boost-type-index.json | 0 .../b-/boost-type-traits.json | 0 .../b-/boost-typeof.json | 0 .../b-/boost-ublas.json | 0 .../b-/boost-uninstall.json | 0 .../b-/boost-units.json | 0 .../b-/boost-unordered.json | 0 .../b-/boost-utility.json | 0 .../b-/boost-uuid.json | 0 .../b-/boost-variant.json | 0 .../b-/boost-variant2.json | 0 .../b-/boost-vcpkg-helpers.json | 0 {port_versions => versions}/b-/boost-vmd.json | 0 .../b-/boost-wave.json | 0 .../b-/boost-winapi.json | 0 .../b-/boost-xpressive.json | 0 {port_versions => versions}/b-/boost-yap.json | 0 {port_versions => versions}/b-/boost.json | 0 {port_versions => versions}/b-/boringssl.json | 0 {port_versions => versions}/b-/botan.json | 0 {port_versions => versions}/b-/box2d.json | 0 {port_versions => versions}/b-/breakpad.json | 0 {port_versions => versions}/b-/brigand.json | 0 {port_versions => versions}/b-/brotli.json | 0 {port_versions => versions}/b-/brpc.json | 0 .../b-/brunocodutra-metal.json | 0 {port_versions => versions}/b-/brynet.json | 0 {port_versions => versions}/b-/bullet3.json | 0 {port_versions => versions}/b-/bustache.json | 0 .../b-/butteraugli.json | 0 {port_versions => versions}/b-/byte-lite.json | 0 {port_versions => versions}/b-/bzip2.json | 0 {port_versions => versions}/baseline.json | 0 {port_versions => versions}/c-/c-ares.json | 0 {port_versions => versions}/c-/c4core.json | 0 {port_versions => versions}/c-/caf.json | 0 {port_versions => versions}/c-/caffe2.json | 0 {port_versions => versions}/c-/cairo.json | 0 {port_versions => versions}/c-/cairomm.json | 0 {port_versions => versions}/c-/camport3.json | 0 {port_versions => versions}/c-/capnproto.json | 0 {port_versions => versions}/c-/capstone.json | 0 .../c-/cartographer.json | 0 {port_versions => versions}/c-/casclib.json | 0 .../c-/catch-classic.json | 0 {port_versions => versions}/c-/catch.json | 0 {port_versions => versions}/c-/catch2.json | 0 .../c-/cccapstone.json | 0 {port_versions => versions}/c-/ccd.json | 0 {port_versions => versions}/c-/ccfits.json | 0 {port_versions => versions}/c-/cctz.json | 0 {port_versions => versions}/c-/celero.json | 0 {port_versions => versions}/c-/cello.json | 0 {port_versions => versions}/c-/cereal.json | 0 {port_versions => versions}/c-/ceres.json | 0 {port_versions => versions}/c-/cfitsio.json | 0 {port_versions => versions}/c-/cgal.json | 0 {port_versions => versions}/c-/cgicc.json | 0 {port_versions => versions}/c-/cgl.json | 0 {port_versions => versions}/c-/cgltf.json | 0 {port_versions => versions}/c-/cgns.json | 0 .../c-/chaiscript.json | 0 .../c-/chakracore.json | 0 {port_versions => versions}/c-/charls.json | 0 {port_versions => versions}/c-/chartdir.json | 0 {port_versions => versions}/c-/check.json | 0 {port_versions => versions}/c-/chipmunk.json | 0 {port_versions => versions}/c-/chmlib.json | 0 .../c-/chromium-base.json | 0 {port_versions => versions}/c-/cimg.json | 0 {port_versions => versions}/c-/cityhash.json | 0 {port_versions => versions}/c-/civetweb.json | 0 {port_versions => versions}/c-/cjson.json | 0 {port_versions => versions}/c-/clapack.json | 0 {port_versions => versions}/c-/clara.json | 0 {port_versions => versions}/c-/clblas.json | 0 {port_versions => versions}/c-/clblast.json | 0 {port_versions => versions}/c-/clfft.json | 0 {port_versions => versions}/c-/cli.json | 0 {port_versions => versions}/c-/cli11.json | 0 .../c-/clickhouse-cpp.json | 0 {port_versions => versions}/c-/clipp.json | 0 .../c-/clockutils.json | 0 {port_versions => versions}/c-/clp.json | 0 {port_versions => versions}/c-/clrng.json | 0 {port_versions => versions}/c-/clue.json | 0 {port_versions => versions}/c-/cmark.json | 0 {port_versions => versions}/c-/cmcstl2.json | 0 {port_versions => versions}/c-/cmocka.json | 0 {port_versions => versions}/c-/cnl.json | 0 {port_versions => versions}/c-/coin.json | 0 {port_versions => versions}/c-/coinutils.json | 0 .../c-/collada-dom.json | 0 {port_versions => versions}/c-/colmap.json | 0 .../c-/comms-ublox.json | 0 {port_versions => versions}/c-/comms.json | 0 {port_versions => versions}/c-/commsdsl.json | 0 .../c-/concurrentqueue.json | 0 .../c-/console-bridge.json | 0 .../c-/constexpr-contracts.json | 0 {port_versions => versions}/c-/constexpr.json | 0 {port_versions => versions}/c-/coolprop.json | 0 {port_versions => versions}/c-/coroutine.json | 0 {port_versions => versions}/c-/corrade.json | 0 .../c-/cpp-base64.json | 0 .../c-/cpp-httplib.json | 0 .../c-/cpp-netlib.json | 0 .../c-/cpp-peglib.json | 0 {port_versions => versions}/c-/cpp-redis.json | 0 .../c-/cpp-taskflow.json | 0 {port_versions => versions}/c-/cppad.json | 0 {port_versions => versions}/c-/cppcms.json | 0 {port_versions => versions}/c-/cppcodec.json | 0 {port_versions => versions}/c-/cppcoro.json | 0 {port_versions => versions}/c-/cppfs.json | 0 .../c-/cppgraphqlgen.json | 0 .../c-/cppitertools.json | 0 {port_versions => versions}/c-/cppkafka.json | 0 .../c-/cppmicroservices.json | 0 .../c-/cpprestsdk.json | 0 {port_versions => versions}/c-/cpptoml.json | 0 {port_versions => versions}/c-/cppunit.json | 0 {port_versions => versions}/c-/cpputest.json | 0 {port_versions => versions}/c-/cppwinrt.json | 0 {port_versions => versions}/c-/cppzmq.json | 0 {port_versions => versions}/c-/cpr.json | 0 .../c-/cpu-features.json | 0 {port_versions => versions}/c-/cpuid.json | 0 {port_versions => versions}/c-/cpuinfo.json | 0 {port_versions => versions}/c-/cr.json | 0 {port_versions => versions}/c-/crashpad.json | 0 {port_versions => versions}/c-/crashrpt.json | 0 {port_versions => versions}/c-/crc32c.json | 0 {port_versions => versions}/c-/crfsuite.json | 0 {port_versions => versions}/c-/croncpp.json | 0 {port_versions => versions}/c-/crossguid.json | 0 {port_versions => versions}/c-/crow.json | 0 {port_versions => versions}/c-/cryptopp.json | 0 {port_versions => versions}/c-/cspice.json | 0 {port_versions => versions}/c-/ctbignum.json | 0 {port_versions => versions}/c-/ctemplate.json | 0 {port_versions => versions}/c-/ctp.json | 0 {port_versions => versions}/c-/ctre.json | 0 {port_versions => versions}/c-/cub.json | 0 {port_versions => versions}/c-/cuda.json | 0 {port_versions => versions}/c-/cudnn.json | 0 {port_versions => versions}/c-/cunit.json | 0 {port_versions => versions}/c-/curl.json | 0 {port_versions => versions}/c-/curlpp.json | 0 .../c-/cute-headers.json | 0 {port_versions => versions}/c-/cutelyst2.json | 0 {port_versions => versions}/c-/cwalk.json | 0 {port_versions => versions}/c-/cxxopts.json | 0 {port_versions => versions}/c-/czmq.json | 0 {port_versions => versions}/d-/d3dx12.json | 0 {port_versions => versions}/d-/darknet.json | 0 .../d-/darts-clone.json | 0 {port_versions => versions}/d-/dartsim.json | 0 {port_versions => versions}/d-/dataframe.json | 0 {port_versions => versions}/d-/date.json | 0 {port_versions => versions}/d-/dbg-macro.json | 0 {port_versions => versions}/d-/dbghelp.json | 0 {port_versions => versions}/d-/dbow2.json | 0 {port_versions => versions}/d-/dbow3.json | 0 {port_versions => versions}/d-/dcmtk.json | 0 .../d-/debug-assert.json | 0 .../d-/decimal-for-cpp.json | 0 {port_versions => versions}/d-/detours.json | 0 .../d-/devicenameresolver.json | 0 {port_versions => versions}/d-/devil.json | 0 {port_versions => versions}/d-/dimcli.json | 0 .../d-/directx-headers.json | 0 .../d-/directxmath.json | 0 .../d-/directxmesh.json | 0 .../d-/directxsdk.json | 0 .../d-/directxtex.json | 0 {port_versions => versions}/d-/directxtk.json | 0 .../d-/directxtk12.json | 0 {port_versions => versions}/d-/dirent.json | 0 .../d-/discord-game-sdk.json | 0 .../d-/discord-rpc.json | 0 {port_versions => versions}/d-/discount.json | 0 {port_versions => versions}/d-/distorm.json | 0 .../d-/dlfcn-win32.json | 0 {port_versions => versions}/d-/dlib.json | 0 {port_versions => versions}/d-/dmlc.json | 0 {port_versions => versions}/d-/docopt.json | 0 {port_versions => versions}/d-/doctest.json | 0 .../d-/double-conversion.json | 0 {port_versions => versions}/d-/dpdk.json | 0 {port_versions => versions}/d-/draco.json | 0 {port_versions => versions}/d-/drlibs.json | 0 {port_versions => versions}/d-/drogon.json | 0 {port_versions => versions}/d-/dtl.json | 0 {port_versions => versions}/d-/duckx.json | 0 {port_versions => versions}/d-/duilib.json | 0 {port_versions => versions}/d-/duktape.json | 0 {port_versions => versions}/d-/dx.json | 0 {port_versions => versions}/d-/dxut.json | 0 {port_versions => versions}/e-/eabase.json | 0 {port_versions => versions}/e-/eastl.json | 0 {port_versions => versions}/e-/easycl.json | 0 {port_versions => versions}/e-/easyhook.json | 0 .../e-/easyloggingpp.json | 0 {port_versions => versions}/e-/eathread.json | 0 {port_versions => versions}/e-/ebml.json | 0 {port_versions => versions}/e-/ecm.json | 0 {port_versions => versions}/e-/ecos.json | 0 {port_versions => versions}/e-/ecsutil.json | 0 {port_versions => versions}/e-/edlib.json | 0 .../e-/effolkronium-random.json | 0 {port_versions => versions}/e-/efsw.json | 0 .../e-/egl-registry.json | 0 {port_versions => versions}/e-/eigen3.json | 0 {port_versions => versions}/e-/elfio.json | 0 {port_versions => versions}/e-/elfutils.json | 0 {port_versions => versions}/e-/embree2.json | 0 {port_versions => versions}/e-/embree3.json | 0 {port_versions => versions}/e-/enet.json | 0 {port_versions => versions}/e-/ensmallen.json | 0 {port_versions => versions}/e-/entityx.json | 0 {port_versions => versions}/e-/entt.json | 0 {port_versions => versions}/e-/epsilon.json | 0 {port_versions => versions}/e-/esaxx.json | 0 {port_versions => versions}/e-/evpp.json | 0 {port_versions => versions}/e-/exiv2.json | 0 {port_versions => versions}/e-/expat.json | 0 .../e-/expected-lite.json | 0 {port_versions => versions}/e-/exprtk.json | 0 {port_versions => versions}/e-/ezc3d.json | 0 {port_versions => versions}/f-/faad2.json | 0 {port_versions => versions}/f-/fadbad.json | 0 {port_versions => versions}/f-/faiss.json | 0 {port_versions => versions}/f-/fann.json | 0 {port_versions => versions}/f-/farmhash.json | 0 .../f-/fast-cpp-csv-parser.json | 0 {port_versions => versions}/f-/fastcdr.json | 0 {port_versions => versions}/f-/fastcgi.json | 0 {port_versions => versions}/f-/fastfeat.json | 0 {port_versions => versions}/f-/fastlz.json | 0 {port_versions => versions}/f-/fastrtps.json | 0 {port_versions => versions}/f-/fbthrift.json | 0 {port_versions => versions}/f-/fcl.json | 0 {port_versions => versions}/f-/fdk-aac.json | 0 {port_versions => versions}/f-/fdlibm.json | 0 {port_versions => versions}/f-/ffmpeg.json | 0 {port_versions => versions}/f-/ffnvcodec.json | 0 {port_versions => versions}/f-/fftw3.json | 0 {port_versions => versions}/f-/fftwpp.json | 0 {port_versions => versions}/f-/field3d.json | 0 .../f-/fixed-string.json | 0 {port_versions => versions}/f-/fizz.json | 0 {port_versions => versions}/f-/flann.json | 0 .../f-/flashlight-cpu.json | 0 .../f-/flashlight-cuda.json | 0 .../f-/flatbuffers.json | 0 {port_versions => versions}/f-/flint.json | 0 {port_versions => versions}/f-/fltk.json | 0 {port_versions => versions}/f-/fluidlite.json | 0 .../f-/fluidsynth.json | 0 {port_versions => versions}/f-/fmem.json | 0 {port_versions => versions}/f-/fmi4cpp.json | 0 {port_versions => versions}/f-/fmilib.json | 0 {port_versions => versions}/f-/fmt.json | 0 {port_versions => versions}/f-/folly.json | 0 {port_versions => versions}/f-/font-chef.json | 0 .../f-/fontconfig.json | 0 .../f-/foonathan-memory.json | 0 {port_versions => versions}/f-/forest.json | 0 {port_versions => versions}/f-/forge.json | 0 {port_versions => versions}/f-/fplus.json | 0 {port_versions => versions}/f-/freeglut.json | 0 {port_versions => versions}/f-/freeimage.json | 0 {port_versions => versions}/f-/freeopcua.json | 0 {port_versions => versions}/f-/freerdp.json | 0 {port_versions => versions}/f-/freetds.json | 0 .../f-/freetype-gl.json | 0 {port_versions => versions}/f-/freetype.json | 0 {port_versions => versions}/f-/freexl.json | 0 {port_versions => versions}/f-/fribidi.json | 0 {port_versions => versions}/f-/frozen.json | 0 {port_versions => versions}/f-/fruit.json | 0 {port_versions => versions}/f-/ftgl.json | 0 {port_versions => versions}/f-/function2.json | 0 {port_versions => versions}/f-/fuzzylite.json | 0 {port_versions => versions}/g-/g2o.json | 0 {port_versions => versions}/g-/g3log.json | 0 {port_versions => versions}/g-/gainput.json | 0 .../g-/gamedev-framework.json | 0 {port_versions => versions}/g-/gamma.json | 0 {port_versions => versions}/g-/gasol.json | 0 .../g-/gaussianlib.json | 0 {port_versions => versions}/g-/gcem.json | 0 {port_versions => versions}/g-/gdal.json | 0 {port_versions => versions}/g-/gdcm.json | 0 {port_versions => versions}/g-/gdcm2.json | 0 .../g-/gdk-pixbuf.json | 0 {port_versions => versions}/g-/genann.json | 0 {port_versions => versions}/g-/geogram.json | 0 .../g-/geographiclib.json | 0 {port_versions => versions}/g-/geos.json | 0 {port_versions => versions}/g-/geotrans.json | 0 {port_versions => versions}/g-/getdns.json | 0 .../g-/getopt-win32.json | 0 {port_versions => versions}/g-/getopt.json | 0 {port_versions => versions}/g-/gettext.json | 0 .../g-/gettimeofday.json | 0 {port_versions => versions}/g-/gflags.json | 0 {port_versions => versions}/g-/gherkin-c.json | 0 {port_versions => versions}/g-/giflib.json | 0 {port_versions => versions}/g-/gl2ps.json | 0 {port_versions => versions}/g-/gl3w.json | 0 {port_versions => versions}/g-/glad.json | 0 {port_versions => versions}/g-/glbinding.json | 0 {port_versions => versions}/g-/glew.json | 0 {port_versions => versions}/g-/glfw3.json | 0 {port_versions => versions}/g-/gli.json | 0 {port_versions => versions}/g-/glib.json | 0 {port_versions => versions}/g-/glibmm.json | 0 {port_versions => versions}/g-/glm.json | 0 {port_versions => versions}/g-/globjects.json | 0 {port_versions => versions}/g-/glog.json | 0 {port_versions => versions}/g-/gloo.json | 0 {port_versions => versions}/g-/glslang.json | 0 {port_versions => versions}/g-/glui.json | 0 {port_versions => versions}/g-/gmime.json | 0 {port_versions => versions}/g-/gmmlib.json | 0 {port_versions => versions}/g-/gmp.json | 0 .../g-/google-cloud-cpp-common.json | 0 .../g-/google-cloud-cpp-spanner.json | 0 .../g-/google-cloud-cpp.json | 0 .../g-/googleapis.json | 0 {port_versions => versions}/g-/gperf.json | 0 .../g-/gperftools.json | 0 {port_versions => versions}/g-/gpgme.json | 0 {port_versions => versions}/g-/gppanel.json | 0 {port_versions => versions}/g-/graphene.json | 0 .../g-/graphicsmagick.json | 0 {port_versions => versions}/g-/graphite2.json | 0 .../g-/graphqlparser.json | 0 {port_versions => versions}/g-/greatest.json | 0 {port_versions => versions}/g-/grpc.json | 0 {port_versions => versions}/g-/grppi.json | 0 {port_versions => versions}/g-/gsl-lite.json | 0 {port_versions => versions}/g-/gsl.json | 0 {port_versions => versions}/g-/gsoap.json | 0 {port_versions => versions}/g-/gtest.json | 0 {port_versions => versions}/g-/gtk.json | 0 {port_versions => versions}/g-/gtkmm.json | 0 {port_versions => versions}/g-/gts.json | 0 {port_versions => versions}/g-/guetzli.json | 0 {port_versions => versions}/g-/gumbo.json | 0 {port_versions => versions}/g-/gzip-hpp.json | 0 {port_versions => versions}/h-/h3.json | 0 {port_versions => versions}/h-/h5py-lzf.json | 0 {port_versions => versions}/h-/halide.json | 0 {port_versions => versions}/h-/harfbuzz.json | 0 {port_versions => versions}/h-/hayai.json | 0 {port_versions => versions}/h-/hdf5.json | 0 {port_versions => versions}/h-/healpix.json | 0 {port_versions => versions}/h-/hedley.json | 0 {port_versions => versions}/h-/hffix.json | 0 {port_versions => versions}/h-/hfsm2.json | 0 {port_versions => versions}/h-/hidapi.json | 0 {port_versions => versions}/h-/highfive.json | 0 {port_versions => versions}/h-/hiredis.json | 0 {port_versions => versions}/h-/hpx.json | 0 .../h-/http-parser.json | 0 {port_versions => versions}/h-/hungarian.json | 0 {port_versions => versions}/h-/hunspell.json | 0 {port_versions => versions}/h-/hwloc.json | 0 {port_versions => versions}/h-/hyperscan.json | 0 {port_versions => versions}/h-/hypre.json | 0 {port_versions => versions}/i-/icu.json | 0 .../i-/ideviceinstaller.json | 0 .../i-/idevicerestore.json | 0 {port_versions => versions}/i-/if97.json | 0 {port_versions => versions}/i-/igloo.json | 0 .../i-/ignition-cmake0.json | 0 .../i-/ignition-cmake2.json | 0 .../i-/ignition-common1.json | 0 .../i-/ignition-common3.json | 0 .../i-/ignition-fuel-tools1.json | 0 .../i-/ignition-fuel-tools4.json | 0 .../i-/ignition-math4.json | 0 .../i-/ignition-math6.json | 0 .../i-/ignition-modularscripts.json | 0 .../i-/ignition-msgs1.json | 0 .../i-/ignition-msgs5.json | 0 .../i-/ignition-msgs6.json | 0 .../i-/ignition-plugin1.json | 0 .../i-/ignition-transport4.json | 0 .../i-/ignition-transport8.json | 0 .../i-/ignition-transport9.json | 0 .../i-/ijg-libjpeg.json | 0 {port_versions => versions}/i-/ilmbase.json | 0 .../i-/imgui-sfml.json | 0 {port_versions => versions}/i-/imgui.json | 0 {port_versions => versions}/i-/immer.json | 0 {port_versions => versions}/i-/implot.json | 0 .../i-/indicators.json | 0 {port_versions => versions}/i-/infoware.json | 0 {port_versions => versions}/i-/inih.json | 0 {port_versions => versions}/i-/iniparser.json | 0 {port_versions => versions}/i-/inja.json | 0 .../i-/intel-ipsec.json | 0 {port_versions => versions}/i-/intel-mkl.json | 0 .../i-/intelrdfpmathlib.json | 0 {port_versions => versions}/i-/io2d.json | 0 {port_versions => versions}/i-/irrlicht.json | 0 {port_versions => versions}/i-/irrxml.json | 0 {port_versions => versions}/i-/isal.json | 0 {port_versions => versions}/i-/ismrmrd.json | 0 {port_versions => versions}/i-/itk.json | 0 {port_versions => versions}/i-/itpp.json | 0 .../i-/ixwebsocket.json | 0 {port_versions => versions}/j-/jack2.json | 0 .../j-/jaeger-client-cpp.json | 0 {port_versions => versions}/j-/jansson.json | 0 {port_versions => versions}/j-/jasper.json | 0 {port_versions => versions}/j-/jbig2dec.json | 0 {port_versions => versions}/j-/jbigkit.json | 0 {port_versions => versions}/j-/jemalloc.json | 0 .../j-/jinja2cpplight.json | 0 .../j-/josuttis-jthread.json | 0 {port_versions => versions}/j-/jsmn.json | 0 {port_versions => versions}/j-/json-c.json | 0 {port_versions => versions}/j-/json-dto.json | 0 .../j-/json-schema-validator.json | 0 .../j-/json-spirit.json | 0 {port_versions => versions}/j-/json11.json | 0 .../j-/json5-parser.json | 0 {port_versions => versions}/j-/jsoncons.json | 0 {port_versions => versions}/j-/jsoncpp.json | 0 {port_versions => versions}/j-/jsonnet.json | 0 {port_versions => versions}/j-/jwt-cpp.json | 0 {port_versions => versions}/j-/jxrlib.json | 0 {port_versions => versions}/k-/kangaru.json | 0 {port_versions => versions}/k-/kcp.json | 0 {port_versions => versions}/k-/kd-soap.json | 0 {port_versions => versions}/k-/kealib.json | 0 {port_versions => versions}/k-/kenlm.json | 0 {port_versions => versions}/k-/keystone.json | 0 .../k-/kf5archive.json | 0 .../k-/kf5completion.json | 0 {port_versions => versions}/k-/kf5config.json | 0 .../k-/kf5coreaddons.json | 0 {port_versions => versions}/k-/kf5crash.json | 0 .../k-/kf5guiaddons.json | 0 .../k-/kf5holidays.json | 0 {port_versions => versions}/k-/kf5i18n.json | 0 .../k-/kf5itemmodels.json | 0 .../k-/kf5itemviews.json | 0 .../k-/kf5plotting.json | 0 .../k-/kf5syntaxhighlighting.json | 0 .../k-/kf5widgetsaddons.json | 0 .../k-/kf5windowsystem.json | 0 {port_versions => versions}/k-/kfr.json | 0 .../k-/kinectsdk1.json | 0 .../k-/kinectsdk2.json | 0 {port_versions => versions}/k-/kissfft.json | 0 {port_versions => versions}/k-/knet.json | 0 {port_versions => versions}/k-/krabsetw.json | 0 {port_versions => versions}/k-/ktx.json | 0 {port_versions => versions}/k-/kubazip.json | 0 {port_versions => versions}/k-/kuku.json | 0 .../k-/kvasir-mpl.json | 0 .../l-/lapack-reference.json | 0 {port_versions => versions}/l-/lapack.json | 0 {port_versions => versions}/l-/lastools.json | 0 {port_versions => versions}/l-/laszip.json | 0 .../l-/lazy-importer.json | 0 {port_versions => versions}/l-/lcm.json | 0 {port_versions => versions}/l-/lcms.json | 0 {port_versions => versions}/l-/leaf.json | 0 {port_versions => versions}/l-/lemon.json | 0 {port_versions => versions}/l-/leptonica.json | 0 {port_versions => versions}/l-/lerc.json | 0 {port_versions => versions}/l-/lest.json | 0 {port_versions => versions}/l-/leveldb.json | 0 {port_versions => versions}/l-/levmar.json | 0 {port_versions => versions}/l-/libaaplus.json | 0 {port_versions => versions}/l-/libaiff.json | 0 .../l-/libarchive.json | 0 {port_versions => versions}/l-/libass.json | 0 {port_versions => versions}/l-/libassuan.json | 0 {port_versions => versions}/l-/libb2.json | 0 {port_versions => versions}/l-/libbf.json | 0 {port_versions => versions}/l-/libbson.json | 0 {port_versions => versions}/l-/libcds.json | 0 {port_versions => versions}/l-/libcerf.json | 0 {port_versions => versions}/l-/libconfig.json | 0 .../l-/libconfuse.json | 0 {port_versions => versions}/l-/libcopp.json | 0 .../l-/libcrafter.json | 0 {port_versions => versions}/l-/libcroco.json | 0 {port_versions => versions}/l-/libcuckoo.json | 0 .../l-/libdatachannel.json | 0 {port_versions => versions}/l-/libdatrie.json | 0 {port_versions => versions}/l-/libde265.json | 0 {port_versions => versions}/l-/libdisasm.json | 0 {port_versions => versions}/l-/libdivide.json | 0 .../l-/libdshowcapture.json | 0 {port_versions => versions}/l-/libepoxy.json | 0 {port_versions => versions}/l-/libevent.json | 0 {port_versions => versions}/l-/libevhtp.json | 0 {port_versions => versions}/l-/libexif.json | 0 {port_versions => versions}/l-/libfabric.json | 0 {port_versions => versions}/l-/libffi.json | 0 {port_versions => versions}/l-/libflac.json | 0 {port_versions => versions}/l-/libfort.json | 0 .../l-/libfreenect2.json | 0 {port_versions => versions}/l-/libftdi.json | 0 {port_versions => versions}/l-/libftdi1.json | 0 {port_versions => versions}/l-/libgcrypt.json | 0 {port_versions => versions}/l-/libgd.json | 0 .../l-/libgeotiff.json | 0 {port_versions => versions}/l-/libgit2.json | 0 {port_versions => versions}/l-/libgo.json | 0 .../l-/libgpg-error.json | 0 {port_versions => versions}/l-/libgpod.json | 0 {port_versions => versions}/l-/libgta.json | 0 .../l-/libguarded.json | 0 {port_versions => versions}/l-/libharu.json | 0 {port_versions => versions}/l-/libhdfs3.json | 0 {port_versions => versions}/l-/libheif.json | 0 .../l-/libhsplasma.json | 0 .../l-/libhydrogen.json | 0 {port_versions => versions}/l-/libiconv.json | 0 {port_versions => versions}/l-/libics.json | 0 .../l-/libideviceactivation.json | 0 {port_versions => versions}/l-/libidn2.json | 0 {port_versions => versions}/l-/libigl.json | 0 {port_versions => versions}/l-/libilbc.json | 0 .../l-/libimobiledevice.json | 0 .../l-/libirecovery.json | 0 .../l-/libjpeg-turbo.json | 0 {port_versions => versions}/l-/libjuice.json | 0 {port_versions => versions}/l-/libkml.json | 0 {port_versions => versions}/l-/liblas.json | 0 {port_versions => versions}/l-/liblbfgs.json | 0 {port_versions => versions}/l-/liblemon.json | 0 {port_versions => versions}/l-/liblinear.json | 0 {port_versions => versions}/l-/liblo.json | 0 {port_versions => versions}/l-/liblsl.json | 0 {port_versions => versions}/l-/liblzma.json | 0 {port_versions => versions}/l-/libmad.json | 0 {port_versions => versions}/l-/libmagic.json | 0 .../l-/libmariadb.json | 0 .../l-/libmaxminddb.json | 0 .../l-/libmediainfo.json | 0 {port_versions => versions}/l-/libmesh.json | 0 .../l-/libmicrohttpd.json | 0 {port_versions => versions}/l-/libmikmod.json | 0 {port_versions => versions}/l-/libmodbus.json | 0 {port_versions => versions}/l-/libmodman.json | 0 .../l-/libmodplug.json | 0 {port_versions => versions}/l-/libmorton.json | 0 {port_versions => versions}/l-/libmpeg2.json | 0 {port_versions => versions}/l-/libmspack.json | 0 {port_versions => versions}/l-/libmupdf.json | 0 {port_versions => versions}/l-/libmysql.json | 0 {port_versions => versions}/l-/libnice.json | 0 {port_versions => versions}/l-/libnoise.json | 0 .../l-/libodb-boost.json | 0 .../l-/libodb-mysql.json | 0 .../l-/libodb-pgsql.json | 0 .../l-/libodb-sqlite.json | 0 {port_versions => versions}/l-/libodb.json | 0 {port_versions => versions}/l-/libogg.json | 0 .../l-/libopenmpt.json | 0 .../l-/libopusenc.json | 0 {port_versions => versions}/l-/libosip2.json | 0 {port_versions => versions}/l-/libosmium.json | 0 .../l-/libosmscout.json | 0 .../l-/libp7-baical.json | 0 .../l-/libp7client.json | 0 {port_versions => versions}/l-/libpcap.json | 0 {port_versions => versions}/l-/libpff.json | 0 {port_versions => versions}/l-/libplist.json | 0 .../l-/libpmemobj-cpp.json | 0 {port_versions => versions}/l-/libpng.json | 0 {port_versions => versions}/l-/libpopt.json | 0 {port_versions => versions}/l-/libpq.json | 0 {port_versions => versions}/l-/libpqxx.json | 0 .../l-/libprotobuf-mutator.json | 0 {port_versions => versions}/l-/libproxy.json | 0 {port_versions => versions}/l-/libqcow.json | 0 .../l-/libqglviewer.json | 0 .../l-/libqrencode.json | 0 .../l-/librabbitmq.json | 0 {port_versions => versions}/l-/libraqm.json | 0 {port_versions => versions}/l-/libraw.json | 0 .../l-/librdkafka.json | 0 {port_versions => versions}/l-/libressl.json | 0 {port_versions => versions}/l-/librsvg.json | 0 {port_versions => versions}/l-/librsync.json | 0 {port_versions => versions}/l-/librtmp.json | 0 {port_versions => versions}/l-/librttopo.json | 0 .../l-/libsamplerate.json | 0 {port_versions => versions}/l-/libsass.json | 0 {port_versions => versions}/l-/libsbml.json | 0 .../l-/libsigcpp-3.json | 0 {port_versions => versions}/l-/libsigcpp.json | 0 .../l-/libsndfile.json | 0 {port_versions => versions}/l-/libsodium.json | 0 .../l-/libsoundio.json | 0 .../l-/libspatialindex.json | 0 .../l-/libspatialite.json | 0 {port_versions => versions}/l-/libspnav.json | 0 {port_versions => versions}/l-/libsquish.json | 0 {port_versions => versions}/l-/libsrt.json | 0 {port_versions => versions}/l-/libsrtp.json | 0 {port_versions => versions}/l-/libssh.json | 0 {port_versions => versions}/l-/libssh2.json | 0 .../l-/libstemmer.json | 0 {port_versions => versions}/l-/libstk.json | 0 {port_versions => versions}/l-/libsvm.json | 0 {port_versions => versions}/l-/libtheora.json | 0 {port_versions => versions}/l-/libtins.json | 0 .../l-/libtomcrypt.json | 0 .../l-/libtommath.json | 0 .../l-/libtorrent.json | 0 .../l-/libu2f-server.json | 0 {port_versions => versions}/l-/libudis86.json | 0 {port_versions => versions}/l-/libudns.json | 0 {port_versions => versions}/l-/libui.json | 0 .../l-/libunibreak.json | 0 .../l-/libusb-win32.json | 0 {port_versions => versions}/l-/libusb.json | 0 .../l-/libusbmuxd.json | 0 {port_versions => versions}/l-/libuuid.json | 0 {port_versions => versions}/l-/libuv.json | 0 {port_versions => versions}/l-/libvmdk.json | 0 {port_versions => versions}/l-/libvorbis.json | 0 {port_versions => versions}/l-/libvpx.json | 0 {port_versions => versions}/l-/libwandio.json | 0 {port_versions => versions}/l-/libwebm.json | 0 {port_versions => versions}/l-/libwebp.json | 0 .../l-/libwebsockets.json | 0 {port_versions => versions}/l-/libxdiff.json | 0 .../l-/libxlsxwriter.json | 0 {port_versions => versions}/l-/libxml2.json | 0 {port_versions => versions}/l-/libxmlmm.json | 0 {port_versions => versions}/l-/libxmlpp.json | 0 .../l-/libxmp-lite.json | 0 {port_versions => versions}/l-/libxslt.json | 0 {port_versions => versions}/l-/libyaml.json | 0 {port_versions => versions}/l-/libyuv.json | 0 {port_versions => versions}/l-/libzen.json | 0 {port_versions => versions}/l-/libzip.json | 0 {port_versions => versions}/l-/libzippp.json | 0 {port_versions => versions}/l-/licensepp.json | 0 {port_versions => versions}/l-/lilv.json | 0 {port_versions => versions}/l-/linalg.json | 0 .../l-/linenoise-ng.json | 0 {port_versions => versions}/l-/live555.json | 0 {port_versions => versions}/l-/llgl.json | 0 {port_versions => versions}/l-/llvm.json | 0 {port_versions => versions}/l-/lmdb.json | 0 {port_versions => versions}/l-/lodepng.json | 0 {port_versions => versions}/l-/log4cplus.json | 0 {port_versions => versions}/l-/log4cpp.json | 0 {port_versions => versions}/l-/log4cxx.json | 0 {port_versions => versions}/l-/loguru.json | 0 {port_versions => versions}/l-/lpeg.json | 0 {port_versions => versions}/l-/lua.json | 0 {port_versions => versions}/l-/luabridge.json | 0 .../l-/luafilesystem.json | 0 {port_versions => versions}/l-/luajit.json | 0 {port_versions => versions}/l-/luasocket.json | 0 {port_versions => versions}/l-/lv2.json | 0 {port_versions => versions}/l-/lz4.json | 0 {port_versions => versions}/l-/lzfse.json | 0 {port_versions => versions}/l-/lzo.json | 0 {port_versions => versions}/l-/lzokay.json | 0 .../m-/magic-enum.json | 0 {port_versions => versions}/m-/magic-get.json | 0 .../m-/magnum-extras.json | 0 .../m-/magnum-integration.json | 0 .../m-/magnum-plugins.json | 0 {port_versions => versions}/m-/magnum.json | 0 .../m-/mapbox-variant.json | 0 {port_versions => versions}/m-/marble.json | 0 {port_versions => versions}/m-/marl.json | 0 {port_versions => versions}/m-/mathc.json | 0 {port_versions => versions}/m-/mathgl.json | 0 {port_versions => versions}/m-/matio.json | 0 .../m-/matplotlib-cpp.json | 0 {port_versions => versions}/m-/matroska.json | 0 {port_versions => versions}/m-/mbedtls.json | 0 {port_versions => versions}/m-/mcpp.json | 0 {port_versions => versions}/m-/mdns.json | 0 .../m-/mdnsresponder.json | 0 {port_versions => versions}/m-/mecab.json | 0 .../m-/memorymodule.json | 0 {port_versions => versions}/m-/mesa.json | 0 {port_versions => versions}/m-/meschach.json | 0 .../m-/meshoptimizer.json | 0 {port_versions => versions}/m-/metis.json | 0 {port_versions => versions}/m-/metrohash.json | 0 {port_versions => versions}/m-/mgnlibs.json | 0 {port_versions => versions}/m-/mhook.json | 0 .../m-/microsoft-signalr.json | 0 .../m-/mikktspace.json | 0 .../m-/milerius-sfml-imgui.json | 0 {port_versions => versions}/m-/mimalloc.json | 0 {port_versions => versions}/m-/minc.json | 0 {port_versions => versions}/m-/minhook.json | 0 {port_versions => versions}/m-/minifb.json | 0 {port_versions => versions}/m-/minimp3.json | 0 .../m-/minisat-master-keying.json | 0 {port_versions => versions}/m-/minitrace.json | 0 {port_versions => versions}/m-/miniupnpc.json | 0 {port_versions => versions}/m-/miniz.json | 0 {port_versions => versions}/m-/minizip.json | 0 {port_versions => versions}/m-/mio.json | 0 {port_versions => versions}/m-/mlpack.json | 0 {port_versions => versions}/m-/mman.json | 0 {port_versions => versions}/m-/mmloader.json | 0 {port_versions => versions}/m-/mmx.json | 0 .../m-/modp-base64.json | 0 .../m-/mongo-c-driver.json | 0 .../m-/mongo-cxx-driver.json | 0 {port_versions => versions}/m-/mongoose.json | 0 .../m-/monkeys-audio.json | 0 {port_versions => versions}/m-/moos-core.json | 0 .../m-/moos-essential.json | 0 {port_versions => versions}/m-/moos-ui.json | 0 {port_versions => versions}/m-/morton-nd.json | 0 {port_versions => versions}/m-/mosquitto.json | 0 {port_versions => versions}/m-/mozjpeg.json | 0 {port_versions => versions}/m-/mp-units.json | 0 {port_versions => versions}/m-/mp3lame.json | 0 .../m-/mpark-variant.json | 0 {port_versions => versions}/m-/mpfr.json | 0 {port_versions => versions}/m-/mpg123.json | 0 {port_versions => versions}/m-/mpi.json | 0 {port_versions => versions}/m-/mpir.json | 0 {port_versions => versions}/m-/mpmcqueue.json | 0 {port_versions => versions}/m-/mqtt-cpp.json | 0 {port_versions => versions}/m-/ms-angle.json | 0 {port_versions => versions}/m-/ms-gsl.json | 0 {port_versions => versions}/m-/msdfgen.json | 0 {port_versions => versions}/m-/msgpack.json | 0 {port_versions => versions}/m-/msgpack11.json | 0 .../m-/msinttypes.json | 0 {port_versions => versions}/m-/msix.json | 0 {port_versions => versions}/m-/msmpi.json | 0 {port_versions => versions}/m-/mstch.json | 0 {port_versions => versions}/m-/mujs.json | 0 {port_versions => versions}/m-/munit.json | 0 {port_versions => versions}/m-/muparser.json | 0 .../m-/murmurhash.json | 0 {port_versions => versions}/m-/mygui.json | 0 {port_versions => versions}/n-/nameof.json | 0 {port_versions => versions}/n-/nana.json | 0 .../n-/nano-signal-slot.json | 0 {port_versions => versions}/n-/nanobench.json | 0 {port_versions => versions}/n-/nanodbc.json | 0 {port_versions => versions}/n-/nanoflann.json | 0 {port_versions => versions}/n-/nanogui.json | 0 {port_versions => versions}/n-/nanomsg.json | 0 {port_versions => versions}/n-/nanopb.json | 0 .../n-/nanoprintf.json | 0 {port_versions => versions}/n-/nanorange.json | 0 {port_versions => versions}/n-/nanort.json | 0 {port_versions => versions}/n-/nanovg.json | 0 .../n-/nativefiledialog.json | 0 {port_versions => versions}/n-/nccl.json | 0 .../n-/neargye-semver.json | 0 {port_versions => versions}/n-/netcdf-c.json | 0 .../n-/netcdf-cxx4.json | 0 {port_versions => versions}/n-/nethost.json | 0 {port_versions => versions}/n-/nettle.json | 0 .../n-/networkdirect-sdk.json | 0 {port_versions => versions}/n-/nghttp2.json | 0 {port_versions => versions}/n-/ngspice.json | 0 {port_versions => versions}/n-/nifticlib.json | 0 .../n-/nlohmann-fifo-map.json | 0 .../n-/nlohmann-json.json | 0 {port_versions => versions}/n-/nlopt.json | 0 {port_versions => versions}/n-/nmap.json | 0 {port_versions => versions}/n-/nmslib.json | 0 {port_versions => versions}/n-/nng.json | 0 {port_versions => versions}/n-/nngpp.json | 0 {port_versions => versions}/n-/nonius.json | 0 {port_versions => versions}/n-/nowide.json | 0 .../n-/nrf-ble-driver.json | 0 .../n-/nt-wrapper.json | 0 {port_versions => versions}/n-/nuklear.json | 0 {port_versions => versions}/n-/numactl.json | 0 {port_versions => versions}/n-/numcpp.json | 0 {port_versions => versions}/n-/nuspell.json | 0 {port_versions => versions}/n-/nvtt.json | 0 .../o-/oatpp-consul.json | 0 .../o-/oatpp-curl.json | 0 .../o-/oatpp-libressl.json | 0 .../o-/oatpp-mbedtls.json | 0 .../o-/oatpp-mongo.json | 0 .../o-/oatpp-postgresql.json | 0 .../o-/oatpp-sqlite.json | 0 .../o-/oatpp-swagger.json | 0 .../o-/oatpp-websocket.json | 0 .../o-/oatpp-zlib.json | 0 {port_versions => versions}/o-/oatpp.json | 0 .../o-/observer-ptr-lite.json | 0 {port_versions => versions}/o-/ocilib.json | 0 {port_versions => versions}/o-/octomap.json | 0 {port_versions => versions}/o-/ode.json | 0 .../o-/offscale-libetcd-cpp.json | 0 {port_versions => versions}/o-/ogdf.json | 0 {port_versions => versions}/o-/ogre-next.json | 0 {port_versions => versions}/o-/ogre.json | 0 {port_versions => versions}/o-/ois.json | 0 {port_versions => versions}/o-/ompl.json | 0 {port_versions => versions}/o-/onednn.json | 0 {port_versions => versions}/o-/oniguruma.json | 0 .../o-/onnxruntime-gpu.json | 0 {port_versions => versions}/o-/open62541.json | 0 .../o-/openal-soft.json | 0 {port_versions => versions}/o-/openblas.json | 0 .../o-/opencascade.json | 0 {port_versions => versions}/o-/opencc.json | 0 .../o-/opencensus-cpp.json | 0 {port_versions => versions}/o-/opencl.json | 0 .../o-/opencolorio-tools.json | 0 .../o-/opencolorio.json | 0 {port_versions => versions}/o-/opencsg.json | 0 {port_versions => versions}/o-/opencv.json | 0 {port_versions => versions}/o-/opencv2.json | 0 {port_versions => versions}/o-/opencv3.json | 0 {port_versions => versions}/o-/opencv4.json | 0 {port_versions => versions}/o-/opendnp3.json | 0 {port_versions => versions}/o-/openexr.json | 0 .../o-/opengl-registry.json | 0 {port_versions => versions}/o-/opengl.json | 0 .../o-/openigtlink.json | 0 .../o-/openimageio.json | 0 {port_versions => versions}/o-/openjpeg.json | 0 {port_versions => versions}/o-/openmama.json | 0 {port_versions => versions}/o-/openmesh.json | 0 {port_versions => versions}/o-/openmpi.json | 0 {port_versions => versions}/o-/openmvg.json | 0 {port_versions => versions}/o-/openmvs.json | 0 {port_versions => versions}/o-/openni2.json | 0 {port_versions => versions}/o-/openscap.json | 0 .../o-/openssl-unix.json | 0 .../o-/openssl-uwp.json | 0 .../o-/openssl-windows.json | 0 {port_versions => versions}/o-/openssl.json | 0 .../o-/opensubdiv.json | 0 .../o-/opentracing.json | 0 {port_versions => versions}/o-/openvdb.json | 0 {port_versions => versions}/o-/openvpn3.json | 0 {port_versions => versions}/o-/openvr.json | 0 .../o-/openxr-loader.json | 0 .../o-/optional-bare.json | 0 .../o-/optional-lite.json | 0 {port_versions => versions}/o-/opus.json | 0 {port_versions => versions}/o-/opusfile.json | 0 {port_versions => versions}/o-/orc.json | 0 .../o-/orocos-kdl.json | 0 {port_versions => versions}/o-/osg-qt.json | 0 {port_versions => versions}/o-/osg.json | 0 {port_versions => versions}/o-/osgearth.json | 0 {port_versions => versions}/o-/osi.json | 0 {port_versions => versions}/o-/otl.json | 0 {port_versions => versions}/o-/outcome.json | 0 .../p-/p-ranav-csv.json | 0 .../p-/p-ranav-csv2.json | 0 {port_versions => versions}/p-/pagmo2.json | 0 {port_versions => versions}/p-/paho-mqtt.json | 0 .../p-/paho-mqttpp3.json | 0 .../p-/palsigslot.json | 0 {port_versions => versions}/p-/pango.json | 0 {port_versions => versions}/p-/pangolin.json | 0 {port_versions => versions}/p-/pangomm.json | 0 .../p-/parallel-hashmap.json | 0 .../p-/parallelstl.json | 0 {port_versions => versions}/p-/paraview.json | 0 {port_versions => versions}/p-/parmetis.json | 0 {port_versions => versions}/p-/parquet.json | 0 {port_versions => versions}/p-/parson.json | 0 {port_versions => versions}/p-/pbc.json | 0 {port_versions => versions}/p-/pcg.json | 0 {port_versions => versions}/p-/pcl.json | 0 {port_versions => versions}/p-/pcre.json | 0 {port_versions => versions}/p-/pcre2.json | 0 {port_versions => versions}/p-/pdal-c.json | 0 {port_versions => versions}/p-/pdal.json | 0 {port_versions => versions}/p-/pdcurses.json | 0 {port_versions => versions}/p-/pdqsort.json | 0 {port_versions => versions}/p-/pe-parse.json | 0 {port_versions => versions}/p-/pegtl-2.json | 0 {port_versions => versions}/p-/pegtl.json | 0 {port_versions => versions}/p-/pfring.json | 0 .../p-/pfultz2-linq.json | 0 {port_versions => versions}/p-/phnt.json | 0 {port_versions => versions}/p-/physfs.json | 0 {port_versions => versions}/p-/physx.json | 0 {port_versions => versions}/p-/picojson.json | 0 {port_versions => versions}/p-/picosha2.json | 0 {port_versions => versions}/p-/piex.json | 0 {port_versions => versions}/p-/pistache.json | 0 {port_versions => versions}/p-/pixel.json | 0 {port_versions => versions}/p-/pixman.json | 0 .../p-/platform-folders.json | 0 .../p-/plf-colony.json | 0 {port_versions => versions}/p-/plf-list.json | 0 .../p-/plf-nanotimer.json | 0 {port_versions => versions}/p-/plf-stack.json | 0 {port_versions => versions}/p-/plib.json | 0 {port_versions => versions}/p-/plibsys.json | 0 {port_versions => versions}/p-/plog.json | 0 {port_versions => versions}/p-/plplot.json | 0 {port_versions => versions}/p-/plustache.json | 0 {port_versions => versions}/p-/pmdk.json | 0 {port_versions => versions}/p-/pngpp.json | 0 {port_versions => versions}/p-/pngwriter.json | 0 {port_versions => versions}/p-/poco.json | 0 {port_versions => versions}/p-/podofo.json | 0 {port_versions => versions}/p-/poly2tri.json | 0 .../p-/polyclipping.json | 0 {port_versions => versions}/p-/polyhook2.json | 0 .../p-/polymorphic-value.json | 0 {port_versions => versions}/p-/ponder.json | 0 {port_versions => versions}/p-/poppler.json | 0 .../p-/portable-snippets.json | 0 {port_versions => versions}/p-/portaudio.json | 0 {port_versions => versions}/p-/portmidi.json | 0 {port_versions => versions}/p-/ppconsul.json | 0 {port_versions => versions}/p-/ppmagic.json | 0 {port_versions => versions}/p-/pprint.json | 0 {port_versions => versions}/p-/pqp.json | 0 {port_versions => versions}/p-/proj.json | 0 {port_versions => versions}/p-/proj4.json | 0 .../p-/prometheus-cpp.json | 0 .../p-/protobuf-c.json | 0 {port_versions => versions}/p-/protobuf.json | 0 {port_versions => versions}/p-/protopuf.json | 0 {port_versions => versions}/p-/protozero.json | 0 {port_versions => versions}/p-/proxygen.json | 0 .../p-/proxywrapper.json | 0 {port_versions => versions}/p-/ptex.json | 0 {port_versions => versions}/p-/pthread.json | 0 {port_versions => versions}/p-/pthreads.json | 0 {port_versions => versions}/p-/pugixml.json | 0 {port_versions => versions}/p-/pybind11.json | 0 {port_versions => versions}/p-/pystring.json | 0 {port_versions => versions}/p-/python2.json | 0 {port_versions => versions}/p-/python3.json | 0 {port_versions => versions}/q-/qca.json | 0 .../q-/qcustomplot.json | 0 {port_versions => versions}/q-/qhull.json | 0 .../q-/qpid-proton.json | 0 .../q-/qscintilla.json | 0 .../q-/qt-advanced-docking-system.json | 0 {port_versions => versions}/q-/qt5-3d.json | 0 .../q-/qt5-activeqt.json | 0 .../q-/qt5-androidextras.json | 0 {port_versions => versions}/q-/qt5-base.json | 0 .../q-/qt5-canvas3d.json | 0 .../q-/qt5-charts.json | 0 .../q-/qt5-connectivity.json | 0 .../q-/qt5-datavis3d.json | 0 .../q-/qt5-declarative.json | 0 {port_versions => versions}/q-/qt5-doc.json | 0 .../q-/qt5-gamepad.json | 0 .../q-/qt5-graphicaleffects.json | 0 .../q-/qt5-imageformats.json | 0 .../q-/qt5-location.json | 0 .../q-/qt5-macextras.json | 0 .../q-/qt5-modularscripts.json | 0 {port_versions => versions}/q-/qt5-mqtt.json | 0 .../q-/qt5-multimedia.json | 0 .../q-/qt5-networkauth.json | 0 .../q-/qt5-purchasing.json | 0 .../q-/qt5-quickcontrols.json | 0 .../q-/qt5-quickcontrols2.json | 0 .../q-/qt5-remoteobjects.json | 0 .../q-/qt5-script.json | 0 {port_versions => versions}/q-/qt5-scxml.json | 0 .../q-/qt5-sensors.json | 0 .../q-/qt5-serialbus.json | 0 .../q-/qt5-serialport.json | 0 .../q-/qt5-speech.json | 0 {port_versions => versions}/q-/qt5-svg.json | 0 {port_versions => versions}/q-/qt5-tools.json | 0 .../q-/qt5-translations.json | 0 .../q-/qt5-virtualkeyboard.json | 0 .../q-/qt5-wayland.json | 0 .../q-/qt5-webchannel.json | 0 .../q-/qt5-webengine.json | 0 .../q-/qt5-webglplugin.json | 0 .../q-/qt5-websockets.json | 0 .../q-/qt5-webview.json | 0 .../q-/qt5-winextras.json | 0 .../q-/qt5-x11extras.json | 0 .../q-/qt5-xmlpatterns.json | 0 {port_versions => versions}/q-/qt5.json | 0 .../q-/qtkeychain.json | 0 {port_versions => versions}/q-/quadtree.json | 0 {port_versions => versions}/q-/quantlib.json | 0 .../q-/quaternions.json | 0 {port_versions => versions}/q-/quazip.json | 0 {port_versions => versions}/q-/quickfast.json | 0 {port_versions => versions}/q-/quickfix.json | 0 {port_versions => versions}/q-/quill.json | 0 {port_versions => versions}/q-/quirc.json | 0 {port_versions => versions}/q-/qwt.json | 0 {port_versions => versions}/q-/qwtw.json | 0 {port_versions => versions}/r-/rabit.json | 0 {port_versions => versions}/r-/ragel.json | 0 {port_versions => versions}/r-/rang.json | 0 .../r-/range-v3-vs2015.json | 0 {port_versions => versions}/r-/range-v3.json | 0 .../r-/rapidcheck.json | 0 {port_versions => versions}/r-/rapidjson.json | 0 .../r-/rapidxml-ns.json | 0 {port_versions => versions}/r-/rapidxml.json | 0 {port_versions => versions}/r-/rappture.json | 0 {port_versions => versions}/r-/raylib.json | 0 {port_versions => versions}/r-/rbdl.json | 0 {port_versions => versions}/r-/re2.json | 0 .../r-/readerwriterqueue.json | 0 .../r-/readline-win32.json | 0 {port_versions => versions}/r-/readline.json | 0 {port_versions => versions}/r-/readosm.json | 0 .../r-/realsense2.json | 0 {port_versions => versions}/r-/recast.json | 0 .../r-/redis-plus-plus.json | 0 {port_versions => versions}/r-/refl-cpp.json | 0 .../r-/refprop-headers.json | 0 {port_versions => versions}/r-/replxx.json | 0 {port_versions => versions}/r-/reproc.json | 0 {port_versions => versions}/r-/rest-rpc.json | 0 {port_versions => versions}/r-/restbed.json | 0 .../r-/restclient-cpp.json | 0 {port_versions => versions}/r-/restinio.json | 0 {port_versions => versions}/r-/rhash.json | 0 {port_versions => versions}/r-/riffcpp.json | 0 .../r-/ring-span-lite.json | 0 {port_versions => versions}/r-/roaring.json | 0 .../r-/robin-hood-hashing.json | 0 {port_versions => versions}/r-/robin-map.json | 0 {port_versions => versions}/r-/rocksdb.json | 0 {port_versions => versions}/r-/rpclib.json | 0 {port_versions => versions}/r-/rply.json | 0 .../r-/rs-core-lib.json | 0 {port_versions => versions}/r-/rsocket.json | 0 {port_versions => versions}/r-/rtabmap.json | 0 {port_versions => versions}/r-/rtaudio.json | 0 {port_versions => versions}/r-/rtlsdr.json | 0 {port_versions => versions}/r-/rtmidi.json | 0 {port_versions => versions}/r-/rttr.json | 0 {port_versions => versions}/r-/rxcpp.json | 0 {port_versions => versions}/r-/rxqt.json | 0 {port_versions => versions}/r-/rxspencer.json | 0 {port_versions => versions}/r-/ryml.json | 0 {port_versions => versions}/r-/ryu.json | 0 {port_versions => versions}/s-/safeint.json | 0 {port_versions => versions}/s-/sail.json | 0 {port_versions => versions}/s-/sais.json | 0 {port_versions => versions}/s-/sajson.json | 0 {port_versions => versions}/s-/sassc.json | 0 {port_versions => versions}/s-/scintilla.json | 0 {port_versions => versions}/s-/sciter.json | 0 {port_versions => versions}/s-/scnlib.json | 0 .../s-/scylla-wrapper.json | 0 .../s-/sdformat10.json | 0 {port_versions => versions}/s-/sdformat6.json | 0 {port_versions => versions}/s-/sdformat9.json | 0 {port_versions => versions}/s-/sdl1-net.json | 0 {port_versions => versions}/s-/sdl1.json | 0 {port_versions => versions}/s-/sdl2-gfx.json | 0 .../s-/sdl2-image.json | 0 .../s-/sdl2-mixer.json | 0 {port_versions => versions}/s-/sdl2-net.json | 0 {port_versions => versions}/s-/sdl2-ttf.json | 0 {port_versions => versions}/s-/sdl2.json | 0 {port_versions => versions}/s-/sdl2pp.json | 0 {port_versions => versions}/s-/seal.json | 0 {port_versions => versions}/s-/secp256k1.json | 0 {port_versions => versions}/s-/selene.json | 0 .../s-/sentencepiece.json | 0 .../s-/sentry-native.json | 0 {port_versions => versions}/s-/septag-sx.json | 0 {port_versions => versions}/s-/seqan.json | 0 {port_versions => versions}/s-/serd.json | 0 {port_versions => versions}/s-/sf2cute.json | 0 {port_versions => versions}/s-/sfgui.json | 0 {port_versions => versions}/s-/sfml.json | 0 {port_versions => versions}/s-/sfsexp.json | 0 {port_versions => versions}/s-/shaderc.json | 0 .../s-/shaderwriter.json | 0 {port_versions => versions}/s-/shapelib.json | 0 .../s-/shiva-sfml.json | 0 {port_versions => versions}/s-/shiva.json | 0 {port_versions => versions}/s-/shogun.json | 0 .../s-/signalrclient.json | 0 {port_versions => versions}/s-/sigslot.json | 0 {port_versions => versions}/s-/simage.json | 0 {port_versions => versions}/s-/simde.json | 0 {port_versions => versions}/s-/simdjson.json | 0 .../s-/simple-fft.json | 0 {port_versions => versions}/s-/simpleini.json | 0 {port_versions => versions}/s-/skia.json | 0 {port_versions => versions}/s-/skyr-url.json | 0 {port_versions => versions}/s-/slikenet.json | 0 {port_versions => versions}/s-/sltbench.json | 0 {port_versions => versions}/s-/smpeg2.json | 0 {port_versions => versions}/s-/snappy.json | 0 {port_versions => versions}/s-/sndfile.json | 0 {port_versions => versions}/s-/snowhouse.json | 0 {port_versions => versions}/s-/so5extra.json | 0 .../s-/sobjectizer.json | 0 {port_versions => versions}/s-/soci.json | 0 .../s-/socket-io-client.json | 0 {port_versions => versions}/s-/sockpp.json | 0 {port_versions => versions}/s-/soem.json | 0 {port_versions => versions}/s-/soil.json | 0 {port_versions => versions}/s-/soil2.json | 0 {port_versions => versions}/s-/sokol.json | 0 {port_versions => versions}/s-/sol2.json | 0 {port_versions => versions}/s-/solid3.json | 0 {port_versions => versions}/s-/sophus.json | 0 {port_versions => versions}/s-/soqt.json | 0 {port_versions => versions}/s-/sord.json | 0 .../s-/soundtouch.json | 0 {port_versions => versions}/s-/soxr.json | 0 {port_versions => versions}/s-/spaceland.json | 0 {port_versions => versions}/s-/span-lite.json | 0 .../s-/sparsehash.json | 0 {port_versions => versions}/s-/sparsepp.json | 0 .../s-/spatialite-tools.json | 0 {port_versions => versions}/s-/spdk-dpdk.json | 0 .../s-/spdk-ipsec.json | 0 {port_versions => versions}/s-/spdk-isal.json | 0 {port_versions => versions}/s-/spdk.json | 0 {port_versions => versions}/s-/spdlog.json | 0 {port_versions => versions}/s-/spectra.json | 0 {port_versions => versions}/s-/speex.json | 0 {port_versions => versions}/s-/speexdsp.json | 0 {port_versions => versions}/s-/spirit-po.json | 0 .../s-/spirv-cross.json | 0 .../s-/spirv-headers.json | 0 .../s-/spirv-tools.json | 0 {port_versions => versions}/s-/sprout.json | 0 {port_versions => versions}/s-/spscqueue.json | 0 {port_versions => versions}/s-/sqlcipher.json | 0 .../s-/sqlite-modern-cpp.json | 0 .../s-/sqlite-orm.json | 0 {port_versions => versions}/s-/sqlite3.json | 0 {port_versions => versions}/s-/sqlitecpp.json | 0 .../s-/sqlpp11-connector-mysql.json | 0 .../s-/sqlpp11-connector-sqlite3.json | 0 {port_versions => versions}/s-/sqlpp11.json | 0 {port_versions => versions}/s-/sratom.json | 0 .../s-/status-value-lite.json | 0 {port_versions => versions}/s-/stb.json | 0 {port_versions => versions}/s-/stlab.json | 0 {port_versions => versions}/s-/stormlib.json | 0 .../s-/strict-variant.json | 0 .../s-/string-theory.json | 0 .../s-/string-view-lite.json | 0 {port_versions => versions}/s-/strtk.json | 0 {port_versions => versions}/s-/stx.json | 0 {port_versions => versions}/s-/stxxl.json | 0 .../s-/suitesparse.json | 0 {port_versions => versions}/s-/sundials.json | 0 {port_versions => versions}/s-/superlu.json | 0 {port_versions => versions}/s-/symengine.json | 0 {port_versions => versions}/s-/systemc.json | 0 {port_versions => versions}/s-/szip.json | 0 {port_versions => versions}/t-/tabulate.json | 0 {port_versions => versions}/t-/tacopie.json | 0 {port_versions => versions}/t-/taglib.json | 0 .../t-/taocpp-json.json | 0 .../t-/tap-windows6.json | 0 {port_versions => versions}/t-/taskflow.json | 0 {port_versions => versions}/t-/tbb.json | 0 {port_versions => versions}/t-/tcl.json | 0 {port_versions => versions}/t-/tclap.json | 0 {port_versions => versions}/t-/teemo.json | 0 {port_versions => versions}/t-/telnetpp.json | 0 .../t-/tensorflow-cc.json | 0 .../t-/tensorflow-common.json | 0 .../t-/tensorflow.json | 0 {port_versions => versions}/t-/termcolor.json | 0 {port_versions => versions}/t-/tesseract.json | 0 {port_versions => versions}/t-/tfhe.json | 0 {port_versions => versions}/t-/tgbot-cpp.json | 0 {port_versions => versions}/t-/tgc.json | 0 {port_versions => versions}/t-/tgui.json | 0 {port_versions => versions}/t-/theia.json | 0 .../t-/think-cell-range.json | 0 {port_versions => versions}/t-/thor.json | 0 .../t-/threadpool.json | 0 {port_versions => versions}/t-/thrift.json | 0 .../t-/tidy-html5.json | 0 {port_versions => versions}/t-/tiff.json | 0 .../t-/tinkerforge.json | 0 .../t-/tiny-aes-c.json | 0 .../t-/tiny-bignum-c.json | 0 {port_versions => versions}/t-/tiny-dnn.json | 0 .../t-/tiny-process-library.json | 0 .../t-/tiny-regex-c.json | 0 .../t-/tinycthread.json | 0 {port_versions => versions}/t-/tinydir.json | 0 {port_versions => versions}/t-/tinyexif.json | 0 {port_versions => versions}/t-/tinyexpr.json | 0 {port_versions => versions}/t-/tinyexr.json | 0 .../t-/tinyfiledialogs.json | 0 {port_versions => versions}/t-/tinygltf.json | 0 {port_versions => versions}/t-/tinynpy.json | 0 .../t-/tinyobjloader.json | 0 {port_versions => versions}/t-/tinyply.json | 0 .../t-/tinyspline.json | 0 .../t-/tinythread.json | 0 {port_versions => versions}/t-/tinytoml.json | 0 {port_versions => versions}/t-/tinyutf8.json | 0 {port_versions => versions}/t-/tinyxml.json | 0 {port_versions => versions}/t-/tinyxml2.json | 0 .../t-/tl-expected.json | 0 .../t-/tl-function-ref.json | 0 .../t-/tl-optional.json | 0 {port_versions => versions}/t-/tlx.json | 0 {port_versions => versions}/t-/tmx.json | 0 {port_versions => versions}/t-/tmxlite.json | 0 {port_versions => versions}/t-/tmxparser.json | 0 {port_versions => versions}/t-/toml11.json | 0 .../t-/tomlplusplus.json | 0 .../t-/tool-meson.json | 0 {port_versions => versions}/t-/torch-th.json | 0 {port_versions => versions}/t-/trantor.json | 0 {port_versions => versions}/t-/tre.json | 0 .../t-/treehopper.json | 0 {port_versions => versions}/t-/triangle.json | 0 .../t-/trompeloeil.json | 0 .../t-/tsl-hopscotch-map.json | 0 .../t-/tsl-ordered-map.json | 0 .../t-/tsl-sparse-map.json | 0 .../t-/turbobase64.json | 0 {port_versions => versions}/t-/tweeny.json | 0 {port_versions => versions}/t-/type-lite.json | 0 {port_versions => versions}/t-/type-safe.json | 0 {port_versions => versions}/u-/uchardet.json | 0 {port_versions => versions}/u-/umock-c.json | 0 .../u-/unicorn-lib.json | 0 {port_versions => versions}/u-/unicorn.json | 0 {port_versions => versions}/u-/units.json | 0 .../u-/unittest-cpp.json | 0 {port_versions => versions}/u-/unixodbc.json | 0 {port_versions => versions}/u-/unqlite.json | 0 {port_versions => versions}/u-/unrar.json | 0 {port_versions => versions}/u-/upb.json | 0 .../u-/urdfdom-headers.json | 0 {port_versions => versions}/u-/urdfdom.json | 0 {port_versions => versions}/u-/uriparser.json | 0 {port_versions => versions}/u-/usbmuxd.json | 0 {port_versions => versions}/u-/usd.json | 0 {port_versions => versions}/u-/usockets.json | 0 {port_versions => versions}/u-/usrsctp.json | 0 {port_versions => versions}/u-/utf8h.json | 0 {port_versions => versions}/u-/utf8proc.json | 0 {port_versions => versions}/u-/utfcpp.json | 0 {port_versions => versions}/u-/utfz.json | 0 .../u-/uthenticode.json | 0 {port_versions => versions}/u-/uvatlas.json | 0 {port_versions => versions}/u-/uvw.json | 0 .../u-/uwebsockets.json | 0 {port_versions => versions}/v-/v-hacd.json | 0 {port_versions => versions}/v-/v8.json | 0 {port_versions => versions}/v-/valijson.json | 0 .../v-/value-ptr-lite.json | 0 .../v-/variant-lite.json | 0 {port_versions => versions}/v-/vc.json | 0 {port_versions => versions}/v-/vcglib.json | 0 .../v-/vcpkg-gfortran.json | 0 .../v-/vectorclass.json | 0 .../v-/visit-struct.json | 0 {port_versions => versions}/v-/vlfeat.json | 0 {port_versions => versions}/v-/vlpp.json | 0 {port_versions => versions}/v-/volk.json | 0 {port_versions => versions}/v-/vs-yasm.json | 0 {port_versions => versions}/v-/vtk-dicom.json | 0 {port_versions => versions}/v-/vtk-m.json | 0 {port_versions => versions}/v-/vtk.json | 0 .../v-/vulkan-headers.json | 0 .../v-/vulkan-hpp.json | 0 .../v-/vulkan-memory-allocator.json | 0 {port_versions => versions}/v-/vulkan.json | 0 {port_versions => versions}/v-/vxl.json | 0 {port_versions => versions}/w-/wampcc.json | 0 {port_versions => versions}/w-/wangle.json | 0 {port_versions => versions}/w-/wavelib.json | 0 {port_versions => versions}/w-/wavpack.json | 0 .../w-/websocketpp.json | 0 {port_versions => versions}/w-/wepoll.json | 0 {port_versions => versions}/w-/wg21-sg14.json | 0 {port_versions => versions}/w-/wil.json | 0 {port_versions => versions}/w-/wildmidi.json | 0 {port_versions => versions}/w-/wincrypt.json | 0 {port_versions => versions}/w-/winpcap.json | 0 {port_versions => versions}/w-/winreg.json | 0 {port_versions => versions}/w-/winsock2.json | 0 {port_versions => versions}/w-/wintoast.json | 0 {port_versions => versions}/w-/woff2.json | 0 {port_versions => versions}/w-/wordnet.json | 0 {port_versions => versions}/w-/wpilib.json | 0 {port_versions => versions}/w-/wren.json | 0 {port_versions => versions}/w-/wt.json | 0 {port_versions => versions}/w-/wtl.json | 0 .../w-/wxchartdir.json | 0 {port_versions => versions}/w-/wxwidgets.json | 0 {port_versions => versions}/x-/x-plane.json | 0 {port_versions => versions}/x-/x264.json | 0 {port_versions => versions}/x-/x265.json | 0 {port_versions => versions}/x-/xalan-c.json | 0 {port_versions => versions}/x-/xbyak.json | 0 {port_versions => versions}/x-/xerces-c.json | 0 {port_versions => versions}/x-/xeus.json | 0 {port_versions => versions}/x-/xframe.json | 0 {port_versions => versions}/x-/xlnt.json | 0 {port_versions => versions}/x-/xmlsec.json | 0 {port_versions => versions}/x-/xmsh.json | 0 {port_versions => versions}/x-/xorstr.json | 0 {port_versions => versions}/x-/xproperty.json | 0 {port_versions => versions}/x-/xsimd.json | 0 .../x-/xtensor-blas.json | 0 .../x-/xtensor-fftw.json | 0 .../x-/xtensor-io.json | 0 {port_versions => versions}/x-/xtensor.json | 0 {port_versions => versions}/x-/xtl.json | 0 {port_versions => versions}/x-/xxhash.json | 0 {port_versions => versions}/y-/yajl.json | 0 {port_versions => versions}/y-/yaml-cpp.json | 0 {port_versions => versions}/y-/yara.json | 0 {port_versions => versions}/y-/yas.json | 0 .../y-/yasm-tool-helper.json | 0 {port_versions => versions}/y-/yasm-tool.json | 0 {port_versions => versions}/y-/yasm.json | 0 {port_versions => versions}/y-/yato.json | 0 {port_versions => versions}/y-/yoga.json | 0 {port_versions => versions}/z-/z3.json | 0 {port_versions => versions}/z-/z85.json | 0 {port_versions => versions}/z-/zeromq.json | 0 {port_versions => versions}/z-/zfp.json | 0 {port_versions => versions}/z-/zkpp.json | 0 {port_versions => versions}/z-/zlib.json | 0 {port_versions => versions}/z-/zookeeper.json | 0 {port_versions => versions}/z-/zopfli.json | 0 .../z-/zserge-webview.json | 0 {port_versions => versions}/z-/zstd.json | 0 {port_versions => versions}/z-/zstr.json | 0 {port_versions => versions}/z-/zxing-cpp.json | 0 {port_versions => versions}/z-/zydis.json | 0 {port_versions => versions}/z-/zyre.json | 0 {port_versions => versions}/z-/zziplib.json | 0 1613 files changed, 73 insertions(+), 74 deletions(-) rename scripts/e2e_ports/{port_versions => versions}/baseline.json (100%) rename scripts/e2e_ports/{port_versions => versions}/v-/vcpkg-internal-e2e-test-port.json (100%) rename scripts/testing/version-files/default-baseline-2/{port_versions => versions}/z-/zlib.json (100%) rename scripts/testing/version-files/{port_versions => versions}/baseline.json (100%) rename scripts/testing/version-files/{port_versions => versions}/c-/cat.json (100%) rename scripts/testing/version-files/{port_versions => versions}/d-/dog.json (100%) rename scripts/testing/version-files/{port_versions => versions}/d-/duck.json (100%) rename scripts/testing/version-files/{port_versions => versions}/m-/mouse.json (100%) rename scripts/testing/version-files/{port_versions_incomplete => versions_incomplete}/baseline.json (100%) rename scripts/testing/version-files/{port_versions_incomplete => versions_incomplete}/c-/cat.json (100%) rename scripts/testing/version-files/{port_versions_incomplete => versions_incomplete}/d-/dog.json (100%) rename scripts/testing/version-files/{port_versions_incomplete => versions_incomplete}/f-/fish.json (100%) rename scripts/testing/version-files/{port_versions_incomplete => versions_incomplete}/m-/mouse.json (100%) rename scripts/testing/version-files/without-default-baseline-2/{port_versions => versions}/z-/zlib.json (100%) delete mode 100644 test.cmake rename {port_versions => versions}/3-/3fd.json (100%) rename {port_versions => versions}/7-/7zip.json (100%) rename {port_versions => versions}/a-/abseil.json (100%) rename {port_versions => versions}/a-/absent.json (100%) rename {port_versions => versions}/a-/ace.json (100%) rename {port_versions => versions}/a-/activemq-cpp.json (100%) rename {port_versions => versions}/a-/ade.json (100%) rename {port_versions => versions}/a-/aixlog.json (100%) rename {port_versions => versions}/a-/akali.json (100%) rename {port_versions => versions}/a-/alac-decoder.json (100%) rename {port_versions => versions}/a-/alac.json (100%) rename {port_versions => versions}/a-/alembic.json (100%) rename {port_versions => versions}/a-/aliyun-oss-c-sdk.json (100%) rename {port_versions => versions}/a-/allegro5.json (100%) rename {port_versions => versions}/a-/ampl-asl.json (100%) rename {port_versions => versions}/a-/ampl-mp.json (100%) rename {port_versions => versions}/a-/amqpcpp.json (100%) rename {port_versions => versions}/a-/anax.json (100%) rename {port_versions => versions}/a-/angelscript.json (100%) rename {port_versions => versions}/a-/angle.json (100%) rename {port_versions => versions}/a-/antlr4.json (100%) rename {port_versions => versions}/a-/any-lite.json (100%) rename {port_versions => versions}/a-/anyrpc.json (100%) rename {port_versions => versions}/a-/apr-util.json (100%) rename {port_versions => versions}/a-/apr.json (100%) rename {port_versions => versions}/a-/arb.json (100%) rename {port_versions => versions}/a-/arcus.json (100%) rename {port_versions => versions}/a-/argagg.json (100%) rename {port_versions => versions}/a-/argh.json (100%) rename {port_versions => versions}/a-/argparse.json (100%) rename {port_versions => versions}/a-/args.json (100%) rename {port_versions => versions}/a-/argtable2.json (100%) rename {port_versions => versions}/a-/argtable3.json (100%) rename {port_versions => versions}/a-/argumentum.json (100%) rename {port_versions => versions}/a-/armadillo.json (100%) rename {port_versions => versions}/a-/arrayfire.json (100%) rename {port_versions => versions}/a-/arrow.json (100%) rename {port_versions => versions}/a-/ashes.json (100%) rename {port_versions => versions}/a-/asio.json (100%) rename {port_versions => versions}/a-/asiosdk.json (100%) rename {port_versions => versions}/a-/asmjit.json (100%) rename {port_versions => versions}/a-/assimp.json (100%) rename {port_versions => versions}/a-/asynch.json (100%) rename {port_versions => versions}/a-/asyncplusplus.json (100%) rename {port_versions => versions}/a-/atk.json (100%) rename {port_versions => versions}/a-/atkmm.json (100%) rename {port_versions => versions}/a-/atlmfc.json (100%) rename {port_versions => versions}/a-/aubio.json (100%) rename {port_versions => versions}/a-/audiofile.json (100%) rename {port_versions => versions}/a-/aurora.json (100%) rename {port_versions => versions}/a-/autobahn.json (100%) rename {port_versions => versions}/a-/avisynthplus.json (100%) rename {port_versions => versions}/a-/avro-c.json (100%) rename {port_versions => versions}/a-/avro-cpp.json (100%) rename {port_versions => versions}/a-/aws-c-common.json (100%) rename {port_versions => versions}/a-/aws-c-event-stream.json (100%) rename {port_versions => versions}/a-/aws-checksums.json (100%) rename {port_versions => versions}/a-/aws-lambda-cpp.json (100%) rename {port_versions => versions}/a-/aws-sdk-cpp.json (100%) rename {port_versions => versions}/a-/azmq.json (100%) rename {port_versions => versions}/a-/azure-c-shared-utility.json (100%) rename {port_versions => versions}/a-/azure-iot-sdk-c.json (100%) rename {port_versions => versions}/a-/azure-kinect-sensor-sdk.json (100%) rename {port_versions => versions}/a-/azure-macro-utils-c.json (100%) rename {port_versions => versions}/a-/azure-storage-cpp.json (100%) rename {port_versions => versions}/a-/azure-uamqp-c.json (100%) rename {port_versions => versions}/a-/azure-uhttp-c.json (100%) rename {port_versions => versions}/a-/azure-umqtt-c.json (100%) rename {port_versions => versions}/b-/basisu.json (100%) rename {port_versions => versions}/b-/bcg729.json (100%) rename {port_versions => versions}/b-/bde.json (100%) rename {port_versions => versions}/b-/bdwgc.json (100%) rename {port_versions => versions}/b-/beast.json (100%) rename {port_versions => versions}/b-/behaviortree-cpp.json (100%) rename {port_versions => versions}/b-/benchmark.json (100%) rename {port_versions => versions}/b-/bento4.json (100%) rename {port_versions => versions}/b-/berkeleydb.json (100%) rename {port_versions => versions}/b-/bfgroup-lyra.json (100%) rename {port_versions => versions}/b-/bigint.json (100%) rename {port_versions => versions}/b-/binn.json (100%) rename {port_versions => versions}/b-/bitmagic.json (100%) rename {port_versions => versions}/b-/bitserializer-cpprestjson.json (100%) rename {port_versions => versions}/b-/bitserializer-pugixml.json (100%) rename {port_versions => versions}/b-/bitserializer-rapidjson.json (100%) rename {port_versions => versions}/b-/bitserializer-rapidyaml.json (100%) rename {port_versions => versions}/b-/bitserializer.json (100%) rename {port_versions => versions}/b-/bitsery.json (100%) rename {port_versions => versions}/b-/blas.json (100%) rename {port_versions => versions}/b-/blaze.json (100%) rename {port_versions => versions}/b-/blend2d.json (100%) rename {port_versions => versions}/b-/blitz.json (100%) rename {port_versions => versions}/b-/blosc.json (100%) rename {port_versions => versions}/b-/bond.json (100%) rename {port_versions => versions}/b-/boolinq.json (100%) rename {port_versions => versions}/b-/boost-accumulators.json (100%) rename {port_versions => versions}/b-/boost-algorithm.json (100%) rename {port_versions => versions}/b-/boost-align.json (100%) rename {port_versions => versions}/b-/boost-any.json (100%) rename {port_versions => versions}/b-/boost-array.json (100%) rename {port_versions => versions}/b-/boost-asio.json (100%) rename {port_versions => versions}/b-/boost-assert.json (100%) rename {port_versions => versions}/b-/boost-assign.json (100%) rename {port_versions => versions}/b-/boost-atomic.json (100%) rename {port_versions => versions}/b-/boost-beast.json (100%) rename {port_versions => versions}/b-/boost-bimap.json (100%) rename {port_versions => versions}/b-/boost-bind.json (100%) rename {port_versions => versions}/b-/boost-build.json (100%) rename {port_versions => versions}/b-/boost-callable-traits.json (100%) rename {port_versions => versions}/b-/boost-chrono.json (100%) rename {port_versions => versions}/b-/boost-circular-buffer.json (100%) rename {port_versions => versions}/b-/boost-compatibility.json (100%) rename {port_versions => versions}/b-/boost-compute.json (100%) rename {port_versions => versions}/b-/boost-concept-check.json (100%) rename {port_versions => versions}/b-/boost-config.json (100%) rename {port_versions => versions}/b-/boost-container-hash.json (100%) rename {port_versions => versions}/b-/boost-container.json (100%) rename {port_versions => versions}/b-/boost-context.json (100%) rename {port_versions => versions}/b-/boost-contract.json (100%) rename {port_versions => versions}/b-/boost-conversion.json (100%) rename {port_versions => versions}/b-/boost-convert.json (100%) rename {port_versions => versions}/b-/boost-core.json (100%) rename {port_versions => versions}/b-/boost-coroutine.json (100%) rename {port_versions => versions}/b-/boost-coroutine2.json (100%) rename {port_versions => versions}/b-/boost-crc.json (100%) rename {port_versions => versions}/b-/boost-date-time.json (100%) rename {port_versions => versions}/b-/boost-detail.json (100%) rename {port_versions => versions}/b-/boost-di.json (100%) rename {port_versions => versions}/b-/boost-dll.json (100%) rename {port_versions => versions}/b-/boost-dynamic-bitset.json (100%) rename {port_versions => versions}/b-/boost-endian.json (100%) rename {port_versions => versions}/b-/boost-exception.json (100%) rename {port_versions => versions}/b-/boost-fiber.json (100%) rename {port_versions => versions}/b-/boost-filesystem.json (100%) rename {port_versions => versions}/b-/boost-flyweight.json (100%) rename {port_versions => versions}/b-/boost-foreach.json (100%) rename {port_versions => versions}/b-/boost-format.json (100%) rename {port_versions => versions}/b-/boost-function-types.json (100%) rename {port_versions => versions}/b-/boost-function.json (100%) rename {port_versions => versions}/b-/boost-functional.json (100%) rename {port_versions => versions}/b-/boost-fusion.json (100%) rename {port_versions => versions}/b-/boost-geometry.json (100%) rename {port_versions => versions}/b-/boost-gil.json (100%) rename {port_versions => versions}/b-/boost-graph-parallel.json (100%) rename {port_versions => versions}/b-/boost-graph.json (100%) rename {port_versions => versions}/b-/boost-hana.json (100%) rename {port_versions => versions}/b-/boost-heap.json (100%) rename {port_versions => versions}/b-/boost-histogram.json (100%) rename {port_versions => versions}/b-/boost-hof.json (100%) rename {port_versions => versions}/b-/boost-icl.json (100%) rename {port_versions => versions}/b-/boost-integer.json (100%) rename {port_versions => versions}/b-/boost-interprocess.json (100%) rename {port_versions => versions}/b-/boost-interval.json (100%) rename {port_versions => versions}/b-/boost-intrusive.json (100%) rename {port_versions => versions}/b-/boost-io.json (100%) rename {port_versions => versions}/b-/boost-iostreams.json (100%) rename {port_versions => versions}/b-/boost-iterator.json (100%) rename {port_versions => versions}/b-/boost-json.json (100%) rename {port_versions => versions}/b-/boost-lambda.json (100%) rename {port_versions => versions}/b-/boost-leaf.json (100%) rename {port_versions => versions}/b-/boost-lexical-cast.json (100%) rename {port_versions => versions}/b-/boost-local-function.json (100%) rename {port_versions => versions}/b-/boost-locale.json (100%) rename {port_versions => versions}/b-/boost-lockfree.json (100%) rename {port_versions => versions}/b-/boost-log.json (100%) rename {port_versions => versions}/b-/boost-logic.json (100%) rename {port_versions => versions}/b-/boost-math.json (100%) rename {port_versions => versions}/b-/boost-metaparse.json (100%) rename {port_versions => versions}/b-/boost-modular-build-helper.json (100%) rename {port_versions => versions}/b-/boost-move.json (100%) rename {port_versions => versions}/b-/boost-mp11.json (100%) rename {port_versions => versions}/b-/boost-mpi.json (100%) rename {port_versions => versions}/b-/boost-mpl.json (100%) rename {port_versions => versions}/b-/boost-msm.json (100%) rename {port_versions => versions}/b-/boost-multi-array.json (100%) rename {port_versions => versions}/b-/boost-multi-index.json (100%) rename {port_versions => versions}/b-/boost-multiprecision.json (100%) rename {port_versions => versions}/b-/boost-nowide.json (100%) rename {port_versions => versions}/b-/boost-numeric-conversion.json (100%) rename {port_versions => versions}/b-/boost-odeint.json (100%) rename {port_versions => versions}/b-/boost-optional.json (100%) rename {port_versions => versions}/b-/boost-outcome.json (100%) rename {port_versions => versions}/b-/boost-parameter-python.json (100%) rename {port_versions => versions}/b-/boost-parameter.json (100%) rename {port_versions => versions}/b-/boost-pfr.json (100%) rename {port_versions => versions}/b-/boost-phoenix.json (100%) rename {port_versions => versions}/b-/boost-poly-collection.json (100%) rename {port_versions => versions}/b-/boost-polygon.json (100%) rename {port_versions => versions}/b-/boost-pool.json (100%) rename {port_versions => versions}/b-/boost-predef.json (100%) rename {port_versions => versions}/b-/boost-preprocessor.json (100%) rename {port_versions => versions}/b-/boost-process.json (100%) rename {port_versions => versions}/b-/boost-program-options.json (100%) rename {port_versions => versions}/b-/boost-property-map.json (100%) rename {port_versions => versions}/b-/boost-property-tree.json (100%) rename {port_versions => versions}/b-/boost-proto.json (100%) rename {port_versions => versions}/b-/boost-ptr-container.json (100%) rename {port_versions => versions}/b-/boost-python.json (100%) rename {port_versions => versions}/b-/boost-qvm.json (100%) rename {port_versions => versions}/b-/boost-random.json (100%) rename {port_versions => versions}/b-/boost-range.json (100%) rename {port_versions => versions}/b-/boost-ratio.json (100%) rename {port_versions => versions}/b-/boost-rational.json (100%) rename {port_versions => versions}/b-/boost-regex.json (100%) rename {port_versions => versions}/b-/boost-safe-numerics.json (100%) rename {port_versions => versions}/b-/boost-scope-exit.json (100%) rename {port_versions => versions}/b-/boost-serialization.json (100%) rename {port_versions => versions}/b-/boost-signals2.json (100%) rename {port_versions => versions}/b-/boost-smart-ptr.json (100%) rename {port_versions => versions}/b-/boost-sort.json (100%) rename {port_versions => versions}/b-/boost-spirit.json (100%) rename {port_versions => versions}/b-/boost-stacktrace.json (100%) rename {port_versions => versions}/b-/boost-statechart.json (100%) rename {port_versions => versions}/b-/boost-static-assert.json (100%) rename {port_versions => versions}/b-/boost-static-string.json (100%) rename {port_versions => versions}/b-/boost-stl-interfaces.json (100%) rename {port_versions => versions}/b-/boost-system.json (100%) rename {port_versions => versions}/b-/boost-test.json (100%) rename {port_versions => versions}/b-/boost-thread.json (100%) rename {port_versions => versions}/b-/boost-throw-exception.json (100%) rename {port_versions => versions}/b-/boost-timer.json (100%) rename {port_versions => versions}/b-/boost-tokenizer.json (100%) rename {port_versions => versions}/b-/boost-tti.json (100%) rename {port_versions => versions}/b-/boost-tuple.json (100%) rename {port_versions => versions}/b-/boost-type-erasure.json (100%) rename {port_versions => versions}/b-/boost-type-index.json (100%) rename {port_versions => versions}/b-/boost-type-traits.json (100%) rename {port_versions => versions}/b-/boost-typeof.json (100%) rename {port_versions => versions}/b-/boost-ublas.json (100%) rename {port_versions => versions}/b-/boost-uninstall.json (100%) rename {port_versions => versions}/b-/boost-units.json (100%) rename {port_versions => versions}/b-/boost-unordered.json (100%) rename {port_versions => versions}/b-/boost-utility.json (100%) rename {port_versions => versions}/b-/boost-uuid.json (100%) rename {port_versions => versions}/b-/boost-variant.json (100%) rename {port_versions => versions}/b-/boost-variant2.json (100%) rename {port_versions => versions}/b-/boost-vcpkg-helpers.json (100%) rename {port_versions => versions}/b-/boost-vmd.json (100%) rename {port_versions => versions}/b-/boost-wave.json (100%) rename {port_versions => versions}/b-/boost-winapi.json (100%) rename {port_versions => versions}/b-/boost-xpressive.json (100%) rename {port_versions => versions}/b-/boost-yap.json (100%) rename {port_versions => versions}/b-/boost.json (100%) rename {port_versions => versions}/b-/boringssl.json (100%) rename {port_versions => versions}/b-/botan.json (100%) rename {port_versions => versions}/b-/box2d.json (100%) rename {port_versions => versions}/b-/breakpad.json (100%) rename {port_versions => versions}/b-/brigand.json (100%) rename {port_versions => versions}/b-/brotli.json (100%) rename {port_versions => versions}/b-/brpc.json (100%) rename {port_versions => versions}/b-/brunocodutra-metal.json (100%) rename {port_versions => versions}/b-/brynet.json (100%) rename {port_versions => versions}/b-/bullet3.json (100%) rename {port_versions => versions}/b-/bustache.json (100%) rename {port_versions => versions}/b-/butteraugli.json (100%) rename {port_versions => versions}/b-/byte-lite.json (100%) rename {port_versions => versions}/b-/bzip2.json (100%) rename {port_versions => versions}/baseline.json (100%) rename {port_versions => versions}/c-/c-ares.json (100%) rename {port_versions => versions}/c-/c4core.json (100%) rename {port_versions => versions}/c-/caf.json (100%) rename {port_versions => versions}/c-/caffe2.json (100%) rename {port_versions => versions}/c-/cairo.json (100%) rename {port_versions => versions}/c-/cairomm.json (100%) rename {port_versions => versions}/c-/camport3.json (100%) rename {port_versions => versions}/c-/capnproto.json (100%) rename {port_versions => versions}/c-/capstone.json (100%) rename {port_versions => versions}/c-/cartographer.json (100%) rename {port_versions => versions}/c-/casclib.json (100%) rename {port_versions => versions}/c-/catch-classic.json (100%) rename {port_versions => versions}/c-/catch.json (100%) rename {port_versions => versions}/c-/catch2.json (100%) rename {port_versions => versions}/c-/cccapstone.json (100%) rename {port_versions => versions}/c-/ccd.json (100%) rename {port_versions => versions}/c-/ccfits.json (100%) rename {port_versions => versions}/c-/cctz.json (100%) rename {port_versions => versions}/c-/celero.json (100%) rename {port_versions => versions}/c-/cello.json (100%) rename {port_versions => versions}/c-/cereal.json (100%) rename {port_versions => versions}/c-/ceres.json (100%) rename {port_versions => versions}/c-/cfitsio.json (100%) rename {port_versions => versions}/c-/cgal.json (100%) rename {port_versions => versions}/c-/cgicc.json (100%) rename {port_versions => versions}/c-/cgl.json (100%) rename {port_versions => versions}/c-/cgltf.json (100%) rename {port_versions => versions}/c-/cgns.json (100%) rename {port_versions => versions}/c-/chaiscript.json (100%) rename {port_versions => versions}/c-/chakracore.json (100%) rename {port_versions => versions}/c-/charls.json (100%) rename {port_versions => versions}/c-/chartdir.json (100%) rename {port_versions => versions}/c-/check.json (100%) rename {port_versions => versions}/c-/chipmunk.json (100%) rename {port_versions => versions}/c-/chmlib.json (100%) rename {port_versions => versions}/c-/chromium-base.json (100%) rename {port_versions => versions}/c-/cimg.json (100%) rename {port_versions => versions}/c-/cityhash.json (100%) rename {port_versions => versions}/c-/civetweb.json (100%) rename {port_versions => versions}/c-/cjson.json (100%) rename {port_versions => versions}/c-/clapack.json (100%) rename {port_versions => versions}/c-/clara.json (100%) rename {port_versions => versions}/c-/clblas.json (100%) rename {port_versions => versions}/c-/clblast.json (100%) rename {port_versions => versions}/c-/clfft.json (100%) rename {port_versions => versions}/c-/cli.json (100%) rename {port_versions => versions}/c-/cli11.json (100%) rename {port_versions => versions}/c-/clickhouse-cpp.json (100%) rename {port_versions => versions}/c-/clipp.json (100%) rename {port_versions => versions}/c-/clockutils.json (100%) rename {port_versions => versions}/c-/clp.json (100%) rename {port_versions => versions}/c-/clrng.json (100%) rename {port_versions => versions}/c-/clue.json (100%) rename {port_versions => versions}/c-/cmark.json (100%) rename {port_versions => versions}/c-/cmcstl2.json (100%) rename {port_versions => versions}/c-/cmocka.json (100%) rename {port_versions => versions}/c-/cnl.json (100%) rename {port_versions => versions}/c-/coin.json (100%) rename {port_versions => versions}/c-/coinutils.json (100%) rename {port_versions => versions}/c-/collada-dom.json (100%) rename {port_versions => versions}/c-/colmap.json (100%) rename {port_versions => versions}/c-/comms-ublox.json (100%) rename {port_versions => versions}/c-/comms.json (100%) rename {port_versions => versions}/c-/commsdsl.json (100%) rename {port_versions => versions}/c-/concurrentqueue.json (100%) rename {port_versions => versions}/c-/console-bridge.json (100%) rename {port_versions => versions}/c-/constexpr-contracts.json (100%) rename {port_versions => versions}/c-/constexpr.json (100%) rename {port_versions => versions}/c-/coolprop.json (100%) rename {port_versions => versions}/c-/coroutine.json (100%) rename {port_versions => versions}/c-/corrade.json (100%) rename {port_versions => versions}/c-/cpp-base64.json (100%) rename {port_versions => versions}/c-/cpp-httplib.json (100%) rename {port_versions => versions}/c-/cpp-netlib.json (100%) rename {port_versions => versions}/c-/cpp-peglib.json (100%) rename {port_versions => versions}/c-/cpp-redis.json (100%) rename {port_versions => versions}/c-/cpp-taskflow.json (100%) rename {port_versions => versions}/c-/cppad.json (100%) rename {port_versions => versions}/c-/cppcms.json (100%) rename {port_versions => versions}/c-/cppcodec.json (100%) rename {port_versions => versions}/c-/cppcoro.json (100%) rename {port_versions => versions}/c-/cppfs.json (100%) rename {port_versions => versions}/c-/cppgraphqlgen.json (100%) rename {port_versions => versions}/c-/cppitertools.json (100%) rename {port_versions => versions}/c-/cppkafka.json (100%) rename {port_versions => versions}/c-/cppmicroservices.json (100%) rename {port_versions => versions}/c-/cpprestsdk.json (100%) rename {port_versions => versions}/c-/cpptoml.json (100%) rename {port_versions => versions}/c-/cppunit.json (100%) rename {port_versions => versions}/c-/cpputest.json (100%) rename {port_versions => versions}/c-/cppwinrt.json (100%) rename {port_versions => versions}/c-/cppzmq.json (100%) rename {port_versions => versions}/c-/cpr.json (100%) rename {port_versions => versions}/c-/cpu-features.json (100%) rename {port_versions => versions}/c-/cpuid.json (100%) rename {port_versions => versions}/c-/cpuinfo.json (100%) rename {port_versions => versions}/c-/cr.json (100%) rename {port_versions => versions}/c-/crashpad.json (100%) rename {port_versions => versions}/c-/crashrpt.json (100%) rename {port_versions => versions}/c-/crc32c.json (100%) rename {port_versions => versions}/c-/crfsuite.json (100%) rename {port_versions => versions}/c-/croncpp.json (100%) rename {port_versions => versions}/c-/crossguid.json (100%) rename {port_versions => versions}/c-/crow.json (100%) rename {port_versions => versions}/c-/cryptopp.json (100%) rename {port_versions => versions}/c-/cspice.json (100%) rename {port_versions => versions}/c-/ctbignum.json (100%) rename {port_versions => versions}/c-/ctemplate.json (100%) rename {port_versions => versions}/c-/ctp.json (100%) rename {port_versions => versions}/c-/ctre.json (100%) rename {port_versions => versions}/c-/cub.json (100%) rename {port_versions => versions}/c-/cuda.json (100%) rename {port_versions => versions}/c-/cudnn.json (100%) rename {port_versions => versions}/c-/cunit.json (100%) rename {port_versions => versions}/c-/curl.json (100%) rename {port_versions => versions}/c-/curlpp.json (100%) rename {port_versions => versions}/c-/cute-headers.json (100%) rename {port_versions => versions}/c-/cutelyst2.json (100%) rename {port_versions => versions}/c-/cwalk.json (100%) rename {port_versions => versions}/c-/cxxopts.json (100%) rename {port_versions => versions}/c-/czmq.json (100%) rename {port_versions => versions}/d-/d3dx12.json (100%) rename {port_versions => versions}/d-/darknet.json (100%) rename {port_versions => versions}/d-/darts-clone.json (100%) rename {port_versions => versions}/d-/dartsim.json (100%) rename {port_versions => versions}/d-/dataframe.json (100%) rename {port_versions => versions}/d-/date.json (100%) rename {port_versions => versions}/d-/dbg-macro.json (100%) rename {port_versions => versions}/d-/dbghelp.json (100%) rename {port_versions => versions}/d-/dbow2.json (100%) rename {port_versions => versions}/d-/dbow3.json (100%) rename {port_versions => versions}/d-/dcmtk.json (100%) rename {port_versions => versions}/d-/debug-assert.json (100%) rename {port_versions => versions}/d-/decimal-for-cpp.json (100%) rename {port_versions => versions}/d-/detours.json (100%) rename {port_versions => versions}/d-/devicenameresolver.json (100%) rename {port_versions => versions}/d-/devil.json (100%) rename {port_versions => versions}/d-/dimcli.json (100%) rename {port_versions => versions}/d-/directx-headers.json (100%) rename {port_versions => versions}/d-/directxmath.json (100%) rename {port_versions => versions}/d-/directxmesh.json (100%) rename {port_versions => versions}/d-/directxsdk.json (100%) rename {port_versions => versions}/d-/directxtex.json (100%) rename {port_versions => versions}/d-/directxtk.json (100%) rename {port_versions => versions}/d-/directxtk12.json (100%) rename {port_versions => versions}/d-/dirent.json (100%) rename {port_versions => versions}/d-/discord-game-sdk.json (100%) rename {port_versions => versions}/d-/discord-rpc.json (100%) rename {port_versions => versions}/d-/discount.json (100%) rename {port_versions => versions}/d-/distorm.json (100%) rename {port_versions => versions}/d-/dlfcn-win32.json (100%) rename {port_versions => versions}/d-/dlib.json (100%) rename {port_versions => versions}/d-/dmlc.json (100%) rename {port_versions => versions}/d-/docopt.json (100%) rename {port_versions => versions}/d-/doctest.json (100%) rename {port_versions => versions}/d-/double-conversion.json (100%) rename {port_versions => versions}/d-/dpdk.json (100%) rename {port_versions => versions}/d-/draco.json (100%) rename {port_versions => versions}/d-/drlibs.json (100%) rename {port_versions => versions}/d-/drogon.json (100%) rename {port_versions => versions}/d-/dtl.json (100%) rename {port_versions => versions}/d-/duckx.json (100%) rename {port_versions => versions}/d-/duilib.json (100%) rename {port_versions => versions}/d-/duktape.json (100%) rename {port_versions => versions}/d-/dx.json (100%) rename {port_versions => versions}/d-/dxut.json (100%) rename {port_versions => versions}/e-/eabase.json (100%) rename {port_versions => versions}/e-/eastl.json (100%) rename {port_versions => versions}/e-/easycl.json (100%) rename {port_versions => versions}/e-/easyhook.json (100%) rename {port_versions => versions}/e-/easyloggingpp.json (100%) rename {port_versions => versions}/e-/eathread.json (100%) rename {port_versions => versions}/e-/ebml.json (100%) rename {port_versions => versions}/e-/ecm.json (100%) rename {port_versions => versions}/e-/ecos.json (100%) rename {port_versions => versions}/e-/ecsutil.json (100%) rename {port_versions => versions}/e-/edlib.json (100%) rename {port_versions => versions}/e-/effolkronium-random.json (100%) rename {port_versions => versions}/e-/efsw.json (100%) rename {port_versions => versions}/e-/egl-registry.json (100%) rename {port_versions => versions}/e-/eigen3.json (100%) rename {port_versions => versions}/e-/elfio.json (100%) rename {port_versions => versions}/e-/elfutils.json (100%) rename {port_versions => versions}/e-/embree2.json (100%) rename {port_versions => versions}/e-/embree3.json (100%) rename {port_versions => versions}/e-/enet.json (100%) rename {port_versions => versions}/e-/ensmallen.json (100%) rename {port_versions => versions}/e-/entityx.json (100%) rename {port_versions => versions}/e-/entt.json (100%) rename {port_versions => versions}/e-/epsilon.json (100%) rename {port_versions => versions}/e-/esaxx.json (100%) rename {port_versions => versions}/e-/evpp.json (100%) rename {port_versions => versions}/e-/exiv2.json (100%) rename {port_versions => versions}/e-/expat.json (100%) rename {port_versions => versions}/e-/expected-lite.json (100%) rename {port_versions => versions}/e-/exprtk.json (100%) rename {port_versions => versions}/e-/ezc3d.json (100%) rename {port_versions => versions}/f-/faad2.json (100%) rename {port_versions => versions}/f-/fadbad.json (100%) rename {port_versions => versions}/f-/faiss.json (100%) rename {port_versions => versions}/f-/fann.json (100%) rename {port_versions => versions}/f-/farmhash.json (100%) rename {port_versions => versions}/f-/fast-cpp-csv-parser.json (100%) rename {port_versions => versions}/f-/fastcdr.json (100%) rename {port_versions => versions}/f-/fastcgi.json (100%) rename {port_versions => versions}/f-/fastfeat.json (100%) rename {port_versions => versions}/f-/fastlz.json (100%) rename {port_versions => versions}/f-/fastrtps.json (100%) rename {port_versions => versions}/f-/fbthrift.json (100%) rename {port_versions => versions}/f-/fcl.json (100%) rename {port_versions => versions}/f-/fdk-aac.json (100%) rename {port_versions => versions}/f-/fdlibm.json (100%) rename {port_versions => versions}/f-/ffmpeg.json (100%) rename {port_versions => versions}/f-/ffnvcodec.json (100%) rename {port_versions => versions}/f-/fftw3.json (100%) rename {port_versions => versions}/f-/fftwpp.json (100%) rename {port_versions => versions}/f-/field3d.json (100%) rename {port_versions => versions}/f-/fixed-string.json (100%) rename {port_versions => versions}/f-/fizz.json (100%) rename {port_versions => versions}/f-/flann.json (100%) rename {port_versions => versions}/f-/flashlight-cpu.json (100%) rename {port_versions => versions}/f-/flashlight-cuda.json (100%) rename {port_versions => versions}/f-/flatbuffers.json (100%) rename {port_versions => versions}/f-/flint.json (100%) rename {port_versions => versions}/f-/fltk.json (100%) rename {port_versions => versions}/f-/fluidlite.json (100%) rename {port_versions => versions}/f-/fluidsynth.json (100%) rename {port_versions => versions}/f-/fmem.json (100%) rename {port_versions => versions}/f-/fmi4cpp.json (100%) rename {port_versions => versions}/f-/fmilib.json (100%) rename {port_versions => versions}/f-/fmt.json (100%) rename {port_versions => versions}/f-/folly.json (100%) rename {port_versions => versions}/f-/font-chef.json (100%) rename {port_versions => versions}/f-/fontconfig.json (100%) rename {port_versions => versions}/f-/foonathan-memory.json (100%) rename {port_versions => versions}/f-/forest.json (100%) rename {port_versions => versions}/f-/forge.json (100%) rename {port_versions => versions}/f-/fplus.json (100%) rename {port_versions => versions}/f-/freeglut.json (100%) rename {port_versions => versions}/f-/freeimage.json (100%) rename {port_versions => versions}/f-/freeopcua.json (100%) rename {port_versions => versions}/f-/freerdp.json (100%) rename {port_versions => versions}/f-/freetds.json (100%) rename {port_versions => versions}/f-/freetype-gl.json (100%) rename {port_versions => versions}/f-/freetype.json (100%) rename {port_versions => versions}/f-/freexl.json (100%) rename {port_versions => versions}/f-/fribidi.json (100%) rename {port_versions => versions}/f-/frozen.json (100%) rename {port_versions => versions}/f-/fruit.json (100%) rename {port_versions => versions}/f-/ftgl.json (100%) rename {port_versions => versions}/f-/function2.json (100%) rename {port_versions => versions}/f-/fuzzylite.json (100%) rename {port_versions => versions}/g-/g2o.json (100%) rename {port_versions => versions}/g-/g3log.json (100%) rename {port_versions => versions}/g-/gainput.json (100%) rename {port_versions => versions}/g-/gamedev-framework.json (100%) rename {port_versions => versions}/g-/gamma.json (100%) rename {port_versions => versions}/g-/gasol.json (100%) rename {port_versions => versions}/g-/gaussianlib.json (100%) rename {port_versions => versions}/g-/gcem.json (100%) rename {port_versions => versions}/g-/gdal.json (100%) rename {port_versions => versions}/g-/gdcm.json (100%) rename {port_versions => versions}/g-/gdcm2.json (100%) rename {port_versions => versions}/g-/gdk-pixbuf.json (100%) rename {port_versions => versions}/g-/genann.json (100%) rename {port_versions => versions}/g-/geogram.json (100%) rename {port_versions => versions}/g-/geographiclib.json (100%) rename {port_versions => versions}/g-/geos.json (100%) rename {port_versions => versions}/g-/geotrans.json (100%) rename {port_versions => versions}/g-/getdns.json (100%) rename {port_versions => versions}/g-/getopt-win32.json (100%) rename {port_versions => versions}/g-/getopt.json (100%) rename {port_versions => versions}/g-/gettext.json (100%) rename {port_versions => versions}/g-/gettimeofday.json (100%) rename {port_versions => versions}/g-/gflags.json (100%) rename {port_versions => versions}/g-/gherkin-c.json (100%) rename {port_versions => versions}/g-/giflib.json (100%) rename {port_versions => versions}/g-/gl2ps.json (100%) rename {port_versions => versions}/g-/gl3w.json (100%) rename {port_versions => versions}/g-/glad.json (100%) rename {port_versions => versions}/g-/glbinding.json (100%) rename {port_versions => versions}/g-/glew.json (100%) rename {port_versions => versions}/g-/glfw3.json (100%) rename {port_versions => versions}/g-/gli.json (100%) rename {port_versions => versions}/g-/glib.json (100%) rename {port_versions => versions}/g-/glibmm.json (100%) rename {port_versions => versions}/g-/glm.json (100%) rename {port_versions => versions}/g-/globjects.json (100%) rename {port_versions => versions}/g-/glog.json (100%) rename {port_versions => versions}/g-/gloo.json (100%) rename {port_versions => versions}/g-/glslang.json (100%) rename {port_versions => versions}/g-/glui.json (100%) rename {port_versions => versions}/g-/gmime.json (100%) rename {port_versions => versions}/g-/gmmlib.json (100%) rename {port_versions => versions}/g-/gmp.json (100%) rename {port_versions => versions}/g-/google-cloud-cpp-common.json (100%) rename {port_versions => versions}/g-/google-cloud-cpp-spanner.json (100%) rename {port_versions => versions}/g-/google-cloud-cpp.json (100%) rename {port_versions => versions}/g-/googleapis.json (100%) rename {port_versions => versions}/g-/gperf.json (100%) rename {port_versions => versions}/g-/gperftools.json (100%) rename {port_versions => versions}/g-/gpgme.json (100%) rename {port_versions => versions}/g-/gppanel.json (100%) rename {port_versions => versions}/g-/graphene.json (100%) rename {port_versions => versions}/g-/graphicsmagick.json (100%) rename {port_versions => versions}/g-/graphite2.json (100%) rename {port_versions => versions}/g-/graphqlparser.json (100%) rename {port_versions => versions}/g-/greatest.json (100%) rename {port_versions => versions}/g-/grpc.json (100%) rename {port_versions => versions}/g-/grppi.json (100%) rename {port_versions => versions}/g-/gsl-lite.json (100%) rename {port_versions => versions}/g-/gsl.json (100%) rename {port_versions => versions}/g-/gsoap.json (100%) rename {port_versions => versions}/g-/gtest.json (100%) rename {port_versions => versions}/g-/gtk.json (100%) rename {port_versions => versions}/g-/gtkmm.json (100%) rename {port_versions => versions}/g-/gts.json (100%) rename {port_versions => versions}/g-/guetzli.json (100%) rename {port_versions => versions}/g-/gumbo.json (100%) rename {port_versions => versions}/g-/gzip-hpp.json (100%) rename {port_versions => versions}/h-/h3.json (100%) rename {port_versions => versions}/h-/h5py-lzf.json (100%) rename {port_versions => versions}/h-/halide.json (100%) rename {port_versions => versions}/h-/harfbuzz.json (100%) rename {port_versions => versions}/h-/hayai.json (100%) rename {port_versions => versions}/h-/hdf5.json (100%) rename {port_versions => versions}/h-/healpix.json (100%) rename {port_versions => versions}/h-/hedley.json (100%) rename {port_versions => versions}/h-/hffix.json (100%) rename {port_versions => versions}/h-/hfsm2.json (100%) rename {port_versions => versions}/h-/hidapi.json (100%) rename {port_versions => versions}/h-/highfive.json (100%) rename {port_versions => versions}/h-/hiredis.json (100%) rename {port_versions => versions}/h-/hpx.json (100%) rename {port_versions => versions}/h-/http-parser.json (100%) rename {port_versions => versions}/h-/hungarian.json (100%) rename {port_versions => versions}/h-/hunspell.json (100%) rename {port_versions => versions}/h-/hwloc.json (100%) rename {port_versions => versions}/h-/hyperscan.json (100%) rename {port_versions => versions}/h-/hypre.json (100%) rename {port_versions => versions}/i-/icu.json (100%) rename {port_versions => versions}/i-/ideviceinstaller.json (100%) rename {port_versions => versions}/i-/idevicerestore.json (100%) rename {port_versions => versions}/i-/if97.json (100%) rename {port_versions => versions}/i-/igloo.json (100%) rename {port_versions => versions}/i-/ignition-cmake0.json (100%) rename {port_versions => versions}/i-/ignition-cmake2.json (100%) rename {port_versions => versions}/i-/ignition-common1.json (100%) rename {port_versions => versions}/i-/ignition-common3.json (100%) rename {port_versions => versions}/i-/ignition-fuel-tools1.json (100%) rename {port_versions => versions}/i-/ignition-fuel-tools4.json (100%) rename {port_versions => versions}/i-/ignition-math4.json (100%) rename {port_versions => versions}/i-/ignition-math6.json (100%) rename {port_versions => versions}/i-/ignition-modularscripts.json (100%) rename {port_versions => versions}/i-/ignition-msgs1.json (100%) rename {port_versions => versions}/i-/ignition-msgs5.json (100%) rename {port_versions => versions}/i-/ignition-msgs6.json (100%) rename {port_versions => versions}/i-/ignition-plugin1.json (100%) rename {port_versions => versions}/i-/ignition-transport4.json (100%) rename {port_versions => versions}/i-/ignition-transport8.json (100%) rename {port_versions => versions}/i-/ignition-transport9.json (100%) rename {port_versions => versions}/i-/ijg-libjpeg.json (100%) rename {port_versions => versions}/i-/ilmbase.json (100%) rename {port_versions => versions}/i-/imgui-sfml.json (100%) rename {port_versions => versions}/i-/imgui.json (100%) rename {port_versions => versions}/i-/immer.json (100%) rename {port_versions => versions}/i-/implot.json (100%) rename {port_versions => versions}/i-/indicators.json (100%) rename {port_versions => versions}/i-/infoware.json (100%) rename {port_versions => versions}/i-/inih.json (100%) rename {port_versions => versions}/i-/iniparser.json (100%) rename {port_versions => versions}/i-/inja.json (100%) rename {port_versions => versions}/i-/intel-ipsec.json (100%) rename {port_versions => versions}/i-/intel-mkl.json (100%) rename {port_versions => versions}/i-/intelrdfpmathlib.json (100%) rename {port_versions => versions}/i-/io2d.json (100%) rename {port_versions => versions}/i-/irrlicht.json (100%) rename {port_versions => versions}/i-/irrxml.json (100%) rename {port_versions => versions}/i-/isal.json (100%) rename {port_versions => versions}/i-/ismrmrd.json (100%) rename {port_versions => versions}/i-/itk.json (100%) rename {port_versions => versions}/i-/itpp.json (100%) rename {port_versions => versions}/i-/ixwebsocket.json (100%) rename {port_versions => versions}/j-/jack2.json (100%) rename {port_versions => versions}/j-/jaeger-client-cpp.json (100%) rename {port_versions => versions}/j-/jansson.json (100%) rename {port_versions => versions}/j-/jasper.json (100%) rename {port_versions => versions}/j-/jbig2dec.json (100%) rename {port_versions => versions}/j-/jbigkit.json (100%) rename {port_versions => versions}/j-/jemalloc.json (100%) rename {port_versions => versions}/j-/jinja2cpplight.json (100%) rename {port_versions => versions}/j-/josuttis-jthread.json (100%) rename {port_versions => versions}/j-/jsmn.json (100%) rename {port_versions => versions}/j-/json-c.json (100%) rename {port_versions => versions}/j-/json-dto.json (100%) rename {port_versions => versions}/j-/json-schema-validator.json (100%) rename {port_versions => versions}/j-/json-spirit.json (100%) rename {port_versions => versions}/j-/json11.json (100%) rename {port_versions => versions}/j-/json5-parser.json (100%) rename {port_versions => versions}/j-/jsoncons.json (100%) rename {port_versions => versions}/j-/jsoncpp.json (100%) rename {port_versions => versions}/j-/jsonnet.json (100%) rename {port_versions => versions}/j-/jwt-cpp.json (100%) rename {port_versions => versions}/j-/jxrlib.json (100%) rename {port_versions => versions}/k-/kangaru.json (100%) rename {port_versions => versions}/k-/kcp.json (100%) rename {port_versions => versions}/k-/kd-soap.json (100%) rename {port_versions => versions}/k-/kealib.json (100%) rename {port_versions => versions}/k-/kenlm.json (100%) rename {port_versions => versions}/k-/keystone.json (100%) rename {port_versions => versions}/k-/kf5archive.json (100%) rename {port_versions => versions}/k-/kf5completion.json (100%) rename {port_versions => versions}/k-/kf5config.json (100%) rename {port_versions => versions}/k-/kf5coreaddons.json (100%) rename {port_versions => versions}/k-/kf5crash.json (100%) rename {port_versions => versions}/k-/kf5guiaddons.json (100%) rename {port_versions => versions}/k-/kf5holidays.json (100%) rename {port_versions => versions}/k-/kf5i18n.json (100%) rename {port_versions => versions}/k-/kf5itemmodels.json (100%) rename {port_versions => versions}/k-/kf5itemviews.json (100%) rename {port_versions => versions}/k-/kf5plotting.json (100%) rename {port_versions => versions}/k-/kf5syntaxhighlighting.json (100%) rename {port_versions => versions}/k-/kf5widgetsaddons.json (100%) rename {port_versions => versions}/k-/kf5windowsystem.json (100%) rename {port_versions => versions}/k-/kfr.json (100%) rename {port_versions => versions}/k-/kinectsdk1.json (100%) rename {port_versions => versions}/k-/kinectsdk2.json (100%) rename {port_versions => versions}/k-/kissfft.json (100%) rename {port_versions => versions}/k-/knet.json (100%) rename {port_versions => versions}/k-/krabsetw.json (100%) rename {port_versions => versions}/k-/ktx.json (100%) rename {port_versions => versions}/k-/kubazip.json (100%) rename {port_versions => versions}/k-/kuku.json (100%) rename {port_versions => versions}/k-/kvasir-mpl.json (100%) rename {port_versions => versions}/l-/lapack-reference.json (100%) rename {port_versions => versions}/l-/lapack.json (100%) rename {port_versions => versions}/l-/lastools.json (100%) rename {port_versions => versions}/l-/laszip.json (100%) rename {port_versions => versions}/l-/lazy-importer.json (100%) rename {port_versions => versions}/l-/lcm.json (100%) rename {port_versions => versions}/l-/lcms.json (100%) rename {port_versions => versions}/l-/leaf.json (100%) rename {port_versions => versions}/l-/lemon.json (100%) rename {port_versions => versions}/l-/leptonica.json (100%) rename {port_versions => versions}/l-/lerc.json (100%) rename {port_versions => versions}/l-/lest.json (100%) rename {port_versions => versions}/l-/leveldb.json (100%) rename {port_versions => versions}/l-/levmar.json (100%) rename {port_versions => versions}/l-/libaaplus.json (100%) rename {port_versions => versions}/l-/libaiff.json (100%) rename {port_versions => versions}/l-/libarchive.json (100%) rename {port_versions => versions}/l-/libass.json (100%) rename {port_versions => versions}/l-/libassuan.json (100%) rename {port_versions => versions}/l-/libb2.json (100%) rename {port_versions => versions}/l-/libbf.json (100%) rename {port_versions => versions}/l-/libbson.json (100%) rename {port_versions => versions}/l-/libcds.json (100%) rename {port_versions => versions}/l-/libcerf.json (100%) rename {port_versions => versions}/l-/libconfig.json (100%) rename {port_versions => versions}/l-/libconfuse.json (100%) rename {port_versions => versions}/l-/libcopp.json (100%) rename {port_versions => versions}/l-/libcrafter.json (100%) rename {port_versions => versions}/l-/libcroco.json (100%) rename {port_versions => versions}/l-/libcuckoo.json (100%) rename {port_versions => versions}/l-/libdatachannel.json (100%) rename {port_versions => versions}/l-/libdatrie.json (100%) rename {port_versions => versions}/l-/libde265.json (100%) rename {port_versions => versions}/l-/libdisasm.json (100%) rename {port_versions => versions}/l-/libdivide.json (100%) rename {port_versions => versions}/l-/libdshowcapture.json (100%) rename {port_versions => versions}/l-/libepoxy.json (100%) rename {port_versions => versions}/l-/libevent.json (100%) rename {port_versions => versions}/l-/libevhtp.json (100%) rename {port_versions => versions}/l-/libexif.json (100%) rename {port_versions => versions}/l-/libfabric.json (100%) rename {port_versions => versions}/l-/libffi.json (100%) rename {port_versions => versions}/l-/libflac.json (100%) rename {port_versions => versions}/l-/libfort.json (100%) rename {port_versions => versions}/l-/libfreenect2.json (100%) rename {port_versions => versions}/l-/libftdi.json (100%) rename {port_versions => versions}/l-/libftdi1.json (100%) rename {port_versions => versions}/l-/libgcrypt.json (100%) rename {port_versions => versions}/l-/libgd.json (100%) rename {port_versions => versions}/l-/libgeotiff.json (100%) rename {port_versions => versions}/l-/libgit2.json (100%) rename {port_versions => versions}/l-/libgo.json (100%) rename {port_versions => versions}/l-/libgpg-error.json (100%) rename {port_versions => versions}/l-/libgpod.json (100%) rename {port_versions => versions}/l-/libgta.json (100%) rename {port_versions => versions}/l-/libguarded.json (100%) rename {port_versions => versions}/l-/libharu.json (100%) rename {port_versions => versions}/l-/libhdfs3.json (100%) rename {port_versions => versions}/l-/libheif.json (100%) rename {port_versions => versions}/l-/libhsplasma.json (100%) rename {port_versions => versions}/l-/libhydrogen.json (100%) rename {port_versions => versions}/l-/libiconv.json (100%) rename {port_versions => versions}/l-/libics.json (100%) rename {port_versions => versions}/l-/libideviceactivation.json (100%) rename {port_versions => versions}/l-/libidn2.json (100%) rename {port_versions => versions}/l-/libigl.json (100%) rename {port_versions => versions}/l-/libilbc.json (100%) rename {port_versions => versions}/l-/libimobiledevice.json (100%) rename {port_versions => versions}/l-/libirecovery.json (100%) rename {port_versions => versions}/l-/libjpeg-turbo.json (100%) rename {port_versions => versions}/l-/libjuice.json (100%) rename {port_versions => versions}/l-/libkml.json (100%) rename {port_versions => versions}/l-/liblas.json (100%) rename {port_versions => versions}/l-/liblbfgs.json (100%) rename {port_versions => versions}/l-/liblemon.json (100%) rename {port_versions => versions}/l-/liblinear.json (100%) rename {port_versions => versions}/l-/liblo.json (100%) rename {port_versions => versions}/l-/liblsl.json (100%) rename {port_versions => versions}/l-/liblzma.json (100%) rename {port_versions => versions}/l-/libmad.json (100%) rename {port_versions => versions}/l-/libmagic.json (100%) rename {port_versions => versions}/l-/libmariadb.json (100%) rename {port_versions => versions}/l-/libmaxminddb.json (100%) rename {port_versions => versions}/l-/libmediainfo.json (100%) rename {port_versions => versions}/l-/libmesh.json (100%) rename {port_versions => versions}/l-/libmicrohttpd.json (100%) rename {port_versions => versions}/l-/libmikmod.json (100%) rename {port_versions => versions}/l-/libmodbus.json (100%) rename {port_versions => versions}/l-/libmodman.json (100%) rename {port_versions => versions}/l-/libmodplug.json (100%) rename {port_versions => versions}/l-/libmorton.json (100%) rename {port_versions => versions}/l-/libmpeg2.json (100%) rename {port_versions => versions}/l-/libmspack.json (100%) rename {port_versions => versions}/l-/libmupdf.json (100%) rename {port_versions => versions}/l-/libmysql.json (100%) rename {port_versions => versions}/l-/libnice.json (100%) rename {port_versions => versions}/l-/libnoise.json (100%) rename {port_versions => versions}/l-/libodb-boost.json (100%) rename {port_versions => versions}/l-/libodb-mysql.json (100%) rename {port_versions => versions}/l-/libodb-pgsql.json (100%) rename {port_versions => versions}/l-/libodb-sqlite.json (100%) rename {port_versions => versions}/l-/libodb.json (100%) rename {port_versions => versions}/l-/libogg.json (100%) rename {port_versions => versions}/l-/libopenmpt.json (100%) rename {port_versions => versions}/l-/libopusenc.json (100%) rename {port_versions => versions}/l-/libosip2.json (100%) rename {port_versions => versions}/l-/libosmium.json (100%) rename {port_versions => versions}/l-/libosmscout.json (100%) rename {port_versions => versions}/l-/libp7-baical.json (100%) rename {port_versions => versions}/l-/libp7client.json (100%) rename {port_versions => versions}/l-/libpcap.json (100%) rename {port_versions => versions}/l-/libpff.json (100%) rename {port_versions => versions}/l-/libplist.json (100%) rename {port_versions => versions}/l-/libpmemobj-cpp.json (100%) rename {port_versions => versions}/l-/libpng.json (100%) rename {port_versions => versions}/l-/libpopt.json (100%) rename {port_versions => versions}/l-/libpq.json (100%) rename {port_versions => versions}/l-/libpqxx.json (100%) rename {port_versions => versions}/l-/libprotobuf-mutator.json (100%) rename {port_versions => versions}/l-/libproxy.json (100%) rename {port_versions => versions}/l-/libqcow.json (100%) rename {port_versions => versions}/l-/libqglviewer.json (100%) rename {port_versions => versions}/l-/libqrencode.json (100%) rename {port_versions => versions}/l-/librabbitmq.json (100%) rename {port_versions => versions}/l-/libraqm.json (100%) rename {port_versions => versions}/l-/libraw.json (100%) rename {port_versions => versions}/l-/librdkafka.json (100%) rename {port_versions => versions}/l-/libressl.json (100%) rename {port_versions => versions}/l-/librsvg.json (100%) rename {port_versions => versions}/l-/librsync.json (100%) rename {port_versions => versions}/l-/librtmp.json (100%) rename {port_versions => versions}/l-/librttopo.json (100%) rename {port_versions => versions}/l-/libsamplerate.json (100%) rename {port_versions => versions}/l-/libsass.json (100%) rename {port_versions => versions}/l-/libsbml.json (100%) rename {port_versions => versions}/l-/libsigcpp-3.json (100%) rename {port_versions => versions}/l-/libsigcpp.json (100%) rename {port_versions => versions}/l-/libsndfile.json (100%) rename {port_versions => versions}/l-/libsodium.json (100%) rename {port_versions => versions}/l-/libsoundio.json (100%) rename {port_versions => versions}/l-/libspatialindex.json (100%) rename {port_versions => versions}/l-/libspatialite.json (100%) rename {port_versions => versions}/l-/libspnav.json (100%) rename {port_versions => versions}/l-/libsquish.json (100%) rename {port_versions => versions}/l-/libsrt.json (100%) rename {port_versions => versions}/l-/libsrtp.json (100%) rename {port_versions => versions}/l-/libssh.json (100%) rename {port_versions => versions}/l-/libssh2.json (100%) rename {port_versions => versions}/l-/libstemmer.json (100%) rename {port_versions => versions}/l-/libstk.json (100%) rename {port_versions => versions}/l-/libsvm.json (100%) rename {port_versions => versions}/l-/libtheora.json (100%) rename {port_versions => versions}/l-/libtins.json (100%) rename {port_versions => versions}/l-/libtomcrypt.json (100%) rename {port_versions => versions}/l-/libtommath.json (100%) rename {port_versions => versions}/l-/libtorrent.json (100%) rename {port_versions => versions}/l-/libu2f-server.json (100%) rename {port_versions => versions}/l-/libudis86.json (100%) rename {port_versions => versions}/l-/libudns.json (100%) rename {port_versions => versions}/l-/libui.json (100%) rename {port_versions => versions}/l-/libunibreak.json (100%) rename {port_versions => versions}/l-/libusb-win32.json (100%) rename {port_versions => versions}/l-/libusb.json (100%) rename {port_versions => versions}/l-/libusbmuxd.json (100%) rename {port_versions => versions}/l-/libuuid.json (100%) rename {port_versions => versions}/l-/libuv.json (100%) rename {port_versions => versions}/l-/libvmdk.json (100%) rename {port_versions => versions}/l-/libvorbis.json (100%) rename {port_versions => versions}/l-/libvpx.json (100%) rename {port_versions => versions}/l-/libwandio.json (100%) rename {port_versions => versions}/l-/libwebm.json (100%) rename {port_versions => versions}/l-/libwebp.json (100%) rename {port_versions => versions}/l-/libwebsockets.json (100%) rename {port_versions => versions}/l-/libxdiff.json (100%) rename {port_versions => versions}/l-/libxlsxwriter.json (100%) rename {port_versions => versions}/l-/libxml2.json (100%) rename {port_versions => versions}/l-/libxmlmm.json (100%) rename {port_versions => versions}/l-/libxmlpp.json (100%) rename {port_versions => versions}/l-/libxmp-lite.json (100%) rename {port_versions => versions}/l-/libxslt.json (100%) rename {port_versions => versions}/l-/libyaml.json (100%) rename {port_versions => versions}/l-/libyuv.json (100%) rename {port_versions => versions}/l-/libzen.json (100%) rename {port_versions => versions}/l-/libzip.json (100%) rename {port_versions => versions}/l-/libzippp.json (100%) rename {port_versions => versions}/l-/licensepp.json (100%) rename {port_versions => versions}/l-/lilv.json (100%) rename {port_versions => versions}/l-/linalg.json (100%) rename {port_versions => versions}/l-/linenoise-ng.json (100%) rename {port_versions => versions}/l-/live555.json (100%) rename {port_versions => versions}/l-/llgl.json (100%) rename {port_versions => versions}/l-/llvm.json (100%) rename {port_versions => versions}/l-/lmdb.json (100%) rename {port_versions => versions}/l-/lodepng.json (100%) rename {port_versions => versions}/l-/log4cplus.json (100%) rename {port_versions => versions}/l-/log4cpp.json (100%) rename {port_versions => versions}/l-/log4cxx.json (100%) rename {port_versions => versions}/l-/loguru.json (100%) rename {port_versions => versions}/l-/lpeg.json (100%) rename {port_versions => versions}/l-/lua.json (100%) rename {port_versions => versions}/l-/luabridge.json (100%) rename {port_versions => versions}/l-/luafilesystem.json (100%) rename {port_versions => versions}/l-/luajit.json (100%) rename {port_versions => versions}/l-/luasocket.json (100%) rename {port_versions => versions}/l-/lv2.json (100%) rename {port_versions => versions}/l-/lz4.json (100%) rename {port_versions => versions}/l-/lzfse.json (100%) rename {port_versions => versions}/l-/lzo.json (100%) rename {port_versions => versions}/l-/lzokay.json (100%) rename {port_versions => versions}/m-/magic-enum.json (100%) rename {port_versions => versions}/m-/magic-get.json (100%) rename {port_versions => versions}/m-/magnum-extras.json (100%) rename {port_versions => versions}/m-/magnum-integration.json (100%) rename {port_versions => versions}/m-/magnum-plugins.json (100%) rename {port_versions => versions}/m-/magnum.json (100%) rename {port_versions => versions}/m-/mapbox-variant.json (100%) rename {port_versions => versions}/m-/marble.json (100%) rename {port_versions => versions}/m-/marl.json (100%) rename {port_versions => versions}/m-/mathc.json (100%) rename {port_versions => versions}/m-/mathgl.json (100%) rename {port_versions => versions}/m-/matio.json (100%) rename {port_versions => versions}/m-/matplotlib-cpp.json (100%) rename {port_versions => versions}/m-/matroska.json (100%) rename {port_versions => versions}/m-/mbedtls.json (100%) rename {port_versions => versions}/m-/mcpp.json (100%) rename {port_versions => versions}/m-/mdns.json (100%) rename {port_versions => versions}/m-/mdnsresponder.json (100%) rename {port_versions => versions}/m-/mecab.json (100%) rename {port_versions => versions}/m-/memorymodule.json (100%) rename {port_versions => versions}/m-/mesa.json (100%) rename {port_versions => versions}/m-/meschach.json (100%) rename {port_versions => versions}/m-/meshoptimizer.json (100%) rename {port_versions => versions}/m-/metis.json (100%) rename {port_versions => versions}/m-/metrohash.json (100%) rename {port_versions => versions}/m-/mgnlibs.json (100%) rename {port_versions => versions}/m-/mhook.json (100%) rename {port_versions => versions}/m-/microsoft-signalr.json (100%) rename {port_versions => versions}/m-/mikktspace.json (100%) rename {port_versions => versions}/m-/milerius-sfml-imgui.json (100%) rename {port_versions => versions}/m-/mimalloc.json (100%) rename {port_versions => versions}/m-/minc.json (100%) rename {port_versions => versions}/m-/minhook.json (100%) rename {port_versions => versions}/m-/minifb.json (100%) rename {port_versions => versions}/m-/minimp3.json (100%) rename {port_versions => versions}/m-/minisat-master-keying.json (100%) rename {port_versions => versions}/m-/minitrace.json (100%) rename {port_versions => versions}/m-/miniupnpc.json (100%) rename {port_versions => versions}/m-/miniz.json (100%) rename {port_versions => versions}/m-/minizip.json (100%) rename {port_versions => versions}/m-/mio.json (100%) rename {port_versions => versions}/m-/mlpack.json (100%) rename {port_versions => versions}/m-/mman.json (100%) rename {port_versions => versions}/m-/mmloader.json (100%) rename {port_versions => versions}/m-/mmx.json (100%) rename {port_versions => versions}/m-/modp-base64.json (100%) rename {port_versions => versions}/m-/mongo-c-driver.json (100%) rename {port_versions => versions}/m-/mongo-cxx-driver.json (100%) rename {port_versions => versions}/m-/mongoose.json (100%) rename {port_versions => versions}/m-/monkeys-audio.json (100%) rename {port_versions => versions}/m-/moos-core.json (100%) rename {port_versions => versions}/m-/moos-essential.json (100%) rename {port_versions => versions}/m-/moos-ui.json (100%) rename {port_versions => versions}/m-/morton-nd.json (100%) rename {port_versions => versions}/m-/mosquitto.json (100%) rename {port_versions => versions}/m-/mozjpeg.json (100%) rename {port_versions => versions}/m-/mp-units.json (100%) rename {port_versions => versions}/m-/mp3lame.json (100%) rename {port_versions => versions}/m-/mpark-variant.json (100%) rename {port_versions => versions}/m-/mpfr.json (100%) rename {port_versions => versions}/m-/mpg123.json (100%) rename {port_versions => versions}/m-/mpi.json (100%) rename {port_versions => versions}/m-/mpir.json (100%) rename {port_versions => versions}/m-/mpmcqueue.json (100%) rename {port_versions => versions}/m-/mqtt-cpp.json (100%) rename {port_versions => versions}/m-/ms-angle.json (100%) rename {port_versions => versions}/m-/ms-gsl.json (100%) rename {port_versions => versions}/m-/msdfgen.json (100%) rename {port_versions => versions}/m-/msgpack.json (100%) rename {port_versions => versions}/m-/msgpack11.json (100%) rename {port_versions => versions}/m-/msinttypes.json (100%) rename {port_versions => versions}/m-/msix.json (100%) rename {port_versions => versions}/m-/msmpi.json (100%) rename {port_versions => versions}/m-/mstch.json (100%) rename {port_versions => versions}/m-/mujs.json (100%) rename {port_versions => versions}/m-/munit.json (100%) rename {port_versions => versions}/m-/muparser.json (100%) rename {port_versions => versions}/m-/murmurhash.json (100%) rename {port_versions => versions}/m-/mygui.json (100%) rename {port_versions => versions}/n-/nameof.json (100%) rename {port_versions => versions}/n-/nana.json (100%) rename {port_versions => versions}/n-/nano-signal-slot.json (100%) rename {port_versions => versions}/n-/nanobench.json (100%) rename {port_versions => versions}/n-/nanodbc.json (100%) rename {port_versions => versions}/n-/nanoflann.json (100%) rename {port_versions => versions}/n-/nanogui.json (100%) rename {port_versions => versions}/n-/nanomsg.json (100%) rename {port_versions => versions}/n-/nanopb.json (100%) rename {port_versions => versions}/n-/nanoprintf.json (100%) rename {port_versions => versions}/n-/nanorange.json (100%) rename {port_versions => versions}/n-/nanort.json (100%) rename {port_versions => versions}/n-/nanovg.json (100%) rename {port_versions => versions}/n-/nativefiledialog.json (100%) rename {port_versions => versions}/n-/nccl.json (100%) rename {port_versions => versions}/n-/neargye-semver.json (100%) rename {port_versions => versions}/n-/netcdf-c.json (100%) rename {port_versions => versions}/n-/netcdf-cxx4.json (100%) rename {port_versions => versions}/n-/nethost.json (100%) rename {port_versions => versions}/n-/nettle.json (100%) rename {port_versions => versions}/n-/networkdirect-sdk.json (100%) rename {port_versions => versions}/n-/nghttp2.json (100%) rename {port_versions => versions}/n-/ngspice.json (100%) rename {port_versions => versions}/n-/nifticlib.json (100%) rename {port_versions => versions}/n-/nlohmann-fifo-map.json (100%) rename {port_versions => versions}/n-/nlohmann-json.json (100%) rename {port_versions => versions}/n-/nlopt.json (100%) rename {port_versions => versions}/n-/nmap.json (100%) rename {port_versions => versions}/n-/nmslib.json (100%) rename {port_versions => versions}/n-/nng.json (100%) rename {port_versions => versions}/n-/nngpp.json (100%) rename {port_versions => versions}/n-/nonius.json (100%) rename {port_versions => versions}/n-/nowide.json (100%) rename {port_versions => versions}/n-/nrf-ble-driver.json (100%) rename {port_versions => versions}/n-/nt-wrapper.json (100%) rename {port_versions => versions}/n-/nuklear.json (100%) rename {port_versions => versions}/n-/numactl.json (100%) rename {port_versions => versions}/n-/numcpp.json (100%) rename {port_versions => versions}/n-/nuspell.json (100%) rename {port_versions => versions}/n-/nvtt.json (100%) rename {port_versions => versions}/o-/oatpp-consul.json (100%) rename {port_versions => versions}/o-/oatpp-curl.json (100%) rename {port_versions => versions}/o-/oatpp-libressl.json (100%) rename {port_versions => versions}/o-/oatpp-mbedtls.json (100%) rename {port_versions => versions}/o-/oatpp-mongo.json (100%) rename {port_versions => versions}/o-/oatpp-postgresql.json (100%) rename {port_versions => versions}/o-/oatpp-sqlite.json (100%) rename {port_versions => versions}/o-/oatpp-swagger.json (100%) rename {port_versions => versions}/o-/oatpp-websocket.json (100%) rename {port_versions => versions}/o-/oatpp-zlib.json (100%) rename {port_versions => versions}/o-/oatpp.json (100%) rename {port_versions => versions}/o-/observer-ptr-lite.json (100%) rename {port_versions => versions}/o-/ocilib.json (100%) rename {port_versions => versions}/o-/octomap.json (100%) rename {port_versions => versions}/o-/ode.json (100%) rename {port_versions => versions}/o-/offscale-libetcd-cpp.json (100%) rename {port_versions => versions}/o-/ogdf.json (100%) rename {port_versions => versions}/o-/ogre-next.json (100%) rename {port_versions => versions}/o-/ogre.json (100%) rename {port_versions => versions}/o-/ois.json (100%) rename {port_versions => versions}/o-/ompl.json (100%) rename {port_versions => versions}/o-/onednn.json (100%) rename {port_versions => versions}/o-/oniguruma.json (100%) rename {port_versions => versions}/o-/onnxruntime-gpu.json (100%) rename {port_versions => versions}/o-/open62541.json (100%) rename {port_versions => versions}/o-/openal-soft.json (100%) rename {port_versions => versions}/o-/openblas.json (100%) rename {port_versions => versions}/o-/opencascade.json (100%) rename {port_versions => versions}/o-/opencc.json (100%) rename {port_versions => versions}/o-/opencensus-cpp.json (100%) rename {port_versions => versions}/o-/opencl.json (100%) rename {port_versions => versions}/o-/opencolorio-tools.json (100%) rename {port_versions => versions}/o-/opencolorio.json (100%) rename {port_versions => versions}/o-/opencsg.json (100%) rename {port_versions => versions}/o-/opencv.json (100%) rename {port_versions => versions}/o-/opencv2.json (100%) rename {port_versions => versions}/o-/opencv3.json (100%) rename {port_versions => versions}/o-/opencv4.json (100%) rename {port_versions => versions}/o-/opendnp3.json (100%) rename {port_versions => versions}/o-/openexr.json (100%) rename {port_versions => versions}/o-/opengl-registry.json (100%) rename {port_versions => versions}/o-/opengl.json (100%) rename {port_versions => versions}/o-/openigtlink.json (100%) rename {port_versions => versions}/o-/openimageio.json (100%) rename {port_versions => versions}/o-/openjpeg.json (100%) rename {port_versions => versions}/o-/openmama.json (100%) rename {port_versions => versions}/o-/openmesh.json (100%) rename {port_versions => versions}/o-/openmpi.json (100%) rename {port_versions => versions}/o-/openmvg.json (100%) rename {port_versions => versions}/o-/openmvs.json (100%) rename {port_versions => versions}/o-/openni2.json (100%) rename {port_versions => versions}/o-/openscap.json (100%) rename {port_versions => versions}/o-/openssl-unix.json (100%) rename {port_versions => versions}/o-/openssl-uwp.json (100%) rename {port_versions => versions}/o-/openssl-windows.json (100%) rename {port_versions => versions}/o-/openssl.json (100%) rename {port_versions => versions}/o-/opensubdiv.json (100%) rename {port_versions => versions}/o-/opentracing.json (100%) rename {port_versions => versions}/o-/openvdb.json (100%) rename {port_versions => versions}/o-/openvpn3.json (100%) rename {port_versions => versions}/o-/openvr.json (100%) rename {port_versions => versions}/o-/openxr-loader.json (100%) rename {port_versions => versions}/o-/optional-bare.json (100%) rename {port_versions => versions}/o-/optional-lite.json (100%) rename {port_versions => versions}/o-/opus.json (100%) rename {port_versions => versions}/o-/opusfile.json (100%) rename {port_versions => versions}/o-/orc.json (100%) rename {port_versions => versions}/o-/orocos-kdl.json (100%) rename {port_versions => versions}/o-/osg-qt.json (100%) rename {port_versions => versions}/o-/osg.json (100%) rename {port_versions => versions}/o-/osgearth.json (100%) rename {port_versions => versions}/o-/osi.json (100%) rename {port_versions => versions}/o-/otl.json (100%) rename {port_versions => versions}/o-/outcome.json (100%) rename {port_versions => versions}/p-/p-ranav-csv.json (100%) rename {port_versions => versions}/p-/p-ranav-csv2.json (100%) rename {port_versions => versions}/p-/pagmo2.json (100%) rename {port_versions => versions}/p-/paho-mqtt.json (100%) rename {port_versions => versions}/p-/paho-mqttpp3.json (100%) rename {port_versions => versions}/p-/palsigslot.json (100%) rename {port_versions => versions}/p-/pango.json (100%) rename {port_versions => versions}/p-/pangolin.json (100%) rename {port_versions => versions}/p-/pangomm.json (100%) rename {port_versions => versions}/p-/parallel-hashmap.json (100%) rename {port_versions => versions}/p-/parallelstl.json (100%) rename {port_versions => versions}/p-/paraview.json (100%) rename {port_versions => versions}/p-/parmetis.json (100%) rename {port_versions => versions}/p-/parquet.json (100%) rename {port_versions => versions}/p-/parson.json (100%) rename {port_versions => versions}/p-/pbc.json (100%) rename {port_versions => versions}/p-/pcg.json (100%) rename {port_versions => versions}/p-/pcl.json (100%) rename {port_versions => versions}/p-/pcre.json (100%) rename {port_versions => versions}/p-/pcre2.json (100%) rename {port_versions => versions}/p-/pdal-c.json (100%) rename {port_versions => versions}/p-/pdal.json (100%) rename {port_versions => versions}/p-/pdcurses.json (100%) rename {port_versions => versions}/p-/pdqsort.json (100%) rename {port_versions => versions}/p-/pe-parse.json (100%) rename {port_versions => versions}/p-/pegtl-2.json (100%) rename {port_versions => versions}/p-/pegtl.json (100%) rename {port_versions => versions}/p-/pfring.json (100%) rename {port_versions => versions}/p-/pfultz2-linq.json (100%) rename {port_versions => versions}/p-/phnt.json (100%) rename {port_versions => versions}/p-/physfs.json (100%) rename {port_versions => versions}/p-/physx.json (100%) rename {port_versions => versions}/p-/picojson.json (100%) rename {port_versions => versions}/p-/picosha2.json (100%) rename {port_versions => versions}/p-/piex.json (100%) rename {port_versions => versions}/p-/pistache.json (100%) rename {port_versions => versions}/p-/pixel.json (100%) rename {port_versions => versions}/p-/pixman.json (100%) rename {port_versions => versions}/p-/platform-folders.json (100%) rename {port_versions => versions}/p-/plf-colony.json (100%) rename {port_versions => versions}/p-/plf-list.json (100%) rename {port_versions => versions}/p-/plf-nanotimer.json (100%) rename {port_versions => versions}/p-/plf-stack.json (100%) rename {port_versions => versions}/p-/plib.json (100%) rename {port_versions => versions}/p-/plibsys.json (100%) rename {port_versions => versions}/p-/plog.json (100%) rename {port_versions => versions}/p-/plplot.json (100%) rename {port_versions => versions}/p-/plustache.json (100%) rename {port_versions => versions}/p-/pmdk.json (100%) rename {port_versions => versions}/p-/pngpp.json (100%) rename {port_versions => versions}/p-/pngwriter.json (100%) rename {port_versions => versions}/p-/poco.json (100%) rename {port_versions => versions}/p-/podofo.json (100%) rename {port_versions => versions}/p-/poly2tri.json (100%) rename {port_versions => versions}/p-/polyclipping.json (100%) rename {port_versions => versions}/p-/polyhook2.json (100%) rename {port_versions => versions}/p-/polymorphic-value.json (100%) rename {port_versions => versions}/p-/ponder.json (100%) rename {port_versions => versions}/p-/poppler.json (100%) rename {port_versions => versions}/p-/portable-snippets.json (100%) rename {port_versions => versions}/p-/portaudio.json (100%) rename {port_versions => versions}/p-/portmidi.json (100%) rename {port_versions => versions}/p-/ppconsul.json (100%) rename {port_versions => versions}/p-/ppmagic.json (100%) rename {port_versions => versions}/p-/pprint.json (100%) rename {port_versions => versions}/p-/pqp.json (100%) rename {port_versions => versions}/p-/proj.json (100%) rename {port_versions => versions}/p-/proj4.json (100%) rename {port_versions => versions}/p-/prometheus-cpp.json (100%) rename {port_versions => versions}/p-/protobuf-c.json (100%) rename {port_versions => versions}/p-/protobuf.json (100%) rename {port_versions => versions}/p-/protopuf.json (100%) rename {port_versions => versions}/p-/protozero.json (100%) rename {port_versions => versions}/p-/proxygen.json (100%) rename {port_versions => versions}/p-/proxywrapper.json (100%) rename {port_versions => versions}/p-/ptex.json (100%) rename {port_versions => versions}/p-/pthread.json (100%) rename {port_versions => versions}/p-/pthreads.json (100%) rename {port_versions => versions}/p-/pugixml.json (100%) rename {port_versions => versions}/p-/pybind11.json (100%) rename {port_versions => versions}/p-/pystring.json (100%) rename {port_versions => versions}/p-/python2.json (100%) rename {port_versions => versions}/p-/python3.json (100%) rename {port_versions => versions}/q-/qca.json (100%) rename {port_versions => versions}/q-/qcustomplot.json (100%) rename {port_versions => versions}/q-/qhull.json (100%) rename {port_versions => versions}/q-/qpid-proton.json (100%) rename {port_versions => versions}/q-/qscintilla.json (100%) rename {port_versions => versions}/q-/qt-advanced-docking-system.json (100%) rename {port_versions => versions}/q-/qt5-3d.json (100%) rename {port_versions => versions}/q-/qt5-activeqt.json (100%) rename {port_versions => versions}/q-/qt5-androidextras.json (100%) rename {port_versions => versions}/q-/qt5-base.json (100%) rename {port_versions => versions}/q-/qt5-canvas3d.json (100%) rename {port_versions => versions}/q-/qt5-charts.json (100%) rename {port_versions => versions}/q-/qt5-connectivity.json (100%) rename {port_versions => versions}/q-/qt5-datavis3d.json (100%) rename {port_versions => versions}/q-/qt5-declarative.json (100%) rename {port_versions => versions}/q-/qt5-doc.json (100%) rename {port_versions => versions}/q-/qt5-gamepad.json (100%) rename {port_versions => versions}/q-/qt5-graphicaleffects.json (100%) rename {port_versions => versions}/q-/qt5-imageformats.json (100%) rename {port_versions => versions}/q-/qt5-location.json (100%) rename {port_versions => versions}/q-/qt5-macextras.json (100%) rename {port_versions => versions}/q-/qt5-modularscripts.json (100%) rename {port_versions => versions}/q-/qt5-mqtt.json (100%) rename {port_versions => versions}/q-/qt5-multimedia.json (100%) rename {port_versions => versions}/q-/qt5-networkauth.json (100%) rename {port_versions => versions}/q-/qt5-purchasing.json (100%) rename {port_versions => versions}/q-/qt5-quickcontrols.json (100%) rename {port_versions => versions}/q-/qt5-quickcontrols2.json (100%) rename {port_versions => versions}/q-/qt5-remoteobjects.json (100%) rename {port_versions => versions}/q-/qt5-script.json (100%) rename {port_versions => versions}/q-/qt5-scxml.json (100%) rename {port_versions => versions}/q-/qt5-sensors.json (100%) rename {port_versions => versions}/q-/qt5-serialbus.json (100%) rename {port_versions => versions}/q-/qt5-serialport.json (100%) rename {port_versions => versions}/q-/qt5-speech.json (100%) rename {port_versions => versions}/q-/qt5-svg.json (100%) rename {port_versions => versions}/q-/qt5-tools.json (100%) rename {port_versions => versions}/q-/qt5-translations.json (100%) rename {port_versions => versions}/q-/qt5-virtualkeyboard.json (100%) rename {port_versions => versions}/q-/qt5-wayland.json (100%) rename {port_versions => versions}/q-/qt5-webchannel.json (100%) rename {port_versions => versions}/q-/qt5-webengine.json (100%) rename {port_versions => versions}/q-/qt5-webglplugin.json (100%) rename {port_versions => versions}/q-/qt5-websockets.json (100%) rename {port_versions => versions}/q-/qt5-webview.json (100%) rename {port_versions => versions}/q-/qt5-winextras.json (100%) rename {port_versions => versions}/q-/qt5-x11extras.json (100%) rename {port_versions => versions}/q-/qt5-xmlpatterns.json (100%) rename {port_versions => versions}/q-/qt5.json (100%) rename {port_versions => versions}/q-/qtkeychain.json (100%) rename {port_versions => versions}/q-/quadtree.json (100%) rename {port_versions => versions}/q-/quantlib.json (100%) rename {port_versions => versions}/q-/quaternions.json (100%) rename {port_versions => versions}/q-/quazip.json (100%) rename {port_versions => versions}/q-/quickfast.json (100%) rename {port_versions => versions}/q-/quickfix.json (100%) rename {port_versions => versions}/q-/quill.json (100%) rename {port_versions => versions}/q-/quirc.json (100%) rename {port_versions => versions}/q-/qwt.json (100%) rename {port_versions => versions}/q-/qwtw.json (100%) rename {port_versions => versions}/r-/rabit.json (100%) rename {port_versions => versions}/r-/ragel.json (100%) rename {port_versions => versions}/r-/rang.json (100%) rename {port_versions => versions}/r-/range-v3-vs2015.json (100%) rename {port_versions => versions}/r-/range-v3.json (100%) rename {port_versions => versions}/r-/rapidcheck.json (100%) rename {port_versions => versions}/r-/rapidjson.json (100%) rename {port_versions => versions}/r-/rapidxml-ns.json (100%) rename {port_versions => versions}/r-/rapidxml.json (100%) rename {port_versions => versions}/r-/rappture.json (100%) rename {port_versions => versions}/r-/raylib.json (100%) rename {port_versions => versions}/r-/rbdl.json (100%) rename {port_versions => versions}/r-/re2.json (100%) rename {port_versions => versions}/r-/readerwriterqueue.json (100%) rename {port_versions => versions}/r-/readline-win32.json (100%) rename {port_versions => versions}/r-/readline.json (100%) rename {port_versions => versions}/r-/readosm.json (100%) rename {port_versions => versions}/r-/realsense2.json (100%) rename {port_versions => versions}/r-/recast.json (100%) rename {port_versions => versions}/r-/redis-plus-plus.json (100%) rename {port_versions => versions}/r-/refl-cpp.json (100%) rename {port_versions => versions}/r-/refprop-headers.json (100%) rename {port_versions => versions}/r-/replxx.json (100%) rename {port_versions => versions}/r-/reproc.json (100%) rename {port_versions => versions}/r-/rest-rpc.json (100%) rename {port_versions => versions}/r-/restbed.json (100%) rename {port_versions => versions}/r-/restclient-cpp.json (100%) rename {port_versions => versions}/r-/restinio.json (100%) rename {port_versions => versions}/r-/rhash.json (100%) rename {port_versions => versions}/r-/riffcpp.json (100%) rename {port_versions => versions}/r-/ring-span-lite.json (100%) rename {port_versions => versions}/r-/roaring.json (100%) rename {port_versions => versions}/r-/robin-hood-hashing.json (100%) rename {port_versions => versions}/r-/robin-map.json (100%) rename {port_versions => versions}/r-/rocksdb.json (100%) rename {port_versions => versions}/r-/rpclib.json (100%) rename {port_versions => versions}/r-/rply.json (100%) rename {port_versions => versions}/r-/rs-core-lib.json (100%) rename {port_versions => versions}/r-/rsocket.json (100%) rename {port_versions => versions}/r-/rtabmap.json (100%) rename {port_versions => versions}/r-/rtaudio.json (100%) rename {port_versions => versions}/r-/rtlsdr.json (100%) rename {port_versions => versions}/r-/rtmidi.json (100%) rename {port_versions => versions}/r-/rttr.json (100%) rename {port_versions => versions}/r-/rxcpp.json (100%) rename {port_versions => versions}/r-/rxqt.json (100%) rename {port_versions => versions}/r-/rxspencer.json (100%) rename {port_versions => versions}/r-/ryml.json (100%) rename {port_versions => versions}/r-/ryu.json (100%) rename {port_versions => versions}/s-/safeint.json (100%) rename {port_versions => versions}/s-/sail.json (100%) rename {port_versions => versions}/s-/sais.json (100%) rename {port_versions => versions}/s-/sajson.json (100%) rename {port_versions => versions}/s-/sassc.json (100%) rename {port_versions => versions}/s-/scintilla.json (100%) rename {port_versions => versions}/s-/sciter.json (100%) rename {port_versions => versions}/s-/scnlib.json (100%) rename {port_versions => versions}/s-/scylla-wrapper.json (100%) rename {port_versions => versions}/s-/sdformat10.json (100%) rename {port_versions => versions}/s-/sdformat6.json (100%) rename {port_versions => versions}/s-/sdformat9.json (100%) rename {port_versions => versions}/s-/sdl1-net.json (100%) rename {port_versions => versions}/s-/sdl1.json (100%) rename {port_versions => versions}/s-/sdl2-gfx.json (100%) rename {port_versions => versions}/s-/sdl2-image.json (100%) rename {port_versions => versions}/s-/sdl2-mixer.json (100%) rename {port_versions => versions}/s-/sdl2-net.json (100%) rename {port_versions => versions}/s-/sdl2-ttf.json (100%) rename {port_versions => versions}/s-/sdl2.json (100%) rename {port_versions => versions}/s-/sdl2pp.json (100%) rename {port_versions => versions}/s-/seal.json (100%) rename {port_versions => versions}/s-/secp256k1.json (100%) rename {port_versions => versions}/s-/selene.json (100%) rename {port_versions => versions}/s-/sentencepiece.json (100%) rename {port_versions => versions}/s-/sentry-native.json (100%) rename {port_versions => versions}/s-/septag-sx.json (100%) rename {port_versions => versions}/s-/seqan.json (100%) rename {port_versions => versions}/s-/serd.json (100%) rename {port_versions => versions}/s-/sf2cute.json (100%) rename {port_versions => versions}/s-/sfgui.json (100%) rename {port_versions => versions}/s-/sfml.json (100%) rename {port_versions => versions}/s-/sfsexp.json (100%) rename {port_versions => versions}/s-/shaderc.json (100%) rename {port_versions => versions}/s-/shaderwriter.json (100%) rename {port_versions => versions}/s-/shapelib.json (100%) rename {port_versions => versions}/s-/shiva-sfml.json (100%) rename {port_versions => versions}/s-/shiva.json (100%) rename {port_versions => versions}/s-/shogun.json (100%) rename {port_versions => versions}/s-/signalrclient.json (100%) rename {port_versions => versions}/s-/sigslot.json (100%) rename {port_versions => versions}/s-/simage.json (100%) rename {port_versions => versions}/s-/simde.json (100%) rename {port_versions => versions}/s-/simdjson.json (100%) rename {port_versions => versions}/s-/simple-fft.json (100%) rename {port_versions => versions}/s-/simpleini.json (100%) rename {port_versions => versions}/s-/skia.json (100%) rename {port_versions => versions}/s-/skyr-url.json (100%) rename {port_versions => versions}/s-/slikenet.json (100%) rename {port_versions => versions}/s-/sltbench.json (100%) rename {port_versions => versions}/s-/smpeg2.json (100%) rename {port_versions => versions}/s-/snappy.json (100%) rename {port_versions => versions}/s-/sndfile.json (100%) rename {port_versions => versions}/s-/snowhouse.json (100%) rename {port_versions => versions}/s-/so5extra.json (100%) rename {port_versions => versions}/s-/sobjectizer.json (100%) rename {port_versions => versions}/s-/soci.json (100%) rename {port_versions => versions}/s-/socket-io-client.json (100%) rename {port_versions => versions}/s-/sockpp.json (100%) rename {port_versions => versions}/s-/soem.json (100%) rename {port_versions => versions}/s-/soil.json (100%) rename {port_versions => versions}/s-/soil2.json (100%) rename {port_versions => versions}/s-/sokol.json (100%) rename {port_versions => versions}/s-/sol2.json (100%) rename {port_versions => versions}/s-/solid3.json (100%) rename {port_versions => versions}/s-/sophus.json (100%) rename {port_versions => versions}/s-/soqt.json (100%) rename {port_versions => versions}/s-/sord.json (100%) rename {port_versions => versions}/s-/soundtouch.json (100%) rename {port_versions => versions}/s-/soxr.json (100%) rename {port_versions => versions}/s-/spaceland.json (100%) rename {port_versions => versions}/s-/span-lite.json (100%) rename {port_versions => versions}/s-/sparsehash.json (100%) rename {port_versions => versions}/s-/sparsepp.json (100%) rename {port_versions => versions}/s-/spatialite-tools.json (100%) rename {port_versions => versions}/s-/spdk-dpdk.json (100%) rename {port_versions => versions}/s-/spdk-ipsec.json (100%) rename {port_versions => versions}/s-/spdk-isal.json (100%) rename {port_versions => versions}/s-/spdk.json (100%) rename {port_versions => versions}/s-/spdlog.json (100%) rename {port_versions => versions}/s-/spectra.json (100%) rename {port_versions => versions}/s-/speex.json (100%) rename {port_versions => versions}/s-/speexdsp.json (100%) rename {port_versions => versions}/s-/spirit-po.json (100%) rename {port_versions => versions}/s-/spirv-cross.json (100%) rename {port_versions => versions}/s-/spirv-headers.json (100%) rename {port_versions => versions}/s-/spirv-tools.json (100%) rename {port_versions => versions}/s-/sprout.json (100%) rename {port_versions => versions}/s-/spscqueue.json (100%) rename {port_versions => versions}/s-/sqlcipher.json (100%) rename {port_versions => versions}/s-/sqlite-modern-cpp.json (100%) rename {port_versions => versions}/s-/sqlite-orm.json (100%) rename {port_versions => versions}/s-/sqlite3.json (100%) rename {port_versions => versions}/s-/sqlitecpp.json (100%) rename {port_versions => versions}/s-/sqlpp11-connector-mysql.json (100%) rename {port_versions => versions}/s-/sqlpp11-connector-sqlite3.json (100%) rename {port_versions => versions}/s-/sqlpp11.json (100%) rename {port_versions => versions}/s-/sratom.json (100%) rename {port_versions => versions}/s-/status-value-lite.json (100%) rename {port_versions => versions}/s-/stb.json (100%) rename {port_versions => versions}/s-/stlab.json (100%) rename {port_versions => versions}/s-/stormlib.json (100%) rename {port_versions => versions}/s-/strict-variant.json (100%) rename {port_versions => versions}/s-/string-theory.json (100%) rename {port_versions => versions}/s-/string-view-lite.json (100%) rename {port_versions => versions}/s-/strtk.json (100%) rename {port_versions => versions}/s-/stx.json (100%) rename {port_versions => versions}/s-/stxxl.json (100%) rename {port_versions => versions}/s-/suitesparse.json (100%) rename {port_versions => versions}/s-/sundials.json (100%) rename {port_versions => versions}/s-/superlu.json (100%) rename {port_versions => versions}/s-/symengine.json (100%) rename {port_versions => versions}/s-/systemc.json (100%) rename {port_versions => versions}/s-/szip.json (100%) rename {port_versions => versions}/t-/tabulate.json (100%) rename {port_versions => versions}/t-/tacopie.json (100%) rename {port_versions => versions}/t-/taglib.json (100%) rename {port_versions => versions}/t-/taocpp-json.json (100%) rename {port_versions => versions}/t-/tap-windows6.json (100%) rename {port_versions => versions}/t-/taskflow.json (100%) rename {port_versions => versions}/t-/tbb.json (100%) rename {port_versions => versions}/t-/tcl.json (100%) rename {port_versions => versions}/t-/tclap.json (100%) rename {port_versions => versions}/t-/teemo.json (100%) rename {port_versions => versions}/t-/telnetpp.json (100%) rename {port_versions => versions}/t-/tensorflow-cc.json (100%) rename {port_versions => versions}/t-/tensorflow-common.json (100%) rename {port_versions => versions}/t-/tensorflow.json (100%) rename {port_versions => versions}/t-/termcolor.json (100%) rename {port_versions => versions}/t-/tesseract.json (100%) rename {port_versions => versions}/t-/tfhe.json (100%) rename {port_versions => versions}/t-/tgbot-cpp.json (100%) rename {port_versions => versions}/t-/tgc.json (100%) rename {port_versions => versions}/t-/tgui.json (100%) rename {port_versions => versions}/t-/theia.json (100%) rename {port_versions => versions}/t-/think-cell-range.json (100%) rename {port_versions => versions}/t-/thor.json (100%) rename {port_versions => versions}/t-/threadpool.json (100%) rename {port_versions => versions}/t-/thrift.json (100%) rename {port_versions => versions}/t-/tidy-html5.json (100%) rename {port_versions => versions}/t-/tiff.json (100%) rename {port_versions => versions}/t-/tinkerforge.json (100%) rename {port_versions => versions}/t-/tiny-aes-c.json (100%) rename {port_versions => versions}/t-/tiny-bignum-c.json (100%) rename {port_versions => versions}/t-/tiny-dnn.json (100%) rename {port_versions => versions}/t-/tiny-process-library.json (100%) rename {port_versions => versions}/t-/tiny-regex-c.json (100%) rename {port_versions => versions}/t-/tinycthread.json (100%) rename {port_versions => versions}/t-/tinydir.json (100%) rename {port_versions => versions}/t-/tinyexif.json (100%) rename {port_versions => versions}/t-/tinyexpr.json (100%) rename {port_versions => versions}/t-/tinyexr.json (100%) rename {port_versions => versions}/t-/tinyfiledialogs.json (100%) rename {port_versions => versions}/t-/tinygltf.json (100%) rename {port_versions => versions}/t-/tinynpy.json (100%) rename {port_versions => versions}/t-/tinyobjloader.json (100%) rename {port_versions => versions}/t-/tinyply.json (100%) rename {port_versions => versions}/t-/tinyspline.json (100%) rename {port_versions => versions}/t-/tinythread.json (100%) rename {port_versions => versions}/t-/tinytoml.json (100%) rename {port_versions => versions}/t-/tinyutf8.json (100%) rename {port_versions => versions}/t-/tinyxml.json (100%) rename {port_versions => versions}/t-/tinyxml2.json (100%) rename {port_versions => versions}/t-/tl-expected.json (100%) rename {port_versions => versions}/t-/tl-function-ref.json (100%) rename {port_versions => versions}/t-/tl-optional.json (100%) rename {port_versions => versions}/t-/tlx.json (100%) rename {port_versions => versions}/t-/tmx.json (100%) rename {port_versions => versions}/t-/tmxlite.json (100%) rename {port_versions => versions}/t-/tmxparser.json (100%) rename {port_versions => versions}/t-/toml11.json (100%) rename {port_versions => versions}/t-/tomlplusplus.json (100%) rename {port_versions => versions}/t-/tool-meson.json (100%) rename {port_versions => versions}/t-/torch-th.json (100%) rename {port_versions => versions}/t-/trantor.json (100%) rename {port_versions => versions}/t-/tre.json (100%) rename {port_versions => versions}/t-/treehopper.json (100%) rename {port_versions => versions}/t-/triangle.json (100%) rename {port_versions => versions}/t-/trompeloeil.json (100%) rename {port_versions => versions}/t-/tsl-hopscotch-map.json (100%) rename {port_versions => versions}/t-/tsl-ordered-map.json (100%) rename {port_versions => versions}/t-/tsl-sparse-map.json (100%) rename {port_versions => versions}/t-/turbobase64.json (100%) rename {port_versions => versions}/t-/tweeny.json (100%) rename {port_versions => versions}/t-/type-lite.json (100%) rename {port_versions => versions}/t-/type-safe.json (100%) rename {port_versions => versions}/u-/uchardet.json (100%) rename {port_versions => versions}/u-/umock-c.json (100%) rename {port_versions => versions}/u-/unicorn-lib.json (100%) rename {port_versions => versions}/u-/unicorn.json (100%) rename {port_versions => versions}/u-/units.json (100%) rename {port_versions => versions}/u-/unittest-cpp.json (100%) rename {port_versions => versions}/u-/unixodbc.json (100%) rename {port_versions => versions}/u-/unqlite.json (100%) rename {port_versions => versions}/u-/unrar.json (100%) rename {port_versions => versions}/u-/upb.json (100%) rename {port_versions => versions}/u-/urdfdom-headers.json (100%) rename {port_versions => versions}/u-/urdfdom.json (100%) rename {port_versions => versions}/u-/uriparser.json (100%) rename {port_versions => versions}/u-/usbmuxd.json (100%) rename {port_versions => versions}/u-/usd.json (100%) rename {port_versions => versions}/u-/usockets.json (100%) rename {port_versions => versions}/u-/usrsctp.json (100%) rename {port_versions => versions}/u-/utf8h.json (100%) rename {port_versions => versions}/u-/utf8proc.json (100%) rename {port_versions => versions}/u-/utfcpp.json (100%) rename {port_versions => versions}/u-/utfz.json (100%) rename {port_versions => versions}/u-/uthenticode.json (100%) rename {port_versions => versions}/u-/uvatlas.json (100%) rename {port_versions => versions}/u-/uvw.json (100%) rename {port_versions => versions}/u-/uwebsockets.json (100%) rename {port_versions => versions}/v-/v-hacd.json (100%) rename {port_versions => versions}/v-/v8.json (100%) rename {port_versions => versions}/v-/valijson.json (100%) rename {port_versions => versions}/v-/value-ptr-lite.json (100%) rename {port_versions => versions}/v-/variant-lite.json (100%) rename {port_versions => versions}/v-/vc.json (100%) rename {port_versions => versions}/v-/vcglib.json (100%) rename {port_versions => versions}/v-/vcpkg-gfortran.json (100%) rename {port_versions => versions}/v-/vectorclass.json (100%) rename {port_versions => versions}/v-/visit-struct.json (100%) rename {port_versions => versions}/v-/vlfeat.json (100%) rename {port_versions => versions}/v-/vlpp.json (100%) rename {port_versions => versions}/v-/volk.json (100%) rename {port_versions => versions}/v-/vs-yasm.json (100%) rename {port_versions => versions}/v-/vtk-dicom.json (100%) rename {port_versions => versions}/v-/vtk-m.json (100%) rename {port_versions => versions}/v-/vtk.json (100%) rename {port_versions => versions}/v-/vulkan-headers.json (100%) rename {port_versions => versions}/v-/vulkan-hpp.json (100%) rename {port_versions => versions}/v-/vulkan-memory-allocator.json (100%) rename {port_versions => versions}/v-/vulkan.json (100%) rename {port_versions => versions}/v-/vxl.json (100%) rename {port_versions => versions}/w-/wampcc.json (100%) rename {port_versions => versions}/w-/wangle.json (100%) rename {port_versions => versions}/w-/wavelib.json (100%) rename {port_versions => versions}/w-/wavpack.json (100%) rename {port_versions => versions}/w-/websocketpp.json (100%) rename {port_versions => versions}/w-/wepoll.json (100%) rename {port_versions => versions}/w-/wg21-sg14.json (100%) rename {port_versions => versions}/w-/wil.json (100%) rename {port_versions => versions}/w-/wildmidi.json (100%) rename {port_versions => versions}/w-/wincrypt.json (100%) rename {port_versions => versions}/w-/winpcap.json (100%) rename {port_versions => versions}/w-/winreg.json (100%) rename {port_versions => versions}/w-/winsock2.json (100%) rename {port_versions => versions}/w-/wintoast.json (100%) rename {port_versions => versions}/w-/woff2.json (100%) rename {port_versions => versions}/w-/wordnet.json (100%) rename {port_versions => versions}/w-/wpilib.json (100%) rename {port_versions => versions}/w-/wren.json (100%) rename {port_versions => versions}/w-/wt.json (100%) rename {port_versions => versions}/w-/wtl.json (100%) rename {port_versions => versions}/w-/wxchartdir.json (100%) rename {port_versions => versions}/w-/wxwidgets.json (100%) rename {port_versions => versions}/x-/x-plane.json (100%) rename {port_versions => versions}/x-/x264.json (100%) rename {port_versions => versions}/x-/x265.json (100%) rename {port_versions => versions}/x-/xalan-c.json (100%) rename {port_versions => versions}/x-/xbyak.json (100%) rename {port_versions => versions}/x-/xerces-c.json (100%) rename {port_versions => versions}/x-/xeus.json (100%) rename {port_versions => versions}/x-/xframe.json (100%) rename {port_versions => versions}/x-/xlnt.json (100%) rename {port_versions => versions}/x-/xmlsec.json (100%) rename {port_versions => versions}/x-/xmsh.json (100%) rename {port_versions => versions}/x-/xorstr.json (100%) rename {port_versions => versions}/x-/xproperty.json (100%) rename {port_versions => versions}/x-/xsimd.json (100%) rename {port_versions => versions}/x-/xtensor-blas.json (100%) rename {port_versions => versions}/x-/xtensor-fftw.json (100%) rename {port_versions => versions}/x-/xtensor-io.json (100%) rename {port_versions => versions}/x-/xtensor.json (100%) rename {port_versions => versions}/x-/xtl.json (100%) rename {port_versions => versions}/x-/xxhash.json (100%) rename {port_versions => versions}/y-/yajl.json (100%) rename {port_versions => versions}/y-/yaml-cpp.json (100%) rename {port_versions => versions}/y-/yara.json (100%) rename {port_versions => versions}/y-/yas.json (100%) rename {port_versions => versions}/y-/yasm-tool-helper.json (100%) rename {port_versions => versions}/y-/yasm-tool.json (100%) rename {port_versions => versions}/y-/yasm.json (100%) rename {port_versions => versions}/y-/yato.json (100%) rename {port_versions => versions}/y-/yoga.json (100%) rename {port_versions => versions}/z-/z3.json (100%) rename {port_versions => versions}/z-/z85.json (100%) rename {port_versions => versions}/z-/zeromq.json (100%) rename {port_versions => versions}/z-/zfp.json (100%) rename {port_versions => versions}/z-/zkpp.json (100%) rename {port_versions => versions}/z-/zlib.json (100%) rename {port_versions => versions}/z-/zookeeper.json (100%) rename {port_versions => versions}/z-/zopfli.json (100%) rename {port_versions => versions}/z-/zserge-webview.json (100%) rename {port_versions => versions}/z-/zstd.json (100%) rename {port_versions => versions}/z-/zstr.json (100%) rename {port_versions => versions}/z-/zxing-cpp.json (100%) rename {port_versions => versions}/z-/zydis.json (100%) rename {port_versions => versions}/z-/zyre.json (100%) rename {port_versions => versions}/z-/zziplib.json (100%) diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md index 6ceb519125b46e..9a65d1790aa891 100644 --- a/docs/maintainers/maintainer-guide.md +++ b/docs/maintainers/maintainer-guide.md @@ -204,16 +204,16 @@ For Example: See our [manifest files document](manifest-files.md#port-version) for a full explanation of our conventions. -### Update the version files in `port_versions/` of any modified ports +### Update the version files in `versions/` of any modified ports Vcpkg uses a set of metadata files to power its versioning feature. These files are located in the following locations: -* `${VCPKG_ROOT}/port_versions/baseline.json`, (this file is common to all ports) and -* `${VCPKG_ROOT}/port_versions/${first-letter-of-portname}-/${portname}.json` (one per port). +* `${VCPKG_ROOT}/versions/baseline.json`, (this file is common to all ports) and +* `${VCPKG_ROOT}/versions/${first-letter-of-portname}-/${portname}.json` (one per port). For example, for `zlib` the relevant files are: -* `${VCPKG_ROOT}/port_versions/baseline.json` -* `${VCPKG_ROOT}/port_versions/z-/zlib.json` +* `${VCPKG_ROOT}/versions/baseline.json` +* `${VCPKG_ROOT}/versions/z-/zlib.json` We expect that each time you update a port, you also update its version files. diff --git a/docs/specifications/versioning.md b/docs/specifications/versioning.md index 7cbf89aec5ad5f..960e87f1892019 100644 --- a/docs/specifications/versioning.md +++ b/docs/specifications/versioning.md @@ -171,7 +171,7 @@ Baselines are used to set lower boundaries on package versions. A baseline effec But what is a baseline? -In the main registry, the baseline is a file located in `${VCPKG_ROOT}/port_versions/baseline.json`. This file contains a version declaration for each package in vcpkg. The format of this file is the following: +In the main registry, the baseline is a file located in `${VCPKG_ROOT}/versions/baseline.json`. This file contains a version declaration for each package in vcpkg. The format of this file is the following: ```json { @@ -319,9 +319,9 @@ Although the concept of package versions has always been present in vcpkg, the c With the introduction of versioning constraints, it is now possible that a package depends on a port version that does not match the one available locally. This raises a problem as vcpkg needs to know how to acquire the port files for the requested version. -To solve this problem, a new set of metadata needs to be introduced. This specification proposes a that a new “port_versions” folder is added as part of a registry. In the main vcpkg registry, this means a new root level port_versions directory. +To solve this problem, a new set of metadata needs to be introduced. This specification proposes a that a new "versions" folder is added as part of a registry. In the main vcpkg registry, this means a new root level versions directory. -The port_versions directory, from here on referred as the versions database, will contain JSON files for each one of the ports available in the registry. Each file will list all the versions available for a package and contain a Git tree-ish object that vcpkg can check out to obtain that version’s portfiles. +The versions directory, from here on referred as the versions database, will contain JSON files for each one of the ports available in the registry. Each file will list all the versions available for a package and contain a Git tree-ish object that vcpkg can check out to obtain that version’s portfiles. As part of the versioning implementation, a generator for these database files will be implemented. The generator will extract from our repository’s Git history, all the versions of each port that had been available at any moment in time and compile them into these database files. @@ -349,5 +349,5 @@ Example: generated `zlib.json` } ``` -For each port, its corresponding versions file should be located in `port_versions/{first letter of port name}-/{port name}.json`. For example, zlib’s version file will be located in `port_versions/z-/zlib.json`. -Aside from port version files, the current baseline file is located in `port_versions/baseline.json`. +For each port, its corresponding versions file should be located in `versions/{first letter of port name}-/{port name}.json`. For example, zlib’s version file will be located in `versions/z-/zlib.json`. +Aside from port version files, the current baseline file is located in `versions/baseline.json`. diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 index ef7023c8525fb3..1ea2cb36d6772a 100644 --- a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 @@ -1,12 +1,12 @@ . "$PSScriptRoot/../end-to-end-tests-prelude.ps1" -$builtinRegistryArgs = $commonArgs + @("--x-builtin-port-versions-dir=$PSScriptRoot/../../e2e_ports/port_versions") +$builtinRegistryArgs = $commonArgs + @("--x-builtin-registry-versions-dir=$PSScriptRoot/../../e2e_ports/versions") Run-Vcpkg install @builtinRegistryArgs 'vcpkg-internal-e2e-test-port' Throw-IfNotFailed -# We should not look into the port_versions directory unless we have a baseline, +# We should not look into the versions directory unless we have a baseline, # even if we pass the registries feature flag Run-Vcpkg install @builtinRegistryArgs --feature-flags=registries 'vcpkg-internal-e2e-test-port' Throw-IfNotFailed @@ -28,13 +28,13 @@ Copy-Item -Recurse ` -LiteralPath "$PSScriptRoot/../../e2e_ports/vcpkg-internal-e2e-test-port" ` -Destination "$filesystemRegistry" New-Item ` - -Path "$filesystemRegistry/port_versions" ` + -Path "$filesystemRegistry/versions" ` -ItemType Directory Copy-Item ` - -LiteralPath "$PSScriptRoot/../../e2e_ports/port_versions/baseline.json" ` - -Destination "$filesystemRegistry/port_versions/baseline.json" + -LiteralPath "$PSScriptRoot/../../e2e_ports/versions/baseline.json" ` + -Destination "$filesystemRegistry/versions/baseline.json" New-Item ` - -Path "$filesystemRegistry/port_versions/v-" ` + -Path "$filesystemRegistry/versions/v-" ` -ItemType Directory $vcpkgInternalE2eTestPortJson = @{ @@ -46,7 +46,7 @@ $vcpkgInternalE2eTestPortJson = @{ ) } New-Item ` - -Path "$filesystemRegistry/port_versions/v-/vcpkg-internal-e2e-test-port.json" ` + -Path "$filesystemRegistry/versions/v-/vcpkg-internal-e2e-test-port.json" ` -ItemType File ` -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgInternalE2eTestPortJson) @@ -68,7 +68,7 @@ try $CurrentTest = 'git init .' git @gitConfigOptions init . Throw-IfFailed - Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/port_versions" -Destination . + Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/versions" -Destination . Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/vcpkg-internal-e2e-test-port" -Destination . $CurrentTest = 'git add -A' diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 index 11550d7bd72ae8..7f927759f69251 100644 --- a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 @@ -2,16 +2,16 @@ # Test verify versions mkdir $VersionFilesRoot -Copy-Item -Recurse "scripts/testing/version-files/port_versions_incomplete" $VersionFilesRoot +Copy-Item -Recurse "scripts/testing/version-files/versions_incomplete" $VersionFilesRoot $portsRedirectArgsOK = @( "--feature-flags=versions", "--x-builtin-ports-root=scripts/testing/version-files/ports", - "--x-builtin-port-versions-dir=scripts/testing/version-files/port_versions" + "--x-builtin-registry-versions-dir=scripts/testing/version-files/versions" ) $portsRedirectArgsIncomplete = @( "--feature-flags=versions", "--x-builtin-ports-root=scripts/testing/version-files/ports_incomplete", - "--x-builtin-port-versions-dir=$VersionFilesRoot/port_versions_incomplete" + "--x-builtin-registry-versions-dir=$VersionFilesRoot/versions_incomplete" ) $CurrentTest = "x-verify-ci-versions (All files OK)" Write-Host $CurrentTest @@ -77,7 +77,7 @@ foreach ($opt_registries in @("",",registries")) ./vcpkg $commonArgs "--feature-flags=versions$opt_registries" install ` "--dry-run" ` "--x-manifest-root=scripts/testing/version-files/without-default-baseline-2" ` - "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions" + "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions" Throw-IfFailed Require-FileNotExists $buildtreesRoot/versioning @@ -85,7 +85,7 @@ foreach ($opt_registries in @("",",registries")) ./vcpkg $commonArgs "--feature-flags=versions$opt_registries" install ` "--dry-run" ` "--x-manifest-root=scripts/testing/version-files/default-baseline-2" ` - "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions" + "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions" Throw-IfFailed Require-FileExists $buildtreesRoot/versioning @@ -93,6 +93,6 @@ foreach ($opt_registries in @("",",registries")) ./vcpkg $commonArgs "--feature-flags=-versions$opt_registries" install ` "--dry-run" ` "--x-manifest-root=scripts/testing/version-files/default-baseline-2" ` - "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions" + "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions" Throw-IfNotFailed -} \ No newline at end of file +} diff --git a/scripts/e2e_ports/port_versions/baseline.json b/scripts/e2e_ports/versions/baseline.json similarity index 100% rename from scripts/e2e_ports/port_versions/baseline.json rename to scripts/e2e_ports/versions/baseline.json diff --git a/scripts/e2e_ports/port_versions/v-/vcpkg-internal-e2e-test-port.json b/scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json similarity index 100% rename from scripts/e2e_ports/port_versions/v-/vcpkg-internal-e2e-test-port.json rename to scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json diff --git a/scripts/generateBaseline.py b/scripts/generateBaseline.py index d70ab369b01b5c..6488b5425bd82a 100644 --- a/scripts/generateBaseline.py +++ b/scripts/generateBaseline.py @@ -8,7 +8,7 @@ SCRIPT_DIRECTORY = os.path.dirname(os.path.abspath(__file__)) PORTS_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../ports') -VERSIONS_DB_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../port_versions') +VERSIONS_DB_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../versions') def get_version_tag(version): diff --git a/scripts/generatePortVersionsDb.py b/scripts/generatePortVersionsDb.py index 3be4a939e478d7..d35e51b523120b 100644 --- a/scripts/generatePortVersionsDb.py +++ b/scripts/generatePortVersionsDb.py @@ -13,7 +13,7 @@ MAX_PROCESSES = multiprocessing.cpu_count() SCRIPT_DIRECTORY = os.path.dirname(os.path.abspath(__file__)) PORTS_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../ports') -VERSIONS_DB_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../port_versions') +VERSIONS_DB_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../versions') def get_current_git_ref(): @@ -26,7 +26,7 @@ def get_current_git_ref(): return None -def generate_port_versions_file(port_name): +def generate_versions_file(port_name): containing_dir = os.path.join(VERSIONS_DB_DIRECTORY, f'{port_name[0]}-') os.makedirs(containing_dir, exist_ok=True) @@ -43,7 +43,7 @@ def generate_port_versions_file(port_name): output.stdout.strip(), file=sys.stderr) -def generate_port_versions_db(revision): +def generate_versions_db(revision): start_time = time.time() # Assume each directory in ${VCPKG_ROOT}/ports is a different port @@ -54,7 +54,7 @@ def generate_port_versions_db(revision): concurrency = MAX_PROCESSES / 2 print(f'Running {concurrency:.0f} parallel processes') process_pool = multiprocessing.Pool(MAX_PROCESSES) - for i, _ in enumerate(process_pool.imap_unordered(generate_port_versions_file, port_names), 1): + for i, _ in enumerate(process_pool.imap_unordered(generate_versions_file, port_names), 1): sys.stderr.write( f'\rProcessed: {i}/{total_count} ({(i / total_count):.2%})') process_pool.close() @@ -80,7 +80,7 @@ def main(): print(f'Database files already exist for commit {revision}') sys.exit(0) - generate_port_versions_db(revision) + generate_versions_db(revision) if __name__ == "__main__": diff --git a/scripts/testing/version-files/default-baseline-2/port_versions/z-/zlib.json b/scripts/testing/version-files/default-baseline-2/versions/z-/zlib.json similarity index 100% rename from scripts/testing/version-files/default-baseline-2/port_versions/z-/zlib.json rename to scripts/testing/version-files/default-baseline-2/versions/z-/zlib.json diff --git a/scripts/testing/version-files/port_versions/baseline.json b/scripts/testing/version-files/versions/baseline.json similarity index 100% rename from scripts/testing/version-files/port_versions/baseline.json rename to scripts/testing/version-files/versions/baseline.json diff --git a/scripts/testing/version-files/port_versions/c-/cat.json b/scripts/testing/version-files/versions/c-/cat.json similarity index 100% rename from scripts/testing/version-files/port_versions/c-/cat.json rename to scripts/testing/version-files/versions/c-/cat.json diff --git a/scripts/testing/version-files/port_versions/d-/dog.json b/scripts/testing/version-files/versions/d-/dog.json similarity index 100% rename from scripts/testing/version-files/port_versions/d-/dog.json rename to scripts/testing/version-files/versions/d-/dog.json diff --git a/scripts/testing/version-files/port_versions/d-/duck.json b/scripts/testing/version-files/versions/d-/duck.json similarity index 100% rename from scripts/testing/version-files/port_versions/d-/duck.json rename to scripts/testing/version-files/versions/d-/duck.json diff --git a/scripts/testing/version-files/port_versions/m-/mouse.json b/scripts/testing/version-files/versions/m-/mouse.json similarity index 100% rename from scripts/testing/version-files/port_versions/m-/mouse.json rename to scripts/testing/version-files/versions/m-/mouse.json diff --git a/scripts/testing/version-files/port_versions_incomplete/baseline.json b/scripts/testing/version-files/versions_incomplete/baseline.json similarity index 100% rename from scripts/testing/version-files/port_versions_incomplete/baseline.json rename to scripts/testing/version-files/versions_incomplete/baseline.json diff --git a/scripts/testing/version-files/port_versions_incomplete/c-/cat.json b/scripts/testing/version-files/versions_incomplete/c-/cat.json similarity index 100% rename from scripts/testing/version-files/port_versions_incomplete/c-/cat.json rename to scripts/testing/version-files/versions_incomplete/c-/cat.json diff --git a/scripts/testing/version-files/port_versions_incomplete/d-/dog.json b/scripts/testing/version-files/versions_incomplete/d-/dog.json similarity index 100% rename from scripts/testing/version-files/port_versions_incomplete/d-/dog.json rename to scripts/testing/version-files/versions_incomplete/d-/dog.json diff --git a/scripts/testing/version-files/port_versions_incomplete/f-/fish.json b/scripts/testing/version-files/versions_incomplete/f-/fish.json similarity index 100% rename from scripts/testing/version-files/port_versions_incomplete/f-/fish.json rename to scripts/testing/version-files/versions_incomplete/f-/fish.json diff --git a/scripts/testing/version-files/port_versions_incomplete/m-/mouse.json b/scripts/testing/version-files/versions_incomplete/m-/mouse.json similarity index 100% rename from scripts/testing/version-files/port_versions_incomplete/m-/mouse.json rename to scripts/testing/version-files/versions_incomplete/m-/mouse.json diff --git a/scripts/testing/version-files/without-default-baseline-2/port_versions/z-/zlib.json b/scripts/testing/version-files/without-default-baseline-2/versions/z-/zlib.json similarity index 100% rename from scripts/testing/version-files/without-default-baseline-2/port_versions/z-/zlib.json rename to scripts/testing/version-files/without-default-baseline-2/versions/z-/zlib.json diff --git a/test.cmake b/test.cmake deleted file mode 100644 index 9989339c245629..00000000000000 --- a/test.cmake +++ /dev/null @@ -1 +0,0 @@ -execute_process(COMMAND "bash" "-c" "echo \$TEST_ENV_VAR") diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h index 2677e6811bcb8c..365f892a0bc70f 100644 --- a/toolsrc/include/vcpkg/vcpkgcmdarguments.h +++ b/toolsrc/include/vcpkg/vcpkgcmdarguments.h @@ -134,8 +134,8 @@ namespace vcpkg std::unique_ptr scripts_root_dir; constexpr static StringLiteral BUILTIN_PORTS_ROOT_DIR_ARG = "x-builtin-ports-root"; std::unique_ptr builtin_ports_root_dir; - constexpr static StringLiteral BUILTIN_PORT_VERSIONS_DIR_ARG = "x-builtin-port-versions-dir"; - std::unique_ptr builtin_port_versions_dir; + constexpr static StringLiteral BUILTIN_REGISTRY_VERSIONS_DIR_ARG = "x-builtin-registry-versions-dir"; + std::unique_ptr builtin_registry_versions_dir; constexpr static StringLiteral DEFAULT_VISUAL_STUDIO_PATH_ENV = "VCPKG_VISUAL_STUDIO_PATH"; std::unique_ptr default_visual_studio_path; diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index d36ebfb7cff2b4..8a97b258e934cf 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -92,7 +92,7 @@ namespace vcpkg fs::path scripts; fs::path prefab; fs::path builtin_ports; - fs::path builtin_port_versions; + fs::path builtin_registry_versions; fs::path tools; fs::path buildsystems; diff --git a/toolsrc/src/vcpkg-test/arguments.cpp b/toolsrc/src/vcpkg-test/arguments.cpp index 27fa74b8df1e3c..7a7c7015127a72 100644 --- a/toolsrc/src/vcpkg-test/arguments.cpp +++ b/toolsrc/src/vcpkg-test/arguments.cpp @@ -15,7 +15,7 @@ TEST_CASE ("VcpkgCmdArguments from lowercase argument sequence", "[arguments]") "C:\\vcpkg", "--x-scripts-root=C:\\scripts", "--x-builtin-ports-root=C:\\ports", - "--x-builtin-port-versions-dir=C:\\port_versions", + "--x-builtin-registry-versions-dir=C:\\versions", "--debug", "--sendmetrics", "--printmetrics", @@ -28,7 +28,7 @@ TEST_CASE ("VcpkgCmdArguments from lowercase argument sequence", "[arguments]") REQUIRE(*v.vcpkg_root_dir == "C:\\vcpkg"); REQUIRE(*v.scripts_root_dir == "C:\\scripts"); REQUIRE(*v.builtin_ports_root_dir == "C:\\ports"); - REQUIRE(*v.builtin_port_versions_dir == "C:\\port_versions"); + REQUIRE(*v.builtin_registry_versions_dir == "C:\\versions"); REQUIRE(v.debug); REQUIRE(*v.debug.get()); REQUIRE(v.send_metrics); @@ -51,7 +51,7 @@ TEST_CASE ("VcpkgCmdArguments from uppercase argument sequence", "[arguments]") "C:\\vcpkg", "--X-SCRIPTS-ROOT=C:\\scripts", "--X-BUILTIN-PORTS-ROOT=C:\\ports", - "--X-BUILTIN-PORT-VERSIONS-DIR=C:\\port_versions", + "--X-BUILTIN-REGISTRY-VERSIONS-DIR=C:\\versions", "--DEBUG", "--SENDMETRICS", "--PRINTMETRICS", @@ -64,7 +64,7 @@ TEST_CASE ("VcpkgCmdArguments from uppercase argument sequence", "[arguments]") REQUIRE(*v.vcpkg_root_dir == "C:\\vcpkg"); REQUIRE(*v.scripts_root_dir == "C:\\scripts"); REQUIRE(*v.builtin_ports_root_dir == "C:\\ports"); - REQUIRE(*v.builtin_port_versions_dir == "C:\\port_versions"); + REQUIRE(*v.builtin_registry_versions_dir == "C:\\versions"); REQUIRE(v.debug); REQUIRE(*v.debug.get()); REQUIRE(v.send_metrics); diff --git a/toolsrc/src/vcpkg/commands.add-version.cpp b/toolsrc/src/vcpkg/commands.add-version.cpp index fc288eb13874cb..bb4cc213b871ed 100644 --- a/toolsrc/src/vcpkg/commands.add-version.cpp +++ b/toolsrc/src/vcpkg/commands.add-version.cpp @@ -334,7 +334,7 @@ namespace vcpkg::Commands::AddVersion const bool verbose = Util::Sets::contains(parsed_args.switches, OPTION_VERBOSE); auto& fs = paths.get_filesystem(); - auto baseline_path = paths.builtin_port_versions / fs::u8path("baseline.json"); + auto baseline_path = paths.builtin_registry_versions / fs::u8path("baseline.json"); if (!fs.exists(VCPKG_LINE_INFO, baseline_path)) { System::printf( @@ -400,8 +400,8 @@ namespace vcpkg::Commands::AddVersion } const auto& git_tree = git_tree_it->second; - auto port_versions_path = - paths.builtin_port_versions / Strings::concat(port_name[0], '-') / Strings::concat(port_name, ".json"); + auto port_versions_path = paths.builtin_registry_versions / fs::u8path({port_name[0], '-'}) / + fs::u8path(Strings::concat(port_name, ".json")); update_version_db_file( paths, port_name, schemed_version, git_tree, port_versions_path, overwrite_version, verbose, add_all); update_baseline_version(paths, port_name, schemed_version.versiont, baseline_path, verbose); @@ -413,4 +413,4 @@ namespace vcpkg::Commands::AddVersion { AddVersion::perform_and_exit(args, paths); } -} \ No newline at end of file +} diff --git a/toolsrc/src/vcpkg/commands.civerifyversions.cpp b/toolsrc/src/vcpkg/commands.civerifyversions.cpp index 71ced9f76a477d..78269646c642da 100644 --- a/toolsrc/src/vcpkg/commands.civerifyversions.cpp +++ b/toolsrc/src/vcpkg/commands.civerifyversions.cpp @@ -367,8 +367,8 @@ namespace vcpkg::Commands::CIVerifyVersions continue; } - auto versions_file_path = - paths.builtin_port_versions / Strings::concat(port_name[0], '-') / Strings::concat(port_name, ".json"); + auto versions_file_path = paths.builtin_registry_versions / fs::u8path({port_name[0], '-'}) / + fs::u8path(Strings::concat(port_name, ".json")); if (!fs.exists(versions_file_path)) { System::printf(System::Color::error, "FAIL: %s\n", port_name); @@ -415,4 +415,4 @@ namespace vcpkg::Commands::CIVerifyVersions { CIVerifyVersions::perform_and_exit(args, paths); } -} \ No newline at end of file +} diff --git a/toolsrc/src/vcpkg/registries.cpp b/toolsrc/src/vcpkg/registries.cpp index 1e5b9ee7991f1f..4f6c8c0c2f6fc8 100644 --- a/toolsrc/src/vcpkg/registries.cpp +++ b/toolsrc/src/vcpkg/registries.cpp @@ -19,7 +19,7 @@ namespace using Baseline = std::map>; - static fs::path port_versions_dir = fs::u8path("port_versions"); + static const fs::path registry_versions_dir_name = fs::u8path("versions"); // this class is an implementation detail of `BuiltinRegistryEntry`; // when `BuiltinRegistryEntry` is using a port versions file for a port, @@ -72,12 +72,12 @@ namespace { return m_versions_tree.get([this, &paths]() -> fs::path { auto maybe_tree = paths.git_find_object_id_for_remote_registry_path(get_commit_of_repo(paths), - fs::u8path("port_versions")); + registry_versions_dir_name); if (!maybe_tree) { Checks::exit_with_message( VCPKG_LINE_INFO, - "Error: could not find the git tree for `port_versions` in repo `%s` at commit `%s`: %s", + "Error: could not find the git tree for `versions` in repo `%s` at commit `%s`: %s", m_repo, get_commit_of_repo(paths), maybe_tree.error()); @@ -218,9 +218,9 @@ namespace const fs::path& path_to_baseline, StringView identifier = {}); - void load_all_port_names_from_port_versions(std::vector& out, - const VcpkgPaths& paths, - const fs::path& port_versions_path) + void load_all_port_names_from_registry_versions(std::vector& out, + const VcpkgPaths& paths, + const fs::path& port_versions_path) { for (auto super_directory : fs::directory_iterator(port_versions_path)) { @@ -247,11 +247,11 @@ namespace // { BuiltinRegistry::RegistryImplementation std::unique_ptr BuiltinRegistry::get_port_entry(const VcpkgPaths& paths, StringView port_name) const { - auto versions_path = paths.builtin_port_versions / relative_path_to_versions(port_name); + auto versions_path = paths.builtin_registry_versions / relative_path_to_versions(port_name); if (!m_baseline_identifier.empty() && paths.get_filesystem().exists(versions_path)) { - auto maybe_version_entries = - load_versions_file(paths.get_filesystem(), VersionDbType::Git, paths.builtin_port_versions, port_name); + auto maybe_version_entries = load_versions_file( + paths.get_filesystem(), VersionDbType::Git, paths.builtin_registry_versions, port_name); Checks::check_maybe_upgrade( VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: " + maybe_version_entries.error()); auto version_entries = std::move(maybe_version_entries).value_or_exit(VCPKG_LINE_INFO); @@ -300,7 +300,7 @@ namespace ExpectedS try_parse_builtin_baseline(const VcpkgPaths& paths, StringView baseline_identifier) { if (baseline_identifier.size() == 0) return Baseline{}; - auto path_to_baseline = paths.builtin_port_versions / fs::u8path("baseline.json"); + auto path_to_baseline = paths.builtin_registry_versions / fs::u8path("baseline.json"); auto res_baseline = load_baseline_versions(paths, path_to_baseline, baseline_identifier); if (!res_baseline.has_value()) @@ -384,9 +384,9 @@ namespace void BuiltinRegistry::get_all_port_names(std::vector& out, const VcpkgPaths& paths) const { - if (!m_baseline_identifier.empty() && paths.get_filesystem().exists(paths.builtin_port_versions)) + if (!m_baseline_identifier.empty() && paths.get_filesystem().exists(paths.builtin_registry_versions)) { - load_all_port_names_from_port_versions(out, paths, paths.builtin_port_versions); + load_all_port_names_from_registry_versions(out, paths, paths.builtin_registry_versions); } for (auto port_directory : fs::directory_iterator(paths.builtin_ports_directory())) @@ -402,7 +402,7 @@ namespace // { FilesystemRegistry::RegistryImplementation Baseline parse_filesystem_baseline(const VcpkgPaths& paths, const fs::path& root, StringView baseline_identifier) { - auto path_to_baseline = root / port_versions_dir / fs::u8path("baseline.json"); + auto path_to_baseline = root / registry_versions_dir_name / fs::u8path("baseline.json"); auto res_baseline = load_baseline_versions(paths, path_to_baseline, baseline_identifier); if (auto opt_baseline = res_baseline.get()) { @@ -445,9 +445,9 @@ namespace StringView port_name) const { auto maybe_version_entries = load_versions_file( - paths.get_filesystem(), VersionDbType::Filesystem, m_path / port_versions_dir, port_name, m_path); + paths.get_filesystem(), VersionDbType::Filesystem, m_path / registry_versions_dir_name, port_name, m_path); Checks::check_maybe_upgrade( - VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: " + maybe_version_entries.error()); + VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: %s", maybe_version_entries.error()); auto version_entries = std::move(maybe_version_entries).value_or_exit(VCPKG_LINE_INFO); auto res = std::make_unique(port_name.to_string()); @@ -461,7 +461,7 @@ namespace void FilesystemRegistry::get_all_port_names(std::vector& out, const VcpkgPaths& paths) const { - load_all_port_names_from_port_versions(out, paths, m_path / port_versions_dir); + load_all_port_names_from_registry_versions(out, paths, m_path / registry_versions_dir_name); } // } FilesystemRegistry::RegistryImplementation @@ -526,7 +526,7 @@ namespace m_repo, explicit_hash.error()); } - auto path_to_baseline = fs::u8path("port_versions") / fs::u8path("baseline.json"); + auto path_to_baseline = registry_versions_dir_name / fs::u8path("baseline.json"); auto maybe_contents = paths.git_show_from_remote_registry(*explicit_hash.get(), path_to_baseline); if (!maybe_contents.has_value()) { @@ -573,7 +573,7 @@ namespace void GitRegistry::get_all_port_names(std::vector& out, const VcpkgPaths& paths) const { auto versions_path = get_versions_tree_path(paths); - load_all_port_names_from_port_versions(out, paths, versions_path); + load_all_port_names_from_registry_versions(out, paths, versions_path); } // } GitRegistry::RegistryImplementation @@ -616,7 +616,7 @@ namespace auto& name = scfl->source_control_file->core_paragraph->name; return Strings::format( "Error: no version entry for %s at version %s.\n" - "We are currently using the version in the ports tree (%s), since no %s.json was found in /port_versions.", + "We are currently using the version in the ports tree (%s), since no %s.json was found in /versions.", name, version.to_string(), scfl->to_versiont().to_string(), @@ -958,7 +958,7 @@ namespace ExpectedS> load_versions_file(Files::Filesystem& fs, VersionDbType type, - const fs::path& port_versions, + const fs::path& registry_versions, StringView port_name, const fs::path& registry_root) { @@ -966,7 +966,7 @@ namespace !(type == VersionDbType::Filesystem && registry_root.empty()), "Bug in vcpkg; type should never = Filesystem when registry_root is empty."); - auto versions_file_path = port_versions / relative_path_to_versions(port_name); + auto versions_file_path = registry_versions / relative_path_to_versions(port_name); if (!fs.exists(versions_file_path)) { @@ -1180,7 +1180,7 @@ namespace vcpkg StringView port_name) { auto maybe_versions = - load_versions_file(paths.get_filesystem(), VersionDbType::Git, paths.builtin_port_versions, port_name); + load_versions_file(paths.get_filesystem(), VersionDbType::Git, paths.builtin_registry_versions, port_name); if (auto pversions = maybe_versions.get()) { return Util::fmap( diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp index 648b2065cfb65a..e5e8e5aad485df 100644 --- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp +++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp @@ -277,7 +277,7 @@ namespace vcpkg {PACKAGES_ROOT_DIR_ARG, &VcpkgCmdArguments::packages_root_dir}, {SCRIPTS_ROOT_DIR_ARG, &VcpkgCmdArguments::scripts_root_dir}, {BUILTIN_PORTS_ROOT_DIR_ARG, &VcpkgCmdArguments::builtin_ports_root_dir}, - {BUILTIN_PORT_VERSIONS_DIR_ARG, &VcpkgCmdArguments::builtin_port_versions_dir}, + {BUILTIN_REGISTRY_VERSIONS_DIR_ARG, &VcpkgCmdArguments::builtin_registry_versions_dir}, }; constexpr static std::pair VcpkgCmdArguments::*> @@ -630,7 +630,7 @@ namespace vcpkg table.format(opt(SCRIPTS_ROOT_DIR_ARG, "=", ""), "(Experimental) Specify the scripts root directory"); table.format(opt(BUILTIN_PORTS_ROOT_DIR_ARG, "=", ""), "(Experimental) Specify the packages root directory"); - table.format(opt(BUILTIN_PORT_VERSIONS_DIR_ARG, "=", ""), + table.format(opt(BUILTIN_REGISTRY_VERSIONS_DIR_ARG, "=", ""), "(Experimental) Specify the versions root directory"); table.format(opt(JSON_SWITCH, "", ""), "(Experimental) Request JSON output"); } @@ -920,7 +920,7 @@ namespace vcpkg constexpr StringLiteral VcpkgCmdArguments::PACKAGES_ROOT_DIR_ARG; constexpr StringLiteral VcpkgCmdArguments::SCRIPTS_ROOT_DIR_ARG; constexpr StringLiteral VcpkgCmdArguments::BUILTIN_PORTS_ROOT_DIR_ARG; - constexpr StringLiteral VcpkgCmdArguments::BUILTIN_PORT_VERSIONS_DIR_ARG; + constexpr StringLiteral VcpkgCmdArguments::BUILTIN_REGISTRY_VERSIONS_DIR_ARG; constexpr StringLiteral VcpkgCmdArguments::DEFAULT_VISUAL_STUDIO_PATH_ENV; diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 1d347ea94322dc..e6fa3a0a54f54d 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -349,8 +349,8 @@ If you wish to silence this error and use classic mode, you can: scripts = process_input_directory(filesystem, root, args.scripts_root_dir.get(), "scripts", VCPKG_LINE_INFO); builtin_ports = process_output_directory(filesystem, root, args.builtin_ports_root_dir.get(), "ports", VCPKG_LINE_INFO); - builtin_port_versions = process_output_directory( - filesystem, root, args.builtin_port_versions_dir.get(), "port_versions", VCPKG_LINE_INFO); + builtin_registry_versions = process_output_directory( + filesystem, root, args.builtin_registry_versions_dir.get(), "versions", VCPKG_LINE_INFO); prefab = root / fs::u8path("prefab"); if (args.default_visual_studio_path) @@ -653,7 +653,7 @@ If you wish to silence this error and use classic mode, you can: if (!fs.exists(destination)) { const fs::path destination_tmp = destination_parent / fs::u8path("baseline.json.tmp"); - auto treeish = Strings::concat(commit_sha, ":port_versions/baseline.json"); + auto treeish = Strings::concat(commit_sha, ":versions/baseline.json"); auto maybe_contents = git_show(treeish, this->root / fs::u8path(".git")); if (auto contents = maybe_contents.get()) { diff --git a/port_versions/3-/3fd.json b/versions/3-/3fd.json similarity index 100% rename from port_versions/3-/3fd.json rename to versions/3-/3fd.json diff --git a/port_versions/7-/7zip.json b/versions/7-/7zip.json similarity index 100% rename from port_versions/7-/7zip.json rename to versions/7-/7zip.json diff --git a/port_versions/a-/abseil.json b/versions/a-/abseil.json similarity index 100% rename from port_versions/a-/abseil.json rename to versions/a-/abseil.json diff --git a/port_versions/a-/absent.json b/versions/a-/absent.json similarity index 100% rename from port_versions/a-/absent.json rename to versions/a-/absent.json diff --git a/port_versions/a-/ace.json b/versions/a-/ace.json similarity index 100% rename from port_versions/a-/ace.json rename to versions/a-/ace.json diff --git a/port_versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json similarity index 100% rename from port_versions/a-/activemq-cpp.json rename to versions/a-/activemq-cpp.json diff --git a/port_versions/a-/ade.json b/versions/a-/ade.json similarity index 100% rename from port_versions/a-/ade.json rename to versions/a-/ade.json diff --git a/port_versions/a-/aixlog.json b/versions/a-/aixlog.json similarity index 100% rename from port_versions/a-/aixlog.json rename to versions/a-/aixlog.json diff --git a/port_versions/a-/akali.json b/versions/a-/akali.json similarity index 100% rename from port_versions/a-/akali.json rename to versions/a-/akali.json diff --git a/port_versions/a-/alac-decoder.json b/versions/a-/alac-decoder.json similarity index 100% rename from port_versions/a-/alac-decoder.json rename to versions/a-/alac-decoder.json diff --git a/port_versions/a-/alac.json b/versions/a-/alac.json similarity index 100% rename from port_versions/a-/alac.json rename to versions/a-/alac.json diff --git a/port_versions/a-/alembic.json b/versions/a-/alembic.json similarity index 100% rename from port_versions/a-/alembic.json rename to versions/a-/alembic.json diff --git a/port_versions/a-/aliyun-oss-c-sdk.json b/versions/a-/aliyun-oss-c-sdk.json similarity index 100% rename from port_versions/a-/aliyun-oss-c-sdk.json rename to versions/a-/aliyun-oss-c-sdk.json diff --git a/port_versions/a-/allegro5.json b/versions/a-/allegro5.json similarity index 100% rename from port_versions/a-/allegro5.json rename to versions/a-/allegro5.json diff --git a/port_versions/a-/ampl-asl.json b/versions/a-/ampl-asl.json similarity index 100% rename from port_versions/a-/ampl-asl.json rename to versions/a-/ampl-asl.json diff --git a/port_versions/a-/ampl-mp.json b/versions/a-/ampl-mp.json similarity index 100% rename from port_versions/a-/ampl-mp.json rename to versions/a-/ampl-mp.json diff --git a/port_versions/a-/amqpcpp.json b/versions/a-/amqpcpp.json similarity index 100% rename from port_versions/a-/amqpcpp.json rename to versions/a-/amqpcpp.json diff --git a/port_versions/a-/anax.json b/versions/a-/anax.json similarity index 100% rename from port_versions/a-/anax.json rename to versions/a-/anax.json diff --git a/port_versions/a-/angelscript.json b/versions/a-/angelscript.json similarity index 100% rename from port_versions/a-/angelscript.json rename to versions/a-/angelscript.json diff --git a/port_versions/a-/angle.json b/versions/a-/angle.json similarity index 100% rename from port_versions/a-/angle.json rename to versions/a-/angle.json diff --git a/port_versions/a-/antlr4.json b/versions/a-/antlr4.json similarity index 100% rename from port_versions/a-/antlr4.json rename to versions/a-/antlr4.json diff --git a/port_versions/a-/any-lite.json b/versions/a-/any-lite.json similarity index 100% rename from port_versions/a-/any-lite.json rename to versions/a-/any-lite.json diff --git a/port_versions/a-/anyrpc.json b/versions/a-/anyrpc.json similarity index 100% rename from port_versions/a-/anyrpc.json rename to versions/a-/anyrpc.json diff --git a/port_versions/a-/apr-util.json b/versions/a-/apr-util.json similarity index 100% rename from port_versions/a-/apr-util.json rename to versions/a-/apr-util.json diff --git a/port_versions/a-/apr.json b/versions/a-/apr.json similarity index 100% rename from port_versions/a-/apr.json rename to versions/a-/apr.json diff --git a/port_versions/a-/arb.json b/versions/a-/arb.json similarity index 100% rename from port_versions/a-/arb.json rename to versions/a-/arb.json diff --git a/port_versions/a-/arcus.json b/versions/a-/arcus.json similarity index 100% rename from port_versions/a-/arcus.json rename to versions/a-/arcus.json diff --git a/port_versions/a-/argagg.json b/versions/a-/argagg.json similarity index 100% rename from port_versions/a-/argagg.json rename to versions/a-/argagg.json diff --git a/port_versions/a-/argh.json b/versions/a-/argh.json similarity index 100% rename from port_versions/a-/argh.json rename to versions/a-/argh.json diff --git a/port_versions/a-/argparse.json b/versions/a-/argparse.json similarity index 100% rename from port_versions/a-/argparse.json rename to versions/a-/argparse.json diff --git a/port_versions/a-/args.json b/versions/a-/args.json similarity index 100% rename from port_versions/a-/args.json rename to versions/a-/args.json diff --git a/port_versions/a-/argtable2.json b/versions/a-/argtable2.json similarity index 100% rename from port_versions/a-/argtable2.json rename to versions/a-/argtable2.json diff --git a/port_versions/a-/argtable3.json b/versions/a-/argtable3.json similarity index 100% rename from port_versions/a-/argtable3.json rename to versions/a-/argtable3.json diff --git a/port_versions/a-/argumentum.json b/versions/a-/argumentum.json similarity index 100% rename from port_versions/a-/argumentum.json rename to versions/a-/argumentum.json diff --git a/port_versions/a-/armadillo.json b/versions/a-/armadillo.json similarity index 100% rename from port_versions/a-/armadillo.json rename to versions/a-/armadillo.json diff --git a/port_versions/a-/arrayfire.json b/versions/a-/arrayfire.json similarity index 100% rename from port_versions/a-/arrayfire.json rename to versions/a-/arrayfire.json diff --git a/port_versions/a-/arrow.json b/versions/a-/arrow.json similarity index 100% rename from port_versions/a-/arrow.json rename to versions/a-/arrow.json diff --git a/port_versions/a-/ashes.json b/versions/a-/ashes.json similarity index 100% rename from port_versions/a-/ashes.json rename to versions/a-/ashes.json diff --git a/port_versions/a-/asio.json b/versions/a-/asio.json similarity index 100% rename from port_versions/a-/asio.json rename to versions/a-/asio.json diff --git a/port_versions/a-/asiosdk.json b/versions/a-/asiosdk.json similarity index 100% rename from port_versions/a-/asiosdk.json rename to versions/a-/asiosdk.json diff --git a/port_versions/a-/asmjit.json b/versions/a-/asmjit.json similarity index 100% rename from port_versions/a-/asmjit.json rename to versions/a-/asmjit.json diff --git a/port_versions/a-/assimp.json b/versions/a-/assimp.json similarity index 100% rename from port_versions/a-/assimp.json rename to versions/a-/assimp.json diff --git a/port_versions/a-/asynch.json b/versions/a-/asynch.json similarity index 100% rename from port_versions/a-/asynch.json rename to versions/a-/asynch.json diff --git a/port_versions/a-/asyncplusplus.json b/versions/a-/asyncplusplus.json similarity index 100% rename from port_versions/a-/asyncplusplus.json rename to versions/a-/asyncplusplus.json diff --git a/port_versions/a-/atk.json b/versions/a-/atk.json similarity index 100% rename from port_versions/a-/atk.json rename to versions/a-/atk.json diff --git a/port_versions/a-/atkmm.json b/versions/a-/atkmm.json similarity index 100% rename from port_versions/a-/atkmm.json rename to versions/a-/atkmm.json diff --git a/port_versions/a-/atlmfc.json b/versions/a-/atlmfc.json similarity index 100% rename from port_versions/a-/atlmfc.json rename to versions/a-/atlmfc.json diff --git a/port_versions/a-/aubio.json b/versions/a-/aubio.json similarity index 100% rename from port_versions/a-/aubio.json rename to versions/a-/aubio.json diff --git a/port_versions/a-/audiofile.json b/versions/a-/audiofile.json similarity index 100% rename from port_versions/a-/audiofile.json rename to versions/a-/audiofile.json diff --git a/port_versions/a-/aurora.json b/versions/a-/aurora.json similarity index 100% rename from port_versions/a-/aurora.json rename to versions/a-/aurora.json diff --git a/port_versions/a-/autobahn.json b/versions/a-/autobahn.json similarity index 100% rename from port_versions/a-/autobahn.json rename to versions/a-/autobahn.json diff --git a/port_versions/a-/avisynthplus.json b/versions/a-/avisynthplus.json similarity index 100% rename from port_versions/a-/avisynthplus.json rename to versions/a-/avisynthplus.json diff --git a/port_versions/a-/avro-c.json b/versions/a-/avro-c.json similarity index 100% rename from port_versions/a-/avro-c.json rename to versions/a-/avro-c.json diff --git a/port_versions/a-/avro-cpp.json b/versions/a-/avro-cpp.json similarity index 100% rename from port_versions/a-/avro-cpp.json rename to versions/a-/avro-cpp.json diff --git a/port_versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json similarity index 100% rename from port_versions/a-/aws-c-common.json rename to versions/a-/aws-c-common.json diff --git a/port_versions/a-/aws-c-event-stream.json b/versions/a-/aws-c-event-stream.json similarity index 100% rename from port_versions/a-/aws-c-event-stream.json rename to versions/a-/aws-c-event-stream.json diff --git a/port_versions/a-/aws-checksums.json b/versions/a-/aws-checksums.json similarity index 100% rename from port_versions/a-/aws-checksums.json rename to versions/a-/aws-checksums.json diff --git a/port_versions/a-/aws-lambda-cpp.json b/versions/a-/aws-lambda-cpp.json similarity index 100% rename from port_versions/a-/aws-lambda-cpp.json rename to versions/a-/aws-lambda-cpp.json diff --git a/port_versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json similarity index 100% rename from port_versions/a-/aws-sdk-cpp.json rename to versions/a-/aws-sdk-cpp.json diff --git a/port_versions/a-/azmq.json b/versions/a-/azmq.json similarity index 100% rename from port_versions/a-/azmq.json rename to versions/a-/azmq.json diff --git a/port_versions/a-/azure-c-shared-utility.json b/versions/a-/azure-c-shared-utility.json similarity index 100% rename from port_versions/a-/azure-c-shared-utility.json rename to versions/a-/azure-c-shared-utility.json diff --git a/port_versions/a-/azure-iot-sdk-c.json b/versions/a-/azure-iot-sdk-c.json similarity index 100% rename from port_versions/a-/azure-iot-sdk-c.json rename to versions/a-/azure-iot-sdk-c.json diff --git a/port_versions/a-/azure-kinect-sensor-sdk.json b/versions/a-/azure-kinect-sensor-sdk.json similarity index 100% rename from port_versions/a-/azure-kinect-sensor-sdk.json rename to versions/a-/azure-kinect-sensor-sdk.json diff --git a/port_versions/a-/azure-macro-utils-c.json b/versions/a-/azure-macro-utils-c.json similarity index 100% rename from port_versions/a-/azure-macro-utils-c.json rename to versions/a-/azure-macro-utils-c.json diff --git a/port_versions/a-/azure-storage-cpp.json b/versions/a-/azure-storage-cpp.json similarity index 100% rename from port_versions/a-/azure-storage-cpp.json rename to versions/a-/azure-storage-cpp.json diff --git a/port_versions/a-/azure-uamqp-c.json b/versions/a-/azure-uamqp-c.json similarity index 100% rename from port_versions/a-/azure-uamqp-c.json rename to versions/a-/azure-uamqp-c.json diff --git a/port_versions/a-/azure-uhttp-c.json b/versions/a-/azure-uhttp-c.json similarity index 100% rename from port_versions/a-/azure-uhttp-c.json rename to versions/a-/azure-uhttp-c.json diff --git a/port_versions/a-/azure-umqtt-c.json b/versions/a-/azure-umqtt-c.json similarity index 100% rename from port_versions/a-/azure-umqtt-c.json rename to versions/a-/azure-umqtt-c.json diff --git a/port_versions/b-/basisu.json b/versions/b-/basisu.json similarity index 100% rename from port_versions/b-/basisu.json rename to versions/b-/basisu.json diff --git a/port_versions/b-/bcg729.json b/versions/b-/bcg729.json similarity index 100% rename from port_versions/b-/bcg729.json rename to versions/b-/bcg729.json diff --git a/port_versions/b-/bde.json b/versions/b-/bde.json similarity index 100% rename from port_versions/b-/bde.json rename to versions/b-/bde.json diff --git a/port_versions/b-/bdwgc.json b/versions/b-/bdwgc.json similarity index 100% rename from port_versions/b-/bdwgc.json rename to versions/b-/bdwgc.json diff --git a/port_versions/b-/beast.json b/versions/b-/beast.json similarity index 100% rename from port_versions/b-/beast.json rename to versions/b-/beast.json diff --git a/port_versions/b-/behaviortree-cpp.json b/versions/b-/behaviortree-cpp.json similarity index 100% rename from port_versions/b-/behaviortree-cpp.json rename to versions/b-/behaviortree-cpp.json diff --git a/port_versions/b-/benchmark.json b/versions/b-/benchmark.json similarity index 100% rename from port_versions/b-/benchmark.json rename to versions/b-/benchmark.json diff --git a/port_versions/b-/bento4.json b/versions/b-/bento4.json similarity index 100% rename from port_versions/b-/bento4.json rename to versions/b-/bento4.json diff --git a/port_versions/b-/berkeleydb.json b/versions/b-/berkeleydb.json similarity index 100% rename from port_versions/b-/berkeleydb.json rename to versions/b-/berkeleydb.json diff --git a/port_versions/b-/bfgroup-lyra.json b/versions/b-/bfgroup-lyra.json similarity index 100% rename from port_versions/b-/bfgroup-lyra.json rename to versions/b-/bfgroup-lyra.json diff --git a/port_versions/b-/bigint.json b/versions/b-/bigint.json similarity index 100% rename from port_versions/b-/bigint.json rename to versions/b-/bigint.json diff --git a/port_versions/b-/binn.json b/versions/b-/binn.json similarity index 100% rename from port_versions/b-/binn.json rename to versions/b-/binn.json diff --git a/port_versions/b-/bitmagic.json b/versions/b-/bitmagic.json similarity index 100% rename from port_versions/b-/bitmagic.json rename to versions/b-/bitmagic.json diff --git a/port_versions/b-/bitserializer-cpprestjson.json b/versions/b-/bitserializer-cpprestjson.json similarity index 100% rename from port_versions/b-/bitserializer-cpprestjson.json rename to versions/b-/bitserializer-cpprestjson.json diff --git a/port_versions/b-/bitserializer-pugixml.json b/versions/b-/bitserializer-pugixml.json similarity index 100% rename from port_versions/b-/bitserializer-pugixml.json rename to versions/b-/bitserializer-pugixml.json diff --git a/port_versions/b-/bitserializer-rapidjson.json b/versions/b-/bitserializer-rapidjson.json similarity index 100% rename from port_versions/b-/bitserializer-rapidjson.json rename to versions/b-/bitserializer-rapidjson.json diff --git a/port_versions/b-/bitserializer-rapidyaml.json b/versions/b-/bitserializer-rapidyaml.json similarity index 100% rename from port_versions/b-/bitserializer-rapidyaml.json rename to versions/b-/bitserializer-rapidyaml.json diff --git a/port_versions/b-/bitserializer.json b/versions/b-/bitserializer.json similarity index 100% rename from port_versions/b-/bitserializer.json rename to versions/b-/bitserializer.json diff --git a/port_versions/b-/bitsery.json b/versions/b-/bitsery.json similarity index 100% rename from port_versions/b-/bitsery.json rename to versions/b-/bitsery.json diff --git a/port_versions/b-/blas.json b/versions/b-/blas.json similarity index 100% rename from port_versions/b-/blas.json rename to versions/b-/blas.json diff --git a/port_versions/b-/blaze.json b/versions/b-/blaze.json similarity index 100% rename from port_versions/b-/blaze.json rename to versions/b-/blaze.json diff --git a/port_versions/b-/blend2d.json b/versions/b-/blend2d.json similarity index 100% rename from port_versions/b-/blend2d.json rename to versions/b-/blend2d.json diff --git a/port_versions/b-/blitz.json b/versions/b-/blitz.json similarity index 100% rename from port_versions/b-/blitz.json rename to versions/b-/blitz.json diff --git a/port_versions/b-/blosc.json b/versions/b-/blosc.json similarity index 100% rename from port_versions/b-/blosc.json rename to versions/b-/blosc.json diff --git a/port_versions/b-/bond.json b/versions/b-/bond.json similarity index 100% rename from port_versions/b-/bond.json rename to versions/b-/bond.json diff --git a/port_versions/b-/boolinq.json b/versions/b-/boolinq.json similarity index 100% rename from port_versions/b-/boolinq.json rename to versions/b-/boolinq.json diff --git a/port_versions/b-/boost-accumulators.json b/versions/b-/boost-accumulators.json similarity index 100% rename from port_versions/b-/boost-accumulators.json rename to versions/b-/boost-accumulators.json diff --git a/port_versions/b-/boost-algorithm.json b/versions/b-/boost-algorithm.json similarity index 100% rename from port_versions/b-/boost-algorithm.json rename to versions/b-/boost-algorithm.json diff --git a/port_versions/b-/boost-align.json b/versions/b-/boost-align.json similarity index 100% rename from port_versions/b-/boost-align.json rename to versions/b-/boost-align.json diff --git a/port_versions/b-/boost-any.json b/versions/b-/boost-any.json similarity index 100% rename from port_versions/b-/boost-any.json rename to versions/b-/boost-any.json diff --git a/port_versions/b-/boost-array.json b/versions/b-/boost-array.json similarity index 100% rename from port_versions/b-/boost-array.json rename to versions/b-/boost-array.json diff --git a/port_versions/b-/boost-asio.json b/versions/b-/boost-asio.json similarity index 100% rename from port_versions/b-/boost-asio.json rename to versions/b-/boost-asio.json diff --git a/port_versions/b-/boost-assert.json b/versions/b-/boost-assert.json similarity index 100% rename from port_versions/b-/boost-assert.json rename to versions/b-/boost-assert.json diff --git a/port_versions/b-/boost-assign.json b/versions/b-/boost-assign.json similarity index 100% rename from port_versions/b-/boost-assign.json rename to versions/b-/boost-assign.json diff --git a/port_versions/b-/boost-atomic.json b/versions/b-/boost-atomic.json similarity index 100% rename from port_versions/b-/boost-atomic.json rename to versions/b-/boost-atomic.json diff --git a/port_versions/b-/boost-beast.json b/versions/b-/boost-beast.json similarity index 100% rename from port_versions/b-/boost-beast.json rename to versions/b-/boost-beast.json diff --git a/port_versions/b-/boost-bimap.json b/versions/b-/boost-bimap.json similarity index 100% rename from port_versions/b-/boost-bimap.json rename to versions/b-/boost-bimap.json diff --git a/port_versions/b-/boost-bind.json b/versions/b-/boost-bind.json similarity index 100% rename from port_versions/b-/boost-bind.json rename to versions/b-/boost-bind.json diff --git a/port_versions/b-/boost-build.json b/versions/b-/boost-build.json similarity index 100% rename from port_versions/b-/boost-build.json rename to versions/b-/boost-build.json diff --git a/port_versions/b-/boost-callable-traits.json b/versions/b-/boost-callable-traits.json similarity index 100% rename from port_versions/b-/boost-callable-traits.json rename to versions/b-/boost-callable-traits.json diff --git a/port_versions/b-/boost-chrono.json b/versions/b-/boost-chrono.json similarity index 100% rename from port_versions/b-/boost-chrono.json rename to versions/b-/boost-chrono.json diff --git a/port_versions/b-/boost-circular-buffer.json b/versions/b-/boost-circular-buffer.json similarity index 100% rename from port_versions/b-/boost-circular-buffer.json rename to versions/b-/boost-circular-buffer.json diff --git a/port_versions/b-/boost-compatibility.json b/versions/b-/boost-compatibility.json similarity index 100% rename from port_versions/b-/boost-compatibility.json rename to versions/b-/boost-compatibility.json diff --git a/port_versions/b-/boost-compute.json b/versions/b-/boost-compute.json similarity index 100% rename from port_versions/b-/boost-compute.json rename to versions/b-/boost-compute.json diff --git a/port_versions/b-/boost-concept-check.json b/versions/b-/boost-concept-check.json similarity index 100% rename from port_versions/b-/boost-concept-check.json rename to versions/b-/boost-concept-check.json diff --git a/port_versions/b-/boost-config.json b/versions/b-/boost-config.json similarity index 100% rename from port_versions/b-/boost-config.json rename to versions/b-/boost-config.json diff --git a/port_versions/b-/boost-container-hash.json b/versions/b-/boost-container-hash.json similarity index 100% rename from port_versions/b-/boost-container-hash.json rename to versions/b-/boost-container-hash.json diff --git a/port_versions/b-/boost-container.json b/versions/b-/boost-container.json similarity index 100% rename from port_versions/b-/boost-container.json rename to versions/b-/boost-container.json diff --git a/port_versions/b-/boost-context.json b/versions/b-/boost-context.json similarity index 100% rename from port_versions/b-/boost-context.json rename to versions/b-/boost-context.json diff --git a/port_versions/b-/boost-contract.json b/versions/b-/boost-contract.json similarity index 100% rename from port_versions/b-/boost-contract.json rename to versions/b-/boost-contract.json diff --git a/port_versions/b-/boost-conversion.json b/versions/b-/boost-conversion.json similarity index 100% rename from port_versions/b-/boost-conversion.json rename to versions/b-/boost-conversion.json diff --git a/port_versions/b-/boost-convert.json b/versions/b-/boost-convert.json similarity index 100% rename from port_versions/b-/boost-convert.json rename to versions/b-/boost-convert.json diff --git a/port_versions/b-/boost-core.json b/versions/b-/boost-core.json similarity index 100% rename from port_versions/b-/boost-core.json rename to versions/b-/boost-core.json diff --git a/port_versions/b-/boost-coroutine.json b/versions/b-/boost-coroutine.json similarity index 100% rename from port_versions/b-/boost-coroutine.json rename to versions/b-/boost-coroutine.json diff --git a/port_versions/b-/boost-coroutine2.json b/versions/b-/boost-coroutine2.json similarity index 100% rename from port_versions/b-/boost-coroutine2.json rename to versions/b-/boost-coroutine2.json diff --git a/port_versions/b-/boost-crc.json b/versions/b-/boost-crc.json similarity index 100% rename from port_versions/b-/boost-crc.json rename to versions/b-/boost-crc.json diff --git a/port_versions/b-/boost-date-time.json b/versions/b-/boost-date-time.json similarity index 100% rename from port_versions/b-/boost-date-time.json rename to versions/b-/boost-date-time.json diff --git a/port_versions/b-/boost-detail.json b/versions/b-/boost-detail.json similarity index 100% rename from port_versions/b-/boost-detail.json rename to versions/b-/boost-detail.json diff --git a/port_versions/b-/boost-di.json b/versions/b-/boost-di.json similarity index 100% rename from port_versions/b-/boost-di.json rename to versions/b-/boost-di.json diff --git a/port_versions/b-/boost-dll.json b/versions/b-/boost-dll.json similarity index 100% rename from port_versions/b-/boost-dll.json rename to versions/b-/boost-dll.json diff --git a/port_versions/b-/boost-dynamic-bitset.json b/versions/b-/boost-dynamic-bitset.json similarity index 100% rename from port_versions/b-/boost-dynamic-bitset.json rename to versions/b-/boost-dynamic-bitset.json diff --git a/port_versions/b-/boost-endian.json b/versions/b-/boost-endian.json similarity index 100% rename from port_versions/b-/boost-endian.json rename to versions/b-/boost-endian.json diff --git a/port_versions/b-/boost-exception.json b/versions/b-/boost-exception.json similarity index 100% rename from port_versions/b-/boost-exception.json rename to versions/b-/boost-exception.json diff --git a/port_versions/b-/boost-fiber.json b/versions/b-/boost-fiber.json similarity index 100% rename from port_versions/b-/boost-fiber.json rename to versions/b-/boost-fiber.json diff --git a/port_versions/b-/boost-filesystem.json b/versions/b-/boost-filesystem.json similarity index 100% rename from port_versions/b-/boost-filesystem.json rename to versions/b-/boost-filesystem.json diff --git a/port_versions/b-/boost-flyweight.json b/versions/b-/boost-flyweight.json similarity index 100% rename from port_versions/b-/boost-flyweight.json rename to versions/b-/boost-flyweight.json diff --git a/port_versions/b-/boost-foreach.json b/versions/b-/boost-foreach.json similarity index 100% rename from port_versions/b-/boost-foreach.json rename to versions/b-/boost-foreach.json diff --git a/port_versions/b-/boost-format.json b/versions/b-/boost-format.json similarity index 100% rename from port_versions/b-/boost-format.json rename to versions/b-/boost-format.json diff --git a/port_versions/b-/boost-function-types.json b/versions/b-/boost-function-types.json similarity index 100% rename from port_versions/b-/boost-function-types.json rename to versions/b-/boost-function-types.json diff --git a/port_versions/b-/boost-function.json b/versions/b-/boost-function.json similarity index 100% rename from port_versions/b-/boost-function.json rename to versions/b-/boost-function.json diff --git a/port_versions/b-/boost-functional.json b/versions/b-/boost-functional.json similarity index 100% rename from port_versions/b-/boost-functional.json rename to versions/b-/boost-functional.json diff --git a/port_versions/b-/boost-fusion.json b/versions/b-/boost-fusion.json similarity index 100% rename from port_versions/b-/boost-fusion.json rename to versions/b-/boost-fusion.json diff --git a/port_versions/b-/boost-geometry.json b/versions/b-/boost-geometry.json similarity index 100% rename from port_versions/b-/boost-geometry.json rename to versions/b-/boost-geometry.json diff --git a/port_versions/b-/boost-gil.json b/versions/b-/boost-gil.json similarity index 100% rename from port_versions/b-/boost-gil.json rename to versions/b-/boost-gil.json diff --git a/port_versions/b-/boost-graph-parallel.json b/versions/b-/boost-graph-parallel.json similarity index 100% rename from port_versions/b-/boost-graph-parallel.json rename to versions/b-/boost-graph-parallel.json diff --git a/port_versions/b-/boost-graph.json b/versions/b-/boost-graph.json similarity index 100% rename from port_versions/b-/boost-graph.json rename to versions/b-/boost-graph.json diff --git a/port_versions/b-/boost-hana.json b/versions/b-/boost-hana.json similarity index 100% rename from port_versions/b-/boost-hana.json rename to versions/b-/boost-hana.json diff --git a/port_versions/b-/boost-heap.json b/versions/b-/boost-heap.json similarity index 100% rename from port_versions/b-/boost-heap.json rename to versions/b-/boost-heap.json diff --git a/port_versions/b-/boost-histogram.json b/versions/b-/boost-histogram.json similarity index 100% rename from port_versions/b-/boost-histogram.json rename to versions/b-/boost-histogram.json diff --git a/port_versions/b-/boost-hof.json b/versions/b-/boost-hof.json similarity index 100% rename from port_versions/b-/boost-hof.json rename to versions/b-/boost-hof.json diff --git a/port_versions/b-/boost-icl.json b/versions/b-/boost-icl.json similarity index 100% rename from port_versions/b-/boost-icl.json rename to versions/b-/boost-icl.json diff --git a/port_versions/b-/boost-integer.json b/versions/b-/boost-integer.json similarity index 100% rename from port_versions/b-/boost-integer.json rename to versions/b-/boost-integer.json diff --git a/port_versions/b-/boost-interprocess.json b/versions/b-/boost-interprocess.json similarity index 100% rename from port_versions/b-/boost-interprocess.json rename to versions/b-/boost-interprocess.json diff --git a/port_versions/b-/boost-interval.json b/versions/b-/boost-interval.json similarity index 100% rename from port_versions/b-/boost-interval.json rename to versions/b-/boost-interval.json diff --git a/port_versions/b-/boost-intrusive.json b/versions/b-/boost-intrusive.json similarity index 100% rename from port_versions/b-/boost-intrusive.json rename to versions/b-/boost-intrusive.json diff --git a/port_versions/b-/boost-io.json b/versions/b-/boost-io.json similarity index 100% rename from port_versions/b-/boost-io.json rename to versions/b-/boost-io.json diff --git a/port_versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json similarity index 100% rename from port_versions/b-/boost-iostreams.json rename to versions/b-/boost-iostreams.json diff --git a/port_versions/b-/boost-iterator.json b/versions/b-/boost-iterator.json similarity index 100% rename from port_versions/b-/boost-iterator.json rename to versions/b-/boost-iterator.json diff --git a/port_versions/b-/boost-json.json b/versions/b-/boost-json.json similarity index 100% rename from port_versions/b-/boost-json.json rename to versions/b-/boost-json.json diff --git a/port_versions/b-/boost-lambda.json b/versions/b-/boost-lambda.json similarity index 100% rename from port_versions/b-/boost-lambda.json rename to versions/b-/boost-lambda.json diff --git a/port_versions/b-/boost-leaf.json b/versions/b-/boost-leaf.json similarity index 100% rename from port_versions/b-/boost-leaf.json rename to versions/b-/boost-leaf.json diff --git a/port_versions/b-/boost-lexical-cast.json b/versions/b-/boost-lexical-cast.json similarity index 100% rename from port_versions/b-/boost-lexical-cast.json rename to versions/b-/boost-lexical-cast.json diff --git a/port_versions/b-/boost-local-function.json b/versions/b-/boost-local-function.json similarity index 100% rename from port_versions/b-/boost-local-function.json rename to versions/b-/boost-local-function.json diff --git a/port_versions/b-/boost-locale.json b/versions/b-/boost-locale.json similarity index 100% rename from port_versions/b-/boost-locale.json rename to versions/b-/boost-locale.json diff --git a/port_versions/b-/boost-lockfree.json b/versions/b-/boost-lockfree.json similarity index 100% rename from port_versions/b-/boost-lockfree.json rename to versions/b-/boost-lockfree.json diff --git a/port_versions/b-/boost-log.json b/versions/b-/boost-log.json similarity index 100% rename from port_versions/b-/boost-log.json rename to versions/b-/boost-log.json diff --git a/port_versions/b-/boost-logic.json b/versions/b-/boost-logic.json similarity index 100% rename from port_versions/b-/boost-logic.json rename to versions/b-/boost-logic.json diff --git a/port_versions/b-/boost-math.json b/versions/b-/boost-math.json similarity index 100% rename from port_versions/b-/boost-math.json rename to versions/b-/boost-math.json diff --git a/port_versions/b-/boost-metaparse.json b/versions/b-/boost-metaparse.json similarity index 100% rename from port_versions/b-/boost-metaparse.json rename to versions/b-/boost-metaparse.json diff --git a/port_versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json similarity index 100% rename from port_versions/b-/boost-modular-build-helper.json rename to versions/b-/boost-modular-build-helper.json diff --git a/port_versions/b-/boost-move.json b/versions/b-/boost-move.json similarity index 100% rename from port_versions/b-/boost-move.json rename to versions/b-/boost-move.json diff --git a/port_versions/b-/boost-mp11.json b/versions/b-/boost-mp11.json similarity index 100% rename from port_versions/b-/boost-mp11.json rename to versions/b-/boost-mp11.json diff --git a/port_versions/b-/boost-mpi.json b/versions/b-/boost-mpi.json similarity index 100% rename from port_versions/b-/boost-mpi.json rename to versions/b-/boost-mpi.json diff --git a/port_versions/b-/boost-mpl.json b/versions/b-/boost-mpl.json similarity index 100% rename from port_versions/b-/boost-mpl.json rename to versions/b-/boost-mpl.json diff --git a/port_versions/b-/boost-msm.json b/versions/b-/boost-msm.json similarity index 100% rename from port_versions/b-/boost-msm.json rename to versions/b-/boost-msm.json diff --git a/port_versions/b-/boost-multi-array.json b/versions/b-/boost-multi-array.json similarity index 100% rename from port_versions/b-/boost-multi-array.json rename to versions/b-/boost-multi-array.json diff --git a/port_versions/b-/boost-multi-index.json b/versions/b-/boost-multi-index.json similarity index 100% rename from port_versions/b-/boost-multi-index.json rename to versions/b-/boost-multi-index.json diff --git a/port_versions/b-/boost-multiprecision.json b/versions/b-/boost-multiprecision.json similarity index 100% rename from port_versions/b-/boost-multiprecision.json rename to versions/b-/boost-multiprecision.json diff --git a/port_versions/b-/boost-nowide.json b/versions/b-/boost-nowide.json similarity index 100% rename from port_versions/b-/boost-nowide.json rename to versions/b-/boost-nowide.json diff --git a/port_versions/b-/boost-numeric-conversion.json b/versions/b-/boost-numeric-conversion.json similarity index 100% rename from port_versions/b-/boost-numeric-conversion.json rename to versions/b-/boost-numeric-conversion.json diff --git a/port_versions/b-/boost-odeint.json b/versions/b-/boost-odeint.json similarity index 100% rename from port_versions/b-/boost-odeint.json rename to versions/b-/boost-odeint.json diff --git a/port_versions/b-/boost-optional.json b/versions/b-/boost-optional.json similarity index 100% rename from port_versions/b-/boost-optional.json rename to versions/b-/boost-optional.json diff --git a/port_versions/b-/boost-outcome.json b/versions/b-/boost-outcome.json similarity index 100% rename from port_versions/b-/boost-outcome.json rename to versions/b-/boost-outcome.json diff --git a/port_versions/b-/boost-parameter-python.json b/versions/b-/boost-parameter-python.json similarity index 100% rename from port_versions/b-/boost-parameter-python.json rename to versions/b-/boost-parameter-python.json diff --git a/port_versions/b-/boost-parameter.json b/versions/b-/boost-parameter.json similarity index 100% rename from port_versions/b-/boost-parameter.json rename to versions/b-/boost-parameter.json diff --git a/port_versions/b-/boost-pfr.json b/versions/b-/boost-pfr.json similarity index 100% rename from port_versions/b-/boost-pfr.json rename to versions/b-/boost-pfr.json diff --git a/port_versions/b-/boost-phoenix.json b/versions/b-/boost-phoenix.json similarity index 100% rename from port_versions/b-/boost-phoenix.json rename to versions/b-/boost-phoenix.json diff --git a/port_versions/b-/boost-poly-collection.json b/versions/b-/boost-poly-collection.json similarity index 100% rename from port_versions/b-/boost-poly-collection.json rename to versions/b-/boost-poly-collection.json diff --git a/port_versions/b-/boost-polygon.json b/versions/b-/boost-polygon.json similarity index 100% rename from port_versions/b-/boost-polygon.json rename to versions/b-/boost-polygon.json diff --git a/port_versions/b-/boost-pool.json b/versions/b-/boost-pool.json similarity index 100% rename from port_versions/b-/boost-pool.json rename to versions/b-/boost-pool.json diff --git a/port_versions/b-/boost-predef.json b/versions/b-/boost-predef.json similarity index 100% rename from port_versions/b-/boost-predef.json rename to versions/b-/boost-predef.json diff --git a/port_versions/b-/boost-preprocessor.json b/versions/b-/boost-preprocessor.json similarity index 100% rename from port_versions/b-/boost-preprocessor.json rename to versions/b-/boost-preprocessor.json diff --git a/port_versions/b-/boost-process.json b/versions/b-/boost-process.json similarity index 100% rename from port_versions/b-/boost-process.json rename to versions/b-/boost-process.json diff --git a/port_versions/b-/boost-program-options.json b/versions/b-/boost-program-options.json similarity index 100% rename from port_versions/b-/boost-program-options.json rename to versions/b-/boost-program-options.json diff --git a/port_versions/b-/boost-property-map.json b/versions/b-/boost-property-map.json similarity index 100% rename from port_versions/b-/boost-property-map.json rename to versions/b-/boost-property-map.json diff --git a/port_versions/b-/boost-property-tree.json b/versions/b-/boost-property-tree.json similarity index 100% rename from port_versions/b-/boost-property-tree.json rename to versions/b-/boost-property-tree.json diff --git a/port_versions/b-/boost-proto.json b/versions/b-/boost-proto.json similarity index 100% rename from port_versions/b-/boost-proto.json rename to versions/b-/boost-proto.json diff --git a/port_versions/b-/boost-ptr-container.json b/versions/b-/boost-ptr-container.json similarity index 100% rename from port_versions/b-/boost-ptr-container.json rename to versions/b-/boost-ptr-container.json diff --git a/port_versions/b-/boost-python.json b/versions/b-/boost-python.json similarity index 100% rename from port_versions/b-/boost-python.json rename to versions/b-/boost-python.json diff --git a/port_versions/b-/boost-qvm.json b/versions/b-/boost-qvm.json similarity index 100% rename from port_versions/b-/boost-qvm.json rename to versions/b-/boost-qvm.json diff --git a/port_versions/b-/boost-random.json b/versions/b-/boost-random.json similarity index 100% rename from port_versions/b-/boost-random.json rename to versions/b-/boost-random.json diff --git a/port_versions/b-/boost-range.json b/versions/b-/boost-range.json similarity index 100% rename from port_versions/b-/boost-range.json rename to versions/b-/boost-range.json diff --git a/port_versions/b-/boost-ratio.json b/versions/b-/boost-ratio.json similarity index 100% rename from port_versions/b-/boost-ratio.json rename to versions/b-/boost-ratio.json diff --git a/port_versions/b-/boost-rational.json b/versions/b-/boost-rational.json similarity index 100% rename from port_versions/b-/boost-rational.json rename to versions/b-/boost-rational.json diff --git a/port_versions/b-/boost-regex.json b/versions/b-/boost-regex.json similarity index 100% rename from port_versions/b-/boost-regex.json rename to versions/b-/boost-regex.json diff --git a/port_versions/b-/boost-safe-numerics.json b/versions/b-/boost-safe-numerics.json similarity index 100% rename from port_versions/b-/boost-safe-numerics.json rename to versions/b-/boost-safe-numerics.json diff --git a/port_versions/b-/boost-scope-exit.json b/versions/b-/boost-scope-exit.json similarity index 100% rename from port_versions/b-/boost-scope-exit.json rename to versions/b-/boost-scope-exit.json diff --git a/port_versions/b-/boost-serialization.json b/versions/b-/boost-serialization.json similarity index 100% rename from port_versions/b-/boost-serialization.json rename to versions/b-/boost-serialization.json diff --git a/port_versions/b-/boost-signals2.json b/versions/b-/boost-signals2.json similarity index 100% rename from port_versions/b-/boost-signals2.json rename to versions/b-/boost-signals2.json diff --git a/port_versions/b-/boost-smart-ptr.json b/versions/b-/boost-smart-ptr.json similarity index 100% rename from port_versions/b-/boost-smart-ptr.json rename to versions/b-/boost-smart-ptr.json diff --git a/port_versions/b-/boost-sort.json b/versions/b-/boost-sort.json similarity index 100% rename from port_versions/b-/boost-sort.json rename to versions/b-/boost-sort.json diff --git a/port_versions/b-/boost-spirit.json b/versions/b-/boost-spirit.json similarity index 100% rename from port_versions/b-/boost-spirit.json rename to versions/b-/boost-spirit.json diff --git a/port_versions/b-/boost-stacktrace.json b/versions/b-/boost-stacktrace.json similarity index 100% rename from port_versions/b-/boost-stacktrace.json rename to versions/b-/boost-stacktrace.json diff --git a/port_versions/b-/boost-statechart.json b/versions/b-/boost-statechart.json similarity index 100% rename from port_versions/b-/boost-statechart.json rename to versions/b-/boost-statechart.json diff --git a/port_versions/b-/boost-static-assert.json b/versions/b-/boost-static-assert.json similarity index 100% rename from port_versions/b-/boost-static-assert.json rename to versions/b-/boost-static-assert.json diff --git a/port_versions/b-/boost-static-string.json b/versions/b-/boost-static-string.json similarity index 100% rename from port_versions/b-/boost-static-string.json rename to versions/b-/boost-static-string.json diff --git a/port_versions/b-/boost-stl-interfaces.json b/versions/b-/boost-stl-interfaces.json similarity index 100% rename from port_versions/b-/boost-stl-interfaces.json rename to versions/b-/boost-stl-interfaces.json diff --git a/port_versions/b-/boost-system.json b/versions/b-/boost-system.json similarity index 100% rename from port_versions/b-/boost-system.json rename to versions/b-/boost-system.json diff --git a/port_versions/b-/boost-test.json b/versions/b-/boost-test.json similarity index 100% rename from port_versions/b-/boost-test.json rename to versions/b-/boost-test.json diff --git a/port_versions/b-/boost-thread.json b/versions/b-/boost-thread.json similarity index 100% rename from port_versions/b-/boost-thread.json rename to versions/b-/boost-thread.json diff --git a/port_versions/b-/boost-throw-exception.json b/versions/b-/boost-throw-exception.json similarity index 100% rename from port_versions/b-/boost-throw-exception.json rename to versions/b-/boost-throw-exception.json diff --git a/port_versions/b-/boost-timer.json b/versions/b-/boost-timer.json similarity index 100% rename from port_versions/b-/boost-timer.json rename to versions/b-/boost-timer.json diff --git a/port_versions/b-/boost-tokenizer.json b/versions/b-/boost-tokenizer.json similarity index 100% rename from port_versions/b-/boost-tokenizer.json rename to versions/b-/boost-tokenizer.json diff --git a/port_versions/b-/boost-tti.json b/versions/b-/boost-tti.json similarity index 100% rename from port_versions/b-/boost-tti.json rename to versions/b-/boost-tti.json diff --git a/port_versions/b-/boost-tuple.json b/versions/b-/boost-tuple.json similarity index 100% rename from port_versions/b-/boost-tuple.json rename to versions/b-/boost-tuple.json diff --git a/port_versions/b-/boost-type-erasure.json b/versions/b-/boost-type-erasure.json similarity index 100% rename from port_versions/b-/boost-type-erasure.json rename to versions/b-/boost-type-erasure.json diff --git a/port_versions/b-/boost-type-index.json b/versions/b-/boost-type-index.json similarity index 100% rename from port_versions/b-/boost-type-index.json rename to versions/b-/boost-type-index.json diff --git a/port_versions/b-/boost-type-traits.json b/versions/b-/boost-type-traits.json similarity index 100% rename from port_versions/b-/boost-type-traits.json rename to versions/b-/boost-type-traits.json diff --git a/port_versions/b-/boost-typeof.json b/versions/b-/boost-typeof.json similarity index 100% rename from port_versions/b-/boost-typeof.json rename to versions/b-/boost-typeof.json diff --git a/port_versions/b-/boost-ublas.json b/versions/b-/boost-ublas.json similarity index 100% rename from port_versions/b-/boost-ublas.json rename to versions/b-/boost-ublas.json diff --git a/port_versions/b-/boost-uninstall.json b/versions/b-/boost-uninstall.json similarity index 100% rename from port_versions/b-/boost-uninstall.json rename to versions/b-/boost-uninstall.json diff --git a/port_versions/b-/boost-units.json b/versions/b-/boost-units.json similarity index 100% rename from port_versions/b-/boost-units.json rename to versions/b-/boost-units.json diff --git a/port_versions/b-/boost-unordered.json b/versions/b-/boost-unordered.json similarity index 100% rename from port_versions/b-/boost-unordered.json rename to versions/b-/boost-unordered.json diff --git a/port_versions/b-/boost-utility.json b/versions/b-/boost-utility.json similarity index 100% rename from port_versions/b-/boost-utility.json rename to versions/b-/boost-utility.json diff --git a/port_versions/b-/boost-uuid.json b/versions/b-/boost-uuid.json similarity index 100% rename from port_versions/b-/boost-uuid.json rename to versions/b-/boost-uuid.json diff --git a/port_versions/b-/boost-variant.json b/versions/b-/boost-variant.json similarity index 100% rename from port_versions/b-/boost-variant.json rename to versions/b-/boost-variant.json diff --git a/port_versions/b-/boost-variant2.json b/versions/b-/boost-variant2.json similarity index 100% rename from port_versions/b-/boost-variant2.json rename to versions/b-/boost-variant2.json diff --git a/port_versions/b-/boost-vcpkg-helpers.json b/versions/b-/boost-vcpkg-helpers.json similarity index 100% rename from port_versions/b-/boost-vcpkg-helpers.json rename to versions/b-/boost-vcpkg-helpers.json diff --git a/port_versions/b-/boost-vmd.json b/versions/b-/boost-vmd.json similarity index 100% rename from port_versions/b-/boost-vmd.json rename to versions/b-/boost-vmd.json diff --git a/port_versions/b-/boost-wave.json b/versions/b-/boost-wave.json similarity index 100% rename from port_versions/b-/boost-wave.json rename to versions/b-/boost-wave.json diff --git a/port_versions/b-/boost-winapi.json b/versions/b-/boost-winapi.json similarity index 100% rename from port_versions/b-/boost-winapi.json rename to versions/b-/boost-winapi.json diff --git a/port_versions/b-/boost-xpressive.json b/versions/b-/boost-xpressive.json similarity index 100% rename from port_versions/b-/boost-xpressive.json rename to versions/b-/boost-xpressive.json diff --git a/port_versions/b-/boost-yap.json b/versions/b-/boost-yap.json similarity index 100% rename from port_versions/b-/boost-yap.json rename to versions/b-/boost-yap.json diff --git a/port_versions/b-/boost.json b/versions/b-/boost.json similarity index 100% rename from port_versions/b-/boost.json rename to versions/b-/boost.json diff --git a/port_versions/b-/boringssl.json b/versions/b-/boringssl.json similarity index 100% rename from port_versions/b-/boringssl.json rename to versions/b-/boringssl.json diff --git a/port_versions/b-/botan.json b/versions/b-/botan.json similarity index 100% rename from port_versions/b-/botan.json rename to versions/b-/botan.json diff --git a/port_versions/b-/box2d.json b/versions/b-/box2d.json similarity index 100% rename from port_versions/b-/box2d.json rename to versions/b-/box2d.json diff --git a/port_versions/b-/breakpad.json b/versions/b-/breakpad.json similarity index 100% rename from port_versions/b-/breakpad.json rename to versions/b-/breakpad.json diff --git a/port_versions/b-/brigand.json b/versions/b-/brigand.json similarity index 100% rename from port_versions/b-/brigand.json rename to versions/b-/brigand.json diff --git a/port_versions/b-/brotli.json b/versions/b-/brotli.json similarity index 100% rename from port_versions/b-/brotli.json rename to versions/b-/brotli.json diff --git a/port_versions/b-/brpc.json b/versions/b-/brpc.json similarity index 100% rename from port_versions/b-/brpc.json rename to versions/b-/brpc.json diff --git a/port_versions/b-/brunocodutra-metal.json b/versions/b-/brunocodutra-metal.json similarity index 100% rename from port_versions/b-/brunocodutra-metal.json rename to versions/b-/brunocodutra-metal.json diff --git a/port_versions/b-/brynet.json b/versions/b-/brynet.json similarity index 100% rename from port_versions/b-/brynet.json rename to versions/b-/brynet.json diff --git a/port_versions/b-/bullet3.json b/versions/b-/bullet3.json similarity index 100% rename from port_versions/b-/bullet3.json rename to versions/b-/bullet3.json diff --git a/port_versions/b-/bustache.json b/versions/b-/bustache.json similarity index 100% rename from port_versions/b-/bustache.json rename to versions/b-/bustache.json diff --git a/port_versions/b-/butteraugli.json b/versions/b-/butteraugli.json similarity index 100% rename from port_versions/b-/butteraugli.json rename to versions/b-/butteraugli.json diff --git a/port_versions/b-/byte-lite.json b/versions/b-/byte-lite.json similarity index 100% rename from port_versions/b-/byte-lite.json rename to versions/b-/byte-lite.json diff --git a/port_versions/b-/bzip2.json b/versions/b-/bzip2.json similarity index 100% rename from port_versions/b-/bzip2.json rename to versions/b-/bzip2.json diff --git a/port_versions/baseline.json b/versions/baseline.json similarity index 100% rename from port_versions/baseline.json rename to versions/baseline.json diff --git a/port_versions/c-/c-ares.json b/versions/c-/c-ares.json similarity index 100% rename from port_versions/c-/c-ares.json rename to versions/c-/c-ares.json diff --git a/port_versions/c-/c4core.json b/versions/c-/c4core.json similarity index 100% rename from port_versions/c-/c4core.json rename to versions/c-/c4core.json diff --git a/port_versions/c-/caf.json b/versions/c-/caf.json similarity index 100% rename from port_versions/c-/caf.json rename to versions/c-/caf.json diff --git a/port_versions/c-/caffe2.json b/versions/c-/caffe2.json similarity index 100% rename from port_versions/c-/caffe2.json rename to versions/c-/caffe2.json diff --git a/port_versions/c-/cairo.json b/versions/c-/cairo.json similarity index 100% rename from port_versions/c-/cairo.json rename to versions/c-/cairo.json diff --git a/port_versions/c-/cairomm.json b/versions/c-/cairomm.json similarity index 100% rename from port_versions/c-/cairomm.json rename to versions/c-/cairomm.json diff --git a/port_versions/c-/camport3.json b/versions/c-/camport3.json similarity index 100% rename from port_versions/c-/camport3.json rename to versions/c-/camport3.json diff --git a/port_versions/c-/capnproto.json b/versions/c-/capnproto.json similarity index 100% rename from port_versions/c-/capnproto.json rename to versions/c-/capnproto.json diff --git a/port_versions/c-/capstone.json b/versions/c-/capstone.json similarity index 100% rename from port_versions/c-/capstone.json rename to versions/c-/capstone.json diff --git a/port_versions/c-/cartographer.json b/versions/c-/cartographer.json similarity index 100% rename from port_versions/c-/cartographer.json rename to versions/c-/cartographer.json diff --git a/port_versions/c-/casclib.json b/versions/c-/casclib.json similarity index 100% rename from port_versions/c-/casclib.json rename to versions/c-/casclib.json diff --git a/port_versions/c-/catch-classic.json b/versions/c-/catch-classic.json similarity index 100% rename from port_versions/c-/catch-classic.json rename to versions/c-/catch-classic.json diff --git a/port_versions/c-/catch.json b/versions/c-/catch.json similarity index 100% rename from port_versions/c-/catch.json rename to versions/c-/catch.json diff --git a/port_versions/c-/catch2.json b/versions/c-/catch2.json similarity index 100% rename from port_versions/c-/catch2.json rename to versions/c-/catch2.json diff --git a/port_versions/c-/cccapstone.json b/versions/c-/cccapstone.json similarity index 100% rename from port_versions/c-/cccapstone.json rename to versions/c-/cccapstone.json diff --git a/port_versions/c-/ccd.json b/versions/c-/ccd.json similarity index 100% rename from port_versions/c-/ccd.json rename to versions/c-/ccd.json diff --git a/port_versions/c-/ccfits.json b/versions/c-/ccfits.json similarity index 100% rename from port_versions/c-/ccfits.json rename to versions/c-/ccfits.json diff --git a/port_versions/c-/cctz.json b/versions/c-/cctz.json similarity index 100% rename from port_versions/c-/cctz.json rename to versions/c-/cctz.json diff --git a/port_versions/c-/celero.json b/versions/c-/celero.json similarity index 100% rename from port_versions/c-/celero.json rename to versions/c-/celero.json diff --git a/port_versions/c-/cello.json b/versions/c-/cello.json similarity index 100% rename from port_versions/c-/cello.json rename to versions/c-/cello.json diff --git a/port_versions/c-/cereal.json b/versions/c-/cereal.json similarity index 100% rename from port_versions/c-/cereal.json rename to versions/c-/cereal.json diff --git a/port_versions/c-/ceres.json b/versions/c-/ceres.json similarity index 100% rename from port_versions/c-/ceres.json rename to versions/c-/ceres.json diff --git a/port_versions/c-/cfitsio.json b/versions/c-/cfitsio.json similarity index 100% rename from port_versions/c-/cfitsio.json rename to versions/c-/cfitsio.json diff --git a/port_versions/c-/cgal.json b/versions/c-/cgal.json similarity index 100% rename from port_versions/c-/cgal.json rename to versions/c-/cgal.json diff --git a/port_versions/c-/cgicc.json b/versions/c-/cgicc.json similarity index 100% rename from port_versions/c-/cgicc.json rename to versions/c-/cgicc.json diff --git a/port_versions/c-/cgl.json b/versions/c-/cgl.json similarity index 100% rename from port_versions/c-/cgl.json rename to versions/c-/cgl.json diff --git a/port_versions/c-/cgltf.json b/versions/c-/cgltf.json similarity index 100% rename from port_versions/c-/cgltf.json rename to versions/c-/cgltf.json diff --git a/port_versions/c-/cgns.json b/versions/c-/cgns.json similarity index 100% rename from port_versions/c-/cgns.json rename to versions/c-/cgns.json diff --git a/port_versions/c-/chaiscript.json b/versions/c-/chaiscript.json similarity index 100% rename from port_versions/c-/chaiscript.json rename to versions/c-/chaiscript.json diff --git a/port_versions/c-/chakracore.json b/versions/c-/chakracore.json similarity index 100% rename from port_versions/c-/chakracore.json rename to versions/c-/chakracore.json diff --git a/port_versions/c-/charls.json b/versions/c-/charls.json similarity index 100% rename from port_versions/c-/charls.json rename to versions/c-/charls.json diff --git a/port_versions/c-/chartdir.json b/versions/c-/chartdir.json similarity index 100% rename from port_versions/c-/chartdir.json rename to versions/c-/chartdir.json diff --git a/port_versions/c-/check.json b/versions/c-/check.json similarity index 100% rename from port_versions/c-/check.json rename to versions/c-/check.json diff --git a/port_versions/c-/chipmunk.json b/versions/c-/chipmunk.json similarity index 100% rename from port_versions/c-/chipmunk.json rename to versions/c-/chipmunk.json diff --git a/port_versions/c-/chmlib.json b/versions/c-/chmlib.json similarity index 100% rename from port_versions/c-/chmlib.json rename to versions/c-/chmlib.json diff --git a/port_versions/c-/chromium-base.json b/versions/c-/chromium-base.json similarity index 100% rename from port_versions/c-/chromium-base.json rename to versions/c-/chromium-base.json diff --git a/port_versions/c-/cimg.json b/versions/c-/cimg.json similarity index 100% rename from port_versions/c-/cimg.json rename to versions/c-/cimg.json diff --git a/port_versions/c-/cityhash.json b/versions/c-/cityhash.json similarity index 100% rename from port_versions/c-/cityhash.json rename to versions/c-/cityhash.json diff --git a/port_versions/c-/civetweb.json b/versions/c-/civetweb.json similarity index 100% rename from port_versions/c-/civetweb.json rename to versions/c-/civetweb.json diff --git a/port_versions/c-/cjson.json b/versions/c-/cjson.json similarity index 100% rename from port_versions/c-/cjson.json rename to versions/c-/cjson.json diff --git a/port_versions/c-/clapack.json b/versions/c-/clapack.json similarity index 100% rename from port_versions/c-/clapack.json rename to versions/c-/clapack.json diff --git a/port_versions/c-/clara.json b/versions/c-/clara.json similarity index 100% rename from port_versions/c-/clara.json rename to versions/c-/clara.json diff --git a/port_versions/c-/clblas.json b/versions/c-/clblas.json similarity index 100% rename from port_versions/c-/clblas.json rename to versions/c-/clblas.json diff --git a/port_versions/c-/clblast.json b/versions/c-/clblast.json similarity index 100% rename from port_versions/c-/clblast.json rename to versions/c-/clblast.json diff --git a/port_versions/c-/clfft.json b/versions/c-/clfft.json similarity index 100% rename from port_versions/c-/clfft.json rename to versions/c-/clfft.json diff --git a/port_versions/c-/cli.json b/versions/c-/cli.json similarity index 100% rename from port_versions/c-/cli.json rename to versions/c-/cli.json diff --git a/port_versions/c-/cli11.json b/versions/c-/cli11.json similarity index 100% rename from port_versions/c-/cli11.json rename to versions/c-/cli11.json diff --git a/port_versions/c-/clickhouse-cpp.json b/versions/c-/clickhouse-cpp.json similarity index 100% rename from port_versions/c-/clickhouse-cpp.json rename to versions/c-/clickhouse-cpp.json diff --git a/port_versions/c-/clipp.json b/versions/c-/clipp.json similarity index 100% rename from port_versions/c-/clipp.json rename to versions/c-/clipp.json diff --git a/port_versions/c-/clockutils.json b/versions/c-/clockutils.json similarity index 100% rename from port_versions/c-/clockutils.json rename to versions/c-/clockutils.json diff --git a/port_versions/c-/clp.json b/versions/c-/clp.json similarity index 100% rename from port_versions/c-/clp.json rename to versions/c-/clp.json diff --git a/port_versions/c-/clrng.json b/versions/c-/clrng.json similarity index 100% rename from port_versions/c-/clrng.json rename to versions/c-/clrng.json diff --git a/port_versions/c-/clue.json b/versions/c-/clue.json similarity index 100% rename from port_versions/c-/clue.json rename to versions/c-/clue.json diff --git a/port_versions/c-/cmark.json b/versions/c-/cmark.json similarity index 100% rename from port_versions/c-/cmark.json rename to versions/c-/cmark.json diff --git a/port_versions/c-/cmcstl2.json b/versions/c-/cmcstl2.json similarity index 100% rename from port_versions/c-/cmcstl2.json rename to versions/c-/cmcstl2.json diff --git a/port_versions/c-/cmocka.json b/versions/c-/cmocka.json similarity index 100% rename from port_versions/c-/cmocka.json rename to versions/c-/cmocka.json diff --git a/port_versions/c-/cnl.json b/versions/c-/cnl.json similarity index 100% rename from port_versions/c-/cnl.json rename to versions/c-/cnl.json diff --git a/port_versions/c-/coin.json b/versions/c-/coin.json similarity index 100% rename from port_versions/c-/coin.json rename to versions/c-/coin.json diff --git a/port_versions/c-/coinutils.json b/versions/c-/coinutils.json similarity index 100% rename from port_versions/c-/coinutils.json rename to versions/c-/coinutils.json diff --git a/port_versions/c-/collada-dom.json b/versions/c-/collada-dom.json similarity index 100% rename from port_versions/c-/collada-dom.json rename to versions/c-/collada-dom.json diff --git a/port_versions/c-/colmap.json b/versions/c-/colmap.json similarity index 100% rename from port_versions/c-/colmap.json rename to versions/c-/colmap.json diff --git a/port_versions/c-/comms-ublox.json b/versions/c-/comms-ublox.json similarity index 100% rename from port_versions/c-/comms-ublox.json rename to versions/c-/comms-ublox.json diff --git a/port_versions/c-/comms.json b/versions/c-/comms.json similarity index 100% rename from port_versions/c-/comms.json rename to versions/c-/comms.json diff --git a/port_versions/c-/commsdsl.json b/versions/c-/commsdsl.json similarity index 100% rename from port_versions/c-/commsdsl.json rename to versions/c-/commsdsl.json diff --git a/port_versions/c-/concurrentqueue.json b/versions/c-/concurrentqueue.json similarity index 100% rename from port_versions/c-/concurrentqueue.json rename to versions/c-/concurrentqueue.json diff --git a/port_versions/c-/console-bridge.json b/versions/c-/console-bridge.json similarity index 100% rename from port_versions/c-/console-bridge.json rename to versions/c-/console-bridge.json diff --git a/port_versions/c-/constexpr-contracts.json b/versions/c-/constexpr-contracts.json similarity index 100% rename from port_versions/c-/constexpr-contracts.json rename to versions/c-/constexpr-contracts.json diff --git a/port_versions/c-/constexpr.json b/versions/c-/constexpr.json similarity index 100% rename from port_versions/c-/constexpr.json rename to versions/c-/constexpr.json diff --git a/port_versions/c-/coolprop.json b/versions/c-/coolprop.json similarity index 100% rename from port_versions/c-/coolprop.json rename to versions/c-/coolprop.json diff --git a/port_versions/c-/coroutine.json b/versions/c-/coroutine.json similarity index 100% rename from port_versions/c-/coroutine.json rename to versions/c-/coroutine.json diff --git a/port_versions/c-/corrade.json b/versions/c-/corrade.json similarity index 100% rename from port_versions/c-/corrade.json rename to versions/c-/corrade.json diff --git a/port_versions/c-/cpp-base64.json b/versions/c-/cpp-base64.json similarity index 100% rename from port_versions/c-/cpp-base64.json rename to versions/c-/cpp-base64.json diff --git a/port_versions/c-/cpp-httplib.json b/versions/c-/cpp-httplib.json similarity index 100% rename from port_versions/c-/cpp-httplib.json rename to versions/c-/cpp-httplib.json diff --git a/port_versions/c-/cpp-netlib.json b/versions/c-/cpp-netlib.json similarity index 100% rename from port_versions/c-/cpp-netlib.json rename to versions/c-/cpp-netlib.json diff --git a/port_versions/c-/cpp-peglib.json b/versions/c-/cpp-peglib.json similarity index 100% rename from port_versions/c-/cpp-peglib.json rename to versions/c-/cpp-peglib.json diff --git a/port_versions/c-/cpp-redis.json b/versions/c-/cpp-redis.json similarity index 100% rename from port_versions/c-/cpp-redis.json rename to versions/c-/cpp-redis.json diff --git a/port_versions/c-/cpp-taskflow.json b/versions/c-/cpp-taskflow.json similarity index 100% rename from port_versions/c-/cpp-taskflow.json rename to versions/c-/cpp-taskflow.json diff --git a/port_versions/c-/cppad.json b/versions/c-/cppad.json similarity index 100% rename from port_versions/c-/cppad.json rename to versions/c-/cppad.json diff --git a/port_versions/c-/cppcms.json b/versions/c-/cppcms.json similarity index 100% rename from port_versions/c-/cppcms.json rename to versions/c-/cppcms.json diff --git a/port_versions/c-/cppcodec.json b/versions/c-/cppcodec.json similarity index 100% rename from port_versions/c-/cppcodec.json rename to versions/c-/cppcodec.json diff --git a/port_versions/c-/cppcoro.json b/versions/c-/cppcoro.json similarity index 100% rename from port_versions/c-/cppcoro.json rename to versions/c-/cppcoro.json diff --git a/port_versions/c-/cppfs.json b/versions/c-/cppfs.json similarity index 100% rename from port_versions/c-/cppfs.json rename to versions/c-/cppfs.json diff --git a/port_versions/c-/cppgraphqlgen.json b/versions/c-/cppgraphqlgen.json similarity index 100% rename from port_versions/c-/cppgraphqlgen.json rename to versions/c-/cppgraphqlgen.json diff --git a/port_versions/c-/cppitertools.json b/versions/c-/cppitertools.json similarity index 100% rename from port_versions/c-/cppitertools.json rename to versions/c-/cppitertools.json diff --git a/port_versions/c-/cppkafka.json b/versions/c-/cppkafka.json similarity index 100% rename from port_versions/c-/cppkafka.json rename to versions/c-/cppkafka.json diff --git a/port_versions/c-/cppmicroservices.json b/versions/c-/cppmicroservices.json similarity index 100% rename from port_versions/c-/cppmicroservices.json rename to versions/c-/cppmicroservices.json diff --git a/port_versions/c-/cpprestsdk.json b/versions/c-/cpprestsdk.json similarity index 100% rename from port_versions/c-/cpprestsdk.json rename to versions/c-/cpprestsdk.json diff --git a/port_versions/c-/cpptoml.json b/versions/c-/cpptoml.json similarity index 100% rename from port_versions/c-/cpptoml.json rename to versions/c-/cpptoml.json diff --git a/port_versions/c-/cppunit.json b/versions/c-/cppunit.json similarity index 100% rename from port_versions/c-/cppunit.json rename to versions/c-/cppunit.json diff --git a/port_versions/c-/cpputest.json b/versions/c-/cpputest.json similarity index 100% rename from port_versions/c-/cpputest.json rename to versions/c-/cpputest.json diff --git a/port_versions/c-/cppwinrt.json b/versions/c-/cppwinrt.json similarity index 100% rename from port_versions/c-/cppwinrt.json rename to versions/c-/cppwinrt.json diff --git a/port_versions/c-/cppzmq.json b/versions/c-/cppzmq.json similarity index 100% rename from port_versions/c-/cppzmq.json rename to versions/c-/cppzmq.json diff --git a/port_versions/c-/cpr.json b/versions/c-/cpr.json similarity index 100% rename from port_versions/c-/cpr.json rename to versions/c-/cpr.json diff --git a/port_versions/c-/cpu-features.json b/versions/c-/cpu-features.json similarity index 100% rename from port_versions/c-/cpu-features.json rename to versions/c-/cpu-features.json diff --git a/port_versions/c-/cpuid.json b/versions/c-/cpuid.json similarity index 100% rename from port_versions/c-/cpuid.json rename to versions/c-/cpuid.json diff --git a/port_versions/c-/cpuinfo.json b/versions/c-/cpuinfo.json similarity index 100% rename from port_versions/c-/cpuinfo.json rename to versions/c-/cpuinfo.json diff --git a/port_versions/c-/cr.json b/versions/c-/cr.json similarity index 100% rename from port_versions/c-/cr.json rename to versions/c-/cr.json diff --git a/port_versions/c-/crashpad.json b/versions/c-/crashpad.json similarity index 100% rename from port_versions/c-/crashpad.json rename to versions/c-/crashpad.json diff --git a/port_versions/c-/crashrpt.json b/versions/c-/crashrpt.json similarity index 100% rename from port_versions/c-/crashrpt.json rename to versions/c-/crashrpt.json diff --git a/port_versions/c-/crc32c.json b/versions/c-/crc32c.json similarity index 100% rename from port_versions/c-/crc32c.json rename to versions/c-/crc32c.json diff --git a/port_versions/c-/crfsuite.json b/versions/c-/crfsuite.json similarity index 100% rename from port_versions/c-/crfsuite.json rename to versions/c-/crfsuite.json diff --git a/port_versions/c-/croncpp.json b/versions/c-/croncpp.json similarity index 100% rename from port_versions/c-/croncpp.json rename to versions/c-/croncpp.json diff --git a/port_versions/c-/crossguid.json b/versions/c-/crossguid.json similarity index 100% rename from port_versions/c-/crossguid.json rename to versions/c-/crossguid.json diff --git a/port_versions/c-/crow.json b/versions/c-/crow.json similarity index 100% rename from port_versions/c-/crow.json rename to versions/c-/crow.json diff --git a/port_versions/c-/cryptopp.json b/versions/c-/cryptopp.json similarity index 100% rename from port_versions/c-/cryptopp.json rename to versions/c-/cryptopp.json diff --git a/port_versions/c-/cspice.json b/versions/c-/cspice.json similarity index 100% rename from port_versions/c-/cspice.json rename to versions/c-/cspice.json diff --git a/port_versions/c-/ctbignum.json b/versions/c-/ctbignum.json similarity index 100% rename from port_versions/c-/ctbignum.json rename to versions/c-/ctbignum.json diff --git a/port_versions/c-/ctemplate.json b/versions/c-/ctemplate.json similarity index 100% rename from port_versions/c-/ctemplate.json rename to versions/c-/ctemplate.json diff --git a/port_versions/c-/ctp.json b/versions/c-/ctp.json similarity index 100% rename from port_versions/c-/ctp.json rename to versions/c-/ctp.json diff --git a/port_versions/c-/ctre.json b/versions/c-/ctre.json similarity index 100% rename from port_versions/c-/ctre.json rename to versions/c-/ctre.json diff --git a/port_versions/c-/cub.json b/versions/c-/cub.json similarity index 100% rename from port_versions/c-/cub.json rename to versions/c-/cub.json diff --git a/port_versions/c-/cuda.json b/versions/c-/cuda.json similarity index 100% rename from port_versions/c-/cuda.json rename to versions/c-/cuda.json diff --git a/port_versions/c-/cudnn.json b/versions/c-/cudnn.json similarity index 100% rename from port_versions/c-/cudnn.json rename to versions/c-/cudnn.json diff --git a/port_versions/c-/cunit.json b/versions/c-/cunit.json similarity index 100% rename from port_versions/c-/cunit.json rename to versions/c-/cunit.json diff --git a/port_versions/c-/curl.json b/versions/c-/curl.json similarity index 100% rename from port_versions/c-/curl.json rename to versions/c-/curl.json diff --git a/port_versions/c-/curlpp.json b/versions/c-/curlpp.json similarity index 100% rename from port_versions/c-/curlpp.json rename to versions/c-/curlpp.json diff --git a/port_versions/c-/cute-headers.json b/versions/c-/cute-headers.json similarity index 100% rename from port_versions/c-/cute-headers.json rename to versions/c-/cute-headers.json diff --git a/port_versions/c-/cutelyst2.json b/versions/c-/cutelyst2.json similarity index 100% rename from port_versions/c-/cutelyst2.json rename to versions/c-/cutelyst2.json diff --git a/port_versions/c-/cwalk.json b/versions/c-/cwalk.json similarity index 100% rename from port_versions/c-/cwalk.json rename to versions/c-/cwalk.json diff --git a/port_versions/c-/cxxopts.json b/versions/c-/cxxopts.json similarity index 100% rename from port_versions/c-/cxxopts.json rename to versions/c-/cxxopts.json diff --git a/port_versions/c-/czmq.json b/versions/c-/czmq.json similarity index 100% rename from port_versions/c-/czmq.json rename to versions/c-/czmq.json diff --git a/port_versions/d-/d3dx12.json b/versions/d-/d3dx12.json similarity index 100% rename from port_versions/d-/d3dx12.json rename to versions/d-/d3dx12.json diff --git a/port_versions/d-/darknet.json b/versions/d-/darknet.json similarity index 100% rename from port_versions/d-/darknet.json rename to versions/d-/darknet.json diff --git a/port_versions/d-/darts-clone.json b/versions/d-/darts-clone.json similarity index 100% rename from port_versions/d-/darts-clone.json rename to versions/d-/darts-clone.json diff --git a/port_versions/d-/dartsim.json b/versions/d-/dartsim.json similarity index 100% rename from port_versions/d-/dartsim.json rename to versions/d-/dartsim.json diff --git a/port_versions/d-/dataframe.json b/versions/d-/dataframe.json similarity index 100% rename from port_versions/d-/dataframe.json rename to versions/d-/dataframe.json diff --git a/port_versions/d-/date.json b/versions/d-/date.json similarity index 100% rename from port_versions/d-/date.json rename to versions/d-/date.json diff --git a/port_versions/d-/dbg-macro.json b/versions/d-/dbg-macro.json similarity index 100% rename from port_versions/d-/dbg-macro.json rename to versions/d-/dbg-macro.json diff --git a/port_versions/d-/dbghelp.json b/versions/d-/dbghelp.json similarity index 100% rename from port_versions/d-/dbghelp.json rename to versions/d-/dbghelp.json diff --git a/port_versions/d-/dbow2.json b/versions/d-/dbow2.json similarity index 100% rename from port_versions/d-/dbow2.json rename to versions/d-/dbow2.json diff --git a/port_versions/d-/dbow3.json b/versions/d-/dbow3.json similarity index 100% rename from port_versions/d-/dbow3.json rename to versions/d-/dbow3.json diff --git a/port_versions/d-/dcmtk.json b/versions/d-/dcmtk.json similarity index 100% rename from port_versions/d-/dcmtk.json rename to versions/d-/dcmtk.json diff --git a/port_versions/d-/debug-assert.json b/versions/d-/debug-assert.json similarity index 100% rename from port_versions/d-/debug-assert.json rename to versions/d-/debug-assert.json diff --git a/port_versions/d-/decimal-for-cpp.json b/versions/d-/decimal-for-cpp.json similarity index 100% rename from port_versions/d-/decimal-for-cpp.json rename to versions/d-/decimal-for-cpp.json diff --git a/port_versions/d-/detours.json b/versions/d-/detours.json similarity index 100% rename from port_versions/d-/detours.json rename to versions/d-/detours.json diff --git a/port_versions/d-/devicenameresolver.json b/versions/d-/devicenameresolver.json similarity index 100% rename from port_versions/d-/devicenameresolver.json rename to versions/d-/devicenameresolver.json diff --git a/port_versions/d-/devil.json b/versions/d-/devil.json similarity index 100% rename from port_versions/d-/devil.json rename to versions/d-/devil.json diff --git a/port_versions/d-/dimcli.json b/versions/d-/dimcli.json similarity index 100% rename from port_versions/d-/dimcli.json rename to versions/d-/dimcli.json diff --git a/port_versions/d-/directx-headers.json b/versions/d-/directx-headers.json similarity index 100% rename from port_versions/d-/directx-headers.json rename to versions/d-/directx-headers.json diff --git a/port_versions/d-/directxmath.json b/versions/d-/directxmath.json similarity index 100% rename from port_versions/d-/directxmath.json rename to versions/d-/directxmath.json diff --git a/port_versions/d-/directxmesh.json b/versions/d-/directxmesh.json similarity index 100% rename from port_versions/d-/directxmesh.json rename to versions/d-/directxmesh.json diff --git a/port_versions/d-/directxsdk.json b/versions/d-/directxsdk.json similarity index 100% rename from port_versions/d-/directxsdk.json rename to versions/d-/directxsdk.json diff --git a/port_versions/d-/directxtex.json b/versions/d-/directxtex.json similarity index 100% rename from port_versions/d-/directxtex.json rename to versions/d-/directxtex.json diff --git a/port_versions/d-/directxtk.json b/versions/d-/directxtk.json similarity index 100% rename from port_versions/d-/directxtk.json rename to versions/d-/directxtk.json diff --git a/port_versions/d-/directxtk12.json b/versions/d-/directxtk12.json similarity index 100% rename from port_versions/d-/directxtk12.json rename to versions/d-/directxtk12.json diff --git a/port_versions/d-/dirent.json b/versions/d-/dirent.json similarity index 100% rename from port_versions/d-/dirent.json rename to versions/d-/dirent.json diff --git a/port_versions/d-/discord-game-sdk.json b/versions/d-/discord-game-sdk.json similarity index 100% rename from port_versions/d-/discord-game-sdk.json rename to versions/d-/discord-game-sdk.json diff --git a/port_versions/d-/discord-rpc.json b/versions/d-/discord-rpc.json similarity index 100% rename from port_versions/d-/discord-rpc.json rename to versions/d-/discord-rpc.json diff --git a/port_versions/d-/discount.json b/versions/d-/discount.json similarity index 100% rename from port_versions/d-/discount.json rename to versions/d-/discount.json diff --git a/port_versions/d-/distorm.json b/versions/d-/distorm.json similarity index 100% rename from port_versions/d-/distorm.json rename to versions/d-/distorm.json diff --git a/port_versions/d-/dlfcn-win32.json b/versions/d-/dlfcn-win32.json similarity index 100% rename from port_versions/d-/dlfcn-win32.json rename to versions/d-/dlfcn-win32.json diff --git a/port_versions/d-/dlib.json b/versions/d-/dlib.json similarity index 100% rename from port_versions/d-/dlib.json rename to versions/d-/dlib.json diff --git a/port_versions/d-/dmlc.json b/versions/d-/dmlc.json similarity index 100% rename from port_versions/d-/dmlc.json rename to versions/d-/dmlc.json diff --git a/port_versions/d-/docopt.json b/versions/d-/docopt.json similarity index 100% rename from port_versions/d-/docopt.json rename to versions/d-/docopt.json diff --git a/port_versions/d-/doctest.json b/versions/d-/doctest.json similarity index 100% rename from port_versions/d-/doctest.json rename to versions/d-/doctest.json diff --git a/port_versions/d-/double-conversion.json b/versions/d-/double-conversion.json similarity index 100% rename from port_versions/d-/double-conversion.json rename to versions/d-/double-conversion.json diff --git a/port_versions/d-/dpdk.json b/versions/d-/dpdk.json similarity index 100% rename from port_versions/d-/dpdk.json rename to versions/d-/dpdk.json diff --git a/port_versions/d-/draco.json b/versions/d-/draco.json similarity index 100% rename from port_versions/d-/draco.json rename to versions/d-/draco.json diff --git a/port_versions/d-/drlibs.json b/versions/d-/drlibs.json similarity index 100% rename from port_versions/d-/drlibs.json rename to versions/d-/drlibs.json diff --git a/port_versions/d-/drogon.json b/versions/d-/drogon.json similarity index 100% rename from port_versions/d-/drogon.json rename to versions/d-/drogon.json diff --git a/port_versions/d-/dtl.json b/versions/d-/dtl.json similarity index 100% rename from port_versions/d-/dtl.json rename to versions/d-/dtl.json diff --git a/port_versions/d-/duckx.json b/versions/d-/duckx.json similarity index 100% rename from port_versions/d-/duckx.json rename to versions/d-/duckx.json diff --git a/port_versions/d-/duilib.json b/versions/d-/duilib.json similarity index 100% rename from port_versions/d-/duilib.json rename to versions/d-/duilib.json diff --git a/port_versions/d-/duktape.json b/versions/d-/duktape.json similarity index 100% rename from port_versions/d-/duktape.json rename to versions/d-/duktape.json diff --git a/port_versions/d-/dx.json b/versions/d-/dx.json similarity index 100% rename from port_versions/d-/dx.json rename to versions/d-/dx.json diff --git a/port_versions/d-/dxut.json b/versions/d-/dxut.json similarity index 100% rename from port_versions/d-/dxut.json rename to versions/d-/dxut.json diff --git a/port_versions/e-/eabase.json b/versions/e-/eabase.json similarity index 100% rename from port_versions/e-/eabase.json rename to versions/e-/eabase.json diff --git a/port_versions/e-/eastl.json b/versions/e-/eastl.json similarity index 100% rename from port_versions/e-/eastl.json rename to versions/e-/eastl.json diff --git a/port_versions/e-/easycl.json b/versions/e-/easycl.json similarity index 100% rename from port_versions/e-/easycl.json rename to versions/e-/easycl.json diff --git a/port_versions/e-/easyhook.json b/versions/e-/easyhook.json similarity index 100% rename from port_versions/e-/easyhook.json rename to versions/e-/easyhook.json diff --git a/port_versions/e-/easyloggingpp.json b/versions/e-/easyloggingpp.json similarity index 100% rename from port_versions/e-/easyloggingpp.json rename to versions/e-/easyloggingpp.json diff --git a/port_versions/e-/eathread.json b/versions/e-/eathread.json similarity index 100% rename from port_versions/e-/eathread.json rename to versions/e-/eathread.json diff --git a/port_versions/e-/ebml.json b/versions/e-/ebml.json similarity index 100% rename from port_versions/e-/ebml.json rename to versions/e-/ebml.json diff --git a/port_versions/e-/ecm.json b/versions/e-/ecm.json similarity index 100% rename from port_versions/e-/ecm.json rename to versions/e-/ecm.json diff --git a/port_versions/e-/ecos.json b/versions/e-/ecos.json similarity index 100% rename from port_versions/e-/ecos.json rename to versions/e-/ecos.json diff --git a/port_versions/e-/ecsutil.json b/versions/e-/ecsutil.json similarity index 100% rename from port_versions/e-/ecsutil.json rename to versions/e-/ecsutil.json diff --git a/port_versions/e-/edlib.json b/versions/e-/edlib.json similarity index 100% rename from port_versions/e-/edlib.json rename to versions/e-/edlib.json diff --git a/port_versions/e-/effolkronium-random.json b/versions/e-/effolkronium-random.json similarity index 100% rename from port_versions/e-/effolkronium-random.json rename to versions/e-/effolkronium-random.json diff --git a/port_versions/e-/efsw.json b/versions/e-/efsw.json similarity index 100% rename from port_versions/e-/efsw.json rename to versions/e-/efsw.json diff --git a/port_versions/e-/egl-registry.json b/versions/e-/egl-registry.json similarity index 100% rename from port_versions/e-/egl-registry.json rename to versions/e-/egl-registry.json diff --git a/port_versions/e-/eigen3.json b/versions/e-/eigen3.json similarity index 100% rename from port_versions/e-/eigen3.json rename to versions/e-/eigen3.json diff --git a/port_versions/e-/elfio.json b/versions/e-/elfio.json similarity index 100% rename from port_versions/e-/elfio.json rename to versions/e-/elfio.json diff --git a/port_versions/e-/elfutils.json b/versions/e-/elfutils.json similarity index 100% rename from port_versions/e-/elfutils.json rename to versions/e-/elfutils.json diff --git a/port_versions/e-/embree2.json b/versions/e-/embree2.json similarity index 100% rename from port_versions/e-/embree2.json rename to versions/e-/embree2.json diff --git a/port_versions/e-/embree3.json b/versions/e-/embree3.json similarity index 100% rename from port_versions/e-/embree3.json rename to versions/e-/embree3.json diff --git a/port_versions/e-/enet.json b/versions/e-/enet.json similarity index 100% rename from port_versions/e-/enet.json rename to versions/e-/enet.json diff --git a/port_versions/e-/ensmallen.json b/versions/e-/ensmallen.json similarity index 100% rename from port_versions/e-/ensmallen.json rename to versions/e-/ensmallen.json diff --git a/port_versions/e-/entityx.json b/versions/e-/entityx.json similarity index 100% rename from port_versions/e-/entityx.json rename to versions/e-/entityx.json diff --git a/port_versions/e-/entt.json b/versions/e-/entt.json similarity index 100% rename from port_versions/e-/entt.json rename to versions/e-/entt.json diff --git a/port_versions/e-/epsilon.json b/versions/e-/epsilon.json similarity index 100% rename from port_versions/e-/epsilon.json rename to versions/e-/epsilon.json diff --git a/port_versions/e-/esaxx.json b/versions/e-/esaxx.json similarity index 100% rename from port_versions/e-/esaxx.json rename to versions/e-/esaxx.json diff --git a/port_versions/e-/evpp.json b/versions/e-/evpp.json similarity index 100% rename from port_versions/e-/evpp.json rename to versions/e-/evpp.json diff --git a/port_versions/e-/exiv2.json b/versions/e-/exiv2.json similarity index 100% rename from port_versions/e-/exiv2.json rename to versions/e-/exiv2.json diff --git a/port_versions/e-/expat.json b/versions/e-/expat.json similarity index 100% rename from port_versions/e-/expat.json rename to versions/e-/expat.json diff --git a/port_versions/e-/expected-lite.json b/versions/e-/expected-lite.json similarity index 100% rename from port_versions/e-/expected-lite.json rename to versions/e-/expected-lite.json diff --git a/port_versions/e-/exprtk.json b/versions/e-/exprtk.json similarity index 100% rename from port_versions/e-/exprtk.json rename to versions/e-/exprtk.json diff --git a/port_versions/e-/ezc3d.json b/versions/e-/ezc3d.json similarity index 100% rename from port_versions/e-/ezc3d.json rename to versions/e-/ezc3d.json diff --git a/port_versions/f-/faad2.json b/versions/f-/faad2.json similarity index 100% rename from port_versions/f-/faad2.json rename to versions/f-/faad2.json diff --git a/port_versions/f-/fadbad.json b/versions/f-/fadbad.json similarity index 100% rename from port_versions/f-/fadbad.json rename to versions/f-/fadbad.json diff --git a/port_versions/f-/faiss.json b/versions/f-/faiss.json similarity index 100% rename from port_versions/f-/faiss.json rename to versions/f-/faiss.json diff --git a/port_versions/f-/fann.json b/versions/f-/fann.json similarity index 100% rename from port_versions/f-/fann.json rename to versions/f-/fann.json diff --git a/port_versions/f-/farmhash.json b/versions/f-/farmhash.json similarity index 100% rename from port_versions/f-/farmhash.json rename to versions/f-/farmhash.json diff --git a/port_versions/f-/fast-cpp-csv-parser.json b/versions/f-/fast-cpp-csv-parser.json similarity index 100% rename from port_versions/f-/fast-cpp-csv-parser.json rename to versions/f-/fast-cpp-csv-parser.json diff --git a/port_versions/f-/fastcdr.json b/versions/f-/fastcdr.json similarity index 100% rename from port_versions/f-/fastcdr.json rename to versions/f-/fastcdr.json diff --git a/port_versions/f-/fastcgi.json b/versions/f-/fastcgi.json similarity index 100% rename from port_versions/f-/fastcgi.json rename to versions/f-/fastcgi.json diff --git a/port_versions/f-/fastfeat.json b/versions/f-/fastfeat.json similarity index 100% rename from port_versions/f-/fastfeat.json rename to versions/f-/fastfeat.json diff --git a/port_versions/f-/fastlz.json b/versions/f-/fastlz.json similarity index 100% rename from port_versions/f-/fastlz.json rename to versions/f-/fastlz.json diff --git a/port_versions/f-/fastrtps.json b/versions/f-/fastrtps.json similarity index 100% rename from port_versions/f-/fastrtps.json rename to versions/f-/fastrtps.json diff --git a/port_versions/f-/fbthrift.json b/versions/f-/fbthrift.json similarity index 100% rename from port_versions/f-/fbthrift.json rename to versions/f-/fbthrift.json diff --git a/port_versions/f-/fcl.json b/versions/f-/fcl.json similarity index 100% rename from port_versions/f-/fcl.json rename to versions/f-/fcl.json diff --git a/port_versions/f-/fdk-aac.json b/versions/f-/fdk-aac.json similarity index 100% rename from port_versions/f-/fdk-aac.json rename to versions/f-/fdk-aac.json diff --git a/port_versions/f-/fdlibm.json b/versions/f-/fdlibm.json similarity index 100% rename from port_versions/f-/fdlibm.json rename to versions/f-/fdlibm.json diff --git a/port_versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json similarity index 100% rename from port_versions/f-/ffmpeg.json rename to versions/f-/ffmpeg.json diff --git a/port_versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json similarity index 100% rename from port_versions/f-/ffnvcodec.json rename to versions/f-/ffnvcodec.json diff --git a/port_versions/f-/fftw3.json b/versions/f-/fftw3.json similarity index 100% rename from port_versions/f-/fftw3.json rename to versions/f-/fftw3.json diff --git a/port_versions/f-/fftwpp.json b/versions/f-/fftwpp.json similarity index 100% rename from port_versions/f-/fftwpp.json rename to versions/f-/fftwpp.json diff --git a/port_versions/f-/field3d.json b/versions/f-/field3d.json similarity index 100% rename from port_versions/f-/field3d.json rename to versions/f-/field3d.json diff --git a/port_versions/f-/fixed-string.json b/versions/f-/fixed-string.json similarity index 100% rename from port_versions/f-/fixed-string.json rename to versions/f-/fixed-string.json diff --git a/port_versions/f-/fizz.json b/versions/f-/fizz.json similarity index 100% rename from port_versions/f-/fizz.json rename to versions/f-/fizz.json diff --git a/port_versions/f-/flann.json b/versions/f-/flann.json similarity index 100% rename from port_versions/f-/flann.json rename to versions/f-/flann.json diff --git a/port_versions/f-/flashlight-cpu.json b/versions/f-/flashlight-cpu.json similarity index 100% rename from port_versions/f-/flashlight-cpu.json rename to versions/f-/flashlight-cpu.json diff --git a/port_versions/f-/flashlight-cuda.json b/versions/f-/flashlight-cuda.json similarity index 100% rename from port_versions/f-/flashlight-cuda.json rename to versions/f-/flashlight-cuda.json diff --git a/port_versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json similarity index 100% rename from port_versions/f-/flatbuffers.json rename to versions/f-/flatbuffers.json diff --git a/port_versions/f-/flint.json b/versions/f-/flint.json similarity index 100% rename from port_versions/f-/flint.json rename to versions/f-/flint.json diff --git a/port_versions/f-/fltk.json b/versions/f-/fltk.json similarity index 100% rename from port_versions/f-/fltk.json rename to versions/f-/fltk.json diff --git a/port_versions/f-/fluidlite.json b/versions/f-/fluidlite.json similarity index 100% rename from port_versions/f-/fluidlite.json rename to versions/f-/fluidlite.json diff --git a/port_versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json similarity index 100% rename from port_versions/f-/fluidsynth.json rename to versions/f-/fluidsynth.json diff --git a/port_versions/f-/fmem.json b/versions/f-/fmem.json similarity index 100% rename from port_versions/f-/fmem.json rename to versions/f-/fmem.json diff --git a/port_versions/f-/fmi4cpp.json b/versions/f-/fmi4cpp.json similarity index 100% rename from port_versions/f-/fmi4cpp.json rename to versions/f-/fmi4cpp.json diff --git a/port_versions/f-/fmilib.json b/versions/f-/fmilib.json similarity index 100% rename from port_versions/f-/fmilib.json rename to versions/f-/fmilib.json diff --git a/port_versions/f-/fmt.json b/versions/f-/fmt.json similarity index 100% rename from port_versions/f-/fmt.json rename to versions/f-/fmt.json diff --git a/port_versions/f-/folly.json b/versions/f-/folly.json similarity index 100% rename from port_versions/f-/folly.json rename to versions/f-/folly.json diff --git a/port_versions/f-/font-chef.json b/versions/f-/font-chef.json similarity index 100% rename from port_versions/f-/font-chef.json rename to versions/f-/font-chef.json diff --git a/port_versions/f-/fontconfig.json b/versions/f-/fontconfig.json similarity index 100% rename from port_versions/f-/fontconfig.json rename to versions/f-/fontconfig.json diff --git a/port_versions/f-/foonathan-memory.json b/versions/f-/foonathan-memory.json similarity index 100% rename from port_versions/f-/foonathan-memory.json rename to versions/f-/foonathan-memory.json diff --git a/port_versions/f-/forest.json b/versions/f-/forest.json similarity index 100% rename from port_versions/f-/forest.json rename to versions/f-/forest.json diff --git a/port_versions/f-/forge.json b/versions/f-/forge.json similarity index 100% rename from port_versions/f-/forge.json rename to versions/f-/forge.json diff --git a/port_versions/f-/fplus.json b/versions/f-/fplus.json similarity index 100% rename from port_versions/f-/fplus.json rename to versions/f-/fplus.json diff --git a/port_versions/f-/freeglut.json b/versions/f-/freeglut.json similarity index 100% rename from port_versions/f-/freeglut.json rename to versions/f-/freeglut.json diff --git a/port_versions/f-/freeimage.json b/versions/f-/freeimage.json similarity index 100% rename from port_versions/f-/freeimage.json rename to versions/f-/freeimage.json diff --git a/port_versions/f-/freeopcua.json b/versions/f-/freeopcua.json similarity index 100% rename from port_versions/f-/freeopcua.json rename to versions/f-/freeopcua.json diff --git a/port_versions/f-/freerdp.json b/versions/f-/freerdp.json similarity index 100% rename from port_versions/f-/freerdp.json rename to versions/f-/freerdp.json diff --git a/port_versions/f-/freetds.json b/versions/f-/freetds.json similarity index 100% rename from port_versions/f-/freetds.json rename to versions/f-/freetds.json diff --git a/port_versions/f-/freetype-gl.json b/versions/f-/freetype-gl.json similarity index 100% rename from port_versions/f-/freetype-gl.json rename to versions/f-/freetype-gl.json diff --git a/port_versions/f-/freetype.json b/versions/f-/freetype.json similarity index 100% rename from port_versions/f-/freetype.json rename to versions/f-/freetype.json diff --git a/port_versions/f-/freexl.json b/versions/f-/freexl.json similarity index 100% rename from port_versions/f-/freexl.json rename to versions/f-/freexl.json diff --git a/port_versions/f-/fribidi.json b/versions/f-/fribidi.json similarity index 100% rename from port_versions/f-/fribidi.json rename to versions/f-/fribidi.json diff --git a/port_versions/f-/frozen.json b/versions/f-/frozen.json similarity index 100% rename from port_versions/f-/frozen.json rename to versions/f-/frozen.json diff --git a/port_versions/f-/fruit.json b/versions/f-/fruit.json similarity index 100% rename from port_versions/f-/fruit.json rename to versions/f-/fruit.json diff --git a/port_versions/f-/ftgl.json b/versions/f-/ftgl.json similarity index 100% rename from port_versions/f-/ftgl.json rename to versions/f-/ftgl.json diff --git a/port_versions/f-/function2.json b/versions/f-/function2.json similarity index 100% rename from port_versions/f-/function2.json rename to versions/f-/function2.json diff --git a/port_versions/f-/fuzzylite.json b/versions/f-/fuzzylite.json similarity index 100% rename from port_versions/f-/fuzzylite.json rename to versions/f-/fuzzylite.json diff --git a/port_versions/g-/g2o.json b/versions/g-/g2o.json similarity index 100% rename from port_versions/g-/g2o.json rename to versions/g-/g2o.json diff --git a/port_versions/g-/g3log.json b/versions/g-/g3log.json similarity index 100% rename from port_versions/g-/g3log.json rename to versions/g-/g3log.json diff --git a/port_versions/g-/gainput.json b/versions/g-/gainput.json similarity index 100% rename from port_versions/g-/gainput.json rename to versions/g-/gainput.json diff --git a/port_versions/g-/gamedev-framework.json b/versions/g-/gamedev-framework.json similarity index 100% rename from port_versions/g-/gamedev-framework.json rename to versions/g-/gamedev-framework.json diff --git a/port_versions/g-/gamma.json b/versions/g-/gamma.json similarity index 100% rename from port_versions/g-/gamma.json rename to versions/g-/gamma.json diff --git a/port_versions/g-/gasol.json b/versions/g-/gasol.json similarity index 100% rename from port_versions/g-/gasol.json rename to versions/g-/gasol.json diff --git a/port_versions/g-/gaussianlib.json b/versions/g-/gaussianlib.json similarity index 100% rename from port_versions/g-/gaussianlib.json rename to versions/g-/gaussianlib.json diff --git a/port_versions/g-/gcem.json b/versions/g-/gcem.json similarity index 100% rename from port_versions/g-/gcem.json rename to versions/g-/gcem.json diff --git a/port_versions/g-/gdal.json b/versions/g-/gdal.json similarity index 100% rename from port_versions/g-/gdal.json rename to versions/g-/gdal.json diff --git a/port_versions/g-/gdcm.json b/versions/g-/gdcm.json similarity index 100% rename from port_versions/g-/gdcm.json rename to versions/g-/gdcm.json diff --git a/port_versions/g-/gdcm2.json b/versions/g-/gdcm2.json similarity index 100% rename from port_versions/g-/gdcm2.json rename to versions/g-/gdcm2.json diff --git a/port_versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json similarity index 100% rename from port_versions/g-/gdk-pixbuf.json rename to versions/g-/gdk-pixbuf.json diff --git a/port_versions/g-/genann.json b/versions/g-/genann.json similarity index 100% rename from port_versions/g-/genann.json rename to versions/g-/genann.json diff --git a/port_versions/g-/geogram.json b/versions/g-/geogram.json similarity index 100% rename from port_versions/g-/geogram.json rename to versions/g-/geogram.json diff --git a/port_versions/g-/geographiclib.json b/versions/g-/geographiclib.json similarity index 100% rename from port_versions/g-/geographiclib.json rename to versions/g-/geographiclib.json diff --git a/port_versions/g-/geos.json b/versions/g-/geos.json similarity index 100% rename from port_versions/g-/geos.json rename to versions/g-/geos.json diff --git a/port_versions/g-/geotrans.json b/versions/g-/geotrans.json similarity index 100% rename from port_versions/g-/geotrans.json rename to versions/g-/geotrans.json diff --git a/port_versions/g-/getdns.json b/versions/g-/getdns.json similarity index 100% rename from port_versions/g-/getdns.json rename to versions/g-/getdns.json diff --git a/port_versions/g-/getopt-win32.json b/versions/g-/getopt-win32.json similarity index 100% rename from port_versions/g-/getopt-win32.json rename to versions/g-/getopt-win32.json diff --git a/port_versions/g-/getopt.json b/versions/g-/getopt.json similarity index 100% rename from port_versions/g-/getopt.json rename to versions/g-/getopt.json diff --git a/port_versions/g-/gettext.json b/versions/g-/gettext.json similarity index 100% rename from port_versions/g-/gettext.json rename to versions/g-/gettext.json diff --git a/port_versions/g-/gettimeofday.json b/versions/g-/gettimeofday.json similarity index 100% rename from port_versions/g-/gettimeofday.json rename to versions/g-/gettimeofday.json diff --git a/port_versions/g-/gflags.json b/versions/g-/gflags.json similarity index 100% rename from port_versions/g-/gflags.json rename to versions/g-/gflags.json diff --git a/port_versions/g-/gherkin-c.json b/versions/g-/gherkin-c.json similarity index 100% rename from port_versions/g-/gherkin-c.json rename to versions/g-/gherkin-c.json diff --git a/port_versions/g-/giflib.json b/versions/g-/giflib.json similarity index 100% rename from port_versions/g-/giflib.json rename to versions/g-/giflib.json diff --git a/port_versions/g-/gl2ps.json b/versions/g-/gl2ps.json similarity index 100% rename from port_versions/g-/gl2ps.json rename to versions/g-/gl2ps.json diff --git a/port_versions/g-/gl3w.json b/versions/g-/gl3w.json similarity index 100% rename from port_versions/g-/gl3w.json rename to versions/g-/gl3w.json diff --git a/port_versions/g-/glad.json b/versions/g-/glad.json similarity index 100% rename from port_versions/g-/glad.json rename to versions/g-/glad.json diff --git a/port_versions/g-/glbinding.json b/versions/g-/glbinding.json similarity index 100% rename from port_versions/g-/glbinding.json rename to versions/g-/glbinding.json diff --git a/port_versions/g-/glew.json b/versions/g-/glew.json similarity index 100% rename from port_versions/g-/glew.json rename to versions/g-/glew.json diff --git a/port_versions/g-/glfw3.json b/versions/g-/glfw3.json similarity index 100% rename from port_versions/g-/glfw3.json rename to versions/g-/glfw3.json diff --git a/port_versions/g-/gli.json b/versions/g-/gli.json similarity index 100% rename from port_versions/g-/gli.json rename to versions/g-/gli.json diff --git a/port_versions/g-/glib.json b/versions/g-/glib.json similarity index 100% rename from port_versions/g-/glib.json rename to versions/g-/glib.json diff --git a/port_versions/g-/glibmm.json b/versions/g-/glibmm.json similarity index 100% rename from port_versions/g-/glibmm.json rename to versions/g-/glibmm.json diff --git a/port_versions/g-/glm.json b/versions/g-/glm.json similarity index 100% rename from port_versions/g-/glm.json rename to versions/g-/glm.json diff --git a/port_versions/g-/globjects.json b/versions/g-/globjects.json similarity index 100% rename from port_versions/g-/globjects.json rename to versions/g-/globjects.json diff --git a/port_versions/g-/glog.json b/versions/g-/glog.json similarity index 100% rename from port_versions/g-/glog.json rename to versions/g-/glog.json diff --git a/port_versions/g-/gloo.json b/versions/g-/gloo.json similarity index 100% rename from port_versions/g-/gloo.json rename to versions/g-/gloo.json diff --git a/port_versions/g-/glslang.json b/versions/g-/glslang.json similarity index 100% rename from port_versions/g-/glslang.json rename to versions/g-/glslang.json diff --git a/port_versions/g-/glui.json b/versions/g-/glui.json similarity index 100% rename from port_versions/g-/glui.json rename to versions/g-/glui.json diff --git a/port_versions/g-/gmime.json b/versions/g-/gmime.json similarity index 100% rename from port_versions/g-/gmime.json rename to versions/g-/gmime.json diff --git a/port_versions/g-/gmmlib.json b/versions/g-/gmmlib.json similarity index 100% rename from port_versions/g-/gmmlib.json rename to versions/g-/gmmlib.json diff --git a/port_versions/g-/gmp.json b/versions/g-/gmp.json similarity index 100% rename from port_versions/g-/gmp.json rename to versions/g-/gmp.json diff --git a/port_versions/g-/google-cloud-cpp-common.json b/versions/g-/google-cloud-cpp-common.json similarity index 100% rename from port_versions/g-/google-cloud-cpp-common.json rename to versions/g-/google-cloud-cpp-common.json diff --git a/port_versions/g-/google-cloud-cpp-spanner.json b/versions/g-/google-cloud-cpp-spanner.json similarity index 100% rename from port_versions/g-/google-cloud-cpp-spanner.json rename to versions/g-/google-cloud-cpp-spanner.json diff --git a/port_versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json similarity index 100% rename from port_versions/g-/google-cloud-cpp.json rename to versions/g-/google-cloud-cpp.json diff --git a/port_versions/g-/googleapis.json b/versions/g-/googleapis.json similarity index 100% rename from port_versions/g-/googleapis.json rename to versions/g-/googleapis.json diff --git a/port_versions/g-/gperf.json b/versions/g-/gperf.json similarity index 100% rename from port_versions/g-/gperf.json rename to versions/g-/gperf.json diff --git a/port_versions/g-/gperftools.json b/versions/g-/gperftools.json similarity index 100% rename from port_versions/g-/gperftools.json rename to versions/g-/gperftools.json diff --git a/port_versions/g-/gpgme.json b/versions/g-/gpgme.json similarity index 100% rename from port_versions/g-/gpgme.json rename to versions/g-/gpgme.json diff --git a/port_versions/g-/gppanel.json b/versions/g-/gppanel.json similarity index 100% rename from port_versions/g-/gppanel.json rename to versions/g-/gppanel.json diff --git a/port_versions/g-/graphene.json b/versions/g-/graphene.json similarity index 100% rename from port_versions/g-/graphene.json rename to versions/g-/graphene.json diff --git a/port_versions/g-/graphicsmagick.json b/versions/g-/graphicsmagick.json similarity index 100% rename from port_versions/g-/graphicsmagick.json rename to versions/g-/graphicsmagick.json diff --git a/port_versions/g-/graphite2.json b/versions/g-/graphite2.json similarity index 100% rename from port_versions/g-/graphite2.json rename to versions/g-/graphite2.json diff --git a/port_versions/g-/graphqlparser.json b/versions/g-/graphqlparser.json similarity index 100% rename from port_versions/g-/graphqlparser.json rename to versions/g-/graphqlparser.json diff --git a/port_versions/g-/greatest.json b/versions/g-/greatest.json similarity index 100% rename from port_versions/g-/greatest.json rename to versions/g-/greatest.json diff --git a/port_versions/g-/grpc.json b/versions/g-/grpc.json similarity index 100% rename from port_versions/g-/grpc.json rename to versions/g-/grpc.json diff --git a/port_versions/g-/grppi.json b/versions/g-/grppi.json similarity index 100% rename from port_versions/g-/grppi.json rename to versions/g-/grppi.json diff --git a/port_versions/g-/gsl-lite.json b/versions/g-/gsl-lite.json similarity index 100% rename from port_versions/g-/gsl-lite.json rename to versions/g-/gsl-lite.json diff --git a/port_versions/g-/gsl.json b/versions/g-/gsl.json similarity index 100% rename from port_versions/g-/gsl.json rename to versions/g-/gsl.json diff --git a/port_versions/g-/gsoap.json b/versions/g-/gsoap.json similarity index 100% rename from port_versions/g-/gsoap.json rename to versions/g-/gsoap.json diff --git a/port_versions/g-/gtest.json b/versions/g-/gtest.json similarity index 100% rename from port_versions/g-/gtest.json rename to versions/g-/gtest.json diff --git a/port_versions/g-/gtk.json b/versions/g-/gtk.json similarity index 100% rename from port_versions/g-/gtk.json rename to versions/g-/gtk.json diff --git a/port_versions/g-/gtkmm.json b/versions/g-/gtkmm.json similarity index 100% rename from port_versions/g-/gtkmm.json rename to versions/g-/gtkmm.json diff --git a/port_versions/g-/gts.json b/versions/g-/gts.json similarity index 100% rename from port_versions/g-/gts.json rename to versions/g-/gts.json diff --git a/port_versions/g-/guetzli.json b/versions/g-/guetzli.json similarity index 100% rename from port_versions/g-/guetzli.json rename to versions/g-/guetzli.json diff --git a/port_versions/g-/gumbo.json b/versions/g-/gumbo.json similarity index 100% rename from port_versions/g-/gumbo.json rename to versions/g-/gumbo.json diff --git a/port_versions/g-/gzip-hpp.json b/versions/g-/gzip-hpp.json similarity index 100% rename from port_versions/g-/gzip-hpp.json rename to versions/g-/gzip-hpp.json diff --git a/port_versions/h-/h3.json b/versions/h-/h3.json similarity index 100% rename from port_versions/h-/h3.json rename to versions/h-/h3.json diff --git a/port_versions/h-/h5py-lzf.json b/versions/h-/h5py-lzf.json similarity index 100% rename from port_versions/h-/h5py-lzf.json rename to versions/h-/h5py-lzf.json diff --git a/port_versions/h-/halide.json b/versions/h-/halide.json similarity index 100% rename from port_versions/h-/halide.json rename to versions/h-/halide.json diff --git a/port_versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json similarity index 100% rename from port_versions/h-/harfbuzz.json rename to versions/h-/harfbuzz.json diff --git a/port_versions/h-/hayai.json b/versions/h-/hayai.json similarity index 100% rename from port_versions/h-/hayai.json rename to versions/h-/hayai.json diff --git a/port_versions/h-/hdf5.json b/versions/h-/hdf5.json similarity index 100% rename from port_versions/h-/hdf5.json rename to versions/h-/hdf5.json diff --git a/port_versions/h-/healpix.json b/versions/h-/healpix.json similarity index 100% rename from port_versions/h-/healpix.json rename to versions/h-/healpix.json diff --git a/port_versions/h-/hedley.json b/versions/h-/hedley.json similarity index 100% rename from port_versions/h-/hedley.json rename to versions/h-/hedley.json diff --git a/port_versions/h-/hffix.json b/versions/h-/hffix.json similarity index 100% rename from port_versions/h-/hffix.json rename to versions/h-/hffix.json diff --git a/port_versions/h-/hfsm2.json b/versions/h-/hfsm2.json similarity index 100% rename from port_versions/h-/hfsm2.json rename to versions/h-/hfsm2.json diff --git a/port_versions/h-/hidapi.json b/versions/h-/hidapi.json similarity index 100% rename from port_versions/h-/hidapi.json rename to versions/h-/hidapi.json diff --git a/port_versions/h-/highfive.json b/versions/h-/highfive.json similarity index 100% rename from port_versions/h-/highfive.json rename to versions/h-/highfive.json diff --git a/port_versions/h-/hiredis.json b/versions/h-/hiredis.json similarity index 100% rename from port_versions/h-/hiredis.json rename to versions/h-/hiredis.json diff --git a/port_versions/h-/hpx.json b/versions/h-/hpx.json similarity index 100% rename from port_versions/h-/hpx.json rename to versions/h-/hpx.json diff --git a/port_versions/h-/http-parser.json b/versions/h-/http-parser.json similarity index 100% rename from port_versions/h-/http-parser.json rename to versions/h-/http-parser.json diff --git a/port_versions/h-/hungarian.json b/versions/h-/hungarian.json similarity index 100% rename from port_versions/h-/hungarian.json rename to versions/h-/hungarian.json diff --git a/port_versions/h-/hunspell.json b/versions/h-/hunspell.json similarity index 100% rename from port_versions/h-/hunspell.json rename to versions/h-/hunspell.json diff --git a/port_versions/h-/hwloc.json b/versions/h-/hwloc.json similarity index 100% rename from port_versions/h-/hwloc.json rename to versions/h-/hwloc.json diff --git a/port_versions/h-/hyperscan.json b/versions/h-/hyperscan.json similarity index 100% rename from port_versions/h-/hyperscan.json rename to versions/h-/hyperscan.json diff --git a/port_versions/h-/hypre.json b/versions/h-/hypre.json similarity index 100% rename from port_versions/h-/hypre.json rename to versions/h-/hypre.json diff --git a/port_versions/i-/icu.json b/versions/i-/icu.json similarity index 100% rename from port_versions/i-/icu.json rename to versions/i-/icu.json diff --git a/port_versions/i-/ideviceinstaller.json b/versions/i-/ideviceinstaller.json similarity index 100% rename from port_versions/i-/ideviceinstaller.json rename to versions/i-/ideviceinstaller.json diff --git a/port_versions/i-/idevicerestore.json b/versions/i-/idevicerestore.json similarity index 100% rename from port_versions/i-/idevicerestore.json rename to versions/i-/idevicerestore.json diff --git a/port_versions/i-/if97.json b/versions/i-/if97.json similarity index 100% rename from port_versions/i-/if97.json rename to versions/i-/if97.json diff --git a/port_versions/i-/igloo.json b/versions/i-/igloo.json similarity index 100% rename from port_versions/i-/igloo.json rename to versions/i-/igloo.json diff --git a/port_versions/i-/ignition-cmake0.json b/versions/i-/ignition-cmake0.json similarity index 100% rename from port_versions/i-/ignition-cmake0.json rename to versions/i-/ignition-cmake0.json diff --git a/port_versions/i-/ignition-cmake2.json b/versions/i-/ignition-cmake2.json similarity index 100% rename from port_versions/i-/ignition-cmake2.json rename to versions/i-/ignition-cmake2.json diff --git a/port_versions/i-/ignition-common1.json b/versions/i-/ignition-common1.json similarity index 100% rename from port_versions/i-/ignition-common1.json rename to versions/i-/ignition-common1.json diff --git a/port_versions/i-/ignition-common3.json b/versions/i-/ignition-common3.json similarity index 100% rename from port_versions/i-/ignition-common3.json rename to versions/i-/ignition-common3.json diff --git a/port_versions/i-/ignition-fuel-tools1.json b/versions/i-/ignition-fuel-tools1.json similarity index 100% rename from port_versions/i-/ignition-fuel-tools1.json rename to versions/i-/ignition-fuel-tools1.json diff --git a/port_versions/i-/ignition-fuel-tools4.json b/versions/i-/ignition-fuel-tools4.json similarity index 100% rename from port_versions/i-/ignition-fuel-tools4.json rename to versions/i-/ignition-fuel-tools4.json diff --git a/port_versions/i-/ignition-math4.json b/versions/i-/ignition-math4.json similarity index 100% rename from port_versions/i-/ignition-math4.json rename to versions/i-/ignition-math4.json diff --git a/port_versions/i-/ignition-math6.json b/versions/i-/ignition-math6.json similarity index 100% rename from port_versions/i-/ignition-math6.json rename to versions/i-/ignition-math6.json diff --git a/port_versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json similarity index 100% rename from port_versions/i-/ignition-modularscripts.json rename to versions/i-/ignition-modularscripts.json diff --git a/port_versions/i-/ignition-msgs1.json b/versions/i-/ignition-msgs1.json similarity index 100% rename from port_versions/i-/ignition-msgs1.json rename to versions/i-/ignition-msgs1.json diff --git a/port_versions/i-/ignition-msgs5.json b/versions/i-/ignition-msgs5.json similarity index 100% rename from port_versions/i-/ignition-msgs5.json rename to versions/i-/ignition-msgs5.json diff --git a/port_versions/i-/ignition-msgs6.json b/versions/i-/ignition-msgs6.json similarity index 100% rename from port_versions/i-/ignition-msgs6.json rename to versions/i-/ignition-msgs6.json diff --git a/port_versions/i-/ignition-plugin1.json b/versions/i-/ignition-plugin1.json similarity index 100% rename from port_versions/i-/ignition-plugin1.json rename to versions/i-/ignition-plugin1.json diff --git a/port_versions/i-/ignition-transport4.json b/versions/i-/ignition-transport4.json similarity index 100% rename from port_versions/i-/ignition-transport4.json rename to versions/i-/ignition-transport4.json diff --git a/port_versions/i-/ignition-transport8.json b/versions/i-/ignition-transport8.json similarity index 100% rename from port_versions/i-/ignition-transport8.json rename to versions/i-/ignition-transport8.json diff --git a/port_versions/i-/ignition-transport9.json b/versions/i-/ignition-transport9.json similarity index 100% rename from port_versions/i-/ignition-transport9.json rename to versions/i-/ignition-transport9.json diff --git a/port_versions/i-/ijg-libjpeg.json b/versions/i-/ijg-libjpeg.json similarity index 100% rename from port_versions/i-/ijg-libjpeg.json rename to versions/i-/ijg-libjpeg.json diff --git a/port_versions/i-/ilmbase.json b/versions/i-/ilmbase.json similarity index 100% rename from port_versions/i-/ilmbase.json rename to versions/i-/ilmbase.json diff --git a/port_versions/i-/imgui-sfml.json b/versions/i-/imgui-sfml.json similarity index 100% rename from port_versions/i-/imgui-sfml.json rename to versions/i-/imgui-sfml.json diff --git a/port_versions/i-/imgui.json b/versions/i-/imgui.json similarity index 100% rename from port_versions/i-/imgui.json rename to versions/i-/imgui.json diff --git a/port_versions/i-/immer.json b/versions/i-/immer.json similarity index 100% rename from port_versions/i-/immer.json rename to versions/i-/immer.json diff --git a/port_versions/i-/implot.json b/versions/i-/implot.json similarity index 100% rename from port_versions/i-/implot.json rename to versions/i-/implot.json diff --git a/port_versions/i-/indicators.json b/versions/i-/indicators.json similarity index 100% rename from port_versions/i-/indicators.json rename to versions/i-/indicators.json diff --git a/port_versions/i-/infoware.json b/versions/i-/infoware.json similarity index 100% rename from port_versions/i-/infoware.json rename to versions/i-/infoware.json diff --git a/port_versions/i-/inih.json b/versions/i-/inih.json similarity index 100% rename from port_versions/i-/inih.json rename to versions/i-/inih.json diff --git a/port_versions/i-/iniparser.json b/versions/i-/iniparser.json similarity index 100% rename from port_versions/i-/iniparser.json rename to versions/i-/iniparser.json diff --git a/port_versions/i-/inja.json b/versions/i-/inja.json similarity index 100% rename from port_versions/i-/inja.json rename to versions/i-/inja.json diff --git a/port_versions/i-/intel-ipsec.json b/versions/i-/intel-ipsec.json similarity index 100% rename from port_versions/i-/intel-ipsec.json rename to versions/i-/intel-ipsec.json diff --git a/port_versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json similarity index 100% rename from port_versions/i-/intel-mkl.json rename to versions/i-/intel-mkl.json diff --git a/port_versions/i-/intelrdfpmathlib.json b/versions/i-/intelrdfpmathlib.json similarity index 100% rename from port_versions/i-/intelrdfpmathlib.json rename to versions/i-/intelrdfpmathlib.json diff --git a/port_versions/i-/io2d.json b/versions/i-/io2d.json similarity index 100% rename from port_versions/i-/io2d.json rename to versions/i-/io2d.json diff --git a/port_versions/i-/irrlicht.json b/versions/i-/irrlicht.json similarity index 100% rename from port_versions/i-/irrlicht.json rename to versions/i-/irrlicht.json diff --git a/port_versions/i-/irrxml.json b/versions/i-/irrxml.json similarity index 100% rename from port_versions/i-/irrxml.json rename to versions/i-/irrxml.json diff --git a/port_versions/i-/isal.json b/versions/i-/isal.json similarity index 100% rename from port_versions/i-/isal.json rename to versions/i-/isal.json diff --git a/port_versions/i-/ismrmrd.json b/versions/i-/ismrmrd.json similarity index 100% rename from port_versions/i-/ismrmrd.json rename to versions/i-/ismrmrd.json diff --git a/port_versions/i-/itk.json b/versions/i-/itk.json similarity index 100% rename from port_versions/i-/itk.json rename to versions/i-/itk.json diff --git a/port_versions/i-/itpp.json b/versions/i-/itpp.json similarity index 100% rename from port_versions/i-/itpp.json rename to versions/i-/itpp.json diff --git a/port_versions/i-/ixwebsocket.json b/versions/i-/ixwebsocket.json similarity index 100% rename from port_versions/i-/ixwebsocket.json rename to versions/i-/ixwebsocket.json diff --git a/port_versions/j-/jack2.json b/versions/j-/jack2.json similarity index 100% rename from port_versions/j-/jack2.json rename to versions/j-/jack2.json diff --git a/port_versions/j-/jaeger-client-cpp.json b/versions/j-/jaeger-client-cpp.json similarity index 100% rename from port_versions/j-/jaeger-client-cpp.json rename to versions/j-/jaeger-client-cpp.json diff --git a/port_versions/j-/jansson.json b/versions/j-/jansson.json similarity index 100% rename from port_versions/j-/jansson.json rename to versions/j-/jansson.json diff --git a/port_versions/j-/jasper.json b/versions/j-/jasper.json similarity index 100% rename from port_versions/j-/jasper.json rename to versions/j-/jasper.json diff --git a/port_versions/j-/jbig2dec.json b/versions/j-/jbig2dec.json similarity index 100% rename from port_versions/j-/jbig2dec.json rename to versions/j-/jbig2dec.json diff --git a/port_versions/j-/jbigkit.json b/versions/j-/jbigkit.json similarity index 100% rename from port_versions/j-/jbigkit.json rename to versions/j-/jbigkit.json diff --git a/port_versions/j-/jemalloc.json b/versions/j-/jemalloc.json similarity index 100% rename from port_versions/j-/jemalloc.json rename to versions/j-/jemalloc.json diff --git a/port_versions/j-/jinja2cpplight.json b/versions/j-/jinja2cpplight.json similarity index 100% rename from port_versions/j-/jinja2cpplight.json rename to versions/j-/jinja2cpplight.json diff --git a/port_versions/j-/josuttis-jthread.json b/versions/j-/josuttis-jthread.json similarity index 100% rename from port_versions/j-/josuttis-jthread.json rename to versions/j-/josuttis-jthread.json diff --git a/port_versions/j-/jsmn.json b/versions/j-/jsmn.json similarity index 100% rename from port_versions/j-/jsmn.json rename to versions/j-/jsmn.json diff --git a/port_versions/j-/json-c.json b/versions/j-/json-c.json similarity index 100% rename from port_versions/j-/json-c.json rename to versions/j-/json-c.json diff --git a/port_versions/j-/json-dto.json b/versions/j-/json-dto.json similarity index 100% rename from port_versions/j-/json-dto.json rename to versions/j-/json-dto.json diff --git a/port_versions/j-/json-schema-validator.json b/versions/j-/json-schema-validator.json similarity index 100% rename from port_versions/j-/json-schema-validator.json rename to versions/j-/json-schema-validator.json diff --git a/port_versions/j-/json-spirit.json b/versions/j-/json-spirit.json similarity index 100% rename from port_versions/j-/json-spirit.json rename to versions/j-/json-spirit.json diff --git a/port_versions/j-/json11.json b/versions/j-/json11.json similarity index 100% rename from port_versions/j-/json11.json rename to versions/j-/json11.json diff --git a/port_versions/j-/json5-parser.json b/versions/j-/json5-parser.json similarity index 100% rename from port_versions/j-/json5-parser.json rename to versions/j-/json5-parser.json diff --git a/port_versions/j-/jsoncons.json b/versions/j-/jsoncons.json similarity index 100% rename from port_versions/j-/jsoncons.json rename to versions/j-/jsoncons.json diff --git a/port_versions/j-/jsoncpp.json b/versions/j-/jsoncpp.json similarity index 100% rename from port_versions/j-/jsoncpp.json rename to versions/j-/jsoncpp.json diff --git a/port_versions/j-/jsonnet.json b/versions/j-/jsonnet.json similarity index 100% rename from port_versions/j-/jsonnet.json rename to versions/j-/jsonnet.json diff --git a/port_versions/j-/jwt-cpp.json b/versions/j-/jwt-cpp.json similarity index 100% rename from port_versions/j-/jwt-cpp.json rename to versions/j-/jwt-cpp.json diff --git a/port_versions/j-/jxrlib.json b/versions/j-/jxrlib.json similarity index 100% rename from port_versions/j-/jxrlib.json rename to versions/j-/jxrlib.json diff --git a/port_versions/k-/kangaru.json b/versions/k-/kangaru.json similarity index 100% rename from port_versions/k-/kangaru.json rename to versions/k-/kangaru.json diff --git a/port_versions/k-/kcp.json b/versions/k-/kcp.json similarity index 100% rename from port_versions/k-/kcp.json rename to versions/k-/kcp.json diff --git a/port_versions/k-/kd-soap.json b/versions/k-/kd-soap.json similarity index 100% rename from port_versions/k-/kd-soap.json rename to versions/k-/kd-soap.json diff --git a/port_versions/k-/kealib.json b/versions/k-/kealib.json similarity index 100% rename from port_versions/k-/kealib.json rename to versions/k-/kealib.json diff --git a/port_versions/k-/kenlm.json b/versions/k-/kenlm.json similarity index 100% rename from port_versions/k-/kenlm.json rename to versions/k-/kenlm.json diff --git a/port_versions/k-/keystone.json b/versions/k-/keystone.json similarity index 100% rename from port_versions/k-/keystone.json rename to versions/k-/keystone.json diff --git a/port_versions/k-/kf5archive.json b/versions/k-/kf5archive.json similarity index 100% rename from port_versions/k-/kf5archive.json rename to versions/k-/kf5archive.json diff --git a/port_versions/k-/kf5completion.json b/versions/k-/kf5completion.json similarity index 100% rename from port_versions/k-/kf5completion.json rename to versions/k-/kf5completion.json diff --git a/port_versions/k-/kf5config.json b/versions/k-/kf5config.json similarity index 100% rename from port_versions/k-/kf5config.json rename to versions/k-/kf5config.json diff --git a/port_versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json similarity index 100% rename from port_versions/k-/kf5coreaddons.json rename to versions/k-/kf5coreaddons.json diff --git a/port_versions/k-/kf5crash.json b/versions/k-/kf5crash.json similarity index 100% rename from port_versions/k-/kf5crash.json rename to versions/k-/kf5crash.json diff --git a/port_versions/k-/kf5guiaddons.json b/versions/k-/kf5guiaddons.json similarity index 100% rename from port_versions/k-/kf5guiaddons.json rename to versions/k-/kf5guiaddons.json diff --git a/port_versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json similarity index 100% rename from port_versions/k-/kf5holidays.json rename to versions/k-/kf5holidays.json diff --git a/port_versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json similarity index 100% rename from port_versions/k-/kf5i18n.json rename to versions/k-/kf5i18n.json diff --git a/port_versions/k-/kf5itemmodels.json b/versions/k-/kf5itemmodels.json similarity index 100% rename from port_versions/k-/kf5itemmodels.json rename to versions/k-/kf5itemmodels.json diff --git a/port_versions/k-/kf5itemviews.json b/versions/k-/kf5itemviews.json similarity index 100% rename from port_versions/k-/kf5itemviews.json rename to versions/k-/kf5itemviews.json diff --git a/port_versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json similarity index 100% rename from port_versions/k-/kf5plotting.json rename to versions/k-/kf5plotting.json diff --git a/port_versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json similarity index 100% rename from port_versions/k-/kf5syntaxhighlighting.json rename to versions/k-/kf5syntaxhighlighting.json diff --git a/port_versions/k-/kf5widgetsaddons.json b/versions/k-/kf5widgetsaddons.json similarity index 100% rename from port_versions/k-/kf5widgetsaddons.json rename to versions/k-/kf5widgetsaddons.json diff --git a/port_versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json similarity index 100% rename from port_versions/k-/kf5windowsystem.json rename to versions/k-/kf5windowsystem.json diff --git a/port_versions/k-/kfr.json b/versions/k-/kfr.json similarity index 100% rename from port_versions/k-/kfr.json rename to versions/k-/kfr.json diff --git a/port_versions/k-/kinectsdk1.json b/versions/k-/kinectsdk1.json similarity index 100% rename from port_versions/k-/kinectsdk1.json rename to versions/k-/kinectsdk1.json diff --git a/port_versions/k-/kinectsdk2.json b/versions/k-/kinectsdk2.json similarity index 100% rename from port_versions/k-/kinectsdk2.json rename to versions/k-/kinectsdk2.json diff --git a/port_versions/k-/kissfft.json b/versions/k-/kissfft.json similarity index 100% rename from port_versions/k-/kissfft.json rename to versions/k-/kissfft.json diff --git a/port_versions/k-/knet.json b/versions/k-/knet.json similarity index 100% rename from port_versions/k-/knet.json rename to versions/k-/knet.json diff --git a/port_versions/k-/krabsetw.json b/versions/k-/krabsetw.json similarity index 100% rename from port_versions/k-/krabsetw.json rename to versions/k-/krabsetw.json diff --git a/port_versions/k-/ktx.json b/versions/k-/ktx.json similarity index 100% rename from port_versions/k-/ktx.json rename to versions/k-/ktx.json diff --git a/port_versions/k-/kubazip.json b/versions/k-/kubazip.json similarity index 100% rename from port_versions/k-/kubazip.json rename to versions/k-/kubazip.json diff --git a/port_versions/k-/kuku.json b/versions/k-/kuku.json similarity index 100% rename from port_versions/k-/kuku.json rename to versions/k-/kuku.json diff --git a/port_versions/k-/kvasir-mpl.json b/versions/k-/kvasir-mpl.json similarity index 100% rename from port_versions/k-/kvasir-mpl.json rename to versions/k-/kvasir-mpl.json diff --git a/port_versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json similarity index 100% rename from port_versions/l-/lapack-reference.json rename to versions/l-/lapack-reference.json diff --git a/port_versions/l-/lapack.json b/versions/l-/lapack.json similarity index 100% rename from port_versions/l-/lapack.json rename to versions/l-/lapack.json diff --git a/port_versions/l-/lastools.json b/versions/l-/lastools.json similarity index 100% rename from port_versions/l-/lastools.json rename to versions/l-/lastools.json diff --git a/port_versions/l-/laszip.json b/versions/l-/laszip.json similarity index 100% rename from port_versions/l-/laszip.json rename to versions/l-/laszip.json diff --git a/port_versions/l-/lazy-importer.json b/versions/l-/lazy-importer.json similarity index 100% rename from port_versions/l-/lazy-importer.json rename to versions/l-/lazy-importer.json diff --git a/port_versions/l-/lcm.json b/versions/l-/lcm.json similarity index 100% rename from port_versions/l-/lcm.json rename to versions/l-/lcm.json diff --git a/port_versions/l-/lcms.json b/versions/l-/lcms.json similarity index 100% rename from port_versions/l-/lcms.json rename to versions/l-/lcms.json diff --git a/port_versions/l-/leaf.json b/versions/l-/leaf.json similarity index 100% rename from port_versions/l-/leaf.json rename to versions/l-/leaf.json diff --git a/port_versions/l-/lemon.json b/versions/l-/lemon.json similarity index 100% rename from port_versions/l-/lemon.json rename to versions/l-/lemon.json diff --git a/port_versions/l-/leptonica.json b/versions/l-/leptonica.json similarity index 100% rename from port_versions/l-/leptonica.json rename to versions/l-/leptonica.json diff --git a/port_versions/l-/lerc.json b/versions/l-/lerc.json similarity index 100% rename from port_versions/l-/lerc.json rename to versions/l-/lerc.json diff --git a/port_versions/l-/lest.json b/versions/l-/lest.json similarity index 100% rename from port_versions/l-/lest.json rename to versions/l-/lest.json diff --git a/port_versions/l-/leveldb.json b/versions/l-/leveldb.json similarity index 100% rename from port_versions/l-/leveldb.json rename to versions/l-/leveldb.json diff --git a/port_versions/l-/levmar.json b/versions/l-/levmar.json similarity index 100% rename from port_versions/l-/levmar.json rename to versions/l-/levmar.json diff --git a/port_versions/l-/libaaplus.json b/versions/l-/libaaplus.json similarity index 100% rename from port_versions/l-/libaaplus.json rename to versions/l-/libaaplus.json diff --git a/port_versions/l-/libaiff.json b/versions/l-/libaiff.json similarity index 100% rename from port_versions/l-/libaiff.json rename to versions/l-/libaiff.json diff --git a/port_versions/l-/libarchive.json b/versions/l-/libarchive.json similarity index 100% rename from port_versions/l-/libarchive.json rename to versions/l-/libarchive.json diff --git a/port_versions/l-/libass.json b/versions/l-/libass.json similarity index 100% rename from port_versions/l-/libass.json rename to versions/l-/libass.json diff --git a/port_versions/l-/libassuan.json b/versions/l-/libassuan.json similarity index 100% rename from port_versions/l-/libassuan.json rename to versions/l-/libassuan.json diff --git a/port_versions/l-/libb2.json b/versions/l-/libb2.json similarity index 100% rename from port_versions/l-/libb2.json rename to versions/l-/libb2.json diff --git a/port_versions/l-/libbf.json b/versions/l-/libbf.json similarity index 100% rename from port_versions/l-/libbf.json rename to versions/l-/libbf.json diff --git a/port_versions/l-/libbson.json b/versions/l-/libbson.json similarity index 100% rename from port_versions/l-/libbson.json rename to versions/l-/libbson.json diff --git a/port_versions/l-/libcds.json b/versions/l-/libcds.json similarity index 100% rename from port_versions/l-/libcds.json rename to versions/l-/libcds.json diff --git a/port_versions/l-/libcerf.json b/versions/l-/libcerf.json similarity index 100% rename from port_versions/l-/libcerf.json rename to versions/l-/libcerf.json diff --git a/port_versions/l-/libconfig.json b/versions/l-/libconfig.json similarity index 100% rename from port_versions/l-/libconfig.json rename to versions/l-/libconfig.json diff --git a/port_versions/l-/libconfuse.json b/versions/l-/libconfuse.json similarity index 100% rename from port_versions/l-/libconfuse.json rename to versions/l-/libconfuse.json diff --git a/port_versions/l-/libcopp.json b/versions/l-/libcopp.json similarity index 100% rename from port_versions/l-/libcopp.json rename to versions/l-/libcopp.json diff --git a/port_versions/l-/libcrafter.json b/versions/l-/libcrafter.json similarity index 100% rename from port_versions/l-/libcrafter.json rename to versions/l-/libcrafter.json diff --git a/port_versions/l-/libcroco.json b/versions/l-/libcroco.json similarity index 100% rename from port_versions/l-/libcroco.json rename to versions/l-/libcroco.json diff --git a/port_versions/l-/libcuckoo.json b/versions/l-/libcuckoo.json similarity index 100% rename from port_versions/l-/libcuckoo.json rename to versions/l-/libcuckoo.json diff --git a/port_versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json similarity index 100% rename from port_versions/l-/libdatachannel.json rename to versions/l-/libdatachannel.json diff --git a/port_versions/l-/libdatrie.json b/versions/l-/libdatrie.json similarity index 100% rename from port_versions/l-/libdatrie.json rename to versions/l-/libdatrie.json diff --git a/port_versions/l-/libde265.json b/versions/l-/libde265.json similarity index 100% rename from port_versions/l-/libde265.json rename to versions/l-/libde265.json diff --git a/port_versions/l-/libdisasm.json b/versions/l-/libdisasm.json similarity index 100% rename from port_versions/l-/libdisasm.json rename to versions/l-/libdisasm.json diff --git a/port_versions/l-/libdivide.json b/versions/l-/libdivide.json similarity index 100% rename from port_versions/l-/libdivide.json rename to versions/l-/libdivide.json diff --git a/port_versions/l-/libdshowcapture.json b/versions/l-/libdshowcapture.json similarity index 100% rename from port_versions/l-/libdshowcapture.json rename to versions/l-/libdshowcapture.json diff --git a/port_versions/l-/libepoxy.json b/versions/l-/libepoxy.json similarity index 100% rename from port_versions/l-/libepoxy.json rename to versions/l-/libepoxy.json diff --git a/port_versions/l-/libevent.json b/versions/l-/libevent.json similarity index 100% rename from port_versions/l-/libevent.json rename to versions/l-/libevent.json diff --git a/port_versions/l-/libevhtp.json b/versions/l-/libevhtp.json similarity index 100% rename from port_versions/l-/libevhtp.json rename to versions/l-/libevhtp.json diff --git a/port_versions/l-/libexif.json b/versions/l-/libexif.json similarity index 100% rename from port_versions/l-/libexif.json rename to versions/l-/libexif.json diff --git a/port_versions/l-/libfabric.json b/versions/l-/libfabric.json similarity index 100% rename from port_versions/l-/libfabric.json rename to versions/l-/libfabric.json diff --git a/port_versions/l-/libffi.json b/versions/l-/libffi.json similarity index 100% rename from port_versions/l-/libffi.json rename to versions/l-/libffi.json diff --git a/port_versions/l-/libflac.json b/versions/l-/libflac.json similarity index 100% rename from port_versions/l-/libflac.json rename to versions/l-/libflac.json diff --git a/port_versions/l-/libfort.json b/versions/l-/libfort.json similarity index 100% rename from port_versions/l-/libfort.json rename to versions/l-/libfort.json diff --git a/port_versions/l-/libfreenect2.json b/versions/l-/libfreenect2.json similarity index 100% rename from port_versions/l-/libfreenect2.json rename to versions/l-/libfreenect2.json diff --git a/port_versions/l-/libftdi.json b/versions/l-/libftdi.json similarity index 100% rename from port_versions/l-/libftdi.json rename to versions/l-/libftdi.json diff --git a/port_versions/l-/libftdi1.json b/versions/l-/libftdi1.json similarity index 100% rename from port_versions/l-/libftdi1.json rename to versions/l-/libftdi1.json diff --git a/port_versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json similarity index 100% rename from port_versions/l-/libgcrypt.json rename to versions/l-/libgcrypt.json diff --git a/port_versions/l-/libgd.json b/versions/l-/libgd.json similarity index 100% rename from port_versions/l-/libgd.json rename to versions/l-/libgd.json diff --git a/port_versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json similarity index 100% rename from port_versions/l-/libgeotiff.json rename to versions/l-/libgeotiff.json diff --git a/port_versions/l-/libgit2.json b/versions/l-/libgit2.json similarity index 100% rename from port_versions/l-/libgit2.json rename to versions/l-/libgit2.json diff --git a/port_versions/l-/libgo.json b/versions/l-/libgo.json similarity index 100% rename from port_versions/l-/libgo.json rename to versions/l-/libgo.json diff --git a/port_versions/l-/libgpg-error.json b/versions/l-/libgpg-error.json similarity index 100% rename from port_versions/l-/libgpg-error.json rename to versions/l-/libgpg-error.json diff --git a/port_versions/l-/libgpod.json b/versions/l-/libgpod.json similarity index 100% rename from port_versions/l-/libgpod.json rename to versions/l-/libgpod.json diff --git a/port_versions/l-/libgta.json b/versions/l-/libgta.json similarity index 100% rename from port_versions/l-/libgta.json rename to versions/l-/libgta.json diff --git a/port_versions/l-/libguarded.json b/versions/l-/libguarded.json similarity index 100% rename from port_versions/l-/libguarded.json rename to versions/l-/libguarded.json diff --git a/port_versions/l-/libharu.json b/versions/l-/libharu.json similarity index 100% rename from port_versions/l-/libharu.json rename to versions/l-/libharu.json diff --git a/port_versions/l-/libhdfs3.json b/versions/l-/libhdfs3.json similarity index 100% rename from port_versions/l-/libhdfs3.json rename to versions/l-/libhdfs3.json diff --git a/port_versions/l-/libheif.json b/versions/l-/libheif.json similarity index 100% rename from port_versions/l-/libheif.json rename to versions/l-/libheif.json diff --git a/port_versions/l-/libhsplasma.json b/versions/l-/libhsplasma.json similarity index 100% rename from port_versions/l-/libhsplasma.json rename to versions/l-/libhsplasma.json diff --git a/port_versions/l-/libhydrogen.json b/versions/l-/libhydrogen.json similarity index 100% rename from port_versions/l-/libhydrogen.json rename to versions/l-/libhydrogen.json diff --git a/port_versions/l-/libiconv.json b/versions/l-/libiconv.json similarity index 100% rename from port_versions/l-/libiconv.json rename to versions/l-/libiconv.json diff --git a/port_versions/l-/libics.json b/versions/l-/libics.json similarity index 100% rename from port_versions/l-/libics.json rename to versions/l-/libics.json diff --git a/port_versions/l-/libideviceactivation.json b/versions/l-/libideviceactivation.json similarity index 100% rename from port_versions/l-/libideviceactivation.json rename to versions/l-/libideviceactivation.json diff --git a/port_versions/l-/libidn2.json b/versions/l-/libidn2.json similarity index 100% rename from port_versions/l-/libidn2.json rename to versions/l-/libidn2.json diff --git a/port_versions/l-/libigl.json b/versions/l-/libigl.json similarity index 100% rename from port_versions/l-/libigl.json rename to versions/l-/libigl.json diff --git a/port_versions/l-/libilbc.json b/versions/l-/libilbc.json similarity index 100% rename from port_versions/l-/libilbc.json rename to versions/l-/libilbc.json diff --git a/port_versions/l-/libimobiledevice.json b/versions/l-/libimobiledevice.json similarity index 100% rename from port_versions/l-/libimobiledevice.json rename to versions/l-/libimobiledevice.json diff --git a/port_versions/l-/libirecovery.json b/versions/l-/libirecovery.json similarity index 100% rename from port_versions/l-/libirecovery.json rename to versions/l-/libirecovery.json diff --git a/port_versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json similarity index 100% rename from port_versions/l-/libjpeg-turbo.json rename to versions/l-/libjpeg-turbo.json diff --git a/port_versions/l-/libjuice.json b/versions/l-/libjuice.json similarity index 100% rename from port_versions/l-/libjuice.json rename to versions/l-/libjuice.json diff --git a/port_versions/l-/libkml.json b/versions/l-/libkml.json similarity index 100% rename from port_versions/l-/libkml.json rename to versions/l-/libkml.json diff --git a/port_versions/l-/liblas.json b/versions/l-/liblas.json similarity index 100% rename from port_versions/l-/liblas.json rename to versions/l-/liblas.json diff --git a/port_versions/l-/liblbfgs.json b/versions/l-/liblbfgs.json similarity index 100% rename from port_versions/l-/liblbfgs.json rename to versions/l-/liblbfgs.json diff --git a/port_versions/l-/liblemon.json b/versions/l-/liblemon.json similarity index 100% rename from port_versions/l-/liblemon.json rename to versions/l-/liblemon.json diff --git a/port_versions/l-/liblinear.json b/versions/l-/liblinear.json similarity index 100% rename from port_versions/l-/liblinear.json rename to versions/l-/liblinear.json diff --git a/port_versions/l-/liblo.json b/versions/l-/liblo.json similarity index 100% rename from port_versions/l-/liblo.json rename to versions/l-/liblo.json diff --git a/port_versions/l-/liblsl.json b/versions/l-/liblsl.json similarity index 100% rename from port_versions/l-/liblsl.json rename to versions/l-/liblsl.json diff --git a/port_versions/l-/liblzma.json b/versions/l-/liblzma.json similarity index 100% rename from port_versions/l-/liblzma.json rename to versions/l-/liblzma.json diff --git a/port_versions/l-/libmad.json b/versions/l-/libmad.json similarity index 100% rename from port_versions/l-/libmad.json rename to versions/l-/libmad.json diff --git a/port_versions/l-/libmagic.json b/versions/l-/libmagic.json similarity index 100% rename from port_versions/l-/libmagic.json rename to versions/l-/libmagic.json diff --git a/port_versions/l-/libmariadb.json b/versions/l-/libmariadb.json similarity index 100% rename from port_versions/l-/libmariadb.json rename to versions/l-/libmariadb.json diff --git a/port_versions/l-/libmaxminddb.json b/versions/l-/libmaxminddb.json similarity index 100% rename from port_versions/l-/libmaxminddb.json rename to versions/l-/libmaxminddb.json diff --git a/port_versions/l-/libmediainfo.json b/versions/l-/libmediainfo.json similarity index 100% rename from port_versions/l-/libmediainfo.json rename to versions/l-/libmediainfo.json diff --git a/port_versions/l-/libmesh.json b/versions/l-/libmesh.json similarity index 100% rename from port_versions/l-/libmesh.json rename to versions/l-/libmesh.json diff --git a/port_versions/l-/libmicrohttpd.json b/versions/l-/libmicrohttpd.json similarity index 100% rename from port_versions/l-/libmicrohttpd.json rename to versions/l-/libmicrohttpd.json diff --git a/port_versions/l-/libmikmod.json b/versions/l-/libmikmod.json similarity index 100% rename from port_versions/l-/libmikmod.json rename to versions/l-/libmikmod.json diff --git a/port_versions/l-/libmodbus.json b/versions/l-/libmodbus.json similarity index 100% rename from port_versions/l-/libmodbus.json rename to versions/l-/libmodbus.json diff --git a/port_versions/l-/libmodman.json b/versions/l-/libmodman.json similarity index 100% rename from port_versions/l-/libmodman.json rename to versions/l-/libmodman.json diff --git a/port_versions/l-/libmodplug.json b/versions/l-/libmodplug.json similarity index 100% rename from port_versions/l-/libmodplug.json rename to versions/l-/libmodplug.json diff --git a/port_versions/l-/libmorton.json b/versions/l-/libmorton.json similarity index 100% rename from port_versions/l-/libmorton.json rename to versions/l-/libmorton.json diff --git a/port_versions/l-/libmpeg2.json b/versions/l-/libmpeg2.json similarity index 100% rename from port_versions/l-/libmpeg2.json rename to versions/l-/libmpeg2.json diff --git a/port_versions/l-/libmspack.json b/versions/l-/libmspack.json similarity index 100% rename from port_versions/l-/libmspack.json rename to versions/l-/libmspack.json diff --git a/port_versions/l-/libmupdf.json b/versions/l-/libmupdf.json similarity index 100% rename from port_versions/l-/libmupdf.json rename to versions/l-/libmupdf.json diff --git a/port_versions/l-/libmysql.json b/versions/l-/libmysql.json similarity index 100% rename from port_versions/l-/libmysql.json rename to versions/l-/libmysql.json diff --git a/port_versions/l-/libnice.json b/versions/l-/libnice.json similarity index 100% rename from port_versions/l-/libnice.json rename to versions/l-/libnice.json diff --git a/port_versions/l-/libnoise.json b/versions/l-/libnoise.json similarity index 100% rename from port_versions/l-/libnoise.json rename to versions/l-/libnoise.json diff --git a/port_versions/l-/libodb-boost.json b/versions/l-/libodb-boost.json similarity index 100% rename from port_versions/l-/libodb-boost.json rename to versions/l-/libodb-boost.json diff --git a/port_versions/l-/libodb-mysql.json b/versions/l-/libodb-mysql.json similarity index 100% rename from port_versions/l-/libodb-mysql.json rename to versions/l-/libodb-mysql.json diff --git a/port_versions/l-/libodb-pgsql.json b/versions/l-/libodb-pgsql.json similarity index 100% rename from port_versions/l-/libodb-pgsql.json rename to versions/l-/libodb-pgsql.json diff --git a/port_versions/l-/libodb-sqlite.json b/versions/l-/libodb-sqlite.json similarity index 100% rename from port_versions/l-/libodb-sqlite.json rename to versions/l-/libodb-sqlite.json diff --git a/port_versions/l-/libodb.json b/versions/l-/libodb.json similarity index 100% rename from port_versions/l-/libodb.json rename to versions/l-/libodb.json diff --git a/port_versions/l-/libogg.json b/versions/l-/libogg.json similarity index 100% rename from port_versions/l-/libogg.json rename to versions/l-/libogg.json diff --git a/port_versions/l-/libopenmpt.json b/versions/l-/libopenmpt.json similarity index 100% rename from port_versions/l-/libopenmpt.json rename to versions/l-/libopenmpt.json diff --git a/port_versions/l-/libopusenc.json b/versions/l-/libopusenc.json similarity index 100% rename from port_versions/l-/libopusenc.json rename to versions/l-/libopusenc.json diff --git a/port_versions/l-/libosip2.json b/versions/l-/libosip2.json similarity index 100% rename from port_versions/l-/libosip2.json rename to versions/l-/libosip2.json diff --git a/port_versions/l-/libosmium.json b/versions/l-/libosmium.json similarity index 100% rename from port_versions/l-/libosmium.json rename to versions/l-/libosmium.json diff --git a/port_versions/l-/libosmscout.json b/versions/l-/libosmscout.json similarity index 100% rename from port_versions/l-/libosmscout.json rename to versions/l-/libosmscout.json diff --git a/port_versions/l-/libp7-baical.json b/versions/l-/libp7-baical.json similarity index 100% rename from port_versions/l-/libp7-baical.json rename to versions/l-/libp7-baical.json diff --git a/port_versions/l-/libp7client.json b/versions/l-/libp7client.json similarity index 100% rename from port_versions/l-/libp7client.json rename to versions/l-/libp7client.json diff --git a/port_versions/l-/libpcap.json b/versions/l-/libpcap.json similarity index 100% rename from port_versions/l-/libpcap.json rename to versions/l-/libpcap.json diff --git a/port_versions/l-/libpff.json b/versions/l-/libpff.json similarity index 100% rename from port_versions/l-/libpff.json rename to versions/l-/libpff.json diff --git a/port_versions/l-/libplist.json b/versions/l-/libplist.json similarity index 100% rename from port_versions/l-/libplist.json rename to versions/l-/libplist.json diff --git a/port_versions/l-/libpmemobj-cpp.json b/versions/l-/libpmemobj-cpp.json similarity index 100% rename from port_versions/l-/libpmemobj-cpp.json rename to versions/l-/libpmemobj-cpp.json diff --git a/port_versions/l-/libpng.json b/versions/l-/libpng.json similarity index 100% rename from port_versions/l-/libpng.json rename to versions/l-/libpng.json diff --git a/port_versions/l-/libpopt.json b/versions/l-/libpopt.json similarity index 100% rename from port_versions/l-/libpopt.json rename to versions/l-/libpopt.json diff --git a/port_versions/l-/libpq.json b/versions/l-/libpq.json similarity index 100% rename from port_versions/l-/libpq.json rename to versions/l-/libpq.json diff --git a/port_versions/l-/libpqxx.json b/versions/l-/libpqxx.json similarity index 100% rename from port_versions/l-/libpqxx.json rename to versions/l-/libpqxx.json diff --git a/port_versions/l-/libprotobuf-mutator.json b/versions/l-/libprotobuf-mutator.json similarity index 100% rename from port_versions/l-/libprotobuf-mutator.json rename to versions/l-/libprotobuf-mutator.json diff --git a/port_versions/l-/libproxy.json b/versions/l-/libproxy.json similarity index 100% rename from port_versions/l-/libproxy.json rename to versions/l-/libproxy.json diff --git a/port_versions/l-/libqcow.json b/versions/l-/libqcow.json similarity index 100% rename from port_versions/l-/libqcow.json rename to versions/l-/libqcow.json diff --git a/port_versions/l-/libqglviewer.json b/versions/l-/libqglviewer.json similarity index 100% rename from port_versions/l-/libqglviewer.json rename to versions/l-/libqglviewer.json diff --git a/port_versions/l-/libqrencode.json b/versions/l-/libqrencode.json similarity index 100% rename from port_versions/l-/libqrencode.json rename to versions/l-/libqrencode.json diff --git a/port_versions/l-/librabbitmq.json b/versions/l-/librabbitmq.json similarity index 100% rename from port_versions/l-/librabbitmq.json rename to versions/l-/librabbitmq.json diff --git a/port_versions/l-/libraqm.json b/versions/l-/libraqm.json similarity index 100% rename from port_versions/l-/libraqm.json rename to versions/l-/libraqm.json diff --git a/port_versions/l-/libraw.json b/versions/l-/libraw.json similarity index 100% rename from port_versions/l-/libraw.json rename to versions/l-/libraw.json diff --git a/port_versions/l-/librdkafka.json b/versions/l-/librdkafka.json similarity index 100% rename from port_versions/l-/librdkafka.json rename to versions/l-/librdkafka.json diff --git a/port_versions/l-/libressl.json b/versions/l-/libressl.json similarity index 100% rename from port_versions/l-/libressl.json rename to versions/l-/libressl.json diff --git a/port_versions/l-/librsvg.json b/versions/l-/librsvg.json similarity index 100% rename from port_versions/l-/librsvg.json rename to versions/l-/librsvg.json diff --git a/port_versions/l-/librsync.json b/versions/l-/librsync.json similarity index 100% rename from port_versions/l-/librsync.json rename to versions/l-/librsync.json diff --git a/port_versions/l-/librtmp.json b/versions/l-/librtmp.json similarity index 100% rename from port_versions/l-/librtmp.json rename to versions/l-/librtmp.json diff --git a/port_versions/l-/librttopo.json b/versions/l-/librttopo.json similarity index 100% rename from port_versions/l-/librttopo.json rename to versions/l-/librttopo.json diff --git a/port_versions/l-/libsamplerate.json b/versions/l-/libsamplerate.json similarity index 100% rename from port_versions/l-/libsamplerate.json rename to versions/l-/libsamplerate.json diff --git a/port_versions/l-/libsass.json b/versions/l-/libsass.json similarity index 100% rename from port_versions/l-/libsass.json rename to versions/l-/libsass.json diff --git a/port_versions/l-/libsbml.json b/versions/l-/libsbml.json similarity index 100% rename from port_versions/l-/libsbml.json rename to versions/l-/libsbml.json diff --git a/port_versions/l-/libsigcpp-3.json b/versions/l-/libsigcpp-3.json similarity index 100% rename from port_versions/l-/libsigcpp-3.json rename to versions/l-/libsigcpp-3.json diff --git a/port_versions/l-/libsigcpp.json b/versions/l-/libsigcpp.json similarity index 100% rename from port_versions/l-/libsigcpp.json rename to versions/l-/libsigcpp.json diff --git a/port_versions/l-/libsndfile.json b/versions/l-/libsndfile.json similarity index 100% rename from port_versions/l-/libsndfile.json rename to versions/l-/libsndfile.json diff --git a/port_versions/l-/libsodium.json b/versions/l-/libsodium.json similarity index 100% rename from port_versions/l-/libsodium.json rename to versions/l-/libsodium.json diff --git a/port_versions/l-/libsoundio.json b/versions/l-/libsoundio.json similarity index 100% rename from port_versions/l-/libsoundio.json rename to versions/l-/libsoundio.json diff --git a/port_versions/l-/libspatialindex.json b/versions/l-/libspatialindex.json similarity index 100% rename from port_versions/l-/libspatialindex.json rename to versions/l-/libspatialindex.json diff --git a/port_versions/l-/libspatialite.json b/versions/l-/libspatialite.json similarity index 100% rename from port_versions/l-/libspatialite.json rename to versions/l-/libspatialite.json diff --git a/port_versions/l-/libspnav.json b/versions/l-/libspnav.json similarity index 100% rename from port_versions/l-/libspnav.json rename to versions/l-/libspnav.json diff --git a/port_versions/l-/libsquish.json b/versions/l-/libsquish.json similarity index 100% rename from port_versions/l-/libsquish.json rename to versions/l-/libsquish.json diff --git a/port_versions/l-/libsrt.json b/versions/l-/libsrt.json similarity index 100% rename from port_versions/l-/libsrt.json rename to versions/l-/libsrt.json diff --git a/port_versions/l-/libsrtp.json b/versions/l-/libsrtp.json similarity index 100% rename from port_versions/l-/libsrtp.json rename to versions/l-/libsrtp.json diff --git a/port_versions/l-/libssh.json b/versions/l-/libssh.json similarity index 100% rename from port_versions/l-/libssh.json rename to versions/l-/libssh.json diff --git a/port_versions/l-/libssh2.json b/versions/l-/libssh2.json similarity index 100% rename from port_versions/l-/libssh2.json rename to versions/l-/libssh2.json diff --git a/port_versions/l-/libstemmer.json b/versions/l-/libstemmer.json similarity index 100% rename from port_versions/l-/libstemmer.json rename to versions/l-/libstemmer.json diff --git a/port_versions/l-/libstk.json b/versions/l-/libstk.json similarity index 100% rename from port_versions/l-/libstk.json rename to versions/l-/libstk.json diff --git a/port_versions/l-/libsvm.json b/versions/l-/libsvm.json similarity index 100% rename from port_versions/l-/libsvm.json rename to versions/l-/libsvm.json diff --git a/port_versions/l-/libtheora.json b/versions/l-/libtheora.json similarity index 100% rename from port_versions/l-/libtheora.json rename to versions/l-/libtheora.json diff --git a/port_versions/l-/libtins.json b/versions/l-/libtins.json similarity index 100% rename from port_versions/l-/libtins.json rename to versions/l-/libtins.json diff --git a/port_versions/l-/libtomcrypt.json b/versions/l-/libtomcrypt.json similarity index 100% rename from port_versions/l-/libtomcrypt.json rename to versions/l-/libtomcrypt.json diff --git a/port_versions/l-/libtommath.json b/versions/l-/libtommath.json similarity index 100% rename from port_versions/l-/libtommath.json rename to versions/l-/libtommath.json diff --git a/port_versions/l-/libtorrent.json b/versions/l-/libtorrent.json similarity index 100% rename from port_versions/l-/libtorrent.json rename to versions/l-/libtorrent.json diff --git a/port_versions/l-/libu2f-server.json b/versions/l-/libu2f-server.json similarity index 100% rename from port_versions/l-/libu2f-server.json rename to versions/l-/libu2f-server.json diff --git a/port_versions/l-/libudis86.json b/versions/l-/libudis86.json similarity index 100% rename from port_versions/l-/libudis86.json rename to versions/l-/libudis86.json diff --git a/port_versions/l-/libudns.json b/versions/l-/libudns.json similarity index 100% rename from port_versions/l-/libudns.json rename to versions/l-/libudns.json diff --git a/port_versions/l-/libui.json b/versions/l-/libui.json similarity index 100% rename from port_versions/l-/libui.json rename to versions/l-/libui.json diff --git a/port_versions/l-/libunibreak.json b/versions/l-/libunibreak.json similarity index 100% rename from port_versions/l-/libunibreak.json rename to versions/l-/libunibreak.json diff --git a/port_versions/l-/libusb-win32.json b/versions/l-/libusb-win32.json similarity index 100% rename from port_versions/l-/libusb-win32.json rename to versions/l-/libusb-win32.json diff --git a/port_versions/l-/libusb.json b/versions/l-/libusb.json similarity index 100% rename from port_versions/l-/libusb.json rename to versions/l-/libusb.json diff --git a/port_versions/l-/libusbmuxd.json b/versions/l-/libusbmuxd.json similarity index 100% rename from port_versions/l-/libusbmuxd.json rename to versions/l-/libusbmuxd.json diff --git a/port_versions/l-/libuuid.json b/versions/l-/libuuid.json similarity index 100% rename from port_versions/l-/libuuid.json rename to versions/l-/libuuid.json diff --git a/port_versions/l-/libuv.json b/versions/l-/libuv.json similarity index 100% rename from port_versions/l-/libuv.json rename to versions/l-/libuv.json diff --git a/port_versions/l-/libvmdk.json b/versions/l-/libvmdk.json similarity index 100% rename from port_versions/l-/libvmdk.json rename to versions/l-/libvmdk.json diff --git a/port_versions/l-/libvorbis.json b/versions/l-/libvorbis.json similarity index 100% rename from port_versions/l-/libvorbis.json rename to versions/l-/libvorbis.json diff --git a/port_versions/l-/libvpx.json b/versions/l-/libvpx.json similarity index 100% rename from port_versions/l-/libvpx.json rename to versions/l-/libvpx.json diff --git a/port_versions/l-/libwandio.json b/versions/l-/libwandio.json similarity index 100% rename from port_versions/l-/libwandio.json rename to versions/l-/libwandio.json diff --git a/port_versions/l-/libwebm.json b/versions/l-/libwebm.json similarity index 100% rename from port_versions/l-/libwebm.json rename to versions/l-/libwebm.json diff --git a/port_versions/l-/libwebp.json b/versions/l-/libwebp.json similarity index 100% rename from port_versions/l-/libwebp.json rename to versions/l-/libwebp.json diff --git a/port_versions/l-/libwebsockets.json b/versions/l-/libwebsockets.json similarity index 100% rename from port_versions/l-/libwebsockets.json rename to versions/l-/libwebsockets.json diff --git a/port_versions/l-/libxdiff.json b/versions/l-/libxdiff.json similarity index 100% rename from port_versions/l-/libxdiff.json rename to versions/l-/libxdiff.json diff --git a/port_versions/l-/libxlsxwriter.json b/versions/l-/libxlsxwriter.json similarity index 100% rename from port_versions/l-/libxlsxwriter.json rename to versions/l-/libxlsxwriter.json diff --git a/port_versions/l-/libxml2.json b/versions/l-/libxml2.json similarity index 100% rename from port_versions/l-/libxml2.json rename to versions/l-/libxml2.json diff --git a/port_versions/l-/libxmlmm.json b/versions/l-/libxmlmm.json similarity index 100% rename from port_versions/l-/libxmlmm.json rename to versions/l-/libxmlmm.json diff --git a/port_versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json similarity index 100% rename from port_versions/l-/libxmlpp.json rename to versions/l-/libxmlpp.json diff --git a/port_versions/l-/libxmp-lite.json b/versions/l-/libxmp-lite.json similarity index 100% rename from port_versions/l-/libxmp-lite.json rename to versions/l-/libxmp-lite.json diff --git a/port_versions/l-/libxslt.json b/versions/l-/libxslt.json similarity index 100% rename from port_versions/l-/libxslt.json rename to versions/l-/libxslt.json diff --git a/port_versions/l-/libyaml.json b/versions/l-/libyaml.json similarity index 100% rename from port_versions/l-/libyaml.json rename to versions/l-/libyaml.json diff --git a/port_versions/l-/libyuv.json b/versions/l-/libyuv.json similarity index 100% rename from port_versions/l-/libyuv.json rename to versions/l-/libyuv.json diff --git a/port_versions/l-/libzen.json b/versions/l-/libzen.json similarity index 100% rename from port_versions/l-/libzen.json rename to versions/l-/libzen.json diff --git a/port_versions/l-/libzip.json b/versions/l-/libzip.json similarity index 100% rename from port_versions/l-/libzip.json rename to versions/l-/libzip.json diff --git a/port_versions/l-/libzippp.json b/versions/l-/libzippp.json similarity index 100% rename from port_versions/l-/libzippp.json rename to versions/l-/libzippp.json diff --git a/port_versions/l-/licensepp.json b/versions/l-/licensepp.json similarity index 100% rename from port_versions/l-/licensepp.json rename to versions/l-/licensepp.json diff --git a/port_versions/l-/lilv.json b/versions/l-/lilv.json similarity index 100% rename from port_versions/l-/lilv.json rename to versions/l-/lilv.json diff --git a/port_versions/l-/linalg.json b/versions/l-/linalg.json similarity index 100% rename from port_versions/l-/linalg.json rename to versions/l-/linalg.json diff --git a/port_versions/l-/linenoise-ng.json b/versions/l-/linenoise-ng.json similarity index 100% rename from port_versions/l-/linenoise-ng.json rename to versions/l-/linenoise-ng.json diff --git a/port_versions/l-/live555.json b/versions/l-/live555.json similarity index 100% rename from port_versions/l-/live555.json rename to versions/l-/live555.json diff --git a/port_versions/l-/llgl.json b/versions/l-/llgl.json similarity index 100% rename from port_versions/l-/llgl.json rename to versions/l-/llgl.json diff --git a/port_versions/l-/llvm.json b/versions/l-/llvm.json similarity index 100% rename from port_versions/l-/llvm.json rename to versions/l-/llvm.json diff --git a/port_versions/l-/lmdb.json b/versions/l-/lmdb.json similarity index 100% rename from port_versions/l-/lmdb.json rename to versions/l-/lmdb.json diff --git a/port_versions/l-/lodepng.json b/versions/l-/lodepng.json similarity index 100% rename from port_versions/l-/lodepng.json rename to versions/l-/lodepng.json diff --git a/port_versions/l-/log4cplus.json b/versions/l-/log4cplus.json similarity index 100% rename from port_versions/l-/log4cplus.json rename to versions/l-/log4cplus.json diff --git a/port_versions/l-/log4cpp.json b/versions/l-/log4cpp.json similarity index 100% rename from port_versions/l-/log4cpp.json rename to versions/l-/log4cpp.json diff --git a/port_versions/l-/log4cxx.json b/versions/l-/log4cxx.json similarity index 100% rename from port_versions/l-/log4cxx.json rename to versions/l-/log4cxx.json diff --git a/port_versions/l-/loguru.json b/versions/l-/loguru.json similarity index 100% rename from port_versions/l-/loguru.json rename to versions/l-/loguru.json diff --git a/port_versions/l-/lpeg.json b/versions/l-/lpeg.json similarity index 100% rename from port_versions/l-/lpeg.json rename to versions/l-/lpeg.json diff --git a/port_versions/l-/lua.json b/versions/l-/lua.json similarity index 100% rename from port_versions/l-/lua.json rename to versions/l-/lua.json diff --git a/port_versions/l-/luabridge.json b/versions/l-/luabridge.json similarity index 100% rename from port_versions/l-/luabridge.json rename to versions/l-/luabridge.json diff --git a/port_versions/l-/luafilesystem.json b/versions/l-/luafilesystem.json similarity index 100% rename from port_versions/l-/luafilesystem.json rename to versions/l-/luafilesystem.json diff --git a/port_versions/l-/luajit.json b/versions/l-/luajit.json similarity index 100% rename from port_versions/l-/luajit.json rename to versions/l-/luajit.json diff --git a/port_versions/l-/luasocket.json b/versions/l-/luasocket.json similarity index 100% rename from port_versions/l-/luasocket.json rename to versions/l-/luasocket.json diff --git a/port_versions/l-/lv2.json b/versions/l-/lv2.json similarity index 100% rename from port_versions/l-/lv2.json rename to versions/l-/lv2.json diff --git a/port_versions/l-/lz4.json b/versions/l-/lz4.json similarity index 100% rename from port_versions/l-/lz4.json rename to versions/l-/lz4.json diff --git a/port_versions/l-/lzfse.json b/versions/l-/lzfse.json similarity index 100% rename from port_versions/l-/lzfse.json rename to versions/l-/lzfse.json diff --git a/port_versions/l-/lzo.json b/versions/l-/lzo.json similarity index 100% rename from port_versions/l-/lzo.json rename to versions/l-/lzo.json diff --git a/port_versions/l-/lzokay.json b/versions/l-/lzokay.json similarity index 100% rename from port_versions/l-/lzokay.json rename to versions/l-/lzokay.json diff --git a/port_versions/m-/magic-enum.json b/versions/m-/magic-enum.json similarity index 100% rename from port_versions/m-/magic-enum.json rename to versions/m-/magic-enum.json diff --git a/port_versions/m-/magic-get.json b/versions/m-/magic-get.json similarity index 100% rename from port_versions/m-/magic-get.json rename to versions/m-/magic-get.json diff --git a/port_versions/m-/magnum-extras.json b/versions/m-/magnum-extras.json similarity index 100% rename from port_versions/m-/magnum-extras.json rename to versions/m-/magnum-extras.json diff --git a/port_versions/m-/magnum-integration.json b/versions/m-/magnum-integration.json similarity index 100% rename from port_versions/m-/magnum-integration.json rename to versions/m-/magnum-integration.json diff --git a/port_versions/m-/magnum-plugins.json b/versions/m-/magnum-plugins.json similarity index 100% rename from port_versions/m-/magnum-plugins.json rename to versions/m-/magnum-plugins.json diff --git a/port_versions/m-/magnum.json b/versions/m-/magnum.json similarity index 100% rename from port_versions/m-/magnum.json rename to versions/m-/magnum.json diff --git a/port_versions/m-/mapbox-variant.json b/versions/m-/mapbox-variant.json similarity index 100% rename from port_versions/m-/mapbox-variant.json rename to versions/m-/mapbox-variant.json diff --git a/port_versions/m-/marble.json b/versions/m-/marble.json similarity index 100% rename from port_versions/m-/marble.json rename to versions/m-/marble.json diff --git a/port_versions/m-/marl.json b/versions/m-/marl.json similarity index 100% rename from port_versions/m-/marl.json rename to versions/m-/marl.json diff --git a/port_versions/m-/mathc.json b/versions/m-/mathc.json similarity index 100% rename from port_versions/m-/mathc.json rename to versions/m-/mathc.json diff --git a/port_versions/m-/mathgl.json b/versions/m-/mathgl.json similarity index 100% rename from port_versions/m-/mathgl.json rename to versions/m-/mathgl.json diff --git a/port_versions/m-/matio.json b/versions/m-/matio.json similarity index 100% rename from port_versions/m-/matio.json rename to versions/m-/matio.json diff --git a/port_versions/m-/matplotlib-cpp.json b/versions/m-/matplotlib-cpp.json similarity index 100% rename from port_versions/m-/matplotlib-cpp.json rename to versions/m-/matplotlib-cpp.json diff --git a/port_versions/m-/matroska.json b/versions/m-/matroska.json similarity index 100% rename from port_versions/m-/matroska.json rename to versions/m-/matroska.json diff --git a/port_versions/m-/mbedtls.json b/versions/m-/mbedtls.json similarity index 100% rename from port_versions/m-/mbedtls.json rename to versions/m-/mbedtls.json diff --git a/port_versions/m-/mcpp.json b/versions/m-/mcpp.json similarity index 100% rename from port_versions/m-/mcpp.json rename to versions/m-/mcpp.json diff --git a/port_versions/m-/mdns.json b/versions/m-/mdns.json similarity index 100% rename from port_versions/m-/mdns.json rename to versions/m-/mdns.json diff --git a/port_versions/m-/mdnsresponder.json b/versions/m-/mdnsresponder.json similarity index 100% rename from port_versions/m-/mdnsresponder.json rename to versions/m-/mdnsresponder.json diff --git a/port_versions/m-/mecab.json b/versions/m-/mecab.json similarity index 100% rename from port_versions/m-/mecab.json rename to versions/m-/mecab.json diff --git a/port_versions/m-/memorymodule.json b/versions/m-/memorymodule.json similarity index 100% rename from port_versions/m-/memorymodule.json rename to versions/m-/memorymodule.json diff --git a/port_versions/m-/mesa.json b/versions/m-/mesa.json similarity index 100% rename from port_versions/m-/mesa.json rename to versions/m-/mesa.json diff --git a/port_versions/m-/meschach.json b/versions/m-/meschach.json similarity index 100% rename from port_versions/m-/meschach.json rename to versions/m-/meschach.json diff --git a/port_versions/m-/meshoptimizer.json b/versions/m-/meshoptimizer.json similarity index 100% rename from port_versions/m-/meshoptimizer.json rename to versions/m-/meshoptimizer.json diff --git a/port_versions/m-/metis.json b/versions/m-/metis.json similarity index 100% rename from port_versions/m-/metis.json rename to versions/m-/metis.json diff --git a/port_versions/m-/metrohash.json b/versions/m-/metrohash.json similarity index 100% rename from port_versions/m-/metrohash.json rename to versions/m-/metrohash.json diff --git a/port_versions/m-/mgnlibs.json b/versions/m-/mgnlibs.json similarity index 100% rename from port_versions/m-/mgnlibs.json rename to versions/m-/mgnlibs.json diff --git a/port_versions/m-/mhook.json b/versions/m-/mhook.json similarity index 100% rename from port_versions/m-/mhook.json rename to versions/m-/mhook.json diff --git a/port_versions/m-/microsoft-signalr.json b/versions/m-/microsoft-signalr.json similarity index 100% rename from port_versions/m-/microsoft-signalr.json rename to versions/m-/microsoft-signalr.json diff --git a/port_versions/m-/mikktspace.json b/versions/m-/mikktspace.json similarity index 100% rename from port_versions/m-/mikktspace.json rename to versions/m-/mikktspace.json diff --git a/port_versions/m-/milerius-sfml-imgui.json b/versions/m-/milerius-sfml-imgui.json similarity index 100% rename from port_versions/m-/milerius-sfml-imgui.json rename to versions/m-/milerius-sfml-imgui.json diff --git a/port_versions/m-/mimalloc.json b/versions/m-/mimalloc.json similarity index 100% rename from port_versions/m-/mimalloc.json rename to versions/m-/mimalloc.json diff --git a/port_versions/m-/minc.json b/versions/m-/minc.json similarity index 100% rename from port_versions/m-/minc.json rename to versions/m-/minc.json diff --git a/port_versions/m-/minhook.json b/versions/m-/minhook.json similarity index 100% rename from port_versions/m-/minhook.json rename to versions/m-/minhook.json diff --git a/port_versions/m-/minifb.json b/versions/m-/minifb.json similarity index 100% rename from port_versions/m-/minifb.json rename to versions/m-/minifb.json diff --git a/port_versions/m-/minimp3.json b/versions/m-/minimp3.json similarity index 100% rename from port_versions/m-/minimp3.json rename to versions/m-/minimp3.json diff --git a/port_versions/m-/minisat-master-keying.json b/versions/m-/minisat-master-keying.json similarity index 100% rename from port_versions/m-/minisat-master-keying.json rename to versions/m-/minisat-master-keying.json diff --git a/port_versions/m-/minitrace.json b/versions/m-/minitrace.json similarity index 100% rename from port_versions/m-/minitrace.json rename to versions/m-/minitrace.json diff --git a/port_versions/m-/miniupnpc.json b/versions/m-/miniupnpc.json similarity index 100% rename from port_versions/m-/miniupnpc.json rename to versions/m-/miniupnpc.json diff --git a/port_versions/m-/miniz.json b/versions/m-/miniz.json similarity index 100% rename from port_versions/m-/miniz.json rename to versions/m-/miniz.json diff --git a/port_versions/m-/minizip.json b/versions/m-/minizip.json similarity index 100% rename from port_versions/m-/minizip.json rename to versions/m-/minizip.json diff --git a/port_versions/m-/mio.json b/versions/m-/mio.json similarity index 100% rename from port_versions/m-/mio.json rename to versions/m-/mio.json diff --git a/port_versions/m-/mlpack.json b/versions/m-/mlpack.json similarity index 100% rename from port_versions/m-/mlpack.json rename to versions/m-/mlpack.json diff --git a/port_versions/m-/mman.json b/versions/m-/mman.json similarity index 100% rename from port_versions/m-/mman.json rename to versions/m-/mman.json diff --git a/port_versions/m-/mmloader.json b/versions/m-/mmloader.json similarity index 100% rename from port_versions/m-/mmloader.json rename to versions/m-/mmloader.json diff --git a/port_versions/m-/mmx.json b/versions/m-/mmx.json similarity index 100% rename from port_versions/m-/mmx.json rename to versions/m-/mmx.json diff --git a/port_versions/m-/modp-base64.json b/versions/m-/modp-base64.json similarity index 100% rename from port_versions/m-/modp-base64.json rename to versions/m-/modp-base64.json diff --git a/port_versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json similarity index 100% rename from port_versions/m-/mongo-c-driver.json rename to versions/m-/mongo-c-driver.json diff --git a/port_versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json similarity index 100% rename from port_versions/m-/mongo-cxx-driver.json rename to versions/m-/mongo-cxx-driver.json diff --git a/port_versions/m-/mongoose.json b/versions/m-/mongoose.json similarity index 100% rename from port_versions/m-/mongoose.json rename to versions/m-/mongoose.json diff --git a/port_versions/m-/monkeys-audio.json b/versions/m-/monkeys-audio.json similarity index 100% rename from port_versions/m-/monkeys-audio.json rename to versions/m-/monkeys-audio.json diff --git a/port_versions/m-/moos-core.json b/versions/m-/moos-core.json similarity index 100% rename from port_versions/m-/moos-core.json rename to versions/m-/moos-core.json diff --git a/port_versions/m-/moos-essential.json b/versions/m-/moos-essential.json similarity index 100% rename from port_versions/m-/moos-essential.json rename to versions/m-/moos-essential.json diff --git a/port_versions/m-/moos-ui.json b/versions/m-/moos-ui.json similarity index 100% rename from port_versions/m-/moos-ui.json rename to versions/m-/moos-ui.json diff --git a/port_versions/m-/morton-nd.json b/versions/m-/morton-nd.json similarity index 100% rename from port_versions/m-/morton-nd.json rename to versions/m-/morton-nd.json diff --git a/port_versions/m-/mosquitto.json b/versions/m-/mosquitto.json similarity index 100% rename from port_versions/m-/mosquitto.json rename to versions/m-/mosquitto.json diff --git a/port_versions/m-/mozjpeg.json b/versions/m-/mozjpeg.json similarity index 100% rename from port_versions/m-/mozjpeg.json rename to versions/m-/mozjpeg.json diff --git a/port_versions/m-/mp-units.json b/versions/m-/mp-units.json similarity index 100% rename from port_versions/m-/mp-units.json rename to versions/m-/mp-units.json diff --git a/port_versions/m-/mp3lame.json b/versions/m-/mp3lame.json similarity index 100% rename from port_versions/m-/mp3lame.json rename to versions/m-/mp3lame.json diff --git a/port_versions/m-/mpark-variant.json b/versions/m-/mpark-variant.json similarity index 100% rename from port_versions/m-/mpark-variant.json rename to versions/m-/mpark-variant.json diff --git a/port_versions/m-/mpfr.json b/versions/m-/mpfr.json similarity index 100% rename from port_versions/m-/mpfr.json rename to versions/m-/mpfr.json diff --git a/port_versions/m-/mpg123.json b/versions/m-/mpg123.json similarity index 100% rename from port_versions/m-/mpg123.json rename to versions/m-/mpg123.json diff --git a/port_versions/m-/mpi.json b/versions/m-/mpi.json similarity index 100% rename from port_versions/m-/mpi.json rename to versions/m-/mpi.json diff --git a/port_versions/m-/mpir.json b/versions/m-/mpir.json similarity index 100% rename from port_versions/m-/mpir.json rename to versions/m-/mpir.json diff --git a/port_versions/m-/mpmcqueue.json b/versions/m-/mpmcqueue.json similarity index 100% rename from port_versions/m-/mpmcqueue.json rename to versions/m-/mpmcqueue.json diff --git a/port_versions/m-/mqtt-cpp.json b/versions/m-/mqtt-cpp.json similarity index 100% rename from port_versions/m-/mqtt-cpp.json rename to versions/m-/mqtt-cpp.json diff --git a/port_versions/m-/ms-angle.json b/versions/m-/ms-angle.json similarity index 100% rename from port_versions/m-/ms-angle.json rename to versions/m-/ms-angle.json diff --git a/port_versions/m-/ms-gsl.json b/versions/m-/ms-gsl.json similarity index 100% rename from port_versions/m-/ms-gsl.json rename to versions/m-/ms-gsl.json diff --git a/port_versions/m-/msdfgen.json b/versions/m-/msdfgen.json similarity index 100% rename from port_versions/m-/msdfgen.json rename to versions/m-/msdfgen.json diff --git a/port_versions/m-/msgpack.json b/versions/m-/msgpack.json similarity index 100% rename from port_versions/m-/msgpack.json rename to versions/m-/msgpack.json diff --git a/port_versions/m-/msgpack11.json b/versions/m-/msgpack11.json similarity index 100% rename from port_versions/m-/msgpack11.json rename to versions/m-/msgpack11.json diff --git a/port_versions/m-/msinttypes.json b/versions/m-/msinttypes.json similarity index 100% rename from port_versions/m-/msinttypes.json rename to versions/m-/msinttypes.json diff --git a/port_versions/m-/msix.json b/versions/m-/msix.json similarity index 100% rename from port_versions/m-/msix.json rename to versions/m-/msix.json diff --git a/port_versions/m-/msmpi.json b/versions/m-/msmpi.json similarity index 100% rename from port_versions/m-/msmpi.json rename to versions/m-/msmpi.json diff --git a/port_versions/m-/mstch.json b/versions/m-/mstch.json similarity index 100% rename from port_versions/m-/mstch.json rename to versions/m-/mstch.json diff --git a/port_versions/m-/mujs.json b/versions/m-/mujs.json similarity index 100% rename from port_versions/m-/mujs.json rename to versions/m-/mujs.json diff --git a/port_versions/m-/munit.json b/versions/m-/munit.json similarity index 100% rename from port_versions/m-/munit.json rename to versions/m-/munit.json diff --git a/port_versions/m-/muparser.json b/versions/m-/muparser.json similarity index 100% rename from port_versions/m-/muparser.json rename to versions/m-/muparser.json diff --git a/port_versions/m-/murmurhash.json b/versions/m-/murmurhash.json similarity index 100% rename from port_versions/m-/murmurhash.json rename to versions/m-/murmurhash.json diff --git a/port_versions/m-/mygui.json b/versions/m-/mygui.json similarity index 100% rename from port_versions/m-/mygui.json rename to versions/m-/mygui.json diff --git a/port_versions/n-/nameof.json b/versions/n-/nameof.json similarity index 100% rename from port_versions/n-/nameof.json rename to versions/n-/nameof.json diff --git a/port_versions/n-/nana.json b/versions/n-/nana.json similarity index 100% rename from port_versions/n-/nana.json rename to versions/n-/nana.json diff --git a/port_versions/n-/nano-signal-slot.json b/versions/n-/nano-signal-slot.json similarity index 100% rename from port_versions/n-/nano-signal-slot.json rename to versions/n-/nano-signal-slot.json diff --git a/port_versions/n-/nanobench.json b/versions/n-/nanobench.json similarity index 100% rename from port_versions/n-/nanobench.json rename to versions/n-/nanobench.json diff --git a/port_versions/n-/nanodbc.json b/versions/n-/nanodbc.json similarity index 100% rename from port_versions/n-/nanodbc.json rename to versions/n-/nanodbc.json diff --git a/port_versions/n-/nanoflann.json b/versions/n-/nanoflann.json similarity index 100% rename from port_versions/n-/nanoflann.json rename to versions/n-/nanoflann.json diff --git a/port_versions/n-/nanogui.json b/versions/n-/nanogui.json similarity index 100% rename from port_versions/n-/nanogui.json rename to versions/n-/nanogui.json diff --git a/port_versions/n-/nanomsg.json b/versions/n-/nanomsg.json similarity index 100% rename from port_versions/n-/nanomsg.json rename to versions/n-/nanomsg.json diff --git a/port_versions/n-/nanopb.json b/versions/n-/nanopb.json similarity index 100% rename from port_versions/n-/nanopb.json rename to versions/n-/nanopb.json diff --git a/port_versions/n-/nanoprintf.json b/versions/n-/nanoprintf.json similarity index 100% rename from port_versions/n-/nanoprintf.json rename to versions/n-/nanoprintf.json diff --git a/port_versions/n-/nanorange.json b/versions/n-/nanorange.json similarity index 100% rename from port_versions/n-/nanorange.json rename to versions/n-/nanorange.json diff --git a/port_versions/n-/nanort.json b/versions/n-/nanort.json similarity index 100% rename from port_versions/n-/nanort.json rename to versions/n-/nanort.json diff --git a/port_versions/n-/nanovg.json b/versions/n-/nanovg.json similarity index 100% rename from port_versions/n-/nanovg.json rename to versions/n-/nanovg.json diff --git a/port_versions/n-/nativefiledialog.json b/versions/n-/nativefiledialog.json similarity index 100% rename from port_versions/n-/nativefiledialog.json rename to versions/n-/nativefiledialog.json diff --git a/port_versions/n-/nccl.json b/versions/n-/nccl.json similarity index 100% rename from port_versions/n-/nccl.json rename to versions/n-/nccl.json diff --git a/port_versions/n-/neargye-semver.json b/versions/n-/neargye-semver.json similarity index 100% rename from port_versions/n-/neargye-semver.json rename to versions/n-/neargye-semver.json diff --git a/port_versions/n-/netcdf-c.json b/versions/n-/netcdf-c.json similarity index 100% rename from port_versions/n-/netcdf-c.json rename to versions/n-/netcdf-c.json diff --git a/port_versions/n-/netcdf-cxx4.json b/versions/n-/netcdf-cxx4.json similarity index 100% rename from port_versions/n-/netcdf-cxx4.json rename to versions/n-/netcdf-cxx4.json diff --git a/port_versions/n-/nethost.json b/versions/n-/nethost.json similarity index 100% rename from port_versions/n-/nethost.json rename to versions/n-/nethost.json diff --git a/port_versions/n-/nettle.json b/versions/n-/nettle.json similarity index 100% rename from port_versions/n-/nettle.json rename to versions/n-/nettle.json diff --git a/port_versions/n-/networkdirect-sdk.json b/versions/n-/networkdirect-sdk.json similarity index 100% rename from port_versions/n-/networkdirect-sdk.json rename to versions/n-/networkdirect-sdk.json diff --git a/port_versions/n-/nghttp2.json b/versions/n-/nghttp2.json similarity index 100% rename from port_versions/n-/nghttp2.json rename to versions/n-/nghttp2.json diff --git a/port_versions/n-/ngspice.json b/versions/n-/ngspice.json similarity index 100% rename from port_versions/n-/ngspice.json rename to versions/n-/ngspice.json diff --git a/port_versions/n-/nifticlib.json b/versions/n-/nifticlib.json similarity index 100% rename from port_versions/n-/nifticlib.json rename to versions/n-/nifticlib.json diff --git a/port_versions/n-/nlohmann-fifo-map.json b/versions/n-/nlohmann-fifo-map.json similarity index 100% rename from port_versions/n-/nlohmann-fifo-map.json rename to versions/n-/nlohmann-fifo-map.json diff --git a/port_versions/n-/nlohmann-json.json b/versions/n-/nlohmann-json.json similarity index 100% rename from port_versions/n-/nlohmann-json.json rename to versions/n-/nlohmann-json.json diff --git a/port_versions/n-/nlopt.json b/versions/n-/nlopt.json similarity index 100% rename from port_versions/n-/nlopt.json rename to versions/n-/nlopt.json diff --git a/port_versions/n-/nmap.json b/versions/n-/nmap.json similarity index 100% rename from port_versions/n-/nmap.json rename to versions/n-/nmap.json diff --git a/port_versions/n-/nmslib.json b/versions/n-/nmslib.json similarity index 100% rename from port_versions/n-/nmslib.json rename to versions/n-/nmslib.json diff --git a/port_versions/n-/nng.json b/versions/n-/nng.json similarity index 100% rename from port_versions/n-/nng.json rename to versions/n-/nng.json diff --git a/port_versions/n-/nngpp.json b/versions/n-/nngpp.json similarity index 100% rename from port_versions/n-/nngpp.json rename to versions/n-/nngpp.json diff --git a/port_versions/n-/nonius.json b/versions/n-/nonius.json similarity index 100% rename from port_versions/n-/nonius.json rename to versions/n-/nonius.json diff --git a/port_versions/n-/nowide.json b/versions/n-/nowide.json similarity index 100% rename from port_versions/n-/nowide.json rename to versions/n-/nowide.json diff --git a/port_versions/n-/nrf-ble-driver.json b/versions/n-/nrf-ble-driver.json similarity index 100% rename from port_versions/n-/nrf-ble-driver.json rename to versions/n-/nrf-ble-driver.json diff --git a/port_versions/n-/nt-wrapper.json b/versions/n-/nt-wrapper.json similarity index 100% rename from port_versions/n-/nt-wrapper.json rename to versions/n-/nt-wrapper.json diff --git a/port_versions/n-/nuklear.json b/versions/n-/nuklear.json similarity index 100% rename from port_versions/n-/nuklear.json rename to versions/n-/nuklear.json diff --git a/port_versions/n-/numactl.json b/versions/n-/numactl.json similarity index 100% rename from port_versions/n-/numactl.json rename to versions/n-/numactl.json diff --git a/port_versions/n-/numcpp.json b/versions/n-/numcpp.json similarity index 100% rename from port_versions/n-/numcpp.json rename to versions/n-/numcpp.json diff --git a/port_versions/n-/nuspell.json b/versions/n-/nuspell.json similarity index 100% rename from port_versions/n-/nuspell.json rename to versions/n-/nuspell.json diff --git a/port_versions/n-/nvtt.json b/versions/n-/nvtt.json similarity index 100% rename from port_versions/n-/nvtt.json rename to versions/n-/nvtt.json diff --git a/port_versions/o-/oatpp-consul.json b/versions/o-/oatpp-consul.json similarity index 100% rename from port_versions/o-/oatpp-consul.json rename to versions/o-/oatpp-consul.json diff --git a/port_versions/o-/oatpp-curl.json b/versions/o-/oatpp-curl.json similarity index 100% rename from port_versions/o-/oatpp-curl.json rename to versions/o-/oatpp-curl.json diff --git a/port_versions/o-/oatpp-libressl.json b/versions/o-/oatpp-libressl.json similarity index 100% rename from port_versions/o-/oatpp-libressl.json rename to versions/o-/oatpp-libressl.json diff --git a/port_versions/o-/oatpp-mbedtls.json b/versions/o-/oatpp-mbedtls.json similarity index 100% rename from port_versions/o-/oatpp-mbedtls.json rename to versions/o-/oatpp-mbedtls.json diff --git a/port_versions/o-/oatpp-mongo.json b/versions/o-/oatpp-mongo.json similarity index 100% rename from port_versions/o-/oatpp-mongo.json rename to versions/o-/oatpp-mongo.json diff --git a/port_versions/o-/oatpp-postgresql.json b/versions/o-/oatpp-postgresql.json similarity index 100% rename from port_versions/o-/oatpp-postgresql.json rename to versions/o-/oatpp-postgresql.json diff --git a/port_versions/o-/oatpp-sqlite.json b/versions/o-/oatpp-sqlite.json similarity index 100% rename from port_versions/o-/oatpp-sqlite.json rename to versions/o-/oatpp-sqlite.json diff --git a/port_versions/o-/oatpp-swagger.json b/versions/o-/oatpp-swagger.json similarity index 100% rename from port_versions/o-/oatpp-swagger.json rename to versions/o-/oatpp-swagger.json diff --git a/port_versions/o-/oatpp-websocket.json b/versions/o-/oatpp-websocket.json similarity index 100% rename from port_versions/o-/oatpp-websocket.json rename to versions/o-/oatpp-websocket.json diff --git a/port_versions/o-/oatpp-zlib.json b/versions/o-/oatpp-zlib.json similarity index 100% rename from port_versions/o-/oatpp-zlib.json rename to versions/o-/oatpp-zlib.json diff --git a/port_versions/o-/oatpp.json b/versions/o-/oatpp.json similarity index 100% rename from port_versions/o-/oatpp.json rename to versions/o-/oatpp.json diff --git a/port_versions/o-/observer-ptr-lite.json b/versions/o-/observer-ptr-lite.json similarity index 100% rename from port_versions/o-/observer-ptr-lite.json rename to versions/o-/observer-ptr-lite.json diff --git a/port_versions/o-/ocilib.json b/versions/o-/ocilib.json similarity index 100% rename from port_versions/o-/ocilib.json rename to versions/o-/ocilib.json diff --git a/port_versions/o-/octomap.json b/versions/o-/octomap.json similarity index 100% rename from port_versions/o-/octomap.json rename to versions/o-/octomap.json diff --git a/port_versions/o-/ode.json b/versions/o-/ode.json similarity index 100% rename from port_versions/o-/ode.json rename to versions/o-/ode.json diff --git a/port_versions/o-/offscale-libetcd-cpp.json b/versions/o-/offscale-libetcd-cpp.json similarity index 100% rename from port_versions/o-/offscale-libetcd-cpp.json rename to versions/o-/offscale-libetcd-cpp.json diff --git a/port_versions/o-/ogdf.json b/versions/o-/ogdf.json similarity index 100% rename from port_versions/o-/ogdf.json rename to versions/o-/ogdf.json diff --git a/port_versions/o-/ogre-next.json b/versions/o-/ogre-next.json similarity index 100% rename from port_versions/o-/ogre-next.json rename to versions/o-/ogre-next.json diff --git a/port_versions/o-/ogre.json b/versions/o-/ogre.json similarity index 100% rename from port_versions/o-/ogre.json rename to versions/o-/ogre.json diff --git a/port_versions/o-/ois.json b/versions/o-/ois.json similarity index 100% rename from port_versions/o-/ois.json rename to versions/o-/ois.json diff --git a/port_versions/o-/ompl.json b/versions/o-/ompl.json similarity index 100% rename from port_versions/o-/ompl.json rename to versions/o-/ompl.json diff --git a/port_versions/o-/onednn.json b/versions/o-/onednn.json similarity index 100% rename from port_versions/o-/onednn.json rename to versions/o-/onednn.json diff --git a/port_versions/o-/oniguruma.json b/versions/o-/oniguruma.json similarity index 100% rename from port_versions/o-/oniguruma.json rename to versions/o-/oniguruma.json diff --git a/port_versions/o-/onnxruntime-gpu.json b/versions/o-/onnxruntime-gpu.json similarity index 100% rename from port_versions/o-/onnxruntime-gpu.json rename to versions/o-/onnxruntime-gpu.json diff --git a/port_versions/o-/open62541.json b/versions/o-/open62541.json similarity index 100% rename from port_versions/o-/open62541.json rename to versions/o-/open62541.json diff --git a/port_versions/o-/openal-soft.json b/versions/o-/openal-soft.json similarity index 100% rename from port_versions/o-/openal-soft.json rename to versions/o-/openal-soft.json diff --git a/port_versions/o-/openblas.json b/versions/o-/openblas.json similarity index 100% rename from port_versions/o-/openblas.json rename to versions/o-/openblas.json diff --git a/port_versions/o-/opencascade.json b/versions/o-/opencascade.json similarity index 100% rename from port_versions/o-/opencascade.json rename to versions/o-/opencascade.json diff --git a/port_versions/o-/opencc.json b/versions/o-/opencc.json similarity index 100% rename from port_versions/o-/opencc.json rename to versions/o-/opencc.json diff --git a/port_versions/o-/opencensus-cpp.json b/versions/o-/opencensus-cpp.json similarity index 100% rename from port_versions/o-/opencensus-cpp.json rename to versions/o-/opencensus-cpp.json diff --git a/port_versions/o-/opencl.json b/versions/o-/opencl.json similarity index 100% rename from port_versions/o-/opencl.json rename to versions/o-/opencl.json diff --git a/port_versions/o-/opencolorio-tools.json b/versions/o-/opencolorio-tools.json similarity index 100% rename from port_versions/o-/opencolorio-tools.json rename to versions/o-/opencolorio-tools.json diff --git a/port_versions/o-/opencolorio.json b/versions/o-/opencolorio.json similarity index 100% rename from port_versions/o-/opencolorio.json rename to versions/o-/opencolorio.json diff --git a/port_versions/o-/opencsg.json b/versions/o-/opencsg.json similarity index 100% rename from port_versions/o-/opencsg.json rename to versions/o-/opencsg.json diff --git a/port_versions/o-/opencv.json b/versions/o-/opencv.json similarity index 100% rename from port_versions/o-/opencv.json rename to versions/o-/opencv.json diff --git a/port_versions/o-/opencv2.json b/versions/o-/opencv2.json similarity index 100% rename from port_versions/o-/opencv2.json rename to versions/o-/opencv2.json diff --git a/port_versions/o-/opencv3.json b/versions/o-/opencv3.json similarity index 100% rename from port_versions/o-/opencv3.json rename to versions/o-/opencv3.json diff --git a/port_versions/o-/opencv4.json b/versions/o-/opencv4.json similarity index 100% rename from port_versions/o-/opencv4.json rename to versions/o-/opencv4.json diff --git a/port_versions/o-/opendnp3.json b/versions/o-/opendnp3.json similarity index 100% rename from port_versions/o-/opendnp3.json rename to versions/o-/opendnp3.json diff --git a/port_versions/o-/openexr.json b/versions/o-/openexr.json similarity index 100% rename from port_versions/o-/openexr.json rename to versions/o-/openexr.json diff --git a/port_versions/o-/opengl-registry.json b/versions/o-/opengl-registry.json similarity index 100% rename from port_versions/o-/opengl-registry.json rename to versions/o-/opengl-registry.json diff --git a/port_versions/o-/opengl.json b/versions/o-/opengl.json similarity index 100% rename from port_versions/o-/opengl.json rename to versions/o-/opengl.json diff --git a/port_versions/o-/openigtlink.json b/versions/o-/openigtlink.json similarity index 100% rename from port_versions/o-/openigtlink.json rename to versions/o-/openigtlink.json diff --git a/port_versions/o-/openimageio.json b/versions/o-/openimageio.json similarity index 100% rename from port_versions/o-/openimageio.json rename to versions/o-/openimageio.json diff --git a/port_versions/o-/openjpeg.json b/versions/o-/openjpeg.json similarity index 100% rename from port_versions/o-/openjpeg.json rename to versions/o-/openjpeg.json diff --git a/port_versions/o-/openmama.json b/versions/o-/openmama.json similarity index 100% rename from port_versions/o-/openmama.json rename to versions/o-/openmama.json diff --git a/port_versions/o-/openmesh.json b/versions/o-/openmesh.json similarity index 100% rename from port_versions/o-/openmesh.json rename to versions/o-/openmesh.json diff --git a/port_versions/o-/openmpi.json b/versions/o-/openmpi.json similarity index 100% rename from port_versions/o-/openmpi.json rename to versions/o-/openmpi.json diff --git a/port_versions/o-/openmvg.json b/versions/o-/openmvg.json similarity index 100% rename from port_versions/o-/openmvg.json rename to versions/o-/openmvg.json diff --git a/port_versions/o-/openmvs.json b/versions/o-/openmvs.json similarity index 100% rename from port_versions/o-/openmvs.json rename to versions/o-/openmvs.json diff --git a/port_versions/o-/openni2.json b/versions/o-/openni2.json similarity index 100% rename from port_versions/o-/openni2.json rename to versions/o-/openni2.json diff --git a/port_versions/o-/openscap.json b/versions/o-/openscap.json similarity index 100% rename from port_versions/o-/openscap.json rename to versions/o-/openscap.json diff --git a/port_versions/o-/openssl-unix.json b/versions/o-/openssl-unix.json similarity index 100% rename from port_versions/o-/openssl-unix.json rename to versions/o-/openssl-unix.json diff --git a/port_versions/o-/openssl-uwp.json b/versions/o-/openssl-uwp.json similarity index 100% rename from port_versions/o-/openssl-uwp.json rename to versions/o-/openssl-uwp.json diff --git a/port_versions/o-/openssl-windows.json b/versions/o-/openssl-windows.json similarity index 100% rename from port_versions/o-/openssl-windows.json rename to versions/o-/openssl-windows.json diff --git a/port_versions/o-/openssl.json b/versions/o-/openssl.json similarity index 100% rename from port_versions/o-/openssl.json rename to versions/o-/openssl.json diff --git a/port_versions/o-/opensubdiv.json b/versions/o-/opensubdiv.json similarity index 100% rename from port_versions/o-/opensubdiv.json rename to versions/o-/opensubdiv.json diff --git a/port_versions/o-/opentracing.json b/versions/o-/opentracing.json similarity index 100% rename from port_versions/o-/opentracing.json rename to versions/o-/opentracing.json diff --git a/port_versions/o-/openvdb.json b/versions/o-/openvdb.json similarity index 100% rename from port_versions/o-/openvdb.json rename to versions/o-/openvdb.json diff --git a/port_versions/o-/openvpn3.json b/versions/o-/openvpn3.json similarity index 100% rename from port_versions/o-/openvpn3.json rename to versions/o-/openvpn3.json diff --git a/port_versions/o-/openvr.json b/versions/o-/openvr.json similarity index 100% rename from port_versions/o-/openvr.json rename to versions/o-/openvr.json diff --git a/port_versions/o-/openxr-loader.json b/versions/o-/openxr-loader.json similarity index 100% rename from port_versions/o-/openxr-loader.json rename to versions/o-/openxr-loader.json diff --git a/port_versions/o-/optional-bare.json b/versions/o-/optional-bare.json similarity index 100% rename from port_versions/o-/optional-bare.json rename to versions/o-/optional-bare.json diff --git a/port_versions/o-/optional-lite.json b/versions/o-/optional-lite.json similarity index 100% rename from port_versions/o-/optional-lite.json rename to versions/o-/optional-lite.json diff --git a/port_versions/o-/opus.json b/versions/o-/opus.json similarity index 100% rename from port_versions/o-/opus.json rename to versions/o-/opus.json diff --git a/port_versions/o-/opusfile.json b/versions/o-/opusfile.json similarity index 100% rename from port_versions/o-/opusfile.json rename to versions/o-/opusfile.json diff --git a/port_versions/o-/orc.json b/versions/o-/orc.json similarity index 100% rename from port_versions/o-/orc.json rename to versions/o-/orc.json diff --git a/port_versions/o-/orocos-kdl.json b/versions/o-/orocos-kdl.json similarity index 100% rename from port_versions/o-/orocos-kdl.json rename to versions/o-/orocos-kdl.json diff --git a/port_versions/o-/osg-qt.json b/versions/o-/osg-qt.json similarity index 100% rename from port_versions/o-/osg-qt.json rename to versions/o-/osg-qt.json diff --git a/port_versions/o-/osg.json b/versions/o-/osg.json similarity index 100% rename from port_versions/o-/osg.json rename to versions/o-/osg.json diff --git a/port_versions/o-/osgearth.json b/versions/o-/osgearth.json similarity index 100% rename from port_versions/o-/osgearth.json rename to versions/o-/osgearth.json diff --git a/port_versions/o-/osi.json b/versions/o-/osi.json similarity index 100% rename from port_versions/o-/osi.json rename to versions/o-/osi.json diff --git a/port_versions/o-/otl.json b/versions/o-/otl.json similarity index 100% rename from port_versions/o-/otl.json rename to versions/o-/otl.json diff --git a/port_versions/o-/outcome.json b/versions/o-/outcome.json similarity index 100% rename from port_versions/o-/outcome.json rename to versions/o-/outcome.json diff --git a/port_versions/p-/p-ranav-csv.json b/versions/p-/p-ranav-csv.json similarity index 100% rename from port_versions/p-/p-ranav-csv.json rename to versions/p-/p-ranav-csv.json diff --git a/port_versions/p-/p-ranav-csv2.json b/versions/p-/p-ranav-csv2.json similarity index 100% rename from port_versions/p-/p-ranav-csv2.json rename to versions/p-/p-ranav-csv2.json diff --git a/port_versions/p-/pagmo2.json b/versions/p-/pagmo2.json similarity index 100% rename from port_versions/p-/pagmo2.json rename to versions/p-/pagmo2.json diff --git a/port_versions/p-/paho-mqtt.json b/versions/p-/paho-mqtt.json similarity index 100% rename from port_versions/p-/paho-mqtt.json rename to versions/p-/paho-mqtt.json diff --git a/port_versions/p-/paho-mqttpp3.json b/versions/p-/paho-mqttpp3.json similarity index 100% rename from port_versions/p-/paho-mqttpp3.json rename to versions/p-/paho-mqttpp3.json diff --git a/port_versions/p-/palsigslot.json b/versions/p-/palsigslot.json similarity index 100% rename from port_versions/p-/palsigslot.json rename to versions/p-/palsigslot.json diff --git a/port_versions/p-/pango.json b/versions/p-/pango.json similarity index 100% rename from port_versions/p-/pango.json rename to versions/p-/pango.json diff --git a/port_versions/p-/pangolin.json b/versions/p-/pangolin.json similarity index 100% rename from port_versions/p-/pangolin.json rename to versions/p-/pangolin.json diff --git a/port_versions/p-/pangomm.json b/versions/p-/pangomm.json similarity index 100% rename from port_versions/p-/pangomm.json rename to versions/p-/pangomm.json diff --git a/port_versions/p-/parallel-hashmap.json b/versions/p-/parallel-hashmap.json similarity index 100% rename from port_versions/p-/parallel-hashmap.json rename to versions/p-/parallel-hashmap.json diff --git a/port_versions/p-/parallelstl.json b/versions/p-/parallelstl.json similarity index 100% rename from port_versions/p-/parallelstl.json rename to versions/p-/parallelstl.json diff --git a/port_versions/p-/paraview.json b/versions/p-/paraview.json similarity index 100% rename from port_versions/p-/paraview.json rename to versions/p-/paraview.json diff --git a/port_versions/p-/parmetis.json b/versions/p-/parmetis.json similarity index 100% rename from port_versions/p-/parmetis.json rename to versions/p-/parmetis.json diff --git a/port_versions/p-/parquet.json b/versions/p-/parquet.json similarity index 100% rename from port_versions/p-/parquet.json rename to versions/p-/parquet.json diff --git a/port_versions/p-/parson.json b/versions/p-/parson.json similarity index 100% rename from port_versions/p-/parson.json rename to versions/p-/parson.json diff --git a/port_versions/p-/pbc.json b/versions/p-/pbc.json similarity index 100% rename from port_versions/p-/pbc.json rename to versions/p-/pbc.json diff --git a/port_versions/p-/pcg.json b/versions/p-/pcg.json similarity index 100% rename from port_versions/p-/pcg.json rename to versions/p-/pcg.json diff --git a/port_versions/p-/pcl.json b/versions/p-/pcl.json similarity index 100% rename from port_versions/p-/pcl.json rename to versions/p-/pcl.json diff --git a/port_versions/p-/pcre.json b/versions/p-/pcre.json similarity index 100% rename from port_versions/p-/pcre.json rename to versions/p-/pcre.json diff --git a/port_versions/p-/pcre2.json b/versions/p-/pcre2.json similarity index 100% rename from port_versions/p-/pcre2.json rename to versions/p-/pcre2.json diff --git a/port_versions/p-/pdal-c.json b/versions/p-/pdal-c.json similarity index 100% rename from port_versions/p-/pdal-c.json rename to versions/p-/pdal-c.json diff --git a/port_versions/p-/pdal.json b/versions/p-/pdal.json similarity index 100% rename from port_versions/p-/pdal.json rename to versions/p-/pdal.json diff --git a/port_versions/p-/pdcurses.json b/versions/p-/pdcurses.json similarity index 100% rename from port_versions/p-/pdcurses.json rename to versions/p-/pdcurses.json diff --git a/port_versions/p-/pdqsort.json b/versions/p-/pdqsort.json similarity index 100% rename from port_versions/p-/pdqsort.json rename to versions/p-/pdqsort.json diff --git a/port_versions/p-/pe-parse.json b/versions/p-/pe-parse.json similarity index 100% rename from port_versions/p-/pe-parse.json rename to versions/p-/pe-parse.json diff --git a/port_versions/p-/pegtl-2.json b/versions/p-/pegtl-2.json similarity index 100% rename from port_versions/p-/pegtl-2.json rename to versions/p-/pegtl-2.json diff --git a/port_versions/p-/pegtl.json b/versions/p-/pegtl.json similarity index 100% rename from port_versions/p-/pegtl.json rename to versions/p-/pegtl.json diff --git a/port_versions/p-/pfring.json b/versions/p-/pfring.json similarity index 100% rename from port_versions/p-/pfring.json rename to versions/p-/pfring.json diff --git a/port_versions/p-/pfultz2-linq.json b/versions/p-/pfultz2-linq.json similarity index 100% rename from port_versions/p-/pfultz2-linq.json rename to versions/p-/pfultz2-linq.json diff --git a/port_versions/p-/phnt.json b/versions/p-/phnt.json similarity index 100% rename from port_versions/p-/phnt.json rename to versions/p-/phnt.json diff --git a/port_versions/p-/physfs.json b/versions/p-/physfs.json similarity index 100% rename from port_versions/p-/physfs.json rename to versions/p-/physfs.json diff --git a/port_versions/p-/physx.json b/versions/p-/physx.json similarity index 100% rename from port_versions/p-/physx.json rename to versions/p-/physx.json diff --git a/port_versions/p-/picojson.json b/versions/p-/picojson.json similarity index 100% rename from port_versions/p-/picojson.json rename to versions/p-/picojson.json diff --git a/port_versions/p-/picosha2.json b/versions/p-/picosha2.json similarity index 100% rename from port_versions/p-/picosha2.json rename to versions/p-/picosha2.json diff --git a/port_versions/p-/piex.json b/versions/p-/piex.json similarity index 100% rename from port_versions/p-/piex.json rename to versions/p-/piex.json diff --git a/port_versions/p-/pistache.json b/versions/p-/pistache.json similarity index 100% rename from port_versions/p-/pistache.json rename to versions/p-/pistache.json diff --git a/port_versions/p-/pixel.json b/versions/p-/pixel.json similarity index 100% rename from port_versions/p-/pixel.json rename to versions/p-/pixel.json diff --git a/port_versions/p-/pixman.json b/versions/p-/pixman.json similarity index 100% rename from port_versions/p-/pixman.json rename to versions/p-/pixman.json diff --git a/port_versions/p-/platform-folders.json b/versions/p-/platform-folders.json similarity index 100% rename from port_versions/p-/platform-folders.json rename to versions/p-/platform-folders.json diff --git a/port_versions/p-/plf-colony.json b/versions/p-/plf-colony.json similarity index 100% rename from port_versions/p-/plf-colony.json rename to versions/p-/plf-colony.json diff --git a/port_versions/p-/plf-list.json b/versions/p-/plf-list.json similarity index 100% rename from port_versions/p-/plf-list.json rename to versions/p-/plf-list.json diff --git a/port_versions/p-/plf-nanotimer.json b/versions/p-/plf-nanotimer.json similarity index 100% rename from port_versions/p-/plf-nanotimer.json rename to versions/p-/plf-nanotimer.json diff --git a/port_versions/p-/plf-stack.json b/versions/p-/plf-stack.json similarity index 100% rename from port_versions/p-/plf-stack.json rename to versions/p-/plf-stack.json diff --git a/port_versions/p-/plib.json b/versions/p-/plib.json similarity index 100% rename from port_versions/p-/plib.json rename to versions/p-/plib.json diff --git a/port_versions/p-/plibsys.json b/versions/p-/plibsys.json similarity index 100% rename from port_versions/p-/plibsys.json rename to versions/p-/plibsys.json diff --git a/port_versions/p-/plog.json b/versions/p-/plog.json similarity index 100% rename from port_versions/p-/plog.json rename to versions/p-/plog.json diff --git a/port_versions/p-/plplot.json b/versions/p-/plplot.json similarity index 100% rename from port_versions/p-/plplot.json rename to versions/p-/plplot.json diff --git a/port_versions/p-/plustache.json b/versions/p-/plustache.json similarity index 100% rename from port_versions/p-/plustache.json rename to versions/p-/plustache.json diff --git a/port_versions/p-/pmdk.json b/versions/p-/pmdk.json similarity index 100% rename from port_versions/p-/pmdk.json rename to versions/p-/pmdk.json diff --git a/port_versions/p-/pngpp.json b/versions/p-/pngpp.json similarity index 100% rename from port_versions/p-/pngpp.json rename to versions/p-/pngpp.json diff --git a/port_versions/p-/pngwriter.json b/versions/p-/pngwriter.json similarity index 100% rename from port_versions/p-/pngwriter.json rename to versions/p-/pngwriter.json diff --git a/port_versions/p-/poco.json b/versions/p-/poco.json similarity index 100% rename from port_versions/p-/poco.json rename to versions/p-/poco.json diff --git a/port_versions/p-/podofo.json b/versions/p-/podofo.json similarity index 100% rename from port_versions/p-/podofo.json rename to versions/p-/podofo.json diff --git a/port_versions/p-/poly2tri.json b/versions/p-/poly2tri.json similarity index 100% rename from port_versions/p-/poly2tri.json rename to versions/p-/poly2tri.json diff --git a/port_versions/p-/polyclipping.json b/versions/p-/polyclipping.json similarity index 100% rename from port_versions/p-/polyclipping.json rename to versions/p-/polyclipping.json diff --git a/port_versions/p-/polyhook2.json b/versions/p-/polyhook2.json similarity index 100% rename from port_versions/p-/polyhook2.json rename to versions/p-/polyhook2.json diff --git a/port_versions/p-/polymorphic-value.json b/versions/p-/polymorphic-value.json similarity index 100% rename from port_versions/p-/polymorphic-value.json rename to versions/p-/polymorphic-value.json diff --git a/port_versions/p-/ponder.json b/versions/p-/ponder.json similarity index 100% rename from port_versions/p-/ponder.json rename to versions/p-/ponder.json diff --git a/port_versions/p-/poppler.json b/versions/p-/poppler.json similarity index 100% rename from port_versions/p-/poppler.json rename to versions/p-/poppler.json diff --git a/port_versions/p-/portable-snippets.json b/versions/p-/portable-snippets.json similarity index 100% rename from port_versions/p-/portable-snippets.json rename to versions/p-/portable-snippets.json diff --git a/port_versions/p-/portaudio.json b/versions/p-/portaudio.json similarity index 100% rename from port_versions/p-/portaudio.json rename to versions/p-/portaudio.json diff --git a/port_versions/p-/portmidi.json b/versions/p-/portmidi.json similarity index 100% rename from port_versions/p-/portmidi.json rename to versions/p-/portmidi.json diff --git a/port_versions/p-/ppconsul.json b/versions/p-/ppconsul.json similarity index 100% rename from port_versions/p-/ppconsul.json rename to versions/p-/ppconsul.json diff --git a/port_versions/p-/ppmagic.json b/versions/p-/ppmagic.json similarity index 100% rename from port_versions/p-/ppmagic.json rename to versions/p-/ppmagic.json diff --git a/port_versions/p-/pprint.json b/versions/p-/pprint.json similarity index 100% rename from port_versions/p-/pprint.json rename to versions/p-/pprint.json diff --git a/port_versions/p-/pqp.json b/versions/p-/pqp.json similarity index 100% rename from port_versions/p-/pqp.json rename to versions/p-/pqp.json diff --git a/port_versions/p-/proj.json b/versions/p-/proj.json similarity index 100% rename from port_versions/p-/proj.json rename to versions/p-/proj.json diff --git a/port_versions/p-/proj4.json b/versions/p-/proj4.json similarity index 100% rename from port_versions/p-/proj4.json rename to versions/p-/proj4.json diff --git a/port_versions/p-/prometheus-cpp.json b/versions/p-/prometheus-cpp.json similarity index 100% rename from port_versions/p-/prometheus-cpp.json rename to versions/p-/prometheus-cpp.json diff --git a/port_versions/p-/protobuf-c.json b/versions/p-/protobuf-c.json similarity index 100% rename from port_versions/p-/protobuf-c.json rename to versions/p-/protobuf-c.json diff --git a/port_versions/p-/protobuf.json b/versions/p-/protobuf.json similarity index 100% rename from port_versions/p-/protobuf.json rename to versions/p-/protobuf.json diff --git a/port_versions/p-/protopuf.json b/versions/p-/protopuf.json similarity index 100% rename from port_versions/p-/protopuf.json rename to versions/p-/protopuf.json diff --git a/port_versions/p-/protozero.json b/versions/p-/protozero.json similarity index 100% rename from port_versions/p-/protozero.json rename to versions/p-/protozero.json diff --git a/port_versions/p-/proxygen.json b/versions/p-/proxygen.json similarity index 100% rename from port_versions/p-/proxygen.json rename to versions/p-/proxygen.json diff --git a/port_versions/p-/proxywrapper.json b/versions/p-/proxywrapper.json similarity index 100% rename from port_versions/p-/proxywrapper.json rename to versions/p-/proxywrapper.json diff --git a/port_versions/p-/ptex.json b/versions/p-/ptex.json similarity index 100% rename from port_versions/p-/ptex.json rename to versions/p-/ptex.json diff --git a/port_versions/p-/pthread.json b/versions/p-/pthread.json similarity index 100% rename from port_versions/p-/pthread.json rename to versions/p-/pthread.json diff --git a/port_versions/p-/pthreads.json b/versions/p-/pthreads.json similarity index 100% rename from port_versions/p-/pthreads.json rename to versions/p-/pthreads.json diff --git a/port_versions/p-/pugixml.json b/versions/p-/pugixml.json similarity index 100% rename from port_versions/p-/pugixml.json rename to versions/p-/pugixml.json diff --git a/port_versions/p-/pybind11.json b/versions/p-/pybind11.json similarity index 100% rename from port_versions/p-/pybind11.json rename to versions/p-/pybind11.json diff --git a/port_versions/p-/pystring.json b/versions/p-/pystring.json similarity index 100% rename from port_versions/p-/pystring.json rename to versions/p-/pystring.json diff --git a/port_versions/p-/python2.json b/versions/p-/python2.json similarity index 100% rename from port_versions/p-/python2.json rename to versions/p-/python2.json diff --git a/port_versions/p-/python3.json b/versions/p-/python3.json similarity index 100% rename from port_versions/p-/python3.json rename to versions/p-/python3.json diff --git a/port_versions/q-/qca.json b/versions/q-/qca.json similarity index 100% rename from port_versions/q-/qca.json rename to versions/q-/qca.json diff --git a/port_versions/q-/qcustomplot.json b/versions/q-/qcustomplot.json similarity index 100% rename from port_versions/q-/qcustomplot.json rename to versions/q-/qcustomplot.json diff --git a/port_versions/q-/qhull.json b/versions/q-/qhull.json similarity index 100% rename from port_versions/q-/qhull.json rename to versions/q-/qhull.json diff --git a/port_versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json similarity index 100% rename from port_versions/q-/qpid-proton.json rename to versions/q-/qpid-proton.json diff --git a/port_versions/q-/qscintilla.json b/versions/q-/qscintilla.json similarity index 100% rename from port_versions/q-/qscintilla.json rename to versions/q-/qscintilla.json diff --git a/port_versions/q-/qt-advanced-docking-system.json b/versions/q-/qt-advanced-docking-system.json similarity index 100% rename from port_versions/q-/qt-advanced-docking-system.json rename to versions/q-/qt-advanced-docking-system.json diff --git a/port_versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json similarity index 100% rename from port_versions/q-/qt5-3d.json rename to versions/q-/qt5-3d.json diff --git a/port_versions/q-/qt5-activeqt.json b/versions/q-/qt5-activeqt.json similarity index 100% rename from port_versions/q-/qt5-activeqt.json rename to versions/q-/qt5-activeqt.json diff --git a/port_versions/q-/qt5-androidextras.json b/versions/q-/qt5-androidextras.json similarity index 100% rename from port_versions/q-/qt5-androidextras.json rename to versions/q-/qt5-androidextras.json diff --git a/port_versions/q-/qt5-base.json b/versions/q-/qt5-base.json similarity index 100% rename from port_versions/q-/qt5-base.json rename to versions/q-/qt5-base.json diff --git a/port_versions/q-/qt5-canvas3d.json b/versions/q-/qt5-canvas3d.json similarity index 100% rename from port_versions/q-/qt5-canvas3d.json rename to versions/q-/qt5-canvas3d.json diff --git a/port_versions/q-/qt5-charts.json b/versions/q-/qt5-charts.json similarity index 100% rename from port_versions/q-/qt5-charts.json rename to versions/q-/qt5-charts.json diff --git a/port_versions/q-/qt5-connectivity.json b/versions/q-/qt5-connectivity.json similarity index 100% rename from port_versions/q-/qt5-connectivity.json rename to versions/q-/qt5-connectivity.json diff --git a/port_versions/q-/qt5-datavis3d.json b/versions/q-/qt5-datavis3d.json similarity index 100% rename from port_versions/q-/qt5-datavis3d.json rename to versions/q-/qt5-datavis3d.json diff --git a/port_versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json similarity index 100% rename from port_versions/q-/qt5-declarative.json rename to versions/q-/qt5-declarative.json diff --git a/port_versions/q-/qt5-doc.json b/versions/q-/qt5-doc.json similarity index 100% rename from port_versions/q-/qt5-doc.json rename to versions/q-/qt5-doc.json diff --git a/port_versions/q-/qt5-gamepad.json b/versions/q-/qt5-gamepad.json similarity index 100% rename from port_versions/q-/qt5-gamepad.json rename to versions/q-/qt5-gamepad.json diff --git a/port_versions/q-/qt5-graphicaleffects.json b/versions/q-/qt5-graphicaleffects.json similarity index 100% rename from port_versions/q-/qt5-graphicaleffects.json rename to versions/q-/qt5-graphicaleffects.json diff --git a/port_versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json similarity index 100% rename from port_versions/q-/qt5-imageformats.json rename to versions/q-/qt5-imageformats.json diff --git a/port_versions/q-/qt5-location.json b/versions/q-/qt5-location.json similarity index 100% rename from port_versions/q-/qt5-location.json rename to versions/q-/qt5-location.json diff --git a/port_versions/q-/qt5-macextras.json b/versions/q-/qt5-macextras.json similarity index 100% rename from port_versions/q-/qt5-macextras.json rename to versions/q-/qt5-macextras.json diff --git a/port_versions/q-/qt5-modularscripts.json b/versions/q-/qt5-modularscripts.json similarity index 100% rename from port_versions/q-/qt5-modularscripts.json rename to versions/q-/qt5-modularscripts.json diff --git a/port_versions/q-/qt5-mqtt.json b/versions/q-/qt5-mqtt.json similarity index 100% rename from port_versions/q-/qt5-mqtt.json rename to versions/q-/qt5-mqtt.json diff --git a/port_versions/q-/qt5-multimedia.json b/versions/q-/qt5-multimedia.json similarity index 100% rename from port_versions/q-/qt5-multimedia.json rename to versions/q-/qt5-multimedia.json diff --git a/port_versions/q-/qt5-networkauth.json b/versions/q-/qt5-networkauth.json similarity index 100% rename from port_versions/q-/qt5-networkauth.json rename to versions/q-/qt5-networkauth.json diff --git a/port_versions/q-/qt5-purchasing.json b/versions/q-/qt5-purchasing.json similarity index 100% rename from port_versions/q-/qt5-purchasing.json rename to versions/q-/qt5-purchasing.json diff --git a/port_versions/q-/qt5-quickcontrols.json b/versions/q-/qt5-quickcontrols.json similarity index 100% rename from port_versions/q-/qt5-quickcontrols.json rename to versions/q-/qt5-quickcontrols.json diff --git a/port_versions/q-/qt5-quickcontrols2.json b/versions/q-/qt5-quickcontrols2.json similarity index 100% rename from port_versions/q-/qt5-quickcontrols2.json rename to versions/q-/qt5-quickcontrols2.json diff --git a/port_versions/q-/qt5-remoteobjects.json b/versions/q-/qt5-remoteobjects.json similarity index 100% rename from port_versions/q-/qt5-remoteobjects.json rename to versions/q-/qt5-remoteobjects.json diff --git a/port_versions/q-/qt5-script.json b/versions/q-/qt5-script.json similarity index 100% rename from port_versions/q-/qt5-script.json rename to versions/q-/qt5-script.json diff --git a/port_versions/q-/qt5-scxml.json b/versions/q-/qt5-scxml.json similarity index 100% rename from port_versions/q-/qt5-scxml.json rename to versions/q-/qt5-scxml.json diff --git a/port_versions/q-/qt5-sensors.json b/versions/q-/qt5-sensors.json similarity index 100% rename from port_versions/q-/qt5-sensors.json rename to versions/q-/qt5-sensors.json diff --git a/port_versions/q-/qt5-serialbus.json b/versions/q-/qt5-serialbus.json similarity index 100% rename from port_versions/q-/qt5-serialbus.json rename to versions/q-/qt5-serialbus.json diff --git a/port_versions/q-/qt5-serialport.json b/versions/q-/qt5-serialport.json similarity index 100% rename from port_versions/q-/qt5-serialport.json rename to versions/q-/qt5-serialport.json diff --git a/port_versions/q-/qt5-speech.json b/versions/q-/qt5-speech.json similarity index 100% rename from port_versions/q-/qt5-speech.json rename to versions/q-/qt5-speech.json diff --git a/port_versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json similarity index 100% rename from port_versions/q-/qt5-svg.json rename to versions/q-/qt5-svg.json diff --git a/port_versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json similarity index 100% rename from port_versions/q-/qt5-tools.json rename to versions/q-/qt5-tools.json diff --git a/port_versions/q-/qt5-translations.json b/versions/q-/qt5-translations.json similarity index 100% rename from port_versions/q-/qt5-translations.json rename to versions/q-/qt5-translations.json diff --git a/port_versions/q-/qt5-virtualkeyboard.json b/versions/q-/qt5-virtualkeyboard.json similarity index 100% rename from port_versions/q-/qt5-virtualkeyboard.json rename to versions/q-/qt5-virtualkeyboard.json diff --git a/port_versions/q-/qt5-wayland.json b/versions/q-/qt5-wayland.json similarity index 100% rename from port_versions/q-/qt5-wayland.json rename to versions/q-/qt5-wayland.json diff --git a/port_versions/q-/qt5-webchannel.json b/versions/q-/qt5-webchannel.json similarity index 100% rename from port_versions/q-/qt5-webchannel.json rename to versions/q-/qt5-webchannel.json diff --git a/port_versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json similarity index 100% rename from port_versions/q-/qt5-webengine.json rename to versions/q-/qt5-webengine.json diff --git a/port_versions/q-/qt5-webglplugin.json b/versions/q-/qt5-webglplugin.json similarity index 100% rename from port_versions/q-/qt5-webglplugin.json rename to versions/q-/qt5-webglplugin.json diff --git a/port_versions/q-/qt5-websockets.json b/versions/q-/qt5-websockets.json similarity index 100% rename from port_versions/q-/qt5-websockets.json rename to versions/q-/qt5-websockets.json diff --git a/port_versions/q-/qt5-webview.json b/versions/q-/qt5-webview.json similarity index 100% rename from port_versions/q-/qt5-webview.json rename to versions/q-/qt5-webview.json diff --git a/port_versions/q-/qt5-winextras.json b/versions/q-/qt5-winextras.json similarity index 100% rename from port_versions/q-/qt5-winextras.json rename to versions/q-/qt5-winextras.json diff --git a/port_versions/q-/qt5-x11extras.json b/versions/q-/qt5-x11extras.json similarity index 100% rename from port_versions/q-/qt5-x11extras.json rename to versions/q-/qt5-x11extras.json diff --git a/port_versions/q-/qt5-xmlpatterns.json b/versions/q-/qt5-xmlpatterns.json similarity index 100% rename from port_versions/q-/qt5-xmlpatterns.json rename to versions/q-/qt5-xmlpatterns.json diff --git a/port_versions/q-/qt5.json b/versions/q-/qt5.json similarity index 100% rename from port_versions/q-/qt5.json rename to versions/q-/qt5.json diff --git a/port_versions/q-/qtkeychain.json b/versions/q-/qtkeychain.json similarity index 100% rename from port_versions/q-/qtkeychain.json rename to versions/q-/qtkeychain.json diff --git a/port_versions/q-/quadtree.json b/versions/q-/quadtree.json similarity index 100% rename from port_versions/q-/quadtree.json rename to versions/q-/quadtree.json diff --git a/port_versions/q-/quantlib.json b/versions/q-/quantlib.json similarity index 100% rename from port_versions/q-/quantlib.json rename to versions/q-/quantlib.json diff --git a/port_versions/q-/quaternions.json b/versions/q-/quaternions.json similarity index 100% rename from port_versions/q-/quaternions.json rename to versions/q-/quaternions.json diff --git a/port_versions/q-/quazip.json b/versions/q-/quazip.json similarity index 100% rename from port_versions/q-/quazip.json rename to versions/q-/quazip.json diff --git a/port_versions/q-/quickfast.json b/versions/q-/quickfast.json similarity index 100% rename from port_versions/q-/quickfast.json rename to versions/q-/quickfast.json diff --git a/port_versions/q-/quickfix.json b/versions/q-/quickfix.json similarity index 100% rename from port_versions/q-/quickfix.json rename to versions/q-/quickfix.json diff --git a/port_versions/q-/quill.json b/versions/q-/quill.json similarity index 100% rename from port_versions/q-/quill.json rename to versions/q-/quill.json diff --git a/port_versions/q-/quirc.json b/versions/q-/quirc.json similarity index 100% rename from port_versions/q-/quirc.json rename to versions/q-/quirc.json diff --git a/port_versions/q-/qwt.json b/versions/q-/qwt.json similarity index 100% rename from port_versions/q-/qwt.json rename to versions/q-/qwt.json diff --git a/port_versions/q-/qwtw.json b/versions/q-/qwtw.json similarity index 100% rename from port_versions/q-/qwtw.json rename to versions/q-/qwtw.json diff --git a/port_versions/r-/rabit.json b/versions/r-/rabit.json similarity index 100% rename from port_versions/r-/rabit.json rename to versions/r-/rabit.json diff --git a/port_versions/r-/ragel.json b/versions/r-/ragel.json similarity index 100% rename from port_versions/r-/ragel.json rename to versions/r-/ragel.json diff --git a/port_versions/r-/rang.json b/versions/r-/rang.json similarity index 100% rename from port_versions/r-/rang.json rename to versions/r-/rang.json diff --git a/port_versions/r-/range-v3-vs2015.json b/versions/r-/range-v3-vs2015.json similarity index 100% rename from port_versions/r-/range-v3-vs2015.json rename to versions/r-/range-v3-vs2015.json diff --git a/port_versions/r-/range-v3.json b/versions/r-/range-v3.json similarity index 100% rename from port_versions/r-/range-v3.json rename to versions/r-/range-v3.json diff --git a/port_versions/r-/rapidcheck.json b/versions/r-/rapidcheck.json similarity index 100% rename from port_versions/r-/rapidcheck.json rename to versions/r-/rapidcheck.json diff --git a/port_versions/r-/rapidjson.json b/versions/r-/rapidjson.json similarity index 100% rename from port_versions/r-/rapidjson.json rename to versions/r-/rapidjson.json diff --git a/port_versions/r-/rapidxml-ns.json b/versions/r-/rapidxml-ns.json similarity index 100% rename from port_versions/r-/rapidxml-ns.json rename to versions/r-/rapidxml-ns.json diff --git a/port_versions/r-/rapidxml.json b/versions/r-/rapidxml.json similarity index 100% rename from port_versions/r-/rapidxml.json rename to versions/r-/rapidxml.json diff --git a/port_versions/r-/rappture.json b/versions/r-/rappture.json similarity index 100% rename from port_versions/r-/rappture.json rename to versions/r-/rappture.json diff --git a/port_versions/r-/raylib.json b/versions/r-/raylib.json similarity index 100% rename from port_versions/r-/raylib.json rename to versions/r-/raylib.json diff --git a/port_versions/r-/rbdl.json b/versions/r-/rbdl.json similarity index 100% rename from port_versions/r-/rbdl.json rename to versions/r-/rbdl.json diff --git a/port_versions/r-/re2.json b/versions/r-/re2.json similarity index 100% rename from port_versions/r-/re2.json rename to versions/r-/re2.json diff --git a/port_versions/r-/readerwriterqueue.json b/versions/r-/readerwriterqueue.json similarity index 100% rename from port_versions/r-/readerwriterqueue.json rename to versions/r-/readerwriterqueue.json diff --git a/port_versions/r-/readline-win32.json b/versions/r-/readline-win32.json similarity index 100% rename from port_versions/r-/readline-win32.json rename to versions/r-/readline-win32.json diff --git a/port_versions/r-/readline.json b/versions/r-/readline.json similarity index 100% rename from port_versions/r-/readline.json rename to versions/r-/readline.json diff --git a/port_versions/r-/readosm.json b/versions/r-/readosm.json similarity index 100% rename from port_versions/r-/readosm.json rename to versions/r-/readosm.json diff --git a/port_versions/r-/realsense2.json b/versions/r-/realsense2.json similarity index 100% rename from port_versions/r-/realsense2.json rename to versions/r-/realsense2.json diff --git a/port_versions/r-/recast.json b/versions/r-/recast.json similarity index 100% rename from port_versions/r-/recast.json rename to versions/r-/recast.json diff --git a/port_versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json similarity index 100% rename from port_versions/r-/redis-plus-plus.json rename to versions/r-/redis-plus-plus.json diff --git a/port_versions/r-/refl-cpp.json b/versions/r-/refl-cpp.json similarity index 100% rename from port_versions/r-/refl-cpp.json rename to versions/r-/refl-cpp.json diff --git a/port_versions/r-/refprop-headers.json b/versions/r-/refprop-headers.json similarity index 100% rename from port_versions/r-/refprop-headers.json rename to versions/r-/refprop-headers.json diff --git a/port_versions/r-/replxx.json b/versions/r-/replxx.json similarity index 100% rename from port_versions/r-/replxx.json rename to versions/r-/replxx.json diff --git a/port_versions/r-/reproc.json b/versions/r-/reproc.json similarity index 100% rename from port_versions/r-/reproc.json rename to versions/r-/reproc.json diff --git a/port_versions/r-/rest-rpc.json b/versions/r-/rest-rpc.json similarity index 100% rename from port_versions/r-/rest-rpc.json rename to versions/r-/rest-rpc.json diff --git a/port_versions/r-/restbed.json b/versions/r-/restbed.json similarity index 100% rename from port_versions/r-/restbed.json rename to versions/r-/restbed.json diff --git a/port_versions/r-/restclient-cpp.json b/versions/r-/restclient-cpp.json similarity index 100% rename from port_versions/r-/restclient-cpp.json rename to versions/r-/restclient-cpp.json diff --git a/port_versions/r-/restinio.json b/versions/r-/restinio.json similarity index 100% rename from port_versions/r-/restinio.json rename to versions/r-/restinio.json diff --git a/port_versions/r-/rhash.json b/versions/r-/rhash.json similarity index 100% rename from port_versions/r-/rhash.json rename to versions/r-/rhash.json diff --git a/port_versions/r-/riffcpp.json b/versions/r-/riffcpp.json similarity index 100% rename from port_versions/r-/riffcpp.json rename to versions/r-/riffcpp.json diff --git a/port_versions/r-/ring-span-lite.json b/versions/r-/ring-span-lite.json similarity index 100% rename from port_versions/r-/ring-span-lite.json rename to versions/r-/ring-span-lite.json diff --git a/port_versions/r-/roaring.json b/versions/r-/roaring.json similarity index 100% rename from port_versions/r-/roaring.json rename to versions/r-/roaring.json diff --git a/port_versions/r-/robin-hood-hashing.json b/versions/r-/robin-hood-hashing.json similarity index 100% rename from port_versions/r-/robin-hood-hashing.json rename to versions/r-/robin-hood-hashing.json diff --git a/port_versions/r-/robin-map.json b/versions/r-/robin-map.json similarity index 100% rename from port_versions/r-/robin-map.json rename to versions/r-/robin-map.json diff --git a/port_versions/r-/rocksdb.json b/versions/r-/rocksdb.json similarity index 100% rename from port_versions/r-/rocksdb.json rename to versions/r-/rocksdb.json diff --git a/port_versions/r-/rpclib.json b/versions/r-/rpclib.json similarity index 100% rename from port_versions/r-/rpclib.json rename to versions/r-/rpclib.json diff --git a/port_versions/r-/rply.json b/versions/r-/rply.json similarity index 100% rename from port_versions/r-/rply.json rename to versions/r-/rply.json diff --git a/port_versions/r-/rs-core-lib.json b/versions/r-/rs-core-lib.json similarity index 100% rename from port_versions/r-/rs-core-lib.json rename to versions/r-/rs-core-lib.json diff --git a/port_versions/r-/rsocket.json b/versions/r-/rsocket.json similarity index 100% rename from port_versions/r-/rsocket.json rename to versions/r-/rsocket.json diff --git a/port_versions/r-/rtabmap.json b/versions/r-/rtabmap.json similarity index 100% rename from port_versions/r-/rtabmap.json rename to versions/r-/rtabmap.json diff --git a/port_versions/r-/rtaudio.json b/versions/r-/rtaudio.json similarity index 100% rename from port_versions/r-/rtaudio.json rename to versions/r-/rtaudio.json diff --git a/port_versions/r-/rtlsdr.json b/versions/r-/rtlsdr.json similarity index 100% rename from port_versions/r-/rtlsdr.json rename to versions/r-/rtlsdr.json diff --git a/port_versions/r-/rtmidi.json b/versions/r-/rtmidi.json similarity index 100% rename from port_versions/r-/rtmidi.json rename to versions/r-/rtmidi.json diff --git a/port_versions/r-/rttr.json b/versions/r-/rttr.json similarity index 100% rename from port_versions/r-/rttr.json rename to versions/r-/rttr.json diff --git a/port_versions/r-/rxcpp.json b/versions/r-/rxcpp.json similarity index 100% rename from port_versions/r-/rxcpp.json rename to versions/r-/rxcpp.json diff --git a/port_versions/r-/rxqt.json b/versions/r-/rxqt.json similarity index 100% rename from port_versions/r-/rxqt.json rename to versions/r-/rxqt.json diff --git a/port_versions/r-/rxspencer.json b/versions/r-/rxspencer.json similarity index 100% rename from port_versions/r-/rxspencer.json rename to versions/r-/rxspencer.json diff --git a/port_versions/r-/ryml.json b/versions/r-/ryml.json similarity index 100% rename from port_versions/r-/ryml.json rename to versions/r-/ryml.json diff --git a/port_versions/r-/ryu.json b/versions/r-/ryu.json similarity index 100% rename from port_versions/r-/ryu.json rename to versions/r-/ryu.json diff --git a/port_versions/s-/safeint.json b/versions/s-/safeint.json similarity index 100% rename from port_versions/s-/safeint.json rename to versions/s-/safeint.json diff --git a/port_versions/s-/sail.json b/versions/s-/sail.json similarity index 100% rename from port_versions/s-/sail.json rename to versions/s-/sail.json diff --git a/port_versions/s-/sais.json b/versions/s-/sais.json similarity index 100% rename from port_versions/s-/sais.json rename to versions/s-/sais.json diff --git a/port_versions/s-/sajson.json b/versions/s-/sajson.json similarity index 100% rename from port_versions/s-/sajson.json rename to versions/s-/sajson.json diff --git a/port_versions/s-/sassc.json b/versions/s-/sassc.json similarity index 100% rename from port_versions/s-/sassc.json rename to versions/s-/sassc.json diff --git a/port_versions/s-/scintilla.json b/versions/s-/scintilla.json similarity index 100% rename from port_versions/s-/scintilla.json rename to versions/s-/scintilla.json diff --git a/port_versions/s-/sciter.json b/versions/s-/sciter.json similarity index 100% rename from port_versions/s-/sciter.json rename to versions/s-/sciter.json diff --git a/port_versions/s-/scnlib.json b/versions/s-/scnlib.json similarity index 100% rename from port_versions/s-/scnlib.json rename to versions/s-/scnlib.json diff --git a/port_versions/s-/scylla-wrapper.json b/versions/s-/scylla-wrapper.json similarity index 100% rename from port_versions/s-/scylla-wrapper.json rename to versions/s-/scylla-wrapper.json diff --git a/port_versions/s-/sdformat10.json b/versions/s-/sdformat10.json similarity index 100% rename from port_versions/s-/sdformat10.json rename to versions/s-/sdformat10.json diff --git a/port_versions/s-/sdformat6.json b/versions/s-/sdformat6.json similarity index 100% rename from port_versions/s-/sdformat6.json rename to versions/s-/sdformat6.json diff --git a/port_versions/s-/sdformat9.json b/versions/s-/sdformat9.json similarity index 100% rename from port_versions/s-/sdformat9.json rename to versions/s-/sdformat9.json diff --git a/port_versions/s-/sdl1-net.json b/versions/s-/sdl1-net.json similarity index 100% rename from port_versions/s-/sdl1-net.json rename to versions/s-/sdl1-net.json diff --git a/port_versions/s-/sdl1.json b/versions/s-/sdl1.json similarity index 100% rename from port_versions/s-/sdl1.json rename to versions/s-/sdl1.json diff --git a/port_versions/s-/sdl2-gfx.json b/versions/s-/sdl2-gfx.json similarity index 100% rename from port_versions/s-/sdl2-gfx.json rename to versions/s-/sdl2-gfx.json diff --git a/port_versions/s-/sdl2-image.json b/versions/s-/sdl2-image.json similarity index 100% rename from port_versions/s-/sdl2-image.json rename to versions/s-/sdl2-image.json diff --git a/port_versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json similarity index 100% rename from port_versions/s-/sdl2-mixer.json rename to versions/s-/sdl2-mixer.json diff --git a/port_versions/s-/sdl2-net.json b/versions/s-/sdl2-net.json similarity index 100% rename from port_versions/s-/sdl2-net.json rename to versions/s-/sdl2-net.json diff --git a/port_versions/s-/sdl2-ttf.json b/versions/s-/sdl2-ttf.json similarity index 100% rename from port_versions/s-/sdl2-ttf.json rename to versions/s-/sdl2-ttf.json diff --git a/port_versions/s-/sdl2.json b/versions/s-/sdl2.json similarity index 100% rename from port_versions/s-/sdl2.json rename to versions/s-/sdl2.json diff --git a/port_versions/s-/sdl2pp.json b/versions/s-/sdl2pp.json similarity index 100% rename from port_versions/s-/sdl2pp.json rename to versions/s-/sdl2pp.json diff --git a/port_versions/s-/seal.json b/versions/s-/seal.json similarity index 100% rename from port_versions/s-/seal.json rename to versions/s-/seal.json diff --git a/port_versions/s-/secp256k1.json b/versions/s-/secp256k1.json similarity index 100% rename from port_versions/s-/secp256k1.json rename to versions/s-/secp256k1.json diff --git a/port_versions/s-/selene.json b/versions/s-/selene.json similarity index 100% rename from port_versions/s-/selene.json rename to versions/s-/selene.json diff --git a/port_versions/s-/sentencepiece.json b/versions/s-/sentencepiece.json similarity index 100% rename from port_versions/s-/sentencepiece.json rename to versions/s-/sentencepiece.json diff --git a/port_versions/s-/sentry-native.json b/versions/s-/sentry-native.json similarity index 100% rename from port_versions/s-/sentry-native.json rename to versions/s-/sentry-native.json diff --git a/port_versions/s-/septag-sx.json b/versions/s-/septag-sx.json similarity index 100% rename from port_versions/s-/septag-sx.json rename to versions/s-/septag-sx.json diff --git a/port_versions/s-/seqan.json b/versions/s-/seqan.json similarity index 100% rename from port_versions/s-/seqan.json rename to versions/s-/seqan.json diff --git a/port_versions/s-/serd.json b/versions/s-/serd.json similarity index 100% rename from port_versions/s-/serd.json rename to versions/s-/serd.json diff --git a/port_versions/s-/sf2cute.json b/versions/s-/sf2cute.json similarity index 100% rename from port_versions/s-/sf2cute.json rename to versions/s-/sf2cute.json diff --git a/port_versions/s-/sfgui.json b/versions/s-/sfgui.json similarity index 100% rename from port_versions/s-/sfgui.json rename to versions/s-/sfgui.json diff --git a/port_versions/s-/sfml.json b/versions/s-/sfml.json similarity index 100% rename from port_versions/s-/sfml.json rename to versions/s-/sfml.json diff --git a/port_versions/s-/sfsexp.json b/versions/s-/sfsexp.json similarity index 100% rename from port_versions/s-/sfsexp.json rename to versions/s-/sfsexp.json diff --git a/port_versions/s-/shaderc.json b/versions/s-/shaderc.json similarity index 100% rename from port_versions/s-/shaderc.json rename to versions/s-/shaderc.json diff --git a/port_versions/s-/shaderwriter.json b/versions/s-/shaderwriter.json similarity index 100% rename from port_versions/s-/shaderwriter.json rename to versions/s-/shaderwriter.json diff --git a/port_versions/s-/shapelib.json b/versions/s-/shapelib.json similarity index 100% rename from port_versions/s-/shapelib.json rename to versions/s-/shapelib.json diff --git a/port_versions/s-/shiva-sfml.json b/versions/s-/shiva-sfml.json similarity index 100% rename from port_versions/s-/shiva-sfml.json rename to versions/s-/shiva-sfml.json diff --git a/port_versions/s-/shiva.json b/versions/s-/shiva.json similarity index 100% rename from port_versions/s-/shiva.json rename to versions/s-/shiva.json diff --git a/port_versions/s-/shogun.json b/versions/s-/shogun.json similarity index 100% rename from port_versions/s-/shogun.json rename to versions/s-/shogun.json diff --git a/port_versions/s-/signalrclient.json b/versions/s-/signalrclient.json similarity index 100% rename from port_versions/s-/signalrclient.json rename to versions/s-/signalrclient.json diff --git a/port_versions/s-/sigslot.json b/versions/s-/sigslot.json similarity index 100% rename from port_versions/s-/sigslot.json rename to versions/s-/sigslot.json diff --git a/port_versions/s-/simage.json b/versions/s-/simage.json similarity index 100% rename from port_versions/s-/simage.json rename to versions/s-/simage.json diff --git a/port_versions/s-/simde.json b/versions/s-/simde.json similarity index 100% rename from port_versions/s-/simde.json rename to versions/s-/simde.json diff --git a/port_versions/s-/simdjson.json b/versions/s-/simdjson.json similarity index 100% rename from port_versions/s-/simdjson.json rename to versions/s-/simdjson.json diff --git a/port_versions/s-/simple-fft.json b/versions/s-/simple-fft.json similarity index 100% rename from port_versions/s-/simple-fft.json rename to versions/s-/simple-fft.json diff --git a/port_versions/s-/simpleini.json b/versions/s-/simpleini.json similarity index 100% rename from port_versions/s-/simpleini.json rename to versions/s-/simpleini.json diff --git a/port_versions/s-/skia.json b/versions/s-/skia.json similarity index 100% rename from port_versions/s-/skia.json rename to versions/s-/skia.json diff --git a/port_versions/s-/skyr-url.json b/versions/s-/skyr-url.json similarity index 100% rename from port_versions/s-/skyr-url.json rename to versions/s-/skyr-url.json diff --git a/port_versions/s-/slikenet.json b/versions/s-/slikenet.json similarity index 100% rename from port_versions/s-/slikenet.json rename to versions/s-/slikenet.json diff --git a/port_versions/s-/sltbench.json b/versions/s-/sltbench.json similarity index 100% rename from port_versions/s-/sltbench.json rename to versions/s-/sltbench.json diff --git a/port_versions/s-/smpeg2.json b/versions/s-/smpeg2.json similarity index 100% rename from port_versions/s-/smpeg2.json rename to versions/s-/smpeg2.json diff --git a/port_versions/s-/snappy.json b/versions/s-/snappy.json similarity index 100% rename from port_versions/s-/snappy.json rename to versions/s-/snappy.json diff --git a/port_versions/s-/sndfile.json b/versions/s-/sndfile.json similarity index 100% rename from port_versions/s-/sndfile.json rename to versions/s-/sndfile.json diff --git a/port_versions/s-/snowhouse.json b/versions/s-/snowhouse.json similarity index 100% rename from port_versions/s-/snowhouse.json rename to versions/s-/snowhouse.json diff --git a/port_versions/s-/so5extra.json b/versions/s-/so5extra.json similarity index 100% rename from port_versions/s-/so5extra.json rename to versions/s-/so5extra.json diff --git a/port_versions/s-/sobjectizer.json b/versions/s-/sobjectizer.json similarity index 100% rename from port_versions/s-/sobjectizer.json rename to versions/s-/sobjectizer.json diff --git a/port_versions/s-/soci.json b/versions/s-/soci.json similarity index 100% rename from port_versions/s-/soci.json rename to versions/s-/soci.json diff --git a/port_versions/s-/socket-io-client.json b/versions/s-/socket-io-client.json similarity index 100% rename from port_versions/s-/socket-io-client.json rename to versions/s-/socket-io-client.json diff --git a/port_versions/s-/sockpp.json b/versions/s-/sockpp.json similarity index 100% rename from port_versions/s-/sockpp.json rename to versions/s-/sockpp.json diff --git a/port_versions/s-/soem.json b/versions/s-/soem.json similarity index 100% rename from port_versions/s-/soem.json rename to versions/s-/soem.json diff --git a/port_versions/s-/soil.json b/versions/s-/soil.json similarity index 100% rename from port_versions/s-/soil.json rename to versions/s-/soil.json diff --git a/port_versions/s-/soil2.json b/versions/s-/soil2.json similarity index 100% rename from port_versions/s-/soil2.json rename to versions/s-/soil2.json diff --git a/port_versions/s-/sokol.json b/versions/s-/sokol.json similarity index 100% rename from port_versions/s-/sokol.json rename to versions/s-/sokol.json diff --git a/port_versions/s-/sol2.json b/versions/s-/sol2.json similarity index 100% rename from port_versions/s-/sol2.json rename to versions/s-/sol2.json diff --git a/port_versions/s-/solid3.json b/versions/s-/solid3.json similarity index 100% rename from port_versions/s-/solid3.json rename to versions/s-/solid3.json diff --git a/port_versions/s-/sophus.json b/versions/s-/sophus.json similarity index 100% rename from port_versions/s-/sophus.json rename to versions/s-/sophus.json diff --git a/port_versions/s-/soqt.json b/versions/s-/soqt.json similarity index 100% rename from port_versions/s-/soqt.json rename to versions/s-/soqt.json diff --git a/port_versions/s-/sord.json b/versions/s-/sord.json similarity index 100% rename from port_versions/s-/sord.json rename to versions/s-/sord.json diff --git a/port_versions/s-/soundtouch.json b/versions/s-/soundtouch.json similarity index 100% rename from port_versions/s-/soundtouch.json rename to versions/s-/soundtouch.json diff --git a/port_versions/s-/soxr.json b/versions/s-/soxr.json similarity index 100% rename from port_versions/s-/soxr.json rename to versions/s-/soxr.json diff --git a/port_versions/s-/spaceland.json b/versions/s-/spaceland.json similarity index 100% rename from port_versions/s-/spaceland.json rename to versions/s-/spaceland.json diff --git a/port_versions/s-/span-lite.json b/versions/s-/span-lite.json similarity index 100% rename from port_versions/s-/span-lite.json rename to versions/s-/span-lite.json diff --git a/port_versions/s-/sparsehash.json b/versions/s-/sparsehash.json similarity index 100% rename from port_versions/s-/sparsehash.json rename to versions/s-/sparsehash.json diff --git a/port_versions/s-/sparsepp.json b/versions/s-/sparsepp.json similarity index 100% rename from port_versions/s-/sparsepp.json rename to versions/s-/sparsepp.json diff --git a/port_versions/s-/spatialite-tools.json b/versions/s-/spatialite-tools.json similarity index 100% rename from port_versions/s-/spatialite-tools.json rename to versions/s-/spatialite-tools.json diff --git a/port_versions/s-/spdk-dpdk.json b/versions/s-/spdk-dpdk.json similarity index 100% rename from port_versions/s-/spdk-dpdk.json rename to versions/s-/spdk-dpdk.json diff --git a/port_versions/s-/spdk-ipsec.json b/versions/s-/spdk-ipsec.json similarity index 100% rename from port_versions/s-/spdk-ipsec.json rename to versions/s-/spdk-ipsec.json diff --git a/port_versions/s-/spdk-isal.json b/versions/s-/spdk-isal.json similarity index 100% rename from port_versions/s-/spdk-isal.json rename to versions/s-/spdk-isal.json diff --git a/port_versions/s-/spdk.json b/versions/s-/spdk.json similarity index 100% rename from port_versions/s-/spdk.json rename to versions/s-/spdk.json diff --git a/port_versions/s-/spdlog.json b/versions/s-/spdlog.json similarity index 100% rename from port_versions/s-/spdlog.json rename to versions/s-/spdlog.json diff --git a/port_versions/s-/spectra.json b/versions/s-/spectra.json similarity index 100% rename from port_versions/s-/spectra.json rename to versions/s-/spectra.json diff --git a/port_versions/s-/speex.json b/versions/s-/speex.json similarity index 100% rename from port_versions/s-/speex.json rename to versions/s-/speex.json diff --git a/port_versions/s-/speexdsp.json b/versions/s-/speexdsp.json similarity index 100% rename from port_versions/s-/speexdsp.json rename to versions/s-/speexdsp.json diff --git a/port_versions/s-/spirit-po.json b/versions/s-/spirit-po.json similarity index 100% rename from port_versions/s-/spirit-po.json rename to versions/s-/spirit-po.json diff --git a/port_versions/s-/spirv-cross.json b/versions/s-/spirv-cross.json similarity index 100% rename from port_versions/s-/spirv-cross.json rename to versions/s-/spirv-cross.json diff --git a/port_versions/s-/spirv-headers.json b/versions/s-/spirv-headers.json similarity index 100% rename from port_versions/s-/spirv-headers.json rename to versions/s-/spirv-headers.json diff --git a/port_versions/s-/spirv-tools.json b/versions/s-/spirv-tools.json similarity index 100% rename from port_versions/s-/spirv-tools.json rename to versions/s-/spirv-tools.json diff --git a/port_versions/s-/sprout.json b/versions/s-/sprout.json similarity index 100% rename from port_versions/s-/sprout.json rename to versions/s-/sprout.json diff --git a/port_versions/s-/spscqueue.json b/versions/s-/spscqueue.json similarity index 100% rename from port_versions/s-/spscqueue.json rename to versions/s-/spscqueue.json diff --git a/port_versions/s-/sqlcipher.json b/versions/s-/sqlcipher.json similarity index 100% rename from port_versions/s-/sqlcipher.json rename to versions/s-/sqlcipher.json diff --git a/port_versions/s-/sqlite-modern-cpp.json b/versions/s-/sqlite-modern-cpp.json similarity index 100% rename from port_versions/s-/sqlite-modern-cpp.json rename to versions/s-/sqlite-modern-cpp.json diff --git a/port_versions/s-/sqlite-orm.json b/versions/s-/sqlite-orm.json similarity index 100% rename from port_versions/s-/sqlite-orm.json rename to versions/s-/sqlite-orm.json diff --git a/port_versions/s-/sqlite3.json b/versions/s-/sqlite3.json similarity index 100% rename from port_versions/s-/sqlite3.json rename to versions/s-/sqlite3.json diff --git a/port_versions/s-/sqlitecpp.json b/versions/s-/sqlitecpp.json similarity index 100% rename from port_versions/s-/sqlitecpp.json rename to versions/s-/sqlitecpp.json diff --git a/port_versions/s-/sqlpp11-connector-mysql.json b/versions/s-/sqlpp11-connector-mysql.json similarity index 100% rename from port_versions/s-/sqlpp11-connector-mysql.json rename to versions/s-/sqlpp11-connector-mysql.json diff --git a/port_versions/s-/sqlpp11-connector-sqlite3.json b/versions/s-/sqlpp11-connector-sqlite3.json similarity index 100% rename from port_versions/s-/sqlpp11-connector-sqlite3.json rename to versions/s-/sqlpp11-connector-sqlite3.json diff --git a/port_versions/s-/sqlpp11.json b/versions/s-/sqlpp11.json similarity index 100% rename from port_versions/s-/sqlpp11.json rename to versions/s-/sqlpp11.json diff --git a/port_versions/s-/sratom.json b/versions/s-/sratom.json similarity index 100% rename from port_versions/s-/sratom.json rename to versions/s-/sratom.json diff --git a/port_versions/s-/status-value-lite.json b/versions/s-/status-value-lite.json similarity index 100% rename from port_versions/s-/status-value-lite.json rename to versions/s-/status-value-lite.json diff --git a/port_versions/s-/stb.json b/versions/s-/stb.json similarity index 100% rename from port_versions/s-/stb.json rename to versions/s-/stb.json diff --git a/port_versions/s-/stlab.json b/versions/s-/stlab.json similarity index 100% rename from port_versions/s-/stlab.json rename to versions/s-/stlab.json diff --git a/port_versions/s-/stormlib.json b/versions/s-/stormlib.json similarity index 100% rename from port_versions/s-/stormlib.json rename to versions/s-/stormlib.json diff --git a/port_versions/s-/strict-variant.json b/versions/s-/strict-variant.json similarity index 100% rename from port_versions/s-/strict-variant.json rename to versions/s-/strict-variant.json diff --git a/port_versions/s-/string-theory.json b/versions/s-/string-theory.json similarity index 100% rename from port_versions/s-/string-theory.json rename to versions/s-/string-theory.json diff --git a/port_versions/s-/string-view-lite.json b/versions/s-/string-view-lite.json similarity index 100% rename from port_versions/s-/string-view-lite.json rename to versions/s-/string-view-lite.json diff --git a/port_versions/s-/strtk.json b/versions/s-/strtk.json similarity index 100% rename from port_versions/s-/strtk.json rename to versions/s-/strtk.json diff --git a/port_versions/s-/stx.json b/versions/s-/stx.json similarity index 100% rename from port_versions/s-/stx.json rename to versions/s-/stx.json diff --git a/port_versions/s-/stxxl.json b/versions/s-/stxxl.json similarity index 100% rename from port_versions/s-/stxxl.json rename to versions/s-/stxxl.json diff --git a/port_versions/s-/suitesparse.json b/versions/s-/suitesparse.json similarity index 100% rename from port_versions/s-/suitesparse.json rename to versions/s-/suitesparse.json diff --git a/port_versions/s-/sundials.json b/versions/s-/sundials.json similarity index 100% rename from port_versions/s-/sundials.json rename to versions/s-/sundials.json diff --git a/port_versions/s-/superlu.json b/versions/s-/superlu.json similarity index 100% rename from port_versions/s-/superlu.json rename to versions/s-/superlu.json diff --git a/port_versions/s-/symengine.json b/versions/s-/symengine.json similarity index 100% rename from port_versions/s-/symengine.json rename to versions/s-/symengine.json diff --git a/port_versions/s-/systemc.json b/versions/s-/systemc.json similarity index 100% rename from port_versions/s-/systemc.json rename to versions/s-/systemc.json diff --git a/port_versions/s-/szip.json b/versions/s-/szip.json similarity index 100% rename from port_versions/s-/szip.json rename to versions/s-/szip.json diff --git a/port_versions/t-/tabulate.json b/versions/t-/tabulate.json similarity index 100% rename from port_versions/t-/tabulate.json rename to versions/t-/tabulate.json diff --git a/port_versions/t-/tacopie.json b/versions/t-/tacopie.json similarity index 100% rename from port_versions/t-/tacopie.json rename to versions/t-/tacopie.json diff --git a/port_versions/t-/taglib.json b/versions/t-/taglib.json similarity index 100% rename from port_versions/t-/taglib.json rename to versions/t-/taglib.json diff --git a/port_versions/t-/taocpp-json.json b/versions/t-/taocpp-json.json similarity index 100% rename from port_versions/t-/taocpp-json.json rename to versions/t-/taocpp-json.json diff --git a/port_versions/t-/tap-windows6.json b/versions/t-/tap-windows6.json similarity index 100% rename from port_versions/t-/tap-windows6.json rename to versions/t-/tap-windows6.json diff --git a/port_versions/t-/taskflow.json b/versions/t-/taskflow.json similarity index 100% rename from port_versions/t-/taskflow.json rename to versions/t-/taskflow.json diff --git a/port_versions/t-/tbb.json b/versions/t-/tbb.json similarity index 100% rename from port_versions/t-/tbb.json rename to versions/t-/tbb.json diff --git a/port_versions/t-/tcl.json b/versions/t-/tcl.json similarity index 100% rename from port_versions/t-/tcl.json rename to versions/t-/tcl.json diff --git a/port_versions/t-/tclap.json b/versions/t-/tclap.json similarity index 100% rename from port_versions/t-/tclap.json rename to versions/t-/tclap.json diff --git a/port_versions/t-/teemo.json b/versions/t-/teemo.json similarity index 100% rename from port_versions/t-/teemo.json rename to versions/t-/teemo.json diff --git a/port_versions/t-/telnetpp.json b/versions/t-/telnetpp.json similarity index 100% rename from port_versions/t-/telnetpp.json rename to versions/t-/telnetpp.json diff --git a/port_versions/t-/tensorflow-cc.json b/versions/t-/tensorflow-cc.json similarity index 100% rename from port_versions/t-/tensorflow-cc.json rename to versions/t-/tensorflow-cc.json diff --git a/port_versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json similarity index 100% rename from port_versions/t-/tensorflow-common.json rename to versions/t-/tensorflow-common.json diff --git a/port_versions/t-/tensorflow.json b/versions/t-/tensorflow.json similarity index 100% rename from port_versions/t-/tensorflow.json rename to versions/t-/tensorflow.json diff --git a/port_versions/t-/termcolor.json b/versions/t-/termcolor.json similarity index 100% rename from port_versions/t-/termcolor.json rename to versions/t-/termcolor.json diff --git a/port_versions/t-/tesseract.json b/versions/t-/tesseract.json similarity index 100% rename from port_versions/t-/tesseract.json rename to versions/t-/tesseract.json diff --git a/port_versions/t-/tfhe.json b/versions/t-/tfhe.json similarity index 100% rename from port_versions/t-/tfhe.json rename to versions/t-/tfhe.json diff --git a/port_versions/t-/tgbot-cpp.json b/versions/t-/tgbot-cpp.json similarity index 100% rename from port_versions/t-/tgbot-cpp.json rename to versions/t-/tgbot-cpp.json diff --git a/port_versions/t-/tgc.json b/versions/t-/tgc.json similarity index 100% rename from port_versions/t-/tgc.json rename to versions/t-/tgc.json diff --git a/port_versions/t-/tgui.json b/versions/t-/tgui.json similarity index 100% rename from port_versions/t-/tgui.json rename to versions/t-/tgui.json diff --git a/port_versions/t-/theia.json b/versions/t-/theia.json similarity index 100% rename from port_versions/t-/theia.json rename to versions/t-/theia.json diff --git a/port_versions/t-/think-cell-range.json b/versions/t-/think-cell-range.json similarity index 100% rename from port_versions/t-/think-cell-range.json rename to versions/t-/think-cell-range.json diff --git a/port_versions/t-/thor.json b/versions/t-/thor.json similarity index 100% rename from port_versions/t-/thor.json rename to versions/t-/thor.json diff --git a/port_versions/t-/threadpool.json b/versions/t-/threadpool.json similarity index 100% rename from port_versions/t-/threadpool.json rename to versions/t-/threadpool.json diff --git a/port_versions/t-/thrift.json b/versions/t-/thrift.json similarity index 100% rename from port_versions/t-/thrift.json rename to versions/t-/thrift.json diff --git a/port_versions/t-/tidy-html5.json b/versions/t-/tidy-html5.json similarity index 100% rename from port_versions/t-/tidy-html5.json rename to versions/t-/tidy-html5.json diff --git a/port_versions/t-/tiff.json b/versions/t-/tiff.json similarity index 100% rename from port_versions/t-/tiff.json rename to versions/t-/tiff.json diff --git a/port_versions/t-/tinkerforge.json b/versions/t-/tinkerforge.json similarity index 100% rename from port_versions/t-/tinkerforge.json rename to versions/t-/tinkerforge.json diff --git a/port_versions/t-/tiny-aes-c.json b/versions/t-/tiny-aes-c.json similarity index 100% rename from port_versions/t-/tiny-aes-c.json rename to versions/t-/tiny-aes-c.json diff --git a/port_versions/t-/tiny-bignum-c.json b/versions/t-/tiny-bignum-c.json similarity index 100% rename from port_versions/t-/tiny-bignum-c.json rename to versions/t-/tiny-bignum-c.json diff --git a/port_versions/t-/tiny-dnn.json b/versions/t-/tiny-dnn.json similarity index 100% rename from port_versions/t-/tiny-dnn.json rename to versions/t-/tiny-dnn.json diff --git a/port_versions/t-/tiny-process-library.json b/versions/t-/tiny-process-library.json similarity index 100% rename from port_versions/t-/tiny-process-library.json rename to versions/t-/tiny-process-library.json diff --git a/port_versions/t-/tiny-regex-c.json b/versions/t-/tiny-regex-c.json similarity index 100% rename from port_versions/t-/tiny-regex-c.json rename to versions/t-/tiny-regex-c.json diff --git a/port_versions/t-/tinycthread.json b/versions/t-/tinycthread.json similarity index 100% rename from port_versions/t-/tinycthread.json rename to versions/t-/tinycthread.json diff --git a/port_versions/t-/tinydir.json b/versions/t-/tinydir.json similarity index 100% rename from port_versions/t-/tinydir.json rename to versions/t-/tinydir.json diff --git a/port_versions/t-/tinyexif.json b/versions/t-/tinyexif.json similarity index 100% rename from port_versions/t-/tinyexif.json rename to versions/t-/tinyexif.json diff --git a/port_versions/t-/tinyexpr.json b/versions/t-/tinyexpr.json similarity index 100% rename from port_versions/t-/tinyexpr.json rename to versions/t-/tinyexpr.json diff --git a/port_versions/t-/tinyexr.json b/versions/t-/tinyexr.json similarity index 100% rename from port_versions/t-/tinyexr.json rename to versions/t-/tinyexr.json diff --git a/port_versions/t-/tinyfiledialogs.json b/versions/t-/tinyfiledialogs.json similarity index 100% rename from port_versions/t-/tinyfiledialogs.json rename to versions/t-/tinyfiledialogs.json diff --git a/port_versions/t-/tinygltf.json b/versions/t-/tinygltf.json similarity index 100% rename from port_versions/t-/tinygltf.json rename to versions/t-/tinygltf.json diff --git a/port_versions/t-/tinynpy.json b/versions/t-/tinynpy.json similarity index 100% rename from port_versions/t-/tinynpy.json rename to versions/t-/tinynpy.json diff --git a/port_versions/t-/tinyobjloader.json b/versions/t-/tinyobjloader.json similarity index 100% rename from port_versions/t-/tinyobjloader.json rename to versions/t-/tinyobjloader.json diff --git a/port_versions/t-/tinyply.json b/versions/t-/tinyply.json similarity index 100% rename from port_versions/t-/tinyply.json rename to versions/t-/tinyply.json diff --git a/port_versions/t-/tinyspline.json b/versions/t-/tinyspline.json similarity index 100% rename from port_versions/t-/tinyspline.json rename to versions/t-/tinyspline.json diff --git a/port_versions/t-/tinythread.json b/versions/t-/tinythread.json similarity index 100% rename from port_versions/t-/tinythread.json rename to versions/t-/tinythread.json diff --git a/port_versions/t-/tinytoml.json b/versions/t-/tinytoml.json similarity index 100% rename from port_versions/t-/tinytoml.json rename to versions/t-/tinytoml.json diff --git a/port_versions/t-/tinyutf8.json b/versions/t-/tinyutf8.json similarity index 100% rename from port_versions/t-/tinyutf8.json rename to versions/t-/tinyutf8.json diff --git a/port_versions/t-/tinyxml.json b/versions/t-/tinyxml.json similarity index 100% rename from port_versions/t-/tinyxml.json rename to versions/t-/tinyxml.json diff --git a/port_versions/t-/tinyxml2.json b/versions/t-/tinyxml2.json similarity index 100% rename from port_versions/t-/tinyxml2.json rename to versions/t-/tinyxml2.json diff --git a/port_versions/t-/tl-expected.json b/versions/t-/tl-expected.json similarity index 100% rename from port_versions/t-/tl-expected.json rename to versions/t-/tl-expected.json diff --git a/port_versions/t-/tl-function-ref.json b/versions/t-/tl-function-ref.json similarity index 100% rename from port_versions/t-/tl-function-ref.json rename to versions/t-/tl-function-ref.json diff --git a/port_versions/t-/tl-optional.json b/versions/t-/tl-optional.json similarity index 100% rename from port_versions/t-/tl-optional.json rename to versions/t-/tl-optional.json diff --git a/port_versions/t-/tlx.json b/versions/t-/tlx.json similarity index 100% rename from port_versions/t-/tlx.json rename to versions/t-/tlx.json diff --git a/port_versions/t-/tmx.json b/versions/t-/tmx.json similarity index 100% rename from port_versions/t-/tmx.json rename to versions/t-/tmx.json diff --git a/port_versions/t-/tmxlite.json b/versions/t-/tmxlite.json similarity index 100% rename from port_versions/t-/tmxlite.json rename to versions/t-/tmxlite.json diff --git a/port_versions/t-/tmxparser.json b/versions/t-/tmxparser.json similarity index 100% rename from port_versions/t-/tmxparser.json rename to versions/t-/tmxparser.json diff --git a/port_versions/t-/toml11.json b/versions/t-/toml11.json similarity index 100% rename from port_versions/t-/toml11.json rename to versions/t-/toml11.json diff --git a/port_versions/t-/tomlplusplus.json b/versions/t-/tomlplusplus.json similarity index 100% rename from port_versions/t-/tomlplusplus.json rename to versions/t-/tomlplusplus.json diff --git a/port_versions/t-/tool-meson.json b/versions/t-/tool-meson.json similarity index 100% rename from port_versions/t-/tool-meson.json rename to versions/t-/tool-meson.json diff --git a/port_versions/t-/torch-th.json b/versions/t-/torch-th.json similarity index 100% rename from port_versions/t-/torch-th.json rename to versions/t-/torch-th.json diff --git a/port_versions/t-/trantor.json b/versions/t-/trantor.json similarity index 100% rename from port_versions/t-/trantor.json rename to versions/t-/trantor.json diff --git a/port_versions/t-/tre.json b/versions/t-/tre.json similarity index 100% rename from port_versions/t-/tre.json rename to versions/t-/tre.json diff --git a/port_versions/t-/treehopper.json b/versions/t-/treehopper.json similarity index 100% rename from port_versions/t-/treehopper.json rename to versions/t-/treehopper.json diff --git a/port_versions/t-/triangle.json b/versions/t-/triangle.json similarity index 100% rename from port_versions/t-/triangle.json rename to versions/t-/triangle.json diff --git a/port_versions/t-/trompeloeil.json b/versions/t-/trompeloeil.json similarity index 100% rename from port_versions/t-/trompeloeil.json rename to versions/t-/trompeloeil.json diff --git a/port_versions/t-/tsl-hopscotch-map.json b/versions/t-/tsl-hopscotch-map.json similarity index 100% rename from port_versions/t-/tsl-hopscotch-map.json rename to versions/t-/tsl-hopscotch-map.json diff --git a/port_versions/t-/tsl-ordered-map.json b/versions/t-/tsl-ordered-map.json similarity index 100% rename from port_versions/t-/tsl-ordered-map.json rename to versions/t-/tsl-ordered-map.json diff --git a/port_versions/t-/tsl-sparse-map.json b/versions/t-/tsl-sparse-map.json similarity index 100% rename from port_versions/t-/tsl-sparse-map.json rename to versions/t-/tsl-sparse-map.json diff --git a/port_versions/t-/turbobase64.json b/versions/t-/turbobase64.json similarity index 100% rename from port_versions/t-/turbobase64.json rename to versions/t-/turbobase64.json diff --git a/port_versions/t-/tweeny.json b/versions/t-/tweeny.json similarity index 100% rename from port_versions/t-/tweeny.json rename to versions/t-/tweeny.json diff --git a/port_versions/t-/type-lite.json b/versions/t-/type-lite.json similarity index 100% rename from port_versions/t-/type-lite.json rename to versions/t-/type-lite.json diff --git a/port_versions/t-/type-safe.json b/versions/t-/type-safe.json similarity index 100% rename from port_versions/t-/type-safe.json rename to versions/t-/type-safe.json diff --git a/port_versions/u-/uchardet.json b/versions/u-/uchardet.json similarity index 100% rename from port_versions/u-/uchardet.json rename to versions/u-/uchardet.json diff --git a/port_versions/u-/umock-c.json b/versions/u-/umock-c.json similarity index 100% rename from port_versions/u-/umock-c.json rename to versions/u-/umock-c.json diff --git a/port_versions/u-/unicorn-lib.json b/versions/u-/unicorn-lib.json similarity index 100% rename from port_versions/u-/unicorn-lib.json rename to versions/u-/unicorn-lib.json diff --git a/port_versions/u-/unicorn.json b/versions/u-/unicorn.json similarity index 100% rename from port_versions/u-/unicorn.json rename to versions/u-/unicorn.json diff --git a/port_versions/u-/units.json b/versions/u-/units.json similarity index 100% rename from port_versions/u-/units.json rename to versions/u-/units.json diff --git a/port_versions/u-/unittest-cpp.json b/versions/u-/unittest-cpp.json similarity index 100% rename from port_versions/u-/unittest-cpp.json rename to versions/u-/unittest-cpp.json diff --git a/port_versions/u-/unixodbc.json b/versions/u-/unixodbc.json similarity index 100% rename from port_versions/u-/unixodbc.json rename to versions/u-/unixodbc.json diff --git a/port_versions/u-/unqlite.json b/versions/u-/unqlite.json similarity index 100% rename from port_versions/u-/unqlite.json rename to versions/u-/unqlite.json diff --git a/port_versions/u-/unrar.json b/versions/u-/unrar.json similarity index 100% rename from port_versions/u-/unrar.json rename to versions/u-/unrar.json diff --git a/port_versions/u-/upb.json b/versions/u-/upb.json similarity index 100% rename from port_versions/u-/upb.json rename to versions/u-/upb.json diff --git a/port_versions/u-/urdfdom-headers.json b/versions/u-/urdfdom-headers.json similarity index 100% rename from port_versions/u-/urdfdom-headers.json rename to versions/u-/urdfdom-headers.json diff --git a/port_versions/u-/urdfdom.json b/versions/u-/urdfdom.json similarity index 100% rename from port_versions/u-/urdfdom.json rename to versions/u-/urdfdom.json diff --git a/port_versions/u-/uriparser.json b/versions/u-/uriparser.json similarity index 100% rename from port_versions/u-/uriparser.json rename to versions/u-/uriparser.json diff --git a/port_versions/u-/usbmuxd.json b/versions/u-/usbmuxd.json similarity index 100% rename from port_versions/u-/usbmuxd.json rename to versions/u-/usbmuxd.json diff --git a/port_versions/u-/usd.json b/versions/u-/usd.json similarity index 100% rename from port_versions/u-/usd.json rename to versions/u-/usd.json diff --git a/port_versions/u-/usockets.json b/versions/u-/usockets.json similarity index 100% rename from port_versions/u-/usockets.json rename to versions/u-/usockets.json diff --git a/port_versions/u-/usrsctp.json b/versions/u-/usrsctp.json similarity index 100% rename from port_versions/u-/usrsctp.json rename to versions/u-/usrsctp.json diff --git a/port_versions/u-/utf8h.json b/versions/u-/utf8h.json similarity index 100% rename from port_versions/u-/utf8h.json rename to versions/u-/utf8h.json diff --git a/port_versions/u-/utf8proc.json b/versions/u-/utf8proc.json similarity index 100% rename from port_versions/u-/utf8proc.json rename to versions/u-/utf8proc.json diff --git a/port_versions/u-/utfcpp.json b/versions/u-/utfcpp.json similarity index 100% rename from port_versions/u-/utfcpp.json rename to versions/u-/utfcpp.json diff --git a/port_versions/u-/utfz.json b/versions/u-/utfz.json similarity index 100% rename from port_versions/u-/utfz.json rename to versions/u-/utfz.json diff --git a/port_versions/u-/uthenticode.json b/versions/u-/uthenticode.json similarity index 100% rename from port_versions/u-/uthenticode.json rename to versions/u-/uthenticode.json diff --git a/port_versions/u-/uvatlas.json b/versions/u-/uvatlas.json similarity index 100% rename from port_versions/u-/uvatlas.json rename to versions/u-/uvatlas.json diff --git a/port_versions/u-/uvw.json b/versions/u-/uvw.json similarity index 100% rename from port_versions/u-/uvw.json rename to versions/u-/uvw.json diff --git a/port_versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json similarity index 100% rename from port_versions/u-/uwebsockets.json rename to versions/u-/uwebsockets.json diff --git a/port_versions/v-/v-hacd.json b/versions/v-/v-hacd.json similarity index 100% rename from port_versions/v-/v-hacd.json rename to versions/v-/v-hacd.json diff --git a/port_versions/v-/v8.json b/versions/v-/v8.json similarity index 100% rename from port_versions/v-/v8.json rename to versions/v-/v8.json diff --git a/port_versions/v-/valijson.json b/versions/v-/valijson.json similarity index 100% rename from port_versions/v-/valijson.json rename to versions/v-/valijson.json diff --git a/port_versions/v-/value-ptr-lite.json b/versions/v-/value-ptr-lite.json similarity index 100% rename from port_versions/v-/value-ptr-lite.json rename to versions/v-/value-ptr-lite.json diff --git a/port_versions/v-/variant-lite.json b/versions/v-/variant-lite.json similarity index 100% rename from port_versions/v-/variant-lite.json rename to versions/v-/variant-lite.json diff --git a/port_versions/v-/vc.json b/versions/v-/vc.json similarity index 100% rename from port_versions/v-/vc.json rename to versions/v-/vc.json diff --git a/port_versions/v-/vcglib.json b/versions/v-/vcglib.json similarity index 100% rename from port_versions/v-/vcglib.json rename to versions/v-/vcglib.json diff --git a/port_versions/v-/vcpkg-gfortran.json b/versions/v-/vcpkg-gfortran.json similarity index 100% rename from port_versions/v-/vcpkg-gfortran.json rename to versions/v-/vcpkg-gfortran.json diff --git a/port_versions/v-/vectorclass.json b/versions/v-/vectorclass.json similarity index 100% rename from port_versions/v-/vectorclass.json rename to versions/v-/vectorclass.json diff --git a/port_versions/v-/visit-struct.json b/versions/v-/visit-struct.json similarity index 100% rename from port_versions/v-/visit-struct.json rename to versions/v-/visit-struct.json diff --git a/port_versions/v-/vlfeat.json b/versions/v-/vlfeat.json similarity index 100% rename from port_versions/v-/vlfeat.json rename to versions/v-/vlfeat.json diff --git a/port_versions/v-/vlpp.json b/versions/v-/vlpp.json similarity index 100% rename from port_versions/v-/vlpp.json rename to versions/v-/vlpp.json diff --git a/port_versions/v-/volk.json b/versions/v-/volk.json similarity index 100% rename from port_versions/v-/volk.json rename to versions/v-/volk.json diff --git a/port_versions/v-/vs-yasm.json b/versions/v-/vs-yasm.json similarity index 100% rename from port_versions/v-/vs-yasm.json rename to versions/v-/vs-yasm.json diff --git a/port_versions/v-/vtk-dicom.json b/versions/v-/vtk-dicom.json similarity index 100% rename from port_versions/v-/vtk-dicom.json rename to versions/v-/vtk-dicom.json diff --git a/port_versions/v-/vtk-m.json b/versions/v-/vtk-m.json similarity index 100% rename from port_versions/v-/vtk-m.json rename to versions/v-/vtk-m.json diff --git a/port_versions/v-/vtk.json b/versions/v-/vtk.json similarity index 100% rename from port_versions/v-/vtk.json rename to versions/v-/vtk.json diff --git a/port_versions/v-/vulkan-headers.json b/versions/v-/vulkan-headers.json similarity index 100% rename from port_versions/v-/vulkan-headers.json rename to versions/v-/vulkan-headers.json diff --git a/port_versions/v-/vulkan-hpp.json b/versions/v-/vulkan-hpp.json similarity index 100% rename from port_versions/v-/vulkan-hpp.json rename to versions/v-/vulkan-hpp.json diff --git a/port_versions/v-/vulkan-memory-allocator.json b/versions/v-/vulkan-memory-allocator.json similarity index 100% rename from port_versions/v-/vulkan-memory-allocator.json rename to versions/v-/vulkan-memory-allocator.json diff --git a/port_versions/v-/vulkan.json b/versions/v-/vulkan.json similarity index 100% rename from port_versions/v-/vulkan.json rename to versions/v-/vulkan.json diff --git a/port_versions/v-/vxl.json b/versions/v-/vxl.json similarity index 100% rename from port_versions/v-/vxl.json rename to versions/v-/vxl.json diff --git a/port_versions/w-/wampcc.json b/versions/w-/wampcc.json similarity index 100% rename from port_versions/w-/wampcc.json rename to versions/w-/wampcc.json diff --git a/port_versions/w-/wangle.json b/versions/w-/wangle.json similarity index 100% rename from port_versions/w-/wangle.json rename to versions/w-/wangle.json diff --git a/port_versions/w-/wavelib.json b/versions/w-/wavelib.json similarity index 100% rename from port_versions/w-/wavelib.json rename to versions/w-/wavelib.json diff --git a/port_versions/w-/wavpack.json b/versions/w-/wavpack.json similarity index 100% rename from port_versions/w-/wavpack.json rename to versions/w-/wavpack.json diff --git a/port_versions/w-/websocketpp.json b/versions/w-/websocketpp.json similarity index 100% rename from port_versions/w-/websocketpp.json rename to versions/w-/websocketpp.json diff --git a/port_versions/w-/wepoll.json b/versions/w-/wepoll.json similarity index 100% rename from port_versions/w-/wepoll.json rename to versions/w-/wepoll.json diff --git a/port_versions/w-/wg21-sg14.json b/versions/w-/wg21-sg14.json similarity index 100% rename from port_versions/w-/wg21-sg14.json rename to versions/w-/wg21-sg14.json diff --git a/port_versions/w-/wil.json b/versions/w-/wil.json similarity index 100% rename from port_versions/w-/wil.json rename to versions/w-/wil.json diff --git a/port_versions/w-/wildmidi.json b/versions/w-/wildmidi.json similarity index 100% rename from port_versions/w-/wildmidi.json rename to versions/w-/wildmidi.json diff --git a/port_versions/w-/wincrypt.json b/versions/w-/wincrypt.json similarity index 100% rename from port_versions/w-/wincrypt.json rename to versions/w-/wincrypt.json diff --git a/port_versions/w-/winpcap.json b/versions/w-/winpcap.json similarity index 100% rename from port_versions/w-/winpcap.json rename to versions/w-/winpcap.json diff --git a/port_versions/w-/winreg.json b/versions/w-/winreg.json similarity index 100% rename from port_versions/w-/winreg.json rename to versions/w-/winreg.json diff --git a/port_versions/w-/winsock2.json b/versions/w-/winsock2.json similarity index 100% rename from port_versions/w-/winsock2.json rename to versions/w-/winsock2.json diff --git a/port_versions/w-/wintoast.json b/versions/w-/wintoast.json similarity index 100% rename from port_versions/w-/wintoast.json rename to versions/w-/wintoast.json diff --git a/port_versions/w-/woff2.json b/versions/w-/woff2.json similarity index 100% rename from port_versions/w-/woff2.json rename to versions/w-/woff2.json diff --git a/port_versions/w-/wordnet.json b/versions/w-/wordnet.json similarity index 100% rename from port_versions/w-/wordnet.json rename to versions/w-/wordnet.json diff --git a/port_versions/w-/wpilib.json b/versions/w-/wpilib.json similarity index 100% rename from port_versions/w-/wpilib.json rename to versions/w-/wpilib.json diff --git a/port_versions/w-/wren.json b/versions/w-/wren.json similarity index 100% rename from port_versions/w-/wren.json rename to versions/w-/wren.json diff --git a/port_versions/w-/wt.json b/versions/w-/wt.json similarity index 100% rename from port_versions/w-/wt.json rename to versions/w-/wt.json diff --git a/port_versions/w-/wtl.json b/versions/w-/wtl.json similarity index 100% rename from port_versions/w-/wtl.json rename to versions/w-/wtl.json diff --git a/port_versions/w-/wxchartdir.json b/versions/w-/wxchartdir.json similarity index 100% rename from port_versions/w-/wxchartdir.json rename to versions/w-/wxchartdir.json diff --git a/port_versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json similarity index 100% rename from port_versions/w-/wxwidgets.json rename to versions/w-/wxwidgets.json diff --git a/port_versions/x-/x-plane.json b/versions/x-/x-plane.json similarity index 100% rename from port_versions/x-/x-plane.json rename to versions/x-/x-plane.json diff --git a/port_versions/x-/x264.json b/versions/x-/x264.json similarity index 100% rename from port_versions/x-/x264.json rename to versions/x-/x264.json diff --git a/port_versions/x-/x265.json b/versions/x-/x265.json similarity index 100% rename from port_versions/x-/x265.json rename to versions/x-/x265.json diff --git a/port_versions/x-/xalan-c.json b/versions/x-/xalan-c.json similarity index 100% rename from port_versions/x-/xalan-c.json rename to versions/x-/xalan-c.json diff --git a/port_versions/x-/xbyak.json b/versions/x-/xbyak.json similarity index 100% rename from port_versions/x-/xbyak.json rename to versions/x-/xbyak.json diff --git a/port_versions/x-/xerces-c.json b/versions/x-/xerces-c.json similarity index 100% rename from port_versions/x-/xerces-c.json rename to versions/x-/xerces-c.json diff --git a/port_versions/x-/xeus.json b/versions/x-/xeus.json similarity index 100% rename from port_versions/x-/xeus.json rename to versions/x-/xeus.json diff --git a/port_versions/x-/xframe.json b/versions/x-/xframe.json similarity index 100% rename from port_versions/x-/xframe.json rename to versions/x-/xframe.json diff --git a/port_versions/x-/xlnt.json b/versions/x-/xlnt.json similarity index 100% rename from port_versions/x-/xlnt.json rename to versions/x-/xlnt.json diff --git a/port_versions/x-/xmlsec.json b/versions/x-/xmlsec.json similarity index 100% rename from port_versions/x-/xmlsec.json rename to versions/x-/xmlsec.json diff --git a/port_versions/x-/xmsh.json b/versions/x-/xmsh.json similarity index 100% rename from port_versions/x-/xmsh.json rename to versions/x-/xmsh.json diff --git a/port_versions/x-/xorstr.json b/versions/x-/xorstr.json similarity index 100% rename from port_versions/x-/xorstr.json rename to versions/x-/xorstr.json diff --git a/port_versions/x-/xproperty.json b/versions/x-/xproperty.json similarity index 100% rename from port_versions/x-/xproperty.json rename to versions/x-/xproperty.json diff --git a/port_versions/x-/xsimd.json b/versions/x-/xsimd.json similarity index 100% rename from port_versions/x-/xsimd.json rename to versions/x-/xsimd.json diff --git a/port_versions/x-/xtensor-blas.json b/versions/x-/xtensor-blas.json similarity index 100% rename from port_versions/x-/xtensor-blas.json rename to versions/x-/xtensor-blas.json diff --git a/port_versions/x-/xtensor-fftw.json b/versions/x-/xtensor-fftw.json similarity index 100% rename from port_versions/x-/xtensor-fftw.json rename to versions/x-/xtensor-fftw.json diff --git a/port_versions/x-/xtensor-io.json b/versions/x-/xtensor-io.json similarity index 100% rename from port_versions/x-/xtensor-io.json rename to versions/x-/xtensor-io.json diff --git a/port_versions/x-/xtensor.json b/versions/x-/xtensor.json similarity index 100% rename from port_versions/x-/xtensor.json rename to versions/x-/xtensor.json diff --git a/port_versions/x-/xtl.json b/versions/x-/xtl.json similarity index 100% rename from port_versions/x-/xtl.json rename to versions/x-/xtl.json diff --git a/port_versions/x-/xxhash.json b/versions/x-/xxhash.json similarity index 100% rename from port_versions/x-/xxhash.json rename to versions/x-/xxhash.json diff --git a/port_versions/y-/yajl.json b/versions/y-/yajl.json similarity index 100% rename from port_versions/y-/yajl.json rename to versions/y-/yajl.json diff --git a/port_versions/y-/yaml-cpp.json b/versions/y-/yaml-cpp.json similarity index 100% rename from port_versions/y-/yaml-cpp.json rename to versions/y-/yaml-cpp.json diff --git a/port_versions/y-/yara.json b/versions/y-/yara.json similarity index 100% rename from port_versions/y-/yara.json rename to versions/y-/yara.json diff --git a/port_versions/y-/yas.json b/versions/y-/yas.json similarity index 100% rename from port_versions/y-/yas.json rename to versions/y-/yas.json diff --git a/port_versions/y-/yasm-tool-helper.json b/versions/y-/yasm-tool-helper.json similarity index 100% rename from port_versions/y-/yasm-tool-helper.json rename to versions/y-/yasm-tool-helper.json diff --git a/port_versions/y-/yasm-tool.json b/versions/y-/yasm-tool.json similarity index 100% rename from port_versions/y-/yasm-tool.json rename to versions/y-/yasm-tool.json diff --git a/port_versions/y-/yasm.json b/versions/y-/yasm.json similarity index 100% rename from port_versions/y-/yasm.json rename to versions/y-/yasm.json diff --git a/port_versions/y-/yato.json b/versions/y-/yato.json similarity index 100% rename from port_versions/y-/yato.json rename to versions/y-/yato.json diff --git a/port_versions/y-/yoga.json b/versions/y-/yoga.json similarity index 100% rename from port_versions/y-/yoga.json rename to versions/y-/yoga.json diff --git a/port_versions/z-/z3.json b/versions/z-/z3.json similarity index 100% rename from port_versions/z-/z3.json rename to versions/z-/z3.json diff --git a/port_versions/z-/z85.json b/versions/z-/z85.json similarity index 100% rename from port_versions/z-/z85.json rename to versions/z-/z85.json diff --git a/port_versions/z-/zeromq.json b/versions/z-/zeromq.json similarity index 100% rename from port_versions/z-/zeromq.json rename to versions/z-/zeromq.json diff --git a/port_versions/z-/zfp.json b/versions/z-/zfp.json similarity index 100% rename from port_versions/z-/zfp.json rename to versions/z-/zfp.json diff --git a/port_versions/z-/zkpp.json b/versions/z-/zkpp.json similarity index 100% rename from port_versions/z-/zkpp.json rename to versions/z-/zkpp.json diff --git a/port_versions/z-/zlib.json b/versions/z-/zlib.json similarity index 100% rename from port_versions/z-/zlib.json rename to versions/z-/zlib.json diff --git a/port_versions/z-/zookeeper.json b/versions/z-/zookeeper.json similarity index 100% rename from port_versions/z-/zookeeper.json rename to versions/z-/zookeeper.json diff --git a/port_versions/z-/zopfli.json b/versions/z-/zopfli.json similarity index 100% rename from port_versions/z-/zopfli.json rename to versions/z-/zopfli.json diff --git a/port_versions/z-/zserge-webview.json b/versions/z-/zserge-webview.json similarity index 100% rename from port_versions/z-/zserge-webview.json rename to versions/z-/zserge-webview.json diff --git a/port_versions/z-/zstd.json b/versions/z-/zstd.json similarity index 100% rename from port_versions/z-/zstd.json rename to versions/z-/zstd.json diff --git a/port_versions/z-/zstr.json b/versions/z-/zstr.json similarity index 100% rename from port_versions/z-/zstr.json rename to versions/z-/zstr.json diff --git a/port_versions/z-/zxing-cpp.json b/versions/z-/zxing-cpp.json similarity index 100% rename from port_versions/z-/zxing-cpp.json rename to versions/z-/zxing-cpp.json diff --git a/port_versions/z-/zydis.json b/versions/z-/zydis.json similarity index 100% rename from port_versions/z-/zydis.json rename to versions/z-/zydis.json diff --git a/port_versions/z-/zyre.json b/versions/z-/zyre.json similarity index 100% rename from port_versions/z-/zyre.json rename to versions/z-/zyre.json diff --git a/port_versions/z-/zziplib.json b/versions/z-/zziplib.json similarity index 100% rename from port_versions/z-/zziplib.json rename to versions/z-/zziplib.json From d499f51837e9f678a857a0f92de0959702c9ce40 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 21 Jan 2021 12:10:10 -0800 Subject: [PATCH 0547/1694] [vcpkg testing] fix e2e tests (#15803) --- scripts/testing/version-files/default-baseline-2/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/testing/version-files/default-baseline-2/vcpkg.json b/scripts/testing/version-files/default-baseline-2/vcpkg.json index f540ccba0ba4f6..34f4434588a868 100644 --- a/scripts/testing/version-files/default-baseline-2/vcpkg.json +++ b/scripts/testing/version-files/default-baseline-2/vcpkg.json @@ -1,8 +1,8 @@ { "name": "default-baseline-test-2", "version-string": "0", - "builtin-baseline": "16002d9c2318dec4c69e02d9af8c0e11dca0d4c6", + "builtin-baseline": "d5cd6b8c74ee548cfc9ff83cefdac4843cc1503f", "dependencies": [ "zlib" ] -} \ No newline at end of file +} From fea2218a82877cc831c3c0384484be0e1813cf90 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 21 Jan 2021 21:03:37 -0800 Subject: [PATCH 0548/1694] [aws-sdk-cpp] Fix PRIVATE => PRVATE typo (#15804) --- ports/aws-sdk-cpp/CONTROL | 539 --------------------------------- ports/aws-sdk-cpp/usage | 2 +- ports/aws-sdk-cpp/vcpkg.json | 557 +++++++++++++++++++++++++++++++++++ versions/a-/aws-sdk-cpp.json | 5 + versions/baseline.json | 2 +- 5 files changed, 564 insertions(+), 541 deletions(-) delete mode 100644 ports/aws-sdk-cpp/CONTROL create mode 100644 ports/aws-sdk-cpp/vcpkg.json diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL deleted file mode 100644 index 199f79bb936408..00000000000000 --- a/ports/aws-sdk-cpp/CONTROL +++ /dev/null @@ -1,539 +0,0 @@ -Source: aws-sdk-cpp -Version: 1.8.126 -Port-Version: 5 -Homepage: https://github.com/aws/aws-sdk-cpp -Description: AWS SDK for C++ -Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream, zlib -Default-Features: dynamodb, s3, kinesis -# Automatically generated by generateFeatures.ps1 - -Feature: access-management -Description: C++ SDK for the AWS access-management service - -Feature: acm -Description: C++ SDK for the AWS acm service - -Feature: acm-pca -Description: C++ SDK for the AWS acm-pca service - -Feature: alexaforbusiness -Description: C++ SDK for the AWS alexaforbusiness service - -Feature: amplify -Description: C++ SDK for the AWS amplify service - -Feature: apigateway -Description: C++ SDK for the AWS apigateway service - -Feature: apigatewaymanagementapi -Description: C++ SDK for the AWS apigatewaymanagementapi service - -Feature: apigatewayv2 -Description: C++ SDK for the AWS apigatewayv2 service - -Feature: application-autoscaling -Description: C++ SDK for the AWS application-autoscaling service - -Feature: appmesh -Description: C++ SDK for the AWS appmesh service - -Feature: appstream -Description: C++ SDK for the AWS appstream service - -Feature: appsync -Description: C++ SDK for the AWS appsync service - -Feature: athena -Description: C++ SDK for the AWS athena service - -Feature: autoscaling -Description: C++ SDK for the AWS autoscaling service - -Feature: autoscaling-plans -Description: C++ SDK for the AWS autoscaling-plans service - -Feature: awsmigrationhub -Description: C++ SDK for the AWS AWSMigrationHub service - -Feature: awstransfer -Description: C++ SDK for the AWS awstransfer service - -Feature: backup -Description: C++ SDK for the AWS backup service - -Feature: batch -Description: C++ SDK for the AWS batch service - -Feature: budgets -Description: C++ SDK for the AWS budgets service - -Feature: ce -Description: C++ SDK for the AWS ce service - -Feature: chime -Description: C++ SDK for the AWS chime service - -Feature: cloud9 -Description: C++ SDK for the AWS cloud9 service - -Feature: clouddirectory -Description: C++ SDK for the AWS clouddirectory service - -Feature: cloudformation -Description: C++ SDK for the AWS cloudformation service - -Feature: cloudfront -Description: C++ SDK for the AWS cloudfront service - -Feature: cloudhsm -Description: C++ SDK for the AWS cloudhsm service - -Feature: cloudhsmv2 -Description: C++ SDK for the AWS cloudhsmv2 service - -Feature: cloudsearch -Description: C++ SDK for the AWS cloudsearch service - -Feature: cloudsearchdomain -Description: C++ SDK for the AWS cloudsearchdomain service - -Feature: cloudtrail -Description: C++ SDK for the AWS cloudtrail service - -Feature: codebuild -Description: C++ SDK for the AWS codebuild service - -Feature: codecommit -Description: C++ SDK for the AWS codecommit service - -Feature: codedeploy -Description: C++ SDK for the AWS codedeploy service - -Feature: codepipeline -Description: C++ SDK for the AWS codepipeline service - -Feature: codestar -Description: C++ SDK for the AWS codestar service - -Feature: cognito-identity -Description: C++ SDK for the AWS cognito-identity service - -Feature: cognito-idp -Description: C++ SDK for the AWS cognito-idp service - -Feature: cognito-sync -Description: C++ SDK for the AWS cognito-sync service - -Feature: comprehend -Description: C++ SDK for the AWS comprehend service - -Feature: comprehendmedical -Description: C++ SDK for the AWS comprehendmedical service - -Feature: config -Description: C++ SDK for the AWS config service - -Feature: connect -Description: C++ SDK for the AWS connect service - -Feature: cur -Description: C++ SDK for the AWS cur service - -Feature: datapipeline -Description: C++ SDK for the AWS datapipeline service - -Feature: datasync -Description: C++ SDK for the AWS datasync service - -Feature: dax -Description: C++ SDK for the AWS dax service - -Feature: devicefarm -Description: C++ SDK for the AWS devicefarm service - -Feature: directconnect -Description: C++ SDK for the AWS directconnect service - -Feature: discovery -Description: C++ SDK for the AWS discovery service - -Feature: dlm -Description: C++ SDK for the AWS dlm service - -Feature: dms -Description: C++ SDK for the AWS dms service - -Feature: docdb -Description: C++ SDK for the AWS docdb service - -Feature: ds -Description: C++ SDK for the AWS ds service - -Feature: dynamodb -Description: C++ SDK for the AWS dynamodb service - -Feature: dynamodbstreams -Description: C++ SDK for the AWS dynamodbstreams service - -Feature: ec2 -Description: C++ SDK for the AWS ec2 service - -Feature: ecr -Description: C++ SDK for the AWS ecr service - -Feature: ecs -Description: C++ SDK for the AWS ecs service - -Feature: eks -Description: C++ SDK for the AWS eks service - -Feature: elasticache -Description: C++ SDK for the AWS elasticache service - -Feature: elasticbeanstalk -Description: C++ SDK for the AWS elasticbeanstalk service - -Feature: elasticfilesystem -Description: C++ SDK for the AWS elasticfilesystem service - -Feature: elasticloadbalancing -Description: C++ SDK for the AWS elasticloadbalancing service - -Feature: elasticloadbalancingv2 -Description: C++ SDK for the AWS elasticloadbalancingv2 service - -Feature: elasticmapreduce -Description: C++ SDK for the AWS elasticmapreduce service - -Feature: elastictranscoder -Description: C++ SDK for the AWS elastictranscoder service - -Feature: email -Description: C++ SDK for the AWS email service - -Feature: es -Description: C++ SDK for the AWS es service - -Feature: events -Description: C++ SDK for the AWS events service - -Feature: firehose -Description: C++ SDK for the AWS firehose service - -Feature: fms -Description: C++ SDK for the AWS fms service - -Feature: fsx -Description: C++ SDK for the AWS fsx service - -Feature: gamelift -Description: C++ SDK for the AWS gamelift service - -Feature: glacier -Description: C++ SDK for the AWS glacier service - -Feature: globalaccelerator -Description: C++ SDK for the AWS globalaccelerator service - -Feature: glue -Description: C++ SDK for the AWS glue service - -Feature: greengrass -Description: C++ SDK for the AWS greengrass service - -Feature: guardduty -Description: C++ SDK for the AWS guardduty service - -Feature: health -Description: C++ SDK for the AWS health service - -Feature: iam -Description: C++ SDK for the AWS iam service - -Feature: identity-management -Description: C++ SDK for the AWS identity-management service - -Feature: importexport -Description: C++ SDK for the AWS importexport service - -Feature: inspector -Description: C++ SDK for the AWS inspector service - -Feature: iot -Description: C++ SDK for the AWS iot service - -Feature: iot-data -Description: C++ SDK for the AWS iot-data service - -Feature: iot-jobs-data -Description: C++ SDK for the AWS iot-jobs-data service - -Feature: iot1click-devices -Description: C++ SDK for the AWS iot1click-devices service - -Feature: iot1click-projects -Description: C++ SDK for the AWS iot1click-projects service - -Feature: iotanalytics -Description: C++ SDK for the AWS iotanalytics service - -Feature: kafka -Description: C++ SDK for the AWS kafka service - -Feature: kinesis -Description: C++ SDK for the AWS kinesis service - -Feature: kinesis-video-archived-media -Description: C++ SDK for the AWS kinesis-video-archived-media service - -Feature: kinesis-video-media -Description: C++ SDK for the AWS kinesis-video-media service - -Feature: kinesisanalytics -Description: C++ SDK for the AWS kinesisanalytics service - -Feature: kinesisanalyticsv2 -Description: C++ SDK for the AWS kinesisanalyticsv2 service - -Feature: kinesisvideo -Description: C++ SDK for the AWS kinesisvideo service - -Feature: kms -Description: C++ SDK for the AWS kms service - -Feature: lambda -Description: C++ SDK for the AWS lambda service - -Feature: lex -Description: C++ SDK for the AWS lex service - -Feature: lex-models -Description: C++ SDK for the AWS lex-models service - -Feature: license-manager -Description: C++ SDK for the AWS license-manager service - -Feature: lightsail -Description: C++ SDK for the AWS lightsail service - -Feature: logs -Description: C++ SDK for the AWS logs service - -Feature: machinelearning -Description: C++ SDK for the AWS machinelearning service - -Feature: macie -Description: C++ SDK for the AWS macie service - -Feature: marketplace-entitlement -Description: C++ SDK for the AWS marketplace-entitlement service - -Feature: marketplacecommerceanalytics -Description: C++ SDK for the AWS marketplacecommerceanalytics service - -Feature: mediaconnect -Description: C++ SDK for the AWS mediaconnect service - -Feature: mediaconvert -Description: C++ SDK for the AWS mediaconvert service - -Feature: medialive -Description: C++ SDK for the AWS medialive service - -Feature: mediapackage -Description: C++ SDK for the AWS mediapackage service - -Feature: mediastore -Description: C++ SDK for the AWS mediastore service - -Feature: mediastore-data -Description: C++ SDK for the AWS mediastore-data service - -Feature: mediatailor -Description: C++ SDK for the AWS mediatailor service - -Feature: meteringmarketplace -Description: C++ SDK for the AWS meteringmarketplace service - -Feature: mobile -Description: C++ SDK for the AWS mobile service - -Feature: mobileanalytics -Description: C++ SDK for the AWS mobileanalytics service - -Feature: monitoring -Description: C++ SDK for the AWS monitoring service - -Feature: mq -Description: C++ SDK for the AWS mq service - -Feature: mturk-requester -Description: C++ SDK for the AWS mturk-requester service - -Feature: neptune -Description: C++ SDK for the AWS neptune service - -Feature: opsworks -Description: C++ SDK for the AWS opsworks service - -Feature: opsworkscm -Description: C++ SDK for the AWS opsworkscm service - -Feature: organizations -Description: C++ SDK for the AWS organizations service - -Feature: pi -Description: C++ SDK for the AWS pi service - -Feature: pinpoint -Description: C++ SDK for the AWS pinpoint service - -Feature: pinpoint-email -Description: C++ SDK for the AWS pinpoint-email service - -Feature: polly -Description: C++ SDK for the AWS polly service - -Feature: pricing -Description: C++ SDK for the AWS pricing service - -Feature: queues -Description: C++ SDK for the AWS queues service - -Feature: quicksight -Description: C++ SDK for the AWS quicksight service - -Feature: ram -Description: C++ SDK for the AWS ram service - -Feature: rds -Description: C++ SDK for the AWS rds service - -Feature: rds-data -Description: C++ SDK for the AWS rds-data service - -Feature: redshift -Description: C++ SDK for the AWS redshift service - -Feature: rekognition -Description: C++ SDK for the AWS rekognition service - -Feature: resource-groups -Description: C++ SDK for the AWS resource-groups service - -Feature: resourcegroupstaggingapi -Description: C++ SDK for the AWS resourcegroupstaggingapi service - -Feature: robomaker -Description: C++ SDK for the AWS robomaker service - -Feature: route53 -Description: C++ SDK for the AWS route53 service - -Feature: route53domains -Description: C++ SDK for the AWS route53domains service - -Feature: route53resolver -Description: C++ SDK for the AWS route53resolver service - -Feature: s3 -Description: C++ SDK for the AWS s3 service - -Feature: s3-encryption -Description: C++ SDK for the AWS s3-encryption service - -Feature: s3control -Description: C++ SDK for the AWS s3control service - -Feature: sagemaker -Description: C++ SDK for the AWS sagemaker service - -Feature: sagemaker-runtime -Description: C++ SDK for the AWS sagemaker-runtime service - -Feature: sdb -Description: C++ SDK for the AWS sdb service - -Feature: secretsmanager -Description: C++ SDK for the AWS secretsmanager service - -Feature: securityhub -Description: C++ SDK for the AWS securityhub service - -Feature: serverlessrepo -Description: C++ SDK for the AWS serverlessrepo service - -Feature: servicecatalog -Description: C++ SDK for the AWS servicecatalog service - -Feature: servicediscovery -Description: C++ SDK for the AWS servicediscovery service - -Feature: shield -Description: C++ SDK for the AWS shield service - -Feature: signer -Description: C++ SDK for the AWS signer service - -Feature: sms -Description: C++ SDK for the AWS sms service - -Feature: sms-voice -Description: C++ SDK for the AWS sms-voice service - -Feature: snowball -Description: C++ SDK for the AWS snowball service - -Feature: sns -Description: C++ SDK for the AWS sns service - -Feature: sqs -Description: C++ SDK for the AWS sqs service - -Feature: ssm -Description: C++ SDK for the AWS ssm service - -Feature: states -Description: C++ SDK for the AWS states service - -Feature: storagegateway -Description: C++ SDK for the AWS storagegateway service - -Feature: sts -Description: C++ SDK for the AWS sts service - -Feature: support -Description: C++ SDK for the AWS support service - -Feature: swf -Description: C++ SDK for the AWS swf service - -Feature: text-to-speech -Description: C++ SDK for the AWS text-to-speech service - -Feature: transcribe -Description: C++ SDK for the AWS transcribe service - -Feature: transfer -Description: C++ SDK for the AWS transfer service - -Feature: translate -Description: C++ SDK for the AWS translate service - -Feature: waf -Description: C++ SDK for the AWS waf service - -Feature: waf-regional -Description: C++ SDK for the AWS waf-regional service - -Feature: workdocs -Description: C++ SDK for the AWS workdocs service - -Feature: workmail -Description: C++ SDK for the AWS workmail service - -Feature: workspaces -Description: C++ SDK for the AWS workspaces service - -Feature: xray -Description: C++ SDK for the AWS xray service diff --git a/ports/aws-sdk-cpp/usage b/ports/aws-sdk-cpp/usage index 7f3176483522cf..13a822f1c0f4e2 100644 --- a/ports/aws-sdk-cpp/usage +++ b/ports/aws-sdk-cpp/usage @@ -1,5 +1,5 @@ The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED) - target_include_directories(main PRVATE ${AWSSDK_INCLUDE_DIRS}) + target_include_directories(main PRIVATE ${AWSSDK_INCLUDE_DIRS}) target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES}) diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json new file mode 100644 index 00000000000000..f1f9763cfc0639 --- /dev/null +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -0,0 +1,557 @@ +{ + "name": "aws-sdk-cpp", + "version": "1.8.126", + "port-version": 6, + "description": "AWS SDK for C++", + "homepage": "https://github.com/aws/aws-sdk-cpp", + "dependencies": [ + "aws-c-event-stream", + { + "name": "curl", + "platform": "!uwp & !windows" + }, + { + "name": "openssl", + "platform": "!uwp & !windows" + }, + "zlib" + ], + "default-features": [ + "dynamodb", + "kinesis", + "s3" + ], + "features": { + "access-management": { + "description": "C++ SDK for the AWS access-management service" + }, + "acm": { + "description": "C++ SDK for the AWS acm service" + }, + "acm-pca": { + "description": "C++ SDK for the AWS acm-pca service" + }, + "alexaforbusiness": { + "description": "C++ SDK for the AWS alexaforbusiness service" + }, + "amplify": { + "description": "C++ SDK for the AWS amplify service" + }, + "apigateway": { + "description": "C++ SDK for the AWS apigateway service" + }, + "apigatewaymanagementapi": { + "description": "C++ SDK for the AWS apigatewaymanagementapi service" + }, + "apigatewayv2": { + "description": "C++ SDK for the AWS apigatewayv2 service" + }, + "application-autoscaling": { + "description": "C++ SDK for the AWS application-autoscaling service" + }, + "appmesh": { + "description": "C++ SDK for the AWS appmesh service" + }, + "appstream": { + "description": "C++ SDK for the AWS appstream service" + }, + "appsync": { + "description": "C++ SDK for the AWS appsync service" + }, + "athena": { + "description": "C++ SDK for the AWS athena service" + }, + "autoscaling": { + "description": "C++ SDK for the AWS autoscaling service" + }, + "autoscaling-plans": { + "description": "C++ SDK for the AWS autoscaling-plans service" + }, + "awsmigrationhub": { + "description": "C++ SDK for the AWS AWSMigrationHub service" + }, + "awstransfer": { + "description": "C++ SDK for the AWS awstransfer service" + }, + "backup": { + "description": "C++ SDK for the AWS backup service" + }, + "batch": { + "description": "C++ SDK for the AWS batch service" + }, + "budgets": { + "description": "C++ SDK for the AWS budgets service" + }, + "ce": { + "description": "C++ SDK for the AWS ce service" + }, + "chime": { + "description": "C++ SDK for the AWS chime service" + }, + "cloud9": { + "description": "C++ SDK for the AWS cloud9 service" + }, + "clouddirectory": { + "description": "C++ SDK for the AWS clouddirectory service" + }, + "cloudformation": { + "description": "C++ SDK for the AWS cloudformation service" + }, + "cloudfront": { + "description": "C++ SDK for the AWS cloudfront service" + }, + "cloudhsm": { + "description": "C++ SDK for the AWS cloudhsm service" + }, + "cloudhsmv2": { + "description": "C++ SDK for the AWS cloudhsmv2 service" + }, + "cloudsearch": { + "description": "C++ SDK for the AWS cloudsearch service" + }, + "cloudsearchdomain": { + "description": "C++ SDK for the AWS cloudsearchdomain service" + }, + "cloudtrail": { + "description": "C++ SDK for the AWS cloudtrail service" + }, + "codebuild": { + "description": "C++ SDK for the AWS codebuild service" + }, + "codecommit": { + "description": "C++ SDK for the AWS codecommit service" + }, + "codedeploy": { + "description": "C++ SDK for the AWS codedeploy service" + }, + "codepipeline": { + "description": "C++ SDK for the AWS codepipeline service" + }, + "codestar": { + "description": "C++ SDK for the AWS codestar service" + }, + "cognito-identity": { + "description": "C++ SDK for the AWS cognito-identity service" + }, + "cognito-idp": { + "description": "C++ SDK for the AWS cognito-idp service" + }, + "cognito-sync": { + "description": "C++ SDK for the AWS cognito-sync service" + }, + "comprehend": { + "description": "C++ SDK for the AWS comprehend service" + }, + "comprehendmedical": { + "description": "C++ SDK for the AWS comprehendmedical service" + }, + "config": { + "description": "C++ SDK for the AWS config service" + }, + "connect": { + "description": "C++ SDK for the AWS connect service" + }, + "cur": { + "description": "C++ SDK for the AWS cur service" + }, + "datapipeline": { + "description": "C++ SDK for the AWS datapipeline service" + }, + "datasync": { + "description": "C++ SDK for the AWS datasync service" + }, + "dax": { + "description": "C++ SDK for the AWS dax service" + }, + "devicefarm": { + "description": "C++ SDK for the AWS devicefarm service" + }, + "directconnect": { + "description": "C++ SDK for the AWS directconnect service" + }, + "discovery": { + "description": "C++ SDK for the AWS discovery service" + }, + "dlm": { + "description": "C++ SDK for the AWS dlm service" + }, + "dms": { + "description": "C++ SDK for the AWS dms service" + }, + "docdb": { + "description": "C++ SDK for the AWS docdb service" + }, + "ds": { + "description": "C++ SDK for the AWS ds service" + }, + "dynamodb": { + "description": "C++ SDK for the AWS dynamodb service" + }, + "dynamodbstreams": { + "description": "C++ SDK for the AWS dynamodbstreams service" + }, + "ec2": { + "description": "C++ SDK for the AWS ec2 service" + }, + "ecr": { + "description": "C++ SDK for the AWS ecr service" + }, + "ecs": { + "description": "C++ SDK for the AWS ecs service" + }, + "eks": { + "description": "C++ SDK for the AWS eks service" + }, + "elasticache": { + "description": "C++ SDK for the AWS elasticache service" + }, + "elasticbeanstalk": { + "description": "C++ SDK for the AWS elasticbeanstalk service" + }, + "elasticfilesystem": { + "description": "C++ SDK for the AWS elasticfilesystem service" + }, + "elasticloadbalancing": { + "description": "C++ SDK for the AWS elasticloadbalancing service" + }, + "elasticloadbalancingv2": { + "description": "C++ SDK for the AWS elasticloadbalancingv2 service" + }, + "elasticmapreduce": { + "description": "C++ SDK for the AWS elasticmapreduce service" + }, + "elastictranscoder": { + "description": "C++ SDK for the AWS elastictranscoder service" + }, + "email": { + "description": "C++ SDK for the AWS email service" + }, + "es": { + "description": "C++ SDK for the AWS es service" + }, + "events": { + "description": "C++ SDK for the AWS events service" + }, + "firehose": { + "description": "C++ SDK for the AWS firehose service" + }, + "fms": { + "description": "C++ SDK for the AWS fms service" + }, + "fsx": { + "description": "C++ SDK for the AWS fsx service" + }, + "gamelift": { + "description": "C++ SDK for the AWS gamelift service" + }, + "glacier": { + "description": "C++ SDK for the AWS glacier service" + }, + "globalaccelerator": { + "description": "C++ SDK for the AWS globalaccelerator service" + }, + "glue": { + "description": "C++ SDK for the AWS glue service" + }, + "greengrass": { + "description": "C++ SDK for the AWS greengrass service" + }, + "guardduty": { + "description": "C++ SDK for the AWS guardduty service" + }, + "health": { + "description": "C++ SDK for the AWS health service" + }, + "iam": { + "description": "C++ SDK for the AWS iam service" + }, + "identity-management": { + "description": "C++ SDK for the AWS identity-management service" + }, + "importexport": { + "description": "C++ SDK for the AWS importexport service" + }, + "inspector": { + "description": "C++ SDK for the AWS inspector service" + }, + "iot": { + "description": "C++ SDK for the AWS iot service" + }, + "iot-data": { + "description": "C++ SDK for the AWS iot-data service" + }, + "iot-jobs-data": { + "description": "C++ SDK for the AWS iot-jobs-data service" + }, + "iot1click-devices": { + "description": "C++ SDK for the AWS iot1click-devices service" + }, + "iot1click-projects": { + "description": "C++ SDK for the AWS iot1click-projects service" + }, + "iotanalytics": { + "description": "C++ SDK for the AWS iotanalytics service" + }, + "kafka": { + "description": "C++ SDK for the AWS kafka service" + }, + "kinesis": { + "description": "C++ SDK for the AWS kinesis service" + }, + "kinesis-video-archived-media": { + "description": "C++ SDK for the AWS kinesis-video-archived-media service" + }, + "kinesis-video-media": { + "description": "C++ SDK for the AWS kinesis-video-media service" + }, + "kinesisanalytics": { + "description": "C++ SDK for the AWS kinesisanalytics service" + }, + "kinesisanalyticsv2": { + "description": "C++ SDK for the AWS kinesisanalyticsv2 service" + }, + "kinesisvideo": { + "description": "C++ SDK for the AWS kinesisvideo service" + }, + "kms": { + "description": "C++ SDK for the AWS kms service" + }, + "lambda": { + "description": "C++ SDK for the AWS lambda service" + }, + "lex": { + "description": "C++ SDK for the AWS lex service" + }, + "lex-models": { + "description": "C++ SDK for the AWS lex-models service" + }, + "license-manager": { + "description": "C++ SDK for the AWS license-manager service" + }, + "lightsail": { + "description": "C++ SDK for the AWS lightsail service" + }, + "logs": { + "description": "C++ SDK for the AWS logs service" + }, + "machinelearning": { + "description": "C++ SDK for the AWS machinelearning service" + }, + "macie": { + "description": "C++ SDK for the AWS macie service" + }, + "marketplace-entitlement": { + "description": "C++ SDK for the AWS marketplace-entitlement service" + }, + "marketplacecommerceanalytics": { + "description": "C++ SDK for the AWS marketplacecommerceanalytics service" + }, + "mediaconnect": { + "description": "C++ SDK for the AWS mediaconnect service" + }, + "mediaconvert": { + "description": "C++ SDK for the AWS mediaconvert service" + }, + "medialive": { + "description": "C++ SDK for the AWS medialive service" + }, + "mediapackage": { + "description": "C++ SDK for the AWS mediapackage service" + }, + "mediastore": { + "description": "C++ SDK for the AWS mediastore service" + }, + "mediastore-data": { + "description": "C++ SDK for the AWS mediastore-data service" + }, + "mediatailor": { + "description": "C++ SDK for the AWS mediatailor service" + }, + "meteringmarketplace": { + "description": "C++ SDK for the AWS meteringmarketplace service" + }, + "mobile": { + "description": "C++ SDK for the AWS mobile service" + }, + "mobileanalytics": { + "description": "C++ SDK for the AWS mobileanalytics service" + }, + "monitoring": { + "description": "C++ SDK for the AWS monitoring service" + }, + "mq": { + "description": "C++ SDK for the AWS mq service" + }, + "mturk-requester": { + "description": "C++ SDK for the AWS mturk-requester service" + }, + "neptune": { + "description": "C++ SDK for the AWS neptune service" + }, + "opsworks": { + "description": "C++ SDK for the AWS opsworks service" + }, + "opsworkscm": { + "description": "C++ SDK for the AWS opsworkscm service" + }, + "organizations": { + "description": "C++ SDK for the AWS organizations service" + }, + "pi": { + "description": "C++ SDK for the AWS pi service" + }, + "pinpoint": { + "description": "C++ SDK for the AWS pinpoint service" + }, + "pinpoint-email": { + "description": "C++ SDK for the AWS pinpoint-email service" + }, + "polly": { + "description": "C++ SDK for the AWS polly service" + }, + "pricing": { + "description": "C++ SDK for the AWS pricing service" + }, + "queues": { + "description": "C++ SDK for the AWS queues service" + }, + "quicksight": { + "description": "C++ SDK for the AWS quicksight service" + }, + "ram": { + "description": "C++ SDK for the AWS ram service" + }, + "rds": { + "description": "C++ SDK for the AWS rds service" + }, + "rds-data": { + "description": "C++ SDK for the AWS rds-data service" + }, + "redshift": { + "description": "C++ SDK for the AWS redshift service" + }, + "rekognition": { + "description": "C++ SDK for the AWS rekognition service" + }, + "resource-groups": { + "description": "C++ SDK for the AWS resource-groups service" + }, + "resourcegroupstaggingapi": { + "description": "C++ SDK for the AWS resourcegroupstaggingapi service" + }, + "robomaker": { + "description": "C++ SDK for the AWS robomaker service" + }, + "route53": { + "description": "C++ SDK for the AWS route53 service" + }, + "route53domains": { + "description": "C++ SDK for the AWS route53domains service" + }, + "route53resolver": { + "description": "C++ SDK for the AWS route53resolver service" + }, + "s3": { + "description": "C++ SDK for the AWS s3 service" + }, + "s3-encryption": { + "description": "C++ SDK for the AWS s3-encryption service" + }, + "s3control": { + "description": "C++ SDK for the AWS s3control service" + }, + "sagemaker": { + "description": "C++ SDK for the AWS sagemaker service" + }, + "sagemaker-runtime": { + "description": "C++ SDK for the AWS sagemaker-runtime service" + }, + "sdb": { + "description": "C++ SDK for the AWS sdb service" + }, + "secretsmanager": { + "description": "C++ SDK for the AWS secretsmanager service" + }, + "securityhub": { + "description": "C++ SDK for the AWS securityhub service" + }, + "serverlessrepo": { + "description": "C++ SDK for the AWS serverlessrepo service" + }, + "servicecatalog": { + "description": "C++ SDK for the AWS servicecatalog service" + }, + "servicediscovery": { + "description": "C++ SDK for the AWS servicediscovery service" + }, + "shield": { + "description": "C++ SDK for the AWS shield service" + }, + "signer": { + "description": "C++ SDK for the AWS signer service" + }, + "sms": { + "description": "C++ SDK for the AWS sms service" + }, + "sms-voice": { + "description": "C++ SDK for the AWS sms-voice service" + }, + "snowball": { + "description": "C++ SDK for the AWS snowball service" + }, + "sns": { + "description": "C++ SDK for the AWS sns service" + }, + "sqs": { + "description": "C++ SDK for the AWS sqs service" + }, + "ssm": { + "description": "C++ SDK for the AWS ssm service" + }, + "states": { + "description": "C++ SDK for the AWS states service" + }, + "storagegateway": { + "description": "C++ SDK for the AWS storagegateway service" + }, + "sts": { + "description": "C++ SDK for the AWS sts service" + }, + "support": { + "description": "C++ SDK for the AWS support service" + }, + "swf": { + "description": "C++ SDK for the AWS swf service" + }, + "text-to-speech": { + "description": "C++ SDK for the AWS text-to-speech service" + }, + "transcribe": { + "description": "C++ SDK for the AWS transcribe service" + }, + "transfer": { + "description": "C++ SDK for the AWS transfer service" + }, + "translate": { + "description": "C++ SDK for the AWS translate service" + }, + "waf": { + "description": "C++ SDK for the AWS waf service" + }, + "waf-regional": { + "description": "C++ SDK for the AWS waf-regional service" + }, + "workdocs": { + "description": "C++ SDK for the AWS workdocs service" + }, + "workmail": { + "description": "C++ SDK for the AWS workmail service" + }, + "workspaces": { + "description": "C++ SDK for the AWS workspaces service" + }, + "xray": { + "description": "C++ SDK for the AWS xray service" + } + } +} diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 91b3621492fc57..8077f6434a28ee 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "011de9c924af9f41faddda1a6bc2bf080eee6679", + "version": "1.8.126", + "port-version": 6 + }, { "git-tree": "1091bd9bd625aab8f19bc9d32499bd888788c613", "version-string": "1.8.126", diff --git a/versions/baseline.json b/versions/baseline.json index f45c801d233d49..ca9b3fada78baf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -234,7 +234,7 @@ }, "aws-sdk-cpp": { "baseline": "1.8.126", - "port-version": 5 + "port-version": 6 }, "azmq": { "baseline": "2020-03-03", From 6ed4a10124a079dfbe521e064c97703f79fafa5b Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Sat, 23 Jan 2021 02:27:34 +0800 Subject: [PATCH 0549/1694] [vcpkg baseline] [mesa] Fix conflicts with angle (#15729) * [mesa] Remove libs conflicted with angle * Update port_versions check * Use gles-lib-suffix to avoid conflicts with angle * [mesa] Remove libs conflicted with angle * Update port_versions check * Use gles-lib-suffix to avoid conflicts with angle * Update port_versions/m-/mesa.json * Update ports/mesa/portfile.cmake * Update space and versions * Update versions/m-/mesa.json --- ports/mesa/CONTROL | 1 + ports/mesa/portfile.cmake | 2 +- versions/baseline.json | 2 +- versions/m-/mesa.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/mesa/CONTROL b/ports/mesa/CONTROL index c29d91e31869a4..8ad3e5474f40e4 100644 --- a/ports/mesa/CONTROL +++ b/ports/mesa/CONTROL @@ -1,5 +1,6 @@ Source: mesa Version: 20.2.2 +Port-Version: 1 Homepage: https://www.mesa3d.org/ Description: Mesa - The 3D Graphics Library Build-Depends: zlib, zstd, tool-meson diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 17e43d2c61be14..9461dc2c598740 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -168,7 +168,7 @@ endif() vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - #-D gles-lib-suffix=_mesa + -Dgles-lib-suffix=_mesa #-D egl-lib-suffix=_mesa -Dbuild-tests=false ${MESA_OPTIONS} diff --git a/versions/baseline.json b/versions/baseline.json index ca9b3fada78baf..45975822275889 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3678,7 +3678,7 @@ }, "mesa": { "baseline": "20.2.2", - "port-version": 0 + "port-version": 1 }, "meschach": { "baseline": "1.2b-3", diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index a4b44389104f6b..b28bb72de859e0 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2966b4bb6816c1fa46e65c61f4cb30efb5c8381a", + "version-string": "20.2.2", + "port-version": 1 + }, { "git-tree": "9b75570d3f7a9cb58ff7c7c8479bbfb7e745d0d2", "version-string": "20.2.2", From 316c9d7e7aa234ab1e823ad3dfcc74546d402baf Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Fri, 22 Jan 2021 19:28:34 +0100 Subject: [PATCH 0550/1694] [sentry-native] Update to 0.4.5 (#15790) Signed-off-by: Vitalii Koshura --- ports/sentry-native/CONTROL | 3 +-- ports/sentry-native/portfile.cmake | 6 +++--- versions/baseline.json | 4 ++-- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/sentry-native/CONTROL b/ports/sentry-native/CONTROL index 404da1cdd1ad83..6618862603005a 100644 --- a/ports/sentry-native/CONTROL +++ b/ports/sentry-native/CONTROL @@ -1,6 +1,5 @@ Source: sentry-native -Version: 0.4.4 -Port-Version: 1 +Version: 0.4.5 Homepage: https://sentry.io/ Description: Sentry SDK for C, C++ and native applications. Build-Depends: curl (!windows) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 63eda4d3d4ea3d..6fba51e62b66e5 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.4/sentry-native.zip" - FILENAME "sentry-native-0.4.4.zip" - SHA512 2f714343d07328e287113323937fa9045ebb03e1cd95ee18f9dd63ca7b54eba89c7184122e3ad3640e6b4de27f9a619bca6089d6a49a018225fbd93dab446b2d + URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.5/sentry-native.zip" + FILENAME "sentry-native-0.4.5.zip" + SHA512 5bbc58ab2c038d32049b12302f69270d54097092d97fb73d3cf717ad83e639082de75895f7c5244040775d874965d71480f1736b2b7b19579d9226a51aaf0017 ) vcpkg_extract_source_archive_ex( diff --git a/versions/baseline.json b/versions/baseline.json index 45975822275889..a932781ef23ef2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5237,8 +5237,8 @@ "port-version": 0 }, "sentry-native": { - "baseline": "0.4.4", - "port-version": 1 + "baseline": "0.4.5", + "port-version": 0 }, "septag-sx": { "baseline": "2019-05-07-2", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 2af81af9206b5d..d913cbf6a7063d 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12609c0d641d756b3c3f3170c1a019c662f903fb", + "version-string": "0.4.5", + "port-version": 0 + }, { "git-tree": "9d2965fd3424545a9f822802de092c6e514080b9", "version-string": "0.4.4", From ec43cfb9aade376fa4b0fe3805bdf3b0e54e5050 Mon Sep 17 00:00:00 2001 From: evpobr Date: Fri, 22 Jan 2021 23:29:41 +0500 Subject: [PATCH 0551/1694] [libsamplerate] Upgrade to 0.2.0 (#15797) * [libsamplerate] Upgrade to 0.2.0 * Add missiong OPTIONS * Use share/${PORT} instead of share/libsamplerate * Remove SYSTEM_LIBRARIES m argument Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update version * Update version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/libsamplerate/CMakeLists.txt | 14 ------- .../Use-the-lrintf-intrinsic.patch | 39 ------------------- ports/libsamplerate/portfile.cmake | 19 +++++---- ports/libsamplerate/vcpkg.json | 5 +-- versions/baseline.json | 4 +- versions/l-/libsamplerate.json | 5 +++ 6 files changed, 20 insertions(+), 66 deletions(-) delete mode 100644 ports/libsamplerate/CMakeLists.txt delete mode 100644 ports/libsamplerate/Use-the-lrintf-intrinsic.patch diff --git a/ports/libsamplerate/CMakeLists.txt b/ports/libsamplerate/CMakeLists.txt deleted file mode 100644 index 44ba2277aa50ad..00000000000000 --- a/ports/libsamplerate/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -add_library(libsamplerate-0 - samplerate.c - src_sinc.c - src_zoh.c - src_linear.c - ../Win32/libsamplerate-0.def -) - -install(TARGETS libsamplerate-0 - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) - -install(FILES samplerate.h DESTINATION include) diff --git a/ports/libsamplerate/Use-the-lrintf-intrinsic.patch b/ports/libsamplerate/Use-the-lrintf-intrinsic.patch deleted file mode 100644 index cf69b0d4619591..00000000000000 --- a/ports/libsamplerate/Use-the-lrintf-intrinsic.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/float_cast.h b/src/float_cast.h -index 0318427..8499e69 100644 ---- a/src/float_cast.h -+++ b/src/float_cast.h -@@ -117,6 +117,9 @@ - ** most likely both WIN32 and WIN64 will be defined in 64-bit case. - */ - -+/* MSVC pre 16.8 do not have lrintf */ -+#if defined(_MSC_VER) && _MSC_VER < 1928 -+ - #include - - /* Win64 doesn't seem to have these functions, nor inline assembly. -@@ -136,12 +139,16 @@ - { - return _mm_cvtss_si32(_mm_load_ss(&flt)); - } -+#endif - - #elif (defined (WIN32) || defined (_WIN32)) - - #undef HAVE_LRINT_REPLACEMENT - #define HAVE_LRINT_REPLACEMENT 1 - -+/* MSVC pre 16.8 do not have lrintf */ -+#if defined(_MSC_VER) && _MSC_VER < 1928 -+ - #include - - /* -@@ -172,6 +179,7 @@ - - return intgr ; - } -+#endif - - #elif (defined (__MWERKS__) && defined (macintosh)) - diff --git a/ports/libsamplerate/portfile.cmake b/ports/libsamplerate/portfile.cmake index 25a0d6a3b663a3..1085ef269ae1e8 100644 --- a/ports/libsamplerate/portfile.cmake +++ b/ports/libsamplerate/portfile.cmake @@ -1,24 +1,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsndfile/libsamplerate - REF f6730d03c3e7660bb6ecad8816f1b09c5825142a # v0.1.9 - SHA512 6a349c9144d024212fc78dc0d9e39bdc1a43abaf590fcfbf84396af22834545962d5ef10176b48b21fcae2ce62d12277b682059383805d059f4dd2b9f6708478 + REF 0.2.0 + SHA512 6a12506ad391a557fcc354c7bb5767ae71349da26bf31753b806a36449cfc879ef97e4d25adab5722a9540ec1539203c6155b4581e42bdb8b6708dca1f089d11 HEAD_REF master - PATCHES Use-the-lrintf-intrinsic.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/src) -file(COPY ${SOURCE_PATH}/Win32/config.h DESTINATION ${SOURCE_PATH}/src) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/src + SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF + -DLIBSAMPLERATE_EXAMPLES=OFF ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SampleRate TARGET_PATH share/SampleRate) +vcpkg_fixup_pkgconfig() + 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/libsamplerate RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/libsamplerate/vcpkg.json b/ports/libsamplerate/vcpkg.json index 295d4ef5e43ac1..6b4bd48fe8a869 100644 --- a/ports/libsamplerate/vcpkg.json +++ b/ports/libsamplerate/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libsamplerate", - "version-string": "0.1.9.0", - "port-version": 3, + "version-string": "0.2.0", "description": "Sample Rate Converter for audio", - "homepage": "https://www.mega-nerd.com/SRC" + "homepage": "http://libsndfile.github.io/libsamplerate/" } diff --git a/versions/baseline.json b/versions/baseline.json index a932781ef23ef2..4ed65a246420ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3289,8 +3289,8 @@ "port-version": 0 }, "libsamplerate": { - "baseline": "0.1.9.0", - "port-version": 3 + "baseline": "0.2.0", + "port-version": 0 }, "libsass": { "baseline": "3.6.4", diff --git a/versions/l-/libsamplerate.json b/versions/l-/libsamplerate.json index 2456512f6dc855..09d9618d7df6c9 100644 --- a/versions/l-/libsamplerate.json +++ b/versions/l-/libsamplerate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5247f6ff1ca88bae029dc84a18a5a6333e561a85", + "version-string": "0.2.0", + "port-version": 0 + }, { "git-tree": "ec1fec464998f298385bf9afe0ac63cdbc8adda2", "version-string": "0.1.9.0", From 2c3dac5d663a28aab62a4b9e2fd81beceb65f6f2 Mon Sep 17 00:00:00 2001 From: Andrei Lebedev Date: Fri, 22 Jan 2021 19:37:26 +0100 Subject: [PATCH 0552/1694] [vcpkg,boost-modular-build-helper] initial ppc64le community support (#15572) * [vcpkg] initial ppc64le community support Signed-off-by: Andrei Lebedev * [boost-modular-build-helper] ppc64le support Signed-off-by: Andrei Lebedev * Merge from master Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: dan-shaw <51385773+dan-shaw@users.noreply.github.com> Co-authored-by: Nicole Mazzuca --- ports/boost-modular-build-helper/CMakeLists.txt | 2 ++ ports/boost-modular-build-helper/boost-modular-build.cmake | 2 ++ ports/boost-modular-build-helper/vcpkg.json | 2 +- scripts/bootstrap.sh | 4 ++-- scripts/buildsystems/vcpkg.cmake | 2 ++ toolsrc/include/vcpkg/base/system.h | 1 + toolsrc/src/vcpkg.cpp | 7 +++++-- toolsrc/src/vcpkg/base/system.cpp | 7 ++++++- toolsrc/src/vcpkg/triplet.cpp | 7 +++++++ triplets/community/ppc64le-linux.cmake | 5 +++++ versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 12 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 triplets/community/ppc64le-linux.cmake diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index ce33c0f4a25261..d868b5ac82717f 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -39,6 +39,8 @@ if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "s390x") list(APPEND B2_OPTIONS architecture=s390x) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") list(APPEND B2_OPTIONS architecture=arm) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "ppc64le") + list(APPEND B2_OPTIONS architecture=power) else() list(APPEND B2_OPTIONS architecture=x86) endif() diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 481dfd5108670c..09daaeea3c4b66 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -303,6 +303,8 @@ function(boost_modular_build) list(APPEND B2_OPTIONS address-model=64 architecture=arm) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "s390x") list(APPEND B2_OPTIONS address-model=64 architecture=s390x) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "ppc64le") + list(APPEND B2_OPTIONS address-model=64 architecture=power) else() list(APPEND B2_OPTIONS address-model=32 architecture=x86) endif() diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 3ae62630e50b0b..bc96cdaef58032 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version-string": "1.75.0", - "port-version": 2, + "port-version": 3, "dependencies": [ "boost-uninstall" ] diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index ba76f4f6321529..b7d889f9ec9658 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -240,8 +240,8 @@ selectCXX() UNAME="$(uname)" ARCH="$(uname -m)" -# Force using system utilities for building vcpkg if host arch is arm, arm64, or s390x. -if [ "$ARCH" = "armv7l" -o "$ARCH" = "aarch64" -o "$ARCH" = "s390x" ]; then +# Force using system utilities for building vcpkg if host arch is arm, arm64, s390x, or ppc64le. +if [ "$ARCH" = "armv7l" -o "$ARCH" = "aarch64" -o "$ARCH" = "s390x" -o "$ARCH" = "ppc64le" ]; then vcpkgUseSystem=true fi diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index e13c3333b285d3..2969209399cba4 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -198,6 +198,8 @@ else() set(_VCPKG_TARGET_TRIPLET_ARCH x64) elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "s390x") set(_VCPKG_TARGET_TRIPLET_ARCH s390x) + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ppc64le") + set(_VCPKG_TARGET_TRIPLET_ARCH ppc64le) elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "armv7l") set(_VCPKG_TARGET_TRIPLET_ARCH arm) elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64") diff --git a/toolsrc/include/vcpkg/base/system.h b/toolsrc/include/vcpkg/base/system.h index da14fa4bbc62c2..992533eb5ffa18 100644 --- a/toolsrc/include/vcpkg/base/system.h +++ b/toolsrc/include/vcpkg/base/system.h @@ -29,6 +29,7 @@ namespace vcpkg::System ARM, ARM64, S390X, + PPC64LE, }; Optional to_cpu_architecture(StringView arch); diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index 250bca52a1137e..ccc951f101e82a 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -210,13 +210,16 @@ int main(const int argc, const char* const* const argv) load_config(fs); -#if (defined(__aarch64__) || defined(__arm__) || defined(__s390x__) || defined(_M_ARM) || defined(_M_ARM64)) && \ +#if (defined(__aarch64__) || defined(__arm__) || defined(__s390x__) || \ + ((defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || defined(__PPC64LE__)) && \ + defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) || \ + defined(_M_ARM) || defined(_M_ARM64)) && \ !defined(_WIN32) && !defined(__APPLE__) if (!System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value()) { Checks::exit_with_message( VCPKG_LINE_INFO, - "Environment variable VCPKG_FORCE_SYSTEM_BINARIES must be set on arm and s390x platforms."); + "Environment variable VCPKG_FORCE_SYSTEM_BINARIES must be set on arm, s390x, and ppc64le platforms."); } #endif diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp index 687f6fa9c81cbd..b18a41e6d7353f 100644 --- a/toolsrc/src/vcpkg/base/system.cpp +++ b/toolsrc/src/vcpkg/base/system.cpp @@ -27,6 +27,7 @@ namespace vcpkg if (Strings::case_insensitive_ascii_equals(arch, "arm")) return CPUArchitecture::ARM; if (Strings::case_insensitive_ascii_equals(arch, "arm64")) return CPUArchitecture::ARM64; if (Strings::case_insensitive_ascii_equals(arch, "s390x")) return CPUArchitecture::S390X; + if (Strings::case_insensitive_ascii_equals(arch, "ppc64le")) return CPUArchitecture::PPC64LE; return nullopt; } @@ -39,7 +40,8 @@ namespace vcpkg case CPUArchitecture::ARM: return "arm"; case CPUArchitecture::ARM64: return "arm64"; case CPUArchitecture::S390X: return "s390x"; - default: Checks::unreachable(VCPKG_LINE_INFO); + case CPUArchitecture::PPC64LE: return "ppc64le"; + default: Checks::exit_with_message(VCPKG_LINE_INFO, "unexpected vcpkg::System::CPUArchitecture"); } } @@ -62,6 +64,9 @@ namespace vcpkg return CPUArchitecture::ARM64; #elif defined(__s390x__) return CPUArchitecture::S390X; +#elif (defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || defined(__PPC64LE__)) && \ + defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) + return CPUArchitecture::PPC64LE; #else // choose architecture #error "Unknown host architecture" #endif // choose architecture diff --git a/toolsrc/src/vcpkg/triplet.cpp b/toolsrc/src/vcpkg/triplet.cpp index dbb82e3c87ec55..e69f75b112095e 100644 --- a/toolsrc/src/vcpkg/triplet.cpp +++ b/toolsrc/src/vcpkg/triplet.cpp @@ -65,6 +65,10 @@ namespace vcpkg { return CPUArchitecture::S390X; } + if (Strings::starts_with(this->canonical_name(), "ppc64le-")) + { + return CPUArchitecture::PPC64LE; + } return nullopt; } @@ -99,6 +103,9 @@ namespace vcpkg return Triplet::from_canonical_name("arm-linux"); #elif defined(__s390x__) return Triplet::from_canonical_name("s390x-linux"); +#elif (defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || defined(__PPC64LE__)) && \ + defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) + return Triplet::from_canonical_name("ppc64le-linux"); #else return Triplet::from_canonical_name("x64-linux"); #endif diff --git a/triplets/community/ppc64le-linux.cmake b/triplets/community/ppc64le-linux.cmake new file mode 100644 index 00000000000000..70fa5b44c4dfa3 --- /dev/null +++ b/triplets/community/ppc64le-linux.cmake @@ -0,0 +1,5 @@ +set(VCPKG_TARGET_ARCHITECTURE ppc64le) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index f0353be18a9054..52819f68118c6a 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39acb181b681e8ac20ff594d3ac1782bfbb37ba2", + "version-string": "1.75.0", + "port-version": 3 + }, { "git-tree": "1b4dda192c485153b97512519e48a06202fd6930", "version-string": "1.75.0", diff --git a/versions/baseline.json b/versions/baseline.json index 4ed65a246420ac..d09baa59e0c8a1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -674,7 +674,7 @@ }, "boost-modular-build-helper": { "baseline": "1.75.0", - "port-version": 2 + "port-version": 3 }, "boost-move": { "baseline": "1.75.0", From 43e2216f81a26b1ab42f36938408489ad48ff4f1 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Sat, 23 Jan 2021 02:40:01 +0800 Subject: [PATCH 0553/1694] [poppler] Disable clang-format check (#15727) * [poppler] Disable clang-format check * Update port_version check * Add CLANG program * Add clang-format program * Update clang-format and add it to azure-pipelines/linux/provision-image.sh * Update ports/poppler/portfile.cmake * Revert the changes for clang-format --- ports/poppler/0004-disable-clang-format.patch | 12 ++++++++++++ ports/poppler/portfile.cmake | 1 + ports/poppler/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/poppler.json | 5 +++++ 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 ports/poppler/0004-disable-clang-format.patch diff --git a/ports/poppler/0004-disable-clang-format.patch b/ports/poppler/0004-disable-clang-format.patch new file mode 100644 index 00000000000000..43a48da787bd5e --- /dev/null +++ b/ports/poppler/0004-disable-clang-format.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b04be7..947d5be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -532,7 +532,6 @@ if (GPERF AND RUN_GPERF_IF_PRESENT) + add_custom_command(OUTPUT poppler/${input}.c + COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_BINARY_DIR}/poppler/${input}.c + COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c +- COMMAND clang-format -i ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c || true + DEPENDS poppler/${input}.gperf + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + diff --git a/ports/poppler/portfile.cmake b/ports/poppler/portfile.cmake index 4d5b58dee75c07..77ebf431ca12da 100644 --- a/ports/poppler/portfile.cmake +++ b/ports/poppler/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( 0001-remove-CMAKE_CXX_STANDARD.patch 0002-remove-test-subdirectory.patch 0003-fix-gperf-not-recognized.patch + 0004-disable-clang-format.patch ) vcpkg_find_acquire_program(GPERF) diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json index 788c88abc9d5c5..b9af520839f992 100644 --- a/ports/poppler/vcpkg.json +++ b/ports/poppler/vcpkg.json @@ -1,7 +1,7 @@ { "name": "poppler", "version-string": "20.12.1", - "port-version": 2, + "port-version": 3, "description": "a PDF rendering library", "homepage": "https://poppler.freedesktop.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d09baa59e0c8a1..08205525836755 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4602,7 +4602,7 @@ }, "poppler": { "baseline": "20.12.1", - "port-version": 2 + "port-version": 3 }, "portable-snippets": { "baseline": "2019-09-20", diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index b6de22558db717..e961e39267d9be 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6d078aca2d1c5803ddd287701692b891856c3fd", + "version-string": "20.12.1", + "port-version": 3 + }, { "git-tree": "acfc09df4e386e910884ee45b13e79c7ecb23d29", "version-string": "20.12.1", From 77af32593ea6b47eb2dc9334a08f5f0b58ef32d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 22 Jan 2021 10:45:08 -0800 Subject: [PATCH 0554/1694] [msys2] Update msys components pkgconfig url (#15732) * [pkgconfig] Update msys components pkgconfig url * update hash --- scripts/cmake/vcpkg_acquire_msys.cmake | 4 ++-- scripts/cmake/vcpkg_find_acquire_program.cmake | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 9b15a76c72e2ff..552269278dcaaf 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -291,8 +291,8 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) DEPS gcc-libs ) msys_package( - URL "https://repo.msys2.org/msys/x86_64/pkg-config-0.29.2-1-x86_64.pkg.tar.xz" - SHA512 f1d70f0b4ebcfeb3fa2156a7a4f7b0b404795853e05361de14054dc6658a6154915bb982626cbfe76bef0828325f993f30da6817361ca8d7ea440a40023fa864 + URL "https://repo.msys2.org/msys/x86_64/pkg-config-0.29.2-4-x86_64.pkg.tar.zst" + SHA512 9f72c81d8095ca1c341998bc80788f7ce125770ec4252f1eb6445b9cba74db5614caf9a6cc7c0fcc2ac18d4a0f972c49b9f245c3c9c8e588126be6c72a8c1818 DEPS libiconv ) msys_package( diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index e3679c80a91fde..96b59c5c65f7c3 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -441,14 +441,14 @@ function(vcpkg_find_acquire_program VAR) set(VERSION_CMD --version) elseif(CMAKE_HOST_WIN32) if(NOT EXISTS "${PKGCONFIG}") - set(VERSION 0.29.2-1) + set(VERSION 0.29.2-2) set(LIBWINPTHREAD_VERSION git-8.0.0.5906.c9a21571-1) vcpkg_acquire_msys( PKGCONFIG_ROOT NO_DEFAULT_PACKAGES DIRECT_PACKAGES - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-${VERSION}-any.pkg.tar.xz" - 3b1b706a24d9aef7bbdf3ce4427aaa813ba6fbd292ed9dda181b4300e117c3d59a159ddcca8b013fd01ce76da2d95d590314ff9628c0d68a6966bac4842540f0 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-${VERSION}-any.pkg.tar.zst" + 54f8dad3b1a36a4515db47825a3214fbd2bd82f604aec72e7fb8d79068095fda3c836fb2296acd308522d6e12ce15f69e0c26dcf4eb0681fd105d057d912cdb7 "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-${LIBWINPTHREAD_VERSION}-any.pkg.tar.zst" 2c3d9e6b2eee6a4c16fd69ddfadb6e2dc7f31156627d85845c523ac85e5c585d4cfa978659b1fe2ec823d44ef57bc2b92a6127618ff1a8d7505458b794f3f01c ) From 9261263c3aafdf6c12d61d1d9454c47ad2da5549 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 22 Jan 2021 11:10:27 -0800 Subject: [PATCH 0555/1694] Restore x-upload-metrics command accidentally disabled by removing VCPKG_DISABLE_METRICS (#15810) * Restore x-upload-metrics command accidentally disabled by removing VCPKG_DISABLE_METRICS in https://github.com/microsoft/vcpkg/pull/15470 * Didn't save a file. --- toolsrc/src/vcpkg-test/commands.cpp | 4 ++-- toolsrc/src/vcpkg/commands.cpp | 8 ++++---- toolsrc/src/vcpkg/commands.upload-metrics.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/toolsrc/src/vcpkg-test/commands.cpp b/toolsrc/src/vcpkg-test/commands.cpp index e417505ad1cef8..1a582beb31a895 100644 --- a/toolsrc/src/vcpkg-test/commands.cpp +++ b/toolsrc/src/vcpkg-test/commands.cpp @@ -32,9 +32,9 @@ TEST_CASE ("get_available_basic_commands works", "[commands]") check_all_commands(Commands::get_available_basic_commands(), { "contact", "version", -#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND +#if defined(_WIN32) "x-upload-metrics", -#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND +#endif // defined(_WIN32) }); } diff --git a/toolsrc/src/vcpkg/commands.cpp b/toolsrc/src/vcpkg/commands.cpp index 19b5bdcde98003..386aedf5815c65 100644 --- a/toolsrc/src/vcpkg/commands.cpp +++ b/toolsrc/src/vcpkg/commands.cpp @@ -41,16 +41,16 @@ namespace vcpkg::Commands { static const Version::VersionCommand version{}; static const Contact::ContactCommand contact{}; -#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND +#if defined(_WIN32) static const UploadMetrics::UploadMetricsCommand upload_metrics{}; -#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND +#endif // defined(_WIN32) static std::vector> t = { {"version", &version}, {"contact", &contact}, -#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND +#if defined(_WIN32) {"x-upload-metrics", &upload_metrics}, -#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND +#endif // defined(_WIN32) }; return t; } diff --git a/toolsrc/src/vcpkg/commands.upload-metrics.cpp b/toolsrc/src/vcpkg/commands.upload-metrics.cpp index 6ac7cfcb6a0637..acf5a53774eeb7 100644 --- a/toolsrc/src/vcpkg/commands.upload-metrics.cpp +++ b/toolsrc/src/vcpkg/commands.upload-metrics.cpp @@ -1,6 +1,6 @@ #include -#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND +#if defined(_WIN32) #include #include @@ -26,4 +26,4 @@ namespace vcpkg::Commands::UploadMetrics Checks::exit_success(VCPKG_LINE_INFO); } } -#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND +#endif // defined(_WIN32) From d58c78eece58ec26a066e0bd43a6d8a329e5084a Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 22 Jan 2021 21:08:50 +0100 Subject: [PATCH 0556/1694] [darknet] update to latest version (#15770) * [darknet] update to latest version * update version refs * [darknet] update to latest version * update version refs Co-authored-by: NancyLi1013 --- ...ame-_castu32_f32-to-gemm_castu32_f32.patch | 26 ------------------- ports/darknet/CONTROL | 3 +-- ports/darknet/portfile.cmake | 10 +++---- versions/baseline.json | 4 +-- versions/d-/darknet.json | 5 ++++ 5 files changed, 12 insertions(+), 36 deletions(-) delete mode 100644 ports/darknet/0001-rename-_castu32_f32-to-gemm_castu32_f32.patch diff --git a/ports/darknet/0001-rename-_castu32_f32-to-gemm_castu32_f32.patch b/ports/darknet/0001-rename-_castu32_f32-to-gemm_castu32_f32.patch deleted file mode 100644 index 3e459c22503274..00000000000000 --- a/ports/darknet/0001-rename-_castu32_f32-to-gemm_castu32_f32.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ed14dcf873775dcfc56883f55c10619779d8f87e Mon Sep 17 00:00:00 2001 -From: Nicole Mazzuca -Date: Thu, 24 Sep 2020 09:48:16 -0700 -Subject: [PATCH] rename _castu32_f32 to gemm_castu32_f32 - -since _castu32_f32 is reserved, an implementation is allowed to name a function that, -and it turns out Xcode 12 did. ---- - src/gemm.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/gemm.c b/src/gemm.c -index 0b06d98..bc2aef3 100644 ---- a/src/gemm.c -+++ b/src/gemm.c -@@ -546,6 +546,7 @@ static inline float _mm256_extract_float32(__m256 a, const int index) { - #include - #include - -+#define _castu32_f32 gemm_castu32_f32 - static inline float _castu32_f32(uint32_t a) { - return *((float *)&a); - } --- -2.24.3 (Apple Git-128) - diff --git a/ports/darknet/CONTROL b/ports/darknet/CONTROL index b41b9737d2571b..e23b761d03caed 100644 --- a/ports/darknet/CONTROL +++ b/ports/darknet/CONTROL @@ -1,6 +1,5 @@ Source: darknet -Version: 2020-08-30 -Port-Version: 2 +Version: 2021-01-21 Description: Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities. Build-Depends: pthreads, stb diff --git a/ports/darknet/portfile.cmake b/ports/darknet/portfile.cmake index d786e196eab045..3f3df119019d74 100644 --- a/ports/darknet/portfile.cmake +++ b/ports/darknet/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AlexeyAB/darknet - REF ecad770071eb776208a46977347e6d2410d4f50e - SHA512 1de0dc3f4842c68f5c12addf100996f7176ffb50dcd89a0b57446ba996d9199e31531f64c32eedbc2ea6a449459573811444dd35f1a50ece3880f58717c795ab + REF 00d578e327c22638ea12e73c4efb74c798c08de5 + SHA512 ef2d46fab670759e9c22d0233b60192bfe47669e29d2ec1e020a77dfaf09894a93160c11de070bc39d86109dd2a37ca7172fbb081809b1ea2783207a6e385b2c HEAD_REF master - PATCHES - 0001-rename-_castu32_f32-to-gemm_castu32_f32.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -30,7 +28,7 @@ if("weights" IN_LIST FEATURES) vcpkg_download_distfile(YOLOV4-TINY_WEIGHTS URLS "https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v4_pre/yolov4-tiny.weights" FILENAME "darknet-cache/yolov4-tiny.weights" - SHA512 7d4d9fe150f9fe3ea7d2310f1445fe983b31fbf06d301c70ecfe00e8559e6f1bf940198c2dd55db772238f23ea0092fb6553558e5414f3ee173b8b28e53c5b54 + SHA512 804ca2ab8e3699d31c95bf773d22f901f186703487c7945f30dc2dbb808094793362cb6f5da5cd0b4b83f820c8565a3cba22fafa069ee6ca2a925677137d95f4 ) vcpkg_download_distfile(YOLOV4_WEIGHTS URLS "https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v3_optimal/yolov4.weights" @@ -73,7 +71,7 @@ if("weights-train" IN_LIST FEATURES) vcpkg_download_distfile(YOLOV4-TINY-CONV-29 URLS "https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v4_pre/yolov4-tiny.conv.29" FILENAME "darknet-cache/yolov4-tiny.conv.29" - SHA512 d145deb80aea3d422752e784323d89919281ed7a37d15f939f5b680ff62e502072a30e074c34a09026669126d360c7d6817ea1afa53cfa53c56bd1e16333a602 + SHA512 318e47f4bdf43b7f4eff8f3669bc9ba66cd7bd8ffb31df5bc1978682c85fec8e63a8349958022fd933cc676cbf5241953f2181bf4d1789f7cf9d371e012e3e49 ) vcpkg_download_distfile(YOLOV4-CONV-137 URLS "https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v3_optimal/yolov4.conv.137" diff --git a/versions/baseline.json b/versions/baseline.json index 08205525836755..eeba29e0ee319f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1513,8 +1513,8 @@ "port-version": 0 }, "darknet": { - "baseline": "2020-08-30", - "port-version": 2 + "baseline": "2021-01-21", + "port-version": 0 }, "darts-clone": { "baseline": "1767ab87cffe-1", diff --git a/versions/d-/darknet.json b/versions/d-/darknet.json index c7e4b4daa1754b..89f7d3ced79e11 100644 --- a/versions/d-/darknet.json +++ b/versions/d-/darknet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05bdc42da8656bf1acf80d6f3f821dff045c7b72", + "version-string": "2021-01-21", + "port-version": 0 + }, { "git-tree": "5013a879bca7ed0f5a443fa9e379abbedfd38eeb", "version-string": "2020-08-30", From e88582d6a5f61ea0f34d6240ebdbb62d3fcfd9bb Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 22 Jan 2021 21:09:58 +0100 Subject: [PATCH 0557/1694] [ogre] Do not use strict mode by default in ogre for backward compatibility (#15789) * [ogre] Do not use strict mode by default in ogre for backward compatibility * Update port_versions metadata for ogre 1.12.9-5 --- ports/ogre/vcpkg.json | 3 +-- versions/baseline.json | 2 +- versions/o-/ogre.json | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index a92d9ea9b673cb..d084653e719bfb 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre", "version-string": "1.12.9", - "port-version": 4, + "port-version": 5, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "dependencies": [ @@ -13,7 +13,6 @@ "assimp", "freeimage", "overlay", - "strict", "zziplib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index eeba29e0ee319f..58d1198f7082bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4142,7 +4142,7 @@ }, "ogre": { "baseline": "1.12.9", - "port-version": 4 + "port-version": 5 }, "ogre-next": { "baseline": "2019-10-20-1", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index 711603b8495828..5dd8f1b76d14f4 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "322b9a5290ce1656aa66b684b07d1e327b18eeeb", + "version-string": "1.12.9", + "port-version": 5 + }, { "git-tree": "7bd4cd10abb70cc91306e834cb8f7831bc33c8a0", "version-string": "1.12.9", From 9a0b146e05258bbbcd450f9c6200714fc70c87ed Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 22 Jan 2021 21:13:33 +0100 Subject: [PATCH 0558/1694] [OpenCV] update to v4.5 and to v3.4.12 (#15162) * [tesseract] add missing reference for downstream projects * [tesseract] restore ci, fix many regressions that are uncovered by that * Update ports/opencv2/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [opencv] fix regressions on uwp, accept failure on arm64 for now * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [opencv4] allow failures on all arm windows targets, both win32 and uwp * [OpenCV] update to v4.5, draft * Restore CI tests on arm architectures, they will have to work! * adopts hints from #15180 * [libarchive] bump control version * [libarchive] use vcpkg-cmake-wrapper instead of a custom libarchiveConfig, since it is vcpkg-provided and not port-provided * enable features to be visible in parent scope * apply documentation fix from CI * [libarchive] remove unnecessary lines in portfile * update patches * restore ci tests for all opencv4 configs * add port versions to baseline * [OpenCV contrib] fix glog integration * [OpenCV4] fix target processor detection * update version refs * [OpenCV3] fix target processor detection * fix also ocv3 * remove vtk feature from opencv-ci testing * remove qt5-tools from baseline, it works locally Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/opencv3/0002-install-options.patch | 130 ++--- .../0004-add-missing-stdexcept-include.patch | 24 +- ports/opencv3/0005-fix-vtk9.patch | 2 +- ports/opencv3/0009-fix-uwp.patch | 2 +- ports/opencv3/CONTROL | 3 +- ports/opencv3/portfile.cmake | 22 +- ports/opencv4/0002-install-options.patch | 14 +- .../0003-force-package-requirements.patch | 12 +- ports/opencv4/0004-fix-policy-CMP0057.patch | 4 +- .../0005-add-missing-stdexcept-include.patch | 24 +- .../0006-fix-glog-abbreviated-severity.patch | 12 + ports/opencv4/0006-jpeg2000_getref.patch | 33 -- ports/opencv4/0007-fix-vtk9-contrib.patch | 470 ------------------ ports/opencv4/0008-fix-vtk9.patch | 41 -- ports/opencv4/0009-fix-uwp.patch | 4 +- ports/opencv4/CONTROL | 3 +- ports/opencv4/portfile.cmake | 44 +- scripts/ci.baseline.txt | 9 +- versions/baseline.json | 8 +- versions/o-/opencv3.json | 5 + versions/o-/opencv4.json | 5 + 21 files changed, 185 insertions(+), 686 deletions(-) create mode 100644 ports/opencv4/0006-fix-glog-abbreviated-severity.patch delete mode 100644 ports/opencv4/0006-jpeg2000_getref.patch delete mode 100644 ports/opencv4/0007-fix-vtk9-contrib.patch delete mode 100644 ports/opencv4/0008-fix-vtk9.patch diff --git a/ports/opencv3/0002-install-options.patch b/ports/opencv3/0002-install-options.patch index 4f0197f9d23304..1657579fa76960 100644 --- a/ports/opencv3/0002-install-options.patch +++ b/ports/opencv3/0002-install-options.patch @@ -1,65 +1,65 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 614baa2..1e930a3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -601,7 +601,7 @@ endif() - ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) - - # --- Python Support --- --if(NOT IOS) -+if(0) - include(cmake/OpenCVDetectPython.cmake) - endif() - -diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 476156f..4b27b6a 100644 ---- a/cmake/OpenCVCompilerOptions.cmake -+++ b/cmake/OpenCVCompilerOptions.cmake -@@ -261,7 +261,6 @@ if(MSVC) - #endif() - - if(BUILD_WITH_DEBUG_INFO) -- set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi") - set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug") - set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug") - endif() -diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake -index c7f9fc2..84bd302 100644 ---- a/cmake/OpenCVGenConfig.cmake -+++ b/cmake/OpenCVGenConfig.cmake -@@ -109,11 +109,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME) - endif() - endfunction() - --if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID) -+if(TRUE) - ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "") - endif() - --if(ANDROID) -+if(FALSE) - ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "abi-${ANDROID_NDK_ABI_NAME}" "OpenCVConfig.root-ANDROID.cmake.in") - install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION "${OPENCV_CONFIG_INSTALL_PATH}" COMPONENT dev) - endif() -@@ -121,7 +121,7 @@ endif() - # -------------------------------------------------------------------------------------------- - # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages - # -------------------------------------------------------------------------------------------- --if(WIN32) -+if(0) - if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG) - ocv_gen_config("${CMAKE_BINARY_DIR}/win-install" - "${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}" -diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index 1f0d720..0bb1ff7 100644 ---- a/data/CMakeLists.txt -+++ b/data/CMakeLists.txt -@@ -1,8 +1,6 @@ - file(GLOB HAAR_CASCADES haarcascades/*.xml) - file(GLOB LBP_CASCADES lbpcascades/*.xml) - --install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs) --install(FILES ${LBP_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades COMPONENT libs) - - if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH) - install(DIRECTORY "${OPENCV_TEST_DATA_PATH}/" DESTINATION "${OPENCV_TEST_DATA_INSTALL_PATH}" COMPONENT "tests") +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d143a7a..15eb053 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -602,7 +602,7 @@ endif() + ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) + + # --- Python Support --- +-if(NOT IOS) ++if(FALSE) + include(cmake/OpenCVDetectPython.cmake) + endif() + +diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake +index 9ac671d..b14ce09 100644 +--- a/cmake/OpenCVCompilerOptions.cmake ++++ b/cmake/OpenCVCompilerOptions.cmake +@@ -263,7 +263,6 @@ if(MSVC) + #endif() + + if(BUILD_WITH_DEBUG_INFO) +- set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi") + set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug") + set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug") + endif() +diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake +index c7f9fc2..a1f657b 100644 +--- a/cmake/OpenCVGenConfig.cmake ++++ b/cmake/OpenCVGenConfig.cmake +@@ -109,11 +109,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME) + endif() + endfunction() + +-if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID) ++if(TRUE) + ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "") + endif() + +-if(ANDROID) ++if(FALSE) + ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "abi-${ANDROID_NDK_ABI_NAME}" "OpenCVConfig.root-ANDROID.cmake.in") + install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION "${OPENCV_CONFIG_INSTALL_PATH}" COMPONENT dev) + endif() +@@ -121,7 +121,7 @@ endif() + # -------------------------------------------------------------------------------------------- + # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages + # -------------------------------------------------------------------------------------------- +-if(WIN32) ++if(FALSE) + if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG) + ocv_gen_config("${CMAKE_BINARY_DIR}/win-install" + "${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}" +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index 1f0d720..0bb1ff7 100644 +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -1,8 +1,6 @@ + file(GLOB HAAR_CASCADES haarcascades/*.xml) + file(GLOB LBP_CASCADES lbpcascades/*.xml) + +-install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs) +-install(FILES ${LBP_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades COMPONENT libs) + + if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH) + install(DIRECTORY "${OPENCV_TEST_DATA_PATH}/" DESTINATION "${OPENCV_TEST_DATA_INSTALL_PATH}" COMPONENT "tests") diff --git a/ports/opencv3/0004-add-missing-stdexcept-include.patch b/ports/opencv3/0004-add-missing-stdexcept-include.patch index 4f0df7d06615e5..2a7d90ce071cf8 100644 --- a/ports/opencv3/0004-add-missing-stdexcept-include.patch +++ b/ports/opencv3/0004-add-missing-stdexcept-include.patch @@ -1,12 +1,12 @@ -diff --git a/modules/cvv/src/util/observer_ptr.hpp b/modules/cvv/src/util/observer_ptr.hpp -index fef3fea..68d1a80 100644 ---- a/modules/cvv/src/util/observer_ptr.hpp -+++ b/modules/cvv/src/util/observer_ptr.hpp -@@ -11,6 +11,7 @@ - #include //size_t - #include // [u]intXX_t - #include // since some people like to forget that one -+#include - - namespace cvv - { +diff --git a/modules/cvv/src/util/observer_ptr.hpp b/modules/cvv/src/util/observer_ptr.hpp +index fef3fea..68d1a80 100644 +--- a/modules/cvv/src/util/observer_ptr.hpp ++++ b/modules/cvv/src/util/observer_ptr.hpp +@@ -11,6 +11,7 @@ + #include //size_t + #include // [u]intXX_t + #include // since some people like to forget that one ++#include + + namespace cvv + { diff --git a/ports/opencv3/0005-fix-vtk9.patch b/ports/opencv3/0005-fix-vtk9.patch index 137302ee37150e..2dfdee8f651ff7 100644 --- a/ports/opencv3/0005-fix-vtk9.patch +++ b/ports/opencv3/0005-fix-vtk9.patch @@ -1,5 +1,5 @@ diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake -index 1495688..4c83504 100644 +index 1495688..e5c6049 100644 --- a/cmake/OpenCVDetectVTK.cmake +++ b/cmake/OpenCVDetectVTK.cmake @@ -1,12 +1,30 @@ diff --git a/ports/opencv3/0009-fix-uwp.patch b/ports/opencv3/0009-fix-uwp.patch index 73cac14531af2a..9968d869170e53 100644 --- a/ports/opencv3/0009-fix-uwp.patch +++ b/ports/opencv3/0009-fix-uwp.patch @@ -1,5 +1,5 @@ diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index 634b5b2..07a96fb 100644 +index 10ee406..73f4af2 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake @@ -1183,7 +1183,7 @@ function(ocv_add_perf_tests) diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL index 9067dab1882a44..586c4337e41739 100644 --- a/ports/opencv3/CONTROL +++ b/ports/opencv3/CONTROL @@ -1,6 +1,5 @@ Source: opencv3 -Version: 3.4.10 -Port-Version: 5 +Version: 3.4.12 Build-Depends: zlib Homepage: https://github.com/opencv/opencv Description: computer vision library diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index eff881a240efde..c65792bf00029d 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -6,13 +6,13 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4") message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4") endif() -set(OPENCV_VERSION "3.4.10") +set(OPENCV_VERSION "3.4.12") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 7ccdc7fef26436b2f643cce2a13c9f9f77e56d3fd0340117419df3c1665ca12416277b626cce3c056fdc14899805bbe9ece391f11d28c6adea716d47ce8894bc + SHA512 e69ff4869a8128b7d2a0537d198ec7f287fb821a8965df26339bec662da1888860941f50a269db7693309b9861f986c219288bb5856de76a6c7bc4c0a7026bee HEAD_REF master PATCHES 0001-disable-downloading.patch @@ -22,6 +22,16 @@ vcpkg_from_github( 0009-fix-uwp.patch ) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(TARGET_IS_AARCH64 1) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(TARGET_IS_ARM 1) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(TARGET_IS_X86_64 1) +else() + set(TARGET_IS_X86 1) +endif() + file(REMOVE "${SOURCE_PATH}/cmake/FindCUDNN.cmake") string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) @@ -101,7 +111,7 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 70b4ecfaf9881390ad826a2aba24cced8514a680965ec7151df9926082fff53364bbe6be36458bb9ff466fda6f6f6ca2174eeac94c10a6bada989f07ed1c4da1 + SHA512 0191b1d49d5a50195ed94951c570da03dc33677b682e61a65b34d40f355c36a58441034730ea7eca78dcb4af4c821983754250f93fdf3adb2b4a20e71806eb03 HEAD_REF master PATCHES 0004-add-missing-stdexcept-include.patch @@ -242,6 +252,12 @@ vcpkg_configure_cmake( PREFER_NINJA SOURCE_PATH ${SOURCE_PATH} OPTIONS + ###### opencv cpu recognition is broken, always using host and not target: here we bypass that + -DOPENCV_SKIP_SYSTEM_PROCESSOR_DETECTION=TRUE + -DAARCH64=${TARGET_IS_AARCH64} + -DX86_64=${TARGET_IS_X86_64} + -DX86=${TARGET_IS_X86} + -DARM=${TARGET_IS_ARM} ###### ocv_options -DOpenCV_INSTALL_BINARIES_PREFIX= -DOPENCV_BIN_INSTALL_PATH=bin diff --git a/ports/opencv4/0002-install-options.patch b/ports/opencv4/0002-install-options.patch index 9707a6a323695c..533dd8354e4db5 100644 --- a/ports/opencv4/0002-install-options.patch +++ b/ports/opencv4/0002-install-options.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4c0b388..16c0ede 100644 +index 4350b2f..89521b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -594,7 +594,7 @@ endif() +@@ -603,7 +603,7 @@ endif() ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) # --- Python Support --- @@ -12,10 +12,10 @@ index 4c0b388..16c0ede 100644 endif() diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 87b2161..5192875 100644 +index 080c78c..616ce64 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake -@@ -263,7 +263,6 @@ if(MSVC) +@@ -265,7 +265,6 @@ if(MSVC) #endif() if(BUILD_WITH_DEBUG_INFO) @@ -24,10 +24,10 @@ index 87b2161..5192875 100644 set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug") endif() diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake -index 6991289..3a691c5 100644 +index 838852c..04906b3 100644 --- a/cmake/OpenCVGenConfig.cmake +++ b/cmake/OpenCVGenConfig.cmake -@@ -109,11 +109,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME) +@@ -114,11 +114,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME) endif() endfunction() @@ -41,7 +41,7 @@ index 6991289..3a691c5 100644 ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "abi-${ANDROID_NDK_ABI_NAME}" "OpenCVConfig.root-ANDROID.cmake.in") install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION "${OPENCV_CONFIG_INSTALL_PATH}" COMPONENT dev) endif() -@@ -121,7 +121,7 @@ endif() +@@ -126,7 +126,7 @@ endif() # -------------------------------------------------------------------------------------------- # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages # -------------------------------------------------------------------------------------------- diff --git a/ports/opencv4/0003-force-package-requirements.patch b/ports/opencv4/0003-force-package-requirements.patch index b25668b38325ee..c28dd5d9fe89b4 100644 --- a/ports/opencv4/0003-force-package-requirements.patch +++ b/ports/opencv4/0003-force-package-requirements.patch @@ -1,5 +1,5 @@ diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index 0beaf19..3ba1ebd 100644 +index 22e20b6..5d1431c 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake @@ -6,7 +6,7 @@ @@ -38,7 +38,7 @@ index 0beaf19..3ba1ebd 100644 if(WEBP_FOUND) set(HAVE_WEBP 1) endif() -@@ -173,7 +173,7 @@ if(WITH_JASPER AND NOT HAVE_OPENJPEG) +@@ -186,7 +186,7 @@ if(WITH_JASPER AND NOT HAVE_OPENJPEG) if(BUILD_JASPER) ocv_clear_vars(JASPER_FOUND) else() @@ -47,7 +47,7 @@ index 0beaf19..3ba1ebd 100644 endif() if(NOT JASPER_FOUND) -@@ -197,7 +197,7 @@ if(WITH_PNG) +@@ -210,7 +210,7 @@ if(WITH_PNG) if(BUILD_PNG) ocv_clear_vars(PNG_FOUND) else() @@ -56,7 +56,7 @@ index 0beaf19..3ba1ebd 100644 if(PNG_FOUND) include(CheckIncludeFile) check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -@@ -228,7 +228,7 @@ endif() +@@ -241,7 +241,7 @@ endif() if(WITH_OPENEXR) ocv_clear_vars(HAVE_OPENEXR) if(NOT BUILD_OPENEXR) @@ -65,7 +65,7 @@ index 0beaf19..3ba1ebd 100644 endif() if(OPENEXR_FOUND) -@@ -246,7 +246,7 @@ endif() +@@ -259,7 +259,7 @@ endif() # --- GDAL (optional) --- if(WITH_GDAL) @@ -74,7 +74,7 @@ index 0beaf19..3ba1ebd 100644 if(NOT GDAL_FOUND) set(HAVE_GDAL NO) -@@ -258,7 +258,7 @@ if(WITH_GDAL) +@@ -271,7 +271,7 @@ if(WITH_GDAL) endif() if (WITH_GDCM) diff --git a/ports/opencv4/0004-fix-policy-CMP0057.patch b/ports/opencv4/0004-fix-policy-CMP0057.patch index 7f0f0c0271ba01..8bff4f88b7be1b 100644 --- a/ports/opencv4/0004-fix-policy-CMP0057.patch +++ b/ports/opencv4/0004-fix-policy-CMP0057.patch @@ -1,9 +1,9 @@ diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt -index c1c6754..360aa6b 100644 +index 12ff992..afd56eb 100644 --- a/modules/videoio/CMakeLists.txt +++ b/modules/videoio/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.3) - set(VIDEOIO_PLUGIN_LIST "" CACHE STRING "List of videoio backends to be compiled as plugins (ffmpeg, gstreamer)") + set(VIDEOIO_PLUGIN_LIST "" CACHE STRING "List of videoio backends to be compiled as plugins (ffmpeg, gstreamer, mfx, msmf or special value 'all')") set(VIDEOIO_ENABLE_PLUGINS "ON" CACHE BOOL "Allow building videoio plugin support") set(VIDEOIO_ENABLE_STRICT_PLUGIN_CHECK "ON" CACHE BOOL "Make sure OpenCV version is the same in plugin and host code") diff --git a/ports/opencv4/0005-add-missing-stdexcept-include.patch b/ports/opencv4/0005-add-missing-stdexcept-include.patch index 4f0df7d06615e5..2a7d90ce071cf8 100644 --- a/ports/opencv4/0005-add-missing-stdexcept-include.patch +++ b/ports/opencv4/0005-add-missing-stdexcept-include.patch @@ -1,12 +1,12 @@ -diff --git a/modules/cvv/src/util/observer_ptr.hpp b/modules/cvv/src/util/observer_ptr.hpp -index fef3fea..68d1a80 100644 ---- a/modules/cvv/src/util/observer_ptr.hpp -+++ b/modules/cvv/src/util/observer_ptr.hpp -@@ -11,6 +11,7 @@ - #include //size_t - #include // [u]intXX_t - #include // since some people like to forget that one -+#include - - namespace cvv - { +diff --git a/modules/cvv/src/util/observer_ptr.hpp b/modules/cvv/src/util/observer_ptr.hpp +index fef3fea..68d1a80 100644 +--- a/modules/cvv/src/util/observer_ptr.hpp ++++ b/modules/cvv/src/util/observer_ptr.hpp +@@ -11,6 +11,7 @@ + #include //size_t + #include // [u]intXX_t + #include // since some people like to forget that one ++#include + + namespace cvv + { diff --git a/ports/opencv4/0006-fix-glog-abbreviated-severity.patch b/ports/opencv4/0006-fix-glog-abbreviated-severity.patch new file mode 100644 index 00000000000000..aafe61b1a5eb98 --- /dev/null +++ b/ports/opencv4/0006-fix-glog-abbreviated-severity.patch @@ -0,0 +1,12 @@ +diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt +index 53a8d43..8809c88 100644 +--- a/modules/sfm/CMakeLists.txt ++++ b/modules/sfm/CMakeLists.txt +@@ -20,6 +20,7 @@ if((gflags_FOUND OR GFLAGS_FOUND OR GFLAGS_INCLUDE_DIRS) AND (glog_FOUND OR GLOG + ) + file(REMOVE "${_fname}") + message(STATUS "Checking SFM deps... ${SFM_DEPS_OK}") ++ add_definitions(-DGLOG_NO_ABBREVIATED_SEVERITIES) + else() + set(SFM_DEPS_OK FALSE) + endif() diff --git a/ports/opencv4/0006-jpeg2000_getref.patch b/ports/opencv4/0006-jpeg2000_getref.patch deleted file mode 100644 index 7b0fc09c0cb1ef..00000000000000 --- a/ports/opencv4/0006-jpeg2000_getref.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/modules/imgcodecs/src/grfmt_jpeg2000.cpp b/modules/imgcodecs/src/grfmt_jpeg2000.cpp ---- a/modules/imgcodecs/src/grfmt_jpeg2000.cpp -+++ b/modules/imgcodecs/src/grfmt_jpeg2000.cpp -@@ -375,13 +375,13 @@ - int lshift = MAX(0, -rshift); - rshift = MAX(0, rshift); - int delta = (rshift > 0 ? 1 << (rshift - 1) : 0) + offset; - - for( y = 0; y < yend - ystart; ) - { -- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); -+ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 ); - uchar* dst = data + (y - yoffset) * step - xoffset; - - if( xstep == 1 ) - { - if( maxval == 256 && offset == 0 ) - for( x = 0; x < xend - xstart; x++ ) -@@ -441,13 +441,13 @@ - int lshift = MAX(0, -rshift); - rshift = MAX(0, rshift); - int delta = (rshift > 0 ? 1 << (rshift - 1) : 0) + offset; - - for( y = 0; y < yend - ystart; ) - { -- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); -+ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 ); - ushort* dst = data + (y - yoffset) * step - xoffset; - - if( xstep == 1 ) - { - if( maxval == 65536 && offset == 0 ) - for( x = 0; x < xend - xstart; x++ ) diff --git a/ports/opencv4/0007-fix-vtk9-contrib.patch b/ports/opencv4/0007-fix-vtk9-contrib.patch deleted file mode 100644 index 1db18f1c640611..00000000000000 --- a/ports/opencv4/0007-fix-vtk9-contrib.patch +++ /dev/null @@ -1,470 +0,0 @@ -diff --git a/modules/viz/CMakeLists.txt b/modules/viz/CMakeLists.txt -index 89a9c3e098..3426e1dd26 100644 ---- a/modules/viz/CMakeLists.txt -+++ b/modules/viz/CMakeLists.txt -@@ -3,7 +3,9 @@ if(NOT HAVE_VTK) - endif() - - set(the_description "Viz") --include(${VTK_USE_FILE}) -+if(VTK_VERSION VERSION_LESS 8.90) -+ include(${VTK_USE_FILE}) -+endif() - - if(NOT BUILD_SHARED_LIBS) - # We observed conflict between builtin 3rdparty libraries and -diff --git a/modules/viz/src/precomp.hpp b/modules/viz/src/precomp.hpp -index f92fdb6ac2..4c4bf7c599 100644 ---- a/modules/viz/src/precomp.hpp -+++ b/modules/viz/src/precomp.hpp -@@ -133,7 +133,8 @@ - #include - #include - #include --#include "vtkCallbackCommand.h" -+#include -+#include - - #if !defined(_WIN32) || defined(__CYGWIN__) - # include /* unlink */ -@@ -149,6 +150,11 @@ - #include "vtk/vtkTrajectorySource.h" - #include "vtk/vtkImageMatSource.h" - -+#if VTK_MAJOR_VERSION >= 9 -+typedef vtkIdType const * CellIterT; -+#else -+typedef vtkIdType * CellIterT; -+#endif - - #include - #include -diff --git a/modules/viz/src/types.cpp b/modules/viz/src/types.cpp -index 65571a192e..0e14477891 100644 ---- a/modules/viz/src/types.cpp -+++ b/modules/viz/src/types.cpp -@@ -100,7 +100,8 @@ cv::viz::Mesh cv::viz::Mesh::load(const String& file, int type) - int* poly_ptr = mesh.polygons.ptr(); - - polygons->InitTraversal(); -- vtkIdType nr_cell_points, *cell_points; -+ vtkIdType nr_cell_points; -+ CellIterT cell_points; - while (polygons->GetNextCell(nr_cell_points, cell_points)) - { - *poly_ptr++ = nr_cell_points; -diff --git a/modules/viz/src/vizimpl.cpp b/modules/viz/src/vizimpl.cpp -index 2c291c0569..2c7ce997a4 100644 ---- a/modules/viz/src/vizimpl.cpp -+++ b/modules/viz/src/vizimpl.cpp -@@ -55,8 +55,17 @@ cv::viz::Viz3d::VizImpl::VizImpl(const String &name) : spin_once_state_(false), - - // Create render window - window_ = vtkSmartPointer::New(); -- cv::Vec2i window_size = cv::Vec2i(window_->GetScreenSize()) / 2; -- window_->SetSize(window_size.val); -+ int * sz = window_->GetScreenSize(); -+ if (sz) -+ { -+ cv::Vec2i window_size = cv::Vec2i(sz) / 2; -+ window_->SetSize(window_size.val); -+ } -+ else -+ { -+ int new_sz[2] = { 640, 480 }; -+ window_->SetSize(new_sz); -+ } - window_->AddRenderer(renderer_); - - // Create the interactor style -diff --git a/modules/viz/src/vtk/vtkOBJWriter.cpp b/modules/viz/src/vtk/vtkOBJWriter.cpp -index 296b6eb065..2e5764fc27 100644 ---- a/modules/viz/src/vtk/vtkOBJWriter.cpp -+++ b/modules/viz/src/vtk/vtkOBJWriter.cpp -@@ -72,7 +72,7 @@ void cv::viz::vtkOBJWriter::WriteData() - } - - vtkDebugMacro(<<"Opening vtk file for writing..."); -- ostream *outfilep = new ofstream(this->FileName, ios::out); -+ std::ostream *outfilep = new std::ofstream(this->FileName, ios::out); - if (outfilep->fail()) - { - vtkErrorMacro(<< "Unable to open file: "<< this->FileName); -@@ -127,7 +127,8 @@ void cv::viz::vtkOBJWriter::WriteData() - // write out verts if any - if (input->GetNumberOfVerts() > 0) - { -- vtkIdType npts = 0, *index = 0; -+ vtkIdType npts = 0; -+ CellIterT index = 0; - vtkCellArray *cells = input->GetVerts(); - for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) - { -@@ -141,7 +142,8 @@ void cv::viz::vtkOBJWriter::WriteData() - // write out lines if any - if (input->GetNumberOfLines() > 0) - { -- vtkIdType npts = 0, *index = 0; -+ vtkIdType npts = 0; -+ CellIterT index = 0; - vtkCellArray *cells = input->GetLines(); - for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) - { -@@ -162,7 +164,8 @@ void cv::viz::vtkOBJWriter::WriteData() - // write out polys if any - if (input->GetNumberOfPolys() > 0) - { -- vtkIdType npts = 0, *index = 0; -+ vtkIdType npts = 0; -+ CellIterT index = 0; - vtkCellArray *cells = input->GetPolys(); - for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) - { -@@ -191,7 +194,8 @@ void cv::viz::vtkOBJWriter::WriteData() - // write out tstrips if any - if (input->GetNumberOfStrips() > 0) - { -- vtkIdType npts = 0, *index = 0; -+ vtkIdType npts = 0; -+ CellIterT index = 0; - vtkCellArray *cells = input->GetStrips(); - for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) - { -diff --git a/modules/viz/src/vtk/vtkXYZReader.cpp b/modules/viz/src/vtk/vtkXYZReader.cpp -index 57726eae9b..3b9265fed6 100644 ---- a/modules/viz/src/vtk/vtkXYZReader.cpp -+++ b/modules/viz/src/vtk/vtkXYZReader.cpp -@@ -77,7 +77,7 @@ int cv::viz::vtkXYZReader::RequestData(vtkInformation*, vtkInformationVector**, - } - - // Open the input file. -- ifstream fin(this->FileName); -+ std::ifstream fin(this->FileName); - if(!fin) - { - vtkErrorMacro("Error opening file " << this->FileName); -diff --git a/modules/viz/src/vtk/vtkXYZWriter.cpp b/modules/viz/src/vtk/vtkXYZWriter.cpp -index cf95e3c6a0..56a26b38a0 100644 ---- a/modules/viz/src/vtk/vtkXYZWriter.cpp -+++ b/modules/viz/src/vtk/vtkXYZWriter.cpp -@@ -69,7 +69,7 @@ void cv::viz::vtkXYZWriter::WriteData() - } - - vtkDebugMacro(<<"Opening vtk file for writing..."); -- ostream *outfilep = new ofstream(this->FileName, ios::out); -+ std::ostream *outfilep = new std::ofstream(this->FileName, ios::out); - if (outfilep->fail()) - { - vtkErrorMacro(<< "Unable to open file: "<< this->FileName); - -diff --git a/modules/viz/test/test_tutorial2.cpp b/modules/viz/test/test_tutorial2.cpp -index 6b2972f0af..a4b5b99582 100644 ---- a/modules/viz/test/test_tutorial2.cpp -+++ b/modules/viz/test/test_tutorial2.cpp -@@ -28,7 +28,7 @@ static void tutorial2() - /// Rodrigues vector - Vec3d rot_vec = Vec3d::all(0); - double translation_phase = 0.0, translation = 0.0; -- while(!myWindow.wasStopped()) -+ for(unsigned num = 0; num < 50; ++num) - { - /* Rotation using rodrigues */ - /// Rotate around (1,1,1) -@@ -45,7 +45,7 @@ static void tutorial2() - - myWindow.setWidgetPose("Cube Widget", pose); - -- myWindow.spinOnce(1, true); -+ myWindow.spinOnce(100, true); - } - } - -diff --git a/modules/viz/test/test_tutorial3.cpp b/modules/viz/test/test_tutorial3.cpp -index 232130f0a6..32e33b1902 100644 ---- a/modules/viz/test/test_tutorial3.cpp -+++ b/modules/viz/test/test_tutorial3.cpp -@@ -48,7 +48,7 @@ static void tutorial3(bool camera_pov) - myWindow.setViewerPose(camera_pose); - - /// Start event loop. -- myWindow.spin(); -+ myWindow.spinOnce(500, true); - } - - TEST(Viz, tutorial3_global_view) -diff --git a/modules/viz/test/test_viz3d.cpp b/modules/viz/test/test_viz3d.cpp -index cdf8a00ad7..4ab05c3e0a 100644 ---- a/modules/viz/test/test_viz3d.cpp -+++ b/modules/viz/test/test_viz3d.cpp -@@ -59,7 +59,7 @@ TEST(Viz_viz3d, DISABLED_develop) - //cv::Mat cloud = cv::viz::readCloud(get_dragon_ply_file_path()); - //---->>>>> - -- viz.spin(); -+ viz.spinOnce(500, true); - } - - }} // namespace -diff --git a/modules/viz/test/tests_simple.cpp b/modules/viz/test/tests_simple.cpp -index 12d696dfba..5584483f4f 100644 ---- a/modules/viz/test/tests_simple.cpp -+++ b/modules/viz/test/tests_simple.cpp -@@ -56,7 +56,7 @@ TEST(Viz, show_cloud_bluberry) - viz.showWidget("dragon", WCloud(dragon_cloud, Color::bluberry()), pose); - - viz.showWidget("text2d", WText("Bluberry cloud", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_cloud_random_color) -@@ -73,7 +73,7 @@ TEST(Viz, show_cloud_random_color) - viz.showWidget("coosys", WCoordinateSystem()); - viz.showWidget("dragon", WCloud(dragon_cloud, colors), pose); - viz.showWidget("text2d", WText("Random color cloud", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_cloud_masked) -@@ -91,7 +91,7 @@ TEST(Viz, show_cloud_masked) - viz.showWidget("coosys", WCoordinateSystem()); - viz.showWidget("dragon", WCloud(dragon_cloud), pose); - viz.showWidget("text2d", WText("Nan masked cloud", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_cloud_collection) -@@ -109,7 +109,7 @@ TEST(Viz, show_cloud_collection) - viz.showWidget("coosys", WCoordinateSystem()); - viz.showWidget("ccol", ccol); - viz.showWidget("text2d", WText("Cloud collection", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_painted_clouds) -@@ -124,7 +124,7 @@ TEST(Viz, show_painted_clouds) - viz.showWidget("cloud3", WPaintedCloud(cloud, Vec3d(0.0, 0.0, -1.0), Vec3d(0.0, 0.0, 1.0), Color::blue(), Color::red())); - viz.showWidget("arrow", WArrow(Vec3d(0.0, 1.0, -1.0), Vec3d(0.0, 1.0, 1.0), 0.009, Color::raspberry())); - viz.showWidget("text2d", WText("Painted clouds", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_mesh) -@@ -137,7 +137,7 @@ TEST(Viz, show_mesh) - viz.showWidget("coosys", WCoordinateSystem()); - viz.showWidget("mesh", WMesh(mesh), pose); - viz.showWidget("text2d", WText("Just mesh", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_mesh_random_colors) -@@ -152,7 +152,7 @@ TEST(Viz, show_mesh_random_colors) - viz.showWidget("mesh", WMesh(mesh), pose); - viz.setRenderingProperty("mesh", SHADING, SHADING_PHONG); - viz.showWidget("text2d", WText("Random color mesh", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_widget_merger) -@@ -173,7 +173,7 @@ TEST(Viz, show_widget_merger) - viz.showWidget("coo", WCoordinateSystem()); - viz.showWidget("merger", merger); - viz.showWidget("text2d", WText("Widget merger", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_textured_mesh) -@@ -210,7 +210,7 @@ TEST(Viz, show_textured_mesh) - viz.showWidget("mesh", WMesh(mesh)); - viz.setRenderingProperty("mesh", SHADING, SHADING_PHONG); - viz.showWidget("text2d", WText("Textured mesh", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_polyline) -@@ -229,7 +229,7 @@ TEST(Viz, show_polyline) - viz.showWidget("polyline", WPolyLine(polyline, colors)); - viz.showWidget("coosys", WCoordinateSystem()); - viz.showWidget("text2d", WText("Polyline", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_sampled_normals) -@@ -244,7 +244,7 @@ TEST(Viz, show_sampled_normals) - viz.showWidget("normals", WCloudNormals(mesh.cloud, mesh.normals, 30, 0.1f, Color::green()), pose); - viz.setRenderingProperty("normals", LINE_WIDTH, 2.0); - viz.showWidget("text2d", WText("Cloud or mesh normals", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_cloud_shaded_by_normals) -@@ -260,7 +260,7 @@ TEST(Viz, show_cloud_shaded_by_normals) - Viz3d viz("show_cloud_shaded_by_normals"); - viz.showWidget("cloud", cloud, pose); - viz.showWidget("text2d", WText("Cloud shaded by normals", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_trajectories) -@@ -287,15 +287,15 @@ TEST(Viz, show_trajectories) - viz.showWidget("text2d", WText("Different kinds of supported trajectories", Point(20, 20), 20, Color::green())); - - int i = 0; -- while(!viz.wasStopped()) -+ for(unsigned num = 0; num < 50; ++num) - { - double a = --i % 360; - Vec3d pose(sin(a * CV_PI/180), 0.7, cos(a * CV_PI/180)); - viz.setViewerPose(makeCameraPose(pose * 7.5, Vec3d(0.0, 0.5, 0.0), Vec3d(0.0, 0.1, 0.0))); -- viz.spinOnce(20, true); -+ viz.spinOnce(100, true); - } - viz.resetCamera(); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_trajectory_reposition) -@@ -306,7 +306,7 @@ TEST(Viz, show_trajectory_reposition) - viz.showWidget("coos", WCoordinateSystem()); - viz.showWidget("sub3", WTrajectory(Mat(path).rowRange(0, (int)path.size()/3), WTrajectory::BOTH, 0.2, Color::brown()), path.front().inv()); - viz.showWidget("text2d", WText("Trajectory resposition to origin", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_camera_positions) -@@ -330,7 +330,7 @@ TEST(Viz, show_camera_positions) - viz.showWidget("pos3", WCameraPosition(0.75), poses[1]); - viz.showWidget("pos4", WCameraPosition(K, gray, 3, Color::indigo()), poses[1]); - viz.showWidget("text2d", WText("Camera positions with images", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_overlay_image) -@@ -353,16 +353,16 @@ TEST(Viz, show_overlay_image) - viz.showWidget("text2d", WText("Overlay images", Point(20, 20), 20, Color::green())); - - int i = 0; -- while(!viz.wasStopped()) -+ for(unsigned num = 0; num < 50; ++num) - { - double a = ++i % 360; - Vec3d pose(sin(a * CV_PI/180), 0.7, cos(a * CV_PI/180)); - viz.setViewerPose(makeCameraPose(pose * 3, Vec3d(0.0, 0.5, 0.0), Vec3d(0.0, 0.1, 0.0))); - viz.getWidget("img1").cast().setImage(lena * pow(sin(i*10*CV_PI/180) * 0.5 + 0.5, 1.0)); -- viz.spinOnce(1, true); -+ viz.spinOnce(100, true); - } - viz.showWidget("text2d", WText("Overlay images (stopped)", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - -@@ -376,7 +376,7 @@ TEST(Viz, show_image_method) - viz.showImage(lena, lena.size()); - viz.spinOnce(1500, true); - -- cv::viz::imshow("show_image_method", make_gray(lena)).spin(); -+ cv::viz::imshow("show_image_method", make_gray(lena)).spinOnce(500, true); - } - - TEST(Viz, show_image_3d) -@@ -398,13 +398,13 @@ TEST(Viz, show_image_3d) - viz.showWidget("text2d", WText("Images in 3D", Point(20, 20), 20, Color::green())); - - int i = 0; -- while(!viz.wasStopped()) -+ for(unsigned num = 0; num < 50; ++num) - { - viz.getWidget("img0").cast().setImage(lena * pow(sin(i++*7.5*CV_PI/180) * 0.5 + 0.5, 1.0)); -- viz.spinOnce(1, true); -+ viz.spinOnce(100, true); - } - viz.showWidget("text2d", WText("Images in 3D (stopped)", Point(20, 20), 20, Color::green())); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_simple_widgets) -@@ -431,10 +431,10 @@ TEST(Viz, show_simple_widgets) - - viz.showWidget("grid1", WGrid(Vec2i(7,7), Vec2d::all(0.75), Color::gray()), Affine3d().translate(Vec3d(0.0, 0.0, -1.0))); - -- viz.spin(); -+ viz.spinOnce(500, true); - viz.getWidget("text2d").cast().setText("Different simple widgets (updated)"); - viz.getWidget("text3d").cast().setText("Updated text 3D"); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - TEST(Viz, show_follower) -@@ -446,9 +446,9 @@ TEST(Viz, show_follower) - viz.showWidget("t3d_2", WText3D("Simple 3D follower", Point3d(-0.5, -0.5, 0.5), 0.125, true, Color::green())); - viz.showWidget("text2d", WText("Follower: text always facing camera", Point(20, 20), 20, Color::green())); - viz.setBackgroundMeshLab(); -- viz.spin(); -+ viz.spinOnce(500, true); - viz.getWidget("t3d_2").cast().setText("Updated follower 3D"); -- viz.spin(); -+ viz.spinOnce(500, true); - } - - }} // namespace - -diff --git a/modules/viz/CMakeLists.txt b/modules/viz/CMakeLists.txt -index 3426e1dd26..cd225960ce 100644 ---- a/modules/viz/CMakeLists.txt -+++ b/modules/viz/CMakeLists.txt -@@ -3,9 +3,6 @@ if(NOT HAVE_VTK) - endif() - - set(the_description "Viz") --if(VTK_VERSION VERSION_LESS 8.90) -- include(${VTK_USE_FILE}) --endif() - - if(NOT BUILD_SHARED_LIBS) - # We observed conflict between builtin 3rdparty libraries and -@@ -37,7 +34,14 @@ ocv_add_accuracy_tests() - ocv_add_perf_tests() - ocv_add_samples(opencv_imgproc opencv_calib3d opencv_features2d opencv_flann) - --ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) -+ -+if (VTK_VERSION VERSION_LESS "8.90.0") -+ include(${VTK_USE_FILE}) -+ ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) -+else () -+ ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) -+ vtk_module_autoinit(TARGETS ${the_module} MODULES ${VTK_LIBRARIES}) -+endif() - - if(APPLE AND BUILD_opencv_viz) - ocv_target_link_libraries(${the_module} PRIVATE "-framework Cocoa") -diff --git a/modules/viz/src/types.cpp b/modules/viz/src/types.cpp -index 0e14477891..e9a470cf83 100644 ---- a/modules/viz/src/types.cpp -+++ b/modules/viz/src/types.cpp -@@ -97,6 +97,7 @@ cv::viz::Mesh cv::viz::Mesh::load(const String& file, int type) - // Now handle the polygons - vtkSmartPointer polygons = polydata->GetPolys(); - mesh.polygons.create(1, polygons->GetSize(), CV_32SC1); -+ mesh.polygons = 0; - int* poly_ptr = mesh.polygons.ptr(); - - polygons->InitTraversal(); diff --git a/ports/opencv4/0008-fix-vtk9.patch b/ports/opencv4/0008-fix-vtk9.patch deleted file mode 100644 index 7942b0aa4d8b43..00000000000000 --- a/ports/opencv4/0008-fix-vtk9.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake -index 0f2b958..4c83504 100644 ---- a/cmake/OpenCVDetectVTK.cmake -+++ b/cmake/OpenCVDetectVTK.cmake -@@ -1,12 +1,30 @@ -+# VTK 9.0 -+if(NOT VTK_FOUND) -+ find_package(VTK 9 QUIET NAMES vtk COMPONENTS -+ FiltersExtraction -+ FiltersSources -+ FiltersTexture -+ IOExport -+ IOGeometry -+ IOPLY -+ InteractionStyle -+ RenderingCore -+ RenderingLOD -+ RenderingOpenGL2 -+ NO_MODULE) -+endif() -+ - # VTK 6.x components --find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) --IF(VTK_FOUND) -- IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var. -+if(NOT VTK_FOUND) -+ find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) -+ IF(VTK_FOUND) -+ IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var. - find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE) -- ELSE(VTK_RENDERING_BACKEND) -+ ELSE(VTK_RENDERING_BACKEND) - find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) -- ENDIF(VTK_RENDERING_BACKEND) --ENDIF(VTK_FOUND) -+ ENDIF(VTK_RENDERING_BACKEND) -+ ENDIF(VTK_FOUND) -+endif() - - # VTK 5.x components - if(NOT VTK_FOUND) diff --git a/ports/opencv4/0009-fix-uwp.patch b/ports/opencv4/0009-fix-uwp.patch index 1c40cf1e17d4aa..9ace8e2147333e 100644 --- a/ports/opencv4/0009-fix-uwp.patch +++ b/ports/opencv4/0009-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index 9053957..d2b6412 100644 +index bd14aa2..58cd11e 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake -@@ -1196,7 +1196,7 @@ function(ocv_add_perf_tests) +@@ -1197,7 +1197,7 @@ function(ocv_add_perf_tests) set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") endif() diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL index baebc1c59cf635..5de96cd0be31c3 100644 --- a/ports/opencv4/CONTROL +++ b/ports/opencv4/CONTROL @@ -1,6 +1,5 @@ Source: opencv4 -Version: 4.3.0 -Port-Version: 5 +Version: 4.5.0 Build-Depends: zlib Homepage: https://github.com/opencv/opencv Description: computer vision library diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 007ce8a26db024..21f6e227868e17 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -6,25 +6,33 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3") message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3") endif() -set(OPENCV_VERSION "4.3.0") +set(OPENCV_VERSION "4.5.0") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 ac22b41fffa3e3138701fa0df0d19900b3ce72e168f4478ecdc593c5c9fd004b4b1b26612d62c25b681db99a8720db7a11b5b224e576e595624965fa79b0f383 + SHA512 c34100f3f3fe45f2115975350d23288a3badb32864ba0cbd32512387416d1cf10d16d3ef5f3d089d6a1c2be587d788d33997513fc015dbf7d774a622f2d3811f HEAD_REF master PATCHES 0001-disable-downloading.patch 0002-install-options.patch 0003-force-package-requirements.patch 0004-fix-policy-CMP0057.patch - 0006-jpeg2000_getref.patch - 0008-fix-vtk9.patch 0009-fix-uwp.patch 0010-fix-interface_link_libraries.patch # Remove this patch when the next update ) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(TARGET_IS_AARCH64 1) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(TARGET_IS_ARM 1) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(TARGET_IS_X86_64 1) +else() + set(TARGET_IS_X86 1) +endif() + file(REMOVE "${SOURCE_PATH}/cmake/FindCUDNN.cmake") string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) @@ -66,13 +74,6 @@ if("dnn" IN_LIST FEATURES) endif() endif() -#OpenCV on arm on windows platform (non UWP) has serious problems right now. Disabling this module is not enough (remember to put the definition in vcpkg_configure_cmake) -#set(BUILD_opencv_surface_matching ON) -#if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") -# set(BUILD_opencv_surface_matching OFF) -# message(WARNING "The surface_matching module cannot be enabled on ARM architectures") -#endif() - set(BUILD_opencv_gapi ON) if(VCPKG_TARGET_IS_UWP) set(BUILD_opencv_gapi OFF) @@ -135,11 +136,11 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 cfeda06a9f86ccaedbca9521c35bf685c3d8d3a182fb943f9378a7ecd1949d6e2e9df1673f0e3e9686840ca4c9e5a8e8cf2ac962a33b6e1f88f8278abd8c37e5 + SHA512 b2ae72e920c78472fd677281b8dd6f25872399d8ade97b0d3b0fc50bbabea8c00ea849d87bfb311ac148cef663481d0c89c0f6875578c052c1cc7ddcd70e6e17 HEAD_REF master PATCHES 0005-add-missing-stdexcept-include.patch - 0007-fix-vtk9-contrib.patch + 0006-fix-glog-abbreviated-severity.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -289,6 +290,12 @@ vcpkg_configure_cmake( PREFER_NINJA SOURCE_PATH ${SOURCE_PATH} OPTIONS + ###### opencv cpu recognition is broken, always using host and not target: here we bypass that + -DOPENCV_SKIP_SYSTEM_PROCESSOR_DETECTION=TRUE + -DAARCH64=${TARGET_IS_AARCH64} + -DX86_64=${TARGET_IS_X86_64} + -DX86=${TARGET_IS_X86} + -DARM=${TARGET_IS_ARM} ###### ocv_options -DOpenCV_INSTALL_BINARIES_PREFIX= -DOPENCV_BIN_INSTALL_PATH=bin @@ -351,13 +358,15 @@ vcpkg_configure_cmake( ###### customized properties ## Options from vcpkg_check_features() ${FEATURE_OPTIONS} - -DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR} -DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON + -DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR} -DWITH_GTK=OFF -DWITH_IPP=${WITH_IPP} + -DWITH_MATLAB=OFF -DWITH_MSMF=${WITH_MSMF} -DWITH_OPENMP=${WITH_OPENMP} -DWITH_PROTOBUF=${BUILD_opencv_dnn} + -DWITH_OPENCLAMDBLAS=OFF -DWITH_TBB=${WITH_TBB} -DWITH_OPENJPEG=OFF ###### BUILD_options (mainly modules which require additional libraries) @@ -421,12 +430,12 @@ find_dependency(Tesseract)") if("eigen" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(Eigen3 CONFIG)") endif() - if("openexr" IN_LIST FEATURES) - string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)") - endif() if("lapack" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(LAPACK)") endif() + if("openexr" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)") + endif() if(WITH_OPENMP) string(APPEND DEPS_STRING "\nfind_dependency(OpenMP)") endif() @@ -464,6 +473,7 @@ find_dependency(Qt5 COMPONENTS OpenGL Concurrent Test)") file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f4d376c7b3dce1..a44f6881eaff38 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -366,7 +366,7 @@ gdal:x64-windows-static-md=fail geos:arm-uwp=fail geos:x64-uwp=fail -# Port geotrans source ftp://ftp.nga.mil server +# Port geotrans source ftp://ftp.nga.mil server # extremely slow may take several hours to download geotrans:x64-linux = skip geotrans:x64-windows = skip @@ -893,9 +893,9 @@ memorymodule:arm-uwp=fail memorymodule:x64-linux=fail memorymodule:x64-osx=fail memorymodule:x64-uwp=fail -# Due to static crt. +# Due to static crt. mesa:x64-windows-static=fail -# Missing dependent libraries. +# Missing dependent libraries. mesa:x64-linux=fail mesa:x64-osx=fail meschach:arm-uwp=fail @@ -1136,8 +1136,6 @@ opencv3:x64-windows = skip opencv3:x64-windows-static = skip opencv3:x64-windows-static-md=skip opencv3:x86-windows = skip -opencv4:arm64-windows = fail -opencv4:arm-uwp = fail opendnp3:x64-uwp=fail opendnp3:arm-uwp=fail openexr:arm64-windows=fail @@ -1802,7 +1800,6 @@ open62541:x64-windows-static-md=fail pngpp:x64-windows-static-md=fail portmidi:x64-windows-static-md=fail pthreads:x64-windows-static-md=fail -qt5-tools:x64-windows-static-md=fail quantlib:x64-windows-static-md=fail readosm:x64-windows-static-md=fail sentencepiece:x64-windows-static-md=fail diff --git a/versions/baseline.json b/versions/baseline.json index 58d1198f7082bd..a76263660b5bec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4217,12 +4217,12 @@ "port-version": 5 }, "opencv3": { - "baseline": "3.4.10", - "port-version": 5 + "baseline": "3.4.12", + "port-version": 0 }, "opencv4": { - "baseline": "4.3.0", - "port-version": 5 + "baseline": "4.5.0", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.0", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 31859a5aa8ee6f..33d47557a84388 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0dfe03c4db4fb9532b888399deee675750eef61", + "version-string": "3.4.12", + "port-version": 0 + }, { "git-tree": "a761625dd5d17548aaa9611295ace23ca8bc27fc", "version-string": "3.4.10", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index b326830fb5f9d0..5a2934e9d49f23 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf704950d37ce677508db67c081f9aeda18b9cd", + "version-string": "4.5.0", + "port-version": 0 + }, { "git-tree": "f6fbdfab1e9ac01652b51f2251715c2be05a6567", "version-string": "4.3.0", From 027562c1c93e67d43d4215a6bf9e3cb918450136 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Fri, 22 Jan 2021 12:25:40 -0800 Subject: [PATCH 0559/1694] [ceres] Mark all dependencies REQUIRED (#15802) * [ceres] Mark all dependencies REQUIRED * [suitesparse] Fix FindCXSparse.cmake * [ceres] Add version to db Co-authored-by: Robert Schumacher --- ports/ceres/find-package-required.patch | 58 +++++++++++++++++++++++++ ports/ceres/portfile.cmake | 1 + ports/ceres/vcpkg.json | 4 +- ports/suitesparse/CONTROL | 5 --- ports/suitesparse/FindCXSparse.cmake | 8 ++-- ports/suitesparse/vcpkg.json | 11 +++++ versions/baseline.json | 4 +- versions/c-/ceres.json | 5 +++ versions/s-/suitesparse.json | 5 +++ 9 files changed, 87 insertions(+), 14 deletions(-) create mode 100644 ports/ceres/find-package-required.patch delete mode 100644 ports/suitesparse/CONTROL create mode 100644 ports/suitesparse/vcpkg.json diff --git a/ports/ceres/find-package-required.patch b/ports/ceres/find-package-required.patch new file mode 100644 index 00000000000000..aae9cccdd47aa3 --- /dev/null +++ b/ports/ceres/find-package-required.patch @@ -0,0 +1,58 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b6a3d05..a78c027 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -245,7 +245,7 @@ if (EIGEN3_FOUND) + endif (EIGEN3_FOUND) + + if (LAPACK) +- find_package(LAPACK QUIET) ++ find_package(LAPACK REQUIRED) + if (LAPACK_FOUND) + message("-- Found LAPACK library: ${LAPACK_LIBRARIES}") + else (LAPACK_FOUND) +@@ -263,7 +263,7 @@ if (SUITESPARSE) + # built with SuiteSparse support. + + # Check for SuiteSparse and dependencies. +- find_package(SuiteSparse) ++ find_package(SuiteSparse REQUIRED) + if (SUITESPARSE_FOUND) + # On Ubuntu the system install of SuiteSparse (v3.4.0) up to at least + # Ubuntu 13.10 cannot be used to link shared libraries. +@@ -300,7 +300,7 @@ endif (SUITESPARSE) + # CXSparse. + if (CXSPARSE) + # Don't search with REQUIRED as we can continue without CXSparse. +- find_package(CXSparse) ++ find_package(CXSparse REQUIRED) + if (CXSPARSE_FOUND) + # By default, if CXSparse and all dependencies are found, Ceres is + # built with CXSparse support. +@@ -336,7 +336,7 @@ endif(NOT SUITESPARSE AND NOT CXSPARSE AND NOT EIGENSPARSE) + # GFlags. + if (GFLAGS) + # Don't search with REQUIRED as we can continue without gflags. +- find_package(gflags 2.2.0) ++ find_package(gflags REQUIRED) + if (gflags_FOUND) + if (TARGET gflags) + message("-- Found Google Flags (gflags) version ${gflags_VERSION}: ${gflags_DIR}") +@@ -537,7 +537,7 @@ else (NOT OPENMP AND NOT TBB AND NOT CXX11_THREADS) + set_ceres_threading_model("${CERES_THREADING_MODEL}") + + if (BUILD_BENCHMARKS) +- find_package(benchmark QUIET) ++ find_package(benchmark REQUIRED) + if (benchmark_FOUND) + message("-- Found Google benchmark library. Building Ceres benchmarks.") + else() +@@ -782,7 +782,7 @@ if (BUILD_DOCUMENTATION) + set(CERES_DOCS_INSTALL_DIR "share/doc/ceres" CACHE STRING + "Ceres docs install path relative to CMAKE_INSTALL_PREFIX") + +- find_package(Sphinx QUIET) ++ find_package(Sphinx REQUIRED) + if (NOT SPHINX_FOUND) + message("-- Failed to find Sphinx, disabling build of documentation.") + update_cache_variable(BUILD_DOCUMENTATION OFF) diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index e581306236a28b..6b67a7797b7ee8 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_github( 0001_cmakelists_fixes.patch 0002_use_glog_target.patch 0003_fix_exported_ceres_config.patch + find-package-required.patch ) file(REMOVE ${SOURCE_PATH}/cmake/FindCXSparse.cmake) diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json index d89a0179f90fa3..55e5b30e1752d1 100644 --- a/ports/ceres/vcpkg.json +++ b/ports/ceres/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ceres", - "version-string": "2.0.0", - "port-version": 2, + "version-semver": "2.0.0", + "port-version": 3, "description": "non-linear optimization package", "homepage": "https://github.com/ceres-solver/ceres-solver", "dependencies": [ diff --git a/ports/suitesparse/CONTROL b/ports/suitesparse/CONTROL deleted file mode 100644 index 832306d5a8c37f..00000000000000 --- a/ports/suitesparse/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: suitesparse -Version: 5.8.0 -Build-Depends: lapack, metis -Homepage: http://suitesparse.com -Description: algebra library diff --git a/ports/suitesparse/FindCXSparse.cmake b/ports/suitesparse/FindCXSparse.cmake index 94ba41e045f786..65d596acaea2c1 100644 --- a/ports/suitesparse/FindCXSparse.cmake +++ b/ports/suitesparse/FindCXSparse.cmake @@ -33,9 +33,8 @@ include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) -include(${CMAKE_ROOT}/Modules/CMakeFindDependencyMacro.cmake) -find_path(CXSPARSE_INCLUDE_DIR NAMES cs.h) +find_path(CXSPARSE_INCLUDE_DIR NAMES cs.h PATH_SUFFIXES suitesparse) find_library(CXSPARSE_LIBRARY_RELEASE NAMES cxsparse libcxsparse) find_library(CXSPARSE_LIBRARY_DEBUG NAMES cxsparsed libcxsparsed) @@ -65,11 +64,10 @@ endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(CXSparse - REQUIRED_VARS CXSPARSE_INCLUDE_DIRS CXSPARSE_LIBRARIES + REQUIRED_VARS CXSPARSE_INCLUDE_DIR CXSPARSE_LIBRARIES VERSION_VAR CXSPARSE_VERSION) set(CXSPARSE_FOUND ${CXSparse_FOUND}) set(CXSPARSE_INCLUDE_DIRS ${CXSPARSE_INCLUDE_DIR}) -set(CXSPARSE_LIBRARIES ${CXSPARSE_LIBRARY}) set(CXSparse_INCLUDE_DIRS ${CXSPARSE_INCLUDE_DIR}) -set(CXSparse_LIBRARIES ${CXSPARSE_LIBRARY}) +set(CXSparse_LIBRARIES ${CXSPARSE_LIBRARIES}) diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json new file mode 100644 index 00000000000000..71f44d7242847e --- /dev/null +++ b/ports/suitesparse/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "suitesparse", + "version-semver": "5.8.0", + "port-version": 1, + "description": "A suite of sparse matrix algorithms. Also provides libcxsparse.", + "homepage": "http://suitesparse.com", + "dependencies": [ + "lapack", + "metis" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index a76263660b5bec..f24351b870008e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1110,7 +1110,7 @@ }, "ceres": { "baseline": "2.0.0", - "port-version": 2 + "port-version": 3 }, "cfitsio": { "baseline": "3.49", @@ -5570,7 +5570,7 @@ }, "suitesparse": { "baseline": "5.8.0", - "port-version": 0 + "port-version": 1 }, "sundials": { "baseline": "5.5.0", diff --git a/versions/c-/ceres.json b/versions/c-/ceres.json index 5071e44c890c37..0ea9c26c4e584e 100644 --- a/versions/c-/ceres.json +++ b/versions/c-/ceres.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfe64de75017dfef5a1dbd6b034078a0316201c8", + "version-semver": "2.0.0", + "port-version": 3 + }, { "git-tree": "216c1a351f8af9be7952bd5dfcf262a66e24c11e", "version-string": "2.0.0", diff --git a/versions/s-/suitesparse.json b/versions/s-/suitesparse.json index c449b468544b75..8e99fa85061b4a 100644 --- a/versions/s-/suitesparse.json +++ b/versions/s-/suitesparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c709290c9cc6e7635c120dbd5cd9d227408a0ab", + "version-semver": "5.8.0", + "port-version": 1 + }, { "git-tree": "cafd2cb5688d179f1ca502ae8e1ce421db1c7ef5", "version-string": "5.8.0", From b5a53951adb202aaddff33f2ee09e9a9dbf696c7 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Fri, 22 Jan 2021 12:26:01 -0800 Subject: [PATCH 0560/1694] [vcpkg] Fix regression in error messages with registries/versioning (#15709) * [vcpkg] Fix regression in error messages with registries/versioning * [vcpkg] Clean up redundant re-parsing with try_load_overlay_port * [vcpkg] Deduplicate PathsPortfileProvider * [vcpkg] Restore uses of Checks::exit_maybe_upgrade after merge --- toolsrc/include/vcpkg/paragraphs.h | 2 +- toolsrc/include/vcpkg/portfileprovider.h | 26 +- toolsrc/include/vcpkg/registries.h | 2 - toolsrc/src/vcpkg-test/dependencies.cpp | 10 + toolsrc/src/vcpkg/commands.portsdiff.cpp | 3 +- toolsrc/src/vcpkg/paragraphs.cpp | 6 +- toolsrc/src/vcpkg/portfileprovider.cpp | 508 ++++++++++------------- toolsrc/src/vcpkg/registries.cpp | 200 ++++----- 8 files changed, 324 insertions(+), 433 deletions(-) diff --git a/toolsrc/include/vcpkg/paragraphs.h b/toolsrc/include/vcpkg/paragraphs.h index 0293f0733f9927..b376eef816e29c 100644 --- a/toolsrc/include/vcpkg/paragraphs.h +++ b/toolsrc/include/vcpkg/paragraphs.h @@ -56,5 +56,5 @@ namespace vcpkg::Paragraphs LoadResults try_load_all_registry_ports(const VcpkgPaths& paths); std::vector load_all_registry_ports(const VcpkgPaths& paths); - std::vector load_overlay_ports(const VcpkgPaths& paths, const fs::path& dir); + std::vector load_overlay_ports(const Files::Filesystem& fs, const fs::path& dir); } diff --git a/toolsrc/include/vcpkg/portfileprovider.h b/toolsrc/include/vcpkg/portfileprovider.h index d297af73994a7d..979004f94e0d8d 100644 --- a/toolsrc/include/vcpkg/portfileprovider.h +++ b/toolsrc/include/vcpkg/portfileprovider.h @@ -28,18 +28,6 @@ namespace vcpkg::PortFileProvider const std::unordered_map& ports; }; - struct PathsPortFileProvider : Util::ResourceBase, PortFileProvider - { - explicit PathsPortFileProvider(const vcpkg::VcpkgPaths& paths, const std::vector& overlay_ports); - ExpectedS get_control_file(const std::string& src_name) const override; - std::vector load_all_control_files() const override; - - private: - const VcpkgPaths& paths; - std::vector overlay_ports; - mutable std::unordered_map cache; - }; - struct IVersionedPortfileProvider { virtual View get_port_versions(StringView port_name) const = 0; @@ -47,6 +35,7 @@ namespace vcpkg::PortFileProvider virtual ExpectedS get_control_file( const Versions::VersionSpec& version_spec) const = 0; + virtual void load_all_control_files(std::map& out) const = 0; }; struct IBaselineProvider @@ -59,6 +48,19 @@ namespace vcpkg::PortFileProvider { virtual ~IOverlayProvider() = default; virtual Optional get_control_file(StringView port_name) const = 0; + virtual void load_all_control_files(std::map& out) const = 0; + }; + + struct PathsPortFileProvider : Util::ResourceBase, PortFileProvider + { + explicit PathsPortFileProvider(const vcpkg::VcpkgPaths& paths, const std::vector& overlay_ports); + ExpectedS get_control_file(const std::string& src_name) const override; + std::vector load_all_control_files() const override; + + private: + std::unique_ptr m_baseline; + std::unique_ptr m_versioned; + std::unique_ptr m_overlay; }; std::unique_ptr make_baseline_provider(const vcpkg::VcpkgPaths& paths); diff --git a/toolsrc/include/vcpkg/registries.h b/toolsrc/include/vcpkg/registries.h index 74782859dad30f..9c07f1a6092227 100644 --- a/toolsrc/include/vcpkg/registries.h +++ b/toolsrc/include/vcpkg/registries.h @@ -54,8 +54,6 @@ namespace vcpkg View packages() const { return packages_; } const RegistryImplementation& implementation() const { return *implementation_; } - static std::unique_ptr builtin_registry(std::string&& baseline = {}); - friend RegistrySet; // for experimental_set_builtin_registry_baseline private: diff --git a/toolsrc/src/vcpkg-test/dependencies.cpp b/toolsrc/src/vcpkg-test/dependencies.cpp index 8f936abc38e17f..c6241ebe010220 100644 --- a/toolsrc/src/vcpkg-test/dependencies.cpp +++ b/toolsrc/src/vcpkg-test/dependencies.cpp @@ -78,6 +78,11 @@ struct MockVersionedPortfileProvider : PortFileProvider::IVersionedPortfileProvi } return it2->second; } + + virtual void load_all_control_files(std::map&) const override + { + Checks::unreachable(VCPKG_LINE_INFO); + } }; using Versions::Constraint; @@ -190,6 +195,11 @@ struct MockOverlayProvider : PortFileProvider::IOverlayProvider, Util::ResourceB return it->second; } + virtual void load_all_control_files(std::map&) const override + { + Checks::unreachable(VCPKG_LINE_INFO); + } + private: std::map> mappings; }; diff --git a/toolsrc/src/vcpkg/commands.portsdiff.cpp b/toolsrc/src/vcpkg/commands.portsdiff.cpp index 38a1c91cba52f4..18e3a9d910ad4c 100644 --- a/toolsrc/src/vcpkg/commands.portsdiff.cpp +++ b/toolsrc/src/vcpkg/commands.portsdiff.cpp @@ -104,8 +104,7 @@ namespace vcpkg::Commands::PortsDiff System::cmd_execute_and_capture_output(cmd, System::get_clean_environment()); System::cmd_execute_and_capture_output(System::Command(git_exe).string_arg("reset"), System::get_clean_environment()); - const auto ports_at_commit = - Paragraphs::load_overlay_ports(paths, temp_checkout_path / ports_dir_name_as_string); + const auto ports_at_commit = Paragraphs::load_overlay_ports(fs, temp_checkout_path / ports_dir_name_as_string); std::map names_and_versions; for (auto&& port : ports_at_commit) { diff --git a/toolsrc/src/vcpkg/paragraphs.cpp b/toolsrc/src/vcpkg/paragraphs.cpp index 2d28c49d705d6c..dc93ee2db597ff 100644 --- a/toolsrc/src/vcpkg/paragraphs.cpp +++ b/toolsrc/src/vcpkg/paragraphs.cpp @@ -353,6 +353,7 @@ namespace vcpkg::Paragraphs error_info->name = fs::u8string(path.filename()); error_info->error = Strings::format( "Failed to load manifest file for port: %s\n", fs::u8string(path_to_manifest), ec.message()); + return error_info; } return res; @@ -491,13 +492,10 @@ namespace vcpkg::Paragraphs return std::move(results.paragraphs); } - std::vector load_overlay_ports(const VcpkgPaths& paths, const fs::path& directory) + std::vector load_overlay_ports(const Files::Filesystem& fs, const fs::path& directory) { LoadResults ret; - std::vector port_names; - - const auto& fs = paths.get_filesystem(); auto port_dirs = fs.get_files_non_recursive(directory); Util::sort(port_dirs); diff --git a/toolsrc/src/vcpkg/portfileprovider.cpp b/toolsrc/src/vcpkg/portfileprovider.cpp index d2a37c4b3ca619..47aa2976c78845 100644 --- a/toolsrc/src/vcpkg/portfileprovider.cpp +++ b/toolsrc/src/vcpkg/portfileprovider.cpp @@ -57,251 +57,37 @@ namespace vcpkg::PortFileProvider return Util::fmap(ports, [](auto&& kvpair) -> const SourceControlFileLocation* { return &kvpair.second; }); } - PathsPortFileProvider::PathsPortFileProvider(const VcpkgPaths& paths_, - const std::vector& overlay_ports_) - : paths(paths_) + PathsPortFileProvider::PathsPortFileProvider(const VcpkgPaths& paths, const std::vector& overlay_ports) + : m_baseline(make_baseline_provider(paths)) + , m_versioned(make_versioned_portfile_provider(paths)) + , m_overlay(make_overlay_provider(paths, overlay_ports)) { - auto& fs = paths.get_filesystem(); - for (auto&& overlay_path : overlay_ports_) - { - if (!overlay_path.empty()) - { - auto overlay = fs::u8path(overlay_path); - if (overlay.is_absolute()) - { - overlay = fs.canonical(VCPKG_LINE_INFO, overlay); - } - else - { - overlay = fs.canonical(VCPKG_LINE_INFO, paths.original_cwd / overlay); - } - - Debug::print("Using overlay: ", fs::u8string(overlay), "\n"); - - Checks::check_exit( - VCPKG_LINE_INFO, fs.exists(overlay), "Error: Path \"%s\" does not exist", fs::u8string(overlay)); - - Checks::check_exit(VCPKG_LINE_INFO, - fs::is_directory(fs.status(VCPKG_LINE_INFO, overlay)), - "Error: Path \"%s\" must be a directory", - overlay.string()); - - overlay_ports.emplace_back(overlay); - } - } - } - - static std::unique_ptr try_load_overlay_port(const Files::Filesystem& fs, - View overlay_ports, - const std::string& spec) - { - for (auto&& ports_dir : overlay_ports) - { - // Try loading individual port - if (Paragraphs::is_port_directory(fs, ports_dir)) - { - auto maybe_scf = Paragraphs::try_load_port(fs, ports_dir); - if (auto scfp = maybe_scf.get()) - { - auto& scf = *scfp; - if (scf->core_paragraph->name == spec) - { - return std::make_unique(fs::path(ports_dir), scf->to_versiont()); - } - } - else - { - print_error_message(maybe_scf.error()); - Checks::exit_maybe_upgrade( - VCPKG_LINE_INFO, "Error: Failed to load port %s from %s", spec, fs::u8string(ports_dir)); - } - - continue; - } - - auto ports_spec = ports_dir / fs::u8path(spec); - if (Paragraphs::is_port_directory(fs, ports_spec)) - { - auto found_scf = Paragraphs::try_load_port(fs, ports_spec); - if (auto scfp = found_scf.get()) - { - auto& scf = *scfp; - if (scf->core_paragraph->name == spec) - { - return std::make_unique(std::move(ports_spec), scf->to_versiont()); - } - Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, - "Error: Failed to load port from %s: names did not match: '%s' != '%s'", - fs::u8string(ports_spec), - spec, - scf->core_paragraph->name); - } - else - { - print_error_message(found_scf.error()); - Checks::exit_maybe_upgrade( - VCPKG_LINE_INFO, "Error: Failed to load port %s from %s", spec, fs::u8string(ports_dir)); - } - } - } - return nullptr; - } - - static std::pair, Optional> try_load_registry_port_and_baseline( - const VcpkgPaths& paths, const std::string& spec) - { - if (auto registry = paths.get_configuration().registry_set.registry_for_port(spec)) - { - auto entry = registry->get_port_entry(paths, spec); - auto maybe_baseline = registry->get_baseline_version(paths, spec); - if (entry) - { - if (!maybe_baseline) - { - if (entry->get_port_versions().size() == 1) - { - maybe_baseline = entry->get_port_versions()[0]; - } - } - return {std::move(entry), std::move(maybe_baseline)}; - } - else - { - Debug::print("Failed to find port `", spec, "` in registry: no entry found.\n"); - } - } - else - { - Debug::print("Failed to find registry for port: `", spec, "`.\n"); - } - - return {nullptr, nullopt}; } ExpectedS PathsPortFileProvider::get_control_file(const std::string& spec) const { - auto cache_it = cache.find(spec); - if (cache_it == cache.end()) + auto maybe_scfl = m_overlay->get_control_file(spec); + if (auto scfl = maybe_scfl.get()) { - const auto& fs = paths.get_filesystem(); - - std::unique_ptr port; - VersionT port_version; - - auto maybe_overlay_port = try_load_overlay_port(fs, overlay_ports, spec); - if (maybe_overlay_port) - { - port_version = maybe_overlay_port->version; - port = std::move(maybe_overlay_port); - } - else - { - auto maybe_registry_port = try_load_registry_port_and_baseline(paths, spec); - port = std::move(maybe_registry_port.first); - if (auto version = maybe_registry_port.second.get()) - { - port_version = std::move(*version); - } - else if (port) - { - return std::string("No baseline version available."); - } - } - - if (port) - { - auto maybe_port_path = port->get_path_to_version(paths, port_version); - if (!maybe_port_path.has_value()) - { - return std::move(maybe_port_path.error()); - } - auto port_path = std::move(maybe_port_path).value_or_exit(VCPKG_LINE_INFO); - - auto maybe_scfl = Paragraphs::try_load_port(fs, port_path); - if (auto p = maybe_scfl.get()) - { - auto maybe_error = (*p)->check_against_feature_flags(port_path, paths.get_feature_flags()); - if (maybe_error) return std::move(*maybe_error.get()); - - cache_it = - cache.emplace(spec, SourceControlFileLocation{std::move(*p), std::move(port_path)}).first; - } - else - { - return Strings::format("Error: when loading port `%s` from directory `%s`:\n%s\n", - spec, - fs::u8string(port_path), - maybe_scfl.error()->error); - } - } + return *scfl; } - - if (cache_it == cache.end()) + auto maybe_baseline = m_baseline->get_baseline_version(spec); + if (auto baseline = maybe_baseline.get()) { - return std::string("Port definition not found"); + return m_versioned->get_control_file({spec, *baseline}); } else { - return cache_it->second; + return Strings::concat("Error: unable to get baseline for port ", spec); } } std::vector PathsPortFileProvider::load_all_control_files() const { - // Reload cache with ports contained in all ports_dirs - cache.clear(); - std::vector ret; - - for (const fs::path& ports_dir : overlay_ports) - { - // Try loading individual port - if (Paragraphs::is_port_directory(paths.get_filesystem(), ports_dir)) - { - auto maybe_scf = Paragraphs::try_load_port(paths.get_filesystem(), ports_dir); - if (auto scf = maybe_scf.get()) - { - auto port_name = scf->get()->core_paragraph->name; - if (cache.find(port_name) == cache.end()) - { - auto scfl = SourceControlFileLocation{std::move(*scf), ports_dir}; - auto it = cache.emplace(std::move(port_name), std::move(scfl)); - ret.emplace_back(&it.first->second); - } - } - else - { - print_error_message(maybe_scf.error()); - Checks::exit_maybe_upgrade( - VCPKG_LINE_INFO, "Error: Failed to load port from %s", fs::u8string(ports_dir)); - } - continue; - } - - // Try loading all ports inside ports_dir - auto found_scfls = Paragraphs::load_overlay_ports(paths, ports_dir); - for (auto&& scfl : found_scfls) - { - auto port_name = scfl.source_control_file->core_paragraph->name; - if (cache.find(port_name) == cache.end()) - { - auto it = cache.emplace(std::move(port_name), std::move(scfl)); - ret.emplace_back(&it.first->second); - } - } - } - - auto all_ports = Paragraphs::load_all_registry_ports(paths); - for (auto&& scfl : all_ports) - { - auto port_name = scfl.source_control_file->core_paragraph->name; - if (cache.find(port_name) == cache.end()) - { - auto it = cache.emplace(port_name, std::move(scfl)); - ret.emplace_back(&it.first->second); - } - } - - return ret; + std::map m; + m_overlay->load_all_control_files(m); + m_versioned->load_all_control_files(m); + return Util::fmap(m, [](const auto& p) { return p.second; }); } namespace @@ -334,104 +120,158 @@ namespace vcpkg::PortFileProvider { VersionedPortfileProviderImpl(const VcpkgPaths& paths_) : paths(paths_) { } - virtual View get_port_versions(StringView port_name) const override + const ExpectedS>& entry(StringView name) const { - auto entry_it = m_entry_cache.find(port_name.to_string()); - if (entry_it != m_entry_cache.end()) - { - return entry_it->second->get_port_versions(); - } - - auto entry = try_load_registry_port_and_baseline(paths, port_name.to_string()); - if (!entry.first) + auto entry_it = m_entry_cache.find(name); + if (entry_it == m_entry_cache.end()) { - Checks::exit_maybe_upgrade( - VCPKG_LINE_INFO, "Error: Could not find a definition for port %s", port_name); + if (auto reg = paths.get_configuration().registry_set.registry_for_port(name)) + { + if (auto entry = reg->get_port_entry(paths, name)) + { + entry_it = m_entry_cache.emplace(name.to_string(), std::move(entry)).first; + } + else + { + entry_it = + m_entry_cache + .emplace(name.to_string(), + Strings::concat("Error: Could not find a definition for port ", name)) + .first; + } + } + else + { + entry_it = m_entry_cache + .emplace(name.to_string(), + Strings::concat("Error: no registry configured for port ", name)) + .first; + } } - auto it = m_entry_cache.emplace(port_name.to_string(), std::move(entry.first)); - return it.first->second->get_port_versions(); + return entry_it->second; } - ExpectedS get_control_file(const VersionSpec& version_spec) const override + virtual View get_port_versions(StringView port_name) const override { - auto cache_it = m_control_cache.find(version_spec); - if (cache_it != m_control_cache.end()) - { - return cache_it->second; - } + return entry(port_name).value_or_exit(VCPKG_LINE_INFO)->get_port_versions(); + } - auto entry_it = m_entry_cache.find(version_spec.port_name); - if (entry_it == m_entry_cache.end()) + ExpectedS> load_control_file( + const VersionSpec& version_spec) const + { + const auto& maybe_ent = entry(version_spec.port_name); + if (auto ent = maybe_ent.get()) { - auto reg_for_port = - paths.get_configuration().registry_set.registry_for_port(version_spec.port_name); - - if (!reg_for_port) + auto maybe_path = ent->get()->get_path_to_version(paths, version_spec.version); + if (auto path = maybe_path.get()) { - return Strings::format("Error: no registry set up for port %s", version_spec.port_name); + auto maybe_control_file = Paragraphs::try_load_port(paths.get_filesystem(), *path); + if (auto scf = maybe_control_file.get()) + { + if (scf->get()->core_paragraph->name == version_spec.port_name) + { + return std::make_unique(std::move(*scf), std::move(*path)); + } + else + { + return Strings::format("Error: Failed to load port from %s: names did " + "not match: '%s' != '%s'", + fs::u8string(*path), + version_spec.port_name, + scf->get()->core_paragraph->name); + } + } + else + { + // This should change to a soft error when ParseExpected is eliminated. + print_error_message(maybe_control_file.error()); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, + "Error: Failed to load port %s from %s", + version_spec.port_name, + fs::u8string(*path)); + } + } + else + { + return maybe_path.error(); } - - auto entry = reg_for_port->get_port_entry(paths, version_spec.port_name); - entry_it = m_entry_cache.emplace(version_spec.port_name, std::move(entry)).first; } + return maybe_ent.error(); + } - auto maybe_path = entry_it->second->get_path_to_version(paths, version_spec.version); - if (!maybe_path.has_value()) + virtual ExpectedS get_control_file( + const VersionSpec& version_spec) const override + { + auto it = m_control_cache.find(version_spec); + if (it == m_control_cache.end()) { - return std::move(maybe_path).error(); + it = m_control_cache.emplace(version_spec, load_control_file(version_spec)).first; } - auto& port_directory = *maybe_path.get(); + return it->second.map([](const auto& x) -> const SourceControlFileLocation& { return *x.get(); }); + } - auto maybe_control_file = Paragraphs::try_load_port(paths.get_filesystem(), port_directory); - if (auto scf = maybe_control_file.get()) + virtual void load_all_control_files( + std::map& out) const override + { + auto all_ports = Paragraphs::load_all_registry_ports(paths); + for (auto&& scfl : all_ports) { - if (scf->get()->core_paragraph->name == version_spec.port_name) - { - return m_control_cache - .emplace(version_spec, - SourceControlFileLocation{std::move(*scf), std::move(port_directory)}) - .first->second; - } - return Strings::format("Error: Failed to load port from %s: names did not match: '%s' != '%s'", - fs::u8string(port_directory), - version_spec.port_name, - scf->get()->core_paragraph->name); + auto port_name = scfl.source_control_file->core_paragraph->name; + auto version = scfl.source_control_file->core_paragraph->to_versiont(); + auto it = m_control_cache + .emplace(VersionSpec{std::move(port_name), std::move(version)}, + std::make_unique(std::move(scfl))) + .first; + Checks::check_exit(VCPKG_LINE_INFO, it->second.has_value()); + out.emplace(it->first.port_name, it->second.get()->get()); } - - print_error_message(maybe_control_file.error()); - return Strings::format( - "Error: Failed to load port %s from %s", version_spec.port_name, fs::u8string(port_directory)); } private: const VcpkgPaths& paths; // TODO: remove this data member - mutable std::unordered_map m_control_cache; - mutable std::map, std::less<>> m_entry_cache; + mutable std:: + unordered_map>, VersionSpecHasher> + m_control_cache; + mutable std::map>, std::less<>> m_entry_cache; }; struct OverlayProviderImpl : IOverlayProvider, Util::ResourceBase { OverlayProviderImpl(const VcpkgPaths& paths, View overlay_ports) - : paths(paths), m_overlay_ports(Util::fmap(overlay_ports, [&paths](const std::string& s) -> fs::path { + : m_fs(paths.get_filesystem()) + , m_overlay_ports(Util::fmap(overlay_ports, [&paths](const std::string& s) -> fs::path { return Files::combine(paths.original_cwd, fs::u8path(s)); })) { + for (auto&& overlay : m_overlay_ports) + { + auto s_overlay = fs::u8string(overlay); + Debug::print("Using overlay: ", s_overlay, "\n"); + + Checks::check_exit(VCPKG_LINE_INFO, + fs::is_directory(m_fs.status(VCPKG_LINE_INFO, overlay)), + "Error: Overlay path \"%s\" must exist and must be a directory", + s_overlay); + } } - virtual Optional get_control_file(StringView port_name) const override + Optional load_port(StringView port_name) const { - auto it = m_overlay_cache.find(port_name); - if (it == m_overlay_cache.end()) + auto s_port_name = port_name.to_string(); + + for (auto&& ports_dir : m_overlay_ports) { - auto s_port_name = port_name.to_string(); - auto maybe_overlay = try_load_overlay_port(paths.get_filesystem(), m_overlay_ports, s_port_name); - Optional v; - if (maybe_overlay) + // Try loading individual port + if (Paragraphs::is_port_directory(m_fs, ports_dir)) { - auto maybe_scf = Paragraphs::try_load_port(paths.get_filesystem(), maybe_overlay->path); - if (auto scf = maybe_scf.get()) + auto maybe_scf = Paragraphs::try_load_port(m_fs, ports_dir); + if (auto scfp = maybe_scf.get()) { - v = SourceControlFileLocation{std::move(*scf), maybe_overlay->path}; + auto& scf = *scfp; + if (scf->core_paragraph->name == port_name) + { + return SourceControlFileLocation{std::move(scf), fs::path(ports_dir)}; + } } else { @@ -439,16 +279,94 @@ namespace vcpkg::PortFileProvider Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, "Error: Failed to load port %s from %s", port_name, - fs::u8string(maybe_overlay->path)); + fs::u8string(ports_dir)); + } + + continue; + } + + auto ports_spec = ports_dir / fs::u8path(port_name); + if (Paragraphs::is_port_directory(m_fs, ports_spec)) + { + auto found_scf = Paragraphs::try_load_port(m_fs, ports_spec); + if (auto scfp = found_scf.get()) + { + auto& scf = *scfp; + if (scf->core_paragraph->name == port_name) + { + return SourceControlFileLocation{std::move(scf), std::move(ports_spec)}; + } + Checks::exit_maybe_upgrade( + VCPKG_LINE_INFO, + "Error: Failed to load port from %s: names did not match: '%s' != '%s'", + fs::u8string(ports_spec), + port_name, + scf->core_paragraph->name); + } + else + { + print_error_message(found_scf.error()); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, + "Error: Failed to load port %s from %s", + port_name, + fs::u8string(ports_dir)); } } - it = m_overlay_cache.emplace(std::move(s_port_name), std::move(v)).first; + } + return nullopt; + } + + virtual Optional get_control_file(StringView port_name) const override + { + auto it = m_overlay_cache.find(port_name); + if (it == m_overlay_cache.end()) + { + it = m_overlay_cache.emplace(port_name.to_string(), load_port(port_name)).first; } return it->second; } + virtual void load_all_control_files( + std::map& out) const override + { + for (auto&& ports_dir : m_overlay_ports) + { + // Try loading individual port + if (Paragraphs::is_port_directory(m_fs, ports_dir)) + { + auto maybe_scf = Paragraphs::try_load_port(m_fs, ports_dir); + if (auto scfp = maybe_scf.get()) + { + SourceControlFileLocation scfl{std::move(*scfp), fs::path(ports_dir)}; + auto name = scfl.source_control_file->core_paragraph->name; + auto it = m_overlay_cache.emplace(std::move(name), std::move(scfl)).first; + Checks::check_exit(VCPKG_LINE_INFO, it->second.get()); + out.emplace(it->first, it->second.get()); + } + else + { + print_error_message(maybe_scf.error()); + Checks::exit_maybe_upgrade( + VCPKG_LINE_INFO, "Error: Failed to load port from %s", fs::u8string(ports_dir)); + } + + continue; + } + + // Try loading all ports inside ports_dir + auto found_scfls = Paragraphs::load_overlay_ports(m_fs, ports_dir); + for (auto&& scfl : found_scfls) + { + auto name = scfl.source_control_file->core_paragraph->name; + auto it = m_overlay_cache.emplace(std::move(name), std::move(scfl)).first; + Checks::check_exit(VCPKG_LINE_INFO, it->second.get()); + out.emplace(it->first, it->second.get()); + } + } + } + private: - const VcpkgPaths& paths; + const Files::Filesystem& m_fs; const std::vector m_overlay_ports; mutable std::map, std::less<>> m_overlay_cache; }; diff --git a/toolsrc/src/vcpkg/registries.cpp b/toolsrc/src/vcpkg/registries.cpp index 4f6c8c0c2f6fc8..44a6314abcd54c 100644 --- a/toolsrc/src/vcpkg/registries.cpp +++ b/toolsrc/src/vcpkg/registries.cpp @@ -27,8 +27,6 @@ namespace // when `BuiltinRegistryEntry` is using a port tree, it uses the scfl struct GitRegistryEntry final : RegistryEntry { - explicit GitRegistryEntry(std::string&& port_name) : port_name(port_name) { } - View get_port_versions() const override { return port_versions; } ExpectedS get_path_to_version(const VcpkgPaths&, const VersionT& version) const override; @@ -103,36 +101,24 @@ namespace struct BuiltinRegistryEntry final : RegistryEntry { - explicit BuiltinRegistryEntry(std::unique_ptr&& entry) - : git_entry(std::move(entry)), scfl(nullptr) - { - } - explicit BuiltinRegistryEntry(std::unique_ptr&& scfl_) - : git_entry(nullptr), scfl(std::move(scfl_)), scfl_version(scfl->to_versiont()) - { - } - - View get_port_versions() const override + View get_port_versions() const override { return {&version, 1}; } + ExpectedS get_path_to_version(const VcpkgPaths&, const VersionT& v) const override { - if (git_entry) + if (v == version) { - return git_entry->port_versions; - } - else - { - return {&scfl_version, 1}; + return path; } + return {Strings::format("Error: no version entry for %s at version %s.\n" + "We are currently using the version in the ports tree (%s).", + name, + v.to_string(), + version.to_string()), + expected_right_tag}; } - ExpectedS get_path_to_version(const VcpkgPaths&, const VersionT& version) const override; - - // exactly one of these two shall be null - // if we find a versions.json, this shall be non-null and BuiltinRegistryEntry uses git_entry's implementation - std::unique_ptr git_entry; - // otherwise, if we don't find a versions.json, - // we fall back to just using the version in the ports directory, and this is the non-null one - std::unique_ptr scfl; - VersionT scfl_version; // this exists so that we can return a pointer to it + std::string name; + fs::path path; + VersionT version; }; struct FilesystemRegistryEntry final : RegistryEntry @@ -153,7 +139,10 @@ namespace struct BuiltinRegistry final : RegistryImplementation { - BuiltinRegistry(std::string&& baseline) : m_baseline_identifier(std::move(baseline)) { } + BuiltinRegistry(std::string&& baseline) : m_baseline_identifier(std::move(baseline)) + { + Debug::print("BuiltinRegistry initialized with: \"", m_baseline_identifier, "\"\n"); + } std::unique_ptr get_port_entry(const VcpkgPaths& paths, StringView port_name) const override; @@ -205,7 +194,7 @@ namespace }; fs::path relative_path_to_versions(StringView port_name); - ExpectedS> load_versions_file(Files::Filesystem& fs, + ExpectedS> load_versions_file(const Files::Filesystem& fs, VersionDbType vdb, const fs::path& port_versions, StringView port_name, @@ -247,31 +236,34 @@ namespace // { BuiltinRegistry::RegistryImplementation std::unique_ptr BuiltinRegistry::get_port_entry(const VcpkgPaths& paths, StringView port_name) const { - auto versions_path = paths.builtin_registry_versions / relative_path_to_versions(port_name); - if (!m_baseline_identifier.empty() && paths.get_filesystem().exists(versions_path)) + const auto& fs = paths.get_filesystem(); + if (!m_baseline_identifier.empty()) { - auto maybe_version_entries = load_versions_file( - paths.get_filesystem(), VersionDbType::Git, paths.builtin_registry_versions, port_name); - Checks::check_maybe_upgrade( - VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: " + maybe_version_entries.error()); - auto version_entries = std::move(maybe_version_entries).value_or_exit(VCPKG_LINE_INFO); - - auto res = - std::make_unique(std::make_unique(port_name.to_string())); - auto gre = res->git_entry.get(); - for (auto&& version_entry : version_entries) + auto versions_path = paths.builtin_registry_versions / relative_path_to_versions(port_name); + if (fs.exists(versions_path)) { - gre->port_versions.push_back(version_entry.version); - gre->git_trees.push_back(version_entry.git_tree); + auto maybe_version_entries = + load_versions_file(fs, VersionDbType::Git, paths.builtin_registry_versions, port_name); + Checks::check_maybe_upgrade( + VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: " + maybe_version_entries.error()); + auto version_entries = std::move(maybe_version_entries).value_or_exit(VCPKG_LINE_INFO); + + auto gre = std::make_unique(); + gre->port_name = port_name.to_string(); + for (auto&& version_entry : version_entries) + { + gre->port_versions.push_back(version_entry.version); + gre->git_trees.push_back(version_entry.git_tree); + } + return gre; } - return res; } // Fall back to current available version auto port_directory = paths.builtin_ports_directory() / fs::u8path(port_name); - if (paths.get_filesystem().exists(port_directory)) + if (fs.exists(port_directory)) { - auto found_scf = Paragraphs::try_load_port(paths.get_filesystem(), port_directory); + auto found_scf = Paragraphs::try_load_port(fs, port_directory); if (auto scfp = found_scf.get()) { auto& scf = *scfp; @@ -283,8 +275,11 @@ namespace if (scf->core_paragraph->name == port_name) { - return std::make_unique( - std::make_unique(std::move(scf), std::move(port_directory))); + auto res = std::make_unique(); + res->version = scf->core_paragraph->to_versiont(); + res->path = std::move(port_directory); + res->name = std::move(scf->core_paragraph->name); + return res; } Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, "Error: Failed to load port from %s: names did not match: '%s' != '%s'", @@ -355,7 +350,6 @@ namespace } Optional BuiltinRegistry::get_baseline_version(const VcpkgPaths& paths, StringView port_name) const { - Debug::print("Baseline version: \"", m_baseline_identifier, "\"\n"); if (!m_baseline_identifier.empty()) { const auto& baseline = m_baseline.get( @@ -366,32 +360,39 @@ namespace { return it->second; } + return nullopt; } - else + + // if a baseline is not specified, use the ports directory version + auto port_path = paths.builtin_ports_directory() / fs::u8path(port_name); + auto maybe_scf = Paragraphs::try_load_port(paths.get_filesystem(), port_path); + if (auto pscf = maybe_scf.get()) { - // if a baseline is not specified, use the ports directory version - auto maybe_scf = Paragraphs::try_load_port(paths.get_filesystem(), - paths.builtin_ports_directory() / fs::u8path(port_name)); - if (auto pscf = maybe_scf.get()) - { - auto& scf = *pscf; - return scf->to_versiont(); - } - Debug::print("Failed to load port `", port_name, "` from the ports tree: ", maybe_scf.error()->error, "\n"); + auto& scf = *pscf; + return scf->to_versiont(); } - return nullopt; + print_error_message(maybe_scf.error()); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, "Error: failed to load port from %s", fs::u8string(port_path)); } void BuiltinRegistry::get_all_port_names(std::vector& out, const VcpkgPaths& paths) const { - if (!m_baseline_identifier.empty() && paths.get_filesystem().exists(paths.builtin_registry_versions)) + const auto& fs = paths.get_filesystem(); + + if (!m_baseline_identifier.empty() && fs.exists(paths.builtin_registry_versions)) { load_all_port_names_from_registry_versions(out, paths, paths.builtin_registry_versions); } - - for (auto port_directory : fs::directory_iterator(paths.builtin_ports_directory())) + std::error_code ec; + fs::directory_iterator dir_it(paths.builtin_ports_directory(), ec); + Checks::check_exit(VCPKG_LINE_INFO, + !ec, + "Error: failed while enumerating the builtin ports directory %s: %s", + fs::u8string(paths.builtin_ports_directory()), + ec.message()); + for (auto port_directory : dir_it) { - if (!fs::is_directory(paths.get_filesystem().status(VCPKG_LINE_INFO, port_directory))) continue; + if (!fs::is_directory(fs.status(VCPKG_LINE_INFO, port_directory))) continue; auto filename = fs::u8string(port_directory.path().filename()); if (filename == ".DS_Store") continue; out.push_back(filename); @@ -475,7 +476,8 @@ namespace VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: " + maybe_version_entries.error()); auto version_entries = std::move(maybe_version_entries).value_or_exit(VCPKG_LINE_INFO); - auto res = std::make_unique(port_name.to_string()); + auto res = std::make_unique(); + res->port_name = port_name.to_string(); for (auto&& version_entry : version_entries) { res->port_versions.push_back(version_entry.version); @@ -581,49 +583,6 @@ namespace // { RegistryEntry - // { BuiltinRegistryEntry::RegistryEntry - ExpectedS BuiltinRegistryEntry::get_path_to_version(const VcpkgPaths& paths, - const VersionT& version) const - { - if (git_entry) - { - auto it = std::find(git_entry->port_versions.begin(), git_entry->port_versions.end(), version); - if (it == git_entry->port_versions.end()) - { - return { - Strings::concat("Error: No version entry for ", - git_entry->port_name, - " at version ", - version, - ". This may be fixed by updating vcpkg to the latest master via `git " - "pull`.\nAvailable versions:\n", - Strings::join("", - git_entry->port_versions, - [](const VersionT& v) { return Strings::concat(" ", v, "\n"); }), - "\nSee `vcpkg help versioning` for more information."), - expected_right_tag}; - } - - const auto& git_tree = git_entry->git_trees[it - git_entry->port_versions.begin()]; - return paths.git_checkout_port(git_entry->port_name, git_tree, paths.root / fs::u8path(".git")); - } - - if (scfl_version == version) - { - return scfl->source_location; - } - - auto& name = scfl->source_control_file->core_paragraph->name; - return Strings::format( - "Error: no version entry for %s at version %s.\n" - "We are currently using the version in the ports tree (%s), since no %s.json was found in /versions.", - name, - version.to_string(), - scfl->to_versiont().to_string(), - name); - } - // } BuiltinRegistryEntry::RegistryEntry - // { FilesystemRegistryEntry::RegistryEntry ExpectedS FilesystemRegistryEntry::get_path_to_version(const VcpkgPaths&, const VersionT& version) const { @@ -642,11 +601,23 @@ namespace auto it = std::find(port_versions.begin(), port_versions.end(), version); if (it == port_versions.end()) { - return Strings::concat("Error: No version entry for ", port_name, " at version ", version, "."); + // This message suggests that the user updates vcpkg -- this is appropriate for the builtin registry for now + // but needs tweaking for external git registries + return {Strings::concat("Error: No version entry for ", + port_name, + " at version ", + version, + ". This may be fixed by updating vcpkg to the latest master via `git " + "pull`.\nAvailable versions:\n", + Strings::join("", + port_versions, + [](const VersionT& v) { return Strings::concat(" ", v, "\n"); }), + "\nSee `vcpkg help versioning` for more information."), + expected_right_tag}; } const auto& git_tree = git_trees[it - port_versions.begin()]; - return paths.git_checkout_object_from_remote_registry(git_tree); + return paths.git_checkout_port(port_name, git_tree, paths.root / fs::u8path(".git")); } // } GitRegistryEntry::RegistryEntry @@ -956,7 +927,7 @@ namespace return fs::u8path({port_name.byte_at_index(0), '-'}) / port_filename; } - ExpectedS> load_versions_file(Files::Filesystem& fs, + ExpectedS> load_versions_file(const Files::Filesystem& fs, VersionDbType type, const fs::path& registry_versions, StringView port_name, @@ -1090,18 +1061,13 @@ namespace vcpkg "an array of registries", RegistryDeserializer(configuration_directory)); } - std::unique_ptr Registry::builtin_registry(std::string&& baseline) - { - return std::make_unique(std::move(baseline)); - } - Registry::Registry(std::vector&& packages, std::unique_ptr&& impl) : packages_(std::move(packages)), implementation_(std::move(impl)) { Checks::check_exit(VCPKG_LINE_INFO, implementation_ != nullptr); } - RegistrySet::RegistrySet() : default_registry_(Registry::builtin_registry()), registries_() { } + RegistrySet::RegistrySet() : default_registry_(std::make_unique("")) { } const RegistryImplementation* RegistrySet::registry_for_port(StringView name) const { From 4a619a319aa66ab04644109940851ab8bd4fed14 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 22 Jan 2021 23:02:31 +0100 Subject: [PATCH 0561/1694] [tiff] add vcpkg_fixup_pkgconfig for tiff (#15734) * [tiff] add vcpkg_fixup_pkgconfig for tiff * add version * fix tiff deps in *.pc file * update version --- ports/tiff/CONTROL | 1 + ports/tiff/portfile.cmake | 15 +++++++++++++++ versions/baseline.json | 2 +- versions/t-/tiff.json | 5 +++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index f37049768efb92..1eb69723c6a77b 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,5 +1,6 @@ Source: tiff Version: 4.1.0 +Port-Version: 1 Build-Depends: zlib, libjpeg-turbo, liblzma Homepage: https://download.osgeo.org/libtiff Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index ab610d3287484b..7e94ac05a13a05 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -41,7 +41,22 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "-ltiff" "-ltiffd") +endif() + +# Fix dependencies: +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "Version: 4.1.0" "Version: 4.1.0\nRequires.private: liblzma libjpeg") +endif() +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libtiff-4.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "Version: 4.1.0" "Version: 4.1.0\nRequires.private: liblzma libjpeg") +endif() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share diff --git a/versions/baseline.json b/versions/baseline.json index f24351b870008e..c6a99c7cb3d010 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5698,7 +5698,7 @@ }, "tiff": { "baseline": "4.1.0", - "port-version": 0 + "port-version": 1 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 0a4bb5b3c50226..d3ad7ef0aef876 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bb1dc9606c9b3573f08bcf6befad16ac730f287", + "version-string": "4.1.0", + "port-version": 1 + }, { "git-tree": "c2beac2991ae6df4dfeaf0a3b158092a78128214", "version-string": "4.1.0", From f7ed613e3afb978a1b459d585e6359452a1bde51 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 22 Jan 2021 23:11:20 +0100 Subject: [PATCH 0562/1694] [lzo] Install pc file on windows (#15782) * [lzo] Install pc file on windows * add version info * [lzo] Install pc file on windows * add version info --- ports/lzo/CONTROL | 3 ++- ports/lzo/always_install_pc.patch | 13 +++++++++++++ ports/lzo/portfile.cmake | 2 ++ versions/baseline.json | 4 ++-- versions/l-/lzo.json | 5 +++++ 5 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 ports/lzo/always_install_pc.patch diff --git a/ports/lzo/CONTROL b/ports/lzo/CONTROL index 4548ae9bb2a089..fa904083ab12a7 100644 --- a/ports/lzo/CONTROL +++ b/ports/lzo/CONTROL @@ -1,4 +1,5 @@ Source: lzo -Version: 2.10-5 +Version: 2.10 +Port-Version: 6 Homepage: https://www.oberhumer.com/opensource/lzo/ Description: Lossless data compression library diff --git a/ports/lzo/always_install_pc.patch b/ports/lzo/always_install_pc.patch new file mode 100644 index 00000000000000..6750eb681b7826 --- /dev/null +++ b/ports/lzo/always_install_pc.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 98c0a1ad0..85690209c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -290,7 +290,7 @@ if(1) + install(TARGETS ${f} DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/lzo/examples") + endif() + +-if(PKG_CONFIG_FOUND) ++if(1) + configure_file(lzo2.pc.cmakein lzo2.pc @ONLY) + #if(EXISTS "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lzo2.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") diff --git a/ports/lzo/portfile.cmake b/ports/lzo/portfile.cmake index 7c09aaf0c504f3..514c8555a490fa 100644 --- a/ports/lzo/portfile.cmake +++ b/ports/lzo/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES always_install_pc.patch ) set(LZO_STATIC OFF) @@ -26,6 +27,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) diff --git a/versions/baseline.json b/versions/baseline.json index c6a99c7cb3d010..db198be6f94268 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3589,8 +3589,8 @@ "port-version": 0 }, "lzo": { - "baseline": "2.10-5", - "port-version": 0 + "baseline": "2.10", + "port-version": 6 }, "lzokay": { "baseline": "2020-07-30", diff --git a/versions/l-/lzo.json b/versions/l-/lzo.json index a85e5642402100..186064c9b27990 100644 --- a/versions/l-/lzo.json +++ b/versions/l-/lzo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0386bfc83656abde700f2f99732a92e7fd6ac756", + "version-string": "2.10", + "port-version": 6 + }, { "git-tree": "7d19bc8d305faffeba8990d9e6c095ee95b3108d", "version-string": "2.10-5", From 363090d718425c3712962d23159e8b41960f36c6 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Fri, 22 Jan 2021 17:50:18 -0800 Subject: [PATCH 0563/1694] [vcpkg] Improve diagnostics around compiler tracking and toolset errors. 'Fixes' #15823. (#15825) --- toolsrc/include/vcpkg/build.h | 4 +- toolsrc/include/vcpkg/vcpkgpaths.h | 2 + toolsrc/src/vcpkg/build.cpp | 68 ++++++++++++++++++++++-------- toolsrc/src/vcpkg/commands.env.cpp | 2 +- toolsrc/src/vcpkg/vcpkgpaths.cpp | 13 +++++- 5 files changed, 67 insertions(+), 22 deletions(-) diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index e873f0ea272ca6..ed272443596f74 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -232,7 +232,9 @@ namespace vcpkg::Build const VcpkgPaths& m_paths; }; - System::Command make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset); + System::Command make_build_env_cmd(const PreBuildInfo& pre_build_info, + const Toolset& toolset, + View all_toolsets); struct ExtendedBuildResult { diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index 8a97b258e934cf..643baf57e4ad7f 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -148,6 +148,8 @@ namespace vcpkg /// const Toolset& get_toolset(const Build::PreBuildInfo& prebuildinfo) const; + View get_all_toolsets() const; + Files::Filesystem& get_filesystem() const; const System::Environment& get_action_env(const Build::AbiInfo& abi_info) const; diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 8bbb5f2dee68ae..c22c20fea94b76 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -299,11 +299,17 @@ namespace vcpkg::Build if (cmake_system_name == "Windows") return ""; if (cmake_system_name == "WindowsStore") return "store"; - Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, "Unsupported vcvarsall target %s", cmake_system_name); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, + "Error: Could not map VCPKG_CMAKE_SYSTEM_NAME '%s' to a vcvarsall platform. " + "Supported systems are '', 'Windows' and 'WindowsStore'.", + cmake_system_name); } - static CStringView to_vcvarsall_toolchain(const std::string& target_architecture, const Toolset& toolset) + static CStringView to_vcvarsall_toolchain(const std::string& target_architecture, + const Toolset& toolset, + View all_toolsets) { +#if defined(_WIN32) auto maybe_target_arch = System::to_cpu_architecture(target_architecture); Checks::check_maybe_upgrade( VCPKG_LINE_INFO, maybe_target_arch.has_value(), "Invalid architecture string: %s", target_architecture); @@ -318,19 +324,36 @@ namespace vcpkg::Build if (it != toolset.supported_architectures.end()) return it->name; } - Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, - "Unsupported toolchain combination. Target was: %s but supported ones were:\n%s", - target_architecture, - Strings::join(",", toolset.supported_architectures, [](const ToolsetArchOption& t) { - return t.name.c_str(); - })); + System::print2("Error: Unsupported toolchain combination.\n"); + System::print2("Target was ", + target_architecture, + " but the chosen Visual Studio instance supports:\n ", + Strings::join(", ", + toolset.supported_architectures, + [](const ToolsetArchOption& t) { return t.name.c_str(); }), + "\nVcpkg selected ", + fs::u8string(toolset.visual_studio_root_path), + " as the Visual Studio instance.\nDetected instances:\n", + Strings::join("", + all_toolsets, + [](const Toolset& t) { + return Strings::concat(" ", fs::u8string(t.visual_studio_root_path), '\n'); + }), + "\nSee " + "https://github.com/microsoft/vcpkg/blob/master/docs/users/triplets.md#VCPKG_VISUAL_STUDIO_PATH " + "for more information.\n"); + Checks::exit_maybe_upgrade(VCPKG_LINE_INFO); +#else + Checks::exit_with_message(VCPKG_LINE_INFO, + "Error: vcvars-based toolchains are only usable on Windows platforms."); +#endif } #if defined(_WIN32) const System::Environment& EnvCache::get_action_env(const VcpkgPaths& paths, const AbiInfo& abi_info) { - auto build_env_cmd = - make_build_env_cmd(*abi_info.pre_build_info, abi_info.toolset.value_or_exit(VCPKG_LINE_INFO)); + auto build_env_cmd = make_build_env_cmd( + *abi_info.pre_build_info, abi_info.toolset.value_or_exit(VCPKG_LINE_INFO), paths.get_all_toolsets()); const auto& base_env = envs.get_lazy(abi_info.pre_build_info->passthrough_env_vars, [&]() -> EnvMapEntry { std::unordered_map env; @@ -440,7 +463,9 @@ namespace vcpkg::Build }); } - System::Command make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset) + System::Command make_build_env_cmd(const PreBuildInfo& pre_build_info, + const Toolset& toolset, + View all_toolsets) { if (!pre_build_info.using_vcvars()) return {}; @@ -450,7 +475,7 @@ namespace vcpkg::Build tonull = ""; } - const auto arch = to_vcvarsall_toolchain(pre_build_info.target_architecture, toolset); + const auto arch = to_vcvarsall_toolchain(pre_build_info.target_architecture, toolset, all_toolsets); const auto target = to_vcvarsall_target(pre_build_info.cmake_system_name); return System::Command{"cmd"}.string_arg("/c").raw_arg( @@ -566,7 +591,8 @@ namespace vcpkg::Build std::ofstream out_file(stdoutlog.native().c_str(), std::ios::out | std::ios::binary | std::ios::trunc); Checks::check_exit(VCPKG_LINE_INFO, out_file, "Failed to open '%s' for writing", fs::u8string(stdoutlog)); CompilerInfo compiler_info; - System::cmd_execute_and_stream_lines( + std::string buf; + int rc = System::cmd_execute_and_stream_lines( command, [&](StringView s) { static const StringLiteral s_hash_marker = "#COMPILER_HASH#"; @@ -585,6 +611,7 @@ namespace vcpkg::Build compiler_info.id = s.data() + s_id_marker.size(); } Debug::print(s, '\n'); + Strings::append(buf, s, '\n'); out_file.write(s.data(), s.size()).put('\n'); Checks::check_exit( VCPKG_LINE_INFO, out_file, "Error occurred while writing '%s'", fs::u8string(stdoutlog)); @@ -592,19 +619,24 @@ namespace vcpkg::Build env); out_file.close(); - if (compiler_info.hash.empty()) + if (compiler_info.hash.empty() || rc != 0) { Debug::print("Compiler information tracking can be disabled by passing --", VcpkgCmdArguments::FEATURE_FLAGS_ARG, "=-", VcpkgCmdArguments::COMPILER_TRACKING_FEATURE, "\n"); + + System::print2("Error: while detecting compiler information:\nThe log content at ", + fs::u8string(stdoutlog), + " is:\n", + buf); + Checks::exit_with_message(VCPKG_LINE_INFO, + "Error: vcpkg was unable to detect the active compiler's information. See above " + "for the CMake failure output."); } - Checks::check_exit(VCPKG_LINE_INFO, - !compiler_info.hash.empty(), - "Error occurred while detecting compiler information. Pass `--debug` for more information."); - Debug::print("Detecting compiler hash for triplet ", triplet, ": ", compiler_info.hash, "\n"); + Debug::print("Detected compiler hash for triplet ", triplet, ": ", compiler_info.hash, "\n"); return compiler_info; } diff --git a/toolsrc/src/vcpkg/commands.env.cpp b/toolsrc/src/vcpkg/commands.env.cpp index c0bec17dc5d445..f129f02626f813 100644 --- a/toolsrc/src/vcpkg/commands.env.cpp +++ b/toolsrc/src/vcpkg/commands.env.cpp @@ -48,7 +48,7 @@ namespace vcpkg::Commands::Env const Build::PreBuildInfo pre_build_info( paths, triplet, var_provider.get_generic_triplet_vars(triplet).value_or_exit(VCPKG_LINE_INFO)); const Toolset& toolset = paths.get_toolset(pre_build_info); - auto build_env_cmd = Build::make_build_env_cmd(pre_build_info, toolset); + auto build_env_cmd = Build::make_build_env_cmd(pre_build_info, toolset, paths.get_all_toolsets()); std::unordered_map extra_env = {}; const bool add_bin = Util::Sets::contains(options.switches, OPTION_BIN); diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index e6fa3a0a54f54d..b9f1f3f9cd24c6 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -980,8 +980,7 @@ If you wish to silence this error and use classic mode, you can: #if !defined(_WIN32) Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, "Cannot build windows triplets from non-windows."); #else - const std::vector& vs_toolsets = m_pimpl->toolsets.get_lazy( - [this]() { return VisualStudio::find_toolset_instances_preferred_first(*this); }); + View vs_toolsets = get_all_toolsets(); std::vector candidates = Util::fmap(vs_toolsets, [](auto&& x) { return &x; }); const auto tsv = prebuildinfo.platform_toolset.get(); @@ -1029,6 +1028,16 @@ If you wish to silence this error and use classic mode, you can: #endif } + View VcpkgPaths::get_all_toolsets() const + { +#if defined(_WIN32) + return m_pimpl->toolsets.get_lazy( + [this]() { return VisualStudio::find_toolset_instances_preferred_first(*this); }); +#else + return {}; +#endif + } + const System::Environment& VcpkgPaths::get_action_env(const Build::AbiInfo& abi_info) const { return m_pimpl->m_env_cache.get_action_env(*this, abi_info); From b5afcd493be6d90b0d52fda8e4f549dc31693fe5 Mon Sep 17 00:00:00 2001 From: Clare Macrae Date: Mon, 25 Jan 2021 05:37:36 +0000 Subject: [PATCH 0564/1694] [docs] Correct the "new port requests" link in FAQ (#15845) Fixes #15844 --- docs/about/faq.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/about/faq.md b/docs/about/faq.md index 6517774cfce107..2fb169fd3a583b 100644 --- a/docs/about/faq.md +++ b/docs/about/faq.md @@ -1,7 +1,9 @@ # Frequently Asked Questions ## Can I contribute a new library? -Yes! Start out by reading our [contribution guidelines](https://github.com/Microsoft/vcpkg/blob/master/CONTRIBUTING.md). If you want to contribute but don't have a particular library in mind then take a look at the list of [new port requests](https://github.com/Microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+label%3A%22new+port+request+-+consider+making+a+PR%21%22). +Yes! Start out by reading our [contribution guidelines](https://github.com/Microsoft/vcpkg/blob/master/CONTRIBUTING.md). +If you want to contribute but don't have a particular library in mind then take a look at the list +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). From 2d1eece804317e66a71ba67d456b149a96994ce9 Mon Sep 17 00:00:00 2001 From: Francis Lemaire Date: Mon, 25 Jan 2021 01:53:19 -0500 Subject: [PATCH 0565/1694] [gamenetworkingsockets] Add new port (#14937) * Added GameNetworkingSockets port * Fixing requested changes in PR * added `vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)` * added missing trailing newline * removed all entries in ci.baseline.txt Adding license field in manifest Updated library version * Formating manifest * Fixing platform supports in manifest * Refactor to OpenSSL only crypto backend * Fixing format * Adding version Co-authored-by: Andrew Simpson --- ports/gamenetworkingsockets/portfile.cmake | 31 ++++++++++++++++++++++ ports/gamenetworkingsockets/vcpkg.json | 12 +++++++++ versions/baseline.json | 4 +++ versions/g-/gamenetworkingsockets.json | 9 +++++++ 4 files changed, 56 insertions(+) create mode 100644 ports/gamenetworkingsockets/portfile.cmake create mode 100644 ports/gamenetworkingsockets/vcpkg.json create mode 100644 versions/g-/gamenetworkingsockets.json diff --git a/ports/gamenetworkingsockets/portfile.cmake b/ports/gamenetworkingsockets/portfile.cmake new file mode 100644 index 00000000000000..a419c6e46e5519 --- /dev/null +++ b/ports/gamenetworkingsockets/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ValveSoftware/GameNetworkingSockets + REF v1.2.0 + SHA512 d179fd8f221236beb161723ca133c1f7c574f5d8d9364aaa0de27c64c8661b26b17e3395f42f5245276a05a1399146e56e462d3ec1bb23847955225a99f8d2e3 + HEAD_REF master +) + +set(CRYPTO_BACKEND OpenSSL) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DGAMENETWORKINGSOCKETS_BUILD_TESTS=OFF + -DGAMENETWORKINGSOCKETS_BUILD_EXAMPLES=OFF + -DUSE_CRYPTO=${CRYPTO_BACKEND} + -DUSE_CRYPTO25519=${CRYPTO_BACKEND} +) + +vcpkg_install_cmake() +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/GameNetworkingSockets" TARGET_PATH "share/GameNetworkingSockets") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() diff --git a/ports/gamenetworkingsockets/vcpkg.json b/ports/gamenetworkingsockets/vcpkg.json new file mode 100644 index 00000000000000..8daf49b829445b --- /dev/null +++ b/ports/gamenetworkingsockets/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "gamenetworkingsockets", + "version-string": "2020-09-02", + "description": "GameNetworkingSockets is a basic transport layer for games.", + "homepage": "https://github.com/ValveSoftware/GameNetworkingSockets", + "license": "BSD-3-Clause", + "supports": "!(static & windows) & !uwp & !(arm64 & windows)", + "dependencies": [ + "openssl", + "protobuf" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index db198be6f94268..2faf2ad2b139a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2048,6 +2048,10 @@ "baseline": "0.18.1", "port-version": 0 }, + "gamenetworkingsockets": { + "baseline": "2020-09-02", + "port-version": 0 + }, "gamma": { "baseline": "gamma-2018-01-27", "port-version": 2 diff --git a/versions/g-/gamenetworkingsockets.json b/versions/g-/gamenetworkingsockets.json new file mode 100644 index 00000000000000..52d5c8685b2b5b --- /dev/null +++ b/versions/g-/gamenetworkingsockets.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "42d95ab20685b00bc64cad1500f559d5b185a3a5", + "version-string": "2020-09-02", + "port-version": 0 + } + ] +} From a73df4c2435ae92c75d41c24543f90d48c06d859 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 25 Jan 2021 08:01:16 +0100 Subject: [PATCH 0566/1694] [mpc/mpfr] Add new port / update mpfr (#13081) * [mpc] add mpc port * [mpfr] update mpfr to use make. * [gmp] fix preprocessor define for dlls. * more fixes * fix mpfr regression on !windows * install autoconf-archive in provisioning script * change indent of patches Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * fix merge error * update PR * update baseline Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: JackBoosY Co-authored-by: Billy Robert O'Neal III Co-authored-by: Nicole Mazzuca --- ports/gmp/adddef.patch | 12 ++ ports/gmp/portfile.cmake | 12 +- ports/gmp/vcpkg.json | 3 +- ports/mpc/CONTROL | 5 + ports/mpc/gmpd.patch | 15 ++ ports/mpc/portfile.cmake | 27 +++ ports/mpfr/CMakeLists.txt | 281 ------------------------- ports/mpfr/CONTROL | 4 +- ports/mpfr/dll.patch | 13 ++ ports/mpfr/gmpd.patch | 15 ++ ports/mpfr/portfile.cmake | 28 ++- scripts/cmake/vcpkg_acquire_msys.cmake | 10 + versions/baseline.json | 10 +- versions/g-/gmp.json | 5 + versions/m-/mpc.json | 9 + versions/m-/mpfr.json | 5 + 16 files changed, 156 insertions(+), 298 deletions(-) create mode 100644 ports/gmp/adddef.patch create mode 100644 ports/mpc/CONTROL create mode 100644 ports/mpc/gmpd.patch create mode 100644 ports/mpc/portfile.cmake delete mode 100644 ports/mpfr/CMakeLists.txt create mode 100644 ports/mpfr/dll.patch create mode 100644 ports/mpfr/gmpd.patch create mode 100644 versions/m-/mpc.json diff --git a/ports/gmp/adddef.patch b/ports/gmp/adddef.patch new file mode 100644 index 00000000000000..c2276ffc10b2d6 --- /dev/null +++ b/ports/gmp/adddef.patch @@ -0,0 +1,12 @@ +diff --git a/SMP/libgmp.def b/SMP/libgmp.def +index 289f0e2d1..632274ab2 100644 +--- a/SMP/libgmp.def ++++ b/SMP/libgmp.def +@@ -16,6 +16,7 @@ __gmp_randclear + __gmp_urandomb_ui + __gmp_urandomm_ui + __gmp_asprintf ++__gmp_vasprintf + __gmp_fprintf + __gmp_printf + __gmp_snprintf diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index d78d4cc302809c..e57ec460708ede 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -9,9 +9,10 @@ if(VCPKG_TARGET_IS_WINDOWS) REF 0018c44e8dfcc3b64b43e0aea4b3f419f0b65fd0 #v6.2.1-2 SHA512 2405e2536ca9fe0b890f44f54c936ac0e4b5a9ebe6a19e1c48a9c21b7211d2a1b45865852e3c65a98a6735216a4e27bea75c0fd6e52efeed4baecd95da9895a5 HEAD_REF master - PATCHES + PATCHES vs.build.patch runtime.patch + adddef.patch ) include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake) @@ -80,6 +81,11 @@ if(VCPKG_TARGET_IS_WINDOWS) configure_file("${SOURCE_PATH}/gmp.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmp.pc" @ONLY) configure_file("${SOURCE_PATH}/gmpxx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmpxx.pc" @ONLY) vcpkg_fixup_pkgconfig() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gmp.h" + "#if defined(DLL_EXPORT) && defined(NO_ASM)" + "#if 1") + endif() else() vcpkg_download_distfile( ARCHIVE @@ -97,6 +103,7 @@ else() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG + OPTIONS ${OPTIONS} ) vcpkg_install_make() @@ -104,5 +111,6 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -endif() +endif() \ No newline at end of file diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index 19f916179d0419..f19d55d43d3982 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gmp", - "version-string": "6.2.1-2", + "version-string": "6.2.1", + "port-version": 3, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "supports": "windows & !(arm | arm64)", diff --git a/ports/mpc/CONTROL b/ports/mpc/CONTROL new file mode 100644 index 00000000000000..4514e62897dbc6 --- /dev/null +++ b/ports/mpc/CONTROL @@ -0,0 +1,5 @@ +Source: mpc +Version: 1.2.0 +Homepage: http://www.multiprecision.org/mpc/ +Description: GNU MPC is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result. +Build-Depends: gmp, mpfr diff --git a/ports/mpc/gmpd.patch b/ports/mpc/gmpd.patch new file mode 100644 index 00000000000000..b08625777c365f --- /dev/null +++ b/ports/mpc/gmpd.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index ab3da6092..2533df1d8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -151,7 +151,9 @@ AC_CHECK_FUNCS([dup dup2],, + + AC_CHECK_LIB([gmp], [__gmpz_init], + [LIBS="-lgmp $LIBS"], +- [AC_MSG_ERROR([libgmp not found or uses a different ABI (including static vs shared).])]) ++ [AC_CHECK_LIB([gmpd], [__gmpz_init], ++ [LIBS="-lgmpd $LIBS"], ++ [AC_MSG_ERROR([libgmp not found or uses a different ABI (including static vs shared).])])]) + + AC_MSG_CHECKING(for MPFR) + LIBS="-lmpfr $LIBS" diff --git a/ports/mpc/portfile.cmake b/ports/mpc/portfile.cmake new file mode 100644 index 00000000000000..66aeb9f18fd987 --- /dev/null +++ b/ports/mpc/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnu.org/gnu/mpc/mpc-1.2.0.tar.gz" + FILENAME "mpc-1.2.0.tar.gz" + SHA512 84fa3338f51d369111456a63ad040256a1beb70699e21e2a932c779aa1c3bd08b201412c1659ecbb58403ea0548faacc35996d94f88f0639549269b7563c61b7 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES gmpd.patch +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/mpfr/CMakeLists.txt b/ports/mpfr/CMakeLists.txt deleted file mode 100644 index 6664e991ac97a8..00000000000000 --- a/ports/mpfr/CMakeLists.txt +++ /dev/null @@ -1,281 +0,0 @@ -cmake_minimum_required(VERSION 3.3.0) - -project(MPFR VERSION 4.0.2 LANGUAGES C) - -# Find GMP (or MPIR) -find_library(GMP_LIBRARY NAMES gmp mpir) -find_path(GMP_INCLUDE_DIR "gmp.h") - -set(GMP_LIBRARIES ${GMP_LIBRARY}) -set(GMP_INCLUDE_DIRS ${GMP_INCLUDE_DIR}) - -# Sources -set(SRCS - src/abort_prec_max.c - src/acos.c - src/acosh.c - src/add.c - src/add1.c - src/add1sp.c - src/add_d.c - src/add_ui.c - src/agm.c - src/ai.c - src/asin.c - src/asinh.c - src/atan.c - src/atan2.c - src/atanh.c - src/bernoulli.c - src/beta.c - src/buildopt.c - src/cache.c - src/cbrt.c - src/check.c - src/clear.c - src/clears.c - src/cmp.c - src/cmp2.c - src/cmp_abs.c - src/cmp_d.c - src/cmp_ld.c - src/cmp_si.c - src/cmp_ui.c - src/comparisons.c - src/constant.c - src/const_catalan.c - src/const_euler.c - src/const_log2.c - src/const_pi.c - src/copysign.c - src/cos.c - src/cosh.c - src/cot.c - src/coth.c - src/csc.c - src/csch.c - src/digamma.c - src/dim.c - src/div.c - src/div_2exp.c - src/div_2si.c - src/div_2ui.c - src/div_d.c - src/div_ui.c - src/dump.c - src/d_div.c - src/d_sub.c - src/eint.c - src/eq.c - src/erandom.c - src/erf.c - src/erfc.c - src/exceptions.c - src/exp.c - src/exp10.c - src/exp2.c - src/exp3.c - src/expm1.c - src/exp_2.c - src/extract.c - src/factorial.c - src/fits_intmax.c - src/fits_sint.c - src/fits_slong.c - src/fits_sshort.c - src/fits_uint.c - src/fits_uintmax.c - src/fits_ulong.c - src/fits_ushort.c - src/fma.c - src/fmma.c - src/fms.c - src/frac.c - src/free_cache.c - src/frexp.c - src/gamma.c - src/gammaonethird.c - src/gamma_inc.c - src/get_d.c - src/get_d64.c - src/get_exp.c - src/get_f.c - src/get_float128.c - src/get_flt.c - src/get_ld.c - src/get_patches.c - src/get_q.c - src/get_si.c - src/get_sj.c - src/get_str.c - src/get_ui.c - src/get_uj.c - src/get_z.c - src/get_z_exp.c - src/gmp_op.c - src/grandom.c - src/hypot.c - src/init.c - src/init2.c - src/inits.c - src/inits2.c - src/inp_str.c - src/int_ceil_log2.c - src/isinf.c - src/isinteger.c - src/isnan.c - src/isnum.c - src/isqrt.c - src/isregular.c - src/iszero.c - src/jn.c - src/li2.c - src/lngamma.c - src/log.c - src/log10.c - src/log1p.c - src/log2.c - src/logging.c - src/log_ui.c - src/minmax.c - src/min_prec.c - src/modf.c - src/mpfr-gmp.c - src/mpfr-mini-gmp.c - src/mpn_exp.c - src/mp_clz_tab.c - src/mul.c - src/mulders.c - src/mul_2exp.c - src/mul_2si.c - src/mul_2ui.c - src/mul_d.c - src/mul_ui.c - src/neg.c - src/next.c - src/nrandom.c - src/odd_p.c - src/out_str.c - src/pool.c - src/pow.c - src/powerof2.c - src/pow_si.c - src/pow_ui.c - src/pow_z.c - src/printf.c - src/print_raw.c - src/print_rnd_mode.c - src/random_deviate.c - src/rec_sqrt.c - src/reldiff.c - src/rem1.c - src/rint.c - src/rndna.c - src/root.c - src/round_near_x.c - src/round_p.c - src/round_prec.c - src/scale2.c - src/sec.c - src/sech.c - src/set.c - src/setmax.c - src/setmin.c - src/setsign.c - src/set_d.c - src/set_d64.c - src/set_dfl_prec.c - src/set_exp.c - src/set_f.c - src/set_float128.c - src/set_flt.c - src/set_inf.c - src/set_ld.c - src/set_nan.c - src/set_prc_raw.c - src/set_prec.c - src/set_q.c - src/set_rnd.c - src/set_si.c - src/set_si_2exp.c - src/set_sj.c - src/set_str.c - src/set_str_raw.c - src/set_ui.c - src/set_ui_2exp.c - src/set_uj.c - src/set_z.c - src/set_zero.c - src/set_z_exp.c - src/sgn.c - src/signbit.c - src/sin.c - src/sinh.c - src/sinh_cosh.c - src/sin_cos.c - src/si_op.c - src/sqr.c - src/sqrt.c - src/sqrt_ui.c - src/stack_interface.c - src/strtofr.c - src/sub.c - src/sub1.c - src/sub1sp.c - src/subnormal.c - src/sub_d.c - src/sub_ui.c - src/sum.c - src/swap.c - src/tan.c - src/tanh.c - src/ubf.c - src/uceil_exp2.c - src/uceil_log2.c - src/ufloor_log2.c - src/ui_div.c - src/ui_pow.c - src/ui_pow_ui.c - src/ui_sub.c - src/urandom.c - src/urandomb.c - src/vasprintf.c - src/version.c - src/volatile.c - src/yn.c - src/zeta.c - src/zeta_ui.c) - -configure_file("src/mparam_h.in" "mparam.h") - -# Create and configure the target -add_library(mpfr ${SRCS}) - -# target_compile_definitions(mpfr PRIVATE HAVE_CONFIG_H) -target_compile_definitions(mpfr PRIVATE __MPFR_WITHIN_MPFR) -target_compile_definitions(mpfr PRIVATE HAVE_STDINT_H) -target_compile_definitions(mpfr PRIVATE HAVE_STDARG) -if(BUILD_SHARED_LIBS) - target_compile_definitions(mpfr PRIVATE __GMP_LIBGMP_DLL) -endif() - -target_link_libraries(mpfr ${GMP_LIBRARIES}) - -target_include_directories(mpfr PUBLIC ${GMP_INCLUDE_DIRS}) -target_include_directories(mpfr PRIVATE ${CMAKE_BINARY_DIR}) -target_include_directories(mpfr PRIVATE ${PROJECT_SOURCE_DIR}) -target_include_directories(mpfr PRIVATE ${PROJECT_SOURCE_DIR}/src) - -# Install -install( - TARGETS mpfr - EXPORT MPFRExports - RUNTIME DESTINATION "bin" - LIBRARY DESTINATION "lib" - ARCHIVE DESTINATION "lib" - ) - -install( - FILES src/mpfr.h - DESTINATION "include" -) diff --git a/ports/mpfr/CONTROL b/ports/mpfr/CONTROL index 050de1d058887d..487e6cef0b091b 100644 --- a/ports/mpfr/CONTROL +++ b/ports/mpfr/CONTROL @@ -1,5 +1,5 @@ Source: mpfr -Version: 4.0.2-2 +Version: 4.1.0 Homepage: https://www.mpfr.org Description: The MPFR library is a C library for multiple-precision floating-point computations with correct rounding -Build-Depends: mpir +Build-Depends: gmp diff --git a/ports/mpfr/dll.patch b/ports/mpfr/dll.patch new file mode 100644 index 00000000000000..3b6eff519aa978 --- /dev/null +++ b/ports/mpfr/dll.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index fdee5978d..0791b2528 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -593,7 +593,7 @@ case $host in + AC_MSG_CHECKING(for DLL/static GMP) + if test "$enable_shared" = yes; then + MPFR_LDFLAGS="$MPFR_LDFLAGS -no-undefined" +- LIBMPFR_LDFLAGS="$LIBMPFR_LDFLAGS -Wl,--output-def,.libs/libmpfr-6.dll.def" ++ LIBMPFR_LDFLAGS="$LIBMPFR_LDFLAGS -W1,--no-undefined" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include "gmp.h" + #if !__GMP_LIBGMP_DLL diff --git a/ports/mpfr/gmpd.patch b/ports/mpfr/gmpd.patch new file mode 100644 index 00000000000000..d34027d36496b1 --- /dev/null +++ b/ports/mpfr/gmpd.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index ea92c1f97..9621a70e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -693,8 +693,9 @@ See 'config.log' for details (search for GMP_NUMB_BITS).])], + + dnl Check if we can link with GMP + AC_CHECK_LIB(gmp, __gmpz_init, [LIBS="-lgmp $LIBS"], ++ [AC_CHECK_LIB(gmpd, __gmpz_init, [LIBS="-lgmpd $LIBS"], + [AC_MSG_ERROR([libgmp not found or uses a different ABI (including static vs shared). +-Please read the INSTALL file -- see "In case of problem".])]) ++Please read the INSTALL file -- see "In case of problem".])])]) + + dnl Check for corresponding 'gmp.h' and libgmp + AC_MSG_CHECKING(if gmp.h version and libgmp version are the same) diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index 2e202a578780fe..82512c96021570 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -1,25 +1,35 @@ +set(VERSION 4.1.0) vcpkg_download_distfile(ARCHIVE - URLS "http://www.mpfr.org/mpfr-4.0.2/mpfr-4.0.2.tar.xz" "https://ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.xz" - FILENAME "mpfr-4.0.2.tar.xz" - SHA512 d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88 + URLS "http://www.mpfr.org/mpfr-${VERSION}/mpfr-${VERSION}.tar.xz" "https://ftp.gnu.org/gnu/mpfr/mpfr-${VERSION}.tar.xz" + FILENAME "mpfr-${VERSION}.tar.xz" + SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES + gmpd.patch + dll.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -vcpkg_configure_cmake( +file(REMOVE_RECURSE "${SOURCE_PATH}/m4") +vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + AUTOCONFIG + ADDITIONAL_MSYS_PACKAGES texinfo gettext autoconf-archive ) -vcpkg_install_cmake() +vcpkg_install_make() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mpfr.pc" AND VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mpfr.pc" " -lgmp" " -lgmpd") +endif() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 552269278dcaaf..70259991bccbc3 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -162,6 +162,11 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) SHA512 2d0a60f2c384e3b9e2bed2212867c85333545e51ee0f583a33914e488e43c265ed0017cd4430a6e3dafdca99c0414b3756a4b9cc92a6f04d5566eff8b68def75 DEPS msys2-runtime ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/texinfo-6.7-1-x86_64.pkg.tar.xz" + SHA512 d352e06c916ab5d8e34722a8d8bb93ff975525349c9bdf8206e472d93b25158134f97ba5101ffd0d32cd8d88522c0935d3c83847e759aa5376a2276aa2a392b3 + DEPS bash perl + ) msys_package( URL "https://repo.msys2.org/msys/x86_64/bash-4.4.023-2-x86_64.pkg.tar.xz" SHA512 1cf2a07022113010e00e150e7004732013a793d49e7a6ac7c2be27a0b2c0ce3366150584b9974e30df042f8876a84d6a77c1a46f0607e38ebe18f8a25f51c32d @@ -172,6 +177,11 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) SHA512 66b9c97bd3d1dfe2a2ab576235b6b8c204a9e4c099ba14cf5d0139e564bba1e735e3b1083354b4cac8c6c42233cbdd5e1e277e32cadfe24017b94d2fbdeb5617 DEPS m4 ) + msys_package( + URL "https://repo.msys2.org/msys/x86_64/autoconf-archive-2019.01.06-1-any.pkg.tar.xz" + SHA512 77540d3d3644d94a52ade1f5db27b7b4b5910bbcd6995195d511378ca6d394a1dd8d606d57161c744699e6c63c5e55dfe6e8664d032cc8c650af9fdbb2db08b0 + DEPS m4 + ) msys_package( URL "https://repo.msys2.org/msys/x86_64/diffutils-3.7-1-x86_64.pkg.tar.xz" SHA512 0c39837a26b2111bb6310cdfe0bc14656e3d57456ad8023f59c9386634a8f1f236915c79a57348b64c508897c73ed88d8abce2b9ac512a427e9a3956939f2040 diff --git a/versions/baseline.json b/versions/baseline.json index 2faf2ad2b139a7..7ac985820145e0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2205,8 +2205,8 @@ "port-version": 0 }, "gmp": { - "baseline": "6.2.1-2", - "port-version": 0 + "baseline": "6.2.1", + "port-version": 3 }, "google-cloud-cpp": { "baseline": "1.23.0", @@ -3836,8 +3836,12 @@ "baseline": "1.4.0", "port-version": 0 }, + "mpc": { + "baseline": "1.2.0", + "port-version": 0 + }, "mpfr": { - "baseline": "4.0.2-2", + "baseline": "4.1.0", "port-version": 0 }, "mpg123": { diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index db8776cc2fa8bf..1ba3f1ed5ea03a 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b7459d7ea886b86c9c80890c0b697df9df3cce1", + "version-string": "6.2.1", + "port-version": 3 + }, { "git-tree": "7f067caae5b946b5906abdfee1fb72b53922fef5", "version-string": "6.2.1-2", diff --git a/versions/m-/mpc.json b/versions/m-/mpc.json new file mode 100644 index 00000000000000..240192016834bf --- /dev/null +++ b/versions/m-/mpc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "82cc965290366b6d4cbc8996a8b9e335769920c8", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/m-/mpfr.json b/versions/m-/mpfr.json index 67ba0c0a479395..84a29abfe3772b 100644 --- a/versions/m-/mpfr.json +++ b/versions/m-/mpfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6cb77c01fbda04c72b1767e3fbd79078bd29895e", + "version-string": "4.1.0", + "port-version": 0 + }, { "git-tree": "7eefb0bc78d4e4422f50379f1ccd05f13c3ed8c2", "version-string": "4.0.2-2", From 65ea57c5873e774959071101a0f6f66351addceb Mon Sep 17 00:00:00 2001 From: dweckmann Date: Mon, 25 Jan 2021 08:06:50 +0100 Subject: [PATCH 0567/1694] [openigtlink] Fix cmake config location (#15500) --- ports/openigtlink/CONTROL | 2 ++ ports/openigtlink/portfile.cmake | 4 +--- versions/baseline.json | 2 +- versions/o-/openigtlink.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/openigtlink/CONTROL b/ports/openigtlink/CONTROL index 488c4061b02371..46af2d45efc5cc 100644 --- a/ports/openigtlink/CONTROL +++ b/ports/openigtlink/CONTROL @@ -1,3 +1,5 @@ Source: openigtlink Version: 3.0 +Port-Version: 1 +Homepage: https://github.com/openigtlink/OpenIGTLink Description: OpenIGTLink is an open-source network communication interface specifically designed for image-guided interventions. diff --git a/ports/openigtlink/portfile.cmake b/ports/openigtlink/portfile.cmake index 532d8661e233f7..e5e6dd466c35dc 100644 --- a/ports/openigtlink/portfile.cmake +++ b/ports/openigtlink/portfile.cmake @@ -11,14 +11,12 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF + -DOpenIGTLink_INSTALL_PACKAGE_DIR=share/${PORT} ) vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/igtl/cmake) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) vcpkg_copy_pdbs() diff --git a/versions/baseline.json b/versions/baseline.json index 7ac985820145e0..95bc7f6c6b4ff5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4250,7 +4250,7 @@ }, "openigtlink": { "baseline": "3.0", - "port-version": 0 + "port-version": 1 }, "openimageio": { "baseline": "2.2.10.0", diff --git a/versions/o-/openigtlink.json b/versions/o-/openigtlink.json index cb4c0f95aa37d3..50418027fb8bd4 100644 --- a/versions/o-/openigtlink.json +++ b/versions/o-/openigtlink.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f814a06b22cc250df4eb31553c6df7a803567b7", + "version-string": "3.0", + "port-version": 1 + }, { "git-tree": "df766287f1c9c4d379143fab2456a64ae7ae8452", "version-string": "3.0", From 9c6842f8643c3a92d47e51524930feb6d99f9b7a Mon Sep 17 00:00:00 2001 From: Kevin Lalumiere Date: Mon, 25 Jan 2021 02:11:02 -0500 Subject: [PATCH 0568/1694] [vcpkg] Allow to use Nuget's cache for Nuget binary caching sources (fix #15169) (#15512) * Fix warning on clang version 10.0.0-4ubuntu1 The warning was ```shell ../src/vcpkg/commands.porthistory.cpp:55:14: error: unused function 'is_date' [-Werror,-Wunused-function] ``` * Add environment variable VCPKG_USE_NUGET_CACHE As the name suggests, this environment variable allow tu use Nuget cache for Nuget binary caching sources. * Document NuGet's Cache environment variable --- docs/users/binarycaching.md | 4 ++++ docs/users/config-environment.md | 4 ++++ toolsrc/src/vcpkg/binarycaching.cpp | 21 +++++++++++++++++---- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/docs/users/binarycaching.md b/docs/users/binarycaching.md index ed051b71636b30..07e238f925635f 100644 --- a/docs/users/binarycaching.md +++ b/docs/users/binarycaching.md @@ -197,6 +197,10 @@ or ``` if the appropriate environment variables are defined and non-empty. This is specifically used to associate packages in GitHub Packages with the _building_ project and not intended to associate with the original package sources. +#### NuGet's cache + +NuGet's cache is not used by default. To use it for every nuget-based source, set the [environment variable](config-environment.md) `VCPKG_USE_NUGET_CACHE` to `true` (case-insensitive) or `1`. + ## Implementation Notes (internal details subject to change without notice) Binary caching relies on hashing everything that contributes to a particular package build. This includes: diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md index 813d2f4de886bc..309a7865426bc6 100644 --- a/docs/users/config-environment.md +++ b/docs/users/config-environment.md @@ -78,3 +78,7 @@ This environment variable adds or removes binary sources. See [Binary Caching](b #### VCPKG_NUGET_REPOSITORY 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. diff --git a/toolsrc/src/vcpkg/binarycaching.cpp b/toolsrc/src/vcpkg/binarycaching.cpp index 58d0584c42f787..280a5be28ba7ad 100644 --- a/toolsrc/src/vcpkg/binarycaching.cpp +++ b/toolsrc/src/vcpkg/binarycaching.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -415,7 +416,11 @@ namespace , m_read_configs(std::move(read_configs)) , m_write_configs(std::move(write_configs)) , m_interactive(interactive) + , m_use_nuget_cache(false) { + const std::string use_nuget_cache = System::get_environment_variable("VCPKG_USE_NUGET_CACHE").value_or(""); + m_use_nuget_cache = Strings::case_insensitive_ascii_equals(use_nuget_cache, "true") || + Strings::case_insensitive_ascii_equals(use_nuget_cache, "1"); } int run_nuget_commandline(const System::Command& cmdline) @@ -531,9 +536,7 @@ namespace .string_arg("-Source") .string_arg(Strings::join(";", m_read_sources)) .string_arg("-ExcludeVersion") - .string_arg("-NoCache") .string_arg("-PreRelease") - .string_arg("-DirectDownload") .string_arg("-PackageSaveMode") .string_arg("nupkg") .string_arg("-Verbosity") @@ -543,6 +546,10 @@ namespace { cmdline.string_arg("-NonInteractive"); } + if (!m_use_nuget_cache) + { + cmdline.string_arg("-DirectDownload").string_arg("-NoCache"); + } cmdlines.push_back(std::move(cmdline)); } @@ -561,9 +568,7 @@ namespace .string_arg("-ConfigFile") .path_arg(cfg) .string_arg("-ExcludeVersion") - .string_arg("-NoCache") .string_arg("-PreRelease") - .string_arg("-DirectDownload") .string_arg("-PackageSaveMode") .string_arg("nupkg") .string_arg("-Verbosity") @@ -573,6 +578,10 @@ namespace { cmdline.string_arg("-NonInteractive"); } + if (!m_use_nuget_cache) + { + cmdline.string_arg("-DirectDownload").string_arg("-NoCache"); + } cmdlines.push_back(std::move(cmdline)); } @@ -735,6 +744,7 @@ namespace std::set m_restored; bool m_interactive; + bool m_use_nuget_cache; }; } @@ -1429,6 +1439,9 @@ void vcpkg::help_topic_binary_caching(const VcpkgPaths&) "\n" "if the appropriate environment variables are defined and non-empty.\n"); tbl.blank(); + tbl.text("NuGet's cache is not used by default. To use it for every nuget-based source, set the environment " + "variable `VCPKG_USE_NUGET_CACHE` to `true` (case-insensitive) or `1`.\n"); + tbl.blank(); System::print2(tbl.m_str); const auto& maybe_cachepath = default_cache_path(); if (auto p = maybe_cachepath.get()) From 2dbf797582f0f35c1ceb7dbf7550fd6f10536cb0 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Mon, 25 Jan 2021 14:21:41 +0700 Subject: [PATCH 0569/1694] [sdl2] Fix improper replacement of -lSDL2main + remove IGNORE_FLAGS and SYSTEM_LIBRARIES (#15540) * [sdl2] Proper replacement of -lSDL2main -> -lSDL2maind * [sdl2] Add extra SYSTEM_LIBRARIES and IGNORE_FLAGS * [sdl2] Remove SYSTEM_LIBRARIES and IGNORE_FLAGS * update baseline Co-authored-by: JackBoosY --- ports/sdl2/portfile.cmake | 12 ++++-------- ports/sdl2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sdl2.json | 5 +++++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 755160e8b462cb..2bd389c3f5b411 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -71,9 +71,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME) file(GLOB SHARE_FILES ${CURRENT_PACKAGES_DIR}/share/sdl2/*.cmake) foreach(SHARE_FILE ${SHARE_FILES}) - file(READ "${SHARE_FILE}" _contents) - string(REPLACE "lib/SDL2main" "lib/manual-link/SDL2main" _contents "${_contents}") - file(WRITE "${SHARE_FILE}" "${_contents}") + vcpkg_replace_string("${SHARE_FILE}" "lib/SDL2main" "lib/manual-link/SDL2main") endforeach() endif() @@ -89,10 +87,8 @@ string(REGEX REPLACE ${DYLIB_COMPATIBILITY_VERSION_REGEX} "\\1" DYLIB_COMPATIBIL string(REGEX REPLACE ${DYLIB_CURRENT_VERSION_REGEX} "\\1" DYLIB_CURRENT_VERSION "${DYLIB_CURRENT_VERSION}") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2" "-lSDL2d") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2main" "-lSDL2maind") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2 " "-lSDL2d ") endif() -vcpkg_fixup_pkgconfig( - IGNORE_FLAGS "-Wl,-rpath,${CURRENT_PACKAGES_DIR}/lib/pkgconfig/../../lib" "-Wl,-rpath,${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/../../lib" "-Wl,--enable-new-dtags" "-Wl,--no-undefined" "-Wl,-undefined,error" "-Wl,-compatibility_version,${DYLIB_COMPATIBILITY_VERSION}" "-Wl,-current_version,${DYLIB_CURRENT_VERSION}" "-Wl,-weak_framework,Metal" "-Wl,-weak_framework,QuartzCore" - SYSTEM_LIBRARIES dbus-1 -) +vcpkg_fixup_pkgconfig() diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 55562888b1ea4f..e9b899dd3d0e93 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2", "version-string": "2.0.14", + "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", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 95bc7f6c6b4ff5..8bd6cd9eda0d8d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5202,7 +5202,7 @@ }, "sdl2": { "baseline": "2.0.14", - "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 7559dc6ac67c64..61ec9118b8a081 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d5fa523a69780e41605b585788d212d688f3c71", + "version-string": "2.0.14", + "port-version": 1 + }, { "git-tree": "10ed256500fea4cd6cc5d3e6c6b5f2e9e364d78b", "version-string": "2.0.14", From 33ca3c3d9b65ade24e11ee824ff7768ff904008d Mon Sep 17 00:00:00 2001 From: dweckmann Date: Mon, 25 Jan 2021 08:35:49 +0100 Subject: [PATCH 0570/1694] [vtk] use patch for QT_NO_KEYWORDS support from upstream (#15667) --- ...-QT_NO_KEYWORDS-builds-by-VTK-itself.patch | 33 +++++++++++++++++++ ports/vtk/CONTROL | 2 +- ports/vtk/portfile.cmake | 11 +++++++ versions/baseline.json | 2 +- versions/v-/vtk.json | 5 +++ 5 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 ports/vtk/0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch diff --git a/ports/vtk/0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch b/ports/vtk/0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch new file mode 100644 index 00000000000000..56472dbff3bfb2 --- /dev/null +++ b/ports/vtk/0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch @@ -0,0 +1,33 @@ +From 20dd0370d7ad685b7fbdb1625ffec60c940980f3 Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Fri, 17 Apr 2020 15:02:15 -0400 +Subject: [PATCH 2/2] Qt: enforce QT_NO_KEYWORDS builds by VTK itself + +--- + GUISupport/Qt/CMakeLists.txt | 1 + + Views/Qt/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/GUISupport/Qt/CMakeLists.txt b/GUISupport/Qt/CMakeLists.txt +index bfa63a94f1..3fc6fe4bd9 100644 +--- a/GUISupport/Qt/CMakeLists.txt ++++ b/GUISupport/Qt/CMakeLists.txt +@@ -47,4 +47,5 @@ vtk_module_add_module(VTK::GUISupportQt + HEADERS ${headers} + PRIVATE_HEADERS ${private_headers}) + ++vtk_module_definitions(VTK::GUISupportQt PRIVATE QT_NO_KEYWORDS) + vtk_module_link(VTK::GUISupportQt PUBLIC Qt5::Widgets) +diff --git a/Views/Qt/CMakeLists.txt b/Views/Qt/CMakeLists.txt +index 7684118e40..b697571dd2 100644 +--- a/Views/Qt/CMakeLists.txt ++++ b/Views/Qt/CMakeLists.txt +@@ -17,4 +17,5 @@ set(CMAKE_AUTOMOC 1) + vtk_module_add_module(VTK::ViewsQt + CLASSES ${classes}) + ++vtk_module_definitions(VTK::ViewsQt PRIVATE QT_NO_KEYWORDS) + vtk_module_link(VTK::ViewsQt PRIVATE Qt5::Widgets) +-- +2.30.0.windows.1 + diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index feceb9d014b41b..1c1bca6707e215 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,6 +1,6 @@ Source: vtk Version: 9.0.1 -Port-Version: 3 +Port-Version: 4 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5[core], libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg, pegtl-2 diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index cd403bcb649b1b..9f75240c5d5dd5 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -109,6 +109,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # ============================================================================= # Clone & patch + +# This patch is huge, we prefer to download it on demand +vcpkg_download_distfile(QT_NO_KEYWORDS_PATCH + URLS "https://github.com/Kitware/VTK/commit/64265c5fd1a8e26a6a81241284dea6b3272f6db6.diff" + FILENAME 64265c5fd1a8e26a6a81241284dea6b3272f6db6.diff + SHA512 08991f07b30b893b14e906017b77fb700a8298a3a8906086a0c4b67688c1c0431b3d6bf890df70bd3ebf963cbb9c035b5dbcb9d7593e8c716c3a594ccb9a0fc7 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Kitware/VTK @@ -130,6 +138,9 @@ vcpkg_from_github( # Last patch TODO: Patch out internal loguru FindExpat.patch # The find_library calls are taken care of by vcpkg-cmake-wrapper.cmake of expat fix-freetype.patch # Should be fixed next version, !7367 + !7434 + # Remove these 2 official patches in the next update + ${QT_NO_KEYWORDS_PATCH} + 0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch ) # ============================================================================= diff --git a/versions/baseline.json b/versions/baseline.json index 8bd6cd9eda0d8d..7565cc7ba78609 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6046,7 +6046,7 @@ }, "vtk": { "baseline": "9.0.1", - "port-version": 3 + "port-version": 4 }, "vtk-dicom": { "baseline": "0.8.12-1", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 5457ab3f3482ce..84c38d33f33c24 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94667926df104c70c0229cc96b36ec41f3911853", + "version-string": "9.0.1", + "port-version": 4 + }, { "git-tree": "6f325c609afb0c171d6d70c965e041f8c7288bd3", "version-string": "9.0.1", From 61e591145bf13e14785425560198a251f4f6e2a9 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 25 Jan 2021 04:37:22 -0300 Subject: [PATCH 0571/1694] Fix Mbed TLS build for Android (#15680) * Fix Mbed TLS build for Android * Fix Mbed TLS build for Android Add better Windows checks * Fix libssh build for Android * update baseline * Remove redundant parameter * Fix version * Fix version * Fix paramters * Fix version * Better Android support * Fix version * Disable warnings as errors for Mbed TLS * Restore formatting * Fix version files Co-authored-by: Ahmed Yarub Hani Al Nuaimi Co-authored-by: JackBoosY Co-authored-by: Nicole Mazzuca --- ports/mbedtls/CONTROL | 2 +- ports/mbedtls/portfile.cmake | 5 +++-- versions/baseline.json | 2 +- versions/m-/mbedtls.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/mbedtls/CONTROL b/ports/mbedtls/CONTROL index 74164ea10f3f18..dc8bded7bbfe11 100644 --- a/ports/mbedtls/CONTROL +++ b/ports/mbedtls/CONTROL @@ -1,6 +1,6 @@ Source: mbedtls Version: 2.24.0 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/ARMmbed/mbedtls Description: An open source, portable, easy to use, readable and flexible SSL library Supports: !uwp diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index 196f7c08bfc395..3bd961fbce827f 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -25,6 +25,7 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF + -DMBEDTLS_FATAL_WARNINGS=FALSE ) vcpkg_install_cmake() @@ -33,8 +34,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -if(WIN32 AND pthreads IN_LIST FEATURES) +if (VCPKG_TARGET_IS_WINDOWS AND pthreads IN_LIST FEATURES) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -endif() +endif () vcpkg_copy_pdbs() \ No newline at end of file diff --git a/versions/baseline.json b/versions/baseline.json index 7565cc7ba78609..a06db4fb0de4ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3658,7 +3658,7 @@ }, "mbedtls": { "baseline": "2.24.0", - "port-version": 1 + "port-version": 2 }, "mcpp": { "baseline": "2.7.2.14", diff --git a/versions/m-/mbedtls.json b/versions/m-/mbedtls.json index 4eb92bc5958cdc..6498c4d2c107a9 100644 --- a/versions/m-/mbedtls.json +++ b/versions/m-/mbedtls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1591b930b769b43c14a193282eb85e9a7c51a47", + "version-string": "2.24.0", + "port-version": 2 + }, { "git-tree": "8b510a700284731a6f552ff2cd874794af4032ff", "version-string": "2.24.0", From 19624388464a3c17e4e35e8d9101c7e3ec7977f0 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 25 Jan 2021 04:42:44 -0300 Subject: [PATCH 0572/1694] [libssh] Add support for Android (#15687) * Fix Mbed TLS build for Android * Fix Mbed TLS build for Android Add better Windows checks * Fix libssh build for Android * Fix libssh build for Android * Fix versioning * update baseline * Update ports/libssh/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update port_versions/l-/libssh.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update port_versions/baseline.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/libssh/CONTROL * Update port_versions * Revert version changes to master * Update CONTROL version * Update libssh versions * Remove redundant parameter * Remove redundant parameter * Fix version * Fix version * Fix paramters * Fix version * Fix dependencies * Fix versions * Better Android support * Fix version * Simpler Android support * Fix versions * Disable warnings as errors for Mbed TLS * Restore formatting * Update ports/libssh/CONTROL Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Remove redundant paramter * Fix version files * Fix version files * Fix libssh build for Android * Fix versioning * Update ports/libssh/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update port_versions/l-/libssh.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update port_versions/baseline.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/libssh/CONTROL * Update port_versions * Revert version changes to master * Update CONTROL version * Update libssh versions * Remove redundant parameter * Fix dependencies * Fix versions * Simpler Android support * Fix versions * Update ports/libssh/CONTROL Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Remove redundant paramter * Fix version files Co-authored-by: Ahmed Yarub Hani Al Nuaimi Co-authored-by: JackBoosY Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> Co-authored-by: Nicole Mazzuca --- ports/libssh/CONTROL | 4 +++- ports/libssh/portfile.cmake | 7 +++++++ versions/baseline.json | 2 +- versions/l-/libssh.json | 5 +++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ports/libssh/CONTROL b/ports/libssh/CONTROL index fbee566de36b88..d1e607e8cbdfd6 100644 --- a/ports/libssh/CONTROL +++ b/ports/libssh/CONTROL @@ -1,6 +1,8 @@ Source: libssh Version: 0.9.5 +Port-Version: 1 Homepage: https://www.libssh.org/ +Build-Depends: libssh[core,mbedtls] (android) Description: libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side Default-Features: crypto Supports: !uwp @@ -10,7 +12,7 @@ Build-Depends: libssh[mbedtls] Description: Default crypto backend Feature: mbedtls -Build-Depends: mbedtls[pthreads] +Build-Depends: mbedtls[pthreads] (!android), mbedtls[core] Description: Crypto support (mbedTLS) Feature: openssl diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake index 3874d193951640..ee7f0ac8f761a3 100644 --- a/ports/libssh/portfile.cmake +++ b/ports/libssh/portfile.cmake @@ -19,10 +19,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS zlib WITH_ZLIB ) +if (VCPKG_TARGET_IS_ANDROID) + set(EXTRA_ARGS "-DWITH_SERVER=FALSE" + "-DWITH_PCAP=FALSE" + ) +endif () + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + ${EXTRA_ARGS} ${FEATURE_OPTIONS} -DWITH_EXAMPLES=OFF -DUNIT_TESTING=OFF diff --git a/versions/baseline.json b/versions/baseline.json index a06db4fb0de4ed..8afed10c32e2fc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3350,7 +3350,7 @@ }, "libssh": { "baseline": "0.9.5", - "port-version": 0 + "port-version": 1 }, "libssh2": { "baseline": "1.9.0", diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index 2aa48093dda1a2..117d34e07531ab 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf1fb5ae9324823a60784a5ed0ecbca8a3325214", + "version-string": "0.9.5", + "port-version": 1 + }, { "git-tree": "a9db7620dc774257483a98c9c5309dbb7eff8263", "version-string": "0.9.5", From d74b935004d8b4cea478d21cb0a58eeef5b84c69 Mon Sep 17 00:00:00 2001 From: Ludek Vodicka Date: Mon, 25 Jan 2021 09:15:40 +0100 Subject: [PATCH 0573/1694] [libiconv] Updated typo in iconv share files location (#15771) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Updated typo in iconv share files location CMake Error at ports/libiconv/portfile.cmake:4 (file): file COPY cannot copy file "/root/dev/ExternalLibraries/vcpkg/ports/libiconv/vcpkg-cmake-wrapper.cmake" to "/root/dev/ExternalLibraries/vcpkg/packages/libiconv_x64-linux/share/iconv/vcpkg-cmake-wrapper.cmake": Success. Call Stack (most recent call first): scripts/ports.cmake:136 (include) * [libiconv] Bump version * update baseline * Update ports/libiconv/portfile.cmake Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * update baseline Co-authored-by: JackBoosY Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> --- ports/libiconv/CONTROL | 2 +- ports/libiconv/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/l-/libiconv.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index 329b3ebc17819d..ec885fe69eccf3 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,5 +1,5 @@ Source: libiconv Version: 1.16 -Port-Version: 6 +Port-Version: 7 Homepage: https://www.gnu.org/software/libiconv/ Description: GNU Unicode text conversion diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 62fb8e42d89b45..85ccce0c8005cd 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -1,6 +1,6 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/Iconv) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/iconv) file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv) return() endif() @@ -42,4 +42,4 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURR file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) \ No newline at end of file +set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) diff --git a/versions/baseline.json b/versions/baseline.json index 8afed10c32e2fc..67fe34aebf58bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3010,7 +3010,7 @@ }, "libiconv": { "baseline": "1.16", - "port-version": 6 + "port-version": 7 }, "libics": { "baseline": "1.6.4", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index e24310b5ddf797..c8d493eac0ad06 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ca525bd3d388ec908ab2ec26bdccb12a990a26d", + "version-string": "1.16", + "port-version": 7 + }, { "git-tree": "b052109a8f7de3bcaf5d81b92952cbe9218dea6a", "version-string": "1.16", From b0a137b8c6c58c7e588cfcd47559bc4efa30023e Mon Sep 17 00:00:00 2001 From: An Tao Date: Mon, 25 Jan 2021 16:16:36 +0800 Subject: [PATCH 0574/1694] [trantor] Update to 1.2.0 (#15841) * [trantor] Update to 1.2.0 * Add versions file --- ports/trantor/CONTROL | 2 +- ports/trantor/portfile.cmake | 6 ++++-- ports/trantor/vcpkg.patch | 14 ++++++++++++++ versions/baseline.json | 2 +- versions/t-/trantor.json | 5 +++++ 5 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 ports/trantor/vcpkg.patch diff --git a/ports/trantor/CONTROL b/ports/trantor/CONTROL index 88be5a34a84167..5349726cc36939 100644 --- a/ports/trantor/CONTROL +++ b/ports/trantor/CONTROL @@ -1,5 +1,5 @@ Source: trantor -Version: 1.1.1 +Version: 1.2.0 Homepage: https://github.com/an-tao/trantor Description: A non-blocking I/O cross-platform TCP network library, using C++14. Build-Depends: openssl, c-ares diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake index b5620907ac4966..eb835a13eaa3fb 100644 --- a/ports/trantor/portfile.cmake +++ b/ports/trantor/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor - REF v1.1.1 - SHA512 525316b88a96acc90cf21aa0d6dc74ccbeb1bf55dda39cd6fb0344f3672e61db37621614d742666fd54c28448e0fbc4cedebda10cadb97a225be9481a6fbd9e2 + REF v1.2.0 + SHA512 2d94ef174642c81e1db62621ae8bc98a5b439f90437af4fa0ab67d09646bb04847b07a8be305331807dad4ef9244b06636ef471ce9da15ce23fc8bed4ff1d9e2 HEAD_REF master + PATCHES + vcpkg.patch ) vcpkg_configure_cmake( diff --git a/ports/trantor/vcpkg.patch b/ports/trantor/vcpkg.patch new file mode 100644 index 00000000000000..f5b23d64749320 --- /dev/null +++ b/ports/trantor/vcpkg.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d164667..e75b869 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -90,6 +90,9 @@ if(c-ares_FOUND) + message(STATUS "c-ares found!") + target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib) + set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/inner/AresResolver.cc) ++ if(APPLE) ++ target_link_libraries(${PROJECT_NAME} PRIVATE resolv) ++ endif() + else() + set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/inner/NormalResolver.cc) + endif() diff --git a/versions/baseline.json b/versions/baseline.json index 67fe34aebf58bd..5fb557730c4abe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5841,7 +5841,7 @@ "port-version": 0 }, "trantor": { - "baseline": "1.1.1", + "baseline": "1.2.0", "port-version": 0 }, "tre": { diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json index fc225ffc3bdbcb..f4a822e2ed4734 100644 --- a/versions/t-/trantor.json +++ b/versions/t-/trantor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af52c9e7b3dd398e61ef6ea0a34a48cdcfce7f42", + "version-string": "1.2.0", + "port-version": 0 + }, { "git-tree": "0df63258899007bb9f8fa2027ab3f0b3a3807251", "version-string": "1.1.1", From 58f00b2c65881577928e9b6d64323d6eb7d8aec9 Mon Sep 17 00:00:00 2001 From: Ludek Vodicka Date: Mon, 25 Jan 2021 10:28:50 +0100 Subject: [PATCH 0575/1694] [libxslt] Fixed macos build (#15806) * Fixed macos build Fixed missing libiconv library on osx build * [libxslt] Bump version * update version record * update baseline * [libxslt] Add Support field. * update version record Co-authored-by: JackBoosY --- ports/libxslt/CONTROL | 3 ++- ports/libxslt/portfile.cmake | 12 +++++++++--- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 2 +- versions/l-/libxslt.json | 5 +++++ 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ports/libxslt/CONTROL b/ports/libxslt/CONTROL index 27f8c16f448566..65a62940cb38ff 100644 --- a/ports/libxslt/CONTROL +++ b/ports/libxslt/CONTROL @@ -1,6 +1,7 @@ Source: libxslt Version: 1.1.33 -Port-Version: 8 +Port-Version: 9 Homepage: https://github.com/GNOME/libxslt Description: Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT Build-Depends: libxml2, liblzma +Supports: !uwp \ No newline at end of file diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index 63cb6d32222825..06dd48f4811035 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -83,6 +83,12 @@ else() find_library(LibXml2_DEBUG_LIBRARIES libxml2 PATHS ${CURRENT_INSTALLED_DIR}/debug/lib REQUIRED) find_library(LibXml2_RELEASE_LIBRARIES libxml2 PATHS ${CURRENT_INSTALLED_DIR}/lib REQUIRED) + if (VCPKG_TARGET_IS_OSX ) + set(LIBICONV "-liconv") + else() + set(LIBICONV "") + endif() + vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG @@ -95,14 +101,14 @@ else() --with-mem-debug --with-debug --with-debugger - --with-libxml-libs-prefix="${CURRENT_INSTALLED_DIR}/debug/lib -lxml2 -lz -llzmad" + --with-libxml-libs-prefix="${CURRENT_INSTALLED_DIR}/debug/lib -lxml2 -lz -llzmad ${LIBICONV}" --with-html-dir=${CURRENT_INSTALLED_DIR}/debug/tools --with-html-subdir=${CURRENT_INSTALLED_DIR}/debug/tools OPTIONS_RELEASE - --with-libxml-libs-prefix="${CURRENT_INSTALLED_DIR}/lib -lxml2 -lz -llzma" + --with-libxml-libs-prefix="${CURRENT_INSTALLED_DIR}/lib -lxml2 -lz -llzma ${LIBICONV}" --with-html-dir=${CURRENT_INSTALLED_DIR}/tools --with-html-subdir=${CURRENT_INSTALLED_DIR}/tools - ) + ) vcpkg_install_make() vcpkg_fixup_pkgconfig() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a44f6881eaff38..cbb40b1a7fccca 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -819,9 +819,6 @@ libwandio:arm64-windows=fail libwandio:arm-uwp=fail libxmp-lite:x64-linux=fail libxmp-lite:x64-osx=fail -libxslt:arm-uwp=fail -libxslt:x64-osx=fail -libxslt:x64-uwp=fail libyuv:arm-uwp=fail libyuv:x64-uwp=fail licensepp:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 5fb557730c4abe..28eece539e9138 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3482,7 +3482,7 @@ }, "libxslt": { "baseline": "1.1.33", - "port-version": 8 + "port-version": 9 }, "libyaml": { "baseline": "0.2.5", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index 66c70404c70675..722fbe014d69c4 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "210c2ecb911a6c2445806f30a98a3f2c9a9177dc", + "version-string": "1.1.33", + "port-version": 9 + }, { "git-tree": "a737eb337f73e61e189204c657dc32332ba0adf8", "version-string": "1.1.33", From 3a622e87f657b389f516fcef418cff74d392e165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 25 Jan 2021 01:33:30 -0800 Subject: [PATCH 0576/1694] [freeimage] Fix plugin disable patch (#15812) * [freeimage] Fix plugin disable patch * update version record --- ports/freeimage/CONTROL | 2 +- ...ng-on-internal-third-party-libraries.patch | 34 ++++++++++++++----- ports/freeimage/portfile.cmake | 1 - .../freeimage/update_format_enum_values.patch | 33 ------------------ versions/baseline.json | 2 +- versions/f-/freeimage.json | 5 +++ 6 files changed, 33 insertions(+), 44 deletions(-) delete mode 100644 ports/freeimage/update_format_enum_values.patch diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL index da87824649b3a6..811028ca6b97f4 100644 --- a/ports/freeimage/CONTROL +++ b/ports/freeimage/CONTROL @@ -1,6 +1,6 @@ Source: freeimage Version: 3.18.0 -Port-Version: 18 +Port-Version: 19 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp (!uwp), libraw, jxrlib, openexr Homepage: https://sourceforge.net/projects/freeimage/ Description: Support library for graphics image formats diff --git a/ports/freeimage/disable-plugins-depending-on-internal-third-party-libraries.patch b/ports/freeimage/disable-plugins-depending-on-internal-third-party-libraries.patch index 28d0e3a42be9dc..c22828deee7504 100644 --- a/ports/freeimage/disable-plugins-depending-on-internal-third-party-libraries.patch +++ b/ports/freeimage/disable-plugins-depending-on-internal-third-party-libraries.patch @@ -1,20 +1,38 @@ diff --git a/Source/FreeImage.h b/Source/FreeImage.h -index e2d1c5a..cc66b7d 100644 +index 12182cd..ebd0453 100644 --- a/Source/FreeImage.h +++ b/Source/FreeImage.h -@@ -410,7 +410,11 @@ FI_ENUM(FREE_IMAGE_FORMAT) { +@@ -410,16 +410,20 @@ FI_ENUM(FREE_IMAGE_FORMAT) { FIF_DDS = 24, FIF_GIF = 25, FIF_HDR = 26, - FIF_FAXG3 = 27, +- FIF_SGI = 28, +- FIF_EXR = 29, +- FIF_J2K = 30, +- FIF_JP2 = 31, +- FIF_PFM = 32, +- FIF_PICT = 33, +- FIF_RAW = 34, +- FIF_WEBP = 35, +- FIF_JXR = 36 +/* vcpkg: The G3 fax format plugin is deliberately disabled in our build of + FreeImage, since it requires usage of the vendored copy of libtiff. */ +#if 0 + FIF_FAXG3 = 27, +#endif - FIF_SGI = 28, - FIF_EXR = 29, - FIF_J2K = 30, ++ FIF_SGI = 27, ++ FIF_EXR = 28, ++ FIF_J2K = 29, ++ FIF_JP2 = 30, ++ FIF_PFM = 31, ++ FIF_PICT = 32, ++ FIF_RAW = 33, ++ FIF_WEBP = 34, ++ FIF_JXR = 35 + }; + + /** Image type used in FreeImage. @@ -476,6 +480,9 @@ FI_ENUM(FREE_IMAGE_DITHER) { /** Lossless JPEG transformations Constants used in FreeImage_JPEGTransform @@ -33,7 +51,7 @@ index e2d1c5a..cc66b7d 100644 /** Tone mapping operators. Constants used in FreeImage_ToneMapping. -@@ -1077,6 +1085,9 @@ DLL_API const char* DLL_CALLCONV FreeImage_TagToString(FREE_IMAGE_MDMODEL model, +@@ -1089,6 +1097,9 @@ DLL_API const char* DLL_CALLCONV FreeImage_TagToString(FREE_IMAGE_MDMODEL model, // JPEG lossless transformation routines // -------------------------------------------------------------------------- @@ -43,7 +61,7 @@ index e2d1c5a..cc66b7d 100644 DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE)); DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE)); DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom); -@@ -1085,7 +1096,7 @@ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformFromHandle(FreeImageIO* src_io, +@@ -1097,7 +1108,7 @@ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformFromHandle(FreeImageIO* src_io, DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE)); DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE)); DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY* src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE)); @@ -53,7 +71,7 @@ index e2d1c5a..cc66b7d 100644 // -------------------------------------------------------------------------- // Image manipulation toolkit diff --git a/Source/FreeImage/Plugin.cpp b/Source/FreeImage/Plugin.cpp -index 57ebffd..a93440f 100644 +index 11e7294..0119ba7 100644 --- a/Source/FreeImage/Plugin.cpp +++ b/Source/FreeImage/Plugin.cpp @@ -263,7 +263,11 @@ FreeImage_Initialise(BOOL load_local_plugins_only) { diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake index 26253c71560e58..ce1b86821cc544 100644 --- a/ports/freeimage/portfile.cmake +++ b/ports/freeimage/portfile.cmake @@ -18,7 +18,6 @@ vcpkg_from_sourceforge( fix-function-overload.patch use-typedef-as-already-declared.patch use-functions-to-override-libtiff-warning-error-handlers.patch - update_format_enum_values.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/freeimage/update_format_enum_values.patch b/ports/freeimage/update_format_enum_values.patch deleted file mode 100644 index 01a0a6b9f57ca6..00000000000000 --- a/ports/freeimage/update_format_enum_values.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/Source/FreeImage.h b/Source/FreeImage.h -index 59de277..224877f 100644 ---- a/Source/FreeImage.h -+++ b/Source/FreeImage.h -@@ -420,15 +420,19 @@ FI_ENUM(FREE_IMAGE_FORMAT) { - #if 0 - FIF_FAXG3 = 27, - #endif -- FIF_SGI = 28, -- FIF_EXR = 29, -- FIF_J2K = 30, -- FIF_JP2 = 31, -- FIF_PFM = 32, -- FIF_PICT = 33, -- FIF_RAW = 34, -- FIF_WEBP = 35, -- FIF_JXR = 36 -+/* vcpkg: removal of G3 fax format messes up the format enum numbering due to FreeImage -+ relying on the list of plugins as created in AddNode(). Enum values have been -+ corrected to compensate. This is similar to the reported bug: -+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=841089 */ -+ FIF_SGI = 27, -+ FIF_EXR = 28, -+ FIF_J2K = 29, -+ FIF_JP2 = 30, -+ FIF_PFM = 31, -+ FIF_PICT = 32, -+ FIF_RAW = 33, -+ FIF_WEBP = 34, -+ FIF_JXR = 35 - }; - - /** Image type used in FreeImage. diff --git a/versions/baseline.json b/versions/baseline.json index 28eece539e9138..c394a60422886b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1982,7 +1982,7 @@ }, "freeimage": { "baseline": "3.18.0", - "port-version": 18 + "port-version": 19 }, "freeopcua": { "baseline": "20190125-3", diff --git a/versions/f-/freeimage.json b/versions/f-/freeimage.json index c68c6c87a672a5..def7ee31402e31 100644 --- a/versions/f-/freeimage.json +++ b/versions/f-/freeimage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "100a12b0221593a3c5dae70231b7cd4145b73ca9", + "version-string": "3.18.0", + "port-version": 19 + }, { "git-tree": "76911a1130a9c099e49e9fc07a2f5f7cf4c86125", "version-string": "3.18.0", From 1ea8ab1712134c822999664385b4f3367c693151 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Mon, 25 Jan 2021 04:34:35 -0500 Subject: [PATCH 0577/1694] [ngspice] Update to rev 33 (#15837) * [ngspice] Update to rev 33 * Update ports/ngspice/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * x-add-version ngspice Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/ngspice/CONTROL | 3 +-- ports/ngspice/portfile.cmake | 6 ++--- ports/ngspice/use-winbison-global.patch | 32 +++++++++++++++---------- versions/baseline.json | 4 ++-- versions/n-/ngspice.json | 5 ++++ 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/ports/ngspice/CONTROL b/ports/ngspice/CONTROL index df7fd9b5b557ee..52d04f3aaa87d7 100644 --- a/ports/ngspice/CONTROL +++ b/ports/ngspice/CONTROL @@ -1,6 +1,5 @@ Source: ngspice -Version: 32 -Port-Version: 1 +Version: 33 Homepage: http://ngspice.sourceforge.net/ Description: Ngspice is a mixed-level/mixed-signal electronic circuit simulator. It is a successor of the latest stable release of Berkeley SPICE Supports: !(linux|osx|arm|uwp) diff --git a/ports/ngspice/portfile.cmake b/ports/ngspice/portfile.cmake index 66675c8c46a874..538a02f5e6c62c 100644 --- a/ports/ngspice/portfile.cmake +++ b/ports/ngspice/portfile.cmake @@ -8,9 +8,9 @@ set(VCPKG_CRT_LINKAGE static) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO ngspice/ng-spice-rework - REF 32 - FILENAME "ngspice-32.tar.gz" - SHA512 222eaa0cd6577a6eb8454bb49a7050a162d430c4b07a4fdc6baf350c5b3f5b018bac640fd44f465ec09c8cba6a9729b1cbe8d3d8c097f672acc2c22fabe8f4bc + REF 33 + FILENAME "ngspice-33.tar.gz" + SHA512 895e39f7de185df18bf443a9fa5691cdb3bf0a5091d9860d20ccb02254ef396a4cca5a1c8bf4ba19a03783fc89bb86649218cee977b0fe4565d3c84548943c09 PATCHES use-winbison-global.patch ) diff --git a/ports/ngspice/use-winbison-global.patch b/ports/ngspice/use-winbison-global.patch index f28a34acec3da9..c345e98397f88a 100644 --- a/ports/ngspice/use-winbison-global.patch +++ b/ports/ngspice/use-winbison-global.patch @@ -1,13 +1,19 @@ -diff --git a/visualc/sharedspice.vcxproj b/visualc/sharedspice.vcxproj -index 96786b1..f5d9322 100644 ---- a/visualc/sharedspice.vcxproj -+++ b/visualc/sharedspice.vcxproj -@@ -879,7 +879,7 @@ - - - invoke win_bison.exe for %(Identity) -- ..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 -+ win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 - .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h - - +diff --git a/visualc/sharedspice.vcxproj b/visualc/sharedspice.vcxproj +index 4ff0dfc..57b0c35 100644 +--- a/visualc/sharedspice.vcxproj ++++ b/visualc/sharedspice.vcxproj +@@ -2223,12 +2223,12 @@ + + + invoke win_bison.exe for %(Identity) +- ..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + + invoke win_bison.exe for %(Identity) +- ..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + diff --git a/versions/baseline.json b/versions/baseline.json index c394a60422886b..e574da5a3535f4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4009,8 +4009,8 @@ "port-version": 0 }, "ngspice": { - "baseline": "32", - "port-version": 1 + "baseline": "33", + "port-version": 0 }, "nifticlib": { "baseline": "2020-04-30", diff --git a/versions/n-/ngspice.json b/versions/n-/ngspice.json index 5dcf4cb76d38a8..b34cb7d92312b3 100644 --- a/versions/n-/ngspice.json +++ b/versions/n-/ngspice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "90c388f47ca769fd11449fde9d70402e9865a986", + "version-string": "33", + "port-version": 0 + }, { "git-tree": "b15238b045e17d6543080e78e20071380df008f2", "version-string": "32", From 46bdec83aaab9d84b9e92b49712688fd899ab662 Mon Sep 17 00:00:00 2001 From: Martin Vejdarski Date: Mon, 25 Jan 2021 10:47:30 +0100 Subject: [PATCH 0578/1694] [harfbuzz] Use meson and update to 2.7.0 (#12860) * [harfbuzz] Use meson * [harfbuzz] Add config file for CMake * [harfbuzz,pango] Remove glib option for harfbuzz * [libass,libmupdf,qt5-base,skia] Fix for harfbuzz * Back out meson edit already applied in https://github.com/microsoft/vcpkg/pull/15258 * [harfbuzz] Fixup pkgconfig * [libass] Bump port version * Revert "[libass,libmupdf,qt5-base,skia] Fix for harfbuzz" This reverts commit 3ba27c6c1c10a2889a8c5e028d010916f91418e3. * [harfbuzz] Update to 2.7.4 * update baseline record * Restore glib feature for harfbuzz and remove vagrant change * Update port version * Change over to manifests * Update port version Co-authored-by: Ebrahim Byagowi Co-authored-by: Billy Robert O'Neal III Co-authored-by: JackBoosY --- ports/harfbuzz/0001-fix-cmake-export.patch | 13 ---- ports/harfbuzz/0003-remove-broken-test.patch | 26 ------- ports/harfbuzz/CONTROL | 18 ----- ports/harfbuzz/find-package-freetype-2.patch | 13 ---- ports/harfbuzz/fix_include.patch | 12 ---- ports/harfbuzz/glib-cmake.patch | 30 -------- ports/harfbuzz/harfbuzzConfig.cmake.in | 58 +++++++++++++++ ports/harfbuzz/icu.patch | 27 ------- ports/harfbuzz/portfile.cmake | 65 ++++++----------- ports/harfbuzz/vcpkg.json | 36 ++++++++++ ports/pango/0002-remove-hb-glib.diff | 75 ++++++++++++++++++++ ports/pango/CONTROL | 4 +- ports/pango/portfile.cmake | 4 +- versions/baseline.json | 6 +- versions/h-/harfbuzz.json | 5 ++ versions/p-/pango.json | 5 ++ 16 files changed, 210 insertions(+), 187 deletions(-) delete mode 100644 ports/harfbuzz/0001-fix-cmake-export.patch delete mode 100644 ports/harfbuzz/0003-remove-broken-test.patch delete mode 100644 ports/harfbuzz/CONTROL delete mode 100644 ports/harfbuzz/find-package-freetype-2.patch delete mode 100644 ports/harfbuzz/fix_include.patch delete mode 100644 ports/harfbuzz/glib-cmake.patch create mode 100644 ports/harfbuzz/harfbuzzConfig.cmake.in delete mode 100644 ports/harfbuzz/icu.patch create mode 100644 ports/harfbuzz/vcpkg.json create mode 100644 ports/pango/0002-remove-hb-glib.diff diff --git a/ports/harfbuzz/0001-fix-cmake-export.patch b/ports/harfbuzz/0001-fix-cmake-export.patch deleted file mode 100644 index 31f4896f445567..00000000000000 --- a/ports/harfbuzz/0001-fix-cmake-export.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 71830b6f5..a25cb09dd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -712,7 +712,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - ) - install(EXPORT harfbuzzConfig - NAMESPACE harfbuzz:: -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/harfbuzz -+ DESTINATION share/harfbuzz - ) - if (HB_HAVE_ICU) - install(TARGETS harfbuzz-icu diff --git a/ports/harfbuzz/0003-remove-broken-test.patch b/ports/harfbuzz/0003-remove-broken-test.patch deleted file mode 100644 index 2a3b234eed27dd..00000000000000 --- a/ports/harfbuzz/0003-remove-broken-test.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc -index 85993d1..3e8e642 100644 ---- a/src/hb-coretext.cc -+++ b/src/hb-coretext.cc -@@ -1059,21 +1059,6 @@ resize_and_retry: - 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/CONTROL b/ports/harfbuzz/CONTROL deleted file mode 100644 index 753eb70b9e1569..00000000000000 --- a/ports/harfbuzz/CONTROL +++ /dev/null @@ -1,18 +0,0 @@ -Source: harfbuzz -Version: 2.7.2 -Port-Version: 1 -Description: HarfBuzz OpenType text shaping engine -Homepage: https://github.com/behdad/harfbuzz -Build-Depends: freetype[core], ragel, gettext (osx) - -Feature: graphite2 -Build-Depends: graphite2 -Description: Graphite2 shaper support - -Feature: icu -Build-Depends: icu -Description: icu support for harfbuzz - -Feature: glib -Build-Depends: glib -Description: Glib Unicode callbacks support diff --git a/ports/harfbuzz/find-package-freetype-2.patch b/ports/harfbuzz/find-package-freetype-2.patch deleted file mode 100644 index 608e9c890eeb66..00000000000000 --- a/ports/harfbuzz/find-package-freetype-2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index defd5d6..03f9d4e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -267,7 +267,7 @@ set (subset_project_headers - - ## Find and include needed header folders and libraries - if (HB_HAVE_FREETYPE) -- include (FindFreetype) -+ find_package(Freetype REQUIRED) - if (NOT FREETYPE_FOUND) - message(FATAL_ERROR "HB_HAVE_FREETYPE was set, but we failed to find it. Maybe add a CMAKE_PREFIX_PATH= to your Freetype2 install prefix") - endif () diff --git a/ports/harfbuzz/fix_include.patch b/ports/harfbuzz/fix_include.patch deleted file mode 100644 index 894f7b37c4acf5..00000000000000 --- a/ports/harfbuzz/fix_include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c4dc524..bfd15ec 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -431,6 +431,7 @@ endif () - - ## Define harfbuzz library - add_library(harfbuzz ${project_sources} ${project_extra_sources} ${project_headers}) -+target_include_directories(harfbuzz PUBLIC $) - target_link_libraries(harfbuzz ${THIRD_PARTY_LIBS}) - - diff --git a/ports/harfbuzz/glib-cmake.patch b/ports/harfbuzz/glib-cmake.patch deleted file mode 100644 index f982171206dad1..00000000000000 --- a/ports/harfbuzz/glib-cmake.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9b21bef2c..ae741ef63 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -213,21 +213,13 @@ endif () - if (HB_HAVE_GLIB) - add_definitions(-DHAVE_GLIB) - -- # https://github.com/WebKit/webkit/blob/master/Source/cmake/FindGLIB.cmake -- find_package(PkgConfig) -- pkg_check_modules(PC_GLIB QUIET glib-2.0) -- -- find_library(GLIB_LIBRARIES NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS}) -- find_path(GLIBCONFIG_INCLUDE_DIR NAMES glibconfig.h HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0/include) -- find_path(GLIB_INCLUDE_DIR NAMES glib.h HINTS ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0) -- -- include_directories(${GLIBCONFIG_INCLUDE_DIR} ${GLIB_INCLUDE_DIR}) -+ find_package(Threads REQUIRED) -+ find_package(Iconv REQUIRED) -+ find_package(unofficial-glib CONFIG REQUIRED) - - list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-glib.h) - -- list(APPEND THIRD_PARTY_LIBS ${GLIB_LIBRARIES}) -- -- mark_as_advanced(GLIB_LIBRARIES GLIBCONFIG_INCLUDE_DIR GLIB_INCLUDE_DIR) -+ list(APPEND THIRD_PARTY_LIBS unofficial::glib::glib Iconv::Iconv) - endif () - - if (HB_HAVE_ICU) diff --git a/ports/harfbuzz/harfbuzzConfig.cmake.in b/ports/harfbuzz/harfbuzzConfig.cmake.in new file mode 100644 index 00000000000000..b1cd6b6f5b0f29 --- /dev/null +++ b/ports/harfbuzz/harfbuzzConfig.cmake.in @@ -0,0 +1,58 @@ +if(TARGET harfbuzz) + return() +endif() + +add_library(harfbuzz INTERFACE IMPORTED GLOBAL) +add_library(harfbuzz::harfbuzz ALIAS harfbuzz) + +find_library(HARFBUZZ_LIBRARY_DEBUG NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) +if(HARFBUZZ_LIBRARY_DEBUG) + target_link_libraries(harfbuzz INTERFACE $<$:${HARFBUZZ_LIBRARY_DEBUG}>) +endif() + +find_library(HARFBUZZ_LIBRARY_RELEASE NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) +if(HARFBUZZ_LIBRARY_RELEASE) + target_link_libraries(harfbuzz INTERFACE $<$>:${HARFBUZZ_LIBRARY_RELEASE}>) +endif() + +set(HARFBUZZ_FEATURES @FEATURES@) + +if(APPLE) + find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices) + target_link_libraries(harfbuzz INTERFACE ${APPLICATIONSERVICES_LIBRARY}) +endif() + +find_package(freetype CONFIG REQUIRED) +target_link_libraries(harfbuzz INTERFACE freetype) + +if ("graphite2" IN_LIST HARFBUZZ_FEATURES) + find_library(GRAPHITE2_LIBRARY_DEBUG NAMES graphite2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(GRAPHITE2_LIBRARY_DEBUG) + target_link_libraries(harfbuzz INTERFACE $<$:${GRAPHITE2_LIBRARY_DEBUG}>) + endif() + + find_library(GRAPHITE2_LIBRARY_RELEASE NAMES graphite2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(GRAPHITE2_LIBRARY_RELEASE) + target_link_libraries(harfbuzz INTERFACE $<$>:${GRAPHITE2_LIBRARY_RELEASE}>) + endif() +endif() + +if ("glib" IN_LIST HARFBUZZ_FEATURES) + find_library(GLIB_LIBRARY_DEBUG NAMES glib glib-2.0 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(GLIB_LIBRARY_DEBUG) + target_link_libraries(harfbuzz INTERFACE $<$:${GLIB_LIBRARY_DEBUG}>) + endif() + + find_library(GLIB_LIBRARY_RELEASE NAMES glib glib-2.0 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(GLIB_LIBRARY_RELEASE) + target_link_libraries(harfbuzz INTERFACE $<$>:${GLIB_LIBRARY_RELEASE}>) + endif() +endif() + +if ("icu" IN_LIST HARFBUZZ_FEATURES) + find_package(ICU 61 COMPONENTS uc REQUIRED) + target_link_libraries(harfbuzz INTERFACE ICU::uc) +endif() + +get_filename_component(_INSTALL_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) +target_include_directories(harfbuzz INTERFACE ${_INSTALL_DIR}/include/harfbuzz) diff --git a/ports/harfbuzz/icu.patch b/ports/harfbuzz/icu.patch deleted file mode 100644 index 1747c4a7df23e8..00000000000000 --- a/ports/harfbuzz/icu.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eb6cc9007..209128695 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -226,19 +226,13 @@ if (HB_HAVE_ICU) - add_definitions(-DHAVE_ICU) - - # https://github.com/WebKit/webkit/blob/master/Source/cmake/FindICU.cmake -- find_package(PkgConfig) -- pkg_check_modules(PC_ICU QUIET icu-uc) -- -- find_path(ICU_INCLUDE_DIR NAMES unicode/utypes.h HINTS ${PC_ICU_INCLUDE_DIRS} ${PC_ICU_INCLUDEDIR}) -- find_library(ICU_LIBRARY NAMES libicuuc cygicuuc cygicuuc32 icuuc HINTS ${PC_ICU_LIBRARY_DIRS} ${PC_ICU_LIBDIR}) -+ find_package(ICU COMPONENTS uc REQUIRED) - -- include_directories(${ICU_INCLUDE_DIR}) -+ include_directories(${ICU_INCLUDE_DIRS}) - - list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-icu.h) - -- list(APPEND THIRD_PARTY_LIBS ${ICU_LIBRARY}) -- -- mark_as_advanced(ICU_INCLUDE_DIR ICU_LIBRARY) -+ list(APPEND THIRD_PARTY_LIBS ${ICU_LIBRARIES}) - endif () - - if (APPLE AND HB_HAVE_CORETEXT) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 055adaa1551028..5752550b60c29a 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -1,62 +1,43 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz - REF 9c98b2b9a9e43669c5e2b37eaa41b1e07de1ede3 # 2.7.2 - SHA512 00b61034abce61370a7ff40bf5aa80bc1b3557d1f978ef91725fc30b34c4c00c682a3b9c99233e7e52d579b60694a1ba08714d5c9b01ad13e9fd76828facc720 + REF 7236c7e29cef1c2d76c7a284c5081ff4d3aa1127 # 2.7.4 + SHA512 d231a788ea4e52231d4c363c1eca76424cb82ed0952b5c24d0b082e88b3dddbda967e7fffe67fffdcb22c7ebfbf0ec923365eb4532be772f2e61fa7d29b51998 HEAD_REF master PATCHES - 0001-fix-cmake-export.patch 0002-fix-uwp-build.patch - 0003-remove-broken-test.patch - # This patch is required for propagating the full list of static dependencies from freetype - find-package-freetype-2.patch - # This patch is required for propagating the full list of dependencies from glib - glib-cmake.patch - fix_include.patch - icu.patch ) -file(READ ${SOURCE_PATH}/CMakeLists.txt _contents) - -if("${_contents}" MATCHES "include \\(FindFreetype\\)") - message(FATAL_ERROR "Harfbuzz's cmake must not directly include() FindFreetype.") -endif() - -if("${_contents}" MATCHES "find_library\\(GLIB_LIBRARIES") - message(FATAL_ERROR "Harfbuzz's cmake must not directly find_library() glib.") -endif() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - icu HB_HAVE_ICU - graphite2 HB_HAVE_GRAPHITE2 - glib HB_HAVE_GLIB + icu icu + graphite2 graphite + glib glib ) -vcpkg_configure_cmake( +string(REPLACE "=ON" "=enabled" FEATURE_OPTIONS "${FEATURE_OPTIONS}") +string(REPLACE "=OFF" "=disabled" FEATURE_OPTIONS "${FEATURE_OPTIONS}") + +vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} - -DHB_HAVE_FREETYPE=ON - -DHB_BUILD_TESTS=OFF - OPTIONS_DEBUG - -DSKIP_INSTALL_HEADERS=ON + -Dfreetype=enabled + -Dgobject=disabled + -Dcairo=disabled + -Dfontconfig=disabled + -Dintrospection=disabled + -Ddocs=disabled + -Dtests=disabled + -Dbenchmark=disabled ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() - +vcpkg_install_meson() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() -if ("glib" IN_LIST FEATURES) - # Propagate dependency on glib downstream - file(READ "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" _contents) - file(WRITE "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" " -include(CMakeFindDependencyMacro) -find_dependency(unofficial-glib CONFIG) - -${_contents} -") -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" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/harfbuzzConfig.cmake" @ONLY) # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json new file mode 100644 index 00000000000000..bdb4c342069c5f --- /dev/null +++ b/ports/harfbuzz/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "harfbuzz", + "version-string": "2.7.4", + "description": "HarfBuzz OpenType text shaping engine", + "homepage": "https://github.com/harfbuzz/harfbuzz", + "dependencies": [ + { + "name": "freetype", + "default-features": false + }, + { + "name": "gettext", + "platform": "osx" + } + ], + "features": { + "glib": { + "description": "Glib Unicode callbacks support", + "dependencies": [ + "glib" + ] + }, + "graphite2": { + "description": "Graphite2 shaper support", + "dependencies": [ + "graphite2" + ] + }, + "icu": { + "description": "icu support for harfbuzz", + "dependencies": [ + "icu" + ] + } + } +} diff --git a/ports/pango/0002-remove-hb-glib.diff b/ports/pango/0002-remove-hb-glib.diff new file mode 100644 index 00000000000000..10234ae861bd0e --- /dev/null +++ b/ports/pango/0002-remove-hb-glib.diff @@ -0,0 +1,75 @@ +diff --git a/pango/pango-ot-buffer.c b/pango/pango-ot-buffer.c +index 142b2f17..334df746 100644 +--- a/pango/pango-ot-buffer.c ++++ b/pango/pango-ot-buffer.c +@@ -40,7 +40,6 @@ pango_ot_buffer_new (PangoFcFont *font) + PangoOTBuffer *buffer = g_slice_new (PangoOTBuffer); + + buffer->buffer = hb_buffer_create (); +- hb_buffer_set_unicode_funcs (buffer->buffer, hb_glib_get_unicode_funcs ()); + + return buffer; + } +diff --git a/pango/pango-ot-private.h b/pango/pango-ot-private.h +index 0d803ec1..d9d86644 100644 +--- a/pango/pango-ot-private.h ++++ b/pango/pango-ot-private.h +@@ -22,12 +22,12 @@ + #ifndef __PANGO_OT_PRIVATE_H__ + #define __PANGO_OT_PRIVATE_H__ + ++#include + #include + + #include + #include + #include +-#include + + #include "pangofc-private.h" + +diff --git a/pango/pango-ot-tag.c b/pango/pango-ot-tag.c +index 610b59d7..3bf4eccd 100644 +--- a/pango/pango-ot-tag.c ++++ b/pango/pango-ot-tag.c +@@ -47,7 +47,8 @@ PangoOTTag + pango_ot_tag_from_script (PangoScript script) + { + hb_tag_t tag1, tag2; +- hb_ot_tags_from_script (hb_glib_script_to_script (script), &tag1, &tag2); ++ hb_ot_tags_from_script ((hb_script_t) g_unicode_script_to_iso15924 ((GUnicodeScript) script), ++ &tag1, &tag2); + return (PangoOTTag) tag1; + } + +@@ -75,7 +76,7 @@ pango_ot_tag_from_script (PangoScript script) + PangoScript + pango_ot_tag_to_script (PangoOTTag script_tag) + { +- return (PangoScript) hb_glib_script_from_script (hb_ot_tag_to_script ((hb_tag_t) script_tag)); ++ return (PangoScript) g_unicode_script_from_iso15924 (hb_ot_tag_to_script ((hb_tag_t) script_tag)); + } + + +diff --git a/pango/pangofc-shape.c b/pango/pangofc-shape.c +index 60f829f3..4cb0ae04 100644 +--- a/pango/pangofc-shape.c ++++ b/pango/pangofc-shape.c +@@ -28,7 +28,7 @@ + + #include "pangofc-private.h" + #include +-#include ++#include + + /* cache a single hb_buffer_t */ + static hb_buffer_t *cached_buffer = NULL; /* MT-safe */ +@@ -362,7 +362,7 @@ _pango_fc_shape (PangoFont *font, + /* setup buffer */ + + hb_buffer_set_direction (hb_buffer, hb_direction); +- hb_buffer_set_script (hb_buffer, hb_glib_script_to_script (analysis->script)); ++ hb_buffer_set_script (hb_buffer, (hb_script_t) g_unicode_script_to_iso15924 (analysis->script)); + hb_buffer_set_language (hb_buffer, hb_language_from_string (pango_language_to_string (analysis->language), -1)); + #if HB_VERSION_ATLEAST(1,0,3) + hb_buffer_set_cluster_level (hb_buffer, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS); diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL index cea8f146423d8e..8ab0abd62870b5 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -1,6 +1,6 @@ Source: pango Version: 1.40.11 -Port-Version: 8 +Port-Version: 9 Homepage: https://ftp.gnome.org/pub/GNOME/sources/pango/ Description: Text and font handling library. -Build-Depends: glib, gettext, cairo[gobject], fontconfig, freetype, harfbuzz[glib] (!(windows&static)&!osx) +Build-Depends: glib, gettext, cairo[gobject], fontconfig, freetype, harfbuzz (!(windows&static)&!osx) diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index 475d49f01038ec..2127e3c56f4eb2 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -8,7 +8,9 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${PANGO_VERSION} - PATCHES 0001-fix-static-symbols-export.diff + PATCHES + 0001-fix-static-symbols-export.diff + 0002-remove-hb-glib.diff ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.unix DESTINATION ${SOURCE_PATH}) diff --git a/versions/baseline.json b/versions/baseline.json index e574da5a3535f4..353ff3db43cc3d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2321,8 +2321,8 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "2.7.2", - "port-version": 1 + "baseline": "2.7.4", + "port-version": 0 }, "hayai": { "baseline": "2019-08-10", @@ -4402,7 +4402,7 @@ }, "pango": { "baseline": "1.40.11", - "port-version": 8 + "port-version": 9 }, "pangolin": { "baseline": "0.5", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index c5a87612582f00..b21931e21943bf 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb9ea75cd35a35e57fb0bf79ff78818c95148fcf", + "version-string": "2.7.4", + "port-version": 0 + }, { "git-tree": "2a196719fa9c0b074b71119ee781233eecf2a455", "version-string": "2.7.2", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 06b8e2bc695ddb..45c690134486d1 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b8dd172fe2f62afd4508431bd89c50d2510e997", + "version-string": "1.40.11", + "port-version": 9 + }, { "git-tree": "c0585c64466afdd652539982316d65c086b3d4f6", "version-string": "1.40.11", From 44e9f7b540a0f24faa3fcdc378efc2b43c460476 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Mon, 25 Jan 2021 18:54:04 +0900 Subject: [PATCH 0579/1694] [ms-gltf] Add new port (#14971) * [ms-gltf] create a new port * [ms-gltf] install with CMAKE_INSTALL_PREFIX * add a patch to change install path style * [ms-gltf] enable iOS/UWP & support features * feature: support tests/samples to help debugging in buildtrees * triplet: ios/uwp are now available * [ms-gltf] disable Ninja for Windows * [ms-gltf] format the manifest json * [ms-gltf] update expected failures * x64-linux * [ms-gltf] format the manifest json * [ms-gltf] update comments * [ms-gltf] make "test" default feature * [ms-gltf] add version JSON * Address the review suggestions * vcpkg x-add-version ms-gltf * [ms-gltf] fix 'x64-osx' triplet 'samples' feature * [ms-gltf] update git-tree of port Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- ports/ms-gltf/fix-apple-filesystem.patch | 66 ++++++++++++++++++++++++ ports/ms-gltf/fix-install.patch | 44 ++++++++++++++++ ports/ms-gltf/portfile.cmake | 41 +++++++++++++++ ports/ms-gltf/vcpkg.json | 24 +++++++++ versions/baseline.json | 4 ++ versions/m-/ms-gltf.json | 9 ++++ 6 files changed, 188 insertions(+) create mode 100644 ports/ms-gltf/fix-apple-filesystem.patch create mode 100644 ports/ms-gltf/fix-install.patch create mode 100644 ports/ms-gltf/portfile.cmake create mode 100644 ports/ms-gltf/vcpkg.json create mode 100644 versions/m-/ms-gltf.json diff --git a/ports/ms-gltf/fix-apple-filesystem.patch b/ports/ms-gltf/fix-apple-filesystem.patch new file mode 100644 index 00000000000000..d2d1a504b05bf5 --- /dev/null +++ b/ports/ms-gltf/fix-apple-filesystem.patch @@ -0,0 +1,66 @@ +diff --git a/GLTFSDK.Samples/CMakeLists.txt b/GLTFSDK.Samples/CMakeLists.txt +index a66ed93..d948ee2 100644 +--- a/GLTFSDK.Samples/CMakeLists.txt ++++ b/GLTFSDK.Samples/CMakeLists.txt +@@ -1,4 +1,6 @@ + cmake_minimum_required(VERSION 3.5) +- ++if(APPLE) ++ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15") ++endif() + add_subdirectory(Deserialize) + add_subdirectory(Serialize) +diff --git a/GLTFSDK.Samples/Deserialize/CMakeLists.txt b/GLTFSDK.Samples/Deserialize/CMakeLists.txt +index 791898c..6474aee 100644 +--- a/GLTFSDK.Samples/Deserialize/CMakeLists.txt ++++ b/GLTFSDK.Samples/Deserialize/CMakeLists.txt +@@ -17,6 +17,8 @@ if (MSVC) + + # Make sure that all PDB files on Windows are installed to the output folder. By default, only the debug build does this. + set_target_properties(Deserialize PROPERTIES COMPILE_PDB_NAME "Deserialize" COMPILE_PDB_OUTPUT_DIRECTORY "${RUNTIME_OUTPUT_DIRECTORY}") ++elseif(APPLE) ++ set_target_properties(Deserialize PROPERTIES CXX_STANDARD 17) + endif() + + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") +diff --git a/GLTFSDK.Samples/Deserialize/Source/main.cpp b/GLTFSDK.Samples/Deserialize/Source/main.cpp +index 80198fa..fb560e0 100644 +--- a/GLTFSDK.Samples/Deserialize/Source/main.cpp ++++ b/GLTFSDK.Samples/Deserialize/Source/main.cpp +@@ -8,6 +8,9 @@ + + // Replace this with (and use std::filesystem rather than + // std::experimental::filesystem) if your toolchain fully supports C++17 ++#if defined(__APPLE__) ++#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM ++#endif + #include + + #include +diff --git a/GLTFSDK.Samples/Serialize/CMakeLists.txt b/GLTFSDK.Samples/Serialize/CMakeLists.txt +index 5269da8..1129ea0 100644 +--- a/GLTFSDK.Samples/Serialize/CMakeLists.txt ++++ b/GLTFSDK.Samples/Serialize/CMakeLists.txt +@@ -17,6 +17,8 @@ if (MSVC) + + # Make sure that all PDB files on Windows are installed to the output folder. By default, only the debug build does this. + set_target_properties(Serialize PROPERTIES COMPILE_PDB_NAME "Serialize" COMPILE_PDB_OUTPUT_DIRECTORY "${RUNTIME_OUTPUT_DIRECTORY}") ++elseif(APPLE) ++ set_target_properties(Serialize PROPERTIES CXX_STANDARD 17) + endif() + + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") +diff --git a/GLTFSDK.Samples/Serialize/Source/main.cpp b/GLTFSDK.Samples/Serialize/Source/main.cpp +index ac87c10..f5c6e0b 100644 +--- a/GLTFSDK.Samples/Serialize/Source/main.cpp ++++ b/GLTFSDK.Samples/Serialize/Source/main.cpp +@@ -10,6 +10,9 @@ + + // Replace this with (and use std::filesystem rather than + // std::experimental::filesystem) if your toolchain fully supports C++17 ++#if defined(__APPLE__) ++#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM ++#endif + #include + + #include diff --git a/ports/ms-gltf/fix-install.patch b/ports/ms-gltf/fix-install.patch new file mode 100644 index 00000000000000..59b5eebbc19b0a --- /dev/null +++ b/ports/ms-gltf/fix-install.patch @@ -0,0 +1,44 @@ +diff --git a/Build/CMake/Modules/GLTFPlatform.cmake b/Build/CMake/Modules/GLTFPlatform.cmake +index 3d940f5..322f029 100644 +--- a/Build/CMake/Modules/GLTFPlatform.cmake ++++ b/Build/CMake/Modules/GLTFPlatform.cmake +@@ -55,14 +55,14 @@ endfunction(GetGLTFPlatform) + function(CreateGLTFInstallTargets target platform) + + install(TARGETS ${target} +- ARCHIVE DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$/${PROJECT_NAME} +- LIBRARY DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$/${PROJECT_NAME} +- RUNTIME DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$/${PROJECT_NAME} +- BUNDLE DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$/${PROJECT_NAME} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ++ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ++ RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ++ BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + ) + + if (MSVC) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$/${PROJECT_NAME}.pdb DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$/${PROJECT_NAME}) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$/${PROJECT_NAME}.pdb DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + endif() + + endfunction(CreateGLTFInstallTargets) +diff --git a/GLTFSDK.Test/CMakeLists.txt b/GLTFSDK.Test/CMakeLists.txt +index 5c8eca7..a0752a3 100644 +--- a/GLTFSDK.Test/CMakeLists.txt ++++ b/GLTFSDK.Test/CMakeLists.txt +@@ -46,4 +46,4 @@ add_custom_command(TARGET GLTFSDK.Test + AddGLTFIOSAppProperties(GLTFSDK.Test) + CreateGLTFInstallTargets(GLTFSDK.Test ${Platform}) + +-install(FILES ${PROJECT_BINARY_DIR}/$/Resources/ DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${Platform}/$/${PROJECT_NAME}/Resources) ++install(FILES ${PROJECT_BINARY_DIR}/$/Resources/ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +diff --git a/GLTFSDK/CMakeLists.txt b/GLTFSDK/CMakeLists.txt +index 3c53c74..1e8d223 100644 +--- a/GLTFSDK/CMakeLists.txt ++++ b/GLTFSDK/CMakeLists.txt +@@ -46,4 +46,5 @@ target_include_directories(GLTFSDK + PRIVATE "${CMAKE_BINARY_DIR}/GeneratedFiles" + ) + ++install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Inc/GLTFSDK DESTINATION ${CMAKE_INSTALL_PREFIX}/include) + CreateGLTFInstallTargets(GLTFSDK ${Platform}) diff --git a/ports/ms-gltf/portfile.cmake b/ports/ms-gltf/portfile.cmake new file mode 100644 index 00000000000000..503fdae04d0055 --- /dev/null +++ b/ports/ms-gltf/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_fail_port_install(MESSAGE "ms-gltf currently only supports Windows and Mac platforms" ON_TARGET "linux" "ios") +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/glTF-SDK + REF 9428f114b540fb93e6533d5ec460fc123efe0c86 # todo: r1.9.6.0 + SHA512 900caf6d72d360bae4c7af769a8879507f7f727b40f61723ffed679ad22877fb37daed2a0dfcbf27e15ab3adc8afe3249530b95691ce489b3446e5d9a35f205a + HEAD_REF master + PATCHES + fix-install.patch + fix-apple-filesystem.patch +) + +# note: Test/Sample executables won't be installed +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + test ENABLE_UNIT_TESTS + samples ENABLE_SAMPLES +) + +# note: Platform-native buildsystem will be more helpful to launch/debug the tests/samples. +# note: The PDB file path is making Ninja fails to install. +# For Windows, we rely on /MP. The other platforms should be able to build with PREFER_NINJA. +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} +) +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE + 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) +endif() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/ms-gltf/vcpkg.json b/ports/ms-gltf/vcpkg.json new file mode 100644 index 00000000000000..f734d95865d626 --- /dev/null +++ b/ports/ms-gltf/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "ms-gltf", + "version-string": "r1.9.5.0", + "description": "glTF-SDK is a C++ Software Development Kit for glTF", + "homepage": "https://github.com/microsoft/ms-gltf", + "supports": "!linux", + "dependencies": [ + "rapidjson" + ], + "default-features": [ + "test" + ], + "features": { + "samples": { + "description": "Build with GLTF samples" + }, + "test": { + "description": "Build test programs", + "dependencies": [ + "gtest" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 353ff3db43cc3d..bc4973d540401a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3868,6 +3868,10 @@ "baseline": "alias", "port-version": 0 }, + "ms-gltf": { + "baseline": "r1.9.5.0", + "port-version": 0 + }, "ms-gsl": { "baseline": "3.1.0", "port-version": 0 diff --git a/versions/m-/ms-gltf.json b/versions/m-/ms-gltf.json new file mode 100644 index 00000000000000..f583a8a81ecc4c --- /dev/null +++ b/versions/m-/ms-gltf.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1c3bf009ece6942607e095c0088810b6dbf86d38", + "version-string": "r1.9.5.0", + "port-version": 0 + } + ] +} From 06bc30affffc0b490e30da9c837d98b3c167881b Mon Sep 17 00:00:00 2001 From: Rich Logan Date: Mon, 25 Jan 2021 09:57:23 +0000 Subject: [PATCH 0580/1694] [dav1d] Add dav1d AV1 decoder port (#15009) * [dav1d] Add dav1d AV1 decoder port * Remove unnecessary port-version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Bump dav1d to 0.8.1 * Skip dav1d x86 due to infinite link * Add dav1d port version * Apply dav1d code review * Reset dav1d version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/dav1d/patch_underscore_prefix.patch | 13 +++++++++ ports/dav1d/portfile.cmake | 33 +++++++++++++++++++++++ ports/dav1d/vcpkg.json | 10 +++++++ versions/baseline.json | 4 +++ versions/d-/dav1d.json | 9 +++++++ 5 files changed, 69 insertions(+) create mode 100644 ports/dav1d/patch_underscore_prefix.patch create mode 100644 ports/dav1d/portfile.cmake create mode 100644 ports/dav1d/vcpkg.json create mode 100644 versions/d-/dav1d.json diff --git a/ports/dav1d/patch_underscore_prefix.patch b/ports/dav1d/patch_underscore_prefix.patch new file mode 100644 index 00000000000000..30506faf59ed00 --- /dev/null +++ b/ports/dav1d/patch_underscore_prefix.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 07b2586..02acd91 100644 +--- a/meson.build ++++ b/meson.build +@@ -370,7 +370,7 @@ endif + + cdata.set10('ARCH_PPC64LE', host_machine.cpu() == 'ppc64le') + +-if cc.symbols_have_underscore_prefix() ++if cc.symbols_have_underscore_prefix() or (host_machine.cpu_family() == 'x86' and host_machine.system() == 'windows') + cdata.set10('PREFIX', true) + cdata_asm.set10('PREFIX', true) + endif diff --git a/ports/dav1d/portfile.cmake b/ports/dav1d/portfile.cmake new file mode 100644 index 00000000000000..649d7e6c74f0bf --- /dev/null +++ b/ports/dav1d/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_fail_port_install(ON_ARCH "arm" "x86" ON_TARGET "uwp") + +vcpkg_from_gitlab( + GITLAB_URL https://code.videolan.org + OUT_SOURCE_PATH SOURCE_PATH + REPO videolan/dav1d + REF 0.8.1 + SHA512 dd40b82b65e4be37a27ab11e7116f7a244b0da4469915ead3922ac31724fb6da3910a78629a32a669031fe08d4323ab135174afb7462f6ea4adf96c111841c1c + PATCHES + "patch_underscore_prefix.patch" +) + +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) +vcpkg_add_to_path(${NASM_EXE_PATH}) + +set(LIBRARY_TYPE ${VCPKG_LIBRARY_LINKAGE}) +if (LIBRARY_TYPE STREQUAL "dynamic") + set(LIBRARY_TYPE "shared") +endif(LIBRARY_TYPE STREQUAL "dynamic") + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + --default-library=${LIBRARY_TYPE} + -Denable_tests=false + -Denable_tools=false +) + +vcpkg_install_meson() +vcpkg_copy_pdbs() + +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/dav1d/vcpkg.json b/ports/dav1d/vcpkg.json new file mode 100644 index 00000000000000..02d8d473a4f75b --- /dev/null +++ b/ports/dav1d/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "dav1d", + "version-string": "0.8.1", + "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", + "supports": "!(uwp | arm | x86)", + "dependencies": [ + "tool-meson" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index bc4973d540401a..f898dce807d9eb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1532,6 +1532,10 @@ "baseline": "3.0.0", "port-version": 1 }, + "dav1d": { + "baseline": "0.8.1", + "port-version": 0 + }, "dbg-macro": { "baseline": "2019-07-11", "port-version": 0 diff --git a/versions/d-/dav1d.json b/versions/d-/dav1d.json new file mode 100644 index 00000000000000..de707ec64409d0 --- /dev/null +++ b/versions/d-/dav1d.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1c30fb68cde7004f37eb289c95fb9823331fe571", + "version-string": "0.8.1", + "port-version": 0 + } + ] +} From ddb0a1cf1d0415ef1062fdf562c6b859bd4121a2 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 25 Jan 2021 10:09:27 -0800 Subject: [PATCH 0581/1694] Add dummy version.txt for vcpkg older than vcpkg_minimum_required. (#15828) --- toolsrc/VERSION.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 toolsrc/VERSION.txt diff --git a/toolsrc/VERSION.txt b/toolsrc/VERSION.txt new file mode 100644 index 00000000000000..275e5a6e071c4b --- /dev/null +++ b/toolsrc/VERSION.txt @@ -0,0 +1 @@ +"9999.99.99" From 80c7d35db40727a6527a97325c94a46e9a612ff4 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 25 Jan 2021 12:21:12 -0800 Subject: [PATCH 0582/1694] [vcpkg] Improve error reporting for vcpkg_abi_info.txt copy failure. (#15871) In build https://dev.azure.com/vcpkg/public/_build/results?buildId=48398 we are getting output like: ``` Error: Building package v-hacd:x64-windows-static failed with: BUILD_FAILED Elapsed time for package v-hacd:x64-windows-static: 4.156 s Starting package 1396/1464: v8:x64-windows-static Building package v8[core]:x64-windows-static... -- Using msys root at D:/downloads/tools/msys2/969c0913b9df89e1 -- Fetching https://chromium.googlesource.com/v8/v8.git... CMake Error at scripts/cmake/vcpkg_execute_required_process.cmake:108 (message): Command failed: C:/agent/externals/git/cmd/git.exe fetch https://chromium.googlesource.com/v8/v8.git 7565e93eb72cea4268028fc20186d415c22b1cff --depth 1 -n Working Directory: D:/downloads/git-tmp Error code: 128 See logs for more information: D:\buildtrees\v8\git-fetch-x64-windows-static-err.log Call Stack (most recent call first): scripts/cmake/vcpkg_from_git.cmake:91 (vcpkg_execute_required_process) ports/v8/portfile.cmake:71 (vcpkg_from_git) scripts/ports.cmake:128 (include) Could not copy into file: D:\packages\v8_x64-windows-static\share\v8\vcpkg_abi_info.txt ``` but aren't printing the reason for the copy failure. Added printing of that reason. --- toolsrc/src/vcpkg/build.cpp | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index c22c20fea94b76..daaed3e9860bbf 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -1134,7 +1134,7 @@ namespace vcpkg::Build const IBuildLogsRecorder& build_logs_recorder, const StatusParagraphs& status_db) { - auto& fs = paths.get_filesystem(); + auto& filesystem = paths.get_filesystem(); auto& spec = action.spec; const std::string& name = action.source_control_file_location.value_or_exit(VCPKG_LINE_INFO) .source_control_file->core_paragraph->name; @@ -1177,7 +1177,6 @@ namespace vcpkg::Build auto& abi_file = *abi_info.abi_tag_file.get(); - std::error_code ec; const fs::path abi_package_dir = paths.package_dir(spec) / "share" / spec.name(); const fs::path abi_file_in_package = paths.package_dir(spec) / "share" / spec.name() / "vcpkg_abi_info.txt"; if (action.has_package_abi()) @@ -1204,18 +1203,35 @@ namespace vcpkg::Build } ExtendedBuildResult result = do_build_package_and_clean_buildtrees(args, paths, action); + build_logs_recorder.record_build_result(paths, spec, result.code); - fs.create_directories(abi_package_dir, ec); - fs.copy_file(abi_file, abi_file_in_package, fs::copy_options::none, ec); - Checks::check_exit(VCPKG_LINE_INFO, !ec, "Could not copy into file: %s", fs::u8string(abi_file_in_package)); + std::error_code ec; + filesystem.create_directories(abi_package_dir, ec); + if (ec) + { + Checks::exit_with_message(VCPKG_LINE_INFO, + Strings::format("Could not create %s: %s (%d)", + fs::u8string(abi_package_dir).c_str(), + ec.message().c_str(), + ec.value())); + } + + filesystem.copy_file(abi_file, abi_file_in_package, fs::copy_options::none, ec); + if (ec) + { + Checks::exit_with_message(VCPKG_LINE_INFO, + Strings::format("Could not copy %s -> %s: %s (%d)", + fs::u8string(abi_file).c_str(), + fs::u8string(abi_file_in_package).c_str(), + ec.message().c_str(), + ec.value())); + } if (action.has_package_abi() && result.code == BuildResult::SUCCEEDED) { binaries_provider.push_success(paths, action); } - build_logs_recorder.record_build_result(paths, spec, result.code); - return result; } From b5a042863bc531b265747cb1cfe485f051d0b29d Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Tue, 26 Jan 2021 00:52:09 +0100 Subject: [PATCH 0583/1694] [boost-locale] android build (#15606) * pass additional link flags to b2 * configure boost-locale for android * build libiconv for android * Bump port version * bump port version * Update CONTROL * new_ci_checks and versions * add versions again * fix pr review * fix pr review. version * bump versions Co-authored-by: Nicole Mazzuca Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- ports/boost-locale/b2-options.cmake.in | 12 ++++++++++++ ports/boost-modular-build-helper/CMakeLists.txt | 5 +++++ ports/boost-modular-build-helper/vcpkg.json | 2 +- ports/libiconv/CONTROL | 2 +- ports/libiconv/portfile.cmake | 7 +++++-- versions/b-/boost-locale.json | 2 +- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 4 ++-- versions/l-/libiconv.json | 5 +++++ 9 files changed, 37 insertions(+), 7 deletions(-) diff --git a/ports/boost-locale/b2-options.cmake.in b/ports/boost-locale/b2-options.cmake.in index d1df5d6c5152bd..865a0b1437861a 100644 --- a/ports/boost-locale/b2-options.cmake.in +++ b/ports/boost-locale/b2-options.cmake.in @@ -12,6 +12,18 @@ if(@VCPKG_TARGET_IS_WINDOWS@) /boost/locale//boost_locale boost.locale.icu=${BOOST_LOCALE_ICU_FEATURE} ) +elseif(@VCPKG_TARGET_IS_ANDROID@) + find_library(LIBICONV_LIBRARY iconv) + get_filename_component(LIBICONV_DIR "${LIBICONV_LIBRARY}" DIRECTORY) + get_filename_component(LIBICONV_DIR "${LIBICONV_DIR}" DIRECTORY) + + list(APPEND B2_OPTIONS + boost.locale.iconv=on + boost.locale.posix=off + /boost/locale//boost_locale + boost.locale.icu=${BOOST_LOCALE_ICU_FEATURE} + -sICONV_PATH=${LIBICONV_DIR} + ) else() find_library(LIBICONV_LIBRARY iconv) get_filename_component(LIBICONV_DIR "${LIBICONV_LIBRARY}" DIRECTORY) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index d868b5ac82717f..c97158e484e67c 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -96,19 +96,24 @@ endif() if(CMAKE_CXX_COMPILER_TARGET AND CMAKE_CXX_COMPILE_OPTIONS_TARGET) if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") set(CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}") + set(LDFLAGS "${LDFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}") else() set(CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} ${CMAKE_CXX_COMPILER_TARGET}") + set(LDFLAGS "${LDFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} ${CMAKE_CXX_COMPILER_TARGET}") endif() endif() if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN) if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") set(CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") + set(LDFLAGS "${LDFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") else() set(CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") + set(LDFLAGS "${LDFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") endif() endif() if(CMAKE_SYSROOT AND CMAKE_CXX_COMPILE_OPTIONS_SYSROOT) set(CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}") + set(LDFLAGS "${LDFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}") endif() foreach(INCDIR ${CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES}) set(CXXFLAGS "${CXXFLAGS} ${CMAKE_INCLUDE_FLAG_C}${CMAKE_INCLUDE_FLAG_C_SEP}${INCDIR}") diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index bc96cdaef58032..d58b458d85e1e2 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version-string": "1.75.0", - "port-version": 3, + "port-version": 4, "dependencies": [ "boost-uninstall" ] diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index ec885fe69eccf3..f7414b81996681 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,5 +1,5 @@ Source: libiconv Version: 1.16 -Port-Version: 7 +Port-Version: 8 Homepage: https://www.gnu.org/software/libiconv/ Description: GNU Unicode text conversion diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 85ccce0c8005cd..a5d2d70e8875bc 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -1,4 +1,4 @@ -if(NOT VCPKG_TARGET_IS_WINDOWS) +if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/iconv) file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv) @@ -21,11 +21,14 @@ vcpkg_extract_source_archive_ex( 0003-Add-export.patch ) +if (NOT VCPKG_TARGET_IS_ANDROID) + list(APPEND OPTIONS --enable-relocatable) +endif() + vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH} DETERMINE_BUILD_TRIPLET USE_WRAPPERS OPTIONS - --enable-relocatable --enable-extra-encodings --without-libiconv-prefix --without-libintl-prefix diff --git a/versions/b-/boost-locale.json b/versions/b-/boost-locale.json index c5b917b534a186..d5e2d017f46720 100644 --- a/versions/b-/boost-locale.json +++ b/versions/b-/boost-locale.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "88631ecdc11e6ba3b30ee058381a62cf02a0a816", + "git-tree": "8a188d3cd40ba95cf241deda044c44d5426185bd", "version-string": "1.75.0", "port-version": 0 }, diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 52819f68118c6a..a44a263e412142 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b261a1bd3ff03916f10c4a157b670c3c4e7e7326", + "version-string": "1.75.0", + "port-version": 4 + }, { "git-tree": "39acb181b681e8ac20ff594d3ac1782bfbb37ba2", "version-string": "1.75.0", diff --git a/versions/baseline.json b/versions/baseline.json index f898dce807d9eb..3b18e13c2aaa24 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -674,7 +674,7 @@ }, "boost-modular-build-helper": { "baseline": "1.75.0", - "port-version": 3 + "port-version": 4 }, "boost-move": { "baseline": "1.75.0", @@ -3014,7 +3014,7 @@ }, "libiconv": { "baseline": "1.16", - "port-version": 7 + "port-version": 8 }, "libics": { "baseline": "1.6.4", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index c8d493eac0ad06..f198b53463160e 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1190548d712c0ed8699e3b82e16f6b070a5154c9", + "version-string": "1.16", + "port-version": 8 + }, { "git-tree": "2ca525bd3d388ec908ab2ec26bdccb12a990a26d", "version-string": "1.16", From 33ba2c09eb19306c479b9ff6a11eca9a51b02670 Mon Sep 17 00:00:00 2001 From: Stanislav Ershov Date: Tue, 26 Jan 2021 04:53:02 +0500 Subject: [PATCH 0584/1694] [angelscript] Update to 2.35.0 (#15852) * [angelscript] Update to 2.35.0 * Update version * Fix formatting * Update version * [angelscript] backport patch from trunk * Update version --- ports/angelscript/CONTROL | 7 --- ports/angelscript/portfile.cmake | 10 ++-- ports/angelscript/precxx11.patch | 78 ++++++++++++++++++++++++++++++++ ports/angelscript/vcpkg.json | 12 +++++ versions/a-/angelscript.json | 5 ++ versions/baseline.json | 2 +- 6 files changed, 103 insertions(+), 11 deletions(-) delete mode 100644 ports/angelscript/CONTROL create mode 100644 ports/angelscript/precxx11.patch create mode 100644 ports/angelscript/vcpkg.json diff --git a/ports/angelscript/CONTROL b/ports/angelscript/CONTROL deleted file mode 100644 index fee238c1edb5af..00000000000000 --- a/ports/angelscript/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: angelscript -Version: 2.34.0 -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. -Supports: !arm - -Feature: addons -Description: Installs all addons for use in compiling scripts addons diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake index a90f361bbbf405..ab35b4c1b83e3d 100644 --- a/ports/angelscript/portfile.cmake +++ b/ports/angelscript/portfile.cmake @@ -1,7 +1,9 @@ +vcpkg_fail_port_install(ON_ARCH "arm") + vcpkg_download_distfile(ARCHIVE - URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.34.0.zip" - FILENAME "angelscript_2.34.0.zip" - SHA512 c26dba452ab52c300da9c95fde8398acf4840cbc0e653ededf978d4a3e942cfe5b77292c74c49dc0279250a27cfd324c696c49d139a97c844b2a1eead9aae2f4 + URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.35.0.zip" + FILENAME "angelscript_2.35.0.zip" + SHA512 e54b58e78b21c2ff6aa34d5f55b18fcf8737d057c86aef8901ac0c11f14739fe7f1494f9bcfdbca6a8e54b6d0b36a04dd098780bcd02dea5764fd6d22984b6b0 ) vcpkg_extract_source_archive_ex( @@ -9,6 +11,7 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} PATCHES mark-threads-private.patch + precxx11.patch ) vcpkg_configure_cmake( @@ -17,6 +20,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Angelscript) diff --git a/ports/angelscript/precxx11.patch b/ports/angelscript/precxx11.patch new file mode 100644 index 00000000000000..bd4a93325e963b --- /dev/null +++ b/ports/angelscript/precxx11.patch @@ -0,0 +1,78 @@ +commit 4684264c7ed39ff397f9c38c64370284ddac44b0 +Author: angelcode +Date: Thu Dec 10 19:13:44 2020 +0000 + + Changed code to be compatible with pre-C++11 + + git-svn-id: https://svn.code.sf.net/p/angelscript/code/trunk@2686 404ce1b2-830e-0410-a2e2-b09542c77caf + +diff --git a/angelscript/source/as_module.cpp b/angelscript/source/as_module.cpp +index 5ec55423..ddd3ed73 100644 +--- a/angelscript/source/as_module.cpp ++++ b/angelscript/source/as_module.cpp +@@ -1536,28 +1536,28 @@ int asCModule::UnbindAllImportedFunctions() + void asCModule::AddClassType(asCObjectType* type) + { + m_classTypes.PushLast(type); +- m_typeLookup.Insert({type->nameSpace, type->name}, type); ++ m_typeLookup.Insert(asSNameSpaceNamePair(type->nameSpace, type->name), type); + } + + // internal + void asCModule::AddEnumType(asCEnumType* type) + { + m_enumTypes.PushLast(type); +- m_typeLookup.Insert({type->nameSpace, type->name}, type); ++ m_typeLookup.Insert(asSNameSpaceNamePair(type->nameSpace, type->name), type); + } + + // internal + void asCModule::AddTypeDef(asCTypedefType* type) + { + m_typeDefs.PushLast(type); +- m_typeLookup.Insert({type->nameSpace, type->name}, type); ++ m_typeLookup.Insert(asSNameSpaceNamePair(type->nameSpace, type->name), type); + } + + // internal + void asCModule::AddFuncDef(asCFuncdefType* type) + { + m_funcDefs.PushLast(type); +- m_typeLookup.Insert({type->nameSpace, type->name}, type); ++ m_typeLookup.Insert(asSNameSpaceNamePair(type->nameSpace, type->name), type); + } + + // internal +@@ -1569,8 +1569,8 @@ void asCModule::ReplaceFuncDef(asCFuncdefType* type, asCFuncdefType* newType) + m_funcDefs[i] = newType; + + // Replace it in the lookup map too +- asSMapNode* result = nullptr; +- if(m_typeLookup.MoveTo(&result, {type->nameSpace, type->name})) ++ asSMapNode* result = 0; ++ if(m_typeLookup.MoveTo(&result, asSNameSpaceNamePair(type->nameSpace, type->name))) + { + asASSERT( result->value == type ); + result->value = newType; +@@ -1581,8 +1581,8 @@ void asCModule::ReplaceFuncDef(asCFuncdefType* type, asCFuncdefType* newType) + // internal + asCTypeInfo *asCModule::GetType(const asCString &type, asSNameSpace *ns) const + { +- asSMapNode* result = nullptr; +- if(m_typeLookup.MoveTo(&result, {ns, type})) ++ asSMapNode* result = 0; ++ if(m_typeLookup.MoveTo(&result, asSNameSpaceNamePair(ns, type))) + { + return result->value; + } +@@ -1592,8 +1592,8 @@ asCTypeInfo *asCModule::GetType(const asCString &type, asSNameSpace *ns) const + // internal + asCObjectType *asCModule::GetObjectType(const char *type, asSNameSpace *ns) const + { +- asSMapNode* result = nullptr; +- if(m_typeLookup.MoveTo(&result, {ns, type})) ++ asSMapNode* result = 0; ++ if(m_typeLookup.MoveTo(&result, asSNameSpaceNamePair(ns, type))) + { + return CastToObjectType(result->value); + } diff --git a/ports/angelscript/vcpkg.json b/ports/angelscript/vcpkg.json new file mode 100644 index 00000000000000..57d2d13a2c538a --- /dev/null +++ b/ports/angelscript/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "angelscript", + "version-string": "2.35.0", + "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", + "supports": "!arm", + "features": { + "addons": { + "description": "Installs all addons for use in compiling scripts addons" + } + } +} diff --git a/versions/a-/angelscript.json b/versions/a-/angelscript.json index a18118eb2aaf74..df90ac02f5b3c6 100644 --- a/versions/a-/angelscript.json +++ b/versions/a-/angelscript.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c88c2eec1943cd3f46d8fe2b77f4d75f3d35cba2", + "version-string": "2.35.0", + "port-version": 0 + }, { "git-tree": "bca26a9780ffe5a26b45abb86e05603a4eec0719", "version-string": "2.34.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3b18e13c2aaa24..ad344df5b8ca28 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -73,7 +73,7 @@ "port-version": 0 }, "angelscript": { - "baseline": "2.34.0", + "baseline": "2.35.0", "port-version": 0 }, "angle": { From 584042a5304763a602b763dd048c56bcb1544cbf Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 26 Jan 2021 14:33:06 -0800 Subject: [PATCH 0585/1694] [quirc, opencv4] Build fixes from 2021-01-18 build (#15788) * [quirc, opencv4] Use a cmake package for quirc and devendor quirc from opencv4. * Build fixes from 2020-01-18 build https://dev.azure.com/vcpkg/public/_build/results?buildId=48065 > PASSING, REMOVE FROM FAIL LIST: chartdir:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: cmark:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: cppcms:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: cudnn:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: devicenameresolver:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: dxut:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: epsilon:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: fann:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: getopt-win32:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: glib:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: graphqlparser:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: halide:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: hpx:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: jemalloc:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: libepoxy:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: libhsplasma:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: libmodman:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: libpcap:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: libplist:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: milerius-sfml-imgui:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: monkeys-audio:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: moos-core:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: msix:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: ngspice:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: openni2:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: openvr:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: pmdk:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: pngpp:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: qpid-proton:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: qt5-tools:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: sciter:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: scylla-wrapper:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: soundtouch:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: spirv-tools:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: torch-th:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: treehopper:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: unrar:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: urdfdom:x64-windows-static-md (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: xalan-c:x64-windows-static-md (.\scripts\ci.baseline.txt) These look like they have always passed since we turned on x64-windows-static-md in nightly CI. >PASSING, REMOVE FROM FAIL LIST: osgearth:x64-windows (.\scripts\ci.baseline.txt) >PASSING, REMOVE FROM FAIL LIST: osgearth:x86-windows (.\scripts\ci.baseline.txt) Maybe addressed by https://github.com/microsoft/vcpkg/pull/15777 >REGRESSION: gettext:arm-uwp. If expected, add gettext:arm-uwp=fail to .\scripts\ci.baseline.txt. >REGRESSION: gettext:arm64-windows. If expected, add gettext:arm64-windows=fail to .\scripts\ci.baseline.txt. Probably fixed by https://github.com/microsoft/vcpkg/pull/15740 > PASSING, REMOVE FROM FAIL LIST: directxmesh:x64-linux (.\scripts\ci.baseline.txt) > PASSING, REMOVE FROM FAIL LIST: uvatlas:x64-linux (.\scripts\ci.baseline.txt) Probably an error in the authoring of https://github.com/microsoft/vcpkg/pull/15554/ > REGRESSION: dcmtk:x86-windows. If expected, add dcmtk:x86-windows=fail to .\scripts\ci.baseline.txt. > > "C:\PROGRA~2\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x86\cl.exe" /TP -DDCMTK_BUILD_IN_PROGRESS -DNOMINMAX -DUSE_NULL_SAFE_OFSTRING -D_CRT_FAR_MAPPINGS_NO_DEPRECATE -D_CRT_IS_WCTYPE_NO_DEPRECATE -D_CRT_MANAGED_FP_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_DEPRECATE_GLOBALS -D_CRT_SETERRORMODE_BEEP_SLEEP_NO_DEPRECATE -D_CRT_TIME_FUNCTIONS_NO_DEPRECATE -D_CRT_VCCLRIT_NO_DEPRECATE -D_REENTRANT -D_SCL_SECURE_NO_DEPRECATE -Dofstd_EXPORTS -ID:\installed\x86-windows\include -Iconfig\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\ofstd\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\oflog\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmdata\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmimgle\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmimage\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmjpeg\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmjpls\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmtls\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmnet\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmsr\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmsign\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmwlm\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmqrdb\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmpstat\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmrt\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmiod\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmfg\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmseg\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmtract\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmpmap\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmect\include /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 -DDEBUG /showIncludes /Foofstd\libsrc\CMakeFiles\ofstd.dir\offilsys.cc.obj /Fdofstd\libsrc\CMakeFiles\ofstd.dir\ofstd.pdb /FS -c D:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\ofstd\libsrc\offilsys.cc > D:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\ofstd\libsrc\offilsys.cc(376): error C2039: 'DIR': is not a member of '`global namespace'' > > REGRESSION: tesseract:x64-windows-static-md. If expected, add tesseract:x64-windows-static-md=fail to .\scripts\ci.baseline.txt. > REGRESSION: tesseract:x64-windows-static. If expected, add tesseract:x64-windows-static=fail to .\scripts\ci.baseline.txt. > REGRESSION: tesseract:x64-windows. If expected, add tesseract:x64-windows=fail to .\scripts\ci.baseline.txt. > REGRESSION: tesseract:x86-windows. If expected, add tesseract:x86-windows=fail to .\scripts\ci.baseline.txt. > [2/241] "C:\PROGRA~2\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x86\cl.exe" /TP -DHAVE_CONFIG_H -DTESS_EXPORTS -D_CRT_SECURE_NO_WARNINGS -D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1 -D__AVX2__ -D__AVX__ -D__BMI2__ -D__FMA__ -D__SSE2__ -D__SSE3__ -D__SSE4A__ -D__SSE4_1__ -D__SSE4_2__ -D__SSSE3__ -Dlibtesseract_EXPORTS -ID:\installed\x86-windows\share\leptonica\..\..\include -ID:\installed\x86-windows\share\leptonica\..\..\include\leptonica -I. -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\api -Iapi -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\arch -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccmain -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccstruct -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccutil -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\classify -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\cutil -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\dict -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\lstm -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\opencl -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\textord -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\viewer -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\wordrec -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\training -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\vs2010\tesseract -ID:\installed\x86-windows\include /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /utf-8 /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /W4 /bigobj -std:c++17 /showIncludes /FoCMakeFiles\libtesseract.dir\src\classify\shapetable.cpp.obj /FdCMakeFiles\libtesseract.dir\ /FS -c D:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\classify\shapetable.cpp > FAILED: CMakeFiles/libtesseract.dir/src/classify/shapetable.cpp.obj > "C:\PROGRA~2\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x86\cl.exe" /TP -DHAVE_CONFIG_H -DTESS_EXPORTS -D_CRT_SECURE_NO_WARNINGS -D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1 -D__AVX2__ -D__AVX__ -D__BMI2__ -D__FMA__ -D__SSE2__ -D__SSE3__ -D__SSE4A__ -D__SSE4_1__ -D__SSE4_2__ -D__SSSE3__ -Dlibtesseract_EXPORTS -ID:\installed\x86-windows\share\leptonica\..\..\include -ID:\installed\x86-windows\share\leptonica\..\..\include\leptonica -I. -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\api -Iapi -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\arch -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccmain -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccstruct -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccutil -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\classify -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\cutil -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\dict -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\lstm -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\opencl -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\textord -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\viewer -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\wordrec -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\training -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\vs2010\tesseract -ID:\installed\x86-windows\include /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /utf-8 /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /W4 /bigobj -std:c++17 /showIncludes /FoCMakeFiles\libtesseract.dir\src\classify\shapetable.cpp.obj /FdCMakeFiles\libtesseract.dir\ /FS -c D:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\classify\shapetable.cpp > cl : Command line warning D9025 : overriding '/W3' with '/W4' > D:\installed\x86-windows\include\params.h(36): error C2143: syntax error: missing ';' before '*' https://github.com/microsoft/vcpkg/pull/15785 > REGRESSION: fluidsynth:x64-windows-static-md. If expected, add fluidsynth:x64-windows-static-md=fail to .\scripts\ci.baseline.txt. Was previously a cascaded failure from glib. REGRESSION: libevent:x86-windows. If expected, add libevent:x86-windows=fail to .\scripts\ci.baseline.txt. > REGRESSION: ideviceinstaller:x64-windows-static-md. If expected, add ideviceinstaller:x64-windows-static-md=fail to .\scripts\ci.baseline.txt. > REGRESSION: libcrafter:x64-windows-static-md. If expected, add libcrafter:x64-windows-static-md=fail to .\scripts\ci.baseline.txt. > REGRESSION: libirecovery:x64-windows-static-md. If expected, add libirecovery:x64-windows-static-md=fail to .\scripts\ci.baseline.txt. > REGRESSION: moos-essential:x64-windows-static-md. If expected, add moos-essential:x64-windows-static-md=fail to .\scripts\ci.baseline.txt. > REGRESSION: openmama:x64-windows-static-md. If expected, add openmama:x64-windows-static-md=fail to .\scripts\ci.baseline.txt. > REGRESSION: sdformat10:x64-windows-static-md. If expected, add sdformat10:x64-windows-static-md=fail to .\scripts\ci.baseline.txt. > REGRESSION: sdformat6:x64-windows-static-md. If expected, add sdformat6:x64-windows-static-md=fail to .\scripts\ci.baseline.txt. > REGRESSION: sdformat9:x64-windows-static-md. If expected, add sdformat9:x64-windows-static-md=fail to .\scripts\ci.baseline.txt. I'm going to assume these were cascaded failures for now. > REGRESSION: mesa:x64-windows-static-md. If expected, add mesa:x64-windows-static-md=fail to .\scripts\ci.baseline.txt. > REGRESSION: mesa:x64-windows. If expected, add mesa:x64-windows=fail to .\scripts\ci.baseline.txt. > REGRESSION: mesa:x86-windows. If expected, add mesa:x86-windows=fail to .\scripts\ci.baseline.txt. Nancy is working on this https://github.com/microsoft/vcpkg/pull/15729 > REGRESSION: quirc:x64-linux. If expected, add quirc:x64-linux=fail to .\scripts\ci.baseline.txt. > REGRESSION: quirc:x64-osx. If expected, add quirc:x64-osx=fail to .\scripts\ci.baseline.txt. > Starting package 1166/1442: quirc:x64-linux > Building package quirc[core]:x64-linux... > -- Downloading https://github.com/dlbeer/quirc/archive/7e7ab596e4d0988faf1c12ae89c354b114181c40.tar.gz -> dlbeer-quirc-7e7ab596e4d0988faf1c12ae89c354b114181c40.tar.gz... > -- Extracting source /mnt/vcpkg-ci/downloads/dlbeer-quirc-7e7ab596e4d0988faf1c12ae89c354b114181c40.tar.gz > -- Using source at /mnt/vcpkg-ci/buildtrees/quirc/src/b114181c40-f1e71e0d5b.clean > -- Configuring x64-linux-dbg > -- Configuring x64-linux-rel > -- Building x64-linux-dbg > -- Building x64-linux-rel > -- Installing: /mnt/vcpkg-ci/packages/quirc_x64-linux/share/quirc/copyright/LICENSE > -- Performing post-build validation > -- Performing post-build validation done > Uploaded binaries to 1 HTTP remotes. > Building package quirc[core]:x64-linux... done > Installing package quirc[core]:x64-linux... > The following files are already installed in /mnt/vcpkg-ci/installed/x64-linux and are in conflict with quirc:x64-linux > > Installed by opencv4:x64-linux > lib/libquirc.a > > Elapsed time for package quirc:x64-linux: 2.531 s Probably broken by https://github.com/microsoft/vcpkg/pull/15089, fix here > REGRESSION: spatialite-tools:x64-linux. If expected, add spatialite-tools:x64-linux=fail to .\scripts\ci.baseline.txt. > REGRESSION: spatialite-tools:x64-osx. If expected, add spatialite-tools:x64-osx=fail to .\scripts\ci.baseline.txt. These are spewing linker errors, probably triggered by https://github.com/microsoft/vcpkg/pull/15768/ although that PR removed them from ci.baseline.txt? * Fixup spurious / and format-manifest. * x-add-version * Add missing =fails. * Update opencv4 devendor patch for 4.5 * Transform quirc into a feature. * Repeat changes for opencv3. * Repeat for opencv. Also fix version for "opencv". * [dxut] Use vcpkg_from_github, correct "supports", if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic") message(FATAL_ERROR "DXUT only supports dynamic CRT linkage") endif() * [epsilon] Skip in ci.baseline.txt for now because it has "vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)" but also checks against the CRT linkage making the right fix unclear. * Fix flipped supports: * Update ports/opencv3/portfile.cmake * x-add-version Co-authored-by: nicole mazzuca --- ports/dxut/CONTROL | 4 - ports/dxut/portfile.cmake | 51 ++-- ports/dxut/vcpkg.json | 8 + ports/opencv/CONTROL | 107 -------- ports/opencv/vcpkg.json | 333 ++++++++++++++++++++++++ ports/opencv3/0010-devendor-quirc.patch | 26 ++ ports/opencv3/CONTROL | 99 ------- ports/opencv3/portfile.cmake | 7 +- ports/opencv3/vcpkg.json | 214 +++++++++++++++ ports/opencv4/0011-devendor-quirc.patch | 26 ++ ports/opencv4/CONTROL | 102 -------- ports/opencv4/portfile.cmake | 7 +- ports/opencv4/vcpkg.json | 222 ++++++++++++++++ ports/quirc/CMakeLists.txt | 28 +- ports/quirc/CONTROL | 4 - ports/quirc/portfile.cmake | 2 + ports/quirc/vcpkg.json | 6 + scripts/ci.baseline.txt | 63 +---- versions/baseline.json | 14 +- versions/d-/dxut.json | 5 + versions/o-/opencv.json | 5 + versions/o-/opencv3.json | 5 + versions/o-/opencv4.json | 5 + versions/q-/quirc.json | 5 + 24 files changed, 934 insertions(+), 414 deletions(-) delete mode 100644 ports/dxut/CONTROL create mode 100644 ports/dxut/vcpkg.json delete mode 100644 ports/opencv/CONTROL create mode 100644 ports/opencv/vcpkg.json create mode 100644 ports/opencv3/0010-devendor-quirc.patch delete mode 100644 ports/opencv3/CONTROL create mode 100644 ports/opencv3/vcpkg.json create mode 100644 ports/opencv4/0011-devendor-quirc.patch delete mode 100644 ports/opencv4/CONTROL create mode 100644 ports/opencv4/vcpkg.json delete mode 100644 ports/quirc/CONTROL create mode 100644 ports/quirc/vcpkg.json diff --git a/ports/dxut/CONTROL b/ports/dxut/CONTROL deleted file mode 100644 index 60046288274ff8..00000000000000 --- a/ports/dxut/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: dxut -Version: 11.14-3 -Homepage: https://github.com/Microsoft/DXUT -Description: A "GLUT"-like framework for Direct3D 11.x Win32 desktop applications \ No newline at end of file diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake index 4d0a878e3fa579..78626d1c985aea 100644 --- a/ports/dxut/portfile.cmake +++ b/ports/dxut/portfile.cmake @@ -1,18 +1,11 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic") - message(FATAL_ERROR "DXUT only supports dynamic CRT linkage") -endif() - -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/Microsoft/DXUT/archive/sept2016.tar.gz" - FILENAME "DXUT-sept2016.tar.gz" - SHA512 190006c194284a1f5d614477896b0469a59ece05dff37477dadbe98808a5c33e274c0c1bb1390f22d1b5e06c9f534f4b50d6002157b2a391e01c2192b8e08869 -) - -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) +vcpkg_fail_port_install(ON_ARCH arm) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/DXUT + REF d6e8ef60b35b8d3b97684bd6b3cee88f8ba81a3f + SHA512 2ac1ac4416dbf7ae0e8a9e1e95fbd8bede126ac6dc4e919f4bd1131d10f3a01e007aff2f770ace9cbf48093ff76d8b89c4b78b734658028be62e1412f44078ae ) IF (TRIPLET_SYSTEM_ARCH MATCHES "x86") @@ -22,31 +15,29 @@ ELSE() ENDIF() vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/DXUT_2015.sln - PLATFORM ${BUILD_ARCH} + PROJECT_PATH "${SOURCE_PATH}/DXUT_2015.sln" + PLATFORM "${BUILD_ARCH}" ) file(INSTALL - ${SOURCE_PATH}/Core/ - ${SOURCE_PATH}/Optional/ - DESTINATION ${CURRENT_PACKAGES_DIR}/include + "${SOURCE_PATH}/Core/" + "${SOURCE_PATH}/Optional/" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h" ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/include/Bin) + "${CURRENT_PACKAGES_DIR}/include/Bin") file(INSTALL - ${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUT.lib - ${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUTOpt.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + "${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUT.lib" + "${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUTOpt.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL - ${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUT.lib - ${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUTOpt.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + "${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUT.lib" + "${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUTOpt.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/MIT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/dxut RENAME copyright) - -message(STATUS "Installing done") +file(INSTALL "${SOURCE_PATH}/MIT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/dxut/vcpkg.json b/ports/dxut/vcpkg.json new file mode 100644 index 00000000000000..49517b1de906ca --- /dev/null +++ b/ports/dxut/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "dxut", + "version-string": "11.14", + "port-version": 4, + "description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications", + "homepage": "https://github.com/Microsoft/DXUT", + "supports": "!staticcrt & windows & !arm" +} diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL deleted file mode 100644 index 7b0e0cfe9da564..00000000000000 --- a/ports/opencv/CONTROL +++ /dev/null @@ -1,107 +0,0 @@ -Source: opencv -Version: 4.3.0 -Port-Version: 1 -Homepage: https://github.com/opencv/opencv -Description: Computer vision library -Build-Depends: opencv4[core] -Default-Features: dnn, jpeg, png, tiff, webp - -Feature: nonfree -Build-Depends: opencv4[core,nonfree] -Description: opencv nonfree module - -Feature: ade -Build-Depends: opencv4[core,ade] -Description: graph api - -Feature: contrib -Build-Depends: opencv4[core,contrib] -Description: opencv_contrib module - -Feature: cuda -Build-Depends: opencv4[core,cuda] -Description: CUDA support for opencv - -Feature: dnn -Build-Depends: opencv4[core,dnn] -Description: Enable dnn module - -Feature: eigen -Build-Depends: opencv4[core,eigen] -Description: Eigen support for opencv - -Feature: ffmpeg -Build-Depends: opencv4[core,ffmpeg] -Description: ffmpeg support for opencv - -Feature: gdcm -Build-Depends: opencv4[core,gdcm] -Description: GDCM support for opencv - -Feature: halide -Build-Depends: opencv4[core,halide] -Description: Halide support for opencv - -Feature: ipp -Build-Depends: opencv4[core,ipp] -Description: Enable Intel Integrated Performance Primitives - -Feature: jasper -Build-Depends: opencv4[core,jasper] -Description: JPEG 2000 support for opencv - -Feature: jpeg -Build-Depends: opencv4[core,jpeg] -Description: JPEG support for opencv - -Feature: lapack -Build-Depends: opencv4[core,lapack] -Description: LAPACK support for opencv - -Feature: openexr -Build-Depends: opencv4[core,openexr] -Description: OpenEXR support for opencv - -Feature: opengl -Build-Depends: opencv4[core,opengl] -Description: opengl support for opencv - -Feature: openmp -Build-Depends: opencv4[core,openmp] -Description: Enable openmp support for opencv - -Feature: ovis -Build-Depends: opencv4[core,ovis] -Description: opencv_ovis module - -Feature: png -Build-Depends: opencv4[core,png] -Description: PNG support for opencv - -Feature: qt -Build-Depends: opencv4[core,qt] -Description: Qt GUI support for opencv - -Feature: sfm -Build-Depends: opencv4[core,sfm] -Description: opencv_sfm module - -Feature: tbb -Build-Depends: opencv4[core,tbb] -Description: Enable Intel Threading Building Blocks - -Feature: tiff -Build-Depends: opencv4[core,tiff] -Description: TIFF support for opencv - -Feature: vtk -Build-Depends: opencv4[core,vtk] -Description: vtk support for opencv - -Feature: webp -Build-Depends: opencv4[core,webp] -Description: WebP support for opencv - -Feature: world -Build-Depends: opencv4[core,world] -Description: Compile to a single package support for opencv diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json new file mode 100644 index 00000000000000..372977b53c5114 --- /dev/null +++ b/ports/opencv/vcpkg.json @@ -0,0 +1,333 @@ +{ + "name": "opencv", + "version": "4.5.0", + "description": "Computer vision library", + "homepage": "https://github.com/opencv/opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false + } + ], + "default-features": [ + "dnn", + "jpeg", + "png", + "tiff", + "webp" + ], + "features": { + "ade": { + "description": "graph api", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "ade" + ] + } + ] + }, + "contrib": { + "description": "opencv_contrib module", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "contrib" + ] + } + ] + }, + "cuda": { + "description": "CUDA support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "cuda" + ] + } + ] + }, + "dnn": { + "description": "Enable dnn module", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "dnn" + ] + } + ] + }, + "eigen": { + "description": "Eigen support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "eigen" + ] + } + ] + }, + "ffmpeg": { + "description": "ffmpeg support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "ffmpeg" + ] + } + ] + }, + "gdcm": { + "description": "GDCM support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "gdcm" + ] + } + ] + }, + "halide": { + "description": "Halide support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "halide" + ] + } + ] + }, + "ipp": { + "description": "Enable Intel Integrated Performance Primitives", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "ipp" + ] + } + ] + }, + "jasper": { + "description": "JPEG 2000 support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "jasper" + ] + } + ] + }, + "jpeg": { + "description": "JPEG support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "jpeg" + ] + } + ] + }, + "lapack": { + "description": "LAPACK support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "lapack" + ] + } + ] + }, + "nonfree": { + "description": "opencv nonfree module", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "nonfree" + ] + } + ] + }, + "openexr": { + "description": "OpenEXR support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "openexr" + ] + } + ] + }, + "opengl": { + "description": "opengl support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "opengl" + ] + } + ] + }, + "openmp": { + "description": "Enable openmp support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "openmp" + ] + } + ] + }, + "ovis": { + "description": "opencv_ovis module", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "ovis" + ] + } + ] + }, + "png": { + "description": "PNG support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "png" + ] + } + ] + }, + "qt": { + "description": "Qt GUI support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "qt" + ] + } + ] + }, + "quirc": { + "description": "Enable QR code module", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "quirc" + ] + } + ] + }, + "sfm": { + "description": "opencv_sfm module", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "sfm" + ] + } + ] + }, + "tbb": { + "description": "Enable Intel Threading Building Blocks", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "tbb" + ] + } + ] + }, + "tiff": { + "description": "TIFF support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "tiff" + ] + } + ] + }, + "vtk": { + "description": "vtk support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "vtk" + ] + } + ] + }, + "webp": { + "description": "WebP support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "webp" + ] + } + ] + }, + "world": { + "description": "Compile to a single package support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "world" + ] + } + ] + } + } +} diff --git a/ports/opencv3/0010-devendor-quirc.patch b/ports/opencv3/0010-devendor-quirc.patch new file mode 100644 index 00000000000000..1d2d7ccb7de45c --- /dev/null +++ b/ports/opencv3/0010-devendor-quirc.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 15eb053..58a9585 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -766,7 +766,7 @@ if(WITH_OPENVX) + endif() + + if(WITH_QUIRC) +- add_subdirectory(3rdparty/quirc) ++ find_package(quirc CONFIG REQUIRED) + set(HAVE_QUIRC TRUE) + endif() + # ---------------------------------------------------------------------------- +diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt +index 414e578..4f26d75 100644 +--- a/modules/objdetect/CMakeLists.txt ++++ b/modules/objdetect/CMakeLists.txt +@@ -2,7 +2,5 @@ set(the_description "Object Detection") + ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java python js) + + if(HAVE_QUIRC) +- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) +- ocv_include_directories(${QUIRC_INCLUDE}) +- ocv_target_link_libraries(${the_module} quirc) ++ ocv_target_link_libraries(${the_module} quirc::quirc) + endif() diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL deleted file mode 100644 index 586c4337e41739..00000000000000 --- a/ports/opencv3/CONTROL +++ /dev/null @@ -1,99 +0,0 @@ -Source: opencv3 -Version: 3.4.12 -Build-Depends: zlib -Homepage: https://github.com/opencv/opencv -Description: computer vision library -Default-Features: dnn, jpeg, png, tiff, webp - -Feature: nonfree -Description: allow nonfree and unredistributable libraries - -Feature: flann -Build-Depends: protobuf -Description: opencv_flann module - -Feature: contrib -Build-Depends: opencv3[dnn], hdf5 (!uwp&!(windows&(arm|arm64))), tesseract (!uwp&!(windows&(arm|arm64))) -Description: opencv_contrib module - -Feature: cuda -Build-Depends: opencv3[contrib], cuda, cudnn -Description: CUDA support for opencv - -Feature: dnn -Build-Depends: opencv3[flann] -Description: Enable dnn module - -Feature: eigen -Build-Depends: eigen3 -Description: Eigen support for opencv - -Feature: ffmpeg -Build-Depends: ffmpeg -Description: ffmpeg support for opencv - -Feature: gdcm -Build-Depends: gdcm -Description: GDCM support for opencv - -Feature: halide -Build-Depends: halide, opencv3[core], opencv3[dnn] -Description: Halide support for opencv - -Feature: ipp -Description: Enable Intel Integrated Performance Primitives - -Feature: jasper -Build-Depends: jasper -Description: JPEG 2000 support for opencv - -Feature: jpeg -Build-Depends: libjpeg-turbo -Description: JPEG support for opencv - -Feature: lapack -Build-Depends: blas, lapack -Description: LAPACK support for opencv - -Feature: openexr -Build-Depends: openexr -Description: OpenEXR support for opencv - -Feature: opengl -Build-Depends: opengl -Description: opengl support for opencv - -Feature: ovis -Build-Depends: opencv3[contrib], ogre -Description: opencv_ovis module - -Feature: png -Build-Depends: libpng -Description: PNG support for opencv - -Feature: qt -Build-Depends: qt5-base[core] -Description: Qt GUI support for opencv - -Feature: sfm -Build-Depends: opencv3[contrib], eigen3, glog, gflags, ceres -Description: opencv_sfm module - -Feature: tbb -Build-Depends: tbb -Description: Enable Intel Threading Building Blocks - -Feature: tiff -Build-Depends: tiff -Description: TIFF support for opencv - -Feature: vtk -Build-Depends: vtk -Description: vtk support for opencv - -Feature: webp -Build-Depends: libwebp -Description: WebP support for opencv - -Feature: world -Description: Compile to a single package support for opencv diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index c65792bf00029d..4345a1c2fd603d 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_from_github( 0003-force-package-requirements.patch 0005-fix-vtk9.patch 0009-fix-uwp.patch + 0010-devendor-quirc.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -38,8 +39,8 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "contrib" WITH_CONTRIB - "cuda" WITH_CUDA "cuda" WITH_CUBLAS + "cuda" WITH_CUDA "dnn" BUILD_opencv_dnn "eigen" WITH_EIGEN "ffmpeg" WITH_FFMPEG @@ -54,6 +55,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "opengl" WITH_OPENGL "png" WITH_PNG "qt" WITH_QT + "quirc" WITH_QUIRC "sfm" BUILD_opencv_sfm "tiff" WITH_TIFF "vtk" WITH_VTK @@ -401,6 +403,9 @@ find_dependency(Tesseract)") if(BUILD_opencv_ovis) string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)") endif() + if("quirc" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(quirc)") + endif() if("qt" IN_LIST FEATURES) string(APPEND DEPS_STRING " set(CMAKE_AUTOMOC ON) diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json new file mode 100644 index 00000000000000..c977a01329a7f1 --- /dev/null +++ b/ports/opencv3/vcpkg.json @@ -0,0 +1,214 @@ +{ + "name": "opencv3", + "version": "3.4.12", + "port-version": 1, + "description": "computer vision library", + "homepage": "https://github.com/opencv/opencv", + "dependencies": [ + "zlib" + ], + "default-features": [ + "dnn", + "jpeg", + "png", + "tiff", + "webp" + ], + "features": { + "contrib": { + "description": "opencv_contrib module", + "dependencies": [ + { + "name": "hdf5", + "platform": "!uwp & !(windows & (arm | arm64))" + }, + { + "name": "opencv3", + "features": [ + "dnn" + ] + }, + { + "name": "tesseract", + "platform": "!uwp & !(windows & (arm | arm64))" + } + ] + }, + "cuda": { + "description": "CUDA support for opencv", + "dependencies": [ + "cuda", + "cudnn", + { + "name": "opencv3", + "features": [ + "contrib" + ] + } + ] + }, + "dnn": { + "description": "Enable dnn module", + "dependencies": [ + { + "name": "opencv3", + "features": [ + "flann" + ] + } + ] + }, + "eigen": { + "description": "Eigen support for opencv", + "dependencies": [ + "eigen3" + ] + }, + "ffmpeg": { + "description": "ffmpeg support for opencv", + "dependencies": [ + "ffmpeg" + ] + }, + "flann": { + "description": "opencv_flann module", + "dependencies": [ + "protobuf" + ] + }, + "gdcm": { + "description": "GDCM support for opencv", + "dependencies": [ + "gdcm" + ] + }, + "halide": { + "description": "Halide support for opencv", + "dependencies": [ + "halide", + { + "name": "opencv3", + "default-features": false + }, + { + "name": "opencv3", + "features": [ + "dnn" + ] + } + ] + }, + "ipp": { + "description": "Enable Intel Integrated Performance Primitives" + }, + "jasper": { + "description": "JPEG 2000 support for opencv", + "dependencies": [ + "jasper" + ] + }, + "jpeg": { + "description": "JPEG support for opencv", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "lapack": { + "description": "LAPACK support for opencv", + "dependencies": [ + "blas", + "lapack" + ] + }, + "nonfree": { + "description": "allow nonfree and unredistributable libraries" + }, + "openexr": { + "description": "OpenEXR support for opencv", + "dependencies": [ + "openexr" + ] + }, + "opengl": { + "description": "opengl support for opencv", + "dependencies": [ + "opengl" + ] + }, + "ovis": { + "description": "opencv_ovis module", + "dependencies": [ + "ogre", + { + "name": "opencv3", + "features": [ + "contrib" + ] + } + ] + }, + "png": { + "description": "PNG support for opencv", + "dependencies": [ + "libpng" + ] + }, + "qt": { + "description": "Qt GUI support for opencv", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] + }, + "quirc": { + "description": "Enable QR code module", + "dependencies": [ + "quirc" + ] + }, + "sfm": { + "description": "opencv_sfm module", + "dependencies": [ + "ceres", + "eigen3", + "gflags", + "glog", + { + "name": "opencv3", + "features": [ + "contrib" + ] + } + ] + }, + "tbb": { + "description": "Enable Intel Threading Building Blocks", + "dependencies": [ + "tbb" + ] + }, + "tiff": { + "description": "TIFF support for opencv", + "dependencies": [ + "tiff" + ] + }, + "vtk": { + "description": "vtk support for opencv", + "dependencies": [ + "vtk" + ] + }, + "webp": { + "description": "WebP support for opencv", + "dependencies": [ + "libwebp" + ] + }, + "world": { + "description": "Compile to a single package support for opencv" + } + } +} diff --git a/ports/opencv4/0011-devendor-quirc.patch b/ports/opencv4/0011-devendor-quirc.patch new file mode 100644 index 00000000000000..a1f13849e9a58e --- /dev/null +++ b/ports/opencv4/0011-devendor-quirc.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 89521b1..5ff0f01 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -772,7 +772,7 @@ if(WITH_OPENVX) + endif() + + if(WITH_QUIRC) +- add_subdirectory(3rdparty/quirc) ++ find_package(quirc CONFIG REQUIRED) + set(HAVE_QUIRC TRUE) + endif() + # ---------------------------------------------------------------------------- +diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt +index 3fa0c5d..f4c0ad6 100644 +--- a/modules/objdetect/CMakeLists.txt ++++ b/modules/objdetect/CMakeLists.txt +@@ -2,7 +2,5 @@ set(the_description "Object Detection") + ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java objc python js) + + if(HAVE_QUIRC) +- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) +- ocv_include_directories(${QUIRC_INCLUDE}) +- ocv_target_link_libraries(${the_module} quirc) ++ ocv_target_link_libraries(${the_module} quirc::quirc) + endif() diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL deleted file mode 100644 index 5de96cd0be31c3..00000000000000 --- a/ports/opencv4/CONTROL +++ /dev/null @@ -1,102 +0,0 @@ -Source: opencv4 -Version: 4.5.0 -Build-Depends: zlib -Homepage: https://github.com/opencv/opencv -Description: computer vision library -Default-Features: dnn, jpeg, png, tiff, webp - -Feature: nonfree -Description: allow nonfree and unredistributable libraries - -Feature: ade -Build-Depends: ade -Description: graph api - -Feature: contrib -Build-Depends: hdf5 (!uwp&!(windows&(arm|arm64))), tesseract (!uwp&!(windows&(arm|arm64))) -Description: opencv_contrib module - -Feature: cuda -Build-Depends: opencv4[core,contrib], cuda, cudnn -Description: CUDA support for opencv - -Feature: dnn -Build-Depends: protobuf -Description: Enable dnn module - -Feature: eigen -Build-Depends: eigen3 -Description: Eigen support for opencv - -Feature: ffmpeg -Build-Depends: ffmpeg -Description: ffmpeg support for opencv - -Feature: gdcm -Build-Depends: gdcm -Description: GDCM support for opencv - -Feature: halide -Build-Depends: halide, opencv4[core], opencv4[dnn] -Description: Halide support for opencv - -Feature: ipp -Description: Enable Intel Integrated Performance Primitives - -Feature: jasper -Build-Depends: jasper -Description: JPEG 2000 support for opencv - -Feature: jpeg -Build-Depends: libjpeg-turbo -Description: JPEG support for opencv - -Feature: lapack -Build-Depends: blas, lapack -Description: LAPACK support for opencv - -Feature: openexr -Build-Depends: openexr -Description: OpenEXR support for opencv - -Feature: opengl -Build-Depends: opengl -Description: opengl support for opencv - -Feature: openmp -Description: Enable openmp support for opencv - -Feature: ovis -Build-Depends: opencv4[core,contrib], ogre -Description: opencv_ovis module - -Feature: png -Build-Depends: libpng -Description: PNG support for opencv - -Feature: qt -Build-Depends: qt5-base[core] -Description: Qt GUI support for opencv - -Feature: sfm -Build-Depends: opencv4[core,contrib], opencv4[core,eigen], glog, gflags, ceres -Description: opencv_sfm module - -Feature: tbb -Build-Depends: tbb -Description: Enable Intel Threading Building Blocks - -Feature: tiff -Build-Depends: tiff -Description: TIFF support for opencv - -Feature: vtk -Build-Depends: opencv4[contrib], vtk -Description: vtk support for opencv - -Feature: webp -Build-Depends: libwebp -Description: WebP support for opencv - -Feature: world -Description: Compile to a single package support for opencv diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 21f6e227868e17..cc7d4d579ea8c7 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -21,6 +21,7 @@ vcpkg_from_github( 0004-fix-policy-CMP0057.patch 0009-fix-uwp.patch 0010-fix-interface_link_libraries.patch # Remove this patch when the next update + 0011-devendor-quirc.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -42,8 +43,8 @@ set(ADE_DIR ${CURRENT_INSTALLED_DIR}/share/ade CACHE PATH "Path to existing ADE vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "ade" WITH_ADE "contrib" WITH_CONTRIB - "cuda" WITH_CUDA "cuda" WITH_CUBLAS + "cuda" WITH_CUDA "eigen" WITH_EIGEN "ffmpeg" WITH_FFMPEG "gdcm" WITH_GDCM @@ -56,6 +57,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "opengl" WITH_OPENGL "png" WITH_PNG "qt" WITH_QT + "quirc" WITH_QUIRC "sfm" BUILD_opencv_sfm "tiff" WITH_TIFF "vtk" WITH_VTK @@ -442,6 +444,9 @@ find_dependency(Tesseract)") if(BUILD_opencv_ovis) string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)") endif() + if("quirc" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(quirc CONFIG)") + endif() if("qt" IN_LIST FEATURES) string(APPEND DEPS_STRING " set(CMAKE_AUTOMOC ON) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json new file mode 100644 index 00000000000000..dc64f6c4dba966 --- /dev/null +++ b/ports/opencv4/vcpkg.json @@ -0,0 +1,222 @@ +{ + "name": "opencv4", + "version": "4.5.0", + "port-version": 1, + "description": "computer vision library", + "homepage": "https://github.com/opencv/opencv", + "dependencies": [ + "zlib" + ], + "default-features": [ + "dnn", + "jpeg", + "png", + "quirc", + "tiff", + "webp" + ], + "features": { + "ade": { + "description": "graph api", + "dependencies": [ + "ade" + ] + }, + "contrib": { + "description": "opencv_contrib module", + "dependencies": [ + { + "name": "hdf5", + "platform": "!uwp & !(windows & (arm | arm64))" + }, + { + "name": "tesseract", + "platform": "!uwp & !(windows & (arm | arm64))" + } + ] + }, + "cuda": { + "description": "CUDA support for opencv", + "dependencies": [ + "cuda", + "cudnn", + { + "name": "opencv4", + "default-features": false, + "features": [ + "contrib" + ] + } + ] + }, + "dnn": { + "description": "Enable dnn module", + "dependencies": [ + "protobuf" + ] + }, + "eigen": { + "description": "Eigen support for opencv", + "dependencies": [ + "eigen3" + ] + }, + "ffmpeg": { + "description": "ffmpeg support for opencv", + "dependencies": [ + "ffmpeg" + ] + }, + "gdcm": { + "description": "GDCM support for opencv", + "dependencies": [ + "gdcm" + ] + }, + "halide": { + "description": "Halide support for opencv", + "dependencies": [ + "halide", + { + "name": "opencv4", + "default-features": false + }, + { + "name": "opencv4", + "features": [ + "dnn" + ] + } + ] + }, + "ipp": { + "description": "Enable Intel Integrated Performance Primitives" + }, + "jasper": { + "description": "JPEG 2000 support for opencv", + "dependencies": [ + "jasper" + ] + }, + "jpeg": { + "description": "JPEG support for opencv", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "lapack": { + "description": "LAPACK support for opencv", + "dependencies": [ + "blas", + "lapack" + ] + }, + "nonfree": { + "description": "allow nonfree and unredistributable libraries" + }, + "openexr": { + "description": "OpenEXR support for opencv", + "dependencies": [ + "openexr" + ] + }, + "opengl": { + "description": "opengl support for opencv", + "dependencies": [ + "opengl" + ] + }, + "openmp": { + "description": "Enable openmp support for opencv" + }, + "ovis": { + "description": "opencv_ovis module", + "dependencies": [ + "ogre", + { + "name": "opencv4", + "default-features": false, + "features": [ + "contrib" + ] + } + ] + }, + "png": { + "description": "PNG support for opencv", + "dependencies": [ + "libpng" + ] + }, + "qt": { + "description": "Qt GUI support for opencv", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] + }, + "quirc": { + "description": "Enable QR code module", + "dependencies": [ + "quirc" + ] + }, + "sfm": { + "description": "opencv_sfm module", + "dependencies": [ + "ceres", + "gflags", + "glog", + { + "name": "opencv4", + "default-features": false, + "features": [ + "contrib" + ] + }, + { + "name": "opencv4", + "default-features": false, + "features": [ + "eigen" + ] + } + ] + }, + "tbb": { + "description": "Enable Intel Threading Building Blocks", + "dependencies": [ + "tbb" + ] + }, + "tiff": { + "description": "TIFF support for opencv", + "dependencies": [ + "tiff" + ] + }, + "vtk": { + "description": "vtk support for opencv", + "dependencies": [ + { + "name": "opencv4", + "features": [ + "contrib" + ] + }, + "vtk" + ] + }, + "webp": { + "description": "WebP support for opencv", + "dependencies": [ + "libwebp" + ] + }, + "world": { + "description": "Compile to a single package support for opencv" + } + } +} diff --git a/ports/quirc/CMakeLists.txt b/ports/quirc/CMakeLists.txt index a3400c70b86b35..236b281b7b42cf 100644 --- a/ports/quirc/CMakeLists.txt +++ b/ports/quirc/CMakeLists.txt @@ -1,17 +1,27 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.19) project(quirc C) add_library(quirc - lib/decode.c - lib/identify.c - lib/quirc.c - lib/version_db.c + lib/decode.c + lib/identify.c + lib/quirc.c + lib/version_db.c + lib/quirc.h ) +target_include_directories(quirc INTERFACE $) + install(TARGETS quirc - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) + EXPORT quirc-targets + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +install(FILES lib/quirc.h DESTINATION include) -install(FILES ${PROJECT_SOURCE_DIR}/lib/quirc.h DESTINATION include) +install(EXPORT quirc-targets + FILE quirc-config.cmake + NAMESPACE quirc:: + DESTINATION share/quirc +) diff --git a/ports/quirc/CONTROL b/ports/quirc/CONTROL deleted file mode 100644 index c5c23343f2f00f..00000000000000 --- a/ports/quirc/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: quirc -Version: 1.1 -Port-Version: 1 -Description: quirc is one of the C library available for scanning QR Codes diff --git a/ports/quirc/portfile.cmake b/ports/quirc/portfile.cmake index bfb0dc77fb1275..225479cd4e20ef 100644 --- a/ports/quirc/portfile.cmake +++ b/ports/quirc/portfile.cmake @@ -19,6 +19,8 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/quirc/copyright) diff --git a/ports/quirc/vcpkg.json b/ports/quirc/vcpkg.json new file mode 100644 index 00000000000000..9297f736626f9e --- /dev/null +++ b/ports/quirc/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "quirc", + "version": "1.1", + "port-version": 2, + "description": "quirc is one of the C library available for scanning QR Codes" +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index cbb40b1a7fccca..7a2d1b00b21969 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -95,7 +95,6 @@ chartdir:arm64-windows=fail chartdir:arm-uwp=fail chartdir:x64-uwp=fail chartdir:x64-windows-static=fail -chartdir:x64-windows-static-md=fail chmlib:arm-uwp=fail chmlib:x64-uwp=fail # Chromium Base requires a recent version of Clang to be installed. @@ -110,7 +109,6 @@ clblast:x64-windows-static-md=fail clockutils:x64-linux=fail clockutils:x64-osx=fail cmark:x64-windows-static=fail -cmark:x64-windows-static-md=fail cmcstl2:arm64-windows = skip cmcstl2:arm-uwp = skip cmcstl2:x64-linux = skip @@ -138,7 +136,6 @@ corrade:x64-uwp=fail cppcms:x64-linux=fail cppcms:x64-osx=fail cppcms:x64-windows-static=fail -cppcms:x64-windows-static-md=fail cppfs:arm-uwp=fail cppfs:x64-uwp=fail cppmicroservices:arm64-windows=fail @@ -165,7 +162,6 @@ cudnn:arm64-windows=fail cudnn:arm-uwp=fail cudnn:x64-uwp=fail cudnn:x64-windows-static=fail -cudnn:x64-windows-static-md=fail cudnn:x86-windows=fail # Since pipeline cannot automatically install dbghelp dependency, skip this detection dbghelp:arm-uwp=skip @@ -187,13 +183,11 @@ devicenameresolver:x64-linux=fail devicenameresolver:x64-osx=fail devicenameresolver:x64-uwp=fail devicenameresolver:x64-windows-static=fail -devicenameresolver:x64-windows-static-md=fail dimcli:arm-uwp=fail dimcli:x64-osx=fail dimcli:x64-uwp=fail -# directxtex, directxmesh requires GCC 9 or later for linux support +# directxtex requires GCC 9 or later for linux support directxtex:x64-linux=fail -directxmesh:x64-linux=fail discord-game-sdk:x64-windows-static=fail discord-game-sdk:x64-windows-static-md=fail discord-rpc:arm-uwp=fail @@ -231,12 +225,6 @@ duilib:x64-uwp=fail # python2 EOL yay! duktape:x64-osx=skip -dxut:arm64-windows=fail -dxut:arm-uwp=fail -dxut:x64-linux=fail -dxut:x64-osx=fail -dxut:x64-windows-static=fail -dxut:x64-windows-static-md=fail eastl:arm-uwp=fail easyhook:arm64-windows=fail easyhook:arm-uwp=fail @@ -275,12 +263,11 @@ embree2:x64-windows-static=fail embree2:x64-windows-static-md=fail enet:arm-uwp=fail enet:x64-uwp=fail -epsilon:x64-windows-static=fail -epsilon:x64-windows-static-md=fail epsilon:arm-uwp=fail epsilon:x64-linux=fail epsilon:x64-osx=fail epsilon:x64-uwp=fail +epsilon:x64-windows-static=fail faad2:x64-linux=fail faad2:x64-osx=fail fann:arm-uwp=fail @@ -288,7 +275,6 @@ fann:x64-linux=fail fann:x64-osx=fail fann:x64-uwp=fail fann:x64-windows-static=fail -fann:x64-windows-static-md=fail farmhash:arm64-windows=fail farmhash:arm-uwp=fail farmhash:x64-uwp=fail @@ -313,6 +299,7 @@ flint:x64-osx=fail fltk:arm-uwp=fail fltk:x64-uwp=fail fluidsynth:x64-osx=fail +fluidsynth:x64-windows-static-md=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 @@ -379,7 +366,6 @@ getopt-win32:x64-linux=fail getopt-win32:x64-osx=fail getopt-win32:x64-uwp=fail getopt-win32:x64-windows-static=fail -getopt-win32:x64-windows-static-md=fail gflags:arm-uwp=fail gflags:x64-uwp=fail @@ -401,7 +387,6 @@ glfw3:arm-uwp=fail glfw3:x64-uwp=fail glib:x64-uwp=fail glib:x64-windows-static=fail -glib:x64-windows-static-md=fail glib:x64-osx=fail gmmlib:arm64-windows=fail gmmlib:arm-uwp=fail @@ -435,7 +420,6 @@ h3:arm64-windows=fail h3:arm-uwp=fail h3:x64-uwp=fail halide:x64-windows-static=fail -halide:x64-windows-static-md=fail hdf5:arm64-windows=fail hdf5:arm-uwp=fail hdf5:x64-uwp=fail @@ -455,12 +439,11 @@ hidapi:x64-uwp=fail hiredis:arm-uwp=fail hiredis:x64-uwp=fail hpx:x64-windows-static=fail -hpx:x64-windows-static-md=fail hpx:x64-linux=fail libhsplasma:x64-windows-static=fail -libhsplasma:x64-windows-static-md=fail icu:arm-uwp=fail icu:x64-uwp=fail +ideviceinstaller:x64-windows-static-md=fail idevicerestore:x64-linux=fail idevicerestore:x64-osx=fail ignition-common1:x64-linux=fail @@ -521,7 +504,6 @@ jemalloc:x64-linux=fail jemalloc:x64-osx=fail jemalloc:x64-uwp=fail jemalloc:x64-windows-static=fail -jemalloc:x64-windows-static-md=fail jinja2cpplight:arm-uwp=fail jinja2cpplight:x64-uwp=fail keystone:arm-uwp=fail @@ -564,6 +546,7 @@ libcopp:arm64-windows=fail libcopp:arm-uwp=fail libcrafter:x86-windows=fail libcrafter:x64-windows=fail +libcrafter:x64-windows-static-md=fail cpuid:arm-uwp=fail cpuid:x64-uwp=fail cpuid:arm64-windows=fail @@ -578,7 +561,6 @@ libdshowcapture:x64-uwp=fail libepoxy:arm-uwp=fail libepoxy:x64-uwp=fail libepoxy:x64-windows-static=fail -libepoxy:x64-windows-static-md=fail libevent:arm-uwp=fail libevent:x64-uwp=fail libevhtp:x86-windows=fail @@ -627,6 +609,7 @@ libics:x64-uwp=fail libigl:arm64-windows=fail libigl:arm-uwp=fail libigl:x64-uwp=fail +libirecovery:x64-windows-static-md=fail liblemon:arm-uwp=fail liblemon:x64-uwp=fail liblo:arm-uwp=fail @@ -669,7 +652,6 @@ libmesh:x64-linux=skip libmodman:arm-uwp=fail libmodman:x64-uwp=fail libmodman:x64-windows-static=fail -libmodman:x64-windows-static-md=fail libmodplug:arm-uwp=fail libmodplug:x64-uwp=fail libmpeg2:arm-uwp=fail @@ -696,7 +678,6 @@ libpcap:arm-uwp=fail libpcap:x64-osx=fail libpcap:x64-uwp=fail libpcap:x64-windows-static=fail -libpcap:x64-windows-static-md=fail libpff:arm-uwp=fail libpff:x64-linux=fail libpff:x64-osx=fail @@ -704,7 +685,6 @@ libpff:x64-uwp=fail libpff:x64-windows-static=fail libpff:x64-windows-static-md=fail libplist:x64-windows-static=fail -libplist:x64-windows-static-md=fail libpng-apng:arm64-windows = skip libpng-apng:arm-uwp = skip libpng-apng:x64-linux = skip @@ -912,7 +892,6 @@ mhook:x64-osx=fail mhook:x64-uwp=fail milerius-sfml-imgui:x64-osx=fail milerius-sfml-imgui:x64-windows-static=fail -milerius-sfml-imgui:x64-windows-static-md=fail minhook:arm64-windows=fail minhook:arm-uwp=fail minhook:x64-linux=fail @@ -965,12 +944,11 @@ monkeys-audio:x64-linux=fail monkeys-audio:x64-osx=fail monkeys-audio:x64-uwp=fail monkeys-audio:x64-windows-static=fail -monkeys-audio:x64-windows-static-md=fail moos-core:arm-uwp=fail moos-core:x64-uwp=fail moos-core:x64-windows-static=fail -moos-core:x64-windows-static-md=fail moos-essential:arm64-windows=fail +moos-essential:x64-windows-static-md=fail moos-essential:x64-windows=fail moos-essential:x86-windows=fail # Conflicts with libjpeg-turbo @@ -995,7 +973,6 @@ mpir:x64-linux=skip msix:x64-linux=fail msix:x64-osx=fail msix:x64-windows-static=fail -msix:x64-windows-static-md=fail msmpi:arm64-windows=fail msmpi:arm-uwp=fail msmpi:x64-linux=fail @@ -1033,7 +1010,6 @@ nettle:x64-windows-static=skip nettle:x64-windows-static-md=skip nettle:x64-windows=skip ngspice:x64-windows-static=fail -ngspice:x64-windows-static-md=fail nng:arm-uwp=fail nng:x64-uwp=fail nrf-ble-driver:arm-uwp=fail @@ -1140,6 +1116,7 @@ openexr:arm-uwp=fail openexr:x64-uwp=fail opengl:arm64-windows=fail opengl:arm-uwp=fail +openmama:x64-windows-static-md=fail openmesh:arm64-windows=fail openmesh:arm-uwp=fail openmesh:x64-uwp=fail @@ -1152,7 +1129,6 @@ openmpi:x64-windows-static-md=fail openmpi:x86-windows=fail openni2:x64-uwp=fail openni2:x64-windows-static=fail -openni2:x64-windows-static-md=fail openscap:x64-linux=fail openssl-unix:arm64-windows=fail openssl-unix:arm-uwp=fail @@ -1176,7 +1152,6 @@ openvr:arm-uwp=fail openvr:x64-osx=fail openvr:x64-uwp=fail openvr:x64-windows-static=fail -openvr:x64-windows-static-md=fail openxr-loader:arm64-windows=fail openxr-loader:arm-uwp=fail openxr-loader:x64-osx=fail @@ -1252,7 +1227,6 @@ pmdk:x64-linux=fail pmdk:x64-osx=fail pmdk:x64-uwp=fail pmdk:x64-windows-static=fail -pmdk:x64-windows-static-md=fail pmdk:x86-windows=fail pngwriter:arm-uwp=fail pngwriter:x64-uwp=fail @@ -1282,7 +1256,6 @@ qhull:arm-uwp=fail qpid-proton:arm-uwp=fail qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail -qpid-proton:x64-windows-static-md=fail qt5-activeqt:x64-linux=fail qt5-activeqt:x64-osx=fail # Skip deprecated Qt module @@ -1413,7 +1386,6 @@ sciter:arm64-windows=fail sciter:arm-uwp=fail sciter:x64-uwp=fail sciter:x64-windows-static=fail -sciter:x64-windows-static-md=fail scnlib:arm-uwp=fail scnlib:x64-uwp=fail scylla-wrapper:arm-uwp=fail @@ -1421,13 +1393,15 @@ scylla-wrapper:x64-linux=fail scylla-wrapper:x64-osx=fail scylla-wrapper:x64-uwp=fail scylla-wrapper:x64-windows-static=fail -scylla-wrapper:x64-windows-static-md=fail -sdformat6:arm64-windows=fail +sdformat10:x64-windows-static-md=fail sdformat6:arm-uwp=fail +sdformat6:arm64-windows=fail sdformat6:x64-uwp=fail -sdformat9:x64-linux=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 sdl1:arm-uwp=fail sdl1:x64-uwp=fail sdl1:x64-osx=fail @@ -1501,7 +1475,6 @@ soqt:x64-uwp=fail soundtouch:arm-uwp=fail soundtouch:x64-uwp=fail soundtouch:x64-windows-static=fail -soundtouch:x64-windows-static-md=fail spaceland:arm64-windows=fail spaceland:arm-uwp=fail spaceland:x64-uwp=fail @@ -1592,10 +1565,8 @@ torch-th:arm64-windows=fail torch-th:arm-uwp=fail torch-th:x64-uwp=fail torch-th:x64-windows-static=fail -torch-th:x64-windows-static-md=fail tre:x64-osx=fail treehopper:x64-windows-static=fail -treehopper:x64-windows-static-md=fail treehopper:x64-linux=fail turbobase64:arm64-windows=fail turbobase64:arm-uwp=fail @@ -1627,14 +1598,10 @@ unrar:x64-linux=fail unrar:x64-osx=fail unrar:x64-uwp=fail unrar:x64-windows-static=fail -unrar:x64-windows-static-md=fail urdfdom:x64-windows-static=fail -urdfdom:x64-windows-static-md=fail usd:x86-windows=fail uthenticode:arm-uwp=fail uthenticode:x64-uwp=fail -# uvatlas requires GCC 9 or later for linux support -uvatlas:x64-linux=fail v8:arm64-windows=fail v8:arm-uwp=fail v8:x64-osx=fail @@ -1699,7 +1666,6 @@ x265:arm64-windows=fail x265:arm-uwp=fail x265:x64-uwp=fail xalan-c:x64-windows-static=fail -xalan-c:x64-windows-static-md=fail xalan-c:arm64-windows=fail xbyak:arm64-windows=fail xbyak:arm-uwp=fail @@ -1782,7 +1748,6 @@ chromium-base:x64-windows-static-md=fail clockutils:x64-windows-static-md=fail fastcgi:x64-windows-static-md=fail gmp:x64-windows-static-md=fail -graphqlparser:x64-windows-static-md=fail ijg-libjpeg:x64-windows-static-md=fail keystone:x64-windows-static-md=fail libcerf:x64-windows-static-md=fail @@ -1794,13 +1759,11 @@ mmloader:x64-windows-static-md=fail mpg123:x64-windows-static-md=fail netcdf-cxx4:x64-windows-static-md=fail open62541:x64-windows-static-md=fail -pngpp:x64-windows-static-md=fail portmidi:x64-windows-static-md=fail pthreads:x64-windows-static-md=fail quantlib:x64-windows-static-md=fail readosm:x64-windows-static-md=fail sentencepiece:x64-windows-static-md=fail -spirv-tools:x64-windows-static-md=fail symengine:x64-windows-static-md=fail teemo:x64-windows-static-md=fail unicorn:x64-windows-static-md=fail diff --git a/versions/baseline.json b/versions/baseline.json index ad344df5b8ca28..75aa6ea4ae39e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1689,8 +1689,8 @@ "port-version": 0 }, "dxut": { - "baseline": "11.14-3", - "port-version": 0 + "baseline": "11.14", + "port-version": 4 }, "eabase": { "baseline": "2.09.12-1", @@ -4225,8 +4225,8 @@ "port-version": 0 }, "opencv": { - "baseline": "4.3.0", - "port-version": 1 + "baseline": "4.5.0", + "port-version": 0 }, "opencv2": { "baseline": "2.4.13.7", @@ -4234,11 +4234,11 @@ }, "opencv3": { "baseline": "3.4.12", - "port-version": 0 + "port-version": 1 }, "opencv4": { "baseline": "4.5.0", - "port-version": 0 + "port-version": 1 }, "opendnp3": { "baseline": "3.1.0", @@ -4946,7 +4946,7 @@ }, "quirc": { "baseline": "1.1", - "port-version": 1 + "port-version": 2 }, "qwt": { "baseline": "6.1.5", diff --git a/versions/d-/dxut.json b/versions/d-/dxut.json index 97184b77e1dd03..87ba2f78367519 100644 --- a/versions/d-/dxut.json +++ b/versions/d-/dxut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6171a1c44bd4c11d7db922b56ef55c9366fe60af", + "version-string": "11.14", + "port-version": 4 + }, { "git-tree": "27f3d4fe979fbc45d132894a80c6712d27be4c49", "version-string": "11.14-3", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index 856e8045c01449..a428c254d47ff6 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "457db123c6f787763d2bbe056e51caecd8c37464", + "version": "4.5.0", + "port-version": 0 + }, { "git-tree": "6732874b9a119e4de4e9afdc72469c967348b21b", "version-string": "4.3.0", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 33d47557a84388..b04a8ae268eebd 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffd8270ed4798f25f3bd882a6089c72e86803466", + "version": "3.4.12", + "port-version": 1 + }, { "git-tree": "a0dfe03c4db4fb9532b888399deee675750eef61", "version-string": "3.4.12", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 5a2934e9d49f23..f6e5d8fe898e85 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0522dbbb44877b9d4618bfe31a376e07e49bc72", + "version": "4.5.0", + "port-version": 1 + }, { "git-tree": "cdf704950d37ce677508db67c081f9aeda18b9cd", "version-string": "4.5.0", diff --git a/versions/q-/quirc.json b/versions/q-/quirc.json index 7d263e18ee3f2b..dc70374be3516f 100644 --- a/versions/q-/quirc.json +++ b/versions/q-/quirc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15bad29ef4d2466b236311ce7af075dbb9507ed9", + "version": "1.1", + "port-version": 2 + }, { "git-tree": "c4c19ac884d1a66e0ac073ff5bd99c2db1460015", "version-string": "1.1", From a01c8f2df877c8b10aa72ca91facb47ce1942b25 Mon Sep 17 00:00:00 2001 From: ankurverma85 <31362771+ankurverma85@users.noreply.github.com> Date: Tue, 26 Jan 2021 14:54:05 -0800 Subject: [PATCH 0586/1694] gdal:x64-windows-static-md fixes (#15541) * Fix windows-static builds * Rename debug lib to comform to other naming scheme * Update ci.baseline.txt * Update CONTROL * Update dependency_win.cmake * Update portfile.cmake * Update vcpkg-cmake-wrapper.cmake * Update portfile.cmake * Added versions * Update ci.baseline.txt * PR comments * update gdal portversion Co-authored-by: Ankur Verma Co-authored-by: ankurv Co-authored-by: Nicole Mazzuca --- ports/gdal/CONTROL | 2 +- ports/gdal/dependency_win.cmake | 11 +++-------- scripts/ci.baseline.txt | 1 - versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 36944edce4a366..548232fb600214 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,6 +1,6 @@ Source: gdal Version: 3.1.3 -Port-Version: 1 +Port-Version: 2 Homepage: https://gdal.org/ Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data. Build-Depends: proj4, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib, libgeotiff, cfitsio, json-c (!windows) diff --git a/ports/gdal/dependency_win.cmake b/ports/gdal/dependency_win.cmake index 0d9dfa53368978..c18bc9b2d12ff2 100644 --- a/ports/gdal/dependency_win.cmake +++ b/ports/gdal/dependency_win.cmake @@ -22,13 +22,8 @@ macro(find_dependency_win) # Setup expat libraries + include path set(EXPAT_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - if (VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(EXPAT_SUFFIX "MT") - else() - set(EXPAT_SUFFIX "MD") - endif() - set(EXPAT_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libexpat${EXPAT_SUFFIX}.lib" ) - set(EXPAT_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd${EXPAT_SUFFIX}.lib" ) + set(EXPAT_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libexpatMD.lib" ) + set(EXPAT_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatdMD.lib" ) else() set(EXPAT_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libexpat.lib" ) set(EXPAT_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd.lib" ) @@ -117,4 +112,4 @@ macro(find_dependency_win) set(SPATIALITE_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib" ) set(HAVE_SPATIALITE "-DHAVE_SPATIALITE") endif() -endmacro() \ No newline at end of file +endmacro() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7a2d1b00b21969..ea21ced9a018d3 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -349,7 +349,6 @@ gainput:x64-uwp=fail gasol:arm64-windows=fail gasol:arm-uwp=fail gasol:x64-uwp=fail -gdal:x64-windows-static-md=fail geos:arm-uwp=fail geos:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 75aa6ea4ae39e3..5144e658f9e977 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2074,7 +2074,7 @@ }, "gdal": { "baseline": "3.1.3", - "port-version": 1 + "port-version": 2 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index c0a48048b2f121..8ed4f63496b4ad 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "162ae61cb64d9bb9a485e611cca106ade9062c1a", + "version-string": "3.1.3", + "port-version": 2 + }, { "git-tree": "fc7d76bf3899b89791a7699037bed3532cdc0c60", "version-string": "3.1.3", From 46a41795ee7dbeae347eaded2cd5b0d0efbbc2c8 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 27 Jan 2021 06:55:06 +0800 Subject: [PATCH 0587/1694] [x264] Fix build failed on uwp (#15769) * [x264] Fix build failed on uwp * Update port_versions * [x264] Fix build failed on uwp * Update port_versions * Update baseline * Add supports * Update versions/x-/x264.json --- ports/x264/CONTROL | 6 ------ ports/x264/portfile.cmake | 11 +++++++---- ports/x264/vcpkg.json | 14 ++++++++++++++ scripts/ci.baseline.txt | 4 ---- versions/baseline.json | 2 +- versions/x-/x264.json | 5 +++++ 6 files changed, 27 insertions(+), 15 deletions(-) delete mode 100644 ports/x264/CONTROL create mode 100644 ports/x264/vcpkg.json diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL deleted file mode 100644 index 73d74549a1c908..00000000000000 --- a/ports/x264/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: x264 -Version: 157-303c484ec828ed0 -Port-Version: 14 -Homepage: https://github.com/mirror/x264 -Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format -Build-Depends: pthread (linux&osx) diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 32bc1c02098b7b..abd2f1d558a41f 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -1,6 +1,6 @@ set(X264_VERSION 157) -vcpkg_fail_port_install(ON_TARGET "OSX") +vcpkg_fail_port_install(ON_ARCH "arm") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -14,7 +14,7 @@ vcpkg_from_github( vcpkg_find_acquire_program(NASM) get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) -set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}") +vcpkg_add_to_path(${NASM_EXE_PATH}) if(VCPKG_TARGET_IS_WINDOWS) _vcpkg_determine_autotools_host_cpu(BUILD_ARCH) @@ -51,7 +51,10 @@ vcpkg_configure_make( ) vcpkg_install_make() -vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN) + +if(NOT VCPKG_TARGET_IS_UWP) + vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN) +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -81,7 +84,7 @@ elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") ) endif() -vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES -lpthread -lm -ldl) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json new file mode 100644 index 00000000000000..128d8ccf410125 --- /dev/null +++ b/ports/x264/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "x264", + "version-string": "157-303c484ec828ed0", + "port-version": 15, + "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", + "homepage": "https://github.com/mirror/x264", + "supports": "!arm", + "dependencies": [ + { + "name": "pthread", + "platform": "linux & osx" + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ea21ced9a018d3..11db8efbd24b03 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1657,10 +1657,6 @@ wpilib:arm64-windows=fail wpilib:x64-osx=fail wxchartdir:x64-osx=fail wxwidgets:x64-linux=fail -x264:arm64-windows=fail -x264:arm-uwp=fail -x264:x64-uwp=fail -x264:x64-osx=fail x265:arm64-windows=fail x265:arm-uwp=fail x265:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 5144e658f9e977..9bcb809277d3e9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6178,7 +6178,7 @@ }, "x264": { "baseline": "157-303c484ec828ed0", - "port-version": 14 + "port-version": 15 }, "x265": { "baseline": "3.4", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index e71a19f169377b..d129da3b53d5ad 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e766671c5f64574235784ce45b1668daf4cb9b44", + "version-string": "157-303c484ec828ed0", + "port-version": 15 + }, { "git-tree": "5e7b1b08a47363a45799c196a1a8442e9b02f882", "version-string": "157-303c484ec828ed0", From e6b0f1dfb169f1edddb9f164e89df27bdac811dd Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 26 Jan 2021 15:58:42 -0700 Subject: [PATCH 0588/1694] [icu] Add support for macos rpath prefix macro (#15706) * [icu] Add support for macos rpath prefix macro * update port_versions for icu * address review comments * update baseline Co-authored-by: JackBoosY --- ports/icu/CONTROL | 2 +- ports/icu/portfile.cmake | 132 +++++++++++++++++++++++++++++++++++++++ versions/baseline.json | 2 +- versions/i-/icu.json | 5 ++ 4 files changed, 139 insertions(+), 2 deletions(-) diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL index 344d34c517dce1..96c578b09982dc 100644 --- a/ports/icu/CONTROL +++ b/ports/icu/CONTROL @@ -1,6 +1,6 @@ Source: icu Version: 67.1 -Port-Version: 7 +Port-Version: 8 Homepage: http://icu-project.org/apiref/icu4c/ Description: Mature and widely used Unicode and localization library. Supports: !(arm|uwp) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 988620486e6308..60fb602288837c 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -169,6 +169,138 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" LOGNAME "make-build-${RELEASE_TRIPLET}") + # remove this block if https://unicode-org.atlassian.net/browse/ICU-21458 + # is resolved and use the configure script instead + if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + if(DEFINED CMAKE_INSTALL_NAME_DIR) + set(ID_PREFIX "${CMAKE_INSTALL_NAME_DIR}") + else() + set(ID_PREFIX "@rpath") + endif() + + # install_name_tool may be missing if cross-compiling + find_program( + INSTALL_NAME_TOOL + install_name_tool + HINTS /usr/bin /Library/Developer/CommandLineTools/usr/bin/ + DOC "Absolute path of install_name_tool" + REQUIRED + ) + + message(STATUS "setting rpath prefix for macOS dynamic libraries") + + # add ID_PREFIX to libicudata + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -id "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" + "libicudata.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + + # add ID_PREFIX to libicui18n + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -id "${ID_PREFIX}/libicui18n.${ICU_VERSION_MAJOR}.dylib" + "libicui18n.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + + # add ID_PREFIX to libicui18n dependencies + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -change "libicuuc.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicuuc.${ICU_VERSION_MAJOR}.dylib" + "libicui18n.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -change "libicudata.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" + "libicui18n.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + + # add ID_PREFIX to libicuio + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -id "${ID_PREFIX}/libicuio.${ICU_VERSION_MAJOR}.dylib" + "libicuio.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + + # add ID_PREFIX to libicuio dependencies + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -change "libicuuc.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicuuc.${ICU_VERSION_MAJOR}.dylib" + "libicuio.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -change "libicudata.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" + "libicuio.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -change "libicui18n.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicui18n.${ICU_VERSION_MAJOR}.dylib" + "libicuio.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + + # add ID_PREFIX to libicutu + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -id "${ID_PREFIX}/libicutu.${ICU_VERSION_MAJOR}.dylib" + "libicutu.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + + # add ID_PREFIX to libicutu dependencies + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -change "libicui18n.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicui18n.${ICU_VERSION_MAJOR}.dylib" + "libicutu.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -change "libicuuc.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicuuc.${ICU_VERSION_MAJOR}.dylib" + "libicutu.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -change "libicudata.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" + "libicutu.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + + # add ID_PREFIX to libicuuc + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -id "${ID_PREFIX}/libicuuc.${ICU_VERSION_MAJOR}.dylib" + "libicuuc.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + + # add ID_PREFIX to libicuuc dependencies + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -change "libicudata.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" + "libicuuc.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + endif() + vcpkg_execute_build_process( COMMAND ${BASH} --noprofile --norc -c "make install" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" diff --git a/versions/baseline.json b/versions/baseline.json index 9bcb809277d3e9..31bebe2f7ef80f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2394,7 +2394,7 @@ }, "icu": { "baseline": "67.1", - "port-version": 7 + "port-version": 8 }, "ideviceinstaller": { "baseline": "1.1.2.23-1", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index 38be600599c1ee..d91bfed139c7d8 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db2977707d68a8c04e0960b0965722f8e5bfda20", + "version-string": "67.1", + "port-version": 8 + }, { "git-tree": "e224ca4ff2e2bcb1c4b72a1813ab886c1dfa2bfc", "version-string": "67.1", From b7d676a1cb46be8e122418ecf9191496f56a39b0 Mon Sep 17 00:00:00 2001 From: Jonathan Hale Date: Wed, 27 Jan 2021 00:03:54 +0100 Subject: [PATCH 0589/1694] [magnum,magnum-plugins] Add vulkan and shaderconverter features (#15163) * [magnum,magnum-plugins] Add vulkan and shaderconverter features Signed-off-by: Squareys * [magnum,-plugins] Add warning for features unavailable in non-head version Signed-off-by: Squareys * update version record Co-authored-by: JackBoosY --- ports/magnum-plugins/CONTROL | 10 +++++++++- ports/magnum-plugins/portfile.cmake | 9 ++++++++- ports/magnum/CONTROL | 24 ++++++++++++++++++++++-- ports/magnum/portfile.cmake | 12 ++++++++++++ versions/baseline.json | 4 ++-- versions/m-/magnum-plugins.json | 5 +++++ versions/m-/magnum.json | 5 +++++ 7 files changed, 63 insertions(+), 6 deletions(-) diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL index dee9a32de315dd..f80c0f96f6e6ed 100644 --- a/ports/magnum-plugins/CONTROL +++ b/ports/magnum-plugins/CONTROL @@ -1,6 +1,6 @@ Source: magnum-plugins Version: 2020.06 -Port-Version: 1 +Port-Version: 2 Build-Depends: magnum[core] Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization Homepage: https://magnum.graphics/ @@ -48,6 +48,10 @@ Feature: freetypefont Description: FreeTypeFont plugin Build-Depends: freetype, magnum[text] +Feature: glslangshaderconverter +Description: GlslangShaderConverter plugin +Build-Depends: glslang, magnum[shadertools] + Feature: harfbuzzfont Description: HarfBuzzFont plugin Build-Depends: harfbuzz, magnum-plugins[freetypefont] @@ -84,6 +88,10 @@ Feature: pngimporter Description: PngImporter plugin Build-Depends: libpng, magnum[trade] +Feature: spirvtoolsshaderconverter +Description: SpirvToolsShaderConverter plugin +Build-Depends: spirv-tools, magnum[shadertools] + Feature: stanfordimporter Description: StanfordImporter plugin Build-Depends: magnum[trade] diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake index 766d91cfc3db42..07dca290258263 100644 --- a/ports/magnum-plugins/portfile.cmake +++ b/ports/magnum-plugins/portfile.cmake @@ -44,9 +44,16 @@ else() set(BUILD_PLUGINS_STATIC 0) endif() +# Head only features +set(ALL_SUPPORTED_FEATURES ${ALL_FEATURES}) +if(NOT VCPKG_USE_HEAD_VERSION) + list(REMOVE_ITEM ALL_SUPPORTED_FEATURES glslangshaderconverter spirvtoolsshaderconverter) + message(WARNING "Features glslangshaderconverter and spirvtoolsshaderconverter are not avaliable when building non-head version.") +endif() + set(_COMPONENTS "") # Generate cmake parameters from feature names -foreach(_feature IN LISTS ALL_FEATURES) +foreach(_feature IN LISTS ALL_SUPPORTED_FEATURES) # Uppercase the feature name and replace "-" with "_" string(TOUPPER "${_feature}" _FEATURE) string(REPLACE "-" "_" _FEATURE "${_FEATURE}") diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL index e7fa5bd9a89c18..5c9c8fa1c27c7f 100644 --- a/ports/magnum/CONTROL +++ b/ports/magnum/CONTROL @@ -1,10 +1,10 @@ Source: magnum Version: 2020.06 -Port-Version: 2 +Port-Version: 3 Build-Depends: corrade[utility] Description: C++11/C++14 graphics middleware for games and data visualization Homepage: https://magnum.graphics/ -Default-Features: anyaudioimporter, anyimageimporter, anyimageconverter, anysceneconverter, anysceneimporter, debugtools, gl, meshtools, primitives, scenegraph, shaders, text, texturetools, trade, sdl2application +Default-Features: anyaudioimporter, anyimageimporter, anyimageconverter, anysceneconverter, anysceneimporter, anyshaderconverter, debugtools, gl, meshtools, primitives, scenegraph, shaders, shadertools, text, texturetools, trade, sdl2application Feature: al-info Description: magnum-al-info utility @@ -30,6 +30,10 @@ Feature: anysceneimporter Description: AnySceneImporter plugin Build-Depends: magnum[core,trade] +Feature: anyshaderconverter +Description: AnyShaderConverter plugin +Build-Depends: magnum[core,shadertools] + Feature: audio Description: Audio library Build-Depends: openal-soft @@ -99,6 +103,10 @@ Feature: sceneconverter Description: magnum-sceneconverter utility Build-Depends: magnum[core,anysceneconverter] +Feature: shaderconverter +Description: magnum-shaderconverter utility +Build-Depends: magnum[core,shadertools,anyshaderconverter] + Feature: shaders Description: Shaders library Build-Depends: magnum[core,gl] @@ -153,3 +161,15 @@ Build-Depends: magnum[core,gl] Feature: glxcontext Description: GlxContext library Build-Depends: magnum[core,gl] + +Feature: shadertools +Description: ShaderTools library + +Feature: vk +Description: Vk library +Build-Depends: vulkan + +Feature: vk-info +Description: vk-info utility +Build-Depends: magnum[core,vk] + diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index cb8b2473c3dc44..3aa777c9b38e98 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -49,6 +49,13 @@ if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" MATCHES "(Emscripten|Linux)") list(REMOVE_ITEM ALL_SUPPORTED_FEATURES eglcontext windowlesseglapplication) endif() +# Head only features +if(NOT VCPKG_USE_HEAD_VERSION) + list(REMOVE_ITEM ALL_SUPPORTED_FEATURES anyshaderconverter shadertools shaderconverter + vk-info) + message(WARNING "Features anyshaderconverter, shadertools, shaderconverter and vk-info are not avaliable when building non-head version.") +endif() + set(_COMPONENTS "") # Generate cmake parameters from feature names foreach(_feature IN LISTS ALL_SUPPORTED_FEATURES) @@ -88,6 +95,11 @@ set(_TOOLS gl-info imageconverter sceneconverter) +if(VCPKG_USE_HEAD_VERSION) +list(APPEND _TOOLS + shaderconverter + vk-info) +endif() foreach(_tool IN LISTS _TOOLS) if("${_tool}" IN_LIST FEATURES) list(APPEND _TOOL_EXEC_NAMES magnum-${_tool}) diff --git a/versions/baseline.json b/versions/baseline.json index 31bebe2f7ef80f..988fd085c229a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3614,7 +3614,7 @@ }, "magnum": { "baseline": "2020.06", - "port-version": 2 + "port-version": 3 }, "magnum-extras": { "baseline": "2020.06", @@ -3626,7 +3626,7 @@ }, "magnum-plugins": { "baseline": "2020.06", - "port-version": 1 + "port-version": 2 }, "mapbox-variant": { "baseline": "1.2.0", diff --git a/versions/m-/magnum-plugins.json b/versions/m-/magnum-plugins.json index 743464560ad668..0913d37882d4e1 100644 --- a/versions/m-/magnum-plugins.json +++ b/versions/m-/magnum-plugins.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9b701869c5d4f5f4203702622d2bbfa58b6517f", + "version-string": "2020.06", + "port-version": 2 + }, { "git-tree": "bc7aca74b45fcc3c73d3b0d051e63602c270f0b4", "version-string": "2020.06", diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json index 59800ad4f15b26..171c916613de7d 100644 --- a/versions/m-/magnum.json +++ b/versions/m-/magnum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84fd6db3cf53cfcb736bfb14b08b86940f5588e1", + "version-string": "2020.06", + "port-version": 3 + }, { "git-tree": "e7a2404e1104325d881715e65459dd3c8a450489", "version-string": "2020.06", From 7960d2819ea3c643ef1778c4480f9a20e1c11876 Mon Sep 17 00:00:00 2001 From: wangqr Date: Wed, 27 Jan 2021 07:07:05 +0800 Subject: [PATCH 0590/1694] [libass] Update to 0.15.0 (#15213) * [libass] Update to 0.15.0 * [libass] Add vcpkg_fixup_pkgconfig() * [libass] Add to versions file --- ports/libass/CMakeLists.txt | 4 ++-- ports/libass/ConstantValues.patch | 22 ---------------------- ports/libass/libass.def | 25 +++++++++++++------------ ports/libass/portfile.cmake | 6 +++--- ports/libass/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libass.json | 5 +++++ 7 files changed, 25 insertions(+), 40 deletions(-) delete mode 100644 ports/libass/ConstantValues.patch diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt index b91a6aab22b86e..f26c2de70dda9c 100644 --- a/ports/libass/CMakeLists.txt +++ b/ports/libass/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.9) project(libass C CXX) -set(LIBASS_VERSION 0.14.0) +set(LIBASS_VERSION 0.15.0) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h) @@ -77,7 +77,7 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(libdir ${CMAKE_INSTALL_PREFIX}/lib) set(includedir ${CMAKE_INSTALL_PREFIX}/include) set(PACKAGE_VERSION ${LIBASS_VERSION}) -set(PKG_REQUIRES_PRIVATE "harfbuzz >= 0.9.5, fribidi >= 0.19.0, freetype2 >= 9.10.3") +set(PKG_REQUIRES_PRIVATE "harfbuzz >= 1.2.3, fribidi >= 0.19.0, freetype2 >= 9.10.3") set(PKG_LIBS_PRIVATE -lm) configure_file(libass.pc.in libass.pc @ONLY) install(FILES diff --git a/ports/libass/ConstantValues.patch b/ports/libass/ConstantValues.patch deleted file mode 100644 index e666b846610c9d..00000000000000 --- a/ports/libass/ConstantValues.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/libass/ass_outline.c b/libass/ass_outline.c -index ae5c06a..2173508 100644 ---- a/libass/ass_outline.c -+++ b/libass/ass_outline.c -@@ -613,7 +613,7 @@ static bool draw_arc(StrokerState *str, ASS_Vector pt, - ASS_DVector normal0, ASS_DVector normal1, double c, int dir) - { - enum { max_subdiv = 15 }; -- double mul[max_subdiv + 1]; -+ double mul[16]; - - ASS_DVector center; - bool small_angle = true; -@@ -649,7 +649,7 @@ static bool draw_arc(StrokerState *str, ASS_Vector pt, - static bool draw_circle(StrokerState *str, ASS_Vector pt, int dir) - { - enum { max_subdiv = 15 }; -- double mul[max_subdiv + 1], c = 0; -+ double mul[16], c = 0; - - int pos = max_subdiv; - while (c < str->split_cos && pos) { diff --git a/ports/libass/libass.def b/ports/libass/libass.def index 58bfad3d67f822..7edbbdf6308639 100644 --- a/ports/libass/libass.def +++ b/ports/libass/libass.def @@ -1,24 +1,34 @@ EXPORTS +ass_library_version ass_library_init ass_library_done -ass_library_version ass_set_fonts_dir ass_set_extract_fonts ass_set_style_overrides +ass_process_force_style +ass_set_message_cb ass_renderer_init ass_renderer_done ass_set_frame_size ass_set_storage_size +ass_set_shaper ass_set_margins ass_set_use_margins +ass_set_pixel_aspect ass_set_aspect_ratio ass_set_font_scale ass_set_hinting ass_set_line_spacing +ass_set_line_position ass_get_available_font_providers ass_set_fonts +ass_set_selective_style_override_enabled +ass_set_selective_style_override +ass_fonts_update +ass_set_cache_limits ass_render_frame ass_new_track +ass_track_set_feature ass_free_track ass_alloc_style ass_alloc_event @@ -27,20 +37,11 @@ ass_free_event ass_process_data ass_process_codec_private ass_process_chunk +ass_set_check_readorder +ass_flush_events ass_read_file ass_read_memory ass_read_styles ass_add_font ass_clear_fonts ass_step_sub -ass_process_force_style -ass_set_message_cb -ass_fonts_update -ass_set_cache_limits -ass_flush_events -ass_set_shaper -ass_set_line_position -ass_set_pixel_aspect -ass_set_selective_style_override_enabled -ass_set_selective_style_override -ass_set_check_readorder diff --git a/ports/libass/portfile.cmake b/ports/libass/portfile.cmake index 63562f06fce867..eac81b339cc268 100644 --- a/ports/libass/portfile.cmake +++ b/ports/libass/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libass/libass - REF d149636f502f5774ae1a8fb4c554b122674393b2 #v 0.15.0 - SHA512 d8b3b23e3cfa42b6f65a59a389a54a18a8470f015ca828e2a08afd9633510ebf58c74e630b086cd611629f79e68f23be47dd2f798e223330216e6b1f487afd7a + REF 0.15.0 + SHA512 a832da5246577cf815481bb9e4bebabc74bc1d0f5c50faa098f4150a379d801d7e6d1bd7f9f578143a9412e258c5296d08c4fc2d04cc33f1751e613c2583214c HEAD_REF master - PATCHES ConstantValues.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.in DESTINATION ${SOURCE_PATH}) @@ -22,6 +21,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libass/vcpkg.json b/ports/libass/vcpkg.json index 2eab327b8a6fc7..b16ff67696d18b 100644 --- a/ports/libass/vcpkg.json +++ b/ports/libass/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libass", "version-string": "0.15.0", + "port-version": 1, "description": "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format", "homepage": "https://github.com/libass/libass", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 988fd085c229a9..b195a3a79778b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2838,7 +2838,7 @@ }, "libass": { "baseline": "0.15.0", - "port-version": 0 + "port-version": 1 }, "libassuan": { "baseline": "2.5.3", diff --git a/versions/l-/libass.json b/versions/l-/libass.json index 0956685f48170a..78937e0dad4eb1 100644 --- a/versions/l-/libass.json +++ b/versions/l-/libass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba6a3b98d6557361a7c46c0d8543e8d928a3825f", + "version-string": "0.15.0", + "port-version": 1 + }, { "git-tree": "09bc1e4af0701ac49dfb52104d0e940a5810e03d", "version-string": "0.15.0", From 294a9ff7e4572f03e835511e13ba630c64958aec Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 27 Jan 2021 07:09:03 +0800 Subject: [PATCH 0591/1694] [kinectsdk1] Update hash (#15856) * [kinectsdk1] Update Hash * Fix error in vcpkg.json file * Add kinectsdk1.json Co-authored-by: Cheney-Wang --- ports/kinectsdk1/CONTROL | 4 ---- ports/kinectsdk1/portfile.cmake | 9 +++------ ports/kinectsdk1/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++-- versions/k-/kinectsdk1.json | 5 +++++ 5 files changed, 17 insertions(+), 12 deletions(-) delete mode 100644 ports/kinectsdk1/CONTROL create mode 100644 ports/kinectsdk1/vcpkg.json diff --git a/ports/kinectsdk1/CONTROL b/ports/kinectsdk1/CONTROL deleted file mode 100644 index d4cd1d2733b957..00000000000000 --- a/ports/kinectsdk1/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: kinectsdk1 -Version: 1.8-2 -Description: Kinect for Windows SDK for Kinect v1 sensor. -Supports: !arm \ No newline at end of file diff --git a/ports/kinectsdk1/portfile.cmake b/ports/kinectsdk1/portfile.cmake index cde6b6148c48fb..adcb82a524126a 100644 --- a/ports/kinectsdk1/portfile.cmake +++ b/ports/kinectsdk1/portfile.cmake @@ -1,12 +1,10 @@ -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - message(FATAL_ERROR "This port does not currently support architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() +vcpkg_fail_port_install(ON_ARCH "arm") set(KINECTSDK10_VERSION "v1.8") 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" - SHA512 ee8a0f70c86aad80fe214108e315e4550a90ed39f278ce00a7137532174ee5bf3bdeb1d0b499fc5ffdb5e176adecfd68963ee3731e1d2f00d69d32d1b8a3c555 + SHA512 d7e886d639b4310addc7c1350311f81289ffbcd653237882da7bf3d4074281ed35d217cb8be101579cac880c574dd89c62cd6a87772d60905c446d0be5fd1932 ) vcpkg_find_acquire_program(DARK) @@ -65,5 +63,4 @@ file( ) # Handle copyright -file(COPY "${KINECTSDK10_DIR}/SDKEula.rtf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/kinectsdk1) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/kinectsdk1/SDKEula.rtf ${CURRENT_PACKAGES_DIR}/share/kinectsdk1/copyright) \ No newline at end of file +file(INSTALL ${KINECTSDK10_DIR}/SDKEula.rtf DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/kinectsdk1/vcpkg.json b/ports/kinectsdk1/vcpkg.json new file mode 100644 index 00000000000000..230677a2552107 --- /dev/null +++ b/ports/kinectsdk1/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "kinectsdk1", + "version-string": "1.8", + "port-version": 3, + "description": "Kinect for Windows SDK for Kinect v1 sensor.", + "supports": "!arm" +} diff --git a/versions/baseline.json b/versions/baseline.json index b195a3a79778b0..c39c26da42d8f7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2733,8 +2733,8 @@ "port-version": 0 }, "kinectsdk1": { - "baseline": "1.8-2", - "port-version": 0 + "baseline": "1.8", + "port-version": 3 }, "kinectsdk2": { "baseline": "2.0-2", diff --git a/versions/k-/kinectsdk1.json b/versions/k-/kinectsdk1.json index 1d9148b1dd9779..6ddfc2b1251193 100644 --- a/versions/k-/kinectsdk1.json +++ b/versions/k-/kinectsdk1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b48f4bf28923981e5a8ad549daa4dc8ee64dac83", + "version-string": "1.8", + "port-version": 3 + }, { "git-tree": "6f1b6079d522449e9e015c19c96b021bef51d3f8", "version-string": "1.8-2", From 8ff017f1a381298212e1f8ae9328ac32f9449721 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Wed, 27 Jan 2021 00:09:52 +0100 Subject: [PATCH 0592/1694] [sentry-native] Update to 0.4.6 (#15875) Signed-off-by: Vitalii Koshura --- ports/sentry-native/CONTROL | 2 +- ports/sentry-native/portfile.cmake | 6 +++--- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/sentry-native/CONTROL b/ports/sentry-native/CONTROL index 6618862603005a..ac8368f0fda58b 100644 --- a/ports/sentry-native/CONTROL +++ b/ports/sentry-native/CONTROL @@ -1,5 +1,5 @@ Source: sentry-native -Version: 0.4.5 +Version: 0.4.6 Homepage: https://sentry.io/ Description: Sentry SDK for C, C++ and native applications. Build-Depends: curl (!windows) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 6fba51e62b66e5..b3e496964ef9d6 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.5/sentry-native.zip" - FILENAME "sentry-native-0.4.5.zip" - SHA512 5bbc58ab2c038d32049b12302f69270d54097092d97fb73d3cf717ad83e639082de75895f7c5244040775d874965d71480f1736b2b7b19579d9226a51aaf0017 + URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.6/sentry-native.zip" + FILENAME "sentry-native-0.4.6.zip" + SHA512 affc0cbb7930e8d6cf4b4979bf060303d5f939950a4cf265925aff6893d00e748884428be64457b618bc3cddd9a799e4b91cff520c9cd969425c6c564623576f ) vcpkg_extract_source_archive_ex( diff --git a/versions/baseline.json b/versions/baseline.json index c39c26da42d8f7..9ddbe7a291cdcd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5253,7 +5253,7 @@ "port-version": 0 }, "sentry-native": { - "baseline": "0.4.5", + "baseline": "0.4.6", "port-version": 0 }, "septag-sx": { diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index d913cbf6a7063d..a112b084da0586 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3d779405f43319446ea028cb8ba8c7b55c32d49", + "version-string": "0.4.6", + "port-version": 0 + }, { "git-tree": "12609c0d641d756b3c3f3170c1a019c662f903fb", "version-string": "0.4.5", From d0c6c7cd2ead8913f9fa9a603c73db1ac983076f Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 27 Jan 2021 01:02:34 +0100 Subject: [PATCH 0593/1694] ci test current version --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 9e48b89d0dd28d..ed1a58a260b9ef 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 410393fefabf2c9d25f6ed3f823868139cbd7467 - SHA512 3452a113946339aae3818d10d4d202ea16a24c4690feadad2cf6c6bba5c5806eb563cc6ab7f2ef4d4fba1c6029a9c15376fd23de8e359f2d2577ac724626a317 + REF d159bec46ab5e596ba649db784e3c88bd713fe86 + SHA512 6edf3fdd51d1741b4b79059b4cc60974e307841a55cf70c717ae1863301d0c624ca13d2e39ca8a3420c8ace79409d7b9947bc2e824271b825d95dbb955fb4f66 HEAD_REF master ) From 49321690bb943048a3ca09d56acea01be5f7d8f0 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 27 Jan 2021 01:02:34 +0100 Subject: [PATCH 0594/1694] ci test current version --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 9e48b89d0dd28d..ed1a58a260b9ef 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 410393fefabf2c9d25f6ed3f823868139cbd7467 - SHA512 3452a113946339aae3818d10d4d202ea16a24c4690feadad2cf6c6bba5c5806eb563cc6ab7f2ef4d4fba1c6029a9c15376fd23de8e359f2d2577ac724626a317 + REF d159bec46ab5e596ba649db784e3c88bd713fe86 + SHA512 6edf3fdd51d1741b4b79059b4cc60974e307841a55cf70c717ae1863301d0c624ca13d2e39ca8a3420c8ace79409d7b9947bc2e824271b825d95dbb955fb4f66 HEAD_REF master ) From 52a40bdd8b01e7558d1c9b92ad4f422969d24261 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 27 Jan 2021 01:25:48 +0100 Subject: [PATCH 0595/1694] bump to current version --- ports/mapnik/portfile.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index ed1a58a260b9ef..4f5cf696d0c2ee 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF d159bec46ab5e596ba649db784e3c88bd713fe86 - SHA512 6edf3fdd51d1741b4b79059b4cc60974e307841a55cf70c717ae1863301d0c624ca13d2e39ca8a3420c8ace79409d7b9947bc2e824271b825d95dbb955fb4f66 + REF 0b76278adce93d844d9cd135074d1631cd2ef173 + SHA512 1c2033ab67cf129883f4cf0d1c98d81eb7ca5568faaaa9277cf46c30c9b220e16b9e0b28831fe44c5fa0c2101ebc061fb47ba7490e893375f394d615d39e1816 HEAD_REF master ) @@ -44,6 +44,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} + -DCOPY_LIBRARIES_FOR_EXECUTABLES=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_TEST=OFF -DUSE_EXTERNAL_MAPBOX_GEOMETRY=ON From ced97245442b6b2858d48280d5c46036763938b5 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 27 Jan 2021 01:25:48 +0100 Subject: [PATCH 0596/1694] bump to current version --- ports/mapnik/portfile.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index ed1a58a260b9ef..4f5cf696d0c2ee 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF d159bec46ab5e596ba649db784e3c88bd713fe86 - SHA512 6edf3fdd51d1741b4b79059b4cc60974e307841a55cf70c717ae1863301d0c624ca13d2e39ca8a3420c8ace79409d7b9947bc2e824271b825d95dbb955fb4f66 + REF 0b76278adce93d844d9cd135074d1631cd2ef173 + SHA512 1c2033ab67cf129883f4cf0d1c98d81eb7ca5568faaaa9277cf46c30c9b220e16b9e0b28831fe44c5fa0c2101ebc061fb47ba7490e893375f394d615d39e1816 HEAD_REF master ) @@ -44,6 +44,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} + -DCOPY_LIBRARIES_FOR_EXECUTABLES=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_TEST=OFF -DUSE_EXTERNAL_MAPBOX_GEOMETRY=ON From b4f8f6057b3d27b7a6f1d9ec93a3dda6bbec853c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 27 Jan 2021 14:24:07 -0800 Subject: [PATCH 0597/1694] [vcpkg baseline][osgearth] Fix and add dependency tinyxml (#15900) * [osgearth] Fix and add dependency tinyxml * update version record --- ports/osgearth/fix-tinyxml.patch | 15 +++++++++++++++ ports/osgearth/portfile.cmake | 4 ++++ ports/osgearth/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/o-/osgearth.json | 5 +++++ 5 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 ports/osgearth/fix-tinyxml.patch diff --git a/ports/osgearth/fix-tinyxml.patch b/ports/osgearth/fix-tinyxml.patch new file mode 100644 index 00000000000000..9f9a6d96ff4c67 --- /dev/null +++ b/ports/osgearth/fix-tinyxml.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c78bd16..bf31091 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -193,7 +193,9 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak + # TinyXML is an XML parsing library + SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML") + IF (WITH_EXTERNAL_TINYXML) +- find_package(TinyXML REQUIRED) ++ find_package(tinyxml CONFIG REQUIRED) ++ set(TINYXML_FOUND 1) ++ set(TINYXML_LIBRARY unofficial-tinyxml::unofficial-tinyxml) + ENDIF (WITH_EXTERNAL_TINYXML) + + # postfix settings for various configs diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 57d42b523151f8..816aa50e38cd16 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -15,8 +15,12 @@ vcpkg_from_github( HEAD_REF master PATCHES make-all-find-packages-required.patch + fix-tinyxml.patch ) +# Upstream bug, see https://github.com/gwaldron/osgearth/issues/1002 +file(REMOVE ${SOURCE_PATH}/src/osgEarth/tinyxml.h) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index 7d7a220150a688..aef74120b98451 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osgearth", "version": "3.1", - "port-version": 1, + "port-version": 2, "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "supports": "!(x86 | wasm32) & !staticcrt", @@ -20,6 +20,7 @@ ] }, "protobuf", - "sqlite3" + "sqlite3", + "tinyxml" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 9ddbe7a291cdcd..f7f252c0a1e8a1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4370,7 +4370,7 @@ }, "osgearth": { "baseline": "3.1", - "port-version": 1 + "port-version": 2 }, "osi": { "baseline": "0.108.6", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index 13b6b3fece1b9c..674e0b0abbf093 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9355b8ad52fcf4998fe4c262f29a4e01fa83b9fa", + "version": "3.1", + "port-version": 2 + }, { "git-tree": "d194c647fcf69fe345c13ae7b6da3451e4bbddb6", "version": "3.1", From 7e414de8845a4a578229d82c67bb2a0a53492dd8 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 28 Jan 2021 06:25:19 +0800 Subject: [PATCH 0598/1694] [charls] update to 2.2.0 (#15857) * [charls] update to 2.2.0 * update version * delete TARGET_PATH * update version --- ports/charls/CONTROL | 2 +- ports/charls/portfile.cmake | 7 ++++--- versions/baseline.json | 2 +- versions/c-/charls.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/charls/CONTROL b/ports/charls/CONTROL index f266fe9983751e..57fdd3ec666cbc 100644 --- a/ports/charls/CONTROL +++ b/ports/charls/CONTROL @@ -1,4 +1,4 @@ Source: charls -Version: 2.1.0-1 +Version: 2.2.0 Homepage: https://github.com/team-charls/charls Description: CharLS, a C++ JPEG-LS library implementation. \ No newline at end of file diff --git a/ports/charls/portfile.cmake b/ports/charls/portfile.cmake index 159d38f1445ae4..436d11a8e06f88 100644 --- a/ports/charls/portfile.cmake +++ b/ports/charls/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO team-charls/charls - REF 2.1.0 - SHA512 456539243d984ebe6afe1bbb7c9422e642cf0346d25d220126ad8a6d04e945c6c340ab3c2b73a7db4ec390ed6a52236e5c6e9ad6d14e8b78b701937810fb327d + REF 0bafe4ecdc591f633303ad0d32f3f6c38d099802 #v2.2.0 + SHA512 56acb0085a4f653660166c11982934d7f8c8836db63339aaca700aabade2bf7cff8cba77f9f04a68bbc119b5b15800bf01ffb10628703fb2188f6e654d0e5f22 HEAD_REF master ) @@ -12,10 +12,11 @@ vcpkg_configure_cmake( OPTIONS -DCHARLS_BUILD_TESTS=OFF -DCHARLS_BUILD_SAMPLES=OFF + -DCHARLS_BUILD_FUZZ_TEST=OFF ) vcpkg_install_cmake() - +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/charls) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/versions/baseline.json b/versions/baseline.json index f7f252c0a1e8a1..3008b161771551 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1145,7 +1145,7 @@ "port-version": 1 }, "charls": { - "baseline": "2.1.0-1", + "baseline": "2.2.0", "port-version": 0 }, "chartdir": { diff --git a/versions/c-/charls.json b/versions/c-/charls.json index a735a08635a477..3f6d36b4993b64 100644 --- a/versions/c-/charls.json +++ b/versions/c-/charls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12553ab1c13943bb8295052c2965bdbcbfc7f57f", + "version-string": "2.2.0", + "port-version": 0 + }, { "git-tree": "2fa61c15c3a5e28cb65a32bce7769942d8a8f061", "version-string": "2.1.0-1", From ba0806cd384f3b12cc90ba3cb0a35b0dff4adaf3 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Thu, 28 Jan 2021 07:28:14 +0900 Subject: [PATCH 0599/1694] [nsync] create a new port (#15714) * [nsync] create a new port * [nsync] support system name WindowsStore * [nsync] use "version" instead of "version-string" * [nsync] add version JSON * Update ports/nsync/portfile.cmake * [nsync] apply PR feedback * [nsync] update SHA of port * [nsync] extract vcpkg_replace_string to patch * update version SHA Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/nsync/fix-install.patch | 32 ++++++++++++++++++++++++++++++++ ports/nsync/portfile.cmake | 25 +++++++++++++++++++++++++ ports/nsync/vcpkg.json | 6 ++++++ versions/baseline.json | 4 ++++ versions/n-/nsync.json | 9 +++++++++ 5 files changed, 76 insertions(+) create mode 100644 ports/nsync/fix-install.patch create mode 100644 ports/nsync/portfile.cmake create mode 100644 ports/nsync/vcpkg.json create mode 100644 versions/n-/nsync.json diff --git a/ports/nsync/fix-install.patch b/ports/nsync/fix-install.patch new file mode 100644 index 00000000000000..efe560d15bca4b --- /dev/null +++ b/ports/nsync/fix-install.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6b1f1dc..328f9b6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -80,7 +80,7 @@ set (NSYNC_OS_CPP_SRC + # https://cmake.org/cmake/help/v3.1/policy/CMP0054.html + + # Pick the include directory for the operating system. +-if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX") ++if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX" OR "${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsStoreX") + include_directories ("${PROJECT_SOURCE_DIR}/platform/win32") + set (NSYNC_CPP_FLAGS "/TP") + +@@ -230,7 +230,7 @@ elseif (("${CMAKE_SYSTEM_PROCESSOR}X" STREQUAL "ppc64X")) + endif () + + # Windows uses some include files from the posix directory also. +-if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX") ++if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX" OR "${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsStoreX") + include_directories ("${PROJECT_SOURCE_DIR}/platform/posix") + endif () + +@@ -396,7 +396,8 @@ if (NSYNC_ENABLE_TESTS) + endforeach (t) + endif () + +-set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON) ++# By default, install nsync always ++# set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON) + + install (TARGETS nsync + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries diff --git a/ports/nsync/portfile.cmake b/ports/nsync/portfile.cmake new file mode 100644 index 00000000000000..65abd9c87f5239 --- /dev/null +++ b/ports/nsync/portfile.cmake @@ -0,0 +1,25 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/nsync + REF 1.24.0 + SHA512 14dd582488072123a353c967664ed9a3f636865bb35e64d7256dcc809539129fa47c7979a4009fd45c9341cac537a4ca6b4b617ba2cae1d3995a7c251376339f + HEAD_REF master + PATCHES + fix-install.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DNSYNC_ENABLE_TESTS=OFF +) +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +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/nsync/vcpkg.json b/ports/nsync/vcpkg.json new file mode 100644 index 00000000000000..292da006c9059a --- /dev/null +++ b/ports/nsync/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "nsync", + "version": "1.24.0", + "description": "nsync is a C library that exports various synchronization primitives, such as mutexes", + "homepage": "https://github.com/google/nsync" +} diff --git a/versions/baseline.json b/versions/baseline.json index 3008b161771551..06256079455df7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4064,6 +4064,10 @@ "baseline": "4.1.2", "port-version": 0 }, + "nsync": { + "baseline": "1.24.0", + "port-version": 0 + }, "nt-wrapper": { "baseline": "2019-08-10", "port-version": 0 diff --git a/versions/n-/nsync.json b/versions/n-/nsync.json new file mode 100644 index 00000000000000..44af83133ddb9f --- /dev/null +++ b/versions/n-/nsync.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "65f07dbc95a609c95de7befffbf37da598652cee", + "version": "1.24.0", + "port-version": 0 + } + ] +} From af0ec46fc2330ce7b8fda39c14f0dbecb792bc31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 27 Jan 2021 18:16:47 -0800 Subject: [PATCH 0600/1694] [openvdb] Fix vcpkg-cmake-wrapper (#15902) * [openvdb] Fix vcpkg-cmake-wrapper * update version record --- ports/openvdb/CONTROL | 2 +- ports/openvdb/portfile.cmake | 2 +- ...cpkg-cmake-wrapper.cmake => vcpkg-cmake-wrapper.cmake.in} | 2 ++ versions/baseline.json | 2 +- versions/o-/openvdb.json | 5 +++++ 5 files changed, 10 insertions(+), 3 deletions(-) rename ports/openvdb/{vcpkg-cmake-wrapper.cmake => vcpkg-cmake-wrapper.cmake.in} (82%) diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL index f100be3e8a18c5..a05640a98500cf 100644 --- a/ports/openvdb/CONTROL +++ b/ports/openvdb/CONTROL @@ -1,6 +1,6 @@ Source: openvdb Version: 7.1.0 -Port-Version: 1 +Port-Version: 2 Build-Depends: boost-ptr-container, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess, ilmbase Homepage: https://github.com/dreamworksanimation/openvdb Description: Sparse volume data structure and tools diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index fa91fc7f884d22..2fb9c3e6ffea8a 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -54,6 +54,6 @@ if (OPENVDB_BUILD_TOOLS) vcpkg_copy_tools(TOOL_NAMES vdb_print vdb_render vdb_view vdb_lod AUTO_CLEAN) endif() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +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}) file(INSTALL ${SOURCE_PATH}/openvdb/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/openvdb/vcpkg-cmake-wrapper.cmake b/ports/openvdb/vcpkg-cmake-wrapper.cmake.in similarity index 82% rename from ports/openvdb/vcpkg-cmake-wrapper.cmake rename to ports/openvdb/vcpkg-cmake-wrapper.cmake.in index fd1c5d23de7a6f..7b9e5ac67ac170 100644 --- a/ports/openvdb/vcpkg-cmake-wrapper.cmake +++ b/ports/openvdb/vcpkg-cmake-wrapper.cmake.in @@ -5,6 +5,8 @@ list(REMOVE_ITEM ARGS "NO_MODULE") list(REMOVE_ITEM ARGS "CONFIG") list(REMOVE_ITEM ARGS "MODULE") +set(OPENVDB_USE_STATIC_LIBS @OPENVDB_STATIC@) + _find_package(${ARGS}) set(CMAKE_MODULE_PATH ${OPENVDB_PREV_MODULE_PATH}) diff --git a/versions/baseline.json b/versions/baseline.json index 06256079455df7..cf68e470aa6764 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4326,7 +4326,7 @@ }, "openvdb": { "baseline": "7.1.0", - "port-version": 1 + "port-version": 2 }, "openvpn3": { "baseline": "3.4.1-1", diff --git a/versions/o-/openvdb.json b/versions/o-/openvdb.json index 8b0d616fb06f6d..5b5e207a1f0308 100644 --- a/versions/o-/openvdb.json +++ b/versions/o-/openvdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7851d7cc48fbd6ae64e2a625afc0a21024f0eb31", + "version-string": "7.1.0", + "port-version": 2 + }, { "git-tree": "7bd35d581cf4764e95b80e0e1a91554238a45f25", "version-string": "7.1.0", From 89364df5c14e68314c2b15c3c43dea2023483077 Mon Sep 17 00:00:00 2001 From: mfornace Date: Wed, 27 Jan 2021 18:17:09 -0800 Subject: [PATCH 0601/1694] [taskflow] update to 3.0.0 (#15894) * update taskflow portfile to 3.0.0 * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/taskflow/CONTROL | 2 +- ports/taskflow/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/t-/taskflow.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/taskflow/CONTROL b/ports/taskflow/CONTROL index 6576a0ad55b9c3..b3e9843c947a73 100644 --- a/ports/taskflow/CONTROL +++ b/ports/taskflow/CONTROL @@ -1,4 +1,4 @@ Source: taskflow -Version: 2.7.0 +Version: 3.0.0 Description: Fast Parallel Tasking Programming Library using Modern C++. Homepage: https://github.com/taskflow/taskflow diff --git a/ports/taskflow/portfile.cmake b/ports/taskflow/portfile.cmake index b1bfdf04fd8453..2a71d1f1a204a8 100644 --- a/ports/taskflow/portfile.cmake +++ b/ports/taskflow/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taskflow/taskflow - REF v2.7.0 - SHA512 1498739cfe5af9ce66815a82c18edde38a4806d9288c8c7859b8f1621f8353258adfaf80275d4a2294cc3dc09365d8a18219210453aa1b7bb7658abd026b13f2 + REF v3.0.0 + SHA512 5c838ff4436ade1f3755eb6859f724188be2bfcd11baf172413a0bdc18bc516b7b911e6d83a140c95548f844a8c8b908992bdec10b3b6569876a3e3b2d5b821e HEAD_REF master ) diff --git a/versions/baseline.json b/versions/baseline.json index cf68e470aa6764..32ffa27707db5b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5633,7 +5633,7 @@ "port-version": 0 }, "taskflow": { - "baseline": "2.7.0", + "baseline": "3.0.0", "port-version": 0 }, "tbb": { diff --git a/versions/t-/taskflow.json b/versions/t-/taskflow.json index 31c01f999800c7..f728c54f7d8ada 100644 --- a/versions/t-/taskflow.json +++ b/versions/t-/taskflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfa2c53934444b309b97a672883d35da17246d86", + "version-string": "3.0.0", + "port-version": 0 + }, { "git-tree": "efe56bba7e13bcf283b57fed39637a7e4789c1da", "version-string": "2.7.0", From 78a98435815eb16e32266dc1b13e98df6dee96f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 27 Jan 2021 18:18:22 -0800 Subject: [PATCH 0602/1694] [baseline][colmap] Fix find dependency freeimage (#15886) * [colmap] Fix find dependency freeimage * update version record --- ports/colmap/fix-dependency-freeimage.patch | 14 ++++++++++++++ ports/colmap/portfile.cmake | 1 + ports/colmap/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/colmap.json | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/colmap/fix-dependency-freeimage.patch diff --git a/ports/colmap/fix-dependency-freeimage.patch b/ports/colmap/fix-dependency-freeimage.patch new file mode 100644 index 00000000000000..29b591e34127fa --- /dev/null +++ b/ports/colmap/fix-dependency-freeimage.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b05097c..cdd8ca4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -96,7 +96,8 @@ find_package(Boost REQUIRED COMPONENTS + + find_package(Eigen3 REQUIRED) + +-find_package(FreeImage REQUIRED) ++find_package(freeimage CONFIG REQUIRED) ++set(FREEIMAGE_LIBRARIES freeimage::FreeImage) + + find_package(Glog REQUIRED) + diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index 6b9bf3284c4af2..4ab35bbc32a882 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF ${COLMAP_REF} SHA512 9a4b4f2a49891ce8ac32ab1f2e9b859336326bada889e6de49c017a069884bb6c8ab8a2ae430d955e58fc22377c63e8fba9ce80ff959713e2878e29814d44632 HEAD_REF dev + PATCHES fix-dependency-freeimage.patch ) if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES)) diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index 6feee3ee05bf51..5a43d64f86129f 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "colmap", "version-string": "3.6", + "port-version": 1, "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.", "homepage": "https://colmap.github.io/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 32ffa27707db5b..ebd7234cecfc4e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1266,7 +1266,7 @@ }, "colmap": { "baseline": "3.6", - "port-version": 0 + "port-version": 1 }, "comms": { "baseline": "3.1.3", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index 712aae6b4f11ad..026bb17632f2fd 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f88c10f0bc3819bae7c197375bba335106726f1", + "version-string": "3.6", + "port-version": 1 + }, { "git-tree": "e2d108b4334d41c2cc500c5dfe4c389127a46220", "version-string": "3.6", From dfc5716f21393bf128df2346558a057ba1647fbc Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 27 Jan 2021 21:22:43 -0500 Subject: [PATCH 0603/1694] [speex] Add linux and macOS support. (#15855) * [speex] Add linux and macOS support. * [speex] Improve portfile.cmake * update version record Co-authored-by: JackBoosY --- ports/speex/CONTROL | 3 +-- ports/speex/portfile.cmake | 43 ++++++++++++++++++++++++-------------- versions/baseline.json | 2 +- versions/s-/speex.json | 5 +++++ 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/ports/speex/CONTROL b/ports/speex/CONTROL index 0185b9b07b31e1..41157ff237d203 100644 --- a/ports/speex/CONTROL +++ b/ports/speex/CONTROL @@ -1,6 +1,5 @@ Source: speex Version: 1.2.0 -Port-Version: 7 +Port-Version: 8 Homepage: https://github.com/xiph/speex Description: Speex is an Open Source/Free Software patent-free audio compression format designed for speech. -Supports: !(linux | osx) \ No newline at end of file diff --git a/ports/speex/portfile.cmake b/ports/speex/portfile.cmake index a8431db7627e15..14a11d813f9708 100644 --- a/ports/speex/portfile.cmake +++ b/ports/speex/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND PATCHES "0001-make-pkg-config-lib-name-configurable.patch") +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -6,26 +8,35 @@ vcpkg_from_github( REF Speex-1.2.0 SHA512 612dfd67a9089f929b7f2a613ed3a1d2fda3d3ec0a4adafe27e2c1f4542de1870b42b8042f0dcb16d52e08313d686cc35b76940776419c775417f5bad18b448f HEAD_REF master - PATCHES - 0001-make-pkg-config-lib-name-configurable.patch + PATCHES ${PATCHES} ) -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 -) +if(VCPKG_TARGET_IS_WINDOWS) + 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_install_cmake() -vcpkg_install_cmake() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/speex/speex.h" + "extern const SpeexMode" + "__declspec(dllimport) extern const SpeexMode" + ) + endif() +else() + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + ) + vcpkg_install_make() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(READ "${CURRENT_PACKAGES_DIR}/include/speex/speex.h" _contents) - string(REPLACE "extern const SpeexMode" "__declspec(dllimport) extern const SpeexMode" _contents "${_contents}") - file(WRITE "${CURRENT_PACKAGES_DIR}/include/speex/speex.h" "${_contents}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() 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/versions/baseline.json b/versions/baseline.json index ebd7234cecfc4e..6edad38c57b9fb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5482,7 +5482,7 @@ }, "speex": { "baseline": "1.2.0", - "port-version": 7 + "port-version": 8 }, "speexdsp": { "baseline": "1.2.0", diff --git a/versions/s-/speex.json b/versions/s-/speex.json index a177e0f96ab5ed..2579e431086079 100644 --- a/versions/s-/speex.json +++ b/versions/s-/speex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eaa4e7b1a075051d8ba02bc67a89ae035be1b28c", + "version-string": "1.2.0", + "port-version": 8 + }, { "git-tree": "ee8363b22602ef2b0f74d4d43de88ed32457c4ba", "version-string": "1.2.0", From 052d1ddb2a1710bcfc78a8c1e925363aa819a4ed Mon Sep 17 00:00:00 2001 From: Tom Lankhorst Date: Thu, 28 Jan 2021 03:29:04 +0100 Subject: [PATCH 0604/1694] [libpqxx] Upgrade to v7.3.1 (#15851) * [libpqxx] Upgrade to v7.3.1 * Update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/libpqxx/CONTROL | 2 +- ports/libpqxx/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/l-/libpqxx.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libpqxx/CONTROL b/ports/libpqxx/CONTROL index cc022b2ccb6602..8d182f527f9e1f 100644 --- a/ports/libpqxx/CONTROL +++ b/ports/libpqxx/CONTROL @@ -1,5 +1,5 @@ Source: libpqxx -Version: 7.3.0 +Version: 7.3.1 Homepage: https://github.com/jtv/libpqxx Description: The official C++ client API for PostgreSQL Build-Depends: libpq[core] diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake index c7353611940c8a..f5139a17f4ba80 100644 --- a/ports/libpqxx/portfile.cmake +++ b/ports/libpqxx/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jtv/libpqxx - REF 58d2a028d1600225ac3a478d6b3a06ba2f0c01f6 # 7.3.0 - SHA512 c0c121e89e8b6669cd049a25c8b647d7cb861868da4daa11fc68e6a3a9384c22b9bc16e09c998389bc769aae36e618097cc93ca9f90822d90f8c0d15871ec1b0 + REF 9e55cea0116febb5c536ed18ede9a7b2c647e631 # 7.3.1 + SHA512 22da46c1c4ef798e7aa2db4f5094f8d4c3a965d755ae72a1cfae6282264c0d974317849f8db0bf34ff6aebd1ede5e5086cf74bff8bc3c6a21b3149a94d30c04f HEAD_REF master ) diff --git a/versions/baseline.json b/versions/baseline.json index 6edad38c57b9fb..bad41c178cdcf1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3237,7 +3237,7 @@ "port-version": 10 }, "libpqxx": { - "baseline": "7.3.0", + "baseline": "7.3.1", "port-version": 0 }, "libprotobuf-mutator": { diff --git a/versions/l-/libpqxx.json b/versions/l-/libpqxx.json index 78949dc25a36e9..f93cd52e6903b8 100644 --- a/versions/l-/libpqxx.json +++ b/versions/l-/libpqxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66295fd2998b54f3f4fd43702c0f402fef16fccd", + "version-string": "7.3.1", + "port-version": 0 + }, { "git-tree": "8108ba3b6f2f2d5a6f27c1afb5981b778ef184d7", "version-string": "7.3.0", From 66191b66dceb322ec71c0aca9bf02161dbf2f522 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Thu, 28 Jan 2021 02:29:58 +0000 Subject: [PATCH 0605/1694] [ffmpeg] use nasm instead of yasm (#14547) * [ffmpeg] use nasm instead of yasm * [ffmpeg] bump port version * [ffmpeg] remove old yasm path reference * update baseline * [ffmpeg] fall back to yasm on x86 * [ffmpeg] add comment in portfile about issue with ffmpeg nasm build for future reference * [ffmpeg] update git-tree Co-authored-by: JackBoosY --- ports/ffmpeg/CONTROL | 2 +- ports/ffmpeg/portfile.cmake | 16 ++++++++++++---- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 49db6d023db2bb..c58ac743981866 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,6 +1,6 @@ Source: ffmpeg Version: 4.3.1 -Port-Version: 9 +Port-Version: 10 Homepage: https://ffmpeg.org 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. diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index c41f37c7c12276..3f0b7f457d0f49 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -23,8 +23,17 @@ if (SOURCE_PATH MATCHES " ") message(FATAL_ERROR "Error: ffmpeg will not build with spaces in the path. Please use a directory with no spaces") endif() -vcpkg_find_acquire_program(YASM) -get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) + +if(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86) + # ffmpeg nasm build gives link error on x86, so fall back to yasm + vcpkg_find_acquire_program(YASM) + get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) + vcpkg_add_to_path(${YASM_EXE_PATH}) +else() + vcpkg_find_acquire_program(NASM) + get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) + vcpkg_add_to_path(${NASM_EXE_PATH}) +endif() if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) #We're assuming that if we're building for Windows we're using MSVC @@ -35,8 +44,7 @@ else() set(LIB_PATH_VAR "LIBRARY_PATH") endif() -set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${YASM_EXE_PATH}") -set(OPTIONS "--enable-asm --enable-yasm --disable-doc --enable-debug --enable-runtime-cpudetect") +set(OPTIONS "--enable-asm --enable-x86asm --disable-doc --enable-debug --enable-runtime-cpudetect") if(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") diff --git a/versions/baseline.json b/versions/baseline.json index bad41c178cdcf1..ef7e997e47a977 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1878,7 +1878,7 @@ }, "ffmpeg": { "baseline": "4.3.1", - "port-version": 9 + "port-version": 10 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index a9bdb56b99701e..a2ddd9b009ddeb 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93395ca1a700faa1c8c6ce04ef4a6dfa26e9fade", + "version-string": "4.3.1", + "port-version": 10 + }, { "git-tree": "f591a51746536b99b4621d39ea7e0dcd8a693016", "version-string": "4.3.1", From 693ff00c2a3a7bf64bb65440bddc055075696a83 Mon Sep 17 00:00:00 2001 From: Be Date: Thu, 28 Jan 2021 13:43:14 -0800 Subject: [PATCH 0606/1694] set CMake policy CMP0087 for X_VCPKG_APPLOCAL_DEPS_INSTALL (#15874) Without this, X_VCPKG_APPLOCAL_DEPS_INSTALL does not work and CMake prints this warning at the configure step: CMake Warning (dev) in CMakeLists.txt: Policy CMP0087 is not set: Install CODE|SCRIPT allow the use of generator expressions. Run "cmake --help-policy CMP0087" for policy details. Use the cmake_policy command to set the policy and suppress this warning. This warning is for project developers. Use -Wno-dev to suppress it. https://cmake.org/cmake/help/latest/policy/CMP0087.html --- scripts/buildsystems/vcpkg.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 2969209399cba4..f4fa8a64f8ef4e 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -529,6 +529,10 @@ function(x_vcpkg_install_local_dependencies) foreach(TARGET IN LISTS __VCPKG_APPINSTALL_TARGETS) get_target_property(TARGETTYPE ${TARGET} TYPE) if(NOT TARGETTYPE STREQUAL "INTERFACE_LIBRARY") + # Install CODE|SCRIPT allow the use of generator expressions + if(POLICY CMP0087) + cmake_policy(SET CMP0087 NEW) + endif() install(CODE "message(\"-- Installing app dependencies for ${TARGET}...\") execute_process(COMMAND \"${_VCPKG_POWERSHELL_PATH}\" -noprofile -executionpolicy Bypass -file \"${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1\" -targetBinary \"\${CMAKE_INSTALL_PREFIX}/${__VCPKG_APPINSTALL_DESTINATION}/$\" From a2cba631d3838397c8d998a06ae9f2f2a0ba94da Mon Sep 17 00:00:00 2001 From: Radames Cruz Date: Thu, 28 Jan 2021 13:49:30 -0800 Subject: [PATCH 0607/1694] Update to SEAL 3.6.1 (#15015) --- ports/seal/CONTROL | 7 ++++++- ports/seal/portfile.cmake | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/seal/CONTROL b/ports/seal/CONTROL index 36f701e8a3d2e5..060d457b6e9791 100644 --- a/ports/seal/CONTROL +++ b/ports/seal/CONTROL @@ -1,7 +1,8 @@ Source: seal -Version: 3.6.0 +Version: 3.6.1 Homepage: https://github.com/microsoft/SEAL Description: Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library. +Supports: !windows | (windows & static) Default-Features: ms-gsl, zlib, zstd Feature: ms-gsl @@ -15,3 +16,7 @@ Description: Use zlib for compressed serialization Feature: zstd Build-Depends: zstd Description: Use zstd for compressed serialization + +Feature: no-throw-tran +Build-Depends: +Description: Do not throw when operating on transparent ciphertexts diff --git a/ports/seal/portfile.cmake b/ports/seal/portfile.cmake index 4b0fc342cd2b44..d3bae38565e96a 100644 --- a/ports/seal/portfile.cmake +++ b/ports/seal/portfile.cmake @@ -3,15 +3,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/SEAL - REF 3eea4353d4768c79899a67ca4d36bfc3005d5412 - SHA512 ee3d8926f4a26c8f67a9e79fe5da9883195d2e9f9fffa47bb9c3526150d1e0c179968af7222ca280574921feb3c45200da1ca4dc0b012b82aa57dbdef26dcc0a + REF d6040632780981f3ab61969025d333d394eb2aeb + SHA512 f93c636eb9f3dd4c3b626b126aeed669da506e1e17eba172f6d3193ff2561b4cb4fc19a30b46792afa04848f1f4d73e276cdc915b41ec64bc9ea6d02550af110 HEAD_REF master ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES ms-gsl SEAL_USE_MSGSL zlib SEAL_USE_ZLIB zstd SEAL_USE_ZSTD + + INVERTED_FEATURES + no-throw-tran SEAL_THROW_ON_TRANSPARENT_CIPHERTEXT ) vcpkg_configure_cmake( From 3b2c0b426fdd762c9434901763d910aa91610c4e Mon Sep 17 00:00:00 2001 From: Alex Pozhylenkov Date: Fri, 29 Jan 2021 01:00:25 +0200 Subject: [PATCH 0608/1694] update tests (#15449) --- toolsrc/src/vcpkg-test/paragraph.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/toolsrc/src/vcpkg-test/paragraph.cpp b/toolsrc/src/vcpkg-test/paragraph.cpp index 356ee88f8bba06..cb3f8e6207b502 100644 --- a/toolsrc/src/vcpkg-test/paragraph.cpp +++ b/toolsrc/src/vcpkg-test/paragraph.cpp @@ -60,6 +60,7 @@ TEST_CASE ("SourceParagraph construct invalid", "[paragraph]") }}); REQUIRE(!m_pgh.has_value()); + REQUIRE(m_pgh.error()->has_error()); m_pgh = test_parse_control_file({{ {"Source", "zlib"}, @@ -68,6 +69,7 @@ TEST_CASE ("SourceParagraph construct invalid", "[paragraph]") }}); REQUIRE(!m_pgh.has_value()); + REQUIRE(m_pgh.error()->has_error()); m_pgh = test_parse_control_file({ { @@ -81,6 +83,16 @@ TEST_CASE ("SourceParagraph construct invalid", "[paragraph]") }); REQUIRE(!m_pgh.has_value()); + REQUIRE(m_pgh.error()->has_error()); + + // invalid field`s name + m_pgh = test_parse_control_file({{ + {"Surce", "zlib"}, + {"Vursion", "1.2.8"}, + }}); + + REQUIRE(!m_pgh.has_value()); + REQUIRE(m_pgh.error()->has_error()); } TEST_CASE ("SourceParagraph construct maximum", "[paragraph]") From 2ca7f17c8f4d72de23172b15c5bfd0c9ff0f1932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 28 Jan 2021 18:47:13 -0800 Subject: [PATCH 0609/1694] [seal] Update verson record (#15933) --- versions/baseline.json | 2 +- versions/s-/seal.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index ef7e997e47a977..d7d16773dd94f0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5241,7 +5241,7 @@ "port-version": 0 }, "seal": { - "baseline": "3.6.0", + "baseline": "3.6.1", "port-version": 0 }, "secp256k1": { diff --git a/versions/s-/seal.json b/versions/s-/seal.json index d15dc33bc34698..1fbf01d50b5146 100644 --- a/versions/s-/seal.json +++ b/versions/s-/seal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f0e988ad7a2c1b8c2c0d39f9954d1782886dd93", + "version-string": "3.6.1", + "port-version": 0 + }, { "git-tree": "df71d4b4ab6cc7c95c3c5eaec90cc413d508b1ea", "version-string": "3.6.0", From d6569f566228e9265f0e7ddc4f6c37604f4a790c Mon Sep 17 00:00:00 2001 From: Be Date: Thu, 28 Jan 2021 19:21:46 -0800 Subject: [PATCH 0610/1694] [libkeyfinder] add new port with libkeyfinder 2.2.4 (#15878) --- ports/libkeyfinder/portfile.cmake | 24 ++++++++++++++++++++++++ ports/libkeyfinder/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libkeyfinder.json | 9 +++++++++ 4 files changed, 55 insertions(+) create mode 100644 ports/libkeyfinder/portfile.cmake create mode 100644 ports/libkeyfinder/vcpkg.json create mode 100644 versions/l-/libkeyfinder.json diff --git a/ports/libkeyfinder/portfile.cmake b/ports/libkeyfinder/portfile.cmake new file mode 100644 index 00000000000000..0eba972be2ebce --- /dev/null +++ b/ports/libkeyfinder/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mixxxdj/libkeyfinder + REF v2.2.4 + SHA512 6673b9a81dbfa3693fc4e7af4e5fc0f351f0c60b00fdafeb9e3437e2f77b5fec7d1e78e3989ff1daca72770a1d3cdbe3837508718b8e8aba3ac3f3d56af81a56 + HEAD_REF main +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + test BUILD_TESTING +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KeyFinder TARGET_PATH share/KeyFinder) + +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/libkeyfinder/vcpkg.json b/ports/libkeyfinder/vcpkg.json new file mode 100644 index 00000000000000..c1fa0a6a83ef0a --- /dev/null +++ b/ports/libkeyfinder/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libkeyfinder", + "version-string": "2.2.4", + "description": "Musical key detection for digital audio", + "homepage": "https://github.com/mixxxdj/libkeyfinder", + "license": "GPL-3.0-or-later", + "dependencies": [ + "fftw3" + ], + "features": { + "test": { + "description": "Build tests", + "dependencies": [ + "catch2" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index d7d16773dd94f0..31bcaa0136e78d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3052,6 +3052,10 @@ "baseline": "0.6.0", "port-version": 0 }, + "libkeyfinder": { + "baseline": "2.2.4", + "port-version": 0 + }, "libkml": { "baseline": "1.3.0", "port-version": 6 diff --git a/versions/l-/libkeyfinder.json b/versions/l-/libkeyfinder.json new file mode 100644 index 00000000000000..b3738e716ab195 --- /dev/null +++ b/versions/l-/libkeyfinder.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0ea7e74c79c626ed0185ee546a684293663cf651", + "version-string": "2.2.4", + "port-version": 0 + } + ] +} From 490bb1e4a6119d80ad3b86c1aa9c6db82accfecc Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 29 Jan 2021 04:23:57 +0100 Subject: [PATCH 0611/1694] [OpenCV] bump to 4.5.1 and to 3.4.13 (#15859) * [OpenCV] bump to 4.5.1 and to 3.4.13 * [OpenCV] fix patches * [OpenCV] fix hdf5 integration * [OpenCV] devendor quirc * fix quirc for downstream ports * [quirc] fix target export * update version refs * [OpenMVG] fix regressions with new opencv * update version refs * fix quirc mismatch * update version refs --- ports/opencv/vcpkg.json | 3 +- ports/opencv3/0002-install-options.patch | 8 +- .../0003-force-package-requirements.patch | 72 +++++------------ .../0004-add-missing-stdexcept-include.patch | 12 --- ports/opencv3/0004-fix-eigen.patch | 13 +++ ...{0009-fix-uwp.patch => 0006-fix-uwp.patch} | 4 +- ports/opencv3/0007-fix-hdf5.patch | 30 +++++++ ...-quirc.patch => 0008-devendor-quirc.patch} | 52 ++++++------ ports/opencv3/portfile.cmake | 13 +-- ports/opencv3/vcpkg.json | 4 +- ports/opencv4/0002-install-options.patch | 8 +- .../0003-force-package-requirements.patch | 81 +++++++------------ ports/opencv4/0004-fix-policy-CMP0057.patch | 2 +- .../0005-add-missing-stdexcept-include.patch | 12 --- ports/opencv4/0005-fix-eigen.patch | 13 +++ .../0006-fix-glog-abbreviated-severity.patch | 12 --- ...{0009-fix-uwp.patch => 0006-fix-uwp.patch} | 4 +- ports/opencv4/0007-fix-hdf5.patch | 30 +++++++ ...-quirc.patch => 0008-devendor-quirc.patch} | 52 ++++++------ .../0010-fix-interface_link_libraries.patch | 22 ----- ports/opencv4/portfile.cmake | 17 ++-- ports/opencv4/vcpkg.json | 3 +- ports/openmvg/CONTROL | 1 + ports/openmvg/build_fixes.patch | 19 ++++- versions/baseline.json | 12 +-- versions/o-/opencv.json | 5 ++ versions/o-/opencv3.json | 7 +- versions/o-/opencv4.json | 7 +- versions/o-/openmvg.json | 5 ++ 29 files changed, 261 insertions(+), 262 deletions(-) delete mode 100644 ports/opencv3/0004-add-missing-stdexcept-include.patch create mode 100644 ports/opencv3/0004-fix-eigen.patch rename ports/opencv3/{0009-fix-uwp.patch => 0006-fix-uwp.patch} (85%) create mode 100644 ports/opencv3/0007-fix-hdf5.patch rename ports/opencv3/{0010-devendor-quirc.patch => 0008-devendor-quirc.patch} (90%) delete mode 100644 ports/opencv4/0005-add-missing-stdexcept-include.patch create mode 100644 ports/opencv4/0005-fix-eigen.patch delete mode 100644 ports/opencv4/0006-fix-glog-abbreviated-severity.patch rename ports/opencv4/{0009-fix-uwp.patch => 0006-fix-uwp.patch} (85%) create mode 100644 ports/opencv4/0007-fix-hdf5.patch rename ports/opencv4/{0011-devendor-quirc.patch => 0008-devendor-quirc.patch} (82%) delete mode 100644 ports/opencv4/0010-fix-interface_link_libraries.patch diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json index 372977b53c5114..9268e4e2c0ef0d 100644 --- a/ports/opencv/vcpkg.json +++ b/ports/opencv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "opencv", - "version": "4.5.0", + "version": "4.5.1", "description": "Computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ @@ -13,6 +13,7 @@ "dnn", "jpeg", "png", + "quirc", "tiff", "webp" ], diff --git a/ports/opencv3/0002-install-options.patch b/ports/opencv3/0002-install-options.patch index 1657579fa76960..431e02bf6124d2 100644 --- a/ports/opencv3/0002-install-options.patch +++ b/ports/opencv3/0002-install-options.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d143a7a..15eb053 100644 +index fcb4a1d..5810b0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -602,7 +602,7 @@ endif() +@@ -607,7 +607,7 @@ endif() ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) # --- Python Support --- @@ -12,10 +12,10 @@ index d143a7a..15eb053 100644 endif() diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 9ac671d..b14ce09 100644 +index 8a3dcdb..b8b3bae 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake -@@ -263,7 +263,6 @@ if(MSVC) +@@ -262,7 +262,6 @@ if(MSVC) #endif() if(BUILD_WITH_DEBUG_INFO) diff --git a/ports/opencv3/0003-force-package-requirements.patch b/ports/opencv3/0003-force-package-requirements.patch index 7f1b0c906f23f3..e45ced441beaff 100644 --- a/ports/opencv3/0003-force-package-requirements.patch +++ b/ports/opencv3/0003-force-package-requirements.patch @@ -1,44 +1,44 @@ diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index fcf716b..f3951e3 100644 +index f99bb33..5407f70 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake -@@ -6,7 +6,7 @@ - if(BUILD_ZLIB) +@@ -7,7 +7,7 @@ if(BUILD_ZLIB) ocv_clear_vars(ZLIB_FOUND) else() + ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) - find_package(ZLIB "${MIN_VER_ZLIB}") + find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) if(ZLIB_FOUND AND ANDROID) if(ZLIB_LIBRARIES MATCHES "/usr/(lib|lib32|lib64)/libz.so$") set(ZLIB_LIBRARIES z) -@@ -30,7 +30,7 @@ if(WITH_JPEG) - if(BUILD_JPEG) +@@ -33,7 +33,7 @@ if(WITH_JPEG) ocv_clear_vars(JPEG_FOUND) else() + ocv_clear_internal_cache_vars(JPEG_LIBRARY JPEG_INCLUDE_DIR) - include(FindJPEG) + find_package(JPEG REQUIRED) endif() if(NOT JPEG_FOUND) -@@ -74,7 +74,7 @@ if(WITH_TIFF) - if(BUILD_TIFF) +@@ -79,7 +79,7 @@ if(WITH_TIFF) ocv_clear_vars(TIFF_FOUND) else() + ocv_clear_internal_cache_vars(TIFF_LIBRARY TIFF_INCLUDE_DIR) - include(FindTIFF) + find_package(TIFF REQUIRED) if(TIFF_FOUND) ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION) endif() -@@ -117,7 +117,7 @@ if(WITH_WEBP) - if(BUILD_WEBP) +@@ -123,7 +123,7 @@ if(WITH_WEBP) ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR) else() + ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR) - include(cmake/OpenCVFindWebP.cmake) + find_package(WebP REQUIRED) if(WEBP_FOUND) set(HAVE_WEBP 1) endif() -@@ -158,7 +158,7 @@ if(WITH_JASPER) +@@ -164,7 +164,7 @@ if(WITH_JASPER) if(BUILD_JASPER) ocv_clear_vars(JASPER_FOUND) else() @@ -47,75 +47,39 @@ index fcf716b..f3951e3 100644 endif() if(NOT JASPER_FOUND) -@@ -182,7 +182,7 @@ if(WITH_PNG) - if(BUILD_PNG) +@@ -189,7 +189,7 @@ if(WITH_PNG) ocv_clear_vars(PNG_FOUND) else() + ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR) - include(FindPNG) + find_package(PNG REQUIRED) if(PNG_FOUND) include(CheckIncludeFile) check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -@@ -213,7 +213,7 @@ endif() - if(WITH_OPENEXR) +@@ -221,7 +221,7 @@ if(WITH_OPENEXR) ocv_clear_vars(HAVE_OPENEXR) if(NOT BUILD_OPENEXR) + ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) - include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") + find_package(OpenEXR REQUIRED) endif() if(OPENEXR_FOUND) -@@ -231,7 +231,7 @@ endif() +@@ -239,7 +239,7 @@ endif() # --- GDAL (optional) --- if(WITH_GDAL) - find_package(GDAL QUIET) -+ find_package(GDAL REQUIRED) ++ find_package(GDAL REQUIRED) if(NOT GDAL_FOUND) set(HAVE_GDAL NO) -@@ -243,7 +243,7 @@ if(WITH_GDAL) +@@ -251,7 +251,7 @@ if(WITH_GDAL) endif() - if (WITH_GDCM) + if(WITH_GDCM) - find_package(GDCM QUIET) + find_package(GDCM REQUIRED) if(NOT GDCM_FOUND) set(HAVE_GDCM NO) ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES) -diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake -index b9b1a95..596c152 100644 ---- a/cmake/OpenCVFindLibsPerf.cmake -+++ b/cmake/OpenCVFindLibsPerf.cmake -@@ -51,14 +51,9 @@ endif(WITH_CUDA) - - # --- Eigen --- - if(WITH_EIGEN AND NOT HAVE_EIGEN) -- find_package(Eigen3 QUIET) -+ find_package(Eigen3 REQUIRED) - - if(Eigen3_FOUND) -- if(TARGET Eigen3::Eigen) -- # Use Eigen3 imported target if possible -- list(APPEND OPENCV_LINKER_LIBS Eigen3::Eigen) -- set(HAVE_EIGEN 1) -- else() - if(DEFINED EIGEN3_INCLUDE_DIRS) - set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIRS}) - set(HAVE_EIGEN 1) -@@ -66,7 +61,6 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) - set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIR}) - set(HAVE_EIGEN 1) - endif() -- endif() - if(HAVE_EIGEN) - if(DEFINED EIGEN3_WORLD_VERSION) # CMake module - set(EIGEN_WORLD_VERSION ${EIGEN3_WORLD_VERSION}) -@@ -77,6 +71,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) - set(EIGEN_MAJOR_VERSION ${EIGEN3_VERSION_MINOR}) - set(EIGEN_MINOR_VERSION ${EIGEN3_VERSION_PATCH}) - endif() -+ ocv_include_directories(${EIGEN_INCLUDE_PATH}) - endif() - endif() - diff --git a/ports/opencv3/0004-add-missing-stdexcept-include.patch b/ports/opencv3/0004-add-missing-stdexcept-include.patch deleted file mode 100644 index 2a7d90ce071cf8..00000000000000 --- a/ports/opencv3/0004-add-missing-stdexcept-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/modules/cvv/src/util/observer_ptr.hpp b/modules/cvv/src/util/observer_ptr.hpp -index fef3fea..68d1a80 100644 ---- a/modules/cvv/src/util/observer_ptr.hpp -+++ b/modules/cvv/src/util/observer_ptr.hpp -@@ -11,6 +11,7 @@ - #include //size_t - #include // [u]intXX_t - #include // since some people like to forget that one -+#include - - namespace cvv - { diff --git a/ports/opencv3/0004-fix-eigen.patch b/ports/opencv3/0004-fix-eigen.patch new file mode 100644 index 00000000000000..ec8f6a489ca046 --- /dev/null +++ b/ports/opencv3/0004-fix-eigen.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake +index 3753084..0aeb31a 100644 +--- a/cmake/OpenCVFindLibsPerf.cmake ++++ b/cmake/OpenCVFindLibsPerf.cmake +@@ -55,7 +55,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) + OR NOT (CMAKE_VERSION VERSION_LESS "3.0.0") # Eigen3Targets.cmake required CMake 3.0.0+ + ) AND NOT OPENCV_SKIP_EIGEN_FIND_PACKAGE_CONFIG + ) +- find_package(Eigen3 CONFIG QUIET) # Ceres 2.0.0 CMake scripts doesn't work with CMake's FindEigen3.cmake module (due to missing EIGEN3_VERSION_STRING) ++ find_package(Eigen3 CONFIG REQUIRED) # Ceres 2.0.0 CMake scripts doesn't work with CMake's FindEigen3.cmake module (due to missing EIGEN3_VERSION_STRING) + endif() + if(NOT Eigen3_FOUND) + find_package(Eigen3 QUIET) diff --git a/ports/opencv3/0009-fix-uwp.patch b/ports/opencv3/0006-fix-uwp.patch similarity index 85% rename from ports/opencv3/0009-fix-uwp.patch rename to ports/opencv3/0006-fix-uwp.patch index 9968d869170e53..551372950bd6ab 100644 --- a/ports/opencv3/0009-fix-uwp.patch +++ b/ports/opencv3/0006-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index 10ee406..73f4af2 100644 +index efb6ca8..8ca8609 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake -@@ -1183,7 +1183,7 @@ function(ocv_add_perf_tests) +@@ -1184,7 +1184,7 @@ function(ocv_add_perf_tests) set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") endif() diff --git a/ports/opencv3/0007-fix-hdf5.patch b/ports/opencv3/0007-fix-hdf5.patch new file mode 100644 index 00000000000000..de81c79b2cee4e --- /dev/null +++ b/ports/opencv3/0007-fix-hdf5.patch @@ -0,0 +1,30 @@ +diff --git a/modules/hdf/CMakeLists.txt b/modules/hdf/CMakeLists.txt +index 2a1ae68..e40a192 100644 +--- a/modules/hdf/CMakeLists.txt ++++ b/modules/hdf/CMakeLists.txt +@@ -1,25 +1,8 @@ + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}) + +-if(WIN32) +- # windows cmake internal lookups are broken for now +- # will lookup for headers and shared libs given HDF_DIR env +- find_path(HDF5_INCLUDE_DIRS hdf5.h HINTS "$ENV{HDF5_DIR}\\..\\include") +- find_library(HDF5_C_LIBRARY NAMES hdf5 HINTS "$ENV{HDF5_DIR}\\..\\lib") +- if(HDF5_INCLUDE_DIRS AND HDF5_C_LIBRARY) +- set(HDF5_FOUND "YES") +- set(HDF5_LIBRARIES ${HDF5_C_LIBRARY}) +- mark_as_advanced(HDF5_LIBRARIES) +- mark_as_advanced(HDF5_C_LIBRARY) +- mark_as_advanced(HDF5_INCLUDE_DIRS) +- add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB -D_HDF5USEDLL_) +- else() +- set(HDF5_FOUND "NO") +- endif() +-else() + if(NOT CMAKE_CROSSCOMPILING) # iOS build should not reuse OSX package + find_package(HDF5) + endif() +-endif() + + if(NOT HDF5_FOUND) + ocv_module_disable(hdf) # no return diff --git a/ports/opencv3/0010-devendor-quirc.patch b/ports/opencv3/0008-devendor-quirc.patch similarity index 90% rename from ports/opencv3/0010-devendor-quirc.patch rename to ports/opencv3/0008-devendor-quirc.patch index 1d2d7ccb7de45c..b77b1780e8d979 100644 --- a/ports/opencv3/0010-devendor-quirc.patch +++ b/ports/opencv3/0008-devendor-quirc.patch @@ -1,26 +1,26 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 15eb053..58a9585 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -766,7 +766,7 @@ if(WITH_OPENVX) - endif() - - if(WITH_QUIRC) -- add_subdirectory(3rdparty/quirc) -+ find_package(quirc CONFIG REQUIRED) - set(HAVE_QUIRC TRUE) - endif() - # ---------------------------------------------------------------------------- -diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt -index 414e578..4f26d75 100644 ---- a/modules/objdetect/CMakeLists.txt -+++ b/modules/objdetect/CMakeLists.txt -@@ -2,7 +2,5 @@ set(the_description "Object Detection") - ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java python js) - - if(HAVE_QUIRC) -- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) -- ocv_include_directories(${QUIRC_INCLUDE}) -- ocv_target_link_libraries(${the_module} quirc) -+ ocv_target_link_libraries(${the_module} quirc::quirc) - endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5810b0c..04315e3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -771,7 +771,7 @@ if(WITH_OPENVX) + endif() + + if(WITH_QUIRC) +- add_subdirectory(3rdparty/quirc) ++ find_package(quirc CONFIG REQUIRED) + set(HAVE_QUIRC TRUE) + endif() + # ---------------------------------------------------------------------------- +diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt +index 414e578..4f26d75 100644 +--- a/modules/objdetect/CMakeLists.txt ++++ b/modules/objdetect/CMakeLists.txt +@@ -2,7 +2,5 @@ set(the_description "Object Detection") + ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java python js) + + if(HAVE_QUIRC) +- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) +- ocv_include_directories(${QUIRC_INCLUDE}) +- ocv_target_link_libraries(${the_module} quirc) ++ ocv_target_link_libraries(${the_module} quirc::quirc) + endif() diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 4345a1c2fd603d..8b62f7ddc47f1c 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -6,21 +6,22 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4") message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4") endif() -set(OPENCV_VERSION "3.4.12") +set(OPENCV_VERSION "3.4.13") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 e69ff4869a8128b7d2a0537d198ec7f287fb821a8965df26339bec662da1888860941f50a269db7693309b9861f986c219288bb5856de76a6c7bc4c0a7026bee + SHA512 ec87b10534b9187c5ac2eea498c05c73bceab08afaed93b5a117ed34d1eeeb0ffc45901642bebf8f55126fd49ec78d731fc61debe6b40d8642f1323b5dbbeacf HEAD_REF master PATCHES 0001-disable-downloading.patch 0002-install-options.patch 0003-force-package-requirements.patch + 0004-fix-eigen.patch 0005-fix-vtk9.patch - 0009-fix-uwp.patch - 0010-devendor-quirc.patch + 0006-fix-uwp.patch + 0008-devendor-quirc.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -113,10 +114,10 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 0191b1d49d5a50195ed94951c570da03dc33677b682e61a65b34d40f355c36a58441034730ea7eca78dcb4af4c821983754250f93fdf3adb2b4a20e71806eb03 + SHA512 49f0aed8e07a443f354859a16c8de5ceae26560f141721ae4beb0d5fcc5b24b755ee313519e159b1a5b6ba125dcca8584f2a515e0ac96a8c9c36bb11ac6b3375 HEAD_REF master PATCHES - 0004-add-missing-stdexcept-include.patch + 0007-fix-hdf5.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index c977a01329a7f1..42041c4c12ca73 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv3", - "version": "3.4.12", - "port-version": 1, + "version": "3.4.13", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ @@ -11,6 +10,7 @@ "dnn", "jpeg", "png", + "quirc", "tiff", "webp" ], diff --git a/ports/opencv4/0002-install-options.patch b/ports/opencv4/0002-install-options.patch index 533dd8354e4db5..055719ca452230 100644 --- a/ports/opencv4/0002-install-options.patch +++ b/ports/opencv4/0002-install-options.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4350b2f..89521b1 100644 +index 45fc6de..9cd2b4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -603,7 +603,7 @@ endif() +@@ -607,7 +607,7 @@ endif() ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) # --- Python Support --- @@ -12,10 +12,10 @@ index 4350b2f..89521b1 100644 endif() diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 080c78c..616ce64 100644 +index 5e3c056..19f5795 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake -@@ -265,7 +265,6 @@ if(MSVC) +@@ -264,7 +264,6 @@ if(MSVC) #endif() if(BUILD_WITH_DEBUG_INFO) diff --git a/ports/opencv4/0003-force-package-requirements.patch b/ports/opencv4/0003-force-package-requirements.patch index c28dd5d9fe89b4..cfbd8feb61400f 100644 --- a/ports/opencv4/0003-force-package-requirements.patch +++ b/ports/opencv4/0003-force-package-requirements.patch @@ -1,44 +1,53 @@ diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index 22e20b6..5d1431c 100644 +index 2e4e4af..8cd9c75 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake -@@ -6,7 +6,7 @@ - if(BUILD_ZLIB) +@@ -7,7 +7,7 @@ if(BUILD_ZLIB) ocv_clear_vars(ZLIB_FOUND) else() + ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) - find_package(ZLIB "${MIN_VER_ZLIB}") + find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) if(ZLIB_FOUND AND ANDROID) if(ZLIB_LIBRARIES MATCHES "/usr/(lib|lib32|lib64)/libz.so$") set(ZLIB_LIBRARIES z) -@@ -30,7 +30,7 @@ if(WITH_JPEG) - if(BUILD_JPEG) +@@ -33,7 +33,7 @@ if(WITH_JPEG) ocv_clear_vars(JPEG_FOUND) else() + ocv_clear_internal_cache_vars(JPEG_LIBRARY JPEG_INCLUDE_DIR) - include(FindJPEG) + find_package(JPEG REQUIRED) endif() if(NOT JPEG_FOUND) -@@ -74,7 +74,7 @@ if(WITH_TIFF) - if(BUILD_TIFF) +@@ -79,7 +79,7 @@ if(WITH_TIFF) ocv_clear_vars(TIFF_FOUND) else() + ocv_clear_internal_cache_vars(TIFF_LIBRARY TIFF_INCLUDE_DIR) - include(FindTIFF) + find_package(TIFF REQUIRED) if(TIFF_FOUND) ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION) endif() -@@ -117,7 +117,7 @@ if(WITH_WEBP) - if(BUILD_WEBP) +@@ -123,7 +123,7 @@ if(WITH_WEBP) ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR) else() + ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR) - include(cmake/OpenCVFindWebP.cmake) + find_package(WebP REQUIRED) if(WEBP_FOUND) set(HAVE_WEBP 1) endif() -@@ -186,7 +186,7 @@ if(WITH_JASPER AND NOT HAVE_OPENJPEG) +@@ -164,7 +164,7 @@ if(WITH_OPENJPEG) + if(BUILD_OPENJPEG) + ocv_clear_vars(OpenJPEG_FOUND) + else() +- find_package(OpenJPEG QUIET) ++ find_package(OpenJPEG REQUIRED) + endif() + + if(NOT OpenJPEG_FOUND OR OPENJPEG_MAJOR_VERSION LESS 2) +@@ -192,7 +192,7 @@ if(WITH_JASPER AND NOT HAVE_OPENJPEG) if(BUILD_JASPER) ocv_clear_vars(JASPER_FOUND) else() @@ -47,75 +56,39 @@ index 22e20b6..5d1431c 100644 endif() if(NOT JASPER_FOUND) -@@ -210,7 +210,7 @@ if(WITH_PNG) - if(BUILD_PNG) +@@ -217,7 +217,7 @@ if(WITH_PNG) ocv_clear_vars(PNG_FOUND) else() + ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR) - include(FindPNG) + find_package(PNG REQUIRED) if(PNG_FOUND) include(CheckIncludeFile) check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -@@ -241,7 +241,7 @@ endif() - if(WITH_OPENEXR) +@@ -249,7 +249,7 @@ if(WITH_OPENEXR) ocv_clear_vars(HAVE_OPENEXR) if(NOT BUILD_OPENEXR) + ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) - include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") + find_package(OpenEXR REQUIRED) endif() if(OPENEXR_FOUND) -@@ -259,7 +259,7 @@ endif() +@@ -267,7 +267,7 @@ endif() # --- GDAL (optional) --- if(WITH_GDAL) - find_package(GDAL QUIET) -+ find_package(GDAL REQUIRED) ++ find_package(GDAL REQUIRED) if(NOT GDAL_FOUND) set(HAVE_GDAL NO) -@@ -271,7 +271,7 @@ if(WITH_GDAL) +@@ -279,7 +279,7 @@ if(WITH_GDAL) endif() - if (WITH_GDCM) + if(WITH_GDCM) - find_package(GDCM QUIET) + find_package(GDCM REQUIRED) if(NOT GDCM_FOUND) set(HAVE_GDCM NO) ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES) -diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake -index b9b1a95..596c152 100644 ---- a/cmake/OpenCVFindLibsPerf.cmake -+++ b/cmake/OpenCVFindLibsPerf.cmake -@@ -51,14 +51,9 @@ endif(WITH_CUDA) - - # --- Eigen --- - if(WITH_EIGEN AND NOT HAVE_EIGEN) -- find_package(Eigen3 QUIET) -+ find_package(Eigen3 REQUIRED) - - if(Eigen3_FOUND) -- if(TARGET Eigen3::Eigen) -- # Use Eigen3 imported target if possible -- list(APPEND OPENCV_LINKER_LIBS Eigen3::Eigen) -- set(HAVE_EIGEN 1) -- else() - if(DEFINED EIGEN3_INCLUDE_DIRS) - set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIRS}) - set(HAVE_EIGEN 1) -@@ -66,7 +61,6 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) - set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIR}) - set(HAVE_EIGEN 1) - endif() -- endif() - if(HAVE_EIGEN) - if(DEFINED EIGEN3_WORLD_VERSION) # CMake module - set(EIGEN_WORLD_VERSION ${EIGEN3_WORLD_VERSION}) -@@ -77,6 +71,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) - set(EIGEN_MAJOR_VERSION ${EIGEN3_VERSION_MINOR}) - set(EIGEN_MINOR_VERSION ${EIGEN3_VERSION_PATCH}) - endif() -+ ocv_include_directories(${EIGEN_INCLUDE_PATH}) - endif() - endif() - diff --git a/ports/opencv4/0004-fix-policy-CMP0057.patch b/ports/opencv4/0004-fix-policy-CMP0057.patch index 8bff4f88b7be1b..b0d8307fc29627 100644 --- a/ports/opencv4/0004-fix-policy-CMP0057.patch +++ b/ports/opencv4/0004-fix-policy-CMP0057.patch @@ -1,5 +1,5 @@ diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt -index 12ff992..afd56eb 100644 +index a31d969..fa779e4 100644 --- a/modules/videoio/CMakeLists.txt +++ b/modules/videoio/CMakeLists.txt @@ -1,3 +1,4 @@ diff --git a/ports/opencv4/0005-add-missing-stdexcept-include.patch b/ports/opencv4/0005-add-missing-stdexcept-include.patch deleted file mode 100644 index 2a7d90ce071cf8..00000000000000 --- a/ports/opencv4/0005-add-missing-stdexcept-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/modules/cvv/src/util/observer_ptr.hpp b/modules/cvv/src/util/observer_ptr.hpp -index fef3fea..68d1a80 100644 ---- a/modules/cvv/src/util/observer_ptr.hpp -+++ b/modules/cvv/src/util/observer_ptr.hpp -@@ -11,6 +11,7 @@ - #include //size_t - #include // [u]intXX_t - #include // since some people like to forget that one -+#include - - namespace cvv - { diff --git a/ports/opencv4/0005-fix-eigen.patch b/ports/opencv4/0005-fix-eigen.patch new file mode 100644 index 00000000000000..ec8f6a489ca046 --- /dev/null +++ b/ports/opencv4/0005-fix-eigen.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake +index 3753084..0aeb31a 100644 +--- a/cmake/OpenCVFindLibsPerf.cmake ++++ b/cmake/OpenCVFindLibsPerf.cmake +@@ -55,7 +55,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) + OR NOT (CMAKE_VERSION VERSION_LESS "3.0.0") # Eigen3Targets.cmake required CMake 3.0.0+ + ) AND NOT OPENCV_SKIP_EIGEN_FIND_PACKAGE_CONFIG + ) +- find_package(Eigen3 CONFIG QUIET) # Ceres 2.0.0 CMake scripts doesn't work with CMake's FindEigen3.cmake module (due to missing EIGEN3_VERSION_STRING) ++ find_package(Eigen3 CONFIG REQUIRED) # Ceres 2.0.0 CMake scripts doesn't work with CMake's FindEigen3.cmake module (due to missing EIGEN3_VERSION_STRING) + endif() + if(NOT Eigen3_FOUND) + find_package(Eigen3 QUIET) diff --git a/ports/opencv4/0006-fix-glog-abbreviated-severity.patch b/ports/opencv4/0006-fix-glog-abbreviated-severity.patch deleted file mode 100644 index aafe61b1a5eb98..00000000000000 --- a/ports/opencv4/0006-fix-glog-abbreviated-severity.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt -index 53a8d43..8809c88 100644 ---- a/modules/sfm/CMakeLists.txt -+++ b/modules/sfm/CMakeLists.txt -@@ -20,6 +20,7 @@ if((gflags_FOUND OR GFLAGS_FOUND OR GFLAGS_INCLUDE_DIRS) AND (glog_FOUND OR GLOG - ) - file(REMOVE "${_fname}") - message(STATUS "Checking SFM deps... ${SFM_DEPS_OK}") -+ add_definitions(-DGLOG_NO_ABBREVIATED_SEVERITIES) - else() - set(SFM_DEPS_OK FALSE) - endif() diff --git a/ports/opencv4/0009-fix-uwp.patch b/ports/opencv4/0006-fix-uwp.patch similarity index 85% rename from ports/opencv4/0009-fix-uwp.patch rename to ports/opencv4/0006-fix-uwp.patch index 9ace8e2147333e..19c6f8d92b28cd 100644 --- a/ports/opencv4/0009-fix-uwp.patch +++ b/ports/opencv4/0006-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index bd14aa2..58cd11e 100644 +index a548df3..1799e44 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake -@@ -1197,7 +1197,7 @@ function(ocv_add_perf_tests) +@@ -1198,7 +1198,7 @@ function(ocv_add_perf_tests) set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") endif() diff --git a/ports/opencv4/0007-fix-hdf5.patch b/ports/opencv4/0007-fix-hdf5.patch new file mode 100644 index 00000000000000..de81c79b2cee4e --- /dev/null +++ b/ports/opencv4/0007-fix-hdf5.patch @@ -0,0 +1,30 @@ +diff --git a/modules/hdf/CMakeLists.txt b/modules/hdf/CMakeLists.txt +index 2a1ae68..e40a192 100644 +--- a/modules/hdf/CMakeLists.txt ++++ b/modules/hdf/CMakeLists.txt +@@ -1,25 +1,8 @@ + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}) + +-if(WIN32) +- # windows cmake internal lookups are broken for now +- # will lookup for headers and shared libs given HDF_DIR env +- find_path(HDF5_INCLUDE_DIRS hdf5.h HINTS "$ENV{HDF5_DIR}\\..\\include") +- find_library(HDF5_C_LIBRARY NAMES hdf5 HINTS "$ENV{HDF5_DIR}\\..\\lib") +- if(HDF5_INCLUDE_DIRS AND HDF5_C_LIBRARY) +- set(HDF5_FOUND "YES") +- set(HDF5_LIBRARIES ${HDF5_C_LIBRARY}) +- mark_as_advanced(HDF5_LIBRARIES) +- mark_as_advanced(HDF5_C_LIBRARY) +- mark_as_advanced(HDF5_INCLUDE_DIRS) +- add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB -D_HDF5USEDLL_) +- else() +- set(HDF5_FOUND "NO") +- endif() +-else() + if(NOT CMAKE_CROSSCOMPILING) # iOS build should not reuse OSX package + find_package(HDF5) + endif() +-endif() + + if(NOT HDF5_FOUND) + ocv_module_disable(hdf) # no return diff --git a/ports/opencv4/0011-devendor-quirc.patch b/ports/opencv4/0008-devendor-quirc.patch similarity index 82% rename from ports/opencv4/0011-devendor-quirc.patch rename to ports/opencv4/0008-devendor-quirc.patch index a1f13849e9a58e..fc03838b28c7c6 100644 --- a/ports/opencv4/0011-devendor-quirc.patch +++ b/ports/opencv4/0008-devendor-quirc.patch @@ -1,26 +1,26 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 89521b1..5ff0f01 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -772,7 +772,7 @@ if(WITH_OPENVX) - endif() - - if(WITH_QUIRC) -- add_subdirectory(3rdparty/quirc) -+ find_package(quirc CONFIG REQUIRED) - set(HAVE_QUIRC TRUE) - endif() - # ---------------------------------------------------------------------------- -diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt -index 3fa0c5d..f4c0ad6 100644 ---- a/modules/objdetect/CMakeLists.txt -+++ b/modules/objdetect/CMakeLists.txt -@@ -2,7 +2,5 @@ set(the_description "Object Detection") - ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java objc python js) - - if(HAVE_QUIRC) -- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) -- ocv_include_directories(${QUIRC_INCLUDE}) -- ocv_target_link_libraries(${the_module} quirc) -+ ocv_target_link_libraries(${the_module} quirc::quirc) - endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9cd2b4e..b34f20e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -776,7 +776,7 @@ if(WITH_OPENVX) + endif() + + if(WITH_QUIRC) +- add_subdirectory(3rdparty/quirc) ++ find_package(quirc CONFIG REQUIRED) + set(HAVE_QUIRC TRUE) + endif() + +diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt +index 3fa0c5d..f4c0ad6 100644 +--- a/modules/objdetect/CMakeLists.txt ++++ b/modules/objdetect/CMakeLists.txt +@@ -2,7 +2,5 @@ set(the_description "Object Detection") + ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java objc python js) + + if(HAVE_QUIRC) +- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) +- ocv_include_directories(${QUIRC_INCLUDE}) +- ocv_target_link_libraries(${the_module} quirc) ++ ocv_target_link_libraries(${the_module} quirc::quirc) + endif() diff --git a/ports/opencv4/0010-fix-interface_link_libraries.patch b/ports/opencv4/0010-fix-interface_link_libraries.patch deleted file mode 100644 index 64751831309a51..00000000000000 --- a/ports/opencv4/0010-fix-interface_link_libraries.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/modules/videoio/cmake/init.cmake b/modules/videoio/cmake/init.cmake -index 1efef12..81d5d9f 100644 ---- a/modules/videoio/cmake/init.cmake -+++ b/modules/videoio/cmake/init.cmake -@@ -12,8 +12,16 @@ function(ocv_add_external_target name inc link def) - set_target_properties(ocv.3rdparty.${name} PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${inc}" - INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${inc}" -- INTERFACE_LINK_LIBRARIES "${link}" - INTERFACE_COMPILE_DEFINITIONS "${def}") -+ # When cmake version is greater than or equal to 3.11, INTERFACE_LINK_LIBRARIES no longer applies to interface library -+ # See https://github.com/opencv/opencv/pull/18658 -+ if (CMAKE_VERSION VERSION_LESS 3.11) -+ set_target_properties(ocv.3rdparty.${name} PROPERTIES -+ INTERFACE_LINK_LIBRARIES "${link}") -+ else() -+ target_link_libraries(ocv.3rdparty.${name} INTERFACE ${link}) -+ endif() -+ # - if(NOT BUILD_SHARED_LIBS) - install(TARGETS ocv.3rdparty.${name} EXPORT OpenCVModules) - endif() diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index cc7d4d579ea8c7..33982df0e0b4c4 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -6,22 +6,22 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3") message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3") endif() -set(OPENCV_VERSION "4.5.0") +set(OPENCV_VERSION "4.5.1") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 c34100f3f3fe45f2115975350d23288a3badb32864ba0cbd32512387416d1cf10d16d3ef5f3d089d6a1c2be587d788d33997513fc015dbf7d774a622f2d3811f + SHA512 d74ae3bc340639cbc8b5db41a1fec710acabf8ec828dd28ce3bacf7029d1afd23aeaf47a2273a42995de285daa8aef33a7f90d5c57ef096e2cb872e0845e92b0 HEAD_REF master PATCHES 0001-disable-downloading.patch 0002-install-options.patch 0003-force-package-requirements.patch 0004-fix-policy-CMP0057.patch - 0009-fix-uwp.patch - 0010-fix-interface_link_libraries.patch # Remove this patch when the next update - 0011-devendor-quirc.patch + 0005-fix-eigen.patch + 0006-fix-uwp.patch + 0008-devendor-quirc.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -138,11 +138,10 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 b2ae72e920c78472fd677281b8dd6f25872399d8ade97b0d3b0fc50bbabea8c00ea849d87bfb311ac148cef663481d0c89c0f6875578c052c1cc7ddcd70e6e17 + SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7 HEAD_REF master PATCHES - 0005-add-missing-stdexcept-include.patch - 0006-fix-glog-abbreviated-severity.patch + 0007-fix-hdf5.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -445,7 +444,7 @@ find_dependency(Tesseract)") string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)") endif() if("quirc" IN_LIST FEATURES) - string(APPEND DEPS_STRING "\nfind_dependency(quirc CONFIG)") + string(APPEND DEPS_STRING "\nfind_dependency(quirc)") endif() if("qt" IN_LIST FEATURES) string(APPEND DEPS_STRING " diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index dc64f6c4dba966..71513f260dc027 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv4", - "version": "4.5.0", - "port-version": 1, + "version": "4.5.1", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/ports/openmvg/CONTROL b/ports/openmvg/CONTROL index 69d67357934fa3..b28081c6056b57 100644 --- a/ports/openmvg/CONTROL +++ b/ports/openmvg/CONTROL @@ -1,5 +1,6 @@ Source: openmvg Version: 1.6 +Port-Version: 1 Description: open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion. Build-Depends: coinutils, clp, osi, liblemon, flann, eigen3, ceres[suitesparse,cxsparse], cereal, libjpeg-turbo, tiff, libpng, zlib, vlfeat diff --git a/ports/openmvg/build_fixes.patch b/ports/openmvg/build_fixes.patch index fff8846d28e9e2..d87161e674a4a9 100644 --- a/ports/openmvg/build_fixes.patch +++ b/ports/openmvg/build_fixes.patch @@ -525,10 +525,10 @@ index 5fcd972..b21ea7b 100644 endif() set_target_properties(openMVG_matching PROPERTIES SOVERSION ${OPENMVG_VERSION_MAJOR} VERSION "${OPENMVG_VERSION_MAJOR}.${OPENMVG_VERSION_MINOR}") diff --git a/src/openMVG/numeric/CMakeLists.txt b/src/openMVG/numeric/CMakeLists.txt -index 06baee7..47255be 100644 +index 1f3fc30..4097320 100644 --- a/src/openMVG/numeric/CMakeLists.txt +++ b/src/openMVG/numeric/CMakeLists.txt -@@ -24,7 +24,7 @@ target_include_directories(openMVG_numeric +@@ -26,7 +26,7 @@ target_include_directories(openMVG_numeric $ $ ) @@ -649,6 +649,19 @@ index 9a5a482..e804a19 100644 pRecons.wait() - - +diff --git a/src/software/SfM/main_ComputeFeatures_OpenCV.cpp b/src/software/SfM/main_ComputeFeatures_OpenCV.cpp +index 9cc46af..f8bd892 100644 +--- a/src/software/SfM/main_ComputeFeatures_OpenCV.cpp ++++ b/src/software/SfM/main_ComputeFeatures_OpenCV.cpp +@@ -208,7 +208,7 @@ public: + // Create a SIFT detector + std::vector< cv::KeyPoint > v_keypoints; + cv::Mat m_desc; +- cv::Ptr siftdetector = cv::xfeatures2d::SIFT::create(); ++ cv::Ptr siftdetector = cv::SIFT::create(); + + // Process SIFT computation + siftdetector->detectAndCompute(img, m_mask, v_keypoints, m_desc); diff --git a/src/software/SfM/tutorial_demo.py.in b/src/software/SfM/tutorial_demo.py.in index 259e24e..1097062 100644 --- a/src/software/SfM/tutorial_demo.py.in @@ -682,7 +695,7 @@ index aa7dffe..2c4d237 100644 m_detector->detect(current_img, m_nextKeypoints); diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt -index 816a941..f0b7145 100644 +index b71dfab..ad98e51 100644 --- a/src/third_party/CMakeLists.txt +++ b/src/third_party/CMakeLists.txt @@ -18,7 +18,7 @@ add_subdirectory(stlplus3) diff --git a/versions/baseline.json b/versions/baseline.json index 31bcaa0136e78d..f3a0bff9f58f19 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4233,7 +4233,7 @@ "port-version": 0 }, "opencv": { - "baseline": "4.5.0", + "baseline": "4.5.1", "port-version": 0 }, "opencv2": { @@ -4241,12 +4241,12 @@ "port-version": 5 }, "opencv3": { - "baseline": "3.4.12", - "port-version": 1 + "baseline": "3.4.13", + "port-version": 0 }, "opencv4": { - "baseline": "4.5.0", - "port-version": 1 + "baseline": "4.5.1", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.0", @@ -4290,7 +4290,7 @@ }, "openmvg": { "baseline": "1.6", - "port-version": 0 + "port-version": 1 }, "openmvs": { "baseline": "1.1", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index a428c254d47ff6..94d54725048ec0 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5095d4c281b1fa2afc8398bfc61a88dc1e96e7e6", + "version": "4.5.1", + "port-version": 0 + }, { "git-tree": "457db123c6f787763d2bbe056e51caecd8c37464", "version": "4.5.0", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index b04a8ae268eebd..9667226d7e312c 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "ffd8270ed4798f25f3bd882a6089c72e86803466", + "git-tree": "4b65e217d97307583039d4324cd32488347cc344", + "version": "3.4.13", + "port-version": 0 + }, + { + "git-tree": "859d6618f0ff394cc940ede79ada4bff1b7655dc", "version": "3.4.12", "port-version": 1 }, diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index f6e5d8fe898e85..631be40cf43400 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "a0522dbbb44877b9d4618bfe31a376e07e49bc72", + "git-tree": "ba505df8f61764e9b4667b04958c748237d12d23", + "version": "4.5.1", + "port-version": 0 + }, + { + "git-tree": "ba164060f8a9e69ccc4c484a24b5e8085d20b3bd", "version": "4.5.0", "port-version": 1 }, diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json index 57b9407507d8ea..8628d35ee34f0f 100644 --- a/versions/o-/openmvg.json +++ b/versions/o-/openmvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77b221e020b37ab1119a01536d5b4fe6836af4fd", + "version-string": "1.6", + "port-version": 1 + }, { "git-tree": "0bc383c92d6341f46ad2250f956d0731e617d9ee", "version-string": "1.6", From 6970323a11973bddb330fab239d73dee176be118 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 29 Jan 2021 04:24:25 +0100 Subject: [PATCH 0612/1694] [ace] Update to 7.0.0 (#15862) * [ace] 7.0.0 * [ace] 7.0.0 versions * Update portfile.cmake * Update ace.json --- ports/ace/CONTROL | 4 ++-- ports/ace/portfile.cmake | 16 ++++++++-------- versions/a-/ace.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index f0d1c132175b56..4d59260e056db0 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,8 +1,8 @@ Source: ace -Version: 6.5.12 +Version: 7.0.0 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html Description: The ADAPTIVE Communication Environment -Port-Version: 1 +Port-Version: 0 Feature: wchar Description: Enable extra wide char functions in ACE diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 399f5c7882cf9d..bed80493ea66f3 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -1,7 +1,7 @@ # Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter" # when invoking `prj_install.pl`. # So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it. -set(ACE_VERSION 6.5.12) +set(ACE_VERSION 7.0.0) string(REPLACE "." "_" ACE_VERSION_DIRECTORY ${ACE_VERSION}) if("tao" IN_LIST FEATURES) @@ -10,14 +10,14 @@ if("tao" IN_LIST FEATURES) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.zip" FILENAME ACE-TAO-${ACE_VERSION}.zip - SHA512 6b6ad7c98fed19b03449cc93148dc66abbaab5c6cdc893f9fdc9b74e899dba1e2e969e791326a7869ad06f8ffbf9cbbee66a75170bee6ac386e6795eb4f713e3 + SHA512 9b99a07bfc80d616843b2a6f8f9a0fc0868fefcb98a1f57f04cc624f39ad9162043bb29d886eda2162143a321b434b8496717b005fa314acbc5403a37a965df6 ) else() # VCPKG_TARGET_IS_LINUX vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.tar.gz" FILENAME ACE-TAO-${ACE_VERSION}.tar.gz - SHA512 6cb3b87ee5e421b77dc8479c9572c8bd1d110bee504a346094d122f7acdfba29708b6fdb44e4d611620214ecb74d375444988f34a0e807c5853755d32b3c2e7d + SHA512 731896ae9939702b70d293ced64aae1030ddf7545fba926c99b495a43e37aaacc9c9d91f6aadef0153c128704ba7c8545d9b81f9fa0f58de4939e3be4eab1103 ) endif() else() @@ -26,14 +26,14 @@ else() vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.zip" FILENAME ACE-src-${ACE_VERSION}.zip - SHA512 f2b8bc68531af673fb15f72d15fc9cdb1f9c44d21aa6aef473b06461b4a7d8c882368e8a93e5da6a8f7d856b88f3f1199a2bc4185ccb67b269e68f1346bc6b3a + SHA512 6b2ddaabaa737bd13d8541d1458ea2f73cbee558f7a294a16078d68e0f294dc09310661ec23ba3077528dfe7340f7040cccc4bd7082025d7b4f3be52d6718769 ) else(VCPKG_TARGET_IS_WINDOWS) # VCPKG_TARGET_IS_LINUX vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.tar.gz" FILENAME ACE-src-${ACE_VERSION}.tar.gz - SHA512 8dcdf5ff69908840ab527533c500dde2902f59c62aaddcec21f8767afe59d0277e57f03ab359755977e99e9b1f2e158636024b806e25a6874be2ac31e31f72e8 + SHA512 91541eac3c7246e5620ee805c297b80406f2e27e06338f142e40633ec74ef5e18e65164c66225bb8606314b63d6b197c6122927f4300bef4bb88010e8b5571b1 ) endif() endif() @@ -104,7 +104,7 @@ elseif(VCPKG_TARGET_IS_LINUX) elseif(VCPKG_TARGET_IS_OSX) set(SOLUTION_TYPE gnuace) file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-macosx.h\"") - file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU") + file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "c++11=1\ninclude $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU") endif() if(VCPKG_TARGET_IS_UWP) @@ -147,7 +147,7 @@ if(VCPKG_TARGET_IS_WINDOWS) DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}) endforeach() endfunction() - + get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) set(SOURCE_COPY_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}) @@ -272,7 +272,7 @@ if(VCPKG_TARGET_IS_WINDOWS) ${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd_dll.pdb) endif() endif() - + vcpkg_clean_msbuild() elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) FIND_PROGRAM(MAKE make) diff --git a/versions/a-/ace.json b/versions/a-/ace.json index 6089ae49226fe8..cc4691de49f0ea 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fefdf115c09a6996c55262dd9a635647dc7d8440", + "version-string": "7.0.0", + "port-version": 0 + }, { "git-tree": "8b23f37d4b1c965115ae6fbe79686605997fe659", "version-string": "6.5.12", diff --git a/versions/baseline.json b/versions/baseline.json index f3a0bff9f58f19..4e1fa0ebb5dfd2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -17,8 +17,8 @@ "port-version": 0 }, "ace": { - "baseline": "6.5.12", - "port-version": 1 + "baseline": "7.0.0", + "port-version": 0 }, "activemq-cpp": { "baseline": "3.9.5-3", From c7298f5ea1deea0f26dcdfdbc4feba6bbe800e71 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 29 Jan 2021 11:26:11 +0800 Subject: [PATCH 0613/1694] [libgeotiff] Fix packagename via find_package (#15750) * [libgeotiff] Fix packagename via find_package * Update port_versions * Update portfile.cmake * Update patch * [libgeotiff] Fix packagename via find_package * Update port_versions * Update patch * [pdal] Fix geotiff package name * Update versions * [pdal] Update dependency * Update versions/p-/pdal.json --- ports/libgeotiff/CONTROL | 1 + ports/libgeotiff/cmakelists.patch | 2 +- ports/libgeotiff/fix-config-version.patch | 21 +++++++++++++++++++++ ports/libgeotiff/portfile.cmake | 5 +++-- ports/liblas/CONTROL | 2 +- ports/liblas/fix-geotiff.patch | 2 +- ports/pdal/CONTROL | 2 +- ports/pdal/fix-dependency.patch | 2 +- ports/pdal/geotiff.patch | 15 +++++++++++++++ ports/pdal/portfile.cmake | 9 ++------- versions/baseline.json | 6 +++--- versions/l-/libgeotiff.json | 5 +++++ versions/l-/liblas.json | 5 +++++ versions/p-/pdal.json | 5 +++++ 14 files changed, 65 insertions(+), 17 deletions(-) create mode 100644 ports/libgeotiff/fix-config-version.patch create mode 100644 ports/pdal/geotiff.patch diff --git a/ports/libgeotiff/CONTROL b/ports/libgeotiff/CONTROL index c91671eddd4401..c51eb962e8d54a 100644 --- a/ports/libgeotiff/CONTROL +++ b/ports/libgeotiff/CONTROL @@ -1,5 +1,6 @@ Source: libgeotiff Version: 1.6.0 +Port-Version: 1 Homepage: https://github.com/OSGeo/libgeotiff Description: Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags. Build-Depends: tiff, proj4, zlib, libjpeg-turbo diff --git a/ports/libgeotiff/cmakelists.patch b/ports/libgeotiff/cmakelists.patch index 64c09bf66f6bee..169ca0bc8dc930 100644 --- a/ports/libgeotiff/cmakelists.patch +++ b/ports/libgeotiff/cmakelists.patch @@ -75,7 +75,7 @@ index 47a2b00..3809ba3 100644 set (PROJECT_ROOT_DIR "..") endif () +else() -+ set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME}") ++ set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME_LOWER}") + set (PROJECT_ROOT_DIR "../..") +endif() diff --git a/ports/libgeotiff/fix-config-version.patch b/ports/libgeotiff/fix-config-version.patch new file mode 100644 index 00000000000000..173f483d176e64 --- /dev/null +++ b/ports/libgeotiff/fix-config-version.patch @@ -0,0 +1,21 @@ +diff --git a/libgeotiff/cmake/project-config-version.cmake.in b/libgeotiff/cmake/project-config-version.cmake.in +index d695aa2..efe32ba 100644 +--- a/libgeotiff/cmake/project-config-version.cmake.in ++++ b/libgeotiff/cmake/project-config-version.cmake.in +@@ -5,14 +5,14 @@ set (PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@") + set (PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@") + set (PACKAGE_VERSION_PATCH "@PROJECT_VERSION_PATCH@") + +-if (NOT PACKAGE_FIND_NAME STREQUAL "@PROJECT_NAME@") ++if (NOT PACKAGE_FIND_NAME STREQUAL "@PROJECT_NAME_LOWER@") + # Check package name (in particular, because of the way cmake finds + # package config files, the capitalization could easily be "wrong"). + # This is necessary to ensure that the automatically generated + # variables, e.g., _FOUND, are consistently spelled. Make + # this a WARNING, because this is a user error that needs to be fixed. + message (WARNING +- "Mismatched package names: use find_package(@PROJECT_NAME@ ...) instead" ++ "Mismatched package names: use find_package(@PROJECT_NAME_LOWER@ ...) instead" + " of find_package(${PACKAGE_FIND_NAME} ...)") + set (PACKAGE_VERSION_UNSUITABLE TRUE) + elseif (NOT (APPLE OR CMAKE_SIZEOF_VOID_P EQUAL @CMAKE_SIZEOF_VOID_P@)) diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake index b9eb519e3bcad4..952ce8fe928cce 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( geotiff-config.patch fix-proj4.patch fix-staticbuild.patch + fix-config-version.patch ) set(SOURCE_PATH ${SOURCE_PATH}/libgeotiff) @@ -32,10 +33,10 @@ vcpkg_install_cmake() vcpkg_copy_tools(TOOL_NAMES applygeo geotifcp listgeo makegeo AUTO_CLEAN) vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/GeoTIFF TARGET_PATH share/GeoTIFF) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/geotiff TARGET_PATH share/geotiff) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/GeoTIFF/geotiff-config.cmake "if (GeoTIFF_USE_STATIC_LIBS)" "if (1)") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/geotiff/geotiff-config.cmake "if (GeoTIFF_USE_STATIC_LIBS)" "if (1)") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) endif() diff --git a/ports/liblas/CONTROL b/ports/liblas/CONTROL index f6ca886cf00372..91735159fc6e17 100644 --- a/ports/liblas/CONTROL +++ b/ports/liblas/CONTROL @@ -1,6 +1,6 @@ Source: liblas Version: 1.8.1 -Port-Version: 5 +Port-Version: 6 Build-Depends: boost, boost-thread, boost-system, boost-iostreams, boost-filesystem, boost-detail, libgeotiff Description: A C/C++ library for reading and writing the very common LAS LiDAR format. diff --git a/ports/liblas/fix-geotiff.patch b/ports/liblas/fix-geotiff.patch index e812c3d91f44f1..360aec7ef44a99 100644 --- a/ports/liblas/fix-geotiff.patch +++ b/ports/liblas/fix-geotiff.patch @@ -7,7 +7,7 @@ index d246a88..d0bba6f 100644 set(WITH_GEOTIFF TRUE CACHE BOOL "Choose if GeoTIFF support should be built") -find_package (GeoTIFF 1.3.0 ) -+find_package (GeoTIFF CONFIG 1.3.0 ) ++find_package (geotiff CONFIG REQUIRED) if(GEOTIFF_FOUND) set(WITH_GEOTIFF TRUE) # Confirm required API is available diff --git a/ports/pdal/CONTROL b/ports/pdal/CONTROL index 9098db285dd4e0..99643803d3173b 100644 --- a/ports/pdal/CONTROL +++ b/ports/pdal/CONTROL @@ -1,5 +1,5 @@ Source: pdal Version: 1.7.1 -Port-Version: 10 +Port-Version: 11 Description: PDAL - Point Data Abstraction Library is a library for manipulating point cloud data. Build-Depends: gdal, geos, jsoncpp, libgeotiff, laszip, boost-system, boost-filesystem diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index 352eb1d43f1b17..ea2bcf8f844bd9 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -53,7 +53,7 @@ index a03ef14..9d073e6 100644 endforeach(_dir) +include(CMakeFindDependencyMacro) -+find_dependency(GeoTIFF) ++find_dependency(geotiff) +find_dependency(CURL) +find_dependency(Boost COMPONENTS system filesystem) +find_dependency(geos CONFIG) diff --git a/ports/pdal/geotiff.patch b/ports/pdal/geotiff.patch new file mode 100644 index 00000000000000..00e376583d34b0 --- /dev/null +++ b/ports/pdal/geotiff.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/geotiff.cmake b/cmake/geotiff.cmake +index 1d1e8af..ec077bc 100644 +--- a/cmake/geotiff.cmake ++++ b/cmake/geotiff.cmake +@@ -2,8 +2,8 @@ + # GeoTIFF support + # + +-find_package(GeoTIFF REQUIRED 1.3.0) +-set_package_properties(GeoTIFF PROPERTIES TYPE REQUIRED) ++find_package(geotiff REQUIRED 1.3.0) ++set_package_properties(geotiff PROPERTIES TYPE REQUIRED) + if (GEOTIFF_FOUND) + include_directories("${GEOTIFF_INCLUDE_DIR}") + set(PDAL_HAVE_LIBGEOTIFF 1) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 8099bed6f92ec3..18d27a4c4b1cd2 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_extract_source_archive_ex( libpq.patch fix-CPL_DLL.patch 0004-fix-const-overloaded.patch + geotiff.patch ) file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") @@ -32,13 +33,7 @@ foreach(_module IN ITEMS FindGEOS) # Overwritten Modules. ) endforeach() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(VCPKG_BUILD_SHARED_LIBS ON) - set(VCPKG_BUILD_STATIC_LIBS OFF) -else() - set(VCPKG_BUILD_SHARED_LIBS OFF) - set(VCPKG_BUILD_STATIC_LIBS ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" VCPKG_BUILD_STATIC_LIBS) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/versions/baseline.json b/versions/baseline.json index 4e1fa0ebb5dfd2..584a3a0c1de000 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2966,7 +2966,7 @@ }, "libgeotiff": { "baseline": "1.6.0", - "port-version": 0 + "port-version": 1 }, "libgit2": { "baseline": "1.1.0", @@ -3062,7 +3062,7 @@ }, "liblas": { "baseline": "1.8.1", - "port-version": 5 + "port-version": 6 }, "liblbfgs": { "baseline": "1.10", @@ -4474,7 +4474,7 @@ }, "pdal": { "baseline": "1.7.1", - "port-version": 10 + "port-version": 11 }, "pdal-c": { "baseline": "1.8-2", diff --git a/versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json index 0876dcc9a40c9b..f132e503316a4e 100644 --- a/versions/l-/libgeotiff.json +++ b/versions/l-/libgeotiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "413293d224293f65999b988ba07734ad78793405", + "version-string": "1.6.0", + "port-version": 1 + }, { "git-tree": "66eb337495fb9ac5d8cfdb96195b5d1c063088b6", "version-string": "1.6.0", diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json index 6f2e219f0444ad..6059275c2d4f31 100644 --- a/versions/l-/liblas.json +++ b/versions/l-/liblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98b46cc84b9efb95b95bfa0111c22e59a4d9e477", + "version-string": "1.8.1", + "port-version": 6 + }, { "git-tree": "3574373c93114a9a7bac598140a5a7c875830b4c", "version-string": "1.8.1", diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index 0b4ac1dc2510ef..a05e1ec8acb9c7 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6a58e13d646cb435d82143c23a3e9e8f54f495e", + "version-string": "1.7.1", + "port-version": 11 + }, { "git-tree": "e8b9d999c233cc564ff9eac48cf8e1d9b3094f1b", "version-string": "1.7.1", From dcb7b045cda7171686b5531b98d35e6ec44f34a6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 29 Jan 2021 04:29:12 +0100 Subject: [PATCH 0614/1694] [CGAL] switch dep to gmp instead of mpir (#15860) * [cgal] switch dependency to gmp * run x-add-version --- ports/cgal/CONTROL | 3 ++- versions/baseline.json | 2 +- versions/c-/cgal.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index ee652aea0a4e36..d600b45a6ad300 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,6 +1,7 @@ Source: cgal Version: 5.2 -Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-ptr-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision, boost-interval +Port-Version: 1 +Build-Depends: mpfr, gmp, zlib, boost-format, boost-container, boost-ptr-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision, boost-interval Homepage: https://github.com/CGAL/cgal 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. diff --git a/versions/baseline.json b/versions/baseline.json index 584a3a0c1de000..fb521d2f97ec0c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1118,7 +1118,7 @@ }, "cgal": { "baseline": "5.2", - "port-version": 0 + "port-version": 1 }, "cgicc": { "baseline": "3.2.19-4", diff --git a/versions/c-/cgal.json b/versions/c-/cgal.json index ed0be54bc31f4f..e5763bfe7111e8 100644 --- a/versions/c-/cgal.json +++ b/versions/c-/cgal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cbb2f2a60d864bd36098d71a050aeef43e52eff", + "version-string": "5.2", + "port-version": 1 + }, { "git-tree": "1673f680f59b2c8c848a28c8e664b68b2ec182d7", "version-string": "5.2", From 42f3a4cea06563301fc68e830b9d5c318661bd3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Fri, 29 Jan 2021 04:34:34 +0100 Subject: [PATCH 0615/1694] [pugixml] Update to 1.11.4 (#15207) * [pugixml] Update to 1.11.4 * update version * Update ci.baseline.txt Add paraview:x64-linux=fail Co-authored-by: Billy Robert O'Neal III Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/pugixml/CONTROL | 2 +- ports/pugixml/portfile.cmake | 4 ++-- scripts/ci.baseline.txt | 1 + versions/baseline.json | 2 +- versions/p-/pugixml.json | 5 +++++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/pugixml/CONTROL b/ports/pugixml/CONTROL index 65e6732495b46c..910ad83294056b 100644 --- a/ports/pugixml/CONTROL +++ b/ports/pugixml/CONTROL @@ -1,4 +1,4 @@ Source: pugixml -Version: 1.11.1 +Version: 1.11.4 Homepage: https://github.com/zeux/pugixml Description: Light-weight, simple and fast XML parser for C++ with XPath support diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index 72381eb5d8d0da..c27b1a89daeddb 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/pugixml - REF v1.11.1 - SHA512 94a79a28d96e763cdd8951c4d0b20aefb43cd1b32cbf5a5354b09f2636710e960e2dbfa56534b61c8d6ddecb2126a006e5f485c1465a97376e1cc077df25f16e + REF v1.11.4 + SHA512 a1fdf4cbd744318fd339362465472279767777b18a3c8c7e8618d5e637213c632bf9dd8144d16ae22a75cfbde007f383e2feb49084e681c930fc89a2e3f2bc4f HEAD_REF master ) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 11db8efbd24b03..aaa4411bf76714 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1172,6 +1172,7 @@ paho-mqtt:arm-uwp=fail paho-mqtt:x64-uwp=fail pangomm:x64-osx=fail pangomm:arm64-windows=fail +paraview:x64-linux=fail parmetis:x64-linux=fail parmetis:x64-osx=fail pdal:x64-linux=fail diff --git a/versions/baseline.json b/versions/baseline.json index fb521d2f97ec0c..407aba67cd7f36 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4705,7 +4705,7 @@ "port-version": 0 }, "pugixml": { - "baseline": "1.11.1", + "baseline": "1.11.4", "port-version": 0 }, "pybind11": { diff --git a/versions/p-/pugixml.json b/versions/p-/pugixml.json index dfa40fa5d4fc75..36215e5f84a9a1 100644 --- a/versions/p-/pugixml.json +++ b/versions/p-/pugixml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64fda47a7f4dd9fc10c60169c4f5e0b069481199", + "version-string": "1.11.4", + "port-version": 0 + }, { "git-tree": "3c0bf3af0be3a7df2f1ee8f65223b6fc49947b35", "version-string": "1.11.1", From b9075b0dfb9231a88c091c8a037f75271634711e Mon Sep 17 00:00:00 2001 From: pastdue <30942300+past-due@users.noreply.github.com> Date: Thu, 28 Jan 2021 22:38:32 -0500 Subject: [PATCH 0616/1694] vcpkg_configure_make: Support macOS cross-compile (#15659) * vcpkg_configure_make: Support macOS cross-compile * Move compiler flags logic to get_cmake_vars * Better match the arch behavior of config.guess * Apply suggestions from code review Co-authored-by: Billy O'Neal Co-authored-by: Billy O'Neal --- scripts/cmake/vcpkg_configure_make.cmake | 43 ++++++++++++++++++++++-- scripts/get_cmake_vars/CMakeLists.txt | 32 ++++++++++++++---- 2 files changed, 67 insertions(+), 8 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 122281f42dace2..c30de38bd3b251 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -139,6 +139,26 @@ macro(_vcpkg_determine_autotools_target_cpu out_var) endif() endmacro() +macro(_vcpkg_determine_autotools_host_arch_mac out_var) + set(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") +endmacro() + +macro(_vcpkg_determine_autotools_target_arch_mac out_var) + list(LENGTH VCPKG_OSX_ARCHITECTURES _num_osx_archs) + if(_num_osx_archs GREATER_EQUAL 2) + set(${out_var} "universal") + else() + # Better match the arch behavior of config.guess + # See: https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + if(VCPKG_OSX_ARCHITECTURES MATCHES "^(ARM|arm)64$") + set(${out_var} "aarch64") + else() + set(${out_var} "${VCPKG_OSX_ARCHITECTURES}") + endif() + endif() + unset(_num_osx_archs) +endmacro() + macro(_vcpkg_backup_env_variable envvar) if(DEFINED ENV{${envvar}}) set(${envvar}_BACKUP "$ENV{${envvar}}") @@ -407,6 +427,25 @@ function(vcpkg_configure_make) set(prefix_var "\${prefix}") endif() + # macOS - cross-compiling support + if(VCPKG_TARGET_IS_OSX) + if (_csc_AUTOCONFIG AND NOT _csc_BUILD_TRIPLET OR _csc_DETERMINE_BUILD_TRIPLET) + _vcpkg_determine_autotools_host_arch_mac(BUILD_ARCH) # machine you are building on => --build= + _vcpkg_determine_autotools_target_arch_mac(TARGET_ARCH) + # --build: the machine you are building on + # --host: the machine you are building for + # --target: the machine that CC will produce binaries for + # https://stackoverflow.com/questions/21990021/how-to-determine-host-value-for-configure-when-using-cross-compiler + # Only for ports using autotools so we can assume that they follow the common conventions for build/target/host + set(_csc_BUILD_TRIPLET "--build=${BUILD_ARCH}-apple-darwin") + if(NOT "${TARGET_ARCH}" STREQUAL "${BUILD_ARCH}") # we don't need to specify the additional flags if we build natively. + + list(APPEND _csc_BUILD_TRIPLET "--host=${TARGET_ARCH}-apple-darwin") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target) + endif() + debug_message("Using make triplet: ${_csc_BUILD_TRIPLET}") + endif() + endif() + # Cleanup previous build dirs file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" @@ -671,8 +710,8 @@ function(vcpkg_configure_make) if (CMAKE_HOST_WIN32) set(command ${base_cmd} -c "${CONFIGURE_ENV} ./${RELATIVE_BUILD_PATH}/configure ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}") else() - find_program(BASH bash REQUIRED) - set(command "${BASH}" "./${RELATIVE_BUILD_PATH}/configure" ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}) + find_program(BASH bash REQUIRED) + set(command "${BASH}" "./${RELATIVE_BUILD_PATH}/configure" ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}) endif() if(_csc_ADD_BIN_TO_PATH) set(PATH_BACKUP $ENV{PATH}) diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt index 45a53989b56a6b..6be594787392e4 100644 --- a/scripts/get_cmake_vars/CMakeLists.txt +++ b/scripts/get_cmake_vars/CMakeLists.txt @@ -48,6 +48,12 @@ foreach(flag IN LISTS FLAGS) endforeach() list(REMOVE_DUPLICATES VCPKG_DEFAULT_FLAGS_TO_CHECK) +#Language-specific flags. +foreach(_lang IN LISTS VCPKG_LANGUAGES) + list(APPEND VCPKG_LANG_FLAGS CMAKE_${_lang}_FLAGS) +endforeach() +list(REMOVE_DUPLICATES VCPKG_LANG_FLAGS) + # TODO if ever necessary: Properties to check set(VCPKG_VAR_PREFIX "VCPKG_DETECTED" CACHE STRING "Variable prefix to use for detected flags") @@ -81,17 +87,31 @@ foreach(_env IN LISTS VCPKG_ENV_VARS_TO_CHECK) endif() 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}}") + 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() + string(APPEND ${flag_var} " -isysroot ${CMAKE_OSX_SYSROOT}") + endif() + endif() + endif() +endmacro() + foreach(flag IN LISTS VCPKG_FLAGS_TO_CHECK) string(STRIP "${${flag}}" ${flag}) # Strip leading and trailing whitespaces - if(MSVC) # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. - string(REGEX REPLACE "(^| )/" "\\1-" ${flag} "${${flag}}") - endif() + _vcpkg_adjust_flags(${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}) - if(MSVC) - string(REGEX REPLACE "(^| )/" "\\1-" ${flag}_${config} "${${flag}_${config}}") - endif() + _vcpkg_adjust_flags(${flag}_${config}) string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_RAW_${flag}_${config} \"${CMAKE_${flag}_FLAGS_${config}}\")\n") set(COMBINED_${flag}_${config} "${${flag}} ${${flag}_${config}}") string(STRIP "${COMBINED_${flag}_${config}}" COMBINED_${flag}_${config}) From 708341bba18611d8241da52b8245d782c65c2182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 28 Jan 2021 19:41:44 -0800 Subject: [PATCH 0617/1694] [libpq] Fix install tool pg_config on Linux (#15748) * [libpq] Fix install tool pg_config * update baseline * [libpq] Use vcpkg_copy_tool_dependencies instead * update baseline * [libpq] Fix install tool pg_config * update baseline * [libpq] Use vcpkg_copy_tool_dependencies instead * update baseline --- ports/libpq/CONTROL | 2 +- ports/libpq/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/l-/libpq.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL index fa6ea6d91c1140..5d535ff7238fd7 100644 --- a/ports/libpq/CONTROL +++ b/ports/libpq/CONTROL @@ -1,6 +1,6 @@ Source: libpq Version: 12.2 -Port-Version: 10 +Port-Version: 11 Build-Depends: libpq[core,bonjour] (osx) Supports: !uwp Homepage: https://www.postgresql.org/ diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 91f6e36435c69b..427aed5b118277 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -297,8 +297,8 @@ else() if(NOT HAS_TOOLS) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) else() - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug) endif() set(USE_DL ON) endif() diff --git a/versions/baseline.json b/versions/baseline.json index 407aba67cd7f36..8e1b31d6c043e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3238,7 +3238,7 @@ }, "libpq": { "baseline": "12.2", - "port-version": 10 + "port-version": 11 }, "libpqxx": { "baseline": "7.3.1", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index fca613ba448455..a076337a1a6791 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e09ebfc1a310be48ed9f5f3e6d2a648cfddff424", + "version-string": "12.2", + "port-version": 11 + }, { "git-tree": "7c4dbe4fcb780bed98e6b55ccf039b77c7a5be68", "version-string": "12.2", From 859b1008f7a9e3e7de15d182083a02bdac8c1353 Mon Sep 17 00:00:00 2001 From: Charlie Barto Date: Thu, 28 Jan 2021 19:45:59 -0800 Subject: [PATCH 0618/1694] clarify the actions of vcpkg_check_linkage (#15832) Co-authored-by: Charles Barto --- docs/maintainers/vcpkg_check_linkage.md | 2 ++ scripts/cmake/vcpkg_check_linkage.cmake | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docs/maintainers/vcpkg_check_linkage.md b/docs/maintainers/vcpkg_check_linkage.md index f9c149b683fc30..66760675e8e22c 100644 --- a/docs/maintainers/vcpkg_check_linkage.md +++ b/docs/maintainers/vcpkg_check_linkage.md @@ -14,6 +14,8 @@ vcpkg_check_linkage( ### ONLY_STATIC_LIBRARY Indicates that this port can only be built with static library linkage. +Note: If the user requested a dynamic build ONLY_STATIC_LIBRARY will result in a note being printed, not a fatal error. + ### ONLY_DYNAMIC_LIBRARY Indicates that this port can only be built with dynamic/shared library linkage. diff --git a/scripts/cmake/vcpkg_check_linkage.cmake b/scripts/cmake/vcpkg_check_linkage.cmake index 9a8a7acb0210b9..97e29bad7fff37 100644 --- a/scripts/cmake/vcpkg_check_linkage.cmake +++ b/scripts/cmake/vcpkg_check_linkage.cmake @@ -15,6 +15,8 @@ vcpkg_check_linkage( ### ONLY_STATIC_LIBRARY Indicates that this port can only be built with static library linkage. +Note: If the user requested a dynamic build ONLY_STATIC_LIBRARY will result in a note being printed, not a fatal error. + ### ONLY_DYNAMIC_LIBRARY Indicates that this port can only be built with dynamic/shared library linkage. From cc9c0c2e57353c8a3f07febc467f31628d382989 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Fri, 29 Jan 2021 11:04:53 -0800 Subject: [PATCH 0619/1694] [vcpkg] Teach vcpkg.targets to emit a .tlog, enabling up-to-date checks (#15898) Co-authored-by: Robert Schumacher --- scripts/buildsystems/msbuild/vcpkg.targets | 29 +++++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 0ba7d8918c15f2..5f22d0fe5461c6 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -30,6 +30,7 @@ debug\ true + VcpkgTriplet=$(VcpkgTriplet):$(ProjectStateLine) @@ -68,15 +69,35 @@ Importance="High" Condition="'$(VcpkgEnabled)' == 'true' and '$(VcpkgNormalizedConfiguration)' == ''"/> + + <_VcpkgInstallManifestDependenciesInputs Include="$(VcpkgManifestRoot)vcpkg.json"/> + <_VcpkgInstallManifestDependenciesInputs Include="$(VcpkgManifestRoot)vcpkg-configuration.json" Condition="Exists('$(VcpkgManifestRoot)vcpkg-configuration.json')"/> + + - - + + + + <_VcpkgItemToDelete Include="$(TLogLocation)VcpkgInstallManifest*.read.1u.tlog" /> + + + + + + + + + Condition="'$(VcpkgEnabled)' == 'true' and '$(VcpkgApplocalDeps)' == 'true' and '$(LinkSkippedExecution)' != 'true'"> <_VcpkgAppLocalPowerShellCommonArguments>-ExecutionPolicy Bypass -noprofile -File "$(MSBuildThisFileDirectory)applocal.ps1" "$(TargetPath)" "$(VcpkgCurrentInstalledDir)$(VcpkgConfigSubdir)bin" "$(TLogLocation)$(ProjectName).write.1u.tlog" "$(IntDir)vcpkg.applocal.log" From 7157412fdd6e1f00c1079007e7fc380093b25c03 Mon Sep 17 00:00:00 2001 From: evpobr Date: Tue, 2 Feb 2021 08:24:11 +0500 Subject: [PATCH 0620/1694] [libsamplerate] Update to 0.2.1 (#15954) --- ports/libsamplerate/portfile.cmake | 4 ++-- ports/libsamplerate/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libsamplerate.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libsamplerate/portfile.cmake b/ports/libsamplerate/portfile.cmake index 1085ef269ae1e8..3066cb21369004 100644 --- a/ports/libsamplerate/portfile.cmake +++ b/ports/libsamplerate/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsndfile/libsamplerate - REF 0.2.0 - SHA512 6a12506ad391a557fcc354c7bb5767ae71349da26bf31753b806a36449cfc879ef97e4d25adab5722a9540ec1539203c6155b4581e42bdb8b6708dca1f089d11 + REF 0.2.1 + SHA512 ee661f0f1010f19af623edfa0b52960f9397a99583919a1cc758915e68478271f287ee24bf1ba62ad44413846dff9456d8f7500e9c01290df3a57e58873eaa8f HEAD_REF master ) diff --git a/ports/libsamplerate/vcpkg.json b/ports/libsamplerate/vcpkg.json index 6b4bd48fe8a869..83d9709f0f9ad5 100644 --- a/ports/libsamplerate/vcpkg.json +++ b/ports/libsamplerate/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libsamplerate", - "version-string": "0.2.0", + "version-string": "0.2.1", "description": "Sample Rate Converter for audio", "homepage": "http://libsndfile.github.io/libsamplerate/" } diff --git a/versions/baseline.json b/versions/baseline.json index 8e1b31d6c043e3..7943df81510706 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3301,7 +3301,7 @@ "port-version": 0 }, "libsamplerate": { - "baseline": "0.2.0", + "baseline": "0.2.1", "port-version": 0 }, "libsass": { diff --git a/versions/l-/libsamplerate.json b/versions/l-/libsamplerate.json index 09d9618d7df6c9..e7f2a9813eebc9 100644 --- a/versions/l-/libsamplerate.json +++ b/versions/l-/libsamplerate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "658d28f9892b0676577bb6b61b3eff7d2730e72e", + "version-string": "0.2.1", + "port-version": 0 + }, { "git-tree": "5247f6ff1ca88bae029dc84a18a5a6333e561a85", "version-string": "0.2.0", From 1a1fce8b2ca66000df6b1f482e38e14952dba526 Mon Sep 17 00:00:00 2001 From: evpobr Date: Tue, 2 Feb 2021 08:24:40 +0500 Subject: [PATCH 0621/1694] [libsndfile] Update to 1.0.31 (#15953) * [libsndfile] Update to 1.0.31 * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/libsndfile/portfile.cmake | 4 ++-- ports/libsndfile/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libsndfile.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libsndfile/portfile.cmake b/ports/libsndfile/portfile.cmake index 77141fb69caeda..ad84e3315b43ad 100644 --- a/ports/libsndfile/portfile.cmake +++ b/ports/libsndfile/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsndfile/libsndfile - REF 68958f9c9199dad97dcd10700df3746b2cd9b8a3 # v1.0.30 - SHA512 4f2af061af5d5b26106ed11e33f04930a57c79ca0e18ef5fe32255c3f555bfa7b9192db7ff0f34f782d85b2ee40662182073e1abf4a73f448c47b67c26bb5b53 + REF 1.0.31 + SHA512 5767ced306f2d300aa2014d383c22f3ee9a4fe1ffb2c463405bc26209ede09a9cfb95e1c08256db36e986d2b30151c38dbe635a3cae0b7138d7de485e2084891 HEAD_REF master ) diff --git a/ports/libsndfile/vcpkg.json b/ports/libsndfile/vcpkg.json index 33556df7a66b72..e0d0acc68c3ae2 100644 --- a/ports/libsndfile/vcpkg.json +++ b/ports/libsndfile/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libsndfile", - "version-string": "1.0.30", - "port-version": 1, + "version-string": "1.0.31", "description": "Library to read, write and manipulate many soundfile types. Authored by Eric de Castro Lopo", "homepage": "https://github.com/erikd/libsndfile", "license": "LGPL-2.1", diff --git a/versions/baseline.json b/versions/baseline.json index 7943df81510706..9ade36f6461b3c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3321,8 +3321,8 @@ "port-version": 0 }, "libsndfile": { - "baseline": "1.0.30", - "port-version": 1 + "baseline": "1.0.31", + "port-version": 0 }, "libsodium": { "baseline": "1.0.18", diff --git a/versions/l-/libsndfile.json b/versions/l-/libsndfile.json index 070a90791f456d..d0206cf84a9e2e 100644 --- a/versions/l-/libsndfile.json +++ b/versions/l-/libsndfile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "587283d6fa07092beece87351d1361506293ff59", + "version-string": "1.0.31", + "port-version": 0 + }, { "git-tree": "03a5a8afe22b95df759e1f581e3a35d27ee99540", "version-string": "1.0.30", From 622c1bf7dc5c04489b67118f940e9fb48bc6b7ec Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 2 Feb 2021 11:24:55 +0800 Subject: [PATCH 0622/1694] [libjpeg-turbo] update to 2.0.6 (#15936) * [libjpeg-turbo] update to 2.0.6 * update version --- ports/libjpeg-turbo/CONTROL | 3 +-- ports/libjpeg-turbo/portfile.cmake | 4 ++-- versions/baseline.json | 4 ++-- versions/l-/libjpeg-turbo.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index 1e5ad60c6f5f33..dd1c189875712c 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,6 +1,5 @@ Source: libjpeg-turbo -Version: 2.0.5 -Port-Version: 4 +Version: 2.0.6 Homepage: https://github.com/libjpeg-turbo/libjpeg-turbo 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. diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 208d3ff6d40a73..302530c38568f7 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjpeg-turbo/libjpeg-turbo - REF ae87a958613b69628b92088b313ded0d4f59a716 # 2.0.5 - SHA512 25e8857a3542cc74c48775959f11811529fe6a853990cb285f91a6218c1cde5dd1e58043208e81709fb7a71c376396b2de1f20b53b2c5b8595ca097fa02992fd + REF 10ba6ed3365615ed5c2995fe2d240cb2d5000173 # 2.0.6 + SHA512 219d01907e66dd0fc20ea13cfa51a8efee305810f1245d0648b6ad8ee3cf11bf0bbd43b1ceeeb142a6ebbbfa281ec6a3b4e283b2fc343c360cd3ad29e9d42528 HEAD_REF master PATCHES add-options-for-exes-docs-headers.patch diff --git a/versions/baseline.json b/versions/baseline.json index 9ade36f6461b3c..b20b2907ad601c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3045,8 +3045,8 @@ "port-version": 0 }, "libjpeg-turbo": { - "baseline": "2.0.5", - "port-version": 4 + "baseline": "2.0.6", + "port-version": 0 }, "libjuice": { "baseline": "0.6.0", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 46272052c51405..6bcdc411f77f4e 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42aed1a37d04ecdc437a4f52c6dd71740339f478", + "version-string": "2.0.6", + "port-version": 0 + }, { "git-tree": "0c5889f679a9404504230cb568df8f1f1263cbba", "version-string": "2.0.5", From 857a58577409be83305e73f57a6d8c74ec75aa66 Mon Sep 17 00:00:00 2001 From: Ryan Mast Date: Mon, 1 Feb 2021 19:25:30 -0800 Subject: [PATCH 0623/1694] [libgcrypt] Update libgcrypt (#15950) * [libgrypt] Update version to 1.8.7 * [libgcrypt] update versions --- ports/libgcrypt/CONTROL | 4 ++-- ports/libgcrypt/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/l-/libgcrypt.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/libgcrypt/CONTROL b/ports/libgcrypt/CONTROL index 6a9fe7d5b99e7a..1a1ae7916734e5 100644 --- a/ports/libgcrypt/CONTROL +++ b/ports/libgcrypt/CONTROL @@ -1,6 +1,6 @@ Source: libgcrypt -Version: 1.8.6 +Version: 1.8.7 Homepage: https://gnupg.org/software/libgcrypt/index.html Description: A library implementing the so-called Assuan protocol Build-Depends: libgpg-error -Supports: linux|osx \ No newline at end of file +Supports: linux|osx diff --git a/ports/libgcrypt/portfile.cmake b/ports/libgcrypt/portfile.cmake index 6b782f0e60518d..7c5784a0191d60 100644 --- a/ports/libgcrypt/portfile.cmake +++ b/ports/libgcrypt/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platform" vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gpg/libgcrypt - REF libgcrypt-1.8.6 - SHA512 85005b159048b7b47b3fc77e8be5b5b317b1ae73ef536d4e2d78496763b7b8c4f80c70016ed27fc60e998cbc7642d3cf487bd4c5e5a5d8abc8f8d51e02f330d1 + REF libgcrypt-1.8.7 + SHA512 43e50a1b8a3cdbf420171c785fe558f443b414b708defa585277ac5ea59f9d8ae7f4555ed291c16fa004e7d4dd93a5ab2011c3c591e784ce3c6662a3193fd3e1 HEAD_REF master PATCHES fix-pkgconfig.patch diff --git a/versions/baseline.json b/versions/baseline.json index b20b2907ad601c..c106dbfbabe4b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2957,7 +2957,7 @@ "port-version": 0 }, "libgcrypt": { - "baseline": "1.8.6", + "baseline": "1.8.7", "port-version": 0 }, "libgd": { diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json index 6624a4d98ef524..fc0e2c24743240 100644 --- a/versions/l-/libgcrypt.json +++ b/versions/l-/libgcrypt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a7be352162b1187194ba75ff3514361213f77a6", + "version-string": "1.8.7", + "port-version": 0 + }, { "git-tree": "4fd1f0fdf10d205488c813a331b0547e9ab9bbc0", "version-string": "1.8.6", From 2cf3bde9f7114bf3ceea6447050d02935ad632bc Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 2 Feb 2021 11:26:35 +0800 Subject: [PATCH 0624/1694] [raylib] Fix usage (#15935) * [raylib] Fix usage * Update ports/raylib/CONTROL * Update versions * Update versions/r-/raylib.json --- ports/raylib/CONTROL | 1 + ports/raylib/portfile.cmake | 6 ++++++ ports/raylib/vcpkg-cmake-wrapper.cmake | 4 ++-- versions/baseline.json | 2 +- versions/r-/raylib.json | 5 +++++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ports/raylib/CONTROL b/ports/raylib/CONTROL index d617a9189e44ef..925d94d1cb7c84 100644 --- a/ports/raylib/CONTROL +++ b/ports/raylib/CONTROL @@ -1,5 +1,6 @@ Source: raylib Version: 3.5.0 +Port-Version: 1 Description: A simple and easy-to-use library to enjoy videogames programming Homepage: https://github.com/raysan5/raylib Supports: !(arm|uwp) diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index a3af4172eb52d5..965d3f225e6f6f 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -56,6 +56,12 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake + ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake + @ONLY +) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share diff --git a/ports/raylib/vcpkg-cmake-wrapper.cmake b/ports/raylib/vcpkg-cmake-wrapper.cmake index 34484ea6fe3e41..2d7560eb0f3e46 100644 --- a/ports/raylib/vcpkg-cmake-wrapper.cmake +++ b/ports/raylib/vcpkg-cmake-wrapper.cmake @@ -2,8 +2,8 @@ include(SelectLibraryConfigurations) find_path(RAYLIB_INCLUDE_DIR raylib.h) -find_library(RAYLIB_LIBRARY_DEBUG NAMES raylib libraylib NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) -find_library(RAYLIB_LIBRARY_RELEASE NAMES raylib libraylib NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) +find_library(RAYLIB_LIBRARY_DEBUG NAMES raylib libraylib raylib_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) +find_library(RAYLIB_LIBRARY_RELEASE NAMES raylib libraylib raylib_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) select_library_configurations(RAYLIB) diff --git a/versions/baseline.json b/versions/baseline.json index c106dbfbabe4b9..b7e89b59c2177f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5006,7 +5006,7 @@ }, "raylib": { "baseline": "3.5.0", - "port-version": 0 + "port-version": 1 }, "rbdl": { "baseline": "2.6.0", diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json index 49226f0b73b112..b70356c45d7001 100644 --- a/versions/r-/raylib.json +++ b/versions/r-/raylib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b517bb75982839f879e33ed72c13ba824f7f7547", + "version-string": "3.5.0", + "port-version": 1 + }, { "git-tree": "5f584abef9d068dcada1382034eac435d75fd21d", "version-string": "3.5.0", From 32b9558700c5a84dad6c6d2707ba98f6c69689d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20B=C3=A9dard-Couture?= Date: Mon, 1 Feb 2021 22:27:07 -0500 Subject: [PATCH 0625/1694] [fast-cpp-csv-parser ] Update to the latest commit: Fixes compiler warnings (#15943) * Update port to latest commit: Fixes compiler warnings * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/fast-cpp-csv-parser/CONTROL | 2 +- ports/fast-cpp-csv-parser/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/f-/fast-cpp-csv-parser.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/fast-cpp-csv-parser/CONTROL b/ports/fast-cpp-csv-parser/CONTROL index a9766a66a20958..aab47496f0a217 100644 --- a/ports/fast-cpp-csv-parser/CONTROL +++ b/ports/fast-cpp-csv-parser/CONTROL @@ -1,4 +1,4 @@ Source: fast-cpp-csv-parser -Version: 2019-08-14 +Version: 2021-01-03 Description: A small, easy-to-use and fast header-only library for reading comma separated value (CSV) files Homepage: https://github.com/ben-strasser/fast-cpp-csv-parser diff --git a/ports/fast-cpp-csv-parser/portfile.cmake b/ports/fast-cpp-csv-parser/portfile.cmake index 200e767cd7992d..212c97ed947a9d 100644 --- a/ports/fast-cpp-csv-parser/portfile.cmake +++ b/ports/fast-cpp-csv-parser/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ben-strasser/fast-cpp-csv-parser - REF 78f413248fdeea27368481c4a1d48c059ac36680 - SHA512 f8eb477e0b5e82f5b5d7bdf045094dcc59433e7b6305a1e16e45c2c24f4bbb7f6e9540e17a8ffafce29ea2ebe3a2647174824abe80da5f2054f7df3d7da8c28d + REF 75600d0b77448e6c410893830df0aec1dbacf8e3 + SHA512 aab418e98eb895dabd6369b186b7a55beddb84b89e358395a9f125829074916eff9086d80f9cd342d1bfd91acacc7103875c970a84164b75fff259cc93729285 HEAD_REF master ) diff --git a/versions/baseline.json b/versions/baseline.json index b7e89b59c2177f..91fb31ba24120b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1837,7 +1837,7 @@ "port-version": 2 }, "fast-cpp-csv-parser": { - "baseline": "2019-08-14", + "baseline": "2021-01-03", "port-version": 0 }, "fastcdr": { diff --git a/versions/f-/fast-cpp-csv-parser.json b/versions/f-/fast-cpp-csv-parser.json index 65870fed97652c..3fa617b74c4910 100644 --- a/versions/f-/fast-cpp-csv-parser.json +++ b/versions/f-/fast-cpp-csv-parser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1f6fcd862c655b0884eb40931852c6db8a938e4", + "version-string": "2021-01-03", + "port-version": 0 + }, { "git-tree": "e2987a08764b26275d4ed8fc728b9460acc9db5e", "version-string": "2019-08-14", From af3fd24757db5b970c136eb6cdd123594f8039e3 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 2 Feb 2021 04:27:34 +0100 Subject: [PATCH 0626/1694] [meson] fix single-config builds (#15937) --- scripts/cmake/vcpkg_install_meson.cmake | 30 ++++++++++++++----------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/scripts/cmake/vcpkg_install_meson.cmake b/scripts/cmake/vcpkg_install_meson.cmake index 2162029180222c..18cd03e6c7a822 100644 --- a/scripts/cmake/vcpkg_install_meson.cmake +++ b/scripts/cmake/vcpkg_install_meson.cmake @@ -30,19 +30,23 @@ function(vcpkg_install_meson) set(ENV{MACOSX_DEPLOYMENT_TARGET} "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}") endif() - message(STATUS "Package ${TARGET_TRIPLET}-rel") - vcpkg_execute_required_process( - COMMAND ${NINJA} install -v - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - LOGNAME package-${TARGET_TRIPLET}-rel - ) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + message(STATUS "Package ${TARGET_TRIPLET}-rel") + vcpkg_execute_required_process( + COMMAND ${NINJA} install -v + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel + LOGNAME package-${TARGET_TRIPLET}-rel + ) + endif() - message(STATUS "Package ${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process( - COMMAND ${NINJA} install -v - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - LOGNAME package-${TARGET_TRIPLET}-dbg - ) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + message(STATUS "Package ${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND ${NINJA} install -v + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg + LOGNAME package-${TARGET_TRIPLET}-dbg + ) + endif() set(RENAMED_LIBS) if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -54,7 +58,7 @@ function(vcpkg_install_meson) string(REGEX REPLACE ".a$" ".lib" LIBNAMENEW "${LIBNAME}") string(REGEX REPLACE "^lib" "" LIBNAMENEW "${LIBNAMENEW}") file(RENAME "${_library}" "${LIBDIR}/${LIBNAMENEW}") - # For cmake fixes. + # For cmake fixes. string(REGEX REPLACE ".a$" "" LIBRAWNAMEOLD "${LIBNAME}") string(REGEX REPLACE ".lib$" "" LIBRAWNAMENEW "${LIBNAMENEW}") list(APPEND RENAMED_LIBS ${LIBRAWNAMENEW}) From 13769c2537e8e8b3924dc1ae97956a299660608a Mon Sep 17 00:00:00 2001 From: miheer vaidya Date: Tue, 2 Feb 2021 14:45:32 -0700 Subject: [PATCH 0627/1694] [libconfig] Fix libconfig when installing master branch (#15885) * Fix libconfig when installing master branch Also add a warning that stable version won't create cmakeConfig files * run x-add-version * Update ports/libconfig/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/libconfig/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/libconfig/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/libconfig/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Revert "run x-add-version" This reverts commit 79b9ef86933a79012be9866ef638c8cee5abf02d. * run x-add-version libconfig Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/libconfig/CONTROL | 2 +- ports/libconfig/portfile.cmake | 33 +++++++++++++++++++++++++-------- versions/baseline.json | 2 +- versions/l-/libconfig.json | 5 +++++ 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/ports/libconfig/CONTROL b/ports/libconfig/CONTROL index f3a6342401edf4..5a8555e106069d 100644 --- a/ports/libconfig/CONTROL +++ b/ports/libconfig/CONTROL @@ -1,5 +1,5 @@ Source: libconfig Version: 1.7.2 -Port-Version: 3 +Port-Version: 4 Homepage: https://github.com/hyperrealm/libconfig Description: C/C++ library for processing configuration files diff --git a/ports/libconfig/portfile.cmake b/ports/libconfig/portfile.cmake index dd5a4482b1e71e..eb6d305bfedc9a 100644 --- a/ports/libconfig/portfile.cmake +++ b/ports/libconfig/portfile.cmake @@ -6,19 +6,36 @@ vcpkg_from_github( HEAD_REF master ) -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 -) +if (NOT VCPKG_USE_HEAD_VERSION) + message("If you would like to use cmake with the port, use `--head` option with vcpkg install.") + file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +endif() + +if (NOT VCPKG_USE_HEAD_VERSION) + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON + ) +else() + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + ) +endif() vcpkg_install_cmake() vcpkg_copy_pdbs() +if (VCPKG_USE_HEAD_VERSION) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libconfig) +endif() + foreach(FILE ${CURRENT_PACKAGES_DIR}/include/libconfig.h++ ${CURRENT_PACKAGES_DIR}/include/libconfig.h) file(READ ${FILE} _contents) string(REPLACE "defined(LIBCONFIGXX_EXPORTS)" "0" _contents "${_contents}") diff --git a/versions/baseline.json b/versions/baseline.json index 91fb31ba24120b..3832e0b3ab28de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2866,7 +2866,7 @@ }, "libconfig": { "baseline": "1.7.2", - "port-version": 3 + "port-version": 4 }, "libconfuse": { "baseline": "2019-07-14", diff --git a/versions/l-/libconfig.json b/versions/l-/libconfig.json index 45a6c7df81463f..6d7eeafa11e440 100644 --- a/versions/l-/libconfig.json +++ b/versions/l-/libconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "079c1b8cc62fe544a3277a949422bd68c57e0c45", + "version-string": "1.7.2", + "port-version": 4 + }, { "git-tree": "c82b5fbc0a37ebd11ecb4f87b9d63df2552805e7", "version-string": "1.7.2", From 2c885dc582a2906c0b4d595121d1a1a076d8ae87 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Tue, 2 Feb 2021 17:28:38 -0500 Subject: [PATCH 0628/1694] [ngspice] build codemodel extension libraries (#15882) * [ngspice] build codemodel extension libraries * tabs -> spaces * [ngspice] make codemodels a feature * [ngspice] Improve portfile.cmake * update version record Co-authored-by: JackBoosY --- ports/ngspice/CONTROL | 5 ++ ports/ngspice/portfile.cmake | 68 +++++++++++++------ ...l.patch => use-winbison-sharedspice.patch} | 0 ports/ngspice/use-winbison-vngspice.patch | 50 ++++++++++++++ versions/baseline.json | 2 +- versions/n-/ngspice.json | 5 ++ 6 files changed, 109 insertions(+), 21 deletions(-) rename ports/ngspice/{use-winbison-global.patch => use-winbison-sharedspice.patch} (100%) create mode 100644 ports/ngspice/use-winbison-vngspice.patch diff --git a/ports/ngspice/CONTROL b/ports/ngspice/CONTROL index 52d04f3aaa87d7..c11036c4becc22 100644 --- a/ports/ngspice/CONTROL +++ b/ports/ngspice/CONTROL @@ -1,5 +1,10 @@ Source: ngspice Version: 33 +Port-Version: 1 Homepage: http://ngspice.sourceforge.net/ Description: Ngspice is a mixed-level/mixed-signal electronic circuit simulator. It is a successor of the latest stable release of Berkeley SPICE Supports: !(linux|osx|arm|uwp) +Default-Features: codemodels + +Feature: codemodels +Description: Adds optional code models for XSPICE, ADMS (verilog integration) and B-/E-/G- sources. diff --git a/ports/ngspice/portfile.cmake b/ports/ngspice/portfile.cmake index 538a02f5e6c62c..1c85e113389bed 100644 --- a/ports/ngspice/portfile.cmake +++ b/ports/ngspice/portfile.cmake @@ -12,7 +12,8 @@ vcpkg_from_sourceforge( FILENAME "ngspice-33.tar.gz" SHA512 895e39f7de185df18bf443a9fa5691cdb3bf0a5091d9860d20ccb02254ef396a4cca5a1c8bf4ba19a03783fc89bb86649218cee977b0fe4565d3c84548943c09 PATCHES - use-winbison-global.patch + use-winbison-sharedspice.patch + use-winbison-vngspice.patch ) vcpkg_find_acquire_program(BISON) @@ -20,33 +21,60 @@ vcpkg_find_acquire_program(BISON) get_filename_component(BISON_DIR "${BISON}" DIRECTORY) vcpkg_add_to_path(PREPEND "${BISON_DIR}") -# Ensure its windows -if (VCPKG_TARGET_IS_WINDOWS) - # Sadly, vcpkg globs .libs inside install_msbuild and whines that the 47 year old SPICE format isn't a MSVC lib ;) - # We need to kill them off first before the source tree is copied to a tmp location by install_msbuild +# Sadly, vcpkg globs .libs inside install_msbuild and whines that the 47 year old SPICE format isn't a MSVC lib ;) +# We need to kill them off first before the source tree is copied to a tmp location by install_msbuild - file(REMOVE_RECURSE ${SOURCE_PATH}/contrib) - file(REMOVE_RECURSE ${SOURCE_PATH}/examples) - file(REMOVE_RECURSE ${SOURCE_PATH}/man) - file(REMOVE_RECURSE ${SOURCE_PATH}/tests) +file(REMOVE_RECURSE ${SOURCE_PATH}/contrib) +file(REMOVE_RECURSE ${SOURCE_PATH}/examples) +file(REMOVE_RECURSE ${SOURCE_PATH}/man) +file(REMOVE_RECURSE ${SOURCE_PATH}/tests) - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} +# this builds the main dll +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + INCLUDES_SUBPATH /src/include + LICENSE_SUBPATH COPYING + # install_msbuild swaps x86 for win32(bad) if we dont force our own setting + PLATFORM ${TRIPLET_SYSTEM_ARCH} + PROJECT_SUBPATH visualc/sharedspice.sln + TARGET Build +) + +if("codemodels" IN_LIST FEATURES) + # vngspice generates "codemodels" to enhance simulation capabilities + # we cannot use install_msbuild as they output with ".cm" extensions on purpose + set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) + file(REMOVE_RECURSE ${BUILDTREE_PATH}) + file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH}) + + vcpkg_build_msbuild( + PROJECT_PATH ${BUILDTREE_PATH}/visualc/vngspice.sln INCLUDES_SUBPATH /src/include LICENSE_SUBPATH COPYING - # install_msbuild swaps x86 for win32(bad) if we dont force our own setting + # build_msbuild swaps x86 for win32(bad) if we dont force our own setting PLATFORM ${TRIPLET_SYSTEM_ARCH} - PROJECT_SUBPATH visualc/sharedspice.sln TARGET Build ) -else() - message(FATAL_ERROR "Sorry but ngspice only can be built in Windows") + + #put the code models in the intended location + file(GLOB NGSPICE_CODEMODELS_DEBUG + ${BUILDTREE_PATH}/visualc/codemodels/${TRIPLET_SYSTEM_ARCH}/Debug/*.cm + ) + file(COPY ${NGSPICE_CODEMODELS_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/ngspice) + + file(GLOB NGSPICE_CODEMODELS_RELEASE + ${BUILDTREE_PATH}/visualc/codemodels/${TRIPLET_SYSTEM_ARCH}/Release/*.cm + ) + file(COPY ${NGSPICE_CODEMODELS_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/ngspice) + + + # copy over spinit (spice init) + file(RENAME ${BUILDTREE_PATH}/visualc/spinit_all ${BUILDTREE_PATH}/visualc/spinit) + file(COPY ${BUILDTREE_PATH}/visualc/spinit DESTINATION ${CURRENT_PACKAGES_DIR}/share/ngspice) endif() +vcpkg_copy_pdbs() + # Unforunately install_msbuild isn't able to dual include directories that effectively layer -file(GLOB NGSPICE_INCLUDES - ${SOURCE_PATH}/visualc/src/include/ngspice/* -) +file(GLOB NGSPICE_INCLUDES ${SOURCE_PATH}/visualc/src/include/ngspice/*) file(COPY ${NGSPICE_INCLUDES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ngspice) - -vcpkg_copy_pdbs() diff --git a/ports/ngspice/use-winbison-global.patch b/ports/ngspice/use-winbison-sharedspice.patch similarity index 100% rename from ports/ngspice/use-winbison-global.patch rename to ports/ngspice/use-winbison-sharedspice.patch diff --git a/ports/ngspice/use-winbison-vngspice.patch b/ports/ngspice/use-winbison-vngspice.patch new file mode 100644 index 00000000000000..008bc686de8ca6 --- /dev/null +++ b/ports/ngspice/use-winbison-vngspice.patch @@ -0,0 +1,50 @@ +diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj +index 2d1aa81..cf0f0c7 100644 +--- a/visualc/vngspice.vcxproj ++++ b/visualc/vngspice.vcxproj +@@ -2681,12 +2681,12 @@ + + + invoke win_bison.exe for %(Identity) +- ..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + + invoke win_bison.exe for %(Identity) +- ..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + +diff --git a/visualc/xspice/cmpp/cmpp.vcxproj b/visualc/xspice/cmpp/cmpp.vcxproj +index 78607a3..7bcc1a4 100644 +--- a/visualc/xspice/cmpp/cmpp.vcxproj ++++ b/visualc/xspice/cmpp/cmpp.vcxproj +@@ -157,22 +157,22 @@ + + + invoke win_flex.exe for %(Identity) +- ..\..\..\..\flex-bison\win_flex.exe --outfile=.\tmp-bison\%(Filename).c --header-file=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_flex.exe --outfile=.\tmp-bison\%(Filename).c --header-file=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + + invoke win_bison.exe for %(Identity) +- ..\..\..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + + invoke win_flex.exe for %(Identity) +- ..\..\..\..\flex-bison\win_flex.exe --outfile=.\tmp-bison\%(Filename).c --header-file=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_flex.exe --outfile=.\tmp-bison\%(Filename).c --header-file=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + + invoke win_bison.exe for %(Identity) +- ..\..\..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + diff --git a/versions/baseline.json b/versions/baseline.json index 3832e0b3ab28de..5445b0e9a507cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4022,7 +4022,7 @@ }, "ngspice": { "baseline": "33", - "port-version": 0 + "port-version": 1 }, "nifticlib": { "baseline": "2020-04-30", diff --git a/versions/n-/ngspice.json b/versions/n-/ngspice.json index b34cb7d92312b3..6e2f4a81968bd4 100644 --- a/versions/n-/ngspice.json +++ b/versions/n-/ngspice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff27e9605199ca4134c1ab3fa6bcb311096a0e10", + "version-string": "33", + "port-version": 1 + }, { "git-tree": "90c388f47ca769fd11449fde9d70402e9865a986", "version-string": "33", From f834b652ca3ec3265892df298991ec956f4c686b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=8C=E8=8D=89=E9=85=B8=E9=85=AF?= <17663689+kotori2@users.noreply.github.com> Date: Wed, 3 Feb 2021 06:35:45 +0800 Subject: [PATCH 0629/1694] [drogon] Upgrade to v1.3.0 (#15850) * [drogon] Upgrade to v1.3.0 * Update_versions * [drogon] remove debug stuffs * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/drogon/CONTROL | 5 ++++- ports/drogon/portfile.cmake | 18 ++++++++++++++---- ports/drogon/resolv.patch | 13 +++++++++++++ ports/drogon/vcpkg.patch | 34 ++++++++++++++++++++++++++++++---- versions/baseline.json | 2 +- versions/d-/drogon.json | 5 +++++ 6 files changed, 67 insertions(+), 10 deletions(-) create mode 100644 ports/drogon/resolv.patch diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL index bed3e64d471f7a..63c9527aa06582 100644 --- a/ports/drogon/CONTROL +++ b/ports/drogon/CONTROL @@ -1,5 +1,8 @@ Source: drogon -Version: 1.1.0 +Version: 1.3.0 Homepage: https://github.com/an-tao/drogon Description:Drogon: A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows Build-Depends: trantor, zlib, jsoncpp, libmariadb (!osx), libmariadb[iconv] (osx), libpq, sqlite3, brotli, libuuid (!windows) + +Feature: ctl +Description: Build drogon_ctl tool. \ No newline at end of file diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 6dfdc942ccf283..ae53109f9b9469 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -1,11 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon - REF v1.1.0 - SHA512 00d7d64fc666b0b2c02afab899f622123883b62b274d33f3504da6250a6458fc56ab12b131c24f9a7e20284bc5c3604a4f2dd796f56ad00d454d9f8504d8f96e + REF v1.3.0 + SHA512 cddda4b90d28c15319b9cd1dea561c429b804508fc40678b9906fb70153cb36d7a4fc1c13fee01ec1f49d747a722856ceee364aba4118d922afabc3629ba2115 HEAD_REF master PATCHES vcpkg.patch + resolv.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + ctl BUILD_CTL ) vcpkg_configure_cmake( @@ -13,6 +19,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBUILD_EXAMPLES=OFF + ${FEATURE_OPTIONS} ) vcpkg_install_cmake() @@ -20,8 +27,11 @@ vcpkg_install_cmake() # Fix CMake files vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Drogon) # Copy drogon_ctl -vcpkg_copy_tools(TOOL_NAMES drogon_ctl - AUTO_CLEAN) +if("ctl" IN_LIST FEATURES) + message("copying tools") + vcpkg_copy_tools(TOOL_NAMES drogon_ctl + AUTO_CLEAN) +endif() # # Remove includes in debug file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/drogon/resolv.patch b/ports/drogon/resolv.patch new file mode 100644 index 00000000000000..55bf6e50c25575 --- /dev/null +++ b/ports/drogon/resolv.patch @@ -0,0 +1,13 @@ +diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt +--- a/drogon_ctl/CMakeLists.txt ++++ b/drogon_ctl/CMakeLists.txt +@@ -39,6 +39,9 @@ + if(WIN32) + target_link_libraries(drogon_ctl PRIVATE ws2_32 Rpcrt4) + endif(WIN32) ++if(APPLE) ++ target_link_libraries(drogon_ctl PRIVATE resolv) ++endif() + message(STATUS "bin:" ${INSTALL_BIN_DIR}) + install(TARGETS drogon_ctl RUNTIME DESTINATION ${INSTALL_BIN_DIR}) + if(WIN32) diff --git a/ports/drogon/vcpkg.patch b/ports/drogon/vcpkg.patch index 30a39ace0bac45..a4128264fea167 100644 --- a/ports/drogon/vcpkg.patch +++ b/ports/drogon/vcpkg.patch @@ -1,8 +1,25 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 96d6c6a..9d3dd24 100755 +index 6df5dac..b79036d 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -72,9 +72,9 @@ if(WIN32) +@@ -5,13 +5,11 @@ project(drogon) + message(STATUS "compiler: " ${CMAKE_CXX_COMPILER_ID}) + include(CheckCXXSourceRuns) + check_cxx_source_runs( +- ${PROJECT_SOURCE_DIR}/cmake/tests/binary_compatibility_test.cc +- cross_compiling) ++ "int main(){return 0;}" ++ not_cross_compiling) + +-if(cross_compiling) ++if(!not_cross_compiling) + set(BUILD_PROGRAMS OFF) +-else(cross_compiling) +- set(BUILD_PROGRAMS ON) + endif() + + option(BUILD_CTL "Build drogon_ctl" ${BUILD_PROGRAMS}) +@@ -84,9 +82,9 @@ if(WIN32) PRIVATE $) endif(WIN32) @@ -13,8 +30,8 @@ index 96d6c6a..9d3dd24 100755 +target_link_libraries(${PROJECT_NAME} PUBLIC Trantor::Trantor) if(NOT WIN32) - target_link_libraries(${PROJECT_NAME} PRIVATE dl) -@@ -169,11 +169,11 @@ endif(NOT WIN32) + if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") +@@ -183,11 +181,11 @@ endif(NOT WIN32) if(BUILD_ORM) # find postgres @@ -31,3 +48,12 @@ index 96d6c6a..9d3dd24 100755 set(DROGON_SOURCES ${DROGON_SOURCES} orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc) if(LIBPQ_BATCH_MODE) +@@ -206,7 +204,7 @@ if(BUILD_ORM) + set(DROGON_SOURCES ${DROGON_SOURCES} + orm_lib/src/postgresql_impl/PgConnection.cc) + endif(libpq_supports_batch) +- endif(pg_FOUND) ++ endif(PostgreSQL_FOUND) + + # Find mysql, only mariadb client liberary is supported + find_package(MySQL) diff --git a/versions/baseline.json b/versions/baseline.json index 5445b0e9a507cd..a1e687ac269862 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1665,7 +1665,7 @@ "port-version": 0 }, "drogon": { - "baseline": "1.1.0", + "baseline": "1.3.0", "port-version": 0 }, "dtl": { diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index 799e30866b68bb..01d38fe0616aab 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbe57dbdbffedb8cd5218f8dc76c1bbe35b59b5d", + "version-string": "1.3.0", + "port-version": 0 + }, { "git-tree": "f6370e6a96e12ad2fdd2cbefbe442e6b794091dc", "version-string": "1.1.0", From 77cf040072eba15a398142c43ec7c6a7eb4962e6 Mon Sep 17 00:00:00 2001 From: Don Venable Date: Tue, 2 Feb 2021 17:36:30 -0500 Subject: [PATCH 0630/1694] [libffi] Added armv7-a to allowed architectures for Android 32 bit arm builds (#15821) * Added armv7-a to allowed architectures for Android 32 bit arm builds Closes #15820 * Fixed typo * Bumped port version to 7 * Updated libffi version files --- ports/libffi/CMakeLists.txt | 4 +++- ports/libffi/CONTROL | 2 +- versions/baseline.json | 2 +- versions/l-/libffi.json | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/libffi/CMakeLists.txt b/ports/libffi/CMakeLists.txt index a021c9ffd7d130..c9eba2f13cc5cb 100644 --- a/ports/libffi/CMakeLists.txt +++ b/ports/libffi/CMakeLists.txt @@ -11,7 +11,7 @@ endif() # config variables for ffi.h.in set(VERSION 3.3) -set(KNOWN_PROCESSORS x86 x86_64 AMD64 ARM ARM64 i386 armv7l aarch64) +set(KNOWN_PROCESSORS x86 x86_64 AMD64 ARM ARM64 i386 armv7l armv7-a aarch64) if(NOT CMAKE_SYSTEM_PROCESSOR IN_LIST KNOWN_PROCESSORS) message(FATAL_ERROR "Unknown processor: ${CMAKE_SYSTEM_PROCESSOR}") @@ -21,6 +21,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM") set(TARGET ARM) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l") set(TARGET ARM) +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv7-a") + set(TARGET ARM) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") set(TARGET ARM64) elseif(CMAKE_SYSTEM_NAME MATCHES "BSD" AND CMAKE_SIZEOF_VOID_P EQUAL 4) diff --git a/ports/libffi/CONTROL b/ports/libffi/CONTROL index 477587af230f9d..7ba4813a3ef072 100644 --- a/ports/libffi/CONTROL +++ b/ports/libffi/CONTROL @@ -1,5 +1,5 @@ Source: libffi Version: 3.3 -Port-Version: 6 +Port-Version: 7 Homepage: https://github.com/libffi/libffi Description: Portable, high level programming interface to various calling conventions diff --git a/versions/baseline.json b/versions/baseline.json index a1e687ac269862..e6f949d9141865 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2934,7 +2934,7 @@ }, "libffi": { "baseline": "3.3", - "port-version": 6 + "port-version": 7 }, "libflac": { "baseline": "1.3.3", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index b9525a9a390140..03255992e02428 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7582c1b20c576263d22b8429155ead9117cc7c95", + "version-string": "3.3", + "port-version": 7 + }, { "git-tree": "d656f226f68b97173701d07c53633a3d05702abb", "version-string": "3.3", From e6ba731bdd8ef97d1ae78c81e2327cb9768d8ff4 Mon Sep 17 00:00:00 2001 From: pastdue <30942300+past-due@users.noreply.github.com> Date: Tue, 2 Feb 2021 17:37:29 -0500 Subject: [PATCH 0631/1694] [libidn2] Fix cross-compile (non-Windows) (#15868) * [libidn2] Fix cross-compile (non-Windows) * Convert CONTROL, bump port-version * x-add-version libidn2 --- ports/libidn2/CONTROL | 6 ------ ports/libidn2/portfile.cmake | 1 + ports/libidn2/vcpkg.json | 10 ++++++++++ versions/baseline.json | 2 +- versions/l-/libidn2.json | 5 +++++ 5 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 ports/libidn2/CONTROL create mode 100644 ports/libidn2/vcpkg.json diff --git a/ports/libidn2/CONTROL b/ports/libidn2/CONTROL deleted file mode 100644 index fb29df0323f37c..00000000000000 --- a/ports/libidn2/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libidn2 -Version: 2.3.0 -Port-Version: 1 -Build-Depends: libiconv -Homepage: https://www.gnu.org/software/libidn/ -Description: GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names. diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 7c3054b1ca00f5..9509d66757f9fe 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -50,6 +50,7 @@ if (VCPKG_TARGET_IS_WINDOWS) else() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG COPY_SOURCE OPTIONS --with-libiconv-prefix=${CURRENT_INSTALLED_DIR} diff --git a/ports/libidn2/vcpkg.json b/ports/libidn2/vcpkg.json new file mode 100644 index 00000000000000..5b5a6b63983b8c --- /dev/null +++ b/ports/libidn2/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libidn2", + "version-string": "2.3.0", + "port-version": 2, + "description": "GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.", + "homepage": "https://www.gnu.org/software/libidn/", + "dependencies": [ + "libiconv" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index e6f949d9141865..6e5aefd04fb766 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3026,7 +3026,7 @@ }, "libidn2": { "baseline": "2.3.0", - "port-version": 1 + "port-version": 2 }, "libigl": { "baseline": "2.2.0", diff --git a/versions/l-/libidn2.json b/versions/l-/libidn2.json index cbf0a4fb2d0652..688c8a1ace126a 100644 --- a/versions/l-/libidn2.json +++ b/versions/l-/libidn2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f5a62105488c9eb440e97c4d49a1ac6c8fa996c", + "version-string": "2.3.0", + "port-version": 2 + }, { "git-tree": "6d198421acf88e8196da7f2d1389100307f92133", "version-string": "2.3.0", From ba1d3bf194f5ba363e8ee1d8030c69c6ec02f589 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Wed, 3 Feb 2021 08:00:00 +0900 Subject: [PATCH 0632/1694] [metrohash] support Android triplet build (#15715) * [metrohash] support Android build * check ANDROID variable * exclude 'crc' sources that requires non-ARM intrinsic * rewrite CONTROL to vcpkg.json * [metrohash] update checksum and version JSON * [metrohash] apply PR feedback * [metrohash] enable sse4.2 for Clang compiler * [metrohash] fix wrong version string * [metrohash] fix wrong version string --- ports/metrohash/CMakeLists.txt | 16 +++++++++++++--- ports/metrohash/CONTROL | 5 ----- ports/metrohash/portfile.cmake | 10 +++++++--- ports/metrohash/vcpkg.json | 8 ++++++++ versions/baseline.json | 4 ++-- versions/m-/metrohash.json | 5 +++++ 6 files changed, 35 insertions(+), 13 deletions(-) delete mode 100644 ports/metrohash/CONTROL create mode 100644 ports/metrohash/vcpkg.json diff --git a/ports/metrohash/CMakeLists.txt b/ports/metrohash/CMakeLists.txt index 41e1a74b353da5..1c5081203e5e7f 100644 --- a/ports/metrohash/CMakeLists.txt +++ b/ports/metrohash/CMakeLists.txt @@ -5,10 +5,20 @@ set(CMAKE_CXX_STANDARD 17) add_library(metrohash src/metrohash64.cpp src/metrohash128.cpp - src/metrohash128crc.cpp ) -target_compile_options(metrohash PRIVATE -march=native) -set(metro_headers src/metrohash.h src/metrohash64.h src/metrohash128.h src/metrohash128crc.h) +list(APPEND metro_headers src/metrohash.h src/metrohash64.h src/metrohash128.h) + +if(NOT ANDROID) + list(APPEND metro_headers src/metrohash128crc.h) + target_sources(metrohash PRIVATE src/metrohash128crc.cpp) + if(CMAKE_CXX_COMPILER_ID MATCHES Clang) + target_compile_options(metrohash PRIVATE -msse4.2) + endif() +endif() +if(CMAKE_CXX_COMPILER_ID MATCHES GNU) + target_compile_options(metrohash PRIVATE -march=native) +endif() + set_target_properties(metrohash PROPERTIES PUBLIC_HEADER "${metro_headers}" ) diff --git a/ports/metrohash/CONTROL b/ports/metrohash/CONTROL deleted file mode 100644 index 85a795a3c21eb1..00000000000000 --- a/ports/metrohash/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: metrohash -Version: 1.1.3-1 -Homepage: https://github.com/jandrewrogers/MetroHash -Description: MetroHash is a set of state-of-the-art hash functions for non-cryptographic use cases. -Supports: !(uwp|arm|x86) diff --git a/ports/metrohash/portfile.cmake b/ports/metrohash/portfile.cmake index 1c272c818cbced..66f7c957f6a270 100644 --- a/ports/metrohash/portfile.cmake +++ b/ports/metrohash/portfile.cmake @@ -4,11 +4,15 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jandrewrogers/MetroHash - REF 690a521d9beb2e1050cc8f273fdabc13b31bf8f6 - SHA512 51ba58a43f7a60be823746082c1bdebf52a1fd452a0f778434850ccc71dd6f62750fc966ec6aed6b4b523279ad400733df3f56544e2d2e057c212044a2dc16a4 + REF v1.1.3 + SHA512 02b6316e5ebf3d81465eea8a068565452be642394ddf5a53350affbbc9b9bfe1c3d182f7e8f7d49895351c48e11929e465777535e4354e01b6d0ba459e583ac5 HEAD_REF master ) - +if(VCPKG_TARGET_IS_ANDROID) + vcpkg_replace_string(${SOURCE_PATH}/src/metrohash.h + "#include \"metrohash128crc.h\"" + "//#include \"metrohash128crc.h\" // It can't be supported for Android") +endif() configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) configure_file(${CURRENT_PORT_DIR}/Config.cmake.in ${SOURCE_PATH}/cmake/Config.cmake.in COPYONLY) diff --git a/ports/metrohash/vcpkg.json b/ports/metrohash/vcpkg.json new file mode 100644 index 00000000000000..bfb1e672283c83 --- /dev/null +++ b/ports/metrohash/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "metrohash", + "version-string": "1.1.3", + "port-version": 2, + "description": "MetroHash is a set of state-of-the-art hash functions for non-cryptographic use cases", + "homepage": "https://github.com/jandrewrogers/MetroHash", + "supports": "!(uwp | arm | x86)" +} diff --git a/versions/baseline.json b/versions/baseline.json index 6e5aefd04fb766..11b3d0274f1add 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3705,8 +3705,8 @@ "port-version": 7 }, "metrohash": { - "baseline": "1.1.3-1", - "port-version": 0 + "baseline": "1.1.3", + "port-version": 2 }, "mgnlibs": { "baseline": "2019-09-29", diff --git a/versions/m-/metrohash.json b/versions/m-/metrohash.json index c8884e1744fced..8bdb8f146041a3 100644 --- a/versions/m-/metrohash.json +++ b/versions/m-/metrohash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c764c9b22fa64b5194e65f69bfb28bc47dc20fc", + "version-string": "1.1.3", + "port-version": 2 + }, { "git-tree": "e322e34deeeb1ae533217d85ceea0b6ad36ec64e", "version-string": "1.1.3-1", From 3999d2c03d99bce7279de2532636f305385b3d11 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Tue, 2 Feb 2021 15:00:33 -0800 Subject: [PATCH 0633/1694] [vcpkg] Miscellaneous internal improvements extracted from #15424 (#15677) * [vcpkg] Miscellaneous internal improvements extracted from #15424 * [vcpkg] CR comments * [armadillo] Use vcpkg_from_git() to workaround gitlab missing archive Co-authored-by: Robert Schumacher Co-authored-by: Billy Robert O'Neal III --- ports/armadillo/CONTROL | 1 + ports/armadillo/portfile.cmake | 9 ++-- .../azure-pipelines/linux/azure-pipelines.yml | 2 + .../azure-pipelines/osx/azure-pipelines.yml | 2 + .../windows/azure-pipelines.yml | 1 + toolsrc/include/vcpkg-test/util.h | 6 +++ toolsrc/include/vcpkg/base/optional.h | 26 +++++++--- toolsrc/include/vcpkg/dependencies.h | 2 +- toolsrc/include/vcpkg/remove.h | 1 - toolsrc/src/vcpkg-test/catch.cpp | 3 +- toolsrc/src/vcpkg-test/commands.build.cpp | 38 -------------- toolsrc/src/vcpkg-test/manifests.cpp | 14 ++++-- toolsrc/src/vcpkg-test/optional.cpp | 27 ++++++++++ toolsrc/src/vcpkg/build.cpp | 3 +- toolsrc/src/vcpkg/commands.ci.cpp | 50 ++++++++++++------- toolsrc/src/vcpkg/dependencies.cpp | 4 +- toolsrc/src/vcpkg/export.prefab.cpp | 2 +- toolsrc/src/vcpkg/paragraphs.cpp | 10 ++++ toolsrc/src/vcpkg/remove.cpp | 11 ++-- toolsrc/src/vcpkg/sourceparagraph.cpp | 9 +++- toolsrc/src/vcpkg/triplet.cpp | 28 ++++------- versions/a-/armadillo.json | 5 ++ versions/baseline.json | 2 +- 23 files changed, 149 insertions(+), 107 deletions(-) delete mode 100644 toolsrc/src/vcpkg-test/commands.build.cpp diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL index 0939fe8f269fe8..dee179680d79d7 100644 --- a/ports/armadillo/CONTROL +++ b/ports/armadillo/CONTROL @@ -1,5 +1,6 @@ Source: armadillo Version: 10.1.0 +Port-Version: 1 Homepage: https://gitlab.com/conradsnicta/armadillo-code Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use Build-Depends: blas, lapack diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index 7ec7bdad0c8250..40d8ab3d86ea0e 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -1,12 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_gitlab( - GITLAB_URL https://gitlab.com +vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH - REPO conradsnicta/armadillo-code - REF 24b4762cbfbd3ad14c99a4854acd3560559a3195 #v 10.1.0 - SHA512 224a875d21168f80e00604185ef72cb559a86a350a037c9cd1660a6f4dcc68f2ebf6dbc073f234a3cb03d35d959adb44ec49af88b11e3aaca9e0017c9c3fcee6 - HEAD_REF 10.1.x + URL https://gitlab.com/conradsnicta/armadillo-code + REF 24b4762cbfbd3ad14c99a4854acd3560559a3195 # v10.1.0 PATCHES remove_custom_modules.patch fix-CMakePath.patch diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 40089bc24f0574..b20908f97dcf03 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -36,6 +36,8 @@ jobs: arguments: '-buildTests' - bash: toolsrc/build.rel/vcpkg-test displayName: 'Run vcpkg tests' + env: + VCPKG_DEBUG: 1 - task: PowerShell@2 displayName: 'Run vcpkg end-to-end tests' inputs: diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index fa0d0e05666d7d..50bba080fbc646 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -33,6 +33,8 @@ jobs: arguments: '-buildTests' - bash: toolsrc/build.rel/vcpkg-test displayName: 'Run vcpkg tests' + env: + VCPKG_DEBUG: 1 - task: PowerShell@2 displayName: 'Run vcpkg end-to-end tests' inputs: diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 3c180f7ebe50f8..4c46e86a778f88 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -45,6 +45,7 @@ jobs: rmdir /s /q build.x86.debug > nul 2> nul cmake.exe -G Ninja -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON -DVCPKG_DEVELOPMENT_WARNINGS=ON -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=ON -B build.x86.debug -S toolsrc ninja.exe -C build.x86.debug + set VCPKG_DEBUG=1 build.x86.debug\vcpkg-test.exe cmake -G "Visual Studio 16 2019" -A Win32 -T v140 -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=OFF -B build.x86.vs2015 -S toolsrc cmake --build build.x86.vs2015 diff --git a/toolsrc/include/vcpkg-test/util.h b/toolsrc/include/vcpkg-test/util.h index d2c512f9bf0eae..1e20531fc3e7ff 100644 --- a/toolsrc/include/vcpkg-test/util.h +++ b/toolsrc/include/vcpkg-test/util.h @@ -32,6 +32,12 @@ namespace Catch value.package_spec.triplet()); } }; + + template<> + struct StringMaker + { + static const std::string& convert(const vcpkg::Triplet& triplet) { return triplet.canonical_name(); } + }; } namespace vcpkg::Test diff --git a/toolsrc/include/vcpkg/base/optional.h b/toolsrc/include/vcpkg/base/optional.h index c66f891c73a25b..d8c72ca6dea1a7 100644 --- a/toolsrc/include/vcpkg/base/optional.h +++ b/toolsrc/include/vcpkg/base/optional.h @@ -288,32 +288,46 @@ namespace vcpkg using map_t = decltype(std::declval()(std::declval())); template> - U then(F f) const& + Optional map(F f) const& { if (has_value()) { return f(this->m_base.value()); } - else + return nullopt; + } + + template> + U then(F f) const& + { + if (has_value()) { - return nullopt; + return f(this->m_base.value()); } + return nullopt; } template using move_map_t = decltype(std::declval()(std::declval())); template> - U then(F f) && + Optional map(F f) && { if (has_value()) { return f(std::move(this->m_base.value())); } - else + return nullopt; + } + + template> + U then(F f) && + { + if (has_value()) { - return nullopt; + return f(std::move(this->m_base.value())); } + return nullopt; } friend bool operator==(const Optional& lhs, const Optional& rhs) diff --git a/toolsrc/include/vcpkg/dependencies.h b/toolsrc/include/vcpkg/dependencies.h index 4736bc02c96e9d..1b1a7748b674c3 100644 --- a/toolsrc/include/vcpkg/dependencies.h +++ b/toolsrc/include/vcpkg/dependencies.h @@ -132,7 +132,7 @@ namespace vcpkg::Dependencies RequestType request_type; Optional core_paragraph() const; - std::vector dependencies(Triplet triplet) const; + std::vector dependencies() const; private: Optional m_installed_package; diff --git a/toolsrc/include/vcpkg/remove.h b/toolsrc/include/vcpkg/remove.h index 06bdc23f529687..faba3e3686c530 100644 --- a/toolsrc/include/vcpkg/remove.h +++ b/toolsrc/include/vcpkg/remove.h @@ -23,7 +23,6 @@ namespace vcpkg::Remove extern const CommandStructure COMMAND_STRUCTURE; - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, Triplet default_triplet); void remove_package(const VcpkgPaths& paths, const PackageSpec& spec, StatusParagraphs* status_db); struct RemoveCommand : Commands::TripletCommand diff --git a/toolsrc/src/vcpkg-test/catch.cpp b/toolsrc/src/vcpkg-test/catch.cpp index 50331c644296f9..fb62c5d06e2226 100644 --- a/toolsrc/src/vcpkg-test/catch.cpp +++ b/toolsrc/src/vcpkg-test/catch.cpp @@ -2,10 +2,11 @@ #include #include +#include int main(int argc, char** argv) { - vcpkg::Debug::g_debugging = true; + if (vcpkg::System::get_environment_variable("VCPKG_DEBUG").value_or("") == "1") vcpkg::Debug::g_debugging = true; return Catch::Session().run(argc, argv); } diff --git a/toolsrc/src/vcpkg-test/commands.build.cpp b/toolsrc/src/vcpkg-test/commands.build.cpp deleted file mode 100644 index 467fadd72010a3..00000000000000 --- a/toolsrc/src/vcpkg-test/commands.build.cpp +++ /dev/null @@ -1,38 +0,0 @@ -#include - -#include - -#include -#include -#include -#include - -#include -#include - -#include - -using namespace vcpkg; - -TEST_CASE ("build smoke test", "[commands-build]") -{ - static const std::string args_raw[] = {"build", "zlib"}; - - auto& fs_wrapper = Files::get_real_filesystem(); - VcpkgCmdArguments args = VcpkgCmdArguments::create_from_arg_sequence(std::begin(args_raw), std::end(args_raw)); - args.binary_caching = false; - args.buildtrees_root_dir = - std::make_unique(fs::u8string(Test::base_temporary_directory() / fs::u8path("buildtrees"))); - args.install_root_dir = - std::make_unique(fs::u8string(Test::base_temporary_directory() / fs::u8path("installed"))); - args.packages_root_dir = - std::make_unique(fs::u8string(Test::base_temporary_directory() / fs::u8path("packages"))); - VcpkgPaths paths(fs_wrapper, args); - if (fs_wrapper.exists(paths.buildtrees)) fs_wrapper.remove_all_inside(paths.buildtrees, VCPKG_LINE_INFO); - if (fs_wrapper.exists(paths.packages)) fs_wrapper.remove_all_inside(paths.packages, VCPKG_LINE_INFO); - if (fs_wrapper.exists(paths.installed)) fs_wrapper.remove_all_inside(paths.installed, VCPKG_LINE_INFO); - auto triplet = default_triplet(args); - const auto exit_code = Build::Command::perform(args, paths, triplet); - REQUIRE(exit_code == 0); - REQUIRE(paths.get_filesystem().is_directory(paths.buildtrees / fs::u8path("zlib"))); -} diff --git a/toolsrc/src/vcpkg-test/manifests.cpp b/toolsrc/src/vcpkg-test/manifests.cpp index 0af9f4f968a409..7cf92818eb33db 100644 --- a/toolsrc/src/vcpkg-test/manifests.cpp +++ b/toolsrc/src/vcpkg-test/manifests.cpp @@ -691,13 +691,21 @@ TEST_CASE ("Serialize all the ports", "[manifests]") const auto manifest = dir / fs::u8path("vcpkg.json"); if (fs.exists(control)) { + INFO(fs::u8string(control)); auto contents = fs.read_contents(control, VCPKG_LINE_INFO); auto pghs = Paragraphs::parse_paragraphs(contents, fs::u8string(control)); REQUIRE(pghs); - scfs.push_back(std::move(*SourceControlFile::parse_control_file( - fs::u8string(control), std::move(pghs).value_or_exit(VCPKG_LINE_INFO)) - .value_or_exit(VCPKG_LINE_INFO))); + auto scf = SourceControlFile::parse_control_file(fs::u8string(control), + std::move(pghs).value_or_exit(VCPKG_LINE_INFO)); + if (!scf) + { + INFO(scf.error()->name); + INFO(scf.error()->error); + REQUIRE(scf); + } + + scfs.push_back(std::move(*scf.value_or_exit(VCPKG_LINE_INFO))); } else if (fs.exists(manifest)) { diff --git a/toolsrc/src/vcpkg-test/optional.cpp b/toolsrc/src/vcpkg-test/optional.cpp index c2656d97e7b39e..f18efb359995e3 100644 --- a/toolsrc/src/vcpkg-test/optional.cpp +++ b/toolsrc/src/vcpkg-test/optional.cpp @@ -80,6 +80,33 @@ TEST_CASE ("value conversion", "[optional]") REQUIRE(o_v.get()->size() == 3); } +TEST_CASE ("optional.map", "[optional]") +{ + using vcpkg::NullOpt; + using vcpkg::nullopt; + using vcpkg::Optional; + + const Optional> move_only; + + Optional m = move_only.map([](auto&& p) { return p.get(); }); + Optional> n = + move_only.map([](auto&& p) -> Optional { return p ? Optional{p.get()} : nullopt; }); + Optional o = move_only.map([](auto&&) { return nullopt; }); + + Optional five = 5; + + struct MoveTest + { + int operator()(int&&) { return 1; } + int operator()(const int&) { return -1; } + } move_test; + + Optional dst = std::move(five).map(move_test); + REQUIRE(dst == 1); + Optional dst2 = five.map(move_test); + REQUIRE(dst2 == -1); +} + TEST_CASE ("common_projection", "[optional]") { using vcpkg::Util::common_projection; diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index daaed3e9860bbf..53bdd83419d470 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -983,7 +983,8 @@ namespace vcpkg::Build const auto& abi_info = action.abi_info.value_or_exit(VCPKG_LINE_INFO); const auto& triplet_abi = paths.get_triplet_info(abi_info); - abi_tag_entries.emplace_back("triplet", triplet_abi); + abi_tag_entries.emplace_back("triplet", triplet.canonical_name()); + abi_tag_entries.emplace_back("triplet_abi", triplet_abi); abi_entries_from_abi_info(abi_info, abi_tag_entries); // If there is an unusually large number of files in the port then diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp index efe705e3d75cf2..26ae058add1b04 100644 --- a/toolsrc/src/vcpkg/commands.ci.cpp +++ b/toolsrc/src/vcpkg/commands.ci.cpp @@ -271,7 +271,7 @@ namespace vcpkg::Commands::CI std::vector unknown; std::map known; std::map> features; - std::unordered_map default_feature_provider; + Dependencies::ActionPlan plan; std::map abi_map; }; @@ -324,28 +324,20 @@ namespace vcpkg::Commands::CI auto timer = Chrono::ElapsedTimer::create_started(); - Checks::check_exit(VCPKG_LINE_INFO, - action_plan.already_installed.empty(), - "Cannot use CI command with packages already installed."); + Checks::check_exit(VCPKG_LINE_INFO, action_plan.already_installed.empty()); + Checks::check_exit(VCPKG_LINE_INFO, action_plan.remove_actions.empty()); Build::compute_all_abis(paths, action_plan, var_provider, {}); + auto precheck_results = binary_provider_precheck(paths, action_plan, binaryprovider); { vcpkg::System::BufferedPrint stdout_print; - auto precheck_results = binary_provider_precheck(paths, action_plan, binaryprovider); for (auto&& action : action_plan.install_actions) { auto p = &action; ret->abi_map.emplace(action.spec, action.abi_info.value_or_exit(VCPKG_LINE_INFO).package_abi); ret->features.emplace(action.spec, action.feature_list); - if (auto scfl = p->source_control_file_location.get()) - { - auto emp = ret->default_feature_provider.emplace(p->spec.name(), scfl->clone()); - emp.first->second.source_control_file->core_paragraph->default_features = p->feature_list; - - p->build_options = vcpkg::Build::backcompat_prohibiting_package_options; - } auto precheck_result = precheck_results.at(&action); bool b_will_build = false; @@ -399,6 +391,30 @@ namespace vcpkg::Commands::CI } } // flush stdout_print + // This algorithm consumes the previous action plan to build and return a reduced one. + std::vector&& input_install_actions = std::move(action_plan.install_actions); + std::vector rev_install_actions; + rev_install_actions.reserve(input_install_actions.size()); + std::set to_keep; + for (auto it = input_install_actions.rbegin(); it != input_install_actions.rend(); ++it) + { + if (!Util::Sets::contains(ret->known, it->spec)) + { + to_keep.insert(it->spec); + } + + if (Util::Sets::contains(to_keep, it->spec)) + { + rev_install_actions.push_back(&*it); + to_keep.insert(it->package_dependencies.begin(), it->package_dependencies.end()); + } + } + + for (auto it = rev_install_actions.rbegin(); it != rev_install_actions.rend(); ++it) + { + ret->plan.install_actions.push_back(std::move(**it)); + } + System::printf("Time to determine pass/fail: %s\n", timer.elapsed()); return ret; } @@ -480,10 +496,6 @@ namespace vcpkg::Commands::CI return FullPackageSpec{spec, std::move(default_features)}; }); - auto split_specs = find_unknown_ports_for_ci( - paths, exclusions_set, provider, var_provider, all_default_full_specs, binaryprovider); - PortFileProvider::MapPortFileProvider new_default_provider(split_specs->default_feature_provider); - Dependencies::CreateInstallPlanOptions serialize_options; struct RandomizerInstance : Graphs::Randomizer @@ -503,8 +515,10 @@ namespace vcpkg::Commands::CI serialize_options.randomizer = &randomizer_instance; } - auto action_plan = Dependencies::create_feature_install_plan( - new_default_provider, var_provider, split_specs->unknown, status_db, serialize_options); + auto split_specs = find_unknown_ports_for_ci( + paths, exclusions_set, provider, var_provider, all_default_full_specs, binaryprovider); + + auto& action_plan = split_specs->plan; for (auto&& action : action_plan.install_actions) { diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index 68415b9aad6c89..83066312e0ae12 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -503,7 +503,7 @@ namespace vcpkg::Dependencies return nullopt; } - std::vector ExportPlanAction::dependencies(Triplet) const + std::vector ExportPlanAction::dependencies() const { if (auto p_ip = m_installed_package.get()) return p_ip->dependencies(); @@ -590,7 +590,7 @@ namespace vcpkg::Dependencies std::vector adjacency_list(const ExportPlanAction& plan) const override { - return plan.dependencies(plan.spec.triplet()); + return plan.dependencies(); } ExportPlanAction load_vertex_data(const PackageSpec& spec) const override diff --git a/toolsrc/src/vcpkg/export.prefab.cpp b/toolsrc/src/vcpkg/export.prefab.cpp index 852a499814a51f..2ca8e87f76ea17 100644 --- a/toolsrc/src/vcpkg/export.prefab.cpp +++ b/toolsrc/src/vcpkg/export.prefab.cpp @@ -378,7 +378,7 @@ namespace vcpkg::Export::Prefab for (const auto& action : export_plan) { const std::string name = action.spec.name(); - auto dependencies = action.dependencies(default_triplet); + auto dependencies = action.dependencies(); const auto action_build_info = Build::read_build_info(utils, paths.build_info_file_path(action.spec)); const bool is_empty_package = action_build_info.policies.is_enabled(Build::BuildPolicy::EMPTY_PACKAGE); diff --git a/toolsrc/src/vcpkg/paragraphs.cpp b/toolsrc/src/vcpkg/paragraphs.cpp index dc93ee2db597ff..4b46219682735b 100644 --- a/toolsrc/src/vcpkg/paragraphs.cpp +++ b/toolsrc/src/vcpkg/paragraphs.cpp @@ -399,6 +399,16 @@ namespace vcpkg::Paragraphs bcf.features = Util::fmap(*p, [&](auto&& raw_feature) -> BinaryParagraph { return BinaryParagraph(raw_feature); }); + if (bcf.core_paragraph.spec != spec) + { + return Strings::concat("Mismatched spec in package at ", + fs::u8string(paths.package_dir(spec)), + ": expected ", + spec, + ", actual ", + bcf.core_paragraph.spec); + } + return bcf; } diff --git a/toolsrc/src/vcpkg/remove.cpp b/toolsrc/src/vcpkg/remove.cpp index e066917478fd1e..e29ae16c8f750c 100644 --- a/toolsrc/src/vcpkg/remove.cpp +++ b/toolsrc/src/vcpkg/remove.cpp @@ -214,7 +214,9 @@ namespace vcpkg::Remove &valid_arguments, }; - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, Triplet default_triplet) + void RemoveCommand::perform_and_exit(const VcpkgCmdArguments& args, + const VcpkgPaths& paths, + Triplet default_triplet) const { if (paths.manifest_mode_enabled()) { @@ -332,11 +334,4 @@ namespace vcpkg::Remove Checks::exit_success(VCPKG_LINE_INFO); } - - void RemoveCommand::perform_and_exit(const VcpkgCmdArguments& args, - const VcpkgPaths& paths, - Triplet default_triplet) const - { - Remove::perform_and_exit(args, paths, default_triplet); - } } diff --git a/toolsrc/src/vcpkg/sourceparagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp index 61cc7f8264d542..52f72da9435bea 100644 --- a/toolsrc/src/vcpkg/sourceparagraph.cpp +++ b/toolsrc/src/vcpkg/sourceparagraph.cpp @@ -1202,6 +1202,12 @@ namespace vcpkg return ret; } + static bool is_dependency_trivial(const Dependency& dep) + { + return dep.features.empty() && dep.platform.is_empty() && dep.extra_info.is_empty() && + dep.constraint.type == Versions::Constraint::Type::None; + } + static Json::Object serialize_manifest_impl(const SourceControlFile& scf, bool debug) { auto serialize_paragraph = @@ -1246,8 +1252,7 @@ namespace vcpkg } }; auto serialize_dependency = [&](Json::Array& arr, const Dependency& dep) { - if (dep.features.empty() && dep.platform.is_empty() && dep.extra_info.is_empty() && - dep.constraint.type == Versions::Constraint::Type::None) + if (is_dependency_trivial(dep)) { arr.push_back(Json::Value::string(dep.name)); } diff --git a/toolsrc/src/vcpkg/triplet.cpp b/toolsrc/src/vcpkg/triplet.cpp index e69f75b112095e..9943ec9a8ed012 100644 --- a/toolsrc/src/vcpkg/triplet.cpp +++ b/toolsrc/src/vcpkg/triplet.cpp @@ -81,38 +81,30 @@ namespace vcpkg } else { - auto vcpkg_default_triplet_env = System::get_environment_variable("VCPKG_DEFAULT_TRIPLET"); - if (auto v = vcpkg_default_triplet_env.get()) - { - return Triplet::from_canonical_name(std::move(*v)); - } - else - { #if defined(_WIN32) - return Triplet::from_canonical_name("x86-windows"); + return Triplet::from_canonical_name("x86-windows"); #elif defined(__APPLE__) - return Triplet::from_canonical_name("x64-osx"); + return Triplet::from_canonical_name("x64-osx"); #elif defined(__FreeBSD__) - return Triplet::from_canonical_name("x64-freebsd"); + return Triplet::from_canonical_name("x64-freebsd"); #elif defined(__OpenBSD__) - return Triplet::from_canonical_name("x64-openbsd"); + return Triplet::from_canonical_name("x64-openbsd"); #elif defined(__GLIBC__) #if defined(__aarch64__) - return Triplet::from_canonical_name("arm64-linux"); + return Triplet::from_canonical_name("arm64-linux"); #elif defined(__arm__) - return Triplet::from_canonical_name("arm-linux"); + return Triplet::from_canonical_name("arm-linux"); #elif defined(__s390x__) - return Triplet::from_canonical_name("s390x-linux"); + return Triplet::from_canonical_name("s390x-linux"); #elif (defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || defined(__PPC64LE__)) && \ defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) - return Triplet::from_canonical_name("ppc64le-linux"); + return Triplet::from_canonical_name("ppc64le-linux"); #else - return Triplet::from_canonical_name("x64-linux"); + return Triplet::from_canonical_name("x64-linux"); #endif #else - return Triplet::from_canonical_name("x64-linux-musl"); + return Triplet::from_canonical_name("x64-linux-musl"); #endif - } } } } diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index fa267c3876288d..e696b6548f9a36 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ec327570d6731dbd87ebdee5a0cebdd8bd62ed7", + "version-string": "10.1.0", + "port-version": 1 + }, { "git-tree": "fa82d7d3b12f794825dad7fddcda2b08f268c2b2", "version-string": "10.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 11b3d0274f1add..be8a57f801a4bf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -138,7 +138,7 @@ }, "armadillo": { "baseline": "10.1.0", - "port-version": 0 + "port-version": 1 }, "arrayfire": { "baseline": "3.7.3", From 7d8518c0176b7fa49f462646df84b79cb487203e Mon Sep 17 00:00:00 2001 From: Tanguy Fautre Date: Tue, 2 Feb 2021 23:12:41 +0000 Subject: [PATCH 0634/1694] [Arrow] Update to 3.0.0 (#15757) * Cherry picked WiP (Update to arrow-2.0.0) * Point to arrow-3.0.0 files * Add missing re2 dependency. Sort dependency list alphabetically. * Configure ARROW_SNAPPY_USE_SHARED * Configure ARROW_THRIFT_USE_SHARED * Spaces vs tabs. * Fix Thrift and Lz4 library finding logic. * Fix debug arrow (shared) linking against release snappy. Tell CI x86 is not supported. * Fix debug arrow (shared) linking against release snappy (for real this time). * Fix linux build not finding Lz4. * Fix thrift finding on Linux (was pointing to an intermediate dir) * Try to fix macOS 10.x build. * Update port_versions. * update version * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/arrow/CONTROL | 8 +- ports/arrow/all.patch | 291 +++++++++++++++++-------------------- ports/arrow/portfile.cmake | 7 +- versions/a-/arrow.json | 5 + versions/baseline.json | 4 +- 5 files changed, 146 insertions(+), 169 deletions(-) diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL index 40ce8f95bf5e78..8aace675f92463 100644 --- a/ports/arrow/CONTROL +++ b/ports/arrow/CONTROL @@ -1,10 +1,10 @@ Source: arrow -Version: 1.0.1 -Port-Version: 2 -Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, bzip2, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser, openssl, utf8proc +Version: 3.0.0 +Port-Version: 0 +Build-Depends: boost-algorithm, boost-filesystem, boost-multiprecision, boost-system, brotli, bzip2, double-conversion, flatbuffers, gflags, glog, lz4, openssl, rapidjson, re2, snappy, thrift, uriparser, utf8proc, zlib, zstd Homepage: https://github.com/apache/arrow Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations. -Supports: x64&!arm +Supports: x64&!x86&!arm Default-Features: csv, json, parquet, filesystem Feature: csv diff --git a/ports/arrow/all.patch b/ports/arrow/all.patch index 65260b148a1aeb..838a9dcb45b1dd 100644 --- a/ports/arrow/all.patch +++ b/ports/arrow/all.patch @@ -1,120 +1,169 @@ diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake -index e4e13cb70..58ca626da 100644 +index e59b4a38a..9bd895608 100644 --- a/cpp/cmake_modules/BuildUtils.cmake +++ b/cpp/cmake_modules/BuildUtils.cmake -@@ -335,7 +335,7 @@ function(ADD_ARROW_LIB LIB_NAME) +@@ -440,7 +440,7 @@ function(ADD_ARROW_LIB LIB_NAME) target_include_directories(${LIB_NAME}_static PRIVATE ${ARG_PRIVATE_INCLUDES}) endif() - -- if(MSVC) -+ if(MSVC AND 0) + +- if(MSVC_TOOLCHAIN) ++ if(MSVC_TOOLCHAIN AND 0) set(LIB_NAME_STATIC ${LIB_NAME}_static) else() set(LIB_NAME_STATIC ${LIB_NAME}) diff --git a/cpp/cmake_modules/FindBrotli.cmake b/cpp/cmake_modules/FindBrotli.cmake -index bf47915c4..053e605a0 100644 +index b46a0f1a0..3d87f5204 100644 --- a/cpp/cmake_modules/FindBrotli.cmake +++ b/cpp/cmake_modules/FindBrotli.cmake -@@ -64,8 +64,7 @@ if(BROTLI_ROOT) - PATH_SUFFIXES ${INCLUDE_PATH_SUFFIXES} +@@ -69,9 +69,9 @@ if(BROTLI_ROOT) + PATH_SUFFIXES ${ARROW_INCLUDE_PATH_SUFFIXES} NO_DEFAULT_PATH) else() +- find_package(PkgConfig QUIET) - pkg_check_modules(BROTLI_PC libbrotlicommon libbrotlienc libbrotlidec) - if(BROTLI_PC_FOUND) -+ if(0) # Find via pkg_check_modules disabled as incompatible with vcpkg ++ #find_package(PkgConfig QUIET) ++ #pkg_check_modules(BROTLI_PC libbrotlicommon libbrotlienc libbrotlidec) ++ if(BROTLI_PC_FOUND AND 0) # Find via pkg_check_modules disabled as incompatible with vcpkg set(BROTLI_INCLUDE_DIR "${BROTLI_PC_libbrotlicommon_INCLUDEDIR}") - + # Some systems (e.g. Fedora) don't fill Brotli_LIBRARY_DIRS, so add the other dirs here. diff --git a/cpp/cmake_modules/FindLz4.cmake b/cpp/cmake_modules/FindLz4.cmake -index 841091643..bb5a00a50 100644 +index 14b6d93b9..d8d80c408 100644 --- a/cpp/cmake_modules/FindLz4.cmake +++ b/cpp/cmake_modules/FindLz4.cmake -@@ -19,14 +19,16 @@ if(MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX) - set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static") - endif() - --set(LZ4_STATIC_LIB_SUFFIX "${LZ4_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") +@@ -15,10 +15,12 @@ + # specific language governing permissions and limitations + # under the License. + +-if(MSVC_TOOLCHAIN AND NOT DEFINED LZ4_MSVC_LIB_PREFIX) +- set(LZ4_MSVC_LIB_PREFIX "lib") ++# Avoid the debug build linking to the release library by mistake. ++# In theory harmless if static linking at this point, but disastrous if done for a shared library. +if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") + set(LZ4_LIB_NAME_DEBUG_SUFFIX d) -+endif() - --set(LZ4_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_STATIC_LIB_SUFFIX}) -+set(LZ4_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_MSVC_STATIC_LIB_SUFFIX}${LZ4_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) - + endif() +-set(LZ4_LIB_NAME_BASE "${LZ4_MSVC_LIB_PREFIX}lz4") ++set(LZ4_LIB_NAME_BASE "lz4${LZ4_LIB_NAME_DEBUG_SUFFIX}") + + if(ARROW_LZ4_USE_SHARED) + set(LZ4_LIB_NAMES) +@@ -34,12 +36,8 @@ if(ARROW_LZ4_USE_SHARED) + LZ4_LIB_NAMES + "${CMAKE_SHARED_LIBRARY_PREFIX}${LZ4_LIB_NAME_BASE}${CMAKE_SHARED_LIBRARY_SUFFIX}") + else() +- if(MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX) +- set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static") +- endif() +- set(LZ4_STATIC_LIB_SUFFIX "${LZ4_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") + set(LZ4_LIB_NAMES +- "${CMAKE_STATIC_LIBRARY_PREFIX}${LZ4_LIB_NAME_BASE}${LZ4_STATIC_LIB_SUFFIX}") ++ "${CMAKE_STATIC_LIBRARY_PREFIX}${LZ4_LIB_NAME_BASE}${CMAKE_STATIC_LIBRARY_SUFFIX}") + endif() + if(LZ4_ROOT) - find_library( - LZ4_LIB -- NAMES lz4 ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME} -+ NAMES lz4${LZ4_LIB_NAME_DEBUG_SUFFIX} ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME} - "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}" - PATHS ${LZ4_ROOT} - PATH_SUFFIXES ${LIB_PATH_SUFFIXES} -@@ -38,19 +40,19 @@ if(LZ4_ROOT) - PATH_SUFFIXES ${INCLUDE_PATH_SUFFIXES}) - +@@ -56,8 +54,8 @@ if(LZ4_ROOT) + else() + find_package(PkgConfig QUIET) - pkg_check_modules(LZ4_PC liblz4) - if(LZ4_PC_FOUND) + #pkg_check_modules(LZ4_PC liblz4) -+ if(0) #if(LZ4_PC_FOUND) # Disabled as sometimes incompatible with vcpkg on Linux and OSX ++ if(0) # Do not use pkg_check_modules, doesn't seem to work correctly on some macOS versions (10.x in GitHub Actions) set(LZ4_INCLUDE_DIR "${LZ4_PC_INCLUDEDIR}") - + list(APPEND LZ4_PC_LIBRARY_DIRS "${LZ4_PC_LIBDIR}") -- find_library(LZ4_LIB lz4 -+ find_library(LZ4_LIB lz4${LZ4_LIB_NAME_DEBUG_SUFFIX} ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME} - PATHS ${LZ4_PC_LIBRARY_DIRS} - NO_DEFAULT_PATH - PATH_SUFFIXES ${LIB_PATH_SUFFIXES}) - else() - find_library( - LZ4_LIB -- NAMES lz4 ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME} -+ NAMES lz4${LZ4_LIB_NAME_DEBUG_SUFFIX} ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME} - "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}" - PATH_SUFFIXES ${LIB_PATH_SUFFIXES}) - find_path(LZ4_INCLUDE_DIR NAMES lz4.h PATH_SUFFIXES ${INCLUDE_PATH_SUFFIXES}) +diff --git a/cpp/cmake_modules/FindSnappy.cmake b/cpp/cmake_modules/FindSnappy.cmake +index 5784cf592..817cf0c47 100644 +--- a/cpp/cmake_modules/FindSnappy.cmake ++++ b/cpp/cmake_modules/FindSnappy.cmake +@@ -15,20 +15,27 @@ + # specific language governing permissions and limitations + # under the License. + ++# Avoid the debug build linking to the release library by mistake. ++# In theory harmless if static linking at this point, but disastrous if done for a shared library. ++if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(SNAPPY_LIB_NAME_DEBUG_SUFFIX d) ++endif() ++ ++set(SNAPPY_LIB_NAME_BASE "snappy${SNAPPY_LIB_NAME_DEBUG_SUFFIX}") ++ + if(ARROW_SNAPPY_USE_SHARED) + set(SNAPPY_LIB_NAMES) + if(CMAKE_IMPORT_LIBRARY_SUFFIX) + list(APPEND SNAPPY_LIB_NAMES +- "${CMAKE_IMPORT_LIBRARY_PREFIX}snappy${CMAKE_IMPORT_LIBRARY_SUFFIX}") ++ "${CMAKE_IMPORT_LIBRARY_PREFIX}${SNAPPY_LIB_NAME_BASE}${CMAKE_IMPORT_LIBRARY_SUFFIX}") + endif() + list(APPEND SNAPPY_LIB_NAMES +- "${CMAKE_SHARED_LIBRARY_PREFIX}snappy${CMAKE_SHARED_LIBRARY_SUFFIX}") ++ "${CMAKE_SHARED_LIBRARY_PREFIX}${SNAPPY_LIB_NAME_BASE}${CMAKE_SHARED_LIBRARY_SUFFIX}") + else() +- set(SNAPPY_STATIC_LIB_NAME_BASE "snappy") + if(MSVC) +- set(SNAPPY_STATIC_LIB_NAME_BASE "${SNAPPY_STATIC_LIB_NAME_BASE}${SNAPPY_MSVC_STATIC_LIB_SUFFIX}") ++ set(SNAPPY_STATIC_LIB_NAME_BASE "${SNAPPY_LIB_NAME_BASE}${SNAPPY_MSVC_STATIC_LIB_SUFFIX}") + endif() +- set(SNAPPY_LIB_NAMES "${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_STATIC_LIB_NAME_BASE}${CMAKE_STATIC_LIBRARY_SUFFIX}") ++ set(SNAPPY_LIB_NAMES "${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME_BASE}${CMAKE_STATIC_LIBRARY_SUFFIX}") + endif() + + if(Snappy_ROOT) diff --git a/cpp/cmake_modules/FindThrift.cmake b/cpp/cmake_modules/FindThrift.cmake -index bb3eb5608..0b03d37d3 100644 +index 273d907ed..65f477f54 100644 --- a/cpp/cmake_modules/FindThrift.cmake +++ b/cpp/cmake_modules/FindThrift.cmake -@@ -43,6 +43,10 @@ if(MSVC AND NOT THRIFT_MSVC_STATIC_LIB_SUFFIX) - set(THRIFT_MSVC_STATIC_LIB_SUFFIX md) - endif() - +@@ -39,6 +39,12 @@ function(EXTRACT_THRIFT_VERSION) + endif() + endfunction(EXTRACT_THRIFT_VERSION) + ++# Avoid the debug build linking to the release library by mistake. ++# In theory harmless if static linking at this point, but disastrous if done for a shared library. +if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") + set(THRIFT_LIB_NAME_DEBUG_SUFFIX d) +endif() + - if(Thrift_ROOT) - find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX} - PATHS ${Thrift_ROOT} -@@ -61,16 +65,14 @@ else() - + if(MSVC_TOOLCHAIN AND NOT DEFINED THRIFT_MSVC_LIB_SUFFIX) + if(NOT ARROW_THRIFT_USE_SHARED) + if(ARROW_USE_STATIC_CRT) +@@ -48,7 +54,7 @@ if(MSVC_TOOLCHAIN AND NOT DEFINED THRIFT_MSVC_LIB_SUFFIX) + endif() + endif() + endif() +-set(THRIFT_LIB_NAME_BASE "thrift${THRIFT_MSVC_LIB_SUFFIX}") ++set(THRIFT_LIB_NAME_BASE "thrift${THRIFT_MSVC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX}") + + if(ARROW_THRIFT_USE_SHARED) + set(THRIFT_LIB_NAMES thrift) +@@ -84,8 +90,8 @@ else() + # THRIFT-4760: The pkgconfig files are currently only installed when using autotools. + # Starting with 0.13, they are also installed for the CMake-based installations of Thrift. + find_package(PkgConfig QUIET) +- pkg_check_modules(THRIFT_PC thrift) +- if(THRIFT_PC_FOUND) ++ #pkg_check_modules(THRIFT_PC thrift) ++ if(0) # Do not use pkg_check_modules, as it finds the wrong location (an intermediate build dir). + set(THRIFT_INCLUDE_DIR "${THRIFT_PC_INCLUDEDIR}") + list(APPEND THRIFT_PC_LIBRARY_DIRS "${THRIFT_PC_LIBDIR}") - -- find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX} -- PATHS ${THRIFT_PC_LIBRARY_DIRS} -- NO_DEFAULT_PATH) -+ find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX} -+ PATHS ${THRIFT_PC_LIBRARY_DIRS}) - find_program(THRIFT_COMPILER thrift - HINTS ${THRIFT_PC_PREFIX} -- NO_DEFAULT_PATH - PATH_SUFFIXES "bin") +@@ -101,8 +107,7 @@ else() set(THRIFT_VERSION ${THRIFT_PC_VERSION}) else() -- find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX} -+ find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX} - PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib") + find_library(THRIFT_LIB +- NAMES ${THRIFT_LIB_NAMES} +- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib") ++ NAMES ${THRIFT_LIB_NAMES}) find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h PATH_SUFFIXES "include") find_program(THRIFT_COMPILER thrift PATH_SUFFIXES "bin") -diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake -index 84d21d2b5..971a9dec3 100644 ---- a/cpp/cmake_modules/FindZSTD.cmake -+++ b/cpp/cmake_modules/FindZSTD.cmake -@@ -24,11 +24,11 @@ if(ARROW_ZSTD_USE_SHARED) - list(APPEND ZSTD_LIB_NAMES - "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${CMAKE_SHARED_LIBRARY_SUFFIX}") + extract_thrift_version() +diff --git a/cpp/cmake_modules/Findzstd.cmake b/cpp/cmake_modules/Findzstd.cmake +index 6659a682d..d8cc4f72d 100644 +--- a/cpp/cmake_modules/Findzstd.cmake ++++ b/cpp/cmake_modules/Findzstd.cmake +@@ -34,13 +34,14 @@ if(ARROW_ZSTD_USE_SHARED) + ZSTD_LIB_NAMES + "${CMAKE_SHARED_LIBRARY_PREFIX}${ZSTD_LIB_NAME_BASE}${CMAKE_SHARED_LIBRARY_SUFFIX}") else() - if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX) - set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static") @@ -124,90 +173,10 @@ index 84d21d2b5..971a9dec3 100644 set(ZSTD_STATIC_LIB_SUFFIX - "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") + "${ZSTD_MSVC_DEBUG_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") - set(ZSTD_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX}) - set(ZSTD_LIB_NAMES "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}") + set(ZSTD_LIB_NAMES +- "${CMAKE_STATIC_LIBRARY_PREFIX}${ZSTD_LIB_NAME_BASE}${ZSTD_STATIC_LIB_SUFFIX}") ++ "zstd${ZSTD_STATIC_LIB_SUFFIX}" ++ "libzstd${ZSTD_STATIC_LIB_SUFFIX}") endif() -@@ -49,8 +49,8 @@ if(ZSTD_ROOT) - - else() - # Second, find via pkg_check_modules -- pkg_check_modules(ZSTD_PC libzstd) -- if(ZSTD_PC_FOUND) -+ #pkg_check_modules(ZSTD_PC libzstd) -+ if(0) #(ZSTD_PC_FOUND) # Disabled as sometimes incompatible with vcpkg on Linux and OSX - set(ZSTD_INCLUDE_DIR "${ZSTD_PC_INCLUDEDIR}") - list(APPEND ZSTD_PC_LIBRARY_DIRS "${ZSTD_PC_LIBDIR}") -diff --git a/cpp/cmake_modules/DefineOptions.cmake b/cpp/cmake_modules/DefineOptions.cmake -index 3b229846c..da2c6d551 100644 ---- a/cpp/cmake_modules/DefineOptions.cmake -+++ b/cpp/cmake_modules/DefineOptions.cmake -@@ -297,6 +297,9 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") - define_option(ARROW_PROTOBUF_USE_SHARED - "Rely on Protocol Buffers shared libraries where relevant" ON) - -+ define_option(ARROW_UTF8PROC_USE_SHARED -+ "Rely on utf8proc shared libraries where relevant" ON) -+ - define_option(ARROW_ZSTD_USE_SHARED "Rely on zstd shared libraries where relevant" ON) - - define_option(ARROW_WITH_BACKTRACE "Build with backtrace support" ON) -diff --git a/cpp/cmake_modules/Findutf8proc.cmake b/cpp/cmake_modules/Findutf8proc.cmake -index ab9ae9f98..d3063827a 100644 ---- a/cpp/cmake_modules/Findutf8proc.cmake -+++ b/cpp/cmake_modules/Findutf8proc.cmake -@@ -15,11 +15,28 @@ - # specific language governing permissions and limitations - # under the License. - -+if(ARROW_UTF8PROC_USE_SHARED) -+ set(UTF8PROC_LIB_NAMES) -+ if(CMAKE_IMPORT_LIBRARY_SUFFIX) -+ list(APPEND UTF8PROC_LIB_NAMES -+ "${CMAKE_IMPORT_LIBRARY_PREFIX}utf8proc${CMAKE_IMPORT_LIBRARY_SUFFIX}") -+ endif() -+ list(APPEND UTF8PROC_LIB_NAMES -+ "${CMAKE_SHARED_LIBRARY_PREFIX}utf8proc${CMAKE_SHARED_LIBRARY_SUFFIX}") -+else() -+ if(MSVC AND NOT DEFINED UTF8PROC_MSVC_STATIC_LIB_SUFFIX) -+ set(UTF8PROC_MSVC_STATIC_LIB_SUFFIX "_static") -+ endif() -+ set(UTF8PROC_STATIC_LIB_SUFFIX -+ "${UTF8PROC_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") -+ set(UTF8PROC_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}utf8proc${UTF8PROC_STATIC_LIB_SUFFIX}) -+ set(UTF8PROC_LIB_NAMES "${UTF8PROC_STATIC_LIB_NAME}" "lib${UTF8PROC_STATIC_LIB_NAME}") -+endif() -+ - if(utf8proc_ROOT) - find_library( - UTF8PROC_LIB -- NAMES utf8proc -- "${CMAKE_SHARED_LIBRARY_PREFIX}utf8proc${CMAKE_SHARED_LIBRARY_SUFFIX}" -+ NAMES ${UTF8PROC_LIB_NAMES} - PATHS ${utf8proc_ROOT} - PATH_SUFFIXES ${LIB_PATH_SUFFIXES} - NO_DEFAULT_PATH) -@@ -28,12 +45,10 @@ if(utf8proc_ROOT) - PATHS ${utf8proc_ROOT} - NO_DEFAULT_PATH - PATH_SUFFIXES ${INCLUDE_PATH_SUFFIXES}) -- - else() - find_library( - UTF8PROC_LIB -- NAMES utf8proc -- "${CMAKE_SHARED_LIBRARY_PREFIX}utf8proc${CMAKE_SHARED_LIBRARY_SUFFIX}" -+ NAMES ${UTF8PROC_LIB_NAMES} - PATH_SUFFIXES ${LIB_PATH_SUFFIXES}) - find_path(UTF8PROC_INCLUDE_DIR NAMES utf8proc.h PATH_SUFFIXES ${INCLUDE_PATH_SUFFIXES}) - endif() -@@ -47,5 +62,8 @@ if(UTF8PROC_FOUND OR utf8proc_FOUND) - set_target_properties(utf8proc::utf8proc - PROPERTIES IMPORTED_LOCATION "${UTF8PROC_LIB}" - INTERFACE_INCLUDE_DIRECTORIES "${UTF8PROC_INCLUDE_DIR}") -+ if(NOT ARROW_UTF8PROC_USE_SHARED) -+ set_target_properties(utf8proc::utf8proc -+ PROPERTIES INTERFACE_COMPILER_DEFINITIONS "UTF8PROC_STATIC") -+ endif() - endif() -- + # First, find via if specified ZTD_ROOT diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 2ff21fc57a7cfe..a36dad1c1d6fe8 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/arrow - REF apache-arrow-1.0.1 - SHA512 46fedecaf7fa0ff0d8b4ac5f3d7bcbcb75ce4f65d272f775dedd61f091f975cf03fc55e91e46021df9872a82712ca9c9e4eb35414cf46c0f49a26f7a5a3dd50c + REF apache-arrow-3.0.0 + SHA512 02645be0eaaaa69880ab911fc0b74665ebf52a35f9ad05210b23e7b42bcfbe3c3a4d44fa6c4c35af74764efbe528c2e0ebf0549ce5890c796be695ceb94e5606 HEAD_REF master PATCHES all.patch @@ -34,6 +34,9 @@ vcpkg_configure_cmake( -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED} -DARROW_BROTLI_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets -DARROW_GFLAGS_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets + -DARROW_LZ4_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets + -DARROW_SNAPPY_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets + -DARROW_THRIFT_USE_SHARED=OFF # vcpkg doesn't build Thrift as a shared library for the moment (2020/01/22). -DARROW_UTF8PROC_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets -DARROW_ZSTD_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets -DARROW_JEMALLOC=OFF diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index cd706d26e9ba4f..d795d327ada3a2 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc9cb096ffa223f2af620db18ed244d17e47ffe7", + "version-string": "3.0.0", + "port-version": 0 + }, { "git-tree": "604537d50ab45ff96911b5330c51137ac5fc4040", "version-string": "1.0.1", diff --git a/versions/baseline.json b/versions/baseline.json index be8a57f801a4bf..97ef4ae3616c30 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -145,8 +145,8 @@ "port-version": 3 }, "arrow": { - "baseline": "1.0.1", - "port-version": 2 + "baseline": "3.0.0", + "port-version": 0 }, "ashes": { "baseline": "2020-10-21", From 371c5b800582cdef167bf7a7530a50a8ecbd1186 Mon Sep 17 00:00:00 2001 From: Be Date: Tue, 2 Feb 2021 18:40:56 -0800 Subject: [PATCH 0635/1694] [chromaprint] add new port with version 1.5.0 (#15986) --- ports/chromaprint/portfile.cmake | 16 ++++++++++++++++ ports/chromaprint/vcpkg.json | 10 ++++++++++ versions/baseline.json | 4 ++++ versions/c-/chromaprint.json | 9 +++++++++ 4 files changed, 39 insertions(+) create mode 100644 ports/chromaprint/portfile.cmake create mode 100644 ports/chromaprint/vcpkg.json create mode 100644 versions/c-/chromaprint.json diff --git a/ports/chromaprint/portfile.cmake b/ports/chromaprint/portfile.cmake new file mode 100644 index 00000000000000..da430faa5b67f3 --- /dev/null +++ b/ports/chromaprint/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO acoustid/chromaprint + REF v1.5.0 + SHA512 333114949928abdf5d4b11aba1db6ec487eebe526324c68d903b3fa80a3af87a28d942af765a2f873e63a1bf222b658b6438cd10cde4446f61b26ea91f537469 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) +vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/chromaprint/vcpkg.json b/ports/chromaprint/vcpkg.json new file mode 100644 index 00000000000000..4808008c97af67 --- /dev/null +++ b/ports/chromaprint/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "chromaprint", + "version-string": "1.5.0", + "description": "C library for generating audio fingerprints used by AcoustID", + "homepage": "https://github.com/acoustid/chromaprint", + "license": "LGPL-2.1-or-later", + "dependencies": [ + "ffmpeg" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 97ef4ae3616c30..b45ddb950c9ebf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1164,6 +1164,10 @@ "baseline": "0.40-4", "port-version": 0 }, + "chromaprint": { + "baseline": "1.5.0", + "port-version": 0 + }, "chromium-base": { "baseline": "86.0.4199.1", "port-version": 1 diff --git a/versions/c-/chromaprint.json b/versions/c-/chromaprint.json new file mode 100644 index 00000000000000..5fc772975e891d --- /dev/null +++ b/versions/c-/chromaprint.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1f3fe321540c3d87ad63fe85efa5b48bd9c55ac8", + "version-string": "1.5.0", + "port-version": 0 + } + ] +} From 8bbc01be1dd786ae1db2cef43e62769b11751006 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Wed, 3 Feb 2021 10:03:44 -0800 Subject: [PATCH 0636/1694] [vcpkg] fix checking out git registry ports (#16009) * [vcpkg] fix checking out git registry ports * fix the new issues in builtinregistryentry * fix tests * fix tests boogaloo * [vcpkg] Fix issue where baseline is requested for overlay during version resolution * split BuiltinRegistryEntry into two types Co-authored-by: Robert Schumacher --- .../end-to-end-tests-dir/registries.ps1 | 32 +++++++++- toolsrc/src/vcpkg/build.cpp | 3 + toolsrc/src/vcpkg/dependencies.cpp | 53 +++++++++++++---- toolsrc/src/vcpkg/registries.cpp | 59 +++++++++++++++---- 4 files changed, 123 insertions(+), 24 deletions(-) diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 index 1ea2cb36d6772a..bdeeb0a15b5da6 100644 --- a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 @@ -68,8 +68,8 @@ try $CurrentTest = 'git init .' git @gitConfigOptions init . Throw-IfFailed - Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/versions" -Destination . Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/vcpkg-internal-e2e-test-port" -Destination . + New-Item -Path './vcpkg-internal-e2e-test-port/foobar' -Value 'this is just to get a distinct git tree' $CurrentTest = 'git add -A' git @gitConfigOptions add -A @@ -77,6 +77,36 @@ try $CurrentTest = 'git commit' git @gitConfigOptions commit -m 'initial commit' Throw-IfFailed + + $vcpkgInternalE2eTestPortGitTree = git rev-parse 'HEAD:vcpkg-internal-e2e-test-port' + $vcpkgInternalE2eTestPortVersionsJson = @{ + "versions" = @( + @{ + "version-string" = "1.0.0"; + "git-tree" = $vcpkgInternalE2eTestPortGitTree + } + ) + } + $vcpkgBaseline = @{ + "default" = @{ + "vcpkg-internal-e2e-test-port" = @{ + "baseline" = "1.0.0" + } + } + } + + New-Item -Path './versions' -ItemType Directory + New-Item -Path './versions/v-' -ItemType Directory + + New-Item -Path './versions/baseline.json' -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgBaseline) + New-Item -Path './versions/v-/vcpkg-internal-e2e-test-port.json' -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgInternalE2eTestPortVersionsJson) + + $CurrentTest = 'git add -A' + git @gitConfigOptions add -A + Throw-IfFailed + $CurrentTest = 'git commit' + git @gitConfigOptions commit --amend --no-edit + Throw-IfFailed } finally { diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 53bdd83419d470..b38062f0c93da2 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -344,6 +344,9 @@ namespace vcpkg::Build "for more information.\n"); Checks::exit_maybe_upgrade(VCPKG_LINE_INFO); #else + (void)target_architecture; + (void)toolset; + (void)all_toolsets; Checks::exit_with_message(VCPKG_LINE_INFO, "Error: vcvars-based toolchains are only usable on Windows platforms."); #endif diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index 83066312e0ae12..aafdec065ee581 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -1256,6 +1256,8 @@ namespace vcpkg::Dependencies VersionSchemeInfo& vsi, const std::string& feature); + Optional dep_to_version(const std::string& name, const DependencyConstraint& dc); + std::vector m_errors; }; @@ -1452,17 +1454,31 @@ namespace vcpkg::Dependencies const Dependency& dep, const std::string& origin) { - auto base_ver = m_base_provider.get_baseline_version(dep.name); - auto dep_ver = to_version(dep.constraint); - - if (auto dv = dep_ver.get()) + auto maybe_overlay = m_o_provider.get_control_file(ref.first.name()); + auto over_it = m_overrides.find(ref.first.name()); + if (auto p_overlay = maybe_overlay.get()) { - add_constraint(ref, *dv, origin); + auto overlay_version = to_version(*p_overlay->source_control_file); + add_constraint(ref, overlay_version, origin); } - - if (auto bv = base_ver.get()) + else if (over_it != m_overrides.end()) { - add_constraint(ref, *bv, origin); + add_constraint(ref, over_it->second, origin); + } + else + { + auto base_ver = m_base_provider.get_baseline_version(dep.name); + auto dep_ver = to_version(dep.constraint); + + if (auto dv = dep_ver.get()) + { + add_constraint(ref, *dv, origin); + } + + if (auto bv = base_ver.get()) + { + add_constraint(ref, *bv, origin); + } } for (auto&& f : dep.features) @@ -1569,10 +1585,21 @@ namespace vcpkg::Dependencies return *m_graph.emplace(spec, PackageNode{}).first; } - static Optional dep_to_version(const std::string& name, - const DependencyConstraint& dc, - const PortFileProvider::IBaselineProvider& base_provider) + Optional VersionedPackageGraph::dep_to_version(const std::string& name, + const DependencyConstraint& dc) { + auto maybe_overlay = m_o_provider.get_control_file(name); + if (auto p_overlay = maybe_overlay.get()) + { + return to_version(*p_overlay->source_control_file); + } + + auto over_it = m_overrides.find(name); + if (over_it != m_overrides.end()) + { + return over_it->second; + } + auto maybe_cons = to_version(dc); if (maybe_cons) { @@ -1580,7 +1607,7 @@ namespace vcpkg::Dependencies } else { - return base_provider.get_baseline_version(name); + return m_base_provider.get_baseline_version(name); } } @@ -1779,7 +1806,7 @@ namespace vcpkg::Dependencies { continue; } - auto maybe_cons = dep_to_version(dep.name, dep.constraint, m_base_provider); + auto maybe_cons = dep_to_version(dep.name, dep.constraint); if (auto cons = maybe_cons.get()) { diff --git a/toolsrc/src/vcpkg/registries.cpp b/toolsrc/src/vcpkg/registries.cpp index 44a6314abcd54c..971e8d0c298d55 100644 --- a/toolsrc/src/vcpkg/registries.cpp +++ b/toolsrc/src/vcpkg/registries.cpp @@ -99,7 +99,7 @@ namespace DelayedInit m_baseline; }; - struct BuiltinRegistryEntry final : RegistryEntry + struct BuiltinPortTreeRegistryEntry final : RegistryEntry { View get_port_versions() const override { return {&version, 1}; } ExpectedS get_path_to_version(const VcpkgPaths&, const VersionT& v) const override @@ -108,6 +108,7 @@ namespace { return path; } + return {Strings::format("Error: no version entry for %s at version %s.\n" "We are currently using the version in the ports tree (%s).", name, @@ -121,6 +122,19 @@ namespace VersionT version; }; + struct BuiltinGitRegistryEntry final : RegistryEntry + { + View get_port_versions() const override { return port_versions; } + ExpectedS get_path_to_version(const VcpkgPaths&, const VersionT& version) const override; + + std::string port_name; + + // these two map port versions to git trees + // these shall have the same size, and git_trees[i] shall be the git tree for port_versions[i] + std::vector port_versions; + std::vector git_trees; + }; + struct FilesystemRegistryEntry final : RegistryEntry { explicit FilesystemRegistryEntry(std::string&& port_name) : port_name(port_name) { } @@ -248,14 +262,14 @@ namespace VCPKG_LINE_INFO, maybe_version_entries.has_value(), "Error: " + maybe_version_entries.error()); auto version_entries = std::move(maybe_version_entries).value_or_exit(VCPKG_LINE_INFO); - auto gre = std::make_unique(); - gre->port_name = port_name.to_string(); + auto res = std::make_unique(); + res->port_name = port_name.to_string(); for (auto&& version_entry : version_entries) { - gre->port_versions.push_back(version_entry.version); - gre->git_trees.push_back(version_entry.git_tree); + res->port_versions.push_back(version_entry.version); + res->git_trees.push_back(version_entry.git_tree); } - return gre; + return res; } } @@ -275,10 +289,10 @@ namespace if (scf->core_paragraph->name == port_name) { - auto res = std::make_unique(); - res->version = scf->core_paragraph->to_versiont(); - res->path = std::move(port_directory); + auto res = std::make_unique(); res->name = std::move(scf->core_paragraph->name); + res->path = std::move(port_directory); + res->version = scf->to_versiont(); return res; } Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, @@ -583,6 +597,31 @@ namespace // { RegistryEntry + // { BuiltinRegistryEntry::RegistryEntry + ExpectedS BuiltinGitRegistryEntry::get_path_to_version(const VcpkgPaths& paths, + const VersionT& version) const + { + auto it = std::find(port_versions.begin(), port_versions.end(), version); + if (it == port_versions.end()) + { + return {Strings::concat("Error: No version entry for ", + port_name, + " at version ", + version, + ". This may be fixed by updating vcpkg to the latest master via `git " + "pull`.\nAvailable versions:\n", + Strings::join("", + port_versions, + [](const VersionT& v) { return Strings::concat(" ", v, "\n"); }), + "\nSee `vcpkg help versioning` for more information."), + expected_right_tag}; + } + + const auto& git_tree = git_trees[it - port_versions.begin()]; + return paths.git_checkout_port(port_name, git_tree, paths.root / fs::u8path(".git")); + } + // } BuiltinRegistryEntry::RegistryEntry + // { FilesystemRegistryEntry::RegistryEntry ExpectedS FilesystemRegistryEntry::get_path_to_version(const VcpkgPaths&, const VersionT& version) const { @@ -617,7 +656,7 @@ namespace } const auto& git_tree = git_trees[it - port_versions.begin()]; - return paths.git_checkout_port(port_name, git_tree, paths.root / fs::u8path(".git")); + return paths.git_checkout_object_from_remote_registry(git_tree); } // } GitRegistryEntry::RegistryEntry From 5321c036e801e8501e8882ee384edbc70677decf Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 3 Feb 2021 19:32:49 +0100 Subject: [PATCH 0637/1694] should fix mac os --- ports/mapnik/portfile.cmake | 6 +++--- ports/mapnik/vcpkg.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 4f5cf696d0c2ee..b674767ce2bb7e 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 0b76278adce93d844d9cd135074d1631cd2ef173 - SHA512 1c2033ab67cf129883f4cf0d1c98d81eb7ca5568faaaa9277cf46c30c9b220e16b9e0b28831fe44c5fa0c2101ebc061fb47ba7490e893375f394d615d39e1816 + REF 1f73d1c77171165ee8d404be77fe0d4e566b3bd2 + SHA512 f634d0946190cb7f1360722e26dc14e2f852746a828c68535c2742f27059bd474276e08dca8eb7411654af30c3cac983b3cc01d6f04fd8533d0f2f44d51637e5 HEAD_REF master ) @@ -14,7 +14,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS webp USE_WEBP libxml2 USE_LIBXML2 cairo USE_CAIRO - proj4 USE_PROJ4 + proj USE_PROJ "grid-renderer" USE_GRID_RENDERER "svg-renderer" USE_SVG_RENDERER "input-csv" USE_PLUGIN_INPUT_CSV diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 8a1d99af78d78f..97b702144e5c35 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -141,11 +141,11 @@ "libpng" ] }, - "proj4": { - "description": "PROJ4 Functionalities", + "proj": { + "description": "PROJ Functionalities", "dependencies": [ { - "name": "proj4", + "name": "proj", "features": [ "database" ] From 8099db64c8065cda50d4947abc939dea89298da5 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 3 Feb 2021 19:32:49 +0100 Subject: [PATCH 0638/1694] should fix mac os --- ports/mapnik/portfile.cmake | 6 +++--- ports/mapnik/vcpkg.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 4f5cf696d0c2ee..b674767ce2bb7e 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 0b76278adce93d844d9cd135074d1631cd2ef173 - SHA512 1c2033ab67cf129883f4cf0d1c98d81eb7ca5568faaaa9277cf46c30c9b220e16b9e0b28831fe44c5fa0c2101ebc061fb47ba7490e893375f394d615d39e1816 + REF 1f73d1c77171165ee8d404be77fe0d4e566b3bd2 + SHA512 f634d0946190cb7f1360722e26dc14e2f852746a828c68535c2742f27059bd474276e08dca8eb7411654af30c3cac983b3cc01d6f04fd8533d0f2f44d51637e5 HEAD_REF master ) @@ -14,7 +14,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS webp USE_WEBP libxml2 USE_LIBXML2 cairo USE_CAIRO - proj4 USE_PROJ4 + proj USE_PROJ "grid-renderer" USE_GRID_RENDERER "svg-renderer" USE_SVG_RENDERER "input-csv" USE_PLUGIN_INPUT_CSV diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 8a1d99af78d78f..97b702144e5c35 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -141,11 +141,11 @@ "libpng" ] }, - "proj4": { - "description": "PROJ4 Functionalities", + "proj": { + "description": "PROJ Functionalities", "dependencies": [ { - "name": "proj4", + "name": "proj", "features": [ "database" ] From a0cfda89c8bf3c86a53c48f56044e6f61c3deff5 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 3 Feb 2021 19:50:00 +0100 Subject: [PATCH 0639/1694] bump version in advance --- ports/mapnik/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 97b702144e5c35..dd714c48a1f140 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mapnik", - "version-string": "3.0.23", + "version-string": "4.0.0", "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "supports": "!(static & windows)", From 8b2d6e3e160850536ba33fcd497d851d91a7bb8a Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 3 Feb 2021 19:50:00 +0100 Subject: [PATCH 0640/1694] bump version in advance --- ports/mapnik/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 97b702144e5c35..dd714c48a1f140 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mapnik", - "version-string": "3.0.23", + "version-string": "4.0.0", "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "supports": "!(static & windows)", From 92885985b40d2852ad1ac266df15e763381e36d8 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 3 Feb 2021 19:51:42 +0100 Subject: [PATCH 0641/1694] fix space --- ports/mapnik/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index b674767ce2bb7e..d67c22e7e8a092 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS webp USE_WEBP libxml2 USE_LIBXML2 cairo USE_CAIRO - proj USE_PROJ + proj USE_PROJ "grid-renderer" USE_GRID_RENDERER "svg-renderer" USE_SVG_RENDERER "input-csv" USE_PLUGIN_INPUT_CSV From ac955b4c8ee160c9db27ce58ed833e9ff4714339 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 3 Feb 2021 19:51:42 +0100 Subject: [PATCH 0642/1694] fix space --- ports/mapnik/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index b674767ce2bb7e..d67c22e7e8a092 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS webp USE_WEBP libxml2 USE_LIBXML2 cairo USE_CAIRO - proj USE_PROJ + proj USE_PROJ "grid-renderer" USE_GRID_RENDERER "svg-renderer" USE_SVG_RENDERER "input-csv" USE_PLUGIN_INPUT_CSV From 98bf5ff1be8a38e3fa166aaf8293b9ba2d0e1dfb Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 3 Feb 2021 11:11:27 -0800 Subject: [PATCH 0643/1694] [vcpkg] Apply fixes needed to extract vcpkg-tool (#16012) utilities.cmake: Disable warnings that are firing on Azure Pipelines CI machines due to different Clang version. expected.h: Fix a bug I introduced in https://github.com/microsoft/vcpkg/pull/15638/ because I was under the impression expected worked like optional (in that value_or_exit for it should be treated as a program bug) build.cpp: Add (void)s to silence warnings. binarycaching.cpp: Repair assumption that the current directory is C: which isn't true on the Hosted Azure Pipelines agents. others: Make unit tests respect %VCPKG_ROOT%, as necessary in the vcpkg_tool repo. Note that this required splitting vcpkgcmdarguments::ImbueFromEnvironment into the once-only process modifying part and the just imbue from environment part. --- toolsrc/cmake/utilities.cmake | 22 +++++-- toolsrc/include/vcpkg/base/expected.h | 2 +- toolsrc/include/vcpkg/vcpkgcmdarguments.h | 6 +- toolsrc/src/vcpkg-test/binarycaching.cpp | 28 +++------ toolsrc/src/vcpkg-test/manifests.cpp | 1 + toolsrc/src/vcpkg.cpp | 1 + toolsrc/src/vcpkg/vcpkgcmdarguments.cpp | 77 +++++++++++------------ 7 files changed, 73 insertions(+), 64 deletions(-) diff --git a/toolsrc/cmake/utilities.cmake b/toolsrc/cmake/utilities.cmake index 9523b9d9782662..4b434a9c76aba4 100644 --- a/toolsrc/cmake/utilities.cmake +++ b/toolsrc/cmake/utilities.cmake @@ -204,7 +204,13 @@ function(vcpkg_target_add_warning_options TARGET) if(VCPKG_DEVELOPMENT_WARNINGS) target_compile_options(${TARGET} PRIVATE -W4) if(VCPKG_COMPILER STREQUAL "clang") - target_compile_options(${TARGET} PRIVATE -Wmissing-prototypes -Wno-missing-field-initializers) + # -Wno-range-loop-analysis is due to an LLVM bug which will be fixed in a + # future version of clang https://reviews.llvm.org/D73007 + target_compile_options(${TARGET} PRIVATE + -Wmissing-prototypes + -Wno-missing-field-initializers + -Wno-range-loop-analysis + ) else() target_compile_options(${TARGET} PRIVATE -analyze) endif() @@ -219,13 +225,21 @@ function(vcpkg_target_add_warning_options TARGET) if(VCPKG_DEVELOPMENT_WARNINGS) target_compile_options(${TARGET} PRIVATE -Wall -Wextra -Wpedantic - -Wno-unknown-pragmas -Wno-missing-field-initializers -Wno-redundant-move) + -Wno-unknown-pragmas + -Wno-missing-field-initializers + -Wno-redundant-move + ) # GCC and clang have different names for the same warning if(VCPKG_COMPILER STREQUAL "gcc") - target_compile_options(${TARGET} PRIVATE -Wmissing-declarations) + target_compile_options(${TARGET} PRIVATE + -Wmissing-declarations + ) elseif(VCPKG_COMPILER STREQUAL "clang") - target_compile_options(${TARGET} PRIVATE -Wmissing-prototypes) + target_compile_options(${TARGET} PRIVATE + -Wmissing-prototypes + -Wno-range-loop-analysis + ) endif() endif() diff --git a/toolsrc/include/vcpkg/base/expected.h b/toolsrc/include/vcpkg/base/expected.h index 13e70057d3d690..f24366c4a69b09 100644 --- a/toolsrc/include/vcpkg/base/expected.h +++ b/toolsrc/include/vcpkg/base/expected.h @@ -229,7 +229,7 @@ namespace vcpkg if (m_s.has_error()) { System::print2(System::Color::error, m_s.to_string(), "\n"); - Checks::unreachable(line_info); + Checks::exit_fail(line_info); } } diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h index 365f892a0bc70f..14208e926be8dc 100644 --- a/toolsrc/include/vcpkg/vcpkgcmdarguments.h +++ b/toolsrc/include/vcpkg/vcpkgcmdarguments.h @@ -212,7 +212,6 @@ namespace vcpkg } bool output_json() const { return json.value_or(false); } - bool is_recursive_invocation() const { return m_is_recursive_invocation; } std::string command; std::vector command_arguments; @@ -221,13 +220,16 @@ namespace vcpkg void imbue_from_environment(); + // Applies recursive settings from the environment or sets a global environment variable + // to be consumed by subprocesses; may only be called once per process. + static void imbue_or_apply_process_recursion(VcpkgCmdArguments& args); + void check_feature_flag_consistency() const; void debug_print_feature_flags() const; void track_feature_flag_metrics() const; private: - bool m_is_recursive_invocation = false; std::unordered_set command_switches; std::unordered_map> command_options; }; diff --git a/toolsrc/src/vcpkg-test/binarycaching.cpp b/toolsrc/src/vcpkg-test/binarycaching.cpp index 3cede064c585bb..8a1a28d237b739 100644 --- a/toolsrc/src/vcpkg-test/binarycaching.cpp +++ b/toolsrc/src/vcpkg-test/binarycaching.cpp @@ -58,7 +58,11 @@ TEST_CASE ("generate_nuspec", "[generate_nuspec]") { auto& fsWrapper = Files::get_real_filesystem(); VcpkgCmdArguments args = VcpkgCmdArguments::create_from_arg_sequence(nullptr, nullptr); + args.imbue_from_environment(); args.packages_root_dir = std::make_unique("/"); + auto pkgPath = fsWrapper.absolute(VCPKG_LINE_INFO, fs::u8path("/zlib2_x64-windows")) / fs::u8path("**"); + pkgPath.make_preferred(); + const auto pkgPathStr = fs::u8string(pkgPath); VcpkgPaths paths(fsWrapper, args); auto pghs = Paragraphs::parse_paragraphs(R"( @@ -101,11 +105,6 @@ Build-Depends: bzip { auto nuspec = generate_nuspec(paths, ipa, ref, {}); -#ifdef _WIN32 -#define PKGPATH "C:\\zlib2_x64-windows\\**" -#else -#define PKGPATH "/zlib2_x64-windows/**" -#endif std::string expected = R"( zlib2_x64-windows @@ -125,7 +124,8 @@ Features: a, b - + )"; REQUIRE_EQUAL_TEXT(nuspec, expected); @@ -133,11 +133,6 @@ Features: a, b { auto nuspec = generate_nuspec(paths, ipa, ref, {"urlvalue"}); -#ifdef _WIN32 -#define PKGPATH "C:\\zlib2_x64-windows\\**" -#else -#define PKGPATH "/zlib2_x64-windows/**" -#endif std::string expected = R"( zlib2_x64-windows @@ -158,18 +153,14 @@ Features: a, b - + )"; REQUIRE_EQUAL_TEXT(nuspec, expected); } { auto nuspec = generate_nuspec(paths, ipa, ref, {"urlvalue", "branchvalue", "commitvalue"}); -#ifdef _WIN32 -#define PKGPATH "C:\\zlib2_x64-windows\\**" -#else -#define PKGPATH "/zlib2_x64-windows/**" -#endif std::string expected = R"( zlib2_x64-windows @@ -190,7 +181,8 @@ Features: a, b - + )"; REQUIRE_EQUAL_TEXT(nuspec, expected); diff --git a/toolsrc/src/vcpkg-test/manifests.cpp b/toolsrc/src/vcpkg-test/manifests.cpp index 7cf92818eb33db..bbbe0c96c51481 100644 --- a/toolsrc/src/vcpkg-test/manifests.cpp +++ b/toolsrc/src/vcpkg-test/manifests.cpp @@ -681,6 +681,7 @@ TEST_CASE ("Serialize all the ports", "[manifests]") std::vector args_list = {"format-manifest"}; auto& fs = Files::get_real_filesystem(); auto args = VcpkgCmdArguments::create_from_arg_sequence(args_list.data(), args_list.data() + args_list.size()); + args.imbue_from_environment(); VcpkgPaths paths{fs, args}; std::vector scfs; diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index ccc951f101e82a..f25a0c3b602cbe 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -226,6 +226,7 @@ int main(const int argc, const char* const* const argv) VcpkgCmdArguments args = VcpkgCmdArguments::create_from_command_line(fs, argc, argv); if (const auto p = args.debug.get()) Debug::g_debugging = *p; args.imbue_from_environment(); + VcpkgCmdArguments::imbue_or_apply_process_recursion(args); args.check_feature_flag_consistency(); { diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp index e5e8e5aad485df..6ac05e538072e1 100644 --- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp +++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp @@ -648,13 +648,6 @@ namespace vcpkg void VcpkgCmdArguments::imbue_from_environment() { - static bool s_reentrancy_guard = false; - Checks::check_exit(VCPKG_LINE_INFO, - !s_reentrancy_guard, - "VcpkgCmdArguments::imbue_from_environment() modifies global state and thus may only be " - "called once per process."); - s_reentrancy_guard = true; - if (!disable_metrics) { const auto vcpkg_disable_metrics_env = System::get_environment_variable(DISABLE_METRICS_ENV); @@ -701,46 +694,52 @@ namespace vcpkg parse_feature_flags(flags, *this); } } + } - { - auto maybe_vcpkg_recursive_data = System::get_environment_variable(RECURSIVE_DATA_ENV); - if (auto vcpkg_recursive_data = maybe_vcpkg_recursive_data.get()) - { - m_is_recursive_invocation = true; - - auto rec_doc = Json::parse(*vcpkg_recursive_data).value_or_exit(VCPKG_LINE_INFO).first; - const auto& obj = rec_doc.object(); - - if (auto entry = obj.get(DOWNLOADS_ROOT_DIR_ENV)) - { - downloads_root_dir = std::make_unique(entry->string().to_string()); - } + void VcpkgCmdArguments::imbue_or_apply_process_recursion(VcpkgCmdArguments& args) + { + static bool s_reentrancy_guard = false; + Checks::check_exit( + VCPKG_LINE_INFO, + !s_reentrancy_guard, + "VcpkgCmdArguments::imbue_or_apply_process_recursion() modifies global state and thus may only be " + "called once per process."); + s_reentrancy_guard = true; - if (obj.get(DISABLE_METRICS_ENV)) - { - disable_metrics = true; - } + auto maybe_vcpkg_recursive_data = System::get_environment_variable(RECURSIVE_DATA_ENV); + if (auto vcpkg_recursive_data = maybe_vcpkg_recursive_data.get()) + { + auto rec_doc = Json::parse(*vcpkg_recursive_data).value_or_exit(VCPKG_LINE_INFO).first; + const auto& obj = rec_doc.object(); - // Setting the recursive data to 'poison' prevents more than one level of recursion because - // Json::parse() will fail. - System::set_environment_variable(RECURSIVE_DATA_ENV, "poison"); + if (auto entry = obj.get(DOWNLOADS_ROOT_DIR_ENV)) + { + args.downloads_root_dir = std::make_unique(entry->string().to_string()); } - else + + if (obj.get(DISABLE_METRICS_ENV)) { - Json::Object obj; - if (downloads_root_dir) - { - obj.insert(DOWNLOADS_ROOT_DIR_ENV, Json::Value::string(*downloads_root_dir.get())); - } + args.disable_metrics = true; + } - if (disable_metrics) - { - obj.insert(DISABLE_METRICS_ENV, Json::Value::boolean(true)); - } + // Setting the recursive data to 'poison' prevents more than one level of recursion because + // Json::parse() will fail. + System::set_environment_variable(RECURSIVE_DATA_ENV, "poison"); + } + else + { + Json::Object obj; + if (args.downloads_root_dir) + { + obj.insert(DOWNLOADS_ROOT_DIR_ENV, Json::Value::string(*args.downloads_root_dir.get())); + } - System::set_environment_variable(RECURSIVE_DATA_ENV, - Json::stringify(obj, Json::JsonStyle::with_spaces(0))); + if (args.disable_metrics) + { + obj.insert(DISABLE_METRICS_ENV, Json::Value::boolean(true)); } + + System::set_environment_variable(RECURSIVE_DATA_ENV, Json::stringify(obj, Json::JsonStyle::with_spaces(0))); } } From 34eadf4615a3ec4de62e2251f6886a4343143f48 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Wed, 3 Feb 2021 14:14:31 -0500 Subject: [PATCH 0644/1694] [google-cloud-cpp] update to the latest release (v1.24.0) (#16001) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 4f6ce69108f101..783ac0141e82f1 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.23.0 - SHA512 66c8bc6a878dbe23be0dd8fbe2580b725a2e5dab1b132a53f3454a32ec0cce706bdeae8b08b1922acc892f7983df5bc076e3d16993d5d0c1bda75e8a1195c882 + REF v1.24.0 + SHA512 06d53c1599ad60d5ec201f4fc9526f1bae6aee3c776423b9072c07030c840fb808c4e983b83ca58b7899f56e648b4a73846c8ecad0238e513979964f2d28d072 HEAD_REF master ) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index a99b539c32e006..34ac2656352e23 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version-string": "1.23.0", + "version-string": "1.24.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index b45ddb950c9ebf..cccef3d023f9e2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2217,7 +2217,7 @@ "port-version": 3 }, "google-cloud-cpp": { - "baseline": "1.23.0", + "baseline": "1.24.0", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 3f4e71bcfa2f2b..aac379ab84e8bb 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39f9bad63d71830d31bd827577e3c37621653d5e", + "version-string": "1.24.0", + "port-version": 0 + }, { "git-tree": "ab2377218e8992e8aedf8fed757edb90cc390817", "version-string": "1.23.0", From d08d080690cd4c004682b2a48f8cc821b2ea2c82 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 4 Feb 2021 03:14:54 +0800 Subject: [PATCH 0645/1694] [log4cxx] Fix dependency and pkgconfig (#16018) * [Log4cxx] Fix dependency and pkgconfig * Update versions --- ports/log4cxx/CONTROL | 4 ++-- ports/log4cxx/expat.patch | 6 +++--- ports/log4cxx/pkgconfig.patch | 13 +++++++++++++ ports/log4cxx/portfile.cmake | 12 ++++++++++++ versions/baseline.json | 2 +- versions/l-/log4cxx.json | 5 +++++ 6 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 ports/log4cxx/pkgconfig.patch diff --git a/ports/log4cxx/CONTROL b/ports/log4cxx/CONTROL index b7713bd2f03401..bf34f4ba071c3c 100644 --- a/ports/log4cxx/CONTROL +++ b/ports/log4cxx/CONTROL @@ -1,7 +1,7 @@ Source: log4cxx Version: 0.11.0 -Port-Version: 1 +Port-Version: 2 Homepage: https://logging.apache.org/log4cxx Description: Apache log4cxx is a logging framework for C++ patterned after Apache log4j, which uses Apache Portable Runtime for most platform-specific code and should be usable on any platform supported by APR Supports: !uwp -Build-Depends: apr, apr-util +Build-Depends: apr, apr-util, expat diff --git a/ports/log4cxx/expat.patch b/ports/log4cxx/expat.patch index da01721418b77b..250035021d63dd 100644 --- a/ports/log4cxx/expat.patch +++ b/ports/log4cxx/expat.patch @@ -7,7 +7,7 @@ index d30a71b..3ecf5f0 100644 find_package(APR-Util REQUIRED) +# Find expat for XML parsing -+find_package(EXPAT REQUIRED) ++find_package(expat CONFIG REQUIRED) + # Building add_subdirectory(src) @@ -21,7 +21,7 @@ index 3e0cb17..9a450b7 100644 target_compile_definitions(log4cxx PRIVATE ${LOG4CXX_COMPILE_DEFINITIONS} ${APR_COMPILE_DEFINITIONS} ${APR_UTIL_COMPILE_DEFINITIONS} ) target_include_directories(log4cxx INTERFACE $ PRIVATE ${APR_INCLUDE_DIR} ${APR_UTIL_INCLUDE_DIR}) -target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} ${XMLLIB_LIBRARIES} ${APR_LIBRARIES} ${APR_SYSTEM_LIBS}) -+target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} EXPAT::EXPAT ${APR_LIBRARIES} ${APR_SYSTEM_LIBS}) ++target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} expat::expat ${APR_LIBRARIES} ${APR_SYSTEM_LIBS}) if(WIN32) # The ODBC appender is always enabled in the Windows configuration target_link_libraries(log4cxx PRIVATE odbc32.lib) @@ -55,5 +55,5 @@ index bddfe48..138c489 100644 ) -target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} ${XMLLIB_LIBRARIES}) -+target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} EXPAT::EXPAT) ++target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} expat::expat) set(ALL_LOG4CXX_TESTS ${ALL_LOG4CXX_TESTS} xmltests PARENT_SCOPE) diff --git a/ports/log4cxx/pkgconfig.patch b/ports/log4cxx/pkgconfig.patch new file mode 100644 index 00000000000000..06eb7c00e73da0 --- /dev/null +++ b/ports/log4cxx/pkgconfig.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 523fbd9..0467470 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,7 +66,7 @@ if(UNIX) + ) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblog4cxx.pc" +- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif(UNIX) + + # Support for find_package(log4cxx) in consuming CMake projects using diff --git a/ports/log4cxx/portfile.cmake b/ports/log4cxx/portfile.cmake index 2e9a421af1b697..7292c0007295f4 100644 --- a/ports/log4cxx/portfile.cmake +++ b/ports/log4cxx/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_extract_source_archive_ex( PATCHES expat.patch linux.patch + pkgconfig.patch ) vcpkg_configure_cmake( @@ -25,6 +26,17 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/log4cxx) + +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + vcpkg_fixup_pkgconfig() +endif() + +file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cxxConfig.cmake _contents) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cxxConfig.cmake +"include(CMakeFindDependencyMacro) +find_dependency(expat CONFIG) +${_contents}") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) vcpkg_copy_pdbs() diff --git a/versions/baseline.json b/versions/baseline.json index cccef3d023f9e2..3e75ab8a945704 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3562,7 +3562,7 @@ }, "log4cxx": { "baseline": "0.11.0", - "port-version": 1 + "port-version": 2 }, "loguru": { "baseline": "2.1.0-1", diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json index c83469cb682f4e..791767b1cc9019 100644 --- a/versions/l-/log4cxx.json +++ b/versions/l-/log4cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e84807f759e37781d7ce7bfc3b7485609a0feb7c", + "version-string": "0.11.0", + "port-version": 2 + }, { "git-tree": "a584f921462afb2f1b269dc9a7b361b17445028b", "version-string": "0.11.0", From 3b406d12b7d9185e9e0f31a4be78a03c4a3c3a2b Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 4 Feb 2021 03:16:04 +0800 Subject: [PATCH 0646/1694] [opencascade] Update to 7.5.0 (#15997) * [opencascade] Update to 7.5.0 * update version --- ports/opencascade/CONTROL | 3 +- ports/opencascade/fix-build-with-vs2017.patch | 13 ---- .../opencascade/fix-install-prefix-path.patch | 12 --- ports/opencascade/fix-msvc-32bit-builds.patch | 22 ------ ports/opencascade/fix-pdb-find.patch | 33 ++++++++ ports/opencascade/fix-static-build.patch | 76 ------------------- ports/opencascade/portfile.cmake | 9 +-- versions/baseline.json | 4 +- versions/o-/opencascade.json | 5 ++ 9 files changed, 44 insertions(+), 133 deletions(-) delete mode 100644 ports/opencascade/fix-build-with-vs2017.patch delete mode 100644 ports/opencascade/fix-install-prefix-path.patch delete mode 100644 ports/opencascade/fix-msvc-32bit-builds.patch create mode 100644 ports/opencascade/fix-pdb-find.patch delete mode 100644 ports/opencascade/fix-static-build.patch diff --git a/ports/opencascade/CONTROL b/ports/opencascade/CONTROL index d16b19ff84ee7c..998252a3fbce22 100644 --- a/ports/opencascade/CONTROL +++ b/ports/opencascade/CONTROL @@ -1,6 +1,5 @@ Source: opencascade -Version: 7.4.0 -Port-Version: 3 +Version: 7.5.0 Build-Depends: freetype Description: Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE. Supports: !(uwp|osx|linux|arm) diff --git a/ports/opencascade/fix-build-with-vs2017.patch b/ports/opencascade/fix-build-with-vs2017.patch deleted file mode 100644 index 53b0ab0ea837c8..00000000000000 --- a/ports/opencascade/fix-build-with-vs2017.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake -index 203ca6b..4ff433a 100644 ---- a/adm/cmake/occt_defs_flags.cmake -+++ b/adm/cmake/occt_defs_flags.cmake -@@ -18,7 +18,7 @@ endif() - - # Turn off the "improved inline analyzer" that stalls on x86 release builds using MSVC 16.7 for 32-bit - if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8) -- if (MSVC) -+ if (MSVC AND MSVC_VERSION GREATER 1919) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /d2DeepThoughtInliner-") - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /d2DeepThoughtInliner-") - endif() diff --git a/ports/opencascade/fix-install-prefix-path.patch b/ports/opencascade/fix-install-prefix-path.patch deleted file mode 100644 index 38c07c21da3172..00000000000000 --- a/ports/opencascade/fix-install-prefix-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in -index 4937103b..cd35e07d 100644 ---- a/adm/templates/OpenCASCADEConfig.cmake.in -+++ b/adm/templates/OpenCASCADEConfig.cmake.in -@@ -23,6 +23,7 @@ set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@") - # - in Windows style: $INSTALL_DIR/cmake - get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) - get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) -+get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) - if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$") - get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) - endif() diff --git a/ports/opencascade/fix-msvc-32bit-builds.patch b/ports/opencascade/fix-msvc-32bit-builds.patch deleted file mode 100644 index 2fa76ffb00b89c..00000000000000 --- a/ports/opencascade/fix-msvc-32bit-builds.patch +++ /dev/null @@ -1,22 +0,0 @@ - adm/cmake/occt_defs_flags.cmake | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake -index 5484c67..203ca6b 100644 ---- a/adm/cmake/occt_defs_flags.cmake -+++ b/adm/cmake/occt_defs_flags.cmake -@@ -16,6 +16,14 @@ if (MSVC) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:precise") - endif() - -+# Turn off the "improved inline analyzer" that stalls on x86 release builds using MSVC 16.7 for 32-bit -+if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8) -+ if (MSVC) -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /d2DeepThoughtInliner-") -+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /d2DeepThoughtInliner-") -+ endif() -+endif() -+ - # add SSE2 option for old MSVC compilers (VS 2005 - 2010, 32 bit only) - if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8) - if (MSVC AND ((MSVC_VERSION EQUAL 1400) OR (MSVC_VERSION EQUAL 1500) OR (MSVC_VERSION EQUAL 1600))) diff --git a/ports/opencascade/fix-pdb-find.patch b/ports/opencascade/fix-pdb-find.patch new file mode 100644 index 00000000000000..dd9b108637d03e --- /dev/null +++ b/ports/opencascade/fix-pdb-find.patch @@ -0,0 +1,33 @@ +diff --git a/adm/cmake/cotire.cmake b/adm/cmake/cotire.cmake +index 6cf0cb66..2a9b1793 100644 +--- a/adm/cmake/cotire.cmake ++++ b/adm/cmake/cotire.cmake +@@ -3114,6 +3114,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target) + OSX_ARCHITECTURES OSX_ARCHITECTURES_ PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST + IOS_INSTALL_COMBINED) + # copy Windows platform specific stuff ++ if (BUILD_SHARED_LIBS) + cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} + GNUtoMS + COMPILE_PDB_NAME COMPILE_PDB_NAME_ +@@ -3129,6 +3130,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target) + WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS + DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE + VS_SDK_REFERENCES) ++ endif() + # copy Android platform specific stuff + cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} + ANDROID_API ANDROID_API_MIN ANDROID_GUI +diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake +index 79605059..630a978e 100644 +--- a/adm/cmake/occt_toolkit.cmake ++++ b/adm/cmake/occt_toolkit.cmake +@@ -231,7 +231,7 @@ if (EXECUTABLE_PROJECT) + else() + add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES}) + +- if (MSVC) ++ if (MSVC AND BUILD_SHARED_LIBS) + install (FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb + CONFIGURATIONS Debug RelWithDebInfo + DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}") diff --git a/ports/opencascade/fix-static-build.patch b/ports/opencascade/fix-static-build.patch deleted file mode 100644 index 05c105f588e45d..00000000000000 --- a/ports/opencascade/fix-static-build.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/adm/cmake/freetype.cmake b/adm/cmake/freetype.cmake -index 7f6f950..ca0c525 100644 ---- a/adm/cmake/freetype.cmake -+++ b/adm/cmake/freetype.cmake -@@ -111,6 +111,8 @@ if (IS_BUILTIN_SEARCH_REQUIRED) - endif() - - find_package(Freetype) -+ find_package(freetype CONFIG REQUIRED) -+ set(FREETYPE_LIBRARY freetype) - - # restore ENV{FREETYPE_DIR} - if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}") -@@ -230,6 +232,22 @@ endif() - # set 3RDPARTY_FREETYPE_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_LIBRARY - set (3RDPARTY_FREETYPE_LIBRARY "3RDPARTY_FREETYPE_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to freetype library" FORCE) - -+ if (BUILD_SHARED_LIBS) -+ if (CMAKE_BUILD_TYPE STREQUAL "Debug") -+ get_target_property(3RDPARTY_FREETYPE_LIBRARY freetype IMPORTED_IMPLIB_DEBUG) -+ else() -+ get_target_property(3RDPARTY_FREETYPE_LIBRARY freetype IMPORTED_IMPLIB_RELEASE) -+ endif() -+ else() -+ if (CMAKE_BUILD_TYPE STREQUAL "Debug") -+ get_target_property(3RDPARTY_FREETYPE_LIBRARY freetype IMPORTED_LOCATION_DEBUG) -+ else() -+ get_target_property(3RDPARTY_FREETYPE_LIBRARY freetype IMPORTED_LOCATION_RELEASE) -+ endif() -+ endif() -+ get_filename_component(3RDPARTY_FREETYPE_LIBRARY_DIR ${3RDPARTY_FREETYPE_LIBRARY} DIRECTORY) -+ -+ if(0) - if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}") - find_library (3RDPARTY_FREETYPE_LIBRARY ${CSF_FREETYPE} - PATHS "${3RDPARTY_FREETYPE_LIBRARY_DIR}" "${3RDPARTY_FREETYPE_DIR}" -@@ -257,9 +275,10 @@ endif() - - set (3RDPARTY_FREETYPE_LIBRARY "" CACHE FILEPATH "The path to freetype library" FORCE) - endif() -+ endif() - - # freetype shared library -- if (WIN32) -+ if (0) - if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}") - - set (CMAKE_FIND_LIBRARY_SUFFIXES .dll) -diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake -index f59b163..92175e4 100644 ---- a/adm/cmake/occt_toolkit.cmake -+++ b/adm/cmake/occt_toolkit.cmake -@@ -208,7 +208,7 @@ if (EXECUTABLE_PROJECT) - else() - add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES}) - -- if (MSVC) -+ if (MSVC AND BUILD_SHARED_LIBS) - install (FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb - CONFIGURATIONS Debug RelWithDebInfo - DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}") -diff --git a/src/Font/Font_FontMgr.cxx b/src/Font/Font_FontMgr.cxx -index 4fad2f6..ba64b51 100644 ---- a/src/Font/Font_FontMgr.cxx -+++ b/src/Font/Font_FontMgr.cxx -@@ -36,10 +36,6 @@ IMPLEMENT_STANDARD_RTTIEXT(Font_FontMgr,Standard_Transient) - #include - #include - -- #ifdef _MSC_VER -- #pragma comment (lib, "freetype.lib") -- #endif -- - namespace - { - diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index 90676ada2b4dd1..68bb56397835ac 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Open-Cascade-SAS/OCCT - REF V7_4_0 - SHA512 595ad7226b9365c1a7670b77001f71787a5d8aaa4a93a4a4d8eb938564670d79ae5a247ae7cc770b5da53c9a9f2e4166ba6e5ae104c1f2debad19ec2187f4a56 + REF 628c0211d53c7fe1036a85e7a7b2b067c9c50f7a #V7.5.0 + SHA512 8d946e971417642264b318353fb34ebabf214bff5c705c60818da9e56e9cd658ed15b76b73d7207edffa398c23ad9982f4e9656b218b5edada325ca05c1283bb HEAD_REF master PATCHES - fix-msvc-32bit-builds.patch - fix-build-with-vs2017.patch - fix-static-build.patch - fix-install-prefix-path.patch + fix-pdb-find.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/versions/baseline.json b/versions/baseline.json index 3e75ab8a945704..3bd5b395e79f26 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4209,8 +4209,8 @@ "port-version": 0 }, "opencascade": { - "baseline": "7.4.0", - "port-version": 3 + "baseline": "7.5.0", + "port-version": 0 }, "opencc": { "baseline": "2020-04-26", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index 8abba0291a75ed..cf3e61041fab14 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d003408ab69f77a4ca2c02de115087c87a46b27", + "version-string": "7.5.0", + "port-version": 0 + }, { "git-tree": "dc198546c1a39fc3a26f7fae34f1ca97afa94f32", "version-string": "7.4.0", From 9c9e789b9f862347cd282bacbb965b6125d131aa Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Wed, 3 Feb 2021 11:17:07 -0800 Subject: [PATCH 0647/1694] [vcpkg] Emit parse errors to match '::: error: ' for better IDE compatibility (#15926) Co-authored-by: Robert Schumacher --- toolsrc/src/vcpkg-test/json.cpp | 2 +- toolsrc/src/vcpkg/base/json.cpp | 2 +- toolsrc/src/vcpkg/base/parse.cpp | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/toolsrc/src/vcpkg-test/json.cpp b/toolsrc/src/vcpkg-test/json.cpp index 6858a5ac82eeed..b03fe2aec7d844 100644 --- a/toolsrc/src/vcpkg-test/json.cpp +++ b/toolsrc/src/vcpkg-test/json.cpp @@ -234,7 +234,7 @@ TEST_CASE ("JSON track newlines", "[json]") auto res = Json::parse("{\n,", fs::u8path("filename")); REQUIRE(!res); REQUIRE(res.error()->format() == - R"(Error: filename:2:1: Unexpected character; expected property name + R"(filename:2:1: error: Unexpected character; expected property name on expression: , ^ )"); diff --git a/toolsrc/src/vcpkg/base/json.cpp b/toolsrc/src/vcpkg/base/json.cpp index d99fa73925d9b5..c287eae7812d00 100644 --- a/toolsrc/src/vcpkg/base/json.cpp +++ b/toolsrc/src/vcpkg/base/json.cpp @@ -1062,7 +1062,7 @@ namespace vcpkg::Json ExpectedT, std::unique_ptr> parse(StringView json, const fs::path& filepath) noexcept { - return Parser::parse(json, fs::generic_u8string(filepath)); + return Parser::parse(json, fs::u8string(filepath)); } ExpectedT, std::unique_ptr> parse(StringView json, StringView origin) noexcept diff --git a/toolsrc/src/vcpkg/base/parse.cpp b/toolsrc/src/vcpkg/base/parse.cpp index a082c4d9c710b5..fb1b4c3bfa6322 100644 --- a/toolsrc/src/vcpkg/base/parse.cpp +++ b/toolsrc/src/vcpkg/base/parse.cpp @@ -34,13 +34,12 @@ namespace vcpkg::Parse caret_spacing.push_back(cp == '\t' ? '\t' : ' '); } - return Strings::concat("Error: ", - origin, + return Strings::concat(origin, ":", row, ":", column, - ": ", + ": error: ", message, "\n" " on expression: ", // 18 columns From a7a5a82f0bcd9c8135bb3721427b626e55fe1bde Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Wed, 3 Feb 2021 20:20:35 +0100 Subject: [PATCH 0648/1694] [vcpkg] Add shell.nix for building on NixOS (#15906) NixOS does not follow the FHS/LSB convention and building vcpkg therefore fails. In general, vcpkg is of very limited use for a Nix system. This shell.nix however, allows a developer to enter a environment suitable for building vcpkg and developing packages for use on other platforms. Running with argument withX11 will allow building most packages that require X11 libraries. $ nix-shell --arg withX11 true --- shell.nix | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 shell.nix diff --git a/shell.nix b/shell.nix new file mode 100644 index 00000000000000..accea1a0d14dea --- /dev/null +++ b/shell.nix @@ -0,0 +1,46 @@ +{ pkgs ? import {}, withX11 ? false }: + +(pkgs.buildFHSUserEnv { + name = "vcpkg"; + targetPkgs = pkgs: (with pkgs; [ + autoconf + automake + cmake + gcc + gettext + glibc.dev + gperf + libtool + libxkbcommon.dev + m4 + ninja + pkgconfig + zip + zstd.dev + ] ++ pkgs.lib.optionals withX11 [ + freetds + libdrm.dev + libglvnd.dev + mesa_drivers + mesa_glu.dev + mesa.dev + xlibs.libxcb.dev + xlibs.xcbutilimage.dev + xlibs.xcbutilwm.dev + xlibs.xorgserver.dev + xorg.libpthreadstubs + xorg.libX11.dev + xorg.libxcb.dev + xorg.libXext.dev + xorg.libXi.dev + xorg.xcbproto + xorg.xcbutil.dev + xorg.xcbutilcursor.dev + xorg.xcbutilerrors + xorg.xcbutilkeysyms.dev + xorg.xcbutilrenderutil.dev + xorg.xcbutilwm.dev + xorg.xorgproto + ]); + runScript = "bash"; +}).env \ No newline at end of file From 7772aea872f3e132a56bf721d7600167f8811aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 3 Feb 2021 11:21:48 -0800 Subject: [PATCH 0649/1694] [libpqxx] Fix build with Visual Studio 2017 (#15995) * [libpqxx] Fix build with Visual Studio 2017 * update version record --- ports/libpqxx/CONTROL | 1 + ports/libpqxx/fix-build-with-vs2017.patch | 275 ++++++++++++++++++++++ ports/libpqxx/portfile.cmake | 2 + versions/baseline.json | 2 +- versions/l-/libpqxx.json | 5 + 5 files changed, 284 insertions(+), 1 deletion(-) create mode 100644 ports/libpqxx/fix-build-with-vs2017.patch diff --git a/ports/libpqxx/CONTROL b/ports/libpqxx/CONTROL index 8d182f527f9e1f..5b62fe37ca7747 100644 --- a/ports/libpqxx/CONTROL +++ b/ports/libpqxx/CONTROL @@ -1,5 +1,6 @@ Source: libpqxx Version: 7.3.1 +Port-Version: 1 Homepage: https://github.com/jtv/libpqxx Description: The official C++ client API for PostgreSQL Build-Depends: libpq[core] diff --git a/ports/libpqxx/fix-build-with-vs2017.patch b/ports/libpqxx/fix-build-with-vs2017.patch new file mode 100644 index 00000000000000..2a35197520dd65 --- /dev/null +++ b/ports/libpqxx/fix-build-with-vs2017.patch @@ -0,0 +1,275 @@ +diff --git a/include/pqxx/binarystring.hxx b/include/pqxx/binarystring.hxx +index 780cd6e..50865d3 100644 +--- a/include/pqxx/binarystring.hxx ++++ b/include/pqxx/binarystring.hxx +@@ -65,31 +65,31 @@ public: + using const_iterator = const_pointer; + using const_reverse_iterator = std::reverse_iterator; + +- [[deprecated("Use std::byte for binary data.")]] binarystring( +- binarystring const &) = default; ++ PQXX_DEPRECATED("Use std::byte for binary data.") ++ binarystring(binarystring const &) = default; + + /// Read and unescape bytea field. + /** The field will be zero-terminated, even if the original bytea field + * isn't. + * @param F the field to read; must be a bytea field + */ +- [[deprecated("Use std::byte for binary data.")]] explicit binarystring( +- field const &); ++ PQXX_DEPRECATED("Use std::byte for binary data.") ++ explicit binarystring(field const &); + + /// Copy binary data from std::string_view on binary data. + /** This is inefficient in that it copies the data to a buffer allocated on + * the heap. + */ +- [[deprecated("Use std::byte for binary data.")]] explicit binarystring( +- std::string_view); ++ PQXX_DEPRECATED("Use std::byte for binary data.") ++ explicit binarystring(std::string_view); + + /// Copy binary data of given length straight out of memory. +- [[deprecated("Use std::byte for binary data.")]] binarystring( +- void const *, std::size_t); ++ PQXX_DEPRECATED("Use std::byte for binary data.") ++ binarystring(void const *, std::size_t); + + /// Efficiently wrap a buffer of binary data in a @c binarystring. +- [[deprecated("Use std::byte for binary data.")]] binarystring( +- std::shared_ptr ptr, size_type size) : ++ PQXX_DEPRECATED("Use std::byte for binary data.") ++ binarystring(std::shared_ptr ptr, size_type size) : + m_buf{std::move(ptr)}, m_size{size} + {} + +diff --git a/include/pqxx/compiler-public.hxx b/include/pqxx/compiler-public.hxx +index 08d7ac9..8f01755 100644 +--- a/include/pqxx/compiler-public.hxx ++++ b/include/pqxx/compiler-public.hxx +@@ -43,6 +43,11 @@ + // 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)) ++# endif ++ + // Suppress vtables on abstract classes. + # define PQXX_NOVTABLE __declspec(novtable) + +@@ -112,4 +117,8 @@ + # define PQXX_NOVTABLE + #endif + ++#ifndef PQXX_DEPRECATED ++# define PQXX_DEPRECATED(MESSAGE) [[deprecated(# MESSAGE)]] ++#endif ++ + #endif +diff --git a/include/pqxx/largeobject.hxx b/include/pqxx/largeobject.hxx +index 072a490..40ab51b 100644 +--- a/include/pqxx/largeobject.hxx ++++ b/include/pqxx/largeobject.hxx +@@ -36,20 +36,20 @@ public: + + /// Refer to a nonexistent large object (similar to what a null pointer + /// does). +- [[deprecated("Use blob instead.")]] largeobject() noexcept = default; ++ PQXX_DEPRECATED("Use blob instead.") largeobject() noexcept = default; + + /// Create new large object. + /** @param t Backend transaction in which the object is to be created. + */ +- [[deprecated("Use blob instead.")]] explicit largeobject(dbtransaction &t); ++ PQXX_DEPRECATED("Use blob instead.") explicit largeobject(dbtransaction &t); + + /// Wrap object with given oid. + /** Convert combination of a transaction and object identifier into a + * large object identity. Does not affect the database. + * @param o Object identifier for the given object. + */ +- [[deprecated("Use blob instead.")]] explicit largeobject(oid o) noexcept : +- m_id{o} ++ PQXX_DEPRECATED("Use blob instead.") ++ explicit largeobject(oid o) noexcept : m_id{o} + {} + + /// Import large object from a local file. +@@ -57,16 +57,16 @@ public: + * @param t Backend transaction in which the large object is to be created. + * @param file A filename on the client program's filesystem. + */ +- [[deprecated("Use blob instead.")]] largeobject( +- dbtransaction &t, std::string_view file); ++ PQXX_DEPRECATED("Use blob instead.") ++ largeobject(dbtransaction &t, std::string_view file); + + /// Take identity of an opened large object. + /** Copy identity of already opened large object. Note that this may be done + * as an implicit conversion. + * @param o Already opened large object to copy identity from. + */ +- [[deprecated("Use blob instead.")]] largeobject( +- largeobjectaccess const &o) noexcept; ++ PQXX_DEPRECATED("Use blob instead.") ++ largeobject(largeobjectaccess const &o) noexcept; + + /// Object identifier. + /** The number returned by this function identifies the large object in the +@@ -179,8 +179,8 @@ public: + * @param mode Access mode, defaults to ios_base::in | ios_base::out | + * ios_base::binary. + */ +- [[deprecated("Use blob instead.")]] explicit largeobjectaccess( +- dbtransaction &t, openmode mode = default_mode); ++ PQXX_DEPRECATED("Use blob instead.") ++ explicit largeobjectaccess(dbtransaction &t, openmode mode = default_mode); + + /// Open large object with given oid. + /** Convert combination of a transaction and object identifier into a +@@ -190,8 +190,8 @@ public: + * @param mode Access mode, defaults to ios_base::in | ios_base::out | + * ios_base::binary. + */ +- [[deprecated("Use blob instead.")]] largeobjectaccess( +- dbtransaction &t, oid o, openmode mode = default_mode); ++ PQXX_DEPRECATED("Use blob instead.") ++ largeobjectaccess(dbtransaction &t, oid o, openmode mode = default_mode); + + /// Open given large object. + /** Open a large object with the given identity for reading and/or writing. +@@ -200,7 +200,8 @@ public: + * @param mode Access mode, defaults to ios_base::in | ios_base::out | + * ios_base::binary. + */ +- [[deprecated("Use blob instead.")]] largeobjectaccess( ++ PQXX_DEPRECATED("Use blob instead.") ++ largeobjectaccess( + dbtransaction &t, largeobject o, openmode mode = default_mode); + + /// Import large object from a local file and open it. +@@ -209,7 +210,8 @@ public: + * @param file A filename on the client program's filesystem. + * @param mode Access mode, defaults to ios_base::in | ios_base::out. + */ +- [[deprecated("Use blob instead.")]] largeobjectaccess( ++ PQXX_DEPRECATED("Use blob instead.") ++ largeobjectaccess( + dbtransaction &t, std::string_view file, openmode mode = default_mode); + + ~largeobjectaccess() noexcept { close(); } +@@ -386,7 +388,8 @@ public: + static constexpr auto default_mode{ + std::ios::in | std::ios::out | std::ios::binary}; + +- [[deprecated("Use blob instead.")]] largeobject_streambuf( ++ PQXX_DEPRECATED("Use blob instead.") ++ largeobject_streambuf( + dbtransaction &t, largeobject o, openmode mode = default_mode, + size_type buf_size = 512) : + m_bufsize{buf_size}, m_obj{t, o, mode}, m_g{nullptr}, m_p{nullptr} +@@ -394,7 +397,8 @@ public: + initialize(mode); + } + +- [[deprecated("Use blob instead.")]] largeobject_streambuf( ++ PQXX_DEPRECATED("Use blob instead.") ++ largeobject_streambuf( + dbtransaction &t, oid o, openmode mode = default_mode, + size_type buf_size = 512) : + m_bufsize{buf_size}, m_obj{t, o, mode}, m_g{nullptr}, m_p{nullptr} +@@ -556,7 +560,8 @@ public: + * @param o Large object to access. + * @param buf_size Size of buffer to use internally (optional). + */ +- [[deprecated("Use blob instead.")]] basic_ilostream( ++ PQXX_DEPRECATED("Use blob instead.") ++ basic_ilostream( + dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) : + super{nullptr}, + m_buf{t, o, std::ios::in | std::ios::binary, buf_size} +@@ -570,7 +575,8 @@ public: + * @param o Identifier of a large object to access. + * @param buf_size Size of buffer to use internally (optional). + */ +- [[deprecated("Use blob instead.")]] basic_ilostream( ++ PQXX_DEPRECATED("Use blob instead.") ++ basic_ilostream( + dbtransaction &t, oid o, largeobject::size_type buf_size = 512) : + super{nullptr}, + m_buf{t, o, std::ios::in | std::ios::binary, buf_size} +@@ -612,7 +618,8 @@ public: + * @param o a large object to access. + * @param buf_size size of buffer to use internally (optional). + */ +- [[deprecated("Use blob instead.")]] basic_olostream( ++ PQXX_DEPRECATED("Use blob instead.") ++ basic_olostream( + dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) : + super{nullptr}, + m_buf{t, o, std::ios::out | std::ios::binary, buf_size} +@@ -626,7 +633,8 @@ public: + * @param o a large object to access. + * @param buf_size size of buffer to use internally (optional). + */ +- [[deprecated("Use blob instead.")]] basic_olostream( ++ PQXX_DEPRECATED("Use blob instead.") ++ basic_olostream( + dbtransaction &t, oid o, largeobject::size_type buf_size = 512) : + super{nullptr}, + m_buf{t, o, std::ios::out | std::ios::binary, buf_size} +@@ -682,7 +690,8 @@ public: + * @param o Large object to access. + * @param buf_size Size of buffer to use internally (optional). + */ +- [[deprecated("Use blob instead.")]] basic_lostream( ++ PQXX_DEPRECATED("Use blob instead.") ++ basic_lostream( + dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) : + super{nullptr}, + m_buf{ +@@ -697,7 +706,8 @@ public: + * @param o Large object to access. + * @param buf_size Size of buffer to use internally (optional). + */ +- [[deprecated("Use blob instead.")]] basic_lostream( ++ PQXX_DEPRECATED("Use blob instead.") ++ basic_lostream( + dbtransaction &t, oid o, largeobject::size_type buf_size = 512) : + super{nullptr}, + m_buf{ +diff --git a/include/pqxx/stream_from.hxx b/include/pqxx/stream_from.hxx +index 7d05966..2e484bb 100644 +--- a/include/pqxx/stream_from.hxx ++++ b/include/pqxx/stream_from.hxx +@@ -128,21 +128,23 @@ public: + Columns const &columns); + + /// @deprecated Use the @c from_table_t overload instead. +- [[deprecated("Use the from_table_t overload instead.")]] stream_from( +- transaction_base &tx, std::string_view table) : ++ PQXX_DEPRECATED("Use the from_table_t overload instead.") ++ stream_from(transaction_base &tx, std::string_view table) : + stream_from{tx, from_table, table} + {} + + /// @deprecated Use the @c from_table_t overload instead. + template +- [[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, Columns const &columns) : + stream_from{tx, from_table, table, columns} + {} + + /// @deprecated Use the @c from_table_t overload instead. + template +- [[deprecated("Use the from_table_t overload instead.")]] stream_from( ++ PQXX_DEPRECATED("Use the from_table_t overload instead.") ++ stream_from( + transaction_base &, std::string_view table, Iter columns_begin, + Iter columns_end); + //@} diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake index f5139a17f4ba80..9d078c191bbfbc 100644 --- a/ports/libpqxx/portfile.cmake +++ b/ports/libpqxx/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 9e55cea0116febb5c536ed18ede9a7b2c647e631 # 7.3.1 SHA512 22da46c1c4ef798e7aa2db4f5094f8d4c3a965d755ae72a1cfae6282264c0d974317849f8db0bf34ff6aebd1ede5e5086cf74bff8bc3c6a21b3149a94d30c04f HEAD_REF master + PATCHES + fix-build-with-vs2017.patch #https://github.com/jtv/libpqxx/pull/406 ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/config-public-compiler.h.in DESTINATION ${SOURCE_PATH}) diff --git a/versions/baseline.json b/versions/baseline.json index 3bd5b395e79f26..d62967e20941e9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3246,7 +3246,7 @@ }, "libpqxx": { "baseline": "7.3.1", - "port-version": 0 + "port-version": 1 }, "libprotobuf-mutator": { "baseline": "1.0", diff --git a/versions/l-/libpqxx.json b/versions/l-/libpqxx.json index f93cd52e6903b8..38376e0dc3aeb5 100644 --- a/versions/l-/libpqxx.json +++ b/versions/l-/libpqxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac2255ecfdb7a6d5b6307413f181117d005a4989", + "version-string": "7.3.1", + "port-version": 1 + }, { "git-tree": "66295fd2998b54f3f4fd43702c0f402fef16fccd", "version-string": "7.3.1", From a1c3be713890786727aabf037b549a87e6d061c9 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 3 Feb 2021 11:27:37 -0800 Subject: [PATCH 0650/1694] [azure-core-cpp] Add new port (#16013) * Update port for azure-core-cpp * Update port version SHA * Apply suggestions from code review Remove comment headers from port files Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update port version SHA once again Co-authored-by: Anton Kolesnyk Co-authored-by: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/azure-core-cpp/CONTROL | 18 ++++++++++++++++++ ports/azure-core-cpp/portfile.cmake | 27 +++++++++++++++++++++++++++ versions/a-/azure-core-cpp.json | 9 +++++++++ versions/baseline.json | 4 ++++ 4 files changed, 58 insertions(+) create mode 100644 ports/azure-core-cpp/CONTROL create mode 100644 ports/azure-core-cpp/portfile.cmake create mode 100644 versions/a-/azure-core-cpp.json diff --git a/ports/azure-core-cpp/CONTROL b/ports/azure-core-cpp/CONTROL new file mode 100644 index 00000000000000..67563e095294c0 --- /dev/null +++ b/ports/azure-core-cpp/CONTROL @@ -0,0 +1,18 @@ +Source: azure-core-cpp +Version: 1.0.0-beta.5 +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++. +Homepage: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/core/azure-core +Default-Features: http + +Feature: http +Build-Depends: azure-core-cpp[core, curl], azure-core-cpp[core, curl, winhttp] (windows&!uwp) +Description: Build all HTTP transport implementations, depending on the platform + +Feature: curl +Build-Depends: azure-core-cpp[core], curl +Description: Build an HTTP transport implementation with LibCURL + +Feature: winhttp +Build-Depends: azure-core-cpp[core] +Description: Build an HTTP transport implementation with WinHTTP diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake new file mode 100644 index 00000000000000..64501b42f76c0c --- /dev/null +++ b/ports/azure-core-cpp/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-core_1.0.0-beta.5 + SHA512 e109ea215f3a2440d2b66cccfa6be9b4c143373105df962e47ddaf6668207171a1e8c9317a7799aa647b4669078871fde0c48e407c7966e377e7e6a9d8a67575 +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + curl BUILD_TRANSPORT_CURL + winhttp BUILD_TRANSPORT_WINHTTP +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core/ + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_install_cmake() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_fixup_cmake_targets() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json new file mode 100644 index 00000000000000..b6e0ab52129dad --- /dev/null +++ b/versions/a-/azure-core-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d2c26dc5d0cba4af8359e6ed7d4820daf494ee2a", + "version-string": "1.0.0-beta.5", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index d62967e20941e9..6e093f2649d736 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -244,6 +244,10 @@ "baseline": "2020-12-09", "port-version": 0 }, + "azure-core-cpp": { + "baseline": "1.0.0-beta.5", + "port-version": 0 + }, "azure-iot-sdk-c": { "baseline": "2020-12-09", "port-version": 0 From 004a7a8c6fadc56fdadeb6294ee3b3d475e6eccd Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Thu, 4 Feb 2021 02:40:02 +0700 Subject: [PATCH 0651/1694] [date] Fix vcpkg_fixup_cmake_targets for mingw (#15994) * [date] Fix vcpkg_fixup_cmake_targets for mingw * [vcpkg baseline] Update date port-version * [date] Tweak Windows detection Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * [vcpkg baseline] Update date port-version again Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> --- ports/date/CONTROL | 2 +- ports/date/portfile.cmake | 2 +- versions/baseline.json | 2 +- versions/d-/date.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/date/CONTROL b/ports/date/CONTROL index b44b024cdb7d8c..0489b34d37231c 100644 --- a/ports/date/CONTROL +++ b/ports/date/CONTROL @@ -1,6 +1,6 @@ Source: date Version: 3.0.0 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/HowardHinnant/date Description: A date and time library based on the C++17 header diff --git a/ports/date/portfile.cmake b/ports/date/portfile.cmake index 4dd5a40eb470db..215f1ef2a24d9b 100644 --- a/ports/date/portfile.cmake +++ b/ports/date/portfile.cmake @@ -31,7 +31,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/date) else() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/date TARGET_PATH share/date) diff --git a/versions/baseline.json b/versions/baseline.json index 6e093f2649d736..e25334954bbbbd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1538,7 +1538,7 @@ }, "date": { "baseline": "3.0.0", - "port-version": 1 + "port-version": 2 }, "dav1d": { "baseline": "0.8.1", diff --git a/versions/d-/date.json b/versions/d-/date.json index 4f4350366dcb29..f739f8dbca3f87 100644 --- a/versions/d-/date.json +++ b/versions/d-/date.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6223ca4908ce9896c0d17ac21dac600e7f4d54e1", + "version-string": "3.0.0", + "port-version": 2 + }, { "git-tree": "42976b85736114e38204b7d8cd5ea5e74a73c7cd", "version-string": "3.0.0", From d037d3024214df1cd8a705fda379dea2a1e3a928 Mon Sep 17 00:00:00 2001 From: Be Date: Wed, 3 Feb 2021 11:40:55 -0800 Subject: [PATCH 0652/1694] [libdjinterop] add new port with version 0.14.6 (#15990) --- ports/libdjinterop/portfile.cmake | 18 ++++++++++++++++++ ports/libdjinterop/vcpkg.json | 11 +++++++++++ versions/baseline.json | 4 ++++ versions/l-/libdjinterop.json | 9 +++++++++ 4 files changed, 42 insertions(+) create mode 100644 ports/libdjinterop/portfile.cmake create mode 100644 ports/libdjinterop/vcpkg.json create mode 100644 versions/l-/libdjinterop.json diff --git a/ports/libdjinterop/portfile.cmake b/ports/libdjinterop/portfile.cmake new file mode 100644 index 00000000000000..484238b84bf254 --- /dev/null +++ b/ports/libdjinterop/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xsco/libdjinterop + REF 0.14.6 + SHA512 3d05bc882ddc309a1b0d5e97572ede1aa826b662a19ffd8ee874c13ead668d1c3f14d59bf861ae3880588e1a9b94e4a92ccdbb5df71bfb7ffe28f57a1b123f18 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +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/libdjinterop/vcpkg.json b/ports/libdjinterop/vcpkg.json new file mode 100644 index 00000000000000..533f90d86191b8 --- /dev/null +++ b/ports/libdjinterop/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libdjinterop", + "version-string": "0.14.6", + "description": "C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases", + "homepage": "https://github.com/xsco/libdjinterop", + "license": "LGPL-3.0-or-later", + "dependencies": [ + "sqlite3", + "zlib" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index e25334954bbbbd..4e2afdd1aa0064 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2916,6 +2916,10 @@ "baseline": "3.0", "port-version": 0 }, + "libdjinterop": { + "baseline": "0.14.6", + "port-version": 0 + }, "libdshowcapture": { "baseline": "0.6.0-1", "port-version": 0 diff --git a/versions/l-/libdjinterop.json b/versions/l-/libdjinterop.json new file mode 100644 index 00000000000000..02fe1f1f78d753 --- /dev/null +++ b/versions/l-/libdjinterop.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f880d97fbd6043537231fcd201e5df71dc8b51f6", + "version-string": "0.14.6", + "port-version": 0 + } + ] +} From b22bd933347ffdfdcc773bf921ed2b90e5933886 Mon Sep 17 00:00:00 2001 From: Be Date: Wed, 3 Feb 2021 11:42:52 -0800 Subject: [PATCH 0653/1694] [libebur128] add new port with version 1.2.5 (#15988) --- ports/libebur128/portfile.cmake | 20 ++++++++++++++++++++ ports/libebur128/vcpkg.json | 8 ++++++++ versions/baseline.json | 4 ++++ versions/l-/libebur128.json | 9 +++++++++ 4 files changed, 41 insertions(+) create mode 100644 ports/libebur128/portfile.cmake create mode 100644 ports/libebur128/vcpkg.json create mode 100644 versions/l-/libebur128.json diff --git a/ports/libebur128/portfile.cmake b/ports/libebur128/portfile.cmake new file mode 100644 index 00000000000000..5e4db581eb5a69 --- /dev/null +++ b/ports/libebur128/portfile.cmake @@ -0,0 +1,20 @@ +if((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "${PORT} does not support Windows ARM") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jiixyj/libebur128 + REF v1.2.5 + SHA512 5f53c64f47bbad224840eef978bbc357f3fab091ef45f849749e5fabba0035d074451bc6e60240d3ff2c56b96faaf66fb91f32f96dcaacd9d81d3c148688c2f7 +) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DENABLE_INTERNAL_QUEUE_H=ON +) +vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libebur128/vcpkg.json b/ports/libebur128/vcpkg.json new file mode 100644 index 00000000000000..72624b6f8e83af --- /dev/null +++ b/ports/libebur128/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libebur128", + "version-string": "1.2.5", + "description": "A library implementing the EBU R128 audio loudness standard", + "homepage": "https://github.com/jiixyj/libebur128", + "license": "MIT", + "supports": "!(arm & windows)" +} diff --git a/versions/baseline.json b/versions/baseline.json index 4e2afdd1aa0064..1904594e21c301 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2924,6 +2924,10 @@ "baseline": "0.6.0-1", "port-version": 0 }, + "libebur128": { + "baseline": "1.2.5", + "port-version": 0 + }, "libepoxy": { "baseline": "1.5.5", "port-version": 0 diff --git a/versions/l-/libebur128.json b/versions/l-/libebur128.json new file mode 100644 index 00000000000000..82a6b35439ad6d --- /dev/null +++ b/versions/l-/libebur128.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9bfff5d49e34c3ff392662fca4b0ab398a4148b3", + "version-string": "1.2.5", + "port-version": 0 + } + ] +} From a8fbbe46540a447554ec5fe4f202ecf426f840fa Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Thu, 4 Feb 2021 00:43:20 +0500 Subject: [PATCH 0654/1694] [nameof] Update to 0.10.0 (#15975) * [nameof] Update to 0.10.0 * x-add-version --- ports/nameof/CONTROL | 2 +- ports/nameof/portfile.cmake | 5 +++-- versions/baseline.json | 2 +- versions/n-/nameof.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/nameof/CONTROL b/ports/nameof/CONTROL index f004d4f8f14de4..aaf8ed7a8025d8 100644 --- a/ports/nameof/CONTROL +++ b/ports/nameof/CONTROL @@ -1,4 +1,4 @@ Source: nameof -Version: 0.9.4 +Version: 0.10.0 Description: Nameof operator for modern C++, simply obtain the name of a variable, type, function, macro, and enum. Homepage: https://github.com/Neargye/nameof diff --git a/ports/nameof/portfile.cmake b/ports/nameof/portfile.cmake index ed893a39bb47ac..3d0473a873cf64 100644 --- a/ports/nameof/portfile.cmake +++ b/ports/nameof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/nameof - REF v0.9.4 - SHA512 658abf7da2bbc831648aca017815e6368163335840d59f4538ecc0d8438dc3843ad6efc9c2ca8ec1f6ad2208349eee880106fc60cda44bd7b19c73a1f23d067f + REF v0.10.0 + SHA512 39ad64e7b3bd45120b8d47559b5068fbc000cc4c0b9e86bad15f2a440991fcbfb6162e3acce56e98857c4b6b4734f87253415d6001dea0335d0bc5e60045db61 HEAD_REF master ) @@ -14,6 +14,7 @@ vcpkg_configure_cmake( OPTIONS -DNAMEOF_OPT_BUILD_EXAMPLES=OFF -DNAMEOF_OPT_BUILD_TESTS=OFF + -DNAMEOF_OPT_INSTALL=ON ) vcpkg_install_cmake() diff --git a/versions/baseline.json b/versions/baseline.json index 1904594e21c301..08e4cf88fe9872 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3949,7 +3949,7 @@ "port-version": 0 }, "nameof": { - "baseline": "0.9.4", + "baseline": "0.10.0", "port-version": 0 }, "nana": { diff --git a/versions/n-/nameof.json b/versions/n-/nameof.json index a05d5ff3b97228..9449981790eafe 100644 --- a/versions/n-/nameof.json +++ b/versions/n-/nameof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0862786acc338358d7e97a79e4a3c9e68cced4c7", + "version-string": "0.10.0", + "port-version": 0 + }, { "git-tree": "234e76946663fe1435fee7e8ad834e79e674954e", "version-string": "0.9.4", From 1136fb17c00d240a66d61443fe95c5c862515a01 Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Thu, 4 Feb 2021 00:43:45 +0500 Subject: [PATCH 0655/1694] [magic-enum] Update to v0.7.2 (#15974) * [magic-enum] Update to v0.7.2 * x-add-version --- ports/magic-enum/CONTROL | 2 +- ports/magic-enum/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/m-/magic-enum.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/magic-enum/CONTROL b/ports/magic-enum/CONTROL index 25dc3520f99d2d..36179c825f4f12 100644 --- a/ports/magic-enum/CONTROL +++ b/ports/magic-enum/CONTROL @@ -1,4 +1,4 @@ Source: magic-enum -Version: 0.7.1 +Version: 0.7.2 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 diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 11b48af3b5f1ae..4787ed5a71e464 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/magic_enum - REF v0.7.1 - SHA512 0eff2901d9829289fa36811fd428a9a6b66d6b88971948a385c9e74e5bbe3f52f4b80321c96a4d002bfe2c9b3d45e9bae8fbe17d718643fa318ab845b887be09 + REF v0.7.2 + SHA512 53991ccc890548a81a410e274ec2deaf0f153ec15d154ac802452235dc5b913b56da64fddc6aeed9882206fd2abe7250423d36f5e72bdba54b622b8dfdfa9dad HEAD_REF master ) diff --git a/versions/baseline.json b/versions/baseline.json index 08e4cf88fe9872..979a4a8675fcc7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3625,7 +3625,7 @@ "port-version": 0 }, "magic-enum": { - "baseline": "0.7.1", + "baseline": "0.7.2", "port-version": 0 }, "magic-get": { diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index f4ddca33ff1d14..eef040c16d9810 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "237d596c8e4341629912912346075a1d9f65096b", + "version-string": "0.7.2", + "port-version": 0 + }, { "git-tree": "b216fb15c94a2693a2fe1f7fa350a8f13d11f53f", "version-string": "0.7.1", From c6f744352e084165ef1cbf19608fa38b7b2c0b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 3 Feb 2021 11:48:06 -0800 Subject: [PATCH 0656/1694] [physx] Use /Z7 instead of /Zi to integrate the debug info when building static (#15934) * [physx] Use /Z7 instead of /Zi to integrate the debug message when building static * update version record * [physx] Add homepage * update version record * [physx] Re-fix flags, using toolchain set * update version record --- ports/physx/CONTROL | 3 ++- ports/physx/fix-compiler-flag.patch | 37 +++++++++++++++++++++++++++++ ports/physx/portfile.cmake | 4 +--- versions/baseline.json | 2 +- versions/p-/physx.json | 5 ++++ 5 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 ports/physx/fix-compiler-flag.patch diff --git a/ports/physx/CONTROL b/ports/physx/CONTROL index b7055be9a1aed9..c35db5c1bf132c 100644 --- a/ports/physx/CONTROL +++ b/ports/physx/CONTROL @@ -1,4 +1,5 @@ Source: physx Version: 4.1.1 -Port-Version: 6 +Port-Version: 7 +Homepage: https://github.com/NVIDIAGameWorks/PhysX 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 diff --git a/ports/physx/fix-compiler-flag.patch b/ports/physx/fix-compiler-flag.patch new file mode 100644 index 00000000000000..9178e4f29b875f --- /dev/null +++ b/ports/physx/fix-compiler-flag.patch @@ -0,0 +1,37 @@ +diff --git a/physx/compiler/public/CMakeLists.txt b/physx/compiler/public/CMakeLists.txt +index bd85eee..f32fe82 100644 +--- a/physx/compiler/public/CMakeLists.txt ++++ b/physx/compiler/public/CMakeLists.txt +@@ -33,6 +33,8 @@ ENDIF() + + project(PhysXSDK C CXX) + ++SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE INTERNAL "PhysX Debug CXX Flags") ++ + OPTION(PX_BUILDSNIPPETS "Generate the snippets" OFF) + OPTION(PX_BUILDPUBLICSAMPLES "Generate the samples" OFF) + OPTION(PX_CMAKE_SUPPRESS_REGENERATION "Disable zero_check projects" OFF) +diff --git a/physx/source/compiler/cmake/windows/CMakeLists.txt b/physx/source/compiler/cmake/windows/CMakeLists.txt +index c772333..e8a243c 100644 +--- a/physx/source/compiler/cmake/windows/CMakeLists.txt ++++ b/physx/source/compiler/cmake/windows/CMakeLists.txt +@@ -41,15 +41,17 @@ ELSE() + SET(PHYSX_FP_MODE "/fp:fast") + ENDIF() + IF(CMAKE_CL_64) +- SET(PHYSX_CXX_FLAGS "/d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} /Oy ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") ++ SET(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS} ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") + ELSE() +- SET(PHYSX_CXX_FLAGS "/arch:SSE2 /d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} /Oy ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") ++ SET(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS} /arch:SSE2 ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") + ENDIF() + ++if (0) + SET(PHYSX_CXX_FLAGS_DEBUG "/Od ${WINCRT_DEBUG} /RTCu /Zi" CACHE INTERNAL "PhysX Debug CXX Flags") + SET(PHYSX_CXX_FLAGS_CHECKED "/Ox ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Checked CXX Flags") + SET(PHYSX_CXX_FLAGS_PROFILE "/Ox ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Profile CXX Flags") + SET(PHYSX_CXX_FLAGS_RELEASE "/Ox ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Release CXX Flags") ++endif() + + # cache lib type defs + IF(PX_GENERATE_STATIC_LIBRARIES) diff --git a/ports/physx/portfile.cmake b/ports/physx/portfile.cmake index 5c2e1208619764..2d4d627fb76030 100644 --- a/ports/physx/portfile.cmake +++ b/ports/physx/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( msvc_142_bug_workaround.patch vs16_3_typeinfo_header_fix.patch fix_discarded_qualifiers.patch + fix-compiler-flag.patch ) if(NOT DEFINED RELEASE_CONFIGURATION) @@ -78,9 +79,6 @@ else() list(APPEND OPTIONS "-DPX_OUTPUT_ARCH=x86") endif() -# Replicate PhysX's CXX Flags here so we don't have to patch out /WX and -Wall -list(APPEND OPTIONS "-DPHYSX_CXX_FLAGS:INTERNAL=${VCPKG_CXX_FLAGS}") - vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public" PREFER_NINJA diff --git a/versions/baseline.json b/versions/baseline.json index 979a4a8675fcc7..5d83d0a8945f75 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4534,7 +4534,7 @@ }, "physx": { "baseline": "4.1.1", - "port-version": 6 + "port-version": 7 }, "picojson": { "baseline": "1.3.0-1", diff --git a/versions/p-/physx.json b/versions/p-/physx.json index 87c48b1cdfd20b..c69b0eada8a60f 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61c80fbae2a59a689ceb9774b288dc6ffbdceac4", + "version-string": "4.1.1", + "port-version": 7 + }, { "git-tree": "ff229b023b059806554bb8d9e6fbc2b4eb0fe139", "version-string": "4.1.1", From 1d9277374d9794c3898df2351b3ee2025c43b83d Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 4 Feb 2021 04:17:39 +0800 Subject: [PATCH 0657/1694] [vcpkg baseline][armadillo] Update to 10.2.0 and also update the repository (#15973) * [armadillo] Update to 10.2.0 and also update the repository * Update versions * Remove NO_REMOVE_ONE_LEVEL and update patches * Update versions/a-/armadillo.json --- ports/armadillo/CONTROL | 5 +- .../armadillo/add-disable-find-package.patch | 120 +++++++++--------- ports/armadillo/fix-CMakePath.patch | 26 ++-- ports/armadillo/portfile.cmake | 7 +- ports/armadillo/remove_custom_modules.patch | 44 ++++--- versions/a-/armadillo.json | 5 + versions/baseline.json | 4 +- 7 files changed, 109 insertions(+), 102 deletions(-) diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL index dee179680d79d7..d903f6472ed481 100644 --- a/ports/armadillo/CONTROL +++ b/ports/armadillo/CONTROL @@ -1,6 +1,5 @@ Source: armadillo -Version: 10.1.0 -Port-Version: 1 -Homepage: https://gitlab.com/conradsnicta/armadillo-code +Version: 10.2.0 +Homepage: http://arma.sourceforge.net Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use Build-Depends: blas, lapack diff --git a/ports/armadillo/add-disable-find-package.patch b/ports/armadillo/add-disable-find-package.patch index a3262823323891..b5d67d5c21a741 100644 --- a/ports/armadillo/add-disable-find-package.patch +++ b/ports/armadillo/add-disable-find-package.patch @@ -1,60 +1,60 @@ -diff --git a/cmake_aux/Modules/ARMA_FindARPACK.cmake b/cmake_aux/Modules/ARMA_FindARPACK.cmake -index 1a709ad..3029c25 100644 ---- a/cmake_aux/Modules/ARMA_FindARPACK.cmake -+++ b/cmake_aux/Modules/ARMA_FindARPACK.cmake -@@ -4,6 +4,10 @@ - # ARPACK_FOUND - system has ARPACK - # ARPACK_LIBRARY - Link this to use ARPACK - -+if(CMAKE_DISABLE_FIND_PACKAGE_ARPACK) -+ set(ARPACK_FOUND NO) -+ return() -+endif() - - find_library(ARPACK_LIBRARY - NAMES arpack -diff --git a/cmake_aux/Modules/ARMA_FindATLAS.cmake b/cmake_aux/Modules/ARMA_FindATLAS.cmake -index 491a361..e40a0ff 100644 ---- a/cmake_aux/Modules/ARMA_FindATLAS.cmake -+++ b/cmake_aux/Modules/ARMA_FindATLAS.cmake -@@ -1,3 +1,8 @@ -+if(CMAKE_DISABLE_FIND_PACKAGE_ATLAS) -+ set(ATLAS_FOUND NO) -+ return() -+endif() -+ - find_path(ATLAS_CBLAS_INCLUDE_DIR - NAMES cblas.h - PATHS /usr/include/atlas/ /usr/include/ /usr/local/include/atlas/ /usr/local/include/ -diff --git a/cmake_aux/Modules/ARMA_FindMKL.cmake b/cmake_aux/Modules/ARMA_FindMKL.cmake -index 0fd5b06..d6bcd49 100644 ---- a/cmake_aux/Modules/ARMA_FindMKL.cmake -+++ b/cmake_aux/Modules/ARMA_FindMKL.cmake -@@ -6,6 +6,11 @@ - ## the link below explains why we're linking only with mkl_rt - ## https://software.intel.com/en-us/articles/a-new-linking-model-single-dynamic-library-mkl_rt-since-intel-mkl-103 - -+if(CMAKE_DISABLE_FIND_PACKAGE_MKL) -+ set(MKL_FOUND NO) -+ return() -+endif() -+ - set(MKL_NAMES ${MKL_NAMES} mkl_rt) - #set(MKL_NAMES ${MKL_NAMES} mkl_lapack) - #set(MKL_NAMES ${MKL_NAMES} mkl_intel_thread) -diff --git a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake -index abf046d..e496cb0 100644 ---- a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake -+++ b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake -@@ -5,6 +5,11 @@ - # SuperLU_LIBRARY - Link this to use SuperLU - # SuperLU_INCLUDE_DIR - directory of SuperLU headers - -+if(CMAKE_DISABLE_FIND_PACKAGE_SuperLU) -+ set(SuperLU_FOUND OFF) -+ return() -+endif() -+ - find_path(SuperLU_INCLUDE_DIR slu_ddefs.h - /usr/include/superlu/ - /usr/include/SuperLU/ +diff --git a/cmake_aux/Modules/ARMA_FindARPACK.cmake b/cmake_aux/Modules/ARMA_FindARPACK.cmake +index 1a709ad..3029c25 100644 +--- a/cmake_aux/Modules/ARMA_FindARPACK.cmake ++++ b/cmake_aux/Modules/ARMA_FindARPACK.cmake +@@ -4,6 +4,10 @@ + # ARPACK_FOUND - system has ARPACK + # ARPACK_LIBRARY - Link this to use ARPACK + ++if(CMAKE_DISABLE_FIND_PACKAGE_ARPACK) ++ set(ARPACK_FOUND NO) ++ return() ++endif() + + find_library(ARPACK_LIBRARY + NAMES arpack +diff --git a/cmake_aux/Modules/ARMA_FindATLAS.cmake b/cmake_aux/Modules/ARMA_FindATLAS.cmake +index 491a361..e40a0ff 100644 +--- a/cmake_aux/Modules/ARMA_FindATLAS.cmake ++++ b/cmake_aux/Modules/ARMA_FindATLAS.cmake +@@ -1,3 +1,8 @@ ++if(CMAKE_DISABLE_FIND_PACKAGE_ATLAS) ++ set(ATLAS_FOUND NO) ++ return() ++endif() ++ + find_path(ATLAS_CBLAS_INCLUDE_DIR + NAMES cblas.h + PATHS /usr/include/atlas/ /usr/include/ /usr/local/include/atlas/ /usr/local/include/ +diff --git a/cmake_aux/Modules/ARMA_FindMKL.cmake b/cmake_aux/Modules/ARMA_FindMKL.cmake +index 0fd5b06..d6bcd49 100644 +--- a/cmake_aux/Modules/ARMA_FindMKL.cmake ++++ b/cmake_aux/Modules/ARMA_FindMKL.cmake +@@ -6,6 +6,11 @@ + ## the link below explains why we're linking only with mkl_rt + ## https://software.intel.com/en-us/articles/a-new-linking-model-single-dynamic-library-mkl_rt-since-intel-mkl-103 + ++if(CMAKE_DISABLE_FIND_PACKAGE_MKL) ++ set(MKL_FOUND NO) ++ return() ++endif() ++ + set(MKL_NAMES ${MKL_NAMES} mkl_rt) + #set(MKL_NAMES ${MKL_NAMES} mkl_lapack) + #set(MKL_NAMES ${MKL_NAMES} mkl_intel_thread) +diff --git a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake +index abf046d..e496cb0 100644 +--- a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake ++++ b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake +@@ -5,6 +5,11 @@ + # SuperLU_LIBRARY - Link this to use SuperLU + # SuperLU_INCLUDE_DIR - directory of SuperLU headers + ++if(CMAKE_DISABLE_FIND_PACKAGE_SuperLU) ++ set(SuperLU_FOUND OFF) ++ return() ++endif() ++ + find_path(SuperLU_INCLUDE_DIR slu_ddefs.h + /usr/include/superlu/ + /usr/include/SuperLU/ diff --git a/ports/armadillo/fix-CMakePath.patch b/ports/armadillo/fix-CMakePath.patch index 6d16a26f8e01e9..cfafc4f289ead3 100644 --- a/ports/armadillo/fix-CMakePath.patch +++ b/ports/armadillo/fix-CMakePath.patch @@ -1,13 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0fb228f..19cfdf8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -611,7 +611,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION - # and install it - set(ARMADILLO_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}") - set(ARMADILLO_LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") --set(ARMADILLO_CMAKE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo/CMake") -+set(ARMADILLO_CMAKE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo") - - - message(STATUS "Generating '${PROJECT_BINARY_DIR}/InstallFiles/ArmadilloConfig.cmake'") +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea5516e..ecd14bc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -615,7 +615,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION + # and install it + set(ARMADILLO_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + set(ARMADILLO_LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") +-set(ARMADILLO_CMAKE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo/CMake") ++set(ARMADILLO_CMAKE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo") + + + message(STATUS "Generating '${PROJECT_BINARY_DIR}/InstallFiles/ArmadilloConfig.cmake'") diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index 40d8ab3d86ea0e..bc275cb66a478c 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_git( +vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH - URL https://gitlab.com/conradsnicta/armadillo-code - REF 24b4762cbfbd3ad14c99a4854acd3560559a3195 # v10.1.0 + REPO arma + FILENAME "armadillo-10.2.0.tar.xz" + SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd PATCHES remove_custom_modules.patch fix-CMakePath.patch diff --git a/ports/armadillo/remove_custom_modules.patch b/ports/armadillo/remove_custom_modules.patch index 1ce5984bfea835..88631b573aab49 100644 --- a/ports/armadillo/remove_custom_modules.patch +++ b/ports/armadillo/remove_custom_modules.patch @@ -1,21 +1,23 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0fb228f..2275734 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -321,14 +321,13 @@ else() - set(ARMA_OS unix) - - include(ARMA_FindMKL) -- include(ARMA_FindOpenBLAS) - include(ARMA_FindATLAS) -- include(ARMA_FindBLAS) -- include(ARMA_FindLAPACK) - - if(ALLOW_FLEXIBLAS_LINUX AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) - include(ARMA_FindFlexiBLAS) - endif() -+ find_package(BLAS) -+ find_package(LAPACK) - - message(STATUS " MKL_FOUND = ${MKL_FOUND}" ) - message(STATUS " OpenBLAS_FOUND = ${OpenBLAS_FOUND}" ) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ab7dbed..ea5516e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -324,15 +324,15 @@ if(APPLE) + else() + + include(ARMA_FindMKL) +- include(ARMA_FindOpenBLAS) + include(ARMA_FindATLAS) +- include(ARMA_FindBLAS) +- include(ARMA_FindLAPACK) + + if(ALLOW_FLEXIBLAS_LINUX AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) + include(ARMA_FindFlexiBLAS) + endif() + ++ find_package(BLAS) ++ find_package(LAPACK) ++ + message(STATUS " MKL_FOUND = ${MKL_FOUND}" ) + message(STATUS " OpenBLAS_FOUND = ${OpenBLAS_FOUND}" ) + message(STATUS " ATLAS_FOUND = ${ATLAS_FOUND}" ) diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index e696b6548f9a36..2dfbf6adfed539 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f9484de18ab042899bdf1fd033f6522ff091225", + "version-string": "10.2.0", + "port-version": 0 + }, { "git-tree": "3ec327570d6731dbd87ebdee5a0cebdd8bd62ed7", "version-string": "10.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5d83d0a8945f75..3851f388cf57d4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -137,8 +137,8 @@ "port-version": 0 }, "armadillo": { - "baseline": "10.1.0", - "port-version": 1 + "baseline": "10.2.0", + "port-version": 0 }, "arrayfire": { "baseline": "3.7.3", From 5a4ee45cc690b42f1a2406a16fc696ac78516a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Wed, 3 Feb 2021 21:51:28 +0100 Subject: [PATCH 0658/1694] [vcpkg] fix X_VCPKG_APPLOCAL_DEPS_INSTALL (#15960) * [vcpkg] fix X_VCPKG_APPLOCAL_DEPS_INSTALL * [vcpkg] fix x_vcpkg_install_local_dependencies Fixed `x_vcpkg_install_local_dependencies` always assuming a relative `DESTINATION`. --- scripts/buildsystems/vcpkg.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index f4fa8a64f8ef4e..7c9da5e25b3409 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -526,6 +526,9 @@ function(x_vcpkg_install_local_dependencies) if(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp") cmake_parse_arguments(PARSE_ARGV 0 __VCPKG_APPINSTALL "" "DESTINATION" "TARGETS") _vcpkg_set_powershell_path() + if(NOT IS_ABSOLUTE ${__VCPKG_APPINSTALL_DESTINATION}) + set(__VCPKG_APPINSTALL_DESTINATION "\${CMAKE_INSTALL_PREFIX}/${__VCPKG_APPINSTALL_DESTINATION}") + endif() foreach(TARGET IN LISTS __VCPKG_APPINSTALL_TARGETS) get_target_property(TARGETTYPE ${TARGET} TYPE) if(NOT TARGETTYPE STREQUAL "INTERFACE_LIBRARY") @@ -535,7 +538,7 @@ function(x_vcpkg_install_local_dependencies) endif() install(CODE "message(\"-- Installing app dependencies for ${TARGET}...\") execute_process(COMMAND \"${_VCPKG_POWERSHELL_PATH}\" -noprofile -executionpolicy Bypass -file \"${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1\" - -targetBinary \"\${CMAKE_INSTALL_PREFIX}/${__VCPKG_APPINSTALL_DESTINATION}/$\" + -targetBinary \"${__VCPKG_APPINSTALL_DESTINATION}/$\" -installedDir \"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin\" -OutVariable out)") endif() @@ -553,7 +556,7 @@ if(X_VCPKG_APPLOCAL_DEPS_INSTALL) set(PARSED_TARGETS "") # Destination - [RUNTIME] DESTINATION argument overrides this - set(DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") + set(DESTINATION "bin") # Parse arguments given to the install function to find targets and (runtime) destination set(MODIFIER "") # Modifier for the command in the argument From 6b8f6c3b65710f530fd1f261b6d3c05fa06b00e7 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 3 Feb 2021 15:56:00 -0500 Subject: [PATCH 0659/1694] [cairo] Make freetype and fontconfig optional. (#15965) * [cairo] Make fontconfig optional. * [cairo] Update port versions --- ports/cairo/CMakeLists.txt | 46 ++++++++++++------- ports/cairo/CONTROL | 13 ------ .../{cairo-features.h => cairo-features.h.in} | 4 +- ports/cairo/portfile.cmake | 8 +++- ports/cairo/vcpkg.json | 33 +++++++++++++ versions/baseline.json | 2 +- versions/c-/cairo.json | 5 ++ 7 files changed, 77 insertions(+), 34 deletions(-) delete mode 100644 ports/cairo/CONTROL rename ports/cairo/{cairo-features.h => cairo-features.h.in} (92%) create mode 100644 ports/cairo/vcpkg.json diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt index a68491fbd8b9c0..b66d0b905007ab 100644 --- a/ports/cairo/CMakeLists.txt +++ b/ports/cairo/CMakeLists.txt @@ -156,10 +156,13 @@ file(GLOB SOURCES "cairo-svg-surface.c" # script surface "cairo-script-surface.c" -# fontconfig + freetype -"cairo-ft-font.c" ) +if(WITH_FREETYPE) + file(GLOB _FREETYPE_SOURCES "cairo-ft-font.c") + list(APPEND SOURCES ${_FREETYPE_SOURCES}) +endif() + # win32 file(GLOB PLATFORM_SOURCES_WIN32 "win32/cairo-win32-debug.c" @@ -181,17 +184,21 @@ set(CMAKE_DEBUG_POSTFIX "d") find_package(Threads REQUIRED) find_package(ZLIB REQUIRED) find_package(PNG REQUIRED) -find_package(Freetype REQUIRED) -find_package(Fontconfig REQUIRED) +if(WITH_FREETYPE) + find_package(Freetype REQUIRED) + find_package(Fontconfig REQUIRED) +endif() find_package(unofficial-pixman CONFIG REQUIRED) # Cairo needs to be told which features of FreeType are availible -add_definitions( - -DHAVE_FT_GLYPHSLOT_EMBOLDEN=1 - -DHAVE_FT_LIBRARY_SETLCDFILTER=1 - -DHAVE_FT_GLYPHSLOT_OBLIQUE=1 - -DHAVE_FT_LOAD_SFNT_TABLE=1 - -DHAVE_FT_GET_X11_FONT_FORMAT=1) +if(WITH_FREETYPE) + add_definitions( + -DHAVE_FT_GLYPHSLOT_EMBOLDEN=1 + -DHAVE_FT_LIBRARY_SETLCDFILTER=1 + -DHAVE_FT_GLYPHSLOT_OBLIQUE=1 + -DHAVE_FT_LOAD_SFNT_TABLE=1 + -DHAVE_FT_GET_X11_FONT_FORMAT=1) +endif() # additional features for macOS if(UNIX OR APPLE) @@ -210,8 +217,11 @@ add_library(cairo ${SOURCES}) if (WITH_X11) target_compile_definitions(cairo PUBLIC -DCAIRO_HAS_XLIB_SURFACE=1) endif() -target_include_directories(cairo PUBLIC ${FREETYPE_INCLUDE_DIRS}) -target_link_libraries(cairo PRIVATE ZLIB::ZLIB PNG::PNG Freetype::Freetype unofficial::pixman::pixman-1 Fontconfig::Fontconfig) +if(WITH_FREETYPE) + target_include_directories(cairo PUBLIC ${FREETYPE_INCLUDE_DIRS}) + target_link_libraries(cairo PRIVATE Freetype::Freetype Fontconfig::Fontconfig) +endif() +target_link_libraries(cairo PRIVATE ZLIB::ZLIB PNG::PNG unofficial::pixman::pixman-1) if(WIN32) target_link_libraries(cairo PRIVATE gdi32 msimg32 user32) @@ -292,14 +302,16 @@ install( DESTINATION share/unofficial-cairo ) -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-cairo-config.cmake " -include(CMakeFindDependencyMacro) +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-cairo-config.cmake +"include(CMakeFindDependencyMacro) find_dependency(ZLIB) find_dependency(PNG) -find_dependency(Freetype) -find_dependency(Fontconfig) +if(${WITH_FREETYPE}) + find_dependency(Freetype) + find_dependency(Fontconfig) +endif() find_dependency(unofficial-pixman CONFIG) -if(WITH_GOBJECT) +if(${WITH_GOBJECT}) find_dependency(unofficial-glib CONFIG) endif() diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL deleted file mode 100644 index 06877af9b7f25b..00000000000000 --- a/ports/cairo/CONTROL +++ /dev/null @@ -1,13 +0,0 @@ -Source: cairo -Version: 1.16.0 -Port-Version: 8 -Homepage: https://cairographics.org -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. -Build-Depends: zlib, libpng, pixman, freetype, fontconfig - -Feature: x11 -Description: build with x11 support - -Feature: gobject -Description: build gobject module -Build-Depends: glib \ No newline at end of file diff --git a/ports/cairo/cairo-features.h b/ports/cairo/cairo-features.h.in similarity index 92% rename from ports/cairo/cairo-features.h rename to ports/cairo/cairo-features.h.in index e3eb31c139ce85..1254b59e53c134 100644 --- a/ports/cairo/cairo-features.h +++ b/ports/cairo/cairo-features.h.in @@ -30,9 +30,9 @@ #define CAIRO_HAS_GOBJECT_FUNCTIONS 1 /* Require FreeType */ -#define CAIRO_HAS_FT_FONT 1 +#cmakedefine01 CAIRO_HAS_FT_FONT /* Require FontConfig */ -#define CAIRO_HAS_FC_FONT 1 +#cmakedefine01 CAIRO_HAS_FC_FONT #endif diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 414c0df19bdb36..c567dc2ccbbda8 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -15,7 +15,12 @@ vcpkg_extract_source_archive_ex( ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/src) -file(COPY ${CURRENT_PORT_DIR}/cairo-features.h DESTINATION ${SOURCE_PATH}/src) + +if("freetype" IN_LIST FEATURES) + set(CAIRO_HAS_FT_FONT TRUE) + set(CAIRO_HAS_FC_FONT TRUE) +endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/cairo-features.h.in" "${SOURCE_PATH}/src/cairo-features.h") if ("x11" IN_LIST FEATURES) if (VCPKG_TARGET_IS_WINDOWS) @@ -33,6 +38,7 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS x11 WITH_X11 gobject WITH_GOBJECT + freetype WITH_FREETYPE ) vcpkg_configure_cmake( diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json new file mode 100644 index 00000000000000..a8c093e81b5d92 --- /dev/null +++ b/ports/cairo/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "cairo", + "version-string": "1.16.0", + "port-version": 9, + "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", + "dependencies": [ + "libpng", + "pixman", + "zlib" + ], + "default-features": [ + "freetype" + ], + "features": { + "freetype": { + "description": "use the freetype font backend", + "dependencies": [ + "fontconfig", + "freetype" + ] + }, + "gobject": { + "description": "build gobject module", + "dependencies": [ + "glib" + ] + }, + "x11": { + "description": "build with x11 support" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 3851f388cf57d4..43962df2140034 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1046,7 +1046,7 @@ }, "cairo": { "baseline": "1.16.0", - "port-version": 8 + "port-version": 9 }, "cairomm": { "baseline": "1.15.3", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index aefdf577b92b33..b2fab7af92b4a4 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb09773c303a9608687dca6a0480ff551c0c2bf9", + "version-string": "1.16.0", + "port-version": 9 + }, { "git-tree": "b3a1d73d5c8c18a8c6512385b59d40719f963c8c", "version-string": "1.16.0", From 95c6d811bfbeb56f0e74202f6db29b5128374162 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 3 Feb 2021 12:57:35 -0800 Subject: [PATCH 0660/1694] [azure-storage-common-cpp] Publish version 12.0.0-beta.7 (#16020) * Update port for azure-storage-common-cpp * Update port for azure-storage-blobs-cpp * Update port for azure-storage-files-datalake-cpp * Update port version SHAs * Remove comment header from CONTROL files * Remove comment header from portfile.cmake files * Update port version SHAs once again Co-authored-by: Anton Kolesnyk --- ports/azure-storage-blobs-cpp/CONTROL | 6 ++++++ ports/azure-storage-blobs-cpp/portfile.cmake | 20 +++++++++++++++++++ ports/azure-storage-common-cpp/CONTROL | 6 ++++++ ports/azure-storage-common-cpp/portfile.cmake | 20 +++++++++++++++++++ .../azure-storage-files-datalake-cpp/CONTROL | 6 ++++++ .../portfile.cmake | 20 +++++++++++++++++++ versions/a-/azure-storage-blobs-cpp.json | 9 +++++++++ versions/a-/azure-storage-common-cpp.json | 9 +++++++++ .../a-/azure-storage-files-datalake-cpp.json | 9 +++++++++ versions/baseline.json | 12 +++++++++++ 10 files changed, 117 insertions(+) create mode 100644 ports/azure-storage-blobs-cpp/CONTROL create mode 100644 ports/azure-storage-blobs-cpp/portfile.cmake create mode 100644 ports/azure-storage-common-cpp/CONTROL create mode 100644 ports/azure-storage-common-cpp/portfile.cmake create mode 100644 ports/azure-storage-files-datalake-cpp/CONTROL create mode 100644 ports/azure-storage-files-datalake-cpp/portfile.cmake create mode 100644 versions/a-/azure-storage-blobs-cpp.json create mode 100644 versions/a-/azure-storage-common-cpp.json create mode 100644 versions/a-/azure-storage-files-datalake-cpp.json diff --git a/ports/azure-storage-blobs-cpp/CONTROL b/ports/azure-storage-blobs-cpp/CONTROL new file mode 100644 index 00000000000000..a3e08f567953ee --- /dev/null +++ b/ports/azure-storage-blobs-cpp/CONTROL @@ -0,0 +1,6 @@ +Source: azure-storage-blobs-cpp +Version: 12.0.0-beta.7 +Build-Depends: azure-storage-common-cpp +Description: Microsoft Azure Storage Blobs SDK for C++ + This library provides Azure Storage Blobs SDK. +Homepage: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-blobs diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake new file mode 100644 index 00000000000000..2c385b399402c0 --- /dev/null +++ b/ports/azure-storage-blobs-cpp/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-storage-blobs_12.0.0-beta.7 + SHA512 51bf1c961bdc2fd95354afe21f171f2e1c05aafb4f6301a15d51650fecf0f0bc66272ac0fbc2e02c112b0164da4df66a411b17418c338298f6da21c3bfaab2c1 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-blobs/ + PREFER_NINJA + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_install_cmake() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_fixup_cmake_targets() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() + diff --git a/ports/azure-storage-common-cpp/CONTROL b/ports/azure-storage-common-cpp/CONTROL new file mode 100644 index 00000000000000..916e0dd0dc6cf8 --- /dev/null +++ b/ports/azure-storage-common-cpp/CONTROL @@ -0,0 +1,6 @@ +Source: azure-storage-common-cpp +Version: 12.0.0-beta.7 +Build-Depends: azure-core-cpp, libxml2, openssl (!windows) +Description: Microsoft Azure Common Storage SDK for C++ + This library provides common Azure Storage-related abstractions for Azure SDK. +Homepage: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-common diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake new file mode 100644 index 00000000000000..af5850bcbe7fad --- /dev/null +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-storage-common_12.0.0-beta.7 + SHA512 b37ca9a6562856858d19e1babbc7a99a25da75698935706fa6ebcebe118c33c35e388bebefcb56e6dcb45db4ffae0a60e0ffa3a56015f2069fd3a04433e21247 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-common/ + PREFER_NINJA + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_install_cmake() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_fixup_cmake_targets() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() + diff --git a/ports/azure-storage-files-datalake-cpp/CONTROL b/ports/azure-storage-files-datalake-cpp/CONTROL new file mode 100644 index 00000000000000..eda31a86650c1c --- /dev/null +++ b/ports/azure-storage-files-datalake-cpp/CONTROL @@ -0,0 +1,6 @@ +Source: azure-storage-files-datalake-cpp +Version: 12.0.0-beta.7 +Build-Depends: azure-storage-blobs-cpp +Description: Microsoft Azure Storage Files Data Lake SDK for C++ + This library provides Azure Storage Files Data Lake SDK. +Homepage: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-datalake diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake new file mode 100644 index 00000000000000..8856fa7e5d8c82 --- /dev/null +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-storage-files-datalake_12.0.0-beta.7 + SHA512 0fe864854b46ef7130e9e473ade9beb8d64cad29a5a63c78c1053aeb0de8ee6149d5fc93d4d941a3507d8a4eaa3c9d5baa2681da410a7c8d595767f24449b46e +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/ + PREFER_NINJA + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_install_cmake() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_fixup_cmake_targets() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() + diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json new file mode 100644 index 00000000000000..61df5b4dad1566 --- /dev/null +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "32a4dca2b5670fbce88652145fe3297bd221a672", + "version-string": "12.0.0-beta.7", + "port-version": 0 + } + ] +} diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json new file mode 100644 index 00000000000000..171a61583351de --- /dev/null +++ b/versions/a-/azure-storage-common-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1dee55e65cb1fb3f93d4cc8f820a09c4d17ee202", + "version-string": "12.0.0-beta.7", + "port-version": 0 + } + ] +} diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json new file mode 100644 index 00000000000000..4751212bf9aecc --- /dev/null +++ b/versions/a-/azure-storage-files-datalake-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "96e221ac9eb6246fa0ec743cb3cbcc47b932f8f3", + "version-string": "12.0.0-beta.7", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 43962df2140034..bba1793c5c92ad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -260,10 +260,22 @@ "baseline": "2020-06-17", "port-version": 2 }, + "azure-storage-blobs-cpp": { + "baseline": "12.0.0-beta.7", + "port-version": 0 + }, + "azure-storage-common-cpp": { + "baseline": "12.0.0-beta.7", + "port-version": 0 + }, "azure-storage-cpp": { "baseline": "7.5.0", "port-version": 0 }, + "azure-storage-files-datalake-cpp": { + "baseline": "12.0.0-beta.7", + "port-version": 0 + }, "azure-uamqp-c": { "baseline": "2020-12-09", "port-version": 0 From 718d8382f99c6367ea4af9fc689acd5787f4ac7c Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 3 Feb 2021 12:58:29 -0800 Subject: [PATCH 0661/1694] [azure-identity-cpp] Publish version 1.0.0-beta.3 (#16014) * Update port for azure-identity-cpp * Update port version SHA * Remove comment header from CONTROL file * Remove comment header from portfile.cmake file * Update port version SHA once again Co-authored-by: Anton Kolesnyk Co-authored-by: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> --- ports/azure-identity-cpp/CONTROL | 6 ++++++ ports/azure-identity-cpp/portfile.cmake | 20 ++++++++++++++++++++ versions/a-/azure-identity-cpp.json | 9 +++++++++ versions/baseline.json | 4 ++++ 4 files changed, 39 insertions(+) create mode 100644 ports/azure-identity-cpp/CONTROL create mode 100644 ports/azure-identity-cpp/portfile.cmake create mode 100644 versions/a-/azure-identity-cpp.json diff --git a/ports/azure-identity-cpp/CONTROL b/ports/azure-identity-cpp/CONTROL new file mode 100644 index 00000000000000..74e47c1fa0dab8 --- /dev/null +++ b/ports/azure-identity-cpp/CONTROL @@ -0,0 +1,6 @@ +Source: azure-identity-cpp +Version: 1.0.0-beta.3 +Build-Depends: azure-core-cpp +Description: Microsoft Azure Identity SDK for C++ + This library provides common authentication-related abstractions for Azure SDK. +Homepage: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/identity/azure-identity diff --git a/ports/azure-identity-cpp/portfile.cmake b/ports/azure-identity-cpp/portfile.cmake new file mode 100644 index 00000000000000..05838226cab4bb --- /dev/null +++ b/ports/azure-identity-cpp/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-identity_1.0.0-beta.3 + SHA512 ef1926e81e14b040871d654e5d4a3e07607ee82b0c9a0205dd6fa2253ae84eb86cfadc45de6dab6a060a5e8909615e559444c65174368fc1bd386894ea89efa6 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/sdk/identity/azure-identity/ + PREFER_NINJA + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_install_cmake() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_fixup_cmake_targets() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() + diff --git a/versions/a-/azure-identity-cpp.json b/versions/a-/azure-identity-cpp.json new file mode 100644 index 00000000000000..e4cfddf060efc0 --- /dev/null +++ b/versions/a-/azure-identity-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c45f6c8ac731079eb1e5f40a0e5af2725b3ec97a", + "version-string": "1.0.0-beta.3", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index bba1793c5c92ad..72e1648768155c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -248,6 +248,10 @@ "baseline": "1.0.0-beta.5", "port-version": 0 }, + "azure-identity-cpp": { + "baseline": "1.0.0-beta.3", + "port-version": 0 + }, "azure-iot-sdk-c": { "baseline": "2020-12-09", "port-version": 0 From bafe105776cbf350e8130144339d875d685bc8ce Mon Sep 17 00:00:00 2001 From: Sylvain Doremus Date: Wed, 3 Feb 2021 22:01:16 +0100 Subject: [PATCH 0662/1694] [ shaderwriter ]Update to version 1.0.0 (#15948) * Updated shaderwriter port to version 1.0.0 * Updated version files. * Fixed license file install script. * Fixed version file again --- ports/shaderwriter/portfile.cmake | 12 ++++++------ ports/shaderwriter/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/shaderwriter.json | 5 +++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ports/shaderwriter/portfile.cmake b/ports/shaderwriter/portfile.cmake index ea1eb72d6842cd..0bd79bcccd3225 100644 --- a/ports/shaderwriter/portfile.cmake +++ b/ports/shaderwriter/portfile.cmake @@ -1,16 +1,15 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO DragonJoker/ShaderWriter - REF e978c96c959e8aa41eedaef322dcc6a0ec00ad49 - HEAD_REF master - SHA512 4f1ea1fd97392edc2b3dd9b6453fa395772e75a52f28d7bbd5a63d2fe8eca40c8a0d4016e2017e126f22fc03acf28ab29db6de037d64c7687f95884b8435b7c7 + REF v1.0.0 + SHA512 60e63dd1f519869a5e3b8d4ee699339b2d26dea2a7502d16de578b6164131ea4954b7731a89763cd6a3a4750a1eb15afc2592261cc7c8209e8a3667edecdb94b ) vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO DragonJoker/CMakeUtils - REF 6b76e6873afe33baeb59c233d3a70bd391f01769 + REF 811d4acb15de70cb81e2a5788333ba4b50d89e81 HEAD_REF master - SHA512 d7834cf8eeff12575acc526d9dc39471ededad1ff25bec0b85e27a36381157f797c1eb168983410a40b60c001b52b787baea498aef80ffa08c9b7d9a9f5eb7ae + SHA512 b546cabc0f1a7c0e73abe22a742629c7e6d9bef7ed2d1de8a528369931e1871a9902d38efc8f77a3aec9923d62ca328b0c3c8c6c51f2ff527682a3197550dae7 ) get_filename_component(SRC_PATH ${CMAKE_SOURCE_PATH} DIRECTORY) @@ -29,6 +28,7 @@ vcpkg_configure_cmake( OPTIONS -DPROJECTS_USE_PRECOMPILED_HEADERS=OFF -DSDW_GENERATE_SOURCE=OFF + -DSDW_BUILD_VULKAN_LAYER=OFF -DSDW_BUILD_TESTS=OFF -DSDW_BUILD_STATIC_SDW=${BUILD_STATIC} -DSDW_BUILD_EXPORTER_GLSL_STATIC=${BUILD_STATIC} @@ -39,4 +39,4 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/shaderwriter) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/shaderwriter RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/shaderwriter/vcpkg.json b/ports/shaderwriter/vcpkg.json index b18788b28cf668..e039d1c204ebec 100644 --- a/ports/shaderwriter/vcpkg.json +++ b/ports/shaderwriter/vcpkg.json @@ -1,6 +1,6 @@ { "name": "shaderwriter", - "version-string": "2020-10-15", + "version-string": "1.0.0", "description": "Library to write shaders directly from C++ code, supports GLSL, HLSL and SPIRV outputs.", "homepage": "https://github.com/DragonJoker/ShaderWriter" } diff --git a/versions/baseline.json b/versions/baseline.json index 72e1648768155c..8ef915f1766989 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5329,7 +5329,7 @@ "port-version": 0 }, "shaderwriter": { - "baseline": "2020-10-15", + "baseline": "1.0.0", "port-version": 0 }, "shapelib": { diff --git a/versions/s-/shaderwriter.json b/versions/s-/shaderwriter.json index 332cf86581ceca..917246b812377a 100644 --- a/versions/s-/shaderwriter.json +++ b/versions/s-/shaderwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec535c5e829a1afeab64cd517f9f8c6cf453d7bb", + "version-string": "1.0.0", + "port-version": 0 + }, { "git-tree": "f65600030bc48b3b5c3317f4af7affbfa3e2d818", "version-string": "2020-10-15", From d64e3146ed6133a9eeb9fe1381f3baf1a0388e44 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 3 Feb 2021 23:00:00 +0100 Subject: [PATCH 0663/1694] added required version files --- versions/baseline.json | 12 ++++++++++++ versions/m-/mapbox-geometry.json | 9 +++++++++ versions/m-/mapbox-polylabel.json | 9 +++++++++ versions/m-/mapnik.json | 9 +++++++++ 4 files changed, 39 insertions(+) create mode 100644 versions/m-/mapbox-geometry.json create mode 100644 versions/m-/mapbox-polylabel.json create mode 100644 versions/m-/mapnik.json diff --git a/versions/baseline.json b/versions/baseline.json index 8e1b31d6c043e3..07b4d7821669ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3632,10 +3632,22 @@ "baseline": "2020.06", "port-version": 2 }, + "mapbox-geometry": { + "baseline": "2.0.3", + "port-version": 0 + }, + "mapbox-polylabel": { + "baseline": "1.0.4", + "port-version": 0 + }, "mapbox-variant": { "baseline": "1.2.0", "port-version": 0 }, + "mapnik": { + "baseline": "4.0.0", + "port-version": 0 + }, "marble": { "baseline": "19.08.2", "port-version": 0 diff --git a/versions/m-/mapbox-geometry.json b/versions/m-/mapbox-geometry.json new file mode 100644 index 00000000000000..99ba5c30bfc1fe --- /dev/null +++ b/versions/m-/mapbox-geometry.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "be64a5b7fc898a121d58502ddab9fc9e3aadaf80", + "version-string": "2.0.3", + "port-version": 0 + } + ] +} diff --git a/versions/m-/mapbox-polylabel.json b/versions/m-/mapbox-polylabel.json new file mode 100644 index 00000000000000..247b36aa34ef37 --- /dev/null +++ b/versions/m-/mapbox-polylabel.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2da4ad92d9860e7c8bbe9367096c5e161977f039", + "version-string": "1.0.4", + "port-version": 0 + } + ] +} diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json new file mode 100644 index 00000000000000..00d698c0f17d66 --- /dev/null +++ b/versions/m-/mapnik.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "de38e14c12141f33d7e0f515c901811e52f45466", + "version-string": "4.0.0", + "port-version": 0 + } + ] +} From 1d24e70f6c82192f5801694a65a7a8982e67fb27 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 3 Feb 2021 23:00:00 +0100 Subject: [PATCH 0664/1694] added required version files --- versions/baseline.json | 12 ++++++++++++ versions/m-/mapbox-geometry.json | 9 +++++++++ versions/m-/mapbox-polylabel.json | 9 +++++++++ versions/m-/mapnik.json | 9 +++++++++ 4 files changed, 39 insertions(+) create mode 100644 versions/m-/mapbox-geometry.json create mode 100644 versions/m-/mapbox-polylabel.json create mode 100644 versions/m-/mapnik.json diff --git a/versions/baseline.json b/versions/baseline.json index 8e1b31d6c043e3..07b4d7821669ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3632,10 +3632,22 @@ "baseline": "2020.06", "port-version": 2 }, + "mapbox-geometry": { + "baseline": "2.0.3", + "port-version": 0 + }, + "mapbox-polylabel": { + "baseline": "1.0.4", + "port-version": 0 + }, "mapbox-variant": { "baseline": "1.2.0", "port-version": 0 }, + "mapnik": { + "baseline": "4.0.0", + "port-version": 0 + }, "marble": { "baseline": "19.08.2", "port-version": 0 diff --git a/versions/m-/mapbox-geometry.json b/versions/m-/mapbox-geometry.json new file mode 100644 index 00000000000000..99ba5c30bfc1fe --- /dev/null +++ b/versions/m-/mapbox-geometry.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "be64a5b7fc898a121d58502ddab9fc9e3aadaf80", + "version-string": "2.0.3", + "port-version": 0 + } + ] +} diff --git a/versions/m-/mapbox-polylabel.json b/versions/m-/mapbox-polylabel.json new file mode 100644 index 00000000000000..247b36aa34ef37 --- /dev/null +++ b/versions/m-/mapbox-polylabel.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2da4ad92d9860e7c8bbe9367096c5e161977f039", + "version-string": "1.0.4", + "port-version": 0 + } + ] +} diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json new file mode 100644 index 00000000000000..00d698c0f17d66 --- /dev/null +++ b/versions/m-/mapnik.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "de38e14c12141f33d7e0f515c901811e52f45466", + "version-string": "4.0.0", + "port-version": 0 + } + ] +} From 5c5864b70e8929ea63a8c8169a5a4229d7e1816a Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Wed, 3 Feb 2021 14:44:43 -0800 Subject: [PATCH 0665/1694] [vcpkg registries] Registries: Take 2 (#13590) * [vcpkg registries] Registries: Take 2 unfortunately without all the history because I really screwed up the git commands This RFC is the new state of the world with regard to our plan for registries; it is very different from the old RFC. It includes registry databases, which are how one describes the set of versions of ports that one has access to. It also includes the specification for git registries, and updates the specification for filesystem registries with these new registry databases. Since this RFC completely changes how registries work, the existing implementation will be broken. * update the registries RFC for modern design * remove bikeshedding --- docs/specifications/registries-2.md | 557 ++++++++++++++++++++++++++++ 1 file changed, 557 insertions(+) create mode 100644 docs/specifications/registries-2.md diff --git a/docs/specifications/registries-2.md b/docs/specifications/registries-2.md new file mode 100644 index 00000000000000..41a32886b9c62e --- /dev/null +++ b/docs/specifications/registries-2.md @@ -0,0 +1,557 @@ +# Registries: Take 2 (including Git Registries) + +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, +it's become clear that the existing design was lacking. +We need to have an on-disk port database that is not tied to the ports tree. + +This RFC is a new design for registries, that includes this registry database. +It also includes the design for git registries, +which are likely to be the predominant form of registries in the wild. +They are also what we will start to treat the default registry as, +to allow for updating ports without updating the vcpkg executable +(likely necessary for binary releases). + +## Design Considerations + +After internal discussions of the relationship between versioning and registries, +it was clear that the existing design of registries does not play well with versioning. +It was also clear that it was necessary to have metadata about ports in a separate place from the ports tree; +in fact, after discussion, it was clear that the ports tree should be considered an implementation detail; +a backing store for build process information (e.g., `portfile.cmake` and the patches) and the manifest. + +From this, it's clear that vcpkg needs to add a new set of metadata. +The versioning implementation has decided on `port_versions`, and thus that's what this RFC uses. + +Since we're replacing the existing ports directory with a new method of describing ports, +this means that the ports directory is no longer anything but a data store. +This also means that the existing rules around locations of ports is no longer required; +however, it will still keep getting followed for the main repository, +and it's recommended that other registries follow the same pattern to make contributing easier. + +## What does the registry database look like? + +We don't wish to have the same problem as we do right now, +where there are nearly 1500 entries in a single directory. +We solve this by placing each database entry into `port_versions/-/.json`. +For example, the database entry for 7zip is in `port_versions/7-/7zip.json`. + +Each of these database entries contains all of the versions of the port throughout history, +along with versioning and feature metadata, so that we do not have to check out old manifests or CONTROL files +to get at that information. + +Each database entry file must be a top-level array of port version objects, which contain the following entries: +* A version field: `"version-string"`, `"version"`, etc. Same as in the manifest. +* Optionally, `"port-version"`: Same as in the manifest. + +And also contain a description of where to find the build files for this port; the possibilities include: + +* `"git-tree"`: The [git object ID] of a tree object; this is only allowed for git registries. + Note that this ID must be an ID from the repository where the registry is located. +* `"path"`: A path describing where to find the build files. + The first entry in this path should be `$`, which means "this path starts at the root of the registry". + No other kinds of paths are allowed. + * For example: `$/foo/bar` gives you `foo/bar` underneath the folder containing the `port_versions` directory. + * `/foo/bar` and `foo/bar` are both disallowed. + +Using a `"git-tree"` as a backend in a non-git registry, and using a `"path"` in a git registry, +is not permitted. Future extensions may include things like remote archives or git repositories, +or may allow `"path"` in git registries. + +Note that a registry entry should _always_ be additive; +deleting existing entries is unsupported and may result in bad behavior. +The only modification to existing entries that is allowable is moving the backing store +for the build files, assuming that the new build files are equivalent to the old build files. +(For example, a filesystem registry might have a new way of laying out where ports are). + +Additionally, we'd like a new way of describing the set of ports that make up a "baseline". +This is currently done with the reference of the vcpkg git repository - +each reference has a set of versions that are tested against each other, +and this is a major feature of vcpkg. +We wish to have the same feature in the new versioning world, +and so we'll have a set of baseline versions in the registry database. + +Baselines act differently between git registries or the builtin registry, +and in filesystem registries. +In git registries and the builtin registry, +since there's a history that one can access, +a baseline is the `"default"` entry in the baseline at the reference specified. +In filesystem registries, since there is no accessible history, +the baseline identifiers are mapped directly to entries in the baseline file, +without translation; by default, the `"default"` entry is used. + +These baselines are placed in `port_versions/baseline.json`. +This is an object mapping baseline names to baseline objects, +where baseline objects map port names to version objects. +A version object contains `"baseline"`, which is un-schemed version, +and optionally `"port-version"`. + +[git object ID]: https://git-scm.com/book/en/v2/Git-Internals-Git-Objects + +### Example of a baseline file + +The following is a reasonable baseline.json for a filesystem registry that only has two ports: + +```json +{ + "default": { + "abseil": { "baseline": "2020-03-03" }, + "zlib": { "baseline": "1.2.11", "port-version": 9 } + }, + "old": { + "abseil": { "baseline": "2019-02-11" }, + "zlib": { "baseline": "1.2.11", "port-version": 3 } + }, + "really-old": { + "zlib": { "baseline": "1.2.9" } + } +} +``` + +### Example of a registry database entry file + +Note: This file assumes that the versions RFC has been implemented, +and thus that minimum versions are required; +the syntax may change in the time between now and finishing the implementation. + +This example is of `ogre`, since this port has both features and dependencies; +remember that this file would be `port_versions/o-/ogre.json`. + +```json +[ + { + "version-string": "1.12.7", + "git-tree": "466e96fd2e17dd2453aa31dc0bc61bdcf53e7f61", + }, + { + "version-string": "1.12.1", + "port-version": 1, + "git-tree": "0de81b4f7e0ec24966e929c2ea64e16c15e71d5e", + }, + ... +] +``` + +#### Filesystem Registry Databases + +Filesystem registries are the simplest possible registry; +they have a `port_versions` directory at the top-level, which contains the registry database. +It's expected that the filesystem registry would have a filesystem backing store: +something like the existing `ports` directory, except with separate versions. +There won't be a specific way to lay the ports tree out as mandated by the tool, +as we are treating the ports tree as an implementation detail of the registry; +it's simply a way to get the files for a port. +As an example, let's assume that the registry is laid out something like this: + +``` +/ + port_versions/ + baseline.json + a-/ + abseil.json + asmjit.json + o-/ + ogre.json + ports/ + a-/ + abseil/ + 2020-03-03_7/ + vcpkg.json + portfile.cmake + ... + 2020-03-03_8/ + vcpkg.json + portfile.cmake + ... + ... + asmjit/ + 2020-05-08/ + CONTROL + portfile.cmake + ... + 2020-07-22/ + vcpkg.json + portfile.cmake + ... + o-/ + ogre/ + 1.12.7/ + ... + 1.12.1/ + ... + ... + ... +``` + +Then, let's look at updating `asmjit` to latest. + +The current manifest file, in `asmjit/2020-07-22/vcpkg.json` looks like: + +```json +{ + "name": "asmjit", + "version-string": "2020-07-22", + "description": "Complete x86/x64 JIT and Remote Assembler for C++", + "homepage": "https://github.com/asmjit/asmjit", + "supports": "!arm" +} +``` + +while the current `port_versions/a-/asmjit.json` looks like: + +```json +[ + { + "version-string": "2020-07-22", + "path": "$/ports/a-/asmjit/2020-07-22" + }, + { + "version-string": "2020-05-08", + "path": "$/ports/a-/asmjit/2020-05-08" + } +] +``` + +with `port_versions/baseline.json` looking like: + +```json +{ + "default": { + ..., + "asmjit": { "baseline": "2020-07-22" }, + ... + } +} +``` + +and we'd like to update to `2020-10-08`. +We should first copy the existing implementation to a new folder: + +```sh +$ cp -r ports/a-/asmjit/2020-07-22 ports/a-/asmjit/2020-10-08 +``` + +then, we'll make the edits required to `ports/a-/asmjit/2020-10-08` to update to latest. +We should then update `port_versions/a-/asmjit.json`: + +```json +[ + { + "version-string": "2020-10-08", + "path": "$/ports/a-/asmjit/2020-10-08" + }, + { + "version-string": "2020-07-22", + "path": "$/ports/a-/asmjit/2020-07-22" + }, + { + "version-string": "2020-05-08", + "path": "$/ports/a-/asmjit/2020-05-08" + } +] +``` + +and update `port_versions/baseline.json`: + +```json +{ + "default": { + ..., + "asmjit": { "baseline": "2020-10-08" }, + ... + } +} +``` + +and we're done 😊. + +#### Git Registry Databases + +Git registries are not quite as simple as filesystem registries, +but they're still pretty simple, and are likely to be the most common: +the default registry is a git registry, for example. +There is not a specific way the tool requires one to lay out the backing store, +as long as it's possible to get an object hash that corresponds to a checked-in git tree +of the build information. +This allows, for example, the current vcpkg default registry way of laying out ports, +where the latest version of a port `

` is at `ports/

`, +and it also allows for any number of other designs. +One interesting design, for example, +is having an `old-ports` branch which is updated whenever someone want to backfill versions; +then, one could push the old version to the `old-ports` branch, +and then update the HEAD branch with the git tree of the old version in `port_versions/p-/

`. + +As above, we want to update `asmjit` to latest; let's assume we're working in the default vcpkg registry +(the repository): + +The current manifest file for `asmjit` looks like: + +```json +{ + "name": "asmjit", + "version-string": "2020-07-22", + "description": "Complete x86/x64 JIT and Remote Assembler for C++", + "homepage": "https://github.com/asmjit/asmjit", + "supports": "!arm" +} +``` + +and the current `port_versions/a-/asmjit.json` looks like: + +```json +[ + { + "version-string": "2020-07-22", + "git-tree": "fa0c36ba15b48959ab5a2df3463299e1d2473b6f" + } +] +``` + +Now, let's update it to the latest version: + +```json +{ + "name": "asmjit", + "version-string": "2020-10-08", + "description": "Complete x86/x64 JIT and Remote Assembler for C++", + "homepage": "https://github.com/asmjit/asmjit", + "supports": "!arm" +} +``` + +and make the proper edits to the portfile.cmake. Then, let's commit the changes: + +```cmd +> git add ./ports/asmjit +> git commit -m "[asmjit] update asmjit to 2020-10-08" +``` + +In `git-tree` mode, one needs to commit the new version of the port to get the git tree hash; +we use `git rev-parse` to do so: + +```cmd +> git rev-parse HEAD:ports/asmjit +2bb51d8ec8b43bb9b21032185ca8123da10ecc6c +``` + +and then modify `port_versions/a-/asmjit.json` as follows: + +```json +[ + { + "version-string": "2020-10-08", + "git-tree": "2bb51d8ec8b43bb9b21032185ca8123da10ecc6c" + }, + { + "version-string": "2020-07-22", + "git-tree": "fa0c36ba15b48959ab5a2df3463299e1d2473b6f" + } +] +``` + +Then we can commit and push this new database with: + +```sh +$ git add port_versions +$ git commit --amend --no-edit +$ git push +``` + +## Consuming Registries + +The `vcpkg-configuration.json` file from the [first registries RFC](registries.md) +is still the same, except that the registries have a slightly different layout. +A `` is still an object with the following fields: +* Optionally, `"default-registry"`: A `` or `null` +* Optionally, `"registries"`: An array of ``s + +Additionally, `` is still the same; +a `` object, plus the following properties: +* Optionally, `"baseline"`: A named baseline. Defaults to `"default"`. +* Optionally, `"packages"`: An array of ``s + +however, ``s are now slightly different: +* ``: + * `"kind"`: The string `"builtin"` +* ``: + * `"kind"`: The string `"filesystem"` + * `"path"`: A path +* ``: + * `"kind"`: The string `"git"` + * `"repository"`: A URI + +The `"packages"` field of distinct registries must be disjoint, +and each `` must have at the `"packages"` property, +since otherwise there's no point. + +As an example, a package which uses a different default registry, and a different registry for boost, +might look like the following: + +```json +{ + "default-registry": { + "kind": "filesystem", + "path": "vcpkg-ports" + }, + "registries": [ + { + "kind": "builtin", + "packages": [ "cppitertools" ] + } + ] +} +``` + +This will install `fmt` from `/vcpkg-ports`, +and `cppitertools` and the `boost` ports from the registry that ships with vcpkg. +Notably, this does not replace behavior up the tree -- only the `vcpkg-configuration.json`s +for the current invocation do anything. + +### Filesystem Registries + +A filesystem registry takes on the form: + +* `"kind"`: The string `"filesystem"` +* `"path"`: The path to the filesystem registry's root, i.e. the directory containing the `port_versions` directory. + +```json +{ + "kind": "filesystem", + "path": "vcpkg-registry" +} +``` + +Unlike git registries, where there's quite a bit of interesting stuff going on, +there isn't much stuff to do with filesystem registries. +We simply use the registry database at `/port_versions` to get information about ports. + +### Git Registries + +A git registry takes on the form: + +* `"kind"`: The string `"git"` +* `"repository"`: The URL at which the git repository lives. May be any kind of URL that git understands + +```json +{ + "kind": "git", + "repository": "https://github.com/microsoft/vcpkg" +} +``` + +Whenever the first vcpkg command is run with a git registry, +vcpkg notes down the exact commit that HEAD points to at the time of the run in the `vcpkg-lock.json` file. +This will be used as the commit which vcpkg takes the `"default"` baseline from, +and vcpkg will only update that commit when `vcpkg update` is run. + +Since the `"versions"` field is strictly additive, we don't consider older refs than `HEAD`. +We update the repository on some reasonable clip. +Likely, whenever a command is run that will change the set of installed ports. + +#### `vcpkg-lock.json` + +This file will contain metadata that we need to save across runs, +to allow us to keep a "state-of-the-world" that doesn't change unless one explicitly asks for it to change. +This means that, even across different machines, the same registries will be used. +We will also be able to write down version resolution in this file as soon as that feature is added. + +It is recommended that one adds this `vcpkg-lock.json` to one's version control. +This file is machine generated, and it is not specified how it's layed out; +however, for purposes of this RFC, we will define how it relates to git registries. + +In `vcpkg-lock.json`, in the top level object, +there will be a `"registries"` property that is an object. +This object will contain a `"git"` field, which is an array of git-registry objects, +that contain: + +* `"repository"`: The `"repository"` field from the git registry object +* `"baseline"`: The name of the baseline that we've used +* `"baseline-ref"`: The ref which we've gotten the specific baseline from. + +For example, a `vcpkg-lock.json` might look like: + +```json +{ + "registries": { + "git": [ + { + "repository": "https://github.com/microsoft/vcpkg", + "baseline": "default", + "baseline-ref": "6185aa76504a5025f36754324abf307cc776f3da" + } + ] + } +} +``` + +#### `vcpkg update` + +You'll notice that once the repository is added the first time, +there is only one way to update the repository to the tag at a later date - deleting the lock file. +We additionally want to add support for the user updating the registry by themselves - +they will be able to do this via the `vcpkg update` command. +The `vcpkg update` command will, for each git registry, +update the registry and repoint the `"commit"` field in `vcpkg-lock.json` to the latest `HEAD`. + +There is no way to update only one git registry to a later date, since versions are strictly additive. + +## Git Registries: Implementation on Disk + +There are two implementations on disk to consider here: the implementation of the registry database, +and once we have the database entries for the ports, accessing the port data from the git tree object. + +Both of these implementations are placed in the vcpkg cache home (shared by binary caching archives). +On unix, this is located at `$XDG_CACHE_HOME/vcpkg` if the environment variable exists, +otherwise `$HOME/.cache/vcpkg`; on Windows, it's located at `%LOCALAPPDATA%\vcpkg`. +In this document, we use the variable `$CACHE_ROOT` to refer to this folder. +We will add a new folder, `$CACHE_ROOT/registries`, which will contain all the data we need. + +First, we'll discuss the registry database. + +### Registry Database + +At `$CACHE_ROOT/registries/git`, +we'll create a new git repository root which contains all information from all git registries, +since the hashes should be unique, and this allows for deduplication +across repositories which have the same commits (e.g., for mirrors). +In order to get the data from git registries, we simply `fetch` the URL of the git registry. + +In order to grab a specific database entry from a git registry, `git show` is used to grab the +file from the right commit: `git show -- port_versions/-/.json`. + +One unfortunate thing about having one directory being used for all vcpkg instances on a machine is +that it's possible to have an issue with concurrency - for example, after `fetch`ing the latest HEAD +of `https://github.com/microsoft/vcpkg`, another vcpkg process might fetch the latest HEAD of +`https://github.com/meow/vcpkg` before the first vcpkg process has the chance to `git rev-parse FETCH_HEAD`. +Since the first vcpkg process will run `git rev-parse` after the second fetch is done, +instead of getting the `HEAD` of `microsoft/vcpkg`, they instead get the `HEAD` of `meow/vcpkg`. +We will solve this by having a mutex file in `$CACHE_ROOT/registries/git` +that vcpkg locks before any fetches (and unlocks after `rev-parse`ing). + +### Accessing Port Data from `git-tree`s + +Once we've done version resolution and everything with the database, +we then need to access the port data from the git history. +We will add a new folder, `$CACHE_ROOT/registries/git-trees`, into which we'll check out the port data. + +In this `git-trees` directory, we will have all of the trees we check out, at their hashes. +For example, the asmjit port data from above will be located at +`git-trees/2bb51d8ec8b43bb9b21032185ca8123da10ecc6c`. +We will add a mutex file in this `git-trees` directory as well which is taken whenever +we are checking out a new git tree. +We wish to allow multiple vcpkg instances to read port data at a time, +and thus we do the check outs semi-atomically - if `git-trees/` exists, +then the `` must be completely checked out. +vcpkg does this by first checking out to a temporary directory, +and then renaming to the actual hash. + +## Future Extensions + +The way forward for this is to allow the `"builtin"` registry to be a git registry, +in order to support packaging and shipping vcpkg as a binary. +This is currently our plan, although it definitely is still a ways out. +Git registries _are_ an important step on that road, +but are also a good way to support both enterprise, +and experimentation by our users. +They allow us a lot more flexibility than we've had in the past. \ No newline at end of file From 1d757cb90a82976a458e6048b4074cbe750dc466 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 4 Feb 2021 10:15:44 -0800 Subject: [PATCH 0666/1694] [vcpkg] Download vcpkg.exe rather than building it in bootstrap on Windows. (#15474) This reduces bootstrap cost for Windows customers, resolving the issue initially submitted as #12502 . The `toolsrc` tree was extracted to https://github.com/microsoft/vcpkg-tool. `bootstrap.sh` was changed to download the right source tarball, extract, and build it. This was chosen over the previous attempt, a submodule, over concerns of accidentally destroying people's local modifications. --- .gitignore | 9 - docs/about/privacy.md | 2 +- docs/tool-maintainers/benchmarking.md | 195 - docs/tool-maintainers/layout.md | 74 - docs/tool-maintainers/testing.md | 152 - scripts/Generate-SpdxLicenseList.ps1 | 63 - ...reate-FormatDiff.ps1 => Create-PRDiff.ps1} | 0 scripts/azure-pipelines/Format-CxxCode.ps1 | 50 - scripts/azure-pipelines/azure-pipelines.yml | 14 +- .../backcompat-helpers.ps1 | 24 - .../end-to-end-tests-dir/binarycaching.ps1 | 86 - .../end-to-end-tests-dir/build-missing.ps1 | 18 - .../end-to-end-tests-dir/cli.ps1 | 11 - .../end-to-end-tests-dir/create.ps1 | 10 - .../end-to-end-tests-dir/disable-metrics.ps1 | 67 - .../end-to-end-tests-dir/env-passthrough.ps1 | 21 - .../integrate-install.ps1 | 28 - .../end-to-end-tests-dir/registries.ps1 | 192 - .../end-to-end-tests-dir/spaces.ps1 | 11 - .../vcpkg-minimum-required.ps1 | 22 - .../end-to-end-tests-dir/versions.ps1 | 98 - .../end-to-end-tests-prelude.ps1 | 80 - scripts/azure-pipelines/end-to-end-tests.ps1 | 55 - .../azure-pipelines/linux/azure-pipelines.yml | 13 +- .../azure-pipelines/osx/azure-pipelines.yml | 11 - scripts/azure-pipelines/signing.yml | 125 - .../windows/azure-pipelines.yml | 29 +- .../azure-pipelines/windows/packages.config | 4 - .../azure-pipelines/windows/signing.signproj | 39 - scripts/bootstrap.ps1 | 401 +- scripts/bootstrap.sh | 24 +- scripts/cleanEnvironmentHelper.ps1 | 52 - .../portfile.cmake | 2 - .../vcpkg-requires-current-date/vcpkg.json | 6 - .../vcpkg-requires-future-date/portfile.cmake | 2 - .../vcpkg-requires-future-date/vcpkg.json | 6 - .../vcpkg-requires-old-date/portfile.cmake | 2 - .../vcpkg-requires-old-date/vcpkg.json | 6 - .../vcpkg-uses-test-cmake/portfile.cmake | 3 - .../overlays/vcpkg-uses-test-cmake/vcpkg.json | 6 - .../portfile.cmake | 3 - .../vcpkg.json | 6 - .../portfile.cmake | 1 - .../vcpkg-internal-e2e-test-port/vcpkg.json | 4 - scripts/e2e_ports/versions/baseline.json | 5 - .../v-/vcpkg-internal-e2e-test-port.json | 8 - .../testing/env-passthrough/passthrough.cmake | 6 - .../testing/integrate-install/NoProps.vcxproj | 145 - .../integrate-install/Project1.vcxproj | 146 - scripts/testing/integrate-install/Source.cpp | 6 - .../integrate-install/VcpkgTriplet.vcxproj | 151 - .../integrate-install/VcpkgTriplet2.vcxproj | 149 - .../integrate-install/VcpkgUseStatic.vcxproj | 151 - .../integrate-install/VcpkgUseStatic2.vcxproj | 149 - scripts/tls12-download.exe | Bin 0 -> 18312 bytes toolsrc/.clang-format | 54 - toolsrc/CMakeLists.txt | 222 - toolsrc/cmake/utilities.cmake | 250 - toolsrc/include/catch2/catch.hpp | 16865 ---------------- toolsrc/include/pch.h | 55 - .../include/vcpkg-test/mockcmakevarprovider.h | 42 - toolsrc/include/vcpkg-test/util.h | 132 - toolsrc/include/vcpkg/archives.h | 10 - toolsrc/include/vcpkg/base/basic_checks.h | 41 - toolsrc/include/vcpkg/base/cache.h | 21 - toolsrc/include/vcpkg/base/checks.h | 60 - toolsrc/include/vcpkg/base/chrono.h | 75 - toolsrc/include/vcpkg/base/cofffilereader.h | 25 - toolsrc/include/vcpkg/base/cstringview.h | 60 - toolsrc/include/vcpkg/base/delayed_init.h | 29 - toolsrc/include/vcpkg/base/downloads.h | 41 - toolsrc/include/vcpkg/base/enums.h | 11 - toolsrc/include/vcpkg/base/expected.h | 245 - toolsrc/include/vcpkg/base/files.h | 315 - toolsrc/include/vcpkg/base/fwd/json.h | 10 - toolsrc/include/vcpkg/base/fwd/lockguarded.h | 10 - toolsrc/include/vcpkg/base/fwd/optional.h | 7 - toolsrc/include/vcpkg/base/fwd/span.h | 10 - toolsrc/include/vcpkg/base/fwd/stringview.h | 6 - toolsrc/include/vcpkg/base/graphs.h | 113 - toolsrc/include/vcpkg/base/hash.h | 52 - toolsrc/include/vcpkg/base/ignore_errors.h | 10 - toolsrc/include/vcpkg/base/json.h | 302 - toolsrc/include/vcpkg/base/jsonreader.h | 367 - toolsrc/include/vcpkg/base/lazy.h | 26 - toolsrc/include/vcpkg/base/lineinfo.h | 13 - toolsrc/include/vcpkg/base/lockguarded.h | 35 - toolsrc/include/vcpkg/base/machinetype.h | 37 - toolsrc/include/vcpkg/base/optional.h | 382 - toolsrc/include/vcpkg/base/parse.h | 129 - toolsrc/include/vcpkg/base/pragmas.h | 35 - toolsrc/include/vcpkg/base/sortedvector.h | 52 - toolsrc/include/vcpkg/base/span.h | 55 - toolsrc/include/vcpkg/base/stringliteral.h | 18 - toolsrc/include/vcpkg/base/strings.h | 306 - toolsrc/include/vcpkg/base/stringview.h | 55 - toolsrc/include/vcpkg/base/system.debug.h | 45 - toolsrc/include/vcpkg/base/system.h | 50 - toolsrc/include/vcpkg/base/system.print.h | 67 - toolsrc/include/vcpkg/base/system.process.h | 144 - toolsrc/include/vcpkg/base/system_headers.h | 40 - toolsrc/include/vcpkg/base/uint128.h | 24 - toolsrc/include/vcpkg/base/unicode.h | 148 - toolsrc/include/vcpkg/base/util.h | 248 - toolsrc/include/vcpkg/base/view.h | 3 - toolsrc/include/vcpkg/base/xmlserializer.h | 31 - toolsrc/include/vcpkg/base/zstringview.h | 52 - toolsrc/include/vcpkg/binarycaching.h | 62 - toolsrc/include/vcpkg/binarycaching.private.h | 51 - toolsrc/include/vcpkg/binaryparagraph.h | 55 - toolsrc/include/vcpkg/build.h | 389 - toolsrc/include/vcpkg/buildenvironment.h | 15 - toolsrc/include/vcpkg/cmakevars.h | 38 - toolsrc/include/vcpkg/commands.add-version.h | 13 - toolsrc/include/vcpkg/commands.autocomplete.h | 13 - .../include/vcpkg/commands.buildexternal.h | 15 - toolsrc/include/vcpkg/commands.cache.h | 13 - toolsrc/include/vcpkg/commands.ci.h | 16 - toolsrc/include/vcpkg/commands.ciclean.h | 13 - .../include/vcpkg/commands.civerifyversions.h | 13 - toolsrc/include/vcpkg/commands.contact.h | 15 - toolsrc/include/vcpkg/commands.create.h | 15 - toolsrc/include/vcpkg/commands.dependinfo.h | 16 - toolsrc/include/vcpkg/commands.edit.h | 14 - toolsrc/include/vcpkg/commands.env.h | 16 - toolsrc/include/vcpkg/commands.fetch.h | 13 - .../include/vcpkg/commands.format-manifest.h | 14 - toolsrc/include/vcpkg/commands.h | 32 - toolsrc/include/vcpkg/commands.hash.h | 13 - toolsrc/include/vcpkg/commands.info.h | 13 - toolsrc/include/vcpkg/commands.integrate.h | 17 - toolsrc/include/vcpkg/commands.interface.h | 37 - toolsrc/include/vcpkg/commands.list.h | 14 - toolsrc/include/vcpkg/commands.owns.h | 15 - toolsrc/include/vcpkg/commands.porthistory.h | 13 - toolsrc/include/vcpkg/commands.portsdiff.h | 13 - toolsrc/include/vcpkg/commands.search.h | 15 - toolsrc/include/vcpkg/commands.setinstalled.h | 26 - toolsrc/include/vcpkg/commands.upgrade.h | 16 - .../include/vcpkg/commands.upload-metrics.h | 12 - toolsrc/include/vcpkg/commands.version.h | 15 - toolsrc/include/vcpkg/commands.xvsinstances.h | 14 - toolsrc/include/vcpkg/configuration.h | 25 - toolsrc/include/vcpkg/dependencies.h | 188 - toolsrc/include/vcpkg/export.chocolatey.h | 20 - toolsrc/include/vcpkg/export.h | 19 - toolsrc/include/vcpkg/export.ifw.h | 25 - toolsrc/include/vcpkg/export.prefab.h | 79 - toolsrc/include/vcpkg/fwd/build.h | 7 - toolsrc/include/vcpkg/fwd/cmakevars.h | 6 - toolsrc/include/vcpkg/fwd/configuration.h | 6 - toolsrc/include/vcpkg/fwd/dependencies.h | 7 - toolsrc/include/vcpkg/fwd/packagespec.h | 6 - toolsrc/include/vcpkg/fwd/portfileprovider.h | 10 - toolsrc/include/vcpkg/fwd/registries.h | 9 - toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h | 14 - toolsrc/include/vcpkg/fwd/vcpkgpaths.h | 8 - toolsrc/include/vcpkg/globalstate.h | 21 - toolsrc/include/vcpkg/help.h | 19 - toolsrc/include/vcpkg/input.h | 15 - toolsrc/include/vcpkg/install.h | 116 - toolsrc/include/vcpkg/metrics.h | 33 - toolsrc/include/vcpkg/packagespec.h | 226 - toolsrc/include/vcpkg/paragraphparser.h | 68 - toolsrc/include/vcpkg/paragraphs.h | 60 - toolsrc/include/vcpkg/platform-expression.h | 82 - toolsrc/include/vcpkg/portfileprovider.h | 70 - .../include/vcpkg/postbuildlint.buildtype.h | 65 - toolsrc/include/vcpkg/postbuildlint.h | 20 - toolsrc/include/vcpkg/registries.h | 111 - toolsrc/include/vcpkg/remove.h | 34 - toolsrc/include/vcpkg/sourceparagraph.h | 156 - toolsrc/include/vcpkg/statusparagraph.h | 68 - toolsrc/include/vcpkg/statusparagraphs.h | 82 - toolsrc/include/vcpkg/textrowcol.h | 17 - toolsrc/include/vcpkg/tools.h | 37 - toolsrc/include/vcpkg/triplet.h | 50 - toolsrc/include/vcpkg/update.h | 35 - toolsrc/include/vcpkg/userconfig.h | 23 - toolsrc/include/vcpkg/vcpkgcmdarguments.h | 236 - toolsrc/include/vcpkg/vcpkglib.h | 26 - toolsrc/include/vcpkg/vcpkgpaths.h | 178 - toolsrc/include/vcpkg/versiondeserializers.h | 41 - toolsrc/include/vcpkg/versions.h | 87 - toolsrc/include/vcpkg/versiont.h | 44 - toolsrc/include/vcpkg/visualstudio.h | 14 - toolsrc/src/pch.cpp | 2 - toolsrc/src/tls12-download.c | 311 - toolsrc/src/vcpkg-fuzz/main.cpp | 194 - toolsrc/src/vcpkg-test/arguments.cpp | 135 - toolsrc/src/vcpkg-test/binarycaching.cpp | 290 - toolsrc/src/vcpkg-test/binaryconfigparser.cpp | 336 - toolsrc/src/vcpkg-test/catch.cpp | 12 - toolsrc/src/vcpkg-test/chrono.cpp | 34 - toolsrc/src/vcpkg-test/commands.cpp | 83 - toolsrc/src/vcpkg-test/dependencies.cpp | 1713 -- toolsrc/src/vcpkg-test/downloads.cpp | 59 - toolsrc/src/vcpkg-test/files.cpp | 406 - toolsrc/src/vcpkg-test/hash.cpp | 276 - toolsrc/src/vcpkg-test/json.cpp | 241 - .../vcpkg-test/large-json-document.json.inc | 516 - toolsrc/src/vcpkg-test/manifests.cpp | 733 - .../src/vcpkg-test/mockcmakevarsprovider.cpp | 28 - toolsrc/src/vcpkg-test/optional.cpp | 121 - toolsrc/src/vcpkg-test/paragraph.cpp | 516 - toolsrc/src/vcpkg-test/plan.cpp | 1297 -- .../src/vcpkg-test/platform-expression.cpp | 80 - toolsrc/src/vcpkg-test/registries.cpp | 132 - toolsrc/src/vcpkg-test/specifier.cpp | 130 - toolsrc/src/vcpkg-test/statusparagraphs.cpp | 116 - toolsrc/src/vcpkg-test/strings.cpp | 114 - toolsrc/src/vcpkg-test/stringview.cpp | 19 - toolsrc/src/vcpkg-test/system.cpp | 149 - toolsrc/src/vcpkg-test/uint128.cpp | 68 - toolsrc/src/vcpkg-test/update.cpp | 105 - toolsrc/src/vcpkg-test/util.cpp | 230 - toolsrc/src/vcpkg-test/versionplan.cpp | 152 - toolsrc/src/vcpkg.cpp | 313 - toolsrc/src/vcpkg/archives.cpp | 130 - toolsrc/src/vcpkg/base/checks.cpp | 120 - toolsrc/src/vcpkg/base/chrono.cpp | 180 - toolsrc/src/vcpkg/base/cofffilereader.cpp | 311 - toolsrc/src/vcpkg/base/downloads.cpp | 467 - toolsrc/src/vcpkg/base/enums.cpp | 12 - toolsrc/src/vcpkg/base/files.cpp | 1595 -- toolsrc/src/vcpkg/base/hash.cpp | 703 - toolsrc/src/vcpkg/base/json.cpp | 1411 -- toolsrc/src/vcpkg/base/machinetype.cpp | 39 - toolsrc/src/vcpkg/base/parse.cpp | 110 - toolsrc/src/vcpkg/base/strings.cpp | 381 - toolsrc/src/vcpkg/base/stringview.cpp | 45 - toolsrc/src/vcpkg/base/system.cpp | 343 - toolsrc/src/vcpkg/base/system.print.cpp | 30 - toolsrc/src/vcpkg/base/system.process.cpp | 793 - toolsrc/src/vcpkg/base/uint128.cpp | 66 - toolsrc/src/vcpkg/base/unicode.cpp | 282 - toolsrc/src/vcpkg/base/xmlserializer.cpp | 113 - toolsrc/src/vcpkg/binarycaching.cpp | 1477 -- toolsrc/src/vcpkg/binaryparagraph.cpp | 312 - toolsrc/src/vcpkg/build.cpp | 1491 -- toolsrc/src/vcpkg/buildenvironment.cpp | 20 - toolsrc/src/vcpkg/cmakevars.cpp | 323 - toolsrc/src/vcpkg/commands.add-version.cpp | 416 - toolsrc/src/vcpkg/commands.autocomplete.cpp | 185 - toolsrc/src/vcpkg/commands.buildexternal.cpp | 54 - toolsrc/src/vcpkg/commands.cache.cpp | 79 - toolsrc/src/vcpkg/commands.ci.cpp | 606 - toolsrc/src/vcpkg/commands.ciclean.cpp | 46 - .../src/vcpkg/commands.civerifyversions.cpp | 418 - toolsrc/src/vcpkg/commands.contact.cpp | 66 - toolsrc/src/vcpkg/commands.cpp | 134 - toolsrc/src/vcpkg/commands.create.cpp | 70 - toolsrc/src/vcpkg/commands.dependinfo.cpp | 339 - toolsrc/src/vcpkg/commands.edit.cpp | 278 - toolsrc/src/vcpkg/commands.env.cpp | 122 - toolsrc/src/vcpkg/commands.fetch.cpp | 30 - .../src/vcpkg/commands.format-manifest.cpp | 291 - toolsrc/src/vcpkg/commands.hash.cpp | 41 - toolsrc/src/vcpkg/commands.info.cpp | 147 - toolsrc/src/vcpkg/commands.integrate.cpp | 607 - toolsrc/src/vcpkg/commands.list.cpp | 147 - toolsrc/src/vcpkg/commands.owns.cpp | 47 - toolsrc/src/vcpkg/commands.porthistory.cpp | 240 - toolsrc/src/vcpkg/commands.portsdiff.cpp | 200 - toolsrc/src/vcpkg/commands.search.cpp | 184 - toolsrc/src/vcpkg/commands.setinstalled.cpp | 176 - toolsrc/src/vcpkg/commands.upgrade.cpp | 210 - toolsrc/src/vcpkg/commands.upload-metrics.cpp | 29 - toolsrc/src/vcpkg/commands.version.cpp | 60 - toolsrc/src/vcpkg/commands.xvsinstances.cpp | 41 - toolsrc/src/vcpkg/configuration.cpp | 84 - toolsrc/src/vcpkg/dependencies.cpp | 1896 -- toolsrc/src/vcpkg/export.chocolatey.cpp | 233 - toolsrc/src/vcpkg/export.cpp | 707 - toolsrc/src/vcpkg/export.ifw.cpp | 517 - toolsrc/src/vcpkg/export.prefab.cpp | 719 - toolsrc/src/vcpkg/globalstate.cpp | 13 - toolsrc/src/vcpkg/help.cpp | 205 - toolsrc/src/vcpkg/input.cpp | 56 - toolsrc/src/vcpkg/install.cpp | 1105 - toolsrc/src/vcpkg/metrics.cpp | 501 - toolsrc/src/vcpkg/packagespec.cpp | 291 - toolsrc/src/vcpkg/paragraphs.cpp | 531 - toolsrc/src/vcpkg/platform-expression.cpp | 577 - toolsrc/src/vcpkg/portfileprovider.cpp | 390 - toolsrc/src/vcpkg/postbuildlint.buildtype.cpp | 71 - toolsrc/src/vcpkg/postbuildlint.cpp | 981 - toolsrc/src/vcpkg/registries.cpp | 1204 -- toolsrc/src/vcpkg/remove.cpp | 337 - toolsrc/src/vcpkg/sourceparagraph.cpp | 1389 -- toolsrc/src/vcpkg/spdx-exceptions.inc | 45 - toolsrc/src/vcpkg/spdx-licenses.inc | 426 - toolsrc/src/vcpkg/statusparagraph.cpp | 121 - toolsrc/src/vcpkg/statusparagraphs.cpp | 186 - toolsrc/src/vcpkg/tools.cpp | 615 - toolsrc/src/vcpkg/triplet.cpp | 110 - toolsrc/src/vcpkg/update.cpp | 103 - toolsrc/src/vcpkg/userconfig.cpp | 77 - toolsrc/src/vcpkg/vcpkgcmdarguments.cpp | 960 - toolsrc/src/vcpkg/vcpkglib.cpp | 239 - toolsrc/src/vcpkg/vcpkgpaths.cpp | 1086 - toolsrc/src/vcpkg/versiondeserializers.cpp | 202 - toolsrc/src/vcpkg/versions.cpp | 247 - toolsrc/src/vcpkg/versiont.cpp | 48 - toolsrc/src/vcpkg/visualstudio.cpp | 381 - toolsrc/vcpkg.natvis | 35 - toolsrc/windows-bootstrap/vcpkg.vcxproj | 374 - 307 files changed, 46 insertions(+), 69859 deletions(-) delete mode 100644 docs/tool-maintainers/benchmarking.md delete mode 100644 docs/tool-maintainers/layout.md delete mode 100644 docs/tool-maintainers/testing.md delete mode 100644 scripts/Generate-SpdxLicenseList.ps1 rename scripts/azure-pipelines/{Create-FormatDiff.ps1 => Create-PRDiff.ps1} (100%) delete mode 100644 scripts/azure-pipelines/Format-CxxCode.ps1 delete mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1 delete mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1 delete mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/build-missing.ps1 delete mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/cli.ps1 delete mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/create.ps1 delete mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1 delete mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/env-passthrough.ps1 delete mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1 delete mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 delete mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1 delete mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/vcpkg-minimum-required.ps1 delete mode 100644 scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 delete mode 100644 scripts/azure-pipelines/end-to-end-tests-prelude.ps1 delete mode 100644 scripts/azure-pipelines/end-to-end-tests.ps1 delete mode 100644 scripts/azure-pipelines/signing.yml delete mode 100644 scripts/azure-pipelines/windows/packages.config delete mode 100644 scripts/azure-pipelines/windows/signing.signproj delete mode 100644 scripts/cleanEnvironmentHelper.ps1 delete mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake delete mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json delete mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake delete mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json delete mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake delete mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json delete mode 100644 scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake delete mode 100644 scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json delete mode 100644 scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake delete mode 100644 scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json delete mode 100644 scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake delete mode 100644 scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json delete mode 100644 scripts/e2e_ports/versions/baseline.json delete mode 100644 scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json delete mode 100644 scripts/testing/env-passthrough/passthrough.cmake delete mode 100644 scripts/testing/integrate-install/NoProps.vcxproj delete mode 100644 scripts/testing/integrate-install/Project1.vcxproj delete mode 100644 scripts/testing/integrate-install/Source.cpp delete mode 100644 scripts/testing/integrate-install/VcpkgTriplet.vcxproj delete mode 100644 scripts/testing/integrate-install/VcpkgTriplet2.vcxproj delete mode 100644 scripts/testing/integrate-install/VcpkgUseStatic.vcxproj delete mode 100644 scripts/testing/integrate-install/VcpkgUseStatic2.vcxproj create mode 100644 scripts/tls12-download.exe delete mode 100644 toolsrc/.clang-format delete mode 100644 toolsrc/CMakeLists.txt delete mode 100644 toolsrc/cmake/utilities.cmake delete mode 100644 toolsrc/include/catch2/catch.hpp delete mode 100644 toolsrc/include/pch.h delete mode 100644 toolsrc/include/vcpkg-test/mockcmakevarprovider.h delete mode 100644 toolsrc/include/vcpkg-test/util.h delete mode 100644 toolsrc/include/vcpkg/archives.h delete mode 100644 toolsrc/include/vcpkg/base/basic_checks.h delete mode 100644 toolsrc/include/vcpkg/base/cache.h delete mode 100644 toolsrc/include/vcpkg/base/checks.h delete mode 100644 toolsrc/include/vcpkg/base/chrono.h delete mode 100644 toolsrc/include/vcpkg/base/cofffilereader.h delete mode 100644 toolsrc/include/vcpkg/base/cstringview.h delete mode 100644 toolsrc/include/vcpkg/base/delayed_init.h delete mode 100644 toolsrc/include/vcpkg/base/downloads.h delete mode 100644 toolsrc/include/vcpkg/base/enums.h delete mode 100644 toolsrc/include/vcpkg/base/expected.h delete mode 100644 toolsrc/include/vcpkg/base/files.h delete mode 100644 toolsrc/include/vcpkg/base/fwd/json.h delete mode 100644 toolsrc/include/vcpkg/base/fwd/lockguarded.h delete mode 100644 toolsrc/include/vcpkg/base/fwd/optional.h delete mode 100644 toolsrc/include/vcpkg/base/fwd/span.h delete mode 100644 toolsrc/include/vcpkg/base/fwd/stringview.h delete mode 100644 toolsrc/include/vcpkg/base/graphs.h delete mode 100644 toolsrc/include/vcpkg/base/hash.h delete mode 100644 toolsrc/include/vcpkg/base/ignore_errors.h delete mode 100644 toolsrc/include/vcpkg/base/json.h delete mode 100644 toolsrc/include/vcpkg/base/jsonreader.h delete mode 100644 toolsrc/include/vcpkg/base/lazy.h delete mode 100644 toolsrc/include/vcpkg/base/lineinfo.h delete mode 100644 toolsrc/include/vcpkg/base/lockguarded.h delete mode 100644 toolsrc/include/vcpkg/base/machinetype.h delete mode 100644 toolsrc/include/vcpkg/base/optional.h delete mode 100644 toolsrc/include/vcpkg/base/parse.h delete mode 100644 toolsrc/include/vcpkg/base/pragmas.h delete mode 100644 toolsrc/include/vcpkg/base/sortedvector.h delete mode 100644 toolsrc/include/vcpkg/base/span.h delete mode 100644 toolsrc/include/vcpkg/base/stringliteral.h delete mode 100644 toolsrc/include/vcpkg/base/strings.h delete mode 100644 toolsrc/include/vcpkg/base/stringview.h delete mode 100644 toolsrc/include/vcpkg/base/system.debug.h delete mode 100644 toolsrc/include/vcpkg/base/system.h delete mode 100644 toolsrc/include/vcpkg/base/system.print.h delete mode 100644 toolsrc/include/vcpkg/base/system.process.h delete mode 100644 toolsrc/include/vcpkg/base/system_headers.h delete mode 100644 toolsrc/include/vcpkg/base/uint128.h delete mode 100644 toolsrc/include/vcpkg/base/unicode.h delete mode 100644 toolsrc/include/vcpkg/base/util.h delete mode 100644 toolsrc/include/vcpkg/base/view.h delete mode 100644 toolsrc/include/vcpkg/base/xmlserializer.h delete mode 100644 toolsrc/include/vcpkg/base/zstringview.h delete mode 100644 toolsrc/include/vcpkg/binarycaching.h delete mode 100644 toolsrc/include/vcpkg/binarycaching.private.h delete mode 100644 toolsrc/include/vcpkg/binaryparagraph.h delete mode 100644 toolsrc/include/vcpkg/build.h delete mode 100644 toolsrc/include/vcpkg/buildenvironment.h delete mode 100644 toolsrc/include/vcpkg/cmakevars.h delete mode 100644 toolsrc/include/vcpkg/commands.add-version.h delete mode 100644 toolsrc/include/vcpkg/commands.autocomplete.h delete mode 100644 toolsrc/include/vcpkg/commands.buildexternal.h delete mode 100644 toolsrc/include/vcpkg/commands.cache.h delete mode 100644 toolsrc/include/vcpkg/commands.ci.h delete mode 100644 toolsrc/include/vcpkg/commands.ciclean.h delete mode 100644 toolsrc/include/vcpkg/commands.civerifyversions.h delete mode 100644 toolsrc/include/vcpkg/commands.contact.h delete mode 100644 toolsrc/include/vcpkg/commands.create.h delete mode 100644 toolsrc/include/vcpkg/commands.dependinfo.h delete mode 100644 toolsrc/include/vcpkg/commands.edit.h delete mode 100644 toolsrc/include/vcpkg/commands.env.h delete mode 100644 toolsrc/include/vcpkg/commands.fetch.h delete mode 100644 toolsrc/include/vcpkg/commands.format-manifest.h delete mode 100644 toolsrc/include/vcpkg/commands.h delete mode 100644 toolsrc/include/vcpkg/commands.hash.h delete mode 100644 toolsrc/include/vcpkg/commands.info.h delete mode 100644 toolsrc/include/vcpkg/commands.integrate.h delete mode 100644 toolsrc/include/vcpkg/commands.interface.h delete mode 100644 toolsrc/include/vcpkg/commands.list.h delete mode 100644 toolsrc/include/vcpkg/commands.owns.h delete mode 100644 toolsrc/include/vcpkg/commands.porthistory.h delete mode 100644 toolsrc/include/vcpkg/commands.portsdiff.h delete mode 100644 toolsrc/include/vcpkg/commands.search.h delete mode 100644 toolsrc/include/vcpkg/commands.setinstalled.h delete mode 100644 toolsrc/include/vcpkg/commands.upgrade.h delete mode 100644 toolsrc/include/vcpkg/commands.upload-metrics.h delete mode 100644 toolsrc/include/vcpkg/commands.version.h delete mode 100644 toolsrc/include/vcpkg/commands.xvsinstances.h delete mode 100644 toolsrc/include/vcpkg/configuration.h delete mode 100644 toolsrc/include/vcpkg/dependencies.h delete mode 100644 toolsrc/include/vcpkg/export.chocolatey.h delete mode 100644 toolsrc/include/vcpkg/export.h delete mode 100644 toolsrc/include/vcpkg/export.ifw.h delete mode 100644 toolsrc/include/vcpkg/export.prefab.h delete mode 100644 toolsrc/include/vcpkg/fwd/build.h delete mode 100644 toolsrc/include/vcpkg/fwd/cmakevars.h delete mode 100644 toolsrc/include/vcpkg/fwd/configuration.h delete mode 100644 toolsrc/include/vcpkg/fwd/dependencies.h delete mode 100644 toolsrc/include/vcpkg/fwd/packagespec.h delete mode 100644 toolsrc/include/vcpkg/fwd/portfileprovider.h delete mode 100644 toolsrc/include/vcpkg/fwd/registries.h delete mode 100644 toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h delete mode 100644 toolsrc/include/vcpkg/fwd/vcpkgpaths.h delete mode 100644 toolsrc/include/vcpkg/globalstate.h delete mode 100644 toolsrc/include/vcpkg/help.h delete mode 100644 toolsrc/include/vcpkg/input.h delete mode 100644 toolsrc/include/vcpkg/install.h delete mode 100644 toolsrc/include/vcpkg/metrics.h delete mode 100644 toolsrc/include/vcpkg/packagespec.h delete mode 100644 toolsrc/include/vcpkg/paragraphparser.h delete mode 100644 toolsrc/include/vcpkg/paragraphs.h delete mode 100644 toolsrc/include/vcpkg/platform-expression.h delete mode 100644 toolsrc/include/vcpkg/portfileprovider.h delete mode 100644 toolsrc/include/vcpkg/postbuildlint.buildtype.h delete mode 100644 toolsrc/include/vcpkg/postbuildlint.h delete mode 100644 toolsrc/include/vcpkg/registries.h delete mode 100644 toolsrc/include/vcpkg/remove.h delete mode 100644 toolsrc/include/vcpkg/sourceparagraph.h delete mode 100644 toolsrc/include/vcpkg/statusparagraph.h delete mode 100644 toolsrc/include/vcpkg/statusparagraphs.h delete mode 100644 toolsrc/include/vcpkg/textrowcol.h delete mode 100644 toolsrc/include/vcpkg/tools.h delete mode 100644 toolsrc/include/vcpkg/triplet.h delete mode 100644 toolsrc/include/vcpkg/update.h delete mode 100644 toolsrc/include/vcpkg/userconfig.h delete mode 100644 toolsrc/include/vcpkg/vcpkgcmdarguments.h delete mode 100644 toolsrc/include/vcpkg/vcpkglib.h delete mode 100644 toolsrc/include/vcpkg/vcpkgpaths.h delete mode 100644 toolsrc/include/vcpkg/versiondeserializers.h delete mode 100644 toolsrc/include/vcpkg/versions.h delete mode 100644 toolsrc/include/vcpkg/versiont.h delete mode 100644 toolsrc/include/vcpkg/visualstudio.h delete mode 100644 toolsrc/src/pch.cpp delete mode 100644 toolsrc/src/tls12-download.c delete mode 100644 toolsrc/src/vcpkg-fuzz/main.cpp delete mode 100644 toolsrc/src/vcpkg-test/arguments.cpp delete mode 100644 toolsrc/src/vcpkg-test/binarycaching.cpp delete mode 100644 toolsrc/src/vcpkg-test/binaryconfigparser.cpp delete mode 100644 toolsrc/src/vcpkg-test/catch.cpp delete mode 100644 toolsrc/src/vcpkg-test/chrono.cpp delete mode 100644 toolsrc/src/vcpkg-test/commands.cpp delete mode 100644 toolsrc/src/vcpkg-test/dependencies.cpp delete mode 100644 toolsrc/src/vcpkg-test/downloads.cpp delete mode 100644 toolsrc/src/vcpkg-test/files.cpp delete mode 100644 toolsrc/src/vcpkg-test/hash.cpp delete mode 100644 toolsrc/src/vcpkg-test/json.cpp delete mode 100644 toolsrc/src/vcpkg-test/large-json-document.json.inc delete mode 100644 toolsrc/src/vcpkg-test/manifests.cpp delete mode 100644 toolsrc/src/vcpkg-test/mockcmakevarsprovider.cpp delete mode 100644 toolsrc/src/vcpkg-test/optional.cpp delete mode 100644 toolsrc/src/vcpkg-test/paragraph.cpp delete mode 100644 toolsrc/src/vcpkg-test/plan.cpp delete mode 100644 toolsrc/src/vcpkg-test/platform-expression.cpp delete mode 100644 toolsrc/src/vcpkg-test/registries.cpp delete mode 100644 toolsrc/src/vcpkg-test/specifier.cpp delete mode 100644 toolsrc/src/vcpkg-test/statusparagraphs.cpp delete mode 100644 toolsrc/src/vcpkg-test/strings.cpp delete mode 100644 toolsrc/src/vcpkg-test/stringview.cpp delete mode 100644 toolsrc/src/vcpkg-test/system.cpp delete mode 100644 toolsrc/src/vcpkg-test/uint128.cpp delete mode 100644 toolsrc/src/vcpkg-test/update.cpp delete mode 100644 toolsrc/src/vcpkg-test/util.cpp delete mode 100644 toolsrc/src/vcpkg-test/versionplan.cpp delete mode 100644 toolsrc/src/vcpkg.cpp delete mode 100644 toolsrc/src/vcpkg/archives.cpp delete mode 100644 toolsrc/src/vcpkg/base/checks.cpp delete mode 100644 toolsrc/src/vcpkg/base/chrono.cpp delete mode 100644 toolsrc/src/vcpkg/base/cofffilereader.cpp delete mode 100644 toolsrc/src/vcpkg/base/downloads.cpp delete mode 100644 toolsrc/src/vcpkg/base/enums.cpp delete mode 100644 toolsrc/src/vcpkg/base/files.cpp delete mode 100644 toolsrc/src/vcpkg/base/hash.cpp delete mode 100644 toolsrc/src/vcpkg/base/json.cpp delete mode 100644 toolsrc/src/vcpkg/base/machinetype.cpp delete mode 100644 toolsrc/src/vcpkg/base/parse.cpp delete mode 100644 toolsrc/src/vcpkg/base/strings.cpp delete mode 100644 toolsrc/src/vcpkg/base/stringview.cpp delete mode 100644 toolsrc/src/vcpkg/base/system.cpp delete mode 100644 toolsrc/src/vcpkg/base/system.print.cpp delete mode 100644 toolsrc/src/vcpkg/base/system.process.cpp delete mode 100644 toolsrc/src/vcpkg/base/uint128.cpp delete mode 100644 toolsrc/src/vcpkg/base/unicode.cpp delete mode 100644 toolsrc/src/vcpkg/base/xmlserializer.cpp delete mode 100644 toolsrc/src/vcpkg/binarycaching.cpp delete mode 100644 toolsrc/src/vcpkg/binaryparagraph.cpp delete mode 100644 toolsrc/src/vcpkg/build.cpp delete mode 100644 toolsrc/src/vcpkg/buildenvironment.cpp delete mode 100644 toolsrc/src/vcpkg/cmakevars.cpp delete mode 100644 toolsrc/src/vcpkg/commands.add-version.cpp delete mode 100644 toolsrc/src/vcpkg/commands.autocomplete.cpp delete mode 100644 toolsrc/src/vcpkg/commands.buildexternal.cpp delete mode 100644 toolsrc/src/vcpkg/commands.cache.cpp delete mode 100644 toolsrc/src/vcpkg/commands.ci.cpp delete mode 100644 toolsrc/src/vcpkg/commands.ciclean.cpp delete mode 100644 toolsrc/src/vcpkg/commands.civerifyversions.cpp delete mode 100644 toolsrc/src/vcpkg/commands.contact.cpp delete mode 100644 toolsrc/src/vcpkg/commands.cpp delete mode 100644 toolsrc/src/vcpkg/commands.create.cpp delete mode 100644 toolsrc/src/vcpkg/commands.dependinfo.cpp delete mode 100644 toolsrc/src/vcpkg/commands.edit.cpp delete mode 100644 toolsrc/src/vcpkg/commands.env.cpp delete mode 100644 toolsrc/src/vcpkg/commands.fetch.cpp delete mode 100644 toolsrc/src/vcpkg/commands.format-manifest.cpp delete mode 100644 toolsrc/src/vcpkg/commands.hash.cpp delete mode 100644 toolsrc/src/vcpkg/commands.info.cpp delete mode 100644 toolsrc/src/vcpkg/commands.integrate.cpp delete mode 100644 toolsrc/src/vcpkg/commands.list.cpp delete mode 100644 toolsrc/src/vcpkg/commands.owns.cpp delete mode 100644 toolsrc/src/vcpkg/commands.porthistory.cpp delete mode 100644 toolsrc/src/vcpkg/commands.portsdiff.cpp delete mode 100644 toolsrc/src/vcpkg/commands.search.cpp delete mode 100644 toolsrc/src/vcpkg/commands.setinstalled.cpp delete mode 100644 toolsrc/src/vcpkg/commands.upgrade.cpp delete mode 100644 toolsrc/src/vcpkg/commands.upload-metrics.cpp delete mode 100644 toolsrc/src/vcpkg/commands.version.cpp delete mode 100644 toolsrc/src/vcpkg/commands.xvsinstances.cpp delete mode 100644 toolsrc/src/vcpkg/configuration.cpp delete mode 100644 toolsrc/src/vcpkg/dependencies.cpp delete mode 100644 toolsrc/src/vcpkg/export.chocolatey.cpp delete mode 100644 toolsrc/src/vcpkg/export.cpp delete mode 100644 toolsrc/src/vcpkg/export.ifw.cpp delete mode 100644 toolsrc/src/vcpkg/export.prefab.cpp delete mode 100644 toolsrc/src/vcpkg/globalstate.cpp delete mode 100644 toolsrc/src/vcpkg/help.cpp delete mode 100644 toolsrc/src/vcpkg/input.cpp delete mode 100644 toolsrc/src/vcpkg/install.cpp delete mode 100644 toolsrc/src/vcpkg/metrics.cpp delete mode 100644 toolsrc/src/vcpkg/packagespec.cpp delete mode 100644 toolsrc/src/vcpkg/paragraphs.cpp delete mode 100644 toolsrc/src/vcpkg/platform-expression.cpp delete mode 100644 toolsrc/src/vcpkg/portfileprovider.cpp delete mode 100644 toolsrc/src/vcpkg/postbuildlint.buildtype.cpp delete mode 100644 toolsrc/src/vcpkg/postbuildlint.cpp delete mode 100644 toolsrc/src/vcpkg/registries.cpp delete mode 100644 toolsrc/src/vcpkg/remove.cpp delete mode 100644 toolsrc/src/vcpkg/sourceparagraph.cpp delete mode 100644 toolsrc/src/vcpkg/spdx-exceptions.inc delete mode 100644 toolsrc/src/vcpkg/spdx-licenses.inc delete mode 100644 toolsrc/src/vcpkg/statusparagraph.cpp delete mode 100644 toolsrc/src/vcpkg/statusparagraphs.cpp delete mode 100644 toolsrc/src/vcpkg/tools.cpp delete mode 100644 toolsrc/src/vcpkg/triplet.cpp delete mode 100644 toolsrc/src/vcpkg/update.cpp delete mode 100644 toolsrc/src/vcpkg/userconfig.cpp delete mode 100644 toolsrc/src/vcpkg/vcpkgcmdarguments.cpp delete mode 100644 toolsrc/src/vcpkg/vcpkglib.cpp delete mode 100644 toolsrc/src/vcpkg/vcpkgpaths.cpp delete mode 100644 toolsrc/src/vcpkg/versiondeserializers.cpp delete mode 100644 toolsrc/src/vcpkg/versions.cpp delete mode 100644 toolsrc/src/vcpkg/versiont.cpp delete mode 100644 toolsrc/src/vcpkg/visualstudio.cpp delete mode 100644 toolsrc/vcpkg.natvis delete mode 100644 toolsrc/windows-bootstrap/vcpkg.vcxproj diff --git a/.gitignore b/.gitignore index 6b77e62bab5c98..15b8c8b6ddff1e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,8 +11,6 @@ *.userosscache *.sln.docstates -toolsrc/out* -toolsrc/CMakeSettings.json # fuzzing sync_dir* @@ -30,8 +28,6 @@ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ -# VS Code build -toolsrc/build # Ignore the executable /vcpkg /vcpkg.exe @@ -290,11 +286,6 @@ __pycache__/ /installed*/ /packages/ /scripts/buildsystems/tmp/ -/toolsrc/build.rel/ -/toolsrc/windows-bootstrap/msbuild.x86.debug/ -/toolsrc/windows-bootstrap/msbuild.x86.release/ -/toolsrc/windows-bootstrap/msbuild.x64.debug/ -/toolsrc/windows-bootstrap/msbuild.x64.release/ #ignore custom triplets /triplets/* #add vcpkg-designed triplets back in diff --git a/docs/about/privacy.md b/docs/about/privacy.md index 15ef69d763458a..5efecb6790ff3b 100644 --- a/docs/about/privacy.md +++ b/docs/about/privacy.md @@ -41,7 +41,7 @@ We collect various telemetry events such as the command line used, the time of i You can see the telemetry events any command by appending `--printmetrics` after the vcpkg command line. -In the source code (included in `toolsrc\`), you can search for calls to the functions `track_property()`, `track_feature()`, `track_metric()`, and `track_buildtime()` +In the source code (included at https://github.com/microsoft/vcpkg-tool/ ), you can search for calls to the functions `track_property()`, `track_feature()`, `track_metric()`, and `track_buildtime()` to see every specific data point we collect. ## Avoid inadvertent disclosure information diff --git a/docs/tool-maintainers/benchmarking.md b/docs/tool-maintainers/benchmarking.md deleted file mode 100644 index e0295be50bcf7b..00000000000000 --- a/docs/tool-maintainers/benchmarking.md +++ /dev/null @@ -1,195 +0,0 @@ -# Benchmarking - -Benchmarking new code against old code is extremely important whenever making -large changes to how something works. If you are attempting to make something -faster, and you end up slowing it down, you'll never know if you don't -benchmark! We have benchmarks in the `toolsrc/src/vcpkg-test` directory, just -like the tests -- they're treated as a special kind of test. - -## Running Benchmarks - -Unlike normal tests, benchmarks are hidden behind a special define -- `CATCH_CONFIG_ENABLE_BENCHMARKING` -- so that you never try to run benchmarks -unless you specifically want to. This is because benchmarks actually take quite -a long time! However, if you want to run benchmarks (and I recommend running -only specific benchmarks at a time), you can do so by passing the -`VCPKG_ENABLE_BENCHMARKING` option at cmake configure time. - -```sh -$ cmake -B toolsrc/out -S toolsrc -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DVCPKG_BUILD_BENCHMARKING=On - --- The C compiler identification is MSVC 19.22.27905.0 --- The CXX compiler identification is MSVC 19.22.27905.0 --- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.22.27905/bin/Hostx64/x64/cl.exe --- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.22.27905/bin/Hostx64/x64/cl.exe -- works --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Detecting C compile features --- Detecting C compile features - done --- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.22.27905/bin/Hostx64/x64/cl.exe --- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.22.27905/bin/Hostx64/x64/cl.exe -- works --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Detecting CXX compile features --- Detecting CXX compile features - done --- Looking for pthread.h --- Looking for pthread.h - not found --- Found Threads: TRUE --- Configuring done --- Generating done --- Build files have been written to: C:/Users/t-nimaz/src/vcpkg/toolsrc/out - -$ cmake --build toolsrc/out - -[0/2] Re-checking globbed directories... -[80/80] Linking CXX executable vcpkg-test.exe -``` - -You can then run benchmarks easily with the following command (which run the -files benchmarks): - -```sh -$ ./toolsrc/out/vcpkg-test [!benchmark][file] -``` - -You can switch out `[file]` for a different set -- `[hash]`, for example. - -## Writing Benchmarks - -First, before anything else, I recommend reading the -[benchmarking documentation] at Catch2's repository. - -Now, after that, let's say that you wanted to benchmark, say, our ASCII -case-insensitive string compare against your new implementation. We place -benchmarks for code in the same file as their tests, so open -`vcpkg-test/strings.cpp`, and add the following at the bottom: - -```cpp -#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING) -TEST_CASE ("case insensitive ascii equals: benchmark", "[strings][!benchmark]") -{ - BENCHMARK("qwertyuiop") { - return vcpkg::Strings::case_insensitive_ascii_equals("qwertyuiop", "QWERTYUIOP"); - }; -} -#endif -``` - -Remember the `;` at the end of the benchmark -- it's not required for -`TEST_CASE`s, but is for `BENCHMARK`s. - -Now, let's rebuild and run: - -```sh -$ cmake --build toolsrc/out -[0/2] Re-checking globbed directories... -[2/2] Linking CXX executable vcpkg-test.exe -$ ./toolsrc/out/vcpkg-test [strings][!benchmark] -Filters: [strings][!benchmark] - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -vcpkg-test.exe is a Catch v2.9.1 host application. -Run with -? for options - -------------------------------------------------------------------------------- -case insensitive ascii equals: benchmark -------------------------------------------------------------------------------- -C:\Users\t-nimaz\src\vcpkg\toolsrc\src\vcpkg-test\strings.cpp(36) -............................................................................... - -benchmark name samples iterations estimated - mean low mean high mean - std dev low std dev high std dev -------------------------------------------------------------------------------- -qwertyuiop 100 2088 3.9672 ms - 25 ns 24 ns 26 ns - 6 ns 5 ns 8 ns - - -=============================================================================== -test cases: 1 | 1 passed -assertions: - none - -``` - -You've now written your first benchmark! - -But wait. This seems kind of silly. Benchmarking the comparison of literal -strings is great and all, but could we make it a little more realistic? - -This is where `BENCHMARK_ADVANCED` comes in. `BENCHMARK_ADVANCED` allows one to -write a benchmark that has a little setup to it without screwing up the numbers. -Let's try it now: - -```cpp -TEST_CASE ("case insensitive ascii equals: benchmark", "[strings][!benchmark]") -{ - BENCHMARK_ADVANCED("equal strings")(Catch::Benchmark::Chronometer meter) - { - std::vector strings; - strings.resize(meter.runs()); - std::mt19937_64 urbg; - std::uniform_int_distribution data_generator; - - std::generate(strings.begin(), strings.end(), [&] { - std::string result; - for (std::size_t i = 0; i < 1000; ++i) - { - result += vcpkg::Strings::b32_encode(data_generator(urbg)); - } - - return result; - }); - - meter.measure( - [&](int run) { return vcpkg::Strings::case_insensitive_ascii_equals(strings[run], strings[run]); }); - }; -} -``` - -Then, run it again! - -```sh -$ cmake --build toolsrc/out -[0/2] Re-checking globbed directories... -[2/2] Linking CXX executable vcpkg-test.exe -$ toolsrc/out/vcpkg-test [strings][!benchmark] -Filters: [strings][!benchmark] - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -vcpkg-test.exe is a Catch v2.9.1 host application. -Run with -? for options - -------------------------------------------------------------------------------- -case insensitive ascii equals: benchmark -------------------------------------------------------------------------------- -C:\Users\t-nimaz\src\vcpkg\toolsrc\src\vcpkg-test\strings.cpp(36) -............................................................................... - -benchmark name samples iterations estimated - mean low mean high mean - std dev low std dev high std dev -------------------------------------------------------------------------------- -equal strings 100 2 5.4806 ms - 22.098 us 21.569 us 23.295 us - 3.842 us 2.115 us 7.41 us - - -=============================================================================== -test cases: 1 | 1 passed -assertions: - none - -``` - -And now you have a working benchmark to test the speed of the existing code, and -of new code! - -If you're writing a lot of benchmarks that follow the same sort of pattern, with -some differences in constants, look into `vcpkg-test/files.cpp`'s benchmarks -- -there are a lot of things one can do to make writing new benchmarks really easy. - -If you wish to add a benchmark for a piece of code that has not yet been tested, -please read the [testing documentation], and please write some unit tests. -The speed of your code isn't very important if it doesn't work at all! - -[benchmarking documentation]: https://github.com/catchorg/Catch2/blob/master/docs/benchmarks.md#top -[testing documentation]: ./testing.md#adding-new-test-files diff --git a/docs/tool-maintainers/layout.md b/docs/tool-maintainers/layout.md deleted file mode 100644 index ca9fa5c6ae73df..00000000000000 --- a/docs/tool-maintainers/layout.md +++ /dev/null @@ -1,74 +0,0 @@ -# Layout of the vcpkg source tree - -All vcpkg sources and build systems are in `toolsrc`. If you'd like to -contribute to the vcpkg tool itself, most of your time will be spent in here. - -## Build Files - -These are the files used to build and configure the project. In order to build -with CMake, the only files you should be interested in are `CMakeLists.txt`, and -`.clang-format`; in order to build with msbuild or the Visual Studio IDE, you -will be interested in `dirs.proj` or `vcpkg.sln`. However, if you add or remove -files, you will need to edit the MSBuild project files in the `vcpkg*` -directories no matter what system you use. - -### Top Level - -We have six files in this directory -- one `.clang-format` file, one -`CMakeLists.txt` file, three Visual Studio files, and `VERSION.txt`. - - - `.clang-format`: This is where we store the formatting settings of the - project. If you want to format the project, you can use the `format` target - with the CMake build system. - - `CMakeLists.txt`: This is where the CMake build system definition lives. If - you want to modify how one builds the project, or add a target, you can do - it here. - - `VERSION.txt`: This is a file which tells `vcpkg` to tell the user to - rebuild. If this version is different from the version when the user built - the binary (for example, after a `git pull` or a `vcpkg update`), then - `vcpkg` will print a message to re-bootstrap. This is updated whenever major - changes are made to the `vcpkg` tool. - - The Visual Studio files: - - `vcpkg.natvis`: NATVIS files allow one to visualize objects of user - defined type in the debugger -- this one contains the definitions for - `vcpkg`'s types. - - `dirs.proj`: This is how one builds with `msbuild` without calling into - the IDE. - - `vcpkg.sln`: The solution file is how one opens the project in the VS IDE. - -## Source Files - -If you're modifying the project, it's likely that these are the directories that -you're going to deal with. - -### `include` - -There's one file in here -- `pch.h`. This contains most of the C++ standard -library, and acts as a [precompiled header]. You can read more at the link. - -There are three directories: - - - `catch2` -- This contains the single-header library [catch2]. We use this - library for both [testing] and [benchmarking]. - - `vcpkg` -- This contains the header files for the `vcpkg` project. All of - the interfaces for building, installing, and generally "port stuff" live - here. - - `vcpkg/base` -- This contains the interfaces for the - "vcpkg standard library" -- file handling, hashing, strings, - `Span`, printing, etc. - - `vcpkg-test` -- This contains the interfaces for any common utilities - required by the tests. - -### `src` - -The source files live here. `pch.cpp` is the source file for the -[precompiled header]; `vcpkg.cpp` is where the `vcpkg` binary lives. - -The interesting files live in the `vcpkg` and `vcpkg-test` directories. In -`vcpkg`, you have the implementation for the interfaces that live in -`include/vcpkg`; and in `vcpkg-test`, you have the tests and benchmarks. - -[precompiled header]: https://en.wikipedia.org/wiki/Precompiled_header -[catch2]: https://github.com/catchorg/Catch2 -[testing]: ./testing.md -[benchmarking]: ./benchmarking.md diff --git a/docs/tool-maintainers/testing.md b/docs/tool-maintainers/testing.md deleted file mode 100644 index a9e866d9e8e235..00000000000000 --- a/docs/tool-maintainers/testing.md +++ /dev/null @@ -1,152 +0,0 @@ -# Testing - -Testing vcpkg is important whenever one makes changes to the tool itself, and -writing new tests and keeping them up to date is also very important. If one's -code is subtly broken, we'd rather find it out right away than a few weeks down -the line when someone complains! - -## Running Tests - -Before anything else, we should know whether you can actually run the tests! -All you should need is a way to build vcpkg -- anything will do! All you have to -do is follow the guide 😄 - -With `$VCPKG_DIRECTORY` being the directory where you have cloned vcpkg, create -a build directory in `$VCPKG_DIRECTORY/toolsrc` (commonly named `out`), and -`cd` into it. Make sure to clean it out if it already exists! - -```sh -$ cmake .. -DCMAKE_BUILD_TYPE=Debug -G Ninja -$ cmake --build . -$ ./vcpkg-test # ./vcpkg-test [$SPECIFIC_TEST] for a specific set of tests -$ # i.e., ./vcpkg-test [arguments] -``` - -If you make any modifications to `vcpkg`, you'll have to do the -`cmake --build .` step again. - -## Writing Tests - -In your journey to write new tests, and to modify existing tests, reading the -[Catch2 documentation] will be very helpful! Come back after reading those 😀 - -You'll want to place your tests in one of the existing files, or, if it doesn't -belong in any of those, in a [new file](#adding-new-test-files). - -The layout of these tests is as follows: - -```cpp -// ... includes - -TEST_CASE("Name of test", "[filename without the .cpp]") { - // setup and the like - REQUIRE(some boolean expression); -} - -// etc. -``` - -You want to give these test cases good, descriptive, unique names, like -`SourceParagraph construct minimum` -- it doesn't need to be extremely clear -english, and shorthand is good, but make sure it's clear what the test is from -the name. For the latter parameter, known as "tags", you should at least put the -name of the file which the test case is in -- e.g., in `arguments.cpp`, you'd -tag all of the test cases with `[arguments]`. - -If you wish to add helper functions, make sure to place them in an anonymous -namespace -- this will ensure that they don't trample over anybody else's -space. Additionally, there are a few helper functions that live in -`` and `src/vcpkg-test/util.cpp` -- make sure to look into -them so that you're not rewriting functionality. - -That should be all you need to know to start writing your own tests! -Remember to check out the [Catch2 documentation] -if you'd like to get more advanced with your tests, -and good luck on your testing journey! - -## Adding New Test Files - -Adding new test files should be easy and straightforward. All it requires is -creating a new source file in `toolsrc/src/vcpkg-test`. - -### Example - -Let's try writing a new test file called `example` (very creative, I know). - -First, we should create a file, `example.cpp`, in `toolsrc/src/vcpkg-test`: - -```cpp -// vcpkg-test/example.cpp -#include -``` - -This is the minimum file needed for tests; let's rebuild! - -```sh -$ cmake --build . -[80/80] Linking CXX executable vcpkg.exe -``` - -Okay, now let's make sure this worked; add a test case to `example.cpp`: - -```cpp -TEST_CASE("Example 1 - fail", "[example]") { - REQUIRE(false); -} -``` - -Now build the tests again, and run them: - -```sh -$ cmake --build . -[2/2] Linking CXX executable vcpkg-test.exe -$ ./vcpkg-test - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -vcpkg-test.exe is a Catch v2.9.1 host application. -Run with -? for options - -------------------------------------------------------------------------------- -Example 1 - fail -------------------------------------------------------------------------------- -$VCPKG_DIRECTORY/toolsrc/src/vcpkg-test/example.cpp(3) -............................................................................... - -$VCPKG_DIRECTORY/toolsrc/src/vcpkg-test/example.cpp(14): FAILED: - REQUIRE( false ) - -=============================================================================== -test cases: 102 | 101 passed | 1 failed -assertions: 3611 | 3610 passed | 1 failed -``` - -Hopefully, that worked! It should compile correctly, and have one failing test. -Now let's try a more complex test, after deleting the old one; - -```cpp -// add #include to the top of the file -namespace Strings = vcpkg::Strings; - -TEST_CASE("Example 2 - success", "[example]") { - std::string hello = "Hello"; - REQUIRE(Strings::case_insensitive_ascii_equals(hello, "hELLo")); - REQUIRE_FALSE(Strings::case_insensitive_ascii_starts_with(hello, "E")); -} -``` - -Now compile and build the tests, and this time let's only run our example tests: - -```sh -$ cmake --build . -[2/2] Linking CXX executable vcpkg-test.exe -$ ./vcpkg-test [example] -Filters: [example] -=============================================================================== -All tests passed (2 assertions in 1 test case) -``` - -Hopefully you have one test running and succeeding! If you have that, you have -succeeded at adding a new file to vcpkg's tests. Congratulations! Have fun on -the rest of your journey 🐱‍👤😁 - -[Catch2 documentation]: https://github.com/catchorg/Catch2/blob/master/docs/tutorial.md#top diff --git a/scripts/Generate-SpdxLicenseList.ps1 b/scripts/Generate-SpdxLicenseList.ps1 deleted file mode 100644 index 8af5fd4de011dc..00000000000000 --- a/scripts/Generate-SpdxLicenseList.ps1 +++ /dev/null @@ -1,63 +0,0 @@ -<# -#> -[CmdletBinding(PositionalBinding=$False)] -Param( - [Parameter(Mandatory=$True)] - [string]$Commit, - - [Parameter()] - [string]$GithubRepository = "spdx/license-list-data", - - [Parameter()] - [string]$LicensesOutFile = "$PSScriptRoot/../toolsrc/src/vcpkg/spdx-licenses.inc", - - [Parameter()] - [string]$ExceptionsOutFile = "$PSScriptRoot/../toolsrc/src/vcpkg/spdx-exceptions.inc" -) - -function Transform-JsonFile { - [CmdletBinding()] - Param( - [string]$Uri, - [string]$OutFile, - [string]$OuterName, - [string]$Id - ) - - $req = Invoke-WebRequest -Uri $Uri - - if ($req.StatusCode -ne 200) - { - Write-Error "Failed to GET $Uri" - throw - } - - $json = $req.Content | ConvertFrom-Json -Depth 10 - Write-Verbose "Writing output to $OutFile" - - $fileContent = @( - "// Data downloaded from $Uri", - "// Generated by scripts/Generate-SpdxLicenseList.ps1", - "{") - $json.$OuterName | ForEach-Object { - $fileContent += " `"$($_.$Id)`"," - } - $fileContent += "}" - - $fileContent -join "`n" | Out-File -FilePath $OutFile -Encoding 'utf8' -} - -$baseUrl = "https://raw.githubusercontent.com/$GithubRepository/$Commit/json" -Write-Verbose "Getting json files from $baseUrl" - -Transform-JsonFile ` - -Uri "$baseUrl/licenses.json" ` - -OutFile $LicensesOutFile ` - -OuterName 'licenses' ` - -Id 'licenseId' - -Transform-JsonFile ` - -Uri "$baseUrl/exceptions.json" ` - -OutFile $ExceptionsOutFile ` - -OuterName 'exceptions' ` - -Id 'licenseExceptionId' diff --git a/scripts/azure-pipelines/Create-FormatDiff.ps1 b/scripts/azure-pipelines/Create-PRDiff.ps1 similarity index 100% rename from scripts/azure-pipelines/Create-FormatDiff.ps1 rename to scripts/azure-pipelines/Create-PRDiff.ps1 diff --git a/scripts/azure-pipelines/Format-CxxCode.ps1 b/scripts/azure-pipelines/Format-CxxCode.ps1 deleted file mode 100644 index 2653562a7e8630..00000000000000 --- a/scripts/azure-pipelines/Format-CxxCode.ps1 +++ /dev/null @@ -1,50 +0,0 @@ -[CmdletBinding()] -Param( - [Parameter(Mandatory=$True)] - [string]$Root -) - -$Root = Resolve-Path -LiteralPath $Root - -$clangFormat = Get-Command 'clang-format' -ErrorAction 'SilentlyContinue' -if ($null -ne $clangFormat) -{ - $clangFormat = $clangFormat.Source -} - -if ($IsWindows) -{ - if ([String]::IsNullOrEmpty($clangFormat) -or -not (Test-Path $clangFormat)) - { - $clangFormat = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\Llvm\x64\bin\clang-format.exe' - } - if (-not (Test-Path $clangFormat)) - { - $clangFormat = 'C:\Program Files\LLVM\bin\clang-format.exe' - } -} - -if ([String]::IsNullOrEmpty($clangFormat) -or -not (Test-Path $clangFormat)) -{ - Write-Error 'clang-format not found; is it installed?' - throw -} - -$toolsrc = Get-Item "$Root/toolsrc" -Push-Location $toolsrc - -try -{ - $files = Get-ChildItem -Recurse -LiteralPath "$toolsrc/src" -Filter '*.cpp' - $files += Get-ChildItem -Recurse -LiteralPath "$toolsrc/src" -Filter '*.c' - $files += Get-ChildItem -Recurse -LiteralPath "$toolsrc/include/vcpkg" -Filter '*.h' - $files += Get-ChildItem -Recurse -LiteralPath "$toolsrc/include/vcpkg-test" -Filter '*.h' - $files += Get-Item "$toolsrc/include/pch.h" - $fileNames = $files.FullName - - & $clangFormat -style=file -i @fileNames -} -finally -{ - Pop-Location -} diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 7fce6a5c19e115..27db6a93d9a5c4 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -20,12 +20,6 @@ stages: - name: DiffFile value: $(Build.ArtifactStagingDirectory)\format.diff steps: - - task: Powershell@2 - displayName: 'Format C++' - inputs: - filePath: 'scripts/azure-pipelines/Format-CxxCode.ps1' - arguments: '-Root .' - pwsh: true - task: Powershell@2 displayName: 'Generate Documentation' inputs: @@ -33,18 +27,18 @@ stages: arguments: '-VcpkgRoot . -WarningAction Stop' pwsh: true - script: .\bootstrap-vcpkg.bat - displayName: 'Build vcpkg' - - script: '.\vcpkg format-manifest --all' + displayName: 'Bootstrap vcpkg' + - script: '.\vcpkg.exe format-manifest --all' displayName: 'Format Manifests' - task: Powershell@2 displayName: 'Create Diff' inputs: - filePath: scripts/azure-pipelines/Create-FormatDiff.ps1 + filePath: scripts/azure-pipelines/Create-PRDiff.ps1 arguments: '-DiffFile $(DiffFile)' pwsh: true - task: PublishBuildArtifacts@1 condition: failed() - displayName: 'Publish C++ Diff' + displayName: 'Publish Format and Documentation Diff' inputs: PathtoPublish: '$(DiffFile)' ArtifactName: 'format.diff' diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1 deleted file mode 100644 index 704b5275239e66..00000000000000 --- a/scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1 +++ /dev/null @@ -1,24 +0,0 @@ -. $PSScriptRoot/../end-to-end-tests-prelude.ps1 - -# Test that prohibiting backcompat features actually prohibits -$backcompatFeaturePorts = @('vcpkg-uses-test-cmake', 'vcpkg-uses-vcpkg-common-functions') -foreach ($backcompatFeaturePort in $backcompatFeaturePorts) { - $succeedArgs = $commonArgs + @('install',$backcompatFeaturePort,'--no-binarycaching') - $failArgs = $succeedArgs + @('--x-prohibit-backcompat-features') - $CurrentTest = "Should fail: ./vcpkg $($failArgs -join ' ')" - Run-Vcpkg @failArgs - if ($LastExitCode -ne 0) { - Write-Host "... failed (this is good!)." - } else { - throw $CurrentTest - } - - # Install failed when prohibiting backcompat features, so it should succeed if we allow them - $CurrentTest = "Should succeeed: ./vcpkg $($succeedArgs -join ' ')" - Run-Vcpkg @succeedArgs - if ($LastExitCode -ne 0) { - throw $CurrentTest - } else { - Write-Host "... succeeded." - } -} diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1 deleted file mode 100644 index e4ee6e69848c51..00000000000000 --- a/scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1 +++ /dev/null @@ -1,86 +0,0 @@ -if ($IsLinux) { - # The tests below need a mono installation not currently available on the Linux agents. - return -} - -. $PSScriptRoot/../end-to-end-tests-prelude.ps1 - -# Test simple installation -Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--binarycaching", "--x-binarysource=clear;files,$ArchiveRoot,write;nuget,$NuGetRoot,readwrite")) -Throw-IfFailed -Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" - -# Test simple removal -Run-Vcpkg -TestArgs ($commonArgs + @("remove", "rapidjson")) -Throw-IfFailed -Require-FileNotExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" - -# Test restoring from files archive -Remove-Item -Recurse -Force $installRoot -Remove-Item -Recurse -Force $buildtreesRoot -Run-Vcpkg -TestArgs ($commonArgs + @("install","rapidjson","--binarycaching","--x-binarysource=clear;files,$ArchiveRoot,read")) -Throw-IfFailed -Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" -Require-FileNotExists "$buildtreesRoot/rapidjson/src" -Require-FileExists "$buildtreesRoot/detect_compiler" - -# Test --no-binarycaching -Remove-Item -Recurse -Force $installRoot -Remove-Item -Recurse -Force $buildtreesRoot -Run-Vcpkg -TestArgs ($commonArgs + @("install","rapidjson","--no-binarycaching","--x-binarysource=clear;files,$ArchiveRoot,read")) -Throw-IfFailed -Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" -Require-FileExists "$buildtreesRoot/rapidjson/src" -Require-FileExists "$buildtreesRoot/detect_compiler" - -# Test --editable -Remove-Item -Recurse -Force $installRoot -Remove-Item -Recurse -Force $buildtreesRoot -Run-Vcpkg -TestArgs ($commonArgs + @("install","rapidjson","--editable","--x-binarysource=clear;files,$ArchiveRoot,read")) -Throw-IfFailed -Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" -Require-FileExists "$buildtreesRoot/rapidjson/src" -Require-FileNotExists "$buildtreesRoot/detect_compiler" - -# Test restoring from nuget -Remove-Item -Recurse -Force $installRoot -Remove-Item -Recurse -Force $buildtreesRoot -Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--binarycaching", "--x-binarysource=clear;nuget,$NuGetRoot")) -Throw-IfFailed -Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" -Require-FileNotExists "$buildtreesRoot/rapidjson/src" - -# Test four-phase flow -Remove-Item -Recurse -Force $installRoot -ErrorAction SilentlyContinue -Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--dry-run", "--x-write-nuget-packages-config=$TestingRoot/packages.config")) -Throw-IfFailed -Require-FileNotExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" -Require-FileNotExists "$buildtreesRoot/rapidjson/src" -Require-FileExists "$TestingRoot/packages.config" -if ($IsLinux -or $IsMacOS) { - mono $(./vcpkg fetch nuget) restore $TestingRoot/packages.config -OutputDirectory "$NuGetRoot2" -Source "$NuGetRoot" -} else { - & $(./vcpkg fetch nuget) restore $TestingRoot/packages.config -OutputDirectory "$NuGetRoot2" -Source "$NuGetRoot" -} -Throw-IfFailed -Remove-Item -Recurse -Force $NuGetRoot -ErrorAction SilentlyContinue -mkdir $NuGetRoot -Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "tinyxml", "--binarycaching", "--x-binarysource=clear;nuget,$NuGetRoot2;nuget,$NuGetRoot,write")) -Throw-IfFailed -Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" -Require-FileExists "$installRoot/$Triplet/include/tinyxml.h" -Require-FileNotExists "$buildtreesRoot/rapidjson/src" -Require-FileExists "$buildtreesRoot/tinyxml/src" -if ((Get-ChildItem $NuGetRoot -Filter '*.nupkg' | Measure-Object).Count -ne 1) { - throw "In '$CurrentTest': did not create exactly 1 NuGet package" -} - -# Test export -$CurrentTest = 'Exporting' -Require-FileNotExists "$TestingRoot/vcpkg-export-output" -Require-FileNotExists "$TestingRoot/vcpkg-export.1.0.0.nupkg" -Require-FileNotExists "$TestingRoot/vcpkg-export-output.zip" -Run-Vcpkg -TestArgs ($commonArgs + @("export", "rapidjson", "tinyxml", "--nuget", "--nuget-id=vcpkg-export", "--nuget-version=1.0.0", "--output=vcpkg-export-output", "--raw", "--zip", "--output-dir=$TestingRoot")) -Require-FileExists "$TestingRoot/vcpkg-export-output" -Require-FileExists "$TestingRoot/vcpkg-export.1.0.0.nupkg" -Require-FileExists "$TestingRoot/vcpkg-export-output.zip" diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/build-missing.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/build-missing.ps1 deleted file mode 100644 index 5f318e6af9cb96..00000000000000 --- a/scripts/azure-pipelines/end-to-end-tests-dir/build-missing.ps1 +++ /dev/null @@ -1,18 +0,0 @@ -. $PSScriptRoot/../end-to-end-tests-prelude.ps1 - -$CurrentTest = "Build Missing tests" - -Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--only-binarycaching","--x-binarysource=clear;files,$ArchiveRoot,read")) -Throw-IfNotFailed -Require-FileNotExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" - -# Create the rapidjson archive -Remove-Item -Recurse -Force $installRoot -Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson","--x-binarysource=clear;files,$ArchiveRoot,write")) -Throw-IfFailed -Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" - -Remove-Item -Recurse -Force $installRoot -Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--only-binarycaching","--x-binarysource=clear;files,$ArchiveRoot,read")) -Throw-IfFailed -Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h" diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/cli.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/cli.ps1 deleted file mode 100644 index 47f624fa8f6fc5..00000000000000 --- a/scripts/azure-pipelines/end-to-end-tests-dir/cli.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -. $PSScriptRoot/../end-to-end-tests-prelude.ps1 - -# Test bad command lines -Run-Vcpkg -TestArgs ($commonArgs + @("install", "zlib", "--vcpkg-rootttttt", "C:\")) -Throw-IfNotFailed - -Run-Vcpkg -TestArgs ($commonArgs + @("install", "zlib", "--vcpkg-rootttttt=C:\")) -Throw-IfNotFailed - -Run-Vcpkg -TestArgs ($commonArgs + @("install", "zlib", "--fast")) # NB: --fast is not a switch -Throw-IfNotFailed diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/create.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/create.ps1 deleted file mode 100644 index 9d59da5396e671..00000000000000 --- a/scripts/azure-pipelines/end-to-end-tests-dir/create.ps1 +++ /dev/null @@ -1,10 +0,0 @@ -. $PSScriptRoot/../end-to-end-tests-prelude.ps1 - -# Test vcpkg create -$Script:CurrentTest = "create zlib" -Write-Host $Script:CurrentTest -./vcpkg --x-builtin-ports-root=$TestingRoot/ports create zlib https://github.com/madler/zlib/archive/v1.2.11.tar.gz zlib-1.2.11.tar.gz -Throw-IfFailed - -Require-FileExists "$TestingRoot/ports/zlib/portfile.cmake" -Require-FileExists "$TestingRoot/ports/zlib/vcpkg.json" diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1 deleted file mode 100644 index 5ad7616b487970..00000000000000 --- a/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1 +++ /dev/null @@ -1,67 +0,0 @@ -. $PSScriptRoot/../end-to-end-tests-prelude.ps1 - -# Test that metrics are on by default -$metricsTagName = 'vcpkg.disable-metrics' -$metricsAreDisabledMessage = 'Warning: passed --sendmetrics, but metrics are disabled.' - -function Test-Metrics-Enabled() { - Param( - [Parameter(ValueFromRemainingArguments)] - [string[]]$TestArgs - ) - - $actualArgs = @('version', '--sendmetrics') - if ($TestArgs.Length -ne 0) { - $actualArgs += $TestArgs - } - - $vcpkgOutput = Run-Vcpkg $actualArgs - if ($vcpkgOutput -contains $metricsAreDisabledMessage) { - Write-Host 'Metrics are disabled' - return $false - } - - Write-Host 'Metrics are enabled' - return $true -} - -# By default, metrics are enabled. -Require-FileNotExists $metricsTagName -if (-Not (Test-Metrics-Enabled)) { - throw "Metrics were not on by default." -} - -if (Test-Metrics-Enabled '--disable-metrics') { - throw "Metrics were not disabled by switch." -} - -$env:VCPKG_DISABLE_METRICS = 'ON' -try { - if (Test-Metrics-Enabled) { - throw "Environment variable did not disable metrics." - } - - # Also test that you get no message without --sendmetrics - $vcpkgOutput = Run-Vcpkg list - if ($vcpkgOutput -contains $metricsAreDisabledMessage) { - throw "Disabled metrics emit message even without --sendmetrics" - } - - if (-Not (Test-Metrics-Enabled '--no-disable-metrics')) { - throw "Environment variable to disable metrics could not be overridden by switch." - } -} finally { - Remove-Item env:VCPKG_DISABLE_METRICS -} - -# If the disable-metrics tag file exists, metrics are disabled even if attempted to be enabled on -# the command line. -Set-Content -Path $metricsTagName -Value "" -try { - if (Test-Metrics-Enabled '--disable-metrics') { - throw "Metrics were not force-disabled by the disable-metrics tag file." - } -} -finally { - Remove-Item $metricsTagName -} diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/env-passthrough.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/env-passthrough.ps1 deleted file mode 100644 index 6de1335d7cb09b..00000000000000 --- a/scripts/azure-pipelines/end-to-end-tests-dir/env-passthrough.ps1 +++ /dev/null @@ -1,21 +0,0 @@ -if (-not $IsLinux -and -not $IsMacOS) { - . $PSScriptRoot/../end-to-end-tests-prelude.ps1 - - $env:_VCPKG_TEST_TRACKED = "a" - $env:_VCPKG_TEST_UNTRACKED = "b" - - $x = ./vcpkg "--overlay-triplets=$PSScriptRoot/../../testing/env-passthrough" env "echo %_VCPKG_TEST_TRACKED% %_VCPKG_TEST_TRACKED2% %_VCPKG_TEST_UNTRACKED% %_VCPKG_TEST_UNTRACKED2%" - if ($x -ne "%_VCPKG_TEST_TRACKED% %_VCPKG_TEST_TRACKED2% %_VCPKG_TEST_UNTRACKED% %_VCPKG_TEST_UNTRACKED2%") - { - throw "env should have cleaned the environment ($x)" - } - - $y = ./vcpkg "--overlay-triplets=$PSScriptRoot/../../testing/env-passthrough" env --triplet passthrough "echo %_VCPKG_TEST_TRACKED% %_VCPKG_TEST_TRACKED2% %_VCPKG_TEST_UNTRACKED% %_VCPKG_TEST_UNTRACKED2%" - if ($y -ne "a %_VCPKG_TEST_TRACKED2% b %_VCPKG_TEST_UNTRACKED2%") - { - throw "env should have kept the environment ($y)" - } - - rm env:_VCPKG_TEST_TRACKED - rm env:_VCPKG_TEST_UNTRACKED -} \ No newline at end of file diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1 deleted file mode 100644 index 38362ba8cb777d..00000000000000 --- a/scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1 +++ /dev/null @@ -1,28 +0,0 @@ -if (-not $IsLinux -and -not $IsMacOS) { - . $PSScriptRoot/../end-to-end-tests-prelude.ps1 - - # Test msbuild props and targets - $Script:CurrentTest = "zlib:x86-windows-static msbuild scripts\testing\integrate-install\..." - Write-Host $Script:CurrentTest - ./vcpkg $commonArgs install zlib:x86-windows-static --x-binarysource=clear - Throw-IfFailed - foreach ($project in @("VcpkgTriplet", "VcpkgTriplet2", "VcpkgUseStatic", "VcpkgUseStatic2")) { - $Script:CurrentTest = "msbuild scripts\testing\integrate-install\$project.vcxproj" - ./vcpkg $commonArgs env "msbuild scripts\testing\integrate-install\$project.vcxproj /p:VcpkgRoot=$TestingRoot /p:IntDir=$TestingRoot\int\ /p:OutDir=$TestingRoot\out\ " - Throw-IfFailed - Remove-Item -Recurse -Force $TestingRoot\int - Remove-Item -Recurse -Force $TestingRoot\out - } - $Script:CurrentTest = "zlib:x86-windows msbuild scripts\testing\integrate-install\..." - Write-Host $Script:CurrentTest - ./vcpkg $commonArgs install zlib:x86-windows --x-binarysource=clear - Throw-IfFailed - foreach ($project in @("Project1", "NoProps")) { - $Script:CurrentTest = "msbuild scripts\testing\integrate-install\$project.vcxproj" - Write-Host $Script:CurrentTest - ./vcpkg $commonArgs env "msbuild scripts\testing\integrate-install\$project.vcxproj /p:VcpkgRoot=$TestingRoot /p:IntDir=$TestingRoot\int\ /p:OutDir=$TestingRoot\out\ " - Throw-IfFailed - Remove-Item -Recurse -Force $TestingRoot\int - Remove-Item -Recurse -Force $TestingRoot\out - } -} diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 deleted file mode 100644 index bdeeb0a15b5da6..00000000000000 --- a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 +++ /dev/null @@ -1,192 +0,0 @@ -. "$PSScriptRoot/../end-to-end-tests-prelude.ps1" - - -$builtinRegistryArgs = $commonArgs + @("--x-builtin-registry-versions-dir=$PSScriptRoot/../../e2e_ports/versions") - -Run-Vcpkg install @builtinRegistryArgs 'vcpkg-internal-e2e-test-port' -Throw-IfNotFailed - -# We should not look into the versions directory unless we have a baseline, -# even if we pass the registries feature flag -Run-Vcpkg install @builtinRegistryArgs --feature-flags=registries 'vcpkg-internal-e2e-test-port' -Throw-IfNotFailed - -Run-Vcpkg install @builtinRegistryArgs --feature-flags=registries 'zlib' -Throw-IfFailed - -Write-Trace "Test git and filesystem registries" -Refresh-TestRoot -$filesystemRegistry = "$TestingRoot/filesystem-registry" -$gitRegistryUpstream = "$TestingRoot/git-registry-upstream" - -# build a filesystem registry -Write-Trace "build a filesystem registry" -New-Item -Path $filesystemRegistry -ItemType Directory -$filesystemRegistry = (Get-Item $filesystemRegistry).FullName - -Copy-Item -Recurse ` - -LiteralPath "$PSScriptRoot/../../e2e_ports/vcpkg-internal-e2e-test-port" ` - -Destination "$filesystemRegistry" -New-Item ` - -Path "$filesystemRegistry/versions" ` - -ItemType Directory -Copy-Item ` - -LiteralPath "$PSScriptRoot/../../e2e_ports/versions/baseline.json" ` - -Destination "$filesystemRegistry/versions/baseline.json" -New-Item ` - -Path "$filesystemRegistry/versions/v-" ` - -ItemType Directory - -$vcpkgInternalE2eTestPortJson = @{ - "versions" = @( - @{ - "version-string" = "1.0.0"; - "path" = "$/vcpkg-internal-e2e-test-port" - } - ) -} -New-Item ` - -Path "$filesystemRegistry/versions/v-/vcpkg-internal-e2e-test-port.json" ` - -ItemType File ` - -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgInternalE2eTestPortJson) - - -# build a git registry -Write-Trace "build a git registry" -New-Item -Path $gitRegistryUpstream -ItemType Directory -$gitRegistryUpstream = (Get-Item $gitRegistryUpstream).FullName - -Push-Location $gitRegistryUpstream -try -{ - $gitConfigOptions = @( - '-c', 'user.name=Nobody', - '-c', 'user.email=nobody@example.com', - '-c', 'core.autocrlf=false' - ) - - $CurrentTest = 'git init .' - git @gitConfigOptions init . - Throw-IfFailed - Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/vcpkg-internal-e2e-test-port" -Destination . - New-Item -Path './vcpkg-internal-e2e-test-port/foobar' -Value 'this is just to get a distinct git tree' - - $CurrentTest = 'git add -A' - git @gitConfigOptions add -A - Throw-IfFailed - $CurrentTest = 'git commit' - git @gitConfigOptions commit -m 'initial commit' - Throw-IfFailed - - $vcpkgInternalE2eTestPortGitTree = git rev-parse 'HEAD:vcpkg-internal-e2e-test-port' - $vcpkgInternalE2eTestPortVersionsJson = @{ - "versions" = @( - @{ - "version-string" = "1.0.0"; - "git-tree" = $vcpkgInternalE2eTestPortGitTree - } - ) - } - $vcpkgBaseline = @{ - "default" = @{ - "vcpkg-internal-e2e-test-port" = @{ - "baseline" = "1.0.0" - } - } - } - - New-Item -Path './versions' -ItemType Directory - New-Item -Path './versions/v-' -ItemType Directory - - New-Item -Path './versions/baseline.json' -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgBaseline) - New-Item -Path './versions/v-/vcpkg-internal-e2e-test-port.json' -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgInternalE2eTestPortVersionsJson) - - $CurrentTest = 'git add -A' - git @gitConfigOptions add -A - Throw-IfFailed - $CurrentTest = 'git commit' - git @gitConfigOptions commit --amend --no-edit - Throw-IfFailed -} -finally -{ - Pop-Location -} - -# actually test the registries -Write-Trace "actually test the registries" -$vcpkgJson = @{ - "name" = "manifest-test"; - "version-string" = "1.0.0"; - "dependencies" = @( - "vcpkg-internal-e2e-test-port" - ) -} - -# test the filesystem registry -Write-Trace "test the filesystem registry" -$manifestDir = "$TestingRoot/filesystem-registry-test-manifest-dir" - -New-Item -Path $manifestDir -ItemType Directory -$manifestDir = (Get-Item $manifestDir).FullName - -Push-Location $manifestDir -try -{ - New-Item -Path 'vcpkg.json' -ItemType File ` - -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgJson) - - $vcpkgConfigurationJson = @{ - "default-registry" = $null; - "registries" = @( - @{ - "kind" = "filesystem"; - "path" = $filesystemRegistry; - "packages" = @( "vcpkg-internal-e2e-test-port" ) - } - ) - } - New-Item -Path 'vcpkg-configuration.json' -ItemType File ` - -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgConfigurationJson) - - Run-Vcpkg install @builtinRegistryArgs '--feature-flags=registries,manifests' - Throw-IfFailed -} -finally -{ - Pop-Location -} - -# test the git registry -Write-Trace "test the git registry" -$manifestDir = "$TestingRoot/git-registry-test-manifest-dir" - -New-Item -Path $manifestDir -ItemType Directory -$manifestDir = (Get-Item $manifestDir).FullName - -Push-Location $manifestDir -try -{ - New-Item -Path 'vcpkg.json' -ItemType File ` - -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgJson) - - $vcpkgConfigurationJson = @{ - "default-registry" = $null; - "registries" = @( - @{ - "kind" = "git"; - "repository" = $gitRegistryUpstream; - "packages" = @( "vcpkg-internal-e2e-test-port" ) - } - ) - } - New-Item -Path 'vcpkg-configuration.json' -ItemType File ` - -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgConfigurationJson) - - Run-Vcpkg install @builtinRegistryArgs '--feature-flags=registries,manifests' - Throw-IfFailed -} -finally -{ - Pop-Location -} diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1 deleted file mode 100644 index b7aaf6462c6e42..00000000000000 --- a/scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -. $PSScriptRoot/../end-to-end-tests-prelude.ps1 - -##### Test spaces in the path -$Script:CurrentTest = "zlib with spaces in path" -Write-Host $Script:CurrentTest -./vcpkg install zlib "--triplet" $Triplet ` - "--no-binarycaching" ` - "--x-buildtrees-root=$TestingRoot/build Trees" ` - "--x-install-root=$TestingRoot/instalL ed" ` - "--x-packages-root=$TestingRoot/packaG es" -Throw-IfFailed diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/vcpkg-minimum-required.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/vcpkg-minimum-required.ps1 deleted file mode 100644 index 8f512ae7a8fd06..00000000000000 --- a/scripts/azure-pipelines/end-to-end-tests-dir/vcpkg-minimum-required.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -. $PSScriptRoot/../end-to-end-tests-prelude.ps1 - -$successCases = @('vcpkg-requires-current-date', 'vcpkg-requires-old-date') -foreach ($successCase in $successCases) { - $CurrentTest = "Should succeeed: ./vcpkg install $successCase" - Write-Host $CurrentTest - Run-Vcpkg install $successCase @commonArgs - if ($LastExitCode -ne 0) { - throw $CurrentTest - } else { - Write-Host "... succeeded." - } -} - -$CurrentTest = "Should fail: ./vcpkg install vcpkg-requires-future-date" -Write-Host $CurrentTest -Run-Vcpkg install vcpkg-requires-future-date @commonArgs -if ($LastExitCode -ne 0) { - Write-Host "... failed (this is good!)." -} else { - throw $CurrentTest -} diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 deleted file mode 100644 index 7f927759f69251..00000000000000 --- a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 +++ /dev/null @@ -1,98 +0,0 @@ -. $PSScriptRoot/../end-to-end-tests-prelude.ps1 - -# Test verify versions -mkdir $VersionFilesRoot -Copy-Item -Recurse "scripts/testing/version-files/versions_incomplete" $VersionFilesRoot -$portsRedirectArgsOK = @( - "--feature-flags=versions", - "--x-builtin-ports-root=scripts/testing/version-files/ports", - "--x-builtin-registry-versions-dir=scripts/testing/version-files/versions" -) -$portsRedirectArgsIncomplete = @( - "--feature-flags=versions", - "--x-builtin-ports-root=scripts/testing/version-files/ports_incomplete", - "--x-builtin-registry-versions-dir=$VersionFilesRoot/versions_incomplete" -) -$CurrentTest = "x-verify-ci-versions (All files OK)" -Write-Host $CurrentTest -./vcpkg $portsRedirectArgsOK x-ci-verify-versions --verbose -Throw-IfFailed - -$CurrentTest = "x-verify-ci-versions (Incomplete)" -./vcpkg $portsRedirectArgsIncomplete x-ci-verify-versions --verbose -Throw-IfNotFailed - -$CurrentTest = "x-add-version cat" -# Do not fail if there's nothing to update -./vcpkg $portsRedirectArgsIncomplete x-add-version cat -Throw-IfFailed - -$CurrentTest = "x-add-version dog" -# Local version is not in baseline and versions file -./vcpkg $portsRedirectArgsIncomplete x-add-version dog -Throw-IfFailed - -$CurrentTest = "x-add-version duck" -# Missing versions file -./vcpkg $portsRedirectArgsIncomplete x-add-version duck -Throw-IfFailed - -$CurrentTest = "x-add-version ferret" -# Missing versions file and missing baseline entry -./vcpkg $portsRedirectArgsIncomplete x-add-version ferret -Throw-IfFailed - -$CurrentTest = "x-add-version fish (must fail)" -# Discrepancy between local SHA and SHA in fish.json. Requires --overwrite-version. -$out = ./vcpkg $portsRedirectArgsIncomplete x-add-version fish -Throw-IfNotFailed -$CurrentTest = "x-add-version fish --overwrite-version" -./vcpkg $portsRedirectArgsIncomplete x-add-version fish --overwrite-version -Throw-IfFailed - -$CurrentTest = "x-add-version mouse" -# Missing baseline entry -./vcpkg $portsRedirectArgsIncomplete x-add-version mouse -Throw-IfFailed -# Validate changes -./vcpkg $portsRedirectArgsIncomplete x-ci-verify-versions --verbose -Throw-IfFailed - -$CurrentTest = "default baseline" -$out = ./vcpkg $commonArgs "--feature-flags=versions" install --x-manifest-root=scripts/testing/version-files/default-baseline-1 2>&1 | Out-String -Throw-IfNotFailed -if ($out -notmatch ".*Error: while checking out baseline.*") -{ - $out - throw "Expected to fail due to missing baseline" -} - -git fetch https://github.com/vicroms/test-registries -foreach ($opt_registries in @("",",registries")) -{ - Write-Trace "testing baselines: $opt_registries" - Refresh-TestRoot - $CurrentTest = "without default baseline 2 -- enabling versions should not change behavior" - Remove-Item -Recurse $buildtreesRoot/versioning -ErrorAction SilentlyContinue - ./vcpkg $commonArgs "--feature-flags=versions$opt_registries" install ` - "--dry-run" ` - "--x-manifest-root=scripts/testing/version-files/without-default-baseline-2" ` - "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions" - Throw-IfFailed - Require-FileNotExists $buildtreesRoot/versioning - - $CurrentTest = "default baseline 2" - ./vcpkg $commonArgs "--feature-flags=versions$opt_registries" install ` - "--dry-run" ` - "--x-manifest-root=scripts/testing/version-files/default-baseline-2" ` - "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions" - Throw-IfFailed - Require-FileExists $buildtreesRoot/versioning - - $CurrentTest = "using version features fails without flag" - ./vcpkg $commonArgs "--feature-flags=-versions$opt_registries" install ` - "--dry-run" ` - "--x-manifest-root=scripts/testing/version-files/default-baseline-2" ` - "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions" - Throw-IfNotFailed -} diff --git a/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 b/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 deleted file mode 100644 index 29718bf76498f1..00000000000000 --- a/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 +++ /dev/null @@ -1,80 +0,0 @@ -$TestingRoot = Join-Path $WorkingRoot 'testing' -$buildtreesRoot = Join-Path $TestingRoot 'buildtrees' -$installRoot = Join-Path $TestingRoot 'installed' -$packagesRoot = Join-Path $TestingRoot 'packages' -$NuGetRoot = Join-Path $TestingRoot 'nuget' -$NuGetRoot2 = Join-Path $TestingRoot 'nuget2' -$ArchiveRoot = Join-Path $TestingRoot 'archives' -$VersionFilesRoot = Join-Path $TestingRoot 'version-test' -$commonArgs = @( - "--triplet", - $Triplet, - "--x-buildtrees-root=$buildtreesRoot", - "--x-install-root=$installRoot", - "--x-packages-root=$packagesRoot", - "--overlay-ports=$PSScriptRoot/../e2e_ports/overlays" -) -$Script:CurrentTest = 'unassigned' - -if ($IsWindows) -{ - $VcpkgExe = Get-Item './vcpkg.exe' -} -else -{ - $VcpkgExe = Get-Item './vcpkg' -} - -function Refresh-TestRoot { - Remove-Item -Recurse -Force $TestingRoot -ErrorAction SilentlyContinue - mkdir $TestingRoot | Out-Null - mkdir $NuGetRoot | Out-Null -} - -function Require-FileExists { - [CmdletBinding()] - Param( - [string]$File - ) - if (-Not (Test-Path $File)) { - throw "'$Script:CurrentTest' failed to create file '$File'" - } -} - -function Require-FileNotExists { - [CmdletBinding()] - Param( - [string]$File - ) - if (Test-Path $File) { - throw "'$Script:CurrentTest' should not have created file '$File'" - } -} - -function Throw-IfFailed { - if ($LASTEXITCODE -ne 0) { - throw "'$Script:CurrentTest' had a step with a nonzero exit code" - } -} - -function Throw-IfNotFailed { - if ($LASTEXITCODE -eq 0) { - throw "'$Script:CurrentTest' had a step with an unexpectedly zero exit code" - } -} - -function Write-Trace ([string]$text) { - Write-Host (@($MyInvocation.ScriptName, ":", $MyInvocation.ScriptLineNumber, ": ", $text) -join "") -} - -function Run-Vcpkg { - Param( - [Parameter(ValueFromRemainingArguments)] - [string[]]$TestArgs - ) - $Script:CurrentTest = "vcpkg $($testArgs -join ' ')" - Write-Host $Script:CurrentTest - & $VcpkgExe @testArgs -} - -Refresh-TestRoot diff --git a/scripts/azure-pipelines/end-to-end-tests.ps1 b/scripts/azure-pipelines/end-to-end-tests.ps1 deleted file mode 100644 index 8858b362e7d573..00000000000000 --- a/scripts/azure-pipelines/end-to-end-tests.ps1 +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: MIT -# -<# -.SYNOPSIS -End-to-End tests for the vcpkg executable. - -.DESCRIPTION -These tests cover the command line interface and broad functions of vcpkg, including `install`, `remove` and certain -binary caching scenarios. They use the vcpkg executable in the current directory. - -.PARAMETER Triplet -The triplet to use for testing purposes. - -.PARAMETER WorkingRoot -The location used as scratch space for testing. - -#> - -[CmdletBinding()] -Param( - [Parameter(Mandatory = $true)] - [ValidateNotNullOrEmpty()] - [string]$Triplet, - [Parameter(Mandatory = $true)] - [ValidateNotNullOrEmpty()] - [string]$WorkingRoot, - [Parameter(Mandatory = $false)] - [ValidateNotNullOrEmpty()] - [string]$Filter -) - -$ErrorActionPreference = "Stop" - -if (-Not (Test-Path $WorkingRoot)) { - New-Item -Path $WorkingRoot -ItemType Directory -} - -$WorkingRoot = (Get-Item $WorkingRoot).FullName - -$AllTests = Get-ChildItem $PSScriptRoot/end-to-end-tests-dir/*.ps1 -if ($Filter -ne $Null) { - $AllTests = $AllTests | ? { $_.Name -match $Filter } -} -$n = 1 -$m = $AllTests.Count - -$AllTests | % { - Write-Host "[end-to-end-tests.ps1] [$n/$m] Running suite $_" - & $_ - $n += 1 -} - -Write-Host "[end-to-end-tests.ps1] All tests passed." -$LASTEXITCODE = 0 diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index b20908f97dcf03..df5cceda6a404e 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -30,20 +30,9 @@ jobs: exit 0 displayName: 'Create ${{ variables.VCPKG_DOWNLOADS }}' - task: Bash@3 - displayName: 'Build vcpkg' + displayName: 'Bootstrap vcpkg' inputs: filePath: bootstrap-vcpkg.sh - arguments: '-buildTests' - - bash: toolsrc/build.rel/vcpkg-test - displayName: 'Run vcpkg tests' - env: - VCPKG_DEBUG: 1 - - task: PowerShell@2 - displayName: 'Run vcpkg end-to-end tests' - inputs: - filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1' - arguments: '-Triplet x64-linux -WorkingRoot ${{ variables.WORKING_ROOT }}' - pwsh: true - task: PowerShell@2 displayName: '*** Test Modified Ports and Prepare Test Logs ***' inputs: diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index 50bba080fbc646..52e974c93388e0 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -30,17 +30,6 @@ jobs: displayName: 'Build vcpkg' inputs: filePath: bootstrap-vcpkg.sh - arguments: '-buildTests' - - bash: toolsrc/build.rel/vcpkg-test - displayName: 'Run vcpkg tests' - env: - VCPKG_DEBUG: 1 - - task: PowerShell@2 - displayName: 'Run vcpkg end-to-end tests' - inputs: - filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1' - arguments: '-Triplet x64-osx -WorkingRoot ${{ variables.WORKING_ROOT }}' - pwsh: true - task: PowerShell@2 displayName: '*** Test Modified Ports and Prepare Test Logs ***' inputs: diff --git a/scripts/azure-pipelines/signing.yml b/scripts/azure-pipelines/signing.yml deleted file mode 100644 index b7a3137d99d7fc..00000000000000 --- a/scripts/azure-pipelines/signing.yml +++ /dev/null @@ -1,125 +0,0 @@ -# This script is used internally to produce signed vcpkg builds. -# It uses machines / tasks that are not exposed here on GitHub, as -# the hardware on which we allow signing is restricted. - -trigger: none - -variables: - TeamName: vcpkg -jobs: - - job: windows - displayName: "Windows" - dependsOn: - pool: - name: 'VSEng-MicroBuildVS2019' - demands: - - CMAKE - steps: - - task: PoliCheck@1 - inputs: - inputType: 'Basic' - targetType: 'F' - targetArgument: '$(Build.SourcesDirectory)' - result: 'PoliCheck.xml' - - task: CmdLine@2 - displayName: "Build vcpkg with CMake" - inputs: - failOnStderr: true - script: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=x86 - cmake.exe -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=ON -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=OFF -B "$(Build.StagingDirectory)" -S toolsrc - ninja.exe -C "$(Build.StagingDirectory)" - - task: MicroBuildSigningPlugin@2 - inputs: - signType: 'real' - feedSource: 'https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json' - - task: NuGetToolInstaller@1 - inputs: - versionSpec: 5.7 - - task: NuGetCommand@2 - displayName: 'NuGet Restore MicroBuild Signing Extension' - inputs: - command: 'restore' - restoreSolution: 'scripts/azure-pipelines/windows/signing.signproj' - feedsToUse: 'config' - restoreDirectory: '$(Build.SourcesDirectory)\scripts\azure-pipelines\packages' - - task: MSBuild@1 - displayName: 'Sign vcpkg.exe' - inputs: - solution: 'scripts\azure-pipelines\windows\signing.signproj' - msbuildArguments: '/p:OutDir=$(Build.ArtifactStagingDirectory)\ /p:IntermediateOutputPath=$(Build.StagingDirectory)\' - - task: BinSkim@3 - inputs: - InputType: 'CommandLine' - arguments: 'analyze "$(Build.StagingDirectory)\vcpkg.exe"' - - task: BinSkim@3 - inputs: - InputType: 'CommandLine' - arguments: 'analyze "$(Build.StagingDirectory)\tls12-download.exe"' - - task: PublishBuildArtifacts@1 - displayName: 'Publish vcpkg.exe' - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)\vcpkg.exe' - ArtifactName: 'Windows' - publishLocation: 'Container' - - task: PublishBuildArtifacts@1 - displayName: 'Publish vcpkg.pdb' - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)\vcpkg.pdb' - ArtifactName: 'Windows' - publishLocation: 'Container' - - task: PublishBuildArtifacts@1 - displayName: 'Publish tls12-download.exe' - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)\tls12-download.exe' - ArtifactName: 'Windows' - publishLocation: 'Container' - - task: PublishBuildArtifacts@1 - displayName: 'Publish tls12-download.pdb' - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)\tls12-download.pdb' - ArtifactName: 'Windows' - publishLocation: 'Container' - - task: MicroBuildCleanup@1 - condition: succeededOrFailed() - displayName: MicroBuild Cleanup - - job: macos_build - displayName: 'MacOS Build' - pool: - vmImage: macOS-10.15 - steps: - - task: CmdLine@2 - displayName: "Build vcpkg with CMake" - inputs: - failOnStderr: true - script: | - cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=ON -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=OFF -B "$(Build.StagingDirectory)" -S toolsrc - make -j 8 -C "$(Build.StagingDirectory)" - zip "$(Build.StagingDirectory)/vcpkg.zip" "$(Build.StagingDirectory)/vcpkg" - - task: PublishBuildArtifacts@1 - displayName: "Publish Unsigned MacOS Binary" - inputs: - PathtoPublish: '$(Build.StagingDirectory)/vcpkg.zip' - ArtifactName: 'staging' - publishLocation: 'Container' - - job: macos_sign - displayName: 'MacOS Sign' - dependsOn: macos_build - pool: - name: VSEng-MicroBuildVS2019 - steps: - - checkout: none - - task: DownloadBuildArtifacts@0 - displayName: 'Download Unsigned Binary' - inputs: - artifactName: staging - - task: ms-vseng.MicroBuildTasks.7973a23b-33e3-4b00-a7d9-c06d90f8297f.MicroBuildSignMacFiles@1 - displayName: 'Sign Mac Files' - inputs: - SigningTarget: '$(Build.ArtifactStagingDirectory)\staging\vcpkg.zip' - SigningCert: 8003 - - task: PublishBuildArtifacts@1 - displayName: 'Publish Signed Binary' - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)\staging\vcpkg.zip' - ArtifactName: 'MacOS' diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 4c46e86a778f88..c2d74b8bcc4cfa 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -24,34 +24,7 @@ jobs: pwsh: true # Note: D: is the Azure machines' temporary disk. - script: .\bootstrap-vcpkg.bat - displayName: 'Build vcpkg' - - task: PowerShell@2 - displayName: 'Run vcpkg end-to-end tests' - condition: eq('${{ parameters.triplet }}', 'x86-windows') - inputs: - filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1' - arguments: '-Triplet ${{ parameters.triplet }} -WorkingRoot ${{ variables.WORKING_ROOT }}' - pwsh: true - - task: CmdLine@2 - displayName: "Build vcpkg with CMake, with older VS, and Run Tests" - condition: eq('${{ parameters.triplet }}', 'x86-windows') - inputs: - script: | - :: TRANSITION, get these tools on the VMs next time we roll them - .\vcpkg.exe fetch cmake - .\vcpkg.exe fetch ninja - set PATH=${{ variables.VCPKG_DOWNLOADS }}\tools\cmake-3.19.2-windows\cmake-3.19.2-win32-x86\bin;${{ variables.VCPKG_DOWNLOADS }}\tools\ninja-1.10.1-windows;%PATH% - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=x86 - rmdir /s /q build.x86.debug > nul 2> nul - cmake.exe -G Ninja -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON -DVCPKG_DEVELOPMENT_WARNINGS=ON -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=ON -B build.x86.debug -S toolsrc - ninja.exe -C build.x86.debug - set VCPKG_DEBUG=1 - build.x86.debug\vcpkg-test.exe - cmake -G "Visual Studio 16 2019" -A Win32 -T v140 -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=OFF -B build.x86.vs2015 -S toolsrc - cmake --build build.x86.vs2015 - cmake -G "Visual Studio 16 2019" -A Win32 -T v141 -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=OFF -B build.x86.vs2017 -S toolsrc - cmake --build build.x86.vs2017 - failOnStderr: true + displayName: 'Bootstrap vcpkg' - task: PowerShell@2 displayName: '*** Test Modified Ports and Prepare Test Logs ***' inputs: diff --git a/scripts/azure-pipelines/windows/packages.config b/scripts/azure-pipelines/windows/packages.config deleted file mode 100644 index d48977f79641b1..00000000000000 --- a/scripts/azure-pipelines/windows/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/scripts/azure-pipelines/windows/signing.signproj b/scripts/azure-pipelines/windows/signing.signproj deleted file mode 100644 index 9382e0a0e2d77c..00000000000000 --- a/scripts/azure-pipelines/windows/signing.signproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - Microsoft400 - - - Microsoft400 - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - - diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index b4c6295c089161..e4153aad407c32 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -1,10 +1,10 @@ [CmdletBinding()] param( $badParam, - [Parameter(Mandatory=$False)][switch]$disableMetrics = $false, [Parameter(Mandatory=$False)][switch]$win64 = $false, [Parameter(Mandatory=$False)][string]$withVSPath = "", - [Parameter(Mandatory=$False)][string]$withWinSDK = "" + [Parameter(Mandatory=$False)][string]$withWinSDK = "", + [Parameter(Mandatory=$False)][switch]$disableMetrics = $false ) Set-StrictMode -Version Latest # Powershell2-compatible way of forcing named-parameters @@ -12,407 +12,48 @@ if ($badParam) { if ($disableMetrics -and $badParam -eq "1") { - Write-Warning "'disableMetrics 1' is deprecated, please change to 'disableMetrics' (without '1')" + Write-Warning "'disableMetrics 1' is deprecated, please change to 'disableMetrics' (without '1')." } else { - throw "Only named parameters are allowed" + throw "Only named parameters are allowed." } } -$scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition -$withVSPath = $withVSPath -replace "\\$" # Remove potential trailing backslash - -function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Parameter(Mandatory=$true)]$propertyName) +if ($win64) { - if ($null -eq $object) - { - return $false - } - - return [bool]($object.psobject.Properties | Where-Object { $_.Name -eq "$propertyName"}) + Write-Warning "-win64 no longer has any effect; ignored." } -function getProgramFiles32bit() +if (-Not [string]::IsNullOrWhiteSpace($withVSPath)) { - $out = ${env:PROGRAMFILES(X86)} - if ($null -eq $out) - { - $out = ${env:PROGRAMFILES} - } - - if ($null -eq $out) - { - throw "Could not find [Program Files 32-bit]" - } + Write-Warning "-withVSPath no longer has any effect; ignored." +} - return $out +if (-Not [string]::IsNullOrWhiteSpace($withWinSDK)) +{ + Write-Warning "-withWinSDK no longer has any effect; ignored." } +$scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition $vcpkgRootDir = $scriptsDir while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) { Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root" $vcpkgRootDir = Split-path $vcpkgRootDir -Parent } -Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" - -$vcpkgBootstrapPath = "$vcpkgRootDir\toolsrc\windows-bootstrap" - -if (-not (Test-Path $vcpkgBootstrapPath)) -{ - Write-Error "Unable to determine vcpkg build directory. '$vcpkgBootstrapPath' does not exist." - throw -} - -function getVisualStudioInstances() -{ - $programFiles = getProgramFiles32bit - $results = New-Object System.Collections.ArrayList - $vswhereExe = "$programFiles\Microsoft Visual Studio\Installer\vswhere.exe" - if (Test-Path $vswhereExe) - { - $output = & $vswhereExe -prerelease -legacy -products * -format xml - [xml]$asXml = $output - - foreach ($instance in $asXml.instances.instance) - { - $installationPath = $instance.InstallationPath -replace "\\$" # Remove potential trailing backslash - $installationVersion = $instance.InstallationVersion - - $isPrerelease = -7 - if (vcpkgHasProperty -object $instance -propertyName "isPrerelease") - { - $isPrerelease = $instance.isPrerelease - } - - if ($isPrerelease -eq 0) - { - $releaseType = "PreferenceWeight3::StableRelease" - } - elseif ($isPrerelease -eq 1) - { - $releaseType = "PreferenceWeight2::PreRelease" - } - else - { - $releaseType = "PreferenceWeight1::Legacy" - } - - # Placed like that for easy sorting according to preference - $results.Add("${releaseType}::${installationVersion}::${installationPath}") > $null - } - } - else - { - Write-Verbose "Could not locate vswhere at $vswhereExe" - } - - if ("$env:vs140comntools" -ne "") - { - $installationPath = Split-Path -Parent $(Split-Path -Parent "$env:vs140comntools") - $clExe = "$installationPath\VC\bin\cl.exe" - $vcvarsallbat = "$installationPath\VC\vcvarsall.bat" - - if ((Test-Path $clExe) -And (Test-Path $vcvarsallbat)) - { - $results.Add("PreferenceWeight1::Legacy::14.0::$installationPath") > $null - } - } - - $installationPath = "$programFiles\Microsoft Visual Studio 14.0" - $clExe = "$installationPath\VC\bin\cl.exe" - $vcvarsallbat = "$installationPath\VC\vcvarsall.bat" - - if ((Test-Path $clExe) -And (Test-Path $vcvarsallbat)) - { - $results.Add("PreferenceWeight1::Legacy::14.0::$installationPath") > $null - } - - $results.Sort() - $results.Reverse() - - return $results -} - -function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath) -{ - $VisualStudioInstances = getVisualStudioInstances - if ($null -eq $VisualStudioInstances) - { - throw "Could not find Visual Studio. VS2015, VS2017, or VS2019 (with C++) needs to be installed." - } - - Write-Verbose "VS Candidates:`n`r$([system.String]::Join([Environment]::NewLine, $VisualStudioInstances))" - foreach ($instanceCandidate in $VisualStudioInstances) - { - Write-Verbose "Inspecting: $instanceCandidate" - $split = $instanceCandidate -split "::" - # $preferenceWeight = $split[0] - # $releaseType = $split[1] - $version = $split[2] - $path = $split[3] - - if ($withVSPath -ne "" -and $withVSPath -ne $path) - { - Write-Verbose "Skipping: $instanceCandidate" - continue - } - - $majorVersion = $version.Substring(0,2); - if ($majorVersion -eq "16") - { - $VCFolder= "$path\VC\Tools\MSVC\" - if (Test-Path $VCFolder) - { - Write-Verbose "Picking: $instanceCandidate" - return "$path\MSBuild\Current\Bin\MSBuild.exe", "v142" - } - } - - if ($majorVersion -eq "15") - { - $VCFolder= "$path\VC\Tools\MSVC\" - if (Test-Path $VCFolder) - { - Write-Verbose "Picking: $instanceCandidate" - return "$path\MSBuild\15.0\Bin\MSBuild.exe", "v141" - } - } - - if ($majorVersion -eq "14") - { - $clExe= "$path\VC\bin\cl.exe" - if (Test-Path $clExe) - { - Write-Verbose "Picking: $instanceCandidate" - $programFilesPath = getProgramFiles32bit - return "$programFilesPath\MSBuild\14.0\Bin\MSBuild.exe", "v140" - } - } - } - - throw "Could not find MSBuild version with C++ support. VS2015, VS2017, or VS2019 (with C++) needs to be installed." -} -function getWindowsSDK( [Parameter(Mandatory=$False)][switch]$DisableWin10SDK = $False, - [Parameter(Mandatory=$False)][switch]$DisableWin81SDK = $False, - [Parameter(Mandatory=$False)][string]$withWinSDK) -{ - if ($DisableWin10SDK -and $DisableWin81SDK) - { - throw "Both Win10SDK and Win81SDK were disabled." - } - - Write-Verbose "Finding WinSDK" - - $validInstances = New-Object System.Collections.ArrayList - # Windows 10 SDK - function CheckWindows10SDK($path) - { - if ($null -eq $path) - { - return - } - - $folder = (Join-Path $path "Include") - if (!(Test-Path $folder)) - { - Write-Verbose "$folder - Not Found" - return - } - - Write-Verbose "$folder - Found" - $win10sdkVersions = @(Get-ChildItem $folder | Where-Object {$_.Name -match "^10"} | Sort-Object) - [array]::Reverse($win10sdkVersions) # Newest SDK first - - foreach ($win10sdk in $win10sdkVersions) - { - $win10sdkV = $win10sdk.Name - $windowsheader = "$folder\$win10sdkV\um\windows.h" - if (!(Test-Path $windowsheader)) - { - Write-Verbose "$windowsheader - Not Found" - continue - } - Write-Verbose "$windowsheader - Found" - - $ddkheader = "$folder\$win10sdkV\shared\sdkddkver.h" - if (!(Test-Path $ddkheader)) - { - Write-Verbose "$ddkheader - Not Found" - continue - } - - Write-Verbose "$ddkheader - Found" - $win10sdkVersionString = $win10sdkV.ToString() - Write-Verbose "Found $win10sdkVersionString" - $validInstances.Add($win10sdkVersionString) > $null - } - } - - Write-Verbose "`n" - Write-Verbose "Looking for Windows 10 SDK" - $regkey10 = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots\' -Name 'KitsRoot10' -ErrorAction SilentlyContinue - $regkey10Wow6432 = Get-ItemProperty -Path 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots\' -Name 'KitsRoot10' -ErrorAction SilentlyContinue - if (vcpkgHasProperty -object $regkey10 "KitsRoot10") { CheckWindows10SDK($regkey10.KitsRoot10) } - if (vcpkgHasProperty -object $regkey10Wow6432 "KitsRoot10") { CheckWindows10SDK($regkey10Wow6432.KitsRoot10) } - CheckWindows10SDK("$env:ProgramFiles\Windows Kits\10") - CheckWindows10SDK("${env:ProgramFiles(x86)}\Windows Kits\10") - - # Windows 8.1 SDK - function CheckWindows81SDK($path) - { - if ($null -eq $path) - { - return - } - - $folder = "$path\Include" - if (!(Test-Path $folder)) - { - Write-Verbose "$folder - Not Found" - return - } - - Write-Verbose "$folder - Found" - $win81sdkVersionString = "8.1" - Write-Verbose "Found $win81sdkVersionString" - $validInstances.Add($win81sdkVersionString) > $null - } - - Write-Verbose "`n" - Write-Verbose "Looking for Windows 8.1 SDK" - $regkey81 = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots\' -Name 'KitsRoot81' -ErrorAction SilentlyContinue - $regkey81Wow6432 = Get-ItemProperty -Path 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots\' -Name 'KitsRoot81' -ErrorAction SilentlyContinue - if (vcpkgHasProperty -object $regkey81 "KitsRoot81") { CheckWindows81SDK($regkey81.KitsRoot81) } - if (vcpkgHasProperty -object $regkey81Wow6432 "KitsRoot81") { CheckWindows81SDK($regkey81Wow6432.KitsRoot81) } - CheckWindows81SDK("$env:ProgramFiles\Windows Kits\8.1") - CheckWindows81SDK("${env:ProgramFiles(x86)}\Windows Kits\8.1") - - Write-Verbose "`n`n`n" - Write-Verbose "The following Windows SDKs were found:" - foreach ($instance in $validInstances) - { - Write-Verbose $instance - } - - # Selecting - if ($withWinSDK -ne "") - { - foreach ($instance in $validInstances) - { - if ($instance -eq $withWinSDK) - { - return $instance - } - } - - throw "Could not find the requested Windows SDK version: $withWinSDK" - } - - foreach ($instance in $validInstances) - { - if (!$DisableWin10SDK -and $instance -match "10.") - { - return $instance - } - - if (!$DisableWin81SDK -and $instance -match "8.1") - { - return $instance - } - } - - throw "Could not detect a Windows SDK / TargetPlatformVersion" -} - -$msbuildExeWithPlatformToolset = findAnyMSBuildWithCppPlatformToolset $withVSPath -$msbuildExe = $msbuildExeWithPlatformToolset[0] -$platformToolset = $msbuildExeWithPlatformToolset[1] -$windowsSDK = getWindowsSDK -withWinSDK $withWinSDK - -$disableMetricsValue = "0" -if ($disableMetrics) -{ - $disableMetricsValue = "1" -} - -$platform = "x86" -$vcpkgReleaseDir = "$vcpkgBootstrapPath\msbuild.x86.release" -if($PSVersionTable.PSVersion.Major -le 2) -{ - $architecture=(Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture -} -else -{ - $architecture=(Get-CimInstance win32_operatingsystem | Select-Object osarchitecture).osarchitecture -} -if ($win64) -{ - if (-not $architecture -like "*64*") - { - throw "Cannot build 64-bit on non-64-bit system" - } - - $platform = "x64" - $vcpkgReleaseDir = "$vcpkgBootstrapPath\msbuild.x64.release" -} - -if ($architecture -like "*64*") -{ - $PreferredToolArchitecture = "x64" -} -else -{ - $PreferredToolArchitecture = "x86" -} - -$arguments = ( -"`"/p:VCPKG_VERSION=unknownhash`"", -"`"/p:VCPKG_BASE_VERSION=2021-01-13`"", # Note: This duplicate date version will be short lived. See https://github.com/microsoft/vcpkg/pull/15474 -"/p:Configuration=Release", -"/p:Platform=$platform", -"/p:PlatformToolset=$platformToolset", -"/p:TargetPlatformVersion=$windowsSDK", -"/p:PreferredToolArchitecture=$PreferredToolArchitecture", -"/verbosity:minimal", -"/m", -"/nologo", -"`"$vcpkgBootstrapPath\vcpkg.vcxproj`"") -join " " - -function vcpkgInvokeCommandClean() -{ - param ( [Parameter(Mandatory=$true)][string]$executable, - [string]$arguments = "") - - Write-Verbose "Clean-Executing: ${executable} ${arguments}" - $scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition - $cleanEnvScript = "$scriptsDir\cleanEnvironmentHelper.ps1" - $tripleQuotes = "`"`"`"" - $argumentsWithEscapedQuotes = $arguments -replace "`"", $tripleQuotes - $command = ". $tripleQuotes$cleanEnvScript$tripleQuotes; & $tripleQuotes$executable$tripleQuotes $argumentsWithEscapedQuotes" - $arg = "-NoProfile", "-ExecutionPolicy Bypass", "-command $command" - - $process = Start-Process -FilePath powershell.exe -ArgumentList $arg -PassThru -NoNewWindow - Wait-Process -InputObject $process - $ec = $process.ExitCode - Write-Verbose "Execution terminated with exit code $ec." - return $ec -} +Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -# vcpkgInvokeCommandClean cmd "/c echo %PATH%" -Write-Host "`nBuilding vcpkg.exe ...`n" -$ec = vcpkgInvokeCommandClean $msbuildExe $arguments +& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-01-13-768d8f95c9e752603d2c5901c7a7c7fbdb08af35/vcpkg.exe" "$vcpkgRootDir/vcpkg.exe" +Write-Host "" -if ($ec -ne 0) +if ($LASTEXITCODE -ne 0) { - Write-Error "Building vcpkg.exe failed. Please ensure you have installed Visual Studio with the Desktop C++ workload and the Windows SDK for Desktop C++." + Write-Error "Downloading vcpkg.exe failed. Please check your internet connection, or consider downloading a recent vcpkg.exe from https://github.com/microsoft/vcpkg-tool with a browser." throw } -Write-Host "`nBuilding vcpkg.exe... done.`n" - if ($disableMetrics) { Set-Content -Value "" -Path "$vcpkgRootDir\vcpkg.disable-metrics" -Force @@ -433,9 +74,3 @@ or by setting the VCPKG_DISABLE_METRICS environment variable. Read more about vcpkg telemetry at docs/about/privacy.md "@ } - -Write-Verbose "Placing vcpkg.exe in the correct location" - -Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" - -Remove-Item "$vcpkgReleaseDir" -Force -Recurse -ErrorAction SilentlyContinue diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index b7d889f9ec9658..2188b8af71ad89 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -276,11 +276,29 @@ else fi # Do the build -buildDir="$vcpkgRootDir/toolsrc/build.rel" -rm -rf "$buildDir" +vcpkgToolReleaseTag="2021-01-13-768d8f95c9e752603d2c5901c7a7c7fbdb08af35" +vcpkgToolReleaseSha="99c9949637f83bf361ee23557edc889e2865c2105c45306c39c40855a3e1440e2f6fb5ec59e95176fca61eff33929462d23c7b49feb1975f24adb8ca443a98a6" +vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz" +vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball" +baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg" +buildDir="$baseBuildDir/build" +tarballPath="$downloadsDir/$vcpkgToolReleaseTarball" +srcBaseDir="$baseBuildDir/src" +srcDir="$srcBaseDir/vcpkg-tool-$vcpkgToolReleaseTag" + +if [ -e "$tarballPath" ]; then + vcpkgCheckEqualFileHash "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha" +else + echo "Downloading vcpkg tool sources" + vcpkgDownloadFile "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha" +fi + +echo "Building vcpkg-tool..." +rm -rf "$baseBuildDir" mkdir -p "$buildDir" +vcpkgExtractArchive "$tarballPath" "$srcBaseDir" -(cd "$buildDir" && CXX="$CXX" "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DBUILD_TESTING=$vcpkgBuildTests" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 +(cd "$buildDir" && CXX="$CXX" "$cmakeExe" "$srcDir" -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DBUILD_TESTING=$vcpkgBuildTests" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 (cd "$buildDir" && "$cmakeExe" --build .) || exit 1 rm -rf "$vcpkgRootDir/vcpkg" diff --git a/scripts/cleanEnvironmentHelper.ps1 b/scripts/cleanEnvironmentHelper.ps1 deleted file mode 100644 index fa5fe869dd371e..00000000000000 --- a/scripts/cleanEnvironmentHelper.ps1 +++ /dev/null @@ -1,52 +0,0 @@ -# Capture environment variables for the System and User. Also add some special/built-in variables. -# These will be used to synthesize a clean environment -$specialEnvironmentMap = @{ "SystemDrive"=$env:SystemDrive; "SystemRoot"=$env:SystemRoot; "UserProfile"=$env:UserProfile; "TMP"=$env:TMP } # These are built-in and not set in the registry -$machineEnvironmentMap = [Environment]::GetEnvironmentVariables('Machine') # HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment -$userEnvironmentMap = [Environment]::GetEnvironmentVariables('User') # HKEY_CURRENT_USER\Environment - -# Identify the keySet of environment variable names -$nameSet = ($specialEnvironmentMap.Keys + $machineEnvironmentMap.Keys + $userEnvironmentMap.Keys) | Sort-Object | Select-Object -Unique - -# Any environment variable in the $nameSet should be restored to its original value -foreach ($name in $nameSet) -{ - if ($specialEnvironmentMap.ContainsKey($name)) - { - [Environment]::SetEnvironmentVariable($name, $specialEnvironmentMap[$name], 'Process') - continue; - } - - # PATH needs to be concatenated as it has values in both machine and user environment. Any other values should be set. - if ($name -eq 'path') - { - $pathValuePartial = @() - # Machine values before user values - $pathValuePartial += $machineEnvironmentMap[$name] -split ';' - $pathValuePartial += $userEnvironmentMap[$name] -split ';' - $pathValue = $pathValuePartial -join ';' - [Environment]::SetEnvironmentVariable($name, $pathValue, 'Process') - continue; - } - - if ($userEnvironmentMap.ContainsKey($name)) - { - [Environment]::SetEnvironmentVariable($name, $userEnvironmentMap[$name], 'Process') - continue; - } - - if ($machineEnvironmentMap.ContainsKey($name)) - { - [Environment]::SetEnvironmentVariable($name, $machineEnvironmentMap[$name], 'Process') - continue; - } - - throw "Unreachable: Unknown variable $name" -} - -# Any environment variable NOT in the $nameSet should be removed -$processEnvironmentMap = [Environment]::GetEnvironmentVariables('Process') -$variablesForRemoval = $processEnvironmentMap.Keys | Where-Object {$nameSet -notcontains $_} -foreach ($name in $variablesForRemoval) -{ - [Environment]::SetEnvironmentVariable($name, $null, 'Process') -} diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake deleted file mode 100644 index 68dc779a84b889..00000000000000 --- a/scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake +++ /dev/null @@ -1,2 +0,0 @@ -vcpkg_minimum_required(VERSION ${VCPKG_BASE_VERSION}) -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json deleted file mode 100644 index 48debf1e764c48..00000000000000 --- a/scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "vcpkg-requires-current-date", - "version-string": "1.0.0", - "description": "A test port that verifies that vcpkg_minimum_required is inclusive by using the current base version value.", - "homepage": "" -} diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake deleted file mode 100644 index b68e53e95c2006..00000000000000 --- a/scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake +++ /dev/null @@ -1,2 +0,0 @@ -vcpkg_minimum_required(VERSION 2999-12-31) -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json deleted file mode 100644 index f60901998ffb25..00000000000000 --- a/scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "vcpkg-requires-future-date", - "version-string": "1.0.0", - "description": "A test port that requires a vcpkg version from an impossibly far future.", - "homepage": "" -} diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake deleted file mode 100644 index 5a4fbf42138db1..00000000000000 --- a/scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake +++ /dev/null @@ -1,2 +0,0 @@ -vcpkg_minimum_required(VERSION 2020-01-12) -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json deleted file mode 100644 index 31e6fb62ff9531..00000000000000 --- a/scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "vcpkg-requires-old-date", - "version-string": "1.0.0", - "description": "A test port that requires a vcpkg version from before vcpkg_minimum_required's introduction.", - "homepage": "" -} diff --git a/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake deleted file mode 100644 index 571ae3b7ab3ee2..00000000000000 --- a/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -vcpkg_test_cmake(args args args) diff --git a/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json deleted file mode 100644 index 9f34e058d6d1ea..00000000000000 --- a/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "vcpkg-uses-test-cmake", - "version-string": "1.0.0", - "description": "A test port that uses the deprecated function vcpkg_test_cmake.", - "homepage": "" -} diff --git a/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake deleted file mode 100644 index 9207d30b199706..00000000000000 --- a/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -include(vcpkg_common_functions) diff --git a/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json deleted file mode 100644 index 7c16ffe821f890..00000000000000 --- a/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "vcpkg-uses-vcpkg-common-functions", - "version-string": "1.0.0", - "description": "A test port that uses the deprecated file vcpkg_common_functions.", - "homepage": "" -} diff --git a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake b/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake deleted file mode 100644 index 065116c276adcf..00000000000000 --- a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json b/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json deleted file mode 100644 index a25da6d2369849..00000000000000 --- a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "vcpkg-internal-e2e-test-port", - "version-string": "1.0.0" -} diff --git a/scripts/e2e_ports/versions/baseline.json b/scripts/e2e_ports/versions/baseline.json deleted file mode 100644 index 2413f8afc60ad5..00000000000000 --- a/scripts/e2e_ports/versions/baseline.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "vcpkg-internal-e2e-test-port": { "baseline": "1.0.0" } - } -} diff --git a/scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json b/scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json deleted file mode 100644 index ce7698ebb8d1d0..00000000000000 --- a/scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "versions": [ - { - "version-string": "1.0.0", - "git-tree": "1dc3e42a3c0cafe2884d379af4399273238b986e" - } - ] -} diff --git a/scripts/testing/env-passthrough/passthrough.cmake b/scripts/testing/env-passthrough/passthrough.cmake deleted file mode 100644 index 071b8381ea60b7..00000000000000 --- a/scripts/testing/env-passthrough/passthrough.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) - -set(VCPKG_ENV_PASSTHROUGH _VCPKG_TEST_TRACKED _VCPKG_TEST_TRACKED2) -set(VCPKG_ENV_PASSTHROUGH_UNTRACKED _VCPKG_TEST_UNTRACKED _VCPKG_TEST_UNTRACKED2) diff --git a/scripts/testing/integrate-install/NoProps.vcxproj b/scripts/testing/integrate-install/NoProps.vcxproj deleted file mode 100644 index 5b75d0961550cb..00000000000000 --- a/scripts/testing/integrate-install/NoProps.vcxproj +++ /dev/null @@ -1,145 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - {5AFB7AF5-D8FC-4A86-B0D2-3BBD039ED03A} - Project1 - 10.0 - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - \ No newline at end of file diff --git a/scripts/testing/integrate-install/Project1.vcxproj b/scripts/testing/integrate-install/Project1.vcxproj deleted file mode 100644 index a8896fe29d1039..00000000000000 --- a/scripts/testing/integrate-install/Project1.vcxproj +++ /dev/null @@ -1,146 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - {5AFB7AF5-D8FC-4A86-B0D2-3BBD039ED03A} - Project1 - 10.0 - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - \ No newline at end of file diff --git a/scripts/testing/integrate-install/Source.cpp b/scripts/testing/integrate-install/Source.cpp deleted file mode 100644 index 24a84e4d7fdab3..00000000000000 --- a/scripts/testing/integrate-install/Source.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main() { - zlibVersion(); - return 0; -} \ No newline at end of file diff --git a/scripts/testing/integrate-install/VcpkgTriplet.vcxproj b/scripts/testing/integrate-install/VcpkgTriplet.vcxproj deleted file mode 100644 index 883fc8ec1a7311..00000000000000 --- a/scripts/testing/integrate-install/VcpkgTriplet.vcxproj +++ /dev/null @@ -1,151 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - {5AFB7AF5-D8FC-4A86-B0D2-3BBD039ED03A} - VcpkgUseStatic - 10.0 - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - x86-windows-static - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - \ No newline at end of file diff --git a/scripts/testing/integrate-install/VcpkgTriplet2.vcxproj b/scripts/testing/integrate-install/VcpkgTriplet2.vcxproj deleted file mode 100644 index d3352e195b4a11..00000000000000 --- a/scripts/testing/integrate-install/VcpkgTriplet2.vcxproj +++ /dev/null @@ -1,149 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - {5AFB7AF5-D8FC-4A86-B0D2-3BBD039ED03A} - VcpkgUseStatic - 10.0 - x86-windows-static - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - \ No newline at end of file diff --git a/scripts/testing/integrate-install/VcpkgUseStatic.vcxproj b/scripts/testing/integrate-install/VcpkgUseStatic.vcxproj deleted file mode 100644 index 28c4fc7158ca12..00000000000000 --- a/scripts/testing/integrate-install/VcpkgUseStatic.vcxproj +++ /dev/null @@ -1,151 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - {5AFB7AF5-D8FC-4A86-B0D2-3BBD039ED03A} - VcpkgUseStatic - 10.0 - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - true - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - \ No newline at end of file diff --git a/scripts/testing/integrate-install/VcpkgUseStatic2.vcxproj b/scripts/testing/integrate-install/VcpkgUseStatic2.vcxproj deleted file mode 100644 index 98beaee4b12fb1..00000000000000 --- a/scripts/testing/integrate-install/VcpkgUseStatic2.vcxproj +++ /dev/null @@ -1,149 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - {5AFB7AF5-D8FC-4A86-B0D2-3BBD039ED03A} - VcpkgUseStatic - 10.0 - true - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - \ No newline at end of file diff --git a/scripts/tls12-download.exe b/scripts/tls12-download.exe new file mode 100644 index 0000000000000000000000000000000000000000..3eff1dd4e031b5f8074f027cac4d08e91f59dcc1 GIT binary patch literal 18312 zcmeHu2UwFyxA2=nuL>wCN+?kjfj0$G0Hqfdh_r};7)c-?B$z_8(L^y~#ol1mwXTY+ zWvw9g-h080z2VBP?B+l723XYHZ@>HB`~Ba&_xXos+L<$F&YU?jXXd;iV&oi*f?*gH zqE?GxyCFxxk4XP zEu*E&XhBgiv@E$;;%;VU?A%70u}4Tz-{J|{!w$!mm_DjPXwR`RPyr!z*@c0;{EiTas2}P~ zNHXPsh~`cR2+?!wgak!D3=8-Y^8ai9DhUja7iw*SXnvSxqO+yut+WY>!loQOI1NkSaR4_dYGs^Bx;7hEf?rD z1wl1=^y$;PeF{lfQ>p=mRa0?4jCHuY)R_w)Vbe?4x)~p}HZFj!X(`caElM9!FbtTr z7HDk-A_lcKVuCk|(i6~9GSS(Zs_HL2PmHJ3jkg==X|iS}L6mj6={`^`I*bNwh|!EN zjnhb}@tSNyX^Ks-G zZQ3cY7o-ybLu-Q*9I3d{HK@Y@;0rqzyx(-0i5rMGj92DAwbr^~u ztQU4VvHG5Zeil=ok}-_+>HwMp@MhU2%EbgOESVIjVHsq!b{XUttqmK-)?6?745Atg zJu{FFSjWXnO`Q;Dd8oAs=nS0t%A&MCLZE^)U4T6o%n)Xf5gVtqDFm#kbrz-81Oe$@ z7#pb2pk+F=l*3d|D+yYqa7v<)b>j?_&Vf;2NhSiCrU?!46#DAgbt%wLK_lvajc5Wu zW*guF0RVOeB5A?2FacETpn`*}k!nh<;GlyZ*=;>GLXRR?^5f8KQ3@-7N&TGB8s(Eg zyu+OBDpbzHSal_b4O4;Zps6R+R=d#w2;cw&33%aTVUO)TbNck@lGo%<_v@ciDyZ`) zb*{%t>haWabInQU(g@3sB-JMQK2R(rY7sh_}FPzCW#y?{4h${A!j8ss&XjKpiFV+J^i(Ih&XY8v8M zKd16o7NzR}yTXqgl3KzAmZ$z~QMwQyal)eC(PhnIng&tJbhbttBt8aI#tsIA(Z&lP z#K#CgwP*m*v`p2i#tLCW+X$cvPz*BENeEadhv{&2xG)W_rZ-YHn3*l;8EBJ07$2v- z1TB4BCpz1zpChBuMraryLW5p%(&$kQO+Nr%gk0N`FXf3Q4y%D=7Z3Z$RtQ$d1-40# z_MO!ewe@__Kh?s%6s89E(ZAncCtyq<>;e)^Mj{hES~@yLv~+YdXz4CQI*>?lB4raPmq?Ldv~)ir4I)w`N-Z79K}$zM(bCZl z(bCbL*3uJ+)R{*+Pf7v zEca|dsc$o+sWWY8(2zRQ%$mr0za@ZrFNuuaL}YG{AX`3L&lXTL!Psh3BB!plguEiy zaJ3z(Prco$)gIFu0jMPSt458ht)X^I&k$0?_c1+Fq7`hio^4wxgF0ed9d@kH4(h-= z7)4aqtw#AUy%wm~H$okW7S*MX;LK{e4@!FiO+3S}3H53df}KtXKZ6P*A!s5D|6dE? z5eVTwHg#aKd^(!FZe|AUGb?&Y)6K@^-#44aznx9VBvUNMxMY$grlyuiOfjgN=NM>$ zO~cBAO(FAJjTX9XQQK!)B5B2508*4IpU}gg{KtMf1gE{`r6$-=qf?PDN_+hJ z`e8p&A#pwAdeXZ-mvoxYBS8A5NiV}6HdInW2f=SJ>`Q!|S$-I%>K3o@L?z8xV%Jt8 z=B_4;{tMD@7WnC!A`CV4uEC~m7%)`Qr0XH?;~gyi33B&ukiTL2 zEAnj6y>B}Gv-9Xgix+GOC))KSI7HEGS#?FfRQ2-1EEd!?z~21d9JckxuwMsY*juR<<{SO;-4#HA3YLsURS0f`>PIxr(u=)MF2$MPV4`KN<3Feb*r*qA5gg>f)0 z#>4!)6Ka6V>+8AF~+(2@d%3d_daF)=X`$d8~k4yd3} z5UoG@4}@9>K`9G3Q(+O%ri4Ecj3oi?5GNv_i?|m<4UM6K`Jiz@oNXgR0YY3yKR&dp zppOzm5^{r{x{)&>7eUP(sO3SVfuy2fOn;bjB-EloZo{A!3-x#?yMZ)NEezVCfPO4M zLZEFJwCUy?^cCfHxwcC|3DWU^KNM)tdk~~3gaNHspdN!ILmCa#M_>s6_W`cuZL2g0 z>NG-nN;jFbfrMBg1k42d#+=%L14Tpz$zQ1wcjESVDe6zz+n7 z1RyF%L!b@G6~X_Jv^+qH?t}vj=@Ob@7~rEdj)I8B`WhYsP!-YIu0MeCRo_5@R~cX; zEkhv`<`Mf1Ui%o)fH@vC3F(Ip|4Uxbm@-(~zr#cADG<{^ViE#d39~?QQ$ihuFX;{^ z##DgB!=N2$57J&G;C;RJU+OB-Y(!B(jDvOxlDrD2DPSy}Hn(d5!c-BfqK1-gWxwVF z@r_0gBJe~6pJ;VEucVGAMBTkjKhf=T>2GdO}&y{7$MPm1C@mL)JaK2$EqM)zK2;Z{< z2#fGXJ7=Nofi^PXyLL}UPGx6L1gZp>A>{5jo|2k|=C5-_yQih5i$THGLw$rEw72=I zF_1eI;S+V|K#@`vsun54@u@1&*i4DiAKIvYgA)iiXx;N*f^BpP3JSzyVR*uC?}O;; zcw|Bm+t*L04{b0Of}ICgCFE@|Hi99Wb{-b54d#Vl=*S@E*XBnzggUwwyN^|(?SuKW z**sLXgTp+NrlXDOC`2OLNdrH9Cp-nf!~pxV@ZZs%_r-+ivM`k@J1Scu18KC?0yE`G zNtj3`&V(b!r~@jO$s{RoxVg7Oq9r165c*ibX@|r}R8iTgbUA2Mzjhd+9W5EJmMEbw zyB!)Mk%>E?jCN?WBt?>*BZ-zMv*j`+j6SfvWw=_R$Pa@7B?=`b437+pjTN|yGc&Qv z@;D1=UOd`a*5k{~qCtV?zWl3bJc#$F3+o~5QlM)&x4$e!F5IO^mXaG#E2Ws?}&C@C2$~FM(>|1kh<1R70U14yF>B zvO)wyp&brhF}M?gjrPN^k%06_*MRwmluAj~*vx!dURI_|>FcOg$oR?>sU%CJbjwOl zQOK3@RFzwbJc}<#WlRsK&> zW9j-qPo*S94M%G}L5BvxN1-zk60ty$o&yI(nnc;r*tt1454s{FGfa{r$)shX)Ynm@ z4437|$4L~9GYW75#w$D>`I zg9QEp|Dd4o$j}iZ+6w=fI&#$>hIP}!Epa-|!H45QJO!VK7vT%=)p#v_3V(pN;9A^@ z5ynVoXc%)DOBw4KhZvU_uNh`cI@6UooH>rEVa{W2W!5p@GtF31RvxR6HI21`wTbl> z9_HQHz1Xg77MssbWT&we>`CnD?D_1K><#Q6*$3Gt*;G#xPis$m&jFrn&t%W@o)0|V zdA4|(d)a#Nz5KnzUU$46dOh=ciwcvK=in&?bJnj_kD(+hDCTQ@bmbS`KA0B{5kwZ{FVH*{LTDY{vLik z{{;U6{|5gN{~7-c{};ZKH`9Bhx5!)Ot@1ALF7z(*p6NZ$`+#?Y_YLp6-k-fOA9EjD zA15ES56>soN92?0Q{*$tXTDFZPlL~KpQ}ENJ}-QkDGMV>C{!~1 zqy|saH+I!0QAx!dGKpFhi4ViOcY;{pMidfOMg5Lkh~bQ{`ci3S9}hWie>$JTPG6Ab zk>*$!Yg?*R(KawF|;xkij>lHS(-{NV_4$m2xwqs5G@gB z$z@_jAKVT>jIC@U+D{}}pj?qHSBTKYXSm>fQ9H%TzH_@+LW@aHlL1wlAkd%2#2E~{ zPj@pWjVv=KLLBZNlib)o*)+A$cF^Pno z-F3o5S^Fuf*4VM9``^qDQoX3|&L?_dSSp6h+KcYV{^+WJz* zo%O*7j*l{&mAOBsLfkU8&qq%~kA4@@UOaZNxSg{n;*R@Z?m-i^*L}f^i{*!>swR!< z;@SIVmR_X$#=t%LFD?u`_bkkKEi`_YN!T4p!D9dtACaTj`Oa$n*ey0_9@R zVNhSBy~!wX!#Qp^*B#n%QTv=pBx)QUgAZ@7fBMX(~s^`oSudeoh{*JgR*B2uEdNN`i;%4o8|MHjpFkS9CHc{g^Y{) ze|^C?li+);V21itB>C}*gU_GlY``4l_R+CvTQxnyT)eZ(F4xgkT^qeku=4QkIgJnEo*E|2a?pK}K{SRj@}PRlY{x1zfNfBn4qAM#h$Dw7+J z7oRyvA7k|>Y98-$!11IjzeO>PKJA>~WiseiUwUjtwfWsC89^hMkCtiDUsu-OUqyPj z{?2uiG}|?7jV7Zr z7{#Lk)Hm_W z6;5-sB`H?@|Jc3Ja`-uGAn12`YI+Jhp=thVl~j&ymmNj`OaTYyGI3A1Kp-RFMN}C$ zs{Y%JR5AHmb3jJsfDGmU_S~kozbY*4+<&+(+gNNF!QS(J=Lm;Y0lfx{dp1(AakoCV zCpCP}lm^p2cR1sYcD-)$mV0Q4{7teDSo&m1CSUx2_Cd{!BXh;=N@t z+l>b{Y`w9;bxVQK)@utBPLAoR_bfH1i5cCutH;w#hJtgoLA#Q!A9kmxH%UL7%KE@h ztnStvvZs+N-YgS)=6zq4V&QhlZ+^?ey9Q=g67$!F_kU`3pvo%uK&9`S&ktQkTG~g% zyL?xmXza@06+Zg@!hs(no%mm6xnCocL`sSJpBPZ>5{|HLD7eI2nRb; z-d-pe<#EO7VRn+m@Q~cv7VQ4M&E(?bTXiKhaV zjf$tv_YQ_EIr8R^o$yvk#mk6reBGv5_g;=#wYBxmw$umpi;5<^y83G9)A0W5tX#fd zHz}>~$&9gi$=f|juL+kY9?W%ddG{)-!DaTq*?yd;`ukIZ$`2b2J92q#poeO~Cs|7# zZNxyUq%jMY4vJ!x-rP35``wk1%?r2f3#rOne6jKB^qD5@=I|Am!)LgqzERsP&xS;W zix}3){{5*j>e11`noKqAV+`MQ)bQ0M5c9`P&~a};MP$lwi;lBj52t_$_`=L7-1ub1 zoWP%~^&;;-Uw4dg!Ks{$k3>D}sbGolsH%vnp=IH1RtT)sw`Pv8aoGy+Xr<^Z5$s#o zwXj(`j9oI$N@g+%V>i0pxPh^Y#szp}dmW5jz&|o}9x3gX?jO)s;YF(u^E7JFBD|;) zFPhsSBzFp4RDus~AC64w#`;IYA>%EUrzkzL73o`!u>i3ka2b&CapJo zn3KSVL-dI=nfR!KK6IwQr<>%C4=j?7&tvYi-d`Q4g!N5(U$%B}V{Cp;_e}&UtxH@MEsikvHF}^e?Rb0pXfNu4d;Z7FU0&anc)VQnb9Lgv>)6%mko^fC z7OgcJ8fLkq(EdEu|47ZUwS$9m`*2s)4;m4IN2gmIiy6C|R zbzaYx&pAu-ZHH>F);dYmPqzNrs(E2j_&nWvYb*YWI&9Xxd+Mx|xxN=x#79OQEEGCc z=XGH^6uj{_t{MD!{pmGH_0`jt3CG7rh6UFJoLH7K%D6CW+;91->i1`5Wt@msTA39H z&M=B?((q!N6nOsOMGOAjhU+h1fSn$tRYhBHIDp#TghmvGX~!iV9;xuo`{T)K!Z3&X z=O1+&+~bdqRE8s!W_m2tbfL<4&kj?U!}#TEj#~p18}T#SyqB}}EFRb$tiS_0bvI?O zab}fuVORKujy4+l{;Y(Uim9r57TW&Rp6K~EQ~l^mi%E&2 zyZrdD&isSow99NJeSXB|T{h${{G9n7%kQVU2k84{zbm_{ktU!1tbe3mb?oBq5wouA zZ_l25Nq%Uv&*hJ!GDZc_Cj1^}t_7Cho+u^-fo%Q2r1^k0w~;PQ zFs6|H#5qxTb&Kol?fte(L!b0q;=4e&YeCAsE_Y|Fs6FMNIM6zKCRu+>kK50tOt!UR z;_$#{;w-o)da@brUTn{iIJJ;WYOX4}yr$>^UUc?faxMK2JSzL*&R}`q{n=w-8`Ma@MA;Anf?u76tR(5~fbkWBXw-}WuE1MQ0QRJkjNUDm> zgYaVNM{vvB>ExDibC2*pnId6Tq02eRt+P@ix6H(Ui4fXmMzQMsryRFAWpLz_VelAC z1`nRMo;bVBDZ}8jRsYwm5$O207yQoto(-akW_37!aWH#VZP@Oa)4DQ}%Np;vj5VeE zZQZb_@Cu%=>8kS$yXc2^ye9~&C$ruPkA+Rr4Bc{#mbQLC1%GIH7wcQ`O732TJk;)` z|J&7izm~K*Wmh$fo;PzX&FeRZ^WUDB#DZ)H&lO%miptj|S zmH&N<4WhB{q_hLaoPT`F&@@maE^3cI|V&VN=ewmAP1l(OkBk zzyG7Yd{Z5pvj3X(q!m*#DV2NumRBvW8Fg()YVPB016DlD+Z|+cszIRcUgk6^?Ab7> z$&RNp$DM3EMp3OFx$oixQ=^N6SCzH0AF0RuUU{$mg4+uu)xFbo_C}_7VgSjZCDMF` z)+6u$`~8ZtGhf_FucYu3XE5e`2%Io6q}LIabmY{mI6Pi=D~-az{Za+)mk!^^KX)sI zJq9}rloh#OaKin#(v6uBwCPFD5$@YyZ(@BFtk578U#*qVN(m+WYu-fX3|U}DCV zgrI?;oQj)wM9U11O8d`@rcSOj4y7pdj!(Q;nia!Zo|HPPlG=3K>!Cj7wcql9Iyjhv{>fv{Xe56ntp7gF2;Jd_gZBZ>KbDuL zCp!E*byYU1{+o~HzdfmXo9)Z(GJ{Wh*=n`ux{i8l6Vs2%u=nrPb3yO3Mpm;XitvOQJjmkRnCYdlfu`3Yc5@AD1MbY< zd{v1H`xdVbHaq|PV`$NtgU(}^BgTZh9}!x{EbXHbrOiz)imf>}f7rbG!`~-e5LwAw zj`sYetZ?r=QENzjzuwMiT@^hYW^5fQE*FfgN%}3<-uJCgy?OtPfC#_g7c7?R4@#Tz zF}04eFlh3d^Fx1=JzjdUX8rqu0mh8CHzW1u?woGu*_3Cu?b(tuK2JS@_N;5ZE#AL| zR8KRSpLeEpU)_nIq|x1$lk}n-Bic`@CvZ|d_=ivNKRufMOP=CaevUsiyXm{cvC<2^ zm2*a2JG<2O@PGEu>v$@+9eQ4FOxAzZq4yWG;R#-a&N&+LHp644XdYfP`-@k25$@Z5 z{=qAp@s~%eU}(7R2_7hj@eoT=MesYAf8q@;fXBceZ}6D5A36T*8{FW@^x{zko@ zy^1-c-*0hSJ$~Q$cou8#*yN?RgnrN7on4YTXQnn|?36o4hM3Il`+)bd$B^+UD<(K( zH7sBKozJgRCN0dEllOhr#rw;D>D|h`UfFzft?|OLHTzfg+(Hc~*}bE1nIo6BgZ^0j z@>BD{$tekRivo9^Fz37R8}(;cly}=BTG!>&((C4-OAC*jKeO)qn@J^a?|Y9ox|gI{ z>}V*uxlPbVzW?2Q?A}v`!J7H}Pm<8Qrk3?#n?BuDOcsrk=WZxEwa#cWZ|}>ar>+qwvW1b+$?TM!8E0};giK~&np^P?p^zTtn-NN=kV$H=E$2a zyK6SwTDW~(z;`Fk_3)2qEc<1^($!s3@k@JE%%S&ECVX5n!=u+Rhph=aw%iW#StJ;L zt@`4TxQFR?h4mNi;&s2BeiHH7>|j#VvlV@Ma6R^&8=>d^#;i)r(RUyQ=BoU8{@97r`~_O}xQdtN(XCE536w1{Z^YzMiW&h1`>3gRMH7d~EWx z2{oz%M%$wke{MLl_Iynh_{oY2*G&F5+pJDssr2+PvL5#E2(=sTXlv2_7G!ub*erZx z2Y}rMz;oe%(fJ$T;YlSiJm9)#+(rO7R*fMclY6+6!5L~ml)G5y5RS$zLBV@nC*wuz1Nx1(WmY#;r6U+UaMiJs%P>(<{G|k8oO-4WVvhK`MrnF9Gq6S z>VX7GkIBD8w`zjsA-ex*No!gls66_bYGJv+P);8-&I!oTp1@5uGF z#4&%tf*pOhw;pi1Kh)pRDx98L5cRe){h94*(}_#)qF*}^AbT*1p5sMN@uEj~(S9mz z*1M4k#Uz@+><0@hEquH#w)9`Naqw%C2=&rwyz2Y#kL5*+{~K(DKNlQ0&ddsG7TX4I z+UEDLvGS}#klWUNhjZW61rN!v3Dq#ydvH4|B=`rA(`)E6`K&z$)ZdFz*0;KjSG>Bt zQZU|P@#CiMeO^?M1f`QsJ~|$uwhCa^C-D}&jvuGrYii&;&lL|$5BuewJ2G)=aQ+bw zo2WRiCF?fyS#@CPh#m9y+QeO`xp{Z=8Kdn3YxptS>qNM>%ck(rORsA(7mYC6J0iEb zPlbu)9jlUo(W$T+c6q*8Y*YUiU17B4GHhSykE&-s4mw&Xz-Vg26D y4K>JFh}T9uFAUtHUj82+``7~j literal 0 HcmV?d00001 diff --git a/toolsrc/.clang-format b/toolsrc/.clang-format deleted file mode 100644 index 374a4233e6380a..00000000000000 --- a/toolsrc/.clang-format +++ /dev/null @@ -1,54 +0,0 @@ -BasedOnStyle: WebKit -Language: Cpp -Standard: Cpp11 - -UseTab: Never -IndentWidth: 4 -ColumnLimit: 120 -PointerAlignment: Left - -BreakBeforeBraces: Allman - -AllowShortBlocksOnASingleLine: false -AllowShortCaseLabelsOnASingleLine: true -AllowShortFunctionsOnASingleLine: All -AllowShortIfStatementsOnASingleLine: true -AllowShortLoopsOnASingleLine: false -AlwaysBreakTemplateDeclarations: true -AlignAfterOpenBracket: true -AlignOperands: true -AlignTrailingComments: true -BinPackArguments: false -BinPackParameters: false -BreakBeforeBinaryOperators: None -BreakConstructorInitializersBeforeComma: true -ConstructorInitializerAllOnOneLineOrOnePerLine: true -Cpp11BracedListStyle: true -IndentCaseLabels: true -KeepEmptyLinesAtTheStartOfBlocks: false -NamespaceIndentation: All -ForEachMacros: [TEST_CASE, SECTION] -PenaltyReturnTypeOnItsOwnLine: 1000 -SpaceAfterTemplateKeyword: false -SpaceBeforeCpp11BracedList: false -DeriveLineEnding: false -UseCRLF: false - -IncludeBlocks: Regroup -IncludeCategories: - - Regex: '^(|"pch\.h")$' - Priority: -1 - - Regex: '^$' - Priority: 1 - - Regex: '^$' - Priority: 2 - - Regex: '^$' - Priority: 3 - - Regex: '^$' - Priority: 4 - - Regex: '^$' - Priority: 5 - - Regex: '^<[a-z0-9_]*\.h>$' - Priority: 6 - - Regex: '^<[a-z0-9_]*>$' # C++ standard library - Priority: 7 diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt deleted file mode 100644 index 24ab12818d5602..00000000000000 --- a/toolsrc/CMakeLists.txt +++ /dev/null @@ -1,222 +0,0 @@ -if(WIN32) -# 3.16 for MSVC_RUNTIME_LIBRARY -cmake_minimum_required(VERSION 3.16) -else() -cmake_minimum_required(VERSION 3.14) -endif() - -project(vcpkg C CXX) -include(cmake/utilities.cmake) - -# =============== -# === Options === -# =============== - -include(CMakeDependentOption) - -option(BUILD_TESTING "Option for enabling testing" ON) -option(VCPKG_ALLOW_APPLE_CLANG "Option for allowing apple clang, even versions that we don't know will work" OFF) -option(VCPKG_DEVELOPMENT_WARNINGS "Option for turning on all warnings" ON) -option(VCPKG_WARNINGS_AS_ERRORS "Set warnings to be errors" ${VCPKG_DEVELOPMENT_WARNINGS}) -option(VCPKG_BUILD_FUZZING "Option for enabling vcpkg-fuzz support" OFF) -option(VCPKG_EMBED_GIT_SHA "Option for to fill in the Git SHA version; off by default to avoid privacy concerns out of official builds" OFF) - -CMAKE_DEPENDENT_OPTION(VCPKG_BUILD_BENCHMARKING "Option for enabling benchmarking" OFF - "BUILD_TESTING" OFF) - -if(WERROR) - message(DEPRECATION "-DWERROR is no longer a supported flag. It doesn't do anything.") -endif() -if(DEFINE_DISABLE_METRICS OR VCPKG_DISABLE_METRICS) - message(DEPRECATION "DEFINE_DISABLE_METRICS / VCPKG_DISABLE_METRICS are now handled by creating a " - "file vcpkg.disable_metrics next to the binary.") -endif() - -# ============= -# === Files === -# ============= - -file(GLOB VCPKGLIB_SOURCES CONFIGURE_DEPENDS src/vcpkg/*.cpp) -file(GLOB VCPKGLIB_BASE_SOURCES CONFIGURE_DEPENDS src/vcpkg/base/*.cpp) -file(GLOB VCPKGLIB_INCLUDES CONFIGURE_DEPENDS include/vcpkg/*.h include/vcpkg/fwd/*.h) -file(GLOB VCPKGLIB_BASE_INCLUDES CONFIGURE_DEPENDS include/vcpkg/base/*.h include/vcpkg/base/fwd/*.h) - -set(VCPKG_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/vcpkg.cpp) - -file(GLOB VCPKG_TEST_SOURCES CONFIGURE_DEPENDS src/vcpkg-test/*.cpp) -file(GLOB VCPKG_TEST_INCLUDES CONFIGURE_DEPENDS include/vcpkg-test/*.h) - -file(GLOB VCPKG_FUZZ_SOURCES CONFIGURE_DEPENDS src/vcpkg-fuzz/*.cpp) - -# ======================== -# === System detection === -# ======================== - -vcpkg_detect_compiler() -vcpkg_detect_standard_library() -vcpkg_detect_std_filesystem() - -if (VCPKG_EMBED_GIT_SHA) - find_package(Git REQUIRED) - execute_process( - COMMAND "${GIT_EXECUTABLE}" status --porcelain=v1 - WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - OUTPUT_VARIABLE VCPKG_GIT_STATUS - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - if (VCPKG_GIT_STATUS STREQUAL "") - execute_process( - COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD - WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - OUTPUT_VARIABLE VCPKG_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - else() - message(WARNING "Skipping embedding SHA due to local changes.") - endif() -endif() - -if (NOT DEFINED VCPKG_VERSION OR VCPKG_VERSION STREQUAL "") - set(VCPKG_VERSION "unknownhash") -endif() - -set(VCPKG_BASE_VERSION "2021-01-13") - -set(CMAKE_CXX_EXTENSIONS OFF) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_STANDARD 17) -if(MSVC) - string(REGEX REPLACE "[-/]W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - if (CMAKE_BUILD_TYPE STREQUAL "Release") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi /guard:cf") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /debugtype:cv,fixup /guard:cf") - endif() -endif() - -if(APPLE) - SET(CMAKE_C_ARCHIVE_CREATE " Scr ") - SET(CMAKE_CXX_ARCHIVE_CREATE " Scr ") - SET(CMAKE_C_ARCHIVE_FINISH " -no_warning_for_no_symbols -c ") - SET(CMAKE_CXX_ARCHIVE_FINISH " -no_warning_for_no_symbols -c ") -endif() - -# =============== -# === Targets === -# =============== - -# === Target: vcpkglib === - -add_library(vcpkglib - ${VCPKGLIB_BASE_SOURCES} - ${VCPKGLIB_SOURCES} - ${VCPKGLIB_BASE_INCLUDES} - ${VCPKGLIB_INCLUDES}) -target_include_directories(vcpkglib PUBLIC include) - -vcpkg_target_add_warning_options(vcpkglib) -target_compile_definitions(vcpkglib PUBLIC - VCPKG_USE_STD_FILESYSTEM=$ - VCPKG_VERSION=${VCPKG_VERSION} - VCPKG_BASE_VERSION=${VCPKG_BASE_VERSION} - ) - -set(THREADS_PREFER_PTHREAD_FLAG ON) -find_package(Threads REQUIRED) -target_link_libraries(vcpkglib PRIVATE Threads::Threads) - -if(VCPKG_CXXFS_LIBRARY) - target_link_libraries(vcpkglib PRIVATE ${VCPKG_CXXFS_LIBRARY}) -endif() - -if(MSVC) - get_target_property(_srcs vcpkglib SOURCES) - - if(NOT CMAKE_GENERATOR MATCHES "Visual Studio .*") - set_property(SOURCE src/pch.cpp APPEND PROPERTY OBJECT_OUTPUTS "${CMAKE_CURRENT_BINARY_DIR}/pch.pch") - set_property(SOURCE ${_srcs} APPEND PROPERTY OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pch.pch") - endif() - - set_source_files_properties(src/pch.cpp PROPERTIES COMPILE_FLAGS "/Ycpch.h") - target_sources(vcpkglib PRIVATE src/pch.cpp) - target_compile_options(vcpkglib PRIVATE /Yupch.h /FIpch.h /Zm200) -else() - target_compile_options(vcpkglib PRIVATE -include "${CMAKE_CURRENT_SOURCE_DIR}/include/pch.h") -endif() - -if (MINGW) - target_compile_definitions(vcpkglib - PUBLIC - UNICODE - _WIN32_WINNT=0x0601 - WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY=4 - __fastfail=exit) - target_link_libraries(vcpkglib PUBLIC winhttp bcrypt version ole32 uuid) -endif() - -# === Target: vcpkg === - -add_executable(vcpkg ${VCPKG_SOURCES}) -target_link_libraries(vcpkg PRIVATE vcpkglib) -vcpkg_target_add_warning_options(vcpkg) - -# === Target: vcpkg-test === - -if (BUILD_TESTING) - enable_testing() - - add_executable(vcpkg-test - ${VCPKG_TEST_SOURCES} - ${VCPKG_TEST_INCLUDES}) - target_link_libraries(vcpkg-test PRIVATE vcpkglib) - vcpkg_target_add_warning_options(vcpkg-test) - - add_test(NAME default COMMAND vcpkg-test --order rand --rng-seed time) - - if (VCPKG_BUILD_BENCHMARKING) - target_compile_options(vcpkg-test PRIVATE -DCATCH_CONFIG_ENABLE_BENCHMARKING) - endif() -endif() - -# === Target: vcpkg-fuzz === - -if(VCPKG_BUILD_FUZZING) - add_executable(vcpkg-fuzz ${VCPKG_FUZZ_SOURCES}) - target_link_libraries(vcpkg-fuzz PRIVATE vcpkglib) - vcpkg_target_add_warning_options(vcpkg-fuzz) -endif() - - -# === Target: tls12-download === - -set(TLS12_DOWNLOAD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/tls12-download.c) -if(WIN32) - add_executable(tls12-download ${TLS12_DOWNLOAD_SOURCES}) - set_property(TARGET tls12-download PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded") - set_property(TARGET tls12-download APPEND PROPERTY LINK_OPTIONS "$,,/ENTRY:entry>") - target_link_libraries(tls12-download winhttp) -endif() - - -# === Target: format === - -find_program(CLANG_FORMAT clang-format) -if(CLANG_FORMAT) - # doing all of these formats in one line has a tendency to overflow the command line length - add_custom_target(format - COMMAND ${CLANG_FORMAT} -i -verbose ${CMAKE_CURRENT_SOURCE_DIR}/src/pch.cpp - COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKGLIB_BASE_SOURCES} - COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKGLIB_SOURCES} - COMMAND ${CLANG_FORMAT} -i -verbose ${CMAKE_CURRENT_SOURCE_DIR}/include/pch.h - COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKGLIB_BASE_INCLUDES} - COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKGLIB_INCLUDES} - - COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKG_SOURCES} - - COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKG_TEST_SOURCES} - COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKG_TEST_INCLUDES} - - COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKG_FUZZ_SOURCES} - COMMAND ${CLANG_FORMAT} -i -verbose ${TLS12_DOWNLOAD_SOURCES} - ) -endif() diff --git a/toolsrc/cmake/utilities.cmake b/toolsrc/cmake/utilities.cmake deleted file mode 100644 index 4b434a9c76aba4..00000000000000 --- a/toolsrc/cmake/utilities.cmake +++ /dev/null @@ -1,250 +0,0 @@ -# Outputs to Cache: VCPKG_COMPILER -function(vcpkg_detect_compiler) - if(NOT DEFINED CACHE{VCPKG_COMPILER}) - message(STATUS "Detecting the C++ compiler in use") - if(CMAKE_COMPILER_IS_GNUXX OR CMAKE_CXX_COMPILER_ID MATCHES "GNU") - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0) - message(FATAL_ERROR [[ -The g++ version picked up is too old; please install a newer compiler such as g++-7. -On Ubuntu try the following: - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get update -y - sudo apt-get install g++-7 -y -On CentOS try the following: - sudo yum install centos-release-scl - sudo yum install devtoolset-7 - scl enable devtoolset-7 bash -]]) - endif() - - set(COMPILER "gcc") - elseif(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang") - #[[ - Note: CMAKE_SYSTEM_VERSION uses darwin versions - - Darwin 19.0.0 = macOS 10.15, iOS 13 - - Darwin 18.0.0 = macOS 10.14, iOS 12 - - Darwin 17.0.0 = macOS 10.13, iOS 11 - - Darwin 16.0.0 = macOS 10.12, iOS 10 - ]] - if(CMAKE_SYSTEM_VERSION VERSION_LESS "19.0.0" AND NOT VCPKG_ALLOW_APPLE_CLANG) - message(FATAL_ERROR [[ -Building the vcpkg tool requires support for the C++ Filesystem TS. -macOS versions below 10.15 do not have support for it with Apple Clang. -Please install gcc6 or newer from homebrew (brew install gcc). -If you would like to try anyway, pass --allowAppleClang to bootstrap.sh. -]]) - endif() - set(COMPILER "clang") - elseif(CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang") - set(COMPILER "clang") - elseif(MSVC) - set(COMPILER "msvc") - else() - message(FATAL_ERROR "Unknown compiler: ${CMAKE_CXX_COMPILER_ID}") - endif() - - set(VCPKG_COMPILER ${COMPILER} - CACHE STRING - "The compiler in use; one of gcc, clang, msvc") - message(STATUS "Detecting the C++ compiler in use - ${VCPKG_COMPILER}") - endif() -endfunction() - -# Outputs to Cache: VCPKG_STANDARD_LIBRARY -function(vcpkg_detect_standard_library) - if(NOT DEFINED CACHE{VCPKG_STANDARD_LIBRARY}) - include(CheckCXXSourceCompiles) - - message(STATUS "Detecting the C++ standard library") - - # note: since is the smallest header, generally it's used to get the standard library version - set(CMAKE_REQUIRED_QUIET ON) - check_cxx_source_compiles([[ -#include -#if !defined(__GLIBCXX__) -#error "not libstdc++" -#endif -int main() {} -]] - _VCPKG_STANDARD_LIBRARY_LIBSTDCXX) - check_cxx_source_compiles([[ -#include -#if !defined(_LIBCPP_VERSION) -#error "not libc++" -#endif -int main() {} -]] - _VCPKG_STANDARD_LIBRARY_LIBCXX) - check_cxx_source_compiles([[ -#include -#if !defined(_MSVC_STL_VERSION) && !(defined(_MSC_VER) && _MSC_VER <= 1900) -#error "not MSVC stl" -#endif -int main() {} -]] - _VCPKG_STANDARD_LIBRARY_MSVC_STL) - if(_VCPKG_STANDARD_LIBRARY_LIBSTDCXX) - set(STANDARD_LIBRARY "libstdc++") - elseif(_VCPKG_STANDARD_LIBRARY_LIBCXX) - set(STANDARD_LIBRARY "libc++") - elseif(_VCPKG_STANDARD_LIBRARY_MSVC_STL) - set(STANDARD_LIBRARY "msvc-stl") - else() - message(FATAL_ERROR "Can't find which C++ runtime is in use") - endif() - - set(VCPKG_STANDARD_LIBRARY ${STANDARD_LIBRARY} - CACHE STRING - "The C++ standard library in use; one of libstdc++, libc++, msvc-stl") - - message(STATUS "Detecting the C++ standard library - ${VCPKG_STANDARD_LIBRARY}") - endif() -endfunction() - -# Outputs to Cache: VCPKG_USE_STD_FILESYSTEM, VCPKG_CXXFS_LIBRARY -function(vcpkg_detect_std_filesystem) - vcpkg_detect_standard_library() - - if(NOT DEFINED CACHE{VCPKG_USE_STD_FILESYSTEM}) - include(CheckCXXSourceCompiles) - - message(STATUS "Detecting how to use the C++ filesystem library") - - set(CMAKE_REQUIRED_QUIET ON) - if(VCPKG_STANDARD_LIBRARY STREQUAL "libstdc++") - check_cxx_source_compiles([[ -#include -#if defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 9 -#error "libstdc++ after version 9 does not require -lstdc++fs" -#endif -int main() {} -]] - _VCPKG_REQUIRE_LINK_CXXFS) - - check_cxx_source_compiles([[ -#include -#if !defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE < 8 -#error "libstdc++ before version 8 does not support " -#endif -int main() {} -]] - _VCPKG_USE_STD_FILESYSTEM) - - if(_VCPKG_REQUIRE_LINK_CXXFS) - set(_VCPKG_CXXFS_LIBRARY "stdc++fs") - endif() - elseif(VCPKG_STANDARD_LIBRARY STREQUAL "libc++") - if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang") - # AppleClang never requires (or allows) -lc++fs, even with libc++ version 8.0.0 - set(_VCPKG_CXXFS_LIBRARY OFF) - elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") - # As above, not required on this platform (tested at least on 6.8) - set(_VCPKG_CXXFS_LIBRARY OFF) - else() - check_cxx_source_compiles([[ -#include -#if _LIBCPP_VERSION >= 9000 -#error "libc++ after version 9 does not require -lc++fs" -#endif -int main() {} -]] - _VCPKG_REQUIRE_LINK_CXXFS) - - if(_VCPKG_REQUIRE_LINK_CXXFS) - set(_VCPKG_CXXFS_LIBRARY "c++fs") - endif() - endif() - - # We don't support versions of libc++ < 7.0.0, and libc++ 7.0.0 has - set(_VCPKG_USE_STD_FILESYSTEM ON) - elseif(VCPKG_STANDARD_LIBRARY STREQUAL "msvc-stl") - check_cxx_source_compiles( - "#include - #if !defined(_MSVC_STL_UPDATE) || _MSVC_STL_UPDATE < 201803 - #error \"MSVC STL before 15.7 does not support \" - #endif - int main() {}" - _VCPKG_USE_STD_FILESYSTEM) - - set(_VCPKG_CXXFS_LIBRARY OFF) - endif() - - set(VCPKG_USE_STD_FILESYSTEM ${_VCPKG_USE_STD_FILESYSTEM} - CACHE BOOL - "Whether to use , as opposed to " - FORCE) - set(VCPKG_CXXFS_LIBRARY ${_VCPKG_CXXFS_LIBRARY} - CACHE STRING - "Library to link (if any) in order to use " - FORCE) - - if(VCPKG_USE_STD_FILESYSTEM) - set(msg "") - else() - set(msg "") - endif() - if(VCPKG_CXXFS_LIBRARY) - set(msg "${msg} with -l${VCPKG_CXXFS_LIBRARY}") - endif() - - message(STATUS "Detecting how to use the C++ filesystem library - ${msg}") - endif() -endfunction() - -function(vcpkg_target_add_warning_options TARGET) - if(MSVC) - # either MSVC, or clang-cl - target_compile_options(${TARGET} PRIVATE -FC) - - if (MSVC_VERSION GREATER 1900) - # Visual Studio 2017 or later - target_compile_options(${TARGET} PRIVATE -permissive- -utf-8) - endif() - - if(VCPKG_DEVELOPMENT_WARNINGS) - target_compile_options(${TARGET} PRIVATE -W4) - if(VCPKG_COMPILER STREQUAL "clang") - # -Wno-range-loop-analysis is due to an LLVM bug which will be fixed in a - # future version of clang https://reviews.llvm.org/D73007 - target_compile_options(${TARGET} PRIVATE - -Wmissing-prototypes - -Wno-missing-field-initializers - -Wno-range-loop-analysis - ) - else() - target_compile_options(${TARGET} PRIVATE -analyze) - endif() - else() - target_compile_options(${TARGET} PRIVATE -W3) - endif() - - if(VCPKG_WARNINGS_AS_ERRORS) - target_compile_options(${TARGET} PRIVATE -WX) - endif() - else() - if(VCPKG_DEVELOPMENT_WARNINGS) - target_compile_options(${TARGET} PRIVATE - -Wall -Wextra -Wpedantic - -Wno-unknown-pragmas - -Wno-missing-field-initializers - -Wno-redundant-move - ) - - # GCC and clang have different names for the same warning - if(VCPKG_COMPILER STREQUAL "gcc") - target_compile_options(${TARGET} PRIVATE - -Wmissing-declarations - ) - elseif(VCPKG_COMPILER STREQUAL "clang") - target_compile_options(${TARGET} PRIVATE - -Wmissing-prototypes - -Wno-range-loop-analysis - ) - endif() - endif() - - if(VCPKG_WARNINGS_AS_ERRORS) - target_compile_options(${TARGET} PRIVATE -Werror) - endif() - endif() -endfunction() diff --git a/toolsrc/include/catch2/catch.hpp b/toolsrc/include/catch2/catch.hpp deleted file mode 100644 index f471a2ec68a3dd..00000000000000 --- a/toolsrc/include/catch2/catch.hpp +++ /dev/null @@ -1,16865 +0,0 @@ -/* - * Catch v2.9.1 - * Generated: 2019-06-17 11:59:24.363643 - * ---------------------------------------------------------- - * This file has been merged from multiple headers. Please don't edit it directly - * Copyright (c) 2019 Two Blue Cubes Ltd. All rights reserved. - * - * 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) - */ -#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED -#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED -// start catch.hpp - - -#define CATCH_VERSION_MAJOR 2 -#define CATCH_VERSION_MINOR 9 -#define CATCH_VERSION_PATCH 1 - -#ifdef __clang__ -# pragma clang system_header -#elif defined __GNUC__ -# pragma GCC system_header -#endif - -// start catch_suppress_warnings.h - -#ifdef __clang__ -# ifdef __ICC // icpc defines the __clang__ macro -# pragma warning(push) -# pragma warning(disable: 161 1682) -# else // __ICC -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wpadded" -# pragma clang diagnostic ignored "-Wswitch-enum" -# pragma clang diagnostic ignored "-Wcovered-switch-default" -# endif -#elif defined __GNUC__ - // Because REQUIREs trigger GCC's -Wparentheses, and because still - // supported version of g++ have only buggy support for _Pragmas, - // Wparentheses have to be suppressed globally. -# pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details - -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wunused-variable" -# pragma GCC diagnostic ignored "-Wpadded" -#endif -// end catch_suppress_warnings.h -#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER) -# define CATCH_IMPL -# define CATCH_CONFIG_ALL_PARTS -#endif - -// In the impl file, we want to have access to all parts of the headers -// Can also be used to sanely support PCHs -#if defined(CATCH_CONFIG_ALL_PARTS) -# define CATCH_CONFIG_EXTERNAL_INTERFACES -# if defined(CATCH_CONFIG_DISABLE_MATCHERS) -# undef CATCH_CONFIG_DISABLE_MATCHERS -# endif -# if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER) -# define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER -# endif -#endif - -#if !defined(CATCH_CONFIG_IMPL_ONLY) -// start catch_platform.h - -#ifdef __APPLE__ -# include -# if TARGET_OS_OSX == 1 -# define CATCH_PLATFORM_MAC -# elif TARGET_OS_IPHONE == 1 -# define CATCH_PLATFORM_IPHONE -# endif - -#elif defined(linux) || defined(__linux) || defined(__linux__) -# define CATCH_PLATFORM_LINUX - -#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__) -# define CATCH_PLATFORM_WINDOWS -#endif - -// end catch_platform.h - -#ifdef CATCH_IMPL -# ifndef CLARA_CONFIG_MAIN -# define CLARA_CONFIG_MAIN_NOT_DEFINED -# define CLARA_CONFIG_MAIN -# endif -#endif - -// start catch_user_interfaces.h - -namespace Catch { - unsigned int rngSeed(); -} - -// end catch_user_interfaces.h -// start catch_tag_alias_autoregistrar.h - -// start catch_common.h - -// start catch_compiler_capabilities.h - -// Detect a number of compiler features - by compiler -// The following features are defined: -// -// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported? -// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported? -// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported? -// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled? -// **************** -// Note to maintainers: if new toggles are added please document them -// in configuration.md, too -// **************** - -// In general each macro has a _NO_ form -// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature. -// Many features, at point of detection, define an _INTERNAL_ macro, so they -// can be combined, en-mass, with the _NO_ forms later. - -#ifdef __cplusplus - -# if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L) -# define CATCH_CPP14_OR_GREATER -# endif - -# if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) -# define CATCH_CPP17_OR_GREATER -# endif - -#endif - -#if defined(CATCH_CPP17_OR_GREATER) -# define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS -#endif - -#ifdef __clang__ - -# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ - _Pragma( "clang diagnostic push" ) \ - _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \ - _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"") -# define CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \ - _Pragma( "clang diagnostic pop" ) - -# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ - _Pragma( "clang diagnostic push" ) \ - _Pragma( "clang diagnostic ignored \"-Wparentheses\"" ) -# define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \ - _Pragma( "clang diagnostic pop" ) - -# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \ - _Pragma( "clang diagnostic push" ) \ - _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" ) -# define CATCH_INTERNAL_UNSUPPRESS_UNUSED_WARNINGS \ - _Pragma( "clang diagnostic pop" ) - -# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \ - _Pragma( "clang diagnostic push" ) \ - _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" ) -# define CATCH_INTERNAL_UNSUPPRESS_ZERO_VARIADIC_WARNINGS \ - _Pragma( "clang diagnostic pop" ) - -#endif // __clang__ - -//////////////////////////////////////////////////////////////////////////////// -// Assume that non-Windows platforms support posix signals by default -#if !defined(CATCH_PLATFORM_WINDOWS) - #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS -#endif - -//////////////////////////////////////////////////////////////////////////////// -// We know some environments not to support full POSIX signals -#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__) - #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS -#endif - -#ifdef __OS400__ -# define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS -# define CATCH_CONFIG_COLOUR_NONE -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Android somehow still does not support std::to_string -#if defined(__ANDROID__) -# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Not all Windows environments support SEH properly -#if defined(__MINGW32__) -# define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH -#endif - -//////////////////////////////////////////////////////////////////////////////// -// PS4 -#if defined(__ORBIS__) -# define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Cygwin -#ifdef __CYGWIN__ - -// Required for some versions of Cygwin to declare gettimeofday -// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin -# define _BSD_SOURCE -// some versions of cygwin (most) do not support std::to_string. Use the libstd check. -// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813 -# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \ - && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF)) - -# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING - -# endif -#endif // __CYGWIN__ - -//////////////////////////////////////////////////////////////////////////////// -// Visual C++ -#ifdef _MSC_VER - -# if _MSC_VER >= 1900 // Visual Studio 2015 or newer -# define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS -# endif - -// Universal Windows platform does not support SEH -// Or console colours (or console at all...) -# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) -# define CATCH_CONFIG_COLOUR_NONE -# else -# define CATCH_INTERNAL_CONFIG_WINDOWS_SEH -# endif - -// MSVC traditional preprocessor needs some workaround for __VA_ARGS__ -// _MSVC_TRADITIONAL == 0 means new conformant preprocessor -// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor -# if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL) -# define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -# endif -#endif // _MSC_VER - -#if defined(_REENTRANT) || defined(_MSC_VER) -// Enable async processing, as -pthread is specified or no additional linking is required -# define CATCH_INTERNAL_CONFIG_USE_ASYNC -#endif // _MSC_VER - -//////////////////////////////////////////////////////////////////////////////// -// Check if we are compiled with -fno-exceptions or equivalent -#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND) -# define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED -#endif - -//////////////////////////////////////////////////////////////////////////////// -// DJGPP -#ifdef __DJGPP__ -# define CATCH_INTERNAL_CONFIG_NO_WCHAR -#endif // __DJGPP__ - -//////////////////////////////////////////////////////////////////////////////// -// Embarcadero C++Build -#if defined(__BORLANDC__) - #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN -#endif - -//////////////////////////////////////////////////////////////////////////////// - -// Use of __COUNTER__ is suppressed during code analysis in -// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly -// handled by it. -// Otherwise all supported compilers support COUNTER macro, -// but user still might want to turn it off -#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L ) - #define CATCH_INTERNAL_CONFIG_COUNTER -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Check if string_view is available and usable -// The check is split apart to work around v140 (VS2015) preprocessor issue... -#if defined(__has_include) -#if __has_include() && defined(CATCH_CPP17_OR_GREATER) -# define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW -#endif -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Check if optional is available and usable -#if defined(__has_include) -# if __has_include() && defined(CATCH_CPP17_OR_GREATER) -# define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL -# endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) -#endif // __has_include - -//////////////////////////////////////////////////////////////////////////////// -// Check if variant is available and usable -#if defined(__has_include) -# if __has_include() && defined(CATCH_CPP17_OR_GREATER) -# if defined(__clang__) && (__clang_major__ < 8) - // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852 - // fix should be in clang 8, workaround in libstdc++ 8.2 -# include -# if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) -# define CATCH_CONFIG_NO_CPP17_VARIANT -# else -# define CATCH_INTERNAL_CONFIG_CPP17_VARIANT -# endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) -# else -# define CATCH_INTERNAL_CONFIG_CPP17_VARIANT -# endif // defined(__clang__) && (__clang_major__ < 8) -# endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) -#endif // __has_include - -#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER) -# define CATCH_CONFIG_COUNTER -#endif -#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH) -# define CATCH_CONFIG_WINDOWS_SEH -#endif -// This is set by default, because we assume that unix compilers are posix-signal-compatible by default. -#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS) -# define CATCH_CONFIG_POSIX_SIGNALS -#endif -// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions. -#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR) -# define CATCH_CONFIG_WCHAR -#endif - -#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING) -# define CATCH_CONFIG_CPP11_TO_STRING -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL) -# define CATCH_CONFIG_CPP17_OPTIONAL -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) -# define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW) -# define CATCH_CONFIG_CPP17_STRING_VIEW -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT) -# define CATCH_CONFIG_CPP17_VARIANT -#endif - -#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT) -# define CATCH_INTERNAL_CONFIG_NEW_CAPTURE -#endif - -#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE) -# define CATCH_CONFIG_NEW_CAPTURE -#endif - -#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) -# define CATCH_CONFIG_DISABLE_EXCEPTIONS -#endif - -#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN) -# define CATCH_CONFIG_POLYFILL_ISNAN -#endif - -#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC) -# define CATCH_CONFIG_USE_ASYNC -#endif - -#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS -# define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS -# define CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS -# define CATCH_INTERNAL_UNSUPPRESS_UNUSED_WARNINGS -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS -# define CATCH_INTERNAL_UNSUPPRESS_ZERO_VARIADIC_WARNINGS -#endif - -#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) -#define CATCH_TRY if ((true)) -#define CATCH_CATCH_ALL if ((false)) -#define CATCH_CATCH_ANON(type) if ((false)) -#else -#define CATCH_TRY try -#define CATCH_CATCH_ALL catch (...) -#define CATCH_CATCH_ANON(type) catch (type) -#endif - -#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) -#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#endif - -// end catch_compiler_capabilities.h -#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line -#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) -#ifdef CATCH_CONFIG_COUNTER -# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ ) -#else -# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ ) -#endif - -#include -#include -#include - -// We need a dummy global operator<< so we can bring it into Catch namespace later -struct Catch_global_namespace_dummy {}; -std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy); - -namespace Catch { - - struct CaseSensitive { enum Choice { - Yes, - No - }; }; - - class NonCopyable { - NonCopyable( NonCopyable const& ) = delete; - NonCopyable( NonCopyable && ) = delete; - NonCopyable& operator = ( NonCopyable const& ) = delete; - NonCopyable& operator = ( NonCopyable && ) = delete; - - protected: - NonCopyable(); - virtual ~NonCopyable(); - }; - - struct SourceLineInfo { - - SourceLineInfo() = delete; - SourceLineInfo( char const* _file, std::size_t _line ) noexcept - : file( _file ), - line( _line ) - {} - - SourceLineInfo( SourceLineInfo const& other ) = default; - SourceLineInfo& operator = ( SourceLineInfo const& ) = default; - SourceLineInfo( SourceLineInfo&& ) noexcept = default; - SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default; - - bool empty() const noexcept; - bool operator == ( SourceLineInfo const& other ) const noexcept; - bool operator < ( SourceLineInfo const& other ) const noexcept; - - char const* file; - std::size_t line; - }; - - std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ); - - // Bring in operator<< from global namespace into Catch namespace - // This is necessary because the overload of operator<< above makes - // lookup stop at namespace Catch - using ::operator<<; - - // Use this in variadic streaming macros to allow - // >> +StreamEndStop - // as well as - // >> stuff +StreamEndStop - struct StreamEndStop { - std::string operator+() const; - }; - template - T const& operator + ( T const& value, StreamEndStop ) { - return value; - } -} - -#define CATCH_INTERNAL_LINEINFO \ - ::Catch::SourceLineInfo( __FILE__, static_cast( __LINE__ ) ) - -// end catch_common.h -namespace Catch { - - struct RegistrarForTagAliases { - RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ); - }; - -} // end namespace Catch - -#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \ - CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ - namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \ - CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS - -// end catch_tag_alias_autoregistrar.h -// start catch_test_registry.h - -// start catch_interfaces_testcase.h - -#include - -namespace Catch { - - class TestSpec; - - struct ITestInvoker { - virtual void invoke () const = 0; - virtual ~ITestInvoker(); - }; - - class TestCase; - struct IConfig; - - struct ITestCaseRegistry { - virtual ~ITestCaseRegistry(); - virtual std::vector const& getAllTests() const = 0; - virtual std::vector const& getAllTestsSorted( IConfig const& config ) const = 0; - }; - - bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ); - std::vector filterTests( std::vector const& testCases, TestSpec const& testSpec, IConfig const& config ); - std::vector const& getAllTestCasesSorted( IConfig const& config ); - -} - -// end catch_interfaces_testcase.h -// start catch_stringref.h - -#include -#include -#include - -namespace Catch { - - /// A non-owning string class (similar to the forthcoming std::string_view) - /// Note that, because a StringRef may be a substring of another string, - /// it may not be null terminated. c_str() must return a null terminated - /// string, however, and so the StringRef will internally take ownership - /// (taking a copy), if necessary. In theory this ownership is not externally - /// visible - but it does mean (substring) StringRefs should not be shared between - /// threads. - class StringRef { - public: - using size_type = std::size_t; - - private: - friend struct StringRefTestAccess; - - char const* m_start; - size_type m_size; - - char* m_data = nullptr; - - void takeOwnership(); - - static constexpr char const* const s_empty = ""; - - public: // construction/ assignment - StringRef() noexcept - : StringRef( s_empty, 0 ) - {} - - StringRef( StringRef const& other ) noexcept - : m_start( other.m_start ), - m_size( other.m_size ) - {} - - StringRef( StringRef&& other ) noexcept - : m_start( other.m_start ), - m_size( other.m_size ), - m_data( other.m_data ) - { - other.m_data = nullptr; - } - - StringRef( char const* rawChars ) noexcept; - - StringRef( char const* rawChars, size_type size ) noexcept - : m_start( rawChars ), - m_size( size ) - {} - - StringRef( std::string const& stdString ) noexcept - : m_start( stdString.c_str() ), - m_size( stdString.size() ) - {} - - ~StringRef() noexcept { - delete[] m_data; - } - - auto operator = ( StringRef const &other ) noexcept -> StringRef& { - delete[] m_data; - m_data = nullptr; - m_start = other.m_start; - m_size = other.m_size; - return *this; - } - - operator std::string() const; - - void swap( StringRef& other ) noexcept; - - public: // operators - auto operator == ( StringRef const& other ) const noexcept -> bool; - auto operator != ( StringRef const& other ) const noexcept -> bool; - - auto operator[] ( size_type index ) const noexcept -> char; - - public: // named queries - auto empty() const noexcept -> bool { - return m_size == 0; - } - auto size() const noexcept -> size_type { - return m_size; - } - - auto numberOfCharacters() const noexcept -> size_type; - auto c_str() const -> char const*; - - public: // substrings and searches - auto substr( size_type start, size_type size ) const noexcept -> StringRef; - - // Returns the current start pointer. - // Note that the pointer can change when if the StringRef is a substring - auto currentData() const noexcept -> char const*; - - private: // ownership queries - may not be consistent between calls - auto isOwned() const noexcept -> bool; - auto isSubstring() const noexcept -> bool; - }; - - auto operator + ( StringRef const& lhs, StringRef const& rhs ) -> std::string; - auto operator + ( StringRef const& lhs, char const* rhs ) -> std::string; - auto operator + ( char const* lhs, StringRef const& rhs ) -> std::string; - - auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&; - auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&; - - inline auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef { - return StringRef( rawChars, size ); - } - -} // namespace Catch - -inline auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef { - return Catch::StringRef( rawChars, size ); -} - -// end catch_stringref.h -// start catch_type_traits.hpp - - -#include - -namespace Catch{ - -#ifdef CATCH_CPP17_OR_GREATER - template - inline constexpr auto is_unique = std::true_type{}; - - template - inline constexpr auto is_unique = std::bool_constant< - (!std::is_same_v && ...) && is_unique - >{}; -#else - -template -struct is_unique : std::true_type{}; - -template -struct is_unique : std::integral_constant -::value - && is_unique::value - && is_unique::value ->{}; - -#endif -} - -// end catch_type_traits.hpp -// start catch_preprocessor.hpp - - -#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__ -#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__))) - -#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__ -// MSVC needs more evaluations -#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__))) -#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__)) -#else -#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL5(__VA_ARGS__) -#endif - -#define CATCH_REC_END(...) -#define CATCH_REC_OUT - -#define CATCH_EMPTY() -#define CATCH_DEFER(id) id CATCH_EMPTY() - -#define CATCH_REC_GET_END2() 0, CATCH_REC_END -#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2 -#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1 -#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT -#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0) -#define CATCH_REC_NEXT(test, next) CATCH_REC_NEXT1(CATCH_REC_GET_END test, next) - -#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST2(f, x, peek, ...) f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ ) - -#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...) f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ ) - -// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results, -// and passes userdata as the first parameter to each invocation, -// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c) -#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) - -#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) - -#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param) -#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__ -#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__ -#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF -#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__) -#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__ -#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) -#else -// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF -#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__) -#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__ -#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1) -#endif - -#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__ -#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name) - -#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__) - -#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper()) -#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)) -#else -#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper())) -#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))) -#endif - -#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\ - CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__) - -#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0) -#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1) -#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2) -#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3) -#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4) -#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5) -#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _4, _5, _6) -#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7) -#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8) -#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9) -#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10) - -#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N - -#define INTERNAL_CATCH_TYPE_GEN\ - template struct TypeList {};\ - template\ - constexpr auto get_wrapper() noexcept -> TypeList { return {}; }\ - \ - template class L1, typename...E1, template class L2, typename...E2> \ - constexpr auto append(L1, L2) noexcept -> L1 { return {}; }\ - template< template class L1, typename...E1, template class L2, typename...E2, typename...Rest>\ - constexpr auto append(L1, L2, Rest...) noexcept -> decltype(append(L1{}, Rest{}...)) { return {}; }\ - template< template class L1, typename...E1, typename...Rest>\ - constexpr auto append(L1, TypeList, Rest...) noexcept -> L1 { return {}; }\ - \ - template< template class Container, template class List, typename...elems>\ - constexpr auto rewrap(List) noexcept -> TypeList> { return {}; }\ - template< template class Container, template class List, class...Elems, typename...Elements>\ - constexpr auto rewrap(List,Elements...) noexcept -> decltype(append(TypeList>{}, rewrap(Elements{}...))) { return {}; }\ - \ - template